From 233a7aabdd96f1ae25f6a28115f5d7bd1c364fa0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 03:55:26 +0000
Subject: [PATCH 0001/1848] Removed usage of dropped timestamp field in import.

---
 WEB-INF/lib/ttImportHelper.class.php | 1 -
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 2b1b5af36..55fd15407 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -245,7 +245,6 @@ function endElement($parser, $name) {
     if ($name == 'LOG_ITEM' && $this->canImport) {
       $this->logMap[$this->currentElement['ID']] =
         ttTimeHelper::insert(array(
-          'timestamp' => $this->currentElement['TIMESTAMP'],
           'user_id' => $this->userMap[$this->currentElement['USER_ID']],
           'date' => $this->currentElement['DATE'],
           'start' => $this->currentElement['START'],
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9f114559a..1d95f5ecb 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.17.64.4122 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.64.4123 | 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>

From dc00748e76b054fb1163f7a3835b686a752fbf8a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 15:20:07 +0000
Subject: [PATCH 0002/1848] Improved a comment for translators in translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 4 ++--
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 64fa6a277..0a4684d28 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -514,7 +514,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Factura enviada.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 549e8ed52..3300c7a3a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -527,7 +527,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Faktura odeslána.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index abf049cd2..23cbc20ce 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -468,7 +468,7 @@
 'form.mail.report_sent' => 'Rapport sendt.',
 'form.mail.invoice_sent' => 'Faktura sendt.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'År',
 'form.quota.month' => 'Måned',
 'form.quota.quota' => 'Kvota',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a588ad493..f98216203 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -466,7 +466,7 @@
 'form.mail.report_sent' => 'Der Bericht wurde gesendet.',
 'form.mail.invoice_sent' => 'Die Rechnung wurde gesendet.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 011f458ae..ce65dc622 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -452,14 +452,14 @@
 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Invoice sent.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Year',
 'form.quota.month' => 'Month',
 'form.quota.quota' => 'Quota',
 'form.quota.workday_hours' => 'Hours in work day',
 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 23b391a7f..0d7f7ab24 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -529,7 +529,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Factura enviada.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b6a5895ca..aa8a63af8 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -524,7 +524,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Arve saadetud.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 5ad0871a5..2fa168ef1 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -497,7 +497,7 @@
 'form.mail.report_sent' => 'گزارش ارسال شد.',
 'form.mail.invoice_sent' => 'فاکتور ارسال شد.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 5557499d3..a02c9d9cd 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -476,7 +476,7 @@
 'form.mail.report_sent' => 'Raportti lähetetty.',
 'form.mail.invoice_sent' => 'Lasku lähetetty.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1c8708a4c..1de9b91c9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -465,7 +465,7 @@
 'form.mail.report_sent' => 'Le rapport a été envoyé.',
 'form.mail.invoice_sent' => 'La facture a été envoyée.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Année',
 'form.quota.month' => 'Mois',
 'form.quota.quota' => 'Quota',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 934051983..e3477ccc3 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -451,7 +451,7 @@
 'form.mail.report_sent' => 'Η αναφορά στάλθηκε.',
 'form.mail.invoice_sent' => 'Το τιμολόγιο στάλθηκε.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Χρόνος',
 'form.quota.month' => 'Μήνας',
 'form.quota.quota' => 'Ποσοστό',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2306e7c7e..bae295f90 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -502,7 +502,7 @@
 'form.mail.report_sent' => 'הדוח נשלח.',
 'form.mail.invoice_sent' => 'החשבונית נשלחה.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index fae8f6d5b..70cfb40ca 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -519,7 +519,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'A számla elküldve.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2954043a7..a1c1f47fc 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -467,7 +467,7 @@
 'form.mail.report_sent' => 'Rapporto inviato.',
 'form.mail.invoice_sent' => 'Fattura inviata.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Anno',
 'form.quota.month' => 'Mese',
 'form.quota.quota' => 'Quota',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0df3c610b..65d77779a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -519,7 +519,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '送信した送り状。',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 717761c35..c3a47603f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -517,7 +517,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '송신한 송장.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e8153aa76..630c64d19 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -459,7 +459,7 @@
 'form.mail.report_sent' => 'Rapport is verzonden.',
 'form.mail.invoice_sent' => 'Factuur is verzonden.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Jaar',
 'form.quota.month' => 'Maand',
 'form.quota.quota' => 'Quota',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index dceff3d7e..7aae59085 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -515,7 +515,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 // 'form.mail.invoice_sent' => 'Invoice sent.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 7b9f37869..2c1427e3d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -478,7 +478,7 @@
 'form.mail.report_sent' => 'Wysłano raport',
 'form.mail.invoice_sent' => 'Wysłano fakturę',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5c9bd7f35..ecf7a70fa 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -473,7 +473,7 @@
 'form.mail.report_sent' => 'Relatório enviado.',
 'form.mail.invoice_sent' => 'Fatura enviada.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 733d22f8b..c2909f43f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -503,7 +503,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 // 'form.mail.invoice_sent' => 'Invoice sent.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 6e0898f32..05522ac30 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -523,7 +523,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Factura trimisa.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d3d8b25df..c03b6f12a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -449,7 +449,7 @@
 'form.mail.report_sent' => 'Отчёт отправлен.',
 'form.mail.invoice_sent' => 'Счёт отправлен.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Год',
 'form.quota.month' => 'Месяц',
 'form.quota.quota' => 'Квота',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 91f4d96f6..ac508d491 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -493,7 +493,7 @@
 'form.mail.report_sent' => 'Zostava odoslaná.',
 'form.mail.invoice_sent' => 'Faktúra odoslaná.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7a63b97dd..bd51ff4e4 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -501,7 +501,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 // 'form.mail.invoice_sent' => 'Invoice sent.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d96c4aa2a..0612d4e83 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -477,7 +477,7 @@
 'form.mail.report_sent' => 'Izveštaj poslat.',
 'form.mail.invoice_sent' => 'Račun poslat.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 9a58e5703..24ad4551e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -474,7 +474,7 @@
 'form.mail.report_sent' => 'Rapporten skickades.',
 'form.mail.invoice_sent' => 'Fakturan skickades.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'År',
 'form.quota.month' => 'Månad',
 'form.quota.quota' => 'Kvot',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b5b54939e..ad0565f9c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -535,7 +535,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Fatura yollandı.',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 1581a9967..c174185f5 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -502,7 +502,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '发票已送出。',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 8c9ace018..a2c28331c 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -512,7 +512,7 @@
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '發票已送出。',
 
-// Quotas configuration form.
+// Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1d95f5ecb..6c21ea63a 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.17.64.4123 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.64.4124 | 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>

From 9eee35c738a83c870e8d6dfda19d859bd063b233 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 15:27:02 +0000
Subject: [PATCH 0003/1848] Improved a comment for translators.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0a4684d28..078eaf5cd 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -522,7 +522,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 3300c7a3a..91ead1a9b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -535,7 +535,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 23cbc20ce..397dc7f57 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -475,7 +475,7 @@
 'form.quota.workday_hours' => 'Timer på en arbejdsdag',
 'form.quota.hint' => 'Hvis værdierne er tomme, beregnes kvoter automatisk baseret på arbejdsdage og helligdage.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index f98216203..279feee7a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -474,7 +474,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0d7f7ab24..b760badc6 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -537,7 +537,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index aa8a63af8..21fbcc0c2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -532,7 +532,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2fa168ef1..f9c7a3b9d 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -505,7 +505,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a02c9d9cd..d722106d4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -484,7 +484,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1de9b91c9..c999d6380 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -472,7 +472,7 @@
 'form.quota.workday_hours' => 'Heures journée de travail',
 'form.quota.hint' => 'Si les valeurs sont vides, les quotas sont calculés automatiquement selon les heures des journées de travail et des congés.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e3477ccc3..1a7bfa1a3 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -458,7 +458,7 @@
 'form.quota.workday_hours' => 'Ώρες ανά ημέρα εργασίας',
 'form.quota.hint' => 'Εάν οι τιμές είναι κενές, οι ποσοστώσεις υπολογίζονται αυτόματα με βάση τις ώρες της εργάσιμης ημέρας και τις αργίες.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index bae295f90..fc54004ed 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -510,7 +510,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 70cfb40ca..0ef9f2888 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -527,7 +527,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index a1c1f47fc..6df19a3b6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -474,7 +474,7 @@
 'form.quota.workday_hours' => 'Ore lavorative in un giorno',
 'form.quota.hint' => 'Se i valori sono vuoti, le quote vengono calcolate automaticamente basandosi su ore giornaliere e vacanze.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 65d77779a..c1845d73e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -527,7 +527,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c3a47603f..101cfd713 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -525,7 +525,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 630c64d19..fa65b754c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -466,7 +466,7 @@
 'form.quota.workday_hours' => 'Werkuren per dag',
 'form.quota.hint' => 'Als de velden leeg worden gelaten, dan zullen de doelen worden berekend op bassis van het aantal werkuren per dag en vakantiedagen.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 7aae59085..c467d9798 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -523,7 +523,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2c1427e3d..f7b380672 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -486,7 +486,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ecf7a70fa..aa7bb7620 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -481,7 +481,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c2909f43f..feaff31cc 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -511,7 +511,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 05522ac30..96cf3a102 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -531,7 +531,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c03b6f12a..07e1c619b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -456,7 +456,7 @@
 'form.quota.workday_hours' => 'Количество часов в рабочем дне',
 'form.quota.hint' => 'При пустых значениях квоты автоматически определяются из длительности рабочего дня и праздников.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 'form.swap.swap_with' => 'Обменять роль с',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ac508d491..2b6f43eb0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -501,7 +501,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index bd51ff4e4..91e11c6f6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -509,7 +509,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 0612d4e83..e5e04f935 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -485,7 +485,7 @@
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 24ad4551e..d2ec27626 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -481,7 +481,7 @@
 'form.quota.workday_hours' => 'Arbetstimmar per dag',
 'form.quota.hint' => 'Om fälten lämnas tomma räknas kvoterna automatiskt ut baserat på arbetstimmar per dag och helgdagar.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index ad0565f9c..6df4b32f1 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -543,7 +543,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index c174185f5..3d9c34d19 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -510,7 +510,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a2c28331c..66b885cfd 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -520,7 +520,7 @@
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
-// Swap roles form.
+// Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
 // 'form.swap.swap_with' => 'Swap roles with',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6c21ea63a..aaaf8db2b 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.17.64.4124 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.64.4125 | 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>

From 2ccee198591bc2ad5d80b5e1076246449d9232c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 17:18:39 +0000
Subject: [PATCH 0004/1848] Started to work on ttRegistrator class to
 encapsulate restration related tasks.

---
 WEB-INF/lib/ttExportHelper.class.php | 12 ++--
 WEB-INF/lib/ttRegistrator.class.php  | 83 ++++++++++++++++++++++++++++
 register.php                         | 25 +++++----
 3 files changed, 103 insertions(+), 17 deletions(-)
 create mode 100644 WEB-INF/lib/ttRegistrator.class.php

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 77b2db1fd..375de2f37 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -360,16 +360,14 @@ function compress($in, $out) {
 
   /*
    * Note about the utility functions below.
-   * We have roughly 3 groups of operations:
+   * We have roughly 4 groups of operations:
    *   1) Regular system usage for tracking time, etc.
-   *   2) Admin usage - used infrequently.
-   *   3) Export - used infrequently.
-   *
-   * TODO: we also have user registration process without initialized user.
-   * Perhaps we need a separate helper class for this. Think about it.
+   *   2) Registration process - used infrequently.
+   *   3) Admin usage - used infrequently.
+   *   4) Export - used infrequently.
    *
    * It is tempting to have a generic function to get things done for
-   * all situations. However, as export and admin access are one-off
+   * all situations. However, as registration, export and admin access are one-off
    * operations, while regular system usage is daily and must be efficient,
    * the current approach is to have SEPARATE functions for each mode.
    *
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
new file mode 100644
index 000000000..9a650c9c2
--- /dev/null
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -0,0 +1,83 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// ttRegistrator class is used to register a user in Time Tracker.
+class ttRegistrator {
+  var $user_name = null;  // User name.
+  var $login = null;      // User login.
+  var $password = null;   // User password.
+  var $email = null;      // User email.
+  var $group_name = null; // Group name.
+  var $currency = null;   // Currency.
+  var $lang = null;       // Language.
+  var $err = null;        // Error object, passed to us as reference.
+                          // We use it to communicate errors to caller.
+
+  // Constructor.
+  function __construct($fields, &$err) {
+    $this->user_name = $fields['user_name'];
+    $this->login = $fields['login'];    
+    $this->password1 = $fields['password1'];
+    $this->password2 = $fields['password2'];
+    $this->email = $fields['email'];
+    $this->group_name = $fields['group_name'];
+    $this->currency = $fields['currency'];
+    $this->lang = $fields['lang'];
+    if (!$thins->lang) $this->lang = 'en';
+    $this->err = $err;
+
+    // Validate passed in parameters.
+    $this->validate();
+  }
+
+  function validate() {
+    global $i18n;
+
+    if (!ttValidString($this->group_name, true))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+    if (!ttValidString($this->currency, true))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
+    if (!ttValidString($this->user_name))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+    if (!ttValidString($this->login))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+    if (!ttValidString($this->password1))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($this->password2))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if ($this->password1 !== $this->password2)
+      $this->err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));    
+    if (!ttValidEmail($this->email, true))
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  }
+
+  // The register function registers a user in Time Tracker.
+  function register() {
+    // TODO: work in progress. Not implemented.
+  }
+}
diff --git a/register.php b/register.php
index 92e97be68..a34a78fbc 100644
--- a/register.php
+++ b/register.php
@@ -85,16 +85,21 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
 
 if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-  if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
-  if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-  if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
-  if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-  if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
-  if ($cl_password1 !== $cl_password2)
-    $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
-  if (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  // Create fields array for ttRegistrator instance.
+  $fields = array(
+    'user_name' => $cl_manager_name,
+    'login' => $cl_manager_login,
+    'password1' => $cl_password1,
+    'password2' => $cl_password2,
+    'email' => $cl_manager_email,
+    'group_name' => $cl_team_name,
+    'currency' => $cl_currency,
+    'lang' => $cl_lang);
+
+  // Create an instance of ttRegistrator class.
+  import('ttRegistrator');
+  $registrator = new ttRegistrator($fields, $err);
+  // Validation of user input occurs in ttRegistrator constructor above.
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_manager_login)) {

From d40763fdef73f3118da81b497baafff29a73c5ba Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 19:12:59 +0000
Subject: [PATCH 0005/1848] Refactored register.php by encapsulating stuff in
 ttRegistrator class.

---
 WEB-INF/lib/ttRegistrator.class.php | 77 ++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl        |  2 +-
 register.php                        | 42 ++++------------
 3 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 9a650c9c2..0e51ce39c 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -35,6 +35,9 @@ class ttRegistrator {
   var $group_name = null; // Group name.
   var $currency = null;   // Currency.
   var $lang = null;       // Language.
+  var $group_id = null;   // Group id, set after we create a group.
+  var $role_id = null;    // Role id for top managers.
+  var $user_id = null;    // User id after registration.
   var $err = null;        // Error object, passed to us as reference.
                           // We use it to communicate errors to caller.
 
@@ -48,7 +51,7 @@ function __construct($fields, &$err) {
     $this->group_name = $fields['group_name'];
     $this->currency = $fields['currency'];
     $this->lang = $fields['lang'];
-    if (!$thins->lang) $this->lang = 'en';
+    if (!$this->lang) $this->lang = 'en';
     $this->err = $err;
 
     // Validate passed in parameters.
@@ -78,6 +81,76 @@ function validate() {
 
   // The register function registers a user in Time Tracker.
   function register() {
-    // TODO: work in progress. Not implemented.
+    global $i18n;
+
+    if ($this->err->yes())
+      return; // There are errors, do not proceed.
+
+    import('ttUserHelper');
+    if (ttUserHelper::getUserByLogin($this->login)) {
+      // User login already exists.
+      $this->err->add($i18n->getKey('error.user_exists'));
+      return;
+    }
+
+    // Create a new group.
+    $this->group_id = $this->createGroup();
+    if (!$this->group_id) {
+      $this->err->add($i18n->getKey('error.db'));
+      return;
+    }
+
+    import('ttRoleHelper');
+    if (!ttRoleHelper::createPredefinedRoles($this->group_id, $this->lang)) {
+      $err->add($i18n->getKey('error.db'));
+      return;
+    }
+    $this->role_id = ttRoleHelper::getTopManagerRoleID();
+    $this->user_id = $this->createUser();
+
+    if (!$this->user_id) {
+      $err->add($i18n->getKey('error.db'));
+      return;
+    }
+  }
+
+  // The createGroup function creates a group in Time Tracker as part
+  // of user registration process. This is a top group for user as top manager.
+  function createGroup() {
+    $mdb2 = getConnection();
+
+    $name = $mdb2->quote($this->group_name);
+    $currency = $mdb2->quote($this->currency);
+    $lang = $mdb2->quote($this->lang);
+
+    $sql = "insert into tt_teams (name, currency, lang) values($name, $currency, $lang)";
+    $affected = $mdb2->exec($sql);
+
+    if (!is_a($affected, 'PEAR_Error')) {
+      $group_id = $mdb2->lastInsertID('tt_teams', 'id');
+      return $group_id;
+    }
+    return false;
+  }
+
+  // The createUser creates a user in database as part of registration process.
+  function createUser() {
+    $mdb2 = getConnection();
+
+    $login = $mdb2->quote($this->login);
+    $password = 'md5('.$mdb2->quote($this->password1).')';
+    $name = $mdb2->quote($this->user_name);
+    $email = $mdb2->quote($this->email);
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $values = "values($login, $password, $name, $this->group_id, $this->role_id, $email, $created, $created_ip)";
+
+    $sql = 'insert into tt_users (login, password, name, team_id, role_id, email, created, created_ip) '.$values;
+    $affected = $mdb2->exec($sql);
+    if (!is_a($affected, 'PEAR_Error')) {
+      $user_id = $mdb2->lastInsertID('tt_users', 'id');
+      return $user_id;
+    }
+    return false;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aaaf8db2b..0f5a4f2de 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.17.64.4125 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.64.4126 | 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/register.php b/register.php
index a34a78fbc..3ddcb9902 100644
--- a/register.php
+++ b/register.php
@@ -28,8 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttUserHelper');
-import('ttRoleHelper');
 
 if (!isTrue(MULTITEAM_MODE) || $auth->isPasswordExternal()) {
   header('Location: login.php');
@@ -99,39 +97,17 @@
   // Create an instance of ttRegistrator class.
   import('ttRegistrator');
   $registrator = new ttRegistrator($fields, $err);
-  // Validation of user input occurs in ttRegistrator constructor above.
+  $registrator->register();
 
   if ($err->no()) {
-    if (!ttUserHelper::getUserByLogin($cl_manager_login)) {
-      // Create a new team.
-      $team_id = ttTeamHelper::insert(array('name'=>$cl_team_name,'currency'=>$cl_currency,'lang'=>$cl_lang));
-      if ($team_id) {
-        if (!ttRoleHelper::createPredefinedRoles($team_id, $cl_lang))
-          $err->add($i18n->getKey('error.db'));
-
-        $role_id = ttRoleHelper::getTopManagerRoleID();
-
-        // Team created, now create a team manager.
-        $user_id = ttUserHelper::insert(array(
-          'team_id' => $team_id,
-          'role_id' => $role_id,
-          'name' => $cl_manager_name,
-          'login' => $cl_manager_login,
-          'password' => $cl_password1,
-          'email' => $cl_manager_email));
-      }
-      if ($team_id && $user_id) {
-        if ($auth->doLogin($cl_manager_login, $cl_password1)) {
-          setcookie('tt_login', $cl_manager_login, time() + COOKIE_EXPIRE, '/');
-          header('Location: time.php');
-        } else {
-          header('Location: login.php');
-        }
-        exit();
-      } else
-        $err->add($i18n->getKey('error.db'));
-    } else
-      $err->add($i18n->getKey('error.user_exists'));
+    // Registration successful.
+    if ($auth->doLogin($cl_manager_login, $cl_password1)) {
+      setcookie('tt_login', $cl_manager_login, time() + COOKIE_EXPIRE, '/');
+      header('Location: time.php');
+    } else {
+      header('Location: login.php');
+    }
+    exit();
   }
 } // isPost
 

From 7482d40143c40f58935fc37ecda54f2a60b2611e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 19:50:58 +0000
Subject: [PATCH 0006/1848] Introduced audit fields in tt_teams table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 15 +++++++++++----
 mysql.sql                    |  6 ++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0f5a4f2de..972eaf232 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.17.64.4126 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4127 | 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/dbinstall.php b/dbinstall.php
index ff0820b63..7fb35e831 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11764"]) {
+  if ($_POST["convert11744to11765"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -844,6 +844,13 @@ function setChange($sql) {
     setChange("update `tt_log` l inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.61') set l.created = l.timestamp where l.created is null");
     setChange("ALTER TABLE `tt_log` drop `timestamp`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.64', modified = now() where param_name = 'version_db' and param_value = '1.17.61'");
+    setChange("ALTER TABLE `tt_teams` ADD `created` datetime default NULL AFTER `config`");
+    setChange("ALTER TABLE `tt_teams` ADD `created_ip` varchar(45) default NULL AFTER `created`");
+    setChange("ALTER TABLE `tt_teams` ADD `created_by` int(11) default NULL AFTER `created_ip`");
+    setChange("ALTER TABLE `tt_teams` ADD `modified` datetime default NULL AFTER `created_by`");
+    setChange("ALTER TABLE `tt_teams` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
+    setChange("ALTER TABLE `tt_teams` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'");
   }
 
   if ($_POST["cleanup"]) {
@@ -889,7 +896,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.64)</b>
+    <td width="80%"><b>Create database structure (v1.17.65)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -929,8 +936,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.64)</td>
-    <td><input type="submit" name="convert11744to11764" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.65)</td>
+    <td><input type="submit" name="convert11744to11765" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 61b39098c..931f9bdc1 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -33,6 +33,12 @@ CREATE TABLE `tt_teams` (
   `workday_minutes` smallint(4) default 480,                 # number of work minutes in a regular working day
   `custom_logo` tinyint(4) default 0,                        # whether to use a custom logo or not
   `config` text default NULL,                                # miscellaneous team configuration settings
+  `created` datetime default NULL,                           # creation timestamp
+  `created_ip` varchar(45) default NULL,                     # creator ip
+  `created_by` int(11) default NULL,                         # creator user_id
+  `modified` datetime default NULL,                          # modification timestamp
+  `modified_ip` varchar(45) default NULL,                    # modifier ip
+  `modified_by` int(11) default NULL,                        # modifier user_id
   `status` tinyint(4) default 1,                             # team status
   PRIMARY KEY (`id`)
 );

From 496cfee4721ea6f3dca65ec57a2845ef059c5b1d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 19:52:10 +0000
Subject: [PATCH 0007/1848] Updated db version.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mysql.sql                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 972eaf232..1a731bba4 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.17.65.4127 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4128 | 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/mysql.sql b/mysql.sql
index 931f9bdc1..cc4ffb0df 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -452,4 +452,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.64', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.65', now()); # TODO: change when structure changes.

From 15684e556a6829fbea1511e99ee5bf8053d69295 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 21:11:48 +0000
Subject: [PATCH 0008/1848] Added handling of audit info to user registration.

---
 WEB-INF/lib/ttRegistrator.class.php | 13 ++++++++++++-
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 0e51ce39c..ea76f3a2f 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -122,8 +122,10 @@ function createGroup() {
     $name = $mdb2->quote($this->group_name);
     $currency = $mdb2->quote($this->currency);
     $lang = $mdb2->quote($this->lang);
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
 
-    $sql = "insert into tt_teams (name, currency, lang) values($name, $currency, $lang)";
+    $sql = "insert into tt_teams (name, currency, lang, created, created_ip) values($name, $currency, $lang, $created, $created_ip)";
     $affected = $mdb2->exec($sql);
 
     if (!is_a($affected, 'PEAR_Error')) {
@@ -149,6 +151,15 @@ function createUser() {
     $affected = $mdb2->exec($sql);
     if (!is_a($affected, 'PEAR_Error')) {
       $user_id = $mdb2->lastInsertID('tt_users', 'id');
+
+      // Update created_by field for the team with user id, now that we have it.
+      $sql = "update tt_teams set created_by = $user_id where id = $this->group_id and created_by is null";
+      $affected = $mdb2->exec($sql);
+
+      // Update created_by field for user by setting to self.
+      $sql = "update tt_users set created_by = $user_id where id = $user_id and team_id = $this->group_id and created_by is null";
+      $affected = $mdb2->exec($sql);
+
       return $user_id;
     }
     return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a731bba4..54e00f39f 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.17.65.4128 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4129 | 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>

From f340e538c5e269b9035905e808220a5683b079c4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Mar 2018 22:00:26 +0000
Subject: [PATCH 0009/1848] Added modification info to team updates.

---
 WEB-INF/lib/ttTeamHelper.class.php | 4 +++-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 74ef55452..6dede8b23 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -867,6 +867,7 @@ static function insert($fields) {
   // The update function updates team information.
   static function update($team_id, $fields)
   {
+    global $user;
     $mdb2 = getConnection();
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
@@ -897,10 +898,11 @@ static function update($team_id, $fields)
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
 
     $sql = "update tt_teams set $name_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
-      $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part where id = $team_id";
+      $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 54e00f39f..d45f4d94f 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.17.65.4129 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4130 | 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>

From 73bd55c5aaa9459806ef9fa899cc5a24513727bc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 00:06:41 +0000
Subject: [PATCH 0010/1848] Introduced ttAdmin class for admin tasks.

---
 WEB-INF/lib/ttAdmin.class.php | 179 ++++++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl  |   2 +-
 admin_team_delete.php         |   5 +-
 3 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/lib/ttAdmin.class.php

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
new file mode 100644
index 000000000..b6b081e97
--- /dev/null
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -0,0 +1,179 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// ttAdmin class is used to perform admin tasks.
+class ttAdmin {
+
+  // Constructor.
+  function __construct() {
+  }
+
+  // getSubgroups rerurns an array of subgroups for a group.
+  function getSubgroups($group_id) {
+    return array(); // TODO: not yet implemented.
+  }
+
+  // getUsers obtains user ids in a group.
+  function getUsers($group_id) {
+    $mdb2 = getConnection();
+    $sql = "select id from tt_users where team_id = $group_id";
+    $res = $mdb2->query($sql);
+    $users = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $users[] = $val;
+      }
+    }
+    return $users;
+  }
+
+  // markUserDeleted marks a user and all things associated with user as deleted.
+  function markUserDeleted($user_id) {
+    $mdb2 = getConnection();
+
+    // Mark user binds as deleted.
+    $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark favorite reports as deleted.
+    $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark user as deleted.
+    global $user;
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $sql = "update tt_users set status = NULL $modified_part where id = $user_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    return true;
+  }
+
+  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group.
+  function markTasksDeleted($group_id) {
+    $mdb2 = getConnection();
+    $sql = "select id from tt_tasks where team_id = $group_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+
+    while ($val = $res->fetchRow()) {
+      // Delete task binds.
+      $task_id = $val['id'];
+      $sql = "delete from tt_project_task_binds where task_id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Mark task as deleted.
+      $sql = "update tt_tasks set status = NULL where id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+    return true;
+  }
+
+  // markGroupDeleted marks the group and everything in it as deleted.
+  function markGroupDeleted($group_id) {
+
+    // Keep the logic simple by returning false on first error.
+
+    // Obtain subgroups and call self recursively on them.
+    $subgroups = $this->getSubgroups();
+    foreach($subgroups as $subgroup) {
+      if (!$this->markGroupDeleted($subgroup['id']))
+        return false;
+    }
+
+    // Now that we are done with subgroups, handle this group.
+    $users = $this->getUsers($group_id);
+
+    // Iterate through team users and mark them as deleted.
+    foreach ($users as $one_user) {
+      if (!$this->markUserDeleted($one_user['id']))
+          return false;
+    }
+
+    // Mark tasks deleted.
+    if (!$this->markTasksDeleted($group_id)) return false;
+
+    $mdb2 = getConnection();
+
+    // Mark roles deleted.
+    $sql = "update tt_roles set status = NULL where team_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark projects deleted.
+    $sql = "update tt_projects set status = NULL where team_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark clients deleted.
+    $sql = "update tt_clients set status = NULL where team_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark invoices deleted.
+    $sql = "update tt_invoices set status = NULL where team_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark custom fields deleted.
+    $sql = "update tt_custom_fields set status = NULL where team_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark notifications deleted.
+    $sql = "update tt_cron set status = NULL where team_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Note: we don't mark tt_log or tt_expense_items deleted here.
+    // Reasoning is:
+    //
+    // 1) Users may mark some of them deleted during their work.
+    // If we mark all of them deleted here, we can't recover nicely
+    // as we'll lose track of what was deleted by user.
+    //
+    // 2) DB maintenance script (Clean up DB from inactive teams) should
+    // get rid of these items permanently eventually.
+
+    // Mark group deleted.
+    global $user;
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $sql = "update tt_teams set status = NULL $modified_part where id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return true;
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d45f4d94f..e0a4919d8 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.17.65.4130 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4131 | 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/admin_team_delete.php b/admin_team_delete.php
index 6958ca0e8..b2b462ce6 100644
--- a/admin_team_delete.php
+++ b/admin_team_delete.php
@@ -47,7 +47,10 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if (ttTeamHelper::markDeleted($team_id)) {
+    import('ttAdmin');
+    $admin = new ttAdmin();
+    $result = $admin->markGroupDeleted($team_id);
+    if ($result) {
       header('Location: admin_teams.php');
       exit();
     } else

From 62dc3d09ec2703764869f5e76e5bc82b351938a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 14:45:15 +0000
Subject: [PATCH 0011/1848] Refactored admin_team_edit.php to use ttAdmin
 class.

---
 WEB-INF/lib/ttAdmin.class.php | 87 ++++++++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl  |  2 +-
 admin_team_edit.php           | 47 +++++++------------
 3 files changed, 104 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index b6b081e97..e054547d1 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -26,11 +26,17 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
+import('ttUser');
+
 // ttAdmin class is used to perform admin tasks.
 class ttAdmin {
 
+  var $err = null;        // Error object, passed to us as reference.
+                          // We use it to communicate errors to caller.
+
   // Constructor.
-  function __construct() {
+  function __construct(&$err = null) {
+    $this->err = $err;
   }
 
   // getSubgroups rerurns an array of subgroups for a group.
@@ -176,4 +182,83 @@ function markGroupDeleted($group_id) {
 
     return true;
   }
+
+  // validateTeamInfo validates team information entered by user.
+  function validateTeamInfo($fields) {
+    global $i18n;
+    global $auth;
+
+    $result = true;
+
+    if (!ttValidString($fields['group_name'], true)) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+      $result = false;
+    }
+    if (!ttValidString($fields['user_name'])) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+      $result = false;
+    }
+    if (!ttValidString($fields['new_login'])) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+      $result = false;
+    }
+
+    // If we change login, it must be unique.
+    if ($fields['new_login'] != $fields['old_login']) {
+      if (ttUserHelper::getUserByLogin($fields['new_login'])) {
+        $this->err->add($i18n->getKey('error.user_exists'));
+        $result = false;
+      }
+    }
+
+    if (!$auth->isPasswordExternal() && ($fields['password1'] || $fields['password2'])) {
+      if (!ttValidString($fields['password1'])) {
+        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+        $result = false;
+      }
+      if (!ttValidString($fields['password2'])) {
+        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+        $result = false;
+      }
+      if ($fields['password1'] !== $fields['password2']) {
+        $this->err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+        $result = false;
+      }
+    }
+    if (!ttValidEmail($fields['email'], true)) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+      $result = false;
+    }
+
+    return $result;
+  }
+
+  // updateTeam validates user input and updates the team with new information.
+  function updateTeam($team_id, $fields) {
+    if (!$this->validateTeamInfo($fields)) return false; // Can't continue as user input is invalid.
+
+    $mdb2 = getConnection();
+
+    // Update group name if it changed.
+    if ($fields['old_group_name'] != $fields['new_group_name']) {
+      $name = $mdb2->quote($fields['new_group_name']);
+      $sql = "update tt_teams set name = $name where id = $team_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+
+    // Update group manager.
+    $user_id = $fields['user_id'];
+    $login_part = 'login = '.$mdb2->quote($fields['new_login']);
+    if ($fields['password1'])
+      $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
+    $name_part = ', name = '.$mdb2->quote($fields['user_name']);
+    $email_part = ', email = '.$mdb2->quote($fields['email']);
+
+    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.'where id = '.$user_id;
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e0a4919d8..0bbfc0348 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.17.65.4131 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4132 | 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/admin_team_edit.php b/admin_team_edit.php
index 61828e166..428845855 100644
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -74,37 +74,24 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_save')) {
-    // Validate user input.
-    if (!ttValidString($cl_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-    if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-    if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
-    if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-      if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-      if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
-      if ($cl_password1 !== $cl_password2)
-        $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
-    }
-    if (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-
-    // New login must be unique.
-    if ($cl_manager_login != $team_details['manager_login'])
-      if (ttUserHelper::getUserByLogin($cl_manager_login)) $err->add($i18n->getKey('error.user_exists'));
+    // Create fields array for ttAdmin instance.
+    $fields = array(
+      'old_group_name' => $team_details['team_name'],
+      'new_group_name' => $cl_team_name,
+      'user_id' => $team_details['manager_id'],
+      'user_name' => $cl_manager_name,
+      'old_login' => $team_details['manager_login'],
+      'new_login' => $cl_manager_login,
+      'password1' => $cl_password1,
+      'password2' => $cl_password2,
+      'email' => $cl_manager_email);
 
-    if ($err->no()) {
-      $update_result = ttTeamHelper::update($team_id, array('name'=>$cl_team_name));
-      if ($update_result) {
-        $update_result = ttUserHelper::update($team_details['manager_id'], array(
-          'name' => $cl_manager_name,
-          'login' => $cl_manager_login,
-          'password' => $cl_password1,
-          'email' => $cl_manager_email,
-          'status' => ACTIVE));
-      }
-      if ($update_result) {
-        header('Location: admin_teams.php');
-        exit();
-      } else
-        $err->add($i18n->getKey('error.db'));
+    import('ttAdmin');
+    $admin = new ttAdmin($err);
+    $result = $admin->updateTeam($team_id, $fields);
+    if ($result) {
+      header('Location: admin_teams.php');
+      exit();
     }
   }
 

From afb1ca7aaa68c5b34da82ed58b7e06df1c1525ab Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 18:21:35 +0000
Subject: [PATCH 0012/1848] A bit more refactoring for admin.

---
 WEB-INF/lib/ttAdmin.class.php       | 34 ++++++++++++++--
 WEB-INF/lib/ttRegistrator.class.php | 40 +++++++++++++------
 WEB-INF/templates/footer.tpl        |  2 +-
 admin_team_add.php                  | 61 ++++++++++++-----------------
 4 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index e054547d1..d6b9696a1 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -237,12 +237,14 @@ function validateTeamInfo($fields) {
   function updateTeam($team_id, $fields) {
     if (!$this->validateTeamInfo($fields)) return false; // Can't continue as user input is invalid.
 
+    global $user;
     $mdb2 = getConnection();
 
     // Update group name if it changed.
     if ($fields['old_group_name'] != $fields['new_group_name']) {
-      $name = $mdb2->quote($fields['new_group_name']);
-      $sql = "update tt_teams set name = $name where id = $team_id";
+      $name_part = 'name = '.$mdb2->quote($fields['new_group_name']);
+      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+      $sql = 'update tt_teams set '.$name_part.$modified_part.' where id = '.$team_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
@@ -254,11 +256,35 @@ function updateTeam($team_id, $fields) {
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['user_name']);
     $email_part = ', email = '.$mdb2->quote($fields['email']);
-
-    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.'where id = '.$user_id;
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.'where id = '.$user_id;
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     return true;
   }
+
+  // setCreatedByAdmin sets created_by field for both group and its top manager to admin account.
+  function setCreatedByAdmin($team_id, $user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    // Update created_by for group.
+    $sql = "update tt_teams set created_by = $user->id where id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->err->add($i18n->getKey('error.db'));
+      return false;
+    }
+
+    // Update created_by for top manager.
+    $sql = "update tt_users set created_by = $user->id where id = $user_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->err->add($i18n->getKey('error.db'));
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index ea76f3a2f..3ac6166d3 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -81,10 +81,9 @@ function validate() {
 
   // The register function registers a user in Time Tracker.
   function register() {
-    global $i18n;
+    if ($this->err->yes()) return; // There are errors, do not proceed.
 
-    if ($this->err->yes())
-      return; // There are errors, do not proceed.
+    global $i18n;
 
     import('ttUserHelper');
     if (ttUserHelper::getUserByLogin($this->login)) {
@@ -112,6 +111,8 @@ function register() {
       $err->add($i18n->getKey('error.db'));
       return;
     }
+
+    $this->setCreatedBy($this->user_id);
   }
 
   // The createGroup function creates a group in Time Tracker as part
@@ -151,17 +152,34 @@ function createUser() {
     $affected = $mdb2->exec($sql);
     if (!is_a($affected, 'PEAR_Error')) {
       $user_id = $mdb2->lastInsertID('tt_users', 'id');
+      return $user_id;
+    }
+    return false;
+  }
 
-      // Update created_by field for the team with user id, now that we have it.
-      $sql = "update tt_teams set created_by = $user_id where id = $this->group_id and created_by is null";
-      $affected = $mdb2->exec($sql);
+  // The setCreatedBy sets created_by field for both group and user to passed in user_id.
+  function setCreatedBy($user_id) {
+    if ($this->err->yes()) return false; // There are errors, do not proceed.
+
+    global $i18n;
+    $mdb2 = getConnection();
 
-      // Update created_by field for user by setting to self.
-      $sql = "update tt_users set created_by = $user_id where id = $user_id and team_id = $this->group_id and created_by is null";
-      $affected = $mdb2->exec($sql);
+    // Update group.
+    $sql = "update tt_teams set created_by = $user_id where id = $this->group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->err->add($i18n->getKey('error.db'));
+      return false;
+    }
 
-      return $user_id;
+    // Update top manager.
+    $sql = "update tt_users set created_by = $user_id where id = $user_id and team_id = $this->group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->err->add($i18n->getKey('error.db'));
+      return false;
     }
-    return false;
+
+    return true;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0bbfc0348..f9d1e927d 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.17.65.4132 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4133 | 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/admin_team_add.php b/admin_team_add.php
index 08a193117..b270de172 100644
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -81,44 +81,33 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
 
 if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-  if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-  if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
-  if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
-    if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
-  }
-  if (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  /*
+   * Note: creating a group by admin is pretty much the same as self-registration,
+   * except that created_by gields for group and user must be set to admin account.
+   * Therefore, we'll reuse ttRegistrator instance to create a group here
+   * and override created_by fields using ttRegistrator::setCreatedBy() function.
+   */
 
-  if ($err->no()) {
-    if (!ttUserHelper::getUserByLogin($cl_manager_login)) {
-      // Create a new team.
-      if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
-      $team_id = ttTeamHelper::insert(array('name'=>$cl_team_name,'currency'=>CURRENCY_DEFAULT,'lang'=>$cl_lang));
-      if ($team_id) {
-        if (!ttRoleHelper::createPredefinedRoles($team_id, $cl_lang))
-          $err->add($i18n->getKey('error.db'));
+  // Create fields array for ttRegistrator instance.
+  if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
+  $fields = array(
+    'user_name' => $cl_manager_name,
+    'login' => $cl_manager_login,
+    'password1' => $cl_password1,
+    'password2' => $cl_password2,
+    'email' => $cl_manager_email,
+    'group_name' => $cl_team_name,
+    'currency' => CURRENCY_DEFAULT,
+    'lang' => $cl_lang);
 
-        $role_id = ttRoleHelper::getTopManagerRoleID();
-
-        // Team created, now create a team manager.
-        $user_id = ttUserHelper::insert(array(
-          'team_id' => $team_id,
-          'role_id' => $role_id,
-          'name' => $cl_manager_name,
-          'login' => $cl_manager_login,
-          'password' => $cl_password1,
-          'email' => $cl_manager_email));
-      }
-      if ($team_id && $user_id) {
-        header('Location: admin_teams.php');
-      } else
-        $err->add($i18n->getKey('error.db'));
-    } else
-      $err->add($i18n->getKey('error.user_exists'));
+  // Create an instance of ttRegistrator class.
+  import('ttRegistrator');
+  $registrator = new ttRegistrator($fields, $err);
+  $registrator->register();
+  $registrator->setCreatedBy($user->id); // Override created_by to admin account.
+  if ($err->no()) {
+    header('Location: admin_teams.php');
+    exit();
   }
 } // isPost
 

From bcff87ad905e60d848029cf5643c8c02191ca346 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 18:23:59 +0000
Subject: [PATCH 0013/1848] Removed unused function.

---
 WEB-INF/lib/ttAdmin.class.php | 24 ------------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index d6b9696a1..9e29eeebf 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -263,28 +263,4 @@ function updateTeam($team_id, $fields) {
 
     return true;
   }
-
-  // setCreatedByAdmin sets created_by field for both group and its top manager to admin account.
-  function setCreatedByAdmin($team_id, $user_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    // Update created_by for group.
-    $sql = "update tt_teams set created_by = $user->id where id = $team_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) {
-      $this->err->add($i18n->getKey('error.db'));
-      return false;
-    }
-
-    // Update created_by for top manager.
-    $sql = "update tt_users set created_by = $user->id where id = $user_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) {
-      $this->err->add($i18n->getKey('error.db'));
-      return false;
-    }
-
-    return true;
-  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f9d1e927d..9427fe9d8 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.17.65.4133 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4134 | 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>

From e80e19c6b609af8e06403a337a5cd46200ab4fc6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 19:52:28 +0000
Subject: [PATCH 0014/1848] Switched from timestamp to created column in a
 query.

---
 WEB-INF/lib/ttTeamHelper.class.php | 8 ++++----
 WEB-INF/templates/footer.tpl       | 2 +-
 dbinstall.php                      | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6dede8b23..27f31bb32 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -693,12 +693,12 @@ static function getTeams() {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql =  "select id, name, lang, timestamp from tt_teams where status = 1 order by id desc";
+    $sql =  "select id, name, created, lang from tt_teams where status = 1 order by id desc";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-      	$val['date'] = substr($val['timestamp'], 0, 10); // Strip the time.
+        $val['date'] = substr($val['created'], 0, 10); // Strip the time.
         $result[] = $val;
       }
       return $result;
@@ -914,9 +914,9 @@ static function getInactiveTeams() {
     $inactive_teams = array();
     $mdb2 = getConnection();
 
-    // Get all team ids for teams created or modified more than 6 months ago.
+    // Get all team ids for teams created or modified more than 8 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));
-    $ts = date('Y-m-d', strtotime('-6 month'));
+    $ts = date('Y-m-d', strtotime('-8 month'));
     $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
     $res = $mdb2->query($sql);
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9427fe9d8..27a3ad38c 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.17.65.4134 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4135 | 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/dbinstall.php b/dbinstall.php
index 7fb35e831..9f6972c93 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -851,6 +851,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_teams` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
     setChange("ALTER TABLE `tt_teams` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'");
+    setChange("update `tt_teams` t inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set t.created = t.timestamp where t.created is null");
   }
 
   if ($_POST["cleanup"]) {

From 6753e281196a94e8a50d9c98d5195093e61fcefb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 20:27:44 +0000
Subject: [PATCH 0015/1848] Introduced ttGroupHelper class as part of
 refactoring.

---
 WEB-INF/lib/ttGroupHelper.class.php | 51 +++++++++++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php  | 18 ----------
 WEB-INF/templates/footer.tpl        |  2 +-
 admin_teams.php                     |  5 ++-
 login.php                           |  4 +--
 mobile/login.php                    |  4 +--
 6 files changed, 58 insertions(+), 26 deletions(-)
 create mode 100644 WEB-INF/lib/ttGroupHelper.class.php

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
new file mode 100644
index 000000000..9fcb8443e
--- /dev/null
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -0,0 +1,51 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// Class ttGroupHelper - contains helper functions that operate with groups.
+// This is a planned replacement for ttTeamHelper as we move forward with subgroups.
+class ttGroupHelper {
+
+  // The getTopGroups function returns an array of all active top groups on the server.
+  static function getTopGroups() {
+    $result = array();
+    $mdb2 = getConnection();
+
+    // TODO: when we have subgroups, improve the query to return only top groups.
+    $sql =  "select id, name, created, lang from tt_teams where status = 1 order by id desc";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $val['date'] = substr($val['created'], 0, 10); // Strip the time.
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+}
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 27f31bb32..1c9e30fd1 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -688,24 +688,6 @@ static function getMonthlyQuotas($team_id) {
     return false;
   }
 
-  // The getTeams function returns an array of all active teams on the server.
-  static function getTeams() {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql =  "select id, name, created, lang from tt_teams where status = 1 order by id desc";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $val['date'] = substr($val['created'], 0, 10); // Strip the time.
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // The markDeleted function marks the team and everything in it as deleted.
   static function markDeleted($team_id) {
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 27a3ad38c..1ddc76d92 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.17.65.4135 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4136 | 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/admin_teams.php b/admin_teams.php
index 9c3d2092c..55df54fc5 100644
--- a/admin_teams.php
+++ b/admin_teams.php
@@ -27,8 +27,7 @@
 // +----------------------------------------------------------------------+
 	
 require_once('initialize.php');
-import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access check.
 if (!ttAccessAllowed('administer_site')) {
@@ -36,7 +35,7 @@
   exit();
 }
 
-$smarty->assign('teams', ttTeamHelper::getTeams());
+$smarty->assign('teams', ttGroupHelper::getTopGroups());
 $smarty->assign('title', $i18n->getKey('title.teams'));
 $smarty->assign('content_page_name', 'admin_teams.tpl');
 $smarty->display('index.tpl');
diff --git a/login.php b/login.php
index d398794c4..538147b02 100644
--- a/login.php
+++ b/login.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUser');
 
 $cl_login = $request->getParameter('login');
@@ -75,7 +75,7 @@
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams())
+if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
   $err->add($i18n->getKey('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
diff --git a/mobile/login.php b/mobile/login.php
index 538a0b544..384cf8c7f 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUser');
 
 if ($request->isPost()) {
@@ -80,7 +80,7 @@
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams())
+if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
   $err->add($i18n->getKey('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.

From e616d14ff2173bd13155592c0bdba23636376ffe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Mar 2018 23:49:20 +0000
Subject: [PATCH 0016/1848] Moving away from using the timestamp field.

---
 WEB-INF/lib/ttAdmin.class.php      | 15 ++++++++++-----
 WEB-INF/lib/ttTeamHelper.class.php |  8 ++++----
 WEB-INF/templates/footer.tpl       |  2 +-
 admin_options.php                  | 20 ++++++++++++++++++++
 admin_team_edit.php                |  2 +-
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 9e29eeebf..87fe00bca 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -183,8 +183,8 @@ function markGroupDeleted($group_id) {
     return true;
   }
 
-  // validateTeamInfo validates team information entered by user.
-  function validateTeamInfo($fields) {
+  // validateGroupInfo validates group information entered by user.
+  function validateGroupInfo($fields) {
     global $i18n;
     global $auth;
 
@@ -233,9 +233,9 @@ function validateTeamInfo($fields) {
     return $result;
   }
 
-  // updateTeam validates user input and updates the team with new information.
-  function updateTeam($team_id, $fields) {
-    if (!$this->validateTeamInfo($fields)) return false; // Can't continue as user input is invalid.
+  // updateGroup validates user input and updates the group with new information.
+  function updateGroup($team_id, $fields) {
+    if (!$this->validateGroupInfo($fields)) return false; // Can't continue as user input is invalid.
 
     global $user;
     $mdb2 = getConnection();
@@ -263,4 +263,9 @@ function updateTeam($team_id, $fields) {
 
     return true;
   }
+
+  // updateSelf validates user input and updates admin account with new information.
+  function updateSelf($fields) {
+    return false; // Not yet implemeneted.
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 1c9e30fd1..9f3e0a902 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -898,8 +898,8 @@ static function getInactiveTeams() {
 
     // Get all team ids for teams created or modified more than 8 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));
-    $ts = date('Y-m-d', strtotime('-8 month'));
-    $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
+    $ts = $mdb2->quote(date('Y-m-d', strtotime('-8 month')));
+    $sql =  "select id from tt_teams where created < $ts and (modified is null or modified < $ts) order by id";
     $res = $mdb2->query($sql);
 
     $count = 0;
@@ -935,7 +935,7 @@ static function isTeamActive($team_id) {
 
     $count = 0;
     $ts = date('Y-m-d', strtotime('-2 years'));
-    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";
+    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$ts'";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow()) {
@@ -950,7 +950,7 @@ static function isTeamActive($team_id) {
       // We will consider a team inactive if it has 5 or less time entries made more than 1 year ago.
       $count_last_year = 0;
       $ts = date('Y-m-d', strtotime('-1 year'));
-      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";
+      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$ts'";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         if ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1ddc76d92..0427ace0d 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.17.65.4136 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4137 | 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/admin_options.php b/admin_options.php
index 6f8125589..e728c830f 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -61,6 +61,26 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
 
 if ($request->isPost()) {
+/*
+ * This is work in progress... refactoring to replace the block below.
+
+  // Create fields array for ttAdmin instance.
+  $fields = array(
+    'name' => $cl_name,
+    'login' => $cl_login,
+    'password1' => $cl_password1,
+    'password2' => $cl_password2,
+    'email' => $cl_email);
+
+    import('ttAdmin');
+    $admin = new ttAdmin($err);
+    $result = $admin->updateSelf($fields);
+    if ($result) {
+      header('Location: admin_teams.php');
+      exit();
+    }
+ */
+
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
   if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
diff --git a/admin_team_edit.php b/admin_team_edit.php
index 428845855..63f8fe7ad 100644
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -88,7 +88,7 @@
 
     import('ttAdmin');
     $admin = new ttAdmin($err);
-    $result = $admin->updateTeam($team_id, $fields);
+    $result = $admin->updateGroup($team_id, $fields);
     if ($result) {
       header('Location: admin_teams.php');
       exit();

From c360da4bcfd113a87bc156e0f009e968d8a8bf07 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 00:59:41 +0000
Subject: [PATCH 0017/1848] Update for tt_users created field.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0427ace0d..3fa67d5ad 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.17.65.4137 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.65.4138 | 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/dbinstall.php b/dbinstall.php
index 9f6972c93..b04a1f69e 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -852,6 +852,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_teams` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'");
     setChange("update `tt_teams` t inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set t.created = t.timestamp where t.created is null");
+    setChange("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set u.created = u.timestamp where u.created is null");
   }
 
   if ($_POST["cleanup"]) {

From 7243c8da5a23936555f2a7adc1abf6f297a4e746 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 01:17:18 +0000
Subject: [PATCH 0018/1848] Dropping timestamp columns from tt_teams and
 tt_users.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 +---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3fa67d5ad..4dc0027ed 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.17.65.4138 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.66.4139 | 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/dbinstall.php b/dbinstall.php
index b04a1f69e..9c2d041b6 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11765"]) {
+  if ($_POST["convert11744to11766"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -853,6 +853,9 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'");
     setChange("update `tt_teams` t inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set t.created = t.timestamp where t.created is null");
     setChange("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set u.created = u.timestamp where u.created is null");
+    setChange("ALTER TABLE `tt_teams` drop `timestamp`");
+    setChange("ALTER TABLE `tt_users` drop `timestamp`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.66', modified = now() where param_name = 'version_db' and param_value = '1.17.65'");
   }
 
   if ($_POST["cleanup"]) {
@@ -898,7 +901,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.65)</b>
+    <td width="80%"><b>Create database structure (v1.17.66)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -938,8 +941,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.65)</td>
-    <td><input type="submit" name="convert11744to11765" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.66)</td>
+    <td><input type="submit" name="convert11744to11766" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index cc4ffb0df..48ec08331 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -14,7 +14,6 @@
 #
 CREATE TABLE `tt_teams` (
   `id` int(11) NOT NULL auto_increment,                      # team id
-  `timestamp` timestamp default CURRENT_TIMESTAMP,           # Modification timestamp. TODO: redo all timestamps to survive beyond 2038.
   `name` varchar(80) default NULL,                           # team name
   `currency` varchar(7) default NULL,                        # team currency symbol
   `decimal_mark` char(1) NOT NULL default '.',               # separator in decimals
@@ -80,7 +79,6 @@ INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top man
 #
 CREATE TABLE `tt_users` (
   `id` int(11) NOT NULL auto_increment,            # user id
-  `timestamp` timestamp default CURRENT_TIMESTAMP, # modification timestamp
   `login` varchar(50) COLLATE utf8_bin NOT NULL,   # user login
   `password` varchar(50) default NULL,             # password hash
   `name` varchar(100) default NULL,                # user name
@@ -452,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.65', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.66', now()); # TODO: change when structure changes.

From 7ca15b5853146dd809f2ad3f5b2e1d9dab4f8dd4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 11:56:01 +0000
Subject: [PATCH 0019/1848] Refactored admin_options.php to use ttAdmin
 instance.

---
 WEB-INF/lib/ttAdmin.class.php       | 82 +++++++++++++++++++++++++----
 WEB-INF/lib/ttRegistrator.class.php | 15 +++---
 WEB-INF/templates/footer.tpl        |  2 +-
 admin_options.php                   | 45 +++-------------
 4 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 87fe00bca..6008dcab3 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -31,8 +31,8 @@
 // ttAdmin class is used to perform admin tasks.
 class ttAdmin {
 
-  var $err = null;        // Error object, passed to us as reference.
-                          // We use it to communicate errors to caller.
+  var $err = null; // Error object, passed to us as reference.
+                   // We use it to communicate errors to caller.
 
   // Constructor.
   function __construct(&$err = null) {
@@ -65,22 +65,19 @@ function markUserDeleted($user_id) {
     // Mark user binds as deleted.
     $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark favorite reports as deleted.
     $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark user as deleted.
     global $user;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
     $sql = "update tt_users set status = NULL $modified_part where id = $user_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    if (is_a($affected, 'PEAR_Error')) return false;
 
     return true;
   }
@@ -104,6 +101,7 @@ function markTasksDeleted($group_id) {
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
+
     return true;
   }
 
@@ -264,8 +262,74 @@ function updateGroup($team_id, $fields) {
     return true;
   }
 
+  // validateUserInfo validates account information entered by user.
+  function validateUserInfo($fields) {
+    global $i18n;
+    global $user;
+    global $auth;
+
+    $result = true;
+
+    if (!ttValidString($fields['name'])) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+      $result = false;
+    }
+    if (!ttValidString($fields['login'])) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+      $result = false;
+    }
+    // If we change login, it must be unique.
+    if ($fields['login'] != $user->login) {
+      if (ttUserHelper::getUserByLogin($fields['login'])) {
+        $this->err->add($i18n->getKey('error.user_exists'));
+        $result = false;
+      }
+    }
+    if (!$auth->isPasswordExternal() && ($fields['password1'] || $fields['password2'])) {
+      if (!ttValidString($fields['password1'])) {
+        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+        $result = false;
+      }
+      if (!ttValidString($fields['password2'])) {
+        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+        $result = false;
+      }
+      if ($fields['password1'] !== $fields['password2']) {
+        $this->err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+        $result = false;
+      }
+    }
+    if (!ttValidEmail($fields['email'], true)) {
+      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+      $result = false;
+    }
+
+    return $result;
+  }
+
   // updateSelf validates user input and updates admin account with new information.
   function updateSelf($fields) {
-    return false; // Not yet implemeneted.
+    if (!$this->validateUserInfo($fields)) return false; // Can't continue as user input is invalid.
+
+    global $user;
+    global $i18n;
+    $mdb2 = getConnection();
+
+    // Update self.
+    $user_id = $user->id;
+    $login_part = 'login = '.$mdb2->quote($fields['login']);
+    if ($fields['password1'])
+      $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
+    $name_part = ', name = '.$mdb2->quote($fields['name']);
+    $email_part = ', email = '.$mdb2->quote($fields['email']);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.'where id = '.$user_id;
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->err->add($i18n->getKey('error.db'));
+      return false;
+    }
+
+    return true;
   }
 }
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 3ac6166d3..71f49e690 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -81,7 +81,7 @@ function validate() {
 
   // The register function registers a user in Time Tracker.
   function register() {
-    if ($this->err->yes()) return; // There are errors, do not proceed.
+    if ($this->err->yes()) return false; // There are errors, do not proceed.
 
     global $i18n;
 
@@ -89,30 +89,33 @@ function register() {
     if (ttUserHelper::getUserByLogin($this->login)) {
       // User login already exists.
       $this->err->add($i18n->getKey('error.user_exists'));
-      return;
+      return false;
     }
 
     // Create a new group.
     $this->group_id = $this->createGroup();
     if (!$this->group_id) {
       $this->err->add($i18n->getKey('error.db'));
-      return;
+      return false;
     }
 
     import('ttRoleHelper');
     if (!ttRoleHelper::createPredefinedRoles($this->group_id, $this->lang)) {
       $err->add($i18n->getKey('error.db'));
-      return;
+      return false;
     }
     $this->role_id = ttRoleHelper::getTopManagerRoleID();
     $this->user_id = $this->createUser();
 
     if (!$this->user_id) {
       $err->add($i18n->getKey('error.db'));
-      return;
+      return false;
     }
 
-    $this->setCreatedBy($this->user_id);
+    if (!$this->setCreatedBy($this->user_id))
+      return false;
+
+    return true;
   }
 
   // The createGroup function creates a group in Time Tracker as part
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4dc0027ed..efe88efdd 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.17.66.4139 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.66.4140 | 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/admin_options.php b/admin_options.php
index e728c830f..14cb3f54c 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -61,9 +61,6 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
 
 if ($request->isPost()) {
-/*
- * This is work in progress... refactoring to replace the block below.
-
   // Create fields array for ttAdmin instance.
   $fields = array(
     'name' => $cl_name,
@@ -72,42 +69,12 @@
     'password2' => $cl_password2,
     'email' => $cl_email);
 
-    import('ttAdmin');
-    $admin = new ttAdmin($err);
-    $result = $admin->updateSelf($fields);
-    if ($result) {
-      header('Location: admin_teams.php');
-      exit();
-    }
- */
-
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
-  // New login must be unique.
-  if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
-    $err->add($i18n->getKey('error.user_exists'));
-  if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
-    if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
-  }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  // Finished validating user input.
-
-  if ($err->no()) {
-    if (ttUserHelper::update($user->id, array(
-      'name' => $cl_name,
-      'login' => $cl_login,
-      'password' => $cl_password1,
-      'email' => $cl_email,
-      'status' => ACTIVE))) {
-      header('Location: admin_teams.php');
-      exit();
-    } else {
-      $err->add($i18n->getKey('error.db'));
-    }
+  import('ttAdmin');
+  $admin = new ttAdmin($err);
+  $result = $admin->updateSelf($fields);
+  if ($result) {
+    header('Location: admin_teams.php');
+    exit();
   }
 } // isPost
 

From da435f04300629fd13e7c2c90c3bbd3a8dc349aa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 14:25:28 +0000
Subject: [PATCH 0020/1848] Fixed a problem with deleting teams by supplying a
 required parameter.

---
 WEB-INF/lib/ttAdmin.class.php | 2 +-
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 6008dcab3..d4b72e2e9 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -111,7 +111,7 @@ function markGroupDeleted($group_id) {
     // Keep the logic simple by returning false on first error.
 
     // Obtain subgroups and call self recursively on them.
-    $subgroups = $this->getSubgroups();
+    $subgroups = $this->getSubgroups($group_id);
     foreach($subgroups as $subgroup) {
       if (!$this->markGroupDeleted($subgroup['id']))
         return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index efe88efdd..881616e0d 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.17.66.4140 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.67.4141 | 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>

From 75b65e92b21d45e2b09fb12daef169fb214a7acd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 15:03:09 +0000
Subject: [PATCH 0021/1848] Refactoring. Replacing getKey() with get().

---
 WEB-INF/lib/I18n.class.php               | 15 +++++++----
 WEB-INF/lib/form/Calendar.class.php      |  2 +-
 WEB-INF/lib/form/CheckboxGroup.class.php |  4 +--
 WEB-INF/lib/form/DateField.class.php     |  6 ++---
 WEB-INF/lib/ttAdmin.class.php            | 32 ++++++++++++------------
 WEB-INF/lib/ttImportHelper.class.php     |  6 ++---
 WEB-INF/lib/ttInvoiceHelper.class.php    | 30 +++++++++++-----------
 WEB-INF/lib/ttRegistrator.class.php      | 28 ++++++++++-----------
 WEB-INF/templates/footer.tpl             |  2 +-
 9 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 7155edb0c..ed7497d70 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -35,23 +35,28 @@ class I18n {
   var $holidays;
   var $keys = array(); // These are our localized strings.
 
-  // The getKey obtains localized keyword value.
-  function getKey($kword) {
+  // get - obtains a localized value from $keys array.
+  function get($key) {
     $value = '';
-    $pos = strpos($kword, '.'); // Keywords can have separating dots such as in form.login.about.
+    $pos = strpos($key, '.'); // Keywords can have separating dots such as in form.login.about.
     if (!($pos === false)) {
-      $words = explode('.', $kword);
+      $words = explode('.', $key);
       $str = '';
       foreach ($words as $word) {
         $str .= "['".$word."']";
       }
       eval("\$value = \$this->keys".$str.";");
     } else {
-      $value = $this->keys[$kword];
+      $value = $this->keys[$key];
     }
     return $value;
   }
 
+  // getKey is a legacy function that we are replacing with get.
+  function getKey($kword) {
+    return $this->get($kword);
+  }
+
   // TODO: refactoring ongoing down from here...
     function getWeekDayName($id) {
       $id = (int) $id;
diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 555b6e149..4c835f62e 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -207,7 +207,7 @@ function toString($date="") {
         $str .= "</TR>\n";
       }
 
-      $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->getKey('label.today')."</a></td></tr>\n";
+      $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
       $str .= "</table>\n";
 
       $str .= "<input type=\"hidden\" name=\"$this->controlName\" value=\"$indate\">\n";
diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php
index 810c96311..9488b5cce 100644
--- a/WEB-INF/lib/form/CheckboxGroup.class.php
+++ b/WEB-INF/lib/form/CheckboxGroup.class.php
@@ -60,8 +60,8 @@ function getGroupIn() { return $this->mGroupIn; }
 	
 	function localize() {
           global $i18n;
-          $this->lSelAll = $i18n->getKey('label.select_all');
-          $this->lSelNone = $i18n->getKey('label.select_none');
+          $this->lSelAll = $i18n->get('label.select_all');
+          $this->lSelNone = $i18n->get('label.select_none');
 	}
 		
 	function getHtml() {
diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index f8eef8cb8..9016dff0c 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -52,9 +52,9 @@ function localize()  {
 
     $this->mMonthNames = $i18n->monthNames;
     $this->mWeekDayShortNames = $i18n->weekdayShortNames;
-    $this->lToday = $i18n->getKey('label.today');
-    $this->lCalendarButtons['today'] = $i18n->getKey('label.today');
-    $this->lCalendarButtons['close'] = $i18n->getKey('button.close');
+    $this->lToday = $i18n->get('label.today');
+    $this->lCalendarButtons['today'] = $i18n->get('label.today');
+    $this->lCalendarButtons['close'] = $i18n->get('button.close');
 
     $this->mDateFormat = $user->date_format;
     $this->mWeekStartDay = $user->week_start;
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index d4b72e2e9..fbcabd476 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -189,42 +189,42 @@ function validateGroupInfo($fields) {
     $result = true;
 
     if (!ttValidString($fields['group_name'], true)) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
       $result = false;
     }
     if (!ttValidString($fields['user_name'])) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
       $result = false;
     }
     if (!ttValidString($fields['new_login'])) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
       $result = false;
     }
 
     // If we change login, it must be unique.
     if ($fields['new_login'] != $fields['old_login']) {
       if (ttUserHelper::getUserByLogin($fields['new_login'])) {
-        $this->err->add($i18n->getKey('error.user_exists'));
+        $this->err->add($i18n->get('error.user_exists'));
         $result = false;
       }
     }
 
     if (!$auth->isPasswordExternal() && ($fields['password1'] || $fields['password2'])) {
       if (!ttValidString($fields['password1'])) {
-        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+        $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
         $result = false;
       }
       if (!ttValidString($fields['password2'])) {
-        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+        $this->err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
         $result = false;
       }
       if ($fields['password1'] !== $fields['password2']) {
-        $this->err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+        $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
         $result = false;
       }
     }
     if (!ttValidEmail($fields['email'], true)) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
       $result = false;
     }
 
@@ -271,36 +271,36 @@ function validateUserInfo($fields) {
     $result = true;
 
     if (!ttValidString($fields['name'])) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
       $result = false;
     }
     if (!ttValidString($fields['login'])) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.login'));
       $result = false;
     }
     // If we change login, it must be unique.
     if ($fields['login'] != $user->login) {
       if (ttUserHelper::getUserByLogin($fields['login'])) {
-        $this->err->add($i18n->getKey('error.user_exists'));
+        $this->err->add($i18n->get('error.user_exists'));
         $result = false;
       }
     }
     if (!$auth->isPasswordExternal() && ($fields['password1'] || $fields['password2'])) {
       if (!ttValidString($fields['password1'])) {
-        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+        $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
         $result = false;
       }
       if (!ttValidString($fields['password2'])) {
-        $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+        $this->err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
         $result = false;
       }
       if ($fields['password1'] !== $fields['password2']) {
-        $this->err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+        $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
         $result = false;
       }
     }
     if (!ttValidEmail($fields['email'], true)) {
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
       $result = false;
     }
 
@@ -326,7 +326,7 @@ function updateSelf($fields) {
     $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.'where id = '.$user_id;
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
-      $this->err->add($i18n->getKey('error.db'));
+      $this->err->add($i18n->get('error.db'));
       return false;
     }
 
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 55fd15407..ca717caef 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -371,13 +371,13 @@ function importXml() {
     // If the file is compressed - uncompress it.
     if ($compressed) {
       if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->getKey('error.sys'));
+        $this->errors->add($i18n->get('error.sys'));
         return;
       }
       unlink($_FILES['xmlfile']['tmp_name']);
     } else {
       if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->getKey('error.upload'));
+        $this->errors->add($i18n->get('error.upload'));
         return;
       }
     }
@@ -397,7 +397,7 @@ function importXml() {
           xml_get_current_line_number($parser)));
       }
       if (!$this->canImport) {
-        $this->errors->add($i18n->getKey('error.user_exists'));
+        $this->errors->add($i18n->get('error.user_exists'));
         break;
       }
     }
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index fd701fe51..d58bc1161 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -429,16 +429,16 @@ static function prepareInvoiceBody($invoice_id, $comment)
     $body .= '<body>';
 
     // Output title.
-    $body .= '<p style="'.$style_title.'">'.$i18n->getKey('title.invoice').' '.htmlspecialchars($invoice['name']).'</p>';
+    $body .= '<p style="'.$style_title.'">'.$i18n->get('title.invoice').' '.htmlspecialchars($invoice['name']).'</p>';
 
     // Output comment.
     if($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
 
     // Output invoice info.
     $body .= '<table>';
-    $body .= '<tr><td><b>'.$i18n->getKey('label.date').':</b> '.$invoice['date'].'</td></tr>';
-    $body .= '<tr><td><b>'.$i18n->getKey('label.client').':</b> '.htmlspecialchars($client['name']).'</td></tr>';
-    $body .= '<tr><td><b>'.$i18n->getKey('label.client_address').':</b> '.htmlspecialchars($client['address']).'</td></tr>';
+    $body .= '<tr><td><b>'.$i18n->get('label.date').':</b> '.$invoice['date'].'</td></tr>';
+    $body .= '<tr><td><b>'.$i18n->get('label.client').':</b> '.htmlspecialchars($client['name']).'</td></tr>';
+    $body .= '<tr><td><b>'.$i18n->get('label.client_address').':</b> '.htmlspecialchars($client['address']).'</td></tr>';
     $body .= '</table>';
 
     $body .= '<p></p>';
@@ -446,15 +446,15 @@ static function prepareInvoiceBody($invoice_id, $comment)
     // Output invoice items.
     $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
     $body .= '<tr>';
-    $body .= '<td style="'.$style_tableHeader.'">'.$i18n->getKey('label.date').'</td>';
-    $body .= '<td style="'.$style_tableHeader.'">'.$i18n->getKey('form.invoice.person').'</td>';
+    $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.date').'</td>';
+    $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('form.invoice.person').'</td>';
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-      $body .= '<td style="'.$style_tableHeader.'">'.$i18n->getKey('label.project').'</td>';
+      $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.project').'</td>';
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-      $body .= '<td style="'.$style_tableHeader.'">'.$i18n->getKey('label.task').'</td>';
-    $body .= '<td style="'.$style_tableHeader.'">'.$i18n->getKey('label.note').'</td>';
-    $body .= '<td style="'.$style_tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
-    $body .= '<td style="'.$style_tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+      $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.task').'</td>';
+    $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.note').'</td>';
+    $body .= '<td style="'.$style_tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+    $body .= '<td style="'.$style_tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
     $body .= '</tr>';
     foreach ($invoice_items as $item) {
       $body .= '<tr>';
@@ -477,15 +477,15 @@ static function prepareInvoiceBody($invoice_id, $comment)
       $colspan += 2;
     $body .= '<tr><td>&nbsp;</td></tr>';
     if ($tax) {
-      $body .= '<tr><td colspan="'.$colspan.'" align="right"><b>'.$i18n->getKey('label.subtotal').':</b></td><td nowrap align="right">'.$subtotal.'</td></tr>';
-      $body .= '<tr><td colspan="'.$colspan.'" align="right"><b>'.$i18n->getKey('label.tax').':</b></td><td nowrap align="right">'.$tax.'</td></tr>';
+      $body .= '<tr><td colspan="'.$colspan.'" align="right"><b>'.$i18n->get('label.subtotal').':</b></td><td nowrap align="right">'.$subtotal.'</td></tr>';
+      $body .= '<tr><td colspan="'.$colspan.'" align="right"><b>'.$i18n->get('label.tax').':</b></td><td nowrap align="right">'.$tax.'</td></tr>';
     }
-    $body .= '<tr><td colspan="'.$colspan.'" align="right"><b>'.$i18n->getKey('label.total').':</b></td><td nowrap align="right">'.$total.'</td></tr>';
+    $body .= '<tr><td colspan="'.$colspan.'" align="right"><b>'.$i18n->get('label.total').':</b></td><td nowrap align="right">'.$total.'</td></tr>';
     $body .= '</table>';
 
     // Output footer.
     if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
-      $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+      $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
 
     // Finish creating email body.
     $body .= '</body></html>';
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 71f49e690..7082e6bc2 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -62,21 +62,21 @@ function validate() {
     global $i18n;
 
     if (!ttValidString($this->group_name, true))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
     if (!ttValidString($this->currency, true))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.currency'));
     if (!ttValidString($this->user_name))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
     if (!ttValidString($this->login))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
     if (!ttValidString($this->password1))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
     if (!ttValidString($this->password2))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($this->password1 !== $this->password2)
-      $this->err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));    
+      $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
     if (!ttValidEmail($this->email, true))
-      $this->err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
   }
 
   // The register function registers a user in Time Tracker.
@@ -88,27 +88,27 @@ function register() {
     import('ttUserHelper');
     if (ttUserHelper::getUserByLogin($this->login)) {
       // User login already exists.
-      $this->err->add($i18n->getKey('error.user_exists'));
+      $this->err->add($i18n->get('error.user_exists'));
       return false;
     }
 
     // Create a new group.
     $this->group_id = $this->createGroup();
     if (!$this->group_id) {
-      $this->err->add($i18n->getKey('error.db'));
+      $this->err->add($i18n->get('error.db'));
       return false;
     }
 
     import('ttRoleHelper');
     if (!ttRoleHelper::createPredefinedRoles($this->group_id, $this->lang)) {
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
       return false;
     }
     $this->role_id = ttRoleHelper::getTopManagerRoleID();
     $this->user_id = $this->createUser();
 
     if (!$this->user_id) {
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
       return false;
     }
 
@@ -171,7 +171,7 @@ function setCreatedBy($user_id) {
     $sql = "update tt_teams set created_by = $user_id where id = $this->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
-      $this->err->add($i18n->getKey('error.db'));
+      $this->err->add($i18n->get('error.db'));
       return false;
     }
 
@@ -179,7 +179,7 @@ function setCreatedBy($user_id) {
     $sql = "update tt_users set created_by = $user_id where id = $user_id and team_id = $this->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
-      $this->err->add($i18n->getKey('error.db'));
+      $this->err->add($i18n->get('error.db'));
       return false;
     }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 881616e0d..d92f371af 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.17.67.4141 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.67.4142 | 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>

From 5f64df1308fd641565631e6e38d282432f5e6250 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 15:27:29 +0000
Subject: [PATCH 0022/1848] Refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php   | 92 +++++++++++++-------------
 WEB-INF/lib/ttRoleHelper.class.php     | 40 +++++------
 WEB-INF/lib/ttTeamHelper.class.php     |  2 +-
 WEB-INF/lib/ttWeekViewHelper.class.php | 22 +++---
 WEB-INF/templates/footer.tpl           |  2 +-
 access_denied.php                      |  4 +-
 admin_options.php                      |  4 +-
 admin_team_add.php                     |  4 +-
 admin_team_delete.php                  |  8 +--
 admin_team_edit.php                    |  6 +-
 admin_teams.php                        |  2 +-
 cf_custom_field_add.php                | 12 ++--
 12 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1f797ace4..b894b037d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1188,7 +1188,7 @@ static function prepareReportBody($bean, $comment)
     $body .= '<body>';
 
     // Output title.
-    $body .= '<p style="'.$style_title.'">'.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
+    $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
 
     // Output comment.
     if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
@@ -1201,16 +1201,16 @@ static function prepareReportBody($bean, $comment)
         $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
       else {
         $key = 'label.'.$group_by;
-        $group_by_header = $i18n->getKey($key);
+        $group_by_header = $i18n->get($key);
       }
 
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       if ($bean->getAttribute('chduration'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
       if ($bean->getAttribute('chcost'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
@@ -1231,7 +1231,7 @@ static function prepareReportBody($bean, $comment)
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
       if ($bean->getAttribute('chduration')) {
         $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
         if ($totals['time'] <> '0:00') $body .= $totals['time'];
@@ -1251,33 +1251,33 @@ static function prepareReportBody($bean, $comment)
       // Print table header.
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
-      $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
+      $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
       if ($canViewReports || $isClient)
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
       if ($bean->getAttribute('chclient'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
       if ($bean->getAttribute('chproject'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.project').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
       if ($bean->getAttribute('chtask'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.task').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
       if ($bean->getAttribute('chcf_1'))
         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
       if ($bean->getAttribute('chstart'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.start').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
       if ($bean->getAttribute('chfinish'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.finish').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
       if ($bean->getAttribute('chduration'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
       if ($bean->getAttribute('chnote'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.note').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($bean->getAttribute('chcost'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       if ($bean->getAttribute('chpaid'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.paid').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
       if ($bean->getAttribute('chip'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.ip').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
       if ($bean->getAttribute('chinvoice'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
       $body .= '</tr>';
 
       // Initialize variables to print subtotals.
@@ -1301,7 +1301,7 @@ static function prepareReportBody($bean, $comment)
             $cur_grouped_by = $record['grouped_by'];
             if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
               $body .= '<tr style="'.$rowSubtotal.'">';
-              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
               if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
               if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
@@ -1353,7 +1353,7 @@ static function prepareReportBody($bean, $comment)
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
           if ($bean->getAttribute('chpaid')) {
             $body .= '<td style="'.$cellRightAligned.'">';
-            $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+            $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
             $body .= '</td>';
           }
           if ($bean->getAttribute('chip')) {
@@ -1374,7 +1374,7 @@ static function prepareReportBody($bean, $comment)
       // Print a terminating subtotal.
       if ($print_subtotals) {
         $body .= '<tr style="'.$rowSubtotal.'">';
-        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
         if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
         if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
@@ -1399,7 +1399,7 @@ static function prepareReportBody($bean, $comment)
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
       if ($canViewReports || $isClient) $body .= '<td></td>';
       if ($bean->getAttribute('chclient')) $body .= '<td></td>';
       if ($bean->getAttribute('chproject')) $body .= '<td></td>';
@@ -1424,7 +1424,7 @@ static function prepareReportBody($bean, $comment)
 
     // Output footer.
     if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
-      $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+      $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
 
     // Finish creating email body.
     $body .= '</body></html>';
@@ -1484,7 +1484,7 @@ static function prepareFavReportBody($report)
     $body .= '<body>';
 
     // Output title.
-    $body .= '<p style="'.$style_title.'">'.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
+    $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
 
     // Output comment.
     // if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>'; // No comment for fav. reports.
@@ -1497,16 +1497,16 @@ static function prepareFavReportBody($report)
         $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
       else {
         $key = 'label.'.$group_by;
-        $group_by_header = $i18n->getKey($key);
+        $group_by_header = $i18n->get($key);
       }
 
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       if ($report['show_duration'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
       if ($report['show_cost'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
@@ -1527,7 +1527,7 @@ static function prepareFavReportBody($report)
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
       if ($report['show_duration']) {
         $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
         if ($totals['time'] <> '0:00') $body .= $totals['time'];
@@ -1547,33 +1547,33 @@ static function prepareFavReportBody($report)
       // Print table header.
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
-      $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
+      $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
       if ($canViewReports || $isClient)
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
       if ($report['show_client'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
       if ($report['show_project'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.project').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
       if ($report['show_task'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.task').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
       if ($report['show_custom_field_1'])
         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
       if ($report['show_start'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.start').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
       if ($report['show_end'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.finish').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
       if ($report['show_duration'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
       if ($report['show_note'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.note').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($report['show_cost'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       if ($report['show_paid'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.paid').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
       if ($report['show_ip'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.ip').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
       if ($report['show_invoice'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
       $body .= '</tr>';
 
       // Initialize variables to print subtotals.
@@ -1597,7 +1597,7 @@ static function prepareFavReportBody($report)
             $cur_grouped_by = $record['grouped_by'];
             if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
               $body .= '<tr style="'.$rowSubtotal.'">';
-              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
               if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
               if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
@@ -1649,7 +1649,7 @@ static function prepareFavReportBody($report)
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
           if ($report['show_paid']) {
             $body .= '<td style="'.$cellRightAligned.'">';
-            $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+            $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
             $body .= '</td>';
           }
           if ($report['show_ip']) {
@@ -1670,7 +1670,7 @@ static function prepareFavReportBody($report)
       // Print a terminating subtotal.
       if ($print_subtotals) {
         $body .= '<tr style="'.$rowSubtotal.'">';
-        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
         if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
         if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
@@ -1695,7 +1695,7 @@ static function prepareFavReportBody($report)
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
       if ($canViewReports || $isClient) $body .= '<td></td>';
       if ($report['show_client']) $body .= '<td></td>';
       if ($report['show_project']) $body .= '<td></td>';
@@ -1720,7 +1720,7 @@ static function prepareFavReportBody($report)
 
     // Output footer.
     if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
-      $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+      $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
 
     // Finish creating email body.
     $body .= '</body></html>';
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 18396704a..7629df422 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -190,32 +190,32 @@ static function createPredefinedRoles($team_id, $lang)
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
-    $name = $mdb2->quote($i18n->getKey('role.user.label'));
-    $description = $mdb2->quote($i18n->getKey('role.user.description'));
+    $name = $mdb2->quote($i18n->get('role.user.label'));
+    $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $name = $mdb2->quote($i18n->getKey('role.client.label'));
-    $description = $mdb2->quote($i18n->getKey('role.client.description'));
+    $name = $mdb2->quote($i18n->get('role.client.label'));
+    $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $name = $mdb2->quote($i18n->getKey('role.comanager.label'));
-    $description = $mdb2->quote($i18n->getKey('role.comanager.description'));
+    $name = $mdb2->quote($i18n->get('role.comanager.label'));
+    $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $name = $mdb2->quote($i18n->getKey('role.manager.label'));
-    $description = $mdb2->quote($i18n->getKey('role.manager.description'));
+    $name = $mdb2->quote($i18n->get('role.manager.label'));
+    $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
@@ -223,8 +223,8 @@ static function createPredefinedRoles($team_id, $lang)
       return false;
 
     // Inactive roles.
-    $name = $mdb2->quote($i18n->getKey('role.supervisor.label'));
-    $description = $mdb2->quote($i18n->getKey('role.supervisor.description'));
+    $name = $mdb2->quote($i18n->get('role.supervisor.label'));
+    $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
@@ -248,32 +248,32 @@ static function createDefaultRoles()
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
-    $name = $mdb2->quote($i18n->getKey('role.user.label'));
-    $description = $mdb2->quote($i18n->getKey('role.user.description'));
+    $name = $mdb2->quote($i18n->get('role.user.label'));
+    $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $name = $mdb2->quote($i18n->getKey('role.client.label'));
-    $description = $mdb2->quote($i18n->getKey('role.client.description'));
+    $name = $mdb2->quote($i18n->get('role.client.label'));
+    $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $name = $mdb2->quote($i18n->getKey('role.comanager.label'));
-    $description = $mdb2->quote($i18n->getKey('role.comanager.description'));
+    $name = $mdb2->quote($i18n->get('role.comanager.label'));
+    $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $name = $mdb2->quote($i18n->getKey('role.manager.label'));
-    $description = $mdb2->quote($i18n->getKey('role.manager.description'));
+    $name = $mdb2->quote($i18n->get('role.manager.label'));
+    $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
@@ -281,8 +281,8 @@ static function createDefaultRoles()
       return false;
 
     // Inactive roles.
-    $name = $mdb2->quote($i18n->getKey('role.supervisor.label'));
-    $description = $mdb2->quote($i18n->getKey('role.supervisor.description'));
+    $name = $mdb2->quote($i18n->get('role.supervisor.label'));
+    $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
     $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 9f3e0a902..0d10a84f0 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -85,7 +85,7 @@ static function getActiveUsers($options = null) {
     while ($val = $res->fetchRow()) {
       // Localize top manager role name, as it is not localized in db.
       if ($val['rank'] == 512)
-        $val['role_name'] = $i18n->getKey('role.top_manager.label');
+        $val['role_name'] = $i18n->get('role.top_manager.label');
       $user_list[] = $val;
     }
 
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index af0960ae6..f4ee719f8 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -156,7 +156,7 @@ static function getDataForWeekView($records, $dayHeaders) {
     $dataArray = array();
 
     // Construct the first row for a brand new entry.
-    $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('form.week.new_entry').':'); // Insert row.
+    $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
     // Insert empty cells with proper control ids.
     for ($i = 0; $i < 7; $i++) {
       $control_id = '0_'. $dayHeaders[$i];
@@ -164,7 +164,7 @@ static function getDataForWeekView($records, $dayHeaders) {
     }
     if ($user->isPluginEnabled('wvns')) {
       // Construct the second row for daily comments for a brand new entry.
-      $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('label.notes').':'); // Insert row.
+      $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
       // Insert empty cells with proper control ids.
       for ($i = 0; $i < 7; $i++) {
         $control_id = '1_'. $dayHeaders[$i];
@@ -197,7 +197,7 @@ static function getDataForWeekView($records, $dayHeaders) {
         }
         // Insert row for comments.
         if ($user->isPluginEnabled('wvns')) {
-          $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->getKey('label.notes').':');
+          $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
           $pos++;
           // Insert empty cells with proper control ids.
           for ($i = 0; $i < 7; $i++) {
@@ -254,14 +254,14 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
     }
 
     // Construct the first row for a brand new entry.
-    $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('form.week.new_entry').':'); // Insert row.
+    $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
     // Insert empty cells with proper control ids.
     for ($i = 0; $i < 7; $i++) {
       $control_id = '0_'. $dayHeaders[$i];
       $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
     }
     // Construct the second row for daily comments for a brand new entry.
-    $dataArray[] = array('row_id' => null,'label' => $i18n->getKey('label.notes').':'); // Insert row.
+    $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
     // Insert empty cells with proper control ids.
     for ($i = 0; $i < 7; $i++) {
       $control_id = '1_'. $dayHeaders[$i];
@@ -284,7 +284,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
           $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
         }
         // Insert row for comments.
-        $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->getKey('label.notes').':');
+        $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
         $pos++;
         // Insert empty cells with proper control ids.
         for ($i = 0; $i < 7; $i++) {
@@ -325,7 +325,7 @@ static function getDayTotals($dataArray, $dayHeaders) {
 
     // Insert label.
     global $i18n;
-    $dayTotals['label'] = $i18n->getKey('label.day_total').':';
+    $dayTotals['label'] = $i18n->get('label.day_total').':';
 
     foreach ($dataArray as $row) {
       foreach($dayHeaders as $dayHeader) {
@@ -485,7 +485,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     if (!$user->future_entries && $fields['browser_today']) {
       $objBrowserToday = new DateAndTime(DB_DATEFORMAT, $fields['browser_today']);
       if ($objEntryDate->after($objBrowserToday)) {
-        $err->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->get('error.future_date'));
         return false;
       }
     }
@@ -550,7 +550,7 @@ static function canModify($tt_log_id, $new_duration, $err) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
-        $err->add($i18n->getKey('error.db')); // This is not expected.
+        $err->add($i18n->get('error.db')); // This is not expected.
         return false;
       }
       $val = $res->fetchRow();
@@ -571,7 +571,7 @@ static function canModify($tt_log_id, $new_duration, $err) {
     $newEndMinutes = $startMinutes + $newMinutes;
     if ($newEndMinutes > 1440) {
       // Invalid duration, as new duration puts the record beyond current day.
-      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
       return false;
     }
 
@@ -582,7 +582,7 @@ static function canModify($tt_log_id, $new_duration, $err) {
     $start = ttTimeHelper::toAbsDuration($startMinutes);
     $finish = ttTimeHelper::toAbsDuration($newEndMinutes);
     if (ttTimeHelper::overlaps($user_id, $date, $start, $finish, $tt_log_id)) {
-      $err->add($i18n->getKey('error.overlap'));
+      $err->add($i18n->get('error.overlap'));
       return false;
     }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d92f371af..74eb876fb 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.17.67.4142 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.67.4143 | 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/access_denied.php b/access_denied.php
index 65a5ed72d..72a28d192 100644
--- a/access_denied.php
+++ b/access_denied.php
@@ -28,9 +28,9 @@
 
 require_once('initialize.php');
 
-$err->add($i18n->getKey('error.access_denied'));
+$err->add($i18n->get('error.access_denied'));
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
-$smarty->assign('title', $i18n->getKey('label.error'));
+$smarty->assign('title', $i18n->get('label.error'));
 $smarty->assign('content_page_name', 'access_denied.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_options.php b/admin_options.php
index 14cb3f54c..cc9fd65c4 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -58,7 +58,7 @@
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   // Create fields array for ttAdmin instance.
@@ -80,6 +80,6 @@
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.options'));
+$smarty->assign('title', $i18n->get('title.options'));
 $smarty->assign('content_page_name', 'admin_options.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_team_add.php b/admin_team_add.php
index b270de172..6d5bc84f9 100644
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -78,7 +78,7 @@
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_email','value'=>$cl_manager_email));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   /*
@@ -115,5 +115,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');
 $smarty->assign('content_page_name', 'admin_team_add.tpl');
-$smarty->assign('title', $i18n->getKey('title.create_team'));
+$smarty->assign('title', $i18n->get('title.create_team'));
 $smarty->display('index.tpl');
diff --git a/admin_team_delete.php b/admin_team_delete.php
index b2b462ce6..a9ce1ee1b 100644
--- a/admin_team_delete.php
+++ b/admin_team_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('teamForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$team_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -54,7 +54,7 @@
       header('Location: admin_teams.php');
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {
@@ -65,6 +65,6 @@
 
 $smarty->assign('team_to_delete', $team_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_team'));
+$smarty->assign('title', $i18n->get('title.delete_team'));
 $smarty->assign('content_page_name', 'admin_team_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_team_edit.php b/admin_team_edit.php
index 63f8fe7ad..a737050a8 100644
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -69,8 +69,8 @@
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_email','value'=>$cl_manager_email));
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$team_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_save')) {
@@ -104,6 +104,6 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.edit_team'));
+$smarty->assign('title', $i18n->get('title.edit_team'));
 $smarty->assign('content_page_name', 'admin_team_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_teams.php b/admin_teams.php
index 55df54fc5..7d2b3dfa4 100644
--- a/admin_teams.php
+++ b/admin_teams.php
@@ -36,6 +36,6 @@
 }
 
 $smarty->assign('teams', ttGroupHelper::getTopGroups());
-$smarty->assign('title', $i18n->getKey('title.teams'));
+$smarty->assign('title', $i18n->get('title.teams'));
 $smarty->assign('content_page_name', 'admin_teams.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index f8ea01e01..30c82a5a4 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -47,15 +47,15 @@
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
 $form->addInput(array('type'=>'combobox','name'=>'type',
-  'data'=>array(CustomFields::TYPE_TEXT=>$i18n->getKey('label.type_text'),
-                CustomFields::TYPE_DROPDOWN=>$i18n->getKey('label.type_dropdown'))
+  'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
+                CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))
 ));
 $form->addInput(array('type'=>'checkbox','name'=>'required'));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));	
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_field_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_field_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
     $res = CustomFields::insertField($cl_field_name, $cl_field_type, $cl_required);
@@ -63,12 +63,12 @@
       header('Location: cf_custom_fields.php');
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_add_custom_field'));
+$smarty->assign('title', $i18n->get('title.cf_add_custom_field'));
 $smarty->assign('content_page_name', 'cf_custom_field_add.tpl');
 $smarty->display('index.tpl');

From a0dd058ab6007cfc6a72713215a7f4abb96f1b45 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 15:37:45 +0000
Subject: [PATCH 0023/1848] Some more refactoring.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 cf_custom_field_delete.php    | 10 +++++-----
 cf_custom_field_edit.php      | 14 +++++++-------
 cf_custom_fields.php          |  4 ++--
 cf_dropdown_option_add.php    | 10 +++++-----
 cf_dropdown_option_delete.php | 10 +++++-----
 cf_dropdown_option_edit.php   | 10 +++++-----
 cf_dropdown_options.php       |  4 ++--
 charts.php                    | 18 +++++++++---------
 client_add.php                | 14 +++++++-------
 client_delete.php             | 12 ++++++------
 client_edit.php               | 22 +++++++++++-----------
 12 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 74eb876fb..7cf8ef60d 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.17.67.4143 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.67.4144 | 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/cf_custom_field_delete.php b/cf_custom_field_delete.php
index caf858a29..f4de48098 100644
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -48,7 +48,7 @@
       header('Location: cf_custom_fields.php');
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
   if ($request->getParameter('btn_cancel')) {
     // Cancel button pressed.
@@ -58,18 +58,18 @@
 } else {
   $field = CustomFields::getField($id);	
   if (false === $field)
-    $err->add($i18n->getKey('error.db'));
+    $err->add($i18n->get('error.db'));
 
   if ($err->no()) {
     $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
-    $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-    $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+    $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+    $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
   }
 }
 
 $smarty->assign('field', $field['label']);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_delete_custom_field'));
+$smarty->assign('title', $i18n->get('title.cf_delete_custom_field'));
 $smarty->assign('content_page_name', 'cf_custom_field_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 295e40790..32ee3878d 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -39,7 +39,7 @@
 $cl_id = $request->getParameter('id');
 $field = CustomFields::getField($cl_id);
 if (false === $field)
-  $err->add($i18n->getKey('error.db'));
+  $err->add($i18n->get('error.db'));
 
 $form = new Form('fieldForm');
 if ($err->no()) {
@@ -47,9 +47,9 @@
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
   $form->addInput(array('type'=>'checkbox','name'=>'required','value'=>$field['required']));
   $form->addInput(array('type'=>'combobox','name'=>'type','value'=>$field['type'],
-    'data'=>array(CustomFields::TYPE_TEXT=>$i18n->getKey('label.type_text'),
-                  CustomFields::TYPE_DROPDOWN=>$i18n->getKey('label.type_dropdown'))));
-  $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+    'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
+                  CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))));
+  $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 }
 
 if ($request->isPost()) {
@@ -60,7 +60,7 @@
     $cl_required = 0;
 
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
     $res = CustomFields::updateField($cl_id, $cl_name, $cl_type, $cl_required);
@@ -68,12 +68,12 @@
       header('Location: cf_custom_fields.php');
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_edit_custom_field'));
+$smarty->assign('title', $i18n->get('title.cf_edit_custom_field'));
 $smarty->assign('content_page_name', 'cf_custom_field_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 539271c54..2b34fb76b 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -45,7 +45,7 @@
     exit();
   }
 } else {
-  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
   $fields = CustomFields::getFields();
   // At this time only one custom field is supported. Disable the Add button if we already have one or more custom fields.
@@ -55,6 +55,6 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('custom_fields', $fields);
-$smarty->assign('title', $i18n->getKey('title.cf_custom_fields'));
+$smarty->assign('title', $i18n->get('title.cf_custom_fields'));
 $smarty->assign('content_page_name', 'cf_custom_fields.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index f87003d15..b9500833d 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -39,20 +39,20 @@
 $cl_field_id = $request->getParameter('field_id');
 $field = CustomFields::getField($cl_field_id);
 if (false === $field)
-  $err->add($i18n->getKey('error.db'));
+  $err->add($i18n->get('error.db'));
 
 $form = new Form('optionAddForm');
 if ($err->no()) {
   $form->addInput(array('type'=>'hidden','name'=>'field_id','value'=>$cl_field_id));
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
-  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 }
 
 if ($request->isPost()) {
   $cl_option_name = trim($request->getParameter('name'));
 
   // Validate user input.
-  if (!ttValidString($cl_option_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_option_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
     $res = CustomFields::insertOption($cl_field_id, $cl_option_name);
@@ -60,12 +60,12 @@
       header("Location: cf_dropdown_options.php?field_id=$cl_field_id");
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionAddForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_add_dropdown_option'));
+$smarty->assign('title', $i18n->get('title.cf_add_dropdown_option'));
 $smarty->assign('content_page_name', 'cf_dropdown_option_add.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index f4e442075..0a1f25ba0 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -50,7 +50,7 @@
       header("Location: cf_dropdown_options.php?field_id=$field_id");
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
   if ($request->getParameter('btn_cancel')) {
     // Cancel button pressed.
@@ -60,18 +60,18 @@
 } else {
   $option = CustomFields::getOptionName($cl_id);
   if (false === $option)
-    $err->add($i18n->getKey('error.db'));
+    $err->add($i18n->get('error.db'));
 
   if ($err->no()) {
     $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-    $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-    $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+    $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+    $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
   }
 }
 
 $smarty->assign('option', $option);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_delete_dropdown_option'));
+$smarty->assign('title', $i18n->get('title.cf_delete_dropdown_option'));
 $smarty->assign('content_page_name', 'cf_dropdown_option_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 1013a54a4..5fc333d01 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -39,20 +39,20 @@
 $cl_id = $request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
 if (false === $cl_name)
-  $err->add($i18n->getKey('error.db'));
+  $err->add($i18n->get('error.db'));
 
 $form = new Form('optionEditForm');
 if ($err->no()) {
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-  $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 }
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
 
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
     $res = CustomFields::updateOption($cl_id, $cl_name);
@@ -62,12 +62,12 @@
       header("Location: cf_dropdown_options.php?field_id=$field_id");
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionEditForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_edit_dropdown_option'));
+$smarty->assign('title', $i18n->get('title.cf_edit_dropdown_option'));
 $smarty->assign('content_page_name', 'cf_dropdown_option_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/cf_dropdown_options.php b/cf_dropdown_options.php
index 3ee5294eb..02f59f56b 100644
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -39,13 +39,13 @@
 $field_id = $request->getParameter('field_id');
 $options = CustomFields::getOptions($field_id);
 if (false === $options)
-  $err->add($i18n->getKey('error.db'));
+  $err->add($i18n->get('error.db'));
 
 $form = new Form('dropdownOptionsForm');
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('field_id', $field_id);
 $smarty->assign('options', $options);
-$smarty->assign('title', $i18n->getKey('title.cf_dropdown_options'));
+$smarty->assign('title', $i18n->get('title.cf_dropdown_options'));
 $smarty->assign('content_page_name', 'cf_dropdown_options.tpl');
 $smarty->display('index.tpl');
diff --git a/charts.php b/charts.php
index 9df70d55e..69997d87f 100644
--- a/charts.php
+++ b/charts.php
@@ -139,11 +139,11 @@
 
 // Chart interval options.
 $intervals = array();
-$intervals[INTERVAL_THIS_DAY] = $i18n->getKey('dropdown.selected_day');
-$intervals[INTERVAL_THIS_WEEK] = $i18n->getKey('dropdown.selected_week');
-$intervals[INTERVAL_THIS_MONTH] = $i18n->getKey('dropdown.selected_month');
-$intervals[INTERVAL_THIS_YEAR] = $i18n->getKey('dropdown.selected_year');
-$intervals[INTERVAL_ALL_TIME] = $i18n->getKey('dropdown.all_time');
+$intervals[INTERVAL_THIS_DAY] = $i18n->get('dropdown.selected_day');
+$intervals[INTERVAL_THIS_WEEK] = $i18n->get('dropdown.selected_week');
+$intervals[INTERVAL_THIS_MONTH] = $i18n->get('dropdown.selected_month');
+$intervals[INTERVAL_THIS_YEAR] = $i18n->get('dropdown.selected_year');
+$intervals[INTERVAL_ALL_TIME] = $i18n->get('dropdown.all_time');
 
 // Chart interval dropdown.
 $chart_form->addInput(array('type' => 'combobox',
@@ -158,11 +158,11 @@
 if ($chart_selector) {
   $types = array();
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-    $types[CHART_PROJECTS] = $i18n->getKey('dropdown.projects');
+    $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
   if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-    $types[CHART_TASKS] = $i18n->getKey('dropdown.tasks');
+    $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
   if ($user->isPluginEnabled('cl'))
-    $types[CHART_CLIENTS] = $i18n->getKey('dropdown.clients');
+    $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
 
   // Add chart type dropdown.
   $chart_form->addInput(array('type' => 'combobox',
@@ -223,6 +223,6 @@
 $smarty->assign('img_file_name', $img_ref);
 $smarty->assign('chart_selector', $chart_selector);
 $smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.charts'));
+$smarty->assign('title', $i18n->get('title.charts'));
 $smarty->assign('content_page_name', 'charts.tpl');
 $smarty->display('index.tpl');
diff --git a/client_add.php b/client_add.php
index 8dbb0d86a..c0526e51b 100644
--- a/client_add.php
+++ b/client_add.php
@@ -56,13 +56,13 @@
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
 
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
@@ -76,14 +76,14 @@
         header('Location: clients.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
      } else
-       $err->add($i18n->getKey('error.client_exists'));
+       $err->add($i18n->get('error.client_exists'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_client'));
+$smarty->assign('title', $i18n->get('title.add_client'));
 $smarty->assign('content_page_name', 'client_add.tpl');
 $smarty->display('index.tpl');
diff --git a/client_delete.php b/client_delete.php
index eae300500..b162ea844 100644
--- a/client_delete.php
+++ b/client_delete.php
@@ -44,9 +44,9 @@
 $form = new Form('clientDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
 $form->addInput(array('type'=>'combobox','name'=>'delete_client_entries',
-  'data'=>array('0'=>$i18n->getKey('dropdown.do_not_delete'),'1'=>$i18n->getKey('dropdown.delete'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+  'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if(ttClientHelper::getClient($id)) {
@@ -55,10 +55,10 @@
         header('Location: clients.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   } else
-    $err->add($i18n->getKey('error.db'));
+    $err->add($i18n->get('error.db'));
 
   if ($request->getParameter('btn_cancel')) {
     header('Location: clients.php');
@@ -68,6 +68,6 @@
 
 $smarty->assign('client_to_delete', $client_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_client'));
+$smarty->assign('title', $i18n->get('title.delete_client'));
 $smarty->assign('content_page_name', 'client_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/client_edit.php b/client_edit.php
index 3099e8889..05203237f 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -65,17 +65,17 @@
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
@@ -91,9 +91,9 @@
           header('Location: clients.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.client_exists'));
+        $err->add($i18n->get('error.client_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -108,14 +108,14 @@
           header('Location: clients.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.client_exists'));
+        $err->add($i18n->get('error.client_exists'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_client'));
+$smarty->assign('title', $i18n->get('title.edit_client'));
 $smarty->assign('content_page_name', 'client_edit.tpl');
 $smarty->display('index.tpl');

From a62e4bdd1bc89ea4f3cf29507399b5b8f229597a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 16:09:47 +0000
Subject: [PATCH 0024/1848] Some more refactoring.

---
 clients.php              |  2 +-
 expense_delete.php       | 12 ++++++------
 expense_edit.php         | 38 +++++++++++++++++++-------------------
 expenses.php             | 26 +++++++++++++-------------
 export.php               | 10 +++++-----
 import.php               |  6 +++---
 invoice_add.php          | 24 ++++++++++++------------
 invoice_delete.php       | 12 ++++++------
 invoice_send.php         | 20 ++++++++++----------
 invoice_view.php         |  6 +++---
 invoices.php             |  2 +-
 locking.php              |  8 ++++----
 login.php                | 14 +++++++-------
 mobile/access_denied.php |  4 ++--
 mobile/client_add.php    | 14 +++++++-------
 mobile/client_delete.php | 12 ++++++------
 mobile/client_edit.php   | 24 ++++++++++++------------
 mobile/clients.php       |  2 +-
 18 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/clients.php b/clients.php
index f02d4b951..89b5c4a37 100644
--- a/clients.php
+++ b/clients.php
@@ -38,6 +38,6 @@
 
 $smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->team_id, true));
 $smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->team_id, true));
-$smarty->assign('title', $i18n->getKey('title.clients'));
+$smarty->assign('title', $i18n->get('title.clients'));
 $smarty->assign('content_page_name', 'clients.tpl');
 $smarty->display('index.tpl');
diff --git a/expense_delete.php b/expense_delete.php
index d5b4e8d27..06c9690b0 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -41,7 +41,7 @@
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
-if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
+if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
@@ -49,7 +49,7 @@
     // Determine if it is okay to delete the record.
     $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
     if ($user->isDateLocked($item_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
       // Mark the record as deleted.
@@ -57,7 +57,7 @@
         header('Location: expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   }
   if ($request->getParameter('cancel_button')) { // Cancel button pressed.
@@ -68,11 +68,11 @@
 
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
 $smarty->assign('expense_item', $expense_item);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_expense'));
+$smarty->assign('title', $i18n->get('title.delete_expense'));
 $smarty->assign('content_page_name', 'expense_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/expense_edit.php b/expense_edit.php
index dbd14d96d..9ea7c6493 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -44,7 +44,7 @@
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
 // Prohibit editing invoiced items.
-if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
+if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
 
@@ -80,7 +80,7 @@
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -93,7 +93,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -119,7 +119,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
@@ -132,7 +132,7 @@
       'value'=>$cl_predefined_expense,
       'data'=>$predefined_expenses,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
 }
 $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
@@ -143,20 +143,20 @@
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-    $err->add($i18n->getKey('error.client'));
+    $err->add($i18n->get('error.client'));
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $err->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->get('error.project'));
   }
-  if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
-  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
 
   // This is a new date for the expense item.
   $new_date = new DateAndTime($user->date_format, $cl_date);
@@ -165,7 +165,7 @@
   if (!$user->future_entries) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $err->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->get('error.future_date'));
   }
 
   // Save record.
@@ -177,11 +177,11 @@
     // Now, step by step.
     // 1) Prohibit saving locked entries in any form.
     if ($user->isDateLocked($item_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // 2) Prohibit saving unlocked entries into locked range.
     if ($err->no() && $user->isDateLocked($new_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Now, an update.
     if ($err->no()) {
@@ -197,7 +197,7 @@
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.
     if ($user->isDateLocked($new_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Now, a new insert.
     if ($err->no()) {
@@ -206,7 +206,7 @@
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   }
 
@@ -221,6 +221,6 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_expense'));
+$smarty->assign('title', $i18n->get('title.edit_expense'));
 $smarty->assign('content_page_name', 'expense_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/expenses.php b/expenses.php
index ca681d413..bb7694816 100644
--- a/expenses.php
+++ b/expenses.php
@@ -84,7 +84,7 @@
       'value'=>$cl_client,
       'data'=>$active_clients,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -98,7 +98,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -124,7 +124,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
@@ -137,38 +137,38 @@
     'value'=>$cl_predefined_expense,
     'data'=>$predefined_expenses,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
 }
 $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
 $form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-      $err->add($i18n->getKey('error.client'));
+      $err->add($i18n->get('error.client'));
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
-    if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+    if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+    if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
     if (!$user->future_entries) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $err->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->get('error.future_date'));
     }
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.
     if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Insert record.
     if ($err->no()) {
@@ -177,7 +177,7 @@
         header('Location: expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   } elseif ($request->getParameter('onBehalfUser')) {
     if($user->canManageTeam()) {
@@ -201,6 +201,6 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->getKey('title.expenses'));
+$smarty->assign('title', $i18n->get('title.expenses'));
 $smarty->assign('content_page_name', 'expenses.tpl');
 $smarty->display('index.tpl');
diff --git a/export.php b/export.php
index 7ccce3308..4f1a571a1 100644
--- a/export.php
+++ b/export.php
@@ -37,13 +37,13 @@
 }
 
 $cl_compression = $request->getParameter('compression');
-$compressors = array('' => $i18n->getKey('form.export.compression_none'));
+$compressors = array('' => $i18n->get('form.export.compression_none'));
 if (function_exists('bzcompress'))
-  $compressors['bzip'] = $i18n->getKey('form.export.compression_bzip');
+  $compressors['bzip'] = $i18n->get('form.export.compression_bzip');
 
 $form = new Form('exportForm');
 $form->addInput(array('type'=>'combobox','name'=>'compression','value'=>$cl_compression,'data'=>$compressors));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.export')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.export')));
 
 if ($request->isPost()) {
 
@@ -74,10 +74,10 @@
     }
     exit;
   } else
-    $err->add($i18n->getKey('error.sys'));
+    $err->add($i18n->get('error.sys'));
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.export'));
+$smarty->assign('title', $i18n->get('title.export'));
 $smarty->assign('content_page_name', 'export.tpl');
 $smarty->display('index.tpl');
diff --git a/import.php b/import.php
index dd30ad3a8..f822cb793 100644
--- a/import.php
+++ b/import.php
@@ -39,16 +39,16 @@
 $form = new Form('importForm');
 $form->addInput(array('type'=>'upload','name'=>'xmlfile','value'=>'browse','maxsize'=>67108864)); // 64 MB file upload limit.
 // Note: for the above limit to work make sure to set upload_max_filesize and post_max_size in php.ini to at least 64M.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.import')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
 
   $import = new ttImportHelper($err);
   $import->importXml();
-  if ($err->no()) $msg->add($i18n->getKey('form.import.success'));
+  if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()) );
-$smarty->assign('title', $i18n->getKey('title.import'));
+$smarty->assign('title', $i18n->get('title.import'));
 $smarty->assign('content_page_name', 'import.tpl');
 $smarty->display('index.tpl');
diff --git a/invoice_add.php b/invoice_add.php
index 01b77615e..ed0a8c526 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -52,33 +52,33 @@
 // Dropdown for clients if the clients plugin is enabled.
 if ($user->isPluginEnabled('cl')) {
   $clients = ttTeamHelper::getActiveClients($user->team_id);
-  $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
   $projects = ttTeamHelper::getActiveProjects($user->team_id);
-  $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+  $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'number','style'=>'width: 250px;','value'=>$cl_number));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start','value'=>$cl_start));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'finish','value'=>$cl_finish));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_number)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.invoice.number'));
-  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!$cl_client) $err->add($i18n->getKey('error.client'));
-  if (!ttValidDate($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
-  if (!ttValidDate($cl_finish)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
+  if (!ttValidString($cl_number)) $err->add($i18n->get('error.field'), $i18n->get('form.invoice.number'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
+  if (!$cl_client) $err->add($i18n->get('error.client'));
+  if (!ttValidDate($cl_start)) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
+  if (!ttValidDate($cl_finish)) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
 
   $fields = array('date'=>$cl_date,'name'=>$cl_number,'client_id'=>$cl_client,'project_id'=>$cl_project,'start_date'=>$cl_start,'end_date'=>$cl_finish);
   if ($err->no()) {
     if (ttInvoiceHelper::getInvoiceByName($cl_number))
-      $err->add($i18n->getKey('error.invoice_exists'));
+      $err->add($i18n->get('error.invoice_exists'));
 
     if (!ttInvoiceHelper::invoiceableItemsExist($fields))
-      $err->add($i18n->getKey('error.no_invoiceable_items'));
+      $err->add($i18n->get('error.no_invoiceable_items'));
   }
 
   if ($err->no()) {
@@ -87,13 +87,13 @@
       header('Location: invoices.php');
       exit();
     } else {
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceForm.number.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_invoice'));
+$smarty->assign('title', $i18n->get('title.add_invoice'));
 $smarty->assign('content_page_name', 'invoice_add.tpl');
 $smarty->display('index.tpl');
diff --git a/invoice_delete.php b/invoice_delete.php
index 6fd8270d2..29160ba55 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -44,10 +44,10 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
 $form->addInput(array('type'=>'combobox',
     'name'=>'delete_invoice_entries',
-    'data'=>array('0'=>$i18n->getKey('dropdown.do_not_delete'),'1'=>$i18n->getKey('dropdown.delete')),
+    'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete')),
 ));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete'),'onclick'=>'return confirm_deleting_entries();'));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>'return confirm_deleting_entries();'));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -56,9 +56,9 @@
         header('Location: invoices.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: invoices.php');
     exit();
@@ -68,6 +68,6 @@
 $smarty->assign('invoice_to_delete', $invoice_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_invoice'));
+$smarty->assign('title', $i18n->get('title.delete_invoice'));
 $smarty->assign('content_page_name', 'invoice_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/invoice_send.php b/invoice_send.php
index 48bc14f07..2c0894a35 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -43,7 +43,7 @@
 
 // Security check.
 if (!$cl_invoice_id || !$invoice)
-  die ($i18n->getKey('error.sys'));
+  die ($i18n->get('error.sys'));
 
 if ($request->isPost()) {
   $cl_receiver = trim($request->getParameter('receiver'));
@@ -53,7 +53,7 @@
 } else {
   $cl_receiver = $sc->getValue(SYSC_LAST_INVOICE_EMAIL);
   $cl_cc = $sc->getValue(SYSC_LAST_INVOICE_CC);
-  $cl_subject = $i18n->getKey('title.invoice').' '.$invoice['name'].', '.$user->team;
+  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->team;
 }
 
 $form = new Form('mailForm');
@@ -62,14 +62,14 @@
 $form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
 $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
 $form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;'));
-$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey('button.send')));
+$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('button.send')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
-  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
-  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
-  if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
+  if (!ttValidEmailList($cl_receiver)) $err->add($i18n->get('error.field'), $i18n->get('form.mail.to'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
+  if (!ttValidString($cl_subject)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   if ($err->no()) {
     // Save last invoice emails for future use.
@@ -90,9 +90,9 @@
       $mailer->setReceiverBCC($user->bcc_email);
     $mailer->setMailMode(MAIL_MODE);
     if ($mailer->send($cl_subject, $body))
-      $msg->add($i18n->getKey('form.mail.invoice_sent'));
+      $msg->add($i18n->get('form.mail.invoice_sent'));
     else
-      $err->add($i18n->getKey('error.mail_send'));
+      $err->add($i18n->get('error.mail_send'));
   }
 } // isPost
 
@@ -106,7 +106,7 @@
   }
 }
 
-$smarty->assign('title', $i18n->getKey('title.send_invoice'));
+$smarty->assign('title', $i18n->get('title.send_invoice'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
 $smarty->assign('content_page_name', 'mail.tpl');
diff --git a/invoice_view.php b/invoice_view.php
index 4a6027a5b..3715b80a2 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -90,12 +90,12 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 // invoiceForm only contains controls for "Mark paid" block below invoice table.
 if ($user->isPluginEnabled('ps')) {
-  $mark_paid_action_options = array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid'));
+  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
     'data'=>$mark_paid_action_options,
     'value'=>$cl_mark_paid_action_option));
-  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->getKey('button.submit')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
 }
 
 if ($request->isPost()) {
@@ -120,6 +120,6 @@
 $smarty->assign('client_address', $client['address']);
 $smarty->assign('invoice_items', $invoice_items);
 $smarty->assign('colspan', $colspan);
-$smarty->assign('title', $i18n->getKey('title.view_invoice'));
+$smarty->assign('title', $i18n->get('title.view_invoice'));
 $smarty->assign('content_page_name', 'invoice_view.tpl');
 $smarty->display('index.tpl');
diff --git a/invoices.php b/invoices.php
index 0617a44f2..a03579b08 100644
--- a/invoices.php
+++ b/invoices.php
@@ -39,6 +39,6 @@
 $invoices = ttTeamHelper::getActiveInvoices();
 
 $smarty->assign('invoices', $invoices);
-$smarty->assign('title', $i18n->getKey('title.invoices'));
+$smarty->assign('title', $i18n->get('title.invoices'));
 $smarty->assign('content_page_name', 'invoices.tpl');
 $smarty->display('index.tpl');
diff --git a/locking.php b/locking.php
index 1f9530c97..8a6f4304c 100644
--- a/locking.php
+++ b/locking.php
@@ -40,11 +40,11 @@
 
 $form = new Form('lockingForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'lock_spec','style'=>'width: 250px;','value'=>$cl_lock_spec));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidCronSpec($cl_lock_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.schedule'));
+  if (!ttValidCronSpec($cl_lock_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
 
   if ($err->no()) {
     if (ttTeamHelper::update($user->team_id, array(
@@ -53,12 +53,12 @@
       header('Location: profile_edit.php');
       exit();
     } else {
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.locking'));
+$smarty->assign('title', $i18n->get('title.locking'));
 $smarty->assign('content_page_name', 'locking.tpl');
 $smarty->display('index.tpl');
diff --git a/login.php b/login.php
index 538147b02..e246e0a51 100644
--- a/login.php
+++ b/login.php
@@ -39,12 +39,12 @@
 $form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'100','name'=>'login','style'=>'width: 220px;','value'=>$cl_login));
 $form->addInput(array('type'=>'password','size'=>'25','maxlength'=>'50','name'=>'password','style'=>'width: 220px;','value'=>$cl_password));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
-$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.login')));
+$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.login')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
-  if (!ttValidString($cl_password)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
 
   if ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
@@ -71,12 +71,12 @@
       }
       exit();
     } else
-      $err->add($i18n->getKey('error.auth'));
+      $err->add($i18n->get('error.auth'));
   }
 } // isPost
 
 if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
-  $err->add($i18n->getKey('error.no_teams'));
+  $err->add($i18n->get('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
@@ -84,7 +84,7 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
-$smarty->assign('title', $i18n->getKey('title.login'));
+$smarty->assign('title', $i18n->get('title.login'));
 $smarty->assign('content_page_name', 'login.tpl');
-$smarty->assign('about_text', $i18n->getKey('form.login.about'));
+$smarty->assign('about_text', $i18n->get('form.login.about'));
 $smarty->display('index.tpl');
diff --git a/mobile/access_denied.php b/mobile/access_denied.php
index b0bc00281..6e7174a26 100644
--- a/mobile/access_denied.php
+++ b/mobile/access_denied.php
@@ -28,9 +28,9 @@
 
 require_once('../initialize.php');
 
-$err->add($i18n->getKey('error.access_denied'));
+$err->add($i18n->get('error.access_denied'));
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
-$smarty->assign('title', $i18n->getKey('label.error'));
+$smarty->assign('title', $i18n->get('label.error'));
 $smarty->assign('content_page_name', 'mobile/access_denied.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/client_add.php b/mobile/client_add.php
index 71f51ca13..134819bb1 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -56,13 +56,13 @@
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
 
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
@@ -76,14 +76,14 @@
         header('Location: clients.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
      } else
-       $err->add($i18n->getKey('error.client_exists'));
+       $err->add($i18n->get('error.client_exists'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_client'));
+$smarty->assign('title', $i18n->get('title.add_client'));
 $smarty->assign('content_page_name', 'mobile/client_add.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/client_delete.php b/mobile/client_delete.php
index b57e581db..e23cd026b 100644
--- a/mobile/client_delete.php
+++ b/mobile/client_delete.php
@@ -44,9 +44,9 @@
 $form = new Form('clientDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
 $form->addInput(array('type'=>'combobox','name'=>'delete_client_entries',
-  'data'=>array('0'=>$i18n->getKey('dropdown.do_not_delete'),'1'=>$i18n->getKey('dropdown.delete'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+  'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if(ttClientHelper::getClient($id)) {
@@ -55,10 +55,10 @@
         header('Location: clients.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   } else 
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
 
   if ($request->getParameter('btn_cancel')) {
     header('Location: clients.php');
@@ -68,6 +68,6 @@
 
 $smarty->assign('client_to_delete', $client_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_client'));
+$smarty->assign('title', $i18n->get('title.delete_client'));
 $smarty->assign('content_page_name', 'mobile/client_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index fc2203697..e4bc9b22b 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -65,18 +65,18 @@
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','class'=>'mobile-textarea','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
@@ -92,9 +92,9 @@
           header('Location: clients.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.client_exists'));
+        $err->add($i18n->get('error.client_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -109,9 +109,9 @@
           header('Location: clients.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.client_exists'));
+        $err->add($i18n->get('error.client_exists'));
     }
     
     if ($request->getParameter('btn_delete')) {
@@ -122,6 +122,6 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_client'));
+$smarty->assign('title', $i18n->get('title.edit_client'));
 $smarty->assign('content_page_name', 'mobile/client_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/clients.php b/mobile/clients.php
index aa6e6ad30..d1a49f1e1 100644
--- a/mobile/clients.php
+++ b/mobile/clients.php
@@ -38,6 +38,6 @@
 
 $smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->team_id, true));
 $smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->team_id, true));
-$smarty->assign('title', $i18n->getKey('title.clients'));
+$smarty->assign('title', $i18n->get('title.clients'));
 $smarty->assign('content_page_name', 'mobile/clients.tpl');
 $smarty->display('mobile/index.tpl');

From fd0872d9e582113346fa1e93557f370286c5c9f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 17:01:42 +0000
Subject: [PATCH 0025/1848] Replaced getKey() with get() calls.

---
 WEB-INF/lib/I18n.class.php    |  5 ---
 WEB-INF/templates/footer.tpl  |  2 +-
 mobile/expense_delete.php     | 12 +++---
 mobile/expense_edit.php       | 38 +++++++++---------
 mobile/expenses.php           | 26 ++++++-------
 mobile/login.php              | 12 +++---
 mobile/project_add.php        | 12 +++---
 mobile/project_delete.php     | 10 ++---
 mobile/project_edit.php       | 22 +++++------
 mobile/projects.php           |  2 +-
 mobile/task_add.php           | 12 +++---
 mobile/task_delete.php        | 10 ++---
 mobile/task_edit.php          | 22 +++++------
 mobile/tasks.php              |  2 +-
 mobile/time.php               | 48 +++++++++++------------
 mobile/time_delete.php        | 12 +++---
 mobile/time_edit.php          | 58 ++++++++++++++--------------
 mobile/timer.php              | 36 +++++++++---------
 mobile/user_add.php           | 30 +++++++--------
 mobile/user_delete.php        |  8 ++--
 mobile/user_edit.php          | 34 ++++++++---------
 mobile/users.php              |  2 +-
 notification_add.php          | 20 +++++-----
 notification_delete.php       | 10 ++---
 notification_edit.php         | 20 +++++-----
 notifications.php             |  4 +-
 password_change.php           | 12 +++---
 password_reset.php            | 18 ++++-----
 predefined_expense_add.php    | 10 ++---
 predefined_expense_delete.php | 10 ++---
 predefined_expense_edit.php   | 10 ++---
 predefined_expenses.php       |  4 +-
 profile_edit.php              | 42 ++++++++++----------
 project_add.php               | 12 +++---
 project_delete.php            | 10 ++---
 project_edit.php              | 20 +++++-----
 projects.php                  |  2 +-
 quotas.php                    | 10 ++---
 register.php                  |  4 +-
 report.php                    | 18 ++++-----
 report_send.php               | 18 ++++-----
 reports.php                   | 72 +++++++++++++++++------------------
 role_add.php                  | 12 +++---
 role_delete.php               | 10 ++---
 role_edit.php                 | 22 +++++------
 roles.php                     |  2 +-
 swap_roles.php                |  6 +--
 table_test.php                |  4 +-
 task_add.php                  | 12 +++---
 task_delete.php               | 10 ++---
 task_edit.php                 | 20 +++++-----
 tasks.php                     |  2 +-
 time.php                      | 50 ++++++++++++------------
 time_delete.php               | 12 +++---
 time_edit.php                 | 68 ++++++++++++++++-----------------
 tofile.php                    | 34 ++++++++---------
 topdf.php                     | 52 ++++++++++++-------------
 user_add.php                  | 32 ++++++++--------
 user_delete.php               |  8 ++--
 user_edit.php                 | 34 ++++++++---------
 users.php                     |  2 +-
 week.php                      | 26 ++++++-------
 week_view.php                 |  6 +--
 63 files changed, 580 insertions(+), 585 deletions(-)

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index ed7497d70..0e3dd02a4 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -52,11 +52,6 @@ function get($key) {
     return $value;
   }
 
-  // getKey is a legacy function that we are replacing with get.
-  function getKey($kword) {
-    return $this->get($kword);
-  }
-
   // TODO: refactoring ongoing down from here...
     function getWeekDayName($id) {
       $id = (int) $id;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7cf8ef60d..21c302736 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.17.67.4144 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.67.4145 | 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/expense_delete.php b/mobile/expense_delete.php
index da902b4f0..48051b426 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -41,7 +41,7 @@
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
-if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
+if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
@@ -49,7 +49,7 @@
     // Determine if it is okay to delete the record.
     $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
     if ($user->isDateLocked($item_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
       // Mark the record as deleted.
@@ -57,7 +57,7 @@
         header('Location: expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   }
   if ($request->getParameter('cancel_button')) { // Cancel button pressed.
@@ -68,11 +68,11 @@
 
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
 $smarty->assign('expense_item', $expense_item);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_expense'));
+$smarty->assign('title', $i18n->get('title.delete_expense'));
 $smarty->assign('content_page_name', 'mobile/expense_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index fff249e77..7107e7851 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -44,7 +44,7 @@
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
 // Prohibit editing invoiced items.
-if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
+if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
 
@@ -77,7 +77,7 @@
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -90,7 +90,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -116,7 +116,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
@@ -129,7 +129,7 @@
       'value'=>$cl_predefined_expense,
       'data'=>$predefined_expenses,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name));
@@ -138,20 +138,20 @@
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-    $err->add($i18n->getKey('error.client'));
+    $err->add($i18n->get('error.client'));
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $err->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->get('error.project'));
   }
-  if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
-  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
 
   // This is a new date for the expense item.
   $new_date = new DateAndTime($user->date_format, $cl_date);
@@ -160,7 +160,7 @@
   if (!$user->future_entries) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $err->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->get('error.future_date'));
   }
 
   // Save record.
@@ -172,11 +172,11 @@
     // Now, step by step.
     // 1) Prohibit saving locked entries in any form.
     if ($user->isDateLocked($item_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // 2) Prohibit saving unlocked entries into locked range.
     if ($err->no() && $user->isDateLocked($new_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Now, an update.
     if ($err->no()) {
@@ -192,7 +192,7 @@
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.
     if ($user->isDateLocked($new_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Now, a new insert.
     if ($err->no()) {
@@ -201,7 +201,7 @@
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   }
 
@@ -216,6 +216,6 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_expense'));
+$smarty->assign('title', $i18n->get('title.edit_expense'));
 $smarty->assign('content_page_name', 'mobile/expense_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 40b3a342e..934c63a78 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -88,7 +88,7 @@
       'value'=>$cl_client,
       'data'=>$active_clients,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -102,7 +102,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -128,7 +128,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
@@ -141,38 +141,38 @@
     'value'=>$cl_predefined_expense,
     'data'=>$predefined_expenses,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
 $form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-      $err->add($i18n->getKey('error.client'));
+      $err->add($i18n->get('error.client'));
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
-    if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+    if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
+    if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
     if (!$user->future_entries) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $err->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->get('error.future_date'));
     }
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.
     if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Insert record.
     if ($err->no()) {
@@ -181,7 +181,7 @@
         header('Location: expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   } elseif ($request->getParameter('onBehalfUser')) {
     if($user->canManageTeam()) {
@@ -207,6 +207,6 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->getKey('title.expenses'));
+$smarty->assign('title', $i18n->get('title.expenses'));
 $smarty->assign('content_page_name', 'mobile/expenses.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/login.php b/mobile/login.php
index 384cf8c7f..4d1412d3c 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -42,12 +42,12 @@
 $form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'100','name'=>'login','style'=>'width: 220px;','value'=>$cl_login));
 $form->addInput(array('type'=>'password','size'=>'25','maxlength'=>'50','name'=>'password','style'=>'width: 220px;','value'=>$cl_password));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
-$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.login')));
+$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.login')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
-  if (!ttValidString($cl_password)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
 
   if ($err->no()) {
 
@@ -76,12 +76,12 @@
       }
       exit();
     } else
-      $err->add($i18n->getKey('error.auth'));
+      $err->add($i18n->get('error.auth'));
   }
 } // isPost
 
 if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
-  $err->add($i18n->getKey('error.no_teams'));
+  $err->add($i18n->get('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
@@ -89,6 +89,6 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
-$smarty->assign('title', $i18n->getKey('title.login'));
+$smarty->assign('title', $i18n->get('title.login'));
 $smarty->assign('content_page_name', 'mobile/login.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/project_add.php b/mobile/project_add.php
index f7dc3fbf8..bbaa8fa75 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -63,12 +63,12 @@
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
@@ -82,14 +82,14 @@
           header('Location: projects.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.project_exists'));
+      $err->add($i18n->get('error.project_exists'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_project'));
+$smarty->assign('title', $i18n->get('title.add_project'));
 $smarty->assign('content_page_name', 'mobile/project_add.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/project_delete.php b/mobile/project_delete.php
index 6e57f4d49..d2b0b32b8 100644
--- a/mobile/project_delete.php
+++ b/mobile/project_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('projectDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: projects.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: projects.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('project_to_delete', $project_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_project'));
+$smarty->assign('title', $i18n->get('title.delete_project'));
 $smarty->assign('content_page_name', 'mobile/project_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 4c84c7c5b..31ea65da4 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -75,18 +75,18 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
@@ -103,9 +103,9 @@
            header('Location: projects.php');
            exit();
         } else
-           $err->add($i18n->getKey('error.db'));
+           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.project_exists'));
+        $err->add($i18n->get('error.project_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -120,9 +120,9 @@
           header('Location: projects.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.project_exists'));
+        $err->add($i18n->get('error.project_exists'));
     }
     
     if ($request->getParameter('btn_delete')) {
@@ -134,6 +134,6 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.edit_project'));
+$smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'mobile/project_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/projects.php b/mobile/projects.php
index a6aa0448d..5dec7ee36 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -44,6 +44,6 @@
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
-$smarty->assign('title', $i18n->getKey('title.projects'));
+$smarty->assign('title', $i18n->get('title.projects'));
 $smarty->assign('content_page_name', 'mobile/projects.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/task_add.php b/mobile/task_add.php
index b413002b8..0c405b6fa 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -53,12 +53,12 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
@@ -71,14 +71,14 @@
           header('Location: tasks.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.task_exists'));
+      $err->add($i18n->get('error.task_exists'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_task'));
+$smarty->assign('title', $i18n->get('title.add_task'));
 $smarty->assign('content_page_name', 'mobile/task_add.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/task_delete.php b/mobile/task_delete.php
index 4b6b149df..df3c964a5 100644
--- a/mobile/task_delete.php
+++ b/mobile/task_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('taskDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: tasks.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: tasks.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('task_to_delete', $task_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_task'));
+$smarty->assign('title', $i18n->get('title.delete_task'));
 $smarty->assign('content_page_name', 'mobile/task_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index c4bc9d333..2ba2cc554 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -61,17 +61,17 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
@@ -87,9 +87,9 @@
           header('Location: tasks.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->get('error.task_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -103,9 +103,9 @@
           header('Location: tasks.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->get('error.task_exists'));
     }
     
     if ($request->getParameter('btn_delete')) {
@@ -116,6 +116,6 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_task'));
+$smarty->assign('title', $i18n->get('title.edit_task'));
 $smarty->assign('content_page_name', 'mobile/task_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/tasks.php b/mobile/tasks.php
index 1e8b40a7a..25575eb65 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -38,6 +38,6 @@
 
 $smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
 $smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
-$smarty->assign('title', $i18n->getKey('title.tasks'));
+$smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'mobile/tasks.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/time.php b/mobile/time.php
index fc1f68ff1..abde5e01d 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -97,7 +97,7 @@
       'value'=>$cl_client,
       'data'=>$active_clients,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -111,7 +111,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -138,7 +138,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -150,7 +150,7 @@
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
@@ -167,7 +167,7 @@
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
@@ -179,7 +179,7 @@
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -189,62 +189,62 @@
 
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-      $err->add($i18n->getKey('error.client'));
+      $err->add($i18n->get('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->get('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
-      if (!$cl_task) $err->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
-          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+          $err->add($i18n->get('error.field'), $i18n->get('label.start'));
         if ($cl_finish) {
           if (!ttTimeHelper::isValidTime($cl_finish))
-            $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+            $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
           if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+            $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
         if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
         if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {
       if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+        $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
-    if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+    if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
     if (!$user->future_entries) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $err->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->get('error.future_date'));
     }
 
     // Prohibit creating entries in locked range.
     if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {
       if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
-        $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+        $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->get('error.overlap'));
     }
 
     if ($err->no()) {
@@ -273,7 +273,7 @@
         header('Location: time.php');
         exit();
       }
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
 } // isPost
@@ -288,6 +288,6 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'mobile/time.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 63884d233..33ba61468 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -42,7 +42,7 @@
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
-if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
+if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
@@ -57,7 +57,7 @@
     $uncompleted = ($time_rec['duration'] == '0:00');
 
     if ($user->isDateLocked($item_date) && !$uncompleted)
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
 
@@ -68,7 +68,7 @@
         header('Location: time.php');
         exit();
       } else {
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
       }
     }
   }
@@ -80,10 +80,10 @@
 
 $form = new Form('timeRecordForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 $smarty->assign('time_rec', $time_rec);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_time_record'));
+$smarty->assign('title', $i18n->get('title.delete_time_record'));
 $smarty->assign('content_page_name', 'mobile/time_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 6ec41defb..683bab74f 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -53,7 +53,7 @@
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 
 // Prohibit editing invoiced records.
-if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
+if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
 
@@ -98,7 +98,7 @@
   if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
     $cl_finish = '';
     $cl_duration = '';
-    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->get('form.time_edit.uncompleted'));
   }
 }
 
@@ -115,7 +115,7 @@
       'value'=>$cl_client,
       'data'=>$active_clients,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -129,7 +129,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -156,7 +156,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -168,7 +168,7 @@
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 
 // Add other controls.
@@ -196,7 +196,7 @@
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty' => array('' => $i18n->getKey('dropdown.select'))));
+      'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }
 // Hidden control for record id.
@@ -204,49 +204,49 @@
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
 
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-    $err->add($i18n->getKey('error.client'));
+    $err->add($i18n->get('error.client'));
   if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $err->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->get('error.project'));
   }
   if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
-    if (!$cl_task) $err->add($i18n->getKey('error.task'));
+    if (!$cl_task) $err->add($i18n->get('error.task'));
   }
   if (!$cl_duration) {
     if ('0' == $cl_duration)
-      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     elseif ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+        $err->add($i18n->get('error.field'), $i18n->get('label.start'));
       if ($cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_finish))
-          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+          $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
         if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+          $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
       }
     } else {
       if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+        $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
+        $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
       }
       if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+        $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
     }
   } else {
     if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
   }
-  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
+  if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
   // Finished validating user input.
 
   // This is a new date for the time record.
@@ -256,7 +256,7 @@
   if (!$user->future_entries) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $err->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->get('error.future_date'));
   }
 
   // Save record.
@@ -270,11 +270,11 @@
     if ($err->no()) {
       // 1) Prohibit saving locked entries in any form.
       if ($user->isDateLocked($item_date))
-        $err->add($i18n->getKey('error.range_locked'));
+        $err->add($i18n->get('error.range_locked'));
 
       // 2) Prohibit saving completed unlocked entries into locked range.
       if ($err->no() && $user->isDateLocked($new_date))
-        $err->add($i18n->getKey('error.range_locked'));
+        $err->add($i18n->get('error.range_locked'));
 
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
@@ -282,7 +282,7 @@
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
-          $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
         }
       }
     }
@@ -290,7 +290,7 @@
     // Prohibit creating an overlapping record.
     if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $err->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->get('error.overlap'));
     }
 
     // Now, an update.
@@ -334,6 +334,6 @@
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('title', $i18n->getKey('title.edit_time_record'));
+$smarty->assign('title', $i18n->get('title.edit_time_record'));
 $smarty->assign('content_page_name', 'mobile/time_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/timer.php b/mobile/timer.php
index 6851052f0..059767edd 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -97,7 +97,7 @@
       'value'=>$cl_client,
       'data'=>$active_clients,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -112,7 +112,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -139,7 +139,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -152,7 +152,7 @@
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable,'enable'=>$enable_controls));
@@ -160,9 +160,9 @@
 $form->addInput(array('type'=>'hidden','name'=>'browser_time','value'=>''));  // User current time, which gets filled in on button click.
 $enable_start = $uncompleted ? false : true;
 if (!$uncompleted)
-  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->getKey('label.start'),'enable'=>$enable_start));
+  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.start'),'enable'=>$enable_start));
 else
-  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->getKey('label.finish'),'enable'=>!$enable_start));
+  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.finish'),'enable'=>!$enable_start));
 
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
@@ -174,7 +174,7 @@
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))
+      'empty'=>array(''=>$i18n->get('dropdown.select'))
     ));
   }
 }
@@ -187,15 +187,15 @@
 
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-      $err->add($i18n->getKey('error.client'));
+      $err->add($i18n->get('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->get('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_task) $err->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     // Finished validating user input.
 
@@ -203,22 +203,22 @@
     if (!$user->future_entries) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $err->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->get('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
     if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
     if ($err->no() && $uncompleted) {
-      $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+      $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->get('error.overlap'));
     }
 
     if ($err->no()) {
@@ -247,7 +247,7 @@
         header('Location: timer.php');
         exit();
       }
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
   if ($request->getParameter('btn_stop')) {
@@ -272,7 +272,7 @@
         header('Location: timer.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else {
       // Cannot complete, redirect for manual edit.
       header('Location: time_edit.php?id='.$record['id']);
@@ -296,6 +296,6 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'mobile/timer.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/user_add.php b/mobile/user_add.php
index 7fff9a064..838981de4 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -67,7 +67,7 @@
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->get('error.field'), 'rate_'.$p);
     }
   }
 }
@@ -84,7 +84,7 @@
 $active_roles = ttTeamHelper::getActiveRolesForUser();
 $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
@@ -120,24 +120,24 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->getKey('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->getKey('form.users.rate'), new RateCellRenderer()));
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
 $form->addInputElement($table);
 
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
   if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
   }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
+  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 ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
@@ -155,9 +155,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
         header('Location: users.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->get('error.user_exists'));
   }
 } // isPost
 
@@ -165,6 +165,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
-$smarty->assign('title', $i18n->getKey('title.add_user'));
+$smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'mobile/user_add.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/user_delete.php b/mobile/user_delete.php
index cb0e1a2cd..d8400456a 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -58,8 +58,8 @@
 // Create confirmation form.
 $form = new Form('userDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -82,7 +82,7 @@
       }
       exit();
     } else {
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
   if ($request->getParameter('btn_cancel')) {
@@ -92,6 +92,6 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_user'));
+$smarty->assign('title', $i18n->get('title.delete_user'));
 $smarty->assign('content_page_name', 'mobile/user_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 89a473cb6..285c3442b 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -82,7 +82,7 @@
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->get('error.field'), 'rate_'.$p);
     }
   }
 } else {
@@ -112,10 +112,10 @@
 $active_roles = ttTeamHelper::getActiveRolesForUser();
 $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
 // Define classes for the projects table.
@@ -148,27 +148,27 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->getKey('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->getKey('form.users.rate'), new RateCellRenderer()));
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
 $form->addInputElement($table);
 
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
-    if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-    if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+    if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+    if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
     if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-      if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-      if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+      if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+      if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
       if ($cl_password1 !== $cl_password2)
-        $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+        $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
     }
-    if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-    if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
+    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 ($err->no()) {
       $existing_user = ttUserHelper::getUserByLogin($cl_login);
@@ -214,9 +214,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
           exit();
   
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.user_exists'));
+        $err->add($i18n->get('error.user_exists'));
     }
   }
   
@@ -234,6 +234,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('user_id', $user_id);
-$smarty->assign('title', $i18n->getKey('title.edit_user'));
+$smarty->assign('title', $i18n->get('title.edit_user'));
 $smarty->assign('content_page_name', 'mobile/user_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/users.php b/mobile/users.php
index 8ae0fc930..131d2b44c 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -55,6 +55,6 @@
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('can_delete_manager', $can_delete_manager);
-$smarty->assign('title', $i18n->getKey('title.users'));
+$smarty->assign('title', $i18n->get('title.users'));
 $smarty->assign('content_page_name', 'mobile/users.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/notification_add.php b/notification_add.php
index 3cac65217..6d0e4d31a 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -59,23 +59,23 @@
   'value'=>$cl_fav_report,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
-  'empty'=>array(''=>$i18n->getKey('dropdown.select'))
+  'empty'=>array(''=>$i18n->get('dropdown.select'))
 ));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','style'=>'width: 250px;','value'=>$cl_cron_spec));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
 $form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
 $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $err->add($i18n->getKey('error.report'));
-  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.schedule'));
-  if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
-  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
-  if (!ttValidCondition($cl_report_condition)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.condition'));
+  if (!$cl_fav_report) $err->add($i18n->get('error.report'));
+  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
+  if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
+  if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));
 
   if ($err->no()) {
     // Calculate next execution time.
@@ -94,11 +94,11 @@
         header('Location: notifications.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.add_notification'));
+$smarty->assign('title', $i18n->get('title.add_notification'));
 $smarty->assign('content_page_name', 'notification_add.tpl');
 $smarty->display('index.tpl');
diff --git a/notification_delete.php b/notification_delete.php
index 0b6cf5ccc..46de065d6 100644
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('notificationDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_notification_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: notifications.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: notifications.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('notification_to_delete', $notification_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.notificationDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_notification'));
+$smarty->assign('title', $i18n->get('title.delete_notification'));
 $smarty->assign('content_page_name', 'notification_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/notification_edit.php b/notification_edit.php
index ec26f610b..431798285 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -67,22 +67,22 @@
   'value'=>$cl_fav_report,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
-  'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  'empty'=>array(''=>$i18n->get('dropdown.select'))));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','style'=>'width: 250px;','value'=>$cl_cron_spec));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
 $form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
 $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $err->add($i18n->getKey('error.report'));
-  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.schedule'));
-  if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
-  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
-  if (!ttValidCondition($cl_report_condition)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.condition'));
+  if (!$cl_fav_report) $err->add($i18n->get('error.report'));
+  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
+  if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
+  if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));
 
   if ($err->no()) {
     // Calculate next execution time.
@@ -102,11 +102,11 @@
         header('Location: notifications.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_notification'));
+$smarty->assign('title', $i18n->get('title.edit_notification'));
 $smarty->assign('content_page_name', 'notification_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/notifications.php b/notifications.php
index 4205dffaf..c03378d29 100644
--- a/notifications.php
+++ b/notifications.php
@@ -45,12 +45,12 @@
     exit();
   }
 } else {
-  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
   $notifications = ttTeamHelper::getNotifications($user->team_id);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('notifications', $notifications);
-$smarty->assign('title', $i18n->getKey('title.notifications'));
+$smarty->assign('title', $i18n->get('title.notifications'));
 $smarty->assign('content_page_name', 'notifications.tpl');
 $smarty->display('index.tpl');
diff --git a/password_change.php b/password_change.php
index 89e79c7ff..bcbd5f4ad 100644
--- a/password_change.php
+++ b/password_change.php
@@ -62,14 +62,14 @@
 $form->addInput(array('type'=>'password','maxlength'=>'120','name'=>'password1','value'=>$cl_password1));
 $form->addInput(array('type'=>'password','maxlength'=>'120','name'=>'password2','value'=>$cl_password2));
 $form->addInput(array('type'=>'hidden','name'=>'ref','value'=>$cl_ref));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-  if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+  if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+  if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
   if ($cl_password1 !== $cl_password2)
-    $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+    $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
 
   if ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
@@ -91,12 +91,12 @@
       }
       exit();
     } else {
-      $err->add($i18n->getKey('error.auth'));
+      $err->add($i18n->get('error.auth'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.change_password'));
+$smarty->assign('title', $i18n->get('title.change_password'));
 $smarty->assign('content_page_name', 'password_change.tpl');
 $smarty->display('index.tpl');
diff --git a/password_reset.php b/password_reset.php
index e73dcf816..1ee4711ed 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -38,13 +38,13 @@
 
 $form = new Form('resetPasswordForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;'));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.reset_password')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.reset_password')));
 
 if ($request->isPost()) {
   $cl_login = $request->getParameter('login');
 
   // Validate user input.
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
@@ -55,9 +55,9 @@
         if ($login)
           $cl_login = $login;
         else
-          $err->add($i18n->getKey('error.no_login'));
+          $err->add($i18n->get('error.no_login'));
       } else
-        $err->add($i18n->getKey('error.no_login'));
+        $err->add($i18n->get('error.no_login'));
     }
   }
 
@@ -83,7 +83,7 @@
       if (ttValidEmail($cl_login))
         $receiver = $cl_login;
       else
-        $err->add($i18n->getKey('error.no_email'));
+        $err->add($i18n->get('error.no_email'));
     }
 
     if ($receiver) {
@@ -99,21 +99,21 @@
       else
         $http = 'http';
 
-      $cl_subject = $user_i18n->getKey('form.reset_password.email_subject');
+      $cl_subject = $user_i18n->get('form.reset_password.email_subject');
       if (APP_NAME)
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/'.APP_NAME.'/password_change.php?ref='.$temp_ref;
       else
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
 
       $sender->setMailMode(MAIL_MODE);
-      $res = $sender->send($cl_subject, sprintf($user_i18n->getKey('form.reset_password.email_body'), $_SERVER['REMOTE_ADDR'], $pass_edit_url));
-      $smarty->assign('result_message', $res ? $i18n->getKey('form.reset_password.message') : $i18n->getKey('error.mail_send'));
+      $res = $sender->send($cl_subject, sprintf($user_i18n->get('form.reset_password.email_body'), $_SERVER['REMOTE_ADDR'], $pass_edit_url));
+      $smarty->assign('result_message', $res ? $i18n->get('form.reset_password.message') : $i18n->get('error.mail_send'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.resetPasswordForm.login.focus()"');
-$smarty->assign('title', $i18n->getKey('title.reset_password'));
+$smarty->assign('title', $i18n->get('title.reset_password'));
 $smarty->assign('content_page_name', 'password_reset.tpl');
 $smarty->display('index.tpl');
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 5e7305996..82cf99b63 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -44,12 +44,12 @@
 $form = new Form('predefinedExpenseForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
   if ($err->no()) {
     if (ttPredefinedExpenseHelper::insert(array(
         'team_id' => $user->team_id,
@@ -58,11 +58,11 @@
         header('Location: predefined_expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.add_predefined_expense'));
+$smarty->assign('title', $i18n->get('title.add_predefined_expense'));
 $smarty->assign('content_page_name', 'predefined_expense_add.tpl');
 $smarty->display('index.tpl');
diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index 3b1cde554..c8ae1c822 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('predefinedExpenseDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_predefined_expense_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: predefined_expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: predefined_expenses.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('predefined_expense_to_delete', $predefined_expense_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.predefinedExpenseDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_predefined_expense'));
+$smarty->assign('title', $i18n->get('title.delete_predefined_expense'));
 $smarty->assign('content_page_name', 'predefined_expense_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index 64bf9d84d..220778a98 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -51,12 +51,12 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$predefined_expense_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
   if ($err->no()) {
     if (ttPredefinedExpenseHelper::update(array(
         'id' => $predefined_expense_id,
@@ -66,11 +66,11 @@
         header('Location: predefined_expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_predefined_expense'));
+$smarty->assign('title', $i18n->get('title.edit_predefined_expense'));
 $smarty->assign('content_page_name', 'predefined_expense_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/predefined_expenses.php b/predefined_expenses.php
index 9db98e0ea..4e799121b 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -45,12 +45,12 @@
     exit();
   }
 } else {
-  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
   $predefinedExpenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('predefined_expenses', $predefinedExpenses);
-$smarty->assign('title', $i18n->getKey('title.predefined_expenses'));
+$smarty->assign('title', $i18n->get('title.predefined_expenses'));
 $smarty->assign('content_page_name', 'predefined_expenses.tpl');
 $smarty->display('index.tpl');
diff --git a/profile_edit.php b/profile_edit.php
index ba157a9ca..9c27ab41a 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -165,8 +165,8 @@
   $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
     'onchange'=>'MakeFormatPreview(&quot;date_format_preview&quot;, this);'));
   $TIME_FORMAT_OPTIONS = array(
-    array('id'=>'%H:%M','name'=>$i18n->getKey('form.profile.24_hours')),
-    array('id'=>'%I:%M %p','name'=>$i18n->getKey('form.profile.12_hours')));
+    array('id'=>'%H:%M','name'=>$i18n->get('form.profile.24_hours')),
+    array('id'=>'%I:%M %p','name'=>$i18n->get('form.profile.12_hours')));
   $form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
     'onchange'=>'MakeFormatPreview(&quot;time_format_preview&quot;, this);'));
 
@@ -182,18 +182,18 @@
 
   // Prepare tracking mode choices.
   $tracking_mode_options = array();
-  $tracking_mode_options[MODE_TIME] = $i18n->getKey('form.profile.mode_time');
-  $tracking_mode_options[MODE_PROJECTS] = $i18n->getKey('form.profile.mode_projects');
-  $tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->getKey('form.profile.mode_projects_and_tasks');
+  $tracking_mode_options[MODE_TIME] = $i18n->get('form.profile.mode_time');
+  $tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.profile.mode_projects');
+  $tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.profile.mode_projects_and_tasks');
   $form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode,'onchange'=>'handleTaskRequiredCheckbox()'));
   $form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
   $form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
 
   // Prepare record type choices.
   $record_type_options = array();
-  $record_type_options[TYPE_ALL] = $i18n->getKey('form.profile.type_all');
-  $record_type_options[TYPE_START_FINISH] = $i18n->getKey('form.profile.type_start_finish');
-  $record_type_options[TYPE_DURATION] = $i18n->getKey('form.profile.type_duration');
+  $record_type_options[TYPE_ALL] = $i18n->get('form.profile.type_all');
+  $record_type_options[TYPE_START_FINISH] = $i18n->get('form.profile.type_start_finish');
+  $record_type_options[TYPE_DURATION] = $i18n->get('form.profile.type_duration');
   $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
   // Punch mode checkbox.
@@ -227,30 +227,30 @@
   $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
   $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 }
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
   if ($can_change_login) {
-    if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+    if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
 
     // New login must be unique.
     if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
-      $err->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->get('error.user_exists'));
   }
   if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
   }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if ($user->canManageTeam()) {
-    if (!ttValidString($cl_team, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-    if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
+    if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+    if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
     if ($user->isManager()) {
-      if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.bcc'));
+      if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
     }
   }
   // Finished validating user input.
@@ -338,13 +338,13 @@
       header('Location: time.php');
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
-$smarty->assign('title', $i18n->getKey('title.profile'));
+$smarty->assign('title', $i18n->get('title.profile'));
 $smarty->assign('content_page_name', 'profile_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/project_add.php b/project_add.php
index 99f8c6d5f..6b55019cb 100644
--- a/project_add.php
+++ b/project_add.php
@@ -63,12 +63,12 @@
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
@@ -82,14 +82,14 @@
           header('Location: projects.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.project_exists'));
+      $err->add($i18n->get('error.project_exists'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_project'));
+$smarty->assign('title', $i18n->get('title.add_project'));
 $smarty->assign('content_page_name', 'project_add.tpl');
 $smarty->display('index.tpl');
diff --git a/project_delete.php b/project_delete.php
index a6b6ed532..683dbc50c 100644
--- a/project_delete.php
+++ b/project_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('projectDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: projects.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: projects.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('project_to_delete', $project_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_project'));
+$smarty->assign('title', $i18n->get('title.delete_project'));
 $smarty->assign('content_page_name', 'project_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/project_edit.php b/project_edit.php
index d7b67565c..be0e90fa9 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -75,17 +75,17 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
@@ -102,9 +102,9 @@
            header('Location: projects.php');
            exit();
         } else
-           $err->add($i18n->getKey('error.db'));
+           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.project_exists'));
+        $err->add($i18n->get('error.project_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -119,15 +119,15 @@
           header('Location: projects.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.project_exists'));
+        $err->add($i18n->get('error.project_exists'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.edit_project'));
+$smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/projects.php b/projects.php
index ce7bb9a1a..ed0103a4e 100644
--- a/projects.php
+++ b/projects.php
@@ -44,6 +44,6 @@
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
-$smarty->assign('title', $i18n->getKey('title.projects'));
+$smarty->assign('title', $i18n->get('title.projects'));
 $smarty->assign('content_page_name', 'projects.tpl');
 $smarty->display('index.tpl');
diff --git a/quotas.php b/quotas.php
index 06fdbbe5a..19e70e505 100644
--- a/quotas.php
+++ b/quotas.php
@@ -72,12 +72,12 @@
 if ($request->isPost()){
   // Validate user input.
   if (false === ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours')))
-    $err->add($i18n->getKey('error.field'), $i18n->getKey('form.quota.workday_hours'));
+    $err->add($i18n->get('error.field'), $i18n->get('form.quota.workday_hours'));
 
   for ($i = 0; $i < count($months); $i++){
     $val = $request->getParameter($months[$i]);
     if (false === ttTimeHelper::postedDurationToMinutes($val, 44640/*24*60*31*/))
-      $err->add($i18n->getKey('error.field'), $months[$i]);
+      $err->add($i18n->get('error.field'), $months[$i]);
   }
   // Finished validating user input.
 
@@ -87,7 +87,7 @@
     $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
     if ($workday_minutes != $user->workday_minutes) {
       if (!ttTeamHelper::update($user->team_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
 
     // Handle monthly quotas for a selected year.
@@ -95,7 +95,7 @@
     for ($i = 0; $i < count($months); $i++){
       $quota_in_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter($months[$i]), 44640/*24*60*31*/);
       if (!$quota->update($selectedYear, $i+1, $quota_in_minutes))
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
 
     if ($err->no()) {
@@ -125,6 +125,6 @@
 
 $smarty->assign('months', $months);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.monthly_quotas'));
+$smarty->assign('title', $i18n->get('title.monthly_quotas'));
 $smarty->assign('content_page_name', 'quotas.tpl');
 $smarty->display('index.tpl');
diff --git a/register.php b/register.php
index 3ddcb9902..32fed57ad 100644
--- a/register.php
+++ b/register.php
@@ -80,7 +80,7 @@
 $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password1','value'=>$cl_password1));
 $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_email','value'=>$cl_manager_email));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   // Create fields array for ttRegistrator instance.
@@ -111,7 +111,7 @@
   }
 } // isPost
 
-$smarty->assign('title', $i18n->getKey('title.create_team'));
+$smarty->assign('title', $i18n->get('title.create_team'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.profileForm.team.focus()"');
 $smarty->assign('content_page_name', 'register.tpl');
diff --git a/report.php b/report.php
index c4bfd0683..190dff8ee 100644
--- a/report.php
+++ b/report.php
@@ -75,17 +75,17 @@
 
 // Controls for "Mark paid" block.
 if ($bean->getAttribute('chpaid')) {
-  $mark_paid_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+  $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',
     'data'=>$mark_paid_select_options,
     'value'=>$cl_mark_paid_select_option));
-  $mark_paid_action_options = array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid'));
+  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
     'data'=>$mark_paid_action_options,
     'value'=>$cl_mark_paid_action_option));
-  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->getKey('button.submit')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
   $smarty->assign('use_mark_paid', true);
 }
 
@@ -94,7 +94,7 @@
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id);
   if ($recent_invoices) {
-    $assign_invoice_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+    $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
     $form->addInput(array('type'=>'combobox',
       'name'=>'assign_invoice_select_options',
       'data'=>$assign_invoice_select_options,
@@ -104,8 +104,8 @@
       'data'=>$recent_invoices,
       'datakeys'=>array('id','name'),
       'value'=>$cl_recent_invoice_option,
-      'empty'=>array(''=>$i18n->getKey('dropdown.select_invoice'))));
-    $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->getKey('button.submit')));
+      'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
+    $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->get('button.submit')));
     $smarty->assign('use_assign_to_invoice', true);
   }
 }
@@ -122,7 +122,7 @@
       if ('item_id_' == substr($key, 0, 8))
         $expense_item_ids[] = substr($key, 8);
     }
-    if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->getKey('error.record')); // There are no selected records.
+    if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->get('error.record')); // There are no selected records.
     // Validation of parameteres ended here.
   } else {
     // We are assigning all report items. Get the arrays from session.
@@ -193,7 +193,7 @@
     $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
   else {
     $key = 'label.'.$group_by;
-    $smarty->assign('group_by_header', $i18n->getKey($key));
+    $smarty->assign('group_by_header', $i18n->get($key));
   }
 }
 // Assign variables that are used to alternate color of rows for different dates.
@@ -207,6 +207,6 @@
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
 $smarty->assign('bean', $bean);
-$smarty->assign('title', $i18n->getKey('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
+$smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
 $smarty->assign('content_page_name', 'report.tpl');
 $smarty->display('index.tpl');
diff --git a/report_send.php b/report_send.php
index 9be9676fd..b420b3aca 100644
--- a/report_send.php
+++ b/report_send.php
@@ -48,7 +48,7 @@
 } else {
   $cl_receiver = $sc->getValue(SYSC_LAST_REPORT_EMAIL);
   $cl_cc = $sc->getValue(SYSC_LAST_REPORT_CC);
-  $cl_subject = $i18n->getKey('form.mail.report_subject');
+  $cl_subject = $i18n->get('form.mail.report_subject');
 }
 
 $form = new Form('mailForm');
@@ -56,14 +56,14 @@
 $form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
 $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
 $form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;'));
-$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey('button.send')));
+$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('button.send')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
-  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
-  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
-  if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
+  if (!ttValidEmailList($cl_receiver)) $err->add($i18n->get('error.field'), $i18n->get('form.mail.to'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
+  if (!ttValidString($cl_subject)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   if ($err->no()) {
     // Save last report emails for future use.
@@ -87,9 +87,9 @@
       $mailer->setReceiverBCC($user->bcc_email);
     $mailer->setMailMode(MAIL_MODE);
     if ($mailer->send($cl_subject, $body))
-      $msg->add($i18n->getKey('form.mail.report_sent'));
+      $msg->add($i18n->get('form.mail.report_sent'));
     else
-      $err->add($i18n->getKey('error.mail_send'));
+      $err->add($i18n->get('error.mail_send'));
   }
 }
 
@@ -103,7 +103,7 @@
   }
 }
 
-$smarty->assign('title', $i18n->getKey('title.send_report'));
+$smarty->assign('title', $i18n->get('title.send_report'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
 $smarty->assign('content_page_name', 'mail.tpl');
diff --git a/reports.php b/reports.php
index f6655d702..390c85c68 100644
--- a/reports.php
+++ b/reports.php
@@ -59,11 +59,11 @@
   'style'=>'width: 250px;',
   'data'=>$report_list,
   'datakeys'=>array('id','name'),
-  'empty'=>array('-1'=>$i18n->getKey('dropdown.no'))));
+  'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
 $form->addInput(array('type'=>'hidden','name'=>'fav_report_changed'));
 // Generate and Delete buttons.
-$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->getKey('button.generate')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete'),'onclick'=>"return confirm('".$i18n->getKey('form.reports.confirm_delete')."')"));
+$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
 
 // Dropdown for clients if the clients plugin is enabled.
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) {
@@ -76,7 +76,7 @@
     'style'=>'width: 250px;',
     'data'=>$client_list,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
 // If we have a TYPE_DROPDOWN custom field - add control to select an option.
@@ -85,7 +85,7 @@
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+      'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
 // Add controls for projects and tasks.
@@ -102,7 +102,7 @@
   'style'=>'width: 250px;',
   'data'=>$project_list,
   'datakeys'=>array('id','name'),
-  'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+  'empty'=>array(''=>$i18n->get('dropdown.all'))));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
   $task_list = ttTeamHelper::getActiveTasks($user->team_id);
   $form->addInput(array('type'=>'combobox',
@@ -110,36 +110,36 @@
     'style'=>'width: 250px;',
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
 // Add include records control.
-$include_options = array('1'=>$i18n->getKey('form.reports.include_billable'),
-  '2'=>$i18n->getKey('form.reports.include_not_billable'));
+$include_options = array('1'=>$i18n->get('form.reports.include_billable'),
+  '2'=>$i18n->get('form.reports.include_not_billable'));
 $form->addInput(array('type'=>'combobox',
   'name'=>'include_records',
   'style'=>'width: 250px;',
   'data'=>$include_options,
-  'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+  'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
 if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'paid_status',
    'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid')),
-   'empty'=>array(''=>$i18n->getKey('dropdown.all'))
+   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
  ));
 }
 
 
 // Add invoiced / not invoiced selector.
-$invoice_options = array('1'=>$i18n->getKey('form.reports.include_invoiced'),
-  '2'=>$i18n->getKey('form.reports.include_not_invoiced'));
+$invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
+  '2'=>$i18n->get('form.reports.include_not_invoiced'));
 $form->addInput(array('type'=>'combobox',
   'name'=>'invoice',
   'style'=>'width: 250px;',
   'data'=>$invoice_options,
-  'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+  'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
 $user_list = array();
 if ($user->canManageTeam() || $user->isClient()) {
@@ -171,13 +171,13 @@
 $form->addInput(array('type'=>'combobox',
   'name'=>'period',
   'style'=>'width: 250px;',
-  'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.current_month'),
-    INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.previous_month'),
-    INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.current_week'),
-    INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.previous_week'),
-    INTERVAL_THIS_DAY=>$i18n->getKey('dropdown.current_day'),
-    INTERVAL_LAST_DAY=>$i18n->getKey('dropdown.previous_day')),
-  'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
+    INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
+    INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
+    INTERVAL_LAST_WEEK=>$i18n->get('dropdown.previous_week'),
+    INTERVAL_THIS_DAY=>$i18n->get('dropdown.current_day'),
+    INTERVAL_LAST_DAY=>$i18n->get('dropdown.previous_day')),
+  'empty'=>array(''=>$i18n->get('dropdown.select'))));
 // Add controls for start and end dates.
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
@@ -206,16 +206,16 @@
 if ($custom_fields && $custom_fields->fields[0])
   $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
 // Add group by control.
-$group_by_options['no_grouping'] = $i18n->getKey('form.reports.group_by_no');
-$group_by_options['date'] = $i18n->getKey('form.reports.group_by_date');
+$group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
+$group_by_options['date'] = $i18n->get('form.reports.group_by_date');
 if ($user->canManageTeam() || $user->isClient())
-  $group_by_options['user'] = $i18n->getKey('form.reports.group_by_user');
+  $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
-  $group_by_options['client'] = $i18n->getKey('form.reports.group_by_client');
+  $group_by_options['client'] = $i18n->get('form.reports.group_by_client');
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-  $group_by_options['project'] = $i18n->getKey('form.reports.group_by_project');
+  $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
-  $group_by_options['task'] = $i18n->getKey('form.reports.group_by_task');
+  $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
 if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
 }
@@ -225,9 +225,9 @@
 // Add text field for a new favorite report name.
 $form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30','style'=>'width: 250px;'));
 // Save button.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
-$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->getKey('button.generate')));
+$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
 
 // Create a bean (which is a mechanism to remember form values in session).
 $bean = new ActionForm('reportBean', $form, $request);
@@ -278,12 +278,12 @@
     }
   } elseif ($bean->getAttribute('btn_save')) {
     // User clicked the Save button. We need to save form options as new favorite report.
-    if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite'));
+    if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
 
     if ($err->no()) {
       $id = ttFavReportHelper::saveReport($user->id, $bean);
       if (!$id)
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
       if ($err->no()) {
         $bean->setAttribute('favorite_report', $id);
         $bean->saveBean();
@@ -310,14 +310,14 @@
       $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
 
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
+        $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
 
       $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
       if ($end_date->isError() || !$bean->getAttribute('end_date'))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
+        $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
 
       if ($start_date->compare($end_date) > 0)
-        $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date'));
+        $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
     }
 
     $bean->saveBean();
@@ -335,6 +335,6 @@
 $smarty->assign('assigned_projects', $assigned_projects);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handleCheckboxes()"');
-$smarty->assign('title', $i18n->getKey('title.reports'));
+$smarty->assign('title', $i18n->get('title.reports'));
 $smarty->assign('content_page_name', 'reports.tpl');
 $smarty->display('index.tpl');
diff --git a/role_add.php b/role_add.php
index bd9f3e46f..e4cbb9644 100644
--- a/role_add.php
+++ b/role_add.php
@@ -50,12 +50,12 @@
   $rank_data[] = $i;
 }
 $form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->team_id);
@@ -71,13 +71,13 @@
           header('Location: roles.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.role_exists'));
+        $err->add($i18n->get('error.role_exists'));
     }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.add_role'));
+$smarty->assign('title', $i18n->get('title.add_role'));
 $smarty->assign('content_page_name', 'role_add.tpl');
 $smarty->display('index.tpl');
diff --git a/role_delete.php b/role_delete.php
index 7bf6ae692..086e7affb 100644
--- a/role_delete.php
+++ b/role_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('roleDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: roles.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: roles.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('role_to_delete', $role_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_role'));
+$smarty->assign('title', $i18n->get('title.delete_role'));
 $smarty->assign('content_page_name', 'role_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/role_edit.php b/role_edit.php
index 946f83476..3eb7696b0 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -67,20 +67,20 @@
 }
 $form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 // Multiple select controls for assigned and available rights.
 $form->addInput(array('type'=>'combobox','name'=>'assigned_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$assigned_rights));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('button.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));
 $form->addInput(array('type'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
     // Validate user input.
-    if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-    if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+    if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+    if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
     if ($err->no()) {
       $existing_role = ttRoleHelper::getRoleByName($cl_name);
@@ -95,9 +95,9 @@
           header('Location: roles.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.object_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
   }
   if ($request->getParameter('btn_delete') && $request->getParameter('assigned_rights')) {
@@ -113,7 +113,7 @@
        header('Location: role_edit.php?id='.$role['id']);
        exit();
      } else
-       $err->add($i18n->getKey('error.db'));
+       $err->add($i18n->get('error.db'));
   }
   if ($request->getParameter('btn_add') && $request->getParameter('available_rights')) {
      $rights = $role['rights'];
@@ -132,11 +132,11 @@
        header('Location: role_edit.php?id='.$role['id']);
        exit();
      } else
-       $err->add($i18n->getKey('error.db'));
+       $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_role'));
+$smarty->assign('title', $i18n->get('title.edit_role'));
 $smarty->assign('content_page_name', 'role_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/roles.php b/roles.php
index 64a1ee4a9..ec79020ee 100644
--- a/roles.php
+++ b/roles.php
@@ -39,6 +39,6 @@
 
 $smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
-$smarty->assign('title', $i18n->getKey('title.roles'));
+$smarty->assign('title', $i18n->get('title.roles'));
 $smarty->assign('content_page_name', 'roles.tpl');
 $smarty->display('index.tpl');
diff --git a/swap_roles.php b/swap_roles.php
index 5ee472486..0c5257049 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -44,17 +44,17 @@
 
 $form = new Form('swapForm');
 $form->addInput(array('type'=>'combobox','name'=>'swap_with','style'=>'width: 250px;','data'=>$users,'datakeys'=>array('id','name')));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   if (ttTeamHelper::swapRolesWith($cl_id)) {
     header('Location: users.php');
     exit();
   } else
-    $err->add($i18n->getKey('error.db'));
+    $err->add($i18n->get('error.db'));
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.swap_roles'));
+$smarty->assign('title', $i18n->get('title.swap_roles'));
 $smarty->assign('content_page_name', 'swap_roles.tpl');
 $smarty->display('index.tpl');
diff --git a/table_test.php b/table_test.php
index f8b4c7251..7cd5cda35 100644
--- a/table_test.php
+++ b/table_test.php
@@ -104,7 +104,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table->setInteractive(false);
 $form->addInputElement($table);
 
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 // Submit.
 if ($request->isPost()) {
@@ -113,6 +113,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'table_test.tpl');
 $smarty->display('index.tpl');
diff --git a/task_add.php b/task_add.php
index 40eb4887d..12c54464d 100644
--- a/task_add.php
+++ b/task_add.php
@@ -53,12 +53,12 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
@@ -71,14 +71,14 @@
           header('Location: tasks.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.task_exists'));
+      $err->add($i18n->get('error.task_exists'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.add_task'));
+$smarty->assign('title', $i18n->get('title.add_task'));
 $smarty->assign('content_page_name', 'task_add.tpl');
 $smarty->display('index.tpl');
diff --git a/task_delete.php b/task_delete.php
index 3cdb5b691..d72220d2f 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -42,8 +42,8 @@
 
 $form = new Form('taskDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +52,9 @@
         header('Location: tasks.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: tasks.php');
     exit();
@@ -64,6 +64,6 @@
 $smarty->assign('task_to_delete', $task_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_task'));
+$smarty->assign('title', $i18n->get('title.delete_task'));
 $smarty->assign('content_page_name', 'task_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/task_edit.php b/task_edit.php
index 5c70f11b9..36e717d7e 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -61,15 +61,15 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
@@ -85,9 +85,9 @@
           header('Location: tasks.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->get('error.task_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -101,14 +101,14 @@
           header('Location: tasks.php');
           exit();
         } else
-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->get('error.task_exists'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_task'));
+$smarty->assign('title', $i18n->get('title.edit_task'));
 $smarty->assign('content_page_name', 'task_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/tasks.php b/tasks.php
index a1033a5c0..5bc3fd459 100644
--- a/tasks.php
+++ b/tasks.php
@@ -38,6 +38,6 @@
 
 $smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
 $smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
-$smarty->assign('title', $i18n->getKey('title.tasks'));
+$smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'tasks.tpl');
 $smarty->display('index.tpl');
diff --git a/time.php b/time.php
index 7f9b1849e..270a8aaef 100644
--- a/time.php
+++ b/time.php
@@ -127,7 +127,7 @@
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -141,7 +141,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -168,7 +168,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -180,7 +180,7 @@
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 
 // Add other controls.
@@ -202,7 +202,7 @@
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
@@ -214,7 +214,7 @@
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -224,62 +224,62 @@
 
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-      $err->add($i18n->getKey('error.client'));
+      $err->add($i18n->get('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->get('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
-      if (!$cl_task) $err->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
-          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+          $err->add($i18n->get('error.field'), $i18n->get('label.start'));
         if ($cl_finish) {
           if (!ttTimeHelper::isValidTime($cl_finish))
-            $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+            $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
           if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+            $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
         if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
         if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {
       if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+        $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
-    if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+    if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
     if (!$user->future_entries) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $err->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->get('error.future_date'));
     }
 
     // Prohibit creating entries in locked range.
     if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {
       if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
-        $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+        $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->get('error.overlap'));
     }
 
     // Insert record.
@@ -308,7 +308,7 @@
         header('Location: time.php');
         exit();
       }
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   } elseif ($request->getParameter('btn_stop')) {
     // Stop button pressed to finish an uncompleted record.
@@ -333,7 +333,7 @@
           'note'=>$record['comment'],
           'billable'=>$record['billable']));
       if (!$res)
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else {
       // Cannot complete, redirect for manual edit.
       header('Location: time_edit.php?id='.$record_id);
@@ -367,6 +367,6 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'time.tpl');
 $smarty->display('index.tpl');
diff --git a/time_delete.php b/time_delete.php
index 0cdd8816e..2ad3ea412 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -42,7 +42,7 @@
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
-if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
+if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
@@ -57,7 +57,7 @@
     $uncompleted = ($time_rec['duration'] == '0:00');
 
     if ($user->isDateLocked($item_date) && !$uncompleted)
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
 
@@ -68,7 +68,7 @@
         header('Location: time.php');
         exit();
       } else {
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
       }
     }
   }
@@ -80,11 +80,11 @@
 
 $form = new Form('timeRecordForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
 $smarty->assign('time_rec', $time_rec);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_time_record'));
+$smarty->assign('title', $i18n->get('title.delete_time_record'));
 $smarty->assign('content_page_name', 'time_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/time_edit.php b/time_edit.php
index 59ae7531b..dd3edde13 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -53,7 +53,7 @@
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 
 // Prohibit editing invoiced records.
-if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
+if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
 
@@ -101,7 +101,7 @@
   if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
     $cl_finish = '';
     $cl_duration = '';
-    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->get('form.time_edit.uncompleted'));
   }
 }
 
@@ -118,7 +118,7 @@
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -132,7 +132,7 @@
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -159,7 +159,7 @@
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -171,7 +171,7 @@
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 
 // Add other controls.
@@ -199,7 +199,7 @@
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty' => array('' => $i18n->getKey('dropdown.select'))));
+      'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }
 // Hidden control for record id.
@@ -209,50 +209,50 @@
 if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
 
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-    $err->add($i18n->getKey('error.client'));
+    $err->add($i18n->get('error.client'));
   if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $err->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->get('error.project'));
   }
   if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
-    if (!$cl_task) $err->add($i18n->getKey('error.task'));
+    if (!$cl_task) $err->add($i18n->get('error.task'));
   }
   if (!$cl_duration) {
     if ('0' == $cl_duration)
-      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     elseif ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
-        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+        $err->add($i18n->get('error.field'), $i18n->get('label.start'));
       if ($cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_finish))
-          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+          $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
         if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+          $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
       }
     } else {
       if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+        $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
+        $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
       }
       if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+        $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
     }
   } else {
     if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
   }
-  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
+  if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
   // Finished validating user input.
 
   // This is a new date for the time record.
@@ -262,7 +262,7 @@
   if (!$user->future_entries) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $err->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->get('error.future_date'));
   }
 
   // Save record.
@@ -276,11 +276,11 @@
     if ($err->no()) {
       // 1) Prohibit saving locked entries in any form.
       if ($user->isDateLocked($item_date))
-        $err->add($i18n->getKey('error.range_locked'));
+        $err->add($i18n->get('error.range_locked'));
 
       // 2) Prohibit saving completed unlocked entries into locked range.
       if ($err->no() && $user->isDateLocked($new_date))
-        $err->add($i18n->getKey('error.range_locked'));
+        $err->add($i18n->get('error.range_locked'));
 
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
@@ -288,7 +288,7 @@
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
-          $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
         }
       }
     }
@@ -296,7 +296,7 @@
     // Prohibit creating an overlapping record.
     if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $err->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->get('error.overlap'));
     }
 
     // Now, an update.
@@ -340,7 +340,7 @@
     if ($err->no()) {
       // 1) Prohibit saving into locked range.
       if ($user->isDateLocked($new_date))
-        $err->add($i18n->getKey('error.range_locked'));
+        $err->add($i18n->get('error.range_locked'));
 
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
@@ -348,7 +348,7 @@
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec) {
           // We have another not completed record.
-          $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
         }
       }
     }
@@ -356,7 +356,7 @@
     // Prohibit creating an overlapping record.
     if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
-        $err->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->get('error.overlap'));
     }
 
     // Now, a new insert.
@@ -387,7 +387,7 @@
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       }
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
 
@@ -402,6 +402,6 @@
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('title', $i18n->getKey('title.edit_time_record'));
+$smarty->assign('title', $i18n->get('title.edit_time_record'));
 $smarty->assign('content_page_name', 'time_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/tofile.php b/tofile.php
index 534cb9430..67c5b31ce 100644
--- a/tofile.php
+++ b/tofile.php
@@ -63,7 +63,7 @@
   $items = ttReportHelper::getItems($bean);
 
 // Build a string to use as filename for the files being downloaded.
-$filename = strtolower($i18n->getKey('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
+$filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
 
 header('Pragma: public'); // This is needed for IE8 to download files over https.
 header('Content-Type: text/html; charset=utf-8');
@@ -164,13 +164,13 @@
       $group_by_header = $custom_fields->fields[0]['label'];
     else {
       $key = 'label.'.$group_by;
-      $group_by_header = $i18n->getKey($key);
+      $group_by_header = $i18n->get($key);
     }
 
     // Print headers.
     print '"'.$group_by_header.'"';
-    if ($bean->getAttribute('chduration')) print ',"'.$i18n->getKey('label.duration').'"';
-    if ($bean->getAttribute('chcost')) print ',"'.$i18n->getKey('label.cost').'"';
+    if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
+    if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
     print "\n";
 
     // Print subtotals.
@@ -192,20 +192,20 @@
     }
   } else {
     // Normal report. Print headers.
-    print '"'.$i18n->getKey('label.date').'"';
-    if ($user->canManageTeam() || $user->isClient()) print ',"'.$i18n->getKey('label.user').'"';
-    if ($bean->getAttribute('chclient')) print ',"'.$i18n->getKey('label.client').'"';
-    if ($bean->getAttribute('chproject')) print ',"'.$i18n->getKey('label.project').'"';
-    if ($bean->getAttribute('chtask')) print ',"'.$i18n->getKey('label.task').'"';
+    print '"'.$i18n->get('label.date').'"';
+    if ($user->canManageTeam() || $user->isClient()) print ',"'.$i18n->get('label.user').'"';
+    if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
+    if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
+    if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
     if ($bean->getAttribute('chcf_1')) print ',"'.$custom_fields->fields[0]['label'].'"';
-    if ($bean->getAttribute('chstart')) print ',"'.$i18n->getKey('label.start').'"';
-    if ($bean->getAttribute('chfinish')) print ',"'.$i18n->getKey('label.finish').'"';
-    if ($bean->getAttribute('chduration')) print ',"'.$i18n->getKey('label.duration').'"';
-    if ($bean->getAttribute('chnote')) print ',"'.$i18n->getKey('label.note').'"';
-    if ($bean->getAttribute('chcost')) print ',"'.$i18n->getKey('label.cost').'"';
-    if ($bean->getAttribute('chpaid')) print ',"'.$i18n->getKey('label.paid').'"';
-    if ($bean->getAttribute('chip')) print ',"'.$i18n->getKey('label.ip').'"';
-    if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->getKey('label.invoice').'"';
+    if ($bean->getAttribute('chstart')) print ',"'.$i18n->get('label.start').'"';
+    if ($bean->getAttribute('chfinish')) print ',"'.$i18n->get('label.finish').'"';
+    if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
+    if ($bean->getAttribute('chnote')) print ',"'.$i18n->get('label.note').'"';
+    if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
+    if ($bean->getAttribute('chpaid')) print ',"'.$i18n->get('label.paid').'"';
+    if ($bean->getAttribute('chip')) print ',"'.$i18n->get('label.ip').'"';
+    if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->get('label.invoice').'"';
     print "\n";
 
     // Print items.
diff --git a/topdf.php b/topdf.php
index 68a1eb5c3..b8f6684c4 100644
--- a/topdf.php
+++ b/topdf.php
@@ -68,7 +68,7 @@
     $group_by_header = $custom_fields->fields[0]['label'];
   else {
     $key = 'label.'.$group_by;
-    $group_by_header = $i18n->getKey($key);
+    $group_by_header = $i18n->get($key);
   }
 }
 
@@ -88,7 +88,7 @@
 }
 
 // Build a string to use as filename for the files being downloaded.
-$filename = strtolower($i18n->getKey('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
+$filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
 
 // Start preparing HTML to build PDF from.
 $styleHeader = 'style="background-color:#a6ccf7;"';
@@ -96,7 +96,7 @@
 $styleCentered = 'style="text-align:center;"';
 $styleRightAligned = 'style="text-align:right;"';
 
-$title = $i18n->getKey('title.report').": ".$totals['start_date']." - ".$totals['end_date'];
+$title = $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date'];
 $html = '<h1 style="text-align:center;">'.$title.'</h1>';
 $html .= '<table border="1" cellpadding="3" cellspacing="0" width="100%">';
 
@@ -107,8 +107,8 @@
   $html .= '<thead>';
   $html .= "<tr $styleHeader>";
   $html .= '<td>'.htmlspecialchars($group_by_header).'</td>';
-  if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.duration').'</td>'; }
-  if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.cost').'</td>'; }
+  if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
+  if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
   $html .= '</tr>';
   $html .= '</thead>';
   // Print subtotals.
@@ -129,7 +129,7 @@
   // Print totals.
   $html .= '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
   $html .= "<tr $styleSubtotal>";
-  $html .= '<td>'.$i18n->getKey('label.total').'</td>';
+  $html .= '<td>'.$i18n->get('label.total').'</td>';
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
   if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
@@ -148,20 +148,20 @@
   // Table header.
   $html .= '<thead>';
   $html .= "<tr $styleHeader>";
-  $html .= '<td>'.$i18n->getKey('label.date').'</td>';
-  if ($user->canManageTeam() || $user->isClient()) { $colspan++; $html .= '<td>'.$i18n->getKey('label.user').'</td>'; }
-  if ($bean->getAttribute('chclient')) { $colspan++; $html .= '<td>'.$i18n->getKey('label.client').'</td>'; }
-  if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->getKey('label.project').'</td>'; }
-  if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->getKey('label.task').'</td>'; }
+  $html .= '<td>'.$i18n->get('label.date').'</td>';
+  if ($user->canManageTeam() || $user->isClient()) { $colspan++; $html .= '<td>'.$i18n->get('label.user').'</td>'; }
+  if ($bean->getAttribute('chclient')) { $colspan++; $html .= '<td>'.$i18n->get('label.client').'</td>'; }
+  if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->get('label.project').'</td>'; }
+  if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->get('label.task').'</td>'; }
   if ($bean->getAttribute('chcf_1')) { $colspan++; $html .= '<td>'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>'; }
-  if ($bean->getAttribute('chstart')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.start').'</td>'; }
-  if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.finish').'</td>'; }
-  if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.duration').'</td>'; }
-  if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->getKey('label.note').'</td>'; }
-  if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.cost').'</td>'; }
-  if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.paid').'</td>'; }
-  if ($bean->getAttribute('chip')) { $colspan++; $html .= "<td $styleCentered>".$i18n->getKey('label.ip').'</td>'; }
-  if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '<td>'.$i18n->getKey('label.invoice').'</td>'; }
+  if ($bean->getAttribute('chstart')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.start').'</td>'; }
+  if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
+  if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
+  if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
+  if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
+  if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
+  if ($bean->getAttribute('chip')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.ip').'</td>'; }
+  if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '<td>'.$i18n->get('label.invoice').'</td>'; }
   $html .= '</tr>';
   $html .= '</thead>';
 
@@ -172,7 +172,7 @@
       $cur_grouped_by = $item['grouped_by'];
       if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
         $html .= '<tr style="background-color:#e0e0e0;">';
-        $html .= '<td>'.$i18n->getKey('label.subtotal').'</td>';
+        $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
         if ($user->canManageTeam() || $user->isClient()) {
             $html .= '<td>';
             if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
@@ -241,7 +241,7 @@
     }
     if ($bean->getAttribute('chpaid')) {
         $html .= '<td>';
-        $html .= $item['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+        $html .= $item['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
         $html .= '</td>';
     }
     if ($bean->getAttribute('chip')) {
@@ -259,7 +259,7 @@
   // Print a terminating subtotal.
   if ($print_subtotals) {
     $html .= '<tr style="background-color:#e0e0e0;">';
-    $html .= '<td>'.$i18n->getKey('label.subtotal').'</td>';
+    $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
     if ($user->canManageTeam() || $user->isClient()) {
       $html .= '<td>';
       if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
@@ -306,7 +306,7 @@
   // Print totals.
   $html .= '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
   $html .= '<tr style="background-color:#e0e0e0;">';
-  $html .= '<td>'.$i18n->getKey('label.total').'</td>';
+  $html .= '<td>'.$i18n->get('label.total').'</td>';
   if ($user->canManageTeam() || $user->isClient()) $html .= '<td></td>';
   if ($bean->getAttribute('chclient')) $html .= '<td></td>';
   if ($bean->getAttribute('chproject')) $html .= '<td></td>';
@@ -333,12 +333,12 @@
 
 // Output footer.
 if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) // By default we print it unless explicitely defined as false.
-  $html .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+  $html .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
 
 // By this time we have html ready.
 
 // Determine title for report.
-$title = $i18n->getKey('title.report').": ".$totals['start_date']." - ".$totals['end_date'];
+$title = $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date'];
 
 header('Pragma: public'); // This is needed for IE8 to download files over https.
 header('Content-Type: text/html; charset=utf-8');
@@ -394,7 +394,7 @@ public function Footer() {
   $pdf->SetImageFile('images/'.$user->team_id.'.png');
 
 // Set page word for the footer.
-$pdf->SetPageWord($i18n->getKey('label.page'));
+$pdf->SetPageWord($i18n->get('label.page'));
 
 // Set document information.
 $pdf->SetCreator(PDF_CREATOR);
diff --git a/user_add.php b/user_add.php
index a31669c7e..91286537d 100644
--- a/user_add.php
+++ b/user_add.php
@@ -68,7 +68,7 @@
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->get('error.field'), 'rate_'.$p);
     }
   }
 }
@@ -85,7 +85,7 @@
 $active_roles = ttTeamHelper::getActiveRolesForUser();
 $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
@@ -121,26 +121,26 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->getKey('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->getKey('form.users.rate'), new RateCellRenderer()));
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
 $form->addInputElement($table);
 
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
   if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
   }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.
-  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->getKey('error.client'));
-  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
+  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 ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
@@ -158,9 +158,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
         header('Location: users.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->get('error.user_exists'));
   }
 } // isPost
 
@@ -168,6 +168,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
-$smarty->assign('title', $i18n->getKey('title.add_user'));
+$smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'user_add.tpl');
 $smarty->display('index.tpl');
diff --git a/user_delete.php b/user_delete.php
index 97b255725..a88454bf9 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -57,8 +57,8 @@
 // Create confirmation form.
 $form = new Form('userDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -81,7 +81,7 @@
       }
       exit();
     } else {
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
     }
   }
   if ($request->getParameter('btn_cancel')) {
@@ -91,6 +91,6 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_user'));
+$smarty->assign('title', $i18n->get('title.delete_user'));
 $smarty->assign('content_page_name', 'user_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/user_edit.php b/user_edit.php
index ee572a7f6..531e84242 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -83,7 +83,7 @@
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->get('error.field'), 'rate_'.$p);
     }
   }
 } else {
@@ -113,10 +113,10 @@
 $active_roles = ttTeamHelper::getActiveRolesForUser();
 $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
 // Define classes for the projects table.
@@ -150,27 +150,27 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->getKey('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->getKey('form.users.rate'), new RateCellRenderer()));
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
 $form->addInputElement($table);
 
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
   if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
   }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.
-  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->getKey('error.client'));
-  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
+  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 ($err->no()) {
     $existing_user = ttUserHelper::getUserByLogin($cl_login);
@@ -216,9 +216,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
         exit();
 
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->get('error.user_exists'));
   }
 } // isPost
 
@@ -230,6 +230,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('user_id', $user_id);
-$smarty->assign('title', $i18n->getKey('title.edit_user'));
+$smarty->assign('title', $i18n->get('title.edit_user'));
 $smarty->assign('content_page_name', 'user_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/users.php b/users.php
index 28a37227a..860218638 100644
--- a/users.php
+++ b/users.php
@@ -56,6 +56,6 @@
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('can_delete_manager', $can_delete_manager);
-$smarty->assign('title', $i18n->getKey('title.users'));
+$smarty->assign('title', $i18n->get('title.users'));
 $smarty->assign('content_page_name', 'users.tpl');
 $smarty->display('index.tpl');
diff --git a/week.php b/week.php
index 29c15e479..e26aa1192 100644
--- a/week.php
+++ b/week.php
@@ -235,7 +235,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -249,7 +249,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
@@ -276,7 +276,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -288,7 +288,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 if (!defined('NOTE_INPUT_HEIGHT'))
   define('NOTE_INPUT_HEIGHT', 40);
@@ -299,7 +299,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
@@ -311,7 +311,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
 
@@ -330,15 +330,15 @@ function render(&$table, $value, $row, $column, $selected = false) {
     }
     if ($newEntryPosted) {
       if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
-        $err->add($i18n->getKey('error.client'));
+        $err->add($i18n->get('error.client'));
       if ($custom_fields) {
-        if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+        if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
       }
       if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-        if (!$cl_project) $err->add($i18n->getKey('error.project'));
+        if (!$cl_project) $err->add($i18n->get('error.project'));
       }
       if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
-        if (!$cl_task) $err->add($i18n->getKey('error.task'));
+        if (!$cl_task) $err->add($i18n->get('error.task'));
       }
     }
     // Finished validating user input for row 0.
@@ -369,7 +369,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
             // If posted value is not null, check and normalize it.
             if ($postedDuration) {
               if (false === ttTimeHelper::postedDurationToMinutes($postedDuration)) {
-                $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+                $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
                 $result = false; break; // Break out. Stop any further processing.
               } else {
                 $minutes = ttTimeHelper::postedDurationToMinutes($postedDuration);
@@ -433,7 +433,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
             $existingComment = $dataArray[$rowNumber][$dayHeader]['note'];
             // If posted value is not null, check it.
             if ($postedComment && !ttValidString($postedComment, true)) {
-              $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+              $err->add($i18n->get('error.field'), $i18n->get('label.note'));
               $result = false; break; // Break out. Stop any further processing.
             }
             // Do not process if value has not changed.
@@ -490,6 +490,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
 
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'week.tpl');
 $smarty->display('index.tpl');
diff --git a/week_view.php b/week_view.php
index 99dc2eee9..b273d2789 100644
--- a/week_view.php
+++ b/week_view.php
@@ -52,17 +52,17 @@
 $form->addInput(array('type'=>'checkbox','name'=>'week_note','value'=>$cl_week_note));
 $form->addInput(array('type'=>'checkbox','name'=>'week_list','value'=>$cl_week_list));
 $form->addInput(array('type'=>'checkbox','name'=>'notes','value'=>$cl_notes));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
   if (!ttTeamHelper::enablePlugin('wvn', $cl_week_note) ||
       !ttTeamHelper::enablePlugin('wvl', $cl_week_list) ||
       !ttTeamHelper::enablePlugin('wvns', $cl_notes)) {
-    $err->add($i18n->getKey('error.db'));
+    $err->add($i18n->get('error.db'));
   }
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.week_view'));
+$smarty->assign('title', $i18n->get('title.week_view'));
 $smarty->assign('content_page_name', 'week_view.tpl');
 $smarty->display('index.tpl');

From 86381310c0914f345eb6c88d4e9ec621996f493c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 17:48:20 +0000
Subject: [PATCH 0026/1848] Replaced timestamp column  with datetime type in
 tt_tmp_refs.

---
 WEB-INF/lib/ttUserHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 12 ++++++++----
 mysql.sql                          |  4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 9513a721a..e4591ea43 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -415,10 +415,10 @@ static function delete($user_id) {
   static function saveTmpRef($ref, $user_id) {
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_tmp_refs where timestamp + 86400 < now()";
+    $sql = "delete from tt_tmp_refs where created < now() - interval 1 hour";
     $affected = $mdb2->exec($sql);
 
-    $sql = "insert into tt_tmp_refs (ref, user_id) values(".$mdb2->quote($ref).", $user_id)";
+    $sql = "insert into tt_tmp_refs (created, ref, user_id) values(now(), ".$mdb2->quote($ref).", $user_id)";
     $affected = $mdb2->exec($sql);
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 21c302736..8f2c0a6cc 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.17.67.4145 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.67.4146 | 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/dbinstall.php b/dbinstall.php
index 9c2d041b6..4d7feeb25 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11766"]) {
+  if ($_POST["convert11744to11767"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -856,6 +856,10 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_teams` drop `timestamp`");
     setChange("ALTER TABLE `tt_users` drop `timestamp`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.66', modified = now() where param_name = 'version_db' and param_value = '1.17.65'");
+    setChange("ALTER TABLE `tt_tmp_refs` ADD `created` datetime default NULL AFTER `timestamp`");
+    setChange("ALTER TABLE `tt_tmp_refs` drop `timestamp`");
+    setChange("delete from `tt_tmp_refs`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.67', modified = now() where param_name = 'version_db' and param_value = '1.17.66'");
   }
 
   if ($_POST["cleanup"]) {
@@ -901,7 +905,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.66)</b>
+    <td width="80%"><b>Create database structure (v1.17.67)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -941,8 +945,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.66)</td>
-    <td><input type="submit" name="convert11744to11766" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.67)</td>
+    <td><input type="submit" name="convert11744to11767" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 48ec08331..df34b7759 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -226,7 +226,7 @@ create unique index name_idx on tt_invoices(team_id, name, status);
 # Structure for table tt_tmp_refs. Used for reset password mechanism.
 #
 CREATE TABLE `tt_tmp_refs` (
-  `timestamp` timestamp default CURRENT_TIMESTAMP, # creation timestamp
+  `created` datetime default NULL,                 # creation timestamp
   `ref` char(32) NOT NULL default '',              # unique reference for user, used in urls
   `user_id` int(11) NOT NULL                       # user id
 );
@@ -450,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.66', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.67', now()); # TODO: change when structure changes.

From a003ad003dfa29eb043c45f18e7f395cb3331aa5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 20:26:41 +0000
Subject: [PATCH 0027/1848] Put a swap roles link on user_edit.php.

---
 WEB-INF/lib/ttUser.class.php     | 4 +++-
 WEB-INF/resources/en.lang.php    | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/swap_roles.tpl | 4 +++-
 WEB-INF/templates/user_edit.tpl  | 6 ++++++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e0bbbe5ac..0a1048884 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -32,6 +32,7 @@ class ttUser {
   var $id = null;               // User id.
   var $team_id = null;          // Team id.
   var $role_id = null;          // Role id.
+  var $role_name = null;        // Role name.
   var $rank = null;             // User role rank.
   var $client_id = null;        // Client id for client user role.
   var $behalf_id = null;        // User id, on behalf of whom we are working.
@@ -71,7 +72,7 @@ function __construct($login, $id = null) {
 
     $mdb2 = getConnection();
 
-    $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.rights, u.client_id, u.email, t.name as team_name,
+    $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, t.name as team_name,
       t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
       t.tracking_mode, t.project_required, t.task_required, t.record_type,
       t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
@@ -94,6 +95,7 @@ function __construct($login, $id = null) {
       $this->id = $val['id'];
       $this->team_id = $val['team_id'];
       $this->role_id = $val['role_id'];
+      $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);
       $this->is_client = !in_array('track_own_time', $this->rights);
       $this->rank = $val['rank'];
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ce65dc622..bedc4f6a7 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -427,6 +427,7 @@
 'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 hours',
 'form.profile.24_hours' => '24 hours',
 'form.profile.show_holidays' => 'Show holidays',
@@ -460,6 +461,7 @@
 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
+'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8f2c0a6cc..6ca757e04 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.17.67.4146 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.68.4147 | 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/swap_roles.tpl b/WEB-INF/templates/swap_roles.tpl
index d2d99240e..b96334f0b 100644
--- a/WEB-INF/templates/swap_roles.tpl
+++ b/WEB-INF/templates/swap_roles.tpl
@@ -1,8 +1,10 @@
 {$forms.swapForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
   <table cellspacing="1" cellpadding="2" border="0">
+    <tr><td colspan="2">{$i18n.form.swap.hint}</td></tr
+    <tr><td>&nbsp;</td></tr>
     <tr>
-      <td align=""right">{$i18n.form.swap.swap_with}:</td>
+      <td align="right">{$i18n.form.swap.swap_with}:</td>
       <td>{$forms.swapForm.swap_with.control}</td>
     </tr>
     <tr>
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 85e2cd44d..15bf3fe27 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -104,6 +104,12 @@ function handleClientControl() {
       <td align="right">{$i18n.label.status}:</td>
       <td>{$forms.userForm.status.control}</td>
     </tr>
+{/if}
+{if $user->id == $user_id}
+      <tr>
+      <td align="right">{$i18n.form.users.role}:</td>
+      <td>{$user->role_name} {if $user->can('swap_roles')}<a href="swap_roles.php">{$i18n.form.profile.swap_roles}</a>{/if}</td>
+    </tr>
 {/if}
     <tr>
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>

From 341186de71fff2ecf47786a15adc96178c566e96 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 21:46:05 +0000
Subject: [PATCH 0028/1848] Added a Cancel button on the swap roles page.

---
 WEB-INF/templates/admin_team_delete.tpl |  2 +-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/swap_roles.tpl        |  2 +-
 swap_roles.php                          | 15 ++++++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/admin_team_delete.tpl b/WEB-INF/templates/admin_team_delete.tpl
index a8b0712f7..865c3fa99 100644
--- a/WEB-INF/templates/admin_team_delete.tpl
+++ b/WEB-INF/templates/admin_team_delete.tpl
@@ -10,7 +10,7 @@
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
-          <td align="right">{$forms.teamForm.btn_delete.control}&nbsp;</td>
+          <td align="right">{$forms.teamForm.btn_delete.control} &nbsp;</td>
           <td align="left">&nbsp;{$forms.teamForm.btn_cancel.control}</td>
         </tr>
       </table>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6ca757e04..2765c4c88 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.17.68.4147 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.68.4148 | 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/swap_roles.tpl b/WEB-INF/templates/swap_roles.tpl
index b96334f0b..2d3086329 100644
--- a/WEB-INF/templates/swap_roles.tpl
+++ b/WEB-INF/templates/swap_roles.tpl
@@ -8,7 +8,7 @@
       <td>{$forms.swapForm.swap_with.control}</td>
     </tr>
     <tr>
-      <td colspan="2" align="center" height="50">{$forms.swapForm.btn_submit.control}</td>
+      <td colspan="2" align="center">{$forms.swapForm.btn_submit.control} {$forms.swapForm.btn_cancel.control}</td>
     </tr>
   </table>
 </table>
diff --git a/swap_roles.php b/swap_roles.php
index 0c5257049..09178cd94 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -45,16 +45,25 @@
 $form = new Form('swapForm');
 $form->addInput(array('type'=>'combobox','name'=>'swap_with','style'=>'width: 250px;','data'=>$users,'datakeys'=>array('id','name')));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
-  if (ttTeamHelper::swapRolesWith($cl_id)) {
+  if ($request->getParameter('btn_submit')) {
+    if (ttTeamHelper::swapRolesWith($cl_id)) {
+      header('Location: users.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+
+  if ($request->getParameter('btn_cancel')) {
     header('Location: users.php');
     exit();
-  } else
-    $err->add($i18n->get('error.db'));
+  }
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.swapForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.swap_roles'));
 $smarty->assign('content_page_name', 'swap_roles.tpl');
 $smarty->display('index.tpl');

From a8334a66f49ce583f575ec1b4a71c7d746a1bcdc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 22:01:49 +0000
Subject: [PATCH 0029/1848] Added modification info to swap role operation.

---
 WEB-INF/lib/ttTeamHelper.class.php      | 6 ++++--
 WEB-INF/templates/admin_team_delete.tpl | 2 +-
 WEB-INF/templates/footer.tpl            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 0d10a84f0..de034794f 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -116,14 +116,16 @@ static function swapRolesWith($user_id) {
     if (!$val['id'] || !$val['role_id'])
       return false;
 
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+
     // Promote user.
-    $sql = "update tt_users set role_id = $user->role_id where id = $user_id and team_id = $user->team_id";
+    $sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and team_id = $user->team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Demote self.
     $role_id = $val['role_id'];
-    $sql = "update tt_users set role_id = $role_id where id = $user->id and team_id = $user->team_id";
+    $sql = "update tt_users set role_id = $role_id".$modified_part." where id = $user->id and team_id = $user->team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/admin_team_delete.tpl b/WEB-INF/templates/admin_team_delete.tpl
index 865c3fa99..a8b0712f7 100644
--- a/WEB-INF/templates/admin_team_delete.tpl
+++ b/WEB-INF/templates/admin_team_delete.tpl
@@ -10,7 +10,7 @@
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
-          <td align="right">{$forms.teamForm.btn_delete.control} &nbsp;</td>
+          <td align="right">{$forms.teamForm.btn_delete.control}&nbsp;</td>
           <td align="left">&nbsp;{$forms.teamForm.btn_cancel.control}</td>
         </tr>
       </table>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2765c4c88..aaa0fd750 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.17.68.4148 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.68.4149 | 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>

From dd3a0ade5b3c342fb4352b00dac4f654409fd3e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 22:18:29 +0000
Subject: [PATCH 0030/1848] Put form.profile.swap_roles into localization
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 078eaf5cd..bd7e479a2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -488,6 +488,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 91ead1a9b..9a1c45fa3 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -501,6 +501,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 397dc7f57..4892fb060 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -441,6 +441,8 @@
 'form.teams.hint' => 'Opret et nyt team ved at oprette en ny teamadministrator konto. <br> Du kan også importere teamdata fra en xml-fil fra en anden Anuko Time Tracker-server (eksisterende brugernavne er ikke tilladt).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 timers',
 'form.profile.24_hours' => '24 timers',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 279feee7a..12207a889 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -439,6 +439,8 @@
 'form.teams.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 Stunden',
 'form.profile.24_hours' => '24 Stunden',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b760badc6..21eb29333 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -501,6 +501,8 @@
 'form.teams.hint' => 'Crear un nuevo grupo, creando una nueva cuenta del manejador del equipo.<br>También puede importar datos de grupos, de un archivo xml de otro servidor Anuko Time Tracker (no estan permitidad colisiones de e-mail).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 horas',
 'form.profile.24_hours' => '24 horas',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 21fbcc0c2..ea2dfc672 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -498,6 +498,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f9c7a3b9d..4d8bff0ea 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -469,6 +469,8 @@
 'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 ساعت',
 'form.profile.24_hours' => '24 ساعت',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d722106d4..600557cbf 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -449,6 +449,8 @@
 'form.teams.hint' => 'Luo uusi tiimi luomalla ensin tiimin esimiehen käyttäjätili.<br>Tiimin tiedot voi myös tuoda toiselta Anuko Time Tracker -palvelimelta xml-muodossa (käyttäjänimien oltava uusia).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12-tuntinen',
 'form.profile.24_hours' => '24-tuntinen',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index c999d6380..ac61f4b27 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -438,6 +438,8 @@
 'form.teams.hint' => 'Créez une nouvelle équipe en créant un nouveau compte de responsable d\\\'équipe.<br>Vous pouvez également importer des données d\\\'une équipe depuis un fichier xml provenant d\\\'un autre serveur Anuko Time Tracker (les doublons d\\\'identifiants ne sont pas autorisés).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 heures',
 'form.profile.24_hours' => '24 heures',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1a7bfa1a3..4bef25ead 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -426,6 +426,8 @@
 'form.teams.hint' => 'Δημιουργήστε μια νέα ομάδα δημιουργώντας ένα νέο λογαριασμό διαχειριστή ομάδας.<br>Μπορείτε επίσης να εισαγάγετε δεδομένα ομάδας από ένα αρχείο xml από άλλο διακομιστή Anuko Time Tracker (δεν επιτρέπονται συγκρούσεις σύνδεσης).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 ώρες',
 'form.profile.24_hours' => '24 ώρες',
 'form.profile.show_holidays' => 'Προβολή διακοπών',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index fc54004ed..0964fd615 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -475,6 +475,8 @@
 'form.teams.hint' => 'ניתן ליצור צוות חדש על-ידי יצירת מנהל צוות חדש.<br>ניתן לייבא נתוני צוות מקובץ XML משרת Anuko Time Tracker אחר (אין אפשרות לשמות משתמש זהים)',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 שעות',
 'form.profile.24_hours' => '24 שעות',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 0ef9f2888..337f96d08 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -493,6 +493,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 6df19a3b6..5770b2784 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -441,6 +441,8 @@
 'form.teams.hint' => 'Crea un nuovo gruppo creando un account gruppo manager.<br>Puoi anche importare i dati di un gruppo da un file xml esportato da un altro server Anuko Time Tracker (non sono ammessi login duplicati).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 ore',
 'form.profile.24_hours' => '24 ore',
 'form.profile.show_holidays' => 'Mostra vacanze',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c1845d73e..86d60fff9 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -493,6 +493,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 101cfd713..2e3a49d67 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -491,6 +491,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index fa65b754c..d7d09442d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -434,6 +434,8 @@
 'form.teams.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 uurs',
 'form.profile.24_hours' => '24 uurs',
 'form.profile.show_holidays' => 'Toon vakantiedagen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c467d9798..2aa8b4099 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -489,6 +489,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f7b380672..54082f2f0 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -451,6 +451,8 @@
 'form.teams.hint' => 'Załóż nowy zespół najpierw tworząc konto managera.<br>Możesz także zaimportować plik xml z danymi zespołu z innego serwera Anuko Time Tracker (nazwy loginów nie mogą się powtarzać).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 godzin',
 'form.profile.24_hours' => '24 godziny',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index aa7bb7620..31a9d2b3c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -446,6 +446,8 @@
 'form.teams.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 horas',
 'form.profile.24_hours' => '24 horas',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index feaff31cc..0ec583c12 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -477,6 +477,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 96cf3a102..c58ed6b18 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -497,6 +497,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 07e1c619b..2407e3540 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -424,6 +424,7 @@
 'form.teams.hint' => 'Cоздайте новую команду, сделав новый аккаунт для её менеджера.<br>Также вы можете импортировать данные команды через xml файл из другого Anuko Time Tracker сервера (запрещено дублирование логинов).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+'form.profile.swap_roles' => 'Обменять роль',
 'form.profile.12_hours' => '12 часов',
 'form.profile.24_hours' => '24 часа',
 'form.profile.show_holidays' => 'Показывать праздники',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2b6f43eb0..b7b6eb36f 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -466,6 +466,8 @@
 'form.teams.hint' => 'Pomocou vytvorenia nového účtu tímového manažéra vytvorte nový tím.<br>Taktiež môžete importovať údaje o tíme z xml súboru z iného Anuko Time Tracker serveru (nie sú povolené kolízie v prihlasovacom mene).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12-hodinový',
 'form.profile.24_hours' => '24-hodinový',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 91e11c6f6..832af1215 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -475,6 +475,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e5e04f935..ce480f600 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -450,6 +450,8 @@
 'form.teams.hint' => 'Napravite novi tim. Počnite sa otvaranjem naloga za Menadžera.<br>Takođe možete uvoziti podatke iz xml fajla sa drugog Anuko Time Tracker server-a (dupliranje prijava nisu dozvoljeni).',
 
 // Forma profila. Pogledajte primer na at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 časova',
 'form.profile.24_hours' => '24 časova',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d2ec27626..3d4081b6e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -447,6 +447,8 @@
 'form.teams.hint' => 'Skapa en ny arbetsgrupp genom att skapa ett konto för en ansvarig person. Du kan även importera arbetsgrupper från en tidigare installation av Anuko Time Tracker via en XML-fil. Se till att inga användarnamn krockar när filen importeras.',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
+// TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12-timmars',
 'form.profile.24_hours' => '24-timmars',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 6df4b32f1..d195f62f1 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -509,6 +509,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 3d9c34d19..26f90ebf6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -476,6 +476,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 66b885cfd..5c4170fcd 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -486,6 +486,7 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
+// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aaa0fd750..45319e90a 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.17.68.4149 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.68.4150 | 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>

From 182ed39acb3600d991ff4742848a75c5ed2ba728 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Mar 2018 23:08:40 +0000
Subject: [PATCH 0031/1848] Put form.swap.hint into translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index bd7e479a2..6de09521f 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -525,6 +525,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9a1c45fa3..1eae00b84 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -538,6 +538,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4892fb060..85bf3e638 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -479,6 +479,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 12207a889..8534dd105 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -478,6 +478,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 21eb29333..703f9a35d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -541,6 +541,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ea2dfc672..b262a9b40 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -535,6 +535,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 4d8bff0ea..c224a01a5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -509,6 +509,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 600557cbf..128d025e0 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -488,6 +488,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ac61f4b27..85b22cce2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -476,6 +476,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4bef25ead..2e2a14b23 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -462,6 +462,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 0964fd615..2de2f23ec 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -514,6 +514,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 337f96d08..9732292d4 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -530,6 +530,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5770b2784..8802caa11 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -478,6 +478,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 86d60fff9..1edccd0a1 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -530,6 +530,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2e3a49d67..5bb4e50c6 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -528,6 +528,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index d7d09442d..eb69d0dc0 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -470,6 +470,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2aa8b4099..4d178534b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -526,6 +526,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 54082f2f0..016123fff 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -490,6 +490,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 31a9d2b3c..4878919fb 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -485,6 +485,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 0ec583c12..223368c64 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -514,6 +514,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c58ed6b18..0f77cab77 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -534,6 +534,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 2407e3540..69fa16d87 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -458,6 +458,7 @@
 'form.quota.hint' => 'При пустых значениях квоты автоматически определяются из длительности рабочего дня и праздников.',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
+'form.swap.hint' => 'Уменьшите свою роль, обменявшись с другим пользователем. Роль не может восстановлена.',
 'form.swap.swap_with' => 'Обменять роль с',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b7b6eb36f..cd7a1eee0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -505,6 +505,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 832af1215..2e3f79a0d 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -512,6 +512,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ce480f600..558050d14 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -489,6 +489,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3d4081b6e..1f6b444cc 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -485,6 +485,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d195f62f1..2f2997249 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -546,6 +546,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 26f90ebf6..7972e72fe 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -513,6 +513,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5c4170fcd..a10108ea2 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -523,6 +523,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 // TODO: translate the following.
+// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 45319e90a..223a757c3 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.17.68.4150 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.68.4151 | 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>

From 2ffa361a7610cbd1334754da314e4783226df689 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 11:22:56 +0000
Subject: [PATCH 0032/1848] Added some protection from bot registrations.

---
 WEB-INF/lib/ttRegistrator.class.php | 24 ++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 7082e6bc2..3c424f486 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -85,6 +85,12 @@ function register() {
 
     global $i18n;
 
+    // Protection fom too many recent bot registrations from user IP.
+    if ($this->registeredRecently()) {
+      $this->err->add($i18n->get('error.access_denied'));
+      return false;
+    }
+
     import('ttUserHelper');
     if (ttUserHelper::getUserByLogin($this->login)) {
       // User login already exists.
@@ -185,4 +191,22 @@ function setCreatedBy($user_id) {
 
     return true;
   }
+
+  // registeredRecently determines if we already have a successful recent registration from user IP.
+  // "recent" means "within the last minute" and is set in a query by the following condition:
+  // "and created > now() - interval 1 minute". Change if necessary.
+  function registeredRecently() {
+    $mdb2 = getConnection();
+
+    $ip_part = ' created_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $sql = 'select created from tt_teams where '.$ip_part.' and created > now() - interval 1 minute';
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    $val = $res->fetchRow();
+    if ($val)
+      return true;
+
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 223a757c3..4beb89559 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.17.68.4151 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4152 | 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>

From a8a191541d6f05b08bd8331bdf409af5abfac896 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 16:04:24 +0000
Subject: [PATCH 0033/1848] Introduced feature_disabled.php for better error
 description.

---
 WEB-INF/resources/en.lang.php |  1 +
 admin_team_add.php            |  3 ++-
 cf_custom_field_add.php       |  8 ++++++--
 cf_custom_field_delete.php    |  8 ++++++--
 cf_custom_field_edit.php      |  8 ++++++--
 cf_custom_fields.php          |  8 ++++++--
 cf_dropdown_option_add.php    |  8 ++++++--
 cf_dropdown_option_delete.php |  8 ++++++--
 cf_dropdown_option_edit.php   |  8 ++++++--
 cf_dropdown_options.php       |  8 ++++++--
 charts.php                    | 10 ++++++++--
 feature_disabled.php          | 36 +++++++++++++++++++++++++++++++++++
 12 files changed, 95 insertions(+), 19 deletions(-)
 create mode 100644 feature_disabled.php

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index bedc4f6a7..732141a4a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -69,6 +69,7 @@
 'error.access_denied' => 'Access denied.',
 'error.sys' => 'System error.',
 'error.db' => 'Database error.',
+'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Incorrect "{0}" data.',
 'error.empty' => 'Field "{0}" is empty.',
 'error.not_equal' => 'Field "{0}" is not equal to field "{1}".',
diff --git a/admin_team_add.php b/admin_team_add.php
index 6d5bc84f9..6a8b05d57 100644
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -81,9 +81,10 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
+
   /*
    * Note: creating a group by admin is pretty much the same as self-registration,
-   * except that created_by gields for group and user must be set to admin account.
+   * except that created_by fields for group and user must be set to admin account.
    * Therefore, we'll reuse ttRegistrator instance to create a group here
    * and override created_by fields using ttRegistrator::setCreatedBy() function.
    */
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 30c82a5a4..922d83b7c 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));
diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index f4de48098..86c10b1ff 100644
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $id = $request->getParameter('id');
 
diff --git a/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 32ee3878d..499f6d02a 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = $request->getParameter('id');
 $field = CustomFields::getField($cl_id);
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 2b34fb76b..53f80e400 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $form = new Form('customFieldsForm');
 
diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index b9500833d..7b49424e5 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_field_id = $request->getParameter('field_id');
 $field = CustomFields::getField($cl_field_id);
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 0a1f25ba0..4cb2aca8a 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = $request->getParameter('id');
 $form = new Form('optionDeleteForm');
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 5fc333d01..5522accf1 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = $request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
diff --git a/cf_dropdown_options.php b/cf_dropdown_options.php
index 02f59f56b..1afce7348 100644
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -30,11 +30,15 @@
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $field_id = $request->getParameter('field_id');
 $options = CustomFields::getOptions($field_id);
diff --git a/charts.php b/charts.php
index 69997d87f..959cfe36a 100644
--- a/charts.php
+++ b/charts.php
@@ -37,11 +37,17 @@
 import('ttUserHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('view_own_charts') || !$user->isPluginEnabled('ch')) {
+// Access checks.
+if (!ttAccessAllowed('view_own_charts')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ch')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+
+
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
diff --git a/feature_disabled.php b/feature_disabled.php
new file mode 100644
index 000000000..7f0bb81f5
--- /dev/null
+++ b/feature_disabled.php
@@ -0,0 +1,36 @@
+<?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');
+
+$err->add($i18n->get('error.feature_disabled'));
+if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
+
+$smarty->assign('title', $i18n->get('label.error'));
+$smarty->assign('content_page_name', 'access_denied.tpl');
+$smarty->display('index.tpl');

From 62b36719d92eec21e5e132811c1ec88e5f495117 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 16:17:16 +0000
Subject: [PATCH 0034/1848] Added error.feature_disabled to translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6de09521f..3b429f5d5 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -77,6 +77,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Error de la base de dades.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dada "{0}" incorrecta.',
 'error.empty' => 'L\\\'Arxiu "{0}" està buit.',
 'error.not_equal' => 'L\\\'Arxiu "{0}" no és igual al arxiu "{1}".',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1eae00b84..0eccd9fdc 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -79,6 +79,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Chyba databáze.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Nesprávná "{0}" data.',
 'error.empty' => 'Pole "{0}" je prázdné.',
 'error.not_equal' => 'Pole "{0}" neodpovídá poli "{1}".',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 85bf3e638..424346667 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Adgang nægtet.',
 'error.sys' => 'System fejl.',
 'error.db' => 'Database fejl.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Forkert "{0}" data.',
 'error.empty' => 'Felt "{0}" er tom.',
 'error.not_equal' => 'Felt "{0}" er ikke lig med "{1}".',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8534dd105..34d050c05 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Zugriff verweigert.',
 'error.sys' => 'Systemfehler.',
 'error.db' => 'Datenbankfehler.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Ungültige "{0}" Daten.',
 'error.empty' => 'Feld "{0}" ist leer.',
 'error.not_equal' => 'Feld "{0}" ist nicht gleich Feld "{1}".',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 703f9a35d..3c5f91532 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -76,6 +76,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Error de la base de datos.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dato "{0}" incorrecto.',
 'error.empty' => 'El archivo "{0}" esta vacío.',
 'error.not_equal' => 'El archivo "{0}" no es igual al archivo "{1}".',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b262a9b40..33085b1d2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -79,6 +79,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Andmebaasi viga.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Valed "{0}" andmed.',
 'error.empty' => 'Väli "{0}" on tühi.',
 'error.not_equal' => 'Väli "{0}" ei ole väljaga "{1}" võrdne.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index c224a01a5..654674b1a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -72,6 +72,8 @@
 // 'error.access_denied' => 'Access denied.',
 'error.sys' => 'خطا در سیستم.',
 'error.db' => 'خطا در پایگاه داده.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'داده اشتباه در "{0}".',
 'error.empty' => 'فیلد "{0}" خالیست.',
 'error.not_equal' => 'فیلد "{0}" با فیلد "{1}" برابر نیست.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 128d025e0..967c251d8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -70,6 +70,8 @@
 'error.access_denied' => 'Pääsy estetty.',
 'error.sys' => 'Järjestelmävirhe.',
 'error.db' => 'Tietokantavirhe.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Virheellinen "{0}" tieto.',
 'error.empty' => 'Kenttä "{0}" on tyhjä.',
 'error.not_equal' => 'Kentät "{0}" ja "{1}" eivät ole samat.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 85b22cce2..aafbb5dca 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Accès refusé.',
 'error.sys' => 'Erreur système.',
 'error.db' => 'Erreur de base de données.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Donnée "{0}" incorrecte.',
 'error.empty' => 'Le champ "{0}" est vide.',
 'error.not_equal' => 'Le champ "{0}" n\\\'est pas égal au champ "{1}".',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 2e2a14b23..e9f4790c0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Δεν επιτρέπεται η πρόσβαση.',
 'error.sys' => 'Σφάλμα συστήματος.',
 'error.db' => 'Σφάλμα βάσης δεδομένων.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Λανθασμένο "{0}" δεδομένο.',
 'error.empty' => 'Το πεδίο "{0}" είναι κενό.',
 'error.not_equal' => 'Το πεδίο "{0}" δεν είναι ίσο με το πεδίο "{1}".',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2de2f23ec..3426aa870 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -75,6 +75,8 @@
 // 'error.access_denied' => 'Access denied.',
 'error.sys' => 'שגיאת מערכת',
 'error.db' => 'שגיאה של בסיס הנתונים',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'נתון "{0}" שגוי',
 'error.empty' => 'השדה "{0}" ריק',
 'error.not_equal' => 'השדה "{1}" אינו שווה לשדה "{0}"',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9732292d4..fb891c8c0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -77,6 +77,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Adatbázis hiba.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Hibás "{0}" mező tartalma.',
 'error.empty' => 'A "{0}" mező üres.',
 'error.not_equal' => 'A "{0}" mező tartalma nem egyezik meg a "{1}" mező tartalmával.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8802caa11..e2258bb74 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -70,6 +70,8 @@
 'error.access_denied' => 'Accesso negato.',
 'error.sys' => 'Errore di sistema.',
 'error.db' => 'Errore database.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dato "{0}" errato.',
 'error.empty' => 'Il campo "{0}" è vuoto.',
 'error.not_equal' => 'Il campo "{0}" non è uguale al campo "{1}".',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 1edccd0a1..880b95cd8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -77,6 +77,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'データベースのエラー。',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '不正確な"{0}"データ。',
 'error.empty' => '"{0}"のフィールドが空白です。',
 'error.not_equal' => '"{0}"のフィールドは"{1}"のフィールドと違います。',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5bb4e50c6..6e0a7e292 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -77,6 +77,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => '데이터베이스 오류.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '부정확한 "{0}" 의 데이터.',
 'error.empty' => '"{0}" 의 필드가 비어있습니다.',
 'error.not_equal' => '"{0}" 의 필드가 "{1}" 의 필드와 같지 않습니다.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index eb69d0dc0..be2fcf622 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Toegang geweigerd.',
 'error.sys' => 'Systeem fout.',
 'error.db' => 'Database fout.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Incorrecte gegevens: "{0}".',
 'error.empty' => 'Veld "{0}" is leeg.',
 'error.not_equal' => 'Veld "{0}" is niet gelijk aan veld "{1}".',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 4d178534b..71a8959cf 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -76,6 +76,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Databasefeil.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Feil "{0}" data.',
 'error.empty' => 'Feltet "{0}" er tomt.',
 'error.not_equal' => 'Feltet "{0}" stemmer ikke med "{1}".',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 016123fff..fd599500f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -71,6 +71,8 @@
 'error.access_denied' => 'Odmowa dostępu.',
 'error.sys' => 'Błąd systemu.',
 'error.db' => 'Błąd bazy danych.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Niepoprawne dane: "{0}".',
 'error.empty' => 'Pole "{0}" jest puste.',
 'error.not_equal' => 'Wartość z pola "{0}" jest inna niż wartość z pola "{1}".',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 4878919fb..6fcd6c3ce 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Acesso negado.',
 'error.sys' => 'Erro no sistema.',
 'error.db' => 'Erro no banco de dados.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dados incorretos "{0}".',
 'error.empty' => 'Campo "{0}" está vazio.',
 'error.not_equal' => 'Campo "{0}" é diferente do campo "{1}".',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 223368c64..7b87af001 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -79,6 +79,7 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 // 'error.db' => 'Database error.',
+// 'error.feature_disabled' => 'Feature is disabled.',
 // 'error.field' => 'Incorrect "{0}" data.',
 // 'error.empty' => 'Field "{0}" is empty.',
 // 'error.not_equal' => 'Field "{0}" is not equal to field "{1}".',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 0f77cab77..357d6448e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -81,6 +81,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Eroare baza de date.',
 // TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 // 'error.field' => 'Incorrect "{0}" data.',
 'error.empty' => 'Campul "{0}" este gol.',
 'error.not_equal' => 'Campul "{0}" nu este egal cu campul "{1}".',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 69fa16d87..14b3e6e8d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -68,6 +68,7 @@
 'error.access_denied' => 'Доступ запрещён.',
 'error.sys' => 'Системная ошибка.',
 'error.db' => 'Ошибка базы данных.',
+'error.feature_disabled' => 'Функция отключена.',
 'error.field' => 'Некорректные данные в поле "{0}".',
 'error.empty' => 'Пустое поле "{0}".',
 'error.not_equal' => 'Значение "{0}" не соответствует "{1}".',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index cd7a1eee0..4dbffff2f 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -73,6 +73,8 @@
 // 'error.access_denied' => 'Access denied.',
 'error.sys' => 'Systémová chyba.',
 'error.db' => 'Databázová chyba.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Nesprávne "{0}" údaje.',
 'error.empty' => 'Pole "{0}" je prázdne.',
 'error.not_equal' => 'Pole "{0}" nie je zhodné s poľom "{1}".',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2e3f79a0d..8c93e4000 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -79,6 +79,7 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 // 'error.db' => 'Database error.',
+// 'error.feature_disabled' => 'Feature is disabled.',
 // 'error.field' => 'Incorrect "{0}" data.',
 // 'error.empty' => 'Field "{0}" is empty.',
 // 'error.not_equal' => 'Field "{0}" is not equal to field "{1}".',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 558050d14..5e7f56e9f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -68,6 +68,8 @@
 'error.access_denied' => 'Pristup odbijen.',
 'error.sys' => 'Greška u sistemu.',
 'error.db' => 'Greška u bazi podataka.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Pogrešan "{0}" podatak.',
 'error.empty' => 'Polje "{0}" je prazno.',
 'error.not_equal' => 'Polje "{0}" nije jednak polju "{1}".',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1f6b444cc..37e8dffe3 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -69,6 +69,8 @@
 'error.access_denied' => 'Åtkomst nekad.',
 'error.sys' => 'Systemfel.',
 'error.db' => 'Databasfel.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '"{0}" innehåller ett felaktigt värde.',
 'error.empty' => '"{0}" kan inte vara tomt.',
 'error.not_equal' => '"{0}" matchar inte "{1}".',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2f2997249..bbf97dbf8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -80,6 +80,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => 'Veritabanı hatası.',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Hatalı veri "{0}".',
 'error.empty' => 'Alan "{0}" boştur.',
 // TODO: confirm that error.not_equal is translated correctly.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7972e72fe..558427534 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -69,6 +69,8 @@
 'error.access_denied' => '拒绝访问。',
 'error.sys' => '系统错误。',
 'error.db' => '数据库错误。',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '不正确的"{0}"数据。',
 'error.empty' => '栏目"{0}"为空。',
 'error.not_equal' => '栏目"{0}"不等于栏目"{1}"。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a10108ea2..16c806222 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -75,6 +75,8 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 'error.db' => '資料庫錯誤。',
+// TODO: translate the following.
+// 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '不正確的"{0}"資料。',
 'error.empty' => '欄目"{0}"為空。',
 'error.not_equal' => '欄目"{0}"不等於欄目"{1}"。',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4beb89559..0f0b9fc5e 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.17.69.4152 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4153 | 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>

From b9fc6bb058ab933c980b72c54eea0b5afcab03e7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 16:48:47 +0000
Subject: [PATCH 0035/1848] Fixed header to print a revamped role name.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 charts.php                   | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0f0b9fc5e..10499fb25 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.17.69.4153 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4154 | 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/header.tpl b/WEB-INF/templates/header.tpl
index e0fd8057a..101c84a6c 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -150,7 +150,7 @@
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
-        <tr><td>{$user->name|escape}{if $user->isAdmin()} {$i18n.label.role_admin}{elseif $user->isManager()} {$i18n.label.role_manager}{elseif $user->canManageTeam()} {$i18n.label.role_comanager}{/if}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
+        <tr><td>{$user->name|escape} - {$user->role_name|escape} {if $user->behalf_id > 0}<b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
       </table>
 {/if}
       <!-- end of page title and user details -->
diff --git a/charts.php b/charts.php
index 959cfe36a..f2b01f16f 100644
--- a/charts.php
+++ b/charts.php
@@ -47,8 +47,6 @@
   exit();
 }
 
-
-
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 if(!$cl_date) {
@@ -111,7 +109,7 @@
   }
   // If user has changed - set behalf_id accordingly in the session.
   if ($request->getParameter('onBehalfUser')) {
-    if($user->canManageTeam()) {
+    if($user->can('view_charts')) {
       unset($_SESSION['behalf_id']);
       unset($_SESSION['behalf_name']);
 
@@ -129,7 +127,7 @@
 $chart_form = new Form('chartForm');
 
 // User dropdown. Changes the user "on behalf" of whom we are working. 
-if ($user->canManageTeam()) {
+if ($user->can('view_charts')) {
   $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
   if (count($user_list) > 1) {
     $chart_form->addInput(array('type'=>'combobox',

From e59d57b1fcf105382028dcfc0157a6ca84b0dc46 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 16:52:06 +0000
Subject: [PATCH 0036/1848] One more fix to header output.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 10499fb25..2403c2b26 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.17.69.4154 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4155 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 101c84a6c..1d6622165 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -150,7 +150,7 @@
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
-        <tr><td>{$user->name|escape} - {$user->role_name|escape} {if $user->behalf_id > 0}<b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
+        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
       </table>
 {/if}
       <!-- end of page title and user details -->

From 4dcb88a76a3de466ee6116ae0852f53ba2b259a5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 18:05:53 +0000
Subject: [PATCH 0037/1848] Some refactoring of access checks - in progress.

---
 WEB-INF/templates/footer.tpl |  2 +-
 client_add.php               |  8 ++++--
 client_delete.php            |  8 ++++--
 client_edit.php              |  8 ++++--
 clients.php                  |  8 ++++--
 expense_delete.php           | 10 +++++--
 expense_edit.php             |  8 ++++--
 expenses.php                 |  8 ++++--
 index.php                    |  2 +-
 invoice_add.php              |  8 ++++--
 invoice_delete.php           |  8 ++++--
 invoice_send.php             |  8 ++++--
 invoice_view.php             |  8 ++++--
 invoices.php                 |  8 ++++--
 locking.php                  |  8 ++++--
 login.php                    |  2 +-
 mobile/expenses.php          |  8 ++++--
 mobile/feature_disabled.php  | 36 +++++++++++++++++++++++++
 mysql.sql                    | 52 ++++++++++++++++++------------------
 notification_add.php         |  8 ++++--
 notification_delete.php      |  8 ++++--
 notification_edit.php        |  8 ++++--
 notifications.php            |  8 ++++--
 password_change.php          |  2 +-
 24 files changed, 176 insertions(+), 66 deletions(-)
 create mode 100644 mobile/feature_disabled.php

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2403c2b26..8b84e12b6 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.17.69.4155 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4156 | 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/client_add.php b/client_add.php
index c0526e51b..5ae5997fa 100644
--- a/client_add.php
+++ b/client_add.php
@@ -31,11 +31,15 @@
 import('ttClientHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
diff --git a/client_delete.php b/client_delete.php
index b162ea844..22ae9d4a6 100644
--- a/client_delete.php
+++ b/client_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttClientHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $id = (int)$request->getParameter('id');
 $client = ttClientHelper::getClient($id);
diff --git a/client_edit.php b/client_edit.php
index 05203237f..b74fb3150 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -31,11 +31,15 @@
 import('ttClientHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = (int) $request->getParameter('id');
 
diff --git a/clients.php b/clients.php
index 89b5c4a37..6ac6f5a1d 100644
--- a/clients.php
+++ b/clients.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->team_id, true));
 $smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->team_id, true));
diff --git a/expense_delete.php b/expense_delete.php
index 06c9690b0..42a6add80 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -31,11 +31,17 @@
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+
+
 
 $cl_id = $request->getParameter('id');
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
diff --git a/expense_edit.php b/expense_edit.php
index 9ea7c6493..15cfcfaf5 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -32,11 +32,15 @@
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = $request->getParameter('id');
 
diff --git a/expenses.php b/expenses.php
index bb7694816..00b43179c 100644
--- a/expenses.php
+++ b/expenses.php
@@ -33,11 +33,15 @@
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
diff --git a/index.php b/index.php
index 51e1e016f..fd4dde8ed 100644
--- a/index.php
+++ b/index.php
@@ -30,7 +30,7 @@
 
 // Redirects for admin and client roles.
 if ($auth->isAuthenticated()) {
-  if ($user->isAdmin()) {
+  if ($user->can('administer_site')) {
     header('Location: admin_teams.php');
     exit();
   } elseif ($user->isClient()) {
diff --git a/invoice_add.php b/invoice_add.php
index ed0a8c526..5267056c0 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -31,11 +31,15 @@
 import('ttTeamHelper');
 import('ttInvoiceHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_invoices') || !$user->isPluginEnabled('iv')) {
+// Access checks.
+if (!ttAccessAllowed('manage_invoices')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('iv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 if ($request->isPost()) {
   $cl_date = $request->getParameter('date');
diff --git a/invoice_delete.php b/invoice_delete.php
index 29160ba55..2bca58ce3 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttInvoiceHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_invoices') || !$user->isPluginEnabled('iv')) {
+// Access checks.
+if (!ttAccessAllowed('manage_invoices')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('iv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_invoice_id = (int)$request->getParameter('id');
 $invoice = ttInvoiceHelper::getInvoice($cl_invoice_id);
diff --git a/invoice_send.php b/invoice_send.php
index 2c0894a35..f0e30bc4b 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -31,11 +31,15 @@
 import('ttInvoiceHelper');
 import('ttSysConfig');
 
-// Access check.
-if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices')) || !$user->isPluginEnabled('iv')) {
+// Access checks.
+if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('iv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_invoice_id = (int)$request->getParameter('id');
 $invoice = ttInvoiceHelper::getInvoice($cl_invoice_id); 
diff --git a/invoice_view.php b/invoice_view.php
index 3715b80a2..62f0cbbff 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -32,11 +32,15 @@
 import('ttClientHelper');
 import('form.Form');
 
-// Access check.
-if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices')) || !$user->isPluginEnabled('iv')) {
+// Access checks.
+if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('iv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = (int)$request->getParameter('id');
 $invoice = ttInvoiceHelper::getInvoice($cl_id);
diff --git a/invoices.php b/invoices.php
index a03579b08..1723a8d1d 100644
--- a/invoices.php
+++ b/invoices.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices')) || !$user->isPluginEnabled('iv')) {
+// Access checks.
+if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('iv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $invoices = ttTeamHelper::getActiveInvoices();
 
diff --git a/locking.php b/locking.php
index 8a6f4304c..2b49b8375 100644
--- a/locking.php
+++ b/locking.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('lk')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('lk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_lock_spec = $request->isPost() ? $request->getParameter('lock_spec') : $user->lock_spec;
 
diff --git a/login.php b/login.php
index e246e0a51..a3345d0e0 100644
--- a/login.php
+++ b/login.php
@@ -62,7 +62,7 @@
 
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
-      if ($user->isAdmin()) {
+      if ($user->can('administer_site')) {
         header('Location: admin_teams.php');
       } elseif ($user->isClient()) {
         header('Location: reports.php');
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 934c63a78..f0fc5c304 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -33,11 +33,15 @@
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
diff --git a/mobile/feature_disabled.php b/mobile/feature_disabled.php
new file mode 100644
index 000000000..cf399568e
--- /dev/null
+++ b/mobile/feature_disabled.php
@@ -0,0 +1,36 @@
+<?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');
+
+$err->add($i18n->get('error.feature_disabled'));
+if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
+
+$smarty->assign('title', $i18n->get('label.error'));
+$smarty->assign('content_page_name', 'mobile/access_denied.tpl');
+$smarty->display('mobile/index.tpl');
diff --git a/mysql.sql b/mysql.sql
index df34b7759..ebe59936a 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -13,32 +13,32 @@
 # This table stores settings common to all team members such as language, week start day, etc.
 #
 CREATE TABLE `tt_teams` (
-  `id` int(11) NOT NULL auto_increment,                      # team id
-  `name` varchar(80) default NULL,                           # team name
-  `currency` varchar(7) default NULL,                        # team currency symbol
-  `decimal_mark` char(1) NOT NULL default '.',               # separator in decimals
-  `lang` varchar(10) NOT NULL default 'en',                  # language
-  `date_format` varchar(20) NOT NULL default '%Y-%m-%d',     # date format
-  `time_format` varchar(20) NOT NULL default '%H:%M',        # time format
-  `week_start` smallint(2) NOT NULL default 0,               # Week start day, 0 == Sunday.
-  `tracking_mode` smallint(2) NOT NULL default 1,            # tracking mode ("time", "projects" or "projects and tasks")
-  `project_required` smallint(2) NOT NULL default 0,         # whether a project selection is required or optional
-  `task_required` smallint(2) NOT NULL default 0,            # whether a task selection is required or optional
-  `record_type` smallint(2) NOT NULL default 0,              # time record type ("start and finish", "duration", or both)
-  `bcc_email` varchar(100) default NULL,                     # bcc email to copy all reports to
-  `plugins` varchar(255) default NULL,                       # a list of enabled plugins for team
-  `lock_spec` varchar(255) default NULL,                     # Cron specification for record locking,
-                                                             # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
-  `workday_minutes` smallint(4) default 480,                 # number of work minutes in a regular working day
-  `custom_logo` tinyint(4) default 0,                        # whether to use a custom logo or not
-  `config` text default NULL,                                # miscellaneous team configuration settings
-  `created` datetime default NULL,                           # creation timestamp
-  `created_ip` varchar(45) default NULL,                     # creator ip
-  `created_by` int(11) default NULL,                         # creator user_id
-  `modified` datetime default NULL,                          # modification timestamp
-  `modified_ip` varchar(45) default NULL,                    # modifier ip
-  `modified_by` int(11) default NULL,                        # modifier user_id
-  `status` tinyint(4) default 1,                             # team status
+  `id` int(11) NOT NULL auto_increment,                  # team id
+  `name` varchar(80) default NULL,                       # team name
+  `currency` varchar(7) default NULL,                    # team currency symbol
+  `decimal_mark` char(1) NOT NULL default '.',           # separator in decimals
+  `lang` varchar(10) NOT NULL default 'en',              # language
+  `date_format` varchar(20) NOT NULL default '%Y-%m-%d', # date format
+  `time_format` varchar(20) NOT NULL default '%H:%M',    # time format
+  `week_start` smallint(2) NOT NULL default 0,           # Week start day, 0 == Sunday.
+  `tracking_mode` smallint(2) NOT NULL default 1,        # tracking mode ("time", "projects" or "projects and tasks")
+  `project_required` smallint(2) NOT NULL default 0,     # whether a project selection is required or optional
+  `task_required` smallint(2) NOT NULL default 0,        # whether a task selection is required or optional
+  `record_type` smallint(2) NOT NULL default 0,          # time record type ("start and finish", "duration", or both)
+  `bcc_email` varchar(100) default NULL,                 # bcc email to copy all reports to
+  `plugins` varchar(255) default NULL,                   # a list of enabled plugins for team
+  `lock_spec` varchar(255) default NULL,                 # Cron specification for record locking,
+                                                         # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
+  `workday_minutes` smallint(4) default 480,             # number of work minutes in a regular working day
+  `custom_logo` tinyint(4) default 0,                    # whether to use a custom logo or not
+  `config` text default NULL,                            # miscellaneous team configuration settings
+  `created` datetime default NULL,                       # creation timestamp
+  `created_ip` varchar(45) default NULL,                 # creator ip
+  `created_by` int(11) default NULL,                     # creator user_id
+  `modified` datetime default NULL,                      # modification timestamp
+  `modified_ip` varchar(45) default NULL,                # modifier ip
+  `modified_by` int(11) default NULL,                    # modifier user_id
+  `status` tinyint(4) default 1,                         # team status
   PRIMARY KEY (`id`)
 );
 
diff --git a/notification_add.php b/notification_add.php
index 6d0e4d31a..7dd680ff3 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -33,11 +33,15 @@
 import('ttFavReportHelper');
 import('ttNotificationHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('no')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('no')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $fav_reports = ttFavReportHelper::getReports($user->id);
 
diff --git a/notification_delete.php b/notification_delete.php
index 46de065d6..b18ac614f 100644
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttNotificationHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('no')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('no')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_notification_id = (int)$request->getParameter('id');
 $notification = ttNotificationHelper::get($cl_notification_id);
diff --git a/notification_edit.php b/notification_edit.php
index 431798285..1c36865f3 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -33,11 +33,15 @@
 import('ttFavReportHelper');
 import('ttNotificationHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('no')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('no')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $notification_id = (int) $request->getParameter('id');
 $fav_reports = ttFavReportHelper::getReports($user->id);
diff --git a/notifications.php b/notifications.php
index c03378d29..6dcf33fd2 100644
--- a/notifications.php
+++ b/notifications.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('no')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('no')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $form = new Form('notificationsForm');
 
diff --git a/password_change.php b/password_change.php
index bcbd5f4ad..832118f6c 100644
--- a/password_change.php
+++ b/password_change.php
@@ -82,7 +82,7 @@
     if ($auth->doLogin($user->login, $cl_password1)) {
       setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
       // Redirect, depending on user role.
-      if ($user->isAdmin()) {
+      if ($user->can('administer_site')) {
         header('Location: admin_teams.php');
       } elseif ($user->isClient()) {
         header('Location: reports.php');

From 030d2c3ffbf8229cc945427e9e9f7704226effe1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 19:37:00 +0000
Subject: [PATCH 0038/1848] A bit more progress on refactoring access checks.

---
 WEB-INF/lib/ttTeamHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/user_edit.tpl    |  2 +-
 expense_delete.php                 |  2 --
 predefined_expense_add.php         |  8 ++++++--
 predefined_expense_delete.php      |  8 ++++++--
 predefined_expense_edit.php        |  8 ++++++--
 predefined_expenses.php            |  8 ++++++--
 project_add.php                    |  8 ++++++--
 project_delete.php                 |  8 ++++++--
 project_edit.php                   |  8 ++++++--
 projects.php                       |  8 ++++++--
 quotas.php                         |  8 ++++++--
 report.php                         |  2 +-
 report_send.php                    |  2 +-
 reports.php                        |  2 +-
 role_edit.php                      |  3 ++-
 swap_roles.php                     | 11 +++++++----
 user_edit.php                      |  8 ++++++++
 19 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index de034794f..5aeee2196 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -143,7 +143,7 @@ static function getUsersForSwap() {
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {
-      $isClient = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have data entry right.
+      $isClient = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have track_own_time right.
       if ($isClient)
         continue; // Skip adding clients.
       $user_list[] = $val;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b84e12b6..b99c720bf 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.17.69.4156 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4157 | 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/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 15bf3fe27..6b09881d8 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -108,7 +108,7 @@ function handleClientControl() {
 {if $user->id == $user_id}
       <tr>
       <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$user->role_name} {if $user->can('swap_roles')}<a href="swap_roles.php">{$i18n.form.profile.swap_roles}</a>{/if}</td>
+      <td>{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.profile.swap_roles}</a>{/if}</td>
     </tr>
 {/if}
     <tr>
diff --git a/expense_delete.php b/expense_delete.php
index 42a6add80..1f7fbb34b 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -41,8 +41,6 @@
   exit();
 }
 
-
-
 $cl_id = $request->getParameter('id');
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 82cf99b63..2f1621cac 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttPredefinedExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index c8ae1c822..9b4450325 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttPredefinedExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_predefined_expense_id = (int)$request->getParameter('id');
 $predefined_expense = ttPredefinedExpenseHelper::get($cl_predefined_expense_id);
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index 220778a98..7791b2440 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttPredefinedExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $predefined_expense_id = (int) $request->getParameter('id');
 
diff --git a/predefined_expenses.php b/predefined_expenses.php
index 4e799121b..7aed7ad60 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $form = new Form('predefinedExpensesForm');
 
diff --git a/project_add.php b/project_add.php
index 6b55019cb..55b83b42a 100644
--- a/project_add.php
+++ b/project_add.php
@@ -31,11 +31,15 @@
 import('ttProjectHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_projects') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $users = ttTeamHelper::getActiveUsers();
 foreach ($users as $user_item)
diff --git a/project_delete.php b/project_delete.php
index 683dbc50c..2373bbead 100644
--- a/project_delete.php
+++ b/project_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttProjectHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_projects') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_project_id = (int)$request->getParameter('id');
 $project = ttProjectHelper::get($cl_project_id);
diff --git a/project_edit.php b/project_edit.php
index be0e90fa9..d30782ab5 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -31,11 +31,15 @@
 import('ttProjectHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_projects') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_project_id = (int)$request->getParameter('id');
 
diff --git a/projects.php b/projects.php
index ed0103a4e..5315c4f70 100644
--- a/projects.php
+++ b/projects.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_time') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 if($user->canManageTeam()) {
   $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
diff --git a/quotas.php b/quotas.php
index 19e70e505..c921fba4c 100644
--- a/quotas.php
+++ b/quotas.php
@@ -32,11 +32,15 @@
 import('ttTeamHelper');
 import('ttTimeHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('mq')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('mq')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 // Start and end fallback values for the Year dropdown.
 $yearStart = 2015;
diff --git a/report.php b/report.php
index 190dff8ee..c59f6b5e3 100644
--- a/report.php
+++ b/report.php
@@ -33,7 +33,7 @@
 import('ttTeamHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_own_reports')) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/report_send.php b/report_send.php
index b420b3aca..d7c031fd7 100644
--- a/report_send.php
+++ b/report_send.php
@@ -33,7 +33,7 @@
 import('ttReportHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_own_reports')) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/reports.php b/reports.php
index 390c85c68..3a7367e77 100644
--- a/reports.php
+++ b/reports.php
@@ -37,7 +37,7 @@
 import('ttClientHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_own_reports')) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/role_edit.php b/role_edit.php
index 3eb7696b0..f5f3762b3 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -32,7 +32,7 @@
 import('ttTaskHelper'); // TODO: remove this?
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
@@ -43,6 +43,7 @@
   header('Location: access_denied.php');
   exit();
 }
+
 $assigned_rights = explode(',', $role['rights']);
 $available_rights = array_diff($user->rights, $assigned_rights);
 
diff --git a/swap_roles.php b/swap_roles.php
index 09178cd94..59a726c5b 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -30,20 +30,23 @@
 import('form.Form');
 import('ttUserHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('swap_roles')) {
   header('Location: access_denied.php');
   exit();
 }
-
-$users = ttTeamHelper::getUsersForSwap();
+$users_for_swap = ttTeamHelper::getUsersForSwap();
+if (!is_array($users_for_swap) || sizeof($users_for_swap) == 0) {
+  header('Location: access_denied.php');
+  exit();
+}
 
 if ($request->isPost()) {
   $cl_id = $request->getParameter('swap_with');
 }
 
 $form = new Form('swapForm');
-$form->addInput(array('type'=>'combobox','name'=>'swap_with','style'=>'width: 250px;','data'=>$users,'datakeys'=>array('id','name')));
+$form->addInput(array('type'=>'combobox','name'=>'swap_with','style'=>'width: 250px;','data'=>$users_for_swap,'datakeys'=>array('id','name')));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
diff --git a/user_edit.php b/user_edit.php
index 531e84242..75d89e506 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -222,11 +222,19 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
+$can_swap = false;
+if ($user->id == $user_id && $user->can('swap_roles')) {
+  $users_for_swap = ttTeamHelper::getUsersForSwap();
+  if (is_array($users_for_swap) && sizeof($users_for_swap) > 0)
+    $can_swap = true;
+}
+
 $rates = ttProjectHelper::getRates($user_id);
 $smarty->assign('rates', $rates);
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
+$smarty->assign('can_swap', $can_swap);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('user_id', $user_id);

From a8a4278a6a87c600835890a10c774dfdc58e930a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 19:52:42 +0000
Subject: [PATCH 0039/1848] More improvements to access checks.

---
 WEB-INF/templates/footer.tpl | 2 +-
 task_add.php                 | 8 ++++++--
 task_delete.php              | 8 ++++++--
 task_edit.php                | 8 ++++++--
 tasks.php                    | 8 ++++++--
 time.php                     | 2 +-
 time_delete.php              | 2 +-
 time_edit.php                | 2 +-
 tofile.php                   | 2 +-
 topdf.php                    | 2 +-
 users.php                    | 2 +-
 week.php                     | 8 ++++++--
 week_view.php                | 8 ++++++--
 13 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b99c720bf..a4a020e71 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.17.69.4157 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.69.4158 | 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/task_add.php b/task_add.php
index 12c54464d..a5149e840 100644
--- a/task_add.php
+++ b/task_add.php
@@ -32,11 +32,15 @@
 import('ttTeamHelper');
 import('ttTaskHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
diff --git a/task_delete.php b/task_delete.php
index d72220d2f..0e9f40cfe 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -30,11 +30,15 @@
 import('ttTaskHelper');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_task_id = (int)$request->getParameter('id');
 $task = ttTaskHelper::get($cl_task_id);
diff --git a/task_edit.php b/task_edit.php
index 36e717d7e..bba89bebd 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -31,11 +31,15 @@
 import('ttTeamHelper');
 import('ttTaskHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_task_id = (int)$request->getParameter('id');
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
diff --git a/tasks.php b/tasks.php
index 5bc3fd459..5505e6ddd 100644
--- a/tasks.php
+++ b/tasks.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
 $smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
diff --git a/time.php b/time.php
index 270a8aaef..1c29aa8f6 100644
--- a/time.php
+++ b/time.php
@@ -42,7 +42,7 @@
 // }
 
 // Access check.
-if (!ttAccessAllowed('track_own_time')) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/time_delete.php b/time_delete.php
index 2ad3ea412..ec3c677cc 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -33,7 +33,7 @@
 import('DateAndTime');
 
 // Access check.
-if (!ttAccessAllowed('track_own_time')) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/time_edit.php b/time_edit.php
index dd3edde13..c14928f56 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -35,7 +35,7 @@
 import('DateAndTime');
 
 // Access check.
-if (!ttAccessAllowed('track_own_time')) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/tofile.php b/tofile.php
index 67c5b31ce..abd1f278b 100644
--- a/tofile.php
+++ b/tofile.php
@@ -32,7 +32,7 @@
 import('ttReportHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_own_reports')) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/topdf.php b/topdf.php
index b8f6684c4..3177d1559 100644
--- a/topdf.php
+++ b/topdf.php
@@ -36,7 +36,7 @@
 import('ttReportHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_own_reports')) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/users.php b/users.php
index 860218638..35fd4168c 100644
--- a/users.php
+++ b/users.php
@@ -33,7 +33,7 @@
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_users')) {
+if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/week.php b/week.php
index e26aa1192..f1dc78893 100644
--- a/week.php
+++ b/week.php
@@ -38,11 +38,15 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
-if (!ttAccessAllowed('track_own_time') || !$user->isPluginEnabled('wv')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('wv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
diff --git a/week_view.php b/week_view.php
index b273d2789..e5ec14796 100644
--- a/week_view.php
+++ b/week_view.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('wv')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('wv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 if ($request->isPost()) {
   $cl_week_note = $request->getParameter('week_note');

From dd2ba64b1b4aaddacec2b9f6763c0ed7a35efc3b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 21:08:52 +0000
Subject: [PATCH 0040/1848] Finished improving access checks by providing
 separate error msg for disabled features.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/client_add.php        | 8 ++++++--
 mobile/client_delete.php     | 8 ++++++--
 mobile/client_edit.php       | 8 ++++++--
 mobile/clients.php           | 8 ++++++--
 mobile/expense_delete.php    | 8 ++++++--
 mobile/expense_edit.php      | 8 ++++++--
 mobile/index.php             | 2 +-
 mobile/project_add.php       | 8 ++++++--
 mobile/project_delete.php    | 8 ++++++--
 mobile/project_edit.php      | 8 ++++++--
 mobile/projects.php          | 8 ++++++--
 mobile/task_add.php          | 8 ++++++--
 mobile/task_delete.php       | 8 ++++++--
 mobile/task_edit.php         | 8 ++++++--
 mobile/tasks.php             | 8 ++++++--
 mobile/users.php             | 2 +-
 17 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4a020e71..4eb4fd678 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.17.69.4158 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.70.4159 | 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/client_add.php b/mobile/client_add.php
index 134819bb1..fc57853d7 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -31,11 +31,15 @@
 import('ttClientHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
diff --git a/mobile/client_delete.php b/mobile/client_delete.php
index e23cd026b..154d89308 100644
--- a/mobile/client_delete.php
+++ b/mobile/client_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttClientHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $id = (int)$request->getParameter('id');
 $client = ttClientHelper::getClient($id);
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index e4bc9b22b..eb8592290 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -31,11 +31,15 @@
 import('ttClientHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = (int) $request->getParameter('id');
 
diff --git a/mobile/clients.php b/mobile/clients.php
index d1a49f1e1..43e6848ae 100644
--- a/mobile/clients.php
+++ b/mobile/clients.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->team_id, true));
 $smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->team_id, true));
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index 48051b426..cca61b7c1 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -31,11 +31,15 @@
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = $request->getParameter('id');
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 7107e7851..8da55a1eb 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -32,11 +32,15 @@
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_id = $request->getParameter('id');
 
diff --git a/mobile/index.php b/mobile/index.php
index 1c7cf231c..9b2ed530f 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -30,7 +30,7 @@
 
 // Redirects for admin and client roles.
 if ($auth->isAuthenticated()) {
-  if ($user->isAdmin()) {
+  if ($user->can('administer_site')) {
     header('Location: ../admin_teams.php');
     exit();
   } elseif ($user->isClient()) {
diff --git a/mobile/project_add.php b/mobile/project_add.php
index bbaa8fa75..a9495d715 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -31,11 +31,15 @@
 import('ttProjectHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_projects') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $users = ttTeamHelper::getActiveUsers();
 foreach ($users as $user_item)
diff --git a/mobile/project_delete.php b/mobile/project_delete.php
index d2b0b32b8..c8753b844 100644
--- a/mobile/project_delete.php
+++ b/mobile/project_delete.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttProjectHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_projects') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_project_id = (int)$request->getParameter('id');
 $project = ttProjectHelper::get($cl_project_id);
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 31ea65da4..74454ec41 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -31,11 +31,15 @@
 import('ttProjectHelper');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_projects') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_project_id = (int)$request->getParameter('id');
 
diff --git a/mobile/projects.php b/mobile/projects.php
index 5dec7ee36..93261d425 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_time') || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 if($user->canManageTeam()) {
   $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
diff --git a/mobile/task_add.php b/mobile/task_add.php
index 0c405b6fa..a976ac5c9 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -32,11 +32,15 @@
 import('ttTeamHelper');
 import('ttTaskHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
diff --git a/mobile/task_delete.php b/mobile/task_delete.php
index df3c964a5..1146a2ac2 100644
--- a/mobile/task_delete.php
+++ b/mobile/task_delete.php
@@ -30,11 +30,15 @@
 import('ttTaskHelper');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_task_id = (int)$request->getParameter('id');
 $task = ttTaskHelper::get($cl_task_id);
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index 2ba2cc554..346899dce 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -31,11 +31,15 @@
 import('ttTeamHelper');
 import('ttTaskHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $cl_task_id = (int)$request->getParameter('id');
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
diff --git a/mobile/tasks.php b/mobile/tasks.php
index 25575eb65..edb57089e 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -30,11 +30,15 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
 $smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
 $smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
diff --git a/mobile/users.php b/mobile/users.php
index 131d2b44c..67654376e 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -32,7 +32,7 @@
 import('ttTimeHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_users')) {
+if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }

From e02d7592b0556895e35f4d028939197c132f6b09 Mon Sep 17 00:00:00 2001
From: bonnedav <theD_2011@hotmail.com>
Date: Sat, 24 Mar 2018 15:39:39 -0600
Subject: [PATCH 0041/1848] Refactor header to use user rights. (#57)

* Refactor header to use user rights.

* use "manage_own_settings" for porfile link
---
 WEB-INF/templates/header.tpl | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 1d6622165..9ed099a63 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -83,7 +83,9 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
-            <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
+            {if $user->can('manage_own_settings')}
+              <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
+            {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
@@ -95,33 +97,35 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
-    {if !$user->isClient()}
+    {if $user->can('track_time') || $user->can('track_own_time')}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
-    {if $user->isPluginEnabled('ex') && !$user->isClient()}
+    {if $user->isPluginEnabled('ex') && ($user->can('track_expenses') || $user->can('track_own_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-            {if !$user->isClient()}&middot; {/if}<a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
+    {if $user->can('view_invoices') || $user->can('view_own_reports')}
+            &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
+    {/if}        
     {if $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_own_invoices'))}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
-    {if ($user->isPluginEnabled('ch') && !$user->isClient()) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
+    {if ($user->isPluginEnabled('ch') && ($user->can('view_charts') || $user->can('view_own_charts'))) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
       || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if !$user->isClient() && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $user->can('manage_projects') && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode) && $user->can('manage_tasks')}
             &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
-    {if !$user->isClient()}
+    {if $user->can('view_users') || $user->can('manage_users')}
             &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
     {if $user->isPluginEnabled('cl') && $user->can('manage_clients')}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
-    {if $user->isManager()}
+    {if $user->can('export_data')}
             &middot; <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
     {/if}
           </td>

From 31c09561b78ef5a9e40f8ff5b18e068f6ff881bc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 22:00:19 +0000
Subject: [PATCH 0042/1848] Some fixes for desktop header.tpl.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/header.tpl | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4eb4fd678..aa964b0a4 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.17.70.4159 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.70.4160 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 9ed099a63..f33bc6b73 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -54,7 +54,7 @@
       <!-- end of top image -->
 
 {if $authenticated}
-  {if $user->isAdmin()}
+  {if $user->can('administer_site')}
       <!-- top menu for admin -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
@@ -83,9 +83,9 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
-            {if $user->can('manage_own_settings')}
-              <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
-            {/if}
+    {if $user->can('manage_own_settings')}
+            <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
+    {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
@@ -97,23 +97,23 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
-    {if $user->can('track_time') || $user->can('track_own_time')}
+    {if $user->can('track_own_time') || $user->can('track_time')}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
-    {if $user->isPluginEnabled('ex') && ($user->can('track_expenses') || $user->can('track_own_expenses'))}
+    {if $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if $user->can('view_invoices') || $user->can('view_own_reports')}
+    {if $user->can('view_own_reports') || $user->can('view_reports')}
             &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
     {/if}        
-    {if $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_own_invoices'))}
+    {if $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
-    {if ($user->isPluginEnabled('ch') && ($user->can('view_charts') || $user->can('view_own_charts'))) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
+    {if ($user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
       || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if $user->can('manage_projects') && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('track_own_time') || $user->can('track_time')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode) && $user->can('manage_tasks')}

From e60508fb73602f118d17c06a9103532da05306c5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 22:05:41 +0000
Subject: [PATCH 0043/1848] Fixed projects menu for users with manage_projects
 right.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aa964b0a4..c2bbeb8b7 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.17.70.4160 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.70.4161 | 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/header.tpl b/WEB-INF/templates/header.tpl
index f33bc6b73..97ee53dae 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -113,7 +113,7 @@
       || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if ($user->can('track_own_time') || $user->can('track_time')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('manage_projects') || $user->can('track_own_time') || $user->can('track_time')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode) && $user->can('manage_tasks')}

From c7f2e7126f6f508487a23d0770ca4f8543278379 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Mar 2018 22:16:05 +0000
Subject: [PATCH 0044/1848] Refactored mobile header to use access rights.

---
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/mobile/header.tpl | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c2bbeb8b7..5f16dbdf0 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.17.70.4161 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.70.4162 | 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/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 87d2c4012..507a07e02 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -55,7 +55,7 @@
       <!-- end of top image -->
       
 {if $authenticated}
-  {if $user->isAdmin()}
+  {if $user->can('administer_site')}
   
       <!-- sub menu for admin -->
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
@@ -73,22 +73,22 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
-    {if !$user->isClient()}
+    {if $user->can('track_own_time') || $user->can('track_time')}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
-    {if $user->isPluginEnabled('ex') && !$user->isClient()}
+    {if $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if !$user->isClient() && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('manage_projects') || $user->can('track_own_time') || $user->can('track_time')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if $user->canManageTeam() && ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $user->can('manage_tasks') && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode}
             &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
-    {if !$user->isClient()}
+    {if $user->can('view_users') || $user->can('manage_users')}
             &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
-    {if $user->canManageTeam() && $user->isPluginEnabled('cl')}
+    {if $user->isPluginEnabled('cl') && $user->can('manage_clients')}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
           </td>

From 68a5cc5aff88d6144b6db95f7d01315c15e2ebda Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Mar 2018 16:22:57 +0000
Subject: [PATCH 0045/1848] Fixed the charts tab to work better for lower roles
 only.

---
 WEB-INF/lib/ttUser.class.php | 54 ++++++++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/users.tpl  | 12 ++++----
 charts.php                   | 10 +++++--
 4 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0a1048884..95edd6e48 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -241,4 +241,58 @@ function canOverridePunchMode()
 
     return true;
   }
+
+  // getUsers obtains users in a group, as specififed by options.
+  function getUsers($options) {
+
+    $mdb2 = getConnection();
+
+    $skipClients = !isset($options['include_clients']);
+    $includeSelf = isset($options['include_self']);
+
+    $select_part = 'select u.id, u.name';
+    if (!isset($options['include_clients'])) $select_part .= ', r.rights';
+
+    $from_part = ' from tt_users u';
+
+    $left_joins = null;
+    if (isset($options['max_rank']) || $skipClients)
+        $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
+
+    $where_part = " where u.team_id = $this->team_id";
+    if (isset($options['status'])) $where_part .= ' and u.status = '.(int)$options['status'];
+    if ($includeSelf) {
+      $where_part .= " and (u.id = $this->id || r.rank <= ".(int)$options['max_rank'].')';
+    } else {
+      if (isset($options['max_rank'])) $where_part .= ' and r.rank <= '.(int)$options['max_rank'];
+    }
+
+    $sql = $select_part.$from_part.$left_joins.$where_part;
+    $res = $mdb2->query($sql);
+    $user_list = array();
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+
+    while ($val = $res->fetchRow()) {
+      if ($skipClients) {
+        $isClient = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have track_own_time right.
+        if ($isClient)
+          continue; // Skip adding clients.
+      }
+      $user_list[] = $val;
+    }
+
+    if (isset($options['self_first'])) {
+      // Put own entry at the front.
+      $cnt = count($user_list);
+      for($i = 0; $i < $cnt; $i++) {
+        if ($user_list[$i]['id'] == $this->id) {
+          $self = $user_list[$i]; // Found self.
+          array_unshift($user_list, $self); // Put own entry at the front.
+          array_splice($user_list, $i+1, 1); // Remove duplicate.
+        }
+      }
+    }
+    return $user_list;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5f16dbdf0..a470afaac 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.17.70.4162 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.71.4163 | 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/users.tpl b/WEB-INF/templates/users.tpl
index f47435322..008413391 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -11,9 +11,9 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
   {/if}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.login}</td>
+          <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
           <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
           <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
         </tr>
@@ -52,9 +52,9 @@
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.inactive_users}</td></tr>
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
+          <td width="30%" class="tableHeader">{$i18n.label.login}</td>
+          <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
           <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
           <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
         </tr>
diff --git a/charts.php b/charts.php
index f2b01f16f..a44c9926d 100644
--- a/charts.php
+++ b/charts.php
@@ -38,7 +38,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!ttAccessAllowed('view_own_charts')) {
+if (!(ttAccessAllowed('view_own_charts') || ttAccessAllowed('view_charts'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -128,8 +128,12 @@
 
 // User dropdown. Changes the user "on behalf" of whom we are working. 
 if ($user->can('view_charts')) {
-  $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
-  if (count($user_list) > 1) {
+  if ($user->can('view_own_charts'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
     $chart_form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',
       'name'=>'onBehalfUser',

From 2ff04a2baeaa449ab30b822e2bb52ff792776753 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Mar 2018 20:25:40 +0000
Subject: [PATCH 0046/1848] A bit better job with access checks for charts.

---
 WEB-INF/lib/ttUser.class.php | 33 +++++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 charts.php                   |  8 ++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 95edd6e48..85b26d517 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -295,4 +295,37 @@ function getUsers($options) {
     }
     return $user_list;
   }
+
+  // checkBehalfId checks whether behalf_id is appropriate.
+  // On behalf user must be active and have lower rank.
+  function checkBehalfId() {
+    $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
+    $users = $this->getUsers($options);
+    foreach($users as $one_user) {
+      if ($one_user['id'] == $this->behalf_id)
+        return true;
+    }
+
+    return false;
+  }
+
+  // adjustBehalfId attempts to adjust behalf_id and behalf_name to a first found
+  // aapropriate user.
+  //
+  // Needed for situations when use does not have do_own_something right.
+  // Example: has view_charts but does not have view_own_charts.
+  // In this case we still allow access to charts, but set behalf_id to someone else.
+  function adjustBehalfId() {
+    $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
+    $users = $this->getUsers($options);
+    foreach($users as $one_user) {
+      // Fake loop to access first element.
+      $this->behalf_id = $one_user['id'];
+      $this->behalf_name = $one_user['name'];
+      $_SESSION['behalf_id'] = $this->behalf_id;
+      $_SESSION['behalf_name'] = $this->behalf_name;
+      return true;
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a470afaac..d003b9bd7 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.17.71.4163 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.71.4164 | 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/charts.php b/charts.php
index a44c9926d..d6707038f 100644
--- a/charts.php
+++ b/charts.php
@@ -46,6 +46,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($user->behalf_id && (!$user->can('view_charts') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('view_own_charts') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);

From 5f1b7a5bed3563565e28a5bf851298d3ed7df8c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Mar 2018 20:28:44 +0000
Subject: [PATCH 0047/1848] Fixed typos.

---
 WEB-INF/lib/ttUser.class.php | 5 ++---
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 85b26d517..3461ac5bf 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -305,14 +305,13 @@ function checkBehalfId() {
       if ($one_user['id'] == $this->behalf_id)
         return true;
     }
-
     return false;
   }
 
   // adjustBehalfId attempts to adjust behalf_id and behalf_name to a first found
-  // aapropriate user.
+  // apropriate user.
   //
-  // Needed for situations when use does not have do_own_something right.
+  // Needed for situations when user does not have do_own_something right.
   // Example: has view_charts but does not have view_own_charts.
   // In this case we still allow access to charts, but set behalf_id to someone else.
   function adjustBehalfId() {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d003b9bd7..7a02ae7b0 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.17.71.4164 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.71.4165 | 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>

From e7b081c97f2f2cfa69ca8df99afdeb8506eff726 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Mar 2018 20:43:45 +0000
Subject: [PATCH 0048/1848] Improved time page with a better filter for on
 behalf users - lower roles only.

---
 WEB-INF/templates/footer.tpl |  2 +-
 time.php                     | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7a02ae7b0..d1cf3d01b 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.17.71.4165 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.71.4166 | 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/time.php b/time.php
index 1c29aa8f6..18979fe22 100644
--- a/time.php
+++ b/time.php
@@ -41,11 +41,19 @@
   // die ("Your browser's cookie functionality is turned off. Please turn it on.");
 // }
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -103,9 +111,13 @@
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
 
-if ($user->canManageTeam()) {
-  $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
-  if (count($user_list) > 1) {
+if ($user->can('track_time')) {
+  if ($user->can('track_own_time'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',
       'name'=>'onBehalfUser',

From e560c531255da8d1fa40295c58cc5c4b1bb4e9d3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Mar 2018 21:32:25 +0000
Subject: [PATCH 0049/1848] Improved population of on behalf dropdowns on week
 view and expenses pages.

---
 WEB-INF/templates/footer.tpl |  2 +-
 expenses.php                 | 18 +++++++++++++++---
 mobile/expenses.php          | 18 +++++++++++++++---
 time.php                     |  2 +-
 week.php                     | 16 ++++++++++++++--
 5 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d1cf3d01b..2be4b9359 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.17.71.4166 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.71.4167 | 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/expenses.php b/expenses.php
index 00b43179c..7291414aa 100644
--- a/expenses.php
+++ b/expenses.php
@@ -42,6 +42,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_expenses') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -64,9 +72,13 @@
 // Elements of expensesForm.
 $form = new Form('expensesForm');
 
-if ($user->canManageTeam()) {
-  $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
-  if (count($user_list) > 1) {
+if ($user->can('track_expenses')) {
+  if ($user->can('track_own_expenses'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',
       'name'=>'onBehalfUser',
diff --git a/mobile/expenses.php b/mobile/expenses.php
index f0fc5c304..1cd39c04c 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -42,6 +42,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_expenses') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -68,9 +76,13 @@
 // Elements of expensesForm.
 $form = new Form('expensesForm');
 
-if ($user->canManageTeam()) {
-  $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
-  if (count($user_list) > 1) {
+if ($user->can('track_expenses')) {
+  if ($user->can('track_own_expenses'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',
       'name'=>'onBehalfUser',
diff --git a/time.php b/time.php
index 18979fe22..98a383fdd 100644
--- a/time.php
+++ b/time.php
@@ -51,7 +51,7 @@
   exit();
 }
 if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
 
diff --git a/week.php b/week.php
index f1dc78893..741a2bb4e 100644
--- a/week.php
+++ b/week.php
@@ -47,6 +47,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -203,8 +211,12 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $form = new Form('weekTimeForm');
 
 if ($user->can('track_time')) {
-  $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
-  if (count($user_list) > 1) {
+  if ($user->can('track_own_time'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',
       'name'=>'onBehalfUser',

From 0a7886b373c91ef0c2c41307f81177d043c807be Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Mar 2018 22:31:31 +0000
Subject: [PATCH 0050/1848] Access check improvements for time and expense
 edits and deletes.

---
 WEB-INF/templates/footer.tpl |  2 +-
 expense_delete.php           | 12 +++++++-----
 expense_edit.php             | 12 ++++++------
 mobile/expense_delete.php    | 12 +++++++-----
 mobile/expense_edit.php      | 12 ++++++------
 mobile/time_delete.php       | 14 ++++++++------
 mobile/time_edit.php         | 16 ++++++++--------
 time_delete.php              | 14 ++++++++------
 time_edit.php                | 18 +++++++++---------
 9 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2be4b9359..658d120a3 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.17.71.4167 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4168 | 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/expense_delete.php b/expense_delete.php
index 1f7fbb34b..49bb8ac1b 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -40,12 +40,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
+// Get the expense item we are deleting.
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
-
-// Prohibit deleting invoiced records.
-if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
+if (!$expense_item || $expense_item['invoice_id']) {
+  // Prohibit deleting not ours or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
diff --git a/expense_edit.php b/expense_edit.php
index 15cfcfaf5..99503b06b 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -41,14 +41,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
-
+$cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
-
-// Prohibit editing invoiced items.
-if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
+if (!$expense_item || $expense_item['invoice_id']) {
+  // Prohibit editing not ours or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
 
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index cca61b7c1..a6f0989e6 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -40,12 +40,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
+// Get the expense item we are deleting.
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
-
-// Prohibit deleting invoiced records.
-if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
+if (!$expense_item || $expense_item['invoice_id']) {
+  // Prohibit deleting not ours or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 8da55a1eb..1611378d9 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -41,14 +41,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
-
+$cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
-
-// Prohibit editing invoiced items.
-if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
+if (!$expense_item || $expense_item['invoice_id']) {
+  // Prohibit editing not ours or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
 
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 33ba61468..5d6918c59 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -32,17 +32,19 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
+// Get the time record we are deleting.
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
-
-// Prohibit deleting invoiced records.
-if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
+if (!$time_rec || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours or invoiced records.
+  header('Location: access_denied.php');
+  exit();
+}
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 683bab74f..eff9b3358 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -39,6 +39,14 @@
   header('Location: access_denied.php');
   exit();
 }
+$cl_id = (int)$request->getParameter('id');
+// Get the time record we are editing.
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+if (!$time_rec || $time_rec['invoice_id']) {
+  // Prohibit editing not ours or invoiced records.
+  header('Location: access_denied.php');
+  exit();
+}
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -47,14 +55,6 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-$cl_id = $request->getParameter('id');
-
-// Get the time record we are editing.
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
-
-// Prohibit editing invoiced records.
-if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
-
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
 
 // Initialize variables.
diff --git a/time_delete.php b/time_delete.php
index ec3c677cc..060311e87 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -32,17 +32,19 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
+// Get the time record we are deleting.
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
-
-// Prohibit deleting invoiced records.
-if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
+if (!$time_rec || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours or invoiced records.
+  header('Location: access_denied.php');
+  exit();
+}
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
diff --git a/time_edit.php b/time_edit.php
index c14928f56..05db97c02 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -34,11 +34,19 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
+$cl_id = (int)$request->getParameter('id');
+// Get the time record we are editing.
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+if (!$time_rec || $time_rec['invoice_id']) {
+  // Prohibit editing not ours or invoiced records.
+  header('Location: access_denied.php');
+  exit();
+}
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -47,14 +55,6 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-$cl_id = $request->getParameter('id');
-
-// Get the time record we are editing.
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
-
-// Prohibit editing invoiced records.
-if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
-
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
 
 // Initialize variables.

From 9f4ffc38746c7d23beb7b48ba342dd0cc8e8b19a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 00:10:07 +0000
Subject: [PATCH 0051/1848] Improved users page a bit in accordance with user
 rights.

---
 WEB-INF/lib/ttUser.class.php |  4 +++-
 WEB-INF/templates/footer.tpl |  2 +-
 users.php                    | 17 +++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 3461ac5bf..5321e74d9 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -251,12 +251,14 @@ function getUsers($options) {
     $includeSelf = isset($options['include_self']);
 
     $select_part = 'select u.id, u.name';
+    if (isset($options['include_login'])) $select_part .= ', u.login';
     if (!isset($options['include_clients'])) $select_part .= ', r.rights';
+    if (isset($options['include_role'])) $select_part .= ', r.name as role_name, r.rank';
 
     $from_part = ' from tt_users u';
 
     $left_joins = null;
-    if (isset($options['max_rank']) || $skipClients)
+    if (isset($options['max_rank']) || $skipClients || isset($options['include_role']))
         $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
 
     $where_part = " where u.team_id = $this->team_id";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 658d120a3..e9e28a35e 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.17.72.4168 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4169 | 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/users.php b/users.php
index 35fd4168c..f5335455f 100644
--- a/users.php
+++ b/users.php
@@ -38,11 +38,17 @@
   exit();
 }
 
-// Get users.
-$active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
-if($user->canManageTeam()) {
-  $can_delete_manager = (1 == count($active_users));
-  $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
+// Prepare a list of active users.
+if ($user->can('view_users'))
+  $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+else /* if ($user->can('manage_users')) */
+  $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'self_first'=>true,'include_login'=>true,'include_role'=>true);
+$active_users = $user->getUsers($options);
+
+// Prepare a list of inactive users.
+if($user->can('manage_users')) {
+  $options = array('status'=>INACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+  $inactive_users = $user->getUsers($options);
 }
 
 // Check if the team is set to show indicators for uncompleted time entries.
@@ -55,7 +61,6 @@
 
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
-$smarty->assign('can_delete_manager', $can_delete_manager);
 $smarty->assign('title', $i18n->get('title.users'));
 $smarty->assign('content_page_name', 'users.tpl');
 $smarty->display('index.tpl');

From 2178ec6d4efd6cad07b8f137415ecec207efcdad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 00:14:45 +0000
Subject: [PATCH 0052/1848] Removed self_first option from Users page display -
 unneeded.

---
 WEB-INF/templates/footer.tpl | 2 +-
 users.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e9e28a35e..7239c1384 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.17.72.4169 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4170 | 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/users.php b/users.php
index f5335455f..8787844b4 100644
--- a/users.php
+++ b/users.php
@@ -42,7 +42,7 @@
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
 else /* if ($user->can('manage_users')) */
-  $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'self_first'=>true,'include_login'=>true,'include_role'=>true);
+  $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
 $active_users = $user->getUsers($options);
 
 // Prepare a list of inactive users.

From 9339284bfdaba5a0c2a4e3c9fa000194a508d0bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 13:14:51 +0000
Subject: [PATCH 0053/1848] Improved getUserDetails to not return info for
 deleted users.

---
 WEB-INF/lib/ttUserHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 mobile/user_delete.php             | 1 -
 mobile/user_edit.php               | 1 -
 user_delete.php                    | 9 +++------
 user_edit.php                      | 7 ++-----
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index e4591ea43..583049bd7 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -36,7 +36,7 @@ static function getUserDetails($user_id) {
     global $user;
     $mdb2 = getConnection();
 
-    $sql =  "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.team_id = $user->team_id";
+    $sql =  "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.team_id = $user->team_id and u.status is not null";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7239c1384..77e160e9b 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.17.72.4170 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4171 | 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_delete.php b/mobile/user_delete.php
index d8400456a..0e045d018 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -45,7 +45,6 @@
 
 // Security checks.
 if (!$user_details || // No details.
-     $user_details['team_id'] <> $user->team_id || // User not in team.
      $user_details['rank'] > $user->rank || // User has a bigger rank.
      ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
    ) {
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 285c3442b..497812261 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -47,7 +47,6 @@
 
 // Security checks.
 if (!$user_details || // No details.
-     $user_details['team_id'] <> $user->team_id || // User not in team.
      $user_details['rank'] > $user->rank || // User has a bigger rank.
      ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
    ) {
diff --git a/user_delete.php b/user_delete.php
index a88454bf9..b8ec5e9ad 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -30,27 +30,24 @@
 import('form.Form');
 import('ttUserHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
-
-// Get user id we are deleting from the request.
+// Get user id we are deleting.
 // A cast to int is for safety against manipulation of request parameter (sql injection). 
 $user_id = (int) $request->getParameter('id');
 // We need user name and login to display.
 $user_details = ttUserHelper::getUserDetails($user_id);
-
-// Security checks.
 if (!$user_details || // No details.
-     $user_details['team_id'] <> $user->team_id || // User not in team.
      $user_details['rank'] > $user->rank || // User has a bigger rank.
      ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
    ) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $smarty->assign('user_to_delete', $user_details['name']." (".$user_details['login'].")");
 
diff --git a/user_edit.php b/user_edit.php
index 75d89e506..5ceac373e 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -35,26 +35,23 @@
 import('form.TableColumn');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
-
 // Get user id we are editing from the request.
 $user_id = (int) $request->getParameter('id');
 // Get user details.
 $user_details = ttUserHelper::getUserDetails($user_id);
-
-// Security checks.
 if (!$user_details || // No details.
-     $user_details['team_id'] <> $user->team_id || // User not in team.
      $user_details['rank'] > $user->rank || // User has a bigger rank.
      ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
    ) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($user->isPluginEnabled('cl'))
   $clients = ttTeamHelper::getActiveClients($user->team_id);

From bdbf162130c02c6a5510205c7704ef7d5e8f22ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 14:19:37 +0000
Subject: [PATCH 0054/1848] A bit of refactoring of access checks in user edits
 and deletes.

---
 WEB-INF/lib/ttUser.class.php       | 19 +++++++++++++++++++
 WEB-INF/lib/ttUserHelper.class.php | 15 ---------------
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/user_delete.php             | 15 +++------------
 mobile/user_edit.php               | 13 +++----------
 user_delete.php                    | 10 ++--------
 user_edit.php                      |  9 ++-------
 7 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5321e74d9..7f9894efd 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -298,6 +298,25 @@ function getUsers($options) {
     return $user_list;
   }
 
+  // getUser function is used to manage users in group and returns user details.
+  // At the moment, the function is used for user edits and deletes.
+  function getUser($user_id) {
+    if (!$this->can('manage_users')) return false;
+
+    $mdb2 = getConnection();
+
+    $sql =  "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email, r.rank from tt_users u".
+            " left join tt_roles r on (u.role_id = r.id)".
+            " where u.id = $user_id and u.team_id = $this->team_id and u.status is not null".
+            " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val;
+    }
+    return false;
+  }
+
   // checkBehalfId checks whether behalf_id is appropriate.
   // On behalf user must be active and have lower rank.
   function checkBehalfId() {
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 583049bd7..31c7bde4d 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -31,21 +31,6 @@
 // Class ttUserHelper contains helper functions for operations with users.
 class ttUserHelper {
 
-  // The getUserDetails function returns user details.
-  static function getUserDetails($user_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $sql =  "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.team_id = $user->team_id and u.status is not null";
-    $res = $mdb2->query($sql);
-
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val;
-    }
-    return false;
-  }
-
   // The getUserName function returns user name.
   static function getUserName($user_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 77e160e9b..851570f35 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.17.72.4171 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4172 | 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_delete.php b/mobile/user_delete.php
index 0e045d018..4c9aad878 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -35,22 +35,13 @@
   header('Location: access_denied.php');
   exit();
 }
-
-// Get user id we are deleting from the request.
-// A cast to int is for safety against manipulation of request parameter (sql injection). 
 $user_id = (int) $request->getParameter('id');
-
-// We need user name and login to display.
-$user_details = ttUserHelper::getUserDetails($user_id);
-
-// Security checks.
-if (!$user_details || // No details.
-     $user_details['rank'] > $user->rank || // User has a bigger rank.
-     ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
-   ) {
+$user_details = $user->getUser($user_id);
+if (!$user_details) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $smarty->assign('user_to_delete', $user_details['name']." (".$user_details['login'].")");
 
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 497812261..3baaf1e93 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -39,20 +39,13 @@
   header('Location: access_denied.php');
   exit();
 }
-
-// Get user id we are editing from the request.
 $user_id = (int) $request->getParameter('id');
-// Get user details.
-$user_details = ttUserHelper::getUserDetails($user_id);
-
-// Security checks.
-if (!$user_details || // No details.
-     $user_details['rank'] > $user->rank || // User has a bigger rank.
-     ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
-   ) {
+$user_details = $user->getUser($user_id);
+if (!$user_details) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($user->isPluginEnabled('cl'))
   $clients = ttTeamHelper::getActiveClients($user->team_id);
diff --git a/user_delete.php b/user_delete.php
index b8ec5e9ad..d06463b8a 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -35,15 +35,9 @@
   header('Location: access_denied.php');
   exit();
 }
-// Get user id we are deleting.
-// A cast to int is for safety against manipulation of request parameter (sql injection). 
 $user_id = (int) $request->getParameter('id');
-// We need user name and login to display.
-$user_details = ttUserHelper::getUserDetails($user_id);
-if (!$user_details || // No details.
-     $user_details['rank'] > $user->rank || // User has a bigger rank.
-     ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
-   ) {
+$user_details = $user->getUser($user_id);
+if (!$user_details) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/user_edit.php b/user_edit.php
index 5ceac373e..8f588db97 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -40,14 +40,9 @@
   header('Location: access_denied.php');
   exit();
 }
-// Get user id we are editing from the request.
 $user_id = (int) $request->getParameter('id');
-// Get user details.
-$user_details = ttUserHelper::getUserDetails($user_id);
-if (!$user_details || // No details.
-     $user_details['rank'] > $user->rank || // User has a bigger rank.
-     ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
-   ) {
+$user_details = $user->getUser($user_id);
+if (!$user_details) {
   header('Location: access_denied.php');
   exit();
 }

From 5c3193f4b25f637d737c2acb714164ada39b4788 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 14:25:58 +0000
Subject: [PATCH 0055/1848] Removed rank field from the query as it is
 currently not used.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7f9894efd..27b90a425 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -305,7 +305,7 @@ function getUser($user_id) {
 
     $mdb2 = getConnection();
 
-    $sql =  "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email, r.rank from tt_users u".
+    $sql =  "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email from tt_users u".
             " left join tt_roles r on (u.role_id = r.id)".
             " where u.id = $user_id and u.team_id = $this->team_id and u.status is not null".
             " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 851570f35..e965d2a58 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.17.72.4172 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4173 | 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>

From d685a57ec1f70438af9aa66ed578a5f6cf4deb00 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 14:34:22 +0000
Subject: [PATCH 0056/1848] Added ordering by name to getUsers.

---
 WEB-INF/lib/ttUser.class.php | 4 +++-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 27b90a425..d58a71679 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -269,7 +269,9 @@ function getUsers($options) {
       if (isset($options['max_rank'])) $where_part .= ' and r.rank <= '.(int)$options['max_rank'];
     }
 
-    $sql = $select_part.$from_part.$left_joins.$where_part;
+    $order_part = " order by upper(u.name)";
+
+    $sql = $select_part.$from_part.$left_joins.$where_part.$order_part;
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e965d2a58..ab703fb7e 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.17.72.4173 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.72.4174 | 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>

From d9ef3e94c49d9b5e8c7532efc8b460c3e1135fdd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 15:12:52 +0000
Subject: [PATCH 0057/1848] Fixed reports to include users of lesser roles
 only.

---
 WEB-INF/lib/ttUser.class.php |  5 ++++-
 WEB-INF/templates/footer.tpl |  2 +-
 reports.php                  | 31 ++++++++++++++++++-------------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index d58a71679..f9edc8cc7 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -262,7 +262,10 @@ function getUsers($options) {
         $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
 
     $where_part = " where u.team_id = $this->team_id";
-    if (isset($options['status'])) $where_part .= ' and u.status = '.(int)$options['status'];
+    if (isset($options['status']))
+      $where_part .= ' and u.status = '.(int)$options['status'];
+    else
+      $where_part .= ' and u.status is not null';
     if ($includeSelf) {
       $where_part .= " and (u.id = $this->id || r.rank <= ".(int)$options['max_rank'].')';
     } else {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ab703fb7e..4b5b36f6b 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.17.72.4174 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.73.4175 | 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/reports.php b/reports.php
index 3a7367e77..59f3c0f92 100644
--- a/reports.php
+++ b/reports.php
@@ -122,16 +122,6 @@
   'data'=>$include_options,
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
-if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'paid_status',
-   'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
- ));
-}
-
-
 // Add invoiced / not invoiced selector.
 $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
   '2'=>$i18n->get('form.reports.include_not_invoiced'));
@@ -141,11 +131,26 @@
   'data'=>$invoice_options,
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
+if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'paid_status',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+
 $user_list = array();
-if ($user->canManageTeam() || $user->isClient()) {
+if ($user->can('view_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
-  if ($user->canManageTeam())
-    $users = ttTeamHelper::getUsers(); // Active and inactive users for managers.
+  if ($user->can('view_reports')) {
+    // $users = ttTeamHelper::getUsers(); // Active and inactive users for managers.
+    if ($user->can('view_own_reports'))
+      $options = array('max_rank'=>$user->rank-1,'include_self'=>true);
+    else
+      $options = array('max_rank'=>$user->rank-1);
+    $users = $user->getUsers($options); // Active and inactive users for managers.
+  }
   elseif ($user->isClient())
     $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
 

From b187fdd5442216e598a181f732da57e268f46dd8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 15:16:10 +0000
Subject: [PATCH 0058/1848] Fixed a comment.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4b5b36f6b..c7c23da32 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.17.73.4175 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.73.4176 | 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/reports.php b/reports.php
index 59f3c0f92..3aba9cdf7 100644
--- a/reports.php
+++ b/reports.php
@@ -144,12 +144,11 @@
 if ($user->can('view_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports')) {
-    // $users = ttTeamHelper::getUsers(); // Active and inactive users for managers.
     if ($user->can('view_own_reports'))
       $options = array('max_rank'=>$user->rank-1,'include_self'=>true);
     else
       $options = array('max_rank'=>$user->rank-1);
-    $users = $user->getUsers($options); // Active and inactive users for managers.
+    $users = $user->getUsers($options); // Active and inactive users.
   }
   elseif ($user->isClient())
     $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.

From 3c5c333f6d7a4a3f54fb711547dbd48403912c3a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 16:19:03 +0000
Subject: [PATCH 0059/1848] Improved ttClientHelper::delete() function.

---
 WEB-INF/lib/ttClientHelper.class.php | 16 ++++++++++++----
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 14788ae4c..288cd45be 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -120,8 +120,9 @@ static function delete($id, $delete_client_entries) {
     }
 
     // Handle time records.
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
     if ($delete_client_entries) {
-      $sql = "update tt_log set status = NULL where client_id = $id";
+      $sql = 'update tt_log set status = NULL'.$modified_part." where client_id = $id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -129,7 +130,7 @@ static function delete($id, $delete_client_entries) {
 
     // Handle expense items.
     if ($delete_client_entries) {
-      $sql = "update tt_expense_items set status = NULL where client_id = $id";
+      $sql = 'update tt_expense_items set status = NULL'.$modified_part." where client_id = $id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -137,7 +138,7 @@ static function delete($id, $delete_client_entries) {
 
     // Handle invoices.
     if ($delete_client_entries) {
-      $sql = "update tt_invoices set status = NULL where client_id = $id";
+      $sql = "update tt_invoices set status = NULL where client_id = $id and team_id = $user->team_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -149,7 +150,14 @@ static function delete($id, $delete_client_entries) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "update tt_clients set status = NULL where id = $id and team_id = ".$user->team_id;
+    // Handle users for client.
+    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and team_id = $user->team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark client deleted.
+    $sql = "update tt_clients set status = NULL where id = $id and team_id = $user->team_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c7c23da32..3e9eb18dc 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.17.73.4176 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.73.4177 | 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>

From 926b8d63a0be596b0c95cb55f01addae410af50c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 17:09:46 +0000
Subject: [PATCH 0060/1848] Improved access checks for invoices.

---
 WEB-INF/templates/footer.tpl |  2 +-
 invoice_add.php              |  1 +
 invoice_delete.php           |  7 ++++++-
 invoice_send.php             | 13 +++++++------
 invoice_view.php             |  8 +++-----
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3e9eb18dc..2aa36a25b 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.17.73.4177 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.73.4178 | 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/invoice_add.php b/invoice_add.php
index 5267056c0..ad9c3cfb8 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -40,6 +40,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
   $cl_date = $request->getParameter('date');
diff --git a/invoice_delete.php b/invoice_delete.php
index 2bca58ce3..ffdcf2c17 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -39,9 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_invoice_id = (int)$request->getParameter('id');
 $invoice = ttInvoiceHelper::getInvoice($cl_invoice_id);
+if (!$invoice) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $invoice_to_delete = $invoice['name'];
 
 $form = new Form('invoiceDeleteForm');
diff --git a/invoice_send.php b/invoice_send.php
index f0e30bc4b..20c3c1870 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -40,14 +40,15 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_invoice_id = (int)$request->getParameter('id');
-$invoice = ttInvoiceHelper::getInvoice($cl_invoice_id); 
-$sc = new ttSysConfig($user->id);
+$invoice = ttInvoiceHelper::getInvoice($cl_invoice_id);
+if (!$invoice) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
-// Security check.
-if (!$cl_invoice_id || !$invoice)
-  die ($i18n->get('error.sys'));
+$sc = new ttSysConfig($user->id);
 
 if ($request->isPost()) {
   $cl_receiver = trim($request->getParameter('receiver'));
diff --git a/invoice_view.php b/invoice_view.php
index 62f0cbbff..fd8424a39 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -41,15 +41,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = (int)$request->getParameter('id');
-$invoice = ttInvoiceHelper::getInvoice($cl_id);
-// Temporary fix for invalid invoice id. TODO: implement properly and review security of other pages,
-// where item id is passed (or posted) as parameter.
+$cl_invoice_id = (int)$request->getParameter('id');
+$invoice = ttInvoiceHelper::getInvoice($cl_invoice_id);
 if (!$invoice) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $invoice_date = new DateAndTime(DB_DATEFORMAT, $invoice['date']);
 $client = ttClientHelper::getClient($invoice['client_id'], true);

From 11bfec0ff88b649a934556e8b4812d65715c7509 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 18:45:28 +0000
Subject: [PATCH 0061/1848] Security fix - improved access checks for task edit
 and deletes.

---
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/task_add.php          |  1 +
 mobile/task_delete.php       |  7 ++++++-
 mobile/task_edit.php         | 10 +++++++---
 mobile/tasks.php             |  1 +
 mobile/time.php              |  3 ++-
 mobile/time_delete.php       |  2 +-
 mobile/time_edit.php         |  4 ++--
 mobile/user_add.php          |  3 ++-
 mobile/user_delete.php       |  4 ++--
 mobile/user_edit.php         |  4 ++--
 mobile/users.php             |  3 ++-
 task_add.php                 |  1 +
 task_delete.php              |  7 ++++++-
 task_edit.php                | 10 +++++++---
 tasks.php                    |  1 +
 time.php                     |  8 +-------
 time_delete.php              |  2 +-
 time_edit.php                |  2 +-
 tofile.php                   |  3 ++-
 topdf.php                    |  3 ++-
 user_add.php                 |  3 ++-
 user_delete.php              |  2 +-
 user_edit.php                |  2 +-
 users.php                    |  3 ++-
 week.php                     |  1 +
 26 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2aa36a25b..b9939f90e 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.17.73.4178 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.74.4179 | 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/task_add.php b/mobile/task_add.php
index a976ac5c9..fd1fb4649 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -41,6 +41,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
diff --git a/mobile/task_delete.php b/mobile/task_delete.php
index 1146a2ac2..153f3a2d8 100644
--- a/mobile/task_delete.php
+++ b/mobile/task_delete.php
@@ -39,9 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_task_id = (int)$request->getParameter('id');
 $task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $task_to_delete = $task['name'];
 
 $form = new Form('taskDeleteForm');
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index 346899dce..f1748c7e9 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -40,8 +40,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_task_id = (int)$request->getParameter('id');
+$task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
 if ($request->isPost()) {
@@ -50,11 +56,9 @@
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $task = ttTaskHelper::get($cl_task_id);
   $cl_name = $task['name'];
   $cl_description = $task['description'];
   $cl_status = $task['status'];
-
   $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
   foreach ($assigned_projects as $project_item)
     $cl_projects[] = $project_item['id'];
diff --git a/mobile/tasks.php b/mobile/tasks.php
index edb57089e..e49498c4c 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -39,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
 $smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
diff --git a/mobile/time.php b/mobile/time.php
index abde5e01d..8c6721d49 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -34,11 +34,12 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 5d6918c59..399895c7a 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -38,13 +38,13 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-// Get the time record we are deleting.
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit deleting not ours or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index eff9b3358..a1a56e37c 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -34,19 +34,19 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-// Get the time record we are editing.
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
diff --git a/mobile/user_add.php b/mobile/user_add.php
index 838981de4..53b9842fa 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -33,11 +33,12 @@
 import('form.Table');
 import('form.TableColumn');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.
 // The "limit" plugin is not required for normal operation of the Time Tracker.
diff --git a/mobile/user_delete.php b/mobile/user_delete.php
index 4c9aad878..b5c8dae12 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -30,12 +30,12 @@
 import('form.Form');
 import('ttUserHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
-$user_id = (int) $request->getParameter('id');
+$user_id = (int)$request->getParameter('id');
 $user_details = $user->getUser($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 3baaf1e93..f82d9314a 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -34,12 +34,12 @@
 import('form.Table');
 import('form.TableColumn');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
-$user_id = (int) $request->getParameter('id');
+$user_id = (int)$request->getParameter('id');
 $user_details = $user->getUser($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
diff --git a/mobile/users.php b/mobile/users.php
index 67654376e..18ad2e5fa 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -31,11 +31,12 @@
 import('ttTeamHelper');
 import('ttTimeHelper');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Get users.
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
diff --git a/task_add.php b/task_add.php
index a5149e840..eaaba5e8d 100644
--- a/task_add.php
+++ b/task_add.php
@@ -41,6 +41,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
diff --git a/task_delete.php b/task_delete.php
index 0e9f40cfe..d8e14399f 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -39,9 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_task_id = (int)$request->getParameter('id');
 $task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $task_to_delete = $task['name'];
 
 $form = new Form('taskDeleteForm');
diff --git a/task_edit.php b/task_edit.php
index bba89bebd..324f1dbb8 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -40,8 +40,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_task_id = (int)$request->getParameter('id');
+$task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
 if ($request->isPost()) {
@@ -50,11 +56,9 @@
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $task = ttTaskHelper::get($cl_task_id);
   $cl_name = $task['name'];
   $cl_description = $task['description'];
   $cl_status = $task['status'];
-
   $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
   foreach ($assigned_projects as $project_item)
     $cl_projects[] = $project_item['id'];
diff --git a/tasks.php b/tasks.php
index 5505e6ddd..2d310d011 100644
--- a/tasks.php
+++ b/tasks.php
@@ -39,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
 $smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
diff --git a/time.php b/time.php
index 98a383fdd..d75854c83 100644
--- a/time.php
+++ b/time.php
@@ -34,13 +34,6 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// This is a now removed check whether user browser supports cookies.
-// if (!isset($_COOKIE['tt_PHPSESSID'])) {
-  // This test gives a false-positive if user goes directly to this page
-  // as from a desktop shortcut (on first request only).
-  // die ("Your browser's cookie functionality is turned off. Please turn it on.");
-// }
-
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
@@ -54,6 +47,7 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+// End of access checks.
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
diff --git a/time_delete.php b/time_delete.php
index 060311e87..5d721ab1f 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -38,13 +38,13 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-// Get the time record we are deleting.
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit deleting not ours or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
diff --git a/time_edit.php b/time_edit.php
index 05db97c02..507f28abb 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -40,13 +40,13 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-// Get the time record we are editing.
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
diff --git a/tofile.php b/tofile.php
index abd1f278b..e7b9ed963 100644
--- a/tofile.php
+++ b/tofile.php
@@ -31,11 +31,12 @@
 import('form.ActionForm');
 import('ttReportHelper');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
diff --git a/topdf.php b/topdf.php
index 3177d1559..475522ef9 100644
--- a/topdf.php
+++ b/topdf.php
@@ -35,11 +35,12 @@
 import('form.ActionForm');
 import('ttReportHelper');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Check whether TCPDF library is available.
 if (!file_exists('WEB-INF/lib/tcpdf/'))
diff --git a/user_add.php b/user_add.php
index 91286537d..b235cbd17 100644
--- a/user_add.php
+++ b/user_add.php
@@ -34,11 +34,12 @@
 import('form.TableColumn');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.
 // The "limit" plugin is not required for normal operation of the Time Tracker.
diff --git a/user_delete.php b/user_delete.php
index d06463b8a..647f21728 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -35,7 +35,7 @@
   header('Location: access_denied.php');
   exit();
 }
-$user_id = (int) $request->getParameter('id');
+$user_id = (int)$request->getParameter('id');
 $user_details = $user->getUser($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
diff --git a/user_edit.php b/user_edit.php
index 8f588db97..95ed29e79 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -40,7 +40,7 @@
   header('Location: access_denied.php');
   exit();
 }
-$user_id = (int) $request->getParameter('id');
+$user_id = (int)$request->getParameter('id');
 $user_details = $user->getUser($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
diff --git a/users.php b/users.php
index 8787844b4..af5389021 100644
--- a/users.php
+++ b/users.php
@@ -32,11 +32,12 @@
 import('ttTimeHelper');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Prepare a list of active users.
 if ($user->can('view_users'))
diff --git a/week.php b/week.php
index 741a2bb4e..1d72ce400 100644
--- a/week.php
+++ b/week.php
@@ -55,6 +55,7 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+// End of access checks.
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);

From 81ca36ba9b5294ecb417d9b82196752211c652b7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 18:56:07 +0000
Subject: [PATCH 0062/1848] Included team_id in task update sql to avoid risk
 of misuse.

---
 WEB-INF/lib/ttTaskHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 2bb99da42..24831cb26 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -198,7 +198,7 @@ static function update($fields)
     $projects = $fields['projects'];
 
     $sql = "update tt_tasks set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-      ", status = $status where id = $task_id";
+      ", status = $status where id = $task_id and team_id = $user->team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       die($affected->getMessage());
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b9939f90e..9defcca82 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.17.74.4179 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.74.4180 | 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>

From 2f5b2dc68a73954b497c7aaa3223be7f3db1d117 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 19:18:51 +0000
Subject: [PATCH 0063/1848] Improved access checks for swap_roles.php.

---
 WEB-INF/lib/ttTeamHelper.class.php |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 swap_roles.php                     | 11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 5aeee2196..fb74d8e10 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -108,6 +108,7 @@ static function swapRolesWith($user_id) {
     global $user;
     $mdb2 = getConnection();
 
+    // Obtain role id for the user we are swapping ourselves with.
     $sql = "select u.id, u.role_id from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.team_id = $user->team_id and u.status = 1 and r.rank < $user->rank";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9defcca82..6646f126b 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.17.74.4180 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.74.4181 | 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/swap_roles.php b/swap_roles.php
index 59a726c5b..05485018b 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -40,10 +40,15 @@
   header('Location: access_denied.php');
   exit();
 }
-
 if ($request->isPost()) {
-  $cl_id = $request->getParameter('swap_with');
+  $user_id = (int)$request->getParameter('swap_with');
+  $user_details = $user->getUser($user_id);
+  if (!$user_details) {
+    header('Location: access_denied.php');
+    exit();
+  }
 }
+// End of access checks.
 
 $form = new Form('swapForm');
 $form->addInput(array('type'=>'combobox','name'=>'swap_with','style'=>'width: 250px;','data'=>$users_for_swap,'datakeys'=>array('id','name')));
@@ -52,7 +57,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
-    if (ttTeamHelper::swapRolesWith($cl_id)) {
+    if (ttTeamHelper::swapRolesWith($user_id)) {
       header('Location: users.php');
       exit();
     } else

From dab1057395c8eb9c5dce5480a738de1467e83ba5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 19:45:10 +0000
Subject: [PATCH 0064/1848] Improved input checking for role editor.

---
 WEB-INF/templates/footer.tpl | 2 +-
 role_add.php                 | 3 ++-
 role_delete.php              | 7 ++++++-
 role_edit.php                | 4 ++--
 roles.php                    | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6646f126b..7c8bd634f 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.17.74.4181 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.74.4182 | 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/role_add.php b/role_add.php
index e4cbb9644..d26cb6ad0 100644
--- a/role_add.php
+++ b/role_add.php
@@ -40,7 +40,7 @@
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
-  $cl_rank = (int) $request->getParameter('rank');
+  $cl_rank = (int)$request->getParameter('rank');
 }
 
 $form = new Form('roleForm');
@@ -56,6 +56,7 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
 
   if ($err->no()) {
     $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->team_id);
diff --git a/role_delete.php b/role_delete.php
index 086e7affb..a3ce2985d 100644
--- a/role_delete.php
+++ b/role_delete.php
@@ -35,9 +35,14 @@
   header('Location: access_denied.php');
   exit();
 }
-
 $cl_role_id = (int)$request->getParameter('id');
 $role = ttRoleHelper::get($cl_role_id);
+if (!$role) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $role_to_delete = $role['name'];
 
 $form = new Form('roleDeleteForm');
diff --git a/role_edit.php b/role_edit.php
index f5f3762b3..972d4540c 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -28,8 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper'); // TODO: remove this?
-import('ttTaskHelper'); // TODO: remove this?
 import('ttRoleHelper');
 
 // Access checks.
@@ -43,6 +41,7 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $assigned_rights = explode(',', $role['rights']);
 $available_rights = array_diff($user->rights, $assigned_rights);
@@ -82,6 +81,7 @@
     // Validate user input.
     if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
     if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+    if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
 
     if ($err->no()) {
       $existing_role = ttRoleHelper::getRoleByName($cl_name);
diff --git a/roles.php b/roles.php
index ec79020ee..cd17da3c4 100644
--- a/roles.php
+++ b/roles.php
@@ -31,11 +31,12 @@
 import('ttTeamHelper');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());

From 75ef763b9bd7f515280a6d130e5ad81720d72156 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Mar 2018 20:31:45 +0000
Subject: [PATCH 0065/1848] Security fix for project edits.

---
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/project_delete.php    | 16 +++++++++-------
 mobile/project_edit.php      |  8 ++++++--
 mobile/projects.php          |  5 +++--
 project_delete.php           | 16 +++++++++-------
 project_edit.php             |  8 ++++++--
 projects.php                 |  6 ++++--
 7 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7c8bd634f..95bed59a1 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.17.74.4182 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.75.4183 | 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/project_delete.php b/mobile/project_delete.php
index c8753b844..5785496aa 100644
--- a/mobile/project_delete.php
+++ b/mobile/project_delete.php
@@ -39,9 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_project_id = (int)$request->getParameter('id');
 $project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $project_to_delete = $project['name'];
 
 $form = new Form('projectDeleteForm');
@@ -51,12 +56,9 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttProjectHelper::get($cl_project_id)) {
-      if (ttProjectHelper::delete($cl_project_id)) {
-        header('Location: projects.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
+    if (ttProjectHelper::delete($cl_project_id)) {
+      header('Location: projects.php');
+      exit();
     } else
       $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 74454ec41..6adb475e4 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -40,8 +40,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_project_id = (int)$request->getParameter('id');
+$project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $users = ttTeamHelper::getActiveUsers();
 foreach ($users as $user_item)
@@ -58,7 +63,6 @@
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
 } else {
-  $project = ttProjectHelper::get($cl_project_id);
   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];
diff --git a/mobile/projects.php b/mobile/projects.php
index 93261d425..938eab82a 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -31,7 +31,8 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+// TODO: introduce view_projects right to keep access checks simple.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -40,7 +41,7 @@
   exit();
 }
 
-if($user->canManageTeam()) {
+if($user->can('manage_projects')) {
   $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
   $inactive_projects = ttTeamHelper::getInactiveProjects($user->team_id);
 } else
diff --git a/project_delete.php b/project_delete.php
index 2373bbead..450241e79 100644
--- a/project_delete.php
+++ b/project_delete.php
@@ -39,9 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_project_id = (int)$request->getParameter('id');
 $project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $project_to_delete = $project['name'];
 
 $form = new Form('projectDeleteForm');
@@ -51,12 +56,9 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttProjectHelper::get($cl_project_id)) {
-      if (ttProjectHelper::delete($cl_project_id)) {
-        header('Location: projects.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
+    if (ttProjectHelper::delete($cl_project_id)) {
+      header('Location: projects.php');
+      exit();
     } else
       $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
diff --git a/project_edit.php b/project_edit.php
index d30782ab5..543c532ef 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -40,8 +40,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_project_id = (int)$request->getParameter('id');
+$project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $users = ttTeamHelper::getActiveUsers();
 foreach ($users as $user_item)
@@ -58,7 +63,6 @@
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
 } else {
-  $project = ttProjectHelper::get($cl_project_id);
   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];
diff --git a/projects.php b/projects.php
index 5315c4f70..1d5f7e2e4 100644
--- a/projects.php
+++ b/projects.php
@@ -31,7 +31,8 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+// TODO: introduce view_projects right to keep access checks simple.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -39,8 +40,9 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
-if($user->canManageTeam()) {
+if($user->can('manage_projects')) {
   $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
   $inactive_projects = ttTeamHelper::getInactiveProjects($user->team_id);
 } else

From f39d6bdcde7c4de3f38dc63e500824d28aa1939c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 01:32:29 +0000
Subject: [PATCH 0066/1848] Introduced parent_id and org_id fields in tt_teams.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    | 16 +++++++++-------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 95bed59a1..ceaf9982e 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.17.75.4183 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.76.4184 | 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/dbinstall.php b/dbinstall.php
index 4d7feeb25..1f876470d 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11767"]) {
+  if ($_POST["convert11744to11776"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -860,6 +860,9 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_tmp_refs` drop `timestamp`");
     setChange("delete from `tt_tmp_refs`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.67', modified = now() where param_name = 'version_db' and param_value = '1.17.66'");
+    setChange("ALTER TABLE `tt_teams` ADD `parent_id` int(11) default NULL AFTER `id`");
+    setChange("ALTER TABLE `tt_teams` ADD `org_id` int(11) default NULL AFTER `parent_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.76', modified = now() where param_name = 'version_db' and param_value = '1.17.67'");
   }
 
   if ($_POST["cleanup"]) {
@@ -905,7 +908,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.67)</b>
+    <td width="80%"><b>Create database structure (v1.17.76)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -945,8 +948,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.67)</td>
-    <td><input type="submit" name="convert11744to11767" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.76)</td>
+    <td><input type="submit" name="convert11744to11776" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index ebe59936a..3e4805fe1 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -10,12 +10,14 @@
 
 #
 # Structure for table tt_teams. A team is a group of users for whom we are tracking work time.
-# This table stores settings common to all team members such as language, week start day, etc.
+# This table stores settings common to all group members such as language, week start day, etc.
 #
 CREATE TABLE `tt_teams` (
-  `id` int(11) NOT NULL auto_increment,                  # team id
-  `name` varchar(80) default NULL,                       # team name
-  `currency` varchar(7) default NULL,                    # team currency symbol
+  `id` int(11) NOT NULL auto_increment,                  # group id
+  `parent_id` int(11) default NULL,                      # parent group id
+  `org_id` int(11) default NULL,                         # organization id (id of top group)
+  `name` varchar(80) default NULL,                       # group name
+  `currency` varchar(7) default NULL,                    # currency symbol
   `decimal_mark` char(1) NOT NULL default '.',           # separator in decimals
   `lang` varchar(10) NOT NULL default 'en',              # language
   `date_format` varchar(20) NOT NULL default '%Y-%m-%d', # date format
@@ -31,14 +33,14 @@ CREATE TABLE `tt_teams` (
                                                          # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
   `workday_minutes` smallint(4) default 480,             # number of work minutes in a regular working day
   `custom_logo` tinyint(4) default 0,                    # whether to use a custom logo or not
-  `config` text default NULL,                            # miscellaneous team configuration settings
+  `config` text default NULL,                            # miscellaneous group configuration settings
   `created` datetime default NULL,                       # creation timestamp
   `created_ip` varchar(45) default NULL,                 # creator ip
   `created_by` int(11) default NULL,                     # creator user_id
   `modified` datetime default NULL,                      # modification timestamp
   `modified_ip` varchar(45) default NULL,                # modifier ip
   `modified_by` int(11) default NULL,                    # modifier user_id
-  `status` tinyint(4) default 1,                         # team status
+  `status` tinyint(4) default 1,                         # group status
   PRIMARY KEY (`id`)
 );
 
@@ -450,4 +452,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.67', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.76', now()); # TODO: change when structure changes.

From a575a9147976a06263d8a7eae006d6ba3372446e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 09:57:42 +0000
Subject: [PATCH 0067/1848] Added team_id to project delete and update queries
 to reduce risk of misuse.

---
 WEB-INF/lib/ttProjectHelper.class.php | 37 +++++++++++++--------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 06605c76a..d3e0eb1b7 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -154,33 +154,31 @@ static function getProjectByName($name) {
   
   // delete - deletes things associated with a project and marks the project as deleted. 
   static function delete($id) {
+    global $user;
     $mdb2 = getConnection();
-    
+
+    // Start with project itself. Reason: if the passed in project_id is bogus,
+    // we'll fail right here and don't damage any other data.
+
+    // Mark project as deleted and remove associated tasks.
+    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and team_id = $user->team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error') || 0 == $affected)
+      return false; // An error ocurred, or 0 rows updated.
+
     // Delete user binds to this project.
     $sql = "delete from tt_user_project_binds where project_id = $id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-    
-  	// Delete task binds to this project.
-    $sql = "delete from tt_project_task_binds where project_id = $id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-    
-    // Remove associated tasks.
-    $sql = "update tt_projects set tasks = NULL where id = $id";
-    $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Mark project as deleted.
-    $sql = "update tt_projects set status = NULL where id = $id";
+    // Delete task binds to this project.
+    $sql = "delete from tt_project_task_binds where project_id = $id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-  	return true;
+    return true;
   }
   
   // insert function inserts a new project into database.
@@ -236,8 +234,8 @@ static function insert($fields)
   } 
 
   // update function - updates the project in database.
-  static function update($fields)
-  {
+  static function update($fields) {
+    global $user;
     $mdb2 = getConnection();
     
     $project_id = $fields['id']; // Project we are updating.
@@ -313,7 +311,8 @@ static function update($fields)
     
     // Update project name, description, tasks and status in tt_projects table.
     $comma_separated = implode(",", $tasks_to_bind); // This is a comma-separated list of associated task ids.
-    $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id";
+    $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
+           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and team_id = $user->team_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ceaf9982e..37e220f6e 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.17.76.4184 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.76.4185 | 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>

From 6380ce5acad1e2911e44db3d339183646e3963ac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 15:16:08 +0000
Subject: [PATCH 0068/1848] Fixed page title.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 4 ++++
 profile_edit.php             | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 37e220f6e..31553a4f6 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.17.76.4185 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.76.4186 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 97ee53dae..ac6e99fe4 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -154,7 +154,11 @@
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
+  {if $user->name}
         <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
+  {else}
+        <tr><td>&nbsp;</td></tr>
+  {/if}
       </table>
 {/if}
       <!-- end of page title and user details -->
diff --git a/profile_edit.php b/profile_edit.php
index 9c27ab41a..2fed4f6ba 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -31,11 +31,12 @@
 import('ttUserHelper');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_own_settings')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 $can_change_login = $user->canManageTeam();

From 3209a25c21cd59c6476d820624545963a5a4a857 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 16:11:35 +0000
Subject: [PATCH 0069/1848] Added import timestamp and IP for team import
 operation.

---
 WEB-INF/lib/ttTeamHelper.class.php | 4 ++++
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index fb74d8e10..2aff793bc 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -756,6 +756,7 @@ static function getTeamDetails($team_id) {
   // The insert function creates a new team.
   static function insert($fields) {
 
+    global $user;
     $mdb2 = getConnection();
 
     // Start with team name and currency.
@@ -838,6 +839,9 @@ static function insert($fields) {
       $values .= ', '.$mdb2->quote($fields['config']);
     }
 
+    $columns .= ', created, created_ip, created_by';
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+
     $sql = "insert into tt_teams ($columns) values($values)";
     $affected = $mdb2->exec($sql);
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 31553a4f6..d3cf38900 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.17.76.4186 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.76.4187 | 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>

From 1a11a94d4ec3f33d7f92145ad8d6fa8eec4b18ac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 17:22:47 +0000
Subject: [PATCH 0070/1848] Introduced manage_own_account right.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 7629df422..e4465e52d 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -186,7 +186,7 @@ static function createPredefinedRoles($team_id, $lang)
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
@@ -244,7 +244,7 @@ static function createDefaultRoles()
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d3cf38900..e3d4db5f0 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.17.76.4187 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.77.4188 | 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/dbinstall.php b/dbinstall.php
index 1f876470d..164a15df8 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11776"]) {
+  if ($_POST["convert11744to11777"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -863,6 +863,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_teams` ADD `parent_id` int(11) default NULL AFTER `id`");
     setChange("ALTER TABLE `tt_teams` ADD `org_id` int(11) default NULL AFTER `parent_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.76', modified = now() where param_name = 'version_db' and param_value = '1.17.67'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.76') set rights = replace(rights, ',manage_users', ',manage_own_account,manage_users')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.77', modified = now() where param_name = 'version_db' and param_value = '1.17.76'");
   }
 
   if ($_POST["cleanup"]) {
@@ -908,7 +910,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.76)</b>
+    <td width="80%"><b>Create database structure (v1.17.77)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -948,8 +950,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.76)</td>
-    <td><input type="submit" name="convert11744to11776" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.77)</td>
+    <td><input type="submit" name="convert11744to11777" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 3e4805fe1..f20e45823 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -73,7 +73,7 @@ create unique index role_idx on tt_roles(team_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -452,4 +452,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.76', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.77', now()); # TODO: change when structure changes.

From b462dba60a4686a99189cb9a6329c2cc99f5f7ac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 17:47:15 +0000
Subject: [PATCH 0071/1848] Work in progress handling manage_own_account right.

---
 WEB-INF/templates/footer.tpl |  2 +-
 profile_edit.php             | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e3d4db5f0..c75544271 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.17.77.4188 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.77.4189 | 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/profile_edit.php b/profile_edit.php
index 2fed4f6ba..c64b95bd9 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -39,7 +39,7 @@
 // End of access checks.
 
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
-$can_change_login = $user->canManageTeam();
+$can_manage_account = $user->can('manage_own_account');
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -125,13 +125,13 @@
 }
 
 $form = new Form('profileForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login,'enable'=>$can_change_login));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name,'enable'=>$can_manage_account));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login,'enable'=>$can_manage_account));
 if (!$auth->isPasswordExternal()) {
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password1','value'=>$cl_password1));
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email,'enable'=>$can_change_login));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email,'enable'=>$can_manage_account));
 if ($user->canManageTeam()) {
   $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
   $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
@@ -233,13 +233,12 @@
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
-  if ($can_change_login) {
-    if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+
+  // New login must be unique.
+  if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
+    $err->add($i18n->get('error.user_exists'));
 
-    // New login must be unique.
-    if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
-      $err->add($i18n->get('error.user_exists'));
-  }
   if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
     if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
     if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));

From bb9bcdeebd85a41052f2e8a0ca63a7b1b0c86985 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 20:07:43 +0000
Subject: [PATCH 0072/1848] Introduced view_projects right.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index e4465e52d..7461ee2cc 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -184,7 +184,7 @@ static function createPredefinedRoles($team_id, $lang)
     $mdb2 = getConnection();
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_projects,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
@@ -242,7 +242,7 @@ static function createDefaultRoles()
     global $user;
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_projects,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c75544271..28e6fffaf 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.17.77.4189 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.78.4190 | 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/dbinstall.php b/dbinstall.php
index 164a15df8..42234bce1 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11777"]) {
+  if ($_POST["convert11744to11778"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -865,6 +865,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.76', modified = now() where param_name = 'version_db' and param_value = '1.17.67'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.76') set rights = replace(rights, ',manage_users', ',manage_own_account,manage_users')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.77', modified = now() where param_name = 'version_db' and param_value = '1.17.76'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.77') set rights = replace(rights, 'manage_own_settings,view_users', 'manage_own_settings,view_projects,view_users')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.78', modified = now() where param_name = 'version_db' and param_value = '1.17.77'");
   }
 
   if ($_POST["cleanup"]) {
@@ -910,7 +912,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.77)</b>
+    <td width="80%"><b>Create database structure (v1.17.78)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -950,8 +952,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.77)</td>
-    <td><input type="submit" name="convert11744to11777" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.78)</td>
+    <td><input type="submit" name="convert11744to11778" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index f20e45823..c82db686b 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -73,7 +73,7 @@ create unique index role_idx on tt_roles(team_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_projects,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -452,4 +452,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.77', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.78', now()); # TODO: change when structure changes.

From 21054f67875d0c0c947cc46fe438f407dbe94ee7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 20:35:51 +0000
Subject: [PATCH 0073/1848] Renamed view_projects right to view_own_projects.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 ++++++----
 mobile/projects.php                |  2 +-
 mysql.sql                          |  4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 7461ee2cc..c6cd02ba6 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -184,7 +184,7 @@ static function createPredefinedRoles($team_id, $lang)
     $mdb2 = getConnection();
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_projects,view_users';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
@@ -242,7 +242,7 @@ static function createDefaultRoles()
     global $user;
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_projects,view_users';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 28e6fffaf..67a6e0a06 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.17.78.4190 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.79.4191 | 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/dbinstall.php b/dbinstall.php
index 42234bce1..8f1e867f2 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11778"]) {
+  if ($_POST["convert11744to11779"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -867,6 +867,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.77', modified = now() where param_name = 'version_db' and param_value = '1.17.76'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.77') set rights = replace(rights, 'manage_own_settings,view_users', 'manage_own_settings,view_projects,view_users')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.78', modified = now() where param_name = 'version_db' and param_value = '1.17.77'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.78') set rights = replace(rights, 'manage_own_settings,view_projects,view_users', 'view_own_projects,manage_own_settings,view_users')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.79', modified = now() where param_name = 'version_db' and param_value = '1.17.78'");
   }
 
   if ($_POST["cleanup"]) {
@@ -912,7 +914,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.78)</b>
+    <td width="80%"><b>Create database structure (v1.17.79)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -952,8 +954,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.78)</td>
-    <td><input type="submit" name="convert11744to11778" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.79)</td>
+    <td><input type="submit" name="convert11744to11779" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mobile/projects.php b/mobile/projects.php
index 938eab82a..c35e738af 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -31,7 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-// TODO: introduce view_projects right to keep access checks simple.
+// TODO: introduce view_own_projects right to keep access checks simple.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
   exit();
diff --git a/mysql.sql b/mysql.sql
index c82db686b..9d2f1e7b4 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -73,7 +73,7 @@ create unique index role_idx on tt_roles(team_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_projects,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -452,4 +452,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.78', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.79', now()); # TODO: change when structure changes.

From 216d1c29ae204a1404a5d38cad77abce516e2386 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 20:47:40 +0000
Subject: [PATCH 0074/1848] Refactored headers to use view_own_projects right
 check.

---
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/header.tpl        | 2 +-
 WEB-INF/templates/mobile/header.tpl | 2 +-
 mobile/project_add.php              | 1 +
 mobile/projects.php                 | 4 ++--
 projects.php                        | 3 +--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 67a6e0a06..e939e021e 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.17.79.4191 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.79.4192 | 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/header.tpl b/WEB-INF/templates/header.tpl
index ac6e99fe4..b74923ba8 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -113,7 +113,7 @@
       || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if ($user->can('manage_projects') || $user->can('track_own_time') || $user->can('track_time')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode) && $user->can('manage_tasks')}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 507a07e02..7118cfa4e 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -79,7 +79,7 @@
     {if $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if ($user->can('manage_projects') || $user->can('track_own_time') || $user->can('track_time')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if $user->can('manage_tasks') && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode}
diff --git a/mobile/project_add.php b/mobile/project_add.php
index a9495d715..bb0f1d096 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -40,6 +40,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $users = ttTeamHelper::getActiveUsers();
 foreach ($users as $user_item)
diff --git a/mobile/projects.php b/mobile/projects.php
index c35e738af..a9f8ab02d 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -31,8 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-// TODO: introduce view_own_projects right to keep access checks simple.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time') || ttAccessAllowed('manage_projects'))) {
+if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -40,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 if($user->can('manage_projects')) {
   $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
diff --git a/projects.php b/projects.php
index 1d5f7e2e4..bf6aed1cb 100644
--- a/projects.php
+++ b/projects.php
@@ -31,8 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-// TODO: introduce view_projects right to keep access checks simple.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time') || ttAccessAllowed('manage_projects'))) {
+if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
   exit();
 }

From 1955bb54c5569f779a16eb3b8de9b4684b5f11b4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 23:17:04 +0000
Subject: [PATCH 0075/1848] Split profile page into two for account and group
 settings to reduce complexity.

---
 WEB-INF/resources/en.lang.php      |   2 +
 WEB-INF/templates/footer.tpl       |   2 +-
 WEB-INF/templates/group_edit.tpl   | 248 ++++++++++++++++++++++++
 WEB-INF/templates/header.tpl       |   3 +
 WEB-INF/templates/profile_edit.tpl | 235 ----------------------
 group_edit.php                     | 301 +++++++++++++++++++++++++++++
 profile_edit.php                   | 248 +-----------------------
 7 files changed, 556 insertions(+), 483 deletions(-)
 create mode 100644 WEB-INF/templates/group_edit.tpl
 create mode 100644 group_edit.php

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 732141a4a..1613fec90 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -46,6 +46,7 @@
 'menu.help' => 'Help',
 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profile',
+'menu.group' => 'Group',
 'menu.time' => 'Time',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
@@ -268,6 +269,7 @@
 'title.import' => 'Importing Team Data',
 'title.options' => 'Options',
 'title.profile' => 'Profile',
+'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Custom Fields',
 'title.cf_add_custom_field' => 'Adding Custom Field',
 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e939e021e..35039df11 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.17.79.4192 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4193 | 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
new file mode 100644
index 000000000..9b341b674
--- /dev/null
+++ b/WEB-INF/templates/group_edit.tpl
@@ -0,0 +1,248 @@
+<script>
+// handleTaskRequiredCheckbox - controls visibility of the Task Required checkbox.
+function handleTaskRequiredCheckbox() {
+  var taskRequiredCheckbox = document.getElementById("task_required");
+  var taskRequiredLabel = document.getElementById("task_required_label");
+  var trackingModeDropdown = document.getElementById("tracking_mode");
+  if (trackingModeDropdown.value == 2) {
+    taskRequiredCheckbox.style.visibility = "visible";
+    taskRequiredLabel.style.visibility = "visible";
+  } else {
+    taskRequiredCheckbox.style.visibility = "hidden";
+    taskRequiredLabel.style.visibility = "hidden";
+  }
+}
+
+
+// handleControls - controls visibility of controls.
+function handlePluginCheckboxes() {
+  var clientsCheckbox = document.getElementById("clients");
+  var invoicesCheckbox = document.getElementById("invoices");
+  var requiredCheckbox = document.getElementById("client_required");
+  var requiredLabel = document.getElementById("client_required_label");
+  if (clientsCheckbox.checked) {
+    requiredCheckbox.style.visibility = "visible";
+    requiredLabel.style.visibility = "visible";
+    invoicesCheckbox.disabled = false;
+  } else {
+    requiredCheckbox.checked = false;
+    requiredCheckbox.style.visibility = "hidden";
+    requiredLabel.style.visibility = "hidden";
+    invoicesCheckbox.checked = false;
+    invoicesCheckbox.disabled = true;
+  }
+
+  var expensesCheckbox = document.getElementById("expenses");
+  var taxCheckbox = document.getElementById("tax_expenses");
+  var taxLabel = document.getElementById("tax_label");
+  if (expensesCheckbox.checked) {
+    taxCheckbox.style.visibility = "visible";
+    taxLabel.style.visibility = "visible";
+  } else {
+    taxCheckbox.checked = false;
+    taxCheckbox.style.visibility = "hidden";
+    taxLabel.style.visibility = "hidden";
+  }
+  var configureLabel = document.getElementById("expenses_config");
+  if (expensesCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var customFieldsCheckbox = document.getElementById("custom_fields");
+  configureLabel = document.getElementById("cf_config");
+  if (customFieldsCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var notificationsCheckbox = document.getElementById("notifications");
+  configureLabel = document.getElementById("notifications_config");
+  if (notificationsCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var lockingCheckbox = document.getElementById("locking");
+  configureLabel = document.getElementById("locking_config");
+  if (lockingCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var quotasCheckbox = document.getElementById("quotas");
+  configureLabel = document.getElementById("quotas_config");
+  if (quotasCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var weekViewCheckbox = document.getElementById("week_view");
+  configureLabel = document.getElementById("week_view_config");
+  if (weekViewCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+}
+</script>
+
+{$forms.groupForm.open}
+
+{if $user->canManageTeam()}
+{include file="datetime_format_preview.tpl"}
+{/if}
+
+<table cellspacing="4" cellpadding="7" border="0">
+    <tr>
+      <td>
+        <table cellspacing="1" cellpadding="2" border="0">
+{if $user->isManager() || ($user->canManageTeam() && !defined(MANAGER_ONLY_TEAM_SETTINGS))}
+          <tr>
+            <td align="right" nowrap>{$i18n.label.team_name}:</td>
+            <td>{$forms.groupForm.team_name.control}</td>
+          </tr>
+          <tr>
+            <td align="right">{$i18n.label.currency}:</td>
+            <td>{$forms.groupForm.currency.control}</td>
+          </tr>
+  {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}
+          <tr>
+           <td align="right" nowrap>{$i18n.label.language}:</td>
+           <td>{$forms.groupForm.lang.control}</td>
+          </tr>
+          <tr>
+            <td align="right">{$i18n.label.decimal_mark}:</td>
+            <td>{$forms.groupForm.decimal_mark.control} <font id="decimal_preview" color="#777777">&nbsp;</font></td>
+          <tr>
+            <td align="right" nowrap>{$i18n.label.date_format}:</td>
+            <td>{$forms.groupForm.date_format.control} <font id="date_format_preview" color="#777777">&nbsp;</font></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.label.time_format}:</td>
+            <td>{$forms.groupForm.time_format.control} <font id="time_format_preview" color="#777777">&nbsp;</font></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.label.week_start}:</td>
+            <td>{$forms.groupForm.start_week.control}</td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.show_holidays}:</td>
+            <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.tracking_mode}:</td>
+            <td>{$forms.groupForm.tracking_mode.control} {$forms.profileForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.record_type}:</td>
+            <td>{$forms.groupForm.record_type.control}</td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.punch_mode}:</td>
+            <td>{$forms.groupForm.punch_mode.control} <a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.allow_overlap}:</td>
+            <td>{$forms.groupForm.allow_overlap.control} <a href="https://www.anuko.com/lp/tt_16.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.future_entries}:</td>
+            <td>{$forms.groupForm.future_entries.control} <a href="https://www.anuko.com/lp/tt_17.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
+            <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+{if $user->isManager()}
+          <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}
+          {* initialize preview text *}
+          <script>
+            MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
+            MakeFormatPreview("time_format_preview", document.getElementById("time_format"));
+
+            function adjustDecimalPreview()
+            {
+              var mark = document.getElementById("decimal_mark").value;
+              var example = document.getElementById("decimal_preview");
+              example.innerHTML = "<i>3"+mark+"14</i>";
+            }
+            adjustDecimalPreview();
+          </script>
+
+          <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+          </tr>
+
+          <tr>
+             <td colspan="2" class="sectionHeader">{$i18n.form.profile.plugins}</td>
+          </tr>
+          <tr><td>&nbsp;</td></tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.charts.control}</td>
+            <td><label for="charts">{$i18n.title.charts}</label></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.clients.control}</td>
+            <td><label for="clients">{$i18n.title.clients}</label> {$forms.profileForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.invoices.control}</td>
+            <td><label for="invoices">{$i18n.title.invoices}</label></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.paid_status.control}</td>
+            <td><label for="paid_status">{$i18n.label.paid_status}</label></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.custom_fields.control}</td>
+            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_config"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.expenses.control}</td>
+            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.profileForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.notifications.control}</td>
+            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config"><a href="notifications.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.locking.control}</td>
+            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_config"><a href="locking.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.quotas.control}</td>
+            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_config"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.week_view.control}</td>
+            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+{/if}
+
+          <tr>
+            <td colspan="2">&nbsp;</td>
+          </tr>
+          <tr>
+            <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control}</td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+</table>
+{$forms.groupForm.close}
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index b74923ba8..3ad3fb5fc 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -85,6 +85,9 @@
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
     {if $user->can('manage_own_settings')}
             <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
+    {/if}
+    {if $user->can('manage_basic_settings')}
+            <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> &middot;
     {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index 244c6cb15..1fb040005 100644
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -1,103 +1,5 @@
-<script>
-// handleTaskRequiredCheckbox - controls visibility of the Task Required checkbox.
-function handleTaskRequiredCheckbox() {
-  var taskRequiredCheckbox = document.getElementById("task_required");
-  var taskRequiredLabel = document.getElementById("task_required_label");
-  var trackingModeDropdown = document.getElementById("tracking_mode");
-  if (trackingModeDropdown.value == 2) {
-    taskRequiredCheckbox.style.visibility = "visible";
-    taskRequiredLabel.style.visibility = "visible";
-  } else {
-    taskRequiredCheckbox.style.visibility = "hidden";
-    taskRequiredLabel.style.visibility = "hidden";
-  }
-}
-
-
-// handleControls - controls visibility of controls.
-function handlePluginCheckboxes() {
-  var clientsCheckbox = document.getElementById("clients");
-  var invoicesCheckbox = document.getElementById("invoices");
-  var requiredCheckbox = document.getElementById("client_required");
-  var requiredLabel = document.getElementById("client_required_label");
-  if (clientsCheckbox.checked) {
-    requiredCheckbox.style.visibility = "visible";
-    requiredLabel.style.visibility = "visible";
-    invoicesCheckbox.disabled = false;
-  } else {
-    requiredCheckbox.checked = false;
-    requiredCheckbox.style.visibility = "hidden";
-    requiredLabel.style.visibility = "hidden";
-    invoicesCheckbox.checked = false;
-    invoicesCheckbox.disabled = true;
-  }
-
-  var expensesCheckbox = document.getElementById("expenses");
-  var taxCheckbox = document.getElementById("tax_expenses");
-  var taxLabel = document.getElementById("tax_label");
-  if (expensesCheckbox.checked) {
-    taxCheckbox.style.visibility = "visible";
-    taxLabel.style.visibility = "visible";
-  } else {
-    taxCheckbox.checked = false;
-    taxCheckbox.style.visibility = "hidden";
-    taxLabel.style.visibility = "hidden";
-  }
-  var configureLabel = document.getElementById("expenses_config");
-  if (expensesCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var customFieldsCheckbox = document.getElementById("custom_fields");
-  configureLabel = document.getElementById("cf_config");
-  if (customFieldsCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var notificationsCheckbox = document.getElementById("notifications");
-  configureLabel = document.getElementById("notifications_config");
-  if (notificationsCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var lockingCheckbox = document.getElementById("locking");
-  configureLabel = document.getElementById("locking_config");
-  if (lockingCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-  
-  var quotasCheckbox = document.getElementById("quotas");
-  configureLabel = document.getElementById("quotas_config");
-  if (quotasCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var weekViewCheckbox = document.getElementById("week_view");
-  configureLabel = document.getElementById("week_view_config");
-  if (weekViewCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-}
-</script>
-
 {$forms.profileForm.open}
 
-{if $user->canManageTeam()}
-{include file="datetime_format_preview.tpl"}
-{/if}
-
 <table cellspacing="4" cellpadding="7" border="0">
     <tr>
       <td>
@@ -128,143 +30,6 @@ function handlePluginCheckboxes() {
             <td></td>
             <td>{$i18n.label.required_fields}</td>
           </tr>
-
-{if $user->isManager() || ($user->canManageTeam() && !defined(MANAGER_ONLY_TEAM_SETTINGS))}
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.team_name}:</td>
-            <td>{$forms.profileForm.team_name.control}</td>
-          </tr>
-          <tr>
-            <td align="right">{$i18n.label.currency}:</td>
-            <td>{$forms.profileForm.currency.control}</td>
-          </tr>
-  {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}
-          <tr>
-           <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.profileForm.lang.control}</td>
-          </tr>
-          <tr>
-            <td align="right">{$i18n.label.decimal_mark}:</td>
-            <td>{$forms.profileForm.decimal_mark.control} <font id="decimal_preview" color="#777777">&nbsp;</font></td>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.date_format}:</td>
-            <td>{$forms.profileForm.date_format.control} <font id="date_format_preview" color="#777777">&nbsp;</font></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.time_format}:</td>
-            <td>{$forms.profileForm.time_format.control} <font id="time_format_preview" color="#777777">&nbsp;</font></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.week_start}:</td>
-            <td>{$forms.profileForm.start_week.control}</td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.show_holidays}:</td>
-            <td>{$forms.profileForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.tracking_mode}:</td>
-            <td>{$forms.profileForm.tracking_mode.control} {$forms.profileForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.record_type}:</td>
-            <td>{$forms.profileForm.record_type.control}</td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.punch_mode}:</td>
-            <td>{$forms.profileForm.punch_mode.control} <a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.allow_overlap}:</td>
-            <td>{$forms.profileForm.allow_overlap.control} <a href="https://www.anuko.com/lp/tt_16.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.future_entries}:</td>
-            <td>{$forms.profileForm.future_entries.control} <a href="https://www.anuko.com/lp/tt_17.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
-            <td>{$forms.profileForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-{if $user->isManager()}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.bcc}:</td>
-            <td>{$forms.profileForm.bcc_email.control} <a href="https://www.anuko.com/lp/tt_10.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-{/if}
-          {* initialize preview text *}
-          <script>
-            MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
-            MakeFormatPreview("time_format_preview", document.getElementById("time_format"));
-
-            function adjustDecimalPreview()
-            {
-              var mark = document.getElementById("decimal_mark").value;
-              var example = document.getElementById("decimal_preview");
-              example.innerHTML = "<i>3"+mark+"14</i>";
-            }
-            adjustDecimalPreview();
-          </script>
-
-          <tr>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-          </tr>
-
-          <tr>
-             <td colspan="2" class="sectionHeader">{$i18n.form.profile.plugins}</td>
-          </tr>
-          <tr><td>&nbsp;</td></tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.charts.control}</td>
-            <td><label for="charts">{$i18n.title.charts}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.clients.control}</td>
-            <td><label for="clients">{$i18n.title.clients}</label> {$forms.profileForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.invoices.control}</td>
-            <td><label for="invoices">{$i18n.title.invoices}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.paid_status.control}</td>
-            <td><label for="paid_status">{$i18n.label.paid_status}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.custom_fields.control}</td>
-            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_config"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.expenses.control}</td>
-            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.profileForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config"><a href="notifications.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.locking.control}</td>
-            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_config"><a href="locking.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.quotas.control}</td>
-            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_config"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.profileForm.week_view.control}</td>
-            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-{/if}
-
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/group_edit.php b/group_edit.php
new file mode 100644
index 000000000..0ce93582f
--- /dev/null
+++ b/group_edit.php
@@ -0,0 +1,301 @@
+<?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');
+
+// Access checks.
+if (!ttAccessAllowed('manage_basic_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
+
+if ($request->isPost()) {
+  $cl_team = trim($request->getParameter('team_name'));
+  $cl_currency = trim($request->getParameter('currency'));
+  if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
+  $cl_lang = $request->getParameter('lang');
+  $cl_decimal_mark = $request->getParameter('decimal_mark');
+  $cl_date_format = $request->getParameter('date_format');
+  $cl_time_format = $request->getParameter('time_format');
+  $cl_start_week = $request->getParameter('start_week');
+  $cl_show_holidays = $request->getParameter('show_holidays');
+  $cl_tracking_mode = $request->getParameter('tracking_mode');
+  $cl_project_required = $request->getParameter('project_required');
+  $cl_task_required = $request->getParameter('task_required');
+  $cl_record_type = $request->getParameter('record_type');
+  $cl_punch_mode = $request->getParameter('punch_mode');
+  $cl_allow_overlap = $request->getParameter('allow_overlap');
+  $cl_future_entries = $request->getParameter('future_entries');
+  $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
+  $cl_bcc_email = trim($request->getParameter('bcc_email'));
+
+  // Plugin checkboxes.
+  $cl_charts = $request->getParameter('charts');
+  $cl_clients = $request->getParameter('clients');
+  $cl_client_required = $request->getParameter('client_required');
+  $cl_invoices = $request->getParameter('invoices');
+  $cl_paid_status = $request->getParameter('paid_status');
+  $cl_custom_fields = $request->getParameter('custom_fields');
+  $cl_expenses = $request->getParameter('expenses');
+  $cl_tax_expenses = $request->getParameter('tax_expenses');
+  $cl_notifications = $request->getParameter('notifications');
+  $cl_locking = $request->getParameter('locking');
+  $cl_quotas = $request->getParameter('quotas');
+  $cl_week_view = $request->getParameter('week_view');
+} else {
+  $cl_team = $user->team;
+  $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
+  $cl_lang = $user->lang;
+  $cl_decimal_mark = $user->decimal_mark;
+  $cl_date_format = $user->date_format;
+  $cl_time_format = $user->time_format;
+  $cl_start_week = $user->week_start;
+  $cl_show_holidays = $user->show_holidays;
+  $cl_tracking_mode = $user->tracking_mode;
+  $cl_project_required = $user->project_required;
+  $cl_task_required = $user->task_required;
+  $cl_record_type = $user->record_type;
+  $cl_punch_mode = $user->punch_mode;
+  $cl_allow_overlap = $user->allow_overlap;
+  $cl_future_entries = $user->future_entries;
+  $cl_uncompleted_indicators = $user->uncompleted_indicators;
+  $cl_bcc_email = $user->bcc_email;
+
+  // Which plugins do we have enabled?
+  $plugins = explode(',', $user->plugins);
+  $cl_charts = in_array('ch', $plugins);
+  $cl_clients = in_array('cl', $plugins);
+  $cl_client_required = in_array('cm', $plugins);
+  $cl_invoices = in_array('iv', $plugins);
+  $cl_paid_status = in_array('ps', $plugins);
+  $cl_custom_fields = in_array('cf', $plugins);
+  $cl_expenses = in_array('ex', $plugins);
+  $cl_tax_expenses = in_array('et', $plugins);
+  $cl_notifications = in_array('no', $plugins);
+  $cl_locking = in_array('lk', $plugins);
+  $cl_quotas = in_array('mq', $plugins);
+  $cl_week_view = in_array('wv', $plugins);
+}
+
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
+$form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
+
+// Prepare an array of available languages.
+$lang_files = I18n::getLangFileList();
+foreach ($lang_files as $lfile) {
+  $content = file(RESOURCE_DIR."/".$lfile);
+  $lname = '';
+  foreach ($content as $line) {
+    if (strstr($line, 'i18n_language')) {
+      $a = explode('=', $line);
+      $lname = trim(str_replace(';','',str_replace("'","",$a[1])));
+      break;
+    }
+  }
+  unset($content);
+  $longname_lang[] = array('id'=>I18n::getLangFromFilename($lfile),'name'=>$lname);
+}
+$longname_lang = mu_sort($longname_lang, 'name');
+$form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 200px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
+
+$DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
+$form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
+  'onchange'=>'adjustDecimalPreview()'));
+
+$DATE_FORMAT_OPTIONS = array(
+  array('id'=>'%Y-%m-%d','name'=>'Y-m-d'),
+  array('id'=>'%m/%d/%Y','name'=>'m/d/Y'),
+  array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
+  array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
+$form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
+  'onchange'=>'MakeFormatPreview(&quot;date_format_preview&quot;, this);'));
+$TIME_FORMAT_OPTIONS = array(
+  array('id'=>'%H:%M','name'=>$i18n->get('form.profile.24_hours')),
+  array('id'=>'%I:%M %p','name'=>$i18n->get('form.profile.12_hours')));
+$form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
+  'onchange'=>'MakeFormatPreview(&quot;time_format_preview&quot;, this);'));
+
+// Prepare week start choices.
+$week_start_options = array();
+foreach ($i18n->weekdayNames as $id => $week_dn) {
+  $week_start_options[] = array('id' => $id, 'name' => $week_dn);
+}
+$form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
+
+// Show holidays checkbox.
+$form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
+
+// Prepare tracking mode choices.
+$tracking_mode_options = array();
+$tracking_mode_options[MODE_TIME] = $i18n->get('form.profile.mode_time');
+$tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.profile.mode_projects');
+$tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.profile.mode_projects_and_tasks');
+$form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode,'onchange'=>'handleTaskRequiredCheckbox()'));
+$form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
+$form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
+
+// Prepare record type choices.
+$record_type_options = array();
+$record_type_options[TYPE_ALL] = $i18n->get('form.profile.type_all');
+$record_type_options[TYPE_START_FINISH] = $i18n->get('form.profile.type_start_finish');
+$record_type_options[TYPE_DURATION] = $i18n->get('form.profile.type_duration');
+$form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
+
+// Punch mode checkbox.
+$form->addInput(array('type'=>'checkbox','name'=>'punch_mode','value'=>$cl_punch_mode));
+
+// Allow overlap checkbox.
+$form->addInput(array('type'=>'checkbox','name'=>'allow_overlap','value'=>$cl_allow_overlap));
+
+// Future entries checkbox.
+$form->addInput(array('type'=>'checkbox','name'=>'future_entries','value'=>$cl_future_entries));
+
+// Uncompleted indicators checkbox.
+$form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
+
+// Add bcc email control, for manager only.
+if ($user->can('manage_advanced_settings')) {
+  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
+}
+
+// Plugin checkboxes.
+$form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
+$form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'client_required','value'=>$cl_client_required));
+$form->addInput(array('type'=>'checkbox','name'=>'invoices','value'=>$cl_invoices));
+$form->addInput(array('type'=>'checkbox','name'=>'paid_status','value'=>$cl_paid_status));
+$form->addInput(array('type'=>'checkbox','name'=>'custom_fields','value'=>$cl_custom_fields,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'expenses','value'=>$cl_expenses,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'tax_expenses','value'=>$cl_tax_expenses));
+$form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+  if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
+  if ($user->can('manage_advanced_settings')) {
+    if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
+  }
+  // Finished validating user input.
+
+  if ($err->no()) {
+    $update_result = true;
+    if ($user->canManageTeam()) {
+
+      // Prepare plugins string.
+      if ($cl_charts)
+        $plugins .= ',ch';
+      if ($cl_clients)
+        $plugins .= ',cl';
+      if ($cl_client_required)
+        $plugins .= ',cm';
+      if ($cl_invoices)
+        $plugins .= ',iv';
+      if ($cl_paid_status)
+        $plugins .= ',ps';
+      if ($cl_custom_fields)
+        $plugins .= ',cf';
+      if ($cl_expenses)
+        $plugins .= ',ex';
+      if ($cl_tax_expenses)
+        $plugins .= ',et';
+      if ($cl_notifications)
+        $plugins .= ',no';
+      if ($cl_locking)
+        $plugins .= ',lk';
+      if ($cl_quotas)
+        $plugins .= ',mq';
+      if ($cl_week_view)
+        $plugins .= ',wv';
+
+      // Recycle week view plugin options as they are not configured on this page.
+      $existing_plugins = explode(',', $user->plugins);
+      if (in_array('wvn', $existing_plugins))
+        $plugins .= ',wvn';
+      if (in_array('wvl', $existing_plugins))
+        $plugins .= ',wvl';
+      if (in_array('wvns', $existing_plugins))
+        $plugins .= ',wvns';
+
+      $plugins = trim($plugins, ',');
+
+      // Prepare config string.
+      if ($cl_show_holidays)
+        $config .= ',show_holidays';
+      if ($cl_punch_mode)
+        $config .= ',punch_mode';
+      if ($cl_allow_overlap)
+        $config .= ',allow_overlap';
+      if ($cl_future_entries)
+        $config .= ',future_entries';
+      if ($cl_uncompleted_indicators)
+        $config .= ',uncompleted_indicators';
+      $config = trim($config, ',');
+
+      $update_result = ttTeamHelper::update($user->team_id, array(
+        'name' => $cl_team,
+        'currency' => $cl_currency,
+        'lang' => $cl_lang,
+        'decimal_mark' => $cl_decimal_mark,
+        'date_format' => $cl_date_format,
+        'time_format' => $cl_time_format,
+        'week_start' => $cl_start_week,
+        'tracking_mode' => $cl_tracking_mode,
+        'project_required' => $cl_project_required,
+        'task_required' => $cl_task_required,
+        'record_type' => $cl_record_type,
+        'uncompleted_indicators' => $cl_uncompleted_indicators,
+        'bcc_email' => $cl_bcc_email,
+        'plugins' => $plugins,
+        'config' => $config));
+    }
+    if ($update_result) {
+      header('Location: time.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+} // isPost
+
+$smarty->assign('auth_external', $auth->isPasswordExternal());
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
+$smarty->assign('title', $i18n->get('title.group'));
+$smarty->assign('content_page_name', 'group_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/profile_edit.php b/profile_edit.php
index c64b95bd9..9de1820ee 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -38,7 +38,6 @@
 }
 // End of access checks.
 
-if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 $can_manage_account = $user->can('manage_own_account');
 
 if ($request->isPost()) {
@@ -49,79 +48,10 @@
     $cl_password2 = $request->getParameter('password2');
   }
   $cl_email = trim($request->getParameter('email'));
-
-  if ($user->canManageTeam()) {
-    $cl_team = trim($request->getParameter('team_name'));
-    $cl_currency = trim($request->getParameter('currency'));
-    if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
-    $cl_lang = $request->getParameter('lang');
-    $cl_decimal_mark = $request->getParameter('decimal_mark');
-    $cl_date_format = $request->getParameter('date_format');
-    $cl_time_format = $request->getParameter('time_format');
-    $cl_start_week = $request->getParameter('start_week');
-    $cl_show_holidays = $request->getParameter('show_holidays');
-    $cl_tracking_mode = $request->getParameter('tracking_mode');
-    $cl_project_required = $request->getParameter('project_required');
-    $cl_task_required = $request->getParameter('task_required');
-    $cl_record_type = $request->getParameter('record_type');
-    $cl_punch_mode = $request->getParameter('punch_mode');
-    $cl_allow_overlap = $request->getParameter('allow_overlap');
-    $cl_future_entries = $request->getParameter('future_entries');
-    $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
-    $cl_bcc_email = trim($request->getParameter('bcc_email'));
-
-    // Plugin checkboxes.
-    $cl_charts = $request->getParameter('charts');
-    $cl_clients = $request->getParameter('clients');
-    $cl_client_required = $request->getParameter('client_required');
-    $cl_invoices = $request->getParameter('invoices');
-    $cl_paid_status = $request->getParameter('paid_status');
-    $cl_custom_fields = $request->getParameter('custom_fields');
-    $cl_expenses = $request->getParameter('expenses');
-    $cl_tax_expenses = $request->getParameter('tax_expenses');
-    $cl_notifications = $request->getParameter('notifications');
-    $cl_locking = $request->getParameter('locking');
-    $cl_quotas = $request->getParameter('quotas');
-    $cl_week_view = $request->getParameter('week_view');
-  }
 } else {
   $cl_name = $user->name;
   $cl_login = $user->login;
   $cl_email = $user->email;
-  if ($user->canManageTeam()) {
-    $cl_team = $user->team;
-    $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
-    $cl_lang = $user->lang;
-    $cl_decimal_mark = $user->decimal_mark;
-    $cl_date_format = $user->date_format;
-    $cl_time_format = $user->time_format;
-    $cl_start_week = $user->week_start;
-    $cl_show_holidays = $user->show_holidays;
-    $cl_tracking_mode = $user->tracking_mode;
-    $cl_project_required = $user->project_required;
-    $cl_task_required = $user->task_required;
-    $cl_record_type = $user->record_type;
-    $cl_punch_mode = $user->punch_mode;
-    $cl_allow_overlap = $user->allow_overlap;
-    $cl_future_entries = $user->future_entries;
-    $cl_uncompleted_indicators = $user->uncompleted_indicators;
-    $cl_bcc_email = $user->bcc_email;
-
-    // Which plugins do we have enabled?
-    $plugins = explode(',', $user->plugins);
-    $cl_charts = in_array('ch', $plugins);
-    $cl_clients = in_array('cl', $plugins);
-    $cl_client_required = in_array('cm', $plugins);
-    $cl_invoices = in_array('iv', $plugins);
-    $cl_paid_status = in_array('ps', $plugins);
-    $cl_custom_fields = in_array('cf', $plugins);    
-    $cl_expenses = in_array('ex', $plugins);
-    $cl_tax_expenses = in_array('et', $plugins);
-    $cl_notifications = in_array('no', $plugins);
-    $cl_locking = in_array('lk', $plugins);
-    $cl_quotas = in_array('mq', $plugins);
-    $cl_week_view = in_array('wv', $plugins);
-  }
 }
 
 $form = new Form('profileForm');
@@ -132,102 +62,6 @@
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email,'enable'=>$can_manage_account));
-if ($user->canManageTeam()) {
-  $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
-  $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
-
-  // Prepare an array of available languages.
-  $lang_files = I18n::getLangFileList();
-  foreach ($lang_files as $lfile) {
-    $content = file(RESOURCE_DIR."/".$lfile);
-    $lname = '';
-    foreach ($content as $line) {
-      if (strstr($line, 'i18n_language')) {
-        $a = explode('=', $line);
-        $lname = trim(str_replace(';','',str_replace("'","",$a[1])));
-        break;
-      }
-    }
-    unset($content);
-    $longname_lang[] = array('id'=>I18n::getLangFromFilename($lfile),'name'=>$lname);
-  }
-  $longname_lang = mu_sort($longname_lang, 'name');
-  $form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 200px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
-
-  $DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
-  $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
-    'onchange'=>'adjustDecimalPreview()'));
-
-  $DATE_FORMAT_OPTIONS = array(
-    array('id'=>'%Y-%m-%d','name'=>'Y-m-d'),
-    array('id'=>'%m/%d/%Y','name'=>'m/d/Y'),
-    array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
-    array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
-  $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
-    'onchange'=>'MakeFormatPreview(&quot;date_format_preview&quot;, this);'));
-  $TIME_FORMAT_OPTIONS = array(
-    array('id'=>'%H:%M','name'=>$i18n->get('form.profile.24_hours')),
-    array('id'=>'%I:%M %p','name'=>$i18n->get('form.profile.12_hours')));
-  $form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
-    'onchange'=>'MakeFormatPreview(&quot;time_format_preview&quot;, this);'));
-
-  // Prepare week start choices.
-  $week_start_options = array();
-  foreach ($i18n->weekdayNames as $id => $week_dn) {
-    $week_start_options[] = array('id' => $id, 'name' => $week_dn);
-  }
-  $form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
-
-  // Show holidays checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
-
-  // Prepare tracking mode choices.
-  $tracking_mode_options = array();
-  $tracking_mode_options[MODE_TIME] = $i18n->get('form.profile.mode_time');
-  $tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.profile.mode_projects');
-  $tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.profile.mode_projects_and_tasks');
-  $form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode,'onchange'=>'handleTaskRequiredCheckbox()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
-  $form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
-
-  // Prepare record type choices.
-  $record_type_options = array();
-  $record_type_options[TYPE_ALL] = $i18n->get('form.profile.type_all');
-  $record_type_options[TYPE_START_FINISH] = $i18n->get('form.profile.type_start_finish');
-  $record_type_options[TYPE_DURATION] = $i18n->get('form.profile.type_duration');
-  $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
-
-  // Punch mode checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'punch_mode','value'=>$cl_punch_mode));
-
-  // Allow overlap checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'allow_overlap','value'=>$cl_allow_overlap));
-
-  // Future entries checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'future_entries','value'=>$cl_future_entries));
-
-  // Uncompleted indicators checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
-
-  // Add bcc email control, for manager only.
-  if ($user->isManager()) {
-    $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
-  }
-
-  // Plugin checkboxes.
-  $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
-  $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'client_required','value'=>$cl_client_required));
-  $form->addInput(array('type'=>'checkbox','name'=>'invoices','value'=>$cl_invoices));
-  $form->addInput(array('type'=>'checkbox','name'=>'paid_status','value'=>$cl_paid_status));
-  $form->addInput(array('type'=>'checkbox','name'=>'custom_fields','value'=>$cl_custom_fields,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'expenses','value'=>$cl_expenses,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'tax_expenses','value'=>$cl_tax_expenses));
-  $form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
-}
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -246,94 +80,15 @@
       $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
-  if ($user->canManageTeam()) {
-    if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
-    if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
-    if ($user->isManager()) {
-      if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
-    }
-  }
   // Finished validating user input.
 
   if ($err->no()) {
-    $update_result = true;
-    if ($user->canManageTeam()) {
-
-      // Prepare plugins string.
-      if ($cl_charts)
-        $plugins .= ',ch';
-      if ($cl_clients)
-        $plugins .= ',cl';
-      if ($cl_client_required)
-        $plugins .= ',cm';
-      if ($cl_invoices)
-        $plugins .= ',iv';
-      if ($cl_paid_status)
-        $plugins .= ',ps';
-      if ($cl_custom_fields)
-        $plugins .= ',cf';
-      if ($cl_expenses)
-        $plugins .= ',ex';
-      if ($cl_tax_expenses)
-        $plugins .= ',et';
-      if ($cl_notifications)
-        $plugins .= ',no';
-      if ($cl_locking)
-        $plugins .= ',lk';
-      if ($cl_quotas)
-        $plugins .= ',mq';
-      if ($cl_week_view)
-        $plugins .= ',wv';
-
-      // Recycle week view plugin options as they are not configured on this page.
-      $existing_plugins = explode(',', $user->plugins);
-      if (in_array('wvn', $existing_plugins))
-        $plugins .= ',wvn';
-      if (in_array('wvl', $existing_plugins))
-        $plugins .= ',wvl';
-      if (in_array('wvns', $existing_plugins))
-        $plugins .= ',wvns';
-
-      $plugins = trim($plugins, ',');
-
-      // Prepare config string.
-      if ($cl_show_holidays)
-        $config .= ',show_holidays';
-      if ($cl_punch_mode)
-        $config .= ',punch_mode';
-      if ($cl_allow_overlap)
-        $config .= ',allow_overlap';
-      if ($cl_future_entries)
-        $config .= ',future_entries';
-      if ($cl_uncompleted_indicators)
-        $config .= ',uncompleted_indicators';
-      $config = trim($config, ',');
-
-      $update_result = ttTeamHelper::update($user->team_id, array(
-        'name' => $cl_team,
-        'currency' => $cl_currency,
-        'lang' => $cl_lang,
-        'decimal_mark' => $cl_decimal_mark,
-        'date_format' => $cl_date_format,
-        'time_format' => $cl_time_format,
-        'week_start' => $cl_start_week,
-        'tracking_mode' => $cl_tracking_mode,
-        'project_required' => $cl_project_required,
-        'task_required' => $cl_task_required,
-        'record_type' => $cl_record_type,
-        'uncompleted_indicators' => $cl_uncompleted_indicators,
-        'bcc_email' => $cl_bcc_email,
-        'plugins' => $plugins,
-        'config' => $config));
-    }
-    if ($update_result) {
-      $update_result = ttUserHelper::update($user->id, array(
+    $update_result = ttUserHelper::update($user->id, array(
         'name' => $cl_name,
         'login' => $cl_login,
         'password' => $cl_password1,
         'email' => $cl_email,
         'status' => ACTIVE));
-    }
     if ($update_result) {
       header('Location: time.php');
       exit();
@@ -344,7 +99,6 @@
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
 $smarty->assign('title', $i18n->get('title.profile'));
 $smarty->assign('content_page_name', 'profile_edit.tpl');
 $smarty->display('index.tpl');

From a490f47a3440b85efc7ef9c1795dd59dac60c83b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 23:30:07 +0000
Subject: [PATCH 0076/1848] Introduced menu.group into translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3b429f5d5..3e7cc33ac 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -48,6 +48,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Perfil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Temps',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0eccd9fdc..961a69b5e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -51,6 +51,7 @@
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
+// 'menu.group' => 'Group',
 // 'menu.time' => 'Time',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Sestavy',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 424346667..fd707ea4f 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Hjælp',
 'menu.create_team' => 'Lav et team',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tid',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 34d050c05..0a515068b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Hilfe',
 'menu.create_team' => 'Neues Team',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Zeiten',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3c5f91532..a238cdd84 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -47,6 +47,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Perfil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tiempo',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 33085b1d2..9a3e4de39 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -50,6 +50,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profiili',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Aeg',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 654674b1a..d1a5f2507 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -47,6 +47,8 @@
 'menu.help' => 'راهنما',
 'menu.create_team' => 'ایجاد گروه',
 'menu.profile' => 'پروفايل',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'زمان',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 967c251d8..e288d1d79 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Apua',
 'menu.create_team' => 'Luo tiimi',
 'menu.profile' => 'Profiili',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tunnit',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index aafbb5dca..54309ae19 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Aide',
 'menu.create_team' => 'Créer une équipe',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Temps',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e9f4790c0..a3827d17c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Βοήθεια',
 'menu.create_team' => 'Δημιουργία ομάδας',
 'menu.profile' => 'Προφίλ',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Χρόνος',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3426aa870..a6ceca7fa 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -47,6 +47,8 @@
 'menu.help' => 'עזרה',
 'menu.create_team' => 'צור צוות',
 'menu.profile' => 'פרופיל',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'זמן',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index fb891c8c0..904ccdefe 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -48,6 +48,8 @@
 'menu.help' => 'Segítség',
 'menu.create_team' => 'Csoport létrehozása',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Munkaidő',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e2258bb74..6cc4b7571 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -48,6 +48,8 @@
 'menu.help' => 'Aiuto',
 'menu.create_team' => 'Crea gruppo',
 'menu.profile' => 'Profilo',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 880b95cd8..e92a03e0d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -48,6 +48,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'プロファイル',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => '時間',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6e0a7e292..85754e635 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -48,6 +48,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => '프로필',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => '시간',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index be2fcf622..e083705e9 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Help',
 'menu.create_team' => 'Maak team',
 'menu.profile' => 'Profiel',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 71a8959cf..0acce80cd 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -49,6 +49,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tid',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index fd599500f..ccb7dc2b9 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Pomoc',
 'menu.create_team' => 'Stwórz zespół',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Czas',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 6fcd6c3ce..6691dad1f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Ajuda',
 'menu.create_team' => 'Criar equipe',
 'menu.profile' => 'Perfil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Gastos',
 'menu.reports' => 'Relatórios',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 7b87af001..d05a39cab 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -50,6 +50,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Perfil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 357d6448e..a649d3ac8 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -50,6 +50,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Timpul',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 14b3e6e8d..cfdee9220 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -46,6 +46,7 @@
 'menu.help' => 'Справка',
 'menu.create_team' => 'Создать команду',
 'menu.profile' => 'Профиль',
+'menu.group' => 'Группа',
 'menu.time' => 'Время',
 'menu.expenses' => 'Расходы',
 'menu.reports' => 'Отчёты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 4dbffff2f..1790729c9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Pomoc',
 'menu.create_team' => 'Vytvoriť tím',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Časový záznam',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8c93e4000..3b417fb49 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -51,6 +51,7 @@
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
+// 'menu.group' => 'Group',
 // 'menu.time' => 'Time',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Poročila',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5e7f56e9f..32d789ddc 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Pomoć',
 'menu.create_team' => 'Napravi tim',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Vreme',
 'menu.expenses' => 'Troškovi',
 'menu.reports' => 'Izveštaji',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 37e8dffe3..bdc2fa87e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -46,6 +46,8 @@
 'menu.help' => 'Hjälp',
 'menu.create_team' => 'Skapa arbetsgrupp',
 'menu.profile' => 'Profil',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Tider',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index bbf97dbf8..6828cb857 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -50,6 +50,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => 'Profili',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => 'Zaman',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 558427534..de8b5d746 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -47,6 +47,8 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 'menu.profile' => '简介',
+// TODO: translate the following.
+// 'menu.group' => 'Group',
 'menu.time' => '时间记录',
 'menu.expenses' => '费用',
 'menu.reports' => '报告',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 16c806222..d5bd872f4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -48,6 +48,7 @@
 // TODO: translate the following.
 // 'menu.create_team' => 'Create Team',
 // 'menu.profile' => 'Profile',
+// 'menu.group' => 'Group',
 // 'menu.time' => 'Time',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '報告',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 35039df11..ccba58341 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.17.80.4193 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4194 | 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>

From c13fcda70448cc81d1555fe2ee25a5d0ed2f74c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Mar 2018 23:41:51 +0000
Subject: [PATCH 0077/1848] Introduced title.group into translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3e7cc33ac..6f7aa90e3 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -314,6 +314,7 @@
 'title.options' => 'Opcions',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 961a69b5e..7410ac064 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -324,6 +324,7 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index fd707ea4f..a515b6bef 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -281,6 +281,8 @@
 'title.import' => 'Importer Team Data',
 'title.options' => 'Indstillinger',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Brugerdefineret Felt',
 'title.cf_add_custom_field' => 'Tilføj Brugerdefineret Felt',
 'title.cf_edit_custom_field' => 'Redigér Brugerdefineret Felt',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0a515068b..6e56c7044 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -273,6 +273,8 @@
 'title.import' => 'Daten importieren',
 'title.options' => 'Optionen',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Benutzerfelder',
 'title.cf_add_custom_field' => 'Benutzerfeld hinzufügen',
 'title.cf_edit_custom_field' => 'Benutzerfeld bearbeiten',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a238cdd84..f668046e6 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -313,6 +313,7 @@
 'title.options' => 'Opciones',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 9a3e4de39..d852de894 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -320,6 +320,7 @@
 'title.options' => 'Suvandid',
 'title.profile' => 'Profiili',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index d1a5f2507..90ca57bf5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -291,6 +291,8 @@
 'title.import' => 'وارد کردن اطلاعات تیم',
 'title.options' => 'گزینه ها',
 'title.profile' => 'پروفایل',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'فیلدهای سفارشی',
 'title.cf_add_custom_field' => 'درج فیلد سفارشی',
 'title.cf_edit_custom_field' => 'ویرایش فیلد سفارشی',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e288d1d79..24fadbf55 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -282,6 +282,8 @@
 'title.import' => 'Tiimitietojen tunti',
 'title.options' => 'Optiot',
 'title.profile' => 'Profiili',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Omat kentät',
 'title.cf_add_custom_field' => 'Oman kentän lisäys',
 'title.cf_edit_custom_field' => 'Oman kentän muokkaus',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 54309ae19..947bc0bce 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -275,6 +275,8 @@
 'title.import' => 'Importation des données',
 'title.options' => 'Options',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Champs personalisés',
 'title.cf_add_custom_field' => 'Ajout d\\\'un champ',
 'title.cf_edit_custom_field' => 'Édition d\\\'un champ',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a3827d17c..93b3eab86 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -271,6 +271,8 @@
 'title.import' => 'Εισαγωγή δεδομένων ομάδας',
 'title.options' => 'Επιλογές',
 'title.profile' => 'Προφίλ',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Προσαρμοσμένα πεδία',
 'title.cf_add_custom_field' => 'Προσθήκη προσαρμοσμένου πεδίου',
 'title.cf_edit_custom_field' => 'Επεξεργασία προσαρμοσμένου πεδίου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a6ceca7fa..baa85d710 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -302,6 +302,8 @@
 'title.import' => 'ייבוא נתוני צוות',
 'title.options' => 'אפשרויות',
 'title.profile' => 'פרופיל',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'שדות אישיים',
 'title.cf_add_custom_field' => 'הוספת שדה אישי',
 'title.cf_edit_custom_field' => 'עריכת שדה אישי',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 904ccdefe..4fbec7a5e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -312,6 +312,7 @@
 'title.options' => 'Opciók',
 'title.profile' => 'Profil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 6cc4b7571..ce173ee31 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -281,6 +281,8 @@
 'title.import' => 'Importa i dati del gruppo',
 'title.options' => 'Opzioni',
 'title.profile' => 'Profilo',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Campi personalizzati',
 'title.cf_add_custom_field' => 'Aggiunta campo personalizzato',
 'title.cf_edit_custom_field' => 'Modifica campo personalizzato',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index e92a03e0d..e13f2d9dd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -318,6 +318,7 @@
 'title.options' => 'オプション',
 'title.profile' => 'プロファイル',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 85754e635..b066e55fd 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -319,6 +319,7 @@
 'title.options' => '옵션',
 'title.profile' => '프로필',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e083705e9..320da1d97 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -274,6 +274,8 @@
 'title.import' => 'Importeer teamgegevens',
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Eigen velden',
 'title.cf_add_custom_field' => 'Eigen veld toevoegen',
 'title.cf_edit_custom_field' => 'Eigen veld bewerken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 0acce80cd..aeff48725 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -314,6 +314,7 @@
 'title.options' => 'Opsjoner',
 'title.profile' => 'Profil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ccb7dc2b9..62702bf20 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -282,6 +282,8 @@
 'title.import' => 'Import danych zespołu',
 'title.options' => 'Opcje',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Pola niestandardowe',
 'title.cf_add_custom_field' => 'Dodawanie pola niestandardowego',
 'title.cf_edit_custom_field' => 'Edytowanie pola niestandardowego',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 6691dad1f..3ad934e2d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -279,6 +279,8 @@
 'title.import' => 'Importando dados de equipe',
 'title.options' => 'Opções',
 'title.profile' => 'Perfil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Campos personalizados',
 'title.cf_add_custom_field' => 'Adicionando campo personalizado',
 'title.cf_edit_custom_field' => 'Editando campo personalizado',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d05a39cab..d33922f63 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -301,6 +301,7 @@
 'title.options' => 'Opções',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a649d3ac8..4deeb3ee1 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -320,6 +320,7 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index cfdee9220..34368cdd2 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -268,6 +268,7 @@
 'title.import' => 'Импортирование данных команды',
 'title.options' => 'Опции',
 'title.profile' => 'Профиль',
+'title.group' => 'Настройки группы',
 'title.cf_custom_fields' => 'Дополнительные поля',
 'title.cf_add_custom_field' => 'Добавление поля',
 'title.cf_edit_custom_field' => 'Редактирование поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1790729c9..8ff080e2b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -292,6 +292,8 @@
 'title.import' => 'Importovanie údajov o tíme',
 'title.options' => 'Nastavenia',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Vlastné polia',
 'title.cf_add_custom_field' => 'Pridávanie vlastného poľa',
 'title.cf_edit_custom_field' => 'Upravovanie vlastného poľa',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 3b417fb49..9696b526c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -296,6 +296,7 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 32d789ddc..06b087b7c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -281,6 +281,8 @@
 'title.import' => 'Uvoz podataka tim-a',
 'title.options' => 'Opcije',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Dodatna polja',
 'title.cf_add_custom_field' => 'Dodavanje dodatnih polja',
 'title.cf_edit_custom_field' => 'Izmena dodatnih polja',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bdc2fa87e..2c6992320 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -282,6 +282,8 @@
 'title.import' => 'Importera arbetsgrupp',
 'title.options' => 'Alternativ',
 'title.profile' => 'Profil',
+// TODO: translate the following.
+// 'title.group' => 'Group Settings',
 'title.cf_custom_fields' => 'Egna fält',
 'title.cf_add_custom_field' => 'Lägg till fält',
 'title.cf_edit_custom_field' => 'Redigera fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 6828cb857..d7a513bf9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -329,6 +329,7 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profili',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index de8b5d746..72f4317e1 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -306,6 +306,7 @@
 'title.options' => '选项',
 'title.profile' => '简介',
 // TODO: translate the following.
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index d5bd872f4..0ef227efb 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -313,6 +313,7 @@
 'title.options' => '選項',
 // TODO: translate the following.
 // 'title.profile' => 'Profile',
+// 'title.group' => 'Group Settings',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ccba58341..f0473bb12 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.17.80.4194 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4195 | 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>

From 40e7c879cbbc4f00227c039f1a86d48f81e10101 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Mar 2018 00:28:31 +0000
Subject: [PATCH 0078/1848] Ongoing process of renaming team to group.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 3 ++-
 WEB-INF/resources/de.lang.php    | 3 ++-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 3 ++-
 WEB-INF/resources/fi.lang.php    | 3 ++-
 WEB-INF/resources/fr.lang.php    | 3 ++-
 WEB-INF/resources/gr.lang.php    | 3 ++-
 WEB-INF/resources/he.lang.php    | 3 ++-
 WEB-INF/resources/hu.lang.php    | 5 ++---
 WEB-INF/resources/it.lang.php    | 3 +--
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 3 ++-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 3 ++-
 WEB-INF/resources/pt-br.lang.php | 3 ++-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 3 ++-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 3 ++-
 WEB-INF/resources/sv.lang.php    | 5 ++---
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/header.tpl     | 2 +-
 32 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6f7aa90e3..9ccf24e94 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajuda',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 7410ac064..e73597079 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -48,7 +48,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoc',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a515b6bef..88b905ba0 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Log ud',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hjælp',
-'menu.create_team' => 'Lav et team',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6e56c7044..47ac5c52a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Abmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hilfe',
-'menu.create_team' => 'Neues Team',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1613fec90..b4fdb8a73 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -44,7 +44,7 @@
 'menu.logout' => 'Logout',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-'menu.create_team' => 'Create Team',
+'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
 'menu.time' => 'Time',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f668046e6..1d6926810 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -45,7 +45,7 @@
 'menu.forum' => 'Foro',
 'menu.help' => 'Ayuda',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d852de894..2eea5d4bf 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -48,7 +48,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Abiinfo',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profiili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 90ca57bf5..a9834b0a6 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -45,7 +45,8 @@
 'menu.logout' => 'خروج',
 'menu.forum' => 'فروم',
 'menu.help' => 'راهنما',
-'menu.create_team' => 'ایجاد گروه',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'پروفايل',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 24fadbf55..3b904500e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Kirjaudu ulos',
 'menu.forum' => 'Keskustelupalsta',
 'menu.help' => 'Apua',
-'menu.create_team' => 'Luo tiimi',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profiili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 947bc0bce..ae46dc664 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Quitter',
 'menu.forum' => 'Forum',
 'menu.help' => 'Aide',
-'menu.create_team' => 'Créer une équipe',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 93b3eab86..616aad7c0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Αποσύνδεση',
 'menu.forum' => 'Φόρουμ',
 'menu.help' => 'Βοήθεια',
-'menu.create_team' => 'Δημιουργία ομάδας',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Προφίλ',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index baa85d710..a8bcf9254 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -45,7 +45,8 @@
 'menu.logout' => 'יציאה',
 'menu.forum' => 'פורום',
 'menu.help' => 'עזרה',
-'menu.create_team' => 'צור צוות',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'פרופיל',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 4fbec7a5e..b0f9d2e61 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -46,10 +46,9 @@
 'menu.logout' => 'Kijelentkezés',
 'menu.forum' => 'Fórum',
 'menu.help' => 'Segítség',
-'menu.create_team' => 'Csoport létrehozása',
+'menu.create_group' => 'Csoport létrehozása',
 'menu.profile' => 'Profil',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Csoport',
 'menu.time' => 'Munkaidő',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ce173ee31..200f490b4 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -48,8 +48,7 @@
 'menu.help' => 'Aiuto',
 'menu.create_team' => 'Crea gruppo',
 'menu.profile' => 'Profilo',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Gruppo',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index e13f2d9dd..aaf501104 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'ヘルプ',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'プロファイル',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b066e55fd..7b429a562 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => '도움말',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => '프로필',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 320da1d97..a247160bb 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Afmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-'menu.create_team' => 'Maak team',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profiel',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index aeff48725..0de21ef18 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -47,7 +47,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Hjelp',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 62702bf20..36e1940d6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Wyloguj',
 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoc',
-'menu.create_team' => 'Stwórz zespół',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3ad934e2d..2387937fa 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Logout',
 'menu.forum' => 'Fórum',
 'menu.help' => 'Ajuda',
-'menu.create_team' => 'Criar equipe',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d33922f63..5a9e39849 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -48,7 +48,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajuda',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 4deeb3ee1..476ad3f1c 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -48,7 +48,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajutor',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 34368cdd2..f1f18b09f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -44,7 +44,7 @@
 'menu.logout' => 'Выйти',
 'menu.forum' => 'Форум',
 'menu.help' => 'Справка',
-'menu.create_team' => 'Создать команду',
+'menu.create_group' => 'Создать группу',
 'menu.profile' => 'Профиль',
 'menu.group' => 'Группа',
 'menu.time' => 'Время',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8ff080e2b..2608643af 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Odhlásenie',
 'menu.forum' => 'Fórum',
 'menu.help' => 'Pomoc',
-'menu.create_team' => 'Vytvoriť tím',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9696b526c..7c181ae6c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -48,7 +48,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoč',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 06b087b7c..839b60bd8 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Odjava',
 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoć',
-'menu.create_team' => 'Napravi tim',
+// TODO: translate the following.
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 2c6992320..93e3348bb 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -44,10 +44,9 @@
 'menu.logout' => 'Logga ut',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hjälp',
-'menu.create_team' => 'Skapa arbetsgrupp',
+'menu.create_group' => 'Skapa grupp',
 'menu.profile' => 'Profil',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Grupp',
 'menu.time' => 'Tider',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d7a513bf9..727188a6c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -48,7 +48,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Yardım',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 72f4317e1..5b2e2dccb 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -45,7 +45,7 @@
 'menu.forum' => '论坛',
 'menu.help' => '帮助',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 'menu.profile' => '简介',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 0ef227efb..5a9a072b5 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => '幫助',
 // TODO: translate the following.
-// 'menu.create_team' => 'Create Team',
+// 'menu.create_group' => 'Create Group',
 // 'menu.profile' => 'Profile',
 // 'menu.group' => 'Group',
 // 'menu.time' => 'Time',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f0473bb12..8d3bd12b7 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.17.80.4195 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4196 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 3ad3fb5fc..454365fbb 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -143,7 +143,7 @@
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a> &middot;
   {if isTrue($smarty.const.MULTITEAM_MODE) && $smarty.const.AUTH_MODULE == 'db'}
-            <a class="systemMenu" href="register.php">{$i18n.menu.create_team}</a> &middot;
+            <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a> &middot;
   {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>

From e0ec0364d761e2dff5a7c0032f04ec1dbae50980 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Mar 2018 01:42:40 +0000
Subject: [PATCH 0079/1848] A bit more progress with renaming teams to groups.

---
 WEB-INF/resources/ca.lang.php       | 2 +-
 WEB-INF/resources/cs.lang.php       | 3 ++-
 WEB-INF/resources/da.lang.php       | 3 ++-
 WEB-INF/resources/de.lang.php       | 3 ++-
 WEB-INF/resources/en.lang.php       | 2 +-
 WEB-INF/resources/es.lang.php       | 4 ++--
 WEB-INF/resources/et.lang.php       | 2 +-
 WEB-INF/resources/fa.lang.php       | 3 ++-
 WEB-INF/resources/fi.lang.php       | 3 ++-
 WEB-INF/resources/fr.lang.php       | 3 ++-
 WEB-INF/resources/gr.lang.php       | 8 +++-----
 WEB-INF/resources/he.lang.php       | 3 ++-
 WEB-INF/resources/hu.lang.php       | 2 +-
 WEB-INF/resources/it.lang.php       | 2 +-
 WEB-INF/resources/ja.lang.php       | 2 +-
 WEB-INF/resources/ko.lang.php       | 2 +-
 WEB-INF/resources/nl.lang.php       | 3 ++-
 WEB-INF/resources/no.lang.php       | 3 ++-
 WEB-INF/resources/pl.lang.php       | 3 ++-
 WEB-INF/resources/pt-br.lang.php    | 3 ++-
 WEB-INF/resources/pt.lang.php       | 2 +-
 WEB-INF/resources/ro.lang.php       | 2 +-
 WEB-INF/resources/ru.lang.php       | 2 +-
 WEB-INF/resources/sk.lang.php       | 3 ++-
 WEB-INF/resources/sl.lang.php       | 3 +--
 WEB-INF/resources/sr.lang.php       | 3 ++-
 WEB-INF/resources/sv.lang.php       | 2 +-
 WEB-INF/resources/tr.lang.php       | 2 +-
 WEB-INF/resources/zh-cn.lang.php    | 3 ++-
 WEB-INF/resources/zh-tw.lang.php    | 3 ++-
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/header.tpl        | 2 +-
 WEB-INF/templates/mobile/header.tpl | 2 +-
 33 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9ccf24e94..27abaeac3 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -60,7 +60,7 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Usuaris',
-'menu.teams' => 'Grups',
+'menu.groups' => 'Grups',
 // TODO: translate the following.
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clients',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e73597079..4c9a50c2c 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -61,7 +61,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Uživatelů',
-'menu.teams' => 'Týmy',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Export',
 'menu.clients' => 'Zákazníci',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 88b905ba0..d49ab64ab 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projekter',
 'menu.tasks' => 'Opgaver',
 'menu.users' => 'Brugere',
-'menu.teams' => 'Teams',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Indstillinger',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 47ac5c52a..9712b6329 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projekte',
 'menu.tasks' => 'Aufgaben',
 'menu.users' => 'Personen',
-'menu.teams' => 'Teams',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Exportieren',
 'menu.clients' => 'Kunden',
 'menu.options' => 'Optionen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b4fdb8a73..2063f4eec 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -54,7 +54,7 @@
 'menu.projects' => 'Projects',
 'menu.tasks' => 'Tasks',
 'menu.users' => 'Users',
-'menu.teams' => 'Teams',
+'menu.groups' => 'Groups',
 'menu.export' => 'Export',
 'menu.clients' => 'Clients',
 'menu.options' => 'Options',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1d6926810..f294df6c7 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -59,9 +59,9 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Personas',
-'menu.teams' => 'Equipos',
 // TODO: translate the following.
-// menu.export' => 'Export',
+// 'menu.groups' => 'Groups',
+// 'menu.export' => 'Export',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opciones',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 2eea5d4bf..7a7640e39 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -62,8 +62,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Kasutajad',
-'menu.teams' => 'Meeskonnad',
 // TODO: translate the following.
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Kliendid',
 'menu.options' => 'Suvandid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a9834b0a6..e290791be 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -57,7 +57,8 @@
 'menu.projects' => 'پروژه ها',
 'menu.tasks' => 'وظايف',
 'menu.users' => 'کاربران',
-'menu.teams' => 'گروه ها',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'پشتیبانی',
 'menu.clients' => 'مشتری ها',
 'menu.options' => 'تنظیمات',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3b904500e..9d4bcba63 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projektit',
 'menu.tasks' => 'Tehtävät',
 'menu.users' => 'Käyttäjät',
-'menu.teams' => 'Tiimit',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Vie',
 'menu.clients' => 'Asiakkaat',
 'menu.options' => 'Optiot',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ae46dc664..57f3d10c9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projets',
 'menu.tasks' => 'Tâches',
 'menu.users' => 'Utilisateurs',
-'menu.teams' => 'Équipes',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Exporter',
 'menu.clients' => 'Clients',
 'menu.options' => 'Options',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 616aad7c0..396719e9c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -44,11 +44,9 @@
 'menu.logout' => 'Αποσύνδεση',
 'menu.forum' => 'Φόρουμ',
 'menu.help' => 'Βοήθεια',
-// TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+'menu.create_group' => 'Δημιουργία ομάδας',
 'menu.profile' => 'Προφίλ',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Ομάδα',
 'menu.time' => 'Χρόνος',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
@@ -56,7 +54,7 @@
 'menu.projects' => 'Έργα',
 'menu.tasks' => 'Εργασίες',
 'menu.users' => 'Χρήστες',
-'menu.teams' => 'Ομάδες',
+'menu.groups' => 'Ομάδες',
 'menu.export' => 'Εξαγωγή',
 'menu.clients' => 'Πελάτες',
 'menu.options' => 'Επιλογές',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a8bcf9254..a657bdc30 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -58,7 +58,8 @@
 'menu.projects' => 'פרוייקטים',
 'menu.tasks' => 'משימות',
 'menu.users' => 'משתמשים',
-'menu.teams' => 'צוותים',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'ייצוא',
 'menu.clients' => 'לקוחות',
 'menu.options' => 'אפשרויות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b0f9d2e61..3c96206b0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -59,7 +59,7 @@
 // 'menu.tasks' => 'Tasks',
 // TODO: translate the following.
 // 'menu.users' => 'Users',
-'menu.teams' => 'Csoportok',
+'menu.groups' => 'Csoportok',
 // TODO: translate the following.
 // 'menu.export' => 'Export',
 'menu.clients' => 'Ügyfelek',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 200f490b4..927417b9c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -56,7 +56,7 @@
 'menu.projects' => 'Progetti',
 'menu.tasks' => 'Compiti',
 'menu.users' => 'Utenti',
-'menu.teams' => 'Gruppi',
+'menu.groups' => 'Gruppi',
 'menu.export' => 'Esportazione',
 'menu.clients' => 'Clienti',
 'menu.options' => 'Opzioni',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index aaf501104..534eb3db7 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -60,8 +60,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'ユーザー',
-'menu.teams' => 'チーム',
 // TODO: translate the following.
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'クライアント',
 'menu.options' => 'オプション',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 7b429a562..67b6d5054 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -60,8 +60,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => '사용자',
-'menu.teams' => '팀',
 // TODO: translate the following.
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 'menu.clients' => '클라이언트',
 'menu.options' => '옵션',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a247160bb..ff4514512 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projecten',
 'menu.tasks' => 'Taken',
 'menu.users' => 'Medewerkers',
-'menu.teams' => 'Teams',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Exporteren',
 'menu.clients' => 'Klanten',
 'menu.options' => 'Opties',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 0de21ef18..077ee2984 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -60,7 +60,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Brukere',
-// 'menu.teams' => 'Teams',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienter',
 'menu.options' => 'Opsjoner',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 36e1940d6..166edfed7 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projekty',
 'menu.tasks' => 'Zadania',
 'menu.users' => 'Użytkownicy',
-'menu.teams' => 'Zespoły',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienci',
 'menu.options' => 'Opcje',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 2387937fa..dd8fc8250 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projetos',
 'menu.tasks' => 'Tarefas',
 'menu.users' => 'Usuários',
-'menu.teams' => 'Equipes',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Exportar',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opções',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5a9e39849..66cf565ba 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -63,7 +63,7 @@
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Usuários',
 // TODO: translate the following.
-// 'menu.teams' => 'Teams',
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 // 'menu.clients' => 'Clients',
 'menu.options' => 'Opções',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 476ad3f1c..eeba69563 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -62,8 +62,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Utilizatori',
-'menu.teams' => 'Echipe',
 // TODO: translate the following.
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clienti',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f1f18b09f..8d1331d81 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -54,7 +54,7 @@
 'menu.projects' => 'Проекты',
 'menu.tasks' => 'Задачи',
 'menu.users' => 'Пользователи',
-'menu.teams' => 'Команды',
+'menu.groups' => 'Группы',
 'menu.export' => 'Экспорт',
 'menu.clients' => 'Клиенты',
 'menu.options' => 'Опции',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2608643af..66efd058d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -57,7 +57,8 @@
 'menu.projects' => 'Projekty',
 'menu.tasks' => 'Úlohy',
 'menu.users' => 'Používatelia',
-'menu.teams' => 'Tímy',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Export',
 'menu.clients' => 'Klienti',
 'menu.options' => 'Nastavenia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7c181ae6c..5fba7a9c6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -61,8 +61,7 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 // 'menu.users' => 'Users',
-'menu.teams' => 'Timi',
-// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Stranke',
 'menu.options' => 'Možnosti',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 839b60bd8..5fa432f6e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => 'Projekti',
 'menu.tasks' => 'Zadaci',
 'menu.users' => 'Korisnici',
-'menu.teams' => 'Timovi',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => 'Izvoz',
 'menu.clients' => 'Klijenti',
 'menu.options' => 'Opcije',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 93e3348bb..a45921b1c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -54,7 +54,7 @@
 'menu.projects' => 'Projekt',
 'menu.tasks' => 'Arbetsuppgifter',
 'menu.users' => 'Användare',
-'menu.teams' => 'Arbetsgrupper',
+'menu.groups' => 'Grupper',
 'menu.export' => 'Exportera',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Alternativ',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 727188a6c..0cb44dfd7 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -62,8 +62,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => 'Kullanıcılar',
-'menu.teams' => 'Ekipler',
 // TODO: translate the following.
+// 'menu.groups' => 'Groups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Müşteriler',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5b2e2dccb..8439f6b3e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -56,7 +56,8 @@
 'menu.projects' => '项目',
 'menu.tasks' => '任务',
 'menu.users' => '用户',
-'menu.teams' => '团队',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => '导出数据',
 'menu.clients' => '客户',
 'menu.options' => '选项',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5a9a072b5..33ea3114b 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -58,7 +58,8 @@
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
 'menu.users' => '用戶',
-'menu.teams' => '團隊',
+// TODO: translate the following.
+// 'menu.groups' => 'Groups',
 'menu.export' => '輸出資料',
 'menu.clients' => '客戶',
 'menu.options' => '選項',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8d3bd12b7..0acdf55c7 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.17.80.4196 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4197 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 454365fbb..a5f0d022d 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -71,7 +71,7 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_teams.php">{$i18n.menu.teams}</a> &middot;
+            <a class="mainMenu" href="admin_teams.php">{$i18n.menu.groups}</a> &middot;
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
         </tr>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 7118cfa4e..f61b7119a 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -61,7 +61,7 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_teams.php">{$i18n.menu.teams}</a> &middot;
+            <a class="mainMenu" href="admin_teams.php">{$i18n.menu.groups}</a> &middot;
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
         </tr>

From dfc50841cd4b60eb8f2172044d6dd08785fe3df4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Mar 2018 10:35:44 +0000
Subject: [PATCH 0080/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 44 ++++++++++++++---------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ff4514512..4e06cc0ec 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -72,8 +72,7 @@
 'error.access_denied' => 'Toegang geweigerd.',
 'error.sys' => 'Systeem fout.',
 'error.db' => 'Database fout.',
-// TODO: translate the following.
-// 'error.feature_disabled' => 'Feature is disabled.',
+'error.feature_disabled' => 'Functie is uitgeschakeld.',
 'error.field' => 'Incorrecte gegevens: "{0}".',
 'error.empty' => 'Veld "{0}" is leeg.',
 'error.not_equal' => 'Veld "{0}" is niet gelijk aan veld "{1}".',
@@ -82,17 +81,18 @@
 'error.task' => 'Kies taak.',
 'error.client' => 'Kies klant.',
 'error.report' => 'Kies rapport.',
-'error.record' => 'Selecteer record.', // TODO: why not Kies as above?
+'error.record' => 'Kies record.',
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
-// TODO: translate the following.
-// 'error.object_exists' => 'Object with this name already exists.',
+'error.object_exists' => 'Een object met deze naam bestaat al.',
 'error.project_exists' => 'Een project met deze naam bestaat al.',
 'error.task_exists' => 'Er bestaat al een taak met deze naam.',
 'error.client_exists' => 'Een klant met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
-// TODO: translate the following.
+// TODO: translate the following. It seems like rank is misplaced ith rights.
 // 'error.role_exists' => 'Role with this rank already exists.',
+// 'error.role_exists' => 'Een rol met deze rechten bestaat al.', // TODO: rank is not rights. Rank is a number.
+                                                                  // Rights (rechten) is a set of permissions ("view_users", etc.).
 'error.no_invoiceable_items' => 'Er zijn geen factuureerbare onderdelen.',
 'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.',
 'error.no_teams' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw team.',
@@ -161,8 +161,7 @@
 'label.notes' => 'Notities',
 'label.item' => 'Artikel',
 'label.cost' => 'Kosten',
-// TODO: translate the following.
-// 'label.ip' => 'IP',
+'label.ip' => 'IP adres',
 'label.day_total' => 'Dag totaal',
 'label.week_total' => 'Week totaal',
 'label.month_total' => 'Maand totaal',
@@ -208,8 +207,7 @@
 'label.type_text' => 'tekst',
 'label.required' => 'Verplicht veld',
 'label.fav_report' => 'Standaard rapport',
-// TODO: translate the following.
-// 'label.schedule' => 'Schedule',
+'label.schedule' => 'Planning',
 'label.what_is_it' => 'Wat betekent dit?',
 'label.expense' => 'Kosten',
 'label.quantity' => 'Hoeveelheid',
@@ -288,8 +286,7 @@
 'title.cf_delete_dropdown_option' => 'Uitvouwmogelijkheid verwijderen',
 'title.locking' => 'Blokkeren',
 'title.week_view' => 'Week overzicht',
-// TODO: translate the following.
-// 'title.swap_roles' => 'Swapping Roles',
+'title.swap_roles' => 'Rollen verruilen',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -332,10 +329,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Het verzoek om het wachtwoord te herstellen is verzonden per email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker wachtwoord herstel verzoek',
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
-// "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Geachte medewerker,\n\nIemand, IP %s, heeft verzocht uw wachtwoord in Anuko Time Tracker te herstellen. Klik op deze link als u uw wachtwoord wil wijzigen.\n\n%s\n\nAnuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek https://www.anuko.com voor meer informatie.\n\n",
+'form.reset_password.email_body' => "Geachte medewerker,\n\nIemand, met IP adres %s, heeft verzocht uw wachtwoord in Anuko Time Tracker te herstellen. Klik op deze link als u uw wachtwoord wil wijzigen.\n\n%s\n\nAnuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek https://www.anuko.com voor meer informatie.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Voer het nieuwe wachtwoord in en klik op Bewaren.',
@@ -412,12 +406,10 @@
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 'form.roles.active_roles' => 'Actieve rollen',
 'form.roles.inactive_roles' => 'Inactieve rollen',
-// TODO: translate the following.
-// 'form.roles.rank' => 'Rank',
+'form.roles.rank' => 'Volgorde',
 'form.roles.rights' => 'Rechten',
-// TODO: translate the following.
-// 'form.roles.assigned' => 'Assigned',
-// 'form.roles.not_assigned' => 'Not assigned',
+'form.roles.assigned' => 'Toegewezen',
+'form.roles.not_assigned' => 'Niet toegewezen',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
 'form.clients.active_clients' => 'Actieve klanten',
@@ -442,8 +434,7 @@
 'form.teams.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
+'form.profile.swap_roles' => 'Rollen verruilen',
 'form.profile.12_hours' => '12 uurs',
 'form.profile.24_hours' => '24 uurs',
 'form.profile.show_holidays' => 'Toon vakantiedagen',
@@ -477,9 +468,8 @@
 'form.quota.hint' => 'Als de velden leeg worden gelaten, dan zullen de doelen worden berekend op bassis van het aantal werkuren per dag en vakantiedagen.',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
-// TODO: translate the following.
-// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
-// 'form.swap.swap_with' => 'Swap roles with',
+'form.swap.hint' => 'Degradeer jezelf naar een lagere rol door een rol te verruilen met iemand anders. Dit kan niet ongedaan worden gemaakt.',
+'form.swap.swap_with' => 'Verruil rol met',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'Gebruiker',
@@ -502,5 +492,5 @@
 'role.top_manager.description' => 'Top groepsbeheerder. Kan alle groepen beheren.',
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
-'role.admin.description' => 'Website beheerder.', // TODO: perhaps, 'Time Tracker administrator.'?
+'role.admin.description' => 'Time Tracker beheerder.',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0acdf55c7..e70cdbeae 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.17.80.4197 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4198 | 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>

From 82113b6a111dc3f716c71fb8fb55b11845cbd697 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Mar 2018 19:32:52 +0000
Subject: [PATCH 0081/1848] Refactoring. Renamed tt_teams table to tt_groups.

---
 WEB-INF/lib/ttAdmin.class.php       |  4 ++--
 WEB-INF/lib/ttGroupHelper.class.php |  4 ++--
 WEB-INF/lib/ttRegistrator.class.php |  8 ++++----
 WEB-INF/lib/ttTeamHelper.class.php  | 18 +++++++++---------
 WEB-INF/lib/ttUser.class.php        |  2 +-
 WEB-INF/lib/ttUserHelper.class.php  |  2 +-
 WEB-INF/resources/nl.lang.php       |  2 +-
 WEB-INF/templates/footer.tpl        |  2 +-
 dbinstall.php                       | 13 ++++++++-----
 mysql.sql                           | 13 +++++--------
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index fbcabd476..ed1b280c3 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -174,7 +174,7 @@ function markGroupDeleted($group_id) {
     // Mark group deleted.
     global $user;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-    $sql = "update tt_teams set status = NULL $modified_part where id = $group_id";
+    $sql = "update tt_groups set status = NULL $modified_part where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -242,7 +242,7 @@ function updateGroup($team_id, $fields) {
     if ($fields['old_group_name'] != $fields['new_group_name']) {
       $name_part = 'name = '.$mdb2->quote($fields['new_group_name']);
       $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-      $sql = 'update tt_teams set '.$name_part.$modified_part.' where id = '.$team_id;
+      $sql = 'update tt_groups set '.$name_part.$modified_part.' where id = '.$team_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 9fcb8443e..6ffa6b21a 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -35,8 +35,8 @@ static function getTopGroups() {
     $result = array();
     $mdb2 = getConnection();
 
-    // TODO: when we have subgroups, improve the query to return only top groups.
-    $sql =  "select id, name, created, lang from tt_teams where status = 1 order by id desc";
+    $sql =  "select id, name, created, lang from tt_groups".
+            " where status = 1 and org_id is NULL order by id desc";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 3c424f486..23df23eab 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -135,11 +135,11 @@ function createGroup() {
     $created = 'now()';
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
 
-    $sql = "insert into tt_teams (name, currency, lang, created, created_ip) values($name, $currency, $lang, $created, $created_ip)";
+    $sql = "insert into tt_groups (name, currency, lang, created, created_ip) values($name, $currency, $lang, $created, $created_ip)";
     $affected = $mdb2->exec($sql);
 
     if (!is_a($affected, 'PEAR_Error')) {
-      $group_id = $mdb2->lastInsertID('tt_teams', 'id');
+      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
       return $group_id;
     }
     return false;
@@ -174,7 +174,7 @@ function setCreatedBy($user_id) {
     $mdb2 = getConnection();
 
     // Update group.
-    $sql = "update tt_teams set created_by = $user_id where id = $this->group_id";
+    $sql = "update tt_groups set created_by = $user_id where id = $this->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
       $this->err->add($i18n->get('error.db'));
@@ -199,7 +199,7 @@ function registeredRecently() {
     $mdb2 = getConnection();
 
     $ip_part = ' created_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $sql = 'select created from tt_teams where '.$ip_part.' and created > now() - interval 1 minute';
+    $sql = 'select created from tt_groups where '.$ip_part.' and created > now() - interval 1 minute';
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 2aff793bc..d5a7f51de 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -725,8 +725,8 @@ static function markDeleted($team_id) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    // Mark team deleted.
-    $sql = "update tt_teams set status = NULL where id = $team_id";
+    // Mark group deleted.
+    $sql = "update tt_groups set status = NULL where id = $team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -739,7 +739,7 @@ static function getTeamDetails($team_id) {
     $mdb2 = getConnection();
 
     $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email
-      from tt_teams t
+      from tt_groups t
       inner join tt_users u on (u.team_id = t.id)
       inner join tt_roles r on (r.id = u.role_id and r.rank = 512)
       where t.id = $team_id";
@@ -842,11 +842,11 @@ static function insert($fields) {
     $columns .= ', created, created_ip, created_by';
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
 
-    $sql = "insert into tt_teams ($columns) values($values)";
+    $sql = "insert into tt_groups ($columns) values($values)";
     $affected = $mdb2->exec($sql);
 
     if (!is_a($affected, 'PEAR_Error')) {
-      $team_id = $mdb2->lastInsertID('tt_teams', 'id');
+      $team_id = $mdb2->lastInsertID('tt_groups', 'id');
       return $team_id;
     }
 
@@ -889,7 +889,7 @@ static function update($team_id, $fields)
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
 
-    $sql = "update tt_teams set $name_part $currency_part $lang_part $decimal_mark_part
+    $sql = "update tt_groups set $name_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
       $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $team_id";
     $affected = $mdb2->exec($sql);
@@ -906,7 +906,7 @@ static function getInactiveTeams() {
     // Get all team ids for teams created or modified more than 8 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));
     $ts = $mdb2->quote(date('Y-m-d', strtotime('-8 month')));
-    $sql =  "select id from tt_teams where created < $ts and (modified is null or modified < $ts) order by id";
+    $sql =  "select id from tt_groups where created < $ts and (modified is null or modified < $ts) order by id";
     $res = $mdb2->query($sql);
 
     $count = 0;
@@ -1014,8 +1014,8 @@ static function delete($team_id) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    // Delete team.
-    $sql = "delete from tt_teams where id = $team_id";
+    // Delete group.
+    $sql = "delete from tt_groups where id = $team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index f9edc8cc7..7e167f612 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -76,7 +76,7 @@ function __construct($login, $id = null) {
       t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
       t.tracking_mode, t.project_required, t.task_required, t.record_type,
       t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
-      FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+      FROM tt_users u LEFT JOIN tt_groups t ON (u.team_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
     else
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 31c7bde4d..dab51297c 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -318,7 +318,7 @@ static function markDeleted($user_id) {
           return false;
  
         // Mark team deleted.
-        $sql = "update tt_teams set status = NULL where id = $user->team_id";
+        $sql = "update tt_groups set status = NULL where id = $user->team_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4e06cc0ec..9631a87b6 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -89,7 +89,7 @@
 'error.task_exists' => 'Er bestaat al een taak met deze naam.',
 'error.client_exists' => 'Een klant met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
-// TODO: translate the following. It seems like rank is misplaced ith rights.
+// TODO: translate the following. It seems like rank is misplaced with rights.
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.role_exists' => 'Een rol met deze rechten bestaat al.', // TODO: rank is not rights. Rank is a number.
                                                                   // Rights (rechten) is a set of permissions ("view_users", etc.).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e70cdbeae..1a5dbf67f 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.17.80.4198 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.80.4199 | 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/dbinstall.php b/dbinstall.php
index 8f1e867f2..190ff7eea 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11779"]) {
+  if ($_POST["convert11744to11780"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -869,6 +869,9 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.78', modified = now() where param_name = 'version_db' and param_value = '1.17.77'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.78') set rights = replace(rights, 'manage_own_settings,view_projects,view_users', 'view_own_projects,manage_own_settings,view_users')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.79', modified = now() where param_name = 'version_db' and param_value = '1.17.78'");
+    setChange("RENAME TABLE `tt_teams` TO `tt_groups`");
+    setChange("ALTER TABLE `tt_monthly_quotas` DROP FOREIGN KEY FK_TT_TEAM_CONSTRAING");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.80', modified = now() where param_name = 'version_db' and param_value = '1.17.79'");
   }
 
   if ($_POST["cleanup"]) {
@@ -897,7 +900,7 @@ function setChange($sql) {
     setChange("OPTIMIZE TABLE tt_project_task_binds");
     setChange("OPTIMIZE TABLE tt_projects");
     setChange("OPTIMIZE TABLE tt_tasks");
-    setChange("OPTIMIZE TABLE tt_teams");
+    setChange("OPTIMIZE TABLE tt_groups");
     setChange("OPTIMIZE TABLE tt_tmp_refs");
     setChange("OPTIMIZE TABLE tt_user_project_binds");
     setChange("OPTIMIZE TABLE tt_users");
@@ -914,7 +917,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.79)</b>
+    <td width="80%"><b>Create database structure (v1.17.80)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -954,8 +957,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.79)</td>
-    <td><input type="submit" name="convert11744to11779" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.80)</td>
+    <td><input type="submit" name="convert11744to11780" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 9d2f1e7b4..4a48a662c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -9,10 +9,10 @@
 
 
 #
-# Structure for table tt_teams. A team is a group of users for whom we are tracking work time.
+# Structure for table tt_groups. A team is a group of users for whom we are tracking work time.
 # This table stores settings common to all group members such as language, week start day, etc.
 #
-CREATE TABLE `tt_teams` (
+CREATE TABLE `tt_groups` (
   `id` int(11) NOT NULL auto_increment,                  # group id
   `parent_id` int(11) default NULL,                      # parent group id
   `org_id` int(11) default NULL,                         # organization id (id of top group)
@@ -425,19 +425,16 @@ CREATE TABLE `tt_predefined_expenses` (
 
 #
 # Structure for table tt_monthly_quotas.
-# This table keeps monthly work hour quotas for teams.
+# This table keeps monthly work hour quotas for groups.
 #
 CREATE TABLE `tt_monthly_quotas` (
-  `team_id` int(11) NOT NULL,             # team id
+  `team_id` int(11) NOT NULL,             # group id
   `year` smallint(5) UNSIGNED NOT NULL,   # quota year
   `month` tinyint(3) UNSIGNED NOT NULL,   # quota month
   `minutes` int(11) default NULL,         # quota in minutes in specified month and year
   PRIMARY KEY (`team_id`,`year`,`month`)
 );
 
-ALTER TABLE `tt_monthly_quotas`
-  ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
-
 
 #
 # Structure for table tt_site_config. This table stores configuration data
@@ -452,4 +449,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.79', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.80', now()); # TODO: change when structure changes.

From 45c855269d952873285f7a835e82fc2b3eff3971 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Mar 2018 23:35:58 +0000
Subject: [PATCH 0082/1848] Refactoring. Renamed team_id fields to become
 group_id.

---
 WEB-INF/lib/ttAdmin.class.php                 |  22 +-
 WEB-INF/lib/ttClientHelper.class.php          |  30 +--
 WEB-INF/lib/ttCustomFieldHelper.class.php     |   6 +-
 WEB-INF/lib/ttExportHelper.class.php          |  24 +-
 WEB-INF/lib/ttImportHelper.class.php          |  30 +--
 WEB-INF/lib/ttInvoiceHelper.class.php         |  16 +-
 WEB-INF/lib/ttNotificationHelper.class.php    |  14 +-
 .../lib/ttPredefinedExpenseHelper.class.php   |  14 +-
 WEB-INF/lib/ttProjectHelper.class.php         |  28 +--
 WEB-INF/lib/ttRegistrator.class.php           |   4 +-
 WEB-INF/lib/ttReportHelper.class.php          |  12 +-
 WEB-INF/lib/ttRoleHelper.class.php            |  44 ++--
 WEB-INF/lib/ttTaskHelper.class.php            |  18 +-
 WEB-INF/lib/ttTeamHelper.class.php            | 206 +++++++++---------
 WEB-INF/lib/ttUser.class.php                  |  14 +-
 WEB-INF/lib/ttUserHelper.class.php            |  24 +-
 WEB-INF/lib/ttWeekViewHelper.class.php        |   2 +-
 WEB-INF/templates/footer.tpl                  |   2 +-
 admin_team_delete.php                         |   8 +-
 admin_team_edit.php                           |   8 +-
 client_add.php                                |   4 +-
 client_edit.php                               |   4 +-
 clients.php                                   |   4 +-
 dbinstall.php                                 |  11 +
 expense_edit.php                              |   6 +-
 expenses.php                                  |   6 +-
 group_edit.php                                |   2 +-
 initialize.php                                |   4 +-
 invoice_add.php                               |   4 +-
 locking.php                                   |   2 +-
 mobile/client_add.php                         |   4 +-
 mobile/client_edit.php                        |   4 +-
 mobile/clients.php                            |   4 +-
 mobile/expense_edit.php                       |   6 +-
 mobile/expenses.php                           |   6 +-
 mobile/project_add.php                        |   4 +-
 mobile/project_edit.php                       |   4 +-
 mobile/projects.php                           |   4 +-
 mobile/task_add.php                           |   4 +-
 mobile/task_edit.php                          |   4 +-
 mobile/tasks.php                              |   4 +-
 mobile/time.php                               |   8 +-
 mobile/time_edit.php                          |   8 +-
 mobile/timer.php                              |   8 +-
 mobile/user_add.php                           |   6 +-
 mobile/user_edit.php                          |   4 +-
 mobile/users.php                              |   2 +-
 mysql.sql                                     |  44 ++--
 notification_add.php                          |   2 +-
 notification_edit.php                         |   2 +-
 notifications.php                             |   2 +-
 password_change.php                           |   4 +-
 plugins/CustomFields.class.php                |  30 +--
 plugins/MonthlyQuota.class.php                |  18 +-
 predefined_expense_add.php                    |   2 +-
 predefined_expense_edit.php                   |   2 +-
 predefined_expenses.php                       |   2 +-
 project_add.php                               |   4 +-
 project_edit.php                              |   4 +-
 projects.php                                  |   4 +-
 quotas.php                                    |   2 +-
 report.php                                    |   4 +-
 reports.php                                   |   4 +-
 role_add.php                                  |   4 +-
 task_add.php                                  |   4 +-
 task_edit.php                                 |   4 +-
 tasks.php                                     |   4 +-
 time.php                                      |   8 +-
 time_edit.php                                 |   8 +-
 tofile.php                                    |   2 +-
 topdf.php                                     |   6 +-
 user_add.php                                  |   6 +-
 user_edit.php                                 |   4 +-
 week.php                                      |   8 +-
 74 files changed, 428 insertions(+), 417 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index ed1b280c3..83b93a767 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -47,7 +47,7 @@ function getSubgroups($group_id) {
   // getUsers obtains user ids in a group.
   function getUsers($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_users where team_id = $group_id";
+    $sql = "select id from tt_users where group_id = $group_id";
     $res = $mdb2->query($sql);
     $users = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -85,7 +85,7 @@ function markUserDeleted($user_id) {
   // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group.
   function markTasksDeleted($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where team_id = $group_id";
+    $sql = "select id from tt_tasks where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
 
@@ -120,7 +120,7 @@ function markGroupDeleted($group_id) {
     // Now that we are done with subgroups, handle this group.
     $users = $this->getUsers($group_id);
 
-    // Iterate through team users and mark them as deleted.
+    // Iterate through group users and mark them as deleted.
     foreach ($users as $one_user) {
       if (!$this->markUserDeleted($one_user['id']))
           return false;
@@ -132,32 +132,32 @@ function markGroupDeleted($group_id) {
     $mdb2 = getConnection();
 
     // Mark roles deleted.
-    $sql = "update tt_roles set status = NULL where team_id = $group_id";
+    $sql = "update tt_roles set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where team_id = $group_id";
+    $sql = "update tt_projects set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark clients deleted.
-    $sql = "update tt_clients set status = NULL where team_id = $group_id";
+    $sql = "update tt_clients set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark invoices deleted.
-    $sql = "update tt_invoices set status = NULL where team_id = $group_id";
+    $sql = "update tt_invoices set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark custom fields deleted.
-    $sql = "update tt_custom_fields set status = NULL where team_id = $group_id";
+    $sql = "update tt_custom_fields set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark notifications deleted.
-    $sql = "update tt_cron set status = NULL where team_id = $group_id";
+    $sql = "update tt_cron set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -232,7 +232,7 @@ function validateGroupInfo($fields) {
   }
 
   // updateGroup validates user input and updates the group with new information.
-  function updateGroup($team_id, $fields) {
+  function updateGroup($group_id, $fields) {
     if (!$this->validateGroupInfo($fields)) return false; // Can't continue as user input is invalid.
 
     global $user;
@@ -242,7 +242,7 @@ function updateGroup($team_id, $fields) {
     if ($fields['old_group_name'] != $fields['new_group_name']) {
       $name_part = 'name = '.$mdb2->quote($fields['new_group_name']);
       $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-      $sql = 'update tt_groups set '.$name_part.$modified_part.' where id = '.$team_id;
+      $sql = 'update tt_groups set '.$name_part.$modified_part.' where id = '.$group_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 288cd45be..f11edc90f 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -41,7 +41,7 @@ static function getClient($client_id, $all_fields = false) {
     else
       $sql .= 'name ';
 
-    $sql .= "from tt_clients where team_id = $user->team_id
+    $sql .= "from tt_clients where group_id = $user->group_id
       and id = $client_id and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -60,7 +60,7 @@ static function getClients()
     $mdb2 = getConnection();
 
     $sql = "select id, name from tt_clients
-      where team_id = $user->team_id and (status = 0 or status = 1) order by upper(name)";
+      where group_id = $user->group_id and (status = 0 or status = 1) order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -76,7 +76,7 @@ static function getClientByName($client_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_clients where team_id = $user->team_id and name = ".
+    $sql = "select id from tt_clients where group_id = $user->group_id and name = ".
       $mdb2->quote($client_name)." and (status = 1 or status = 0)";
 
     $res = $mdb2->query($sql);
@@ -95,7 +95,7 @@ static function getDeletedClient($client_id) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select name, address from tt_clients where team_id = $user->team_id
+    $sql = "select name, address from tt_clients where group_id = $user->group_id
       and id = $client_id and status is NULL";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -138,7 +138,7 @@ static function delete($id, $delete_client_entries) {
 
     // Handle invoices.
     if ($delete_client_entries) {
-      $sql = "update tt_invoices set status = NULL where client_id = $id and team_id = $user->team_id";
+      $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = $user->group_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -151,13 +151,13 @@ static function delete($id, $delete_client_entries) {
       return false;
 
     // Handle users for client.
-    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and team_id = $user->team_id";
+    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark client deleted.
-    $sql = "update tt_clients set status = NULL where id = $id and team_id = $user->team_id";
+    $sql = "update tt_clients set status = NULL where id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -168,7 +168,7 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     $address = $fields['address'];
     $tax = $fields['tax'];
@@ -180,8 +180,8 @@ static function insert($fields)
     $tax = str_replace(',', '.', $tax);
     if ($tax == '') $tax = 0;
 
-    $sql = "insert into tt_clients (team_id, name, address, tax, projects, status) 
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_clients (group_id, name, address, tax, projects, status)".
+      " values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
 
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -236,16 +236,16 @@ static function update($fields)
     // Update client properties in tt_clients table.
     $comma_separated = implode(",", $projects); // This is a comma-separated list of associated project ids.
     $sql = "update tt_clients set name = ".$mdb2->quote($name).", address = ".$mdb2->quote($address).
-      ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status where team_id = ".$user->team_id." and id = ".$id;
+      ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status where group_id = ".$user->group_id." and id = ".$id;
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // The setMappedClient function is used during team import to change client_id value for tt_users to a mapped value.
-  static function setMappedClient($team_id, $imported_id, $mapped_id)
+  static function setMappedClient($group_id, $imported_id, $mapped_id)
   {
     $mdb2 = getConnection();
-    $sql = "update tt_users set client_id = $mapped_id where client_id = $imported_id and team_id = $team_id ";
+    $sql = "update tt_users set client_id = $mapped_id where client_id = $imported_id and group_id = $group_id ";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -272,7 +272,7 @@ static function getAssignedProjects($client_id)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name from tt_projects p
       inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)
-      where p.team_id = $user->team_id and p.status = 1 order by p.name";
+      where p.group_id = $user->group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -318,7 +318,7 @@ static function getAssignedProjectsForUser($client_id)
     $sql = "select p.id, p.name from tt_projects p
       inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)
       inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)
-      where p.team_id = $user->team_id and p.status = 1 order by p.name";
+      where p.group_id = $user->group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/lib/ttCustomFieldHelper.class.php b/WEB-INF/lib/ttCustomFieldHelper.class.php
index f12675083..15c7ca054 100644
--- a/WEB-INF/lib/ttCustomFieldHelper.class.php
+++ b/WEB-INF/lib/ttCustomFieldHelper.class.php
@@ -34,14 +34,14 @@ static function insertField($fields)
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $type = (int) $fields['type'];
     $label = $fields['label'];
     $required = (int) $fields['required'];
     $status = $fields['status'];
     
-    $sql = "insert into tt_custom_fields (team_id, type, label, required, status) 
-      values ($team_id, $type, ".$mdb2->quote($label).", $required, ".$mdb2->quote($status).")";
+    $sql = "insert into tt_custom_fields (group_id, type, label, required, status)".
+      " values ($group_id, $type, ".$mdb2->quote($label).", $required, ".$mdb2->quote($status).")";
       
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 375de2f37..22521c739 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -83,17 +83,17 @@ function createDataFile($compress = false) {
       $this->userMap[$user_item['id']] = $key + 1;
 
     // Prepare project map.
-    $projects = ttTeamHelper::getAllProjects($user->team_id, true);
+    $projects = ttTeamHelper::getAllProjects($user->group_id, true);
     foreach ($projects as $key=>$project_item)
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare task map.
-    $tasks = ttTeamHelper::getAllTasks($user->team_id, true);
+    $tasks = ttTeamHelper::getAllTasks($user->group_id, true);
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
     // Prepare client map.
-    $clients = ttTeamHelper::getAllClients($user->team_id, true);
+    $clients = ttTeamHelper::getAllClients($user->group_id, true);
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
@@ -103,12 +103,12 @@ function createDataFile($compress = false) {
       $this->invoiceMap[$invoice_item['id']] = $key + 1;
 
     // Prepare custom fields map.
-    $custom_fields = ttTeamHelper::getAllCustomFields($user->team_id);
+    $custom_fields = ttTeamHelper::getAllCustomFields($user->group_id);
     foreach ($custom_fields as $key=>$custom_field)
       $this->customFieldMap[$custom_field['id']] = $key + 1;
 
     // Prepare custom field options map.
-    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->team_id);
+    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->group_id);
     foreach ($custom_field_options as $key=>$option)
       $this->customFieldOptionMap[$option['id']] = $key + 1;
 
@@ -164,7 +164,7 @@ function createDataFile($compress = false) {
 
     // Write user to project binds.
     fwrite($file, "<user_project_binds>\n");
-    $user_binds = ttTeamHelper::getUserToProjectBinds($user->team_id);
+    $user_binds = ttTeamHelper::getUserToProjectBinds($user->group_id);
     foreach ($user_binds as $bind) {
       $user_id = $this->userMap[$bind['user_id']];
       $project_id = $this->projectMap[$bind['project_id']];
@@ -222,7 +222,7 @@ function createDataFile($compress = false) {
     unset($custom_field_options);
 
     // Write monthly quotas.
-    $quotas = ttTeamHelper::getMonthlyQuotas($user->team_id);
+    $quotas = ttTeamHelper::getMonthlyQuotas($user->group_id);
     fwrite($file, "<monthly_quotas>\n");
     foreach ($quotas as $quota) {
       fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");
@@ -246,7 +246,7 @@ function createDataFile($compress = false) {
     unset($records);
 
     // Write custom field log.
-    $custom_field_log = ttTeamHelper::getCustomFieldLog($user->team_id);
+    $custom_field_log = ttTeamHelper::getCustomFieldLog($user->group_id);
     fwrite($file, "<custom_field_log>\n");
     foreach ($custom_field_log as $entry) {
       fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");
@@ -257,7 +257,7 @@ function createDataFile($compress = false) {
     unset($custom_field_log);
 
     // Write expense items.
-    $expense_items = ttTeamHelper::getExpenseItems($user->team_id);
+    $expense_items = ttTeamHelper::getExpenseItems($user->group_id);
     fwrite($file, "<expense_items>\n");
     foreach ($expense_items as $expense_item) {
       fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");
@@ -269,7 +269,7 @@ function createDataFile($compress = false) {
 
     // Write fav reports.
     fwrite($file, "<fav_reports>\n");
-    $fav_reports = ttTeamHelper::getFavReports($user->team_id);
+    $fav_reports = ttTeamHelper::getFavReports($user->group_id);
     foreach ($fav_reports as $fav_report) {
       $user_list = '';
       if (strlen($fav_report['users']) > 0) {
@@ -381,7 +381,7 @@ function getRoles() {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_roles where team_id = $user->team_id";
+    $sql = "select * from tt_roles where group_id = $user->group_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -398,7 +398,7 @@ function getUsers() {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.team_id = $user->team_id order by upper(u.name)"; // Note: deleted users are included.
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id order by upper(u.name)"; // Note: deleted users are included.
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index ca717caef..ea54d0edc 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -47,7 +47,7 @@ class ttImportHelper {
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
   var $teamData       = array(); // Array of team data such as team name, etc.
-  var $team_id        = null;    // New team id we are importing. It is created during the import operation.
+  var $group_id       = null;    // New group id we are importing. It is created during the import operation.
   var $roles          = array(); // Array of arrays of role properties.
   var $users          = array(); // Array of arrays of user properties.
   var $top_role_id    = null;    // Top manager role id on the new server.
@@ -124,7 +124,7 @@ function endElement($parser, $name) {
       // Now we can create a team.
       if ($this->canImport) {
         $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
-        $team_id = ttTeamHelper::insert(array(
+        $group_id = ttTeamHelper::insert(array(
           'name' => $this->teamData['NAME'],
           'currency' => $this->teamData['CURRENCY'],
           'decimal_mark' => $this->teamData['DECIMAL_MARK'],
@@ -141,13 +141,13 @@ function endElement($parser, $name) {
           'lock_spec' => $this->teamData['LOCK_SPEC'],
           'workday_minutes' => $this->teamData['WORKDAY_MINUTES'],
           'config' => $this->teamData['CONFIG']));
-        if ($team_id) {
-          $this->team_id = $team_id;
+        if ($group_id) {
+          $this->group_id = $group_id;
 
           // Create roles.
           foreach ($this->roles as $key=>$role_item) {
             $role_id = ttRoleHelper::insert(array(
-              'team_id' => $this->team_id,
+              'group_id' => $this->group_id,
               'name' => $role_item['NAME'],
               'rank' => $role_item['RANK'],
               'rights' => $role_item['RIGHTS'],
@@ -158,7 +158,7 @@ function endElement($parser, $name) {
           foreach ($this->users as $key=>$user_item) {
             $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
             $user_id = ttUserHelper::insert(array(
-              'team_id' => $this->team_id,
+              'group_id' => $this->group_id,
               'role_id' => $role_id,
               'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
               'name' => $user_item['NAME'],
@@ -176,7 +176,7 @@ function endElement($parser, $name) {
     if ($name == 'TASK' && $this->canImport) {
       $this->taskMap[$this->currentElement['ID']] =
         ttTaskHelper::insert(array(
-          'team_id' => $this->team_id,
+          'group_id' => $this->group_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'status' => $this->currentElement['STATUS']));
@@ -190,7 +190,7 @@ function endElement($parser, $name) {
       // Add a new project.
       $this->projectMap[$this->currentElement['ID']] =
         ttProjectHelper::insert(array(
-          'team_id' => $this->team_id,
+          'group_id' => $this->group_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'tasks' => $mapped_tasks,
@@ -214,7 +214,7 @@ function endElement($parser, $name) {
 
       $this->clientMap[$this->currentElement['ID']] =
         ttClientHelper::insert(array(
-          'team_id' => $this->team_id,
+          'group_id' => $this->group_id,
           'name' => $this->currentElement['NAME'],
           'address' => $this->currentElement['ADDRESS'],
           'tax' => $this->currentElement['TAX'],
@@ -224,13 +224,13 @@ function endElement($parser, $name) {
         // Update client_id for tt_users to a mapped value.
         // We did not do it during user insertion because clientMap was not ready then.
         if ($this->currentElement['ID'] != $this->clientMap[$this->currentElement['ID']])
-          ttClientHelper::setMappedClient($this->team_id, $this->currentElement['ID'], $this->clientMap[$this->currentElement['ID']]);
+          ttClientHelper::setMappedClient($this->group_id, $this->currentElement['ID'], $this->clientMap[$this->currentElement['ID']]);
     }
 
     if ($name == 'INVOICE' && $this->canImport) {
       $this->invoiceMap[$this->currentElement['ID']] =
         ttInvoiceHelper::insert(array(
-          'team_id' => $this->team_id,
+          'group_id' => $this->group_id,
           'name' => $this->currentElement['NAME'],
           'date' => $this->currentElement['DATE'],
           'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
@@ -239,7 +239,7 @@ function endElement($parser, $name) {
     }
 
     if ($name == 'MONTHLY_QUOTA' && $this->canImport) {
-      $this->insertMonthlyQuota($this->team_id, $this->currentElement['YEAR'], $this->currentElement['MONTH'], $this->currentElement['MINUTES']);
+      $this->insertMonthlyQuota($this->group_id, $this->currentElement['YEAR'], $this->currentElement['MONTH'], $this->currentElement['MINUTES']);
     }
 
     if ($name == 'LOG_ITEM' && $this->canImport) {
@@ -263,7 +263,7 @@ function endElement($parser, $name) {
     if ($name == 'CUSTOM_FIELD' && $this->canImport) {
       $this->customFieldMap[$this->currentElement['ID']] =
         ttCustomFieldHelper::insertField(array(
-          'team_id' => $this->team_id,
+          'group_id' => $this->group_id,
           'type' => $this->currentElement['TYPE'],
           'label' => $this->currentElement['LABEL'],
           'required' => $this->currentElement['REQUIRED'],
@@ -433,9 +433,9 @@ function uncompress($in, $out) {
   }
 
   // insertMonthlyQuota - a helper function to insert a monthly quota.
-  private function insertMonthlyQuota($team_id, $year, $month, $minutes) {
+  private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
     $mdb2 = getConnection();
-    $sql = "INSERT INTO tt_monthly_quotas (team_id, year, month, minutes) values ($team_id, $year, $month, $minutes)";
+    $sql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index d58bc1161..d35aa3486 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -37,7 +37,7 @@ static function insert($fields)
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     if (!$name) return false;
 
@@ -49,8 +49,8 @@ static function insert($fields)
     }
 
     // Insert a new invoice record.
-    $sql = "insert into tt_invoices (team_id, name, date, client_id $status_f)
-      values($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)"; 
+    $sql = "insert into tt_invoices (group_id, name, date, client_id $status_f)".
+      " values($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)";
     $affected = $mdb2->exec($sql);
 
     if (is_a($affected, 'PEAR_Error')) return false;
@@ -71,7 +71,7 @@ static function getInvoice($invoice_id) {
 
     if ($user->isClient()) $client_part = " and client_id = $user->client_id";
 
-    $sql = "select * from tt_invoices where id = $invoice_id and team_id = $user->team_id $client_part and status = 1";
+    $sql = "select * from tt_invoices where id = $invoice_id and group_id = $user->group_id $client_part and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
@@ -86,7 +86,7 @@ static function getInvoiceByName($invoice_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_invoices where team_id = $user->team_id and name = ".$mdb2->quote($invoice_name)." and status = 1";
+    $sql = "select id from tt_invoices where group_id = $user->group_id and name = ".$mdb2->quote($invoice_name)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -233,7 +233,7 @@ static function delete($invoice_id, $delete_invoice_items) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    $sql = "update tt_invoices set status = NULL where id = $invoice_id and team_id = $user->team_id";
+    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -328,8 +328,8 @@ static function createInvoice($fields) {
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Create a new invoice record.
-    $sql = "insert into tt_invoices (team_id, name, date, client_id)
-      values($user->team_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+    $sql = "insert into tt_invoices (group_id, name, date, client_id)
+      values($user->group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index ee7880c45..34c852769 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -41,7 +41,7 @@ static function get($id)
 
     $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.id = $id and c.team_id = $user->team_id";
+      where c.id = $id and c.group_id = $user->group_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -57,7 +57,7 @@ static function delete($id) {
   	    
     $mdb2 = getConnection();
     
-    $sql = "delete from tt_cron where id = $id and team_id = $user->team_id";
+    $sql = "delete from tt_cron where id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -70,7 +70,7 @@ static function insert($fields)
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
@@ -80,8 +80,8 @@ static function insert($fields)
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
-    $sql = "insert into tt_cron (team_id, cron_spec, next, report_id, email, cc, subject, report_condition, status)
-      values ($team_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_cron (group_id, cron_spec, next, report_id, email, cc, subject, report_condition, status)
+      values ($group_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -95,7 +95,7 @@ static function update($fields)
     $mdb2 = getConnection();
     
     $notification_id = (int) $fields['id'];
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
@@ -106,7 +106,7 @@ static function update($fields)
     $status = $fields['status'];
     
     $sql = "update tt_cron set cron_spec = ".$mdb2->quote($cron_spec).", next = $next, report_id = $report_id, email = ".$mdb2->quote($email).", cc = ".$mdb2->quote($cc).", subject = ".$mdb2->quote($subject).", report_condition = ".$mdb2->quote($report_condition).", status = ".$mdb2->quote($status).
-      " where id = $notification_id and team_id = $team_id";
+      " where id = $notification_id and group_id = $group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 556bc42f6..c292870fb 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -39,7 +39,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and team_id = $user->team_id";
+      where id = $id and group_id = $user->group_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -58,7 +58,7 @@ static function delete($id) {
 
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and team_id = $user->team_id";
+    $sql = "delete from tt_predefined_expenses where id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -73,14 +73,14 @@ static function insert($fields)
 
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->decimal_mark)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
-    $sql = "insert into tt_predefined_expenses (team_id, name, cost)
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
+    $sql = "insert into tt_predefined_expenses (group_id, name, cost)
+      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -96,14 +96,14 @@ static function update($fields)
     $mdb2 = getConnection();
 
     $predefined_expense_id = (int) $fields['id'];
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->decimal_mark)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
-      " where id = $predefined_expense_id and team_id = $team_id";
+      " where id = $predefined_expense_id and group_id = $group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index d3e0eb1b7..ff154af45 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -35,7 +35,7 @@ class ttProjectHelper {
   // getAssignedProjects - returns an array of assigned projects.
   static function getAssignedProjects($user_id)
   {
-  	global $user;
+    global $user;
   	
     $result = array();
     $mdb2 = getConnection();
@@ -43,7 +43,7 @@ static function getAssignedProjects($user_id)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.tasks, upb.rate from tt_projects p
       inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)
-      where p.team_id = $user->team_id and p.status = 1 order by p.name";
+      where p.group_id = $user->group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -63,7 +63,7 @@ static function getRates($user_id)
     
     $sql = "select p.id, upb.rate from tt_projects p
       inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id)
-      where team_id = $user->team_id";
+      where group_id = $user->group_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -82,8 +82,8 @@ static function getProjects()
     $result = array();
     $mdb2 = getConnection();
     
-    $sql = "select id, name, tasks from tt_projects
-      where team_id = $user->team_id and (status = 0 or status = 1) order by name";  	
+    $sql = "select id, name, tasks from tt_projects".
+      " where group_id = $user->group_id and (status = 0 or status = 1) order by name";
         
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -104,7 +104,7 @@ static function getProjectsForClient()
     
     $sql = "select p.id, p.name, p.tasks from tt_projects p
 	  inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)
-	  where p.team_id = $user->team_id and (p.status = 0 or p.status = 1)
+	  where p.group_id = $user->group_id and (p.status = 0 or p.status = 1)
       order by p.name";  	
         
     $res = $mdb2->query($sql);
@@ -124,7 +124,7 @@ static function get($id)
  
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, status, tasks from tt_projects where id = $id and team_id = $user->team_id and (status = 0 or status = 1)";
+    $sql = "select id, name, description, status, tasks from tt_projects where id = $id and group_id = $user->group_id and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -140,7 +140,7 @@ static function getProjectByName($name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_projects where team_id = $user->team_id and name = ".
+    $sql = "select id from tt_projects where group_id = $user->group_id and name = ".
       $mdb2->quote($name)." and (status = 1 or status = 0)";
   	$res = $mdb2->query($sql);
   	if (!is_a($res, 'PEAR_Error')) {
@@ -161,7 +161,7 @@ static function delete($id) {
     // we'll fail right here and don't damage any other data.
 
     // Mark project as deleted and remove associated tasks.
-    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and team_id = $user->team_id";
+    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error') || 0 == $affected)
       return false; // An error ocurred, or 0 rows updated.
@@ -186,7 +186,7 @@ static function insert($fields)
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
 
     $name = $fields['name'];
     $description = $fields['description'];
@@ -195,8 +195,8 @@ static function insert($fields)
     $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
     $status = $fields['status'];
     
-    $sql = "insert into tt_projects (team_id, name, description, tasks, status)
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_projects (group_id, name, description, tasks, status)
+      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -220,7 +220,7 @@ static function insert($fields)
     }
 
     // Bind the project to tasks in tt_project_task_binds table.
-    $all_tasks = ttTeamHelper::getAllTasks($team_id);
+    $all_tasks = ttTeamHelper::getAllTasks($group_id);
     foreach ($all_tasks as $task) {
       if(in_array($task['id'], $tasks)) {
         $sql = "insert into tt_project_task_binds (project_id, task_id) values($last_id, ".$task['id'].")";
@@ -312,7 +312,7 @@ static function update($fields) {
     // Update project name, description, tasks and status in tt_projects table.
     $comma_separated = implode(",", $tasks_to_bind); // This is a comma-separated list of associated task ids.
     $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and team_id = $user->team_id";
+           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 23df23eab..a82ebd3f4 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -157,7 +157,7 @@ function createUser() {
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
     $values = "values($login, $password, $name, $this->group_id, $this->role_id, $email, $created, $created_ip)";
 
-    $sql = 'insert into tt_users (login, password, name, team_id, role_id, email, created, created_ip) '.$values;
+    $sql = 'insert into tt_users (login, password, name, group_id, role_id, email, created, created_ip) '.$values;
     $affected = $mdb2->exec($sql);
     if (!is_a($affected, 'PEAR_Error')) {
       $user_id = $mdb2->lastInsertID('tt_users', 'id');
@@ -182,7 +182,7 @@ function setCreatedBy($user_id) {
     }
 
     // Update top manager.
-    $sql = "update tt_users set created_by = $user_id where id = $user_id and team_id = $this->group_id";
+    $sql = "update tt_users set created_by = $user_id where id = $user_id and group_id = $this->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
       $this->err->add($i18n->get('error.db'));
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index b894b037d..67f1da263 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -257,7 +257,7 @@ static function getItems($bean) {
     // Add custom field.
     $include_cf_1 = $bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option;
     if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->team_id);
+      $custom_fields = new CustomFields($user->group_id);
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         array_push($fields, 'cfl.value as cf_1');
@@ -522,7 +522,7 @@ static function getFavItems($report) {
     // Add custom field.
     $include_cf_1 = $report['show_custom_field_1'] || 'cf_1' == $group_by_option;
     if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->team_id);
+      $custom_fields = new CustomFields($user->group_id);
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         array_push($fields, 'cfl.value as cf_1');
@@ -756,7 +756,7 @@ static function getSubtotals($bean) {
         break;
       case 'cf_1':
         $group_field = 'cfo.value';
-        $custom_fields = new CustomFields($user->team_id);
+        $custom_fields = new CustomFields($user->group_id);
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
         elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
@@ -884,7 +884,7 @@ static function getFavSubtotals($report) {
         break;
       case 'cf_1':
         $group_field = 'cfo.value';
-        $custom_fields = new CustomFields($user->team_id);
+        $custom_fields = new CustomFields($user->group_id);
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
         elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
@@ -1168,7 +1168,7 @@ static function prepareReportBody($bean, $comment)
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
-      $custom_fields = new CustomFields($user->team_id);
+      $custom_fields = new CustomFields($user->group_id);
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
@@ -1464,7 +1464,7 @@ static function prepareFavReportBody($report)
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
-      $custom_fields = new CustomFields($user->team_id);
+      $custom_fields = new CustomFields($user->group_id);
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index c6cd02ba6..25d714194 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -37,7 +37,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, rank, rights, status from tt_roles
-      where id = $id and team_id = $user->team_id and (status = 0 or status = 1)";
+      where id = $id and group_id = $user->group_id and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -56,7 +56,7 @@ static function getRoleByName($role_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_roles where team_id = $user->team_id and name = ".
+    $sql = "select id from tt_roles where group_id = $user->group_id and name = ".
       $mdb2->quote($role_name)." and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
@@ -72,7 +72,7 @@ static function getRoleByName($role_name) {
   static function getTopManagerRoleID() {
     $mdb2 = getConnection();
 
-    $sql = "select id from tt_roles where team_id = 0 and rank = 512";
+    $sql = "select id from tt_roles where group_id = 0 and rank = 512";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -89,7 +89,7 @@ static function isClientRole($role_id) {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select rights from tt_roles where team_id = $user->team_id and id = $role_id";
+    $sql = "select rights from tt_roles where group_id = $user->group_id and id = $role_id";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -102,13 +102,13 @@ static function isClientRole($role_id) {
   }
 
   // getRoleByRank looks up a role by its rank.
-  static function getRoleByRank($rank, $team_id) {
+  static function getRoleByRank($rank, $group_id) {
     global $user;
     $mdb2 = getConnection();
 
     $rank = (int) $rank; // Cast to int just in case for better security.
 
-    $sql = "select id from tt_roles where team_id = $team_id and rank = $rank and (status = 1 or status = 0)";
+    $sql = "select id from tt_roles where group_id = $group_id and rank = $rank and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -131,7 +131,7 @@ static function update($fields) {
     if (isset($fields['status'])) $status_part = ', status = '.(int)$fields['status'];
     if (isset($fields['rights'])) $rights_part = ', rights = '.$mdb2->quote($fields['rights']);
     $parts = trim($name_part.$rank_part.$descr_part.$status_part.$rights_part, ',');
-    $sql = "update tt_roles set $parts where id = $id and team_id = $user->team_id";
+    $sql = "update tt_roles set $parts where id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -143,7 +143,7 @@ static function delete($role_id) {
     $mdb2 = getConnection();
 
     // Mark the task as deleted.
-    $sql = "update tt_roles set status = NULL where id = $role_id and team_id = $user->team_id";
+    $sql = "update tt_roles set status = NULL where id = $role_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -153,15 +153,15 @@ static function insert($fields)
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     $rank = (int) $fields['rank'];
     $description = $fields['description'];
     $rights = $fields['rights'];
     $status = $fields['status'];
 
-    $sql = "insert into tt_roles (team_id, name, rank, description, rights, status)
-      values ($team_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_roles (group_id, name, rank, description, rights, status)
+      values ($group_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -174,7 +174,7 @@ static function insert($fields)
   }
 
   // createPredefinedRoles - creates a set of predefined roles for the team to use.
-  static function createPredefinedRoles($team_id, $lang)
+  static function createPredefinedRoles($group_id, $lang)
   {
     // We need localized role names and a new I18n object to obtain them.
     import('I18n');
@@ -193,7 +193,7 @@ static function createPredefinedRoles($team_id, $lang)
     $name = $mdb2->quote($i18n->get('role.user.label'));
     $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 4, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -201,7 +201,7 @@ static function createPredefinedRoles($team_id, $lang)
     $name = $mdb2->quote($i18n->get('role.client.label'));
     $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 16, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -209,7 +209,7 @@ static function createPredefinedRoles($team_id, $lang)
     $name = $mdb2->quote($i18n->get('role.comanager.label'));
     $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 68, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -217,7 +217,7 @@ static function createPredefinedRoles($team_id, $lang)
     $name = $mdb2->quote($i18n->get('role.manager.label'));
     $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 324, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -226,7 +226,7 @@ static function createPredefinedRoles($team_id, $lang)
     $name = $mdb2->quote($i18n->get('role.supervisor.label'));
     $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($team_id, $name, $description, 12, $rights, 0)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -251,7 +251,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.user.label'));
     $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 4, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -259,7 +259,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.client.label'));
     $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 16, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -267,7 +267,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.comanager.label'));
     $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 68, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -275,7 +275,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.manager.label'));
     $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 324, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -284,7 +284,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.supervisor.label'));
     $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($user->team_id, $name, $description, 12, $rights, 0)";
+    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 24831cb26..e09c882d3 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -37,7 +37,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, status from tt_tasks
-      where id = $id and team_id = $user->team_id and (status = 0 or status = 1)";
+      where id = $id and group_id = $user->group_id and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -61,7 +61,7 @@ static function getAssignedProjects($task_id)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name from tt_projects p
       inner join tt_project_task_binds ptb on (ptb.project_id = p.id and ptb.task_id = $task_id)
-      where p.team_id = $user->team_id and p.status = 1 order by p.name";
+      where p.group_id = $user->group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -77,7 +77,7 @@ static function getTaskByName($task_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_tasks where team_id = $user->team_id and name = ".
+    $sql = "select id from tt_tasks where group_id = $user->group_id and name = ".
       $mdb2->quote($task_name)." and (status = 1 or status = 0)";
       $res = $mdb2->query($sql);
 
@@ -103,7 +103,7 @@ static function delete($task_id) {
         
     // Delete project binds to this task from the tasks field in tt_projects table.
     // Get projects where tasks is not NULL.
-    $sql = "select id, tasks from tt_projects where team_id = $user->team_id and tasks is not NULL";
+    $sql = "select id, tasks from tt_projects where group_id = $user->group_id and tasks is not NULL";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
@@ -135,14 +135,14 @@ static function insert($fields)
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     $description = $fields['description'];
     $projects = $fields['projects'];
     $status = $fields['status'];
         
-    $sql = "insert into tt_tasks (team_id, name, description, status)
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_tasks (group_id, name, description, status)
+      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     $last_id = 0;
     if (is_a($affected, 'PEAR_Error'))
@@ -198,7 +198,7 @@ static function update($fields)
     $projects = $fields['projects'];
 
     $sql = "update tt_tasks set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-      ", status = $status where id = $task_id and team_id = $user->team_id";
+      ", status = $status where id = $task_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       die($affected->getMessage());
@@ -220,7 +220,7 @@ static function update($fields)
     // We need to either delete or insert task id in all affected projects.
     
     // Get all not deleted projects for team.
-    $sql = "select id, tasks from tt_projects where team_id = $user->team_id and status is not NULL";
+    $sql = "select id, tasks from tt_projects where group_id = $user->group_id and status is not NULL";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       die($res->getMessage());
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index d5a7f51de..01b0db360 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -34,10 +34,10 @@
 class ttTeamHelper {
 
   // The getUserCount function returns number of people in team.
-  static function getUserCount($team_id) {
+  static function getUserCount($group_id) {
     $mdb2 = getConnection();
 
-    $sql = "select count(id) as cnt from tt_users where team_id = $team_id and status = 1";
+    $sql = "select count(id) as cnt from tt_users where group_id = $group_id and status = 1";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -75,9 +75,9 @@ static function getActiveUsers($options = null) {
     $mdb2 = getConnection();
 
     if (isset($options['getAllFields']))
-      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.team_id = $user->team_id and u.status = 1 order by upper(u.name)";
+      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id and u.status = 1 order by upper(u.name)";
     else
-      $sql = "select id, name from tt_users where team_id = $user->team_id and status = 1 order by upper(name)";
+      $sql = "select id, name from tt_users where group_id = $user->group_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
@@ -109,7 +109,7 @@ static function swapRolesWith($user_id) {
     $mdb2 = getConnection();
 
     // Obtain role id for the user we are swapping ourselves with.
-    $sql = "select u.id, u.role_id from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.team_id = $user->team_id and u.status = 1 and r.rank < $user->rank";
+    $sql = "select u.id, u.role_id from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.group_id = $user->group_id and u.status = 1 and r.rank < $user->rank";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
@@ -120,13 +120,13 @@ static function swapRolesWith($user_id) {
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
 
     // Promote user.
-    $sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and team_id = $user->team_id";
+    $sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Demote self.
     $role_id = $val['role_id'];
-    $sql = "update tt_users set role_id = $role_id".$modified_part." where id = $user->id and team_id = $user->team_id";
+    $sql = "update tt_users set role_id = $role_id".$modified_part." where id = $user->id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -138,7 +138,7 @@ static function getUsersForSwap() {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select u.id, u.name, r.rank, r.rights from tt_users u left join tt_roles r on (u.role_id = r.id) where u.team_id = $user->team_id and u.status = 1 and r.rank < $user->rank order by upper(u.name)";
+    $sql = "select u.id, u.name, r.rank, r.rights from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id and u.status = 1 and r.rank < $user->rank order by upper(u.name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
@@ -157,7 +157,7 @@ static function getUsersForSwap() {
   static function getUsers() {
     global $user;
     $mdb2 = getConnection();
-    $sql = "select id, name from tt_users where team_id = $user->team_id and (status = 1 or status = 0) order by upper(name)";
+    $sql = "select id, name from tt_users where group_id = $user->group_id and (status = 1 or status = 0) order by upper(name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
@@ -169,13 +169,13 @@ static function getUsers() {
   }
 
   // The getInactiveUsers obtains all inactive users in a given team.
-  static function getInactiveUsers($team_id, $all_fields = false) {
+  static function getInactiveUsers($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select u.*, r.name as role_name from tt_users u left join tt_roles r on (u.role_id = r.id) where u.team_id = $team_id and u.status = 0 order by upper(u.name)";
+      $sql = "select u.*, r.name as role_name from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.status = 0 order by upper(u.name)";
     else
-      $sql = "select id, name from tt_users where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select id, name from tt_users where group_id = $group_id and status = 0 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -188,12 +188,12 @@ static function getInactiveUsers($team_id, $all_fields = false) {
   }
 
   // The getAllUsers obtains all users in a given team.
-  static function getAllUsers($team_id, $all_fields = false) {
+  static function getAllUsers($group_id, $all_fields = false) {
     $mdb2 = getConnection();
     if ($all_fields)
-      $sql = "select * from tt_users where team_id = $team_id order by upper(name)";
+      $sql = "select * from tt_users where group_id = $group_id order by upper(name)";
     else
-      $sql = "select id, name from tt_users where team_id = $team_id order by upper(name)";
+      $sql = "select id, name from tt_users where group_id = $group_id order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -206,13 +206,13 @@ static function getAllUsers($team_id, $all_fields = false) {
   }
 
   // getActiveProjects - returns an array of active projects for team.
-  static function getActiveProjects($team_id)
+  static function getActiveProjects($group_id)
   {
     $result = array();
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, tasks from tt_projects
-      where team_id = $team_id and status = 1 order by upper(name)";
+      where group_id = $group_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -224,13 +224,13 @@ static function getActiveProjects($team_id)
   }
 
   // getInactiveProjects - returns an array of inactive projects for team.
-  static function getInactiveProjects($team_id)
+  static function getInactiveProjects($group_id)
   {
     $result = array();
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, tasks from tt_projects
-      where team_id = $team_id and status = 0 order by upper(name)";
+      where group_id = $group_id and status = 0 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -242,13 +242,13 @@ static function getInactiveProjects($team_id)
   }
 
   // The getAllProjects obtains all projects in a given team.
-  static function getAllProjects($team_id, $all_fields = false) {
+  static function getAllProjects($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select * from tt_projects where team_id = $team_id order by status, upper(name)";
+      $sql = "select * from tt_projects where group_id = $group_id order by status, upper(name)";
     else
-      $sql = "select id, name from tt_projects where team_id = $team_id order by status, upper(name)";
+      $sql = "select id, name from tt_projects where group_id = $group_id order by status, upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -261,12 +261,12 @@ static function getAllProjects($team_id, $all_fields = false) {
   }
 
   // getActiveTasks - returns an array of active tasks for team.
-  static function getActiveTasks($team_id)
+  static function getActiveTasks($group_id)
   {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by upper(name)";
+    $sql = "select id, name, description from tt_tasks where group_id = $group_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -278,13 +278,13 @@ static function getActiveTasks($team_id)
   }
 
   // getInactiveTasks - returns an array of inactive tasks for team.
-  static function getInactiveTasks($team_id)
+  static function getInactiveTasks($group_id)
   {
     $result = array();
     $mdb2 = getConnection();
 
     $sql = "select id, name, description from tt_tasks
-      where team_id = $team_id and status = 0 order by upper(name)";
+      where group_id = $group_id and status = 0 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -296,13 +296,13 @@ static function getInactiveTasks($team_id)
   }
 
   // The getAllTasks obtains all tasks in a given team.
-  static function getAllTasks($team_id, $all_fields = false) {
+  static function getAllTasks($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select * from tt_tasks where team_id = $team_id order by status, upper(name)";
+      $sql = "select * from tt_tasks where group_id = $group_id order by status, upper(name)";
     else
-      $sql = "select id, name from tt_tasks where team_id = $team_id order by status, upper(name)";
+      $sql = "select id, name from tt_tasks where group_id = $group_id order by status, upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -322,7 +322,7 @@ static function getActiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where team_id = $user->team_id and rank < $user->rank and status = 1 order by rank";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and rank < $user->rank and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -337,12 +337,12 @@ static function getActiveRolesForUser()
   }
 
   // getActiveRoles - returns an array of active roles for team.
-  static function getActiveRoles($team_id)
+  static function getActiveRoles($group_id)
   {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where team_id = $team_id and status = 1 order by rank";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -355,13 +355,13 @@ static function getActiveRoles($team_id)
   }
 
   // getInactiveRoles - returns an array of inactive roles for team.
-  static function getInactiveRoles($team_id)
+  static function getInactiveRoles($group_id)
   {
     $result = array();
     $mdb2 = getConnection();
 
     $sql = "select id, name, rank, description from tt_roles
-      where team_id = $team_id and status = 0 order by rank";
+      where group_id = $group_id and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -380,7 +380,7 @@ static function getInactiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where team_id = $user->team_id and rank < $user->rank and status = 0 order by rank";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and rank < $user->rank and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -395,15 +395,15 @@ static function getInactiveRolesForUser()
   }
 
   // The getActiveClients returns an array of active clients for team.
-  static function getActiveClients($team_id, $all_fields = false)
+  static function getActiveClients($group_id, $all_fields = false)
   {
     $result = array();
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select * from tt_clients where team_id = $team_id and status = 1 order by upper(name)";
+      $sql = "select * from tt_clients where group_id = $group_id and status = 1 order by upper(name)";
     else
-      $sql = "select id, name from tt_clients where team_id = $team_id and status = 1 order by upper(name)";
+      $sql = "select id, name from tt_clients where group_id = $group_id and status = 1 order by upper(name)";
 
     $res = $mdb2->query($sql);
     $result = array();
@@ -416,15 +416,15 @@ static function getActiveClients($team_id, $all_fields = false)
   }
 
   // The getInactiveClients returns an array of inactive clients for team.
-  static function getInactiveClients($team_id, $all_fields = false)
+  static function getInactiveClients($group_id, $all_fields = false)
   {
     $result = array();
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select * from tt_clients where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select * from tt_clients where group_id = $group_id and status = 0 order by upper(name)";
     else
-      $sql = "select id, name from tt_clients where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select id, name from tt_clients where group_id = $group_id and status = 0 order by upper(name)";
 
     $res = $mdb2->query($sql);
     $result = array();
@@ -437,13 +437,13 @@ static function getInactiveClients($team_id, $all_fields = false)
   }
 
   // The getAllClients obtains all clients in a given team.
-  static function getAllClients($team_id, $all_fields = false) {
+  static function getAllClients($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
     if ($all_fields)
-      $sql = "select * from tt_clients where team_id = $team_id order by status, upper(name)";
+      $sql = "select * from tt_clients where group_id = $group_id order by status, upper(name)";
     else
-      $sql = "select id, name from tt_clients where team_id = $team_id order by status, upper(name)";
+      $sql = "select id, name from tt_clients where group_id = $group_id order by status, upper(name)";
 
     $res = $mdb2->query($sql);
     $result = array();
@@ -470,7 +470,7 @@ static function getActiveInvoices($localizeDates = true)
 
     $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i
       left join tt_clients c on (c.id = i.client_id)
-      where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name";
+      where i.status = 1 and i.group_id = $user->group_id $client_part order by i.name";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -496,7 +496,7 @@ static function getAllInvoices()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select * from tt_invoices where team_id = $user->team_id";
+    $sql = "select * from tt_invoices where group_id = $user->group_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -509,7 +509,7 @@ static function getAllInvoices()
   }
 
   // The getRecentInvoices returns an array of recent invoices (max 3) for a client.
-  static function getRecentInvoices($team_id, $client_id)
+  static function getRecentInvoices($group_id, $client_id)
   {
     global $user;
 
@@ -518,7 +518,7 @@ static function getRecentInvoices($team_id, $client_id)
 
     $sql = "select i.id, i.name from tt_invoices i
       left join tt_clients c on (c.id = i.client_id)
-      where i.team_id = $team_id and i.status = 1 and c.id = $client_id
+      where i.group_id = $group_id and i.status = 1 and c.id = $client_id
       order by i.id desc limit 3";
     $res = $mdb2->query($sql);
     $result = array();
@@ -532,11 +532,11 @@ static function getRecentInvoices($team_id, $client_id)
   }
 
   // getUserToProjectBinds - obtains all user to project binds for a team.
-  static function getUserToProjectBinds($team_id) {
+  static function getUserToProjectBinds($group_id) {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where team_id = $team_id) order by user_id, status, project_id";
+    $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where group_id = $group_id) order by user_id, status, project_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -549,10 +549,10 @@ static function getUserToProjectBinds($team_id) {
   }
 
   // The getAllCustomFields obtains all custom fields in a given team.
-  static function getAllCustomFields($team_id) {
+  static function getAllCustomFields($group_id) {
     $mdb2 = getConnection();
 
-    $sql = "select * from tt_custom_fields where team_id = $team_id order by status";
+    $sql = "select * from tt_custom_fields where group_id = $group_id order by status";
 
     $res = $mdb2->query($sql);
     $result = array();
@@ -566,10 +566,10 @@ static function getAllCustomFields($team_id) {
   }
 
   // The getAllCustomFieldOptions obtains all custom field options in a given team.
-  static function getAllCustomFieldOptions($team_id) {
+  static function getAllCustomFieldOptions($group_id) {
     $mdb2 = getConnection();
 
-    $sql = "select * from tt_custom_field_options where field_id in (select id from tt_custom_fields where team_id = $team_id) order by id";
+    $sql = "select * from tt_custom_field_options where field_id in (select id from tt_custom_fields where group_id = $group_id) order by id";
 
     $res = $mdb2->query($sql);
     $result = array();
@@ -583,10 +583,10 @@ static function getAllCustomFieldOptions($team_id) {
   }
 
   // The getCustomFieldLog obtains all custom field log entries for a given team.
-  static function getCustomFieldLog($team_id) {
+  static function getCustomFieldLog($group_id) {
     $mdb2 = getConnection();
 
-    $sql = "select * from tt_custom_field_log where field_id in (select id from tt_custom_fields where team_id = $team_id) order by id";
+    $sql = "select * from tt_custom_field_log where field_id in (select id from tt_custom_fields where group_id = $group_id) order by id";
 
     $res = $mdb2->query($sql);
     $result = array();
@@ -600,11 +600,11 @@ static function getCustomFieldLog($team_id) {
   }
 
   // getFavReports - obtains all favorite reports for all users in team.
-  static function getFavReports($team_id) {
+  static function getFavReports($group_id) {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_fav_reports where user_id in (select id from tt_users where team_id = $team_id)";
+    $sql = "select * from tt_fav_reports where user_id in (select id from tt_users where group_id = $group_id)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -617,11 +617,11 @@ static function getFavReports($team_id) {
   }
 
   // getExpenseItems - obtains all expense items for all users in team.
-  static function getExpenseItems($team_id) {
+  static function getExpenseItems($group_id) {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_expense_items where user_id in (select id from tt_users where team_id = $team_id)";
+    $sql = "select * from tt_expense_items where user_id in (select id from tt_users where group_id = $group_id)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -634,14 +634,14 @@ static function getExpenseItems($team_id) {
   }
 
   // getPredefinedExpenses - obtains predefined expenses for team.
-  static function getPredefinedExpenses($team_id) {
+  static function getPredefinedExpenses($group_id) {
     global $user;
     $replaceDecimalMark = ('.' != $user->decimal_mark);
 
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select id, name, cost from tt_predefined_expenses where team_id = $team_id";
+    $sql = "select id, name, cost from tt_predefined_expenses where group_id = $group_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -656,13 +656,13 @@ static function getPredefinedExpenses($team_id) {
   }
 
   // getNotifications - obtains notification descriptions for team.
-  static function getNotifications($team_id) {
+  static function getNotifications($group_id) {
     $mdb2 = getConnection();
 
     $result = array();
     $sql = "select c.id, c.cron_spec, c.email, c.report_condition, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.team_id = $team_id and c.status = 1 and fr.status = 1";
+      where c.group_id = $group_id and c.status = 1 and fr.status = 1";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -675,11 +675,11 @@ static function getNotifications($team_id) {
   }
 
   // getMonthlyQuotas - obtains monthly quotas for team.
-  static function getMonthlyQuotas($team_id) {
+  static function getMonthlyQuotas($group_id) {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select year, month, minutes from tt_monthly_quotas where team_id = $team_id";
+    $sql = "select year, month, minutes from tt_monthly_quotas where group_id = $group_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -692,41 +692,41 @@ static function getMonthlyQuotas($team_id) {
   }
 
   // The markDeleted function marks the team and everything in it as deleted.
-  static function markDeleted($team_id) {
+  static function markDeleted($group_id) {
 
     // Iterate through team users and mark them as deleted.
-    $users = ttTeamHelper::getAllUsers($team_id);
+    $users = ttTeamHelper::getAllUsers($group_id);
     foreach ($users as $one_user) {
       if (!ttUserHelper::markDeleted($one_user['id'])) return false;
     }
 
     // Mark tasks deleted.
-    if (!ttTeamHelper::markTasksDeleted($team_id)) return false;
+    if (!ttTeamHelper::markTasksDeleted($group_id)) return false;
 
     $mdb2 = getConnection();
 
     // Mark roles deleted.
-    $sql = "update tt_roles set status = NULL where team_id = $team_id";
+    $sql = "update tt_roles set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where team_id = $team_id";
+    $sql = "update tt_projects set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark clients deleted.
-    $sql = "update tt_clients set status = NULL where team_id = $team_id";
+    $sql = "update tt_clients set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark custom fields deleted.
-    $sql = "update tt_custom_fields set status = NULL where team_id = $team_id";
+    $sql = "update tt_custom_fields set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark group deleted.
-    $sql = "update tt_groups set status = NULL where id = $team_id";
+    $sql = "update tt_groups set status = NULL where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -734,15 +734,15 @@ static function markDeleted($team_id) {
   }
 
   // The getTeamDetails function returns team details.
-  static function getTeamDetails($team_id) {
+  static function getTeamDetails($group_id) {
     $result = array();
     $mdb2 = getConnection();
 
     $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email
       from tt_groups t
-      inner join tt_users u on (u.team_id = t.id)
+      inner join tt_users u on (u.group_id = t.id)
       inner join tt_roles r on (r.id = u.role_id and r.rank = 512)
-      where t.id = $team_id";
+      where t.id = $group_id";
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -846,15 +846,15 @@ static function insert($fields) {
     $affected = $mdb2->exec($sql);
 
     if (!is_a($affected, 'PEAR_Error')) {
-      $team_id = $mdb2->lastInsertID('tt_groups', 'id');
-      return $team_id;
+      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+      return $group_id;
     }
 
     return false;
   }
 
   // The update function updates team information.
-  static function update($team_id, $fields)
+  static function update($group_id, $fields)
   {
     global $user;
     $mdb2 = getConnection();
@@ -891,7 +891,7 @@ static function update($team_id, $fields)
 
     $sql = "update tt_groups set $name_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
-      $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $team_id";
+      $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -912,10 +912,10 @@ static function getInactiveTeams() {
     $count = 0;
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $team_id = $val['id'];
-        if (ttTeamHelper::isTeamActive($team_id) == false) {
+        $group_id = $val['id'];
+        if (ttTeamHelper::isTeamActive($group_id) == false) {
           $count++;
-          $inactive_teams[] = $team_id;
+          $inactive_teams[] = $group_id;
           // Limit the array size for perfomance by allowing this operation on small chunks only.
           if ($count >= 100) break;
         }
@@ -926,11 +926,11 @@ static function getInactiveTeams() {
   }
 
   // The isTeamActive determines if a team is using Time Tracker or abandoned it.
-  static function isTeamActive($team_id) {
+  static function isTeamActive($group_id) {
     $users = array();
 
     $mdb2 = getConnection();
-    $sql = "select id from tt_users where team_id = $team_id";
+    $sql = "select id from tt_users where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
     while ($val = $res->fetchRow()) {
@@ -971,11 +971,11 @@ static function isTeamActive($team_id) {
   }
 
   // The delete function permanently deletes all data for a team.
-  static function delete($team_id) {
+  static function delete($group_id) {
     $mdb2 = getConnection();
 
     // Delete users.
-    $sql = "select id from tt_users where team_id = $team_id";
+    $sql = "select id from tt_users where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
     while ($val = $res->fetchRow()) {
@@ -984,38 +984,38 @@ static function delete($team_id) {
     }
 
     // Delete tasks.
-    if (!ttTeamHelper::deleteTasks($team_id)) return false;
+    if (!ttTeamHelper::deleteTasks($group_id)) return false;
 
     // Delete client to project binds.
-    $sql = "delete from tt_client_project_binds where client_id in (select id from tt_clients where team_id = $team_id)";
+    $sql = "delete from tt_client_project_binds where client_id in (select id from tt_clients where group_id = $group_id)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete projects.
-    $sql = "delete from tt_projects where team_id = $team_id";
+    $sql = "delete from tt_projects where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete clients.
-    $sql = "delete from tt_clients where team_id = $team_id";
+    $sql = "delete from tt_clients where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete invoices.
-    $sql = "delete from tt_invoices where team_id = $team_id";
+    $sql = "delete from tt_invoices where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete custom fields.
-    if (!ttTeamHelper::deleteCustomFields($team_id)) return false;
+    if (!ttTeamHelper::deleteCustomFields($group_id)) return false;
 
     // Delete roles.
-    $sql = "delete from tt_roles where team_id = $team_id";
+    $sql = "delete from tt_roles where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete group.
-    $sql = "delete from tt_groups where id = $team_id";
+    $sql = "delete from tt_groups where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -1023,9 +1023,9 @@ static function delete($team_id) {
   }
 
   // The markTasksDeleted deletes task binds and marks the tasks as deleted for a team.
-  static function markTasksDeleted($team_id) {
+  static function markTasksDeleted($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where team_id = $team_id";
+    $sql = "select id from tt_tasks where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
 
@@ -1047,9 +1047,9 @@ static function markTasksDeleted($team_id) {
   }
 
   // The deleteTasks deletes all tasks and task binds for an inactive team.
-  static function deleteTasks($team_id) {
+  static function deleteTasks($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where team_id = $team_id";
+    $sql = "select id from tt_tasks where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
 
@@ -1071,9 +1071,9 @@ static function deleteTasks($team_id) {
   }
 
   // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive team.
-  static function deleteCustomFields($team_id) {
+  static function deleteCustomFields($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_custom_fields where team_id = $team_id";
+    $sql = "select id from tt_custom_fields where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
 
@@ -1118,7 +1118,7 @@ static function enablePlugin($plugin, $enable = true)
 
     $plugins = implode(',', $plugin_array);
     if ($plugins != $user->plugins) {
-      if (!ttTeamHelper::update($user->team_id, array('name' => $user->team,'plugins' => $plugins)))
+      if (!ttTeamHelper::update($user->group_id, array('name' => $user->team,'plugins' => $plugins)))
         return false;
       $user->plugins = $plugins;
     }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7e167f612..70e550402 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -30,7 +30,7 @@ class ttUser {
   var $login = null;            // User login.
   var $name = null;             // User name.
   var $id = null;               // User id.
-  var $team_id = null;          // Team id.
+  var $group_id = null;         // Group id.
   var $role_id = null;          // Role id.
   var $role_name = null;        // Role name.
   var $rank = null;             // User role rank.
@@ -72,11 +72,11 @@ function __construct($login, $id = null) {
 
     $mdb2 = getConnection();
 
-    $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, t.name as team_name,
+    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, t.name as team_name,
       t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
       t.tracking_mode, t.project_required, t.task_required, t.record_type,
       t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
-      FROM tt_users u LEFT JOIN tt_groups t ON (u.team_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+      FROM tt_users u LEFT JOIN tt_groups t ON (u.group_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
     else
@@ -93,7 +93,7 @@ function __construct($login, $id = null) {
       $this->login = $val['login'];
       $this->name = $val['name'];
       $this->id = $val['id'];
-      $this->team_id = $val['team_id'];
+      $this->group_id = $val['group_id'];
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);
@@ -193,7 +193,7 @@ function getAssignedProjects()
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
       inner join tt_user_project_binds upb on (upb.user_id = ".$this->getActiveUser()." and upb.project_id = p.id and upb.status = 1)
-      where p.team_id = $this->team_id and p.status = 1 order by p.name";
+      where p.group_id = $this->group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -261,7 +261,7 @@ function getUsers($options) {
     if (isset($options['max_rank']) || $skipClients || isset($options['include_role']))
         $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
 
-    $where_part = " where u.team_id = $this->team_id";
+    $where_part = " where u.group_id = $this->group_id";
     if (isset($options['status']))
       $where_part .= ' and u.status = '.(int)$options['status'];
     else
@@ -312,7 +312,7 @@ function getUser($user_id) {
 
     $sql =  "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email from tt_users u".
             " left join tt_roles r on (u.role_id = r.id)".
-            " where u.id = $user_id and u.team_id = $this->team_id and u.status is not null".
+            " where u.id = $user_id and u.group_id = $this->group_id and u.status is not null".
             " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index dab51297c..40cd78293 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -101,7 +101,7 @@ static function insert($fields, $hash = true) {
     if($hash)
       $password = 'md5('.$password.')';
     $email = isset($fields['email']) ? $fields['email'] : '';
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $rate = str_replace(',', '.', isset($fields['rate']) ? $fields['rate'] : 0);
     if($rate == '')
       $rate = 0;
@@ -112,9 +112,9 @@ static function insert($fields, $hash = true) {
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by_v = ', '.$mdb2->quote($user->id);
 
-    $sql = "insert into tt_users (name, login, password, team_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
+    $sql = "insert into tt_users (name, login, password, group_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
-      ", $password, $team_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
+      ", $password, $group_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
@@ -191,7 +191,7 @@ static function update($user_id, $fields) {
       // otherwise de-activate the bind (set its status to inactive). This will keep the bind
       // and its rate in database for reporting.
 
-      $all_projects = ttTeamHelper::getAllProjects($user->team_id);
+      $all_projects = ttTeamHelper::getAllProjects($user->group_id);
       $assigned_projects = isset($fields['projects']) ? $fields['projects'] : array();
 
       foreach($all_projects as $p) {
@@ -282,13 +282,13 @@ static function markDeleted($user_id) {
         return false;
 
       // Mark user as deleted.
-      $sql = "update tt_users set status = NULL where id = $user_id and team_id = ".$user->team_id;
+      $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$user->group_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
 
     } elseif ($user->isManager()) {
-      $user_count = ttTeamHelper::getUserCount($user->team_id);
+      $user_count = ttTeamHelper::getUserCount($user->group_id);
 
       // Marking deleted a manager with active users is not allowed.
        if (($user_id == $user->id) && ($user_count > 1))
@@ -296,29 +296,29 @@ static function markDeleted($user_id) {
 
       if (1 == $user_count) {
         // Mark tasks deleted.
-        if (!ttTeamHelper::markTasksDeleted($user->team_id))
+        if (!ttTeamHelper::markTasksDeleted($user->group_id))
           return false;
 
         // Mark projects deleted.
-        $sql = "update tt_projects set status = NULL where team_id = $user->team_id";
+        $sql = "update tt_projects set status = NULL where group_id = $user->group_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
 
         // Mark clients deleted.
-        $sql = "update tt_clients set status = NULL where team_id = $user->team_id";
+        $sql = "update tt_clients set status = NULL where group_id = $user->group_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
 
         // Mark custom fields deleted.
-        $sql = "update tt_custom_fields set status = NULL where team_id = $user->team_id";
+        $sql = "update tt_custom_fields set status = NULL where group_id = $user->group_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
  
         // Mark team deleted.
-        $sql = "update tt_groups set status = NULL where id = $user->team_id";
+        $sql = "update tt_groups set status = NULL where id = $user->group_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
@@ -337,7 +337,7 @@ static function markDeleted($user_id) {
         return false;
 
       // Mark user as deleted.
-      $sql = "update tt_users set status = NULL where id = $user_id and team_id = ".$user->team_id;
+      $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$user->group_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index f4ee719f8..27a1bbcf5 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -45,7 +45,7 @@ static function getRecordsForInterval($user_id, $start_date, $end_date) {
 
     $custom_field_1 = null;
     if ($user->isPluginEnabled('cf')) {
-      $custom_fields = new CustomFields($user->team_id);
+      $custom_fields = new CustomFields($user->group_id);
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         $custom_field_1 = ', cfl.value as cf_1_value';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a5dbf67f..10419c01b 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.17.80.4199 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.81.4200 | 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/admin_team_delete.php b/admin_team_delete.php
index a9ce1ee1b..61a17041e 100644
--- a/admin_team_delete.php
+++ b/admin_team_delete.php
@@ -36,12 +36,12 @@
   exit();
 }
 
-$team_id = (int)$request->getParameter('id');
-$team_details = ttTeamHelper::getTeamDetails($team_id);
+$group_id = (int)$request->getParameter('id');
+$team_details = ttTeamHelper::getTeamDetails($group_id);
 $team_name = $team_details['team_name'];
 
 $form = new Form('teamForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$team_id));
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
@@ -49,7 +49,7 @@
   if ($request->getParameter('btn_delete')) {
     import('ttAdmin');
     $admin = new ttAdmin();
-    $result = $admin->markGroupDeleted($team_id);
+    $result = $admin->markGroupDeleted($group_id);
     if ($result) {
       header('Location: admin_teams.php');
       exit();
diff --git a/admin_team_edit.php b/admin_team_edit.php
index a737050a8..05bfec8b1 100644
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -37,8 +37,8 @@
   exit();
 }
 
-$team_id = $request->getParameter('id');
-$team_details = ttTeamHelper::getTeamDetails($team_id);	
+$group_id = $request->getParameter('id');
+$team_details = ttTeamHelper::getTeamDetails($group_id);
 
 if ($request->isPost()) {
   $cl_team_name = trim($request->getParameter('team_name'));
@@ -68,7 +68,7 @@
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_email','value'=>$cl_manager_email));
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$team_id));
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
@@ -88,7 +88,7 @@
 
     import('ttAdmin');
     $admin = new ttAdmin($err);
-    $result = $admin->updateGroup($team_id, $fields);
+    $result = $admin->updateGroup($group_id, $fields);
     if ($result) {
       header('Location: admin_teams.php');
       exit();
diff --git a/client_add.php b/client_add.php
index 5ae5997fa..3afcbc072 100644
--- a/client_add.php
+++ b/client_add.php
@@ -41,7 +41,7 @@
   exit();
 }
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -71,7 +71,7 @@
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
diff --git a/client_edit.php b/client_edit.php
index b74fb3150..74062d06e 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -43,7 +43,7 @@
 
 $cl_id = (int) $request->getParameter('id');
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -103,7 +103,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
diff --git a/clients.php b/clients.php
index 6ac6f5a1d..177bd61ee 100644
--- a/clients.php
+++ b/clients.php
@@ -40,8 +40,8 @@
   exit();
 }
 
-$smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->team_id, true));
-$smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->team_id, true));
+$smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->group_id, true));
+$smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->group_id, true));
 $smarty->assign('title', $i18n->get('title.clients'));
 $smarty->assign('content_page_name', 'clients.tpl');
 $smarty->display('index.tpl');
diff --git a/dbinstall.php b/dbinstall.php
index 190ff7eea..97a5085da 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -872,6 +872,17 @@ function setChange($sql) {
     setChange("RENAME TABLE `tt_teams` TO `tt_groups`");
     setChange("ALTER TABLE `tt_monthly_quotas` DROP FOREIGN KEY FK_TT_TEAM_CONSTRAING");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.80', modified = now() where param_name = 'version_db' and param_value = '1.17.79'");
+    setChange("ALTER TABLE `tt_roles` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_users` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_projects` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_tasks` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_invoices` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_cron` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_clients` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_custom_fields` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_predefined_expenses` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("ALTER TABLE `tt_monthly_quotas` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.81', modified = now() where param_name = 'version_db' and param_value = '1.17.80'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/expense_edit.php b/expense_edit.php
index 99503b06b..3e8b18e9b 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -76,7 +76,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -101,7 +101,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -127,7 +127,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
+$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
 if ($predefined_expenses) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'recalculateCost();',
diff --git a/expenses.php b/expenses.php
index 7291414aa..fee812051 100644
--- a/expenses.php
+++ b/expenses.php
@@ -92,7 +92,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -118,7 +118,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -144,7 +144,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
+$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
 if ($predefined_expenses) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
diff --git a/group_edit.php b/group_edit.php
index 0ce93582f..1d71cc17d 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -268,7 +268,7 @@
         $config .= ',uncompleted_indicators';
       $config = trim($config, ',');
 
-      $update_result = ttTeamHelper::update($user->team_id, array(
+      $update_result = ttTeamHelper::update($user->group_id, array(
         'name' => $cl_team,
         'currency' => $cl_currency,
         'lang' => $cl_lang,
diff --git a/initialize.php b/initialize.php
index 5d721b803..261ec7479 100644
--- a/initialize.php
+++ b/initialize.php
@@ -170,8 +170,8 @@
 import('ttUser');
 $user = new ttUser(null, $auth->getUserId());
 if ($user->custom_logo) {
-  $smarty->assign('custom_logo', 'images/'.$user->team_id.'.png');
-  $smarty->assign('mobile_custom_logo', '../images/'.$user->team_id.'.png');
+  $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
+  $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
 }
 $smarty->assign('user', $user);
 
diff --git a/invoice_add.php b/invoice_add.php
index ad9c3cfb8..61568e2aa 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -56,12 +56,12 @@
 
 // Dropdown for clients if the clients plugin is enabled.
 if ($user->isPluginEnabled('cl')) {
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+  $clients = ttTeamHelper::getActiveClients($user->group_id);
   $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $projects = ttTeamHelper::getActiveProjects($user->team_id);
+  $projects = ttTeamHelper::getActiveProjects($user->group_id);
   $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'number','style'=>'width: 250px;','value'=>$cl_number));
diff --git a/locking.php b/locking.php
index 2b49b8375..99e79a217 100644
--- a/locking.php
+++ b/locking.php
@@ -51,7 +51,7 @@
   if (!ttValidCronSpec($cl_lock_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
 
   if ($err->no()) {
-    if (ttTeamHelper::update($user->team_id, array(
+    if (ttTeamHelper::update($user->group_id, array(
       'name' => $user->team,
       'lock_spec' => $cl_lock_spec))) {
       header('Location: profile_edit.php');
diff --git a/mobile/client_add.php b/mobile/client_add.php
index fc57853d7..f83c720ae 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -41,7 +41,7 @@
   exit();
 }
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -71,7 +71,7 @@
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index eb8592290..093e9668c 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -43,7 +43,7 @@
 
 $cl_id = (int) $request->getParameter('id');
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -104,7 +104,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
diff --git a/mobile/clients.php b/mobile/clients.php
index 43e6848ae..4f03510ce 100644
--- a/mobile/clients.php
+++ b/mobile/clients.php
@@ -40,8 +40,8 @@
   exit();
 }
 
-$smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->team_id, true));
-$smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->team_id, true));
+$smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->group_id, true));
+$smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->group_id, true));
 $smarty->assign('title', $i18n->get('title.clients'));
 $smarty->assign('content_page_name', 'mobile/clients.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 1611378d9..f560f5574 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -73,7 +73,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -98,7 +98,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -124,7 +124,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
+$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
 if ($predefined_expenses) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'recalculateCost();',
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 1cd39c04c..815a4fc34 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -96,7 +96,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -122,7 +122,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -148,7 +148,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
+$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
 if ($predefined_expenses) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
diff --git a/mobile/project_add.php b/mobile/project_add.php
index bb0f1d096..b0d5394d4 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -46,7 +46,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->team_id);
+$tasks = ttTeamHelper::getActiveTasks($user->group_id);
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -78,7 +78,7 @@
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 6adb475e4..94f3e514d 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -52,7 +52,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->team_id);
+$tasks = ttTeamHelper::getActiveTasks($user->group_id);
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -119,7 +119,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
diff --git a/mobile/projects.php b/mobile/projects.php
index a9f8ab02d..e3dc2f87e 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -42,8 +42,8 @@
 // End of access checks.
 
 if($user->can('manage_projects')) {
-  $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
-  $inactive_projects = ttTeamHelper::getInactiveProjects($user->team_id);
+  $active_projects = ttTeamHelper::getActiveProjects($user->group_id);
+  $inactive_projects = ttTeamHelper::getInactiveProjects($user->group_id);
 } else
   $active_projects = $user->getAssignedProjects();
 
diff --git a/mobile/task_add.php b/mobile/task_add.php
index fd1fb4649..4b257edc5 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -43,7 +43,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -68,7 +68,7 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index f1748c7e9..f1e256892 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -48,7 +48,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -103,7 +103,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
diff --git a/mobile/tasks.php b/mobile/tasks.php
index e49498c4c..9ad18a170 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -41,8 +41,8 @@
 }
 // End of access checks.
 
-$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
-$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
+$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->group_id));
+$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->group_id));
 $smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'mobile/tasks.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/time.php b/mobile/time.php
index 8c6721d49..2649ff279 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -57,7 +57,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -90,7 +90,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -116,7 +116,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -144,7 +144,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index a1a56e37c..40f58e8d9 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -51,7 +51,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -107,7 +107,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -133,7 +133,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -161,7 +161,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/mobile/timer.php b/mobile/timer.php
index 059767edd..e547c256d 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -53,7 +53,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -88,7 +88,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -116,7 +116,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -144,7 +144,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/mobile/user_add.php b/mobile/user_add.php
index 53b9842fa..934114528 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -45,7 +45,7 @@
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+  $clients = ttTeamHelper::getActiveClients($user->group_id);
 
 $assigned_projects = array();
 if ($request->isPost()) {
@@ -89,7 +89,7 @@
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -147,7 +147,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index f82d9314a..46646bcaf 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -48,9 +48,9 @@
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+  $clients = ttTeamHelper::getActiveClients($user->group_id);
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 $assigned_projects = array();
 
 if ($request->isPost()) {
diff --git a/mobile/users.php b/mobile/users.php
index 18ad2e5fa..4723543d8 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -42,7 +42,7 @@
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
 if($user->canManageTeam()) {
   $can_delete_manager = (1 == count($active_users));
-  $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
+  $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
 
 // Check if the team is set to show indicators for uncompleted time entries.
diff --git a/mysql.sql b/mysql.sql
index 4a48a662c..78ee25abc 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -50,7 +50,7 @@ CREATE TABLE `tt_groups` (
 #
 CREATE TABLE `tt_roles` (
   `id` int(11) NOT NULL auto_increment,    # Role id. Identifies roles for all groups on the server.
-  `team_id` int(11) NOT NULL,              # Team id the role is defined for.
+  `group_id` int(11) NOT NULL,             # Group id the role is defined for.
   `name` varchar(80) default NULL,         # Role name - custom role name. In case we are editing a
                                            # predefined role (USER, etc.), we can rename the role here.
   `description` varchar(255) default NULL, # Role description.
@@ -69,11 +69,11 @@ CREATE TABLE `tt_roles` (
 );
 
 # Create an index that guarantees unique active and inactive role ranks in each group.
-create unique index role_idx on tt_roles(team_id, rank, status);
+create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
-INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -84,7 +84,7 @@ CREATE TABLE `tt_users` (
   `login` varchar(50) COLLATE utf8_bin NOT NULL,   # user login
   `password` varchar(50) default NULL,             # password hash
   `name` varchar(100) default NULL,                # user name
-  `team_id` int(11) NOT NULL,                      # team id
+  `group_id` int(11) NOT NULL,                     # group id
   `role_id` int(11) default NULL,                  # role id
   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
@@ -106,7 +106,7 @@ create unique index login_idx on tt_users(login, status);
 
 # Create admin account with password 'secret'. Admin is a superuser, who can create teams.
 DELETE from `tt_users` WHERE login = 'admin';
-INSERT INTO `tt_users` (`login`, `password`, `name`, `team_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024));
+INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024));
 
 
 #
@@ -114,7 +114,7 @@ INSERT INTO `tt_users` (`login`, `password`, `name`, `team_id`, `role_id`) VALUE
 #
 CREATE TABLE `tt_projects` (
   `id` int(11) NOT NULL auto_increment,         # project id
-  `team_id` int(11) NOT NULL,                   # team id
+  `group_id` int(11) NOT NULL,                  # group id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # project name
   `description` varchar(255) default NULL,      # project description
   `tasks` text default NULL,                    # comma-separated list of task ids associated with this project
@@ -122,8 +122,8 @@ CREATE TABLE `tt_projects` (
   PRIMARY KEY (`id`)
 );
 
-# Create an index that guarantees unique active and inactive projects per team.
-create unique index project_idx on tt_projects(team_id, name, status);
+# Create an index that guarantees unique active and inactive projects per group.
+create unique index project_idx on tt_projects(group_id, name, status);
 
 
 #
@@ -131,15 +131,15 @@ create unique index project_idx on tt_projects(team_id, name, status);
 #
 CREATE TABLE `tt_tasks` (
   `id` int(11) NOT NULL auto_increment,         # task id
-  `team_id` int(11) NOT NULL,                   # team id
+  `group_id` int(11) NOT NULL,                  # group id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # task name
   `description` varchar(255) default NULL,      # task description
   `status` tinyint(4) default 1,                # task status
   PRIMARY KEY (`id`)
 );
 
-# Create an index that guarantees unique active and inactive tasks per team.
-create unique index task_idx on tt_tasks(team_id, name, status);
+# Create an index that guarantees unique active and inactive tasks per group.
+create unique index task_idx on tt_tasks(group_id, name, status);
 
 
 #
@@ -212,7 +212,7 @@ create index task_idx on tt_log(task_id);
 #
 CREATE TABLE `tt_invoices` (
   `id` int(11) NOT NULL auto_increment,         # invoice id
-  `team_id` int(11) NOT NULL,                   # team id
+  `group_id` int(11) NOT NULL,                  # group id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # invoice name
   `date` date NOT NULL,                         # invoice date
   `client_id` int(11) NOT NULL,                 # client id
@@ -221,7 +221,7 @@ CREATE TABLE `tt_invoices` (
 );
 
 # Create an index that guarantees unique invoice names per team.
-create unique index name_idx on tt_invoices(team_id, name, status);
+create unique index name_idx on tt_invoices(group_id, name, status);
 
 
 #
@@ -277,7 +277,7 @@ CREATE TABLE `tt_fav_reports` (
 #
 CREATE TABLE `tt_cron` (
   `id` int(11) NOT NULL auto_increment,         # entry id
-  `team_id` int(11) NOT NULL,                   # team id
+  `group_id` int(11) NOT NULL,                  # group id
   `cron_spec` varchar(255) NOT NULL,            # cron specification, "0 1 * * *" for "daily at 01:00"
   `last` int(11) default NULL,                  # UNIX timestamp of when job was last run
   `next` int(11) default NULL,                  # UNIX timestamp of when to run next job
@@ -296,7 +296,7 @@ CREATE TABLE `tt_cron` (
 #
 CREATE TABLE `tt_clients` (
   `id` int(11) NOT NULL AUTO_INCREMENT,         # client id
-  `team_id` int(11) NOT NULL,                   # team id
+  `group_id` int(11) NOT NULL,                  # group id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # client name
   `address` varchar(255) default NULL,          # client address
   `tax` float(6,2) default '0.00',              # applicable tax for this client
@@ -306,7 +306,7 @@ CREATE TABLE `tt_clients` (
 );
 
 # Create an index that guarantees unique active and inactive clients per team.
-create unique index client_name_idx on tt_clients(team_id, name, status);
+create unique index client_name_idx on tt_clients(group_id, name, status);
 
 
 #
@@ -343,7 +343,7 @@ create unique index param_idx on tt_config(user_id, param_name);
 #
 CREATE TABLE `tt_custom_fields` (
   `id` int(11) NOT NULL auto_increment,    # custom field id
-  `team_id` int(11) NOT NULL,              # team id
+  `group_id` int(11) NOT NULL,             # group id
   `type` tinyint(4) NOT NULL default 0,    # custom field type (text or dropdown)
   `label` varchar(32) NOT NULL default '', # custom field label
   `required` tinyint(4) default 0,         # whether this custom field is mandatory for time records
@@ -416,7 +416,7 @@ create index invoice_idx on tt_expense_items(invoice_id);
 #
 CREATE TABLE `tt_predefined_expenses` (
   `id` int(11) NOT NULL auto_increment, # predefined expense id
-  `team_id` int(11) NOT NULL,           # team id
+  `group_id` int(11) NOT NULL,          # group id
   `name` varchar(255) NOT NULL,         # predefined expense name, such as mileage
   `cost` decimal(10,2) default '0.00',  # cost for one unit
   PRIMARY KEY  (`id`)
@@ -428,11 +428,11 @@ CREATE TABLE `tt_predefined_expenses` (
 # This table keeps monthly work hour quotas for groups.
 #
 CREATE TABLE `tt_monthly_quotas` (
-  `team_id` int(11) NOT NULL,             # group id
+  `group_id` int(11) NOT NULL,            # group id
   `year` smallint(5) UNSIGNED NOT NULL,   # quota year
   `month` tinyint(3) UNSIGNED NOT NULL,   # quota month
   `minutes` int(11) default NULL,         # quota in minutes in specified month and year
-  PRIMARY KEY (`team_id`,`year`,`month`)
+  PRIMARY KEY (`group_id`,`year`,`month`)
 );
 
 
@@ -449,4 +449,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.80', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.81', now()); # TODO: change when structure changes.
diff --git a/notification_add.php b/notification_add.php
index 7dd680ff3..e30970afa 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -86,7 +86,7 @@
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); 
 
     if (ttNotificationHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
         'report_id' => $cl_fav_report,
diff --git a/notification_edit.php b/notification_edit.php
index 1c36865f3..69535815d 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -94,7 +94,7 @@
 
     if (ttNotificationHelper::update(array(
         'id' => $notification_id,
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
         'report_id' => $cl_fav_report,
diff --git a/notifications.php b/notifications.php
index 6dcf33fd2..23400beb4 100644
--- a/notifications.php
+++ b/notifications.php
@@ -50,7 +50,7 @@
   }
 } else {
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $notifications = ttTeamHelper::getNotifications($user->team_id);
+  $notifications = ttTeamHelper::getNotifications($user->group_id);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
diff --git a/password_change.php b/password_change.php
index 832118f6c..f8c47112a 100644
--- a/password_change.php
+++ b/password_change.php
@@ -49,8 +49,8 @@
     $smarty->assign('i18n', $i18n->keys);
   }
   if ($user->custom_logo) {
-    $smarty->assign('custom_logo', 'images/'.$user->team_id.'.png');
-    $smarty->assign('mobile_custom_logo', '../images/'.$user->team_id.'.png');
+    $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
+    $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
   }
   $smarty->assign('user', $user);
 }
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index f9592f1c8..afb59dae9 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -37,11 +37,11 @@ class CustomFields {
   var $options = array(); // Array of options for a dropdown custom field.
 
   // Constructor.
-  function __construct($team_id) {
+  function __construct($group_id) {
     $mdb2 = getConnection();
 
     // Get fields.
-    $sql = "select id, type, label, required from tt_custom_fields where team_id = $team_id and status = 1 and type > 0";
+    $sql = "select id, type, label, required from tt_custom_fields where group_id = $group_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -149,12 +149,12 @@ static function deleteOption($id) {
     $field_id = CustomFields::getFieldIdForOption($id);
 
     // First make sure that the field is ours.
-    $sql = "select team_id from tt_custom_fields where id = $field_id";
+    $sql = "select group_id from tt_custom_fields where id = $field_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
     $val = $res->fetchRow();
-    if ($user->team_id != $val['team_id'])
+    if ($user->group_id != $val['group_id'])
       return false;
 
     // Delete log entries with this option.
@@ -176,12 +176,12 @@ static function getOptions($field_id) {
     $options = array();
 
     // First make sure that the field is ours.
-    $sql = "select team_id from tt_custom_fields where id = $field_id";
+    $sql = "select group_id from tt_custom_fields where id = $field_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
     $val = $res->fetchRow();
-    if ($user->team_id != $val['team_id'])
+    if ($user->group_id != $val['group_id'])
       return false;
 
     // Get options.
@@ -204,12 +204,12 @@ static function getOptionName($id) {
     $field_id = CustomFields::getFieldIdForOption($id);
 
     // First make sure that the field is ours.
-    $sql = "select team_id from tt_custom_fields where id = $field_id";
+    $sql = "select group_id from tt_custom_fields where id = $field_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
     $val = $res->fetchRow();
-    if ($user->team_id != $val['team_id'])
+    if ($user->group_id != $val['group_id'])
       return false;
 
     // Get option name.
@@ -229,7 +229,7 @@ static function getFields() {
     $mdb2 = getConnection();
 
     $fields = array();
-    $sql = "select id, type, label from tt_custom_fields where team_id = $user->team_id and status = 1 and type > 0";
+    $sql = "select id, type, label from tt_custom_fields where group_id = $user->group_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -245,7 +245,7 @@ static function getField($id) {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select label, type, required from tt_custom_fields where id = $id and team_id = $user->team_id";
+    $sql = "select label, type, required from tt_custom_fields where id = $id and group_id = $user->group_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -274,7 +274,7 @@ static function getFieldIdForOption($option_id) {
   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
-    $sql = "insert into tt_custom_fields (team_id, type, label, required, status) values($user->team_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
+    $sql = "insert into tt_custom_fields (group_id, type, label, required, status) values($user->group_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -283,7 +283,7 @@ static function insertField($field_name, $field_type, $required) {
   static function updateField($id, $name, $type, $required) {
     global $user;
     $mdb2 = getConnection();
-    $sql = "update tt_custom_fields set label = ".$mdb2->quote($name).", type = $type, required = $required where id = $id and team_id = $user->team_id";
+    $sql = "update tt_custom_fields set label = ".$mdb2->quote($name).", type = $type, required = $required where id = $id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -299,12 +299,12 @@ static function deleteField($field_id) {
     $mdb2 = getConnection();
 
     // First make sure that the field is ours so that we can safely delete it.
-    $sql = "select team_id from tt_custom_fields where id = $field_id";
+    $sql = "select group_id from tt_custom_fields where id = $field_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
     $val = $res->fetchRow();
-    if ($user->team_id != $val['team_id'])
+    if ($user->group_id != $val['group_id'])
       return false;
 
     // Mark log entries as deleted.
@@ -320,7 +320,7 @@ static function deleteField($field_id) {
       return false;
 
     // Delete the field.
-    $sql = "delete from tt_custom_fields where id = $field_id and team_id = $user->team_id";
+    $sql = "delete from tt_custom_fields where id = $field_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index a4be6ee32..de1f7cd20 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -32,21 +32,21 @@
 class MonthlyQuota {
 
   var $db;       // Database connection.
-  var $team_id;  // Team id.
+  var $group_id; // Group id.
 
   function __construct() {
     $this->db = getConnection();
     global $user;
-    $this->team_id = $user->team_id;
+    $this->group_id = $user->group_id;
   }
 
   // update - deletes a quota, then inserts a new one.
   public function update($year, $month, $minutes) {
-    $team_id = $this->team_id;
-    $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $team_id";
+    $group_id = $this->group_id;
+    $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $group_id";
     $this->db->exec($deleteSql);
     if ($minutes){
-      $insertSql = "INSERT INTO tt_monthly_quotas (team_id, year, month, minutes) values ($team_id, $year, $month, $minutes)";
+      $insertSql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
       $affected = $this->db->exec($insertSql);
       return (!is_a($affected, 'PEAR_Error'));
     }
@@ -64,8 +64,8 @@ public function get($year, $month = null) {
 
   // getSingle - obtains a quota for a single month.
   private function getSingle($year, $month) {
-    $team_id = $this->team_id;
-    $sql = "SELECT minutes FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $team_id";
+    $group_id = $this->group_id;
+    $sql = "SELECT minutes FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $group_id";
     $reader = $this->db->query($sql);
     if (is_a($reader, 'PEAR_Error')) {
       return false;
@@ -83,8 +83,8 @@ private function getSingle($year, $month) {
 
   // getMany - returns an array of quotas for a given year for team.
   private function getMany($year){
-    $team_id = $this->team_id;
-    $sql = "SELECT month, minutes FROM tt_monthly_quotas WHERE year = $year AND team_id = $team_id";
+    $group_id = $this->group_id;
+    $sql = "SELECT month, minutes FROM tt_monthly_quotas WHERE year = $year AND group_id = $group_id";
     $result = array();
     $res = $this->db->query($sql);
     if (is_a($res, 'PEAR_Error')) {
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 2f1621cac..e653192b8 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -56,7 +56,7 @@
   if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
   if ($err->no()) {
     if (ttPredefinedExpenseHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'cost' => $cl_cost))) {
         header('Location: predefined_expenses.php');
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index 7791b2440..9b3727bf1 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -64,7 +64,7 @@
   if ($err->no()) {
     if (ttPredefinedExpenseHelper::update(array(
         'id' => $predefined_expense_id,
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'cost' => $cl_cost))) {
         header('Location: predefined_expenses.php');
diff --git a/predefined_expenses.php b/predefined_expenses.php
index 7aed7ad60..88ac44d70 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -50,7 +50,7 @@
   }
 } else {
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $predefinedExpenses = ttTeamHelper::getPredefinedExpenses($user->team_id);
+  $predefinedExpenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
diff --git a/project_add.php b/project_add.php
index 55b83b42a..980870250 100644
--- a/project_add.php
+++ b/project_add.php
@@ -45,7 +45,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->team_id);
+$tasks = ttTeamHelper::getActiveTasks($user->group_id);
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -77,7 +77,7 @@
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
diff --git a/project_edit.php b/project_edit.php
index 543c532ef..14e8e7713 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -52,7 +52,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->team_id);
+$tasks = ttTeamHelper::getActiveTasks($user->group_id);
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -118,7 +118,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
diff --git a/projects.php b/projects.php
index bf6aed1cb..d206fe8c2 100644
--- a/projects.php
+++ b/projects.php
@@ -42,8 +42,8 @@
 // End of access checks.
 
 if($user->can('manage_projects')) {
-  $active_projects = ttTeamHelper::getActiveProjects($user->team_id);
-  $inactive_projects = ttTeamHelper::getInactiveProjects($user->team_id);
+  $active_projects = ttTeamHelper::getActiveProjects($user->group_id);
+  $inactive_projects = ttTeamHelper::getInactiveProjects($user->group_id);
 } else
   $active_projects = $user->getAssignedProjects();
 
diff --git a/quotas.php b/quotas.php
index c921fba4c..8e6f59c4d 100644
--- a/quotas.php
+++ b/quotas.php
@@ -90,7 +90,7 @@
     // Handle workday hours.
     $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
     if ($workday_minutes != $user->workday_minutes) {
-      if (!ttTeamHelper::update($user->team_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))
+      if (!ttTeamHelper::update($user->group_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))
         $err->add($i18n->get('error.db'));
     }
 
diff --git a/report.php b/report.php
index c59f6b5e3..d712968d9 100644
--- a/report.php
+++ b/report.php
@@ -54,7 +54,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -92,7 +92,7 @@
 // Controls for "Assign to invoice" block.
 if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient()) {
   // Client is selected and we are displaying the invoice column.
-  $recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id);
+  $recent_invoices = ttTeamHelper::getRecentInvoices($user->group_id, $client_id);
   if ($recent_invoices) {
     $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
     $form->addInput(array('type'=>'combobox',
diff --git a/reports.php b/reports.php
index 3aba9cdf7..99683c1ab 100644
--- a/reports.php
+++ b/reports.php
@@ -45,7 +45,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -104,7 +104,7 @@
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/role_add.php b/role_add.php
index d26cb6ad0..086da632c 100644
--- a/role_add.php
+++ b/role_add.php
@@ -59,11 +59,11 @@
   if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
 
   if ($err->no()) {
-    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->team_id);
+    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->group_id);
     if (!$existing_role) {
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,
diff --git a/task_add.php b/task_add.php
index eaaba5e8d..e25fa3908 100644
--- a/task_add.php
+++ b/task_add.php
@@ -43,7 +43,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -68,7 +68,7 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,
diff --git a/task_edit.php b/task_edit.php
index 324f1dbb8..feff4e52d 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -48,7 +48,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -101,7 +101,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
diff --git a/tasks.php b/tasks.php
index 2d310d011..e967e095e 100644
--- a/tasks.php
+++ b/tasks.php
@@ -41,8 +41,8 @@
 }
 // End of access checks.
 
-$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
-$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
+$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->group_id));
+$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->group_id));
 $smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'tasks.tpl');
 $smarty->display('index.tpl');
diff --git a/time.php b/time.php
index d75854c83..24cc7c8ae 100644
--- a/time.php
+++ b/time.php
@@ -61,7 +61,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -125,7 +125,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -151,7 +151,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -179,7 +179,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/time_edit.php b/time_edit.php
index 507f28abb..812594360 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -51,7 +51,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -110,7 +110,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -136,7 +136,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -164,7 +164,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/tofile.php b/tofile.php
index e7b9ed963..62632fa97 100644
--- a/tofile.php
+++ b/tofile.php
@@ -41,7 +41,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
 }
 
 // Report settings are stored in session bean before we get here.
diff --git a/topdf.php b/topdf.php
index 475522ef9..9149e1c69 100644
--- a/topdf.php
+++ b/topdf.php
@@ -52,7 +52,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
 }
 
 // Report settings are stored in session bean before we get here.
@@ -391,8 +391,8 @@ public function Footer() {
 $pdf = new ttPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
 
 // If custom logo file exists - set it.
-if (file_exists('images/'.$user->team_id.'.png'))
-  $pdf->SetImageFile('images/'.$user->team_id.'.png');
+if (file_exists('images/'.$user->group_id.'.png'))
+  $pdf->SetImageFile('images/'.$user->group_id.'.png');
 
 // Set page word for the footer.
 $pdf->SetPageWord($i18n->get('label.page'));
diff --git a/user_add.php b/user_add.php
index b235cbd17..1ed0cb725 100644
--- a/user_add.php
+++ b/user_add.php
@@ -46,7 +46,7 @@
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+  $clients = ttTeamHelper::getActiveClients($user->group_id);
 
 $assigned_projects = array();
 if ($request->isPost()) {
@@ -90,7 +90,7 @@
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -150,7 +150,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
diff --git a/user_edit.php b/user_edit.php
index 95ed29e79..f370f451d 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -49,9 +49,9 @@
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+  $clients = ttTeamHelper::getActiveClients($user->group_id);
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
 $assigned_projects = array();
 
 if ($request->isPost()) {
diff --git a/week.php b/week.php
index 1d72ce400..c71a2ccd0 100644
--- a/week.php
+++ b/week.php
@@ -83,7 +83,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -244,7 +244,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -270,7 +270,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -298,7 +298,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',

From a6c4fa37379736e1c7568ccea1c5d371de7c6271 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Mar 2018 11:28:07 +0000
Subject: [PATCH 0083/1848] Introduced view_all_reports right and added it to
 co-manager role.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          |  4 ++--
 report.php                         |  2 +-
 reports.php                        | 12 +++++++-----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 25d714194..f4168094e 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -186,7 +186,7 @@ static function createPredefinedRoles($group_id, $lang)
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
@@ -244,7 +244,7 @@ static function createDefaultRoles()
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 10419c01b..8a97233ce 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.17.81.4200 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.82.4201 | 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/dbinstall.php b/dbinstall.php
index 97a5085da..e8f282fa6 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11780"]) {
+  if ($_POST["convert11744to11782"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -883,6 +883,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_predefined_expenses` CHANGE `team_id` `group_id` int(11) NOT NULL");
     setChange("ALTER TABLE `tt_monthly_quotas` CHANGE `team_id` `group_id` int(11) NOT NULL");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.81', modified = now() where param_name = 'version_db' and param_value = '1.17.80'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.81') set rights = replace(rights, ',manage_invoices', ',manage_invoices,view_all_reports')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.82', modified = now() where param_name = 'version_db' and param_value = '1.17.81'");
   }
 
   if ($_POST["cleanup"]) {
@@ -928,7 +930,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.80)</b>
+    <td width="80%"><b>Create database structure (v1.17.82)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -968,8 +970,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.80)</td>
-    <td><input type="submit" name="convert11744to11780" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.82)</td>
+    <td><input type="submit" name="convert11744to11782" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 78ee25abc..6d6ce5fb0 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -73,7 +73,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -449,4 +449,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.81', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.82', now()); # TODO: change when structure changes.
diff --git a/report.php b/report.php
index d712968d9..1f0ec87c6 100644
--- a/report.php
+++ b/report.php
@@ -33,7 +33,7 @@
 import('ttTeamHelper');
 
 // Access check.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/reports.php b/reports.php
index 99683c1ab..0028e9957 100644
--- a/reports.php
+++ b/reports.php
@@ -37,7 +37,7 @@
 import('ttClientHelper');
 
 // Access check.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -141,13 +141,15 @@
 }
 
 $user_list = array();
-if ($user->can('view_reports') || $user->isClient()) {
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
-  if ($user->can('view_reports')) {
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $max_rank = $user->rank-1;
+    if ($user->can('view_all_reports')) $max_rank = 512;
     if ($user->can('view_own_reports'))
-      $options = array('max_rank'=>$user->rank-1,'include_self'=>true);
+      $options = array('max_rank'=>$max_rank,'include_self'=>true);
     else
-      $options = array('max_rank'=>$user->rank-1);
+      $options = array('max_rank'=>$max_rank);
     $users = $user->getUsers($options); // Active and inactive users.
   }
   elseif ($user->isClient())

From 0437aa573277bc54ef4365f2df6ec72f40b5ef29 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Mar 2018 12:04:42 +0000
Subject: [PATCH 0084/1848] Added conditional display of invoice related items
 on reports.

---
 WEB-INF/templates/footer.tpl | 2 +-
 report.php                   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8a97233ce..fb117e2f9 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.17.82.4201 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.82.4202 | 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/report.php b/report.php
index 1f0ec87c6..3f2074491 100644
--- a/report.php
+++ b/report.php
@@ -70,11 +70,12 @@
 // Do we need to show checkboxes?
 if ($bean->getAttribute('chpaid') ||
    ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient())) {
-  $smarty->assign('use_checkboxes', true);
+  if ($user->can('manage_invoices'))
+    $smarty->assign('use_checkboxes', true);
 }
 
 // Controls for "Mark paid" block.
-if ($bean->getAttribute('chpaid')) {
+if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
   $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',
@@ -90,7 +91,8 @@
 }
 
 // Controls for "Assign to invoice" block.
-if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient()) {
+if ($user->can('manage_invoices') &&
+  ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient())) {
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttTeamHelper::getRecentInvoices($user->group_id, $client_id);
   if ($recent_invoices) {

From b3ed433e388b83e055958b395ebc0e08172cd079 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Mar 2018 20:07:13 +0000
Subject: [PATCH 0085/1848] Introduced IP based access control for groups.

---
 WEB-INF/lib/common.lib.php         | 15 +++++++++++++++
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/lib/ttTeamHelper.class.php |  4 +++-
 WEB-INF/lib/ttUser.class.php       | 14 ++++++++------
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/group_edit.tpl   |  6 +++++-
 dbinstall.php                      | 11 +++++++----
 group_edit.php                     |  6 ++++++
 mysql.sql                          |  5 +++--
 10 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 7086fe298..210ec41cd 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -339,6 +339,21 @@ function ttAccessAllowed($required_right)
     exit();
   }
 
+  // Check IP restriction, if set.
+  if ($user->allow_ip && !$user->can('override_allow_ip')) {
+    $access_allowed = false;
+    $user_ip = $_SERVER['REMOTE_ADDR'];
+    $allowed_ip_array = explode(',', $user->allow_ip);
+    foreach ($allowed_ip_array as $allowed_ip) {
+      $len = strlen($allowed_ip);
+      if (substr($user_ip, 0, $len) === $allowed_ip) {
+         $access_allowed = true;
+         break;
+      }
+    }
+    if (!$access_allowed) return false;
+  }
+
   // Check if user has the right.
   if (in_array($required_right, $user->rights)) {
     import('ttUserHelper');
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index f4168094e..a5f16f9cb 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -186,7 +186,7 @@ static function createPredefinedRoles($group_id, $lang)
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,view_all_reports';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
@@ -244,7 +244,7 @@ static function createDefaultRoles()
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,view_all_reports';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 01b0db360..0093e9280 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -869,6 +869,7 @@ static function update($group_id, $fields)
     $task_required_part = ' , task_required = '.(int) $fields['task_required'];
     $record_type_part = '';
     $bcc_email_part = '';
+    $allow_ip = '';
     $plugins_part = '';
     $config_part = '';
     $lock_spec_part = '';
@@ -883,6 +884,7 @@ static function update($group_id, $fields)
     if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.(int) $fields['tracking_mode'];
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type'];
     if (isset($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']);
+    if (isset($fields['allow_ip'])) $allow_ip_part = ', allow_ip = '.$mdb2->quote($fields['allow_ip']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
@@ -891,7 +893,7 @@ static function update($group_id, $fields)
 
     $sql = "update tt_groups set $name_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
-      $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $group_id";
+      $bcc_email_part $allow_ip_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 70e550402..2781ea6f2 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -53,6 +53,7 @@ class ttUser {
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
   var $bcc_email = null;        // Bcc email.
+  var $allow_ip = null;         // Specification from where user is allowed access.
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
@@ -72,11 +73,11 @@ function __construct($login, $id = null) {
 
     $mdb2 = getConnection();
 
-    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, t.name as team_name,
-      t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
-      t.tracking_mode, t.project_required, t.task_required, t.record_type,
-      t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
-      FROM tt_users u LEFT JOIN tt_groups t ON (u.group_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, g.name as group_name,
+      g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start,
+      g.tracking_mode, g.project_required, g.task_required, g.record_type,
+      g.bcc_email, g.allow_ip, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo
+      FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
     else
@@ -111,7 +112,8 @@ function __construct($login, $id = null) {
       $this->task_required = $val['task_required'];
       $this->record_type = $val['record_type'];
       $this->bcc_email = $val['bcc_email'];
-      $this->team = $val['team_name'];
+      $this->allow_ip = $val['allow_ip'];
+      $this->team = $val['group_name'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2063f4eec..7e930e4f4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -446,6 +446,7 @@
 'form.profile.allow_overlap' => 'Allow overlap',
 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fb117e2f9..873d5ec4c 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.17.82.4202 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.83.4203 | 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 9b341b674..4dedafdf1 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -164,11 +164,15 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
             <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-{if $user->isManager()}
+{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>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.profile.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>
 {/if}
           {* initialize preview text *}
           <script>
diff --git a/dbinstall.php b/dbinstall.php
index e8f282fa6..f801926ed 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11782"]) {
+  if ($_POST["convert11744to11783"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -885,6 +885,9 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.81', modified = now() where param_name = 'version_db' and param_value = '1.17.80'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.81') set rights = replace(rights, ',manage_invoices', ',manage_invoices,view_all_reports')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.82', modified = now() where param_name = 'version_db' and param_value = '1.17.81'");
+    setChange("ALTER TABLE `tt_groups` ADD `allow_ip` varchar(255) default NULL AFTER `bcc_email`");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.82') set rights = replace(rights, 'manage_invoices,view_all_reports', 'manage_invoices,override_allow_ip,view_all_reports')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.83', modified = now() where param_name = 'version_db' and param_value = '1.17.82'");
   }
 
   if ($_POST["cleanup"]) {
@@ -930,7 +933,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.82)</b>
+    <td width="80%"><b>Create database structure (v1.17.83)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -970,8 +973,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.82)</td>
-    <td><input type="submit" name="convert11744to11782" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.83)</td>
+    <td><input type="submit" name="convert11744to11783" value="Update"></td>
   </tr>
 </table>
 
diff --git a/group_edit.php b/group_edit.php
index 1d71cc17d..1d42ed67f 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -59,6 +59,7 @@
   $cl_future_entries = $request->getParameter('future_entries');
   $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
+  $cl_allow_ip = trim($request->getParameter('allow_ip'));
 
   // Plugin checkboxes.
   $cl_charts = $request->getParameter('charts');
@@ -91,6 +92,7 @@
   $cl_future_entries = $user->future_entries;
   $cl_uncompleted_indicators = $user->uncompleted_indicators;
   $cl_bcc_email = $user->bcc_email;
+  $cl_allow_ip = $user->allow_ip;
 
   // Which plugins do we have enabled?
   $plugins = explode(',', $user->plugins);
@@ -188,6 +190,7 @@
 // Add bcc email control, for manager only.
 if ($user->can('manage_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));
 }
 
 // Plugin checkboxes.
@@ -211,6 +214,8 @@
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
   if ($user->can('manage_advanced_settings')) {
     if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
+    // TODO: how about writing ttValidIP?
+    if (!ttValidString($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.profile.allow_ip'));
   }
   // Finished validating user input.
 
@@ -282,6 +287,7 @@
         'record_type' => $cl_record_type,
         'uncompleted_indicators' => $cl_uncompleted_indicators,
         'bcc_email' => $cl_bcc_email,
+        'allow_ip' => $cl_allow_ip,
         'plugins' => $plugins,
         'config' => $config));
     }
diff --git a/mysql.sql b/mysql.sql
index 6d6ce5fb0..995b032aa 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -28,6 +28,7 @@ CREATE TABLE `tt_groups` (
   `task_required` smallint(2) NOT NULL default 0,        # whether a task selection is required or optional
   `record_type` smallint(2) NOT NULL default 0,          # time record type ("start and finish", "duration", or both)
   `bcc_email` varchar(100) default NULL,                 # bcc email to copy all reports to
+  `allow_ip` varchar(255) default NULL,                  # specification from where users are allowed access
   `plugins` varchar(255) default NULL,                   # a list of enabled plugins for team
   `lock_spec` varchar(255) default NULL,                 # Cron specification for record locking,
                                                          # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
@@ -73,7 +74,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -449,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.82', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.83', now()); # TODO: change when structure changes.

From 0a0a4488fe34267f070436a9e34b733388581728 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Mar 2018 20:59:05 +0000
Subject: [PATCH 0086/1848] Fixed handling of admin@localhost.

---
 WEB-INF/lib/auth/Auth_db.class.php | 9 +++++----
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index dccc98236..937ad3cc9 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -44,8 +44,8 @@ function authenticate($login, $password)
     $mdb2 = getConnection();
 
     // Try md5 password match first.
-    $sql = "SELECT id FROM tt_users
-      WHERE login = ".$mdb2->quote($login)." AND password = md5(".$mdb2->quote($password).") AND status = 1";
+    $sql = "SELECT id FROM tt_users".
+      " WHERE login = ".$mdb2->quote($login)." AND password = md5(".$mdb2->quote($password).") AND status = 1";
 
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
@@ -84,8 +84,9 @@ function authenticate($login, $password)
 
     // Special handling for admin@localhost - search for an account with admin role with a matching password.
     if ($login == 'admin@localhost') {
-      $sql = "SELECT id, login FROM tt_users
-        WHERE role = 1024 AND password = md5(".$mdb2->quote($password).") AND status = 1";
+      $sql = "SELECT u.id, u.login FROM tt_users u".
+        " LEFT JOIN tt_roles r on (u.role_id = r.id)".
+        " WHERE r.rank = 1024 AND password = md5(".$mdb2->quote($password).") AND u.status = 1";
       $res = $mdb2->query($sql);
       if (is_a($res, 'PEAR_Error')) {
         die($res->getMessage());
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 873d5ec4c..5db80101d 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.17.83.4203 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.83.4204 | 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>

From 7de2f8d9b856867cc548029c54e7e2db2290d42b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Mar 2018 22:14:03 +0000
Subject: [PATCH 0087/1848] Wrote ttValidIP function to filter out most of
 bogus IP input.

---
 WEB-INF/lib/common.lib.php   | 22 +++++++++++++++++++++-
 WEB-INF/templates/footer.tpl |  2 +-
 group_edit.php               |  3 +--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 210ec41cd..629e7d78b 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -325,6 +325,26 @@ function ttValidCondition($val, $emptyValid = true)
   return true;
 }
 
+// ttValidIP is used to check user input to validate a comma-separated
+// list of IP subnet "prefixes", for example 192.168.0 (note: no .* in the end).
+// We keep regexp checks here simple - they are not precise.
+// For example, IPv4-mapped IPv6 addresses will fail. This may need to be fixed.
+function ttValidIP($val, $emptyValid = false)
+{
+  $val = trim($val);
+  if (strlen($val) == 0 && !$emptyValid)
+    return false;
+
+  $subnets = explode(',', $val);
+  foreach ($subnets as $subnet) {
+    $ipv4 = preg_match('/^\d\d?\d?(\.\d\d?\d?){0,3}\.?$/', $subnet); // Not precise check.
+    $ipv6 = preg_match('/^([0-9a-fA-F]{4})(:[0-9a-fA-F]{4}){0,7}$/', $subnet); // Not precise check.
+    if (!$ipv4 && !$ipv6)
+      return false;
+  }
+  return true;
+}
+
 // ttAccessAllowed checks whether user is allowed access to a particular page.
 // It is used as an initial check on all publicly available pages
 // (except login.php, register.php, and others where we don't have to check).
@@ -346,7 +366,7 @@ function ttAccessAllowed($required_right)
     $allowed_ip_array = explode(',', $user->allow_ip);
     foreach ($allowed_ip_array as $allowed_ip) {
       $len = strlen($allowed_ip);
-      if (substr($user_ip, 0, $len) === $allowed_ip) {
+      if (substr($user_ip, 0, $len) === $allowed_ip) { // startsWith check.
          $access_allowed = true;
          break;
       }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5db80101d..4a5ef36b6 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.17.83.4204 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.83.4205 | 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/group_edit.php b/group_edit.php
index 1d42ed67f..128365f34 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -214,8 +214,7 @@
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
   if ($user->can('manage_advanced_settings')) {
     if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
-    // TODO: how about writing ttValidIP?
-    if (!ttValidString($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.profile.allow_ip'));
+    if (!ttValidIP($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.profile.allow_ip'));
   }
   // Finished validating user input.
 

From c2b4a52bc12c6ee6204fd03d1d1b2534b7249554 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Mar 2018 13:49:14 +0000
Subject: [PATCH 0088/1848] Introduced view_own_tasks right and its handling.

---
 WEB-INF/lib/common.lib.php          |  4 ++--
 WEB-INF/lib/ttRoleHelper.class.php  |  4 ++--
 WEB-INF/lib/ttUser.class.php        | 31 +++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/header.tpl        |  2 +-
 WEB-INF/templates/mobile/header.tpl |  2 +-
 WEB-INF/templates/mobile/tasks.tpl  |  2 +-
 WEB-INF/templates/tasks.tpl         |  2 +-
 dbinstall.php                       | 10 ++++++----
 mobile/tasks.php                    | 12 ++++++++---
 mysql.sql                           |  4 ++--
 tasks.php                           | 12 ++++++++---
 12 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 629e7d78b..325ae73b4 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -332,8 +332,8 @@ function ttValidCondition($val, $emptyValid = true)
 function ttValidIP($val, $emptyValid = false)
 {
   $val = trim($val);
-  if (strlen($val) == 0 && !$emptyValid)
-    return false;
+  if (strlen($val) == 0 && $emptyValid)
+    return true;
 
   $subnets = explode(',', $val);
   foreach ($subnets as $subnet) {
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index a5f16f9cb..6d81c5bba 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -184,7 +184,7 @@ static function createPredefinedRoles($group_id, $lang)
     $mdb2 = getConnection();
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
@@ -242,7 +242,7 @@ static function createDefaultRoles()
     global $user;
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,manage_own_settings,view_users';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2781ea6f2..2511ecfb0 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -205,6 +205,37 @@ function getAssignedProjects()
     return $result;
   }
 
+  // getAssignedTasks - returns an array of assigned tasks.
+  function getAssignedTasks()
+  {
+    // Start with projects;
+    $projects = $this->getAssignedProjects();
+    if (!$projects) return false;
+
+    // Build an array of task ids.
+    $task_ids = array();
+    foreach($projects as $project) {
+      $one_project_tasks = $project['tasks'] ? explode(',', $project['tasks']) : array();
+      $task_ids = array_unique(array_merge($task_ids, $one_project_tasks));
+    }
+    if (!$task_ids) return false;
+
+    // Get task descriptions.
+    $result = array();
+    $mdb2 = getConnection();
+    $tasks = implode(',', $task_ids); // This is a comma-separated list of task ids.
+
+    $sql = "select id, name, description from tt_tasks".
+      " where group_id = $this->group_id and status = 1 and id in ($tasks) order by name";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // isDateLocked checks whether a specifc date is locked for modifications.
   function isDateLocked($date)
   {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4a5ef36b6..3f01c8ee9 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.17.83.4205 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.84.4206 | 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/header.tpl b/WEB-INF/templates/header.tpl
index a5f0d022d..a31eaeb7f 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -119,7 +119,7 @@
     {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode) && $user->can('manage_tasks')}
+    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
             &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index f61b7119a..d8c34b217 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -82,7 +82,7 @@
     {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if $user->can('manage_tasks') && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode}
+    {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode}
             &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl
index 6c51ed260..3fbee1f7d 100644
--- a/WEB-INF/templates/mobile/tasks.tpl
+++ b/WEB-INF/templates/mobile/tasks.tpl
@@ -5,7 +5,7 @@
 <table class="mobile-table">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_tasks')}
       <table class="mobile-table-details">
   {if $inactive_tasks}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index ec772961d..647a6a787 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -5,7 +5,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_tasks')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_tasks}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
diff --git a/dbinstall.php b/dbinstall.php
index f801926ed..351ccc0ce 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11783"]) {
+  if ($_POST["convert11744to11784"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -888,6 +888,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_groups` ADD `allow_ip` varchar(255) default NULL AFTER `bcc_email`");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.82') set rights = replace(rights, 'manage_invoices,view_all_reports', 'manage_invoices,override_allow_ip,view_all_reports')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.83', modified = now() where param_name = 'version_db' and param_value = '1.17.82'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.83') set rights = replace(rights, 'view_own_projects,manage_own_settings', 'view_own_projects,view_own_tasks,manage_own_settings')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.84', modified = now() where param_name = 'version_db' and param_value = '1.17.83'");
   }
 
   if ($_POST["cleanup"]) {
@@ -933,7 +935,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.83)</b>
+    <td width="80%"><b>Create database structure (v1.17.84)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -973,8 +975,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.83)</td>
-    <td><input type="submit" name="convert11744to11783" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.84)</td>
+    <td><input type="submit" name="convert11744to11784" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mobile/tasks.php b/mobile/tasks.php
index 9ad18a170..c45f9bf04 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -31,7 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
+if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -41,8 +41,14 @@
 }
 // End of access checks.
 
-$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->group_id));
-$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->group_id));
+if($user->can('manage_tasks')) {
+  $active_tasks = ttTeamHelper::getActiveTasks($user->group_id);
+  $inactive_tasks = ttTeamHelper::getInactiveTasks($user->group_id);
+} else
+  $active_tasks = $user->getAssignedTasks();
+
+$smarty->assign('active_tasks', $active_tasks);
+$smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'mobile/tasks.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mysql.sql b/mysql.sql
index 995b032aa..5ac6b8564 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -74,7 +74,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -450,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.83', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.84', now()); # TODO: change when structure changes.
diff --git a/tasks.php b/tasks.php
index e967e095e..c3903f94e 100644
--- a/tasks.php
+++ b/tasks.php
@@ -31,7 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
+if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -41,8 +41,14 @@
 }
 // End of access checks.
 
-$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->group_id));
-$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->group_id));
+if($user->can('manage_tasks')) {
+  $active_tasks = ttTeamHelper::getActiveTasks($user->group_id);
+  $inactive_tasks = ttTeamHelper::getInactiveTasks($user->group_id);
+} else
+  $active_tasks = $user->getAssignedTasks();
+
+$smarty->assign('active_tasks', $active_tasks);
+$smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'tasks.tpl');
 $smarty->display('index.tpl');

From e304b6c8564a6c3f2a3c6e68a0f5e9c7db817a65 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Mar 2018 16:37:58 +0000
Subject: [PATCH 0089/1848] Introduced view_own_clients right and its handling.

---
 WEB-INF/lib/ttRoleHelper.class.php   |  4 ++--
 WEB-INF/lib/ttUser.class.php         | 27 +++++++++++++++++++++++++++
 WEB-INF/templates/clients.tpl        | 15 +++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/header.tpl         |  2 +-
 WEB-INF/templates/mobile/clients.tpl | 15 +++++++++++++++
 WEB-INF/templates/mobile/header.tpl  |  2 +-
 clients.php                          | 12 +++++++++---
 dbinstall.php                        | 10 ++++++----
 mobile/clients.php                   | 13 ++++++++++---
 mysql.sql                            |  4 ++--
 11 files changed, 89 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 6d81c5bba..aa260f290 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -185,7 +185,7 @@ static function createPredefinedRoles($group_id, $lang)
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
@@ -243,7 +243,7 @@ static function createDefaultRoles()
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2511ecfb0..e3de5b4ca 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -236,6 +236,33 @@ function getAssignedTasks()
     return $result;
   }
 
+  // getAssignedClients - returns an array of clients assigned to own projects.
+  function getAssignedClients()
+  {
+    // Start with projects;
+    $projects = $this->getAssignedProjects();
+    if (!$projects) return false;
+    $assigned_project_ids = array();
+    foreach($projects as $project) {
+      $assigned_project_ids[] = $project['id'];
+    }
+
+    $mdb2 = getConnection();
+
+    // Get active clients for group.
+    $clients = array();
+    $sql = "select id, name, address, projects from tt_clients where group_id = $this->group_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $client_project_ids = $val['projects'] ? explode(',', $val['projects']) : array();
+        if (array_intersect($assigned_project_ids, $client_project_ids))
+          $clients[] = $val; // Add client if one of user projects is a client project, too.
+      }
+    }
+    return $clients;
+  }
+
   // isDateLocked checks whether a specifc date is locked for modifications.
   function isDateLocked($date)
   {
diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index 14c03321d..a31a8cd05 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -53,6 +53,21 @@
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
+{else}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.address}</td>
+        </tr>
+  {if $active_clients}
+    {foreach $active_clients as $client}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$client.name|escape}</td>
+          <td>{$client.address|escape}</td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
 {/if}
     </td>
   </tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f01c8ee9..49ee290ec 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.17.84.4206 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4207 | 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/header.tpl b/WEB-INF/templates/header.tpl
index a31eaeb7f..8dc7bc999 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -125,7 +125,7 @@
     {if $user->can('view_users') || $user->can('manage_users')}
             &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
-    {if $user->isPluginEnabled('cl') && $user->can('manage_clients')}
+    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
     {if $user->can('export_data')}
diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl
index c10541fae..34f53a919 100644
--- a/WEB-INF/templates/mobile/clients.tpl
+++ b/WEB-INF/templates/mobile/clients.tpl
@@ -45,6 +45,21 @@
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
+{else}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.address}</td>
+        </tr>
+  {if $active_clients}
+    {foreach $active_clients as $client}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$client.name|escape}</td>
+          <td>{$client.address|escape}</td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
 {/if}
     </td>
   </tr>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index d8c34b217..417cca25b 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -88,7 +88,7 @@
     {if $user->can('view_users') || $user->can('manage_users')}
             &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
-    {if $user->isPluginEnabled('cl') && $user->can('manage_clients')}
+    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
           </td>
diff --git a/clients.php b/clients.php
index 177bd61ee..6bf48097f 100644
--- a/clients.php
+++ b/clients.php
@@ -31,7 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_clients')) {
+if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -40,8 +40,14 @@
   exit();
 }
 
-$smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->group_id, true));
-$smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->group_id, true));
+if($user->can('manage_clients')) {
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $inactive_clients = ttTeamHelper::getInactiveClients($user->group_id, true);
+} else
+  $active_clients = $user->getAssignedClients();
+
+$smarty->assign('active_clients', $active_clients);
+$smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));
 $smarty->assign('content_page_name', 'clients.tpl');
 $smarty->display('index.tpl');
diff --git a/dbinstall.php b/dbinstall.php
index 351ccc0ce..0035bdcef 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11784"]) {
+  if ($_POST["convert11744to11785"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -890,6 +890,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.83', modified = now() where param_name = 'version_db' and param_value = '1.17.82'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.83') set rights = replace(rights, 'view_own_projects,manage_own_settings', 'view_own_projects,view_own_tasks,manage_own_settings')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.84', modified = now() where param_name = 'version_db' and param_value = '1.17.83'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.84') set rights = replace(rights, 'view_charts,override_punch_mode', 'view_charts,view_own_clients,override_punch_mode')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.85', modified = now() where param_name = 'version_db' and param_value = '1.17.84'");
   }
 
   if ($_POST["cleanup"]) {
@@ -935,7 +937,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.84)</b>
+    <td width="80%"><b>Create database structure (v1.17.85)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -975,8 +977,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.84)</td>
-    <td><input type="submit" name="convert11744to11784" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.85)</td>
+    <td><input type="submit" name="convert11744to11785" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mobile/clients.php b/mobile/clients.php
index 4f03510ce..61cc304ea 100644
--- a/mobile/clients.php
+++ b/mobile/clients.php
@@ -31,7 +31,7 @@
 import('ttTeamHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_clients')) {
+if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -39,9 +39,16 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
-$smarty->assign('active_clients', ttTeamHelper::getActiveClients($user->group_id, true));
-$smarty->assign('inactive_clients', ttTeamHelper::getInactiveClients($user->group_id, true));
+if($user->can('manage_clients')) {
+  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $inactive_clients = ttTeamHelper::getInactiveClients($user->group_id, true);
+} else
+  $active_clients = $user->getAssignedClients();
+
+$smarty->assign('active_clients', $active_clients);
+$smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));
 $smarty->assign('content_page_name', 'mobile/clients.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mysql.sql b/mysql.sql
index 5ac6b8564..53fc61632 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -74,7 +74,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -450,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.84', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.85', now()); # TODO: change when structure changes.

From 4c6c94728c57cd8d1825817926c12105ed13ab60 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Mar 2018 17:31:09 +0000
Subject: [PATCH 0090/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 17 +++++------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9631a87b6..7884f6d38 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -44,11 +44,9 @@
 'menu.logout' => 'Afmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-// TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+'menu.create_group' => 'Maak groep',
 'menu.profile' => 'Profiel',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Groep',
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
@@ -56,8 +54,7 @@
 'menu.projects' => 'Projecten',
 'menu.tasks' => 'Taken',
 'menu.users' => 'Medewerkers',
-// TODO: translate the following.
-// 'menu.groups' => 'Groups',
+'menu.groups' => 'Groepen',
 'menu.export' => 'Exporteren',
 'menu.clients' => 'Klanten',
 'menu.options' => 'Opties',
@@ -89,10 +86,7 @@
 'error.task_exists' => 'Er bestaat al een taak met deze naam.',
 'error.client_exists' => 'Een klant met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
-// TODO: translate the following. It seems like rank is misplaced with rights.
-// 'error.role_exists' => 'Role with this rank already exists.',
-// 'error.role_exists' => 'Een rol met deze rechten bestaat al.', // TODO: rank is not rights. Rank is a number.
-                                                                  // Rights (rechten) is a set of permissions ("view_users", etc.).
+'error.role_exists' => 'Een rol met deze rangorde bestaat al.',
 'error.no_invoiceable_items' => 'Er zijn geen factuureerbare onderdelen.',
 'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.',
 'error.no_teams' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw team.',
@@ -274,8 +268,7 @@
 'title.import' => 'Importeer teamgegevens',
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
+'title.group' => 'Groep instelling',
 'title.cf_custom_fields' => 'Eigen velden',
 'title.cf_add_custom_field' => 'Eigen veld toevoegen',
 'title.cf_edit_custom_field' => 'Eigen veld bewerken',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 49ee290ec..9a1e47c16 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.17.85.4207 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4208 | 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>

From bf5a31da67e50256caa4dae27f54832581dbcf7c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Mar 2018 17:42:47 +0000
Subject: [PATCH 0091/1848] Put form.profile.allow_ip into localization files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 27abaeac3..676efd696 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -509,6 +509,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 4c9a50c2c..57f5f57e0 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -522,6 +522,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d49ab64ab..2fa257c01 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -468,6 +468,8 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Uafsluttede indikatore',
+// TODO: translate the following.
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9712b6329..e1246d0b9 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -466,6 +466,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Erweiterungen',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f294df6c7..707645ce9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -524,6 +524,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7a7640e39..46d12af9c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -519,6 +519,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e290791be..9528a2e26 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -496,6 +496,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'پلاگین ها',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9d4bcba63..523b455f9 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -476,6 +476,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Lisäosat',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 57f3d10c9..6c935d50c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -465,6 +465,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 396719e9c..fdee0f619 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -448,6 +448,8 @@
 'form.profile.allow_overlap' => 'Επικάλυψη επιτρεπτή',
 'form.profile.future_entries' => 'Μελλοντικές καταχωρήσεις',
 'form.profile.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
+// TODO: translate the following.
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Πρόσθετα',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a657bdc30..f01cac66d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -502,6 +502,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'תוספים',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3c96206b0..e62c8cb12 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -513,6 +513,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 927417b9c..111c2796e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -464,6 +464,8 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Indicatori incompleti',
+// TODO: translate the following.
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugin',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 534eb3db7..ee817eafa 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -514,6 +514,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 67b6d5054..80c4cb847 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -512,6 +512,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 7884f6d38..4a3920140 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -443,6 +443,8 @@
 'form.profile.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.profile.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.profile.uncompleted_indicators' => 'Onvolledige indicatoren',
+// TODO: translate the following.
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 077ee2984..df2fa0abf 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -511,6 +511,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 166edfed7..8882a5597 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -478,6 +478,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Dodatkowe moduły',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index dd8fc8250..57dba41e9 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -473,6 +473,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 66cf565ba..69bd86f50 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -497,6 +497,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index eeba69563..9814b2f0e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -517,6 +517,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 8d1331d81..1dc7cac02 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -443,6 +443,7 @@
 'form.profile.allow_overlap' => 'Возможное перекрывание',
 'form.profile.future_entries' => 'Будущие записи',
 'form.profile.uncompleted_indicators' => 'Индикаторы незавершения',
+'form.profile.allow_ip' => 'Разрешить доступ с IP',
 'form.profile.plugins' => 'Плагины',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 66efd058d..911527c01 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -493,6 +493,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Doplnkové moduly',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5fba7a9c6..583c12200 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -493,6 +493,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5fa432f6e..1c3704c8c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -477,6 +477,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Dodaci',
 
 // Forma mejla. Pogledajte primer na https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a45921b1c..db0cc9f55 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -471,6 +471,8 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 'form.profile.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
+// TODO: translate the following.
+// 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Tillägg',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 0cb44dfd7..b374b477d 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -530,6 +530,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 8439f6b3e..33d79c946 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -498,6 +498,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 33ea3114b..378e8b794 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -507,6 +507,7 @@
 // 'form.profile.allow_overlap' => 'Allow overlap',
 // 'form.profile.future_entries' => 'Future entries',
 // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9a1e47c16..154d0e675 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.17.85.4208 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4209 | 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>

From 21e4f5e84bc1a591193596475417dac92ebbf4e4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Mar 2018 19:23:08 +0000
Subject: [PATCH 0092/1848] A fix in Dutch file.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4a3920140..c6e2f346a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -443,8 +443,7 @@
 'form.profile.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.profile.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.profile.uncompleted_indicators' => 'Onvolledige indicatoren',
-// TODO: translate the following.
-// 'form.profile.allow_ip' => 'Allow IP',
+'form.profile.allow_ip' => 'Toegestane IP adressen',
 'form.profile.plugins' => 'Plugins',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 154d0e675..b00c5eb9f 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.17.85.4209 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4210 | 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>

From c8caee8e34eec5a3fd047d679e79af149ed1e433 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Apr 2018 13:13:46 +0000
Subject: [PATCH 0093/1848] Refactoring. Renaming team to group.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 login.php                        | 2 +-
 mobile/login.php                 | 2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 676efd696..536fc30fb 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -105,7 +105,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'La seva base de dades està buida. Iniciï sessió com a administrador i creï un nou grup.',
+'error.no_groups' => 'La seva base de dades està buida. Iniciï sessió com a administrador i creï un nou grup.',
 'error.upload' => 'Error pujant l\\\'arxiu.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 57f5f57e0..f77f66f84 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -107,7 +107,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'Vaše databáze je prázdná. Přihlašte se jako admin a vytvořte nový tým.',
+'error.no_groups' => 'Vaše databáze je prázdná. Přihlašte se jako admin a vytvořte nový tým.', // TODO: replace "team" with "group".
 'error.upload' => 'Chyba přenosu souboru.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2fa257c01..6d3f1b9dd 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -96,7 +96,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Der er ingen fakturerbar emner.',
 'error.no_login' => 'Der finde ingen bruger med dette brugernavn.',
-'error.no_teams' => 'Din database er tom, log ind som administrator og lav et nyt team.',
+'error.no_groups' => 'Din database er tom, log ind som administrator og lav et nyt team.', // TODO: replace "team" with "group".
 'error.upload' => 'Fil upload problem.',
 'error.range_locked' => 'Dato interval er spærret.',
 'error.mail_send' => 'Fejl under sending af mail.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e1246d0b9..9eeecda6f 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -96,7 +96,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
-'error.no_teams' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Team erzeugen.',
+'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Team erzeugen.', // TODO: replace "team" with "group".
 'error.upload' => 'Fehler beim hochladen einer Datei.',
 'error.range_locked' => 'Zeitinterval ist gesperrt.',
 'error.mail_send' => 'Fehler beim versenden einer E-Mail.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7e930e4f4..622f83891 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -90,7 +90,7 @@
 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'Your database is empty. Login as admin and create a new team.',
+'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 'error.upload' => 'File upload error.',
 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Error sending mail.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 707645ce9..9c33922f7 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -103,7 +103,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'Su base de datos esta vacía. Inicie sesión como administrador y cree un nuevo grupo.',
+'error.no_groups' => 'Su base de datos esta vacía. Inicie sesión como administrador y cree un nuevo grupo.',
 'error.upload' => 'Error subiendo el archivo.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 46d12af9c..0f1ff55f1 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -107,7 +107,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'Sinu andmebaas on tühi. Logi adminina sisse ja loo uus meeskond.',
+'error.no_groups' => 'Sinu andmebaas on tühi. Logi adminina sisse ja loo uus meeskond.',  // TODO: replace "team" with "group".
 'error.upload' => 'Viga faili vastuvõtmisel.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9528a2e26..c304272e4 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -101,7 +101,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'آیتمی جهت فاکتور کردن وجود ندارد.',
 'error.no_login' => 'کاربری با این نام کاربری موجود نیست.',
-'error.no_teams' => 'پایگاه داده شما خالی است با کاربر admin وارد شوید و تیم ایجاد کنید.',
+'error.no_groups' => 'پایگاه داده شما خالی است با کاربر admin وارد شوید و تیم ایجاد کنید.',  // TODO: replace "team" with "group".
 'error.upload' => 'خطا در آپلود فایل.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 523b455f9..0926a69e8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -98,7 +98,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Ei laskutettavia syötteitä.',
 'error.no_login' => 'Tuntematon käyttäjänimi.',
-'error.no_teams' => 'Tietokanta on tyhjä. Kirjaudu ylläpitäjänä ja luo uusi tiimi.',
+'error.no_groups' => 'Tietokanta on tyhjä. Kirjaudu ylläpitäjänä ja luo uusi tiimi.',  // TODO: replace "team" with "group".
 'error.upload' => 'Virhe tiedoston lataus.',
 'error.range_locked' => 'Aikaväli on lukittu.',
 'error.mail_send' => 'Virhe postinlähetyksessä.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6c935d50c..309c2fc7c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -96,7 +96,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Il n\\\'y a pas d\\\'éléments à facturer.',
 'error.no_login' => 'Aucun utilisateur avec cet identifiant.',
-'error.no_teams' => 'Votre base de données est vide. Connectez-vous comme administrateur et créez une nouvelle équipe.',
+'error.no_groups' => 'Votre base de données est vide. Connectez-vous comme administrateur et créez une nouvelle équipe.',  // TODO: replace "team" with "group".
 'error.upload' => 'Erreur de chargement du fichier.',
 'error.range_locked' => 'Plage de date vérouillée.',
 'error.mail_send' => 'Erreur lors de l\\\'envoi du courriel.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index fdee0f619..aad61ac09 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -90,7 +90,7 @@
 'error.role_exists' => 'Ο ρόλος σε αυτή τη σειρά υπάρχει ήδη.',
 'error.no_invoiceable_items' => 'Δεν υπάρχουν στοιχεία προς τιμολόγηση.',
 'error.no_login' => 'Δεν υπάρχει χρήστης με αυτά τα στοιχεία.',
-'error.no_teams' => 'Η βάση δεδομένων σας είναι κενή. Συνδεθείτε ως διαχειριστής και δημιουργήστε μια νέα ομάδα.',
+'error.no_groups' => 'Η βάση δεδομένων σας είναι κενή. Συνδεθείτε ως διαχειριστής και δημιουργήστε μια νέα ομάδα.',
 'error.upload' => 'Σφάλμα φόρτωσης αρχείου.',
 'error.range_locked' => 'Το χρονικό διάστημα είναι κλειδωμένο.',
 'error.mail_send' => 'Σφάλμα κατά την αποστολή του μηνύματος.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f01cac66d..6a76e02a2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -112,7 +112,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'אין פריטים לחיוב',
 'error.no_login' => 'משתמש זה אינו קיים',
-'error.no_teams' => 'בסיס הנתונים שלך ריק. התחבר כמנהל וצור צוות חדש',
+'error.no_groups' => 'בסיס הנתונים שלך ריק. התחבר כמנהל וצור צוות חדש', // TODO: replace "team" with "group".
 'error.upload' => 'שגיאה בהעלת קובץ',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e62c8cb12..fd1fa6e9e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -103,7 +103,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-// 'error.no_teams' => 'Your database is empty. Login as admin and create a new team.',
+// 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 'error.upload' => 'File feltöltési hiba.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 111c2796e..216293822 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -94,7 +94,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Non ci sono voci fatturabili.',
 'error.no_login' => 'Non esiste un utente con questo username.',
-'error.no_teams' => 'Il database è vuoto. Loggati come amministratore e crea un nuovo gruppo.',
+'error.no_groups' => 'Il database è vuoto. Loggati come amministratore e crea un nuovo gruppo.',
 'error.upload' => 'Errore di caricamento file.',
 'error.range_locked' => 'Intervallo data bloccato.',
 'error.mail_send' => 'Errore nella fase di invio mail.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ee817eafa..d3c778f46 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -106,7 +106,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 'error.no_login' => 'このログインと関連されたユーザーはいません。',
-'error.no_teams' => 'あなたのデータベースは空いています。管理者にログインして新規チームを作成してください。',
+'error.no_groups' => 'あなたのデータベースは空いています。管理者にログインして新規チームを作成してください。', // TODO: replace "team" with "group".
 'error.upload' => 'ファイルのアップロードのエラー。',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 80c4cb847..757ac62ab 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -105,7 +105,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 'error.no_login' => '본 로그인과 연계된 사용자가 없습니다.',
-'error.no_teams' => '당신의 데이터베이스는 비어있습니다. 관리자로 로그인하여 새로운 팀을 생성하십시오.',
+'error.no_groups' => '당신의 데이터베이스는 비어있습니다. 관리자로 로그인하여 새로운 팀을 생성하십시오.', // TODO: replace "team" with "group".
 'error.upload' => '파일 업로드 오류.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c6e2f346a..b054392b3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -89,7 +89,7 @@
 'error.role_exists' => 'Een rol met deze rangorde bestaat al.',
 'error.no_invoiceable_items' => 'Er zijn geen factuureerbare onderdelen.',
 'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.',
-'error.no_teams' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw team.',
+'error.no_groups' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw groep.',
 'error.upload' => 'Fout bij het uploaden van het bestand.',
 'error.range_locked' => 'Datums zijn geblokkeerd.',
 'error.mail_send' => 'Fout bij het versturen van een e-mailbericht.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index df2fa0abf..123e711b8 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -106,7 +106,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 'error.no_login' => 'Det er ingen bruker med dette brukernavnet.',
-'error.no_teams' => 'Databasen din er tom. Logg inn som admin og opprett et nytt team.',
+'error.no_groups' => 'Databasen din er tom. Logg inn som admin og opprett et nytt team.', // TODO: replace "team" with "group".
 'error.upload' => 'Feil med lasting av fil.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8882a5597..e1efcbce7 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -99,7 +99,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Brak przedmiotów do faktury.',
 'error.no_login' => 'Użytkownik o takiej nazwie nie istnieje.',
-'error.no_teams' => 'Twoja baza danych jest pusta. Zaloguj się jako administrator i stwórz nowy zespół.',
+'error.no_groups' => 'Twoja baza danych jest pusta. Zaloguj się jako administrator i stwórz nowy zespół.', // TODO: replace "team" with "group".
 'error.upload' => 'Błąd podczas wysyłania pliku.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 57dba41e9..63a9dcdd4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -97,7 +97,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Não há items faturáveis.',
 'error.no_login' => 'Não há usuário com este login.',
-'error.no_teams' => 'Sua base de dados está vazia. Entre como admin e crie uma equipe nova.',
+'error.no_groups' => 'Sua base de dados está vazia. Entre como admin e crie uma equipe nova.', // TODO: replace "team" with "group".
 'error.upload' => 'Erro no envio do arquivo.',
 'error.range_locked' => 'Período está bloqueado.',
 'error.mail_send' => 'Erro enviando o e-mail.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 69bd86f50..b80f14665 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -102,7 +102,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-// 'error.no_teams' => 'Your database is empty. Login as admin and create a new team.',
+// 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 // 'error.upload' => 'File upload error.',
 // 'error.range_locked' => 'Date range is locked.',
 // 'error.mail_send' => 'Error sending mail.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9814b2f0e..f95d48c9f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -109,7 +109,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'Baza de date este goala. Intra ca admin si adauga o noua echipa.',
+'error.no_groups' => 'Baza de date este goala. Intra ca admin si adauga o noua echipa.', // TODO: replace "team" with "group".
 'error.upload' => 'Eroare la upload-ul fisierului.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1dc7cac02..76e0a184f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -89,7 +89,7 @@
 'error.role_exists' => 'Роль с таким рангом уже есть.',
 'error.no_invoiceable_items' => 'Нет записей для включения в счёт.',
 'error.no_login' => 'Нет пользователя с таким логином.',
-'error.no_teams' => 'Ваша база данных пуста. Войдите в систему как администратор и создайте новую команду.',
+'error.no_groups' => 'Ваша база данных пуста. Войдите в систему как администратор и создайте новую группу.',
 'error.upload' => 'Ошибка загрузки файла.',
 'error.range_locked' => 'Диапазон дат заблокирован.',
 'error.mail_send' => 'Ошибка отправки почты.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 911527c01..bd61c5ef3 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -101,7 +101,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Neexistujú položky, ktoré by bolo možné fakturovať.',
 'error.no_login' => 'Neexistuje používateľ s týmto prihlasovacím menom.',
-'error.no_teams' => 'Vaša databáza je prázdna. Prihláste sa ako admin a vytvorte nový tím.',
+'error.no_groups' => 'Vaša databáza je prázdna. Prihláste sa ako admin a vytvorte nový tím.', // TODO: replace "team" with "group".
 'error.upload' => 'Prenos súboru bol neúspešný.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 583c12200..5b5209590 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -99,7 +99,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-// 'error.no_teams' => 'Your database is empty. Login as admin and create a new team.',
+// 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 // 'error.upload' => 'File upload error.',
 // 'error.range_locked' => 'Date range is locked.',
 // 'error.mail_send' => 'Error sending mail.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1c3704c8c..903811893 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -96,7 +96,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Nema stavke za naplatu.',
 'error.no_login' => 'Nema korisnika pod ovom prijavom',
-'error.no_teams' => 'Vaša baza podataka je prazna. Prijavite se kao administrator i napravite novi tim.',
+'error.no_groups' => 'Vaša baza podataka je prazna. Prijavite se kao administrator i napravite novi tim.', // TODO: replace "team" with "group".
 'error.upload' => 'Greška pri otpremanju podatka.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index db0cc9f55..7e8063563 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -94,7 +94,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Det finns inga debiterbara tidsregistreringar.',
 'error.no_login' => 'Det finns ingen användare med det här användarnamnet.',
-'error.no_teams' => 'Databasen är tom. Logga in som administratör och skapa en ny arbetsgrupp.',
+'error.no_groups' => 'Databasen är tom. Logga in som administratör och skapa en ny grupp.',
 'error.upload' => 'Ett fel uppstod när filen laddades upp.',
 'error.range_locked' => 'Datumintervallet är låst.',
 'error.mail_send' => 'Ett fel uppstod när när e-postmeddelandet skulle skickas.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b374b477d..746bbc3a8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -112,7 +112,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 // 'error.no_login' => 'No user with this login.',
-'error.no_teams' => 'Veritabanınız boş. Yeni bir ekip yaratmak için yönetici olarak giriş yapın.',
+'error.no_groups' => 'Veritabanınız boş. Yeni bir ekip yaratmak için yönetici olarak giriş yapın.', // TODO: replace "team" with "group".
 'error.upload' => 'Dosya yükleme hatası.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 33d79c946..b5d297db7 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -99,7 +99,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 'error.no_login' => '没有该登录信息的用户。',
-'error.no_teams' => '您的数据库没有任何记录。请以管理员身份登录并创建一个新团队。',
+'error.no_groups' => '您的数据库没有任何记录。请以管理员身份登录并创建一个新团队。', // TODO: replace "team" with "group".
 'error.upload' => '上传文件出错。',
 'error.range_locked' => '日期范围锁定。',
 'error.mail_send' => '发送邮件时出错。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 378e8b794..edf8063c5 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -103,7 +103,7 @@
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
 'error.no_login' => '沒有該登錄資訊的使用者。',
-'error.no_teams' => '您的資料庫沒有任何記錄。請以管理員身份登錄並創建一個新團隊。',
+'error.no_groups' => '您的資料庫沒有任何記錄。請以管理員身份登錄並創建一個新團隊。', // TODO: replace "team" with "group".
 'error.upload' => '上傳文件出錯。',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b00c5eb9f..1332c9140 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.17.85.4210 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4211 | 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/login.php b/login.php
index a3345d0e0..7ccb9391f 100644
--- a/login.php
+++ b/login.php
@@ -76,7 +76,7 @@
 } // isPost
 
 if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
-  $err->add($i18n->get('error.no_teams'));
+  $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
diff --git a/mobile/login.php b/mobile/login.php
index 4d1412d3c..78db8dab4 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -81,7 +81,7 @@
 } // isPost
 
 if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
-  $err->add($i18n->get('error.no_teams'));
+  $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);

From 556948c09b8116728275f9933716a153216abe31 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Apr 2018 16:25:09 +0000
Subject: [PATCH 0094/1848] Some more renaming.

---
 WEB-INF/resources/ca.lang.php     | 2 +-
 WEB-INF/resources/cs.lang.php     | 2 +-
 WEB-INF/resources/da.lang.php     | 2 +-
 WEB-INF/resources/de.lang.php     | 2 +-
 WEB-INF/resources/en.lang.php     | 2 +-
 WEB-INF/resources/es.lang.php     | 2 +-
 WEB-INF/resources/et.lang.php     | 2 +-
 WEB-INF/resources/fa.lang.php     | 2 +-
 WEB-INF/resources/fi.lang.php     | 2 +-
 WEB-INF/resources/fr.lang.php     | 2 +-
 WEB-INF/resources/gr.lang.php     | 2 +-
 WEB-INF/resources/he.lang.php     | 2 +-
 WEB-INF/resources/hu.lang.php     | 2 +-
 WEB-INF/resources/it.lang.php     | 2 +-
 WEB-INF/resources/ja.lang.php     | 2 +-
 WEB-INF/resources/ko.lang.php     | 2 +-
 WEB-INF/resources/nl.lang.php     | 2 +-
 WEB-INF/resources/no.lang.php     | 2 +-
 WEB-INF/resources/pl.lang.php     | 2 +-
 WEB-INF/resources/pt-br.lang.php  | 2 +-
 WEB-INF/resources/pt.lang.php     | 2 +-
 WEB-INF/resources/ro.lang.php     | 2 +-
 WEB-INF/resources/ru.lang.php     | 6 +++---
 WEB-INF/resources/sk.lang.php     | 2 +-
 WEB-INF/resources/sl.lang.php     | 2 +-
 WEB-INF/resources/sr.lang.php     | 2 +-
 WEB-INF/resources/sv.lang.php     | 6 +++---
 WEB-INF/resources/tr.lang.php     | 2 +-
 WEB-INF/resources/zh-cn.lang.php  | 2 +-
 WEB-INF/resources/zh-tw.lang.php  | 2 +-
 WEB-INF/templates/admin_teams.tpl | 2 +-
 WEB-INF/templates/footer.tpl      | 2 +-
 32 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 536fc30fb..91d25b1ad 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -130,7 +130,7 @@
 // 'button.reset_password' => 'Reset password',
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar per correu',
-'button.create_team' => 'Crear grup',
+'button.create_group' => 'Crear grup',
 'button.export' => 'Exportar grup',
 'button.import' => 'Importar grup',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index f77f66f84..832060f91 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -132,7 +132,7 @@
 'button.reset_password' => 'Resetovat heslo',
 'button.send' => 'Poslat',
 'button.send_by_email' => 'Poslat e-mailem',
-'button.create_team' => 'Vytvořit tým',
+'button.create_group' => 'Vytvořit tým', // TODO: replace "team" with "group".
 'button.export' => 'Exportovat tým',
 'button.import' => 'Importovat tým',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6d3f1b9dd..71d6a1aff 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -119,7 +119,7 @@
 'button.reset_password' => 'Nulstil adgangskode',
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-mail',
-'button.create_team' => 'Lav et team',
+'button.create_group' => 'Lav et team', // TODO: replace "team" with "group".
 'button.export' => 'Eksporter team',
 'button.import' => 'Importer team',
 'button.close' => 'Luk',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9eeecda6f..3410fb4a4 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -119,7 +119,7 @@
 'button.reset_password' => 'Passwort zurücksetzen',
 'button.send' => 'Senden',
 'button.send_by_email' => 'Als E-Mail senden',
-'button.create_team' => 'Team erstellen',
+'button.create_group' => 'Team erstellen', // TODO: replace "team" with "group".
 'button.export' => 'Team exportieren',
 'button.import' => 'Team importieren',
 'button.close' => 'Schließen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 622f83891..a121a490d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -113,7 +113,7 @@
 'button.reset_password' => 'Reset password',
 'button.send' => 'Send',
 'button.send_by_email' => 'Send by e-mail',
-'button.create_team' => 'Create team',
+'button.create_group' => 'Create group',
 'button.export' => 'Export team',
 'button.import' => 'Import team',
 'button.close' => 'Close',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9c33922f7..dcf3bfc63 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -129,7 +129,7 @@
 // 'button.reset_password' => 'Reset password',
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por correo',
-'button.create_team' => 'Crear grupo',
+'button.create_group' => 'Crear grupo',
 'button.export' => 'Exportar grupo',
 'button.import' => 'Importar grupo',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0f1ff55f1..ae5497ce6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -132,7 +132,7 @@
 'button.reset_password' => 'Tühjenda salasõna',
 'button.send' => 'Saada',
 'button.send_by_email' => 'Saada e-mailiga',
-'button.create_team' => 'Loo meeskond',
+'button.create_group' => 'Loo meeskond', // TODO: replace "team" with "group".
 'button.export' => 'Ekspordi meeskond',
 'button.import' => 'Impordi meeskond',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index c304272e4..0fcf3e10d 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -127,7 +127,7 @@
 'button.reset_password' => 'بازسازی رمزعبور',
 'button.send' => 'ارسال',
 'button.send_by_email' => 'ارسال به ایمیل',
-'button.create_team' => 'ایجاد تیم',
+'button.create_group' => 'ایجاد تیم', // TODO: replace "team" with "group".
 'button.export' => 'ایجاد پشتیبان از تیم',
 'button.import' => 'وارد کردن تیم',
 'button.close' => 'بستن',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 0926a69e8..5926c9524 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -121,7 +121,7 @@
 'button.reset_password' => 'Nollaa salasana',
 'button.send' => 'Lähetä',
 'button.send_by_email' => 'Lähetä sähköpostilla',
-'button.create_team' => 'Luo tiimi',
+'button.create_group' => 'Luo tiimi', // TODO: replace "team" with "group".
 'button.export' => 'Vie tiimi',
 'button.import' => 'Tuo tiimi',
 'button.close' => 'Sulje',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 309c2fc7c..12c983bf1 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -119,7 +119,7 @@
 'button.reset_password' => 'Réinitialiser',
 'button.send' => 'Envoyer',
 'button.send_by_email' => 'Envoyer par courriel',
-'button.create_team' => 'Créer une équipe',
+'button.create_group' => 'Créer une équipe', // TODO: replace "team" with "group".
 'button.export' => 'Exporter l\\\'équipe',
 'button.import' => 'Importer une équipe',
 'button.close' => 'Fermer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index aad61ac09..67041209c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -113,7 +113,7 @@
 'button.reset_password' => 'Επαναφορά κωδικού πρόσβασης',
 'button.send' => 'Αποστολή',
 'button.send_by_email' => 'Αποστολή μέσω email',
-'button.create_team' => 'Δημιουργία ομάδας',
+'button.create_group' => 'Δημιουργία ομάδας',
 'button.export' => 'Εξαγωγη ομάδας',
 'button.import' => 'Εισαγωγή ομάδας',
 'button.close' => 'Κλείσιμο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6a76e02a2..2190b1a70 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -137,7 +137,7 @@
 'button.reset_password' => 'איפוס סיסמה',
 'button.send' => 'שלח',
 'button.send_by_email' => 'שלח בדואר אלקטרוני',
-'button.create_team' => 'צור צוות',
+'button.create_group' => 'צור צוות', // TODO: replace "team" with "group".
 'button.export' => 'ייצא צוות',
 'button.import' => 'ייבא צוות',
 'button.close' => 'סגור',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index fd1fa6e9e..90b14ffc6 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -129,7 +129,7 @@
 // 'button.reset_password' => 'Reset password',
 'button.send' => 'Küld',
 'button.send_by_email' => 'Küldés e-mail-ben',
-'button.create_team' => 'Csoport létrehozása',
+'button.create_group' => 'Csoport létrehozása',
 'button.export' => 'Csoport exportálása',
 'button.import' => 'Csoport importálása',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 216293822..a7980b21e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -117,7 +117,7 @@
 'button.reset_password' => 'Reset password',
 'button.send' => 'Invia',
 'button.send_by_email' => 'Invia tramite e-mail',
-'button.create_team' => 'Crea gruppo',
+'button.create_group' => 'Crea gruppo',
 'button.export' => 'Esporta gruppo',
 'button.import' => 'Importa gruppo',
 'button.close' => 'Chiudi',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index d3c778f46..b9d2fb31b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -134,7 +134,7 @@
 'button.send' => '送信',
 'button.send_by_email' => 'Eメールの送信',
 // TODO: translate the following.
-// 'button.create_team' => 'Create team',
+// 'button.create_group' => 'Create group',
 'button.export' => 'チームのエクスポート',
 'button.import' => 'チームのインポート',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 757ac62ab..fc47e6a2d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -133,7 +133,7 @@
 'button.send' => '송신',
 'button.send_by_email' => '이메일로 송신',
 // TODO: translate the following.
-// 'button.create_team' => 'Create team',
+// 'button.create_group' => 'Create group',
 'button.export' => '팀 익스포트',
 'button.import' => '팀 임포트',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b054392b3..89da00542 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -112,7 +112,7 @@
 'button.reset_password' => 'Herstel het wachtwoord',
 'button.send' => 'Verzenden',
 'button.send_by_email' => 'Verzend per e-mail',
-'button.create_team' => 'Maak team',
+'button.create_group' => 'Maak team', // TODO: replace "team" with "group".
 'button.export' => 'Team exporteren',
 'button.import' => 'Team importeren',
 'button.close' => 'Sluiten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 123e711b8..c3a91952c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -133,7 +133,7 @@
 'button.reset_password' => 'Resett passord',
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-post',
-'button.create_team' => 'Opprett team',
+'button.create_group' => 'Opprett team', // TODO: replace "team" with "group".
 'button.export' => 'Eksport team',
 'button.import' => 'Importer team',
 'button.close' => 'Lukk',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e1efcbce7..ebe8979f5 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -123,7 +123,7 @@
 'button.reset_password' => 'Resetuj hasło',
 'button.send' => 'Wyślij',
 'button.send_by_email' => 'Wyślij e-mail',
-'button.create_team' => 'Stwórz zespół',
+'button.create_group' => 'Stwórz zespół', // TODO: replace "team" with "group".
 'button.export' => 'Eksportuj zespół',
 'button.import' => 'Importuj zespół',
 'button.close' => 'Zamknij',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 63a9dcdd4..64987c8d8 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -120,7 +120,7 @@
 'button.reset_password' => 'Resetar senha',
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
-'button.create_team' => 'Criar equipe',
+'button.create_group' => 'Criar equipe', // TODO: replace "team" with "group".
 'button.export' => 'Exportar equipe',
 'button.import' => 'Importar equipe',
 'button.close' => 'Fechar',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b80f14665..bb34c7e0e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -128,7 +128,7 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
 // TODO: translate the following.
-// 'button.create_team' => 'Create team',
+// 'button.create_group' => 'Create group',
 // 'button.export' => 'Export team',
 // 'button.import' => 'Import team',
 // 'button.close' => 'Close',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f95d48c9f..984a41365 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -135,7 +135,7 @@
 // 'button.reset_password' => 'Reset password',
 'button.send' => 'Trimite',
 'button.send_by_email' => 'Trimite pe e-mail',
-'button.create_team' => 'Adauga echipa',
+'button.create_group' => 'Adauga echipa', // TODO: replace "team" with "group".
 'button.export' => 'Exporta echipa',
 'button.import' => 'Importa echipa',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 76e0a184f..56dca8159 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -112,9 +112,9 @@
 'button.reset_password' => 'Сбросить пароль',
 'button.send' => 'Отправить',
 'button.send_by_email' => 'Отправить по e-mail',
-'button.create_team' => 'Создать команду',
-'button.export' => 'Экспортировать команду',
-'button.import' => 'Импортировать команду',
+'button.create_group' => 'Создать группу',
+'button.export' => 'Экспортировать группу',
+'button.import' => 'Импортировать группу',
 'button.close' => 'Закрыть',
 'button.stop' => 'Завершить',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index bd61c5ef3..78adc2af9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -127,7 +127,7 @@
 'button.reset_password' => 'Obnoviť heslo',
 'button.send' => 'Odoslať',
 'button.send_by_email' => 'Odoslať na e-mail',
-'button.create_team' => 'Vytvoriť tím',
+'button.create_group' => 'Vytvoriť tím', // TODO: replace "team" with "group".
 'button.export' => 'Exportovať tím',
 'button.import' => 'Importovať tím',
 'button.close' => 'Zatvoriť',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5b5209590..5ea6299e0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -124,7 +124,7 @@
 // 'button.reset_password' => 'Reset password',
 'button.send' => 'Pošlji',
 'button.send_by_email' => 'Pošlji preko elektronske pošte',
-'button.create_team' => 'Ustvari tim',
+'button.create_group' => 'Ustvari tim', // TODO: replace "team" with "group".
 'button.export' => 'Izvozi tim',
 'button.import' => 'Uvozi tim',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 903811893..bc5d7f1be 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -120,7 +120,7 @@
 'button.reset_password' => 'Resetuj lozinku',
 'button.send' => 'Pošalji',
 'button.send_by_email' => 'Pošalji mejlom',
-'button.create_team' => 'Napravi tim',
+'button.create_group' => 'Napravi tim', // TODO: replace "team" with "group".
 'button.export' => 'Izvezi tim',
 'button.import' => 'Uvezi tim',
 'button.close' => 'Zatvori',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 7e8063563..c802f013f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -117,9 +117,9 @@
 'button.reset_password' => 'Återställ lösenord',
 'button.send' => 'Skicka',
 'button.send_by_email' => 'Skicka som e-post',
-'button.create_team' => 'Skapa ny arbetsgrupp',
-'button.export' => 'Exportera arbetsgrupp',
-'button.import' => 'Importera arbetsgrupp',
+'button.create_group' => 'Skapa grupp',
+'button.export' => 'Exportera grupp',
+'button.import' => 'Importera grupp',
 'button.close' => 'Stäng',
 'button.stop' => 'Avsluta',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 746bbc3a8..c6137f2ec 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -138,7 +138,7 @@
 // 'button.reset_password' => 'Reset password',
 'button.send' => 'Gönder',
 'button.send_by_email' => 'E-posta ile gönder',
-'button.create_team' => 'Ekip yarat',
+'button.create_group' => 'Ekip yarat', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.export' => 'Export team',
 'button.import' => 'Ekibi içeri aktar',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b5d297db7..7c0fd91b6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -125,7 +125,7 @@
 'button.send' => '发送',
 'button.send_by_email' => '通过邮件发送',
 // TODO: translate the following.
-// 'button.create_team' => 'Create team',
+// 'button.create_group' => 'Create group',
 'button.export' => '导出团队信息',
 'button.import' => '导入团队信息',
 'button.close' => '关闭',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index edf8063c5..c0c94dfb8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -130,7 +130,7 @@
 'button.send' => '發送',
 'button.send_by_email' => '通過郵件發送',
 // TODO: translate the following.
-// 'button.create_team' => 'Create team',
+// 'button.create_group' => 'Create group',
 'button.export' => '輸出團隊資訊',
 'button.import' => '輸入團隊資訊',
 // TODO: translate the following.
diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl
index bbbf2843f..59f15c90b 100644
--- a/WEB-INF/templates/admin_teams.tpl
+++ b/WEB-INF/templates/admin_teams.tpl
@@ -34,7 +34,7 @@
     <td align="center">
       <br>
       <form>
-        <input type="button" onclick="chLocation('admin_team_add.php');" value="{$i18n.button.create_team}">&nbsp;{$i18n.label.or}&nbsp;
+        <input type="button" onclick="chLocation('admin_team_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
         <input type="button" onclick="chLocation('import.php');" value="{$i18n.button.import}">
       </form>
     </td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1332c9140..4131b8090 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.17.85.4211 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4212 | 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>

From 54c7f39c93815e99c45f3f974a4ec14673fee1b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Apr 2018 17:05:24 +0000
Subject: [PATCH 0095/1848] A bit more progress on renaming.

---
 WEB-INF/resources/cs.lang.php    | 4 ++--
 WEB-INF/resources/da.lang.php    | 4 ++--
 WEB-INF/resources/de.lang.php    | 4 ++--
 WEB-INF/resources/et.lang.php    | 4 ++--
 WEB-INF/resources/fa.lang.php    | 4 ++--
 WEB-INF/resources/fi.lang.php    | 4 ++--
 WEB-INF/resources/fr.lang.php    | 4 ++--
 WEB-INF/resources/he.lang.php    | 4 ++--
 WEB-INF/resources/ja.lang.php    | 4 ++--
 WEB-INF/resources/ko.lang.php    | 4 ++--
 WEB-INF/resources/nl.lang.php    | 4 ++--
 WEB-INF/resources/no.lang.php    | 4 ++--
 WEB-INF/resources/pl.lang.php    | 4 ++--
 WEB-INF/resources/pt-br.lang.php | 4 ++--
 WEB-INF/resources/pt.lang.php    | 4 ++--
 WEB-INF/resources/ro.lang.php    | 4 ++--
 WEB-INF/resources/sk.lang.php    | 4 ++--
 WEB-INF/resources/sl.lang.php    | 4 ++--
 WEB-INF/resources/sr.lang.php    | 4 ++--
 WEB-INF/resources/tr.lang.php    | 4 ++--
 WEB-INF/resources/zh-cn.lang.php | 4 ++--
 WEB-INF/resources/zh-tw.lang.php | 4 ++--
 WEB-INF/templates/footer.tpl     | 2 +-
 23 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 832060f91..51fa5030e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -133,8 +133,8 @@
 'button.send' => 'Poslat',
 'button.send_by_email' => 'Poslat e-mailem',
 'button.create_group' => 'Vytvořit tým', // TODO: replace "team" with "group".
-'button.export' => 'Exportovat tým',
-'button.import' => 'Importovat tým',
+'button.export' => 'Exportovat tým', // TODO: replace "team" with "group".
+'button.import' => 'Importovat tým', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 71d6a1aff..896032199 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -120,8 +120,8 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-mail',
 'button.create_group' => 'Lav et team', // TODO: replace "team" with "group".
-'button.export' => 'Eksporter team',
-'button.import' => 'Importer team',
+'button.export' => 'Eksporter team', // TODO: replace "team" with "group".
+'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Luk',
 'button.stop' => 'Stop',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 3410fb4a4..6b6228fe1 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -120,8 +120,8 @@
 'button.send' => 'Senden',
 'button.send_by_email' => 'Als E-Mail senden',
 'button.create_group' => 'Team erstellen', // TODO: replace "team" with "group".
-'button.export' => 'Team exportieren',
-'button.import' => 'Team importieren',
+'button.export' => 'Team exportieren', // TODO: replace "team" with "group".
+'button.import' => 'Team importieren', // TODO: replace "team" with "group".
 'button.close' => 'Schließen',
 'button.stop' => 'Stop',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ae5497ce6..f7f800cef 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -133,8 +133,8 @@
 'button.send' => 'Saada',
 'button.send_by_email' => 'Saada e-mailiga',
 'button.create_group' => 'Loo meeskond', // TODO: replace "team" with "group".
-'button.export' => 'Ekspordi meeskond',
-'button.import' => 'Impordi meeskond',
+'button.export' => 'Ekspordi meeskond', // TODO: replace "team" with "group".
+'button.import' => 'Impordi meeskond', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0fcf3e10d..e629d8d9a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -128,8 +128,8 @@
 'button.send' => 'ارسال',
 'button.send_by_email' => 'ارسال به ایمیل',
 'button.create_group' => 'ایجاد تیم', // TODO: replace "team" with "group".
-'button.export' => 'ایجاد پشتیبان از تیم',
-'button.import' => 'وارد کردن تیم',
+'button.export' => 'ایجاد پشتیبان از تیم', // TODO: replace "team" with "group".
+'button.import' => 'وارد کردن تیم', // TODO: replace "team" with "group".
 'button.close' => 'بستن',
 'button.stop' => 'توقف',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 5926c9524..b90e0ce1d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -122,8 +122,8 @@
 'button.send' => 'Lähetä',
 'button.send_by_email' => 'Lähetä sähköpostilla',
 'button.create_group' => 'Luo tiimi', // TODO: replace "team" with "group".
-'button.export' => 'Vie tiimi',
-'button.import' => 'Tuo tiimi',
+'button.export' => 'Vie tiimi', // TODO: replace "team" with "group".
+'button.import' => 'Tuo tiimi', // TODO: replace "team" with "group".
 'button.close' => 'Sulje',
 'button.stop' => 'Lopeta',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 12c983bf1..92b1b6c99 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -120,8 +120,8 @@
 'button.send' => 'Envoyer',
 'button.send_by_email' => 'Envoyer par courriel',
 'button.create_group' => 'Créer une équipe', // TODO: replace "team" with "group".
-'button.export' => 'Exporter l\\\'équipe',
-'button.import' => 'Importer une équipe',
+'button.export' => 'Exporter l\\\'équipe', // TODO: replace "team" with "group".
+'button.import' => 'Importer une équipe', // TODO: replace "team" with "group".
 'button.close' => 'Fermer',
 'button.stop' => 'Arrêter',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2190b1a70..e83a42b62 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -138,8 +138,8 @@
 'button.send' => 'שלח',
 'button.send_by_email' => 'שלח בדואר אלקטרוני',
 'button.create_group' => 'צור צוות', // TODO: replace "team" with "group".
-'button.export' => 'ייצא צוות',
-'button.import' => 'ייבא צוות',
+'button.export' => 'ייצא צוות', // TODO: replace "team" with "group".
+'button.import' => 'ייבא צוות', // TODO: replace "team" with "group".
 'button.close' => 'סגור',
 'button.stop' => 'עצור',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b9d2fb31b..1ba547cf0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -135,8 +135,8 @@
 'button.send_by_email' => 'Eメールの送信',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-'button.export' => 'チームのエクスポート',
-'button.import' => 'チームのインポート',
+'button.export' => 'チームのエクスポート', // TODO: replace "team" with "group".
+'button.import' => 'チームのインポート', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index fc47e6a2d..1b14e06ea 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -134,8 +134,8 @@
 'button.send_by_email' => '이메일로 송신',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-'button.export' => '팀 익스포트',
-'button.import' => '팀 임포트',
+'button.export' => '팀 익스포트', // TODO: replace "team" with "group".
+'button.import' => '팀 임포트', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 89da00542..69fc06e4b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -113,8 +113,8 @@
 'button.send' => 'Verzenden',
 'button.send_by_email' => 'Verzend per e-mail',
 'button.create_group' => 'Maak team', // TODO: replace "team" with "group".
-'button.export' => 'Team exporteren',
-'button.import' => 'Team importeren',
+'button.export' => 'Team exporteren', // TODO: replace "team" with "group".
+'button.import' => 'Team importeren', // TODO: replace "team" with "group".
 'button.close' => 'Sluiten',
 'button.stop' => 'Stop',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c3a91952c..cca996ea0 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -134,8 +134,8 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-post',
 'button.create_group' => 'Opprett team', // TODO: replace "team" with "group".
-'button.export' => 'Eksport team',
-'button.import' => 'Importer team',
+'button.export' => 'Eksport team', // TODO: replace "team" with "group".
+'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Lukk',
 // TODO: translate the following.
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ebe8979f5..fe3ba97a7 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -124,8 +124,8 @@
 'button.send' => 'Wyślij',
 'button.send_by_email' => 'Wyślij e-mail',
 'button.create_group' => 'Stwórz zespół', // TODO: replace "team" with "group".
-'button.export' => 'Eksportuj zespół',
-'button.import' => 'Importuj zespół',
+'button.export' => 'Eksportuj zespół', // TODO: replace "team" with "group".
+'button.import' => 'Importuj zespół', // TODO: replace "team" with "group".
 'button.close' => 'Zamknij',
 'button.stop' => 'Zatrzymaj',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 64987c8d8..cb07cfdf2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -121,8 +121,8 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
 'button.create_group' => 'Criar equipe', // TODO: replace "team" with "group".
-'button.export' => 'Exportar equipe',
-'button.import' => 'Importar equipe',
+'button.export' => 'Exportar equipe', // TODO: replace "team" with "group".
+'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
 'button.close' => 'Fechar',
 'button.stop' => 'Parar',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index bb34c7e0e..e8b83a6eb 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -129,8 +129,8 @@
 'button.send_by_email' => 'Enviar por e-mail',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-// 'button.export' => 'Export team',
-// 'button.import' => 'Import team',
+// 'button.export' => 'Export group',
+// 'button.import' => 'Import group',
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 984a41365..00f0e742f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -136,8 +136,8 @@
 'button.send' => 'Trimite',
 'button.send_by_email' => 'Trimite pe e-mail',
 'button.create_group' => 'Adauga echipa', // TODO: replace "team" with "group".
-'button.export' => 'Exporta echipa',
-'button.import' => 'Importa echipa',
+'button.export' => 'Exporta echipa', // TODO: replace "team" with "group".
+'button.import' => 'Importa echipa', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 78adc2af9..593ce1e07 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -128,8 +128,8 @@
 'button.send' => 'Odoslať',
 'button.send_by_email' => 'Odoslať na e-mail',
 'button.create_group' => 'Vytvoriť tím', // TODO: replace "team" with "group".
-'button.export' => 'Exportovať tím',
-'button.import' => 'Importovať tím',
+'button.export' => 'Exportovať tím', // TODO: replace "team" with "group".
+'button.import' => 'Importovať tím', // TODO: replace "team" with "group".
 'button.close' => 'Zatvoriť',
 // TODO: translate the following.
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5ea6299e0..5f0543faf 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -125,8 +125,8 @@
 'button.send' => 'Pošlji',
 'button.send_by_email' => 'Pošlji preko elektronske pošte',
 'button.create_group' => 'Ustvari tim', // TODO: replace "team" with "group".
-'button.export' => 'Izvozi tim',
-'button.import' => 'Uvozi tim',
+'button.export' => 'Izvozi tim', // TODO: replace "team" with "group".
+'button.import' => 'Uvozi tim', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index bc5d7f1be..c8c3debfd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -121,8 +121,8 @@
 'button.send' => 'Pošalji',
 'button.send_by_email' => 'Pošalji mejlom',
 'button.create_group' => 'Napravi tim', // TODO: replace "team" with "group".
-'button.export' => 'Izvezi tim',
-'button.import' => 'Uvezi tim',
+'button.export' => 'Izvezi tim', // TODO: replace "team" with "group".
+'button.import' => 'Uvezi tim', // TODO: replace "team" with "group".
 'button.close' => 'Zatvori',
 'button.stop' => 'Stani',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c6137f2ec..1fe6a609a 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -140,8 +140,8 @@
 'button.send_by_email' => 'E-posta ile gönder',
 'button.create_group' => 'Ekip yarat', // TODO: replace "team" with "group".
 // TODO: translate the following.
-// 'button.export' => 'Export team',
-'button.import' => 'Ekibi içeri aktar',
+// 'button.export' => 'Export group',
+'button.import' => 'Ekibi içeri aktar', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7c0fd91b6..71325b5ca 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -126,8 +126,8 @@
 'button.send_by_email' => '通过邮件发送',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-'button.export' => '导出团队信息',
-'button.import' => '导入团队信息',
+'button.export' => '导出团队信息', // TODO: replace "team" with "group".
+'button.import' => '导入团队信息', // TODO: replace "team" with "group".
 'button.close' => '关闭',
 // TODO: translate the following.
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c0c94dfb8..a8277d2da 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -131,8 +131,8 @@
 'button.send_by_email' => '通過郵件發送',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-'button.export' => '輸出團隊資訊',
-'button.import' => '輸入團隊資訊',
+'button.export' => '輸出團隊資訊', // TODO: replace "team" with "group".
+'button.import' => '輸入團隊資訊', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4131b8090..409949948 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.17.85.4212 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4213 | 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>

From 1bd75317d2181028cb38fcb7049048e4f688d58c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Apr 2018 17:08:18 +0000
Subject: [PATCH 0096/1848] A small fix in English localization.

---
 WEB-INF/resources/en.lang.php | 4 ++--
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index a121a490d..45062eb1b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -114,8 +114,8 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send by e-mail',
 'button.create_group' => 'Create group',
-'button.export' => 'Export team',
-'button.import' => 'Import team',
+'button.export' => 'Export group',
+'button.import' => 'Import group',
 'button.close' => 'Close',
 'button.stop' => 'Stop',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 409949948..5e7060522 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.17.85.4213 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4214 | 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>

From 167e70e68597a70269edea5c5af9b186c489d57f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 00:34:26 +0000
Subject: [PATCH 0097/1848] A bit more progress with renaming.

---
 WEB-INF/lib/ttAdmin.class.php         | 2 +-
 WEB-INF/lib/ttRegistrator.class.php   | 2 +-
 WEB-INF/resources/ca.lang.php         | 2 +-
 WEB-INF/resources/cs.lang.php         | 2 +-
 WEB-INF/resources/da.lang.php         | 2 +-
 WEB-INF/resources/de.lang.php         | 2 +-
 WEB-INF/resources/en.lang.php         | 2 +-
 WEB-INF/resources/es.lang.php         | 2 +-
 WEB-INF/resources/et.lang.php         | 2 +-
 WEB-INF/resources/fa.lang.php         | 2 +-
 WEB-INF/resources/fi.lang.php         | 2 +-
 WEB-INF/resources/fr.lang.php         | 2 +-
 WEB-INF/resources/gr.lang.php         | 2 +-
 WEB-INF/resources/he.lang.php         | 2 +-
 WEB-INF/resources/hu.lang.php         | 2 +-
 WEB-INF/resources/it.lang.php         | 2 +-
 WEB-INF/resources/ja.lang.php         | 2 +-
 WEB-INF/resources/ko.lang.php         | 2 +-
 WEB-INF/resources/nl.lang.php         | 2 +-
 WEB-INF/resources/no.lang.php         | 2 +-
 WEB-INF/resources/pl.lang.php         | 2 +-
 WEB-INF/resources/pt-br.lang.php      | 2 +-
 WEB-INF/resources/pt.lang.php         | 2 +-
 WEB-INF/resources/ro.lang.php         | 2 +-
 WEB-INF/resources/ru.lang.php         | 2 +-
 WEB-INF/resources/sk.lang.php         | 2 +-
 WEB-INF/resources/sl.lang.php         | 2 +-
 WEB-INF/resources/sr.lang.php         | 2 +-
 WEB-INF/resources/sv.lang.php         | 2 +-
 WEB-INF/resources/tr.lang.php         | 2 +-
 WEB-INF/resources/zh-cn.lang.php      | 2 +-
 WEB-INF/resources/zh-tw.lang.php      | 2 +-
 WEB-INF/templates/admin_team_add.tpl  | 2 +-
 WEB-INF/templates/admin_team_edit.tpl | 2 +-
 WEB-INF/templates/footer.tpl          | 2 +-
 WEB-INF/templates/group_edit.tpl      | 2 +-
 WEB-INF/templates/register.tpl        | 2 +-
 group_edit.php                        | 2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 83b93a767..f9b12c863 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -189,7 +189,7 @@ function validateGroupInfo($fields) {
     $result = true;
 
     if (!ttValidString($fields['group_name'], true)) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
       $result = false;
     }
     if (!ttValidString($fields['user_name'])) {
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index a82ebd3f4..6a2142b56 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -62,7 +62,7 @@ function validate() {
     global $i18n;
 
     if (!ttValidString($this->group_name, true))
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.team_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'));
     if (!ttValidString($this->user_name))
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 91d25b1ad..b46544599 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -139,7 +139,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Moneda',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 51fa5030e..749692404 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -141,7 +141,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Měna',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 896032199..af784cb6b 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -126,7 +126,7 @@
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Team navn',
+'label.group_name' => 'Team navn', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Valuta',
 'label.manager_name' => 'Manager navn',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6b6228fe1..0c1d5d72e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -126,7 +126,7 @@
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Teamname',
+'label.group_name' => 'Teamname', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Währung',
 'label.manager_name' => 'Manager Name',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 45062eb1b..e487a574e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -120,7 +120,7 @@
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Team name',
+'label.group_name' => 'Group name',
 'label.address' => 'Address',
 'label.currency' => 'Currency',
 'label.manager_name' => 'Manager name',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index dcf3bfc63..d2e3d6d32 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -138,7 +138,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 'label.address' => 'Dirección',
 'label.currency' => 'Moneda',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f7f800cef..71ebe74af 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -141,7 +141,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Valuuta',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e629d8d9a..58bb44ec4 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -134,7 +134,7 @@
 'button.stop' => 'توقف',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'نام تیم',
+'label.group_name' => 'نام تیم', // TODO: replace "team" with "group".
 'label.address' => 'آدرس',
 'label.currency' => 'واحد پول',
 'label.manager_name' => 'نام مدیر',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index b90e0ce1d..3afb86465 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -128,7 +128,7 @@
 'button.stop' => 'Lopeta',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Tiimin nimi',
+'label.group_name' => 'Tiimin nimi', // TODO: replace "team" with "group".
 'label.address' => 'Osoite',
 'label.currency' => 'Valuutta',
 'label.manager_name' => 'Esimies',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 92b1b6c99..f17a36c82 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -126,7 +126,7 @@
 'button.stop' => 'Arrêter',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Nom équipe',
+'label.group_name' => 'Nom équipe', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Devise',
 'label.manager_name' => 'Nom du responsable',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 67041209c..a4ad2cbfb 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -120,7 +120,7 @@
 'button.stop' => 'Τέλος',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Όνομα ομάδας',
+'label.group_name' => 'Όνομα ομάδας',
 'label.address' => 'Διεύθυνση',
 'label.currency' => 'Νόμισμα',
 'label.manager_name' => 'Όνομα διαχειριστή',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e83a42b62..a0931aeec 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -144,7 +144,7 @@
 'button.stop' => 'עצור',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'שם הצוות',
+'label.group_name' => 'שם הצוות', // TODO: replace "team" with "group".
 'label.address' => 'כתובת',
 'label.currency' => 'מטבע',
 'label.manager_name' => 'שם של המנהל',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 90b14ffc6..81d336e8e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -138,7 +138,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Pénznem',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index a7980b21e..8d91f4522 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -124,7 +124,7 @@
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Nome del gruppo',
+'label.group_name' => 'Nome del gruppo',
 'label.address' => 'Indirizzo',
 'label.currency' => 'Moneta',
 'label.manager_name' => 'Nome manager',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 1ba547cf0..02bb66f9e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -143,7 +143,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '通貨',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1b14e06ea..48e17d8dc 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -142,7 +142,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '화폐',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 69fc06e4b..ca7e54077 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -119,7 +119,7 @@
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Teamnaam',
+'label.group_name' => 'Teamnaam', // TODO: replace "team" with "group".
 'label.address' => 'Adres',
 'label.currency' => 'Munteenheid',
 'label.manager_name' => 'Naam van de manager',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index cca996ea0..2fd41c85e 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -142,7 +142,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Valuta',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index fe3ba97a7..da6d2af7b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -130,7 +130,7 @@
 'button.stop' => 'Zatrzymaj',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Nazwa zespołu',
+'label.group_name' => 'Nazwa zespołu',  // TODO: replace "team" with "group".
 'label.address' => 'Adres',
 'label.currency' => 'Waluta',
 'label.manager_name' => 'Nazwa managera',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index cb07cfdf2..357afad97 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -127,7 +127,7 @@
 'button.stop' => 'Parar',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Nome da equipe',
+'label.group_name' => 'Nome da equipe',  // TODO: replace "team" with "group".
 'label.address' => 'Endereço',
 'label.currency' => 'Moeda',
 'label.manager_name' => 'Nome do gerente',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e8b83a6eb..094480184 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -136,7 +136,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 // 'label.currency' => 'Currency',
 // 'label.manager_name' => 'Manager name',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 00f0e742f..d2e661629 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -144,7 +144,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Moneda',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 56dca8159..722642510 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -119,7 +119,7 @@
 'button.stop' => 'Завершить',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Название команды',
+'label.group_name' => 'Название группы',
 'label.address' => 'Адрес',
 'label.currency' => 'Валюта',
 'label.manager_name' => 'Имя менеджера',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 593ce1e07..3f38b378f 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -135,7 +135,7 @@
 // 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Názov tímu',
+'label.group_name' => 'Názov tímu', // TODO: replace "team" with "group".
 'label.address' => 'Adresa',
 'label.currency' => 'Mena',
 'label.manager_name' => 'Meno manažéra',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5f0543faf..7c9617261 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -133,7 +133,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 // 'label.currency' => 'Currency',
 // 'label.manager_name' => 'Manager name',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c8c3debfd..4fb0d0d12 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -127,7 +127,7 @@
 'button.stop' => 'Stani',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Naziv tim-a',
+'label.group_name' => 'Naziv tim-a', // TODO: replace "team" with "group".
 'label.address' => 'Adresa',
 'label.currency' => 'Valuta',
 'label.manager_name' => 'Ime Menadžera',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c802f013f..658871f46 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -124,7 +124,7 @@
 'button.stop' => 'Avsluta',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => 'Namn på arbetsgrupp',
+'label.group_name' => 'Namn på grupp',
 'label.address' => 'Adress',
 'label.currency' => 'Valuta',
 'label.manager_name' => 'Namn på ansvarig',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1fe6a609a..4c4604ba6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -148,7 +148,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Para birimi',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 71325b5ca..716099be7 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -133,7 +133,7 @@
 // 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.team_name' => '团队名称',
+'label.group_name' => '团队名称', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'label.address' => 'Address',
 'label.currency' => '货币',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a8277d2da..6384c0d45 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -139,7 +139,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
-// 'label.team_name' => 'Team name',
+// 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '貨幣',
 // TODO: translate the following.
diff --git a/WEB-INF/templates/admin_team_add.tpl b/WEB-INF/templates/admin_team_add.tpl
index 97cd94da0..364b599b6 100644
--- a/WEB-INF/templates/admin_team_add.tpl
+++ b/WEB-INF/templates/admin_team_add.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right" nowrap>{$i18n.label.team_name}:</td>
+          <td align="right" nowrap>{$i18n.label.group_name}:</td>
           <td>{$forms.teamForm.team_name.control}</td>
         </tr>
         <tr>
diff --git a/WEB-INF/templates/admin_team_edit.tpl b/WEB-INF/templates/admin_team_edit.tpl
index 098049222..fb7920453 100644
--- a/WEB-INF/templates/admin_team_edit.tpl
+++ b/WEB-INF/templates/admin_team_edit.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right" nowrap>{$i18n.label.team_name}:</td>
+          <td align="right" nowrap>{$i18n.label.group_name}:</td>
           <td>{$forms.teamForm.team_name.control}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e7060522..f6ce46f9b 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.17.85.4214 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4215 | 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 4dedafdf1..5a5711b07 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -104,7 +104,7 @@ function handlePluginCheckboxes() {
         <table cellspacing="1" cellpadding="2" border="0">
 {if $user->isManager() || ($user->canManageTeam() && !defined(MANAGER_ONLY_TEAM_SETTINGS))}
           <tr>
-            <td align="right" nowrap>{$i18n.label.team_name}:</td>
+            <td align="right" nowrap>{$i18n.label.group_name}:</td>
             <td>{$forms.groupForm.team_name.control}</td>
           </tr>
           <tr>
diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl
index bc77a6a4d..49fd2267e 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.team_name}:</td>
+          <td align="right" nowrap>{$i18n.label.group_name}:</td>
           <td>{$forms.profileForm.team_name.control}</td>
         </tr>
         <tr>
diff --git a/group_edit.php b/group_edit.php
index 128365f34..eb6995a53 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -210,7 +210,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+  if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
   if ($user->can('manage_advanced_settings')) {
     if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));

From 10a6f13349f497f4e2e5c7c4812fcb48db65310e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 01:23:50 +0000
Subject: [PATCH 0098/1848] A bit more renaming.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 admin_teams.php                  | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b46544599..1c681b2f1 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -250,7 +250,7 @@
 // Compare with English file to see how it is done there and do Catalan titles similarly.
 // Specifically: Agregant vs Agregar, etc.
 'title.login' => 'Sessió iniciada',
-'title.teams' => 'Grups',
+'title.groups' => 'Grups',
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 749692404..899fd3321 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -260,7 +260,7 @@
 // Compare with English file to see how it is done there and do Czech titles similarly.
 // Specifically: Vytváření vs Pridat, etc.
 'title.login' => 'Přihlásit',
-'title.teams' => 'Týmy',
+'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index af784cb6b..7c24f78ea 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -227,7 +227,7 @@
 
 // Form titles.
 'title.login' => 'Login',
-'title.teams' => 'Teams',
+'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 'title.create_team' => 'Opret Team',
 'title.edit_team' => 'Redigér Team',
 'title.delete_team' => 'Slet Team',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0c1d5d72e..029c55ff8 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -223,7 +223,7 @@
 
 // Form titles.
 'title.login' => 'Anmelden',
-'title.teams' => 'Teams',
+'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 'title.create_team' => 'Arbeitsgruppe anlegen',
 'title.edit_team' => 'Team bearbeiten',
 'title.delete_team' => 'Team löschen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index e487a574e..7936113f2 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -214,7 +214,7 @@
 
 // Form titles.
 'title.login' => 'Login',
-'title.teams' => 'Teams',
+'title.groups' => 'Groups',
 'title.create_team' => 'Creating Team',
 'title.edit_team' => 'Editing Team',
 'title.delete_team' => 'Deleting Team',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d2e3d6d32..c6a18a638 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -249,7 +249,7 @@
 
 // Form titles.
 'title.login' => 'Sesión iniciada',
-'title.teams' => 'Grupos',
+'title.groups' => 'Grupos',
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 71ebe74af..907a61e42 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -256,7 +256,7 @@
 // Compare with English file to see how it is done there and do Estonian titles similarly.
 // Specifically: lisamine vs lisa, etc.
 'title.login' => 'Login',
-'title.teams' => 'Meeskonnad',
+'title.groups' => 'Meeskonnad', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 58bb44ec4..e66b6f72c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -239,7 +239,7 @@
 
 // Form titles.
 'title.login' => 'ورود',
-'title.teams' => 'تیم ها',
+'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
 'title.create_team' => 'ایجاد تیم',
 // TODO: translate the following.
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3afb86465..24a045c0d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -231,7 +231,7 @@
 
 // Form titles.
 'title.login' => 'Kirjautuminen',
-'title.teams' => 'Tiimit',
+'title.groupd' => 'Tiimit', // TODO: change "teams" to "groups".
 'title.create_team' => 'Tiimin luonti',
 'title.edit_team' => 'Tiimin muokkaus',
 'title.delete_team' => 'Tiimin poisto',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f17a36c82..23e9d4aee 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -225,7 +225,7 @@
 
 // Form titles.
 'title.login' => 'Connexion',
-'title.teams' => 'Équipes',
+'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
 'title.create_team' => 'Création d\\\'une nouvelle équipe',
 'title.edit_team' => 'Modification d\\\'une équipe',
 'title.delete_team' => 'Suppression d\\\'une équipe',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a4ad2cbfb..5f0321da6 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -215,7 +215,7 @@
 
 // Form titles.
 'title.login' => 'Σύνδεση',
-'title.teams' => 'Ομάδες',
+'title.groups' => 'Ομάδες',
 'title.create_team' => 'Δημιουργία ομάδας',
 'title.edit_team' => 'Επεξεργασία ομάδας',
 'title.delete_team' => 'Διαγραφή ομάδας',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a0931aeec..42f196871 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -249,7 +249,7 @@
 
 // Form titles.
 'title.login' => 'כניסה',
-'title.teams' => 'צוותים',
+'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
 'title.create_team' => 'יצירת צוות',
 // TODO: translate the following.
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 81d336e8e..3e52cac89 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -249,7 +249,7 @@
 
 // Form titles.
 'title.login' => 'Bejelentkezés',
-'title.teams' => 'Csoportok',
+'title.groups' => 'Csoportok',
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8d91f4522..3a5b3167a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -224,7 +224,7 @@
 // Compare with English file to see how it is done there and do Italian titles similarly.
 // Specifically: Eliminazione vs Elimina - we probably want nouns in titles.
 'title.login' => 'Login',
-'title.teams' => 'Gruppi',
+'title.groups' => 'Gruppi',
 'title.create_team' => 'Creazione gruppo',
 'title.edit_team' => 'Modifica gruppo',
 'title.delete_team' => 'Elimina gruppo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 02bb66f9e..66e357a8e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -254,7 +254,7 @@
 
 // Form titles.
 'title.login' => 'ログイン',
-'title.teams' => 'チーム',
+'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 48e17d8dc..08326e23f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -254,7 +254,7 @@
 
 // Form titles.
 'title.login' => '로그인',
-'title.teams' => '팀',
+'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ca7e54077..7536804ff 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -213,7 +213,7 @@
 
 // Form titles.
 'title.login' => 'Aanmelden',
-'title.teams' => 'Teams',
+'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 'title.create_team' => 'Team maken',
 'title.edit_team' => 'Team bewerken',
 'title.delete_team' => 'Team aan het verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2fd41c85e..5d3ac97e5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -253,7 +253,7 @@
 // Form titles.
 'title.login' => 'Innlogging',
 // TODO: translate the following.
-// 'title.teams' => 'Teams',
+// 'title.groups' => 'Groups',
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
 'title.delete_team' => 'Slett team',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index da6d2af7b..f0bf18003 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -232,7 +232,7 @@
 
 // Form titles.
 'title.login' => 'Logowanie',
-'title.teams' => 'Zespoły',
+'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
 'title.create_team' => 'Zakładanie zespołu',
 'title.edit_team' => 'Edytowanie zespołu',
 'title.delete_team' => 'Usuwanie zespołu',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 357afad97..944e1b916 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -229,7 +229,7 @@
 
 // Form titles.
 'title.login' => 'Login',
-'title.teams' => 'Equipes',
+'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
 'title.create_team' => 'Criando equipe',
 'title.edit_team' => 'Editando equipe',
 'title.delete_team' => 'Apagando equipe',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 094480184..ac28cd5b3 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -242,7 +242,7 @@
 // Form titles.
 'title.login' => 'Login',
 // TODO: translate the following.
-// 'title.teams' => 'Teams',
+// 'title.groups' => 'Groups',
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
 // 'title.delete_team' => 'Deleting Team',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index d2e661629..0fd9fe551 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -256,7 +256,7 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Romanian titles similarly.
 'title.login' => 'Autentificare',
-'title.teams' => 'Echipe',
+'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 722642510..dc06e8583 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -213,7 +213,7 @@
 
 // Form titles.
 'title.login' => 'Вход в систему',
-'title.teams' => 'Команды',
+'title.groups' => 'Группы',
 'title.create_team' => 'Создание команды',
 'title.edit_team' => 'Редактирование команды',
 'title.delete_team' => 'Удаление команды',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3f38b378f..9c87c2bf9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -239,7 +239,7 @@
 
 // Form titles.
 'title.login' => 'Prihlásenie',
-'title.teams' => 'Tímy',
+'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
 'title.create_team' => 'Vytváranie tímu',
 // TODO: translate the following.
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7c9617261..dc0196aed 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -236,7 +236,7 @@
 
 // Form titles.
 'title.login' => 'Prijava',
-'title.teams' => 'Timi',
+'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 4fb0d0d12..4e75895e0 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -231,7 +231,7 @@
 
 // Form titles.
 'title.login' => 'Prijava',
-'title.teams' => 'Timovi',
+'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
 'title.create_team' => 'Napravi tim',
 'title.edit_team' => 'Izmeni tim',
 'title.delete_team' => 'Obriši tim',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 658871f46..0151c00a2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -225,7 +225,7 @@
 
 // Rubriker för formulär
 'title.login' => 'Logga in',
-'title.teams' => 'Arbetsgrupper',
+'title.groups' => 'Grupper',
 'title.create_team' => 'Skapa arbetsgrupp',
 'title.edit_team' => 'Redigera arbetsgrupp',
 'title.delete_team' => 'Ta bort arbetsgrupp',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4c4604ba6..1d3ddd6c8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -265,7 +265,7 @@
 // Compare with English file to see how it is done there and do Romanian titles similarly.
 // Specifically: compare project and client titles and see how they differ.
 'title.login' => 'Giriş',
-'title.teams' => 'Ekipler',
+'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 716099be7..58c0bc0e7 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -243,7 +243,7 @@
 
 // Form titles.
 'title.login' => '登录',
-'title.teams' => '团队',
+'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6384c0d45..4441ce2e2 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -250,7 +250,7 @@
 
 // Form titles.
 'title.login' => '登錄',
-'title.teams' => '團隊',
+'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.create_team' => 'Creating Team',
 // 'title.edit_team' => 'Editing Team',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f6ce46f9b..78e8b0dc1 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.17.85.4215 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4216 | 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/admin_teams.php b/admin_teams.php
index 7d2b3dfa4..6744582ed 100644
--- a/admin_teams.php
+++ b/admin_teams.php
@@ -36,6 +36,6 @@
 }
 
 $smarty->assign('teams', ttGroupHelper::getTopGroups());
-$smarty->assign('title', $i18n->get('title.teams'));
+$smarty->assign('title', $i18n->get('title.groups'));
 $smarty->assign('content_page_name', 'admin_teams.tpl');
 $smarty->display('index.tpl');

From d5f3d27d84a808f8333822de5662b2cd3a2e322c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 13:14:33 +0000
Subject: [PATCH 0099/1848] Some more renaming.

---
 WEB-INF/resources/ca.lang.php    |  6 +++---
 WEB-INF/resources/cs.lang.php    |  6 +++---
 WEB-INF/resources/da.lang.php    |  6 +++---
 WEB-INF/resources/de.lang.php    | 14 +++++++-------
 WEB-INF/resources/en.lang.php    |  6 +++---
 WEB-INF/resources/es.lang.php    |  6 +++---
 WEB-INF/resources/et.lang.php    |  6 +++---
 WEB-INF/resources/fa.lang.php    |  6 +++---
 WEB-INF/resources/fi.lang.php    |  6 +++---
 WEB-INF/resources/fr.lang.php    |  6 +++---
 WEB-INF/resources/gr.lang.php    |  6 +++---
 WEB-INF/resources/he.lang.php    |  6 +++---
 WEB-INF/resources/hu.lang.php    |  6 +++---
 WEB-INF/resources/it.lang.php    |  6 +++---
 WEB-INF/resources/ja.lang.php    |  6 +++---
 WEB-INF/resources/ko.lang.php    |  6 +++---
 WEB-INF/resources/nl.lang.php    |  6 +++---
 WEB-INF/resources/no.lang.php    |  6 +++---
 WEB-INF/resources/pl.lang.php    |  6 +++---
 WEB-INF/resources/pt-br.lang.php |  6 +++---
 WEB-INF/resources/pt.lang.php    |  6 +++---
 WEB-INF/resources/ro.lang.php    |  6 +++---
 WEB-INF/resources/ru.lang.php    |  6 +++---
 WEB-INF/resources/sk.lang.php    |  6 +++---
 WEB-INF/resources/sl.lang.php    |  6 +++---
 WEB-INF/resources/sr.lang.php    |  6 +++---
 WEB-INF/resources/sv.lang.php    |  6 +++---
 WEB-INF/resources/tr.lang.php    |  6 +++---
 WEB-INF/resources/zh-cn.lang.php |  6 +++---
 WEB-INF/resources/zh-tw.lang.php |  6 +++---
 WEB-INF/templates/footer.tpl     |  2 +-
 admin_team_add.php               |  2 +-
 admin_team_delete.php            |  2 +-
 admin_team_edit.php              |  2 +-
 register.php                     |  2 +-
 35 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1c681b2f1..e107b378f 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -252,9 +252,9 @@
 'title.login' => 'Sessió iniciada',
 'title.groups' => 'Grups',
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Eliminar grup',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Eliminar grup',
 'title.reset_password' => 'Restablir paraula de pas',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 899fd3321..9699641ab 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -262,9 +262,9 @@
 'title.login' => 'Přihlásit',
 'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Smazat tým',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Smazat tým', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetovat heslo',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7c24f78ea..296d0f98c 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -228,9 +228,9 @@
 // Form titles.
 'title.login' => 'Login',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
-'title.create_team' => 'Opret Team',
-'title.edit_team' => 'Redigér Team',
-'title.delete_team' => 'Slet Team',
+'title.create_gtoup' => 'Opret Team', // TODO: change "team" to "group".
+'title.edit_group' => 'Redigér Team', // TODO: change "team" to "group".
+'title.delete_group' => 'Slet Team', // TODO: change "team" to "group".
 'title.reset_password' => 'Nulstilling af Adgangskode',
 'title.change_password' => 'Skift af Adgangskode',
 'title.time' => 'Tid',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 029c55ff8..bbc3c3727 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -119,9 +119,9 @@
 'button.reset_password' => 'Passwort zurücksetzen',
 'button.send' => 'Senden',
 'button.send_by_email' => 'Als E-Mail senden',
-'button.create_group' => 'Team erstellen', // TODO: replace "team" with "group".
-'button.export' => 'Team exportieren', // TODO: replace "team" with "group".
-'button.import' => 'Team importieren', // TODO: replace "team" with "group".
+'button.create_group' => 'Gruppe erstellen',
+'button.export' => 'Gruppe exportieren',
+'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
 'button.stop' => 'Stop',
 
@@ -223,10 +223,10 @@
 
 // Form titles.
 'title.login' => 'Anmelden',
-'title.groups' => 'Teams', // TODO: change "teams" to "groups".
-'title.create_team' => 'Arbeitsgruppe anlegen',
-'title.edit_team' => 'Team bearbeiten',
-'title.delete_team' => 'Team löschen',
+'title.groups' => 'Gruppen',
+'title.create_group' => 'Gruppe anlegen',
+'title.edit_group' => 'Gruppe bearbeiten',
+'title.delete_group' => 'Gruppe löschen',
 'title.reset_password' => 'Passworterinnerung',
 'title.change_password' => 'Passwortänderung',
 'title.time' => 'Zeiten',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7936113f2..e3985513b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -215,9 +215,9 @@
 // Form titles.
 'title.login' => 'Login',
 'title.groups' => 'Groups',
-'title.create_team' => 'Creating Team',
-'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Deleting Team',
+'title.create_group' => 'Creating Group',
+'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Resetting Password',
 'title.change_password' => 'Changing Password',
 'title.time' => 'Time',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c6a18a638..40aae055e 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -251,9 +251,9 @@
 'title.login' => 'Sesión iniciada',
 'title.groups' => 'Grupos',
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-// 'title.delete_team' => 'Deleting Team',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+// 'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Reestablecer contraseña',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 907a61e42..6dd4d69db 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -258,9 +258,9 @@
 'title.login' => 'Login',
 'title.groups' => 'Meeskonnad', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Kustuta meeskond',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Kustuta meeskond',  // TODO: change "team" to "group".
 'title.reset_password' => 'Tühjenda salasõna',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e66b6f72c..00fd1a802 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -240,10 +240,10 @@
 // Form titles.
 'title.login' => 'ورود',
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
-'title.create_team' => 'ایجاد تیم',
+'title.create_group' => 'ایجاد تیم', // TODO: change "team" to "group".
 // TODO: translate the following.
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'حذف تیم',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'حذف تیم', // TODO: change "team" to "group".
 'title.reset_password' => 'بازیابی رمزعبور',
 'title.change_password' => 'تغییر رمزعبور',
 'title.time' => 'زمان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 24a045c0d..c100af033 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -232,9 +232,9 @@
 // Form titles.
 'title.login' => 'Kirjautuminen',
 'title.groupd' => 'Tiimit', // TODO: change "teams" to "groups".
-'title.create_team' => 'Tiimin luonti',
-'title.edit_team' => 'Tiimin muokkaus',
-'title.delete_team' => 'Tiimin poisto',
+'title.create_group' => 'Tiimin luonti', // TODO: change "team" to "group".
+'title.edit_group' => 'Tiimin muokkaus', // TODO: change "team" to "group".
+'title.delete_group' => 'Tiimin poisto', // TODO: change "team" to "group".
 'title.reset_password' => 'Salasanan nollaus',
 'title.change_password' => 'Salasanan vaihto',
 'title.time' => 'Tuntien kirjaus',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 23e9d4aee..1a7958d74 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -226,9 +226,9 @@
 // Form titles.
 'title.login' => 'Connexion',
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
-'title.create_team' => 'Création d\\\'une nouvelle équipe',
-'title.edit_team' => 'Modification d\\\'une équipe',
-'title.delete_team' => 'Suppression d\\\'une équipe',
+'title.create_group' => 'Création d\\\'une nouvelle équipe', // TODO: change "team" to "group".
+'title.edit_group' => 'Modification d\\\'une équipe', // TODO: change "team" to "group".
+'title.delete_group' => 'Suppression d\\\'une équipe', // TODO: change "team" to "group".
 'title.reset_password' => 'Réinitialisation du mot de passe',
 'title.change_password' => 'Modification du mot de passe',
 'title.time' => 'Temps',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5f0321da6..12c688068 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -216,9 +216,9 @@
 // Form titles.
 'title.login' => 'Σύνδεση',
 'title.groups' => 'Ομάδες',
-'title.create_team' => 'Δημιουργία ομάδας',
-'title.edit_team' => 'Επεξεργασία ομάδας',
-'title.delete_team' => 'Διαγραφή ομάδας',
+'title.create_group' => 'Δημιουργία ομάδας',
+'title.edit_group' => 'Επεξεργασία ομάδας',
+'title.delete_group' => 'Διαγραφή ομάδας',
 'title.reset_password' => 'Επαναφορά κωδικού πρόσβασης',
 'title.change_password' => 'Αλλαγή κωδικού πρόσβασης',
 'title.time' => 'Χρόνος',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 42f196871..1f9953010 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -250,10 +250,10 @@
 // Form titles.
 'title.login' => 'כניסה',
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
-'title.create_team' => 'יצירת צוות',
+'title.create_group' => 'יצירת צוות', // TODO: change "team" to "group".
 // TODO: translate the following.
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'מחיקת צוות',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'מחיקת צוות', // TODO: change "team" to "group".
 'title.reset_password' => 'איפוס סיסמה',
 'title.change_password' => 'שינוי סיסמה',
 'title.time' => 'זמן',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3e52cac89..5ad5fd64a 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -251,9 +251,9 @@
 'title.login' => 'Bejelentkezés',
 'title.groups' => 'Csoportok',
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Csoport törlése',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Csoport törlése',
 // TODO: translate the following.
 // 'title.reset_password' => 'Resetting Password',
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 3a5b3167a..19019d99a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -225,9 +225,9 @@
 // Specifically: Eliminazione vs Elimina - we probably want nouns in titles.
 'title.login' => 'Login',
 'title.groups' => 'Gruppi',
-'title.create_team' => 'Creazione gruppo',
-'title.edit_team' => 'Modifica gruppo',
-'title.delete_team' => 'Elimina gruppo',
+'title.create_group' => 'Creazione gruppo',
+'title.edit_group' => 'Modifica gruppo',
+'title.delete_group' => 'Elimina gruppo',
 'title.reset_password' => 'Reset password',
 'title.change_password' => 'Cambio password',
 'title.time' => 'Tempo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 66e357a8e..62eadfb6e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -256,9 +256,9 @@
 'title.login' => 'ログイン',
 'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'チームの削除',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'チームの削除',  // TODO: change "team" to "group".
 'title.reset_password' => 'パスワードの初期化',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 08326e23f..5bbf8e406 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -256,9 +256,9 @@
 'title.login' => '로그인',
 'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => '팀 삭제',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => '팀 삭제',  // TODO: change "team" to "group".
 'title.reset_password' => '암호 재설정',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 7536804ff..06057e510 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -214,9 +214,9 @@
 // Form titles.
 'title.login' => 'Aanmelden',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
-'title.create_team' => 'Team maken',
-'title.edit_team' => 'Team bewerken',
-'title.delete_team' => 'Team aan het verwijderen',
+'title.create_group' => 'Team maken', // TODO: change "team" to "group".
+'title.edit_group' => 'Team bewerken', // TODO: change "team" to "group".
+'title.delete_group' => 'Team aan het verwijderen', // TODO: change "team" to "group".
 'title.reset_password' => 'Wachtwoord herstellen',
 'title.change_password' => 'Wachtwoord aan het veranderen',
 'title.time' => 'Tijdsregistraties',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5d3ac97e5..94a0a535d 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -254,9 +254,9 @@
 'title.login' => 'Innlogging',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Slett team',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Slett team', // TODO: change "team" to "group".
 // TODO: translate the following.
 // 'title.reset_password' => 'Resetting Password',
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f0bf18003..3eb00a605 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -233,9 +233,9 @@
 // Form titles.
 'title.login' => 'Logowanie',
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
-'title.create_team' => 'Zakładanie zespołu',
-'title.edit_team' => 'Edytowanie zespołu',
-'title.delete_team' => 'Usuwanie zespołu',
+'title.create_group' => 'Zakładanie zespołu', // TODO: change "team" to "group".
+'title.edit_group' => 'Edytowanie zespołu', // TODO: change "team" to "group".
+'title.delete_group' => 'Usuwanie zespołu', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetowanie hasła',
 'title.change_password' => 'Zmiana hasła',
 'title.time' => 'Wybrana data',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 944e1b916..c4e4e8f40 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -230,9 +230,9 @@
 // Form titles.
 'title.login' => 'Login',
 'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
-'title.create_team' => 'Criando equipe',
-'title.edit_team' => 'Editando equipe',
-'title.delete_team' => 'Apagando equipe',
+'title.create_group' => 'Criando equipe', // TODO: change "team" to "group".
+'title.edit_group' => 'Editando equipe', // TODO: change "team" to "group".
+'title.delete_group' => 'Apagando equipe', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetando a senha',
 'title.change_password' => 'Alterando a senha',
 'title.time' => 'Tempo',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ac28cd5b3..9ee94d360 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -243,9 +243,9 @@
 'title.login' => 'Login',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-// 'title.delete_team' => 'Deleting Team',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+// 'title.delete_group' => 'Deleting Group',
 // 'title.reset_password' => 'Resetting Password',
 // 'title.change_password' => 'Changing Password',
 // 'title.time' => 'Time',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 0fd9fe551..bbbc097b0 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -258,9 +258,9 @@
 'title.login' => 'Autentificare',
 'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Șterge echipa',
+// 'title.create_group' => 'Creating Team',
+// 'title.edit_group' => 'Editing Team',
+'title.delete_group' => 'Șterge echipa', // TODO: change "team" to "group".
 'title.reset_password' => 'Reseteaza parola',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index dc06e8583..d2906b933 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -214,9 +214,9 @@
 // Form titles.
 'title.login' => 'Вход в систему',
 'title.groups' => 'Группы',
-'title.create_team' => 'Создание команды',
-'title.edit_team' => 'Редактирование команды',
-'title.delete_team' => 'Удаление команды',
+'title.create_group' => 'Создание группы',
+'title.edit_group' => 'Редактирование группы',
+'title.delete_group' => 'Удаление группы',
 'title.reset_password' => 'Cброс пароля',
 'title.change_password' => 'Смена пароля',
 'title.time' => 'Время',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 9c87c2bf9..b8a06ab54 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -240,10 +240,10 @@
 // Form titles.
 'title.login' => 'Prihlásenie',
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
-'title.create_team' => 'Vytváranie tímu',
+'title.create_group' => 'Vytváranie tímu', // TODO: change "team" to "group".
 // TODO: translate the following.
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Vymazávanie tímu',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Vymazávanie tímu', // TODO: change "team" to "group".
 'title.reset_password' => 'Obnovovanie hesla',
 'title.change_password' => 'Menenie hesla',
 'title.time' => 'Časový záznam',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index dc0196aed..98f975298 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -238,9 +238,9 @@
 'title.login' => 'Prijava',
 'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-// 'title.delete_team' => 'Deleting Team',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+// 'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Razveljavi geslo',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 4e75895e0..5dbb0ed2e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -232,9 +232,9 @@
 // Form titles.
 'title.login' => 'Prijava',
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
-'title.create_team' => 'Napravi tim',
-'title.edit_team' => 'Izmeni tim',
-'title.delete_team' => 'Obriši tim',
+'title.create_group' => 'Napravi tim', // TODO: change "team" to "group".
+'title.edit_group' => 'Izmeni tim', // TODO: change "team" to "group".
+'title.delete_group' => 'Obriši tim', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetuj Lozinku',
 'title.change_password' => 'Promeni Lozinku',
 'title.time' => 'Vreme',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0151c00a2..0e835e509 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -226,9 +226,9 @@
 // Rubriker för formulär
 'title.login' => 'Logga in',
 'title.groups' => 'Grupper',
-'title.create_team' => 'Skapa arbetsgrupp',
-'title.edit_team' => 'Redigera arbetsgrupp',
-'title.delete_team' => 'Ta bort arbetsgrupp',
+'title.create_group' => 'Skapa grupp',
+'title.edit_group' => 'Redigera grupp',
+'title.delete_group' => 'Ta bort grupp',
 'title.reset_password' => 'Återställ lösenord',
 'title.change_password' => 'Ändra lösenord',
 'title.time' => 'Tider',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1d3ddd6c8..cef2a2311 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -267,9 +267,9 @@
 'title.login' => 'Giriş',
 'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => 'Ekibi sil',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => 'Ekibi sil', // TODO: change "team" to "group".
 'title.reset_password' => 'Parolayı sıfırla',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 58c0bc0e7..a7b3b129b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -245,9 +245,9 @@
 'title.login' => '登录',
 'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => '删除团队',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => '删除团队', // TODO: change "team" to "group".
 'title.reset_password' => '重设密码',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 4441ce2e2..28a35e8d7 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -252,9 +252,9 @@
 'title.login' => '登錄',
 'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.create_team' => 'Creating Team',
-// 'title.edit_team' => 'Editing Team',
-'title.delete_team' => '刪除團隊',
+// 'title.create_group' => 'Creating Group',
+// 'title.edit_group' => 'Editing Group',
+'title.delete_group' => '刪除團隊', // TODO: change "team" to "group".
 'title.reset_password' => '重設密碼',
 // TODO: translate the following.
 // 'title.change_password' => 'Changing Password',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 78e8b0dc1..ed7991a31 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.17.85.4216 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.85.4217 | 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/admin_team_add.php b/admin_team_add.php
index 6a8b05d57..65031efda 100644
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -116,5 +116,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');
 $smarty->assign('content_page_name', 'admin_team_add.tpl');
-$smarty->assign('title', $i18n->get('title.create_team'));
+$smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->display('index.tpl');
diff --git a/admin_team_delete.php b/admin_team_delete.php
index 61a17041e..1bc290bda 100644
--- a/admin_team_delete.php
+++ b/admin_team_delete.php
@@ -65,6 +65,6 @@
 
 $smarty->assign('team_to_delete', $team_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.delete_team'));
+$smarty->assign('title', $i18n->get('title.delete_group'));
 $smarty->assign('content_page_name', 'admin_team_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_team_edit.php b/admin_team_edit.php
index 05bfec8b1..58e81b99f 100644
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -104,6 +104,6 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
-$smarty->assign('title', $i18n->get('title.edit_team'));
+$smarty->assign('title', $i18n->get('title.edit_group'));
 $smarty->assign('content_page_name', 'admin_team_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/register.php b/register.php
index 32fed57ad..d1e9ff90e 100644
--- a/register.php
+++ b/register.php
@@ -111,7 +111,7 @@
   }
 } // isPost
 
-$smarty->assign('title', $i18n->get('title.create_team'));
+$smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.profileForm.team.focus()"');
 $smarty->assign('content_page_name', 'register.tpl');

From 6fad626b400a77e2775397dc9e87960f4d53247c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 13:34:49 +0000
Subject: [PATCH 0100/1848] Moved managed_basic_settings to co-manager role.

---
 WEB-INF/lib/ttRoleHelper.class.php |  8 ++++----
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 11 +++++++----
 mysql.sql                          |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index aa260f290..f36427afa 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -186,8 +186,8 @@ static function createPredefinedRoles($group_id, $lang)
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
@@ -244,8 +244,8 @@ static function createDefaultRoles()
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ed7991a31..79fc15067 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.17.85.4217 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4218 | 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/dbinstall.php b/dbinstall.php
index 0035bdcef..63dee9c78 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11785"]) {
+  if ($_POST["convert11744to11786"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -892,6 +892,9 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.84', modified = now() where param_name = 'version_db' and param_value = '1.17.83'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.84') set rights = replace(rights, 'view_charts,override_punch_mode', 'view_charts,view_own_clients,override_punch_mode')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.85', modified = now() where param_name = 'version_db' and param_value = '1.17.84'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'override_allow_ip,view_all_reports', 'override_allow_ip,manage_basic_settings,view_all_reports')");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'manage_features,manage_basic_setting,manage_advanced_settings', 'manage_features,manage_advanced_settings')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.86', modified = now() where param_name = 'version_db' and param_value = '1.17.85'");
   }
 
   if ($_POST["cleanup"]) {
@@ -937,7 +940,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.85)</b>
+    <td width="80%"><b>Create database structure (v1.17.86)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -977,8 +980,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.85)</td>
-    <td><input type="submit" name="convert11744to11785" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.86)</td>
+    <td><input type="submit" name="convert11744to11786" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 53fc61632..3673d2958 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -74,7 +74,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,view_all_reports,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
 
 
 #
@@ -450,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.85', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.86', now()); # TODO: change when structure changes.

From c3c78e060ef21bf5f4f2fe60fb1202da2489374b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 13:56:48 +0000
Subject: [PATCH 0101/1848] Made group name read-only for users without
 manage_advanced_settings right.

---
 WEB-INF/templates/footer.tpl | 2 +-
 group_edit.php               | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 79fc15067..eddadab9e 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.17.86.4218 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4219 | 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/group_edit.php b/group_edit.php
index eb6995a53..42fe36485 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -32,12 +32,13 @@
 import('ttRoleHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_basic_settings')) {
+if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) {
   header('Location: access_denied.php');
   exit();
 }
 // End of access checks.
 
+$advanced_settings = $user->can('manage_advanced_settings');
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost()) {
@@ -111,7 +112,7 @@
 }
 
 $form = new Form('groupForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team,'enable'=>$advanced_settings));
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
@@ -187,8 +188,8 @@
 // Uncompleted indicators checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
 
-// Add bcc email control, for manager only.
-if ($user->can('manage_advanced_settings')) {
+// 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));
 }

From aba62f48b2293cde4cc39123deb92bd7935dc76b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 14:00:49 +0000
Subject: [PATCH 0102/1848] Reusing a variable.

---
 group_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/group_edit.php b/group_edit.php
index 42fe36485..6ec572e98 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -213,7 +213,7 @@
   // Validate user input.
   if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
-  if ($user->can('manage_advanced_settings')) {
+  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.profile.allow_ip'));
   }

From 3129f6204498630940977123a34a1315d9fffbb7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 15:56:39 +0000
Subject: [PATCH 0103/1848] A bit more progress on renaming.

---
 WEB-INF/resources/ca.lang.php    | 4 ++--
 WEB-INF/resources/cs.lang.php    | 4 ++--
 WEB-INF/resources/da.lang.php    | 4 ++--
 WEB-INF/resources/en.lang.php    | 4 ++--
 WEB-INF/resources/et.lang.php    | 4 ++--
 WEB-INF/resources/fa.lang.php    | 4 ++--
 WEB-INF/resources/fi.lang.php    | 4 ++--
 WEB-INF/resources/he.lang.php    | 4 ++--
 WEB-INF/resources/hu.lang.php    | 4 ++--
 WEB-INF/resources/ja.lang.php    | 4 ++--
 WEB-INF/resources/ko.lang.php    | 4 ++--
 WEB-INF/resources/nl.lang.php    | 4 ++--
 WEB-INF/resources/no.lang.php    | 4 ++--
 WEB-INF/resources/pl.lang.php    | 4 ++--
 WEB-INF/resources/pt-br.lang.php | 4 ++--
 WEB-INF/resources/pt.lang.php    | 4 ++--
 WEB-INF/resources/ro.lang.php    | 4 ++--
 WEB-INF/resources/ru.lang.php    | 4 ++--
 WEB-INF/resources/sk.lang.php    | 4 ++--
 WEB-INF/resources/sl.lang.php    | 4 ++--
 WEB-INF/resources/sr.lang.php    | 4 ++--
 WEB-INF/resources/sv.lang.php    | 4 ++--
 WEB-INF/resources/tr.lang.php    | 4 ++--
 WEB-INF/resources/zh-cn.lang.php | 4 ++--
 WEB-INF/resources/zh-tw.lang.php | 4 ++--
 WEB-INF/templates/footer.tpl     | 2 +-
 26 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e107b378f..edb5c2168 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -309,8 +309,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => 'Opcions',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9699641ab..48122a1f5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -320,8 +320,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 296d0f98c..dd34e6e83 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -279,8 +279,8 @@
 'title.edit_notification' => 'Redigér Meddelelse',
 'title.delete_notification' => 'Slet Meddelelse',
 'title.monthly_quotas' => 'Månedlig Kvota',
-'title.export' => 'Eksporter Team Data',
-'title.import' => 'Importer Team Data',
+'title.export' => 'Eksporter Team Data', // TODO: replace "team" with "group".
+'title.import' => 'Importer Team Data', // TODO: replace "team" with "group".
 'title.options' => 'Indstillinger',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index e3985513b..b3893a5e5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -265,8 +265,8 @@
 'title.edit_notification' => 'Editing Notification',
 'title.delete_notification' => 'Deleting Notification',
 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'Exporting Team Data',
-'title.import' => 'Importing Team Data',
+'title.export' => 'Exporting Group Data',
+'title.import' => 'Importing Group Data',
 'title.options' => 'Options',
 'title.profile' => 'Profile',
 'title.group' => 'Group Settings',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 6dd4d69db..ccc8eb2a2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -315,8 +315,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => 'Suvandid',
 'title.profile' => 'Profiili',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 00fd1a802..fb352447e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -289,8 +289,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'پشتیانی گرفتن از اطلاعات تیم',
-'title.import' => 'وارد کردن اطلاعات تیم',
+'title.export' => 'پشتیانی گرفتن از اطلاعات تیم', // TODO: replace "team" with "group".
+'title.import' => 'وارد کردن اطلاعات تیم', // TODO: replace "team" with "group".
 'title.options' => 'گزینه ها',
 'title.profile' => 'پروفایل',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index c100af033..86f1a1119 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -280,8 +280,8 @@
 'title.delete_notification' => 'Ilmoituksen poisto',
 // TODO: translate the following.
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'Tiimitietojen vienti',
-'title.import' => 'Tiimitietojen tunti',
+'title.export' => 'Tiimitietojen vienti', // TODO: replace "team" with "group".
+'title.import' => 'Tiimitietojen tunti', // TODO: replace "team" with "group".
 'title.options' => 'Optiot',
 'title.profile' => 'Profiili',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 1f9953010..5ca8ab1d9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -300,8 +300,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'ייצוא נתוני צוות',
-'title.import' => 'ייבוא נתוני צוות',
+'title.export' => 'ייצוא נתוני צוות', // TODO: replace "team" with "group".
+'title.import' => 'ייבוא נתוני צוות', // TODO: replace "team" with "group".
 'title.options' => 'אפשרויות',
 'title.profile' => 'פרופיל',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5ad5fd64a..c041d29f5 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -306,8 +306,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => 'Opciók',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 62eadfb6e..c5e731d71 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -313,8 +313,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => 'オプション',
 'title.profile' => 'プロファイル',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5bbf8e406..b72ba280a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -314,8 +314,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => '옵션',
 'title.profile' => '프로필',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 06057e510..665470286 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -264,8 +264,8 @@
 'title.edit_notification' => 'Notificatie bewerken',
 'title.delete_notification' => 'Notificatie verwijderen',
 'title.monthly_quotas' => 'Doelen per maand',
-'title.export' => 'Exporteer teamgegevens',
-'title.import' => 'Importeer teamgegevens',
+'title.export' => 'Exporteer teamgegevens', // TODO: replace "team" with "group".
+'title.import' => 'Importeer teamgegevens', // TODO: replace "team" with "group".
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
 'title.group' => 'Groep instelling',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 94a0a535d..0b4990061 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -310,8 +310,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => 'Opsjoner',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3eb00a605..77329da0b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -280,8 +280,8 @@
 'title.edit_notification' => 'Edytowanie powiadomienia',
 'title.delete_notification' => 'Usuwanie powiadomienia',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'Eksport danych zespołu',
-'title.import' => 'Import danych zespołu',
+'title.export' => 'Eksport danych zespołu', // TODO: replace "team" with "group".
+'title.import' => 'Import danych zespołu', // TODO: replace "team" with "group".
 'title.options' => 'Opcje',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index c4e4e8f40..f436d250f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -277,8 +277,8 @@
 'title.edit_notification' => 'Editando notificação',
 'title.delete_notification' => 'Apagando notificação',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'Exportando dados de equipe',
-'title.import' => 'Importando dados de equipe',
+'title.export' => 'Exportando dados de equipe', // TODO: replace "team" with "group".
+'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
 'title.options' => 'Opções',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9ee94d360..cd0e232f7 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -296,8 +296,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => 'Opções',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index bbbc097b0..a5037bda0 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -315,8 +315,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d2906b933..2026789c5 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -264,8 +264,8 @@
 'title.edit_notification' => 'Редактирование уведомления',
 'title.delete_notification' => 'Удаление уведомления',
 'title.monthly_quotas' => 'Месячные квоты',
-'title.export' => 'Экспортирование данных команды',
-'title.import' => 'Импортирование данных команды',
+'title.export' => 'Экспортирование данных группы',
+'title.import' => 'Импортирование данных группы',
 'title.options' => 'Опции',
 'title.profile' => 'Профиль',
 'title.group' => 'Настройки группы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b8a06ab54..f518b219f 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -290,8 +290,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'Exportovanie údajov o tíme',
-'title.import' => 'Importovanie údajov o tíme',
+'title.export' => 'Exportovanie údajov o tíme', // TODO: replace "team" with "group".
+'title.import' => 'Importovanie údajov o tíme', // TODO: replace "team" with "group".
 'title.options' => 'Nastavenia',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 98f975298..e4c36e263 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -290,8 +290,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5dbb0ed2e..f5b69aa80 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -279,8 +279,8 @@
 'title.edit_notification' => 'Izmena napomene',
 'title.delete_notification' => 'Brisanje napomene',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-'title.export' => 'Izvoz podataka tim-a',
-'title.import' => 'Uvoz podataka tim-a',
+'title.export' => 'Izvoz podataka tim-a', // TODO: replace "team" with "group".
+'title.import' => 'Uvoz podataka tim-a', // TODO: replace "team" with "group".
 'title.options' => 'Opcije',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0e835e509..3ff0bf2d2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -277,8 +277,8 @@
 'title.edit_notification' => 'Redigera avisering',
 'title.delete_notification' => 'Ta bort avisering',
 'title.monthly_quotas' => 'Månadskvoter',
-'title.export' => 'Exportera arbetsgrupp',
-'title.import' => 'Importera arbetsgrupp',
+'title.export' => 'Exportera grupp',
+'title.import' => 'Importera grupp',
 'title.options' => 'Alternativ',
 'title.profile' => 'Profil',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cef2a2311..c2c4db0fc 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -324,8 +324,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
 'title.profile' => 'Profili',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a7b3b129b..069f0faa6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -302,8 +302,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => '选项',
 'title.profile' => '简介',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 28a35e8d7..2de601017 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -309,8 +309,8 @@
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
 // 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Team Data',
-// 'title.import' => 'Importing Team Data',
+// 'title.export' => 'Exporting Group Data',
+// 'title.import' => 'Importing Group Data',
 'title.options' => '選項',
 // TODO: translate the following.
 // 'title.profile' => 'Profile',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eddadab9e..9130beed3 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.17.86.4219 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4220 | 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>

From c8ee9a8f8b402e0ef18c8fd9a9e379c1160b503e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 16:43:24 +0000
Subject: [PATCH 0104/1848] A bit more progress with renaming team to group.

---
 WEB-INF/resources/ca.lang.php    | 6 +++---
 WEB-INF/resources/cs.lang.php    | 7 ++++---
 WEB-INF/resources/da.lang.php    | 5 +++--
 WEB-INF/resources/de.lang.php    | 5 +++--
 WEB-INF/resources/en.lang.php    | 8 ++++----
 WEB-INF/resources/es.lang.php    | 6 +++---
 WEB-INF/resources/et.lang.php    | 7 ++++---
 WEB-INF/resources/fa.lang.php    | 7 ++++---
 WEB-INF/resources/fi.lang.php    | 5 +++--
 WEB-INF/resources/fr.lang.php    | 5 +++--
 WEB-INF/resources/gr.lang.php    | 4 ++--
 WEB-INF/resources/he.lang.php    | 7 ++++---
 WEB-INF/resources/hu.lang.php    | 8 ++++----
 WEB-INF/resources/it.lang.php    | 6 +++---
 WEB-INF/resources/ja.lang.php    | 7 ++++---
 WEB-INF/resources/ko.lang.php    | 7 ++++---
 WEB-INF/resources/nl.lang.php    | 5 +++--
 WEB-INF/resources/no.lang.php    | 7 ++++---
 WEB-INF/resources/pl.lang.php    | 7 ++++---
 WEB-INF/resources/pt-br.lang.php | 5 +++--
 WEB-INF/resources/pt.lang.php    | 8 ++++----
 WEB-INF/resources/ro.lang.php    | 7 ++++---
 WEB-INF/resources/ru.lang.php    | 6 +++---
 WEB-INF/resources/sk.lang.php    | 7 ++++---
 WEB-INF/resources/sl.lang.php    | 8 ++++----
 WEB-INF/resources/sr.lang.php    | 7 ++++---
 WEB-INF/resources/sv.lang.php    | 9 +++++----
 WEB-INF/resources/tr.lang.php    | 7 ++++---
 WEB-INF/resources/zh-cn.lang.php | 7 ++++---
 WEB-INF/resources/zh-tw.lang.php | 7 ++++---
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 110 insertions(+), 89 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index edb5c2168..5294dc167 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -324,7 +324,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -476,14 +476,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 'form.export.hint' => 'Vosté pot exportar totes les dades del grup dins d\\\'un archivo xml. Això pot ser útil si necessita migrar dades al seu propi servidor.',
 'form.export.compression' => 'Compressió',
 // TODO: translate the following.
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importar dades del grup des d\\\'un arxiu xml.',
 'form.import.file' => 'Sel·leccioni l\\\'arxiu',
 'form.import.success' => 'Importació finalitzada amb èxit.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 48122a1f5..febe2ae71 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -335,7 +335,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -487,14 +487,15 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Můžete exportova týmová data do xml souboru. Může se to hodit pro přesun na jiný server.',
 'form.export.compression' => 'Komprese',
 // TODO: translate the following.
 // 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importovat týmová data z xml souboru.',
 'form.import.file' => 'Výběr souboru',
 'form.import.success' => 'Import byl úspěšně dokončen.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index dd34e6e83..8ac985059 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -434,13 +434,14 @@
 'form.client.client_to_delete' => 'Klient der skal slettes',
 'form.client.client_entries' => 'Klient indlæg',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Du kan eksportere alle Teamdata til en xml-fil. Det kan være nyttigt, hvis du migrerer data til din egen server.',
 'form.export.compression' => 'Komprimering',
 'form.export.compression_none' => 'Ingen',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importer teamdata fra en xml-fil.',
 'form.import.file' => 'Vælg fil',
 'form.import.success' => 'Import sluttede med succes.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index bbc3c3727..48351b838 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -432,13 +432,14 @@
 'form.client.client_to_delete' => 'Zu löschender Kunde',
 'form.client.client_entries' => 'Kundeneintrag',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Sie können alle Teamdaten in eine XML-Datei exportieren. Diese können in andere Zeiterfassungs-Programme importiert werden.',
 'form.export.compression' => 'Kompression',
 'form.export.compression_none' => 'Keine',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.',
 'form.import.file' => 'Datei auswählen',
 'form.import.success' => 'Import erfolgreich abgeschlossen.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b3893a5e5..8c3d9d302 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -279,7 +279,7 @@
 'title.cf_edit_dropdown_option' => 'Editing Option',
 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 'title.locking' => 'Locking',
 'title.week_view' => 'Week View',
 'title.swap_roles' => 'Swapping Roles',
@@ -415,13 +415,13 @@
 'form.client.client_to_delete' => 'Client to delete',
 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
-'form.export.hint' => 'You can export all team data into an xml file. It could be useful if you are migrating data to your own server.',
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+'form.export.hint' => 'You can export all group data into an xml file. It could be useful if you are migrating data to your own server.',
 'form.export.compression' => 'Compression',
 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Import team data from an xml file.',
 'form.import.file' => 'Select file',
 'form.import.success' => 'Import completed successfully.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 40aae055e..4f3a2201b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -323,7 +323,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -489,14 +489,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 'form.export.hint' => 'Usted puede exportar todos los datos del grupo dentro de un archivo xml. Ésto puede ser útil si necesita migrar datos a su propio sevidor.',
 'form.export.compression' => 'Comprimir',
 // Note to translators: the strings below are missing in the translation and must be added.
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importar datos del grupo desde un archivo xml.',
 'form.import.file' => 'Seleccione el archivo',
 'form.import.success' => 'Importación finalizada con éxito.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ccc8eb2a2..75f64898a 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -330,7 +330,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -485,14 +485,15 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Võid kogu meeskonna andmed eksportida xml-faili. Sellest võib olla kasu kui vahetad serverit.',
 'form.export.compression' => 'Pakkimine',
 // TODO: translate the following.
 // 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Impordi meeskonna andmed xml-failist.',
 'form.import.file' => 'Vali fail',
 'form.import.success' => 'Andmed imporditud.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index fb352447e..96711e70f 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -304,7 +304,7 @@
 'title.cf_edit_dropdown_option' => 'ویرایش گزینه',
 'title.cf_delete_dropdown_option' => 'حذف گزینه',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // TODO: translate the following.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
@@ -461,13 +461,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'می توانید از همه اطلاعات تیم یک پشتیبان به فرمت xml تهیه کنید. اگر میخواهید داده ها را به سرور خودتان منتقل کنید این قسمت می تواند مفید باشد.',
 'form.export.compression' => 'فشرده سازی',
 'form.export.compression_none' => 'هیچ کدام',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'وارد کردن اطلاعات تیم از یک فایل xml',
 'form.import.file' => 'انتخاب فایل',
 'form.import.success' => 'وارد کردن اطلاعات با موفقیت انجام شد',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 86f1a1119..31595ac88 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -442,13 +442,14 @@
 'form.client.client_to_delete' => 'Poistettava asiakas',
 'form.client.client_entries' => 'Asiakassyötteet',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Voit viedä tiimin tiedot xml-tiedostoksi, mikä voi helpottaa tietojen siirtoa omalle palvelimelle.',
 'form.export.compression' => 'Pakkaus',
 'form.export.compression_none' => 'ei pakata',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Tuo tiimitiedot xml-tiedostosta.',
 'form.import.file' => 'Valitse tiedosto',
 'form.import.success' => 'Tietojen tuonti onnistui.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1a7958d74..0955e8e66 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -431,13 +431,14 @@
 'form.client.client_to_delete' => 'Client à supprimer',
 'form.client.client_entries' => 'Entrées de client',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Vous pouvez exporter toutes les données d\\\'une équipe dans un ficheir xml. Cela peut être utile si vous transférez des données vers votre serveur.',
 'form.export.compression' => 'Compression',
 'form.export.compression_none' => 'Aucune',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importer les donnés des équipes depuis un fichier xml.',
 'form.import.file' => 'Sélectionner le fichier',
 'form.import.success' => 'Importation réussie.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 12c688068..d2e552835 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -416,13 +416,13 @@
 'form.client.client_to_delete' => 'Διαγραφή πελάτη',
 'form.client.client_entries' => 'Είσοδος πελάτη',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 'form.export.hint' => 'Μπορείτε να εξαγάγετε όλα τα δεδομένα μιας ομάδας σε ένα αρχείο xml. Θα είναι χρήσιμο εάν μετακινήσετε τα δεδομένα σε δικό σας διακομιστή.',
 'form.export.compression' => 'Συμπίεση',
 'form.export.compression_none' => 'χωρίς',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Εισαγωγή δεδομένων ομάδας από αρχείο xml.',
 'form.import.file' => 'Επιλογή αρχείου',
 'form.import.success' => 'Η εισαγωγή ολοκληρώθηκε με επιτυχία.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5ca8ab1d9..7c1ade6b2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -315,7 +315,7 @@
 'title.cf_edit_dropdown_option' => 'עריכת אפשרות',
 'title.cf_delete_dropdown_option' => 'מחיקת אפשרות',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // TODO: translate the following.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
@@ -468,13 +468,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'ניתן לייצא את כל נתוני הצוות בקובץ XML. זה מאד שימושי אם ברצונך להשתמש בשרת משלך.',
 'form.export.compression' => 'דחיסה',
 'form.export.compression_none' => 'ללא',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'ייבא נתוני צוות מתוך קובץ XML.',
 'form.import.file' => 'בחר קובץ',
 'form.import.success' => 'הייבוא הושלם בהצלחה.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c041d29f5..9d19b3dd0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -321,7 +321,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -477,16 +477,16 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 // TODO: improve or check form.export.hint as the translation seems incorrect if we trust translate.google.com.
-// Export does a single team export (all data in ONE team).
+// Export does a single group export (all data in ONE group).
 'form.export.hint' => 'Kimentheted az összes felvitt csoport adatait egy XML file-ba, ami megkönnyíti a TimeTracker szerverek közötti adatátvitelt.',
 'form.export.compression' => 'Tömörítés',
 // TODO: translate the following.
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Csoport adatok importja XML file-ból.',
 'form.import.file' => 'Válassz file',
 'form.import.success' => 'Az importálás sikeresen véget ért.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 19019d99a..9bb83f974 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -291,7 +291,7 @@
 'title.cf_edit_dropdown_option' => 'Modifica opzione',
 'title.cf_delete_dropdown_option' => 'Eliminazione opzione',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 'title.locking' => 'Bloccaggio',
 'title.week_view' => 'Vista settimanale',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -431,13 +431,13 @@
 'form.client.client_to_delete' => 'Client da eliminare',
 'form.client.client_entries' => 'Voci client',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 'form.export.hint' => 'Puoi esporate tutti i dati dei gruppo in un file xml. Questo può essere utile se devi trasferire i dati da un server ad un altro.',
 'form.export.compression' => 'Compressione',
 'form.export.compression_none' => 'niente',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importa i dati del gruppo da un file xml.',
 'form.import.file' => 'Seleziona il file',
 'form.import.success' => 'Importazione eseguita con successo.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c5e731d71..84e51ea5a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -328,7 +328,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -482,13 +482,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'あなたはすべてのチームのデータをxmlファイルにエクスポートすることができます。これはあなたの自分のサーバに移動する時に有用します。',
 'form.export.compression' => '圧縮',
 'form.export.compression_none' => 'なし',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'xmlファイルからチームのデータをインポート。',
 'form.import.file' => 'ファイルの選択',
 'form.import.success' => 'インポートが成功的に完了されました。',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b72ba280a..23030787a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -329,7 +329,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -480,13 +480,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => '팀의 모든 데이터를 xml 파일로 익스포트 할수 있습니다. 이것은 데이터를 당신자신의 서버에로 옮길때 쓸모있을수 있습니다.',
 'form.export.compression' => '압축',
 'form.export.compression_none' => '없음',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'xml 파일로부터 팀 데이터를 임포트.',
 'form.import.file' => '파일 선택',
 'form.import.success' => '성과적으로 완료된 임포트.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 665470286..e48685c71 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -412,13 +412,14 @@
 'form.client.client_to_delete' => 'Klant die wordt verwijderd',
 'form.client.client_entries' => 'Klant gegevens',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'U kunt alle teamgegevens naar een xml bestand exporteren. Dit kan zinvol zijn als u gegevens migreert naar uw eigen server.',
 'form.export.compression' => 'Compressie',
 'form.export.compression_none' => 'geen',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importeer teamgegevens uit een xml bestand.',
 'form.import.file' => 'Kies bestand',
 'form.import.success' => 'Importeren gelukt.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 0b4990061..ba6dd604c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -325,7 +325,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -479,13 +479,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Du kan eksportere alle team data til en XML fil. Dette kan være nyttig dersom du skal migrere data til din egen server.',
 'form.export.compression' => 'Komprimering',
 'form.export.compression_none' => 'ingen',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Import team data fra en xml fil.',
 'form.import.file' => 'Velg fil',
 'form.import.success' => 'Import gjennomført vellykket.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 77329da0b..8fd725652 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -295,7 +295,7 @@
 'title.cf_edit_dropdown_option' => 'Edytowanie opcji',
 'title.cf_delete_dropdown_option' => 'Usuwanie opcji',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // TODO: translate the following.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
@@ -444,13 +444,14 @@
 'form.client.client_to_delete' => 'Klient do usunięcia',
 'form.client.client_entries' => 'Wpisy dot. klienta',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Możesz wyeksportować wszystkie dane zespołu do pliku xml. Przydatne przy migracji danych na własny serwer.',
 'form.export.compression' => 'Kompresja',
 'form.export.compression_none' => 'brak',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Import danych zespołu z pliku xml.',
 'form.import.file' => 'Wybierz plik',
 'form.import.success' => 'Import zakończony powodzeniem.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f436d250f..f90ebdf39 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -439,13 +439,14 @@
 'form.client.client_to_delete' => 'Cliente a ser apagado',
 'form.client.client_entries' => 'Entradas de cliente',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Você pode exportar todos os dados da equipe para um arquivo xml. Isto pode ser útil se você estiver migrando os dados para um servidor próprio.',
 'form.export.compression' => 'Compressão',
 'form.export.compression_none' => 'nenhuma',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importar dados de equipe de um arquivo xml.',
 'form.import.file' => 'Selecionar arquivo',
 'form.import.success' => 'Importação realizada com sucesso.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index cd0e232f7..276e0abbf 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -311,7 +311,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -462,14 +462,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 // TODO: translate the following.
-// 'form.export.hint' => 'You can export all team data into an xml file. It could be useful if you are migrating data to your own server.',
+// 'form.export.hint' => 'You can export all group data into an xml file. It could be useful if you are migrating data to your own server.',
 // 'form.export.compression' => 'Compression',
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 // TODO: translate the following.
 // 'form.import.hint' => 'Import team data from an xml file.',
 // 'form.import.file' => 'Select file',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a5037bda0..712b7b95b 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -330,7 +330,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -483,14 +483,15 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Poti exporta toate datele despre echipa intr-un fisier xml. Acesta poate fi folositor daca transferi datele pe alt server.',
 'form.export.compression' => 'Compresie',
 // TODO: translate the following.
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importa date echipa dintr-un fisier xml.',
 'form.import.file' => 'Alege fisier',
 'form.import.success' => 'Importul s-a incheiat cu succes.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 2026789c5..f09712749 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -412,13 +412,13 @@
 'form.clients.active_clients' => 'Активные клиенты',
 'form.clients.inactive_clients' => 'Неактивные клиенты',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
-'form.export.hint' => 'Вы можете экспортировать все данные команды в xml файл. Это может быть полезно если вы переносите данные на свой собственный сервер.',
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+'form.export.hint' => 'Вы можете экспортировать все данные группы в xml файл. Это может быть полезно если вы переносите данные на свой собственный сервер.',
 'form.export.compression' => 'Сжатие',
 'form.export.compression_none' => 'нет',
 'form.export.compression_bzip' => 'в формате bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Импортируйте данные команды из xml файла.',
 'form.import.file' => 'Укажите файл',
 'form.import.success' => 'Импорт успешно выполнен.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f518b219f..4722dc6b5 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -305,7 +305,7 @@
 'title.cf_edit_dropdown_option' => 'Upravovanie možností',
 'title.cf_delete_dropdown_option' => 'Vymazávanie možností',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // TODO: translate the following.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
@@ -459,13 +459,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Môžete exportovať všetky údaje o tíme do xml súboru. Toto môže byť užitočné pri prenose údajov na iný server.',
 'form.export.compression' => 'Kompresia',
 'form.export.compression_none' => 'žiadna',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Importovať dáta o tíme z xml súboru.',
 'form.import.file' => 'Vyberte súbor',
 'form.import.success' => 'Import úspešne dokončený.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e4c36e263..bffc47f78 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -305,7 +305,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -458,14 +458,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
 // TODO: translate the following.
-// 'form.export.hint' => 'You can export all team data into an xml file. It could be useful if you are migrating data to your own server.',
+// 'form.export.hint' => 'You can export all group data into an xml file. It could be useful if you are migrating data to your own server.',
 // 'form.export.compression' => 'Compression',
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 // TODO: translate the following.
 // 'form.import.hint' => 'Import team data from an xml file.',
 // 'form.import.file' => 'Select file',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f5b69aa80..dafc47bc2 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -294,7 +294,7 @@
 'title.cf_edit_dropdown_option' => 'Izmena opcija',
 'title.cf_delete_dropdown_option' => 'Brisanje opcija',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // TODO: translate the following.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
@@ -443,13 +443,14 @@
 'form.client.client_to_delete' => 'Klijent za brisanje',
 'form.client.client_entries' => 'Unos klijenta',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Postoji mogućnost izvoza svih podataka od timova u xml fajlu. Može vam biti korisno ako imate internu bazu podataka.',
 'form.export.compression' => 'Kompresija',
 'form.export.compression_none' => 'ništa',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Uvezi podatke timova iz xml fajla.',
 'form.import.file' => 'Odaberi datoteku',
 'form.import.success' => 'Uvoz uspešan.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3ff0bf2d2..7c17a1af9 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -292,7 +292,7 @@
 'title.cf_edit_dropdown_option' => 'Redigera alternativ',
 'title.cf_delete_dropdown_option' => 'Ta bort alternativ',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 'title.locking' => 'Låsning',
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
@@ -437,13 +437,14 @@
 'form.client.client_to_delete' => 'Kund',
 'form.client.client_entries' => 'Relaterade tider och kostnader',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
-'form.export.hint' => 'Du kan exportera all information om arbetsgrupperna till en XML-fil. Det kan vara användbart när du migrerar till en egen server.',
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: check and confirm the translation of form.export.hint is correct. We are exporting ONE group.
+'form.export.hint' => 'Du kan exportera all information om grupp till en XML-fil. Det kan vara användbart när du migrerar till en egen server.',
 'form.export.compression' => 'Komprimering',
 'form.export.compression_none' => 'Ingen',
 'form.export.compression_bzip' => 'B-zip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importera arbetsgrupp från en XML-fil.',
 'form.import.file' => 'Välj fil',
 'form.import.success' => 'Importeringen lyckades utan problem.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c2c4db0fc..2bfc9e706 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -339,7 +339,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -496,14 +496,15 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => 'Tüm ekip bilgilerinizi bir xml dosyasına aktarabilirsiniz. Bu, kendi sunucunuza bilgi aktarmak istediğinizde faydalı olabilir.',
 'form.export.compression' => 'Sıkıştırma',
 // TODO: translate the following.
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => 'Ekip bilgileri bir xml dosyasından içe aktar.',
 'form.import.file' => 'Dosya seç',
 'form.import.success' => 'Içe aktarma başarıyla tamamlandı.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 069f0faa6..2a691c077 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -317,7 +317,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -466,13 +466,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => '您可以将所有团队数据导出到xml文件。如果您要将数据转移到您自己的服务器，这项操作很有用。',
 'form.export.compression' => '压缩',
 'form.export.compression_none' => '不压缩',
 'form.export.compression_bzip' => 'bzip格式',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => '从xml文件导入团队数据。',
 'form.import.file' => '选择档',
 'form.import.success' => '成功完成导入。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2de601017..5eb249f38 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -324,7 +324,7 @@
 // 'title.cf_edit_dropdown_option' => 'Editing Option',
 // 'title.cf_delete_dropdown_option' => 'Deleting Option',
 // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the Team profile page.
+// It is also a name for the Locking plugin on the group settings page.
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
@@ -474,13 +474,14 @@
 // 'form.client.client_to_delete' => 'Client to delete',
 // 'form.client.client_entries' => 'Client entries',
 
-// Exporting Team Data form. See example at https://timetracker.anuko.com/export.php
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
+// TODO: replace "team" with "group" in the string below.
 'form.export.hint' => '您可以將所有團隊資料匯出到xml檔。如果您要將資料轉移到您自己的伺服器，這項操作很有用。',
 'form.export.compression' => '壓縮',
 'form.export.compression_none' => '不压缩',
 'form.export.compression_bzip' => 'bzip格式',
 
-// Importing Team Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 'form.import.hint' => '從xml檔導入團隊資料。',
 'form.import.file' => '選擇檔',
 'form.import.success' => '成功完成導入。',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9130beed3..5b5463a77 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.17.86.4220 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4221 | 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>

From e0929a3b47f8a28dcbafae87c8d7de82b5e858dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Apr 2018 19:41:54 +0000
Subject: [PATCH 0105/1848] Some more progress with renaming.

---
 WEB-INF/resources/ca.lang.php     | 5 +++--
 WEB-INF/resources/cs.lang.php     | 5 +++--
 WEB-INF/resources/da.lang.php     | 5 +++--
 WEB-INF/resources/de.lang.php     | 5 +++--
 WEB-INF/resources/en.lang.php     | 4 ++--
 WEB-INF/resources/es.lang.php     | 5 +++--
 WEB-INF/resources/et.lang.php     | 4 ++--
 WEB-INF/resources/fa.lang.php     | 6 +++---
 WEB-INF/resources/fi.lang.php     | 5 +++--
 WEB-INF/resources/fr.lang.php     | 5 +++--
 WEB-INF/resources/gr.lang.php     | 4 ++--
 WEB-INF/resources/he.lang.php     | 5 +++--
 WEB-INF/resources/hu.lang.php     | 6 +++---
 WEB-INF/resources/it.lang.php     | 4 ++--
 WEB-INF/resources/ja.lang.php     | 5 +++--
 WEB-INF/resources/ko.lang.php     | 5 +++--
 WEB-INF/resources/nl.lang.php     | 5 +++--
 WEB-INF/resources/no.lang.php     | 5 +++--
 WEB-INF/resources/pl.lang.php     | 5 +++--
 WEB-INF/resources/pt-br.lang.php  | 5 +++--
 WEB-INF/resources/pt.lang.php     | 4 ++--
 WEB-INF/resources/ro.lang.php     | 7 ++++---
 WEB-INF/resources/ru.lang.php     | 4 ++--
 WEB-INF/resources/sk.lang.php     | 5 +++--
 WEB-INF/resources/sl.lang.php     | 4 ++--
 WEB-INF/resources/sr.lang.php     | 5 +++--
 WEB-INF/resources/sv.lang.php     | 5 +++--
 WEB-INF/resources/tr.lang.php     | 7 ++++---
 WEB-INF/resources/zh-cn.lang.php  | 5 +++--
 WEB-INF/resources/zh-tw.lang.php  | 6 +++---
 WEB-INF/templates/admin_teams.tpl | 2 +-
 WEB-INF/templates/footer.tpl      | 2 +-
 32 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5294dc167..cbdf292aa 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -488,8 +488,9 @@
 'form.import.file' => 'Sel·leccioni l\\\'arxiu',
 'form.import.success' => 'Importació finalitzada amb èxit.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Crear un nou grup, creant un nou compte del manejador de l\\\'equip.<br>També pot importar dades de grups, d\\\'un arxiu xml d\\\'un altre servidor Anuko Time Tracker (no està permès col·lisions de login).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Crear un nou grup, creant un nou compte del manejador de l\\\'equip.<br>També pot importar dades de grups, d\\\'un arxiu xml d\\\'un altre servidor Anuko Time Tracker (no està permès col·lisions de login).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index febe2ae71..0a0cab99f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -500,10 +500,11 @@
 'form.import.file' => 'Výběr souboru',
 'form.import.success' => 'Import byl úspěšně dokončen.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
 // TODO: translate the following. This part is not translated accurately from English:
 // "Vytvořit nový tým prostřednictvím účtu týmového manažera." Improve and check the entire string for accuracy.
-'form.teams.hint' => 'Vytvořit nový tým prostřednictvím účtu týmového manažera.<br>Můžete také importovat týmová data z xml souboru z jiného time tracker serveru (nejsou povoleny shody login).',
+// ALSO TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Vytvořit nový tým prostřednictvím účtu týmového manažera.<br>Můžete také importovat týmová data z xml souboru z jiného time tracker serveru (nejsou povoleny shody login).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 8ac985059..589cb1f80 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -446,8 +446,9 @@
 'form.import.file' => 'Vælg fil',
 'form.import.success' => 'Import sluttede med succes.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Opret et nyt team ved at oprette en ny teamadministrator konto. <br> Du kan også importere teamdata fra en xml-fil fra en anden Anuko Time Tracker-server (eksisterende brugernavne er ikke tilladt).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Opret et nyt team ved at oprette en ny teamadministrator konto. <br> Du kan også importere teamdata fra en xml-fil fra en anden Anuko Time Tracker-server (eksisterende brugernavne er ikke tilladt).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 48351b838..e22c3741b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -444,8 +444,9 @@
 'form.import.file' => 'Datei auswählen',
 'form.import.success' => 'Import erfolgreich abgeschlossen.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 8c3d9d302..ea85dd5c5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -426,8 +426,8 @@
 'form.import.file' => 'Select file',
 'form.import.success' => 'Import completed successfully.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 'form.profile.swap_roles' => 'Swap roles',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 4f3a2201b..a0b4bf798 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -501,9 +501,10 @@
 'form.import.file' => 'Seleccione el archivo',
 'form.import.success' => 'Importación finalizada con éxito.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
 // TODO: improve translation of form.admin.hint - no login collisions are allowed.
-'form.teams.hint' => 'Crear un nuevo grupo, creando una nueva cuenta del manejador del equipo.<br>También puede importar datos de grupos, de un archivo xml de otro servidor Anuko Time Tracker (no estan permitidad colisiones de e-mail).',
+// ALSO TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Crear un nuevo grupo, creando una nueva cuenta del manejador del equipo.<br>También puede importar datos de grupos, de un archivo xml de otro servidor Anuko Time Tracker (no estan permitidad colisiones de e-mail).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 75f64898a..02b84499d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -498,9 +498,9 @@
 'form.import.file' => 'Vali fail',
 'form.import.success' => 'Andmed imporditud.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
 // TODO: translate the following.
-// 'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
+// 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 96711e70f..c7b916a3e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -473,9 +473,9 @@
 'form.import.file' => 'انتخاب فایل',
 'form.import.success' => 'وارد کردن اطلاعات با موفقیت انجام شد',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-// TODO: translate form.teams.hint.
-'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: translate form.groups.hint.
+// 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 31595ac88..681cd98df 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -454,8 +454,9 @@
 'form.import.file' => 'Valitse tiedosto',
 'form.import.success' => 'Tietojen tuonti onnistui.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Luo uusi tiimi luomalla ensin tiimin esimiehen käyttäjätili.<br>Tiimin tiedot voi myös tuoda toiselta Anuko Time Tracker -palvelimelta xml-muodossa (käyttäjänimien oltava uusia).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Luo uusi tiimi luomalla ensin tiimin esimiehen käyttäjätili.<br>Tiimin tiedot voi myös tuoda toiselta Anuko Time Tracker -palvelimelta xml-muodossa (käyttäjänimien oltava uusia).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 0955e8e66..12a32a662 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -443,8 +443,9 @@
 'form.import.file' => 'Sélectionner le fichier',
 'form.import.success' => 'Importation réussie.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Créez une nouvelle équipe en créant un nouveau compte de responsable d\\\'équipe.<br>Vous pouvez également importer des données d\\\'une équipe depuis un fichier xml provenant d\\\'un autre serveur Anuko Time Tracker (les doublons d\\\'identifiants ne sont pas autorisés).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Créez une nouvelle équipe en créant un nouveau compte de responsable d\\\'équipe.<br>Vous pouvez également importer des données d\\\'une équipe depuis un fichier xml provenant d\\\'un autre serveur Anuko Time Tracker (les doublons d\\\'identifiants ne sont pas autorisés).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d2e552835..9b7668af9 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -427,8 +427,8 @@
 'form.import.file' => 'Επιλογή αρχείου',
 'form.import.success' => 'Η εισαγωγή ολοκληρώθηκε με επιτυχία.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Δημιουργήστε μια νέα ομάδα δημιουργώντας ένα νέο λογαριασμό διαχειριστή ομάδας.<br>Μπορείτε επίσης να εισαγάγετε δεδομένα ομάδας από ένα αρχείο xml από άλλο διακομιστή Anuko Time Tracker (δεν επιτρέπονται συγκρούσεις σύνδεσης).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+'form.groups.hint' => 'Δημιουργήστε μια νέα ομάδα δημιουργώντας ένα νέο λογαριασμό διαχειριστή ομάδας.<br>Μπορείτε επίσης να εισαγάγετε δεδομένα ομάδας από ένα αρχείο xml από άλλο διακομιστή Anuko Time Tracker (δεν επιτρέπονται συγκρούσεις σύνδεσης).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7c1ade6b2..32380ed2f 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -480,8 +480,9 @@
 'form.import.file' => 'בחר קובץ',
 'form.import.success' => 'הייבוא הושלם בהצלחה.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'ניתן ליצור צוות חדש על-ידי יצירת מנהל צוות חדש.<br>ניתן לייבא נתוני צוות מקובץ XML משרת Anuko Time Tracker אחר (אין אפשרות לשמות משתמש זהים)',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below. Also improve formatting, as multiple spaces or no spaces look a bit weird.
+'form.groups.hint' => 'ניתן ליצור צוות חדש על-ידי יצירת מנהל צוות חדש.<br>ניתן לייבא נתוני צוות מקובץ XML משרת Anuko Time Tracker אחר (אין אפשרות לשמות משתמש זהים)',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9d19b3dd0..5343a1490 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -491,9 +491,9 @@
 'form.import.file' => 'Válassz file',
 'form.import.success' => 'Az importálás sikeresen véget ért.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-// TODO: fix form.teams.hint by translating it properly from the English string. Note that the ending is not translated at all.
-'form.teams.hint' => 'Új csoport létrehozása egy csoport-vezetői jogosultsággal.<br>A csoport adatokat importálhatjuk XML-ből (no login collisions are allowed).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: fix form.groups.hint by translating it properly from the English string. Note that the ending is not translated at all.
+'form.groups.hint' => 'Új csoport létrehozása egy csoport-vezetői jogosultsággal.<br>A csoport adatokat importálhatjuk XML-ből (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 9bb83f974..747c1c99d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -442,8 +442,8 @@
 'form.import.file' => 'Seleziona il file',
 'form.import.success' => 'Importazione eseguita con successo.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Crea un nuovo gruppo creando un account gruppo manager.<br>Puoi anche importare i dati di un gruppo da un file xml esportato da un altro server Anuko Time Tracker (non sono ammessi login duplicati).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+'form.groups.hint' => 'Crea un nuovo gruppo creando un account gruppo manager.<br>Puoi anche importare i dati di un gruppo da un file xml esportato da un altro server Anuko Time Tracker (non sono ammessi login duplicati).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 84e51ea5a..3e4743936 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -494,8 +494,9 @@
 'form.import.file' => 'ファイルの選択',
 'form.import.success' => 'インポートが成功的に完了されました。',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => '新規チームの管理者のアカウントを生成して新規チームを作成します。<br>あなたはなお他のAnuko Time Trackerサーバのxmlのファイルからチームデータをインポートすることができます(ログインの衝突は許可されません)。',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => '新規チームの管理者のアカウントを生成して新規チームを作成します。<br>あなたはなお他のAnuko Time Trackerサーバのxmlのファイルからチームデータをインポートすることができます(ログインの衝突は許可されません)。',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 23030787a..b5bc01113 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -492,8 +492,9 @@
 'form.import.file' => '파일 선택',
 'form.import.success' => '성과적으로 완료된 임포트.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => '신규 팀관리자 계정을 생성하여 신규 팀을 생성합니다.<br>또한 다른 Anuko Time Tracker 서버 에서 xml 파일로부터 팀 데이터를 임포트할수 있습니다 (로그인 충돌은 허용되지 안음).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => '신규 팀관리자 계정을 생성하여 신규 팀을 생성합니다.<br>또한 다른 Anuko Time Tracker 서버 에서 xml 파일로부터 팀 데이터를 임포트할수 있습니다 (로그인 충돌은 허용되지 안음).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e48685c71..bb455221c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -424,8 +424,9 @@
 'form.import.file' => 'Kies bestand',
 'form.import.success' => 'Importeren gelukt.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below (3 places).
+'form.groups.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 'form.profile.swap_roles' => 'Rollen verruilen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ba6dd604c..b379e296c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -491,8 +491,9 @@
 'form.import.file' => 'Velg fil',
 'form.import.success' => 'Import gjennomført vellykket.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Opprett et nytt team ved å opprette en ny team manager konto.<br>Du kan også importere team data fra en xml fil fra en annen Anuko Time Tracker server (ingen login kollisjoner er tillatt).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below (3 places).
+'form.groups.hint' => 'Opprett et nytt team ved å opprette en ny team manager konto.<br>Du kan også importere team data fra en xml fil fra en annen Anuko Time Tracker server (ingen login kollisjoner er tillatt).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8fd725652..26f60fbcb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -456,8 +456,9 @@
 'form.import.file' => 'Wybierz plik',
 'form.import.success' => 'Import zakończony powodzeniem.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Załóż nowy zespół najpierw tworząc konto managera.<br>Możesz także zaimportować plik xml z danymi zespołu z innego serwera Anuko Time Tracker (nazwy loginów nie mogą się powtarzać).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Załóż nowy zespół najpierw tworząc konto managera.<br>Możesz także zaimportować plik xml z danymi zespołu z innego serwera Anuko Time Tracker (nazwy loginów nie mogą się powtarzać).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f90ebdf39..42fb7a2fa 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -451,8 +451,9 @@
 'form.import.file' => 'Selecionar arquivo',
 'form.import.success' => 'Importação realizada com sucesso.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below (3 places).
+'form.groups.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 276e0abbf..48eae11e9 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -475,9 +475,9 @@
 // 'form.import.file' => 'Select file',
 // 'form.import.success' => 'Import completed successfully.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
 // TODO: translate the following.
-// 'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
+// 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 712b7b95b..fcdd51003 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -496,9 +496,10 @@
 'form.import.file' => 'Alege fisier',
 'form.import.success' => 'Importul s-a incheiat cu succes.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-// TODO: check form.teams.hint for accuracy.
-'form.teams.hint' => 'Adauga o noua echipa prin adaugarea unui nou cont de tip manager.<br>Deasemeni poti importa datele despre echipa dintr-un fisier xml generat de un alt server Anuko Time Tracker (nu sunt permise duplicate pentru login).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: check form.groups.hint for accuracy.
+// ALSO TODO: replace "team" with "group" in the string below (3 places).
+'form.groups.hint' => 'Adauga o noua echipa prin adaugarea unui nou cont de tip manager.<br>Deasemeni poti importa datele despre echipa dintr-un fisier xml generat de un alt server Anuko Time Tracker (nu sunt permise duplicate pentru login).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f09712749..e7cf9cf3b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -423,8 +423,8 @@
 'form.import.file' => 'Укажите файл',
 'form.import.success' => 'Импорт успешно выполнен.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Cоздайте новую команду, сделав новый аккаунт для её менеджера.<br>Также вы можете импортировать данные команды через xml файл из другого Anuko Time Tracker сервера (запрещено дублирование логинов).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+'form.groups.hint' => 'Cоздайте новую группу, сделав новый аккаунт для её менеджера.<br>Также вы можете импортировать данные группы через xml файл из другого Anuko Time Tracker сервера (запрещено дублирование логинов).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 'form.profile.swap_roles' => 'Обменять роль',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 4722dc6b5..c538d11ca 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -471,8 +471,9 @@
 'form.import.file' => 'Vyberte súbor',
 'form.import.success' => 'Import úspešne dokončený.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Pomocou vytvorenia nového účtu tímového manažéra vytvorte nový tím.<br>Taktiež môžete importovať údaje o tíme z xml súboru z iného Anuko Time Tracker serveru (nie sú povolené kolízie v prihlasovacom mene).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below (3 places).
+'form.groups.hint' => 'Pomocou vytvorenia nového účtu tímového manažéra vytvorte nový tím.<br>Taktiež môžete importovať údaje o tíme z xml súboru z iného Anuko Time Tracker serveru (nie sú povolené kolízie v prihlasovacom mene).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index bffc47f78..39f18efeb 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -471,9 +471,9 @@
 // 'form.import.file' => 'Select file',
 // 'form.import.success' => 'Import completed successfully.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
 // TODO: translate the following.
-// 'form.teams.hint' => 'Create a new team by creating a new team manager account.<br>You can also import team data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
+// 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index dafc47bc2..b9f777aa7 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -455,8 +455,9 @@
 'form.import.file' => 'Odaberi datoteku',
 'form.import.success' => 'Uvoz uspešan.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Napravite novi tim. Počnite sa otvaranjem naloga za Menadžera.<br>Takođe možete uvoziti podatke iz xml fajla sa drugog Anuko Time Tracker server-a (dupliranje prijava nisu dozvoljeni).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Napravite novi tim. Počnite sa otvaranjem naloga za Menadžera.<br>Takođe možete uvoziti podatke iz xml fajla sa drugog Anuko Time Tracker server-a (dupliranje prijava nisu dozvoljeni).',
 
 // Forma profila. Pogledajte primer na at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 7c17a1af9..7a9bbfb8e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -449,8 +449,9 @@
 'form.import.file' => 'Välj fil',
 'form.import.success' => 'Importeringen lyckades utan problem.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => 'Skapa en ny arbetsgrupp genom att skapa ett konto för en ansvarig person. Du kan även importera arbetsgrupper från en tidigare installation av Anuko Time Tracker via en XML-fil. Se till att inga användarnamn krockar när filen importeras.',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: check translation of form.groups.hint for accuracy.
+'form.groups.hint' => 'Skapa en ny grupp genom att skapa ett konto för en ansvarig person. Du kan även importera grupp från en tidigare installation av Anuko Time Tracker via en XML-fil. Se till att inga användarnamn krockar när filen importeras.',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2bfc9e706..d721cb365 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -509,9 +509,10 @@
 'form.import.file' => 'Dosya seç',
 'form.import.success' => 'Içe aktarma başarıyla tamamlandı.',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-// TODO: check form.teams.hint for accuracy. I did not not how to translate "login", so this may be garbage now.
-'form.teams.hint' => 'Yeni bir ekip yönetimi hesabı yaratarak yeni bir ekibi yaratın.<br>Ayrıca başka bir Anuko Time Tracker sunucusundan ekip bilgilerini bir xml dosyasından aktarabilirsiniz (login çakışmalarına izin verilmemekte).',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: check form.groups.hint for accuracy. I did not not how to translate "login", so this may be garbage now.
+// ALSO TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => 'Yeni bir ekip yönetimi hesabı yaratarak yeni bir ekibi yaratın.<br>Ayrıca başka bir Anuko Time Tracker sunucusundan ekip bilgilerini bir xml dosyasından aktarabilirsiniz (login çakışmalarına izin verilmemekte).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 2a691c077..e5659b836 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -478,8 +478,9 @@
 'form.import.file' => '选择档',
 'form.import.success' => '成功完成导入。',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-'form.teams.hint' => '通过创建新的团队经理账号来创建新团队。<br>您也可以从其它的Anuko时间追踪器服务器的xml文件导入团队数据(登录信息不能发生冲突)。',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => '通过创建新的团队经理账号来创建新团队。<br>您也可以从其它的Anuko时间追踪器服务器的xml文件导入团队数据(登录信息不能发生冲突)。',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5eb249f38..1bed9284c 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -486,9 +486,9 @@
 'form.import.file' => '選擇檔',
 'form.import.success' => '成功完成導入。',
 
-// Teams form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
-// TODO: translate the following.
-'form.teams.hint' => '通過創建新的團隊經理帳號來創建新團隊。<br>您也可以從其它的Anuko時間追蹤器伺服器的xml檔導入團隊資料(登錄資訊不能發生衝突)。',
+// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// TODO: replace "team" with "group" in the string below.
+'form.groups.hint' => '通過創建新的團隊經理帳號來創建新團隊。<br>您也可以從其它的Anuko時間追蹤器伺服器的xml檔導入團隊資料(登錄資訊不能發生衝突)。',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl
index 59f15c90b..aa017883a 100644
--- a/WEB-INF/templates/admin_teams.tpl
+++ b/WEB-INF/templates/admin_teams.tpl
@@ -3,7 +3,7 @@
 </script>
 
 <table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr><td valign="top">{$i18n.form.teams.hint}</td></tr>
+  <tr><td valign="top">{$i18n.form.groups.hint}</td></tr>
 </table>
 
 <table cellspacing="1" cellpadding="3" border="0" width="720">
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5b5463a77..b931f0c79 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.17.86.4221 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4222 | 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>

From 317b22c142b15ad3ba4b12d07be9b4f4680e0b5a Mon Sep 17 00:00:00 2001
From: bonnedav <theD_2011@hotmail.com>
Date: Mon, 2 Apr 2018 19:14:01 -0600
Subject: [PATCH 0106/1848] Refactor export.tpl to use rights checks (#60)

---
 WEB-INF/templates/export.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/templates/export.tpl b/WEB-INF/templates/export.tpl
index 1c9866edc..487f00978 100644
--- a/WEB-INF/templates/export.tpl
+++ b/WEB-INF/templates/export.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td align="center">
-{if $user->isManager()}
+{if $user->can('export_data')}
       <table border="0" width="60%">
         <colgroup>
           <col width="50%">

From b9026f8ab6535160feb9d4d1caf95495f5b159be Mon Sep 17 00:00:00 2001
From: bonnedav <theD_2011@hotmail.com>
Date: Mon, 2 Apr 2018 19:15:53 -0600
Subject: [PATCH 0107/1848] Refactor canManageTeam in group_edit.tpl (#59)

---
 WEB-INF/templates/group_edit.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 5a5711b07..72222c094 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -94,7 +94,7 @@ function handlePluginCheckboxes() {
 
 {$forms.groupForm.open}
 
-{if $user->canManageTeam()}
+{if $user->can('manage_basic_settings')}
 {include file="datetime_format_preview.tpl"}
 {/if}
 
@@ -102,7 +102,7 @@ function handlePluginCheckboxes() {
     <tr>
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
-{if $user->isManager() || ($user->canManageTeam() && !defined(MANAGER_ONLY_TEAM_SETTINGS))}
+{if $user->can('manage_basic_settings')}
           <tr>
             <td align="right" nowrap>{$i18n.label.group_name}:</td>
             <td>{$forms.groupForm.team_name.control}</td>

From db7dd4684cf7d63cfd840119e6ea47a4a888f02b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 3 Apr 2018 01:20:25 +0000
Subject: [PATCH 0108/1848] Cosmetic.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b931f0c79..223b24dd7 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.17.86.4222 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4223 | 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 72222c094..0aff38535 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -164,7 +164,7 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
             <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-{if $user->can('manage_advanced_settings')}
+  {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>
@@ -173,7 +173,7 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$i18n.form.profile.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>
-{/if}
+  {/if}
           {* initialize preview text *}
           <script>
             MakeFormatPreview("date_format_preview", document.getElementById("date_format"));

From 3bf66d275fd148785cd2132dd5013c2960e81eac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 3 Apr 2018 12:37:34 +0000
Subject: [PATCH 0109/1848] Fixed Easter holiday for German language.

---
 WEB-INF/resources/de.lang.php | 2 +-
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e22c3741b..2c4785eab 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -34,7 +34,7 @@
 $i18n_weekdays = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag');
 $i18n_weekdays_short = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
 // format mm/dd
-$i18n_holidays = array('01/01', '04/06', '04/09', '05/01', '05/17', '05/28', '10/03', '12/25', '12/26');
+$i18n_holidays = array('01/01', '04/02', '05/01', '05/10', '05/28', '10/03', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 223b24dd7..b377a9ed6 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.17.86.4223 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4224 | 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>

From 2df50105b46a5cbd6493271b137a136ccfe2ea5a Mon Sep 17 00:00:00 2001
From: bonnedav <theD_2011@hotmail.com>
Date: Tue, 3 Apr 2018 06:53:55 -0600
Subject: [PATCH 0110/1848] More refactoring of rights checks (#61)

* Refactor predefined_expenses.tpl to use rights checks

* Refactor notifications.tpl to use rights checks

* Refactor invoices.tpl to use rights checks

* Refactor projects.tpl to use rights checks

* Update users.php

* Refactor desktop projects.tpl to use rights checks

* Refactor expenses.php to remove stray canManageTeam() call

* Refactor mobile users.php to remove stray canManageTeam call

* Refactor mobile expenses.php to remove stray canManageTeam() call

* Refactor time.php to remove stray canManageTeam call
---
 WEB-INF/templates/invoices.tpl            | 2 +-
 WEB-INF/templates/mobile/projects.tpl     | 2 +-
 WEB-INF/templates/notifications.tpl       | 2 +-
 WEB-INF/templates/predefined_expenses.tpl | 2 +-
 WEB-INF/templates/projects.tpl            | 2 +-
 expenses.php                              | 2 +-
 mobile/expenses.php                       | 2 +-
 mobile/users.php                          | 2 +-
 time.php                                  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 32d09544f..b966f9e24 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -5,7 +5,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam() || $user->isClient()}
+{if $user->can('manage_invoices') || $user->can('view_own_invoices')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.invoice}</td>
diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl
index 5e4881332..96dcce100 100644
--- a/WEB-INF/templates/mobile/projects.tpl
+++ b/WEB-INF/templates/mobile/projects.tpl
@@ -5,7 +5,7 @@
 <table class="mobile-table">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_projects')}
       <table class="mobile-table-details">
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index 021ff921f..72854190b 100644
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_advanced_settings')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
index 265bdf1bf..147230dc5 100644
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_advanced_settings')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index 319672187..589993652 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -5,7 +5,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_projects')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
diff --git a/expenses.php b/expenses.php
index fee812051..7d7295d29 100644
--- a/expenses.php
+++ b/expenses.php
@@ -196,7 +196,7 @@
         $err->add($i18n->get('error.db'));
     }
   } elseif ($request->getParameter('onBehalfUser')) {
-    if($user->canManageTeam()) {
+    if($user->can('track_expenses')) {
       unset($_SESSION['behalf_id']);
       unset($_SESSION['behalf_name']);
 
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 815a4fc34..c853a2cae 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -200,7 +200,7 @@
         $err->add($i18n->get('error.db'));
     }
   } elseif ($request->getParameter('onBehalfUser')) {
-    if($user->canManageTeam()) {
+    if($user->can('track_expenses')) {
       unset($_SESSION['behalf_id']);
       unset($_SESSION['behalf_name']);
 
diff --git a/mobile/users.php b/mobile/users.php
index 4723543d8..b531d7a49 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -40,7 +40,7 @@
 
 // Get users.
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
-if($user->canManageTeam()) {
+if($user->can('manage_users')) {
   $can_delete_manager = (1 == count($active_users));
   $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
diff --git a/time.php b/time.php
index 24cc7c8ae..d4caad2b1 100644
--- a/time.php
+++ b/time.php
@@ -347,7 +347,7 @@
     }
   }
   elseif ($request->getParameter('onBehalfUser')) {
-    if($user->canManageTeam()) {
+    if($user->can('track_time')) {
       unset($_SESSION['behalf_id']);
       unset($_SESSION['behalf_name']);
 

From b20bc88bdf10d0599435f36bc8acd01b7a35c23c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 4 Apr 2018 13:26:42 +0000
Subject: [PATCH 0111/1848] A little bit of refactoring in export-import.

---
 WEB-INF/lib/ttExportHelper.class.php |  4 +--
 WEB-INF/lib/ttImportHelper.class.php | 48 ++++++++++++++--------------
 WEB-INF/templates/footer.tpl         |  2 +-
 export.php                           |  2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 22521c739..c26937eb8 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -62,7 +62,7 @@ function createDataFile($compress = false) {
     fwrite($file, "<pack>\n");
 
     // Write team info.
-    fwrite($file, "<team currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
+    fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
       "\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
       "\" tracking_mode=\"".$user->tracking_mode."\" project_required=\"".$user->project_required."\" task_required=\"".$user->task_required.
       "\" record_type=\"".$user->record_type."\" bcc_email=\"".$user->bcc_email.
@@ -70,7 +70,7 @@ function createDataFile($compress = false) {
       "\" config=\"".$user->config.
       "\">\n");
     fwrite($file, "  <name><![CDATA[".$user->team."]]></name>\n");
-    fwrite($file, "</team>\n");
+    fwrite($file, "</group>\n");
 
     // Prepare role map.
     $roles = $this->getRoles();
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index ea54d0edc..b7c024d72 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -38,7 +38,7 @@
 import('ttExpenseHelper');
 import('ttRoleHelper');
 
-// ttImportHelper - this class is used to import team data from a file.
+// ttImportHelper - this class is used to import group data from a file.
 class ttImportHelper {
   var $errors         = null;    // Errors go here. Set in constructor by reference.
 
@@ -46,7 +46,7 @@ class ttImportHelper {
   var $currentTag     = '';      // XML tag of the current element.
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
-  var $teamData       = array(); // Array of team data such as team name, etc.
+  var $groupData      = array(); // Array of group data such as group name, etc.
   var $group_id       = null;    // New group id we are importing. It is created during the import operation.
   var $roles          = array(); // Array of arrays of role properties.
   var $users          = array(); // Array of arrays of user properties.
@@ -73,7 +73,7 @@ function ttImportHelper(&$errors) {
   // startElement - callback handler for opening tag of an XML element.
   // In this function we assign passed in attributes to currentElement.
   function startElement($parser, $name, $attrs) {
-    if ($name == 'TEAM'
+    if ($name == 'GROUP'
       || $name == 'USER'
       || $name == 'TASK'
       || $name == 'PROJECT'
@@ -98,10 +98,10 @@ function startElement($parser, $name, $attrs) {
   // When we are here, currentElement is an array of the element attributes (as set in startElement).
   // Here we do the actual import of data into the database.
   function endElement($parser, $name) {
-    if ($name == 'TEAM') {
-      $this->teamData = $this->currentElement;
-      // Now teamData is an array of team properties. We'll use it later to create a team.
-      // Cannot create the team here. Need to determine whether logins collide with existing logins.
+    if ($name == 'GROUP') {
+      $this->groupData = $this->currentElement;
+      // Now groupData is an array of group properties. We'll use it later to create a group.
+      // Cannot create the group here. Need to determine whether logins collide with existing logins.
       $this->currentElement = array();
     }
     if ($name == 'ROLE') {
@@ -121,26 +121,26 @@ function endElement($parser, $name) {
         }
       }
 
-      // Now we can create a team.
+      // Now we can create a group.
       if ($this->canImport) {
         $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
         $group_id = ttTeamHelper::insert(array(
-          'name' => $this->teamData['NAME'],
-          'currency' => $this->teamData['CURRENCY'],
-          'decimal_mark' => $this->teamData['DECIMAL_MARK'],
-          'lang' => $this->teamData['LANG'],
-          'date_format' => $this->teamData['DATE_FORMAT'],
-          'time_format' => $this->teamData['TIME_FORMAT'],
-          'week_start' => $this->teamData['WEEK_START'],
-          'tracking_mode' => $this->teamData['TRACKING_MODE'],
-          'project_required' => $this->teamData['PROJECT_REQUIRED'],
-          'task_required' => $this->teamData['TASK_REQUIRED'],
-          'record_type' => $this->teamData['RECORD_TYPE'],
-          'bcc_email' => $this->teamData['BCC_EMAIL'],
-          'plugins' => $this->teamData['PLUGINS'],
-          'lock_spec' => $this->teamData['LOCK_SPEC'],
-          'workday_minutes' => $this->teamData['WORKDAY_MINUTES'],
-          'config' => $this->teamData['CONFIG']));
+          'name' => $this->groupData['NAME'],
+          'currency' => $this->groupData['CURRENCY'],
+          'decimal_mark' => $this->groupData['DECIMAL_MARK'],
+          'lang' => $this->groupData['LANG'],
+          'date_format' => $this->groupData['DATE_FORMAT'],
+          'time_format' => $this->groupData['TIME_FORMAT'],
+          'week_start' => $this->groupData['WEEK_START'],
+          'tracking_mode' => $this->groupData['TRACKING_MODE'],
+          'project_required' => $this->groupData['PROJECT_REQUIRED'],
+          'task_required' => $this->groupData['TASK_REQUIRED'],
+          'record_type' => $this->groupData['RECORD_TYPE'],
+          'bcc_email' => $this->groupData['BCC_EMAIL'],
+          'plugins' => $this->groupData['PLUGINS'],
+          'lock_spec' => $this->groupData['LOCK_SPEC'],
+          'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
+          'config' => $this->groupData['CONFIG']));
         if ($group_id) {
           $this->group_id = $group_id;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b377a9ed6..ce32bb192 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.17.86.4224 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4225 | 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/export.php b/export.php
index 4f1a571a1..5f7bd02d4 100644
--- a/export.php
+++ b/export.php
@@ -47,7 +47,7 @@
 
 if ($request->isPost()) {
 
-  $filename = 'team_data.xml';
+  $filename = 'group_data.xml';
   $mime_type = 'text/xml';
   $compress = false;
   if ('bzip' == $cl_compression) {

From 995feb6c9e97991e5b9d9803fbc3c8a41ac48922 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 4 Apr 2018 22:46:37 +0000
Subject: [PATCH 0112/1848] Some more renaming in progress.

---
 WEB-INF/resources/ca.lang.php       | 2 +-
 WEB-INF/resources/cs.lang.php       | 2 +-
 WEB-INF/resources/da.lang.php       | 2 +-
 WEB-INF/resources/de.lang.php       | 2 +-
 WEB-INF/resources/en.lang.php       | 2 +-
 WEB-INF/resources/es.lang.php       | 2 +-
 WEB-INF/resources/et.lang.php       | 2 +-
 WEB-INF/resources/fa.lang.php       | 2 +-
 WEB-INF/resources/fi.lang.php       | 2 +-
 WEB-INF/resources/fr.lang.php       | 2 +-
 WEB-INF/resources/gr.lang.php       | 2 +-
 WEB-INF/resources/he.lang.php       | 2 +-
 WEB-INF/resources/hu.lang.php       | 2 +-
 WEB-INF/resources/it.lang.php       | 2 +-
 WEB-INF/resources/ja.lang.php       | 2 +-
 WEB-INF/resources/ko.lang.php       | 2 +-
 WEB-INF/resources/nl.lang.php       | 2 +-
 WEB-INF/resources/no.lang.php       | 2 +-
 WEB-INF/resources/pl.lang.php       | 2 +-
 WEB-INF/resources/pt-br.lang.php    | 2 +-
 WEB-INF/resources/pt.lang.php       | 2 +-
 WEB-INF/resources/ro.lang.php       | 2 +-
 WEB-INF/resources/ru.lang.php       | 2 +-
 WEB-INF/resources/sk.lang.php       | 2 +-
 WEB-INF/resources/sl.lang.php       | 2 +-
 WEB-INF/resources/sr.lang.php       | 2 +-
 WEB-INF/resources/sv.lang.php       | 2 +-
 WEB-INF/resources/tr.lang.php       | 2 +-
 WEB-INF/resources/zh-cn.lang.php    | 2 +-
 WEB-INF/resources/zh-tw.lang.php    | 2 +-
 WEB-INF/templates/header.tpl        | 2 +-
 WEB-INF/templates/mobile/header.tpl | 2 +-
 admin_teams.php => admin_groups.php | 2 +-
 admin_options.php                   | 2 +-
 admin_team_add.php                  | 2 +-
 admin_team_delete.php               | 4 ++--
 admin_team_edit.php                 | 4 ++--
 index.php                           | 2 +-
 login.php                           | 2 +-
 mobile/index.php                    | 2 +-
 mobile/login.php                    | 2 +-
 password_change.php                 | 2 +-
 42 files changed, 44 insertions(+), 44 deletions(-)
 rename admin_teams.php => admin_groups.php (99%)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index cbdf292aa..af4bc1d2c 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -488,7 +488,7 @@
 'form.import.file' => 'Sel·leccioni l\\\'arxiu',
 'form.import.success' => 'Importació finalitzada amb èxit.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Crear un nou grup, creant un nou compte del manejador de l\\\'equip.<br>També pot importar dades de grups, d\\\'un arxiu xml d\\\'un altre servidor Anuko Time Tracker (no està permès col·lisions de login).',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0a0cab99f..1267f4646 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -500,7 +500,7 @@
 'form.import.file' => 'Výběr souboru',
 'form.import.success' => 'Import byl úspěšně dokončen.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: translate the following. This part is not translated accurately from English:
 // "Vytvořit nový tým prostřednictvím účtu týmového manažera." Improve and check the entire string for accuracy.
 // ALSO TODO: replace "team" with "group" in the string below.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 589cb1f80..809532b45 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -446,7 +446,7 @@
 'form.import.file' => 'Vælg fil',
 'form.import.success' => 'Import sluttede med succes.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Opret et nyt team ved at oprette en ny teamadministrator konto. <br> Du kan også importere teamdata fra en xml-fil fra en anden Anuko Time Tracker-server (eksisterende brugernavne er ikke tilladt).',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 2c4785eab..8dd92ef98 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -444,7 +444,7 @@
 'form.import.file' => 'Datei auswählen',
 'form.import.success' => 'Import erfolgreich abgeschlossen.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ea85dd5c5..68133c8f0 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -426,7 +426,7 @@
 'form.import.file' => 'Select file',
 'form.import.success' => 'Import completed successfully.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a0b4bf798..e79f3d4ad 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -501,7 +501,7 @@
 'form.import.file' => 'Seleccione el archivo',
 'form.import.success' => 'Importación finalizada con éxito.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: improve translation of form.admin.hint - no login collisions are allowed.
 // ALSO TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Crear un nuevo grupo, creando una nueva cuenta del manejador del equipo.<br>También puede importar datos de grupos, de un archivo xml de otro servidor Anuko Time Tracker (no estan permitidad colisiones de e-mail).',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 02b84499d..a8c0a10ca 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -498,7 +498,7 @@
 'form.import.file' => 'Vali fail',
 'form.import.success' => 'Andmed imporditud.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: translate the following.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index c7b916a3e..1b744c6a9 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -473,7 +473,7 @@
 'form.import.file' => 'انتخاب فایل',
 'form.import.success' => 'وارد کردن اطلاعات با موفقیت انجام شد',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: translate form.groups.hint.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 681cd98df..d861b32b2 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -454,7 +454,7 @@
 'form.import.file' => 'Valitse tiedosto',
 'form.import.success' => 'Tietojen tuonti onnistui.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Luo uusi tiimi luomalla ensin tiimin esimiehen käyttäjätili.<br>Tiimin tiedot voi myös tuoda toiselta Anuko Time Tracker -palvelimelta xml-muodossa (käyttäjänimien oltava uusia).',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 12a32a662..b499eea8c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -443,7 +443,7 @@
 'form.import.file' => 'Sélectionner le fichier',
 'form.import.success' => 'Importation réussie.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Créez une nouvelle équipe en créant un nouveau compte de responsable d\\\'équipe.<br>Vous pouvez également importer des données d\\\'une équipe depuis un fichier xml provenant d\\\'un autre serveur Anuko Time Tracker (les doublons d\\\'identifiants ne sont pas autorisés).',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9b7668af9..2d2d0d5e4 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -427,7 +427,7 @@
 'form.import.file' => 'Επιλογή αρχείου',
 'form.import.success' => 'Η εισαγωγή ολοκληρώθηκε με επιτυχία.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Δημιουργήστε μια νέα ομάδα δημιουργώντας ένα νέο λογαριασμό διαχειριστή ομάδας.<br>Μπορείτε επίσης να εισαγάγετε δεδομένα ομάδας από ένα αρχείο xml από άλλο διακομιστή Anuko Time Tracker (δεν επιτρέπονται συγκρούσεις σύνδεσης).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 32380ed2f..ef4668800 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -480,7 +480,7 @@
 'form.import.file' => 'בחר קובץ',
 'form.import.success' => 'הייבוא הושלם בהצלחה.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below. Also improve formatting, as multiple spaces or no spaces look a bit weird.
 'form.groups.hint' => 'ניתן ליצור צוות חדש על-ידי יצירת מנהל צוות חדש.<br>ניתן לייבא נתוני צוות מקובץ XML משרת Anuko Time Tracker אחר (אין אפשרות לשמות משתמש זהים)',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5343a1490..f897844cd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -491,7 +491,7 @@
 'form.import.file' => 'Válassz file',
 'form.import.success' => 'Az importálás sikeresen véget ért.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: fix form.groups.hint by translating it properly from the English string. Note that the ending is not translated at all.
 'form.groups.hint' => 'Új csoport létrehozása egy csoport-vezetői jogosultsággal.<br>A csoport adatokat importálhatjuk XML-ből (no login collisions are allowed).',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 747c1c99d..67af31615 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -442,7 +442,7 @@
 'form.import.file' => 'Seleziona il file',
 'form.import.success' => 'Importazione eseguita con successo.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Crea un nuovo gruppo creando un account gruppo manager.<br>Puoi anche importare i dati di un gruppo da un file xml esportato da un altro server Anuko Time Tracker (non sono ammessi login duplicati).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3e4743936..7f63a9cde 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -494,7 +494,7 @@
 'form.import.file' => 'ファイルの選択',
 'form.import.success' => 'インポートが成功的に完了されました。',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '新規チームの管理者のアカウントを生成して新規チームを作成します。<br>あなたはなお他のAnuko Time Trackerサーバのxmlのファイルからチームデータをインポートすることができます(ログインの衝突は許可されません)。',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b5bc01113..8cafcde53 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -492,7 +492,7 @@
 'form.import.file' => '파일 선택',
 'form.import.success' => '성과적으로 완료된 임포트.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '신규 팀관리자 계정을 생성하여 신규 팀을 생성합니다.<br>또한 다른 Anuko Time Tracker 서버 에서 xml 파일로부터 팀 데이터를 임포트할수 있습니다 (로그인 충돌은 허용되지 안음).',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index bb455221c..f6496d250 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -424,7 +424,7 @@
 'form.import.file' => 'Kies bestand',
 'form.import.success' => 'Importeren gelukt.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b379e296c..6c0e0bff2 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -491,7 +491,7 @@
 'form.import.file' => 'Velg fil',
 'form.import.success' => 'Import gjennomført vellykket.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Opprett et nytt team ved å opprette en ny team manager konto.<br>Du kan også importere team data fra en xml fil fra en annen Anuko Time Tracker server (ingen login kollisjoner er tillatt).',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 26f60fbcb..e59d5809b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -456,7 +456,7 @@
 'form.import.file' => 'Wybierz plik',
 'form.import.success' => 'Import zakończony powodzeniem.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Załóż nowy zespół najpierw tworząc konto managera.<br>Możesz także zaimportować plik xml z danymi zespołu z innego serwera Anuko Time Tracker (nazwy loginów nie mogą się powtarzać).',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 42fb7a2fa..944870f3f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -451,7 +451,7 @@
 'form.import.file' => 'Selecionar arquivo',
 'form.import.success' => 'Importação realizada com sucesso.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 48eae11e9..8514a3682 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -475,7 +475,7 @@
 // 'form.import.file' => 'Select file',
 // 'form.import.success' => 'Import completed successfully.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: translate the following.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fcdd51003..baf430bb6 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -496,7 +496,7 @@
 'form.import.file' => 'Alege fisier',
 'form.import.success' => 'Importul s-a incheiat cu succes.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: check form.groups.hint for accuracy.
 // ALSO TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Adauga o noua echipa prin adaugarea unui nou cont de tip manager.<br>Deasemeni poti importa datele despre echipa dintr-un fisier xml generat de un alt server Anuko Time Tracker (nu sunt permise duplicate pentru login).',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e7cf9cf3b..e6d639d11 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -423,7 +423,7 @@
 'form.import.file' => 'Укажите файл',
 'form.import.success' => 'Импорт успешно выполнен.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Cоздайте новую группу, сделав новый аккаунт для её менеджера.<br>Также вы можете импортировать данные группы через xml файл из другого Anuko Time Tracker сервера (запрещено дублирование логинов).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c538d11ca..4d8cd9da3 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -471,7 +471,7 @@
 'form.import.file' => 'Vyberte súbor',
 'form.import.success' => 'Import úspešne dokončený.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Pomocou vytvorenia nového účtu tímového manažéra vytvorte nový tím.<br>Taktiež môžete importovať údaje o tíme z xml súboru z iného Anuko Time Tracker serveru (nie sú povolené kolízie v prihlasovacom mene).',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 39f18efeb..3609b46fe 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -471,7 +471,7 @@
 // 'form.import.file' => 'Select file',
 // 'form.import.success' => 'Import completed successfully.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: translate the following.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b9f777aa7..f42f339f5 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -455,7 +455,7 @@
 'form.import.file' => 'Odaberi datoteku',
 'form.import.success' => 'Uvoz uspešan.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Napravite novi tim. Počnite sa otvaranjem naloga za Menadžera.<br>Takođe možete uvoziti podatke iz xml fajla sa drugog Anuko Time Tracker server-a (dupliranje prijava nisu dozvoljeni).',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 7a9bbfb8e..4774453b5 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -449,7 +449,7 @@
 'form.import.file' => 'Välj fil',
 'form.import.success' => 'Importeringen lyckades utan problem.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: check translation of form.groups.hint for accuracy.
 'form.groups.hint' => 'Skapa en ny grupp genom att skapa ett konto för en ansvarig person. Du kan även importera grupp från en tidigare installation av Anuko Time Tracker via en XML-fil. Se till att inga användarnamn krockar när filen importeras.',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d721cb365..9359107ce 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -509,7 +509,7 @@
 'form.import.file' => 'Dosya seç',
 'form.import.success' => 'Içe aktarma başarıyla tamamlandı.',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: check form.groups.hint for accuracy. I did not not how to translate "login", so this may be garbage now.
 // ALSO TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Yeni bir ekip yönetimi hesabı yaratarak yeni bir ekibi yaratın.<br>Ayrıca başka bir Anuko Time Tracker sunucusundan ekip bilgilerini bir xml dosyasından aktarabilirsiniz (login çakışmalarına izin verilmemekte).',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e5659b836..b0d15aaa2 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -478,7 +478,7 @@
 'form.import.file' => '选择档',
 'form.import.success' => '成功完成导入。',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '通过创建新的团队经理账号来创建新团队。<br>您也可以从其它的Anuko时间追踪器服务器的xml文件导入团队数据(登录信息不能发生冲突)。',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1bed9284c..ae6a09e6d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -486,7 +486,7 @@
 'form.import.file' => '選擇檔',
 'form.import.success' => '成功完成導入。',
 
-// Groups form. See example at https://timetracker.anuko.com/admin_teams.php (login as admin first).
+// Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '通過創建新的團隊經理帳號來創建新團隊。<br>您也可以從其它的Anuko時間追蹤器伺服器的xml檔導入團隊資料(登錄資訊不能發生衝突)。',
 
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 8dc7bc999..2752dc42f 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -71,7 +71,7 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_teams.php">{$i18n.menu.groups}</a> &middot;
+            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a> &middot;
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
         </tr>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 417cca25b..fdded891c 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -61,7 +61,7 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_teams.php">{$i18n.menu.groups}</a> &middot;
+            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a> &middot;
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
         </tr>
diff --git a/admin_teams.php b/admin_groups.php
similarity index 99%
rename from admin_teams.php
rename to admin_groups.php
index 6744582ed..a5521ad99 100644
--- a/admin_teams.php
+++ b/admin_groups.php
@@ -25,7 +25,7 @@
 // | Contributors:
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
-	
+
 require_once('initialize.php');
 import('ttGroupHelper');
 
diff --git a/admin_options.php b/admin_options.php
index cc9fd65c4..226a8a5e7 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -73,7 +73,7 @@
   $admin = new ttAdmin($err);
   $result = $admin->updateSelf($fields);
   if ($result) {
-    header('Location: admin_teams.php');
+    header('Location: admin_groups.php');
     exit();
   }
 } // isPost
diff --git a/admin_team_add.php b/admin_team_add.php
index 65031efda..7904d9f21 100644
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -107,7 +107,7 @@
   $registrator->register();
   $registrator->setCreatedBy($user->id); // Override created_by to admin account.
   if ($err->no()) {
-    header('Location: admin_teams.php');
+    header('Location: admin_groups.php');
     exit();
   }
 } // isPost
diff --git a/admin_team_delete.php b/admin_team_delete.php
index 1bc290bda..99d508fbd 100644
--- a/admin_team_delete.php
+++ b/admin_team_delete.php
@@ -51,14 +51,14 @@
     $admin = new ttAdmin();
     $result = $admin->markGroupDeleted($group_id);
     if ($result) {
-      header('Location: admin_teams.php');
+      header('Location: admin_groups.php');
       exit();
     } else
       $err->add($i18n->get('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {
-    header('Location: admin_teams.php');
+    header('Location: admin_groups.php');
     exit();
   }
 } // isPost
diff --git a/admin_team_edit.php b/admin_team_edit.php
index 58e81b99f..0efca4f6f 100644
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -90,13 +90,13 @@
     $admin = new ttAdmin($err);
     $result = $admin->updateGroup($group_id, $fields);
     if ($result) {
-      header('Location: admin_teams.php');
+      header('Location: admin_groups.php');
       exit();
     }
   }
 
   if ($request->getParameter('btn_cancel')) {
-    header('Location: admin_teams.php');
+    header('Location: admin_groups.php');
     exit();
   }
 } // isPost
diff --git a/index.php b/index.php
index fd4dde8ed..cabc7060b 100644
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@
 // Redirects for admin and client roles.
 if ($auth->isAuthenticated()) {
   if ($user->can('administer_site')) {
-    header('Location: admin_teams.php');
+    header('Location: admin_groups.php');
     exit();
   } elseif ($user->isClient()) {
     header('Location: reports.php');
diff --git a/login.php b/login.php
index 7ccb9391f..3bfed9a4d 100644
--- a/login.php
+++ b/login.php
@@ -63,7 +63,7 @@
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
       if ($user->can('administer_site')) {
-        header('Location: admin_teams.php');
+        header('Location: admin_groups.php');
       } elseif ($user->isClient()) {
         header('Location: reports.php');
       } else {
diff --git a/mobile/index.php b/mobile/index.php
index 9b2ed530f..fa3f04c46 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -31,7 +31,7 @@
 // Redirects for admin and client roles.
 if ($auth->isAuthenticated()) {
   if ($user->can('administer_site')) {
-    header('Location: ../admin_teams.php');
+    header('Location: ../admin_groups.php');
     exit();
   } elseif ($user->isClient()) {
     header('Location: ../reports.php');
diff --git a/mobile/login.php b/mobile/login.php
index 78db8dab4..d1f659a93 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -68,7 +68,7 @@
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
       if ($user->isAdmin()) {
-        header('Location: ../admin_teams.php');
+        header('Location: ../admin_groups.php');
       } elseif ($user->isClient()) {
         header('Location: ../reports.php');
       } else {
diff --git a/password_change.php b/password_change.php
index f8c47112a..2dce99f9a 100644
--- a/password_change.php
+++ b/password_change.php
@@ -83,7 +83,7 @@
       setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
       // Redirect, depending on user role.
       if ($user->can('administer_site')) {
-        header('Location: admin_teams.php');
+        header('Location: admin_groups.php');
       } elseif ($user->isClient()) {
         header('Location: reports.php');
       } else {

From 8aef74b216afaf7d9a19e069a68807b54e71267e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 4 Apr 2018 22:56:37 +0000
Subject: [PATCH 0113/1848] Renamed a few files.

---
 WEB-INF/templates/admin_teams.tpl               | 6 +++---
 WEB-INF/templates/footer.tpl                    | 2 +-
 admin_team_add.php => admin_group_add.php       | 0
 admin_team_delete.php => admin_group_delete.php | 0
 admin_team_edit.php => admin_group_edit.php     | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename admin_team_add.php => admin_group_add.php (100%)
 rename admin_team_delete.php => admin_group_delete.php (100%)
 rename admin_team_edit.php => admin_group_edit.php (100%)

diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl
index aa017883a..40207c8a6 100644
--- a/WEB-INF/templates/admin_teams.tpl
+++ b/WEB-INF/templates/admin_teams.tpl
@@ -22,8 +22,8 @@
     <td>{$team.name|escape}</td>
     <td nowrap>{$team.date}</td>
     <td align="center">{$team.lang}</td>
-    <td><a href="admin_team_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>
-    <td><a href="admin_team_delete.php?id={$team.id}">{$i18n.label.delete}</a></td>
+    <td><a href="admin_group_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>
+    <td><a href="admin_group_delete.php?id={$team.id}">{$i18n.label.delete}</a></td>
   </tr>
   {/foreach}
 {/if}
@@ -34,7 +34,7 @@
     <td align="center">
       <br>
       <form>
-        <input type="button" onclick="chLocation('admin_team_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
+        <input type="button" onclick="chLocation('admin_group_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
         <input type="button" onclick="chLocation('import.php');" value="{$i18n.button.import}">
       </form>
     </td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ce32bb192..b526292a3 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.17.86.4225 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4226 | 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/admin_team_add.php b/admin_group_add.php
similarity index 100%
rename from admin_team_add.php
rename to admin_group_add.php
diff --git a/admin_team_delete.php b/admin_group_delete.php
similarity index 100%
rename from admin_team_delete.php
rename to admin_group_delete.php
diff --git a/admin_team_edit.php b/admin_group_edit.php
similarity index 100%
rename from admin_team_edit.php
rename to admin_group_edit.php

From 10e7c8186a42d71d6494711b562b92f3e5fd5b7b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Apr 2018 12:12:59 +0000
Subject: [PATCH 0114/1848] Renamed admin templates.

---
 WEB-INF/templates/{admin_team_add.tpl => admin_group_add.tpl}   | 0
 .../templates/{admin_team_delete.tpl => admin_group_delete.tpl} | 0
 WEB-INF/templates/{admin_team_edit.tpl => admin_group_edit.tpl} | 0
 WEB-INF/templates/{admin_teams.tpl => admin_groups.tpl}         | 1 -
 WEB-INF/templates/footer.tpl                                    | 2 +-
 admin_group_add.php                                             | 2 +-
 admin_group_delete.php                                          | 2 +-
 admin_group_edit.php                                            | 2 +-
 admin_groups.php                                                | 2 +-
 9 files changed, 5 insertions(+), 6 deletions(-)
 rename WEB-INF/templates/{admin_team_add.tpl => admin_group_add.tpl} (100%)
 rename WEB-INF/templates/{admin_team_delete.tpl => admin_group_delete.tpl} (100%)
 rename WEB-INF/templates/{admin_team_edit.tpl => admin_group_edit.tpl} (100%)
 rename WEB-INF/templates/{admin_teams.tpl => admin_groups.tpl} (99%)

diff --git a/WEB-INF/templates/admin_team_add.tpl b/WEB-INF/templates/admin_group_add.tpl
similarity index 100%
rename from WEB-INF/templates/admin_team_add.tpl
rename to WEB-INF/templates/admin_group_add.tpl
diff --git a/WEB-INF/templates/admin_team_delete.tpl b/WEB-INF/templates/admin_group_delete.tpl
similarity index 100%
rename from WEB-INF/templates/admin_team_delete.tpl
rename to WEB-INF/templates/admin_group_delete.tpl
diff --git a/WEB-INF/templates/admin_team_edit.tpl b/WEB-INF/templates/admin_group_edit.tpl
similarity index 100%
rename from WEB-INF/templates/admin_team_edit.tpl
rename to WEB-INF/templates/admin_group_edit.tpl
diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_groups.tpl
similarity index 99%
rename from WEB-INF/templates/admin_teams.tpl
rename to WEB-INF/templates/admin_groups.tpl
index 40207c8a6..ebe889914 100644
--- a/WEB-INF/templates/admin_teams.tpl
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -40,4 +40,3 @@
     </td>
   </tr>
 </table>
-      
\ No newline at end of file
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b526292a3..5cc7edc47 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.17.86.4226 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4227 | 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/admin_group_add.php b/admin_group_add.php
index 7904d9f21..3684d6cd4 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -115,6 +115,6 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');
-$smarty->assign('content_page_name', 'admin_team_add.tpl');
+$smarty->assign('content_page_name', 'admin_group_add.tpl');
 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->display('index.tpl');
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 99d508fbd..48e60c31c 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -66,5 +66,5 @@
 $smarty->assign('team_to_delete', $team_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'admin_team_delete.tpl');
+$smarty->assign('content_page_name', 'admin_group_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 0efca4f6f..317624ab1 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -105,5 +105,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
-$smarty->assign('content_page_name', 'admin_team_edit.tpl');
+$smarty->assign('content_page_name', 'admin_group_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/admin_groups.php b/admin_groups.php
index a5521ad99..bccbb0583 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -37,5 +37,5 @@
 
 $smarty->assign('teams', ttGroupHelper::getTopGroups());
 $smarty->assign('title', $i18n->get('title.groups'));
-$smarty->assign('content_page_name', 'admin_teams.tpl');
+$smarty->assign('content_page_name', 'admin_groups.tpl');
 $smarty->display('index.tpl');

From de79fff47f10297d7df2edf34aa6420de71cde5b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Apr 2018 12:29:57 +0000
Subject: [PATCH 0115/1848] Some more refactoring.

---
 WEB-INF/templates/admin_group_add.tpl | 20 ++++++++++----------
 WEB-INF/templates/footer.tpl          |  2 +-
 admin_group_add.php                   | 13 +++++++------
 admin_group_delete.php                |  3 ++-
 admin_group_edit.php                  |  3 ++-
 admin_groups.php                      |  3 ++-
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/templates/admin_group_add.tpl b/WEB-INF/templates/admin_group_add.tpl
index 364b599b6..fd671e9c7 100644
--- a/WEB-INF/templates/admin_group_add.tpl
+++ b/WEB-INF/templates/admin_group_add.tpl
@@ -1,38 +1,38 @@
-{$forms.teamForm.open}
+{$forms.groupForm.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.teamForm.team_name.control}</td>
+          <td>{$forms.groupForm.group_name.control}</td>
         </tr>
         <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.teamForm.lang.control}</td>
+           <td>{$forms.groupForm.lang.control}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.teamForm.manager_name.control}</td>
+          <td>{$forms.groupForm.manager_name.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.teamForm.manager_login.control}</td>
+          <td>{$forms.groupForm.manager_login.control}</td>
         </tr>
 {if !$auth_external}
         <tr>
           <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.teamForm.password1.control}</td>
+          <td>{$forms.groupForm.password1.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.teamForm.password2.control}</td>
+          <td>{$forms.groupForm.password2.control}</td>
         </tr>
 {/if}
         <tr>
           <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.teamForm.manager_email.control}</td>
+          <td>{$forms.groupForm.manager_email.control}</td>
         </tr>
         <tr>
           <td></td>
@@ -40,10 +40,10 @@
         </tr>
         <tr><td colspan="2">&nbsp;</td></tr>
         <tr>
-          <td colspan="2" height="50" align="center">{$forms.teamForm.btn_submit.control}</td>
+          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_submit.control}</td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
-{$forms.teamForm.close}
+{$forms.groupForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5cc7edc47..abe93b446 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.17.86.4227 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4228 | 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/admin_group_add.php b/admin_group_add.php
index 3684d6cd4..21570a967 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -31,14 +31,15 @@
 import('ttUserHelper');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('administer_site')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
-  $cl_team_name = trim($request->getParameter('team_name'));
+  $cl_group_name = trim($request->getParameter('group_name'));
   $cl_lang = $request->getParameter('lang');
   $cl_manager_name = trim($request->getParameter('manager_name'));
   $cl_manager_login = trim($request->getParameter('manager_login'));
@@ -50,8 +51,8 @@
 } else
   $cl_lang = $i18n->lang; // Browser setting from initialize.php.
 
-$form = new Form('teamForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team_name));
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group_name));
 
 // Prepare an array of available languages.
 $lang_files = I18n::getLangFileList();
@@ -97,7 +98,7 @@
     'password1' => $cl_password1,
     'password2' => $cl_password2,
     'email' => $cl_manager_email,
-    'group_name' => $cl_team_name,
+    'group_name' => $cl_group_name,
     'currency' => CURRENCY_DEFAULT,
     'lang' => $cl_lang);
 
@@ -114,7 +115,7 @@
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');
+$smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('content_page_name', 'admin_group_add.tpl');
 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->display('index.tpl');
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 48e60c31c..476f5048e 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -30,11 +30,12 @@
 import('form.Form');
 import('ttTeamHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('administer_site')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $group_id = (int)$request->getParameter('id');
 $team_details = ttTeamHelper::getTeamDetails($group_id);
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 317624ab1..8779bc98d 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -31,11 +31,12 @@
 import('ttUserHelper');
 import('ttTeamHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('administer_site')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $group_id = $request->getParameter('id');
 $team_details = ttTeamHelper::getTeamDetails($group_id);
diff --git a/admin_groups.php b/admin_groups.php
index bccbb0583..fa5f51b21 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -29,11 +29,12 @@
 require_once('initialize.php');
 import('ttGroupHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('administer_site')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $smarty->assign('teams', ttGroupHelper::getTopGroups());
 $smarty->assign('title', $i18n->get('title.groups'));

From e5af7e8b92762ab25710235c72c5504de2e091c6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Apr 2018 12:44:09 +0000
Subject: [PATCH 0116/1848] Refactoring in admin_group_delete.php and .tpl.

---
 WEB-INF/templates/admin_group_delete.tpl | 10 +++++-----
 WEB-INF/templates/footer.tpl             |  2 +-
 admin_group_delete.php                   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/admin_group_delete.tpl b/WEB-INF/templates/admin_group_delete.tpl
index a8b0712f7..57164d4a8 100644
--- a/WEB-INF/templates/admin_group_delete.tpl
+++ b/WEB-INF/templates/admin_group_delete.tpl
@@ -1,20 +1,20 @@
-{$forms.teamForm.open}
+{$forms.groupForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
-          <td colspan="2" align="center"><b>{$team_to_delete|escape}</b></td>
+          <td colspan="2" align="center"><b>{$group_to_delete|escape}</b></td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
-          <td align="right">{$forms.teamForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.teamForm.btn_cancel.control}</td>
+          <td align="right">{$forms.groupForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.groupForm.btn_cancel.control}</td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
-{$forms.teamForm.close}
+{$forms.groupForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index abe93b446..dc988c90c 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.17.86.4228 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4229 | 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/admin_group_delete.php b/admin_group_delete.php
index 476f5048e..418b7fbb9 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -38,10 +38,10 @@
 // End of access checks.
 
 $group_id = (int)$request->getParameter('id');
-$team_details = ttTeamHelper::getTeamDetails($group_id);
-$team_name = $team_details['team_name'];
+$group_details = ttTeamHelper::getTeamDetails($group_id); // TODO: refactor this.
+$group_name = $group_details['team_name'];
 
-$form = new Form('teamForm');
+$form = new Form('groupForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
@@ -64,7 +64,7 @@
   }
 } // isPost
 
-$smarty->assign('team_to_delete', $team_name);
+$smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
 $smarty->assign('content_page_name', 'admin_group_delete.tpl');

From 09538ad1b33e506c716b09a8d55ec4f0ad8c4508 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Apr 2018 12:53:50 +0000
Subject: [PATCH 0117/1848] Refactoring in admin_group_edit files.

---
 WEB-INF/templates/admin_group_edit.tpl | 18 +++++++++---------
 WEB-INF/templates/footer.tpl           |  2 +-
 admin_group_edit.php                   | 26 +++++++++++++-------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/templates/admin_group_edit.tpl b/WEB-INF/templates/admin_group_edit.tpl
index fb7920453..4c52580eb 100644
--- a/WEB-INF/templates/admin_group_edit.tpl
+++ b/WEB-INF/templates/admin_group_edit.tpl
@@ -1,34 +1,34 @@
-{$forms.teamForm.open}
+{$forms.groupForm.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.teamForm.team_name.control}</td>
+          <td>{$forms.groupForm.group_name.control}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.teamForm.manager_name.control}</td>
+          <td>{$forms.groupForm.manager_name.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.teamForm.manager_login.control}</td>
+          <td>{$forms.groupForm.manager_login.control}</td>
         </tr>
 {if !$auth_external}
         <tr>
           <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.teamForm.password1.control}</td>
+          <td>{$forms.groupForm.password1.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.teamForm.password2.control}</td>
+          <td>{$forms.groupForm.password2.control}</td>
         </tr>
 {/if}
         <tr>
           <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.teamForm.manager_email.control}</td>
+          <td>{$forms.groupForm.manager_email.control}</td>
         </tr>
         <tr>
           <td></td>
@@ -36,10 +36,10 @@
         </tr>
         <tr><td colspan="2">&nbsp;</td></tr>
         <tr>
-          <td colspan="2" height="50" align="center">{$forms.teamForm.btn_save.control}&nbsp;{$forms.teamForm.btn_cancel.control}</td>
+          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control}&nbsp;{$forms.groupForm.btn_cancel.control}</td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
-{$forms.teamForm.close}
+{$forms.groupForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dc988c90c..5dba9ffaf 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.17.86.4229 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4230 | 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/admin_group_edit.php b/admin_group_edit.php
index 8779bc98d..a1157fbe3 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -39,10 +39,10 @@
 // End of access checks.
 
 $group_id = $request->getParameter('id');
-$team_details = ttTeamHelper::getTeamDetails($group_id);
+$group_details = ttTeamHelper::getTeamDetails($group_id);
 
 if ($request->isPost()) {
-  $cl_team_name = trim($request->getParameter('team_name'));
+  $cl_group_name = trim($request->getParameter('group_name'));
   $cl_manager_name = trim($request->getParameter('manager_name'));
   $cl_manager_login = trim($request->getParameter('manager_login'));
   if (!$auth->isPasswordExternal()) {
@@ -51,17 +51,17 @@
   }
   $cl_manager_email = trim($request->getParameter('manager_email'));
 } else {
-  $cl_team_name = $team_details['team_name'];
-  $cl_manager_name = $team_details['manager_name'];
-  $cl_manager_login = $team_details['manager_login'];
+  $cl_group_name = $group_details['team_name'];
+  $cl_manager_name = $group_details['manager_name'];
+  $cl_manager_login = $group_details['manager_login'];
   if (!$auth->isPasswordExternal()) {
     $cl_password1 = $cl_password2 = '';
   }
-  $cl_manager_email = $team_details['manager_email'];
+  $cl_manager_email = $group_details['manager_email'];
 }
 
-$form = new Form('teamForm');
-$form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'team_name','value'=>$cl_team_name));
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'group_name','value'=>$cl_group_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_login','value'=>$cl_manager_login));
 if (!$auth->isPasswordExternal()) {
@@ -77,11 +77,11 @@
   if ($request->getParameter('btn_save')) {
     // Create fields array for ttAdmin instance.
     $fields = array(
-      'old_group_name' => $team_details['team_name'],
-      'new_group_name' => $cl_team_name,
-      'user_id' => $team_details['manager_id'],
+      'old_group_name' => $group_details['team_name'],
+      'new_group_name' => $cl_group_name,
+      'user_id' => $group_details['manager_id'],
       'user_name' => $cl_manager_name,
-      'old_login' => $team_details['manager_login'],
+      'old_login' => $group_details['manager_login'],
       'new_login' => $cl_manager_login,
       'password1' => $cl_password1,
       'password2' => $cl_password2,
@@ -104,7 +104,7 @@
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
+$smarty->assign('onload', 'onLoad="document.groupForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
 $smarty->assign('content_page_name', 'admin_group_edit.tpl');
 $smarty->display('index.tpl');

From aa54f082eb63cdd420733b79c5ec8a8f02def11c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Apr 2018 13:15:12 +0000
Subject: [PATCH 0118/1848] More refactoring in admin files.

---
 WEB-INF/lib/ttAdmin.class.php      | 20 ++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php | 20 --------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 admin_group_delete.php             | 10 +++++-----
 admin_group_edit.php               | 10 ++++++----
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index f9b12c863..50bffb6fb 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -332,4 +332,24 @@ function updateSelf($fields) {
 
     return true;
   }
+
+  // getGroupDetails obtains group name and its top manager details.
+  function getGroupDetails($group_id) {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select g.name as group_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email".
+      " from tt_groups g".
+      " inner join tt_users u on (u.group_id = g.id)".
+      " inner join tt_roles r on (r.id = u.role_id and r.rank = 512)".
+      " where g.id = $group_id";
+
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val;
+    }
+
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 0093e9280..5091c1f9e 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -733,26 +733,6 @@ static function markDeleted($group_id) {
     return true;
   }
 
-  // The getTeamDetails function returns team details.
-  static function getTeamDetails($group_id) {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email
-      from tt_groups t
-      inner join tt_users u on (u.group_id = t.id)
-      inner join tt_roles r on (r.id = u.role_id and r.rank = 512)
-      where t.id = $group_id";
-
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val;
-    }
-
-    return false;
-  }
-
   // The insert function creates a new team.
   static function insert($fields) {
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5dba9ffaf..4479bc483 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.17.86.4230 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4231 | 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/admin_group_delete.php b/admin_group_delete.php
index 418b7fbb9..7c7df615a 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttAdmin');
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
@@ -38,8 +38,10 @@
 // End of access checks.
 
 $group_id = (int)$request->getParameter('id');
-$group_details = ttTeamHelper::getTeamDetails($group_id); // TODO: refactor this.
-$group_name = $group_details['team_name'];
+
+$admin = new ttAdmin();
+$group_details = $admin->getGroupDetails($group_id);
+$group_name = $group_details['group_name'];
 
 $form = new Form('groupForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
@@ -48,8 +50,6 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    import('ttAdmin');
-    $admin = new ttAdmin();
     $result = $admin->markGroupDeleted($group_id);
     if ($result) {
       header('Location: admin_groups.php');
diff --git a/admin_group_edit.php b/admin_group_edit.php
index a1157fbe3..6306bdd08 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
+import('ttAdmin');
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
@@ -39,7 +39,9 @@
 // End of access checks.
 
 $group_id = $request->getParameter('id');
-$group_details = ttTeamHelper::getTeamDetails($group_id);
+
+$admin = new ttAdmin();
+$group_details = $admin->getGroupDetails($group_id);
 
 if ($request->isPost()) {
   $cl_group_name = trim($request->getParameter('group_name'));
@@ -51,7 +53,7 @@
   }
   $cl_manager_email = trim($request->getParameter('manager_email'));
 } else {
-  $cl_group_name = $group_details['team_name'];
+  $cl_group_name = $group_details['group_name'];
   $cl_manager_name = $group_details['manager_name'];
   $cl_manager_login = $group_details['manager_login'];
   if (!$auth->isPasswordExternal()) {
@@ -77,7 +79,7 @@
   if ($request->getParameter('btn_save')) {
     // Create fields array for ttAdmin instance.
     $fields = array(
-      'old_group_name' => $group_details['team_name'],
+      'old_group_name' => $group_details['group_name'],
       'new_group_name' => $cl_group_name,
       'user_id' => $group_details['manager_id'],
       'user_name' => $cl_manager_name,

From 0290e13bb8429bb198c21fcb9129b5599a47428d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 10:57:22 +0000
Subject: [PATCH 0119/1848] Fixed invoice view.

---
 WEB-INF/templates/footer.tpl | 2 +-
 invoice_view.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4479bc483..b88511c6e 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.17.86.4231 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4232 | 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/invoice_view.php b/invoice_view.php
index fd8424a39..bfc672238 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -54,7 +54,7 @@
 if (!$client) // In case client was deleted.
   $client = ttClientHelper::getDeletedClient($invoice['client_id']);
 
-$invoice_items = ttInvoiceHelper::getInvoiceItems($cl_id);
+$invoice_items = ttInvoiceHelper::getInvoiceItems($cl_invoice_id);
 $tax_percent = $client['tax'];
 
 $subtotal = 0;

From cc1f9442f83ebfa3a67b917548ffd70cdba7bc9a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 11:20:07 +0000
Subject: [PATCH 0120/1848] More fixes to invoice view.

---
 WEB-INF/templates/footer.tpl | 2 +-
 invoice_view.php             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b88511c6e..ce8281a65 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.17.87.4232 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4233 | 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/invoice_view.php b/invoice_view.php
index bfc672238..22383c026 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -89,7 +89,7 @@
 
 $form = new Form('invoiceForm');
 // Hidden control for invoice id.
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
 // invoiceForm only contains controls for "Mark paid" block below invoice table.
 if ($user->isPluginEnabled('ps')) {
   $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
@@ -106,16 +106,16 @@
 
     // Determine user action.
     $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
-    ttInvoiceHelper::markPaid($cl_id, $mark_paid);
+    ttInvoiceHelper::markPaid($cl_invoice_id, $mark_paid);
 
     // Re-display this form.
-    header('Location: invoice_view.php?id='.$cl_id);
+    header('Location: invoice_view.php?id='.$cl_invoice_id);
     exit();
   }
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('invoice_id', $cl_id);
+$smarty->assign('invoice_id', $cl_invoice_id);
 $smarty->assign('invoice_name', $invoice['name']);
 $smarty->assign('invoice_date', $invoice_date->toString($user->date_format));
 $smarty->assign('client_name', $client['name']);

From 744db7fd043608e864f3db7c9cd1fe7efc55205e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 11:44:54 +0000
Subject: [PATCH 0121/1848] Some more refactoring.

---
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 invoice_view.php                 | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1267f4646..d907c6e95 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -496,7 +496,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importovat týmová data z xml souboru.',
+'form.import.hint' => 'Importovat týmová data z xml souboru.', // TODO: replace "team" with "group".
 'form.import.file' => 'Výběr souboru',
 'form.import.success' => 'Import byl úspěšně dokončen.',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 809532b45..4d94cccff 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -442,7 +442,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importer teamdata fra en xml-fil.',
+'form.import.hint' => 'Importer teamdata fra en xml-fil.', // TODO: replace "team" with "group".
 'form.import.file' => 'Vælg fil',
 'form.import.success' => 'Import sluttede med succes.',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8dd92ef98..eb5a64831 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -440,7 +440,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.',
+'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.', // TODO: replace "team" with "group".
 'form.import.file' => 'Datei auswählen',
 'form.import.success' => 'Import erfolgreich abgeschlossen.',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 68133c8f0..298a575f3 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -422,7 +422,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Import team data from an xml file.',
+'form.import.hint' => 'Import group data from an xml file.',
 'form.import.file' => 'Select file',
 'form.import.success' => 'Import completed successfully.',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a8c0a10ca..1187ed722 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -494,7 +494,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Impordi meeskonna andmed xml-failist.',
+'form.import.hint' => 'Impordi meeskonna andmed xml-failist.', // TODO: replace "team" with "group".
 'form.import.file' => 'Vali fail',
 'form.import.success' => 'Andmed imporditud.',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 1b744c6a9..3539f357b 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -469,7 +469,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'وارد کردن اطلاعات تیم از یک فایل xml',
+'form.import.hint' => 'وارد کردن اطلاعات تیم از یک فایل xml', // TODO: replace "team" with "group".
 'form.import.file' => 'انتخاب فایل',
 'form.import.success' => 'وارد کردن اطلاعات با موفقیت انجام شد',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d861b32b2..7ff1bc1e8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -450,7 +450,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Tuo tiimitiedot xml-tiedostosta.',
+'form.import.hint' => 'Tuo tiimitiedot xml-tiedostosta.', // TODO: replace "team" with "group".
 'form.import.file' => 'Valitse tiedosto',
 'form.import.success' => 'Tietojen tuonti onnistui.',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b499eea8c..1456edc60 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -439,7 +439,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importer les donnés des équipes depuis un fichier xml.',
+'form.import.hint' => 'Importer les donnés des équipes depuis un fichier xml.', // TODO: replace "team" with "group". Also, it's about 1 group, not many.
 'form.import.file' => 'Sélectionner le fichier',
 'form.import.success' => 'Importation réussie.',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ef4668800..6cfccd8e7 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -476,7 +476,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'ייבא נתוני צוות מתוך קובץ XML.',
+'form.import.hint' => 'ייבא נתוני צוות מתוך קובץ XML.', // TODO: replace "team" with "group".
 'form.import.file' => 'בחר קובץ',
 'form.import.success' => 'הייבוא הושלם בהצלחה.',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7f63a9cde..aad7afe62 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -490,7 +490,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'xmlファイルからチームのデータをインポート。',
+'form.import.hint' => 'xmlファイルからチームのデータをインポート。', // TODO: replace "team" with "group".
 'form.import.file' => 'ファイルの選択',
 'form.import.success' => 'インポートが成功的に完了されました。',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 8cafcde53..ca50b7e1b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -488,7 +488,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'xml 파일로부터 팀 데이터를 임포트.',
+'form.import.hint' => 'xml 파일로부터 팀 데이터를 임포트.', // TODO: replace "team" with "group".
 'form.import.file' => '파일 선택',
 'form.import.success' => '성과적으로 완료된 임포트.',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index f6496d250..9841116fe 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -420,7 +420,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importeer teamgegevens uit een xml bestand.',
+'form.import.hint' => 'Importeer teamgegevens uit een xml bestand.', // TODO: replace "team" with "group".
 'form.import.file' => 'Kies bestand',
 'form.import.success' => 'Importeren gelukt.',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6c0e0bff2..d6c6fbb1e 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -487,7 +487,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Import team data fra en xml fil.',
+'form.import.hint' => 'Import team data fra en xml fil.', // TODO: replace "team" with "group".
 'form.import.file' => 'Velg fil',
 'form.import.success' => 'Import gjennomført vellykket.',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e59d5809b..2c1210eac 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -452,7 +452,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Import danych zespołu z pliku xml.',
+'form.import.hint' => 'Import danych zespołu z pliku xml.', // TODO: replace "team" with "group".
 'form.import.file' => 'Wybierz plik',
 'form.import.success' => 'Import zakończony powodzeniem.',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 944870f3f..ad7d5d13a 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -447,7 +447,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importar dados de equipe de um arquivo xml.',
+'form.import.hint' => 'Importar dados de equipe de um arquivo xml.', // TODO: replace "team" with "group".
 'form.import.file' => 'Selecionar arquivo',
 'form.import.success' => 'Importação realizada com sucesso.',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8514a3682..a5139b78f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -471,7 +471,7 @@
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 // TODO: translate the following.
-// 'form.import.hint' => 'Import team data from an xml file.',
+// 'form.import.hint' => 'Import group data from an xml file.',
 // 'form.import.file' => 'Select file',
 // 'form.import.success' => 'Import completed successfully.',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index baf430bb6..9b068a7e0 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -492,7 +492,7 @@
 // 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importa date echipa dintr-un fisier xml.',
+'form.import.hint' => 'Importa date echipa dintr-un fisier xml.', // TODO: replace "team" with "group".
 'form.import.file' => 'Alege fisier',
 'form.import.success' => 'Importul s-a incheiat cu succes.',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e6d639d11..1399049a7 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -419,7 +419,7 @@
 'form.export.compression_bzip' => 'в формате bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Импортируйте данные команды из xml файла.',
+'form.import.hint' => 'Импортируйте данные группы из xml файла.',
 'form.import.file' => 'Укажите файл',
 'form.import.success' => 'Импорт успешно выполнен.',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 4d8cd9da3..8fed200f9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -467,7 +467,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importovať dáta o tíme z xml súboru.',
+'form.import.hint' => 'Importovať dáta o tíme z xml súboru.', // TODO: replace "team" with "group".
 'form.import.file' => 'Vyberte súbor',
 'form.import.success' => 'Import úspešne dokončený.',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 3609b46fe..8c006293a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -467,7 +467,7 @@
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
 // TODO: translate the following.
-// 'form.import.hint' => 'Import team data from an xml file.',
+// 'form.import.hint' => 'Import group data from an xml file.',
 // 'form.import.file' => 'Select file',
 // 'form.import.success' => 'Import completed successfully.',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f42f339f5..6aede0a0c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -451,7 +451,7 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Uvezi podatke timova iz xml fajla.',
+'form.import.hint' => 'Uvezi podatke timova iz xml fajla.', // TODO: replace "team" with "group".
 'form.import.file' => 'Odaberi datoteku',
 'form.import.success' => 'Uvoz uspešan.',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4774453b5..ad943a302 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -445,7 +445,7 @@
 'form.export.compression_bzip' => 'B-zip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
-'form.import.hint' => 'Importera arbetsgrupp från en XML-fil.',
+'form.import.hint' => 'Importera grupp från en XML-fil.',
 'form.import.file' => 'Välj fil',
 'form.import.success' => 'Importeringen lyckades utan problem.',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9359107ce..fcbd981ab 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -505,7 +505,7 @@
 // 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Ekip bilgileri bir xml dosyasından içe aktar.',
+'form.import.hint' => 'Ekip bilgileri bir xml dosyasından içe aktar.', // TODO: replace "team" with "group".
 'form.import.file' => 'Dosya seç',
 'form.import.success' => 'Içe aktarma başarıyla tamamlandı.',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b0d15aaa2..b1a1bdaa1 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -474,7 +474,7 @@
 'form.export.compression_bzip' => 'bzip格式',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => '从xml文件导入团队数据。',
+'form.import.hint' => '从xml文件导入团队数据。', // TODO: replace "team" with "group".
 'form.import.file' => '选择档',
 'form.import.success' => '成功完成导入。',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index ae6a09e6d..a070b1a28 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -482,7 +482,7 @@
 'form.export.compression_bzip' => 'bzip格式',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => '從xml檔導入團隊資料。',
+'form.import.hint' => '從xml檔導入團隊資料。', // TODO: replace "team" with "group".
 'form.import.file' => '選擇檔',
 'form.import.success' => '成功完成導入。',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ce8281a65..a4b7a7d03 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.17.87.4233 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4234 | 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/invoice_view.php b/invoice_view.php
index 22383c026..8168c3ad8 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -61,7 +61,7 @@
 $tax = 0;
 foreach($invoice_items as $item)
   $subtotal += $item['cost'];
-if ($tax_percent) {
+if ($tax_percent > 0) {
   $tax_expenses = $user->isPluginEnabled('et');
   foreach($invoice_items as $item) {
     if ($item['type'] == 2 && !$tax_expenses)

From 9b11ada8adfdfe888c50f799e6523c8df95d090f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 14:22:42 +0000
Subject: [PATCH 0122/1848] More refactoring.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/register.tpl | 22 +++++++++++-----------
 register.php                   | 10 +++++-----
 users.php                      |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4b7a7d03..0fc36c1cd 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.17.87.4234 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4235 | 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/register.tpl b/WEB-INF/templates/register.tpl
index 49fd2267e..96687797d 100644
--- a/WEB-INF/templates/register.tpl
+++ b/WEB-INF/templates/register.tpl
@@ -1,40 +1,40 @@
-{$forms.profileForm.open}
+{$forms.groupForm.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.profileForm.team_name.control}</td>
+          <td>{$forms.groupForm.group_name.control}</td>
         </tr>
         <tr>
           <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.profileForm.currency.control}</td>
+          <td>{$forms.groupForm.currency.control}</td>
         </tr>
         <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.profileForm.lang.control}</td>
+           <td>{$forms.groupForm.lang.control}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.profileForm.manager_name.control}</td>
+          <td>{$forms.groupForm.manager_name.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.profileForm.manager_login.control}</td>
+          <td>{$forms.groupForm.manager_login.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.profileForm.password1.control}</td>
+          <td>{$forms.groupForm.password1.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.profileForm.password2.control}</td>
+          <td>{$forms.groupForm.password2.control}</td>
         </tr>
         <tr>
           <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.profileForm.manager_email.control}</td>
+          <td>{$forms.groupForm.manager_email.control}</td>
         </tr>
         <tr>
           <td></td>
@@ -42,10 +42,10 @@
         </tr>
         <tr><td colspan="2">&nbsp;</td></tr>
         <tr>
-          <td colspan="2" height="50" align="center">{$forms.profileForm.btn_submit.control}</td>
+          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_submit.control}</td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
-{$forms.profileForm.close}
+{$forms.groupForm.close}
diff --git a/register.php b/register.php
index d1e9ff90e..4568e3709 100644
--- a/register.php
+++ b/register.php
@@ -39,7 +39,7 @@
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost()) {
-  $cl_team_name = trim($request->getParameter('team_name'));
+  $cl_group_name = trim($request->getParameter('group_name'));
   $cl_currency = trim($request->getParameter('currency'));
   if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
   $cl_lang = $request->getParameter('lang');
@@ -53,8 +53,8 @@
   $cl_lang = $i18n->lang; // Browser setting from initialize.php.
 }
 
-$form = new Form('profileForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team_name));
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group_name));
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
@@ -90,7 +90,7 @@
     'password1' => $cl_password1,
     'password2' => $cl_password2,
     'email' => $cl_manager_email,
-    'group_name' => $cl_team_name,
+    'group_name' => $cl_group_name,
     'currency' => $cl_currency,
     'lang' => $cl_lang);
 
@@ -113,6 +113,6 @@
 
 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.profileForm.team.focus()"');
+$smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('content_page_name', 'register.tpl');
 $smarty->display('index.tpl');
diff --git a/users.php b/users.php
index af5389021..d20617bca 100644
--- a/users.php
+++ b/users.php
@@ -52,7 +52,7 @@
   $inactive_users = $user->getUsers($options);
 }
 
-// Check if the team is set to show indicators for uncompleted time entries.
+// Check if the group is set to show indicators for uncompleted time entries.
 if ($user->uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {

From b8704d54af8a3c22f1c5a9ebe2e58a28678b7442 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 16:09:29 +0000
Subject: [PATCH 0123/1848] Updated readme.

---
 README.md                    | 4 ++--
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 239809895..d6a1d2d34 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Anuko Time Tracker
 
 ## About
-Anuko [Time Tracker](https://www.anuko.com/time_tracker/index.htm) is a simple, easy to use, open source, web-based time tracking application written in PHP. It allows you to track the time that employees, colleagues, or teammates spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
+Anuko [Time Tracker](https://www.anuko.com/time_tracker/index.htm) is a simple, easy to use, open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
 
 ## Free Hosting
-[Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time_tracker/free_hosting/index.htm) of Time Tracker to individuals and small teams up to 5 users. To start using Time Tracker immediately, create a team at https://timetracker.anuko.com
+[Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time_tracker/free_hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
 
 ## Resources
 * Project home page: https://www.anuko.com/time_tracker/index.htm
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0fc36c1cd..363491991 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.17.87.4235 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4236 | 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>

From 95356f167c97ca1a70fc78d91a9dbc7b1d258b31 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 17:02:03 +0000
Subject: [PATCH 0124/1848] More refactoring.

---
 WEB-INF/config.php.dist              | 9 ++-------
 WEB-INF/lib/ttAdmin.class.php        | 2 +-
 WEB-INF/lib/ttClientHelper.class.php | 4 ++--
 WEB-INF/lib/ttExportHelper.class.php | 8 ++++----
 WEB-INF/lib/ttTeamHelper.class.php   | 2 +-
 WEB-INF/lib/ttUser.class.php         | 4 ++--
 WEB-INF/templates/footer.tpl         | 2 +-
 WEB-INF/templates/header.tpl         | 2 +-
 group_edit.php                       | 2 +-
 invoice_send.php                     | 2 +-
 locking.php                          | 2 +-
 quotas.php                           | 2 +-
 12 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 8e9cf20f1..1218f7f65 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -42,11 +42,10 @@ define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8');
 // and now you see some corrupted characters. See http://dev.mysql.com/doc/refman/5.0/en/charset-mysql.html
 
 
-// MULTITEAM_MODE option defines whether users can create their own teams.
+// MULTITEAM_MODE option defines whether users can create their own top groups (organizations).
+// When false, a Time Tracker server is managed by admin, who creates top groups (one or many).
 //
 // Available values are true or false.
-// If true users can create their own teams.
-// If false only admin can create teams.
 //
 define('MULTITEAM_MODE', true);
 
@@ -208,7 +207,3 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
-
-// define('MANAGER_ONLY_TEAM_SETTINGS', true); // Note: temporary define, to be removed after introduction of role edits.
-                                               // Currently checked for "defined" only in profile_edit.tpl, meaning that false
-                                               // value here means the same thing.
\ No newline at end of file
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 50bffb6fb..30c78f94b 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -168,7 +168,7 @@ function markGroupDeleted($group_id) {
     // If we mark all of them deleted here, we can't recover nicely
     // as we'll lose track of what was deleted by user.
     //
-    // 2) DB maintenance script (Clean up DB from inactive teams) should
+    // 2) DB maintenance script (Clean up DB from inactive groups) should
     // get rid of these items permanently eventually.
 
     // Mark group deleted.
diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index f11edc90f..afa7afbd1 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -51,7 +51,7 @@ static function getClient($client_id, $all_fields = false) {
     return false;
   }
 
-  // getClients - returns an array of active and inactive clients in a team.
+  // getClients - returns an array of active and inactive clients in a group.
   static function getClients()
   {
     global $user;
@@ -241,7 +241,7 @@ static function update($fields)
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // The setMappedClient function is used during team import to change client_id value for tt_users to a mapped value.
+  // The setMappedClient function is used during group import to change client_id value for tt_users to a mapped value.
   static function setMappedClient($group_id, $imported_id, $mapped_id)
   {
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index c26937eb8..243ed3e1d 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -29,7 +29,7 @@
 import('ttTeamHelper');
 import('ttTimeHelper');
 
-// ttExportHelper - this class is used to export team data to a file.
+// ttExportHelper - this class is used to export group data to a file.
 class ttExportHelper {
   var $fileName    = null;    // Name of the file with data.
 
@@ -45,7 +45,7 @@ class ttExportHelper {
   var $customFieldOptionMap = array(); // Custop field option ids.
   var $logMap      = array(); // Time log ids.
 
-  // createDataFile creates a file with all data for a given team.
+  // createDataFile creates a file with all data for a given group.
   function createDataFile($compress = false) {
     global $user;
 
@@ -61,7 +61,7 @@ function createDataFile($compress = false) {
     fwrite($file, "<?xml version=\"1.0\"?>\n");
     fwrite($file, "<pack>\n");
 
-    // Write team info.
+    // Write group info.
     fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
       "\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
       "\" tracking_mode=\"".$user->tracking_mode."\" project_required=\"".$user->project_required."\" task_required=\"".$user->task_required.
@@ -69,7 +69,7 @@ function createDataFile($compress = false) {
       "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
       "\" config=\"".$user->config.
       "\">\n");
-    fwrite($file, "  <name><![CDATA[".$user->team."]]></name>\n");
+    fwrite($file, "  <name><![CDATA[".$user->group."]]></name>\n");
     fwrite($file, "</group>\n");
 
     // Prepare role map.
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 5091c1f9e..6920ab359 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -1100,7 +1100,7 @@ static function enablePlugin($plugin, $enable = true)
 
     $plugins = implode(',', $plugin_array);
     if ($plugins != $user->plugins) {
-      if (!ttTeamHelper::update($user->group_id, array('name' => $user->team,'plugins' => $plugins)))
+      if (!ttTeamHelper::update($user->group_id, array('name' => $user->group,'plugins' => $plugins)))
         return false;
       $user->plugins = $plugins;
     }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e3de5b4ca..dfcd1a6bf 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -57,7 +57,7 @@ class ttUser {
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
-  var $team = null;             // Team name.
+  var $group = null;            // Group name.
   var $custom_logo = 0;         // Whether to use a custom logo for team.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
@@ -113,7 +113,7 @@ function __construct($login, $id = null) {
       $this->record_type = $val['record_type'];
       $this->bcc_email = $val['bcc_email'];
       $this->allow_ip = $val['allow_ip'];
-      $this->team = $val['group_name'];
+      $this->group = $val['group_name'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 363491991..0487798ed 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.17.87.4236 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4237 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 2752dc42f..aa59d3fff 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -158,7 +158,7 @@
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
   {if $user->name}
-        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
+        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->group}, {$user->group|escape}{/if}</td></tr>
   {else}
         <tr><td>&nbsp;</td></tr>
   {/if}
diff --git a/group_edit.php b/group_edit.php
index 6ec572e98..b5deee87e 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -76,7 +76,7 @@
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
 } else {
-  $cl_team = $user->team;
+  $cl_team = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
   $cl_lang = $user->lang;
   $cl_decimal_mark = $user->decimal_mark;
diff --git a/invoice_send.php b/invoice_send.php
index 20c3c1870..ca76f34bb 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -58,7 +58,7 @@
 } else {
   $cl_receiver = $sc->getValue(SYSC_LAST_INVOICE_EMAIL);
   $cl_cc = $sc->getValue(SYSC_LAST_INVOICE_CC);
-  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->team;
+  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->group;
 }
 
 $form = new Form('mailForm');
diff --git a/locking.php b/locking.php
index 99e79a217..2de307ee3 100644
--- a/locking.php
+++ b/locking.php
@@ -52,7 +52,7 @@
 
   if ($err->no()) {
     if (ttTeamHelper::update($user->group_id, array(
-      'name' => $user->team,
+      'name' => $user->group,
       'lock_spec' => $cl_lock_spec))) {
       header('Location: profile_edit.php');
       exit();
diff --git a/quotas.php b/quotas.php
index 8e6f59c4d..a453099e9 100644
--- a/quotas.php
+++ b/quotas.php
@@ -90,7 +90,7 @@
     // Handle workday hours.
     $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
     if ($workday_minutes != $user->workday_minutes) {
-      if (!ttTeamHelper::update($user->group_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))
+      if (!ttTeamHelper::update($user->group_id, array('name'=>$user->group,'workday_minutes'=>$workday_minutes)))
         $err->add($i18n->get('error.db'));
     }
 

From 0282363535e651129be0f07ecd1a5390b01c8b85 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 21:26:40 +0000
Subject: [PATCH 0125/1848] A bit more refactoring.

---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/group_edit.tpl |  2 +-
 group_edit.php                   | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0487798ed..8f7ae1b03 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.17.87.4237 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4238 | 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 0aff38535..35e76046a 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -105,7 +105,7 @@ function handlePluginCheckboxes() {
 {if $user->can('manage_basic_settings')}
           <tr>
             <td align="right" nowrap>{$i18n.label.group_name}:</td>
-            <td>{$forms.groupForm.team_name.control}</td>
+            <td>{$forms.groupForm.group_name.control}</td>
           </tr>
           <tr>
             <td align="right">{$i18n.label.currency}:</td>
diff --git a/group_edit.php b/group_edit.php
index b5deee87e..64a153099 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -42,7 +42,7 @@
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost()) {
-  $cl_team = trim($request->getParameter('team_name'));
+  $cl_group = trim($request->getParameter('group_name'));
   $cl_currency = trim($request->getParameter('currency'));
   if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
   $cl_lang = $request->getParameter('lang');
@@ -76,7 +76,7 @@
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
 } else {
-  $cl_team = $user->group;
+  $cl_group = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
   $cl_lang = $user->lang;
   $cl_decimal_mark = $user->decimal_mark;
@@ -112,7 +112,7 @@
 }
 
 $form = new Form('groupForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team,'enable'=>$advanced_settings));
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
@@ -211,7 +211,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
+  if (!ttValidString($cl_group, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
   if ($advanced_settings) {
     if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
@@ -274,7 +274,7 @@
       $config = trim($config, ',');
 
       $update_result = ttTeamHelper::update($user->group_id, array(
-        'name' => $cl_team,
+        'name' => $cl_group,
         'currency' => $cl_currency,
         'lang' => $cl_lang,
         'decimal_mark' => $cl_decimal_mark,

From cd8dafc45402126fed025ee97930f03386655763 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Apr 2018 21:58:08 +0000
Subject: [PATCH 0126/1848] Changed redirect after configuring record locking.

---
 WEB-INF/templates/footer.tpl | 2 +-
 locking.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8f7ae1b03..a47ecc9e1 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.17.87.4238 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4239 | 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/locking.php b/locking.php
index 2de307ee3..8aae756d7 100644
--- a/locking.php
+++ b/locking.php
@@ -54,7 +54,7 @@
     if (ttTeamHelper::update($user->group_id, array(
       'name' => $user->group,
       'lock_spec' => $cl_lock_spec))) {
-      header('Location: profile_edit.php');
+      header('Location: group_edit.php');
       exit();
     } else {
       $err->add($i18n->get('error.db'));

From b0adefe1eed972a27be939b6c66aec6c3c6b2f18 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 7 Apr 2018 10:47:24 +0000
Subject: [PATCH 0127/1848] Cleanup.

---
 WEB-INF/lib/ttUser.class.php |  2 +-
 WEB-INF/templates/footer.tpl |  2 +-
 initialize.php               | 25 -------------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index dfcd1a6bf..2fb7caa14 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -148,7 +148,7 @@ function can($do_something) {
     return in_array($do_something, $this->rights);
   }
 
-  // isAdmin - determines whether current user is admin (has right_administer_site).
+  // isAdmin - determines whether current user is admin.
   function isAdmin() {
     return $this->can('administer_site');
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a47ecc9e1..86c58ed2d 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.17.87.4239 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4240 | 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/initialize.php b/initialize.php
index 261ec7479..795408507 100644
--- a/initialize.php
+++ b/initialize.php
@@ -125,31 +125,6 @@
 define('TYPE_START_FINISH', 1); // Time record has start and finish times.
 define('TYPE_DURATION', 2); // Time record has only duration, no start and finish times.
 
-// TODO: redesign of user rights and roles is currently ongoing.
-// As we run our of bits for sure at some point, rights should be strings instead,
-// for example: "data_entry".
-// Also, we need rights editor page and team-customized roles.
-// Move this stuff from here to ttUser class.
-//
-// User access rights - bits that collectively define an access mask to the system (a role).
-// We'll have some bits here (1,2, etc...) reserved for future use.
-define('right_data_entry', 4);     // Right to enter work hours and expenses.
-define('right_view_charts', 8);    // Right to view charts.
-define('right_view_reports', 16);  // Right to view reports.
-define('right_view_invoices', 32); // Right to view invoices.
-define('right_manage_team', 64);   // Right to manage team. Note that this is not full access to team.
-define('right_assign_roles', 128); // Right to assign user roles.
-define('right_export_team', 256);  // Right to export team data to a file.
-define('right_administer_site', 1024); // Admin account right to manage the application as a whole. 
-
-// User roles.
-define('ROLE_USER', 4);          // Regular user.
-define('ROLE_CLIENT', 16);       // Client (to view reports and invoices).
-define('ROLE_COMANAGER', 68);    // Team co-manager. Can do many things but not as much as team manager.
-define('ROLE_MANAGER', 324);     // Team manager. Can do everything for a team.
-define('ROLE_SITE_ADMIN', 1024); // Site administrator.
-
-
 define('CHARSET', 'utf-8');
 
 date_default_timezone_set(@date_default_timezone_get());

From ce2bb98acb1f5e2a846f95b798a4af409c842ebb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 7 Apr 2018 14:58:23 +0000
Subject: [PATCH 0128/1848] Fixed visibility of the Required checkbox on group
 settings.

---
 WEB-INF/lib/ttTeamHelper.class.php | 49 +-----------------------------
 WEB-INF/lib/ttUser.class.php       | 37 ++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/group_edit.tpl   |  2 +-
 group_edit.php                     |  2 +-
 locking.php                        |  4 +--
 quotas.php                         |  2 +-
 7 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6920ab359..b22e8b5f9 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -833,53 +833,6 @@ static function insert($fields) {
     return false;
   }
 
-  // The update function updates team information.
-  static function update($group_id, $fields)
-  {
-    global $user;
-    $mdb2 = getConnection();
-    $name_part = 'name = '.$mdb2->quote($fields['name']);
-    $currency_part = '';
-    $lang_part = '';
-    $decimal_mark_part = '';
-    $date_format_part = '';
-    $time_format_part = '';
-    $week_start_part = '';
-    $tracking_mode_part = '';
-    $task_required_part = ' , task_required = '.(int) $fields['task_required'];
-    $record_type_part = '';
-    $bcc_email_part = '';
-    $allow_ip = '';
-    $plugins_part = '';
-    $config_part = '';
-    $lock_spec_part = '';
-    $workday_minutes_part = '';
-
-    if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
-    if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
-    if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
-    if (isset($fields['date_format'])) $date_format_part = ', date_format = '.$mdb2->quote($fields['date_format']);
-    if (isset($fields['time_format'])) $time_format_part = ', time_format = '.$mdb2->quote($fields['time_format']);
-    if (isset($fields['week_start'])) $week_start_part = ', week_start = '.(int) $fields['week_start'];
-    if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.(int) $fields['tracking_mode'];
-    if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type'];
-    if (isset($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']);
-    if (isset($fields['allow_ip'])) $allow_ip_part = ', allow_ip = '.$mdb2->quote($fields['allow_ip']);
-    if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
-    if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
-    if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
-    if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-
-    $sql = "update tt_groups set $name_part $currency_part $lang_part $decimal_mark_part
-      $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
-      $bcc_email_part $allow_ip_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return true;
-  }
-
   // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100).
   static function getInactiveTeams() {
     $inactive_teams = array();
@@ -1100,7 +1053,7 @@ static function enablePlugin($plugin, $enable = true)
 
     $plugins = implode(',', $plugin_array);
     if ($plugins != $user->plugins) {
-      if (!ttTeamHelper::update($user->group_id, array('name' => $user->group,'plugins' => $plugins)))
+      if (!$user->updateGroup(array('plugins' => $plugins)))
         return false;
       $user->plugins = $plugins;
     }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2fb7caa14..ae197c698 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -413,4 +413,41 @@ function adjustBehalfId() {
     }
     return false;
   }
+
+  // updateGroup updates group information with new data.
+  function updateGroup($fields) {
+
+    $mdb2 = getConnection();
+
+    if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
+    if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
+    if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
+    if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
+    if (isset($fields['date_format'])) $date_format_part = ', date_format = '.$mdb2->quote($fields['date_format']);
+    if (isset($fields['time_format'])) $time_format_part = ', time_format = '.$mdb2->quote($fields['time_format']);
+    if (isset($fields['week_start'])) $week_start_part = ', week_start = '.(int) $fields['week_start'];
+    if (isset($fields['tracking_mode'])) {
+      $tracking_mode_part = ', tracking_mode = '.(int) $fields['tracking_mode'];
+      $project_required_part = ' , project_required = '.(int) $fields['project_required'];
+      $task_required_part = ' , task_required = '.(int) $fields['task_required'];
+    }
+    if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type'];
+    if (isset($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']);
+    if (isset($fields['allow_ip'])) $allow_ip_part = ', allow_ip = '.$mdb2->quote($fields['allow_ip']);
+    if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
+    if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
+    if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
+    if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
+
+    $parts = trim($name_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
+      $time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
+      $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$workday_minutes_part.$modified_part, ',');
+
+    $sql = "update tt_groups set $parts where id = $this->group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 86c58ed2d..ac4aadba2 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.17.87.4240 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4241 | 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 35e76046a..7cb8d2e69 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -142,7 +142,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.profile.tracking_mode}:</td>
-            <td>{$forms.groupForm.tracking_mode.control} {$forms.profileForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
+            <td>{$forms.groupForm.tracking_mode.control} {$forms.groupForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.profile.record_type}:</td>
diff --git a/group_edit.php b/group_edit.php
index 64a153099..cc27afae2 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -273,7 +273,7 @@
         $config .= ',uncompleted_indicators';
       $config = trim($config, ',');
 
-      $update_result = ttTeamHelper::update($user->group_id, array(
+      $update_result = $user->updateGroup(array(
         'name' => $cl_group,
         'currency' => $cl_currency,
         'lang' => $cl_lang,
diff --git a/locking.php b/locking.php
index 8aae756d7..94996ada3 100644
--- a/locking.php
+++ b/locking.php
@@ -51,9 +51,7 @@
   if (!ttValidCronSpec($cl_lock_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
 
   if ($err->no()) {
-    if (ttTeamHelper::update($user->group_id, array(
-      'name' => $user->group,
-      'lock_spec' => $cl_lock_spec))) {
+    if ($user->updateGroup(array('lock_spec' => $cl_lock_spec))) {
       header('Location: group_edit.php');
       exit();
     } else {
diff --git a/quotas.php b/quotas.php
index a453099e9..ac6542f5e 100644
--- a/quotas.php
+++ b/quotas.php
@@ -90,7 +90,7 @@
     // Handle workday hours.
     $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
     if ($workday_minutes != $user->workday_minutes) {
-      if (!ttTeamHelper::update($user->group_id, array('name'=>$user->group,'workday_minutes'=>$workday_minutes)))
+      if (!$user->updateGroup(array('workday_minutes'=>$workday_minutes)))
         $err->add($i18n->get('error.db'));
     }
 

From 2e2c4428476aebac3f30d481980d0c7f9614c5c0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 7 Apr 2018 15:46:03 +0000
Subject: [PATCH 0129/1848] Moved enablePlugin to ttUser class.

---
 WEB-INF/lib/ttTeamHelper.class.php | 27 --------------------------
 WEB-INF/lib/ttUser.class.php       | 31 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 week_view.php                      |  6 +++---
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b22e8b5f9..3bb716563 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -1033,31 +1033,4 @@ static function deleteCustomFields($group_id) {
 
     return true;
   }
-
-  // enablePlugin either enables or disables a specific plugin for team.
-  static function enablePlugin($plugin, $enable = true)
-  {
-    global $user;
-    if (!$user->can('manage_features'))
-      return false;
-
-    $plugin_array = explode(',', $user->plugins);
-    if ($enable && !in_array($plugin, $plugin_array))
-      $plugin_array[] = $plugin; // Add plugin to array.
-
-    if (!$enable && in_array($plugin, $plugin_array)) {
-      $key = array_search($plugin, $plugin_array);
-      if ($key !== false)
-        unset($plugin_array[$key]); // Remove plugin from array.
-    }
-
-    $plugins = implode(',', $plugin_array);
-    if ($plugins != $user->plugins) {
-      if (!$user->updateGroup(array('plugins' => $plugins)))
-        return false;
-      $user->plugins = $plugins;
-    }
-
-    return true;
-  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ae197c698..cbfd62d1a 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -416,6 +416,9 @@ function adjustBehalfId() {
 
   // updateGroup updates group information with new data.
   function updateGroup($fields) {
+    if (!($this->can('manage_basic_settings') ||
+      $this->can('manage_advanced_settings') ||
+      $this->can('manage_features'))) return false;
 
     $mdb2 = getConnection();
 
@@ -450,4 +453,32 @@ function updateGroup($fields) {
 
     return true;
   }
+
+  // enablePlugin either enables or disables a specific plugin for group.
+  function enablePlugin($plugin, $enable = true)
+  {
+    if (!$this->can('manage_advanced_settings'))
+      return false; // Note: enablePlugin is currently only used on week_view.php.
+                    // So, it's not really a plugin we are enabling, but rather week view display options.
+                    // Therefore, a check for manage_advanced_settings, not manage_features.
+
+    $plugin_array = explode(',', $this->plugins);
+    if ($enable && !in_array($plugin, $plugin_array))
+      $plugin_array[] = $plugin; // Add plugin to array.
+
+    if (!$enable && in_array($plugin, $plugin_array)) {
+      $key = array_search($plugin, $plugin_array);
+      if ($key !== false)
+        unset($plugin_array[$key]); // Remove plugin from array.
+    }
+
+    $plugins = implode(',', $plugin_array);
+    if ($plugins != $this->plugins) {
+      if (!$this->updateGroup(array('plugins' => $plugins)))
+        return false;
+      $this->plugins = $plugins;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ac4aadba2..1ce30a99a 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.17.87.4241 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4242 | 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/week_view.php b/week_view.php
index e5ec14796..38b753a15 100644
--- a/week_view.php
+++ b/week_view.php
@@ -59,9 +59,9 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
-  if (!ttTeamHelper::enablePlugin('wvn', $cl_week_note) ||
-      !ttTeamHelper::enablePlugin('wvl', $cl_week_list) ||
-      !ttTeamHelper::enablePlugin('wvns', $cl_notes)) {
+  if (!$user->enablePlugin('wvn', $cl_week_note) ||
+      !$user->enablePlugin('wvl', $cl_week_list) ||
+      !$user->enablePlugin('wvns', $cl_notes)) {
     $err->add($i18n->get('error.db'));
   }
 }

From 89fb789af54e5842342ef676fab13da4ab0b1098 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 9 Apr 2018 02:15:34 +0000
Subject: [PATCH 0130/1848] A bit of refactoring.

---
 WEB-INF/lib/ttExportHelper.class.php  |  4 +-
 WEB-INF/lib/ttProjectHelper.class.php | 22 ++++----
 WEB-INF/lib/ttRoleHelper.class.php    |  4 +-
 WEB-INF/lib/ttTaskHelper.class.php    | 18 +++---
 WEB-INF/lib/ttTeamHelper.class.php    | 80 +++++++++++++--------------
 WEB-INF/templates/footer.tpl          |  2 +-
 6 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 243ed3e1d..d969b44a6 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -375,7 +375,7 @@ function compress($in, $out) {
    * and we don't want to over-complicate things.
    */
 
-  // getRoles - obtains all roles defined for team.
+  // getRoles - obtains all roles defined for group.
   function getRoles() {
     global $user;
     $mdb2 = getConnection();
@@ -393,7 +393,7 @@ function getRoles() {
     return false;
   }
 
-  // The getUsers obtains all users in team for the purpose of export.
+  // The getUsers obtains all users in group for the purpose of export.
   function getUsers() {
     global $user;
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index ff154af45..174a31cea 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -74,7 +74,7 @@ static function getRates($user_id)
     return $result;
   }
   
-  // getProjects - returns an array of active and inactive projects in a team.
+  // getProjects - returns an array of active and inactive projects in group.
   static function getProjects()
   {
     global $user;
@@ -94,19 +94,19 @@ static function getProjects()
     return $result;
   }
 
-  // getProjectsForClient - returns an array of active and inactive projects in a team for a client.
+  // getProjectsForClient - returns an array of active and inactive projects in a group for a client.
   static function getProjectsForClient()
   {
-  	global $user;
-  	  	
-  	$result = array();
+    global $user;
+
+    $result = array();
     $mdb2 = getConnection();
-    
-    $sql = "select p.id, p.name, p.tasks from tt_projects p
-	  inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)
-	  where p.group_id = $user->group_id and (p.status = 0 or p.status = 1)
-      order by p.name";  	
-        
+
+    $sql = "select p.id, p.name, p.tasks from tt_projects p".
+      " inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)".
+      " where p.group_id = $user->group_id and (p.status = 0 or p.status = 1)".
+      " order by p.name";
+
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index f36427afa..9dce54885 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -173,7 +173,7 @@ static function insert($fields)
     return $last_id;
   }
 
-  // createPredefinedRoles - creates a set of predefined roles for the team to use.
+  // createPredefinedRoles - creates a set of predefined roles for a group to use.
   static function createPredefinedRoles($group_id, $lang)
   {
     // We need localized role names and a new I18n object to obtain them.
@@ -234,7 +234,7 @@ static function createPredefinedRoles($group_id, $lang)
     return true;
   }
 
-  // createDefaultRoles - creates a set of predefined roles for the team to use.
+  // createDefaultRoles - creates a set of predefined roles for a group to use.
   static function createDefaultRoles()
   {
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index e09c882d3..b02271b95 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -184,7 +184,7 @@ static function insert($fields)
     return $last_id;
   }
  
- // update function updates a task in the database.
+  // update function updates a task in the database.
   static function update($fields)
   {
     global $user;
@@ -219,7 +219,7 @@ static function update($fields)
     // Handle task binds in the tasks field of the tt_projects table.
     // We need to either delete or insert task id in all affected projects.
     
-    // Get all not deleted projects for team.
+    // Get all not deleted projects for group.
     $sql = "select id, tasks from tt_projects where group_id = $user->group_id and status is not NULL";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
@@ -237,14 +237,14 @@ static function update($fields)
       	  if ($task_ids) {
             $task_ids .= ",$task_id";
             $task_ids = ttTaskHelper::sort($task_ids);
-		  } else
-		  	$task_ids = $task_id;
+        } else
+          $task_ids = $task_id;
 
-		 $sql = "update tt_projects set tasks = ".$mdb2->quote($task_ids)." where id = $project_id";
-		 $affected = $mdb2->exec($sql);
-		 if (is_a($affected, 'PEAR_Error'))
-           die($affected->getMessage());
-		}
+        $sql = "update tt_projects set tasks = ".$mdb2->quote($task_ids)." where id = $project_id";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+          die($affected->getMessage());
+        }
       } else {
       	// Task needs to be removed from this project.
         if (in_array($task_id, $task_arr)) {
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 3bb716563..092c737ab 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -30,10 +30,10 @@
 import('DateAndTime');
 import('ttInvoiceHelper');
 
-// Class ttTeamHelper - contains helper functions that operate with teams.
+// Class ttTeamHelper - contains helper functions that operate with groups.
 class ttTeamHelper {
 
-  // The getUserCount function returns number of people in team.
+  // The getUserCount function returns number of active users in a group.
   static function getUserCount($group_id) {
     $mdb2 = getConnection();
 
@@ -47,17 +47,17 @@ static function getUserCount($group_id) {
     return false;
   }
 
-  // The getUsersForClient obtains all active and inactive users in a team that are relevant to a client.
+  // The getUsersForClient obtains all active and inactive users in a group that are relevant to a client.
   static function getUsersForClient() {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select u.id, u.name from tt_user_project_binds upb
-      inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)
-      inner join tt_users u on (u.id = upb.user_id)
-      where (u.status = 1 or u.status = 0)
-      group by u.id
-      order by upper(u.name)";
+    $sql = "select u.id, u.name from tt_user_project_binds upb".
+      " inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)".
+      " inner join tt_users u on (u.id = upb.user_id)".
+      " where (u.status = 1 or u.status = 0)".
+      " group by u.id".
+      " order by upper(u.name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
@@ -68,7 +68,7 @@ static function getUsersForClient() {
     return $user_list;
   }
 
-  // The getActiveUsers obtains all active users in a given team.
+  // The getActiveUsers obtains all active users in a given group.
   static function getActiveUsers($options = null) {
     global $user;
     global $i18n;
@@ -153,7 +153,7 @@ static function getUsersForSwap() {
     return $user_list;
   }
 
-    // The getUsers obtains all active and inactive (but not deleted) users in a given team.
+  // The getUsers obtains all active and inactive (but not deleted) users in a group.
   static function getUsers() {
     global $user;
     $mdb2 = getConnection();
@@ -168,7 +168,7 @@ static function getUsers() {
     return $user_list;
   }
 
-  // The getInactiveUsers obtains all inactive users in a given team.
+  // The getInactiveUsers obtains all inactive users in a group.
   static function getInactiveUsers($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
@@ -187,7 +187,7 @@ static function getInactiveUsers($group_id, $all_fields = false) {
     return false;
   }
 
-  // The getAllUsers obtains all users in a given team.
+  // The getAllUsers obtains all users in a group.
   static function getAllUsers($group_id, $all_fields = false) {
     $mdb2 = getConnection();
     if ($all_fields)
@@ -205,7 +205,7 @@ static function getAllUsers($group_id, $all_fields = false) {
     return false;
   }
 
-  // getActiveProjects - returns an array of active projects for team.
+  // getActiveProjects - returns an array of active projects for a group.
   static function getActiveProjects($group_id)
   {
     $result = array();
@@ -223,7 +223,7 @@ static function getActiveProjects($group_id)
     return $result;
   }
 
-  // getInactiveProjects - returns an array of inactive projects for team.
+  // getInactiveProjects - returns an array of inactive projects for a group.
   static function getInactiveProjects($group_id)
   {
     $result = array();
@@ -241,7 +241,7 @@ static function getInactiveProjects($group_id)
     return $result;
   }
 
-  // The getAllProjects obtains all projects in a given team.
+  // The getAllProjects obtains all projects in a group.
   static function getAllProjects($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
@@ -260,7 +260,7 @@ static function getAllProjects($group_id, $all_fields = false) {
     return false;
   }
 
-  // getActiveTasks - returns an array of active tasks for team.
+  // getActiveTasks - returns an array of active tasks for a group.
   static function getActiveTasks($group_id)
   {
     $result = array();
@@ -277,7 +277,7 @@ static function getActiveTasks($group_id)
     return $result;
   }
 
-  // getInactiveTasks - returns an array of inactive tasks for team.
+  // getInactiveTasks - returns an array of inactive tasks for a group.
   static function getInactiveTasks($group_id)
   {
     $result = array();
@@ -295,7 +295,7 @@ static function getInactiveTasks($group_id)
     return $result;
   }
 
-  // The getAllTasks obtains all tasks in a given team.
+  // The getAllTasks obtains all tasks in a group.
   static function getAllTasks($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
@@ -336,7 +336,7 @@ static function getActiveRolesForUser()
     return $result;
   }
 
-  // getActiveRoles - returns an array of active roles for team.
+  // getActiveRoles - returns an array of active roles for a group.
   static function getActiveRoles($group_id)
   {
     $result = array();
@@ -347,7 +347,7 @@ static function getActiveRoles($group_id)
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $val['is_client'] = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have data entry right.
+        $val['is_client'] = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have track_own_time right.
         $result[] = $val;
       }
     }
@@ -394,7 +394,7 @@ static function getInactiveRolesForUser()
     return $result;
   }
 
-  // The getActiveClients returns an array of active clients for team.
+  // The getActiveClients returns an array of active clients for a group.
   static function getActiveClients($group_id, $all_fields = false)
   {
     $result = array();
@@ -415,7 +415,7 @@ static function getActiveClients($group_id, $all_fields = false)
     return $result;
   }
 
-  // The getInactiveClients returns an array of inactive clients for team.
+  // The getInactiveClients returns an array of inactive clients for a group.
   static function getInactiveClients($group_id, $all_fields = false)
   {
     $result = array();
@@ -436,7 +436,7 @@ static function getInactiveClients($group_id, $all_fields = false)
     return $result;
   }
 
-  // The getAllClients obtains all clients in a given team.
+  // The getAllClients obtains all clients in a group.
   static function getAllClients($group_id, $all_fields = false) {
     $mdb2 = getConnection();
 
@@ -456,7 +456,7 @@ static function getAllClients($group_id, $all_fields = false) {
     return false;
   }
 
-  // The getActiveInvoices returns an array of active invoices for team.
+  // The getActiveInvoices returns an array of active invoices for a group.
   static function getActiveInvoices($localizeDates = true)
   {
     global $user;
@@ -488,7 +488,7 @@ static function getActiveInvoices($localizeDates = true)
     return $result;
   }
 
-  // The getAllInvoices returns an array of all invoices for team.
+  // The getAllInvoices returns an array of all invoices for a group.
   static function getAllInvoices()
   {
     global $user;
@@ -531,7 +531,7 @@ static function getRecentInvoices($group_id, $client_id)
     return $result;
   }
 
-  // getUserToProjectBinds - obtains all user to project binds for a team.
+  // getUserToProjectBinds - obtains all user to project binds for a group.
   static function getUserToProjectBinds($group_id) {
     $mdb2 = getConnection();
 
@@ -548,7 +548,7 @@ static function getUserToProjectBinds($group_id) {
     return false;
   }
 
-  // The getAllCustomFields obtains all custom fields in a given team.
+  // The getAllCustomFields obtains all custom fields in a group.
   static function getAllCustomFields($group_id) {
     $mdb2 = getConnection();
 
@@ -565,7 +565,7 @@ static function getAllCustomFields($group_id) {
     return false;
   }
 
-  // The getAllCustomFieldOptions obtains all custom field options in a given team.
+  // The getAllCustomFieldOptions obtains all custom field options in a group.
   static function getAllCustomFieldOptions($group_id) {
     $mdb2 = getConnection();
 
@@ -582,7 +582,7 @@ static function getAllCustomFieldOptions($group_id) {
     return false;
   }
 
-  // The getCustomFieldLog obtains all custom field log entries for a given team.
+  // The getCustomFieldLog obtains all custom field log entries for a group.
   static function getCustomFieldLog($group_id) {
     $mdb2 = getConnection();
 
@@ -599,7 +599,7 @@ static function getCustomFieldLog($group_id) {
     return false;
   }
 
-  // getFavReports - obtains all favorite reports for all users in team.
+  // getFavReports - obtains all favorite reports for all users in a group.
   static function getFavReports($group_id) {
     $mdb2 = getConnection();
 
@@ -616,7 +616,7 @@ static function getFavReports($group_id) {
     return false;
   }
 
-  // getExpenseItems - obtains all expense items for all users in team.
+  // getExpenseItems - obtains all expense items for all users in a group.
   static function getExpenseItems($group_id) {
     $mdb2 = getConnection();
 
@@ -633,7 +633,7 @@ static function getExpenseItems($group_id) {
     return false;
   }
 
-  // getPredefinedExpenses - obtains predefined expenses for team.
+  // getPredefinedExpenses - obtains predefined expenses for a group.
   static function getPredefinedExpenses($group_id) {
     global $user;
     $replaceDecimalMark = ('.' != $user->decimal_mark);
@@ -655,7 +655,7 @@ static function getPredefinedExpenses($group_id) {
     return false;
   }
 
-  // getNotifications - obtains notification descriptions for team.
+  // getNotifications - obtains notification descriptions for a group.
   static function getNotifications($group_id) {
     $mdb2 = getConnection();
 
@@ -674,7 +674,7 @@ static function getNotifications($group_id) {
     return false;
   }
 
-  // getMonthlyQuotas - obtains monthly quotas for team.
+  // getMonthlyQuotas - obtains monthly quotas for a group.
   static function getMonthlyQuotas($group_id) {
     $mdb2 = getConnection();
 
@@ -691,10 +691,10 @@ static function getMonthlyQuotas($group_id) {
     return false;
   }
 
-  // The markDeleted function marks the team and everything in it as deleted.
+  // The markDeleted function marks the group and everything in it as deleted.
   static function markDeleted($group_id) {
 
-    // Iterate through team users and mark them as deleted.
+    // Iterate through group users and mark them as deleted.
     $users = ttTeamHelper::getAllUsers($group_id);
     foreach ($users as $one_user) {
       if (!ttUserHelper::markDeleted($one_user['id'])) return false;
@@ -733,13 +733,13 @@ static function markDeleted($group_id) {
     return true;
   }
 
-  // The insert function creates a new team.
+  // The insert function creates a new group.
   static function insert($fields) {
 
     global $user;
     $mdb2 = getConnection();
 
-    // Start with team name and currency.
+    // Start with group name and currency.
     $columns = 'name, currency';
     $values = $mdb2->quote(trim($fields['name'])).', '.$mdb2->quote(trim($fields['currency']));
 
@@ -833,7 +833,7 @@ static function insert($fields) {
     return false;
   }
 
-  // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100).
+  // The getInactiveTeams is a maintenance function that returns an array of inactive group ids (max 100).
   static function getInactiveTeams() {
     $inactive_teams = array();
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1ce30a99a..90acc0600 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.17.87.4242 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4243 | 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>

From de05f61301a897661c702f03c1b45dd3ab5c0e8a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 9 Apr 2018 13:18:27 +0000
Subject: [PATCH 0131/1848] A bit of cleanup.

---
 WEB-INF/lib/ttNotificationHelper.class.php |  3 --
 WEB-INF/lib/ttTeamHelper.class.php         | 32 +++++++++++-----------
 WEB-INF/lib/ttUser.class.php               |  6 ++--
 WEB-INF/lib/ttUserHelper.class.php         |  4 +--
 WEB-INF/resources/it.lang.php              |  2 +-
 WEB-INF/templates/admin_groups.tpl         | 16 +++++------
 WEB-INF/templates/footer.tpl               |  2 +-
 admin_groups.php                           |  2 +-
 dbinstall.php                              |  2 +-
 locking.php                                |  1 -
 mobile/users.php                           |  2 +-
 mysql.sql                                  | 22 +++++++--------
 plugins/CustomFields.class.php             | 10 +++----
 plugins/MonthlyQuota.class.php             |  2 +-
 quotas.php                                 |  1 -
 readme.txt                                 |  4 +--
 role_add.php                               |  1 -
 users.php                                  |  1 -
 week_view.php                              |  1 -
 19 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index 34c852769..35a96970e 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -26,9 +26,6 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttTeamHelper');
-import('ttUserHelper');
-
 // Class ttNotificationHelper is used to help with notification related tasks.
 class ttNotificationHelper {
 	
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 092c737ab..359f6b977 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -354,7 +354,7 @@ static function getActiveRoles($group_id)
     return $result;
   }
 
-  // getInactiveRoles - returns an array of inactive roles for team.
+  // getInactiveRoles - returns an array of inactive roles for a group.
   static function getInactiveRoles($group_id)
   {
     $result = array();
@@ -833,12 +833,12 @@ static function insert($fields) {
     return false;
   }
 
-  // The getInactiveTeams is a maintenance function that returns an array of inactive group ids (max 100).
-  static function getInactiveTeams() {
-    $inactive_teams = array();
+  // The getInactiveGroups is a maintenance function that returns an array of inactive group ids (max 100).
+  static function getInactiveGroups() {
+    $inactive_groups = array();
     $mdb2 = getConnection();
 
-    // Get all team ids for teams created or modified more than 8 months ago.
+    // Get all group ids for groups created or modified more than 8 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));
     $ts = $mdb2->quote(date('Y-m-d', strtotime('-8 month')));
     $sql =  "select id from tt_groups where created < $ts and (modified is null or modified < $ts) order by id";
@@ -848,20 +848,20 @@ static function getInactiveTeams() {
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
         $group_id = $val['id'];
-        if (ttTeamHelper::isTeamActive($group_id) == false) {
+        if (ttTeamHelper::isGroupActive($group_id) == false) {
           $count++;
-          $inactive_teams[] = $group_id;
+          $inactive_groups[] = $group_id;
           // Limit the array size for perfomance by allowing this operation on small chunks only.
           if ($count >= 100) break;
         }
       }
-      return $inactive_teams;
+      return $inactive_groups;
     }
     return false;
   }
 
-  // The isTeamActive determines if a team is using Time Tracker or abandoned it.
-  static function isTeamActive($group_id) {
+  // The isGroupActive determines if a group is using Time Tracker or abandoned it.
+  static function isGroupActive($group_id) {
     $users = array();
 
     $mdb2 = getConnection();
@@ -873,7 +873,7 @@ static function isTeamActive($group_id) {
     }
     $user_list = implode(',', $users); // This is a comma-separated list of user ids.
     if (!$user_list)
-      return false; // No users in team.
+      return false; // No users in group.
 
     $count = 0;
     $ts = date('Y-m-d', strtotime('-2 years'));
@@ -889,7 +889,7 @@ static function isTeamActive($group_id) {
       return false;  // No time entries for the last 2 years.
 
     if ($count <= 5) {
-      // We will consider a team inactive if it has 5 or less time entries made more than 1 year ago.
+      // We will consider a group inactive if it has 5 or less time entries made more than 1 year ago.
       $count_last_year = 0;
       $ts = date('Y-m-d', strtotime('-1 year'));
       $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$ts'";
@@ -905,7 +905,7 @@ static function isTeamActive($group_id) {
     return true;
   }
 
-  // The delete function permanently deletes all data for a team.
+  // The delete function permanently deletes all data for a group.
   static function delete($group_id) {
     $mdb2 = getConnection();
 
@@ -957,7 +957,7 @@ static function delete($group_id) {
     return true;
   }
 
-  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a team.
+  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group.
   static function markTasksDeleted($group_id) {
     $mdb2 = getConnection();
     $sql = "select id from tt_tasks where group_id = $group_id";
@@ -981,7 +981,7 @@ static function markTasksDeleted($group_id) {
     return true;
   }
 
-  // The deleteTasks deletes all tasks and task binds for an inactive team.
+  // The deleteTasks deletes all tasks and task binds for an inactive group.
   static function deleteTasks($group_id) {
     $mdb2 = getConnection();
     $sql = "select id from tt_tasks where group_id = $group_id";
@@ -1005,7 +1005,7 @@ static function deleteTasks($group_id) {
     return true;
   }
 
-  // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive team.
+  // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive group.
   static function deleteCustomFields($group_id) {
     $mdb2 = getConnection();
     $sql = "select id from tt_custom_fields where group_id = $group_id";
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index cbfd62d1a..7afc9c15c 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -58,7 +58,7 @@ class ttUser {
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
   var $group = null;            // Group name.
-  var $custom_logo = 0;         // Whether to use a custom logo for team.
+  var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
@@ -153,7 +153,7 @@ function isAdmin() {
     return $this->can('administer_site');
   }
 
-  // isManager - determines whether current user is team manager.
+  // isManager - determines whether current user is group manager.
   // This is a legacy function that we are getting rid of by replacing with rights check.
   function isManager() {
     return $this->can('export_data'); // By default this is assigned to managers but not co-managers.
@@ -161,7 +161,7 @@ function isManager() {
                                       // to this function and then remove it.
   }
 
-  // isCoManager - determines whether current user is team comanager.
+  // isCoManager - determines whether current user is group comanager.
   // This is a legacy function that we are getting rid of by replacing with rights check.
   function isCoManager() {
     return ($this->can('manage_users') && !$this->can('export_data'));
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 40cd78293..3d4ead9fe 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -246,7 +246,7 @@ static function markDeleted($user_id) {
 
     // Tho logic is different depending on who is doing the operation.
     // Co-manager and admin - mark user deleted.
-    // Manager - mark user deleted. If manager is the only account in team, mark team items deleted.
+    // Manager - mark user deleted. If manager is the only account in group, mark group items deleted.
 
     // admin part.
     if ($user->isAdmin()) {
@@ -317,7 +317,7 @@ static function markDeleted($user_id) {
         if (is_a($affected, 'PEAR_Error'))
           return false;
  
-        // Mark team deleted.
+        // Mark group deleted.
         $sql = "update tt_groups set status = NULL where id = $user->group_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 67af31615..8a62db50f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -46,7 +46,7 @@
 'menu.logout' => 'Logout',
 'menu.forum' => 'Forum',
 'menu.help' => 'Aiuto',
-'menu.create_team' => 'Crea gruppo',
+'menu.create_group' => 'Crea gruppo',
 'menu.profile' => 'Profilo',
 'menu.group' => 'Gruppo',
 'menu.time' => 'Tempo',
diff --git a/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
index ebe889914..e0a8aa2c6 100644
--- a/WEB-INF/templates/admin_groups.tpl
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -15,15 +15,15 @@
     <td class="tableHeader">{$i18n.label.edit}</td>
     <td class="tableHeader">{$i18n.label.delete}</td>
   </tr>
-{if $teams}
-  {foreach $teams as $team}
+{if $groups}
+  {foreach $groups as $group}
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    <td>{$team.id}</td>
-    <td>{$team.name|escape}</td>
-    <td nowrap>{$team.date}</td>
-    <td align="center">{$team.lang}</td>
-    <td><a href="admin_group_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>
-    <td><a href="admin_group_delete.php?id={$team.id}">{$i18n.label.delete}</a></td>
+    <td>{$group.id}</td>
+    <td>{$group.name|escape}</td>
+    <td nowrap>{$group.date}</td>
+    <td align="center">{$group.lang}</td>
+    <td><a href="admin_group_edit.php?id={$group.id}">{$i18n.label.edit}</a></td>
+    <td><a href="admin_group_delete.php?id={$group.id}">{$i18n.label.delete}</a></td>
   </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90acc0600..270660828 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.17.87.4243 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4244 | 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/admin_groups.php b/admin_groups.php
index fa5f51b21..78e083ca5 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -36,7 +36,7 @@
 }
 // End of access checks.
 
-$smarty->assign('teams', ttGroupHelper::getTopGroups());
+$smarty->assign('groups', ttGroupHelper::getTopGroups());
 $smarty->assign('title', $i18n->get('title.groups'));
 $smarty->assign('content_page_name', 'admin_groups.tpl');
 $smarty->display('index.tpl');
diff --git a/dbinstall.php b/dbinstall.php
index 63dee9c78..fb5e0317f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -900,7 +900,7 @@ function setChange($sql) {
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
-    $inactive_teams = ttTeamHelper::getInactiveTeams();
+    $inactive_teams = ttTeamHelper::getInactiveGroups();
 
     $count = count($inactive_teams);
     print "$count inactive teams found...<br>\n";
diff --git a/locking.php b/locking.php
index 94996ada3..4359f2197 100644
--- a/locking.php
+++ b/locking.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_advanced_settings')) {
diff --git a/mobile/users.php b/mobile/users.php
index b531d7a49..d0b5d2189 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -45,7 +45,7 @@
   $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
 
-// Check if the team is set to show indicators for uncompleted time entries.
+// Check if the group is set to show indicators for uncompleted time entries.
 if ($user->uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
diff --git a/mysql.sql b/mysql.sql
index 3673d2958..87f677557 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -9,7 +9,7 @@
 
 
 #
-# Structure for table tt_groups. A team is a group of users for whom we are tracking work time.
+# Structure for table tt_groups. A group is a unit of users for whom we are tracking work time.
 # This table stores settings common to all group members such as language, week start day, etc.
 #
 CREATE TABLE `tt_groups` (
@@ -29,7 +29,7 @@ CREATE TABLE `tt_groups` (
   `record_type` smallint(2) NOT NULL default 0,          # time record type ("start and finish", "duration", or both)
   `bcc_email` varchar(100) default NULL,                 # bcc email to copy all reports to
   `allow_ip` varchar(255) default NULL,                  # specification from where users are allowed access
-  `plugins` varchar(255) default NULL,                   # a list of enabled plugins for team
+  `plugins` varchar(255) default NULL,                   # a list of enabled plugins for group
   `lock_spec` varchar(255) default NULL,                 # Cron specification for record locking,
                                                          # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
   `workday_minutes` smallint(4) default 480,             # number of work minutes in a regular working day
@@ -47,7 +47,7 @@ CREATE TABLE `tt_groups` (
 
 
 #
-# Structure for table tt_roles. This table stores customized team roles.
+# Structure for table tt_roles. This table stores group roles.
 #
 CREATE TABLE `tt_roles` (
   `id` int(11) NOT NULL auto_increment,    # Role id. Identifies roles for all groups on the server.
@@ -55,13 +55,11 @@ CREATE TABLE `tt_roles` (
   `name` varchar(80) default NULL,         # Role name - custom role name. In case we are editing a
                                            # predefined role (USER, etc.), we can rename the role here.
   `description` varchar(255) default NULL, # Role description.
-  `rank` int(11) default 0,                # Role rank, an integer value between 0-324. Predefined role ranks:
-                                           # USER - 4, CLIENT - 16, COMANAGER - 68, MANAGER - 324.
+  `rank` int(11) default 0,                # Role rank, an integer value between 0-512. Predefined role ranks:
+                                           # User - 4, Supervisor - 12, Client - 16,
+                                           # Co-manager - 68, Manager - 324, Top manager - 512.
                                            # Rank is used to determine what "lesser roles" are in each group
-                                           # for sutuations such as "manage_users".
-                                           # It also identifies a role within a team (by its "rank").
-                                           # Value of rank is to be used in role field in tt_users table,
-                                           # just like standard roles now.
+                                           # for situations such as "manage_users".
   `rights` text default NULL,              # Comma-separated list of rights assigned to a role.
                                            # NULL here for predefined roles (4, 16, 68, 324 - manager)
                                            # means a hard-coded set of default access rights.
@@ -105,7 +103,7 @@ CREATE TABLE `tt_users` (
 # Create an index that guarantees unique active and inactive logins.
 create unique index login_idx on tt_users(login, status);
 
-# Create admin account with password 'secret'. Admin is a superuser, who can create teams.
+# Create admin account with password 'secret'. Admin is a superuser, who can create groupd.
 DELETE from `tt_users` WHERE login = 'admin';
 INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024));
 
@@ -221,7 +219,7 @@ CREATE TABLE `tt_invoices` (
   PRIMARY KEY (`id`)
 );
 
-# Create an index that guarantees unique invoice names per team.
+# Create an index that guarantees unique invoice names per group.
 create unique index name_idx on tt_invoices(group_id, name, status);
 
 
@@ -306,7 +304,7 @@ CREATE TABLE `tt_clients` (
   PRIMARY KEY (`id`)
 );
 
-# Create an index that guarantees unique active and inactive clients per team.
+# Create an index that guarantees unique active and inactive clients per group.
 create unique index client_name_idx on tt_clients(group_id, name, status);
 
 
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index afb59dae9..00582e3e9 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -33,7 +33,7 @@ class CustomFields {
   const TYPE_TEXT = 1;     // A text field.
   const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
 
-  var $fields = array();  // Array of custom fields for team.
+  var $fields = array();  // Array of custom fields for group.
   var $options = array(); // Array of options for a dropdown custom field.
 
   // Constructor.
@@ -223,7 +223,7 @@ static function getOptionName($id) {
     return false;
   }
 
-  // getFields returns an array of custom fields for team.
+  // getFields returns an array of custom fields for group.
   static function getFields() {
     global $user;
     $mdb2 = getConnection();
@@ -270,7 +270,7 @@ static function getFieldIdForOption($option_id) {
     return false;
   }
 
-  // The insertField inserts a custom field for team.
+  // The insertField inserts a custom field for group.
   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
@@ -279,7 +279,7 @@ static function insertField($field_name, $field_type, $required) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // The updateField updates custom field for team.
+  // The updateField updates custom field for group.
   static function updateField($id, $name, $type, $required) {
     global $user;
     $mdb2 = getConnection();
@@ -288,7 +288,7 @@ static function updateField($id, $name, $type, $required) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // The deleteField deletes a custom field, its options and log entries for team.
+  // The deleteField deletes a custom field, its options and log entries for group.
   static function deleteField($field_id) {
 
     // Our overall intention is to keep the code simple and manageable.
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index de1f7cd20..5a4e70798 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -81,7 +81,7 @@ private function getSingle($year, $month) {
     return $numWorkdays * $user->workday_minutes;
   }
 
-  // getMany - returns an array of quotas for a given year for team.
+  // getMany - returns an array of quotas for a given year for group.
   private function getMany($year){
     $group_id = $this->group_id;
     $sql = "SELECT month, minutes FROM tt_monthly_quotas WHERE year = $year AND group_id = $group_id";
diff --git a/quotas.php b/quotas.php
index ac6542f5e..8381c3b6a 100644
--- a/quotas.php
+++ b/quotas.php
@@ -29,7 +29,6 @@
 require_once('initialize.php');
 require_once('plugins/MonthlyQuota.class.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttTimeHelper');
 
 // Access checks.
diff --git a/readme.txt b/readme.txt
index 82bda0263..fd2e78b33 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Copyright (c) Anuko (https://www.anuko.com)
 Project home page: https://www.anuko.com/time_tracker/index.htm
 Forum: https://www.anuko.com/forum/viewforum.php?f=4
 Info for developers: https://www.anuko.com/time_tracker/info_for_developers.htm
-Free hosting of Time Tracker for individuals and small teams is available at https://timetracker.anuko.com
+Free hosting of Time Tracker for individuals and small groups is available at https://timetracker.anuko.com
 
 Unless otherwise noted, files in this archive are protected by the LIBERAL FREEWARE LICENSE.
 Read the file license.txt for details.
@@ -30,7 +30,7 @@ The general installation procedure looks like this:
 6) Change $dsn value in /WEB-INF/config.php file to reflect your database connection parameters (user name and password).
 7) If you are upgrading from earlier Time Tracker version run dbinstall.php from your browser and do only the required "Update database structure" steps.
 8) If you install time tracker into a sub-directory of your site reflect this in the APP_NAME parameter in /WEB-INF/config.php file. For example, for http://localhost/timetracker/ set APP_NAME = "timetracker".
-9) Login to your time tracker site as admin with password "secret" without quotes and create at least one team.
+9) Login to your time tracker site as admin with password "secret" without quotes and create at least one group.
 10) Change admin password (on the admin "options" page). You can also use the following SQL console command:
   update tt_users set password = md5('new_password_here') where login='admin'
   or by using the "Change password of administrator account" option in http://your_time_tracker_site/dbinstall.php
diff --git a/role_add.php b/role_add.php
index 086da632c..c8df24c73 100644
--- a/role_add.php
+++ b/role_add.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttRoleHelper');
 
 // Access check.
diff --git a/users.php b/users.php
index d20617bca..b7a6606ca 100644
--- a/users.php
+++ b/users.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttTimeHelper');
 import('ttRoleHelper');
 
diff --git a/week_view.php b/week_view.php
index 38b753a15..9f809af3c 100644
--- a/week_view.php
+++ b/week_view.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_advanced_settings')) {

From 6c376fcbe582d3dd0c211aeb8eef20c43850434e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 10 Apr 2018 13:52:38 +0000
Subject: [PATCH 0132/1848] Refactored pull request #62.

---
 WEB-INF/templates/footer.tpl |   2 +-
 group_edit.php               | 131 +++++++++++++++++------------------
 2 files changed, 64 insertions(+), 69 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 270660828..9395bef8d 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.17.87.4244 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4245 | 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/group_edit.php b/group_edit.php
index cc27afae2..2b8764933 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -220,78 +220,73 @@
   // Finished validating user input.
 
   if ($err->no()) {
-    $update_result = true;
-    if ($user->canManageTeam()) {
+    // Prepare plugins string.
+    if ($cl_charts)
+      $plugins .= ',ch';
+    if ($cl_clients)
+      $plugins .= ',cl';
+    if ($cl_client_required)
+      $plugins .= ',cm';
+    if ($cl_invoices)
+      $plugins .= ',iv';
+    if ($cl_paid_status)
+      $plugins .= ',ps';
+    if ($cl_custom_fields)
+      $plugins .= ',cf';
+    if ($cl_expenses)
+      $plugins .= ',ex';
+    if ($cl_tax_expenses)
+      $plugins .= ',et';
+    if ($cl_notifications)
+      $plugins .= ',no';
+    if ($cl_locking)
+      $plugins .= ',lk';
+    if ($cl_quotas)
+      $plugins .= ',mq';
+    if ($cl_week_view)
+      $plugins .= ',wv';
 
-      // Prepare plugins string.
-      if ($cl_charts)
-        $plugins .= ',ch';
-      if ($cl_clients)
-        $plugins .= ',cl';
-      if ($cl_client_required)
-        $plugins .= ',cm';
-      if ($cl_invoices)
-        $plugins .= ',iv';
-      if ($cl_paid_status)
-        $plugins .= ',ps';
-      if ($cl_custom_fields)
-        $plugins .= ',cf';
-      if ($cl_expenses)
-        $plugins .= ',ex';
-      if ($cl_tax_expenses)
-        $plugins .= ',et';
-      if ($cl_notifications)
-        $plugins .= ',no';
-      if ($cl_locking)
-        $plugins .= ',lk';
-      if ($cl_quotas)
-        $plugins .= ',mq';
-      if ($cl_week_view)
-        $plugins .= ',wv';
+    // Recycle week view plugin options as they are not configured on this page.
+    $existing_plugins = explode(',', $user->plugins);
+    if (in_array('wvn', $existing_plugins))
+      $plugins .= ',wvn';
+    if (in_array('wvl', $existing_plugins))
+      $plugins .= ',wvl';
+    if (in_array('wvns', $existing_plugins))
+      $plugins .= ',wvns';
 
-      // Recycle week view plugin options as they are not configured on this page.
-      $existing_plugins = explode(',', $user->plugins);
-      if (in_array('wvn', $existing_plugins))
-        $plugins .= ',wvn';
-      if (in_array('wvl', $existing_plugins))
-        $plugins .= ',wvl';
-      if (in_array('wvns', $existing_plugins))
-        $plugins .= ',wvns';
+    $plugins = trim($plugins, ',');
 
-      $plugins = trim($plugins, ',');
+    // Prepare config string.
+    if ($cl_show_holidays)
+      $config .= ',show_holidays';
+    if ($cl_punch_mode)
+      $config .= ',punch_mode';
+    if ($cl_allow_overlap)
+      $config .= ',allow_overlap';
+    if ($cl_future_entries)
+      $config .= ',future_entries';
+    if ($cl_uncompleted_indicators)
+      $config .= ',uncompleted_indicators';
+    $config = trim($config, ',');
 
-      // Prepare config string.
-      if ($cl_show_holidays)
-        $config .= ',show_holidays';
-      if ($cl_punch_mode)
-        $config .= ',punch_mode';
-      if ($cl_allow_overlap)
-        $config .= ',allow_overlap';
-      if ($cl_future_entries)
-        $config .= ',future_entries';
-      if ($cl_uncompleted_indicators)
-        $config .= ',uncompleted_indicators';
-      $config = trim($config, ',');
-
-      $update_result = $user->updateGroup(array(
-        'name' => $cl_group,
-        'currency' => $cl_currency,
-        'lang' => $cl_lang,
-        'decimal_mark' => $cl_decimal_mark,
-        'date_format' => $cl_date_format,
-        'time_format' => $cl_time_format,
-        'week_start' => $cl_start_week,
-        'tracking_mode' => $cl_tracking_mode,
-        'project_required' => $cl_project_required,
-        '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,
-        'plugins' => $plugins,
-        'config' => $config));
-    }
-    if ($update_result) {
+    if ($user->updateGroup(array(
+      'name' => $cl_group,
+      'currency' => $cl_currency,
+      'lang' => $cl_lang,
+      'decimal_mark' => $cl_decimal_mark,
+      'date_format' => $cl_date_format,
+      'time_format' => $cl_time_format,
+      'week_start' => $cl_start_week,
+      'tracking_mode' => $cl_tracking_mode,
+      'project_required' => $cl_project_required,
+      '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,
+      'plugins' => $plugins,
+      'config' => $config))) {
       header('Location: time.php');
       exit();
     } else

From 223f24a8202940aa5a72661a83be26aa6bc8a560 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 10 Apr 2018 15:35:39 +0000
Subject: [PATCH 0133/1848] Introduced password_complexity field in tt_groups
 table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9395bef8d..d1c48e47a 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.17.87.4245 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4246 | 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/dbinstall.php b/dbinstall.php
index fb5e0317f..b076741e0 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11786"]) {
+  if ($_POST["convert11744to11787"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -895,6 +895,8 @@ function setChange($sql) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'override_allow_ip,view_all_reports', 'override_allow_ip,manage_basic_settings,view_all_reports')");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'manage_features,manage_basic_setting,manage_advanced_settings', 'manage_features,manage_advanced_settings')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.86', modified = now() where param_name = 'version_db' and param_value = '1.17.85'");
+    setChange("ALTER TABLE `tt_groups` ADD `password_complexity` varchar(64) default NULL AFTER `allow_ip`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
   }
 
   if ($_POST["cleanup"]) {
@@ -940,7 +942,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.86)</b>
+    <td width="80%"><b>Create database structure (v1.17.87)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -980,8 +982,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.86)</td>
-    <td><input type="submit" name="convert11744to11786" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.87)</td>
+    <td><input type="submit" name="convert11744to11787" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 87f677557..ba798632d 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -29,6 +29,7 @@ CREATE TABLE `tt_groups` (
   `record_type` smallint(2) NOT NULL default 0,          # time record type ("start and finish", "duration", or both)
   `bcc_email` varchar(100) default NULL,                 # bcc email to copy all reports to
   `allow_ip` varchar(255) default NULL,                  # specification from where users are allowed access
+  `password_complexity` varchar(64) default NULL,        # password example that defines required complexity
   `plugins` varchar(255) default NULL,                   # a list of enabled plugins for group
   `lock_spec` varchar(255) default NULL,                 # Cron specification for record locking,
                                                          # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
@@ -448,4 +449,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.86', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.87', now()); # TODO: change when structure changes.

From 0bd866162cda1e8e5f9617e1d23322163f3a66e6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 00:31:37 +0000
Subject: [PATCH 0134/1848] Cleanup. Removed unused function.

---
 WEB-INF/lib/ttTeamHelper.class.php | 42 ------------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 359f6b977..534744907 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -691,48 +691,6 @@ static function getMonthlyQuotas($group_id) {
     return false;
   }
 
-  // The markDeleted function marks the group and everything in it as deleted.
-  static function markDeleted($group_id) {
-
-    // Iterate through group users and mark them as deleted.
-    $users = ttTeamHelper::getAllUsers($group_id);
-    foreach ($users as $one_user) {
-      if (!ttUserHelper::markDeleted($one_user['id'])) return false;
-    }
-
-    // Mark tasks deleted.
-    if (!ttTeamHelper::markTasksDeleted($group_id)) return false;
-
-    $mdb2 = getConnection();
-
-    // Mark roles deleted.
-    $sql = "update tt_roles set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark clients deleted.
-    $sql = "update tt_clients set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark custom fields deleted.
-    $sql = "update tt_custom_fields set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark group deleted.
-    $sql = "update tt_groups set status = NULL where id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return true;
-  }
-
   // The insert function creates a new group.
   static function insert($fields) {
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d1c48e47a..3136c7121 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.17.87.4246 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4247 | 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>

From 39e42323eb5ccb439a3d3c4b8835141471742a8b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 00:36:01 +0000
Subject: [PATCH 0135/1848] Cleanup. Removed unused function.

---
 WEB-INF/lib/ttTeamHelper.class.php | 18 ------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 534744907..a8133b8a2 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -187,24 +187,6 @@ static function getInactiveUsers($group_id, $all_fields = false) {
     return false;
   }
 
-  // The getAllUsers obtains all users in a group.
-  static function getAllUsers($group_id, $all_fields = false) {
-    $mdb2 = getConnection();
-    if ($all_fields)
-      $sql = "select * from tt_users where group_id = $group_id order by upper(name)";
-    else
-      $sql = "select id, name from tt_users where group_id = $group_id order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getActiveProjects - returns an array of active projects for a group.
   static function getActiveProjects($group_id)
   {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3136c7121..74216a3b9 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.17.87.4247 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4248 | 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>

From 885b2d93423950dc37ae493b0f59c6050e0e119a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 01:12:54 +0000
Subject: [PATCH 0136/1848] Added password_complexity property to ttUser class.

---
 WEB-INF/lib/ttUser.class.php | 4 +++-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7afc9c15c..4c186d4ee 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -54,6 +54,7 @@ class ttUser {
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
+  var $password_complexity = null; // Password complexity example.
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
@@ -76,7 +77,7 @@ function __construct($login, $id = null) {
     $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, g.name as group_name,
       g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start,
       g.tracking_mode, g.project_required, g.task_required, g.record_type,
-      g.bcc_email, g.allow_ip, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo
+      g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo
       FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
@@ -113,6 +114,7 @@ function __construct($login, $id = null) {
       $this->record_type = $val['record_type'];
       $this->bcc_email = $val['bcc_email'];
       $this->allow_ip = $val['allow_ip'];
+      $this->password_complexity = $val['password_complexity'];
       $this->group = $val['group_name'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 74216a3b9..e13d4f5b6 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.17.87.4248 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4249 | 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>

From bf0370124e2c2bfb092deed614990fc4cfffe8c6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 12:57:39 +0000
Subject: [PATCH 0137/1848] Improved export-import to include allow_ip and
 password_complexity.

---
 WEB-INF/lib/ttExportHelper.class.php |   2 +
 WEB-INF/lib/ttImportHelper.class.php |  48 ++++++++++++-
 WEB-INF/lib/ttTeamHelper.class.php   | 100 ---------------------------
 WEB-INF/templates/footer.tpl         |   2 +-
 4 files changed, 49 insertions(+), 103 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index d969b44a6..ca202ad78 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -70,6 +70,8 @@ function createDataFile($compress = false) {
       "\" config=\"".$user->config.
       "\">\n");
     fwrite($file, "  <name><![CDATA[".$user->group."]]></name>\n");
+    fwrite($file, "  <allow_ip><![CDATA[".$user->allow_ip."]]></allow_ip>\n");
+    fwrite($file, "  <password_complexity><![CDATA[".$user->password_complexity."]]></password_complexity>\n");
     fwrite($file, "</group>\n");
 
     // Prepare role map.
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index b7c024d72..dfa3be597 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -124,7 +124,7 @@ function endElement($parser, $name) {
       // Now we can create a group.
       if ($this->canImport) {
         $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
-        $group_id = ttTeamHelper::insert(array(
+        $group_id = $this->createGroup(array(
           'name' => $this->groupData['NAME'],
           'currency' => $this->groupData['CURRENCY'],
           'decimal_mark' => $this->groupData['DECIMAL_MARK'],
@@ -137,6 +137,8 @@ function endElement($parser, $name) {
           'task_required' => $this->groupData['TASK_REQUIRED'],
           'record_type' => $this->groupData['RECORD_TYPE'],
           'bcc_email' => $this->groupData['BCC_EMAIL'],
+          'allow_ip' => $this->groupData['ALLOW_IP'],
+          'password_complexity' => $this->groupData['PASSWORD_COMPLEXITY'],
           'plugins' => $this->groupData['PLUGINS'],
           'lock_spec' => $this->groupData['LOCK_SPEC'],
           'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
@@ -343,7 +345,9 @@ function dataElement($parser, $data) {
       || $this->currentTag == 'LABEL'
       || $this->currentTag == 'VALUE'
       || $this->currentTag == 'COMMENT'
-      || $this->currentTag == 'ADDRESS') {
+      || $this->currentTag == 'ADDRESS'
+      || $this->currentTag == 'ALLOW_IP'
+      || $this->currentTag == 'PASSWORD_COMPLEXITY') {
       if (isset($this->currentElement[$this->currentTag]))
         $this->currentElement[$this->currentTag] .= trim($data);
       else
@@ -432,6 +436,46 @@ function uncompress($in, $out) {
     return true;
   }
 
+  // createGroup function creates a new group.
+  private function createGroup($fields) {
+
+    global $user;
+    $mdb2 = getConnection();
+
+    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
+      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
+      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
+
+    $values = ' values ('.$mdb2->quote(trim($fields['name']));
+    $values .= ', '.$mdb2->quote(trim($fields['currency']));
+    $values .= ', '.$mdb2->quote($fields['decimal_mark']);
+    $values .= ', '.$mdb2->quote($fields['lang']);
+    $values .= ', '.$mdb2->quote($fields['date_format']);
+    $values .= ', '.$mdb2->quote($fields['time_format']);
+    $values .= ', '.(int)$fields['week_start'];
+    $values .= ', '.(int)$fields['tracking_mode'];
+    $values .= ', '.(int)$fields['project_required'];
+    $values .= ', '.(int)$fields['task_required'];
+    $values .= ', '.(int)$fields['record_type'];
+    $values .= ', '.$mdb2->quote($fields['bcc_email']);
+    $values .= ', '.$mdb2->quote($fields['allow_ip']);
+    $values .= ', '.$mdb2->quote($fields['password_complexity']);
+    $values .= ', '.$mdb2->quote($fields['plugins']);
+    $values .= ', '.$mdb2->quote($fields['lock_spec']);
+    $values .= ', '.(int)$fields['workday_minutes'];
+    $values .= ', '.$mdb2->quote($fields['config']);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $values .= ')';
+
+    $sql = 'insert into tt_groups '.$columns.$values;
+    $affected = $mdb2->exec($sql);
+    if (!is_a($affected, 'PEAR_Error')) {
+      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+      return $group_id;
+    }
+    return false;
+  }
+
   // insertMonthlyQuota - a helper function to insert a monthly quota.
   private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index a8133b8a2..dfcdaaf10 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -673,106 +673,6 @@ static function getMonthlyQuotas($group_id) {
     return false;
   }
 
-  // The insert function creates a new group.
-  static function insert($fields) {
-
-    global $user;
-    $mdb2 = getConnection();
-
-    // Start with group name and currency.
-    $columns = 'name, currency';
-    $values = $mdb2->quote(trim($fields['name'])).', '.$mdb2->quote(trim($fields['currency']));
-
-    if ($fields['decimal_mark']) {
-      $columns .= ', decimal_mark';
-      $values .= ', '.$mdb2->quote($fields['decimal_mark']);
-    }
-
-    $lang = $fields['lang'];
-    if (!$lang) {
-      global $i18n;
-      $lang = $i18n->lang;
-    }
-    $columns .= ', lang';
-    $values .= ', '.$mdb2->quote($lang);
-
-    if ($fields['date_format'] || defined('DATE_FORMAT_DEFAULT')) {
-      $date_format = $fields['date_format'] ? $fields['date_format'] : DATE_FORMAT_DEFAULT;
-      $columns .= ', date_format';
-      $values .= ', '.$mdb2->quote($date_format);
-    }
-
-    if ($fields['time_format'] || defined('TIME_FORMAT_DEFAULT')) {
-      $time_format = $fields['time_format'] ? $fields['time_format'] : TIME_FORMAT_DEFAULT;
-      $columns .= ', time_format';
-      $values .= ', '.$mdb2->quote($time_format);
-    }
-
-    if ($fields['week_start'] || defined('WEEK_START_DEFAULT')) {
-      $week_start = $fields['week_start'] ? $fields['week_start'] : WEEK_START_DEFAULT;
-      $columns .= ', week_start';
-      $values .= ', '.(int)$week_start;
-    }
-
-    if ($fields['tracking_mode']) {
-      $columns .= ', tracking_mode';
-      $values .= ', '.(int)$fields['tracking_mode'];
-    }
-
-    if ($fields['project_required']) {
-      $columns .= ', project_required';
-      $values .= ', '.(int)$fields['project_required'];
-    }
-
-    if ($fields['task_required']) {
-      $columns .= ', task_required';
-      $values .= ', '.(int)$fields['task_required'];
-    }
-
-    if ($fields['record_type']) {
-      $columns .= ', record_type';
-      $values .= ', '.(int)$fields['record_type'];
-    }
-
-    if ($fields['bcc_email']) {
-      $columns .= ', bcc_email';
-      $values .= ', '.$mdb2->quote($fields['bcc_email']);
-    }
-
-    if ($fields['plugins']) {
-      $columns .= ', plugins';
-      $values .= ', '.$mdb2->quote($fields['plugins']);
-    }
-
-    if ($fields['lock_spec']) {
-      $columns .= ', lock_spec';
-      $values .= ', '.$mdb2->quote($fields['lock_spec']);
-    }
-
-    if ($fields['workday_minutes']) {
-      $columns .= ', workday_minutes';
-      $values .= ', '.(int)$fields['workday_minutes'];
-    }
-
-    if ($fields['config']) {
-      $columns .= ', config';
-      $values .= ', '.$mdb2->quote($fields['config']);
-    }
-
-    $columns .= ', created, created_ip, created_by';
-    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
-
-    $sql = "insert into tt_groups ($columns) values($values)";
-    $affected = $mdb2->exec($sql);
-
-    if (!is_a($affected, 'PEAR_Error')) {
-      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
-      return $group_id;
-    }
-
-    return false;
-  }
-
   // The getInactiveGroups is a maintenance function that returns an array of inactive group ids (max 100).
   static function getInactiveGroups() {
     $inactive_groups = array();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e13d4f5b6..8eed912a0 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.17.87.4249 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4250 | 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>

From ea80612af0054c2abdc9c2b422fe3f1038f4b2c0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 13:32:44 +0000
Subject: [PATCH 0138/1848] A bit of ongoing cleanup after roles revamp.

---
 WEB-INF/lib/ttUserHelper.class.php | 29 +++++------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 3d4ead9fe..848c95395 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -240,35 +240,16 @@ static function markDeleted($user_id) {
     $mdb2 = getConnection();
     global $user;
 
-    // Preliminary checks. Only managers, co-managers, and admin can do this.
-    if (!$user->canManageTeam() && !$user->isAdmin())
+    // Preliminary checks. Only managers and co-managers can do this.
+    if (!$user->canManageTeam())
       return false;
 
     // Tho logic is different depending on who is doing the operation.
-    // Co-manager and admin - mark user deleted.
+    // Co-manager - mark user deleted.
     // Manager - mark user deleted. If manager is the only account in group, mark group items deleted.
 
-    // admin part.
-    if ($user->isAdmin()) {
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark favorite reports as deleted.
-      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark user as deleted.
-      $sql = "update tt_users set status = NULL where id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-    } elseif ($user->isCoManager()) {
+    // Co-manager part.
+    if ($user->isCoManager()) {
       // Mark user binds as deleted.
       $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
       $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8eed912a0..6b0ca4eb9 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.17.87.4250 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4251 | 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>

From 3d6b6fb758fd7e0befbdd497013d33264b9111e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 13:43:17 +0000
Subject: [PATCH 0139/1848] Got rid of ttUser::isAdmin() function.

---
 WEB-INF/lib/ttUser.class.php | 5 -----
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/import.tpl | 3 ---
 mobile/login.php             | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4c186d4ee..2560417f8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -150,11 +150,6 @@ function can($do_something) {
     return in_array($do_something, $this->rights);
   }
 
-  // isAdmin - determines whether current user is admin.
-  function isAdmin() {
-    return $this->can('administer_site');
-  }
-
   // isManager - determines whether current user is group manager.
   // This is a legacy function that we are getting rid of by replacing with rights check.
   function isManager() {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6b0ca4eb9..6ba9e4fc3 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.17.87.4251 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4252 | 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/import.tpl b/WEB-INF/templates/import.tpl
index b85bc757a..d65b64963 100644
--- a/WEB-INF/templates/import.tpl
+++ b/WEB-INF/templates/import.tpl
@@ -1,9 +1,7 @@
 {$forms.importForm.open}
-
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td align="center">
-{if $user->isAdmin()}
       <table border="0" width="60%">
         <tr><td colspan="2">{$i18n.form.import.hint}<br></td></tr>
         <tr><td colspan="2">&nbsp;</td></tr>
@@ -13,7 +11,6 @@
         </tr>
         <tr><td height="50" align="center" colspan="2">{$forms.importForm.btn_submit.control}</td></tr>
       </table>
-{/if}
     </td>
   </tr>
 </table>
diff --git a/mobile/login.php b/mobile/login.php
index d1f659a93..d094dfbf1 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -67,7 +67,7 @@
 
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
-      if ($user->isAdmin()) {
+      if ($user->can('administer_site')) {
         header('Location: ../admin_groups.php');
       } elseif ($user->isClient()) {
         header('Location: ../reports.php');

From 83987222fbafb8d6dbbbd9578ed2f949f65004d3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 14:38:47 +0000
Subject: [PATCH 0140/1848] Introduced delete_group right.

---
 WEB-INF/templates/group_delete.tpl | 20 +++++++++
 dbinstall.php                      | 10 +++--
 group_delete.php                   | 71 ++++++++++++++++++++++++++++++
 mysql.sql                          |  4 +-
 4 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 WEB-INF/templates/group_delete.tpl
 create mode 100644 group_delete.php

diff --git a/WEB-INF/templates/group_delete.tpl b/WEB-INF/templates/group_delete.tpl
new file mode 100644
index 000000000..57164d4a8
--- /dev/null
+++ b/WEB-INF/templates/group_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.groupForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$group_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.groupForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.groupForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.groupForm.close}
diff --git a/dbinstall.php b/dbinstall.php
index b076741e0..d50594446 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11787"]) {
+  if ($_POST["convert11744to11788"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -897,6 +897,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.86', modified = now() where param_name = 'version_db' and param_value = '1.17.85'");
     setChange("ALTER TABLE `tt_groups` ADD `password_complexity` varchar(64) default NULL AFTER `allow_ip`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
   }
 
   if ($_POST["cleanup"]) {
@@ -942,7 +944,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.87)</b>
+    <td width="80%"><b>Create database structure (v1.17.88)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -982,8 +984,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.87)</td>
-    <td><input type="submit" name="convert11744to11787" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.88)</td>
+    <td><input type="submit" name="convert11744to11788" value="Update"></td>
   </tr>
 </table>
 
diff --git a/group_delete.php b/group_delete.php
new file mode 100644
index 000000000..65875fad1
--- /dev/null
+++ b/group_delete.php
@@ -0,0 +1,71 @@
+<?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');
+
+// Access checks.
+if (!ttAccessAllowed('delete_group')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// TODO: refactor this... and the template.
+$group_id = (int)$request->getParameter('id');
+
+$admin = new ttAdmin();
+$group_details = $admin->getGroupDetails($group_id);
+$group_name = $group_details['group_name'];
+
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    $result = $admin->markGroupDeleted($group_id);
+    if ($result) {
+      header('Location: admin_groups.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+
+  if ($request->getParameter('btn_cancel')) {
+    header('Location: admin_groups.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('group_to_delete', $group_name);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.delete_group'));
+$smarty->assign('content_page_name', 'admin_group_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/mysql.sql b/mysql.sql
index ba798632d..37ad65e76 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -73,7 +73,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group');
 
 
 #
@@ -449,4 +449,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.87', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.88', now()); # TODO: change when structure changes.

From b262cc9f78e50e6910fefc1744782ddd64bbccda Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 17:29:09 +0000
Subject: [PATCH 0141/1848] Implemented group delete feature.

---
 WEB-INF/resources/ca.lang.php      |  4 ++++
 WEB-INF/resources/cs.lang.php      |  4 ++++
 WEB-INF/resources/da.lang.php      |  4 ++++
 WEB-INF/resources/de.lang.php      |  4 ++++
 WEB-INF/resources/en.lang.php      |  3 +++
 WEB-INF/resources/es.lang.php      |  4 ++++
 WEB-INF/resources/et.lang.php      |  4 ++++
 WEB-INF/resources/fa.lang.php      |  4 ++++
 WEB-INF/resources/fi.lang.php      |  4 ++++
 WEB-INF/resources/fr.lang.php      |  4 ++++
 WEB-INF/resources/gr.lang.php      |  4 ++++
 WEB-INF/resources/he.lang.php      |  4 ++++
 WEB-INF/resources/hu.lang.php      |  4 ++++
 WEB-INF/resources/it.lang.php      |  4 ++++
 WEB-INF/resources/ja.lang.php      |  4 ++++
 WEB-INF/resources/ko.lang.php      |  4 ++++
 WEB-INF/resources/nl.lang.php      |  4 ++++
 WEB-INF/resources/no.lang.php      |  4 ++++
 WEB-INF/resources/pl.lang.php      |  4 ++++
 WEB-INF/resources/pt-br.lang.php   |  4 ++++
 WEB-INF/resources/pt.lang.php      |  4 ++++
 WEB-INF/resources/ro.lang.php      |  4 ++++
 WEB-INF/resources/ru.lang.php      |  3 +++
 WEB-INF/resources/sk.lang.php      |  4 ++++
 WEB-INF/resources/sl.lang.php      |  4 ++++
 WEB-INF/resources/sr.lang.php      |  4 ++++
 WEB-INF/resources/sv.lang.php      |  4 ++++
 WEB-INF/resources/tr.lang.php      |  4 ++++
 WEB-INF/resources/zh-cn.lang.php   |  4 ++++
 WEB-INF/resources/zh-tw.lang.php   |  4 ++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/group_delete.tpl |  2 ++
 WEB-INF/templates/group_edit.tpl   |  4 +++-
 group_delete.php                   | 22 ++++++++++++++--------
 group_edit.php                     |  8 ++++++++
 35 files changed, 146 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index af4bc1d2c..8b280c804 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -513,6 +513,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Per a',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d907c6e95..f167910cc 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -527,6 +527,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4d94cccff..4d28aa36a 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -474,6 +474,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index eb5a64831..1f1b4f137 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -471,6 +471,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Erweiterungen',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Von',
 'form.mail.to' => 'An',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 298a575f3..85430647b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -449,6 +449,9 @@
 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// 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?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'From',
 'form.mail.to' => 'To',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e79f3d4ad..faf8d4a51 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -528,6 +528,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1187ed722..85a1f07ba 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -523,6 +523,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Kellelt',
 'form.mail.to' => 'Kellele',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3539f357b..47f3f56e8 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -500,6 +500,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'پلاگین ها',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'از',
 'form.mail.to' => 'به',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 7ff1bc1e8..20d882e4b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -481,6 +481,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Lisäosat',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Lähettäjä',
 'form.mail.to' => 'Vastaanottaja',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1456edc60..249acbd24 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -470,6 +470,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'À',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 2d2d0d5e4..1b78e55e1 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -452,6 +452,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Πρόσθετα',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Από',
 'form.mail.to' => 'Προς',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6cfccd8e7..92450b5d9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -507,6 +507,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'תוספים',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'מאת',
 'form.mail.to' => 'אל',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f897844cd..7510442f8 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -516,6 +516,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Feladó',
 'form.mail.to' => 'Címzett',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8a62db50f..7d4c79ab6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -468,6 +468,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugin',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Da',
 'form.mail.to' => 'A',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index aad7afe62..636f2dd7d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -519,6 +519,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'から',
 'form.mail.to' => 'まで',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ca50b7e1b..5e621fe54 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -517,6 +517,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => '부터',
 'form.mail.to' => '까지', // TODO: is this correct? The meaning is that we send an email TO this person.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9841116fe..7fdae205b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -448,6 +448,10 @@
 'form.profile.allow_ip' => 'Toegestane IP adressen',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Van',
 'form.mail.to' => 'Aan',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d6c6fbb1e..2cfb3ad32 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -516,6 +516,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2c1210eac..7fc6fdc62 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -483,6 +483,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Dodatkowe moduły',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Do',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ad7d5d13a..bdc772150 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -478,6 +478,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a5139b78f..5b9c4db25 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -500,6 +500,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9b068a7e0..93f00f703 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -522,6 +522,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De la',
 'form.mail.to' => 'Catre',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1399049a7..ad714129c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -446,6 +446,9 @@
 'form.profile.allow_ip' => 'Разрешить доступ с IP',
 'form.profile.plugins' => 'Плагины',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'От',
 'form.mail.to' => 'Кому',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8fed200f9..0414d2249 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -498,6 +498,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Doplnkové moduly',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8c006293a..f1731ab92 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -496,6 +496,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6aede0a0c..1c98dc959 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -482,6 +482,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Dodaci',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Forma mejla. Pogledajte primer na https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ad943a302..6348480a0 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -477,6 +477,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Tillägg',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Från',
 'form.mail.to' => 'Till',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index fcbd981ab..06d21c218 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -535,6 +535,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Kimden',
 'form.mail.to' => 'Kime',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b1a1bdaa1..d299b8e34 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -503,6 +503,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => '从',
 'form.mail.to' => '到',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a070b1a28..c28dd0254 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -511,6 +511,10 @@
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => '從',
 'form.mail.to' => '到',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6ba9e4fc3..e4b699185 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.17.87.4252 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4253 | 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_delete.tpl b/WEB-INF/templates/group_delete.tpl
index 57164d4a8..a14373f55 100644
--- a/WEB-INF/templates/group_delete.tpl
+++ b/WEB-INF/templates/group_delete.tpl
@@ -3,6 +3,8 @@
   <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
+        <tr><td colspan="2">{$i18n.form.group_delete.hint}</td></tr>
+        <tr><td>&nbsp;</td></tr>
         <tr>
           <td colspan="2" align="center"><b>{$group_to_delete|escape}</b></td>
         </tr>
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 7cb8d2e69..aba5ea61f 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -1,4 +1,6 @@
 <script>
+function chLocation(newLocation) { document.location = newLocation; }
+
 // handleTaskRequiredCheckbox - controls visibility of the Task Required checkbox.
 function handleTaskRequiredCheckbox() {
   var taskRequiredCheckbox = document.getElementById("task_required");
@@ -243,7 +245,7 @@ function handlePluginCheckboxes() {
             <td colspan="2">&nbsp;</td>
           </tr>
           <tr>
-            <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control}</td>
+            <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control} {$forms.groupForm.btn_delete.control}</td>
           </tr>
         </table>
       </td>
diff --git a/group_delete.php b/group_delete.php
index 65875fad1..6aa0d11d1 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -28,17 +28,22 @@
 
 require_once('initialize.php');
 import('form.Form');
+import('ttAdmin');
 
 // Access checks.
 if (!ttAccessAllowed('delete_group')) {
   header('Location: access_denied.php');
   exit();
 }
-// End of access checks.
-
-// TODO: refactor this... and the template.
 $group_id = (int)$request->getParameter('id');
+if ($user->group_id != $group_id) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
+// Note: reuse ttAdmin class here, simply because deleting a group
+// is a complicated task.
 $admin = new ttAdmin();
 $group_details = $admin->getGroupDetails($group_id);
 $group_name = $group_details['group_name'];
@@ -50,16 +55,17 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    $result = $admin->markGroupDeleted($group_id);
-    if ($result) {
-      header('Location: admin_groups.php');
+    if ($admin->markGroupDeleted($group_id)) {
+      $auth->doLogout();
+      session_unset();
+      header('Location: login.php');
       exit();
     } else
       $err->add($i18n->get('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {
-    header('Location: admin_groups.php');
+    header('Location: group_edit.php');
     exit();
   }
 } // isPost
@@ -67,5 +73,5 @@
 $smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'admin_group_delete.tpl');
+$smarty->assign('content_page_name', 'group_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/group_edit.php b/group_edit.php
index 2b8764933..91b2b68cb 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -208,8 +208,16 @@
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 $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')));
 
 if ($request->isPost()) {
+
+  if ($request->getParameter('btn_delete')) {
+    // Delete button pressed, redirect.
+    header('Location: group_delete.php?id='.$user->group_id);
+    exit();
+  }
+
   // Validate user input.
   if (!ttValidString($cl_group, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));

From 9cfce2e3c14aad3d25c50b12bd7d976e0dd77721 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 17:37:14 +0000
Subject: [PATCH 0142/1848] Improved a comment explaining class reuse.

---
 WEB-INF/templates/footer.tpl | 2 +-
 group_delete.php             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e4b699185..05db3fa5e 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.17.88.4253 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4254 | 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/group_delete.php b/group_delete.php
index 6aa0d11d1..b2977ee44 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -42,8 +42,9 @@
 }
 // End of access checks.
 
-// Note: reuse ttAdmin class here, simply because deleting a group
-// is a complicated task.
+// Note: reuse ttAdmin class here because deleting a group is a complicated task.
+// This creates an issue of using the class for not intended purpose.
+// However, otherwise we have to duplicate code, so reuse it is, for now.
 $admin = new ttAdmin();
 $group_details = $admin->getGroupDetails($group_id);
 $group_name = $group_details['group_name'];

From 8aa0cc3ce9e5382a2b5df0b3b67c07e3d3016278 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 19:03:46 +0000
Subject: [PATCH 0143/1848] Refactoring. Got rid of isCoManager() calls.

---
 WEB-INF/lib/ttUser.class.php       | 38 ++++++++++--
 WEB-INF/lib/ttUserHelper.class.php | 92 ------------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/user_delete.php             |  4 +-
 user_delete.php                    |  4 +-
 5 files changed, 37 insertions(+), 103 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2560417f8..bce21e033 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -158,12 +158,6 @@ function isManager() {
                                       // to this function and then remove it.
   }
 
-  // isCoManager - determines whether current user is group comanager.
-  // This is a legacy function that we are getting rid of by replacing with rights check.
-  function isCoManager() {
-    return ($this->can('manage_users') && !$this->can('export_data'));
-  }
-
   // isClient - determines whether current user is a client.
   function isClient() {
     return $this->is_client;
@@ -451,6 +445,38 @@ function updateGroup($fields) {
     return true;
   }
 
+  // markUserDeleted marks a user in group as deleted.
+  function markUserDeleted($user_id) {
+    if (!$this->can('manage_users') || $this->id == $user_id)
+      return false;
+
+    // Make sure we operate on a legit user.
+    $user_details = $this->getUser($user_id);
+    if (!$user_details) return false;
+
+    $mdb2 = getConnection();
+
+    // Mark user to project binds as deleted.
+    $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark user favorite reports as deleted.
+    $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark user as deleted.
+    $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$this->group_id;
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    return true;
+  }
+
   // enablePlugin either enables or disables a specific plugin for group.
   function enablePlugin($plugin, $enable = true)
   {
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 848c95395..521bc8b7a 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -235,98 +235,6 @@ static function update($user_id, $fields) {
     return true;
   }
 
-  // markDeleted - marks user and its associated things as deleted.
-  static function markDeleted($user_id) {
-    $mdb2 = getConnection();
-    global $user;
-
-    // Preliminary checks. Only managers and co-managers can do this.
-    if (!$user->canManageTeam())
-      return false;
-
-    // Tho logic is different depending on who is doing the operation.
-    // Co-manager - mark user deleted.
-    // Manager - mark user deleted. If manager is the only account in group, mark group items deleted.
-
-    // Co-manager part.
-    if ($user->isCoManager()) {
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark favorite reports as deleted.
-      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark user as deleted.
-      $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$user->group_id;
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-    } elseif ($user->isManager()) {
-      $user_count = ttTeamHelper::getUserCount($user->group_id);
-
-      // Marking deleted a manager with active users is not allowed.
-       if (($user_id == $user->id) && ($user_count > 1))
-        return false;
-
-      if (1 == $user_count) {
-        // Mark tasks deleted.
-        if (!ttTeamHelper::markTasksDeleted($user->group_id))
-          return false;
-
-        // Mark projects deleted.
-        $sql = "update tt_projects set status = NULL where group_id = $user->group_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
-
-        // Mark clients deleted.
-        $sql = "update tt_clients set status = NULL where group_id = $user->group_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
-
-        // Mark custom fields deleted.
-        $sql = "update tt_custom_fields set status = NULL where group_id = $user->group_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
- 
-        // Mark group deleted.
-        $sql = "update tt_groups set status = NULL where id = $user->group_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
-      }
-
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark favorite reports as deleted.
-      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark user as deleted.
-      $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$user->group_id;
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-    }
-
-    return true;
-  }
-
   // The delete function permanently deletes a user and all associated data.
   static function delete($user_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 05db3fa5e..1a94729be 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.17.88.4254 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4255 | 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_delete.php b/mobile/user_delete.php
index b5c8dae12..ac6c7c88c 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttUserHelper');
+import('ttUser');
 
 // Access checks.
 if (!ttAccessAllowed('manage_users')) {
@@ -53,7 +53,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if (ttUserHelper::markDeleted($user_id)) {
+    if ($user->markUserDeleted($user_id)) {
       // If we deleted the "on behalf" user reset its info in session.
       if ($user_id == $user->behalf_id) {
         unset($_SESSION['behalf_id']);
diff --git a/user_delete.php b/user_delete.php
index 647f21728..13b5ed0b7 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttUserHelper');
+import('ttUser');
 
 // Access checks.
 if (!ttAccessAllowed('manage_users')) {
@@ -53,7 +53,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if (ttUserHelper::markDeleted($user_id)) {
+    if ($user->markUserDeleted($user_id)) {
       // If we deleted the "on behalf" user reset its info in session.
       if ($user_id == $user->behalf_id) {
         unset($_SESSION['behalf_id']);

From 1e79f87da93c796cf1a46d7f36eab5f0fef3db61 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 22:32:43 +0000
Subject: [PATCH 0144/1848] A bit of refactoring in translation files.

---
 WEB-INF/resources/ca.lang.php    | 5 ++++-
 WEB-INF/resources/cs.lang.php    | 5 ++++-
 WEB-INF/resources/da.lang.php    | 6 ++++--
 WEB-INF/resources/de.lang.php    | 6 ++++--
 WEB-INF/resources/en.lang.php    | 4 +++-
 WEB-INF/resources/es.lang.php    | 6 ++++--
 WEB-INF/resources/et.lang.php    | 5 ++++-
 WEB-INF/resources/fa.lang.php    | 6 ++++--
 WEB-INF/resources/fi.lang.php    | 6 ++++--
 WEB-INF/resources/fr.lang.php    | 6 ++++--
 WEB-INF/resources/gr.lang.php    | 6 ++++--
 WEB-INF/resources/he.lang.php    | 6 ++++--
 WEB-INF/resources/hu.lang.php    | 5 ++++-
 WEB-INF/resources/it.lang.php    | 6 ++++--
 WEB-INF/resources/ja.lang.php    | 5 ++++-
 WEB-INF/resources/ko.lang.php    | 5 ++++-
 WEB-INF/resources/nl.lang.php    | 4 +++-
 WEB-INF/resources/no.lang.php    | 5 ++++-
 WEB-INF/resources/pl.lang.php    | 6 ++++--
 WEB-INF/resources/pt-br.lang.php | 6 ++++--
 WEB-INF/resources/pt.lang.php    | 5 ++++-
 WEB-INF/resources/ro.lang.php    | 5 ++++-
 WEB-INF/resources/ru.lang.php    | 4 +++-
 WEB-INF/resources/sk.lang.php    | 6 ++++--
 WEB-INF/resources/sl.lang.php    | 5 ++++-
 WEB-INF/resources/sr.lang.php    | 6 ++++--
 WEB-INF/resources/sv.lang.php    | 6 ++++--
 WEB-INF/resources/tr.lang.php    | 5 ++++-
 WEB-INF/resources/zh-cn.lang.php | 5 ++++-
 WEB-INF/resources/zh-tw.lang.php | 5 ++++-
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/user_edit.tpl  | 2 +-
 32 files changed, 119 insertions(+), 46 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 8b280c804..b42a5defd 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -457,6 +457,10 @@
 'form.users.rate' => 'Taxa',
 'form.users.default_rate' => 'Taxa per defecte per hora',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -494,7 +498,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index f167910cc..1fa174624 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -468,6 +468,10 @@
 // TODO: translate the following.
 // 'form.users.default_rate' => 'Default hourly rate',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -508,7 +512,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4d28aa36a..b7f21d585 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -417,6 +417,10 @@
 'form.users.rate' => 'Sats',
 'form.users.default_rate' => 'Standard Time Sats',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -451,8 +455,6 @@
 'form.groups.hint' => 'Opret et nyt team ved at oprette en ny teamadministrator konto. <br> Du kan også importere teamdata fra en xml-fil fra en anden Anuko Time Tracker-server (eksisterende brugernavne er ikke tilladt).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 timers',
 'form.profile.24_hours' => '24 timers',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 1f1b4f137..f86a4cd0e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -415,6 +415,10 @@
 'form.users.rate' => 'Stundensatz',
 'form.users.default_rate' => 'Normaler Stundensatz',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -449,8 +453,6 @@
 'form.groups.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 Stunden',
 'form.profile.24_hours' => '24 Stunden',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 85430647b..ce0163581 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -399,6 +399,9 @@
 'form.users.rate' => 'Rate',
 'form.users.default_rate' => 'Default hourly rate',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+'form.user_edit.swap_roles' => 'Swap roles',
+
  // Roles form. See example at https://timetracker.anuko.com/roles.php
 'form.roles.active_roles' => 'Active Roles',
 'form.roles.inactive_roles' => 'Inactive Roles',
@@ -430,7 +433,6 @@
 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 hours',
 'form.profile.24_hours' => '24 hours',
 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index faf8d4a51..ac09f20e9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -470,6 +470,10 @@
 // TODO: translate the following.
 // 'form.users.default_rate' => 'Default hourly rate',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -507,8 +511,6 @@
 'form.groups.hint' => 'Crear un nuevo grupo, creando una nueva cuenta del manejador del equipo.<br>También puede importar datos de grupos, de un archivo xml de otro servidor Anuko Time Tracker (no estan permitidad colisiones de e-mail).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 horas',
 'form.profile.24_hours' => '24 horas',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 85a1f07ba..86dae1b98 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -466,6 +466,10 @@
 'form.users.rate' => 'Hind',
 'form.users.default_rate' => 'Vaikimisi tunni hind',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -504,7 +508,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 47f3f56e8..eca7e83ba 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -443,6 +443,10 @@
 'form.users.rate' => 'نرخ',
 'form.users.default_rate' => 'نرخ ساعتی پیش فرض',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -478,8 +482,6 @@
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 ساعت',
 'form.profile.24_hours' => '24 ساعت',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 20d882e4b..9e52e06a6 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -425,6 +425,10 @@
 'form.users.rate' => 'Taksa',
 'form.users.default_rate' => 'Oletustuntitaksa',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -459,8 +463,6 @@
 'form.groups.hint' => 'Luo uusi tiimi luomalla ensin tiimin esimiehen käyttäjätili.<br>Tiimin tiedot voi myös tuoda toiselta Anuko Time Tracker -palvelimelta xml-muodossa (käyttäjänimien oltava uusia).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12-tuntinen',
 'form.profile.24_hours' => '24-tuntinen',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 249acbd24..fa96b5691 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -414,6 +414,10 @@
 'form.users.rate' => 'Tarif',
 'form.users.default_rate' => 'Tarif horaire par défaut',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -448,8 +452,6 @@
 'form.groups.hint' => 'Créez une nouvelle équipe en créant un nouveau compte de responsable d\\\'équipe.<br>Vous pouvez également importer des données d\\\'une équipe depuis un fichier xml provenant d\\\'un autre serveur Anuko Time Tracker (les doublons d\\\'identifiants ne sont pas autorisés).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 heures',
 'form.profile.24_hours' => '24 heures',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1b78e55e1..a7e7d296b 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -400,6 +400,10 @@
 'form.users.rate' => 'Τιμή',
 'form.users.default_rate' => 'Προκαθορισμένη ωριαία τιμή',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 'form.roles.active_roles' => 'Ενεργοί ρόλοι',
 'form.roles.inactive_roles' => 'Ανενεργοί ρόλοι',
@@ -431,8 +435,6 @@
 'form.groups.hint' => 'Δημιουργήστε μια νέα ομάδα δημιουργώντας ένα νέο λογαριασμό διαχειριστή ομάδας.<br>Μπορείτε επίσης να εισαγάγετε δεδομένα ομάδας από ένα αρχείο xml από άλλο διακομιστή Anuko Time Tracker (δεν επιτρέπονται συγκρούσεις σύνδεσης).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 ώρες',
 'form.profile.24_hours' => '24 ώρες',
 'form.profile.show_holidays' => 'Προβολή διακοπών',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 92450b5d9..6ded044fd 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -450,6 +450,10 @@
 'form.users.rate' => 'תעריף',
 'form.users.default_rate' => 'תעריף ברירת מחדל לשעה',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -485,8 +489,6 @@
 'form.groups.hint' => 'ניתן ליצור צוות חדש על-ידי יצירת מנהל צוות חדש.<br>ניתן לייבא נתוני צוות מקובץ XML משרת Anuko Time Tracker אחר (אין אפשרות לשמות משתמש זהים)',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 שעות',
 'form.profile.24_hours' => '24 שעות',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 7510442f8..b9651d7cd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -458,6 +458,10 @@
 'form.users.rate' => 'Tarifa',
 'form.users.default_rate' => 'Általános óradíj',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -497,7 +501,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7d4c79ab6..8429a6c85 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -414,6 +414,10 @@
 'form.users.rate' => 'Costo',
 'form.users.default_rate' => 'Costo per ora di default',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -446,8 +450,6 @@
 'form.groups.hint' => 'Crea un nuovo gruppo creando un account gruppo manager.<br>Puoi anche importare i dati di un gruppo da un file xml esportato da un altro server Anuko Time Tracker (non sono ammessi login duplicati).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 ore',
 'form.profile.24_hours' => '24 ore',
 'form.profile.show_holidays' => 'Mostra vacanze',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 636f2dd7d..1d24d6974 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -463,6 +463,10 @@
 'form.users.rate' => '給料',
 'form.users.default_rate' => 'デフォルト時間当り給料',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -500,7 +504,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5e621fe54..e3e871f9d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -461,6 +461,10 @@
 'form.users.rate' => '급여',
 'form.users.default_rate' => '디폴트 시간당 급여',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -498,7 +502,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 7fdae205b..9a496ba04 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -396,6 +396,9 @@
 'form.users.rate' => 'Tarief',
 'form.users.default_rate' => 'Standaard uurtarief',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+'form.user_edit.swap_roles' => 'Rollen verruilen',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 'form.roles.active_roles' => 'Actieve rollen',
 'form.roles.inactive_roles' => 'Inactieve rollen',
@@ -429,7 +432,6 @@
 'form.groups.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.swap_roles' => 'Rollen verruilen',
 'form.profile.12_hours' => '12 uurs',
 'form.profile.24_hours' => '24 uurs',
 'form.profile.show_holidays' => 'Toon vakantiedagen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2cfb3ad32..94bd7d331 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -460,6 +460,10 @@
 // 'form.users.rate' => 'Rate',
 // 'form.users.default_rate' => 'Default hourly rate',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -497,7 +501,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 7fc6fdc62..45603d471 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -427,6 +427,10 @@
 'form.users.rate' => 'Stawka',
 'form.users.default_rate' => 'Domyślna stawka godzinowa',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -461,8 +465,6 @@
 'form.groups.hint' => 'Załóż nowy zespół najpierw tworząc konto managera.<br>Możesz także zaimportować plik xml z danymi zespołu z innego serwera Anuko Time Tracker (nazwy loginów nie mogą się powtarzać).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 godzin',
 'form.profile.24_hours' => '24 godziny',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bdc772150..5d76010a6 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -422,6 +422,10 @@
 'form.users.rate' => 'Honorário',
 'form.users.default_rate' => 'Honorário padrão por hora',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -456,8 +460,6 @@
 'form.groups.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 horas',
 'form.profile.24_hours' => '24 horas',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5b9c4db25..d1928d10d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -443,6 +443,10 @@
 // 'form.users.rate' => 'Rate',
 // 'form.users.default_rate' => 'Default hourly rate',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -481,7 +485,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 93f00f703..73e9366fa 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -464,6 +464,10 @@
 'form.users.rate' => 'Rată',
 'form.users.default_rate' => 'Pret pe ora implicit',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -503,7 +507,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ad714129c..7d67bc074 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -396,6 +396,9 @@
 'form.users.rate' => 'Ставка',
 'form.users.default_rate' => 'Почасовая ставка',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+'form.user_edit.swap_roles' => 'Обменять роль',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 'form.roles.active_roles' => 'Активные роли',
 'form.roles.inactive_roles' => 'Неактивные роли',
@@ -427,7 +430,6 @@
 'form.groups.hint' => 'Cоздайте новую группу, сделав новый аккаунт для её менеджера.<br>Также вы можете импортировать данные группы через xml файл из другого Anuko Time Tracker сервера (запрещено дублирование логинов).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.swap_roles' => 'Обменять роль',
 'form.profile.12_hours' => '12 часов',
 'form.profile.24_hours' => '24 часа',
 'form.profile.show_holidays' => 'Показывать праздники',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 0414d2249..37396da2b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -441,6 +441,10 @@
 'form.users.rate' => 'Sadzba',
 'form.users.default_rate' => 'Predvolená hodinová sadzba',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -476,8 +480,6 @@
 'form.groups.hint' => 'Pomocou vytvorenia nového účtu tímového manažéra vytvorte nový tím.<br>Taktiež môžete importovať údaje o tíme z xml súboru z iného Anuko Time Tracker serveru (nie sú povolené kolízie v prihlasovacom mene).',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12-hodinový',
 'form.profile.24_hours' => '24-hodinový',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f1731ab92..7ec40b111 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -439,6 +439,10 @@
 // 'form.users.rate' => 'Rate',
 // 'form.users.default_rate' => 'Default hourly rate',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -477,7 +481,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1c98dc959..1a02f3a46 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -426,6 +426,10 @@
 'form.users.rate' => 'Cena',
 'form.users.default_rate' => 'Podrazumevana cena sati',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -460,8 +464,6 @@
 'form.groups.hint' => 'Napravite novi tim. Počnite sa otvaranjem naloga za Menadžera.<br>Takođe možete uvoziti podatke iz xml fajla sa drugog Anuko Time Tracker server-a (dupliranje prijava nisu dozvoljeni).',
 
 // Forma profila. Pogledajte primer na at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12 časova',
 'form.profile.24_hours' => '24 časova',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 6348480a0..a7860f81f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -420,6 +420,10 @@
 'form.users.rate' => 'Timtaxa',
 'form.users.default_rate' => 'Standard timtaxa',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -454,8 +458,6 @@
 'form.groups.hint' => 'Skapa en ny grupp genom att skapa ett konto för en ansvarig person. Du kan även importera grupp från en tidigare installation av Anuko Time Tracker via en XML-fil. Se till att inga användarnamn krockar när filen importeras.',
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 'form.profile.12_hours' => '12-timmars',
 'form.profile.24_hours' => '24-timmars',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 06d21c218..049a4f78f 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -477,6 +477,10 @@
 'form.users.rate' => 'Tarife', // TODO: is this correct?
 'form.users.default_rate' => 'Varsayılan saat ücreti',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -516,7 +520,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index d299b8e34..983afaf74 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -447,6 +447,10 @@
 'form.users.rate' => '费率',
 'form.users.default_rate' => '默认小时收费',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -484,7 +488,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c28dd0254..134d150af 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -455,6 +455,10 @@
 'form.users.rate' => '費率',
 'form.users.default_rate' => '默認小時收費',
 
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
+// TODO: translate the following.
+// 'form.user_edit.swap_roles' => 'Swap roles',
+
 // Roles form. See example at https://timetracker.anuko.com/roles.php
 // TODO: translate the following.
 // 'form.roles.active_roles' => 'Active Roles',
@@ -492,7 +496,6 @@
 
 // Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
 // TODO: translate the following.
-// 'form.profile.swap_roles' => 'Swap roles',
 // 'form.profile.12_hours' => '12 hours',
 // 'form.profile.24_hours' => '24 hours',
 // 'form.profile.show_holidays' => 'Show holidays',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a94729be..d3f318304 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.17.88.4255 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4256 | 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/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 6b09881d8..e7d9dd92f 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -108,7 +108,7 @@ function handleClientControl() {
 {if $user->id == $user_id}
       <tr>
       <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.profile.swap_roles}</a>{/if}</td>
+      <td>{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.user_edit.swap_roles}</a>{/if}</td>
     </tr>
 {/if}
     <tr>

From 95d4442c1517b0d9e76081fd901a600e45e9fbea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 23:27:29 +0000
Subject: [PATCH 0145/1848] Renamed group settings keys in translation files.

---
 WEB-INF/resources/ca.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/cs.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/da.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/de.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/en.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/es.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/et.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/fa.lang.php    | 40 ++++++++++++++++----------------
 WEB-INF/resources/fi.lang.php    | 40 ++++++++++++++++----------------
 WEB-INF/resources/fr.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/gr.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/he.lang.php    | 40 ++++++++++++++++----------------
 WEB-INF/resources/hu.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/it.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/ja.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/ko.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/nl.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/no.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/pl.lang.php    | 40 ++++++++++++++++----------------
 WEB-INF/resources/pt-br.lang.php | 40 ++++++++++++++++----------------
 WEB-INF/resources/pt.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/ro.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/ru.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/sk.lang.php    | 40 ++++++++++++++++----------------
 WEB-INF/resources/sl.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/sr.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/sv.lang.php    | 36 ++++++++++++++--------------
 WEB-INF/resources/tr.lang.php    | 38 +++++++++++++++---------------
 WEB-INF/resources/zh-cn.lang.php | 38 +++++++++++++++---------------
 WEB-INF/resources/zh-tw.lang.php | 38 +++++++++++++++---------------
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/group_edit.tpl | 18 +++++++-------
 group_edit.php                   | 18 +++++++-------
 33 files changed, 586 insertions(+), 586 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b42a5defd..cc8264d80 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -496,25 +496,25 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Crear un nou grup, creant un nou compte del manejador de l\\\'equip.<br>També pot importar dades de grups, d\\\'un arxiu xml d\\\'un altre servidor Anuko Time Tracker (no està permès col·lisions de login).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1fa174624..b73f31a2f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -510,25 +510,25 @@
 // ALSO TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Vytvořit nový tým prostřednictvím účtu týmového manažera.<br>Můžete také importovat týmová data z xml souboru z jiného time tracker serveru (nejsou povoleny shody login).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index b7f21d585..668699f61 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -454,27 +454,27 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Opret et nyt team ved at oprette en ny teamadministrator konto. <br> Du kan også importere teamdata fra en xml-fil fra en anden Anuko Time Tracker-server (eksisterende brugernavne er ikke tilladt).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 timers',
-'form.profile.24_hours' => '24 timers',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 timers',
+'form.group_edit.24_hours' => '24 timers',
 // TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Registrerings tilstand',
-'form.profile.mode_time' => 'Tid',
-'form.profile.mode_projects' => 'Projekter',
-'form.profile.mode_projects_and_tasks' => 'Projekter og opgaver',
-'form.profile.record_type' => 'Registrerings type',
-'form.profile.type_all' => 'Alle',
-'form.profile.type_start_finish' => 'Start og slut',
-'form.profile.type_duration' => 'Varighed',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Registrerings tilstand',
+'form.group_edit.mode_time' => 'Tid',
+'form.group_edit.mode_projects' => 'Projekter',
+'form.group_edit.mode_projects_and_tasks' => 'Projekter og opgaver',
+'form.group_edit.record_type' => 'Registrerings type',
+'form.group_edit.type_all' => 'Alle',
+'form.group_edit.type_start_finish' => 'Start og slut',
+'form.group_edit.type_duration' => 'Varighed',
 // TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-'form.profile.uncompleted_indicators' => 'Uafsluttede indikatore',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+'form.group_edit.uncompleted_indicators' => 'Uafsluttede indikatore',
 // TODO: translate the following.
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Plugins',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index f86a4cd0e..b1d455c5f 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -452,26 +452,26 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 Stunden',
-'form.profile.24_hours' => '24 Stunden',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 Stunden',
+'form.group_edit.24_hours' => '24 Stunden',
 // TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Nachverfolgung',
-'form.profile.mode_time' => 'Zeit',
-'form.profile.mode_projects' => 'Projekte',
-'form.profile.mode_projects_and_tasks' => 'Projekte und Aufgaben',
-'form.profile.record_type' => 'Zeiterfassungstyp',
-'form.profile.type_all' => 'alle',
-'form.profile.type_start_finish' => 'Start und Ende',
-'form.profile.type_duration' => 'Dauer',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Nachverfolgung',
+'form.group_edit.mode_time' => 'Zeit',
+'form.group_edit.mode_projects' => 'Projekte',
+'form.group_edit.mode_projects_and_tasks' => 'Projekte und Aufgaben',
+'form.group_edit.record_type' => 'Zeiterfassungstyp',
+'form.group_edit.type_all' => 'alle',
+'form.group_edit.type_start_finish' => 'Start und Ende',
+'form.group_edit.type_duration' => 'Dauer',
 // TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Erweiterungen',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Erweiterungen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ce0163581..45dbdfeeb 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -432,24 +432,24 @@
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 hours',
-'form.profile.24_hours' => '24 hours',
-'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Tracking mode',
-'form.profile.mode_time' => 'time',
-'form.profile.mode_projects' => 'projects',
-'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-'form.profile.record_type' => 'Record type',
-'form.profile.type_all' => 'all',
-'form.profile.type_start_finish' => 'start and finish',
-'form.profile.type_duration' => 'duration',
-'form.profile.punch_mode' => 'Punch mode',
-'form.profile.allow_overlap' => 'Allow overlap',
-'form.profile.future_entries' => 'Future entries',
-'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 hours',
+'form.group_edit.24_hours' => '24 hours',
+'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Tracking mode',
+'form.group_edit.mode_time' => 'time',
+'form.group_edit.mode_projects' => 'projects',
+'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+'form.group_edit.record_type' => 'Record type',
+'form.group_edit.type_all' => 'all',
+'form.group_edit.type_start_finish' => 'start and finish',
+'form.group_edit.type_duration' => 'duration',
+'form.group_edit.punch_mode' => 'Punch mode',
+'form.group_edit.allow_overlap' => 'Allow overlap',
+'form.group_edit.future_entries' => 'Future entries',
+'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Plugins',
 
 // 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?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index ac09f20e9..12796439b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -510,25 +510,25 @@
 // ALSO TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Crear un nuevo grupo, creando una nueva cuenta del manejador del equipo.<br>También puede importar datos de grupos, de un archivo xml de otro servidor Anuko Time Tracker (no estan permitidad colisiones de e-mail).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 horas',
-'form.profile.24_hours' => '24 horas',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 horas',
+'form.group_edit.24_hours' => '24 horas',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 86dae1b98..c007e0f6b 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -506,25 +506,25 @@
 // TODO: translate the following.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index eca7e83ba..9adc21b10 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -481,26 +481,26 @@
 // TODO: translate form.groups.hint.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 ساعت',
-'form.profile.24_hours' => '24 ساعت',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'حالت رهگیری',
-'form.profile.mode_time' => 'زمان',
-'form.profile.mode_projects' => 'پروژه ها',
-'form.profile.mode_projects_and_tasks' => 'پروژه ها و وظایف',
-'form.profile.record_type' => 'نوع رکورد',
-'form.profile.type_all' => 'همه',
-'form.profile.type_start_finish' => 'شروع و اتمام',
-'form.profile.type_duration' => 'مدت زمان',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'پلاگین ها',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 ساعت',
+'form.group_edit.24_hours' => '24 ساعت',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'حالت رهگیری',
+'form.group_edit.mode_time' => 'زمان',
+'form.group_edit.mode_projects' => 'پروژه ها',
+'form.group_edit.mode_projects_and_tasks' => 'پروژه ها و وظایف',
+'form.group_edit.record_type' => 'نوع رکورد',
+'form.group_edit.type_all' => 'همه',
+'form.group_edit.type_start_finish' => 'شروع و اتمام',
+'form.group_edit.type_duration' => 'مدت زمان',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'پلاگین ها',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9e52e06a6..79b454deb 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -462,26 +462,26 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Luo uusi tiimi luomalla ensin tiimin esimiehen käyttäjätili.<br>Tiimin tiedot voi myös tuoda toiselta Anuko Time Tracker -palvelimelta xml-muodossa (käyttäjänimien oltava uusia).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12-tuntinen',
-'form.profile.24_hours' => '24-tuntinen',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Seurantamuoto',
-'form.profile.mode_time' => 'aika',
-'form.profile.mode_projects' => 'projektit',
-'form.profile.mode_projects_and_tasks' => 'projektit ja tehtävät',
-'form.profile.record_type' => 'Tietueen tyyppi',
-'form.profile.type_all' => 'kaikki',
-'form.profile.type_start_finish' => 'aloitus ja lopetus',
-'form.profile.type_duration' => 'kesto',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Lisäosat',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12-tuntinen',
+'form.group_edit.24_hours' => '24-tuntinen',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Seurantamuoto',
+'form.group_edit.mode_time' => 'aika',
+'form.group_edit.mode_projects' => 'projektit',
+'form.group_edit.mode_projects_and_tasks' => 'projektit ja tehtävät',
+'form.group_edit.record_type' => 'Tietueen tyyppi',
+'form.group_edit.type_all' => 'kaikki',
+'form.group_edit.type_start_finish' => 'aloitus ja lopetus',
+'form.group_edit.type_duration' => 'kesto',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Lisäosat',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index fa96b5691..9a1340230 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -451,26 +451,26 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Créez une nouvelle équipe en créant un nouveau compte de responsable d\\\'équipe.<br>Vous pouvez également importer des données d\\\'une équipe depuis un fichier xml provenant d\\\'un autre serveur Anuko Time Tracker (les doublons d\\\'identifiants ne sont pas autorisés).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 heures',
-'form.profile.24_hours' => '24 heures',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 heures',
+'form.group_edit.24_hours' => '24 heures',
 // TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Mode suivi',
-'form.profile.mode_time' => 'Heures',
-'form.profile.mode_projects' => 'Projets',
-'form.profile.mode_projects_and_tasks' => 'Projets et tâches',
-'form.profile.record_type' => 'Type d\\\'enregistrement',
-'form.profile.type_all' => 'Tous',
-'form.profile.type_start_finish' => 'Début et fin',
-'form.profile.type_duration' => 'Durée',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Mode suivi',
+'form.group_edit.mode_time' => 'Heures',
+'form.group_edit.mode_projects' => 'Projets',
+'form.group_edit.mode_projects_and_tasks' => 'Projets et tâches',
+'form.group_edit.record_type' => 'Type d\\\'enregistrement',
+'form.group_edit.type_all' => 'Tous',
+'form.group_edit.type_start_finish' => 'Début et fin',
+'form.group_edit.type_duration' => 'Durée',
 // TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Plugins',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a7e7d296b..8573946f6 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -434,25 +434,25 @@
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Δημιουργήστε μια νέα ομάδα δημιουργώντας ένα νέο λογαριασμό διαχειριστή ομάδας.<br>Μπορείτε επίσης να εισαγάγετε δεδομένα ομάδας από ένα αρχείο xml από άλλο διακομιστή Anuko Time Tracker (δεν επιτρέπονται συγκρούσεις σύνδεσης).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 ώρες',
-'form.profile.24_hours' => '24 ώρες',
-'form.profile.show_holidays' => 'Προβολή διακοπών',
-'form.profile.tracking_mode' => 'Λειτουργία καταγραφής',
-'form.profile.mode_time' => 'χρόνος',
-'form.profile.mode_projects' => 'έργα',
-'form.profile.mode_projects_and_tasks' => 'έργα και εργασίες',
-'form.profile.record_type' => 'Τύπος εγγραφής',
-'form.profile.type_all' => 'όλα',
-'form.profile.type_start_finish' => 'αρχή και τέλος',
-'form.profile.type_duration' => 'διάρκεια',
-'form.profile.punch_mode' => 'Λειτουργία διάτρησης',
-'form.profile.allow_overlap' => 'Επικάλυψη επιτρεπτή',
-'form.profile.future_entries' => 'Μελλοντικές καταχωρήσεις',
-'form.profile.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 ώρες',
+'form.group_edit.24_hours' => '24 ώρες',
+'form.group_edit.show_holidays' => 'Προβολή διακοπών',
+'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
+'form.group_edit.mode_time' => 'χρόνος',
+'form.group_edit.mode_projects' => 'έργα',
+'form.group_edit.mode_projects_and_tasks' => 'έργα και εργασίες',
+'form.group_edit.record_type' => 'Τύπος εγγραφής',
+'form.group_edit.type_all' => 'όλα',
+'form.group_edit.type_start_finish' => 'αρχή και τέλος',
+'form.group_edit.type_duration' => 'διάρκεια',
+'form.group_edit.punch_mode' => 'Λειτουργία διάτρησης',
+'form.group_edit.allow_overlap' => 'Επικάλυψη επιτρεπτή',
+'form.group_edit.future_entries' => 'Μελλοντικές καταχωρήσεις',
+'form.group_edit.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
 // TODO: translate the following.
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Πρόσθετα',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Πρόσθετα',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6ded044fd..7929baa2d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -488,26 +488,26 @@
 // TODO: replace "team" with "group" in the string below. Also improve formatting, as multiple spaces or no spaces look a bit weird.
 'form.groups.hint' => 'ניתן ליצור צוות חדש על-ידי יצירת מנהל צוות חדש.<br>ניתן לייבא נתוני צוות מקובץ XML משרת Anuko Time Tracker אחר (אין אפשרות לשמות משתמש זהים)',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 שעות',
-'form.profile.24_hours' => '24 שעות',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'סוג מעקב',
-'form.profile.mode_time' => 'זמן',
-'form.profile.mode_projects' => 'פרוייקטים',
-'form.profile.mode_projects_and_tasks' => 'פרוייקטים ומשימות',
-'form.profile.record_type' => 'סוג רישום',
-'form.profile.type_all' => 'הכל',
-'form.profile.type_start_finish' => 'התחלה וסיום',
-'form.profile.type_duration' => 'משך זמן',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'תוספים',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 שעות',
+'form.group_edit.24_hours' => '24 שעות',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'סוג מעקב',
+'form.group_edit.mode_time' => 'זמן',
+'form.group_edit.mode_projects' => 'פרוייקטים',
+'form.group_edit.mode_projects_and_tasks' => 'פרוייקטים ומשימות',
+'form.group_edit.record_type' => 'סוג רישום',
+'form.group_edit.type_all' => 'הכל',
+'form.group_edit.type_start_finish' => 'התחלה וסיום',
+'form.group_edit.type_duration' => 'משך זמן',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'תוספים',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b9651d7cd..e6aa959ad 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -499,25 +499,25 @@
 // TODO: fix form.groups.hint by translating it properly from the English string. Note that the ending is not translated at all.
 'form.groups.hint' => 'Új csoport létrehozása egy csoport-vezetői jogosultsággal.<br>A csoport adatokat importálhatjuk XML-ből (no login collisions are allowed).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8429a6c85..2a02eb045 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -449,26 +449,26 @@
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Crea un nuovo gruppo creando un account gruppo manager.<br>Puoi anche importare i dati di un gruppo da un file xml esportato da un altro server Anuko Time Tracker (non sono ammessi login duplicati).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 ore',
-'form.profile.24_hours' => '24 ore',
-'form.profile.show_holidays' => 'Mostra vacanze',
-'form.profile.tracking_mode' => 'Modalità di registrazione',
-'form.profile.mode_time' => 'tempo',
-'form.profile.mode_projects' => 'progetti',
-'form.profile.mode_projects_and_tasks' => 'progetti e compiti',
-'form.profile.record_type' => 'Tipo di record',
-'form.profile.type_all' => 'tutto',
-'form.profile.type_start_finish' => 'inizio e fine',
-'form.profile.type_duration' => 'durata',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 ore',
+'form.group_edit.24_hours' => '24 ore',
+'form.group_edit.show_holidays' => 'Mostra vacanze',
+'form.group_edit.tracking_mode' => 'Modalità di registrazione',
+'form.group_edit.mode_time' => 'tempo',
+'form.group_edit.mode_projects' => 'progetti',
+'form.group_edit.mode_projects_and_tasks' => 'progetti e compiti',
+'form.group_edit.record_type' => 'Tipo di record',
+'form.group_edit.type_all' => 'tutto',
+'form.group_edit.type_start_finish' => 'inizio e fine',
+'form.group_edit.type_duration' => 'durata',
 // TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-'form.profile.uncompleted_indicators' => 'Indicatori incompleti',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+'form.group_edit.uncompleted_indicators' => 'Indicatori incompleti',
 // TODO: translate the following.
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Plugin',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Plugin',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 1d24d6974..75a1546fb 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -502,25 +502,25 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '新規チームの管理者のアカウントを生成して新規チームを作成します。<br>あなたはなお他のAnuko Time Trackerサーバのxmlのファイルからチームデータをインポートすることができます(ログインの衝突は許可されません)。',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index e3e871f9d..1f16aff58 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -500,25 +500,25 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '신규 팀관리자 계정을 생성하여 신규 팀을 생성합니다.<br>또한 다른 Anuko Time Tracker 서버 에서 xml 파일로부터 팀 데이터를 임포트할수 있습니다 (로그인 충돌은 허용되지 안음).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9a496ba04..10bef9279 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -431,24 +431,24 @@
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 uurs',
-'form.profile.24_hours' => '24 uurs',
-'form.profile.show_holidays' => 'Toon vakantiedagen',
-'form.profile.tracking_mode' => 'Bijhouden',
-'form.profile.mode_time' => 'tijd',
-'form.profile.mode_projects' => 'projecten',
-'form.profile.mode_projects_and_tasks' => 'projecten en taken',
-'form.profile.record_type' => 'Registratie type',
-'form.profile.type_all' => 'begin, einde en duur',
-'form.profile.type_start_finish' => 'begin en einde',
-'form.profile.type_duration' => 'duur',
-'form.profile.punch_mode' => 'Start/stop modus',
-'form.profile.allow_overlap' => 'Sta overlapping van tijden toe',
-'form.profile.future_entries' => 'Toevoegingen toestaan in de toekomst',
-'form.profile.uncompleted_indicators' => 'Onvolledige indicatoren',
-'form.profile.allow_ip' => 'Toegestane IP adressen',
-'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 uurs',
+'form.group_edit.24_hours' => '24 uurs',
+'form.group_edit.show_holidays' => 'Toon vakantiedagen',
+'form.group_edit.tracking_mode' => 'Bijhouden',
+'form.group_edit.mode_time' => 'tijd',
+'form.group_edit.mode_projects' => 'projecten',
+'form.group_edit.mode_projects_and_tasks' => 'projecten en taken',
+'form.group_edit.record_type' => 'Registratie type',
+'form.group_edit.type_all' => 'begin, einde en duur',
+'form.group_edit.type_start_finish' => 'begin en einde',
+'form.group_edit.type_duration' => 'duur',
+'form.group_edit.punch_mode' => 'Start/stop modus',
+'form.group_edit.allow_overlap' => 'Sta overlapping van tijden toe',
+'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
+'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
+'form.group_edit.allow_ip' => 'Toegestane IP adressen',
+'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 94bd7d331..b4deac5c1 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -499,25 +499,25 @@
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Opprett et nytt team ved å opprette en ny team manager konto.<br>Du kan også importere team data fra en xml fil fra en annen Anuko Time Tracker server (ingen login kollisjoner er tillatt).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 45603d471..fb48e7bcf 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -464,26 +464,26 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Załóż nowy zespół najpierw tworząc konto managera.<br>Możesz także zaimportować plik xml z danymi zespołu z innego serwera Anuko Time Tracker (nazwy loginów nie mogą się powtarzać).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 godzin',
-'form.profile.24_hours' => '24 godziny',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Tryb śledzenia',
-'form.profile.mode_time' => 'czas',
-'form.profile.mode_projects' => 'projekty',
-'form.profile.mode_projects_and_tasks' => 'projekty i zadania',
-'form.profile.record_type' => 'Rejestrowanie czasu',
-'form.profile.type_all' => 'wszystko',
-'form.profile.type_start_finish' => 'początek i koniec',
-'form.profile.type_duration' => 'czas trwania',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Dodatkowe moduły',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 godzin',
+'form.group_edit.24_hours' => '24 godziny',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Tryb śledzenia',
+'form.group_edit.mode_time' => 'czas',
+'form.group_edit.mode_projects' => 'projekty',
+'form.group_edit.mode_projects_and_tasks' => 'projekty i zadania',
+'form.group_edit.record_type' => 'Rejestrowanie czasu',
+'form.group_edit.type_all' => 'wszystko',
+'form.group_edit.type_start_finish' => 'początek i koniec',
+'form.group_edit.type_duration' => 'czas trwania',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Dodatkowe moduły',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5d76010a6..968f78cb4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -459,26 +459,26 @@
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 horas',
-'form.profile.24_hours' => '24 horas',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Modo de acompanhamento',
-'form.profile.mode_time' => 'tempo',
-'form.profile.mode_projects' => 'projetos',
-'form.profile.mode_projects_and_tasks' => 'projetos e tarefas',
-'form.profile.record_type' => 'Tipo de entrada',
-'form.profile.type_all' => 'todos',
-'form.profile.type_start_finish' => 'início e fim',
-'form.profile.type_duration' => 'duração',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 horas',
+'form.group_edit.24_hours' => '24 horas',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
+'form.group_edit.mode_time' => 'tempo',
+'form.group_edit.mode_projects' => 'projetos',
+'form.group_edit.mode_projects_and_tasks' => 'projetos e tarefas',
+'form.group_edit.record_type' => 'Tipo de entrada',
+'form.group_edit.type_all' => 'todos',
+'form.group_edit.type_start_finish' => 'início e fim',
+'form.group_edit.type_duration' => 'duração',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d1928d10d..ff6d7130a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -483,25 +483,25 @@
 // TODO: translate the following.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 73e9366fa..217f67413 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -505,25 +505,25 @@
 // ALSO TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Adauga o noua echipa prin adaugarea unui nou cont de tip manager.<br>Deasemeni poti importa datele despre echipa dintr-un fisier xml generat de un alt server Anuko Time Tracker (nu sunt permise duplicate pentru login).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 7d67bc074..51413f283 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -429,24 +429,24 @@
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
 'form.groups.hint' => 'Cоздайте новую группу, сделав новый аккаунт для её менеджера.<br>Также вы можете импортировать данные группы через xml файл из другого Anuko Time Tracker сервера (запрещено дублирование логинов).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 часов',
-'form.profile.24_hours' => '24 часа',
-'form.profile.show_holidays' => 'Показывать праздники',
-'form.profile.tracking_mode' => 'Режим работы',
-'form.profile.mode_time' => 'время',
-'form.profile.mode_projects' => 'проекты',
-'form.profile.mode_projects_and_tasks' => 'проекты и задачи',
-'form.profile.record_type' => 'Тип записи',
-'form.profile.type_all' => 'все',
-'form.profile.type_start_finish' => 'начало и конец',
-'form.profile.type_duration' => 'длительность',
-'form.profile.punch_mode' => 'Пробивать время',
-'form.profile.allow_overlap' => 'Возможное перекрывание',
-'form.profile.future_entries' => 'Будущие записи',
-'form.profile.uncompleted_indicators' => 'Индикаторы незавершения',
-'form.profile.allow_ip' => 'Разрешить доступ с IP',
-'form.profile.plugins' => 'Плагины',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12 часов',
+'form.group_edit.24_hours' => '24 часа',
+'form.group_edit.show_holidays' => 'Показывать праздники',
+'form.group_edit.tracking_mode' => 'Режим работы',
+'form.group_edit.mode_time' => 'время',
+'form.group_edit.mode_projects' => 'проекты',
+'form.group_edit.mode_projects_and_tasks' => 'проекты и задачи',
+'form.group_edit.record_type' => 'Тип записи',
+'form.group_edit.type_all' => 'все',
+'form.group_edit.type_start_finish' => 'начало и конец',
+'form.group_edit.type_duration' => 'длительность',
+'form.group_edit.punch_mode' => 'Пробивать время',
+'form.group_edit.allow_overlap' => 'Возможное перекрывание',
+'form.group_edit.future_entries' => 'Будущие записи',
+'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
+'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
+'form.group_edit.plugins' => 'Плагины',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 37396da2b..e80db533a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -479,26 +479,26 @@
 // TODO: replace "team" with "group" in the string below (3 places).
 'form.groups.hint' => 'Pomocou vytvorenia nového účtu tímového manažéra vytvorte nový tím.<br>Taktiež môžete importovať údaje o tíme z xml súboru z iného Anuko Time Tracker serveru (nie sú povolené kolízie v prihlasovacom mene).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12-hodinový',
-'form.profile.24_hours' => '24-hodinový',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Režim sledovania',
-'form.profile.mode_time' => 'čas',
-'form.profile.mode_projects' => 'projekty',
-'form.profile.mode_projects_and_tasks' => 'projekty a úlohy',
-'form.profile.record_type' => 'Typ záznamu',
-'form.profile.type_all' => 'všetky',
-'form.profile.type_start_finish' => 'začiatok a koniec',
-'form.profile.type_duration' => 'trvanie',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Doplnkové moduly',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12-hodinový',
+'form.group_edit.24_hours' => '24-hodinový',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Režim sledovania',
+'form.group_edit.mode_time' => 'čas',
+'form.group_edit.mode_projects' => 'projekty',
+'form.group_edit.mode_projects_and_tasks' => 'projekty a úlohy',
+'form.group_edit.record_type' => 'Typ záznamu',
+'form.group_edit.type_all' => 'všetky',
+'form.group_edit.type_start_finish' => 'začiatok a koniec',
+'form.group_edit.type_duration' => 'trvanie',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Doplnkové moduly',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7ec40b111..6bf161e20 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -479,25 +479,25 @@
 // TODO: translate the following.
 // 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1a02f3a46..5754b603b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -464,25 +464,25 @@
 'form.groups.hint' => 'Napravite novi tim. Počnite sa otvaranjem naloga za Menadžera.<br>Takođe možete uvoziti podatke iz xml fajla sa drugog Anuko Time Tracker server-a (dupliranje prijava nisu dozvoljeni).',
 
 // Forma profila. Pogledajte primer na at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12 časova',
-'form.profile.24_hours' => '24 časova',
-// TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Način evidencije',
-'form.profile.mode_time' => 'vreme',
-'form.profile.mode_projects' => 'projekti',
-'form.profile.mode_projects_and_tasks' => 'projekti i zadaci',
-'form.profile.record_type' => 'Način čuvanja',
-'form.profile.type_all' => 'sve',
-'form.profile.type_start_finish' => 'početak i kraj',
-'form.profile.type_duration' => 'trajanje',
-// TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Dodaci',
+'form.group_edit.12_hours' => '12 časova',
+'form.group_edit.24_hours' => '24 časova',
+// TODO: translate the following.
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Način evidencije',
+'form.group_edit.mode_time' => 'vreme',
+'form.group_edit.mode_projects' => 'projekti',
+'form.group_edit.mode_projects_and_tasks' => 'projekti i zadaci',
+'form.group_edit.record_type' => 'Način čuvanja',
+'form.group_edit.type_all' => 'sve',
+'form.group_edit.type_start_finish' => 'početak i kraj',
+'form.group_edit.type_duration' => 'trajanje',
+// TODO: translate the following.
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Dodaci',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a7860f81f..cee942fb0 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -457,27 +457,27 @@
 // TODO: check translation of form.groups.hint for accuracy.
 'form.groups.hint' => 'Skapa en ny grupp genom att skapa ett konto för en ansvarig person. Du kan även importera grupp från en tidigare installation av Anuko Time Tracker via en XML-fil. Se till att inga användarnamn krockar när filen importeras.',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-'form.profile.12_hours' => '12-timmars',
-'form.profile.24_hours' => '24-timmars',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+'form.group_edit.12_hours' => '12-timmars',
+'form.group_edit.24_hours' => '24-timmars',
 // TODO: translate the following.
-// 'form.profile.show_holidays' => 'Show holidays',
-'form.profile.tracking_mode' => 'Spårningsmetod',
-'form.profile.mode_time' => 'Endast tid',
-'form.profile.mode_projects' => 'Projekt',
-'form.profile.mode_projects_and_tasks' => 'Projekt och arbetsuppgifter',
-'form.profile.record_type' => 'Typ av tidsregistrering',
-'form.profile.type_all' => 'Alla',
-'form.profile.type_start_finish' => 'Starttid och sluttid',
-'form.profile.type_duration' => 'Varaktighet',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.tracking_mode' => 'Spårningsmetod',
+'form.group_edit.mode_time' => 'Endast tid',
+'form.group_edit.mode_projects' => 'Projekt',
+'form.group_edit.mode_projects_and_tasks' => 'Projekt och arbetsuppgifter',
+'form.group_edit.record_type' => 'Typ av tidsregistrering',
+'form.group_edit.type_all' => 'Alla',
+'form.group_edit.type_start_finish' => 'Starttid och sluttid',
+'form.group_edit.type_duration' => 'Varaktighet',
 // TODO: translate the following.
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-'form.profile.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+'form.group_edit.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
 // TODO: translate the following.
-// 'form.profile.allow_ip' => 'Allow IP',
-'form.profile.plugins' => 'Tillägg',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.plugins' => 'Tillägg',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 049a4f78f..111b2d49b 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -518,25 +518,25 @@
 // ALSO TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => 'Yeni bir ekip yönetimi hesabı yaratarak yeni bir ekibi yaratın.<br>Ayrıca başka bir Anuko Time Tracker sunucusundan ekip bilgilerini bir xml dosyasından aktarabilirsiniz (login çakışmalarına izin verilmemekte).',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 983afaf74..4d5307b78 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -486,25 +486,25 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '通过创建新的团队经理账号来创建新团队。<br>您也可以从其它的Anuko时间追踪器服务器的xml文件导入团队数据(登录信息不能发生冲突)。',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 134d150af..9665a6a15 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -494,25 +494,25 @@
 // TODO: replace "team" with "group" in the string below.
 'form.groups.hint' => '通過創建新的團隊經理帳號來創建新團隊。<br>您也可以從其它的Anuko時間追蹤器伺服器的xml檔導入團隊資料(登錄資訊不能發生衝突)。',
 
-// Profile form. See example at https://timetracker.anuko.com/profile_edit.php.
-// TODO: translate the following.
-// 'form.profile.12_hours' => '12 hours',
-// 'form.profile.24_hours' => '24 hours',
-// 'form.profile.show_holidays' => 'Show holidays',
-// 'form.profile.tracking_mode' => 'Tracking mode',
-// 'form.profile.mode_time' => 'time',
-// 'form.profile.mode_projects' => 'projects',
-// 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.profile.record_type' => 'Record type',
-// 'form.profile.type_all' => 'all',
-// 'form.profile.type_start_finish' => 'start and finish',
-// 'form.profile.type_duration' => 'duration',
-// 'form.profile.punch_mode' => 'Punch mode',
-// 'form.profile.allow_overlap' => 'Allow overlap',
-// 'form.profile.future_entries' => 'Future entries',
-// 'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.profile.allow_ip' => 'Allow IP',
-// 'form.profile.plugins' => 'Plugins',
+// Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
+// TODO: translate the following.
+// 'form.group_edit.12_hours' => '12 hours',
+// 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.tracking_mode' => 'Tracking mode',
+// 'form.group_edit.mode_time' => 'time',
+// 'form.group_edit.mode_projects' => 'projects',
+// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
+// 'form.group_edit.record_type' => 'Record type',
+// 'form.group_edit.type_all' => 'all',
+// 'form.group_edit.type_start_finish' => 'start and finish',
+// 'form.group_edit.type_duration' => 'duration',
+// 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.allow_overlap' => 'Allow overlap',
+// 'form.group_edit.future_entries' => 'Future entries',
+// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d3f318304..473d36326 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.17.88.4256 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4257 | 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 aba5ea61f..cec449742 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -139,31 +139,31 @@ function handlePluginCheckboxes() {
             <td>{$forms.groupForm.start_week.control}</td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.show_holidays}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
             <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.tracking_mode}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
             <td>{$forms.groupForm.tracking_mode.control} {$forms.groupForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.record_type}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.record_type}:</td>
             <td>{$forms.groupForm.record_type.control}</td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.punch_mode}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.punch_mode}:</td>
             <td>{$forms.groupForm.punch_mode.control} <a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.allow_overlap}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.allow_overlap}:</td>
             <td>{$forms.groupForm.allow_overlap.control} <a href="https://www.anuko.com/lp/tt_16.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.future_entries}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.future_entries}:</td>
             <td>{$forms.groupForm.future_entries.control} <a href="https://www.anuko.com/lp/tt_17.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
+            <td align="right" nowrap>{$i18n.form.group_edit.uncompleted_indicators}:</td>
             <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
   {if $user->can('manage_advanced_settings')}
@@ -172,7 +172,7 @@ function handlePluginCheckboxes() {
             <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>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.allow_ip}:</td>
+            <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>
   {/if}
@@ -196,7 +196,7 @@ function handlePluginCheckboxes() {
           </tr>
 
           <tr>
-             <td colspan="2" class="sectionHeader">{$i18n.form.profile.plugins}</td>
+             <td colspan="2" class="sectionHeader">{$i18n.form.group_edit.plugins}</td>
           </tr>
           <tr><td>&nbsp;</td></tr>
           <tr>
diff --git a/group_edit.php b/group_edit.php
index 91b2b68cb..d79ba2d35 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -145,8 +145,8 @@
 $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
   'onchange'=>'MakeFormatPreview(&quot;date_format_preview&quot;, this);'));
 $TIME_FORMAT_OPTIONS = array(
-  array('id'=>'%H:%M','name'=>$i18n->get('form.profile.24_hours')),
-  array('id'=>'%I:%M %p','name'=>$i18n->get('form.profile.12_hours')));
+  array('id'=>'%H:%M','name'=>$i18n->get('form.group_edit.24_hours')),
+  array('id'=>'%I:%M %p','name'=>$i18n->get('form.group_edit.12_hours')));
 $form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
   'onchange'=>'MakeFormatPreview(&quot;time_format_preview&quot;, this);'));
 
@@ -162,18 +162,18 @@
 
 // Prepare tracking mode choices.
 $tracking_mode_options = array();
-$tracking_mode_options[MODE_TIME] = $i18n->get('form.profile.mode_time');
-$tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.profile.mode_projects');
-$tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.profile.mode_projects_and_tasks');
+$tracking_mode_options[MODE_TIME] = $i18n->get('form.group_edit.mode_time');
+$tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.group_edit.mode_projects');
+$tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.group_edit.mode_projects_and_tasks');
 $form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode,'onchange'=>'handleTaskRequiredCheckbox()'));
 $form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
 $form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
 
 // Prepare record type choices.
 $record_type_options = array();
-$record_type_options[TYPE_ALL] = $i18n->get('form.profile.type_all');
-$record_type_options[TYPE_START_FINISH] = $i18n->get('form.profile.type_start_finish');
-$record_type_options[TYPE_DURATION] = $i18n->get('form.profile.type_duration');
+$record_type_options[TYPE_ALL] = $i18n->get('form.group_edit.type_all');
+$record_type_options[TYPE_START_FINISH] = $i18n->get('form.group_edit.type_start_finish');
+$record_type_options[TYPE_DURATION] = $i18n->get('form.group_edit.type_duration');
 $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
 // Punch mode checkbox.
@@ -223,7 +223,7 @@
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
   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.profile.allow_ip'));
+    if (!ttValidIP($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.allow_ip'));
   }
   // Finished validating user input.
 

From cfc5b5586771bea46106c54215884da6bc0ede6d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 23:44:54 +0000
Subject: [PATCH 0146/1848] Removed a no longer used function.

---
 WEB-INF/lib/ttTeamHelper.class.php | 24 ------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index dfcdaaf10..8d788cf36 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -797,30 +797,6 @@ static function delete($group_id) {
     return true;
   }
 
-  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group.
-  static function markTasksDeleted($group_id) {
-    $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where group_id = $group_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) return false;
-
-    while ($val = $res->fetchRow()) {
-
-      // Delete task binds.
-      $task_id = $val['id'];
-      $sql = "delete from tt_project_task_binds where task_id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error')) return false;
-
-      // Mark task as deleted.
-      $sql = "update tt_tasks set status = NULL where id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error')) return false;
-    }
-
-    return true;
-  }
-
   // The deleteTasks deletes all tasks and task binds for an inactive group.
   static function deleteTasks($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 473d36326..56f76966e 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.17.88.4257 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4258 | 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>

From 3e557bb14365fb2483e0889820013198e0088674 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Apr 2018 01:30:07 +0000
Subject: [PATCH 0147/1848] Removed unused function.

---
 WEB-INF/lib/ttTeamHelper.class.php | 14 --------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 8d788cf36..08fa5beee 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -33,20 +33,6 @@
 // Class ttTeamHelper - contains helper functions that operate with groups.
 class ttTeamHelper {
 
-  // The getUserCount function returns number of active users in a group.
-  static function getUserCount($group_id) {
-    $mdb2 = getConnection();
-
-    $sql = "select count(id) as cnt from tt_users where group_id = $group_id and status = 1";
-    $res = $mdb2->query($sql);
-
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val['cnt'];
-    }
-    return false;
-  }
-
   // The getUsersForClient obtains all active and inactive users in a group that are relevant to a client.
   static function getUsersForClient() {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 56f76966e..28ff07382 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.17.88.4258 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4259 | 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>

From b548ce1bf2e1175f72563fb0c0c986d551cd4b94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Apr 2018 23:09:32 +0000
Subject: [PATCH 0148/1848] Removed no longer needed isManager() function.

---
 WEB-INF/lib/ttUser.class.php | 8 --------
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index bce21e033..0af49300b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -150,14 +150,6 @@ function can($do_something) {
     return in_array($do_something, $this->rights);
   }
 
-  // isManager - determines whether current user is group manager.
-  // This is a legacy function that we are getting rid of by replacing with rights check.
-  function isManager() {
-    return $this->can('export_data'); // By default this is assigned to managers but not co-managers.
-                                      // Which is sufficient for now until we refactor all calls
-                                      // to this function and then remove it.
-  }
-
   // isClient - determines whether current user is a client.
   function isClient() {
     return $this->is_client;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 28ff07382..c9612607e 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.17.88.4259 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4260 | 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>

From 6756191f98a9812d075dc2fae455921b1a09d850 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Apr 2018 23:24:06 +0000
Subject: [PATCH 0149/1848] A bit of refactoring.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/reports.tpl | 4 ++--
 time_edit.php                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c9612607e..dbacaa7f4 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.17.88.4260 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4261 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 2ee48b01d..640a55ca7 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -209,7 +209,7 @@ function handleCheckboxes() {
           <td>{$forms.reportForm.invoice.control}</td>
         </tr>
 {/if}
-{if ($user->canManageTeam() && $user->isPluginEnabled('ps'))}
+{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
         <tr>
           <td><b>{$i18n.label.paid_status}</b></td>
         </tr>
@@ -264,7 +264,7 @@ function handleCheckboxes() {
                 <td width="25%">{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}<label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label>{/if}</td>
                 <td width="25%">{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chstart.control}&nbsp;{$i18n.label.start}</label>{/if}</td>
                 <td width="25%"><label>{$forms.reportForm.chduration.control}&nbsp;{$i18n.label.duration}</label></td>
-{if (($user->canManageTeam() || $user->isClient()) || $user->isPluginEnabled('ex'))}
+{if ($user->can('manage_invoices') || $user->isClient()) || $user->isPluginEnabled('ex')}
                   <td width="25%"><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td>
 {else}
                   <td></td>
diff --git a/time_edit.php b/time_edit.php
index 812594360..fd1851dc3 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -206,7 +206,7 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));

From 3bb62c4615274c6d495f58fd80df912c9beffee5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 01:26:53 +0000
Subject: [PATCH 0150/1848] A bit more progress on removing dependency on
 canManageTeam().

---
 WEB-INF/templates/footer.tpl    | 2 +-
 WEB-INF/templates/time_edit.tpl | 2 +-
 expense_edit.php                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dbacaa7f4..938417598 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.17.88.4261 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4262 | 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/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index 1d346bba6..a5017ce74 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -20,7 +20,7 @@
       <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
     </tr>
 {/if}
-{if ($user->canManageTeam() && $user->isPluginEnabled('ps'))}
+{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
     <tr>
       <td align="right">&nbsp;</td>
       <td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td>
diff --git a/expense_edit.php b/expense_edit.php
index 3e8b18e9b..26cf3bba1 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -141,7 +141,7 @@
 }
 $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 // Hidden control for record id.

From 4d16598799828cd01d430bf8cb78aeaf955af31e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 11:49:47 +0000
Subject: [PATCH 0151/1848] Fixed getUser to include client_id.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0af49300b..36d713633 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -353,7 +353,7 @@ function getUser($user_id) {
 
     $mdb2 = getConnection();
 
-    $sql =  "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email from tt_users u".
+    $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
             " left join tt_roles r on (u.role_id = r.id)".
             " where u.id = $user_id and u.group_id = $this->group_id and u.status is not null".
             " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 938417598..e1e4c9b57 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.17.88.4262 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4263 | 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>

From 53171dda875db008bc0ce6da98115dff6b3232e8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 12:16:20 +0000
Subject: [PATCH 0152/1848] Ongoing refactoring, getting rid of
 canManageTeam().

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e1e4c9b57..8853f5d30 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.17.88.4263 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4264 | 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/reports.php b/reports.php
index 0028e9957..11d1434d3 100644
--- a/reports.php
+++ b/reports.php
@@ -66,10 +66,11 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
 
 // Dropdown for clients if the clients plugin is enabled.
-if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) {
-  if ($user->canManageTeam() || ($user->isClient() && !$user->client_id))
-    $client_list = ttClientHelper::getClients();
-  else
+if ($user->isPluginEnabled('cl') && !$user->isClient()) {
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
+                                                 // by filtering out not relevant clients.
+  } else
     $client_list = ttClientHelper::getClientsForUser();
   $form->addInput(array('type'=>'combobox',
     'name'=>'client',

From 71d06cc16c8a2a70c69e06ea1bf9140b57e1554d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 12:40:32 +0000
Subject: [PATCH 0153/1848] More progress on replacing canManagerTeam() with
 rights checks.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/reports.tpl |  4 ++++
 reports.php                   | 22 ++++++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8853f5d30..09a969e45 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.17.88.4264 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4265 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 640a55ca7..8aa7f6de1 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -201,13 +201,17 @@ function handleCheckboxes() {
         <tr>
           <td><b>{$i18n.form.time.billable}</b></td>
           <td>&nbsp;</td>
+  {if $user->can('manage_invoices')}
           <td><b>{$i18n.label.invoice}</b></td>
+  {/if}
         </tr>
         <tr valign="top">
           <td>{$forms.reportForm.include_records.control}</td>
           <td>&nbsp;</td>
+  {if $user->can('manage_invoices')}
           <td>{$forms.reportForm.invoice.control}</td>
         </tr>
+  {/if}
 {/if}
 {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
         <tr>
diff --git a/reports.php b/reports.php
index 11d1434d3..bc6d8fc03 100644
--- a/reports.php
+++ b/reports.php
@@ -90,8 +90,8 @@
 }
 
 // Add controls for projects and tasks.
-if ($user->canManageTeam()) {
-  $project_list = ttProjectHelper::getProjects(); // Manager and co-managers can run reports on all active and inactive projects.
+if ($user->can('view_reports') || $user->can('view_all_reports')) {
+  $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
 } elseif ($user->isClient()) {
   $project_list = ttProjectHelper::getProjectsForClient();
 } else {
@@ -124,15 +124,17 @@
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
 // Add invoiced / not invoiced selector.
-$invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
-  '2'=>$i18n->get('form.reports.include_not_invoiced'));
-$form->addInput(array('type'=>'combobox',
-  'name'=>'invoice',
-  'style'=>'width: 250px;',
-  'data'=>$invoice_options,
-  'empty'=>array(''=>$i18n->get('dropdown.all'))));
+if ($user->can('manage_invoices')) {
+  $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
+    '2'=>$i18n->get('form.reports.include_not_invoiced'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'invoice',
+    'style'=>'width: 250px;',
+    'data'=>$invoice_options,
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
 
-if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'paid_status',
    'style'=>'width: 250px;',

From 997481e8d75cb192c12b1c38f71021fd27105777 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 12:51:57 +0000
Subject: [PATCH 0154/1848] More refactoring.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 09a969e45..3ff2dda35 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.17.88.4265 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4266 | 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/reports.php b/reports.php
index bc6d8fc03..fcefd047b 100644
--- a/reports.php
+++ b/reports.php
@@ -194,11 +194,11 @@
 // Add checkboxes for fields.
 if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
-if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
+if (($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
-if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
-if ($user->canManageTeam())
+if ($user->can('view_reports') || $user->can('view_all_reports'))
   $form->addInput(array('type'=>'checkbox','name'=>'chip'));
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
   $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
@@ -217,7 +217,7 @@
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->get('form.reports.group_by_date');
-if ($user->canManageTeam() || $user->isClient())
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
   $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
   $group_by_options['client'] = $i18n->get('form.reports.group_by_client');

From 2bd9983978cf8d6263e27a531aeb33f365667e37 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 13:07:37 +0000
Subject: [PATCH 0155/1848] Some more refactoring.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/reports.tpl | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3ff2dda35..16befd9a6 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.17.88.4266 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4267 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 8aa7f6de1..a70a3f072 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -221,7 +221,7 @@ function handleCheckboxes() {
           <td>{$forms.reportForm.paid_status.control}</td>
         </tr>
 {/if}
-{if $user->canManageTeam() || $user->isClient()}
+{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}
         <tr>
           <td colspan="3"><b>{$i18n.label.users}</b></td>
         </tr>
@@ -248,18 +248,18 @@ function handleCheckboxes() {
         <tr>
           <td colspan="3">
             <table border="0" width="100%">
-{if $user->canManageTeam() || $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv') || $user->isPluginEnabled('ps')}
+{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv') || $user->isPluginEnabled('ps')}
               <tr>
   {if $user->isPluginEnabled('cl')}
                 <td width="25%"><label>{$forms.reportForm.chclient.control}&nbsp;{$i18n.label.client}</label></td>
   {/if}
-  {if ($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv')}
+  {if ($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv')}
                 <td width="25%"><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td>
   {/if}
-  {if ($user->canManageTeam() && $user->isPluginEnabled('ps'))}
+  {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
                 <td width="25%"><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td>
   {/if}
-  {if $user->canManageTeam()}
+  {if $user->can('view_reports') || $user->can('view_all_reports')}
                 <td width="25%"><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</label></td>
   {/if}
               </tr>

From 7638ca2e290e13d2f2a4f80ef41b34ec964568eb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 13:34:14 +0000
Subject: [PATCH 0156/1848] More progress on removing dependency on
 canManageTeam().

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/report.tpl | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 16befd9a6..8c6edaee0 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.17.88.4267 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4268 | 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/report.tpl b/WEB-INF/templates/report.tpl
index c0f4b2c24..ddea591af 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -22,7 +22,7 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
       </tr>
   {/foreach}
       <!-- print totals -->
@@ -30,13 +30,13 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
       </tr>
 {else}
 <!-- normal report -->
       <tr>
         <td class="tableHeader">{$i18n.label.date}</td>
-  {if $user->canManageTeam() || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
+  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
   {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
   {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
@@ -58,7 +58,7 @@
       {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-        {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
+        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
         {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
         {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
         {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
@@ -67,7 +67,7 @@
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
         {if $bean->getAttribute('chnote')}<td></td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chip')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}
@@ -83,7 +83,7 @@
       {/if}
       <tr class="{$report_row_class}">
         <td class="cellLeftAligned">{$item.date}</td>
-    {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
     {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
@@ -92,7 +92,7 @@
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
     {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
@@ -108,7 +108,7 @@
   {if $print_subtotals}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-    {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
     {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
     {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
@@ -117,7 +117,7 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
@@ -128,7 +128,7 @@
       <tr><td>&nbsp;</td></tr>
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
-    {if $user->canManageTeam() || $user->isClient()}<td></td>{/if}
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
     {if $bean->getAttribute('chclient')}<td></td>{/if}
     {if $bean->getAttribute('chproject')}<td></td>{/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
@@ -137,7 +137,7 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}

From 047bc803a5228a0a786462cabdfa5fdd9be762a4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Apr 2018 13:50:14 +0000
Subject: [PATCH 0157/1848] Replaced all calls to canManageTeam() with rights
 checks.

---
 WEB-INF/lib/ttUser.class.php |  8 --------
 WEB-INF/templates/footer.tpl |  2 +-
 tofile.php                   | 14 +++++++-------
 topdf.php                    | 22 +++++++++++-----------
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 36d713633..07d810b89 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -155,14 +155,6 @@ function isClient() {
     return $this->is_client;
   }
 
-  // canManageTeam - determines whether current user is manager or co-manager.
-  // This is a legacy function that we are getting rid of by replacing with rights check.
-  function canManageTeam() {
-    return $this->can('manage_users'); // By default this is assigned to co-managers (an managers).
-                                       // Which is sufficient for now until we refactor all calls
-                                       // to this function and then remove it.
-  }
-
   // isPluginEnabled checks whether a plugin is enabled for user.
   function isPluginEnabled($plugin)
   {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8c6edaee0..e1a3e385e 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.17.88.4268 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.89.4269 | 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/tofile.php b/tofile.php
index 62632fa97..909fdd3eb 100644
--- a/tofile.php
+++ b/tofile.php
@@ -97,7 +97,7 @@
       }
       if ($bean->getAttribute('chcost')) {
         print "\t<cost><![CDATA[";
-        if ($user->canManageTeam() || $user->isClient())
+        if ($user->can('manage_invoices') || $user->isClient())
           print $subtotal['cost'];
         else
           print $subtotal['expenses'];
@@ -111,7 +111,7 @@
       print "<row>\n";
 
       print "\t<date><![CDATA[".$item['date']."]]></date>\n";
-      if ($user->canManageTeam() || $user->isClient()) print "\t<user><![CDATA[".$item['user']."]]></user>\n"; 
+      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print "\t<user><![CDATA[".$item['user']."]]></user>\n"; 
       if ($bean->getAttribute('chclient')) print "\t<client><![CDATA[".$item['client']."]]></client>\n";
       if ($bean->getAttribute('chproject')) print "\t<project><![CDATA[".$item['project']."]]></project>\n";
       if ($bean->getAttribute('chtask')) print "\t<task><![CDATA[".$item['task']."]]></task>\n";
@@ -127,7 +127,7 @@
       if ($bean->getAttribute('chnote')) print "\t<note><![CDATA[".$item['note']."]]></note>\n";
       if ($bean->getAttribute('chcost')) {
         print "\t<cost><![CDATA[";
-        if ($user->canManageTeam() || $user->isClient())
+        if ($user->can('manage_invoices') || $user->isClient())
           print $item['cost'];
         else
           print $item['expense'];
@@ -184,7 +184,7 @@
         print ',"'.$val.'"';
       }
       if ($bean->getAttribute('chcost')) {
-        if ($user->canManageTeam() || $user->isClient())
+        if ($user->can('manage_invoices') || $user->isClient())
           print ',"'.$subtotal['cost'].'"';
         else
           print ',"'.$subtotal['expenses'].'"';
@@ -194,7 +194,7 @@
   } else {
     // Normal report. Print headers.
     print '"'.$i18n->get('label.date').'"';
-    if ($user->canManageTeam() || $user->isClient()) print ',"'.$i18n->get('label.user').'"';
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.$i18n->get('label.user').'"';
     if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
     if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
     if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
@@ -212,7 +212,7 @@
     // Print items.
     foreach ($items as $item) {
       print '"'.$item['date'].'"';
-      if ($user->canManageTeam() || $user->isClient()) print ',"'.str_replace('"','""',$item['user']).'"';
+      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.str_replace('"','""',$item['user']).'"';
       if ($bean->getAttribute('chclient')) print ',"'.str_replace('"','""',$item['client']).'"';
       if ($bean->getAttribute('chproject')) print ',"'.str_replace('"','""',$item['project']).'"';
       if ($bean->getAttribute('chtask')) print ',"'.str_replace('"','""',$item['task']).'"';
@@ -227,7 +227,7 @@
       }
       if ($bean->getAttribute('chnote')) print ',"'.str_replace('"','""',$item['note']).'"';
       if ($bean->getAttribute('chcost')) {
-        if ($user->canManageTeam() || $user->isClient())
+        if ($user->can('manage_invoices') || $user->isClient())
           print ',"'.$item['cost'].'"';
         else
           print ',"'.$item['expense'].'"';
diff --git a/topdf.php b/topdf.php
index 9149e1c69..eb09bc452 100644
--- a/topdf.php
+++ b/topdf.php
@@ -119,7 +119,7 @@
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotal['time'].'</td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
-      if ($user->canManageTeam() || $user->isClient())
+      if ($user->can('manage_invoices') || $user->isClient())
         $html .= $subtotal['cost'];
       else
         $html .= $subtotal['expenses'];
@@ -135,7 +135,7 @@
   if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       $html .= htmlspecialchars($user->currency).' ';
-      if ($user->canManageTeam() || $user->isClient())
+      if ($user->can('manage_invoices') || $user->isClient())
         $html .= $totals['cost'];
       else
         $html .= $totals['expenses'];
@@ -150,7 +150,7 @@
   $html .= '<thead>';
   $html .= "<tr $styleHeader>";
   $html .= '<td>'.$i18n->get('label.date').'</td>';
-  if ($user->canManageTeam() || $user->isClient()) { $colspan++; $html .= '<td>'.$i18n->get('label.user').'</td>'; }
+  if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) { $colspan++; $html .= '<td>'.$i18n->get('label.user').'</td>'; }
   if ($bean->getAttribute('chclient')) { $colspan++; $html .= '<td>'.$i18n->get('label.client').'</td>'; }
   if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->get('label.project').'</td>'; }
   if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->get('label.task').'</td>'; }
@@ -174,7 +174,7 @@
       if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
         $html .= '<tr style="background-color:#e0e0e0;">';
         $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
-        if ($user->canManageTeam() || $user->isClient()) {
+        if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
             $html .= '<td>';
             if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
@@ -205,7 +205,7 @@
         if ($bean->getAttribute('chnote')) $html .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $html .= "<td $styleRightAligned>";
-          if ($user->canManageTeam() || $user->isClient())
+          if ($user->can('manage_invoices') || $user->isClient())
             $html .= $subtotals[$prev_grouped_by]['cost'];
           else
             $html .= $subtotals[$prev_grouped_by]['expenses'];
@@ -223,7 +223,7 @@
     // Print a regular row.
     $html .= '<tr>';
     $html .= '<td>'.$item['date'].'</td>';
-    if ($user->canManageTeam() || $user->isClient()) $html .= '<td>'.htmlspecialchars($item['user']).'</td>';
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= '<td>'.htmlspecialchars($item['user']).'</td>';
     if ($bean->getAttribute('chclient')) $html .= '<td>'.htmlspecialchars($item['client']).'</td>';
     if ($bean->getAttribute('chproject')) $html .= '<td>'.htmlspecialchars($item['project']).'</td>';
     if ($bean->getAttribute('chtask')) $html .= '<td>'.htmlspecialchars($item['task']).'</td>';
@@ -234,7 +234,7 @@
     if ($bean->getAttribute('chnote')) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
-      if ($user->canManageTeam() || $user->isClient())
+      if ($user->can('manage_invoices') || $user->isClient())
         $html .= $item['cost'];
       else
         $html .= $item['expense'];
@@ -261,7 +261,7 @@
   if ($print_subtotals) {
     $html .= '<tr style="background-color:#e0e0e0;">';
     $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
-    if ($user->canManageTeam() || $user->isClient()) {
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
       $html .= '<td>';
       if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
@@ -292,7 +292,7 @@
     if ($bean->getAttribute('chnote')) $html .= '<td></td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
-      if ($user->canManageTeam() || $user->isClient())
+      if ($user->can('manage_invoices') || $user->isClient())
         $html .= $subtotals[$prev_grouped_by]['cost'];
       else
         $html .= $subtotals[$prev_grouped_by]['expenses'];
@@ -308,7 +308,7 @@
   $html .= '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
   $html .= '<tr style="background-color:#e0e0e0;">';
   $html .= '<td>'.$i18n->get('label.total').'</td>';
-  if ($user->canManageTeam() || $user->isClient()) $html .= '<td></td>';
+  if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= '<td></td>';
   if ($bean->getAttribute('chclient')) $html .= '<td></td>';
   if ($bean->getAttribute('chproject')) $html .= '<td></td>';
   if ($bean->getAttribute('chtask')) $html .= '<td></td>';
@@ -319,7 +319,7 @@
   if ($bean->getAttribute('chnote')) $html .= '<td></td>';
   if ($bean->getAttribute('chcost')) {
     $html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
-    if ($user->canManageTeam() || $user->isClient())
+    if ($user->can('manage_invoices') || $user->isClient())
       $html .= $totals['cost'];
     else
       $html .= $totals['expenses'];

From 3293ee1f5f59dca3c19a9b9ac21dca90e572b8dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 15 Apr 2018 18:11:38 +0000
Subject: [PATCH 0158/1848] Cosmetic maintenance fixes.

---
 WEB-INF/lib/ttTeamHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 08fa5beee..631d21202 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -664,9 +664,9 @@ static function getInactiveGroups() {
     $inactive_groups = array();
     $mdb2 = getConnection();
 
-    // Get all group ids for groups created or modified more than 8 months ago.
+    // Get all group ids for groups created or modified more than 9 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));
-    $ts = $mdb2->quote(date('Y-m-d', strtotime('-8 month')));
+    $ts = $mdb2->quote(date('Y-m-d', strtotime('-9 month')));
     $sql =  "select id from tt_groups where created < $ts and (modified is null or modified < $ts) order by id";
     $res = $mdb2->query($sql);
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e1a3e385e..f8265031b 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.17.89.4269 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.89.4270 | 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/dbinstall.php b/dbinstall.php
index d50594446..e0973cd72 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -904,13 +904,13 @@ function setChange($sql) {
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
-    $inactive_teams = ttTeamHelper::getInactiveGroups();
+    $inactive_groups = ttTeamHelper::getInactiveGroups();
 
-    $count = count($inactive_teams);
-    print "$count inactive teams found...<br>\n";
+    $count = count($inactive_groups);
+    print "$count inactive groups found...<br>\n";
     for ($i = 0; $i < $count; $i++) {
-      print "  deleting team ".$inactive_teams[$i]."<br>\n";
-      $res = ttTeamHelper::delete($inactive_teams[$i]);
+      print "  deleting group ".$inactive_groups[$i]."<br>\n";
+      $res = ttTeamHelper::delete($inactive_groups[$i]);
     }
 
     setChange("OPTIMIZE TABLE tt_client_project_binds");

From 1e00b2113ddaf084e87f640c063ff3283de5c7f8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 21 Apr 2018 18:40:20 +0000
Subject: [PATCH 0159/1848] Cosmetic - fix in path, not relevant to core
 functionality.

---
 mobile/user_add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/user_add.php b/mobile/user_add.php
index 934114528..9d2b539e0 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -42,7 +42,7 @@
 
 // Use the "limit" plugin if we have one. Ignore include errors.
 // The "limit" plugin is not required for normal operation of the Time Tracker.
-@include('plugins/limit/user_add.php');
+@include('../plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
   $clients = ttTeamHelper::getActiveClients($user->group_id);

From 63c57b1abb92b53f51a13d2fd93ac064f1ed4178 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 May 2018 20:14:51 +0000
Subject: [PATCH 0160/1848] Fixing file permissions issue for some hostings.

---
 WEB-INF/templates/footer.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f8265031b..e02acfe7b 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.17.89.4270 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.89.4271 | 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>

From 4497564f2b685457b53b2523300178a18005b850 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 May 2018 20:47:47 +0000
Subject: [PATCH 0161/1848] Updated readme with a note about file and directory
 permissions for hosting providers.

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index fd2e78b33..c8929fae4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -23,7 +23,7 @@ The general installation procedure looks like this:
 - Install, configure, and test Anuko Time Tracker like so:
 
 1) Unpack distribution files into a selected directory for your web server.
-2) Allow writing to WEB-INF/templates_c/.
+2) Allow writing to WEB-INF/templates_c/. Some hosting providers like Hostmonster additionally require files having 644 and directories 755. Otherwise you'll see error 500 (bad permissions, writable by group).
 3) Create a database using the mysql.sql file in the distribution.
 4) Create user name and password to access the time tracker database.
 5) Create a config file by coping WEB-INF/config.php.dist to WEB-INF/config.php.

From df91142c352b8cefe51c228be25b181f357acca3 Mon Sep 17 00:00:00 2001
From: eschaettin <enrico.schaettin+github@gmail.com>
Date: Wed, 16 May 2018 21:52:26 +0200
Subject: [PATCH 0162/1848] Corrected the day of Whit Monday in Germany 2018
 (#64)

Whit Monday is in 05/21 not on 05/28
---
 WEB-INF/resources/de.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b1d455c5f..e329907f8 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -34,7 +34,7 @@
 $i18n_weekdays = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag');
 $i18n_weekdays_short = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
 // format mm/dd
-$i18n_holidays = array('01/01', '04/02', '05/01', '05/10', '05/28', '10/03', '12/25', '12/26');
+$i18n_holidays = array('01/01', '04/02', '05/01', '05/10', '05/21', '10/03', '12/25', '12/26');
 
 $i18n_key_words = array(
 

From 0c5ac91ba467b83c2ca3f8d00dcc32b6d4b795c5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Jun 2018 17:13:44 +0000
Subject: [PATCH 0163/1848] Fixed update role_id step in dbinstall.php.

---
 WEB-INF/lib/ttRoleHelper.class.php | 39 +++++++++++++++++++++++-------
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      |  4 +--
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 9dce54885..958f034fc 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -234,12 +234,15 @@ static function createPredefinedRoles($group_id, $lang)
     return true;
   }
 
-  // createDefaultRoles - creates a set of predefined roles for a group to use.
-  static function createDefaultRoles()
+  // createPredefinedRoles_1_17_44 - used in dbinstall.php during database schema update.
+  static function createPredefinedRoles_1_17_44($group_id, $lang)
   {
+    // We need localized role names and a new I18n object to obtain them.
+    import('I18n');
+    $i18n = new I18n();
+    $i18n->load($lang);
+
     $mdb2 = getConnection();
-    global $i18n;
-    global $user;
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
@@ -251,7 +254,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.user.label'));
     $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 4, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -259,7 +262,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.client.label'));
     $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 16, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -267,7 +270,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.comanager.label'));
     $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 68, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -275,7 +278,7 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.manager.label'));
     $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 324, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -284,11 +287,29 @@ static function createDefaultRoles()
     $name = $mdb2->quote($i18n->get('role.supervisor.label'));
     $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($user->group_id, $name, $description, 12, $rights, 0)";
+    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     return true;
   }
+
+  // getRoleByRank_1_17_44 is used in dbinstall.php and looks up a role by its rank.
+  static function getRoleByRank_1_17_44($rank, $group_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $rank = (int) $rank; // Cast to int just in case for better security.
+
+    $sql = "select id from tt_roles where team_id = $group_id and rank = $rank and (status = 1 or status = 0)";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val['id'])
+        return $val['id'];
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e02acfe7b..512d834ac 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.17.89.4271 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.90.4272 | 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/dbinstall.php b/dbinstall.php
index e0973cd72..31d5fbf10 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -789,10 +789,10 @@ function setChange($sql) {
       if (is_a($result, 'PEAR_Error')) die($result->getMessage());
       $row = $result->fetchRow();
       if ($row['count'] == 0)
-        ttRoleHelper::createPredefinedRoles($team_id, $lang);
+        ttRoleHelper::createPredefinedRoles_1_17_44($team_id, $lang);
 
       // Obtain new role id based on legacy role.
-      $role_id = ttRoleHelper::getRoleByRank($legacy_role, $team_id);
+      $role_id = ttRoleHelper::getRoleByRank_1_17_44($legacy_role, $team_id);
       if (!$role_id) continue; // Role not found, nothing to do.
 
       $sql = "update tt_users set role_id = $role_id where id = $user_id and team_id = $team_id";

From a92ccc0e245f7d2b18ce6978611ed0a5549a83cc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Jun 2018 13:18:59 +0000
Subject: [PATCH 0164/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 32 +++++++++++++++-----------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 10bef9279..739957cb8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -112,14 +112,14 @@
 'button.reset_password' => 'Herstel het wachtwoord',
 'button.send' => 'Verzenden',
 'button.send_by_email' => 'Verzend per e-mail',
-'button.create_group' => 'Maak team', // TODO: replace "team" with "group".
-'button.export' => 'Team exporteren', // TODO: replace "team" with "group".
-'button.import' => 'Team importeren', // TODO: replace "team" with "group".
+'button.create_group' => 'Maak groep',
+'button.export' => 'Groep exporteren',
+'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.group_name' => 'Teamnaam', // TODO: replace "team" with "group".
+'label.group_name' => 'Groepsnaam',
 'label.address' => 'Adres',
 'label.currency' => 'Munteenheid',
 'label.manager_name' => 'Naam van de manager',
@@ -213,10 +213,10 @@
 
 // Form titles.
 'title.login' => 'Aanmelden',
-'title.groups' => 'Teams', // TODO: change "teams" to "groups".
-'title.create_group' => 'Team maken', // TODO: change "team" to "group".
-'title.edit_group' => 'Team bewerken', // TODO: change "team" to "group".
-'title.delete_group' => 'Team aan het verwijderen', // TODO: change "team" to "group".
+'title.groups' => 'Groepen',
+'title.create_group' => 'Groep maken',
+'title.edit_group' => 'Groep bewerken',
+'title.delete_group' => 'Groep aan het verwijderen',
 'title.reset_password' => 'Wachtwoord herstellen',
 'title.change_password' => 'Wachtwoord aan het veranderen',
 'title.time' => 'Tijdsregistraties',
@@ -264,8 +264,8 @@
 'title.edit_notification' => 'Notificatie bewerken',
 'title.delete_notification' => 'Notificatie verwijderen',
 'title.monthly_quotas' => 'Doelen per maand',
-'title.export' => 'Exporteer teamgegevens', // TODO: replace "team" with "group".
-'title.import' => 'Importeer teamgegevens', // TODO: replace "team" with "group".
+'title.export' => 'Exporteer groepsgegevens',
+'title.import' => 'Importeer groepsgegevens',
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
 'title.group' => 'Groep instelling',
@@ -416,20 +416,19 @@
 'form.client.client_entries' => 'Klant gegevens',
 
 // Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
-// TODO: replace "team" with "group" in the string below.
-'form.export.hint' => 'U kunt alle teamgegevens naar een xml bestand exporteren. Dit kan zinvol zijn als u gegevens migreert naar uw eigen server.',
+'form.export.hint' => 'U kunt alle groepsgegevens naar een xml bestand exporteren. Dit kan zinvol zijn als u gegevens migreert naar uw eigen server.',
 'form.export.compression' => 'Compressie',
 'form.export.compression_none' => 'geen',
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
-'form.import.hint' => 'Importeer teamgegevens uit een xml bestand.', // TODO: replace "team" with "group".
+'form.import.hint' => 'Importeer groepsgegevens uit een xml bestand.',
 'form.import.file' => 'Kies bestand',
 'form.import.success' => 'Importeren gelukt.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-// TODO: replace "team" with "group" in the string below (3 places).
-'form.groups.hint' => 'Maak een nieuw team door een team  manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
+// TODO: replace "team" with "group" in the string below (1 place - teamgegevens).
+'form.groups.hint' => 'Maak een nieuwe groep door een groeps manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 uurs',
@@ -451,8 +450,7 @@
 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
-// TODO: translate the following.
-// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+'form.group_delete.hint' => 'Bent u er zeker van dat u de hele groep wilt verwijderen?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Van',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 512d834ac..b6d0153c1 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.17.90.4272 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.90.4273 | 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>

From 8e43fd9aa4cd7ec0d3dd806393ba03967f5050b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Jun 2018 14:55:32 +0000
Subject: [PATCH 0165/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 739957cb8..18e1cf853 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -427,8 +427,7 @@
 'form.import.success' => 'Importeren gelukt.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-// TODO: replace "team" with "group" in the string below (1 place - teamgegevens).
-'form.groups.hint' => 'Maak een nieuwe groep door een groeps manager account aan te maken.<br>U kunt ook teamgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
+'form.groups.hint' => 'Maak een nieuwe groep door een groeps manager account aan te maken.<br>U kunt ook groepsgegevens importeren uit een xml file van een andere Anuko Time Tracker server (login namen moeten uniek zijn).',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 uurs',

From 9eb2c5f542ed33fc1aba2e7392a5a29181cbfd1a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Jul 2018 16:09:15 +0000
Subject: [PATCH 0166/1848] Fixed visibility of checkboxes on the Group edit
 page.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b6d0153c1..9ed4365f4 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.17.90.4273 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.91.4274 | 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 cec449742..144971b03 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -205,7 +205,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.groupForm.clients.control}</td>
-            <td><label for="clients">{$i18n.title.clients}</label> {$forms.profileForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
+            <td><label for="clients">{$i18n.title.clients}</label> {$forms.groupForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.groupForm.invoices.control}</td>
@@ -221,7 +221,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.groupForm.expenses.control}</td>
-            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.profileForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.groupForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.groupForm.notifications.control}</td>

From b02288380ea55515a15990d16547e901e438883f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Jul 2018 16:49:37 +0000
Subject: [PATCH 0167/1848] Started coding Work units plugin.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  1 +
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  1 +
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  2 ++
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  2 ++
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  1 +
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/group_edit.tpl | 14 ++++++++++++++
 group_edit.php                   |  6 ++++++
 32 files changed, 53 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index cc8264d80..ad3f5879c 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -243,6 +243,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index b73f31a2f..eb1565e96 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -253,6 +253,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 668699f61..d506f28df 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -224,6 +224,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e329907f8..b4ee16f98 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -220,6 +220,7 @@
 // TODO: translate the following.
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Anmelden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 45dbdfeeb..35958adaf 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -211,6 +211,7 @@
 'label.mark_paid' => 'Mark paid',
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
+'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 12796439b..8693dbb8f 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -246,6 +246,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Sesión iniciada',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c007e0f6b..aa327deeb 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -249,6 +249,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9adc21b10..6fc87e51b 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -236,6 +236,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'ورود',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 79b454deb..5d1417f20 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -228,6 +228,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Kirjautuminen',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9a1340230..be9abdeae 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -222,6 +222,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Connexion',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 8573946f6..89d0e50c9 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -212,6 +212,8 @@
 'label.mark_paid' => 'Σήμανση πληρωμένα',
 'label.week_note' => 'Σημείωση εβδομάδας',
 'label.week_list' => 'Λίστα εβδομάδων',
+// TODO: translate the following.
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Σύνδεση',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7929baa2d..482a74399 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -246,6 +246,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'כניסה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e6aa959ad..375664b86 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -246,6 +246,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Bejelentkezés',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2a02eb045..60310ebd6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -217,6 +217,8 @@
 'label.mark_paid' => 'Segna come pagato',
 'label.week_note' => 'Nota settimanale',
 'label.week_list' => 'Lista settimanale',
+// TODO: translate the following.
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 75a1546fb..9241d735f 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -251,6 +251,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'ログイン',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1f16aff58..0d39209b4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -251,6 +251,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => '로그인',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 18e1cf853..961651fd0 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -210,6 +210,8 @@
 'label.mark_paid' => 'Markeer als betaald',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
+// TODO: translate the following.
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Aanmelden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b4deac5c1..d218341f5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -249,6 +249,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Innlogging',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index fb48e7bcf..e218b929e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -229,6 +229,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Logowanie',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 968f78cb4..a90308127 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -226,6 +226,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ff6d7130a..30ed9bded 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -238,6 +238,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 217f67413..f4f0c85bb 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -250,6 +250,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 51413f283..d3276d88f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -210,6 +210,7 @@
 'label.mark_paid' => 'Отметить оплату',
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Список недели',
+'label.work_units' => 'Единицы работы',
 
 // Form titles.
 'title.login' => 'Вход в систему',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e80db533a..3f5081218 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -236,6 +236,7 @@
 // 'button.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Prihlásenie',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 6bf161e20..f85164b9c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -233,6 +233,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Prijava',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5754b603b..a2287f384 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -228,6 +228,7 @@
 // 'button.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Prijava',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index cee942fb0..0b96da48d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -222,6 +222,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Rubriker för formulär
 'title.login' => 'Logga in',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 111b2d49b..3683e3aff 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -257,6 +257,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4d5307b78..519faa960 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -240,6 +240,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => '登录',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 9665a6a15..0cf2d6c66 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -247,6 +247,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => '登錄',
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 144971b03..a8f56a2d7 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -91,6 +91,14 @@ function handlePluginCheckboxes() {
   } else {
     configureLabel.style.visibility = "hidden";
   }
+
+  var workUnitsCheckbox = document.getElementById("work_units");
+  configureLabel = document.getElementById("work_units_config");
+  if (workUnitsCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
 }
 </script>
 
@@ -239,6 +247,12 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.groupForm.week_view.control}</td>
             <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
           </tr>
+  {if defined('WORK_UNITS_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.work_units.control}</td>
+            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+  {/if}
 {/if}
 
           <tr>
diff --git a/group_edit.php b/group_edit.php
index d79ba2d35..676a4d777 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -75,6 +75,7 @@
   $cl_locking = $request->getParameter('locking');
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
+  $cl_work_units = $request->getParameter('work_units');
 } else {
   $cl_group = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
@@ -109,6 +110,7 @@
   $cl_locking = in_array('lk', $plugins);
   $cl_quotas = in_array('mq', $plugins);
   $cl_week_view = in_array('wv', $plugins);
+  $cl_work_units = in_array('wu', $plugins);
 }
 
 $form = new Form('groupForm');
@@ -207,6 +209,10 @@
 $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
+if (defined('WORK_UNITS_DEBUG')) {
+  $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
+}
+
 $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')));
 

From a67c7fec533237be9be83379eb19fbbf51174c9a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Jul 2018 21:08:04 +0000
Subject: [PATCH 0168/1848] Resource file changes for work units plugin (in
 progress).

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 31 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ad3f5879c..74f299cc8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -329,6 +329,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index eb1565e96..7e30f0e5e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -340,6 +340,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d506f28df..c461cc373 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -298,6 +298,7 @@
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b4ee16f98..23b13c1c8 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -290,6 +290,7 @@
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 35958adaf..55c158e82 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -284,6 +284,7 @@
 'title.locking' => 'Locking',
 'title.week_view' => 'Week View',
 'title.swap_roles' => 'Swapping Roles',
+'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8693dbb8f..a665fabde 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -328,6 +328,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index aa327deeb..e1aa2e384 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -335,6 +335,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 6fc87e51b..7d99e4d3f 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -310,6 +310,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 5d1417f20..a7920c7fb 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -299,6 +299,7 @@
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index be9abdeae..46eb3f330 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -292,6 +292,7 @@
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 89d0e50c9..ec6fdf8ab 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -286,6 +286,7 @@
 'title.week_view' => 'Προβολή εβδομάδας',
 // TODO: translate the following.
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 482a74399..599826e3e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -321,6 +321,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 375664b86..fb64b80ce 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -326,6 +326,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 60310ebd6..09fe6b72a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -297,6 +297,7 @@
 'title.locking' => 'Bloccaggio',
 'title.week_view' => 'Vista settimanale',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9241d735f..6386d5f26 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -333,6 +333,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 0d39209b4..4bc1ec8d2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -334,6 +334,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 961651fd0..db0e1907a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -282,6 +282,8 @@
 'title.locking' => 'Blokkeren',
 'title.week_view' => 'Week overzicht',
 'title.swap_roles' => 'Rollen verruilen',
+// TODO: translate the following.
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d218341f5..a20743158 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -330,6 +330,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e218b929e..42c75f27a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -301,6 +301,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index a90308127..dff078974 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -296,6 +296,7 @@
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 30ed9bded..9520d3eb3 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -316,6 +316,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f4f0c85bb..a86a3640d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -335,6 +335,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d3276d88f..718f32461 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -281,6 +281,7 @@
 'title.locking' => 'Блокировка',
 'title.week_view' => 'Неделя',
 'title.swap_roles' => 'Обмен ролей',
+'title.work_units' => 'Единицы работы',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3f5081218..7ed5339e7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -311,6 +311,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f85164b9c..ab858b90a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -310,6 +310,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a2287f384..4dc9e58e3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -300,6 +300,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0b96da48d..e47f8939d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -298,6 +298,7 @@
 // TODO: translate the following.
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 3683e3aff..665b23e10 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -344,6 +344,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 519faa960..eb571eadc 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -322,6 +322,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 0cf2d6c66..50a0960bc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -329,6 +329,7 @@
 // 'title.locking' => 'Locking',
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
+// 'title.work_units' => 'Work Units',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.

From 99041558bf625b082fc5058a93e1bd2634c2c9d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Jul 2018 23:53:58 +0000
Subject: [PATCH 0169/1848] A bit more progress on Work units plugin, made its
 config page working.

---
 WEB-INF/lib/ttConfigHelper.class.php | 98 ++++++++++++++++++++++++++++
 WEB-INF/resources/ca.lang.php        |  5 ++
 WEB-INF/resources/cs.lang.php        |  5 ++
 WEB-INF/resources/da.lang.php        |  5 ++
 WEB-INF/resources/de.lang.php        |  5 ++
 WEB-INF/resources/en.lang.php        |  4 ++
 WEB-INF/resources/es.lang.php        |  5 ++
 WEB-INF/resources/et.lang.php        |  5 ++
 WEB-INF/resources/fa.lang.php        |  5 ++
 WEB-INF/resources/fi.lang.php        |  5 ++
 WEB-INF/resources/fr.lang.php        |  5 ++
 WEB-INF/resources/gr.lang.php        |  5 ++
 WEB-INF/resources/he.lang.php        |  5 ++
 WEB-INF/resources/hu.lang.php        |  5 ++
 WEB-INF/resources/it.lang.php        |  5 ++
 WEB-INF/resources/ja.lang.php        |  5 ++
 WEB-INF/resources/ko.lang.php        |  5 ++
 WEB-INF/resources/nl.lang.php        |  5 ++
 WEB-INF/resources/no.lang.php        |  5 ++
 WEB-INF/resources/pl.lang.php        |  5 ++
 WEB-INF/resources/pt-br.lang.php     |  5 ++
 WEB-INF/resources/pt.lang.php        |  5 ++
 WEB-INF/resources/ro.lang.php        |  5 ++
 WEB-INF/resources/ru.lang.php        |  4 ++
 WEB-INF/resources/sk.lang.php        |  5 ++
 WEB-INF/resources/sl.lang.php        |  5 ++
 WEB-INF/resources/sr.lang.php        |  5 ++
 WEB-INF/resources/sv.lang.php        |  5 ++
 WEB-INF/resources/tr.lang.php        |  5 ++
 WEB-INF/resources/zh-cn.lang.php     |  5 ++
 WEB-INF/resources/zh-tw.lang.php     |  5 ++
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/group_edit.tpl     |  2 +-
 WEB-INF/templates/work_units.tpl     | 18 +++++
 group_edit.php                       |  2 +
 work_units.php                       | 76 +++++++++++++++++++++
 36 files changed, 344 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/lib/ttConfigHelper.class.php
 create mode 100644 WEB-INF/templates/work_units.tpl
 create mode 100644 work_units.php

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
new file mode 100644
index 000000000..95cd12186
--- /dev/null
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -0,0 +1,98 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// Class ttConfigHelper is a helper class to handle comma-separated lists of config data.
+// For example, in tt_groups table we have a field called "config", that may store something like:
+//
+// allow_overlap,uncompleted_indicators,minutes_in_unit:15,future_entries
+//   Above, some values are simply defined by their presence such as allow_overlap.
+//   Other values have associated values after colon such as minutes_in_work_unit (15).
+class ttConfigHelper {
+  var $config = null; // Source config string.
+  var $config_array = null;  // Array of config values.
+
+  // Constructor.
+  function __construct($config) {
+    $this->config = $config;
+    $this->config_array = explode(',', $this->config);
+  }
+
+  // getDefinedValue determines if a value identified by name is defined.
+  function getDefinedValue($name) {
+    return in_array($name, $this->$config_array);
+  }
+
+  // The getIntValue parses an integer value from the source config string.
+  function getIntValue($name) {
+    $name_with_colon = $name.':';
+    $len = strlen($name_with_colon);
+
+    foreach ($this->config_array as $unparsed_value) {
+      if (substr($unparsed_value, 0, $len) === $name_with_colon) {
+        // Found value.
+        $unparsed_len = strlen($unparsed_value);
+        $int_value = (int) substr($unparsed_value, -($unparsed_len - $len));
+        return $int_value;
+      }
+        
+    }
+    return false;
+  }
+
+  // The setIntValue sets an integer value into config array.
+  function setIntValue($name, $value) {
+    // Try to find and replace an already existing value.
+    $name_with_colon = $name.':';
+    $len = strlen($name_with_colon);
+
+    foreach ($this->config_array as $key => $unparsed_value) {
+      if (substr($unparsed_value, 0, $len) === $name_with_colon) {
+        // Found an already existing value.
+        // Remove value if our new value is NULL.
+        if ($value !== null) {
+          // Replace value.
+          $this->config_array[$key] = $name.':'.$value;
+        } else {
+          // Remove value.
+          unset($this->config_array[$key]);
+        }
+        $this->config = implode(',', $this->config_array);
+        return;
+      }
+    }
+    // If we get here, the value was not found, so add it.
+    $this->config_array[] = $name.':'.$value;
+    $this->config = implode(',', $this->config_array);
+    return;
+  }
+
+  // The getConfig returns the config string.
+  function getConfig() {
+    return $this->config;
+  }
+}
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 74f299cc8..6f499dd6f 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -544,6 +544,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 7e30f0e5e..21e16a6f9 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -558,6 +558,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index c461cc373..3b6487ed5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -502,6 +502,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 23b13c1c8..cf112e99e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -500,6 +500,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 55c158e82..7e57b2fe4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -475,6 +475,10 @@
 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+'form.work_units.minutes_in_unit' => 'Minutes in unit',
+'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'User',
 'role.user.low_case_label' => 'user',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a665fabde..d3ab0e8c6 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -559,6 +559,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e1aa2e384..8547caf76 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -554,6 +554,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 7d99e4d3f..9b06bb13a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -530,6 +530,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a7920c7fb..cf4d0b833 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -510,6 +510,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 46eb3f330..010d6792c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -498,6 +498,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ec6fdf8ab..42b7986d7 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -481,6 +481,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'Χρήστης',
 'role.user.low_case_label' => 'χρήστης',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 599826e3e..646e12a27 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -536,6 +536,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index fb64b80ce..74c3bd2f8 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -547,6 +547,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 09fe6b72a..ed335fe40 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -497,6 +497,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 6386d5f26..7902decf6 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -550,6 +550,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4bc1ec8d2..4128eb67d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -548,6 +548,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index db0e1907a..25b8148f7 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -474,6 +474,11 @@
 'form.swap.hint' => 'Degradeer jezelf naar een lagere rol door een rol te verruilen met iemand anders. Dit kan niet ongedaan worden gemaakt.',
 'form.swap.swap_with' => 'Verruil rol met',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'Gebruiker',
 'role.user.low_case_label' => 'gebruiker',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a20743158..3bd4cc24c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -547,6 +547,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 42c75f27a..5a6150eb8 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -512,6 +512,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index dff078974..c4f9f6a7b 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -507,6 +507,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9520d3eb3..5e43040d8 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -531,6 +531,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a86a3640d..002a38c97 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -553,6 +553,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 718f32461..804d9cd5b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -472,6 +472,10 @@
 'form.swap.hint' => 'Уменьшите свою роль, обменявшись с другим пользователем. Роль не может восстановлена.',
 'form.swap.swap_with' => 'Обменять роль с',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+'form.work_units.minutes_in_unit' => 'Минут в единице работы',
+'form.work_units.1st_unit_threshold' => 'Порог для 1-й единицы',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'Пользователь',
 'role.user.low_case_label' => 'пользователь',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 7ed5339e7..45d16c833 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -527,6 +527,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ab858b90a..8dc9a6d05 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -527,6 +527,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 4dc9e58e3..648f26e24 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -511,6 +511,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index e47f8939d..1e0567168 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -505,6 +505,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 665b23e10..6449a7cd9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -566,6 +566,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index eb571eadc..cbd7de326 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -534,6 +534,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 50a0960bc..6a77cff58 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -542,6 +542,11 @@
 // 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 // 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+// TODO: translate the following.
+// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
+// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9ed4365f4..3f71f0ef2 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.17.91.4274 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.91.4275 | 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 a8f56a2d7..dd059114c 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -250,7 +250,7 @@ function handlePluginCheckboxes() {
   {if defined('WORK_UNITS_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.groupForm.work_units.control}</td>
-            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
   {/if}
 {/if}
diff --git a/WEB-INF/templates/work_units.tpl b/WEB-INF/templates/work_units.tpl
new file mode 100644
index 000000000..9c2e64da8
--- /dev/null
+++ b/WEB-INF/templates/work_units.tpl
@@ -0,0 +1,18 @@
+{$forms.workUnitsForm.open}
+<table cellspacing="1" cellpadding="2" border="0">
+  <tr>
+    <td>{$i18n.form.work_units.minutes_in_unit}:</td>
+    <td>{$forms.workUnitsForm.minutes_in_unit.control} <a href="https://www.anuko.com/lp/tt_23.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+  <tr>
+    <td>{$i18n.form.work_units.1st_unit_threshold}:</td>
+    <td>{$forms.workUnitsForm.1st_unit_threshold.control} <a href="https://www.anuko.com/lp/tt_24.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td colspan="2" height="50" align="center">{$forms.workUnitsForm.btn_save.control}</td>
+  </tr>
+</table>
+{$forms.weekViewForm.close}
diff --git a/group_edit.php b/group_edit.php
index 676a4d777..a5a85d1dd 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -259,6 +259,8 @@
       $plugins .= ',mq';
     if ($cl_week_view)
       $plugins .= ',wv';
+    if ($cl_work_units)
+      $plugins .= ',wu';
 
     // Recycle week view plugin options as they are not configured on this page.
     $existing_plugins = explode(',', $user->plugins);
diff --git a/work_units.php b/work_units.php
new file mode 100644
index 000000000..3340ec151
--- /dev/null
+++ b/work_units.php
@@ -0,0 +1,76 @@
+<?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('ttConfigHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wu')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+
+$config = new ttConfigHelper($user->config);
+
+if ($request->isPost()) {
+  $cl_minutes_in_unit = $request->getParameter('minutes_in_unit');
+  $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold');
+} else {
+  $cl_minutes_in_unit = $config->getIntValue('minutes_in_unit');
+  $cl_1st_unit_threshold = $config->getIntValue('1st_unit_threshold');
+}
+
+$form = new Form('workUnitsForm');
+$form->addInput(array('type'=>'text', 'name'=>'minutes_in_unit', 'value'=>$cl_minutes_in_unit, 'style'=>'width:40px'));
+$form->addInput(array('type'=>'text', 'name'=>'1st_unit_threshold', 'value'=>$cl_1st_unit_threshold, 'style'=>'width:40px'));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()){
+  // Validate user input.
+  if (!ttValidInteger($cl_minutes_in_unit)) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.minutes_in_unit'));
+  if (!ttValidInteger($cl_1st_unit_threshold, true) ||($cl_minutes_in_unit && $cl_1st_unit_threshold > $cl_minutes_in_unit)) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.1st_unit_threshold'));
+  // Finished validating user input.
+
+  if ($err->no()) {
+    $config->setIntValue('minutes_in_unit', $cl_minutes_in_unit);
+    $config->setIntValue('1st_unit_threshold', $cl_1st_unit_threshold);
+    if (!$user->updateGroup(array('config' => $config->getConfig()))) {
+      $err->add($i18n->get('error.db'));
+    }
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.work_units'));
+$smarty->assign('content_page_name', 'work_units.tpl');
+$smarty->display('index.tpl');

From 6968ef66a0264c35eff9bdd8ed92af48b34b8d19 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Jul 2018 16:06:16 +0000
Subject: [PATCH 0170/1848] Initial work done on Work units plugin. Still in
 debug mode.

---
 WEB-INF/lib/ttConfigHelper.class.php |  2 +-
 WEB-INF/lib/ttReportHelper.class.php | 42 ++++++++++++++++++++--------
 WEB-INF/lib/ttUser.class.php         | 25 +++++++++++------
 WEB-INF/resources/ca.lang.php        |  1 +
 WEB-INF/resources/cs.lang.php        |  1 +
 WEB-INF/resources/da.lang.php        |  1 +
 WEB-INF/resources/de.lang.php        |  1 +
 WEB-INF/resources/en.lang.php        |  1 +
 WEB-INF/resources/es.lang.php        |  1 +
 WEB-INF/resources/et.lang.php        |  1 +
 WEB-INF/resources/fa.lang.php        |  1 +
 WEB-INF/resources/fi.lang.php        |  1 +
 WEB-INF/resources/fr.lang.php        |  1 +
 WEB-INF/resources/gr.lang.php        |  1 +
 WEB-INF/resources/he.lang.php        |  1 +
 WEB-INF/resources/hu.lang.php        |  1 +
 WEB-INF/resources/it.lang.php        |  1 +
 WEB-INF/resources/ja.lang.php        |  1 +
 WEB-INF/resources/ko.lang.php        |  1 +
 WEB-INF/resources/nl.lang.php        |  1 +
 WEB-INF/resources/no.lang.php        |  1 +
 WEB-INF/resources/pl.lang.php        |  1 +
 WEB-INF/resources/pt-br.lang.php     |  1 +
 WEB-INF/resources/pt.lang.php        |  1 +
 WEB-INF/resources/ro.lang.php        |  1 +
 WEB-INF/resources/ru.lang.php        |  1 +
 WEB-INF/resources/sk.lang.php        |  1 +
 WEB-INF/resources/sl.lang.php        |  1 +
 WEB-INF/resources/sv.lang.php        |  1 +
 WEB-INF/resources/tr.lang.php        |  1 +
 WEB-INF/resources/zh-cn.lang.php     |  1 +
 WEB-INF/resources/zh-tw.lang.php     |  1 +
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         |  8 ++++++
 WEB-INF/templates/reports.tpl        |  8 ++++++
 reports.php                          |  4 +++
 work_units.php                       |  4 +--
 37 files changed, 101 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
index 95cd12186..b33734c81 100644
--- a/WEB-INF/lib/ttConfigHelper.class.php
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -44,7 +44,7 @@ function __construct($config) {
 
   // getDefinedValue determines if a value identified by name is defined.
   function getDefinedValue($name) {
-    return in_array($name, $this->$config_array);
+    return in_array($name, $this->config_array);
   }
 
   // The getIntValue parses an integer value from the source config string.
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 67f1da263..daaad46c8 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -303,6 +303,10 @@ static function getItems($bean) {
     if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
       array_push($fields, 'i.name as invoice');
 
+    // Add work units.
+    if ($bean->getAttribute('chunits'))
+      array_push($fields, "if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit)) as units");
+
     // Prepare sql query part for left joins.
     $left_joins = null;
     if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
@@ -380,6 +384,10 @@ static function getItems($bean) {
       if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
         array_push($fields, 'i.name as invoice');
 
+      // Add work units.
+      if ($bean->getAttribute('chunits'))
+        array_push($fields, 'null'); // null for work units.
+
       // Prepare sql query part for left joins.
       $left_joins = null;
       if ($canViewReports || $isClient)
@@ -769,21 +777,25 @@ static function getSubtotals($bean) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
+          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $group_join $left_join $where group by $group_field";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
+          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {
-      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l
-         $group_join $where group by $group_field";
+      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
+        sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
+        null as expenses from tt_log l
+        $group_join $where group by $group_field";
     }
     // By now we have sql for time items.
 
@@ -813,13 +825,13 @@ static function getSubtotals($bean) {
       }
 
       $where = ttReportHelper::getExpenseWhere($bean);
-      $sql_for_expenses = "select $group_field as group_field, null as time, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
+      $sql_for_expenses = "select $group_field as group_field, null as time, null as units, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
         $group_join $where";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
 
       // Create a combined query.
-      $sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $sql = "select group_field, sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
     }
 
     // Execute query.
@@ -839,9 +851,9 @@ static function getSubtotals($bean) {
           $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
           $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
         }
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
       } else
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time);
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']);
     }
 
     return $subtotals;
@@ -984,30 +996,37 @@ static function getTotals($bean)
 
     $where = ttReportHelper::getWhere($bean);
 
+    // TODO: build query in parts so the work units inclusion is conditional.
+
     // Start with a query for time items.
     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {
         $sql = "select sum(time_to_sec(l.duration)) as time,
+          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses 
           from tt_log l
           left join tt_users u on (l.user_id = u.id) $where";
       } else {
         $sql = "select sum(time_to_sec(l.duration)) as time,
+          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses
           from tt_log l
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";
       }
     } else
-      $sql = "select sum(time_to_sec(l.duration)) as time, null as cost, null as expenses from tt_log l $where";
+      $sql = "select sum(time_to_sec(l.duration)) as time,"
+            ." sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,"
+            ." null as cost, null as expenses from tt_log l $where";
 
     // If we have expenses, query becomes a bit more complex.
     if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) {
       $where = ttReportHelper::getExpenseWhere($bean);
-      $sql_for_expenses = "select null as time, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+      $sql_for_expenses = "select null as time, null as units, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+
       // Create a combined query.
-      $sql = "select sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $sql = "select sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
     }
 
     // Execute query.
@@ -1039,6 +1058,7 @@ static function getTotals($bean)
     $totals['start_date'] = $period->getStartDate();
     $totals['end_date'] = $period->getEndDate();
     $totals['time'] = $total_time;
+    $totals['units'] = $val['units'];
     $totals['cost'] = $total_cost;
     $totals['expenses'] = $total_expenses;
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 07d810b89..281659313 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -26,6 +26,8 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
+import('ttConfigHelper');
+
 class ttUser {
   var $login = null;            // User login.
   var $name = null;             // User name.
@@ -64,6 +66,8 @@ class ttUser {
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
+  var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
+  var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
 
   // Constructor.
   function __construct($login, $id = null) {
@@ -123,15 +127,20 @@ function __construct($login, $id = null) {
       $this->custom_logo = $val['custom_logo'];
 
       $this->config = $val['config'];
-      $config_array = explode(',', $this->config);
-
+      $config = new ttConfigHelper($this->config);
       // Set user config options.
-      $this->show_holidays = in_array('show_holidays', $config_array);
-      $this->punch_mode = in_array('punch_mode', $config_array);
-      $this->allow_overlap = in_array('allow_overlap', $config_array);
-      $this->future_entries = in_array('future_entries', $config_array);
-      $this->uncompleted_indicators = in_array('uncompleted_indicators', $config_array);
-
+      $this->show_holidays = $config->getDefinedValue('show_holidays');
+      $this->punch_mode = $config->getDefinedValue('punch_mode');
+      $this->allow_overlap = $config->getDefinedValue('allow_overlap');
+      $this->future_entries = $config->getDefinedValue('future_entries');
+      $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
+      if ($this->isPluginEnabled('wu')) {
+        $minutes_in_unit = $config->getIntValue('minutes_in_unit');
+        if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
+        $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
+        if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
+      }
+      
       // Set "on behalf" id and name.
       if (isset($_SESSION['behalf_id'])) {
           $this->behalf_id = $_SESSION['behalf_id'];
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6f499dd6f..0e909ab89 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -244,6 +244,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 21e16a6f9..282296efd 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -254,6 +254,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3b6487ed5..38e9f43d9 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -225,6 +225,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index cf112e99e..613bdc7c9 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -221,6 +221,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Anmelden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7e57b2fe4..e4abce9f5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -212,6 +212,7 @@
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
 'label.work_units' => 'Work units',
+'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d3ab0e8c6..5a040b80b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -247,6 +247,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Sesión iniciada',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 8547caf76..2b1bdde35 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -250,6 +250,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9b06bb13a..c567d072c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -237,6 +237,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'ورود',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index cf4d0b833..48b5089f1 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -229,6 +229,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Kirjautuminen',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 010d6792c..888e0ee8b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -223,6 +223,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Connexion',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 42b7986d7..e8f03b019 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -214,6 +214,7 @@
 'label.week_list' => 'Λίστα εβδομάδων',
 // TODO: translate the following.
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Σύνδεση',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 646e12a27..e513d5fc9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -247,6 +247,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'כניסה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 74c3bd2f8..cf6b0878a 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -247,6 +247,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Bejelentkezés',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ed335fe40..ae1dae459 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -219,6 +219,7 @@
 'label.week_list' => 'Lista settimanale',
 // TODO: translate the following.
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7902decf6..fa4b4bec7 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -252,6 +252,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'ログイン',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4128eb67d..b4c79c23e 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -252,6 +252,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => '로그인',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 25b8148f7..0107a7085 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -212,6 +212,7 @@
 'label.week_list' => 'Week overzicht',
 // TODO: translate the following.
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Aanmelden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 3bd4cc24c..1bfc0534b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -250,6 +250,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Innlogging',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 5a6150eb8..ec6b78488 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -230,6 +230,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Logowanie',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index c4f9f6a7b..db390eb28 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -227,6 +227,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5e43040d8..4b9727fa0 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -239,6 +239,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Login',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 002a38c97..b9c122019 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -251,6 +251,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 804d9cd5b..114ecc541 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -211,6 +211,7 @@
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Список недели',
 'label.work_units' => 'Единицы работы',
+'label.work_units_short' => 'Единицы',
 
 // Form titles.
 'title.login' => 'Вход в систему',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 45d16c833..87beb6f65 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -237,6 +237,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Prihlásenie',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8dc9a6d05..732286b9f 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -234,6 +234,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => 'Prijava',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1e0567168..11eff1948 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -223,6 +223,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Rubriker för formulär
 'title.login' => 'Logga in',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 6449a7cd9..ee3b4456a 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -258,6 +258,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index cbd7de326..1cb84d714 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -241,6 +241,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => '登录',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6a77cff58..fc3ec9957 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -248,6 +248,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+// 'label.work_units_short' => 'Units',
 
 // Form titles.
 'title.login' => '登錄',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f71f0ef2..3ad220b3d 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.17.91.4275 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4276 | 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/report.tpl b/WEB-INF/templates/report.tpl
index ddea591af..55438428c 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -16,12 +16,14 @@
       <tr>
         <td class="tableHeader">{$group_by_header|escape}</td>
         {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
         {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotal['units']}</td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
       </tr>
   {/foreach}
@@ -30,6 +32,7 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td nowrap class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
         {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
       </tr>
 {else}
@@ -44,6 +47,7 @@
   {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
   {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
   {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
+  {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
   {if $bean->getAttribute('chnote')}<td class="tableHeader">{$i18n.label.note}</td>{/if}
   {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
   {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
@@ -66,6 +70,7 @@
         {if $bean->getAttribute('chstart')}<td></td>{/if}
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
         {if $bean->getAttribute('chnote')}<td></td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
@@ -91,6 +96,7 @@
     {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
     {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
@@ -116,6 +122,7 @@
     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
@@ -136,6 +143,7 @@
     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index a70a3f072..b57ba8410 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -284,6 +284,14 @@ function handleCheckboxes() {
                 <td></td>
 {/if}
               </tr>
+{if $user->isPluginEnabled('wu')}
+              <tr>
+                <td></td>
+                <td></td>
+                <td width="25%"><label>{$forms.reportForm.chunits.control}&nbsp;{$i18n.label.work_units}</label></td>
+                <td></td>
+              </tr>
+{/if}
             </table>
           </td>
         </tr>
diff --git a/reports.php b/reports.php
index fcefd047b..0565cf71d 100644
--- a/reports.php
+++ b/reports.php
@@ -214,6 +214,9 @@
 // If we have a custom field - add a checkbox for it.
 if ($custom_fields && $custom_fields->fields[0])
   $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
+if ($user->isPluginEnabled('wu'))
+  $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
+
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->get('form.reports.group_by_date');
@@ -260,6 +263,7 @@
   $form->setValueByElement('chfinish', '1');
   $form->setValueByElement('chnote', '1');
   $form->setValueByElement('chcf_1', '0');
+  $form->setValueByElement('chunits', '0');
   $form->setValueByElement('chtotalsonly', '0');
 }
 
diff --git a/work_units.php b/work_units.php
index 3340ec151..dd01488a7 100644
--- a/work_units.php
+++ b/work_units.php
@@ -46,8 +46,8 @@
   $cl_minutes_in_unit = $request->getParameter('minutes_in_unit');
   $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold');
 } else {
-  $cl_minutes_in_unit = $config->getIntValue('minutes_in_unit');
-  $cl_1st_unit_threshold = $config->getIntValue('1st_unit_threshold');
+  $cl_minutes_in_unit = $user->minutes_in_unit;
+  $cl_1st_unit_threshold = $user->first_unit_threshold;
 }
 
 $form = new Form('workUnitsForm');

From f7ec54ba04c4899a9ec343ef8c1c96109feeabb7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Jul 2018 16:55:45 +0000
Subject: [PATCH 0171/1848] Removed conditional include of the Work units
 plugin to facilitate user testing.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 2 --
 group_edit.php                   | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3ad220b3d..95dec6289 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.17.92.4276 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4277 | 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 dd059114c..db66201c5 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -247,12 +247,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.groupForm.week_view.control}</td>
             <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
           </tr>
-  {if defined('WORK_UNITS_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.groupForm.work_units.control}</td>
             <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
-  {/if}
 {/if}
 
           <tr>
diff --git a/group_edit.php b/group_edit.php
index a5a85d1dd..8c7012a50 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -209,9 +209,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
-if (defined('WORK_UNITS_DEBUG')) {
-  $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
-}
+$form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
 
 $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')));

From a536a682560e3f5d21c960994ebe410e5aef5931 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Jul 2018 18:29:32 +0000
Subject: [PATCH 0172/1848] Fixed export to CSV and XML to include work units.

---
 WEB-INF/templates/footer.tpl | 2 +-
 tofile.php                   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 95dec6289..3d617784a 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.17.92.4277 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4278 | 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/tofile.php b/tofile.php
index 909fdd3eb..a06a98667 100644
--- a/tofile.php
+++ b/tofile.php
@@ -95,6 +95,9 @@
           $val = time_to_decimal($val);
         print "\t<duration><![CDATA[".$val."]]></duration>\n";
       }
+      if ($bean->getAttribute('chunits')) {
+        print "\t<units><![CDATA[".$subtotal['units']."]]></units>\n";
+      }
       if ($bean->getAttribute('chcost')) {
         print "\t<cost><![CDATA[";
         if ($user->can('manage_invoices') || $user->isClient())
@@ -124,6 +127,7 @@
           $duration = time_to_decimal($duration);
           print "\t<duration><![CDATA[".$duration."]]></duration>\n";
       }
+      if ($bean->getAttribute('chunits')) print "\t<units><![CDATA[".$item['units']."]]></units>\n";
       if ($bean->getAttribute('chnote')) print "\t<note><![CDATA[".$item['note']."]]></note>\n";
       if ($bean->getAttribute('chcost')) {
         print "\t<cost><![CDATA[";
@@ -171,6 +175,7 @@
     // Print headers.
     print '"'.$group_by_header.'"';
     if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
+    if ($bean->getAttribute('chunits')) print ',"'.$i18n->get('label.work_units_short').'"';
     if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
     print "\n";
 
@@ -183,6 +188,7 @@
           $val = time_to_decimal($val);
         print ',"'.$val.'"';
       }
+      if ($bean->getAttribute('chunits')) print ',"'.$subtotal['units'].'"';
       if ($bean->getAttribute('chcost')) {
         if ($user->can('manage_invoices') || $user->isClient())
           print ',"'.$subtotal['cost'].'"';
@@ -202,6 +208,7 @@
     if ($bean->getAttribute('chstart')) print ',"'.$i18n->get('label.start').'"';
     if ($bean->getAttribute('chfinish')) print ',"'.$i18n->get('label.finish').'"';
     if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
+    if ($bean->getAttribute('chunits')) print ',"'.$i18n->get('label.work_units_short').'"';
     if ($bean->getAttribute('chnote')) print ',"'.$i18n->get('label.note').'"';
     if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
     if ($bean->getAttribute('chpaid')) print ',"'.$i18n->get('label.paid').'"';
@@ -225,6 +232,7 @@
           $val = time_to_decimal($val);
         print ',"'.$val.'"';
       }
+      if ($bean->getAttribute('chunits')) print ',"'.$item['units'].'"';
       if ($bean->getAttribute('chnote')) print ',"'.str_replace('"','""',$item['note']).'"';
       if ($bean->getAttribute('chcost')) {
         if ($user->can('manage_invoices') || $user->isClient())

From e171b4e97c8dd9322362d88d6722551f7c44f6cf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Jul 2018 18:44:26 +0000
Subject: [PATCH 0173/1848] Fixed export to PDF to include work units.

---
 WEB-INF/templates/footer.tpl | 2 +-
 topdf.php                    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3d617784a..d7c29536c 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.17.92.4278 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4279 | 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/topdf.php b/topdf.php
index eb09bc452..b7ac19d52 100644
--- a/topdf.php
+++ b/topdf.php
@@ -109,6 +109,7 @@
   $html .= "<tr $styleHeader>";
   $html .= '<td>'.htmlspecialchars($group_by_header).'</td>';
   if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
+  if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
   if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
   $html .= '</tr>';
   $html .= '</thead>';
@@ -117,6 +118,7 @@
     $html .= '<tr>';
     $html .= '<td>'.htmlspecialchars($subtotal['name']).'</td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotal['time'].'</td>';
+    if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotal['units'].'</td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())
@@ -132,6 +134,7 @@
   $html .= "<tr $styleSubtotal>";
   $html .= '<td>'.$i18n->get('label.total').'</td>';
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
+  if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
   if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       $html .= htmlspecialchars($user->currency).' ';
@@ -158,6 +161,7 @@
   if ($bean->getAttribute('chstart')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.start').'</td>'; }
   if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
   if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
+  if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
   if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
   if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
   if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
@@ -202,6 +206,7 @@
         if ($bean->getAttribute('chstart')) $html .= '<td></td>';
         if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
         if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
+        if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
         if ($bean->getAttribute('chnote')) $html .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $html .= "<td $styleRightAligned>";
@@ -231,6 +236,7 @@
     if ($bean->getAttribute('chstart')) $html .= "<td $styleRightAligned>".$item['start'].'</td>';
     if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
+    if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
     if ($bean->getAttribute('chnote')) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
@@ -289,6 +295,7 @@
     if ($bean->getAttribute('chstart')) $html .= '<td></td>';
     if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
+    if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
     if ($bean->getAttribute('chnote')) $html .= '<td></td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
@@ -316,6 +323,7 @@
   if ($bean->getAttribute('chstart')) $html .= '<td></td>';
   if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
+  if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
   if ($bean->getAttribute('chnote')) $html .= '<td></td>';
   if ($bean->getAttribute('chcost')) {
     $html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';

From c5c7ed2be4f41e34e63ee90158f499a6f76a76c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Jul 2018 20:29:13 +0000
Subject: [PATCH 0174/1848] Adjusted Work units plugin to count only bullable
 units.

---
 WEB-INF/lib/ttReportHelper.class.php | 14 +++++++-------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index daaad46c8..170dc2a9f 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -305,7 +305,7 @@ static function getItems($bean) {
 
     // Add work units.
     if ($bean->getAttribute('chunits'))
-      array_push($fields, "if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit)) as units");
+      array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
 
     // Prepare sql query part for left joins.
     $left_joins = null;
@@ -778,14 +778,14 @@ static function getSubtotals($bean) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
         $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
+          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $group_join $left_join $where group by $group_field";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
         $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
+          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l
           $group_join
@@ -793,7 +793,7 @@ static function getSubtotals($bean) {
       }
     } else {
       $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-        sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
+        sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
         null as expenses from tt_log l
         $group_join $where group by $group_field";
     }
@@ -1002,14 +1002,14 @@ static function getTotals($bean)
     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {
         $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
+          sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses 
           from tt_log l
           left join tt_users u on (l.user_id = u.id) $where";
       } else {
         $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,
+          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses
           from tt_log l
@@ -1017,7 +1017,7 @@ static function getTotals($bean)
       }
     } else
       $sql = "select sum(time_to_sec(l.duration)) as time,"
-            ." sum(if(time_to_sec(duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(duration)/60/$user->minutes_in_unit))) as units,"
+            ." sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,"
             ." null as cost, null as expenses from tt_log l $where";
 
     // If we have expenses, query becomes a bit more complex.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d7c29536c..c12472533 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.17.92.4279 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4280 | 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>

From 7a58c9da8ffac9b0832a047fe4ef1b93618179f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Jul 2018 14:01:07 +0000
Subject: [PATCH 0175/1848] Enhanced ttConfigHelper class a bit.

---
 WEB-INF/lib/ttConfigHelper.class.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
index b33734c81..13a2a8511 100644
--- a/WEB-INF/lib/ttConfigHelper.class.php
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -47,6 +47,28 @@ function getDefinedValue($name) {
     return in_array($name, $this->config_array);
   }
 
+  // setDefinedValue either sets or deletes a defined value identified by name.
+  function setDefinedValue($name, $set = true) {
+    if ($set) {
+      // Setting part.
+      if (!$this->getDefinedValue($name)) {
+        $this->config_array[] = $name;
+        $this->config = implode(',', $this->config_array);
+        return;
+      }
+
+    } else {
+      // Deleting part.
+      foreach ($this->config_array as $key => $value) {
+        if ($value === $name) {
+          unset($this->config_array[$key]);
+          $this->config = implode(',', $this->config_array);
+          return;
+        }
+      }
+    }
+  }
+
   // The getIntValue parses an integer value from the source config string.
   function getIntValue($name) {
     $name_with_colon = $name.':';
@@ -73,12 +95,11 @@ function setIntValue($name, $value) {
     foreach ($this->config_array as $key => $unparsed_value) {
       if (substr($unparsed_value, 0, $len) === $name_with_colon) {
         // Found an already existing value.
-        // Remove value if our new value is NULL.
         if ($value !== null) {
           // Replace value.
           $this->config_array[$key] = $name.':'.$value;
         } else {
-          // Remove value.
+          // Remove value if our new value is NULL.
           unset($this->config_array[$key]);
         }
         $this->config = implode(',', $this->config_array);

From a9d5914d51687f6f760b9c0e72fc4e99101f2830 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Jul 2018 15:36:43 +0000
Subject: [PATCH 0176/1848] Introduced show_work_units field in tt_fav_reports
 table.

---
 WEB-INF/lib/ttConfigHelper.class.php |  1 -
 WEB-INF/templates/footer.tpl         |  2 +-
 dbinstall.php                        | 10 ++++++----
 mysql.sql                            |  3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
index 13a2a8511..20af19ad0 100644
--- a/WEB-INF/lib/ttConfigHelper.class.php
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -56,7 +56,6 @@ function setDefinedValue($name, $set = true) {
         $this->config = implode(',', $this->config_array);
         return;
       }
-
     } else {
       // Deleting part.
       foreach ($this->config_array as $key => $value) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c12472533..f33073f1f 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.17.92.4280 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4281 | 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/dbinstall.php b/dbinstall.php
index 31d5fbf10..b49824987 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11788"]) {
+  if ($_POST["convert11744to11792"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -899,6 +899,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'");
   }
 
   if ($_POST["cleanup"]) {
@@ -944,7 +946,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.88)</b>
+    <td width="80%"><b>Create database structure (v1.17.92)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -984,8 +986,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.88)</td>
-    <td><input type="submit" name="convert11744to11788" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.92)</td>
+    <td><input type="submit" name="convert11744to11792" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 37ad65e76..267d842dc 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -265,6 +265,7 @@ CREATE TABLE `tt_fav_reports` (
   `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
   `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
   `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
+  `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
   `group_by` varchar(20) default NULL,                   # group by field
   `status` tinyint(4) default 1,                         # favorite report status
@@ -449,4 +450,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.88', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.92', now()); # TODO: change when structure changes.

From 7b81d0e15ca73f1ee3558f4b042c513933d8735a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Jul 2018 15:58:05 +0000
Subject: [PATCH 0177/1848] Added handling of show work units in fav reports
 and export / import.

---
 WEB-INF/lib/ttExportHelper.class.php    | 1 +
 WEB-INF/lib/ttFavReportHelper.class.php | 9 +++++++--
 WEB-INF/lib/ttImportHelper.class.php    | 1 +
 WEB-INF/templates/footer.tpl            | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index ca202ad78..d0b533952 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -303,6 +303,7 @@ function createDataFile($compress = false) {
         " show_end=\"".$fav_report['show_end']."\"".
         " show_note=\"".$fav_report['show_note']."\"".
         " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
+        " show_work_units=\"".$fav_report['show_work_units']."\"".
         " group_by=\"".$fav_report['group_by']."\"".
         " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
       fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 60acc12c9..006d55676 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -83,7 +83,7 @@ static function insertReport($fields) {
       billable, invoice, paid_status, users, period, period_start, period_end,
       show_client, show_invoice, show_paid, show_ip,
       show_project, show_start, show_duration, show_cost,
-      show_task, show_end, show_note, show_custom_field_1,
+      show_task, show_end, show_note, show_custom_field_1, show_work_units,
       group_by, show_totals_only)
       values(".
       $mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
@@ -95,7 +95,7 @@ static function insertReport($fields) {
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
       $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
-      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".
+      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
       $mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -138,6 +138,7 @@ function updateReport($fields) {
       "show_end = ".$fields['chfinish'].", ".
       "show_note = ".$fields['chnote'].", ".
       "show_custom_field_1 = ".$fields['chcf_1'].", ".
+      "show_work_units = ".$fields['chunits'].", ".
       "group_by = ".$mdb2->quote($fields['group_by']).", ".
       "show_totals_only = ".$fields['chtotalsonly'].
       " where id = ".$fields['id'];
@@ -166,6 +167,7 @@ static function saveReport($user_id, $bean) {
     if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
     if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0);
     if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
+    if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0);
     if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
 
     if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) {
@@ -221,6 +223,7 @@ static function saveReport($user_id, $bean) {
       'chfinish'=>$bean->getAttribute('chfinish'),
       'chnote'=>$bean->getAttribute('chnote'),
       'chcf_1'=>$bean->getAttribute('chcf_1'),
+      'chunits'=>$bean->getAttribute('chunits'),
       'group_by'=>$bean->getAttribute('group_by'),
       'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
 
@@ -292,6 +295,7 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttribute('chfinish', $val['show_end']);
       $bean->setAttribute('chnote', $val['show_note']);
       $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
+      $bean->setAttribute('chunits', $val['show_work_units']);
       $bean->setAttribute('group_by', $val['group_by']);
       $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
       $bean->setAttribute('new_fav_report', $val['name']);
@@ -316,6 +320,7 @@ static function loadReport($user_id, &$bean) {
         'chfinish'=>'1',
         'chnote'=>'1',
         'chcf_1'=>'',
+        'chunits'=>'',
         'group_by'=>'',
         'chtotalsonly'=>'',
         'new_fav_report'=>''));
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index dfa3be597..7b68ba7ce 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -332,6 +332,7 @@ function endElement($parser, $name) {
         'chfinish' => (int) $this->currentElement['SHOW_END'],
         'chnote' => (int) $this->currentElement['SHOW_NOTE'],
         'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
+        'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
         'group_by' => $this->currentElement['GROUP_BY'],
         'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f33073f1f..1b04936fb 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.17.92.4281 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4282 | 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>

From de20a2009639bd1064c8d2b61a79d449c352409c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Jul 2018 17:31:54 +0000
Subject: [PATCH 0178/1848] Added work units in output for emailed reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 30 +++++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 170dc2a9f..224d7f177 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1078,26 +1078,30 @@ static function getFavTotals($report)
     if ($report['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
         $sql = "select sum(time_to_sec(l.duration)) as time,
+          sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses 
           from tt_log l
           left join tt_users u on (l.user_id = u.id) $where";
       } else {
         $sql = "select sum(time_to_sec(l.duration)) as time,
+          sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses
           from tt_log l
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";
       }
     } else
-      $sql = "select sum(time_to_sec(l.duration)) as time, null as cost, null as expenses from tt_log l $where";
+      $sql = "select sum(time_to_sec(l.duration)) as time,
+        sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
+        null as cost, null as expenses from tt_log l $where";
 
     // If we have expenses, query becomes a bit more complex.
     if ($report['show_cost'] && $user->isPluginEnabled('ex')) {
       $where = ttReportHelper::getFavExpenseWhere($report);
-      $sql_for_expenses = "select null as time, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+      $sql_for_expenses = "select null as time, null as units, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
       // Create a combined query.
-      $sql = "select sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $sql = "select sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
     }
 
     // Execute query.
@@ -1129,6 +1133,7 @@ static function getFavTotals($report)
     $totals['start_date'] = $period->getStartDate();
     $totals['end_date'] = $period->getEndDate();
     $totals['time'] = $total_time;
+    $totals['units'] = $val['units'];
     $totals['cost'] = $total_cost;
     $totals['expenses'] = $total_expenses;
 
@@ -1229,6 +1234,8 @@ static function prepareReportBody($bean, $comment)
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       if ($bean->getAttribute('chduration'))
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($bean->getAttribute('chunits'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
       if ($bean->getAttribute('chcost'))
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       $body .= '</tr>';
@@ -1240,6 +1247,11 @@ static function prepareReportBody($bean, $comment)
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }
+        if ($bean->getAttribute('chunits')) {
+          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+          $body .= $subtotal['units'];
+          $body .= '</td>';
+        }
         if ($bean->getAttribute('chcost')) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
@@ -1257,6 +1269,11 @@ static function prepareReportBody($bean, $comment)
         if ($totals['time'] <> '0:00') $body .= $totals['time'];
         $body .= '</td>';
       }
+      if ($bean->getAttribute('chunits')) {
+        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+        $body .= $totals['units'];
+        $body .= '</td>';
+      }
       if ($bean->getAttribute('chcost')) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
@@ -1288,6 +1305,8 @@ static function prepareReportBody($bean, $comment)
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
       if ($bean->getAttribute('chduration'))
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($bean->getAttribute('chunits'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
       if ($bean->getAttribute('chnote'))
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($bean->getAttribute('chcost'))
@@ -1331,6 +1350,7 @@ static function prepareReportBody($bean, $comment)
               if ($bean->getAttribute('chstart')) $body .= '<td></td>';
               if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
               if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
+              if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
               if ($bean->getAttribute('chnote')) $body .= '<td></td>';
               if ($bean->getAttribute('chcost')) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
@@ -1367,6 +1387,8 @@ static function prepareReportBody($bean, $comment)
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
           if ($bean->getAttribute('chduration'))
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
+          if ($bean->getAttribute('chunits'))
+            $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
           if ($bean->getAttribute('chnote'))
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($bean->getAttribute('chcost'))
@@ -1404,6 +1426,7 @@ static function prepareReportBody($bean, $comment)
         if ($bean->getAttribute('chstart')) $body .= '<td></td>';
         if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
         if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
+        if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
         if ($bean->getAttribute('chnote')) $body .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
@@ -1428,6 +1451,7 @@ static function prepareReportBody($bean, $comment)
       if ($bean->getAttribute('chstart')) $body .= '<td></td>';
       if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
       if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
+      if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
       if ($bean->getAttribute('chnote')) $body .= '<td></td>';
       if ($bean->getAttribute('chcost')) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1b04936fb..8f0779f2d 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.17.92.4282 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4283 | 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>

From 8ec1dac1bcf71ce282ab116413d335f582b5e8f3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Jul 2018 17:53:59 +0000
Subject: [PATCH 0179/1848] Added work units to emailed fav reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 52 +++++++++++++++++++++-------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 224d7f177..0900f7f9d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -276,6 +276,9 @@ static function getItems($bean) {
     // Add duration.
     if ($bean->getAttribute('chduration'))
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
+    // Add work units.
+    if ($bean->getAttribute('chunits'))
+      array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
     // Add note.
     if ($bean->getAttribute('chnote'))
       array_push($fields, 'l.comment as note');
@@ -303,10 +306,6 @@ static function getItems($bean) {
     if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
       array_push($fields, 'i.name as invoice');
 
-    // Add work units.
-    if ($bean->getAttribute('chunits'))
-      array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
-
     // Prepare sql query part for left joins.
     $left_joins = null;
     if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
@@ -549,6 +548,10 @@ static function getFavItems($report) {
     // Add duration.
     if ($report['show_duration'])
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
+    // Add work units.
+    if ($report['show_work_units'])
+      array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+
     // Add note.
     if ($report['show_note'])
       array_push($fields, 'l.comment as note');
@@ -632,6 +635,8 @@ static function getFavItems($report) {
         array_push($fields, 'null'); // null for finish.
       if ($report['show_duration'])
         array_push($fields, 'null'); // null for duration.
+      if ($report['show_work_units'])
+        array_push($fields, 'null'); // null for work units.
       // Use the note field to print item name.
       if ($report['show_note'])
         array_push($fields, 'ei.name as note');
@@ -909,21 +914,25 @@ static function getFavSubtotals($report) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
+          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $group_join $left_join $where group by $group_field";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
+          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
           sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l 
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {
-      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l 
-         $group_join $where group by $group_field";
+      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
+        sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
+        null as expenses from tt_log l 
+        $group_join $where group by $group_field";
     }
     // By now we have sql for time items.
 
@@ -953,13 +962,13 @@ static function getFavSubtotals($report) {
       }
 
       $where = ttReportHelper::getFavExpenseWhere($report);
-      $sql_for_expenses = "select $group_field as group_field, null as time, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
+      $sql_for_expenses = "select $group_field as group_field, null as time, null as units, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
         $group_join $where";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
 
       // Create a combined query.
-      $sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $sql = "select group_field, sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
     }
 
     // Execute query.
@@ -979,9 +988,9 @@ static function getFavSubtotals($report) {
           $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
           $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
         }
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']);
       } else
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time);
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']);
     }
 
     return $subtotals;
@@ -1549,6 +1558,8 @@ static function prepareFavReportBody($report)
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       if ($report['show_duration'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($report['show_work_units'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
       if ($report['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       $body .= '</tr>';
@@ -1560,6 +1571,11 @@ static function prepareFavReportBody($report)
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }
+        if ($report['show_work_units']) {
+          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+          $body .= $subtotal['units'];
+          $body .= '</td>';
+        }
         if ($report['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
@@ -1577,6 +1593,11 @@ static function prepareFavReportBody($report)
         if ($totals['time'] <> '0:00') $body .= $totals['time'];
         $body .= '</td>';
       }
+      if ($report['show_work_units']) {
+        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+        $body .= $totals['units'];
+        $body .= '</td>';
+      }
       if ($report['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
@@ -1608,6 +1629,8 @@ static function prepareFavReportBody($report)
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
       if ($report['show_duration'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($report['show_work_units'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
       if ($report['show_note'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($report['show_cost'])
@@ -1651,6 +1674,7 @@ static function prepareFavReportBody($report)
               if ($report['show_start']) $body .= '<td></td>';
               if ($report['show_end']) $body .= '<td></td>';
               if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
+              if ($report['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
               if ($report['show_note']) $body .= '<td></td>';
               if ($report['show_cost']) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
@@ -1687,6 +1711,8 @@ static function prepareFavReportBody($report)
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
           if ($report['show_duration'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
+          if ($report['show_work_units'])
+            $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
           if ($report['show_note'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($report['show_cost'])
@@ -1724,6 +1750,7 @@ static function prepareFavReportBody($report)
         if ($report['show_start']) $body .= '<td></td>';
         if ($report['show_end']) $body .= '<td></td>';
         if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
+        if ($report['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
         if ($report['show_note']) $body .= '<td></td>';
         if ($report['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
@@ -1748,6 +1775,7 @@ static function prepareFavReportBody($report)
       if ($report['show_start']) $body .= '<td></td>';
       if ($report['show_end']) $body .= '<td></td>';
       if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
+      if ($report['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
       if ($report['show_note']) $body .= '<td></td>';
       if ($report['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8f0779f2d..c2010946b 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.17.92.4283 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.92.4284 | 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>

From 928c8528504a757cebd2bebcebfa5a393ac19b05 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Jul 2018 17:49:57 +0000
Subject: [PATCH 0180/1848] Work in progress on totals only config option for
 Work units plugin.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 4 +---
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/reports.tpl    | 2 +-
 WEB-INF/templates/work_units.tpl | 4 ++++
 work_units.php                   | 1 +
 33 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0e909ab89..e856fc463 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -245,6 +245,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Només totals',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -415,7 +416,6 @@
 'form.reports.group_by_project' => 'projecte',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Només totals',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 282296efd..aa9037a33 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -255,6 +255,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Pouze součty',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -425,7 +426,6 @@
 'form.reports.group_by_project' => 'projekt',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Pouze součty',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 38e9f43d9..7010608cd 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -226,6 +226,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Kun Total',
 
 // Form titles.
 'title.login' => 'Login',
@@ -379,7 +380,6 @@
 'form.reports.group_by_client' => 'Klient',
 'form.reports.group_by_project' => 'Projekt',
 'form.reports.group_by_task' => 'Opgave',
-'form.reports.totals_only' => 'Kun Total',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 613bdc7c9..b7e0f5314 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -222,6 +222,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Nur Gesamtstunden',
 
 // Form titles.
 'title.login' => 'Anmelden',
@@ -372,7 +373,6 @@
 'form.reports.group_by_client' => 'Kunde',
 'form.reports.group_by_project' => 'Projekt',
 'form.reports.group_by_task' => 'Aufgabe',
-'form.reports.totals_only' => 'Nur Gesamtstunden',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index e4abce9f5..5f1145bd6 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -213,6 +213,7 @@
 'label.week_list' => 'Week list',
 'label.work_units' => 'Work units',
 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => 'Login',
@@ -363,7 +364,6 @@
 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'project',
 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5a040b80b..d804fa0be 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -248,6 +248,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Solo totales',
 
 // Form titles.
 'title.login' => 'Sesión iniciada',
@@ -428,7 +429,6 @@
 'form.reports.group_by_project' => 'proyecto',
 // TODO: traslate the following string.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Solo totales',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 2b1bdde35..2c9b04aa6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -251,6 +251,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Ainult summad',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -423,7 +424,6 @@
 'form.reports.group_by_project' => 'projekt',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Ainult summad',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index c567d072c..28bcf8102 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -238,6 +238,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => 'ورود',
@@ -402,9 +403,6 @@
 'form.reports.group_by_client' => 'مشتری',
 'form.reports.group_by_project' => 'پروژه',
 'form.reports.group_by_task' => 'وظیفه',
-// TODO: translate form.reports.totals_only. Selecting this option means to print subtotals only for a "grouped by" report.
-// In other words, items are not printed, only subtotals for grouped items are printed.  
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 48b5089f1..99b40f489 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -230,6 +230,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Vain yhteissummat',
 
 // Form titles.
 'title.login' => 'Kirjautuminen',
@@ -386,7 +387,6 @@
 'form.reports.group_by_client' => 'asiakas',
 'form.reports.group_by_project' => 'projekti',
 'form.reports.group_by_task' => 'tehtävä',
-'form.reports.totals_only' => 'Vain yhteissummat',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 888e0ee8b..a08f34f4f 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -224,6 +224,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Totaux uniquement',
 
 // Form titles.
 'title.login' => 'Connexion',
@@ -376,7 +377,6 @@
 'form.reports.group_by_client' => 'Client',
 'form.reports.group_by_project' => 'Projet',
 'form.reports.group_by_task' => 'Tâche',
-'form.reports.totals_only' => 'Totaux uniquement',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e8f03b019..7eeead9cb 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -215,6 +215,7 @@
 // TODO: translate the following.
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Σύνολα μόνο',
 
 // Form titles.
 'title.login' => 'Σύνδεση',
@@ -365,7 +366,6 @@
 'form.reports.group_by_client' => 'πελάτης',
 'form.reports.group_by_project' => 'έργο',
 'form.reports.group_by_task' => 'εργασία',
-'form.reports.totals_only' => 'Σύνολα μόνο',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e513d5fc9..c99ce8eb9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -248,6 +248,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'labl.totals_only' => 'סיכומים בלבד',
 
 // Form titles.
 'title.login' => 'כניסה',
@@ -410,7 +411,6 @@
 'form.reports.group_by_client' => 'לקוח',
 'form.reports.group_by_project' => 'פרוייקט',
 'form.reports.group_by_task' => 'משימה',
-'form.reports.totals_only' => 'סיכומים בלבד',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index cf6b0878a..73165fae2 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -248,6 +248,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => 'Bejelentkezés',
@@ -417,7 +418,6 @@
 'form.reports.group_by_project' => 'projekt',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ae1dae459..1c6769b7f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -220,6 +220,7 @@
 // TODO: translate the following.
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Solo i totali',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -379,7 +380,6 @@
 'form.reports.group_by_client' => 'cliente',
 'form.reports.group_by_project' => 'progetto',
 'form.reports.group_by_task' => 'compito',
-'form.reports.totals_only' => 'Solo i totali',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index fa4b4bec7..01782d63d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -253,6 +253,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => '全体だけ',
 
 // Form titles.
 'title.login' => 'ログイン',
@@ -422,7 +423,6 @@
 'form.reports.group_by_project' => 'プロジェクト',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => '全体だけ',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b4c79c23e..971c67d6c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -253,6 +253,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => '오직 전체만',
 
 // Form titles.
 'title.login' => '로그인',
@@ -420,7 +421,6 @@
 'form.reports.group_by_project' => '프로젝트',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => '오직 전체만',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0107a7085..8719b4712 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -213,6 +213,7 @@
 // TODO: translate the following.
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Alleen totalen',
 
 // Form titles.
 'title.login' => 'Aanmelden',
@@ -362,7 +363,6 @@
 'form.reports.group_by_client' => 'klant',
 'form.reports.group_by_project' => 'project',
 'form.reports.group_by_task' => 'taak',
-'form.reports.totals_only' => 'Alleen totalen',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1bfc0534b..b3d58cc0f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -251,6 +251,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => 'Innlogging',
@@ -418,7 +419,6 @@
 'form.reports.group_by_project' => 'prosjekt',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ec6b78488..1b4665e62 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -231,6 +231,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Tylko sumy',
 
 // Form titles.
 'title.login' => 'Logowanie',
@@ -388,7 +389,6 @@
 'form.reports.group_by_client' => 'klientów',
 'form.reports.group_by_project' => 'projektów',
 'form.reports.group_by_task' => 'zadań',
-'form.reports.totals_only' => 'Tylko sumy',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index db390eb28..13fc33a8c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -228,6 +228,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Somente totais',
 
 // Form titles.
 'title.login' => 'Login',
@@ -383,7 +384,6 @@
 'form.reports.group_by_client' => 'cliente',
 'form.reports.group_by_project' => 'projeto',
 'form.reports.group_by_task' => 'tarefa',
-'form.reports.totals_only' => 'Somente totais',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 4b9727fa0..53795d38e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -240,6 +240,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => 'Login',
@@ -400,7 +401,6 @@
 // 'form.reports.group_by_client' => 'client',
 // 'form.reports.group_by_project' => 'project',
 // 'form.reports.group_by_task' => 'task',
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index b9c122019..aad8d8831 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -252,6 +252,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Numai totaluri',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -423,7 +424,6 @@
 'form.reports.group_by_project' => 'proiect',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Numai totaluri',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 114ecc541..3b2c67dbc 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -212,6 +212,7 @@
 'label.week_list' => 'Список недели',
 'label.work_units' => 'Единицы работы',
 'label.work_units_short' => 'Единицы',
+'label.totals_only' => 'Только итоги',
 
 // Form titles.
 'title.login' => 'Вход в систему',
@@ -360,7 +361,6 @@
 'form.reports.group_by_client' => 'клиенту',
 'form.reports.group_by_project' => 'проекту',
 'form.reports.group_by_task' => 'задаче',
-'form.reports.totals_only' => 'Только итоги',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 87beb6f65..d22c4b7eb 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -238,6 +238,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Iba celkové',
 
 // Form titles.
 'title.login' => 'Prihlásenie',
@@ -402,7 +403,6 @@
 'form.reports.group_by_client' => 'klient',
 'form.reports.group_by_project' => 'projekt',
 'form.reports.group_by_task' => 'úloha',
-'form.reports.totals_only' => 'Iba celkové',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 732286b9f..ab53c5b23 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -235,6 +235,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => 'Prijava',
@@ -397,7 +398,6 @@
 'form.reports.group_by_project' => 'projekt',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 648f26e24..b9bbf149e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -229,6 +229,7 @@
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
+'label.totals_only' => 'Samo zbirno',
 
 // Form titles.
 'title.login' => 'Prijava',
@@ -386,7 +387,6 @@
 'form.reports.group_by_client' => 'klijent',
 'form.reports.group_by_project' => 'projekat',
 'form.reports.group_by_task' => 'zadatak',
-'form.reports.totals_only' => 'Samo zbirno',
 
 // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 11eff1948..c2159bb1a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -224,6 +224,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Visa endast summeringar',
 
 // Rubriker för formulär
 'title.login' => 'Logga in',
@@ -382,7 +383,6 @@
 'form.reports.group_by_client' => 'Kund',
 'form.reports.group_by_project' => 'Projekt',
 'form.reports.group_by_task' => 'Arbetsuppgift',
-'form.reports.totals_only' => 'Visa endast summeringar',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index ee3b4456a..3508153e6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -259,6 +259,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+'label.totals_only' => 'Sadece toplamlar',
 
 // Form titles.
 // Form titles.
@@ -435,7 +436,6 @@
 'form.reports.group_by_project' => 'proje',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Sadece toplamlar',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 1cb84d714..6fbcb0232 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -242,6 +242,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => '登录',
@@ -406,7 +407,6 @@
 'form.reports.group_by_project' => '项目',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index fc3ec9957..4ada9fc2e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -249,6 +249,7 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
+// 'label.totals_only' => 'Totals only',
 
 // Form titles.
 'title.login' => '登錄',
@@ -414,7 +415,6 @@
 'form.reports.group_by_project' => '項目',
 // TODO: translate the following.
 // 'form.reports.group_by_task' => 'task',
-// 'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index b57ba8410..af674785e 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -299,7 +299,7 @@ function handleCheckboxes() {
           <td><b>{$i18n.form.reports.group_by}</b></td>
         </tr>
         <tr valign="top">
-          <td>{$forms.reportForm.group_by.control} <label>{$forms.reportForm.chtotalsonly.control} {$i18n.form.reports.totals_only}</label></td>
+          <td>{$forms.reportForm.group_by.control} <label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>
         </tr>
       </table>
 
diff --git a/WEB-INF/templates/work_units.tpl b/WEB-INF/templates/work_units.tpl
index 9c2e64da8..a4fb6b578 100644
--- a/WEB-INF/templates/work_units.tpl
+++ b/WEB-INF/templates/work_units.tpl
@@ -8,6 +8,10 @@
     <td>{$i18n.form.work_units.1st_unit_threshold}:</td>
     <td>{$forms.workUnitsForm.1st_unit_threshold.control} <a href="https://www.anuko.com/lp/tt_24.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
   </tr>
+  <tr>
+    <td align="right" nowrap>{$i18n.label.totals_only}:</td>
+    <td>{$forms.workUnitsForm.totals_only.control} <a href="https://www.anuko.com/lp/tt_25.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
   <tr>
     <td colspan="2">&nbsp;</td>
   </tr>
diff --git a/work_units.php b/work_units.php
index dd01488a7..32b2616b8 100644
--- a/work_units.php
+++ b/work_units.php
@@ -53,6 +53,7 @@
 $form = new Form('workUnitsForm');
 $form->addInput(array('type'=>'text', 'name'=>'minutes_in_unit', 'value'=>$cl_minutes_in_unit, 'style'=>'width:40px'));
 $form->addInput(array('type'=>'text', 'name'=>'1st_unit_threshold', 'value'=>$cl_1st_unit_threshold, 'style'=>'width:40px'));
+$form->addInput(array('type'=>'checkbox','name'=>'totals_only','value'=>$cl_totals_only));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){

From 6dbcf228dba9d1175ffd0c177f0739c58ce0f199 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Jul 2018 01:25:03 +0000
Subject: [PATCH 0181/1848] Introduced totals only option for work units.

---
 WEB-INF/lib/ttReportHelper.class.php | 203 +++++++++++++++++----------
 WEB-INF/lib/ttUser.class.php         |   2 +
 WEB-INF/templates/footer.tpl         |   2 +-
 group_edit.php                       |  23 ++-
 work_units.php                       |   3 +
 5 files changed, 146 insertions(+), 87 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 0900f7f9d..4da47ec07 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -277,8 +277,12 @@ static function getItems($bean) {
     if ($bean->getAttribute('chduration'))
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
     // Add work units.
-    if ($bean->getAttribute('chunits'))
-      array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+    if ($bean->getAttribute('chunits')) {
+      if ($user->unit_totals_only)
+        array_push($fields, "null as units");
+      else
+       array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+    }
     // Add note.
     if ($bean->getAttribute('chnote'))
       array_push($fields, 'l.comment as note');
@@ -363,6 +367,9 @@ static function getItems($bean) {
         array_push($fields, 'null'); // null for finish.
       if ($bean->getAttribute('chduration'))
         array_push($fields, 'null'); // null for duration.
+      // Add work units.
+      if ($bean->getAttribute('chunits'))
+        array_push($fields, 'null as units'); // null for work units.
       // Use the note field to print item name.
       if ($bean->getAttribute('chnote'))
         array_push($fields, 'ei.name as note');
@@ -383,10 +390,6 @@ static function getItems($bean) {
       if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
         array_push($fields, 'i.name as invoice');
 
-      // Add work units.
-      if ($bean->getAttribute('chunits'))
-        array_push($fields, 'null'); // null for work units.
-
       // Prepare sql query part for left joins.
       $left_joins = null;
       if ($canViewReports || $isClient)
@@ -549,8 +552,12 @@ static function getFavItems($report) {
     if ($report['show_duration'])
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
     // Add work units.
-    if ($report['show_work_units'])
-      array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+    if ($report['show_work_units']) {
+      if ($user->unit_totals_only)
+        array_push($fields, "null as units");
+      else
+        array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+    }
 
     // Add note.
     if ($report['show_note'])
@@ -636,7 +643,7 @@ static function getFavItems($report) {
       if ($report['show_duration'])
         array_push($fields, 'null'); // null for duration.
       if ($report['show_work_units'])
-        array_push($fields, 'null'); // null for work units.
+        array_push($fields, 'null as units'); // null for work units.
       // Use the note field to print item name.
       if ($report['show_note'])
         array_push($fields, 'ei.name as note');
@@ -782,24 +789,39 @@ static function getSubtotals($bean) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($bean->getAttribute('chunits')) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $group_join $left_join $where group by $group_field";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($bean->getAttribute('chunits')) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {
-      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-        sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-        null as expenses from tt_log l
+      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+      if ($bean->getAttribute('chunits')) {
+        if ($user->unit_totals_only)
+          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        else
+          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+      }
+      $sql .= ", null as expenses from tt_log l
         $group_join $where group by $group_field";
     }
     // By now we have sql for time items.
@@ -830,13 +852,17 @@ static function getSubtotals($bean) {
       }
 
       $where = ttReportHelper::getExpenseWhere($bean);
-      $sql_for_expenses = "select $group_field as group_field, null as time, null as units, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
-        $group_join $where";
+      $sql_for_expenses = "select $group_field as group_field, null as time";
+      if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
 
       // Create a combined query.
-      $sql = "select group_field, sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $combined = "select group_field, sum(time) as time";
+      if ($bean->getAttribute('chunits')) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $sql = $combined;
     }
 
     // Execute query.
@@ -914,24 +940,40 @@ static function getFavSubtotals($report) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
+          $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+          if ($report['show_work_units']) {
+            if ($user->unit_totals_only)
+              $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+            else
+              $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          }
+          $sql .= ", sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $group_join $left_join $where group by $group_field";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($report['show_work_units']) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l 
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {
-      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
-        sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-        null as expenses from tt_log l 
+      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+      if ($report['show_work_units']) {
+        if ($user->unit_totals_only)
+          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        else
+          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+      }
+      $sql .= ", null as expenses from tt_log l 
         $group_join $where group by $group_field";
     }
     // By now we have sql for time items.
@@ -962,13 +1004,17 @@ static function getFavSubtotals($report) {
       }
 
       $where = ttReportHelper::getFavExpenseWhere($report);
-      $sql_for_expenses = "select $group_field as group_field, null as time, null as units, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
-        $group_join $where";
+      $sql_for_expenses = "select $group_field as group_field, null as time";
+      if ($report['show_work_units']) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
 
       // Create a combined query.
-      $sql = "select group_field, sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $combined = "select group_field, sum(time) as time";
+      if ($report['show_work_units']) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $sql = $combined;
     }
 
     // Execute query.
@@ -1005,37 +1051,41 @@ static function getTotals($bean)
 
     $where = ttReportHelper::getWhere($bean);
 
-    // TODO: build query in parts so the work units inclusion is conditional.
-
-    // Start with a query for time items.
+    // Prepare parts.
+    $time_part = "sum(time_to_sec(l.duration)) as time";
+    if ($bean->getAttribute('chunits')) {
+      $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+    }
+    if ($bean->getAttribute('chcost')) {
+      if (MODE_TIME == $user->tracking_mode)
+        $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
+      else
+        $cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
+    } else {
+      $cost_part = ", null as cost, null as expenses";
+    }
     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {
-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses 
-          from tt_log l
-          left join tt_users u on (l.user_id = u.id) $where";
+        $left_joins = "left join tt_users u on (l.user_id = u.id)";
       } else {
-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses
-          from tt_log l
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";
+        $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
       }
-    } else
-      $sql = "select sum(time_to_sec(l.duration)) as time,"
-            ." sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,"
-            ." null as cost, null as expenses from tt_log l $where";
+    }
+    // Prepare a query for time items.
+    $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
 
     // If we have expenses, query becomes a bit more complex.
     if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) {
       $where = ttReportHelper::getExpenseWhere($bean);
-      $sql_for_expenses = "select null as time, null as units, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+      $sql_for_expenses = "select null as time";
+      if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
 
       // Create a combined query.
-      $sql = "select sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $combined = "select sum(time) as time";
+      if ($bean->getAttribute('chunits')) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $sql = $combined;
     }
 
     // Execute query.
@@ -1083,34 +1133,41 @@ static function getFavTotals($report)
 
     $where = ttReportHelper::getFavWhere($report);
 
-    // Start with a query for time items.
+    // Prepare parts.
+    $time_part = "sum(time_to_sec(l.duration)) as time";
+    if ($report['show_work_units']) {
+      $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+    }
+    if ($report['show_cost']) {
+      if (MODE_TIME == $user->tracking_mode)
+        $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
+      else
+        $cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
+    } else {
+      $cost_part = ", null as cost, null as expenses";
+    }
     if ($report['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses 
-          from tt_log l
-          left join tt_users u on (l.user_id = u.id) $where";
+        $left_joins = "left join tt_users u on (l.user_id = u.id)";
       } else {
-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses
-          from tt_log l
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";
+        $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
       }
-    } else
-      $sql = "select sum(time_to_sec(l.duration)) as time,
-        sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units,
-        null as cost, null as expenses from tt_log l $where";
+    }
+    // Prepare a query for time items.
+    $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
 
     // If we have expenses, query becomes a bit more complex.
     if ($report['show_cost'] && $user->isPluginEnabled('ex')) {
       $where = ttReportHelper::getFavExpenseWhere($report);
-      $sql_for_expenses = "select null as time, null as units, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+      $sql_for_expenses = "select null as time";
+      if ($report['show_work_units']) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+
       // Create a combined query.
-      $sql = "select sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $combined = "select sum(time) as time";
+      if ($report['show_work_units']) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $sql = $combined;
     }
 
     // Execute query.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 281659313..e498cde0e 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -68,6 +68,7 @@ class ttUser {
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
   var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
   var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
+  var $unit_totals_only = 0;    // Totlas only option for the Work units plugin.
 
   // Constructor.
   function __construct($login, $id = null) {
@@ -139,6 +140,7 @@ function __construct($login, $id = null) {
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
         $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
         if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
+        $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
       }
       
       // Set "on behalf" id and name.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c2010946b..6b39e764c 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.17.92.4284 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4285 | 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/group_edit.php b/group_edit.php
index 8c7012a50..01d2ecdc4 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttRoleHelper');
+import('ttConfigHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) {
@@ -38,6 +39,8 @@
 }
 // End of access checks.
 
+$config = new ttConfigHelper($user->config);
+
 $advanced_settings = $user->can('manage_advanced_settings');
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
@@ -271,18 +274,12 @@
 
     $plugins = trim($plugins, ',');
 
-    // Prepare config string.
-    if ($cl_show_holidays)
-      $config .= ',show_holidays';
-    if ($cl_punch_mode)
-      $config .= ',punch_mode';
-    if ($cl_allow_overlap)
-      $config .= ',allow_overlap';
-    if ($cl_future_entries)
-      $config .= ',future_entries';
-    if ($cl_uncompleted_indicators)
-      $config .= ',uncompleted_indicators';
-    $config = trim($config, ',');
+    // Update config.
+    $config->setDefinedValue('show_holidays', $cl_show_holidays);
+    $config->setDefinedValue('punch_mode', $cl_punch_mode);
+    $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
+    $config->setDefinedValue('future_entries', $cl_future_entries);
+    $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
 
     if ($user->updateGroup(array(
       'name' => $cl_group,
@@ -300,7 +297,7 @@
       'bcc_email' => $cl_bcc_email,
       'allow_ip' => $cl_allow_ip,
       'plugins' => $plugins,
-      'config' => $config))) {
+      'config' => $config->getConfig()))) {
       header('Location: time.php');
       exit();
     } else
diff --git a/work_units.php b/work_units.php
index 32b2616b8..b2373adab 100644
--- a/work_units.php
+++ b/work_units.php
@@ -45,9 +45,11 @@
 if ($request->isPost()) {
   $cl_minutes_in_unit = $request->getParameter('minutes_in_unit');
   $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold');
+  $cl_totals_only = $request->getParameter('totals_only');
 } else {
   $cl_minutes_in_unit = $user->minutes_in_unit;
   $cl_1st_unit_threshold = $user->first_unit_threshold;
+  $cl_totals_only = $user->unit_totals_only;
 }
 
 $form = new Form('workUnitsForm');
@@ -65,6 +67,7 @@
   if ($err->no()) {
     $config->setIntValue('minutes_in_unit', $cl_minutes_in_unit);
     $config->setIntValue('1st_unit_threshold', $cl_1st_unit_threshold);
+    $config->setDefinedValue('unit_totals_only', $cl_totals_only);
     if (!$user->updateGroup(array('config' => $config->getConfig()))) {
       $err->add($i18n->get('error.db'));
     }

From 0e60d28bba29fbd47e415ac55bdcb39a284613ee Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Jul 2018 02:35:16 +0000
Subject: [PATCH 0182/1848] Fixed typo in a comment.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e856fc463..9d446f2a4 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -490,7 +490,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importar dades del grup des d\\\'un arxiu xml.',
 'form.import.file' => 'Sel·leccioni l\\\'arxiu',
 'form.import.success' => 'Importació finalitzada amb èxit.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index aa9037a33..fccc92b51 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -502,7 +502,7 @@
 // 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importovat týmová data z xml souboru.', // TODO: replace "team" with "group".
 'form.import.file' => 'Výběr souboru',
 'form.import.success' => 'Import byl úspěšně dokončen.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7010608cd..4390e22bb 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -448,7 +448,7 @@
 'form.export.compression_none' => 'Ingen',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importer teamdata fra en xml-fil.', // TODO: replace "team" with "group".
 'form.import.file' => 'Vælg fil',
 'form.import.success' => 'Import sluttede med succes.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b7e0f5314..ac6423de6 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -446,7 +446,7 @@
 'form.export.compression_none' => 'Keine',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.', // TODO: replace "team" with "group".
 'form.import.file' => 'Datei auswählen',
 'form.import.success' => 'Import erfolgreich abgeschlossen.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5f1145bd6..50180602a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -427,7 +427,7 @@
 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Import group data from an xml file.',
 'form.import.file' => 'Select file',
 'form.import.success' => 'Import completed successfully.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d804fa0be..f03a331b1 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -503,7 +503,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importar datos del grupo desde un archivo xml.',
 'form.import.file' => 'Seleccione el archivo',
 'form.import.success' => 'Importación finalizada con éxito.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 2c9b04aa6..f59da5646 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -500,7 +500,7 @@
 // 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Impordi meeskonna andmed xml-failist.', // TODO: replace "team" with "group".
 'form.import.file' => 'Vali fail',
 'form.import.success' => 'Andmed imporditud.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 28bcf8102..f2a033312 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -473,7 +473,7 @@
 'form.export.compression_none' => 'هیچ کدام',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'وارد کردن اطلاعات تیم از یک فایل xml', // TODO: replace "team" with "group".
 'form.import.file' => 'انتخاب فایل',
 'form.import.success' => 'وارد کردن اطلاعات با موفقیت انجام شد',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 99b40f489..f06429daa 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -456,7 +456,7 @@
 'form.export.compression_none' => 'ei pakata',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Tuo tiimitiedot xml-tiedostosta.', // TODO: replace "team" with "group".
 'form.import.file' => 'Valitse tiedosto',
 'form.import.success' => 'Tietojen tuonti onnistui.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a08f34f4f..49825603c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -445,7 +445,7 @@
 'form.export.compression_none' => 'Aucune',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importer les donnés des équipes depuis un fichier xml.', // TODO: replace "team" with "group". Also, it's about 1 group, not many.
 'form.import.file' => 'Sélectionner le fichier',
 'form.import.success' => 'Importation réussie.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 7eeead9cb..3c6d78a2e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -430,7 +430,7 @@
 'form.export.compression_none' => 'χωρίς',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Εισαγωγή δεδομένων ομάδας από αρχείο xml.',
 'form.import.file' => 'Επιλογή αρχείου',
 'form.import.success' => 'Η εισαγωγή ολοκληρώθηκε με επιτυχία.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index c99ce8eb9..cd61af660 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -482,7 +482,7 @@
 'form.export.compression_none' => 'ללא',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'ייבא נתוני צוות מתוך קובץ XML.', // TODO: replace "team" with "group".
 'form.import.file' => 'בחר קובץ',
 'form.import.success' => 'הייבוא הושלם בהצלחה.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 73165fae2..f0dacf13e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -493,7 +493,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Csoport adatok importja XML file-ból.',
 'form.import.file' => 'Válassz file',
 'form.import.success' => 'Az importálás sikeresen véget ért.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1c6769b7f..ceedf9f52 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -445,7 +445,7 @@
 'form.export.compression_none' => 'niente',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importa i dati del gruppo da un file xml.',
 'form.import.file' => 'Seleziona il file',
 'form.import.success' => 'Importazione eseguita con successo.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 01782d63d..07dc50b9f 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -496,7 +496,7 @@
 'form.export.compression_none' => 'なし',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'xmlファイルからチームのデータをインポート。', // TODO: replace "team" with "group".
 'form.import.file' => 'ファイルの選択',
 'form.import.success' => 'インポートが成功的に完了されました。',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 971c67d6c..21c34a561 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -494,7 +494,7 @@
 'form.export.compression_none' => '없음',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'xml 파일로부터 팀 데이터를 임포트.', // TODO: replace "team" with "group".
 'form.import.file' => '파일 선택',
 'form.import.success' => '성과적으로 완료된 임포트.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8719b4712..907b4a496 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -426,7 +426,7 @@
 'form.export.compression_none' => 'geen',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importeer groepsgegevens uit een xml bestand.',
 'form.import.file' => 'Kies bestand',
 'form.import.success' => 'Importeren gelukt.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b3d58cc0f..436f59016 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -493,7 +493,7 @@
 'form.export.compression_none' => 'ingen',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Import team data fra en xml fil.', // TODO: replace "team" with "group".
 'form.import.file' => 'Velg fil',
 'form.import.success' => 'Import gjennomført vellykket.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 1b4665e62..6b262c22d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -458,7 +458,7 @@
 'form.export.compression_none' => 'brak',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Import danych zespołu z pliku xml.', // TODO: replace "team" with "group".
 'form.import.file' => 'Wybierz plik',
 'form.import.success' => 'Import zakończony powodzeniem.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 13fc33a8c..afdd8eb94 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -453,7 +453,7 @@
 'form.export.compression_none' => 'nenhuma',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importar dados de equipe de um arquivo xml.', // TODO: replace "team" with "group".
 'form.import.file' => 'Selecionar arquivo',
 'form.import.success' => 'Importação realizada com sucesso.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 53795d38e..834aaaf56 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -476,7 +476,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 // TODO: translate the following.
 // 'form.import.hint' => 'Import group data from an xml file.',
 // 'form.import.file' => 'Select file',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index aad8d8831..f00956294 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -498,7 +498,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importa date echipa dintr-un fisier xml.', // TODO: replace "team" with "group".
 'form.import.file' => 'Alege fisier',
 'form.import.success' => 'Importul s-a incheiat cu succes.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3b2c67dbc..85155b423 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -424,7 +424,7 @@
 'form.export.compression_none' => 'нет',
 'form.export.compression_bzip' => 'в формате bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Импортируйте данные группы из xml файла.',
 'form.import.file' => 'Укажите файл',
 'form.import.success' => 'Импорт успешно выполнен.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d22c4b7eb..f79f4abd5 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -473,7 +473,7 @@
 'form.export.compression_none' => 'žiadna',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Importovať dáta o tíme z xml súboru.', // TODO: replace "team" with "group".
 'form.import.file' => 'Vyberte súbor',
 'form.import.success' => 'Import úspešne dokončený.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ab53c5b23..3e24c2541 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -472,7 +472,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 // TODO: translate the following.
 // 'form.import.hint' => 'Import group data from an xml file.',
 // 'form.import.file' => 'Select file',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b9bbf149e..7e7d7f4d1 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -456,7 +456,7 @@
 'form.export.compression_none' => 'ništa',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Uvezi podatke timova iz xml fajla.', // TODO: replace "team" with "group".
 'form.import.file' => 'Odaberi datoteku',
 'form.import.success' => 'Uvoz uspešan.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 3508153e6..0159c7a9c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -511,7 +511,7 @@
 // 'form.export.compression_none' => 'none',
 // 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Ekip bilgileri bir xml dosyasından içe aktar.', // TODO: replace "team" with "group".
 'form.import.file' => 'Dosya seç',
 'form.import.success' => 'Içe aktarma başarıyla tamamlandı.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 6fbcb0232..4265532fd 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -480,7 +480,7 @@
 'form.export.compression_none' => '不压缩',
 'form.export.compression_bzip' => 'bzip格式',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => '从xml文件导入团队数据。', // TODO: replace "team" with "group".
 'form.import.file' => '选择档',
 'form.import.success' => '成功完成导入。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 4ada9fc2e..09712f483 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -488,7 +488,7 @@
 'form.export.compression_none' => '不压缩',
 'form.export.compression_bzip' => 'bzip格式',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => '從xml檔導入團隊資料。', // TODO: replace "team" with "group".
 'form.import.file' => '選擇檔',
 'form.import.success' => '成功完成導入。',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6b39e764c..b8d80a7b2 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.17.93.4285 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4286 | 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>

From 259a4673f7475125e1ab6b68f77a67401fa52d06 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 14:06:39 +0000
Subject: [PATCH 0183/1848] Refactoring of reports started.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 22 ++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 cron.php                                |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 006d55676..88a1338d6 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -327,4 +327,26 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttributes($attrs);
     }
   }
+
+  // getReportOptions - returns an array of fav report options from database data.
+  // Note: this function is a part of refactoring to simplify maintenance of report
+  // generating functions, as we currently have 2 sets: normal reporting (from bean),
+  // and fav report emailing (from db fields). Using options obtained from either db or bean
+  // shall allow us to use only one set of functions.
+  static function getReportOptions($id) {
+
+    // Start with getting the fields from the database.
+    $db_fields = ttFavReportHelper::getReport($id);
+    if (!$db_fields) return false;
+
+    // Prepare an array of report options.
+    $options = $db_fields; // For now, use db field names as options.
+    // Drop things we don't need in reports.
+    unset($options['id']);
+    unset($options['report_spec']); // Currently not used.
+    unset($options['status']);
+
+    // $options now is a subset of db fields from tt_fav_reports table.
+    return $options;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b8d80a7b2..5c25eb60a 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.17.93.4286 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4287 | 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/cron.php b/cron.php
index 9424802ef..262cafe54 100644
--- a/cron.php
+++ b/cron.php
@@ -59,7 +59,7 @@
   // We have jobs to execute in user language.
 
   // Get favorite report details.
-  $report = ttFavReportHelper::getReport($val['report_id']);
+  $report = ttFavReportHelper::getReportOptions($val['report_id']);
   if (!$report) continue; // Skip not found report.
 
   // Recycle global $user object, as user settings are specific for each report.

From 187a16b0ffee5ae6af51b010ff90a194048d3457 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 15:28:04 +0000
Subject: [PATCH 0184/1848] A bit more refactoring in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 90 ++++++++++++++++++++++------
 WEB-INF/templates/footer.tpl         |  2 +-
 report.php                           |  7 ++-
 tofile.php                           |  5 +-
 topdf.php                            |  7 ++-
 5 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4da47ec07..e0993525c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -37,13 +37,14 @@
 class ttReportHelper {
 
   // getWhere prepares a WHERE clause for a report query.
-  static function getWhere($bean) {
+  // Note: $options is a future replacement of $bean, which is work in progress.
+  static function getWhere($bean, $options) {
     global $user;
 
     // Prepare dropdown parts.
     $dropdown_parts = '';
-    if ($bean->getAttribute('client'))
-      $dropdown_parts .= ' and l.client_id = '.$bean->getAttribute('client');
+    if ($options['client_id'])
+      $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
     if ($bean->getAttribute('option')) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$bean->getAttribute('option').')';
@@ -135,13 +136,13 @@ static function getFavWhere($report) {
   }
 
   // getExpenseWhere prepares WHERE clause for expenses query in a report.
-  static function getExpenseWhere($bean) {
+  static function getExpenseWhere($bean, $options) {
     global $user;
 
     // Prepare dropdown parts.
     $dropdown_parts = '';
-    if ($bean->getAttribute('client'))
-      $dropdown_parts .= ' and ei.client_id = '.$bean->getAttribute('client');
+    if ($options['client_id'])
+      $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
     if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project');
@@ -227,7 +228,7 @@ static function getFavExpenseWhere($report) {
   // getItems retrieves all items associated with a report.
   // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
   // Expense items use the "note" field for item name.
-  static function getItems($bean) {
+  static function getItems($bean, $options) {
     global $user;
     $mdb2 = getConnection();
 
@@ -333,7 +334,7 @@ static function getItems($bean) {
     if ($includeCost && MODE_TIME != $user->tracking_mode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
 
-    $where = ttReportHelper::getWhere($bean);
+    $where = ttReportHelper::getWhere($bean, $options);
 
     // Construct sql query for tt_log items.
     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
@@ -401,7 +402,7 @@ static function getItems($bean) {
       if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
-      $where = ttReportHelper::getExpenseWhere($bean);
+      $where = ttReportHelper::getExpenseWhere($bean, $options);
 
       // Construct sql query for expense items.
       $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
@@ -742,7 +743,7 @@ static function getFavItems($report) {
   // getSubtotals calculates report items subtotals when a report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
-  static function getSubtotals($bean) {
+  static function getSubtotals($bean, $options) {
     global $user;
 
     $group_by_option = $bean->getAttribute('group_by');
@@ -784,7 +785,7 @@ static function getSubtotals($bean) {
         break;
     }
 
-    $where = ttReportHelper::getWhere($bean);
+    $where = ttReportHelper::getWhere($bean, $options);
     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
@@ -851,7 +852,7 @@ static function getSubtotals($bean) {
           break;
       }
 
-      $where = ttReportHelper::getExpenseWhere($bean);
+      $where = ttReportHelper::getExpenseWhere($bean, $options);
       $sql_for_expenses = "select $group_field as group_field, null as time";
       if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
@@ -1043,13 +1044,13 @@ static function getFavSubtotals($report) {
   }
 
   // getTotals calculates total hours and cost for all report items.
-  static function getTotals($bean)
+  static function getTotals($bean, $options)
   {
     global $user;
 
     $mdb2 = getConnection();
 
-    $where = ttReportHelper::getWhere($bean);
+    $where = ttReportHelper::getWhere($bean, $options);
 
     // Prepare parts.
     $time_part = "sum(time_to_sec(l.duration)) as time";
@@ -1076,7 +1077,7 @@ static function getTotals($bean)
 
     // If we have expenses, query becomes a bit more complex.
     if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) {
-      $where = ttReportHelper::getExpenseWhere($bean);
+      $where = ttReportHelper::getExpenseWhere($bean, $options);
       $sql_for_expenses = "select null as time";
       if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
@@ -1250,12 +1251,13 @@ static function prepareReportBody($bean, $comment)
     // Determine these once as they are used in multiple places in this function.
     $canViewReports = $user->can('view_reports');
     $isClient = $user->isClient();
+    $options = ttReportHelper::getReportOptions($bean);
 
-    $items = ttReportHelper::getItems($bean);
+    $items = ttReportHelper::getItems($bean, $options);
     $group_by = $bean->getAttribute('group_by');
     if ($group_by && 'no_grouping' != $group_by)
-      $subtotals = ttReportHelper::getSubtotals($bean);
-    $totals = ttReportHelper::getTotals($bean);
+      $subtotals = ttReportHelper::getSubtotals($bean, $options);
+    $totals = ttReportHelper::getTotals($bean, $options);
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
@@ -1884,4 +1886,56 @@ static function sendFavReport($report, $subject, $email, $cc) {
 
     return true;
   }
+
+  // getReportOptions - returns an array of report options constructed from session bean.
+  //
+  // Note: similarly to ttFavReportHelper::getReportOptions, this function is a part of
+  // refactoring to simplify maintenance of report generating functions, as we currently
+  // have 2 sets: normal reporting (from bean), and fav report emailing (from db fields).
+  // Using options obtained from either db or bean shall allow us to use only one set of functions.
+  static function getReportOptions($bean) {
+    global $user;
+
+    // Prepare an array of report options.
+    $options = array();
+
+    // Construct one by one.
+    $options['name'] = null; // No name required.
+    $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php.
+    $options['client_id'] = $bean->getAttribute('client');
+
+/*
+ * TODO: remaining fields to fill in...
+  `client_id` int(11) default NULL,                      # client id (if selected)
+  `cf_1_option_id` int(11) default NULL,                 # custom field 1 option id (if selected)
+  `project_id` int(11) default NULL,                     # project id (if selected)
+  `task_id` int(11) default NULL,                        # task id (if selected)
+  `billable` tinyint(4) default NULL,                    # whether to include billable, not billable, or all records
+  `invoice` tinyint(4) default NULL,                     # whether to include invoiced, not invoiced, or all records
+  `paid_status` tinyint(4) default NULL,                 # whether to include paid, not paid, or all records
+  `users` text default NULL,                             # Comma-separated list of user ids. Nothing here means "all" users.
+  `period` tinyint(4) default NULL,                      # selected period type for report
+  `period_start` date default NULL,                      # period start
+  `period_end` date default NULL,                        # period end
+  `show_client` tinyint(4) NOT NULL default 0,           # whether to show client column
+  `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
+  `show_paid` tinyint(4) NOT NULL default 0,             # whether to show paid column
+  `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
+  `show_project` tinyint(4) NOT NULL default 0,          # whether to show project column
+  `show_start` tinyint(4) NOT NULL default 0,            # whether to show start field
+  `show_duration` tinyint(4) NOT NULL default 0,         # whether to show duration field
+  `show_cost` tinyint(4) NOT NULL default 0,             # whether to show cost field
+  `show_task` tinyint(4) NOT NULL default 0,             # whether to show task column
+  `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
+  `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
+  `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
+  `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
+  `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
+  `group_by` varchar(20) default NULL,                   # group by field
+  `status` tinyint(4) default 1,                         # favorite report status
+  PRIMARY KEY (`id`)
+);
+     */
+    return $options;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5c25eb60a..bbef7b8d3 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.17.93.4287 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4288 | 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/report.php b/report.php
index 3f2074491..61b3587ff 100644
--- a/report.php
+++ b/report.php
@@ -172,14 +172,15 @@
 
 $group_by = $bean->getAttribute('group_by');
 
-$report_items = ttReportHelper::getItems($bean);
+$options = ttReportHelper::getReportOptions($bean);
+$report_items = ttReportHelper::getItems($bean, $options);
 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $user->isPluginEnabled('ps'))
   ttReportHelper::putInSession($report_items);
 
 if ('no_grouping' != $group_by)
-  $subtotals = ttReportHelper::getSubtotals($bean);
-$totals = ttReportHelper::getTotals($bean);
+  $subtotals = ttReportHelper::getSubtotals($bean, $options);
+$totals = ttReportHelper::getTotals($bean, $options);
 
 // Assign variables that are used to print subtotals.
 if ($report_items && 'no_grouping' != $group_by) {
diff --git a/tofile.php b/tofile.php
index a06a98667..5a190f4bb 100644
--- a/tofile.php
+++ b/tofile.php
@@ -58,10 +58,11 @@
 $totals_only = $bean->getAttribute('chtotalsonly');
 
 // Obtain items.
+$options = ttReportHelper::getReportOptions($bean);
 if ($totals_only)
-  $subtotals = ttReportHelper::getSubtotals($bean);
+  $subtotals = ttReportHelper::getSubtotals($bean, $options);
 else
-  $items = ttReportHelper::getItems($bean);
+  $items = ttReportHelper::getItems($bean, $options);
 
 // Build a string to use as filename for the files being downloaded.
 $filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
diff --git a/topdf.php b/topdf.php
index b7ac19d52..9d3164af1 100644
--- a/topdf.php
+++ b/topdf.php
@@ -74,11 +74,12 @@
 }
 
 // Obtain items for report.
+$options = ttReportHelper::getReportOptions($bean);
 if (!$totals_only)
-  $items = ttReportHelper::getItems($bean); // Individual entries.
+  $items = ttReportHelper::getItems($bean, $options); // Individual entries.
 if ($totals_only || 'no_grouping' != $group_by)
-  $subtotals = ttReportHelper::getSubtotals($bean); // Subtotals for groups of items.
-$totals = ttReportHelper::getTotals($bean); // Totals for the entire report.
+  $subtotals = ttReportHelper::getSubtotals($bean, $options); // Subtotals for groups of items.
+$totals = ttReportHelper::getTotals($bean, $options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.
 if ($items && 'no_grouping' != $group_by) {

From 582bcea8035519f2b93be44023ec2cd032ef2504 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 16:21:42 +0000
Subject: [PATCH 0185/1848] Some renaming for ongoing report refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 364 +++++++++++++--------------
 WEB-INF/templates/footer.tpl         |   2 +-
 cron.php                             |  10 +-
 3 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index e0993525c..ae5698d2c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -83,30 +83,30 @@ static function getWhere($bean, $options) {
   }
 
   // getFavWhere prepares a WHERE clause for a favorite report query.
-  static function getFavWhere($report) {
+  static function getFavWhere($options) {
     global $user;
 
     // Prepare dropdown parts.
     $dropdown_parts = '';
-    if ($report['client_id'])
-      $dropdown_parts .= ' and l.client_id = '.$report['client_id'];
+    if ($options['client_id'])
+      $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
-    if ($report['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$report['cf_1_option_id'].')';
-    if ($report['project_id']) $dropdown_parts .= ' and l.project_id = '.$report['project_id'];
-    if ($report['task_id']) $dropdown_parts .= ' and l.task_id = '.$report['task_id'];
-    if ($report['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
-    if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
-    if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
-    if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
-    if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
+    if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')';
+    if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
+    if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
+    if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
+    if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
+    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+    if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
+    if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
     // Prepare user list part.
     $userlist = -1;
     if (($user->can('view_reports') || $user->isClient())) {
-      if ($report['users'])
-        $userlist = $report['users'];
+      if ($options['users'])
+        $userlist = $options['users'];
       else {
         $active_users = ttTeamHelper::getActiveUsers();
         foreach ($active_users as $single_user)
@@ -122,13 +122,13 @@ static function getFavWhere($report) {
       $user_list_part = " and l.user_id = ".$user->id;
 
     // Prepare sql query part for where.
-    if ($report['period'])
-      $period = new Period($report['period'], new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $report['period_start']),
-        new DateAndTime($user->date_format, $report['period_end']));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts";
@@ -177,26 +177,26 @@ static function getExpenseWhere($bean, $options) {
   }
 
   // getFavExpenseWhere prepares a WHERE clause for expenses query in a favorite report.
-  static function getFavExpenseWhere($report) {
+  static function getFavExpenseWhere($options) {
     global $user;
 
     // Prepare dropdown parts.
     $dropdown_parts = '';
-    if ($report['client_id'])
-      $dropdown_parts .= ' and ei.client_id = '.$report['client_id'];
+    if ($options['client_id'])
+      $dropdown_parts .= ' and ei.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
-    if ($report['project_id']) $dropdown_parts .= ' and ei.project_id = '.$report['project_id'];
-    if ($report['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
-    if ($report['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
-    if ($report['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
-    if ($report['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
+    if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
+    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+    if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
+    if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
     // Prepare user list part.
     $userlist = -1;
     if (($user->can('view_reports') || $user->isClient())) {
-      if ($report['users'])
-        $userlist = $report['users'];
+      if ($options['users'])
+        $userlist = $options['users'];
       else {
       	$active_users = ttTeamHelper::getActiveUsers();
         foreach ($active_users as $single_user)
@@ -212,13 +212,13 @@ static function getFavExpenseWhere($report) {
       $user_list_part = " and ei.user_id = ".$user->id;
 
     // Prepare sql query part for where.
-    if ($report['period'])
-      $period = new Period($report['period'], new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $report['period_start']),
-        new DateAndTime($user->date_format, $report['period_end']));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));
     }
     $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts";
@@ -503,7 +503,7 @@ static function getFromSession() {
   // getFavItems retrieves all items associated with a favorite report.
   // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
   // Expense items use the "note" field for item name.
-  static function getFavItems($report) {
+  static function getFavItems($options) {
     global $user;
     $mdb2 = getConnection();
 
@@ -511,8 +511,8 @@ static function getFavItems($report) {
     $canViewReports = $user->can('view_reports');
     $isClient = $user->isClient();
 
-    $group_by_option = $report['group_by'];
-    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']);
+    $group_by_option = $options['group_by'];
+    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
 
     // Prepare a query for time items in tt_log table.
     $fields = array(); // An array of fields for database query.
@@ -522,16 +522,16 @@ static function getFavItems($report) {
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
-    if ($report['show_client'] || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)
       array_push($fields, 'c.name as client');
     // Add project name if it is selected.
-    if ($report['show_project'] || 'project' == $group_by_option)
+    if ($options['show_project'] || 'project' == $group_by_option)
       array_push($fields, 'p.name as project');
     // Add task name if it is selected.
-    if ($report['show_task'] || 'task' == $group_by_option)
+    if ($options['show_task'] || 'task' == $group_by_option)
       array_push($fields, 't.name as task');
     // Add custom field.
-    $include_cf_1 = $report['show_custom_field_1'] || 'cf_1' == $group_by_option;
+    $include_cf_1 = $options['show_custom_field_1'] || 'cf_1' == $group_by_option;
     if ($include_cf_1) {
       $custom_fields = new CustomFields($user->group_id);
       $cf_1_type = $custom_fields->fields[0]['type'];
@@ -542,18 +542,18 @@ static function getFavItems($report) {
       }
     }
     // Add start time.
-    if ($report['show_start']) {
+    if ($options['show_start']) {
       array_push($fields, "l.start as unformatted_start");
       array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start");
     }
     // Add finish time.
-    if ($report['show_end'])
+    if ($options['show_end'])
       array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish");
     // Add duration.
-    if ($report['show_duration'])
+    if ($options['show_duration'])
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
     // Add work units.
-    if ($report['show_work_units']) {
+    if ($options['show_work_units']) {
       if ($user->unit_totals_only)
         array_push($fields, "null as units");
       else
@@ -561,10 +561,10 @@ static function getFavItems($report) {
     }
 
     // Add note.
-    if ($report['show_note'])
+    if ($options['show_note'])
       array_push($fields, 'l.comment as note');
     // Handle cost.
-    $includeCost = $report['show_cost'];
+    $includeCost = $options['show_cost'];
     if ($includeCost) {
       if (MODE_TIME == $user->tracking_mode)
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
@@ -573,30 +573,30 @@ static function getFavItems($report) {
       array_push($fields, "null as expense"); 
     }
     // Add paid status.
-    if ($canViewReports && $report['show_paid'])
+    if ($canViewReports && $options['show_paid'])
       array_push($fields, 'l.paid as paid');
     // Add IP address.
-    if ($canViewReports && $report['show_ip']) {
+    if ($canViewReports && $options['show_ip']) {
       array_push($fields, 'l.created as created');
       array_push($fields, 'l.created_ip as created_ip');
       array_push($fields, 'l.modified as modified');
       array_push($fields, 'l.modified_ip as modified_ip');
     }
     // Add invoice name if it is selected.
-    if (($canViewReports || $isClient) && $report['show_invoice'])
+    if (($canViewReports || $isClient) && $options['show_invoice'])
       array_push($fields, 'i.name as invoice');
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-    if ($report['show_client'] || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
-    if (($canViewReports || $isClient) && $report['show_invoice'])
+    if (($canViewReports || $isClient) && $options['show_invoice'])
       $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
     if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))
        $left_joins .= " left join tt_users u on (u.id = l.user_id)";
-    if ($report['show_project'] || 'project' == $group_by_option)
+    if ($options['show_project'] || 'project' == $group_by_option)
       $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
-    if ($report['show_task'] || 'task' == $group_by_option)
+    if ($options['show_task'] || 'task' == $group_by_option)
       $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
     if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
@@ -609,7 +609,7 @@ static function getFavItems($report) {
     if ($includeCost && MODE_TIME != $user->tracking_mode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
 
-    $where = ttReportHelper::getFavWhere($report);
+    $where = ttReportHelper::getFavWhere($options);
 
     // Construct sql query for tt_log items.
     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
@@ -617,7 +617,7 @@ static function getFavItems($report) {
     // with an exception of sorting part, that is added in the end.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($report['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
       $fields = array(); // An array of fields for database query.
       array_push($fields, 'ei.id');
@@ -626,56 +626,56 @@ static function getFavItems($report) {
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
       // Add client name if it is selected.
-      if ($report['show_client'] || 'client' == $group_by_option)
+      if ($options['show_client'] || 'client' == $group_by_option)
         array_push($fields, 'c.name as client');
       // Add project name if it is selected.
-      if ($report['show_project'] || 'project' == $group_by_option)
+      if ($options['show_project'] || 'project' == $group_by_option)
         array_push($fields, 'p.name as project');
-      if ($report['show_task'] || 'task' == $group_by_option)
+      if ($options['show_task'] || 'task' == $group_by_option)
         array_push($fields, 'null'); // null for task name. We need to match column count for union.
-      if ($report['show_custom_field_1'] || 'cf_1' == $group_by_option)
+      if ($options['show_custom_field_1'] || 'cf_1' == $group_by_option)
         array_push($fields, 'null'); // null for cf_1.
-      if ($report['show_start']) {
+      if ($options['show_start']) {
         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
       }
-      if ($report['show_end'])
+      if ($options['show_end'])
         array_push($fields, 'null'); // null for finish.
-      if ($report['show_duration'])
+      if ($options['show_duration'])
         array_push($fields, 'null'); // null for duration.
-      if ($report['show_work_units'])
+      if ($options['show_work_units'])
         array_push($fields, 'null as units'); // null for work units.
       // Use the note field to print item name.
-      if ($report['show_note'])
+      if ($options['show_note'])
         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
       // Add paid status.
-      if ($canViewReports && $report['show_paid'])
+      if ($canViewReports && $options['show_paid'])
         array_push($fields, 'ei.paid as paid');
       // Add IP address.
-      if ($canViewReports && $report['show_ip']) {
+      if ($canViewReports && $options['show_ip']) {
         array_push($fields, 'ei.created as created');
         array_push($fields, 'ei.created_ip as created_ip');
         array_push($fields, 'ei.modified as modified');
         array_push($fields, 'ei.modified_ip as modified_ip');
       }
       // Add invoice name if it is selected.
-      if (($canViewReports || $isClient) && $report['show_invoice'])
+      if (($canViewReports || $isClient) && $options['show_invoice'])
         array_push($fields, 'i.name as invoice');
 
       // Prepare sql query part for left joins.
       $left_joins = null;
       if ($canViewReports || $isClient)
         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
-      if ($report['show_client'] || 'client' == $group_by_option)
+      if ($options['show_client'] || 'client' == $group_by_option)
         $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
-      if ($report['show_project'] || 'project' == $group_by_option)
+      if ($options['show_project'] || 'project' == $group_by_option)
         $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
-      if (($canViewReports || $isClient) && $report['show_invoice'])
+      if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
-      $where = ttReportHelper::getFavExpenseWhere($report);
+      $where = ttReportHelper::getFavExpenseWhere($options);
 
       // Construct sql query for expense items.
       $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
@@ -692,7 +692,7 @@ static function getFavItems($report) {
       $sort_part .= $group_by_option.', date';
     if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option)
       $sort_part .= ', user, type';
-    if ($report['show_start'])
+    if ($options['show_start'])
       $sort_part .= ', unformatted_start';
     $sort_part .= ', id';
 
@@ -894,10 +894,10 @@ static function getSubtotals($bean, $options) {
   // getFavSubtotals calculates report items subtotals when a favorite report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
-  static function getFavSubtotals($report) {
+  static function getFavSubtotals($options) {
     global $user;
 
-    $group_by_option = $report['group_by'];
+    $group_by_option = $options['group_by'];
     if ('no_grouping' == $group_by_option) return null;
 
     $mdb2 = getConnection();
@@ -936,13 +936,13 @@ static function getFavSubtotals($report) {
         break;
     }
 
-    $where = ttReportHelper::getFavWhere($report);
-    if ($report['show_cost']) {
+    $where = ttReportHelper::getFavWhere($options);
+    if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
           $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-          if ($report['show_work_units']) {
+          if ($options['show_work_units']) {
             if ($user->unit_totals_only)
               $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
             else
@@ -955,7 +955,7 @@ static function getFavSubtotals($report) {
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
         $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-        if ($report['show_work_units']) {
+        if ($options['show_work_units']) {
           if ($user->unit_totals_only)
             $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
           else
@@ -968,7 +968,7 @@ static function getFavSubtotals($report) {
       }
     } else {
       $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-      if ($report['show_work_units']) {
+      if ($options['show_work_units']) {
         if ($user->unit_totals_only)
           $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
         else
@@ -980,7 +980,7 @@ static function getFavSubtotals($report) {
     // By now we have sql for time items.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($report['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
       // Determine group by field and a required join.
       $group_join = null;
@@ -1004,16 +1004,16 @@ static function getFavSubtotals($report) {
           break;
       }
 
-      $where = ttReportHelper::getFavExpenseWhere($report);
+      $where = ttReportHelper::getFavExpenseWhere($options);
       $sql_for_expenses = "select $group_field as group_field, null as time";
-      if ($report['show_work_units']) $sql_for_expenses .= ", null as units";
+      if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
 
       // Create a combined query.
       $combined = "select group_field, sum(time) as time";
-      if ($report['show_work_units']) $combined .= ", sum(units) as units";
+      if ($options['show_work_units']) $combined .= ", sum(units) as units";
       $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
       $sql = $combined;
     }
@@ -1030,7 +1030,7 @@ static function getFavSubtotals($report) {
         unset($o_date);
       }
       $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-      if ($report['show_cost']) {
+      if ($options['show_cost']) {
         if ('.' != $user->decimal_mark) {
           $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
           $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
@@ -1126,20 +1126,20 @@ static function getTotals($bean, $options)
   }
 
   // getFavTotals calculates total hours and cost for all favorite report items.
-  static function getFavTotals($report)
+  static function getFavTotals($options)
   {
     global $user;
 
     $mdb2 = getConnection();
 
-    $where = ttReportHelper::getFavWhere($report);
+    $where = ttReportHelper::getFavWhere($options);
 
     // Prepare parts.
     $time_part = "sum(time_to_sec(l.duration)) as time";
-    if ($report['show_work_units']) {
+    if ($options['show_work_units']) {
       $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
     }
-    if ($report['show_cost']) {
+    if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode)
         $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
       else
@@ -1147,7 +1147,7 @@ static function getFavTotals($report)
     } else {
       $cost_part = ", null as cost, null as expenses";
     }
-    if ($report['show_cost']) {
+    if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
         $left_joins = "left join tt_users u on (l.user_id = u.id)";
       } else {
@@ -1158,15 +1158,15 @@ static function getFavTotals($report)
     $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
 
     // If we have expenses, query becomes a bit more complex.
-    if ($report['show_cost'] && $user->isPluginEnabled('ex')) {
-      $where = ttReportHelper::getFavExpenseWhere($report);
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
+      $where = ttReportHelper::getFavExpenseWhere($options);
       $sql_for_expenses = "select null as time";
-      if ($report['show_work_units']) $sql_for_expenses .= ", null as units";
+      if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
 
       // Create a combined query.
       $combined = "select sum(time) as time";
-      if ($report['show_work_units']) $combined .= ", sum(units) as units";
+      if ($options['show_work_units']) $combined .= ", sum(units) as units";
       $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
       $sql = $combined;
     }
@@ -1177,7 +1177,7 @@ static function getFavTotals($report)
 
     $val = $res->fetchRow();
     $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-    if ($report['show_cost']) {
+    if ($options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
       if ('.' != $user->decimal_mark)
@@ -1188,13 +1188,13 @@ static function getFavTotals($report)
         $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
     }
 
-    if ($report['period'])
-      $period = new Period($report['period'], new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $report['period_start']),
-        new DateAndTime($user->date_format, $report['period_end']));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));
     }
 
     $totals['start_date'] = $period->getStartDate();
@@ -1545,9 +1545,9 @@ static function prepareReportBody($bean, $comment)
   }
 
   // checkFavReportCondition - checks whether it is okay to send fav report.
-  static function checkFavReportCondition($report, $condition)
+  static function checkFavReportCondition($options, $condition)
   {
-    $items = ttReportHelper::getFavItems($report);
+    $items = ttReportHelper::getFavItems($options);
 
     $condition = str_replace('count', '', $condition);
     $count_required = (int) trim(str_replace('>', '', $condition));
@@ -1559,7 +1559,7 @@ static function checkFavReportCondition($report, $condition)
   }
 
   // prepareFavReportBody - prepares an email body for a favorite report.
-  static function prepareFavReportBody($report)
+  static function prepareFavReportBody($options)
   {
     global $user;
     global $i18n;
@@ -1568,11 +1568,11 @@ static function prepareFavReportBody($report)
     $canViewReports = $user->can('view_reports');
     $isClient = $user->isClient();
 
-    $items = ttReportHelper::getFavItems($report);
-    $group_by = $report['group_by'];
+    $items = ttReportHelper::getFavItems($options);
+    $group_by = $options['group_by'];
     if ($group_by && 'no_grouping' != $group_by)
-      $subtotals = ttReportHelper::getFavSubtotals($report);
-    $totals = ttReportHelper::getFavTotals($report);
+      $subtotals = ttReportHelper::getFavSubtotals($options);
+    $totals = ttReportHelper::getFavTotals($options);
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
@@ -1601,7 +1601,7 @@ static function prepareFavReportBody($report)
     // Output comment.
     // if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>'; // No comment for fav. reports.
 
-    if ($report['show_totals_only']) {
+    if ($options['show_totals_only']) {
       // Totals only report. Output subtotals.
 
       // Determine group_by header.
@@ -1615,27 +1615,27 @@ static function prepareFavReportBody($report)
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
-      if ($report['show_duration'])
+      if ($options['show_duration'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
-      if ($report['show_work_units'])
+      if ($options['show_work_units'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
-      if ($report['show_cost'])
+      if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : '&nbsp;').'</td>';
-        if ($report['show_duration']) {
+        if ($options['show_duration']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }
-        if ($report['show_work_units']) {
+        if ($options['show_work_units']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= $subtotal['units'];
           $body .= '</td>';
         }
-        if ($report['show_cost']) {
+        if ($options['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
           $body .= '</td>';
@@ -1647,17 +1647,17 @@ static function prepareFavReportBody($report)
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
       $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
-      if ($report['show_duration']) {
+      if ($options['show_duration']) {
         $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
         if ($totals['time'] <> '0:00') $body .= $totals['time'];
         $body .= '</td>';
       }
-      if ($report['show_work_units']) {
+      if ($options['show_work_units']) {
         $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
         $body .= $totals['units'];
         $body .= '</td>';
       }
-      if ($report['show_cost']) {
+      if ($options['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
         $body .= '</td>';
@@ -1674,31 +1674,31 @@ static function prepareFavReportBody($report)
       $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
       if ($canViewReports || $isClient)
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
-      if ($report['show_client'])
+      if ($options['show_client'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
-      if ($report['show_project'])
+      if ($options['show_project'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
-      if ($report['show_task'])
+      if ($options['show_task'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
-      if ($report['show_custom_field_1'])
+      if ($options['show_custom_field_1'])
         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
-      if ($report['show_start'])
+      if ($options['show_start'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
-      if ($report['show_end'])
+      if ($options['show_end'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
-      if ($report['show_duration'])
+      if ($options['show_duration'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
-      if ($report['show_work_units'])
+      if ($options['show_work_units'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
-      if ($report['show_note'])
+      if ($options['show_note'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
-      if ($report['show_cost'])
+      if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
-      if ($report['show_paid'])
+      if ($options['show_paid'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
-      if ($report['show_ip'])
+      if ($options['show_ip'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
-      if ($report['show_invoice'])
+      if ($options['show_invoice'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
       $body .= '</tr>';
 
@@ -1726,23 +1726,23 @@ static function prepareFavReportBody($report)
               $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
               if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-              if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-              if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-              if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-              if ($report['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
-              if ($report['show_start']) $body .= '<td></td>';
-              if ($report['show_end']) $body .= '<td></td>';
-              if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
-              if ($report['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
-              if ($report['show_note']) $body .= '<td></td>';
-              if ($report['show_cost']) {
+              if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
+              if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
+              if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
+              if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
+              if ($options['show_start']) $body .= '<td></td>';
+              if ($options['show_end']) $body .= '<td></td>';
+              if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
+              if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
+              if ($options['show_note']) $body .= '<td></td>';
+              if ($options['show_cost']) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
                 $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
                 $body .= '</td>';
               }
-              if ($report['show_paid']) $body .= '<td></td>';
-              if ($report['show_ip']) $body .= '<td></td>';
-              if ($report['show_invoice']) $body .= '<td></td>';
+              if ($options['show_paid']) $body .= '<td></td>';
+              if ($options['show_ip']) $body .= '<td></td>';
+              if ($options['show_invoice']) $body .= '<td></td>';
               $body .= '</tr>';
               $body .= '<tr><td>&nbsp;</td></tr>';
             }
@@ -1756,37 +1756,37 @@ static function prepareFavReportBody($report)
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
           if ($canViewReports || $isClient)
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
-          if ($report['show_client'])
+          if ($options['show_client'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
-          if ($report['show_project'])
+          if ($options['show_project'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['project']).'</td>';
-          if ($report['show_task'])
+          if ($options['show_task'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['task']).'</td>';
-          if ($report['show_custom_field_1'])
+          if ($options['show_custom_field_1'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['cf_1']).'</td>';
-          if ($report['show_start'])
+          if ($options['show_start'])
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['start'].'</td>';
-          if ($report['show_end'])
+          if ($options['show_end'])
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
-          if ($report['show_duration'])
+          if ($options['show_duration'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
-          if ($report['show_work_units'])
+          if ($options['show_work_units'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
-          if ($report['show_note'])
+          if ($options['show_note'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
-          if ($report['show_cost'])
+          if ($options['show_cost'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
-          if ($report['show_paid']) {
+          if ($options['show_paid']) {
             $body .= '<td style="'.$cellRightAligned.'">';
             $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
             $body .= '</td>';
           }
-          if ($report['show_ip']) {
+          if ($options['show_ip']) {
             $body .= '<td style="'.$cellRightAligned.'">';
             $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
             $body .= '</td>';
           }
-          if ($report['show_invoice'])
+          if ($options['show_invoice'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           $body .= '</tr>';
 
@@ -1802,23 +1802,23 @@ static function prepareFavReportBody($report)
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
         if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-        if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-        if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-        if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-        if ($report['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
-        if ($report['show_start']) $body .= '<td></td>';
-        if ($report['show_end']) $body .= '<td></td>';
-        if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
-        if ($report['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
-        if ($report['show_note']) $body .= '<td></td>';
-        if ($report['show_cost']) {
+        if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
+        if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
+        if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
+        if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
+        if ($options['show_start']) $body .= '<td></td>';
+        if ($options['show_end']) $body .= '<td></td>';
+        if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
+        if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
+        if ($options['show_note']) $body .= '<td></td>';
+        if ($options['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
           $body .= '</td>';
         }
-        if ($report['show_paid']) $body .= '<td></td>';
-        if ($report['show_ip']) $body .= '<td></td>';
-        if ($report['show_invoice']) $body .= '<td></td>';
+        if ($options['show_paid']) $body .= '<td></td>';
+        if ($options['show_ip']) $body .= '<td></td>';
+        if ($options['show_invoice']) $body .= '<td></td>';
         $body .= '</tr>';
       }
 
@@ -1827,23 +1827,23 @@ static function prepareFavReportBody($report)
       $body .= '<tr style="'.$rowSubtotal.'">';
       $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
       if ($canViewReports || $isClient) $body .= '<td></td>';
-      if ($report['show_client']) $body .= '<td></td>';
-      if ($report['show_project']) $body .= '<td></td>';
-      if ($report['show_task']) $body .= '<td></td>';
-      if ($report['show_custom_field_1']) $body .= '<td></td>';
-      if ($report['show_start']) $body .= '<td></td>';
-      if ($report['show_end']) $body .= '<td></td>';
-      if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
-      if ($report['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
-      if ($report['show_note']) $body .= '<td></td>';
-      if ($report['show_cost']) {
+      if ($options['show_client']) $body .= '<td></td>';
+      if ($options['show_project']) $body .= '<td></td>';
+      if ($options['show_task']) $body .= '<td></td>';
+      if ($options['show_custom_field_1']) $body .= '<td></td>';
+      if ($options['show_start']) $body .= '<td></td>';
+      if ($options['show_end']) $body .= '<td></td>';
+      if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
+      if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
+      if ($options['show_note']) $body .= '<td></td>';
+      if ($options['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
         $body .= '</td>';
       }
-      if ($report['show_paid']) $body .= '<td></td>';
-      if ($report['show_ip']) $body .= '<td></td>';
-      if ($report['show_invoice']) $body .= '<td></td>';
+      if ($options['show_paid']) $body .= '<td></td>';
+      if ($options['show_ip']) $body .= '<td></td>';
+      if ($options['show_invoice']) $body .= '<td></td>';
       $body .= '</tr>';
 
       $body .= '</table>';
@@ -1860,14 +1860,14 @@ static function prepareFavReportBody($report)
   }
 
   // sendFavReport - sends a favorite report to a specified email, called from cron.php
-  static function sendFavReport($report, $subject, $email, $cc) {
+  static function sendFavReport($options, $subject, $email, $cc) {
     // We are called from cron.php, we have no $bean in session.
     // cron.php sets global $user and $i18n objects to match our favorite report user.
     global $user;
     global $i18n;
 
     // Prepare report body.
-    $body = ttReportHelper::prepareFavReportBody($report);
+    $body = ttReportHelper::prepareFavReportBody($options);
 
     import('mail.Mailer');
     $mailer = new Mailer();
@@ -1880,7 +1880,7 @@ static function sendFavReport($report, $subject, $email, $cc) {
       $mailer->setReceiverBCC($user->bcc_email);
     $mailer->setReceiver($email);
     $mailer->setMailMode(MAIL_MODE);
-    if (empty($subject)) $subject = $report['name'];
+    if (empty($subject)) $subject = $options['name'];
     if (!$mailer->send($subject, $body))
       return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bbef7b8d3..654f80442 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.17.93.4288 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4289 | 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/cron.php b/cron.php
index 262cafe54..50d5d7cfb 100644
--- a/cron.php
+++ b/cron.php
@@ -59,11 +59,11 @@
   // We have jobs to execute in user language.
 
   // Get favorite report details.
-  $report = ttFavReportHelper::getReportOptions($val['report_id']);
-  if (!$report) continue; // Skip not found report.
+  $options = ttFavReportHelper::getReportOptions($val['report_id']);
+  if (!$options) continue; // Skip not found report.
 
   // Recycle global $user object, as user settings are specific for each report.
-  $user = new ttUser(null, $report['user_id']);
+  $user = new ttUser(null, $options['user_id']);
   if (!$user->id) continue; // Skip not found user.
   // Recycle $i18n object because language is user-specific.
   $i18n->load($user->lang);
@@ -71,11 +71,11 @@
   // Check condition on a report.
   $condition_ok = true;
   if ($val['report_condition'])
-    $condition_ok = ttReportHelper::checkFavReportCondition($report, $val['report_condition']);
+    $condition_ok = ttReportHelper::checkFavReportCondition($options, $val['report_condition']);
 
   // Email report if condition is okay.
   if ($condition_ok) {
-    if (ttReportHelper::sendFavReport($report, $val['subject'], $val['email'], $val['cc']))
+    if (ttReportHelper::sendFavReport($options, $val['subject'], $val['email'], $val['cc']))
       echo "Report ".$val['report_id']. " sent.<br>";
     else
       echo "Error while emailing report...<br>";

From 3c959f0cd6c32bcfa962480ebd87e7ee4ae6d5c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 16:57:36 +0000
Subject: [PATCH 0186/1848] A bit more progress on report refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 15 +++++++--------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ae5698d2c..624ea8f3d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -47,9 +47,9 @@ static function getWhere($bean, $options) {
       $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
-    if ($bean->getAttribute('option')) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$bean->getAttribute('option').')';
-    if ($bean->getAttribute('project')) $dropdown_parts .= ' and l.project_id = '.$bean->getAttribute('project');
-    if ($bean->getAttribute('task')) $dropdown_parts .= ' and l.task_id = '.$bean->getAttribute('task');
+    if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')';
+    if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
+    if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
     if ($bean->getAttribute('include_records')=='1') $dropdown_parts .= ' and l.billable = 1';
     if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0';
     if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
@@ -145,7 +145,7 @@ static function getExpenseWhere($bean, $options) {
       $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
-    if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project');
+    if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
     if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
     if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
     if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and ei.paid = 1';
@@ -1903,13 +1903,12 @@ static function getReportOptions($bean) {
     $options['name'] = null; // No name required.
     $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php.
     $options['client_id'] = $bean->getAttribute('client');
+    $options['cf_1_option_id'] = $bean->getAttribute('option');
+    $options['project_id'] = $bean->getAttribute('project');
+    $options['task_id'] = $bean->getAttribute('task');
 
 /*
  * TODO: remaining fields to fill in...
-  `client_id` int(11) default NULL,                      # client id (if selected)
-  `cf_1_option_id` int(11) default NULL,                 # custom field 1 option id (if selected)
-  `project_id` int(11) default NULL,                     # project id (if selected)
-  `task_id` int(11) default NULL,                        # task id (if selected)
   `billable` tinyint(4) default NULL,                    # whether to include billable, not billable, or all records
   `invoice` tinyint(4) default NULL,                     # whether to include invoiced, not invoiced, or all records
   `paid_status` tinyint(4) default NULL,                 # whether to include paid, not paid, or all records
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 654f80442..49a8ee805 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.17.93.4289 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4290 | 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>

From 0861ff3430ddb8ae58b0399ca3b6eced35cdb360 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 17:22:58 +0000
Subject: [PATCH 0187/1848] More refactoring in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 26 +++++++++++++-------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 624ea8f3d..b33ded870 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -50,12 +50,12 @@ static function getWhere($bean, $options) {
     if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')';
     if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
     if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
-    if ($bean->getAttribute('include_records')=='1') $dropdown_parts .= ' and l.billable = 1';
-    if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
-    if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
-    if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1';
-    if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.paid = 0';
+    if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
+    if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
+    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+    if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
+    if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
     // Prepare user list part.
     $userlist = -1;
@@ -146,10 +146,10 @@ static function getExpenseWhere($bean, $options) {
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
     if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
-    if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
-    if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
-    if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and ei.paid = 1';
-    if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and ei.paid = 0';
+    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+    if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
+    if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
     // Prepare user list part.
     $userlist = -1;
@@ -1906,12 +1906,12 @@ static function getReportOptions($bean) {
     $options['cf_1_option_id'] = $bean->getAttribute('option');
     $options['project_id'] = $bean->getAttribute('project');
     $options['task_id'] = $bean->getAttribute('task');
+    $options['billable'] = $bean->getAttribute('include_records');
+    $options['invoice'] = $bean->getAttribute('invoice');
+    $options['paid_status'] = $bean->getAttribute('paid_status');
 
 /*
  * TODO: remaining fields to fill in...
-  `billable` tinyint(4) default NULL,                    # whether to include billable, not billable, or all records
-  `invoice` tinyint(4) default NULL,                     # whether to include invoiced, not invoiced, or all records
-  `paid_status` tinyint(4) default NULL,                 # whether to include paid, not paid, or all records
   `users` text default NULL,                             # Comma-separated list of user ids. Nothing here means "all" users.
   `period` tinyint(4) default NULL,                      # selected period type for report
   `period_start` date default NULL,                      # period start
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 49a8ee805..48c12a76f 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.17.93.4290 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4291 | 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>

From 6072ff00f2f58e59e2e1138771038b42bc9f32aa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 19:18:19 +0000
Subject: [PATCH 0188/1848] More refactoring in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 43 ++++++++++++++--------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index b33ded870..74ddd5828 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -57,25 +57,27 @@ static function getWhere($bean, $options) {
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users')))
-      $userlist = join(',', $bean->getAttribute('users'));
+    // Note: "Prepare sql query part for user list" is different in getFavWhere because of
+    // special meaning of NULL value (all "active" users).
+    //
+    // If we are merging into one function, one needs to take care of this, perhaps, with redesign.
+
     // Prepare sql query part for user list.
+    $userlist = $options['users'] ? $options['users'] : '-1';
     $user_list_part = null;
-    if ($user->can('view_reports') || $user->isClient())
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and l.user_id in ($userlist)";
     else
       $user_list_part = " and l.user_id = ".$user->id;
 
     // Prepare sql query part for where.
-    if ($bean->getAttribute('period'))
-      $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
-        new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts";
@@ -151,25 +153,22 @@ static function getExpenseWhere($bean, $options) {
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users')))
-      $userlist = join(',', $bean->getAttribute('users'));
     // Prepare sql query part for user list.
+    $userlist = $options['users'] ? $options['users'] : '-1';
     $user_list_part = null;
-    if ($user->can('view_reports') || $user->isClient())
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and ei.user_id in ($userlist)";
     else
       $user_list_part = " and ei.user_id = ".$user->id;
 
     // Prepare sql query part for where.
-    if ($bean->getAttribute('period'))
-      $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
-        new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));
     }
     $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts";
@@ -1909,13 +1908,13 @@ static function getReportOptions($bean) {
     $options['billable'] = $bean->getAttribute('include_records');
     $options['invoice'] = $bean->getAttribute('invoice');
     $options['paid_status'] = $bean->getAttribute('paid_status');
+    if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
+    $options['period'] = $bean->getAttribute('period');
+    $options['period_start'] = $bean->getAttribute('start_date');
+    $options['period_end'] = $bean->getAttribute('end_date');
 
 /*
  * TODO: remaining fields to fill in...
-  `users` text default NULL,                             # Comma-separated list of user ids. Nothing here means "all" users.
-  `period` tinyint(4) default NULL,                      # selected period type for report
-  `period_start` date default NULL,                      # period start
-  `period_end` date default NULL,                        # period end
   `show_client` tinyint(4) NOT NULL default 0,           # whether to show client column
   `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
   `show_paid` tinyint(4) NOT NULL default 0,             # whether to show paid column
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 48c12a76f..33aba4ff5 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.17.93.4291 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.93.4292 | 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>

From 3d9beabc77b40f26d2ae76269d03ca1c379f0bd0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Jul 2018 20:29:50 +0000
Subject: [PATCH 0189/1848] Security fix for reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 22 ++++++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 reports.php                          |  4 ++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 74ddd5828..acf33681d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1936,4 +1936,26 @@ static function getReportOptions($bean) {
      */
     return $options;
   }
+
+  // verifyBean is a security function to make sure data in bean makes sense for a group.
+  static function verifyBean($bean) {
+    global $user;
+
+    // Check users.
+    $users_in_bean = $bean->getAttribute('users');
+    if (is_array($users_in_bean)) {
+      $users_in_group = ttTeamHelper::getUsers();
+      foreach ($users_in_group as $user_in_group) {
+        $valid_ids[] = $user_in_group['id'];
+      }
+      foreach ($users_in_bean as $user_in_bean) {
+        if (!in_array($user_in_bean, $valid_ids)) {
+          return false;
+        }
+      }
+    }
+
+    // TODO: add additional checks here. Perhaps do it before saving the bean for consistency.
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 33aba4ff5..5b3bf4e75 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.17.93.4292 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.94.4293 | 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/reports.php b/reports.php
index 0565cf71d..79c011f98 100644
--- a/reports.php
+++ b/reports.php
@@ -35,6 +35,7 @@
 import('ttProjectHelper');
 import('ttFavReportHelper');
 import('ttClientHelper');
+import('ttReportHelper');
 
 // Access check.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
@@ -334,6 +335,9 @@
     }
 
     $bean->saveBean();
+    // Check some more values. TODO: Perhaps it's not a good place to check values, re-evaluate this.
+    // Also make sure other post variations are sane.
+    if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
 
     if ($err->no()) {
       // Now we can go ahead and create a report.

From 7f94d3c91c405b7c5324b8b07cc8c66fabc40b77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 14:13:15 +0000
Subject: [PATCH 0190/1848] Fixed a bug when reports where still sent with
 disabled Notifications.

---
 WEB-INF/templates/footer.tpl | 2 +-
 cron.php                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5b3bf4e75..028380aa6 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.17.94.4293 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.95.4294 | 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/cron.php b/cron.php
index 50d5d7cfb..94a20ddad 100644
--- a/cron.php
+++ b/cron.php
@@ -65,6 +65,10 @@
   // Recycle global $user object, as user settings are specific for each report.
   $user = new ttUser(null, $options['user_id']);
   if (!$user->id) continue; // Skip not found user.
+
+  // Skip users with disabled Notifications plugin.
+  if (!$user->isPluginEnabled('no')) continue;
+
   // Recycle $i18n object because language is user-specific.
   $i18n->load($user->lang);
 

From eb39786a6d545fab4e795ce42f3cc5504ec69551 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 16:08:21 +0000
Subject: [PATCH 0191/1848] Resumed refactoring of reports.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 028380aa6..5dd885172 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.17.95.4294 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.95.4295 | 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/reports.php b/reports.php
index 79c011f98..a2825329e 100644
--- a/reports.php
+++ b/reports.php
@@ -333,13 +333,11 @@
       if ($start_date->compare($end_date) > 0)
         $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
     }
-
-    $bean->saveBean();
-    // Check some more values. TODO: Perhaps it's not a good place to check values, re-evaluate this.
-    // Also make sure other post variations are sane.
+    // Check remaining values.
     if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
 
     if ($err->no()) {
+      $bean->saveBean();
       // Now we can go ahead and create a report.
       header('Location: report.php');
       exit();

From 09da35919c86360c09fe365fd22c0be34df1c71f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 16:55:24 +0000
Subject: [PATCH 0192/1848] Added group_id field to tt_log and tt_expense_items
 tables.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5dd885172..c0fe9a67d 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.17.95.4295 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.96.4296 | 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/dbinstall.php b/dbinstall.php
index b49824987..51b01ede9 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11792"]) {
+  if ($_POST["convert11744to11796"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -901,6 +901,9 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
     setChange("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'");
+    setChange("ALTER TABLE `tt_log` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    setChange("ALTER TABLE `tt_expense_items` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.96', modified = now() where param_name = 'version_db' and param_value = '1.17.92'");
   }
 
   if ($_POST["cleanup"]) {
@@ -946,7 +949,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.92)</b>
+    <td width="80%"><b>Create database structure (v1.17.96)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -986,8 +989,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.92)</td>
-    <td><input type="submit" name="convert11744to11792" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.96)</td>
+    <td><input type="submit" name="convert11744to11796" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 267d842dc..796176688 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -178,6 +178,7 @@ create index task_idx on tt_project_task_binds(task_id);
 CREATE TABLE `tt_log` (
   `id` bigint NOT NULL auto_increment,             # time record id
   `user_id` int(11) NOT NULL,                      # user id
+  `group_id` int(11) default NULL,                 # group id
   `date` date NOT NULL,                            # date the record is for
   `start` time default NULL,                       # record start time (for example, 09:00)
   `duration` time default NULL,                    # record duration (for example, 1 hour)
@@ -387,6 +388,7 @@ CREATE TABLE `tt_expense_items` (
   `id` bigint NOT NULL auto_increment,    # expense item id
   `date` date NOT NULL,                   # date the record is for
   `user_id` int(11) NOT NULL,             # user id the expense item is reported by
+  `group_id` int(11) default NULL,        # group id
   `client_id` int(11) default NULL,       # client id
   `project_id` int(11) default NULL,      # project id
   `name` text NOT NULL,                   # expense item name (what is an expense for)
@@ -450,4 +452,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.92', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.96', now()); # TODO: change when structure changes.

From d086ba7f82e14dd22cc606a2e9f59870811196ed Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 18:15:05 +0000
Subject: [PATCH 0193/1848] Started to populate group_id on new time entry
 inserts.

---
 WEB-INF/lib/ttTimeHelper.class.php | 11 ++++++-----
 WEB-INF/lib/ttUser.class.php       | 14 +++++++++++++-
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/time.php                    |  1 +
 mobile/timer.php                   |  1 +
 time.php                           |  1 +
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index bfb81cc32..5ad07e18f 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -383,13 +383,14 @@ static function isValidInterval($start, $finish) {
     return false;
   }
 
-  // insert - inserts a time record into log table. Does not deal with custom fields.
+  // insert - inserts a time record into tt_log table. Does not deal with custom fields.
   static function insert($fields)
   {
     global $user;
     $mdb2 = getConnection();
 
     $user_id = $fields['user_id'];
+    $group_id = $fields['group_id'];
     $date = $fields['date'];
     $start = $fields['start'];
     $finish = $fields['finish'];
@@ -422,8 +423,8 @@ static function insert($fields)
     if (!$paid) $paid = 0;
 
     if ($duration) {
-      $sql = "insert into tt_log (user_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+      $sql = "insert into tt_log (user_id, group_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
+        "values ($user_id, ".$mdb2->quote($group_id).", ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -432,8 +433,8 @@ static function insert($fields)
       if ($duration === false) $duration = 0;
       if (!$duration && ttTimeHelper::getUncompleted($user_id)) return false;
 
-      $sql = "insert into tt_log (user_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+      $sql = "insert into tt_log (user_id, group_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
+        "values ($user_id, ".$mdb2->quote($group_id).", ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e498cde0e..65a1f5962 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -38,7 +38,9 @@ class ttUser {
   var $rank = null;             // User role rank.
   var $client_id = null;        // Client id for client user role.
   var $behalf_id = null;        // User id, on behalf of whom we are working.
+  var $behalf_group_id = null;  // Group id, on behalf of which we are working.
   var $behalf_name = null;      // User name, on behalf of whom we are working.
+  var $behalf_group = null;     // Group name, on behalf of which we are working.
   var $email = null;            // User email.
   var $lang = null;             // Language.
   var $decimal_mark = null;     // Decimal separator.
@@ -143,11 +145,16 @@ function __construct($login, $id = null) {
         $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
       }
       
-      // Set "on behalf" id and name.
+      // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
           $this->behalf_id = $_SESSION['behalf_id'];
           $this->behalf_name = $_SESSION['behalf_name'];
       }
+      // Set "on behalf" id and name (group).
+      if (isset($_SESSION['behalf_group_id'])) {
+          $this->behalf_group_id = $_SESSION['behalf_group_id'];
+          $this->behalf_group = $_SESSION['behalf_group'];
+      }
     }
   }
 
@@ -156,6 +163,11 @@ function getActiveUser() {
     return ($this->behalf_id ? $this->behalf_id : $this->id);
   }
 
+  // The getActiveGroup returns group id on behalf of which the current user is operating.
+  function getActiveGroup() {
+    return ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
+  }
+
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c0fe9a67d..e20ac62df 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.17.96.4296 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.96.4297 | 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/time.php b/mobile/time.php
index 2649ff279..76296f64b 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -252,6 +252,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
+        'group_id' => $user->getActiveGroup(),
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/mobile/timer.php b/mobile/timer.php
index e547c256d..09500bd22 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -225,6 +225,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
+        'group_id' => $user->getActiveGroup(),
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time.php b/time.php
index d4caad2b1..98f6bbaf6 100644
--- a/time.php
+++ b/time.php
@@ -293,6 +293,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
+        'group_id' => $user->getActiveGroup(),
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,

From bcfe9680fdb90d26de543b2c43feabefdcac3c20 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 18:50:15 +0000
Subject: [PATCH 0194/1848] More progress on storing group_id on new inserts.

---
 WEB-INF/lib/ttExpenseHelper.class.php  | 5 +++--
 WEB-INF/lib/ttImportHelper.class.php   | 2 ++
 WEB-INF/lib/ttTimeHelper.class.php     | 8 ++++----
 WEB-INF/lib/ttWeekViewHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl           | 2 +-
 expense_edit.php                       | 2 +-
 expenses.php                           | 2 +-
 mobile/expense_edit.php                | 2 +-
 mobile/expenses.php                    | 2 +-
 time_edit.php                          | 1 +
 10 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 8a4b17153..6d3128fd4 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -36,6 +36,7 @@ static function insert($fields)
 
     $date = $fields['date'];
     $user_id = (int) $fields['user_id'];
+    $group_id = (int) $fields['group_id'];
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
     $name = $fields['name'];
@@ -45,8 +46,8 @@ static function insert($fields)
     $paid = (int) $fields['paid'];
     $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
 
-    $sql = "insert into tt_expense_items (date, user_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status) ".
-      "values (".$mdb2->quote($date).", $user_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
+    $sql = "insert into tt_expense_items (date, user_id, group_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status) ".
+      "values (".$mdb2->quote($date).", $user_id, $group_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
       ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 7b68ba7ce..8be7a8310 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -248,6 +248,7 @@ function endElement($parser, $name) {
       $this->logMap[$this->currentElement['ID']] =
         ttTimeHelper::insert(array(
           'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+          'group_id' => $this->group_id,
           'date' => $this->currentElement['DATE'],
           'start' => $this->currentElement['START'],
           'finish' => $this->currentElement['FINISH'],
@@ -292,6 +293,7 @@ function endElement($parser, $name) {
       ttExpenseHelper::insert(array(
         'date' => $this->currentElement['DATE'],
         'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+        'group_id' => $this->group_id,
         'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
         'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
         'name' => $this->currentElement['NAME'],
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 5ad07e18f..e30203540 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -389,8 +389,8 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
-    $user_id = $fields['user_id'];
-    $group_id = $fields['group_id'];
+    $user_id = (int) $fields['user_id'];
+    $group_id = (int) $fields['group_id'];
     $date = $fields['date'];
     $start = $fields['start'];
     $finish = $fields['finish'];
@@ -424,7 +424,7 @@ static function insert($fields)
 
     if ($duration) {
       $sql = "insert into tt_log (user_id, group_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, ".$mdb2->quote($group_id).", ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+        "values ($user_id, $group_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -434,7 +434,7 @@ static function insert($fields)
       if (!$duration && ttTimeHelper::getUncompleted($user_id)) return false;
 
       $sql = "insert into tt_log (user_id, group_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, ".$mdb2->quote($group_id).", ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+        "values ($user_id, $group_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 27a1bbcf5..dcb39af63 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -493,6 +493,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     // Prepare an array of fields for regular insert function.
     $fields4insert = array();
     $fields4insert['user_id'] = $user->getActiveUser();
+    $fields4insert['group_id'] = $user->getActiveGroup();
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
     $fields4insert['client'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e20ac62df..df6d91d31 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.17.96.4297 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.96.4298 | 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/expense_edit.php b/expense_edit.php
index 26cf3bba1..353f5ce53 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -205,7 +205,7 @@
 
     // Now, a new insert.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),
+      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
         'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
diff --git a/expenses.php b/expenses.php
index 7d7295d29..fa45ad444 100644
--- a/expenses.php
+++ b/expenses.php
@@ -188,7 +188,7 @@
 
     // Insert record.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(),
+      if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
         'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php');
         exit();
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index f560f5574..338e6c778 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -200,7 +200,7 @@
 
     // Now, a new insert.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),
+      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
         'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
diff --git a/mobile/expenses.php b/mobile/expenses.php
index c853a2cae..25a1c6025 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -192,7 +192,7 @@
 
     // Insert record.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(),
+      if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
         'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php');
         exit();
diff --git a/time_edit.php b/time_edit.php
index fd1851dc3..5f4068829 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -365,6 +365,7 @@
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
         'user_id'=>$user->getActiveUser(),
+        'group_id'=>$user->getActiveGroup(),
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,

From d23d7bcb0be0840de0aa847c75e1673dba9302a8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 20:58:10 +0000
Subject: [PATCH 0195/1848] Wrote code to update group_id in 2 tables.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 49 +++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index df6d91d31..a261f3e71 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.17.96.4298 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.96.4299 | 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/dbinstall.php b/dbinstall.php
index 51b01ede9..09c8d02e3 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -906,6 +906,53 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.96', modified = now() where param_name = 'version_db' and param_value = '1.17.92'");
   }
 
+  // The update_group_id function updates group_id field in tt_log and tt_expense_items tables.
+  if ($_POST["update_group_id"]) {
+    $mdb2 = getConnection();
+
+    $sql = "(select distinct user_id from tt_log where group_id is null) union distinct (select distinct user_id from tt_expense_items where group_id is null)";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) {
+      die($res->getMessage());
+    }
+    $users_updated = 0;
+    $tt_log_records_updated = 0;
+    $tt_expense_items_updated = 0;
+
+    // Iterate through result set.
+    while ($val = $res->fetchRow()) {
+      $user_id = $val['user_id'];
+      $sql = "select group_id from tt_users where id = $user_id";
+      $result = $mdb2->query($sql);
+      if (is_a($result, 'PEAR_Error')) {
+        die($res->getMessage());
+      }
+      $value = $result->fetchRow();
+      $group_id = $value['group_id'];
+
+      if ($group_id) {
+        $sql = "update tt_log set group_id = $group_id where user_id = $user_id";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error')) {
+          die($affected->getMessage());
+        }
+        $tt_log_records_updated += $affected;
+
+        $sql = "update tt_expense_items set group_id = $group_id where user_id = $user_id";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error')) {
+          die($affected->getMessage());
+        }
+        $tt_expense_items_updated += $affected;
+        $users_updated++;
+      } else {
+         print "Error: Could not find group for user $user_id...<br>\n";
+      }
+    }
+    print "Updated $tt_log_records_updated tt_log records...<br>\n";
+    print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
+  }
+
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
@@ -990,7 +1037,7 @@ function setChange($sql) {
   </tr>
     <tr valign="top">
     <td>Update database structure (v1.17.44 to v1.17.96)</td>
-    <td><input type="submit" name="convert11744to11796" value="Update"></td>
+    <td><input type="submit" name="convert11744to11796" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
   </tr>
 </table>
 

From 1c55e1b9d6da2173f7e946011908c02dd80df26d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Jul 2018 21:48:56 +0000
Subject: [PATCH 0196/1848] Added group_id to getWhere parts as additional
 protection.

---
 WEB-INF/lib/ttReportHelper.class.php | 18 +++++++++---------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index acf33681d..d46e783f7 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -64,11 +64,11 @@ static function getWhere($bean, $options) {
 
     // Prepare sql query part for user list.
     $userlist = $options['users'] ? $options['users'] : '-1';
-    $user_list_part = null;
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and l.user_id in ($userlist)";
     else
       $user_list_part = " and l.user_id = ".$user->id;
+    $user_list_part .= " and l.group_id = ".$user->getActiveGroup();
 
     // Prepare sql query part for where.
     if ($options['period'])
@@ -106,22 +106,22 @@ static function getFavWhere($options) {
 
     // Prepare user list part.
     $userlist = -1;
-    if (($user->can('view_reports') || $user->isClient())) {
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
       if ($options['users'])
         $userlist = $options['users'];
       else {
-        $active_users = ttTeamHelper::getActiveUsers();
-        foreach ($active_users as $single_user)
+        $group_users = ttTeamHelper::getUsers(); // active and inactive users
+        foreach ($group_users as $single_user)
           $users[] = $single_user['id'];
         $userlist = join(',', $users);
       }
     }
     // Prepare sql query part for user list.
-    $user_list_part = null;
-    if ($user->can('view_reports') || $user->isClient())
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and l.user_id in ($userlist)";
     else
       $user_list_part = " and l.user_id = ".$user->id;
+    $user_list_part .= " and l.group_id = ".$user->getActiveGroup();
 
     // Prepare sql query part for where.
     if ($options['period'])
@@ -155,11 +155,11 @@ static function getExpenseWhere($bean, $options) {
 
     // Prepare sql query part for user list.
     $userlist = $options['users'] ? $options['users'] : '-1';
-    $user_list_part = null;
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and ei.user_id in ($userlist)";
     else
       $user_list_part = " and ei.user_id = ".$user->id;
+    $user_list_part .= " and ei.group_id = ".$user->getActiveGroup();
 
     // Prepare sql query part for where.
     if ($options['period'])
@@ -204,11 +204,11 @@ static function getFavExpenseWhere($options) {
       }
     }
     // Prepare sql query part for user list.
-    $user_list_part = null;
-    if ($user->can('view_reports') || $user->isClient())
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and ei.user_id in ($userlist)";
     else
       $user_list_part = " and ei.user_id = ".$user->id;
+    $user_list_part .= " and ei.group_id = ".$user->getActiveGroup();
 
     // Prepare sql query part for where.
     if ($options['period'])
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a261f3e71..d36605b65 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.17.96.4299 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.96.4300 | 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>

From 0d76b58c818306b35261dd21fd998b9f5fb0a903 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 29 Jul 2018 16:53:01 +0000
Subject: [PATCH 0197/1848] Added indexes on group_id to speed up searches by
 group_id.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d36605b65..88eb10ac8 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.17.96.4300 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4301 | 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/dbinstall.php b/dbinstall.php
index 09c8d02e3..5144d1962 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -805,7 +805,7 @@ function setChange($sql) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11796"]) {
+  if ($_POST["convert11744to11797"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -904,6 +904,9 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_log` ADD `group_id` int(11) default NULL AFTER `user_id`");
     setChange("ALTER TABLE `tt_expense_items` ADD `group_id` int(11) default NULL AFTER `user_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.96', modified = now() where param_name = 'version_db' and param_value = '1.17.92'");
+    setChange("create index group_idx on tt_log(group_id)");
+    setChange("create index group_idx on tt_expense_items(group_id)");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.97', modified = now() where param_name = 'version_db' and param_value = '1.17.96'");
   }
 
   // The update_group_id function updates group_id field in tt_log and tt_expense_items tables.
@@ -996,7 +999,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.96)</b>
+    <td width="80%"><b>Create database structure (v1.17.97)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1036,8 +1039,8 @@ function setChange($sql) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.96)</td>
-    <td><input type="submit" name="convert11744to11796" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
+    <td>Update database structure (v1.17.44 to v1.17.97)</td>
+    <td><input type="submit" name="convert11744to11797" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 796176688..62c1d7c48 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -202,6 +202,7 @@ CREATE TABLE `tt_log` (
 # Create indexes on tt_log for performance.
 create index date_idx on tt_log(date);
 create index user_idx on tt_log(user_id);
+create index group_idx on tt_log(group_id);
 create index client_idx on tt_log(client_id);
 create index invoice_idx on tt_log(invoice_id);
 create index project_idx on tt_log(project_id);
@@ -408,6 +409,7 @@ CREATE TABLE `tt_expense_items` (
 # Create indexes on tt_expense_items for performance.
 create index date_idx on tt_expense_items(date);
 create index user_idx on tt_expense_items(user_id);
+create index group_idx on tt_expense_items(group_id);
 create index client_idx on tt_expense_items(client_id);
 create index project_idx on tt_expense_items(project_id);
 create index invoice_idx on tt_expense_items(invoice_id);
@@ -452,4 +454,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.96', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.97', now()); # TODO: change when structure changes.

From 92300e99d757a271d46126193a8cb1f133447294 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 29 Jul 2018 17:42:28 +0000
Subject: [PATCH 0198/1848] Optimized determining inactive groups.

---
 WEB-INF/lib/ttTeamHelper.class.php | 20 ++++----------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 631d21202..eafc9167c 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -664,9 +664,8 @@ static function getInactiveGroups() {
     $inactive_groups = array();
     $mdb2 = getConnection();
 
-    // Get all group ids for groups created or modified more than 9 months ago.
-    // $ts = date('Y-m-d', strtotime('-1 year'));
-    $ts = $mdb2->quote(date('Y-m-d', strtotime('-9 month')));
+    // Get all group ids for groups created or modified more than 1 year ago.
+    $ts = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql =  "select id from tt_groups where created < $ts and (modified is null or modified < $ts) order by id";
     $res = $mdb2->query($sql);
 
@@ -688,22 +687,11 @@ static function getInactiveGroups() {
 
   // The isGroupActive determines if a group is using Time Tracker or abandoned it.
   static function isGroupActive($group_id) {
-    $users = array();
-
     $mdb2 = getConnection();
-    $sql = "select id from tt_users where group_id = $group_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
-    while ($val = $res->fetchRow()) {
-      $users[] = $val['id'];
-    }
-    $user_list = implode(',', $users); // This is a comma-separated list of user ids.
-    if (!$user_list)
-      return false; // No users in group.
 
     $count = 0;
     $ts = date('Y-m-d', strtotime('-2 years'));
-    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$ts'";
+    $sql = "select count(*) as cnt from tt_log where group_id = $group_id and created > '$ts'";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow()) {
@@ -718,7 +706,7 @@ static function isGroupActive($group_id) {
       // We will consider a group inactive if it has 5 or less time entries made more than 1 year ago.
       $count_last_year = 0;
       $ts = date('Y-m-d', strtotime('-1 year'));
-      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$ts'";
+      $sql = "select count(*) as cnt from tt_log where group_id = $group_id and created > '$ts'";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         if ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 88eb10ac8..c8f66d4f0 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.17.97.4301 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4302 | 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>

From 22f23eb8f2f79853e18a4e4e5ded5c4db66cc5f8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 29 Jul 2018 23:30:38 +0000
Subject: [PATCH 0199/1848] Merged getWhere and getFavWhere into one function.

---
 WEB-INF/lib/ttFavReportHelper.class.php |  36 ++-----
 WEB-INF/lib/ttReportHelper.class.php    | 138 +++---------------------
 WEB-INF/templates/footer.tpl            |   2 +-
 cron.php                                |  23 ++++
 4 files changed, 45 insertions(+), 154 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 88a1338d6..0a21f7c94 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -170,24 +170,9 @@ static function saveReport($user_id, $bean) {
     if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0);
     if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
 
-    if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) {
-      $users_in_bean = $bean->getAttribute('users');
-
-      // If all users are selected - use a null value (which means "all users").
-      $all_users_selected = true;
-      if ($user->can('view_reports')) {
-        $all = ttTeamHelper::getActiveUsers();
-        foreach ($all as $one) {
-          if (!in_array($one['id'], $users_in_bean)) {
-            $all_users_selected = false;
-            break;
-          }
-        }
-      }
-      if ($all_users_selected)
-        $users = null;
-      else
-        $users = join(',', $users_in_bean);
+    $users_in_bean = $bean->getAttribute('users');
+    if ($users_in_bean && is_array($users_in_bean)) {
+      $users = join(',', $users_in_bean);
     }
     if ($bean->getAttribute('start_date')) {
       $dt = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
@@ -262,18 +247,7 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttribute('include_records', $val['billable']);
       $bean->setAttribute('invoice', $val['invoice']);
       $bean->setAttribute('paid_status', $val['paid_status']);
-      if ($val['users'])
-        $bean->setAttribute('users', explode(',', $val['users']));
-      else {
-        // Null users value means "all users". Add them to the bean.
-        if ($user->can('view_reports')) {
-          $all = ttTeamHelper::getActiveUsers();
-          foreach ($all as $one) {
-            $all_user_ids[] = $one['id'];
-          }
-          $bean->setAttribute('users', $all_user_ids);
-        }
-      }
+      $bean->setAttribute('users', explode(',', $val['users']));
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);
@@ -346,6 +320,8 @@ static function getReportOptions($id) {
     unset($options['report_spec']); // Currently not used.
     unset($options['status']);
 
+    // Note: special handling for NULL users field is done in cron.php
+
     // $options now is a subset of db fields from tt_fav_reports table.
     return $options;
   }
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d46e783f7..d76b027ad 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -37,8 +37,7 @@
 class ttReportHelper {
 
   // getWhere prepares a WHERE clause for a report query.
-  // Note: $options is a future replacement of $bean, which is work in progress.
-  static function getWhere($bean, $options) {
+  static function getWhere($options) {
     global $user;
 
     // Prepare dropdown parts.
@@ -57,11 +56,6 @@ static function getWhere($bean, $options) {
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
-    // Note: "Prepare sql query part for user list" is different in getFavWhere because of
-    // special meaning of NULL value (all "active" users).
-    //
-    // If we are merging into one function, one needs to take care of this, perhaps, with redesign.
-
     // Prepare sql query part for user list.
     $userlist = $options['users'] ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
@@ -84,99 +78,8 @@ static function getWhere($bean, $options) {
     return $where;
   }
 
-  // getFavWhere prepares a WHERE clause for a favorite report query.
-  static function getFavWhere($options) {
-    global $user;
-
-    // Prepare dropdown parts.
-    $dropdown_parts = '';
-    if ($options['client_id'])
-      $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
-    elseif ($user->isClient() && $user->client_id)
-      $dropdown_parts .= ' and l.client_id = '.$user->client_id;
-    if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')';
-    if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
-    if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
-    if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
-    if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
-    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
-    if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
-    if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
-
-    // Prepare user list part.
-    $userlist = -1;
-    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
-      if ($options['users'])
-        $userlist = $options['users'];
-      else {
-        $group_users = ttTeamHelper::getUsers(); // active and inactive users
-        foreach ($group_users as $single_user)
-          $users[] = $single_user['id'];
-        $userlist = join(',', $users);
-      }
-    }
-    // Prepare sql query part for user list.
-    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
-      $user_list_part = " and l.user_id in ($userlist)";
-    else
-      $user_list_part = " and l.user_id = ".$user->id;
-    $user_list_part .= " and l.group_id = ".$user->getActiveGroup();
-
-    // Prepare sql query part for where.
-    if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($user->date_format));
-    else {
-      $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($user->date_format, $options['period_start']),
-        new DateAndTime($user->date_format, $options['period_end']));
-    }
-    $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
-      " $user_list_part $dropdown_parts";
-    return $where;
-  }
-
   // getExpenseWhere prepares WHERE clause for expenses query in a report.
-  static function getExpenseWhere($bean, $options) {
-    global $user;
-
-    // Prepare dropdown parts.
-    $dropdown_parts = '';
-    if ($options['client_id'])
-      $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
-    elseif ($user->isClient() && $user->client_id)
-      $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
-    if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
-    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
-    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
-    if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
-    if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
-
-    // Prepare sql query part for user list.
-    $userlist = $options['users'] ? $options['users'] : '-1';
-    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
-      $user_list_part = " and ei.user_id in ($userlist)";
-    else
-      $user_list_part = " and ei.user_id = ".$user->id;
-    $user_list_part .= " and ei.group_id = ".$user->getActiveGroup();
-
-    // Prepare sql query part for where.
-    if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($user->date_format));
-    else {
-      $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($user->date_format, $options['period_start']),
-        new DateAndTime($user->date_format, $options['period_end']));
-    }
-    $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
-      " $user_list_part $dropdown_parts";
-    return $where;
-  }
-
-  // getFavExpenseWhere prepares a WHERE clause for expenses query in a favorite report.
-  static function getFavExpenseWhere($options) {
+  static function getExpenseWhere($options) {
     global $user;
 
     // Prepare dropdown parts.
@@ -191,19 +94,8 @@ static function getFavExpenseWhere($options) {
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->can('view_reports') || $user->isClient())) {
-      if ($options['users'])
-        $userlist = $options['users'];
-      else {
-      	$active_users = ttTeamHelper::getActiveUsers();
-        foreach ($active_users as $single_user)
-          $users[] = $single_user['id'];
-        $userlist = join(',', $users);
-      }
-    }
     // Prepare sql query part for user list.
+    $userlist = $options['users'] ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and ei.user_id in ($userlist)";
     else
@@ -333,7 +225,7 @@ static function getItems($bean, $options) {
     if ($includeCost && MODE_TIME != $user->tracking_mode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
 
-    $where = ttReportHelper::getWhere($bean, $options);
+    $where = ttReportHelper::getWhere($options);
 
     // Construct sql query for tt_log items.
     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
@@ -401,7 +293,7 @@ static function getItems($bean, $options) {
       if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
-      $where = ttReportHelper::getExpenseWhere($bean, $options);
+      $where = ttReportHelper::getExpenseWhere($options);
 
       // Construct sql query for expense items.
       $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
@@ -608,7 +500,7 @@ static function getFavItems($options) {
     if ($includeCost && MODE_TIME != $user->tracking_mode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
 
-    $where = ttReportHelper::getFavWhere($options);
+    $where = ttReportHelper::getWhere($options);
 
     // Construct sql query for tt_log items.
     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
@@ -674,7 +566,7 @@ static function getFavItems($options) {
       if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
-      $where = ttReportHelper::getFavExpenseWhere($options);
+      $where = ttReportHelper::getExpenseWhere($options);
 
       // Construct sql query for expense items.
       $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
@@ -784,7 +676,7 @@ static function getSubtotals($bean, $options) {
         break;
     }
 
-    $where = ttReportHelper::getWhere($bean, $options);
+    $where = ttReportHelper::getWhere($options);
     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
@@ -851,7 +743,7 @@ static function getSubtotals($bean, $options) {
           break;
       }
 
-      $where = ttReportHelper::getExpenseWhere($bean, $options);
+      $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select $group_field as group_field, null as time";
       if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
@@ -935,7 +827,7 @@ static function getFavSubtotals($options) {
         break;
     }
 
-    $where = ttReportHelper::getFavWhere($options);
+    $where = ttReportHelper::getWhere($options);
     if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
@@ -1003,7 +895,7 @@ static function getFavSubtotals($options) {
           break;
       }
 
-      $where = ttReportHelper::getFavExpenseWhere($options);
+      $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select $group_field as group_field, null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
@@ -1049,7 +941,7 @@ static function getTotals($bean, $options)
 
     $mdb2 = getConnection();
 
-    $where = ttReportHelper::getWhere($bean, $options);
+    $where = ttReportHelper::getWhere($options);
 
     // Prepare parts.
     $time_part = "sum(time_to_sec(l.duration)) as time";
@@ -1076,7 +968,7 @@ static function getTotals($bean, $options)
 
     // If we have expenses, query becomes a bit more complex.
     if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) {
-      $where = ttReportHelper::getExpenseWhere($bean, $options);
+      $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
       if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
@@ -1131,7 +1023,7 @@ static function getFavTotals($options)
 
     $mdb2 = getConnection();
 
-    $where = ttReportHelper::getFavWhere($options);
+    $where = ttReportHelper::getWhere($options);
 
     // Prepare parts.
     $time_part = "sum(time_to_sec(l.duration)) as time";
@@ -1158,7 +1050,7 @@ static function getFavTotals($options)
 
     // If we have expenses, query becomes a bit more complex.
     if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
-      $where = ttReportHelper::getFavExpenseWhere($options);
+      $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c8f66d4f0..fc683d0cc 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.17.97.4302 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4303 | 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/cron.php b/cron.php
index 94a20ddad..473f27eff 100644
--- a/cron.php
+++ b/cron.php
@@ -66,6 +66,29 @@
   $user = new ttUser(null, $options['user_id']);
   if (!$user->id) continue; // Skip not found user.
 
+  // Special handling of the NULL $options['users'] field (this used to mean "all users").
+  if (!$options['users']) {
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
+      if ($user->can('view_reports') || $user->can('view_all_reports')) {
+        $max_rank = $user->rank-1;
+        if ($user->can('view_all_reports')) $max_rank = 512;
+        if ($user->can('view_own_reports'))
+          $user_options = array('max_rank'=>$max_rank,'include_self'=>true);
+        else
+          $user_options = array('max_rank'=>$max_rank);
+        $users = $user->getUsers($user_options); // Active and inactive users.
+      } elseif ($user->isClient()) {
+        $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+      }
+      foreach ($users as $single_user) {
+        $user_ids[] = $single_user['id'];
+      }
+      $options['users'] = implode(',', $user_ids);
+    }
+  } else {
+    // TODO: add checking the existing user list for potentially changed access rights for user.
+  }
+
   // Skip users with disabled Notifications plugin.
   if (!$user->isPluginEnabled('no')) continue;
 

From 5970acff895c6773c700d7e218ad4a932040789d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 31 Jul 2018 23:11:54 +0000
Subject: [PATCH 0200/1848] Some more work on refactoring reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 20 ++++++++++++++++----
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d76b027ad..be472df0e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -127,8 +127,8 @@ static function getItems($bean, $options) {
     $canViewReports = $user->can('view_reports');
     $isClient = $user->isClient();
 
-    $group_by_option = $bean->getAttribute('group_by');
-    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish'));
+    $group_by_option = $options['group_by'];
+    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
 
     // Prepare a query for time items in tt_log table.
     $fields = array(); // An array of fields for database query.
@@ -138,9 +138,11 @@ static function getItems($bean, $options) {
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
-    if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)
       array_push($fields, 'c.name as client');
     // Add project name if it is selected.
+
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
       array_push($fields, 'p.name as project');
     // Add task name if it is selected.
@@ -1804,23 +1806,33 @@ static function getReportOptions($bean) {
     $options['period'] = $bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
+    $options['show_client'] = $bean->getAttribute('chclient');
 
 /*
  * TODO: remaining fields to fill in...
-  `show_client` tinyint(4) NOT NULL default 0,           # whether to show client column
   `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
   `show_paid` tinyint(4) NOT NULL default 0,             # whether to show paid column
   `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
   `show_project` tinyint(4) NOT NULL default 0,          # whether to show project column
+ */
+    $options['show_start'] = $bean->getAttribute('chstart');
+/*
   `show_start` tinyint(4) NOT NULL default 0,            # whether to show start field
   `show_duration` tinyint(4) NOT NULL default 0,         # whether to show duration field
   `show_cost` tinyint(4) NOT NULL default 0,             # whether to show cost field
   `show_task` tinyint(4) NOT NULL default 0,             # whether to show task column
+ */
+    $options['show_end'] = $bean->getAttribute('chfinish');
+    /*
   `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
   `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
   `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
   `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
+ **/
+  $options['group_by'] = $bean->getAttribute('group_by');
+/*
+ * TODO: remaining fields to fill in...
   `group_by` varchar(20) default NULL,                   # group by field
   `status` tinyint(4) default 1,                         # favorite report status
   PRIMARY KEY (`id`)
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fc683d0cc..90e9c5a95 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.17.97.4303 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4304 | 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>

From 9e5dbe1bb51fef6af2a8e3a1dc0160086d723cfb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 31 Jul 2018 23:25:50 +0000
Subject: [PATCH 0201/1848] More refactoring in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 24 ++++++++++++------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index be472df0e..1b1adf90e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -141,15 +141,13 @@ static function getItems($bean, $options) {
     if ($options['show_client'] || 'client' == $group_by_option)
       array_push($fields, 'c.name as client');
     // Add project name if it is selected.
-
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
-    if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+    if ($options['show_project'] || 'project' == $group_by_option)
       array_push($fields, 'p.name as project');
     // Add task name if it is selected.
-    if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
+    if ($options['show_task'] || 'task' == $group_by_option)
       array_push($fields, 't.name as task');
     // Add custom field.
-    $include_cf_1 = $bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option;
+    $include_cf_1 = $options['show_custom_field_1'] || 'cf_1' == $group_by_option;
     if ($include_cf_1) {
       $custom_fields = new CustomFields($user->group_id);
       $cf_1_type = $custom_fields->fields[0]['type'];
@@ -159,6 +157,8 @@ static function getItems($bean, $options) {
         array_push($fields, 'cfo.value as cf_1');
       }
     }
+
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add start time.
     if ($bean->getAttribute('chstart')) {
       array_push($fields, "l.start as unformatted_start");
@@ -1813,27 +1813,27 @@ static function getReportOptions($bean) {
   `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
   `show_paid` tinyint(4) NOT NULL default 0,             # whether to show paid column
   `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
-  `show_project` tinyint(4) NOT NULL default 0,          # whether to show project column
  */
+    $options['show_project'] = $bean->getAttribute('chproject');
     $options['show_start'] = $bean->getAttribute('chstart');
 /*
-  `show_start` tinyint(4) NOT NULL default 0,            # whether to show start field
   `show_duration` tinyint(4) NOT NULL default 0,         # whether to show duration field
   `show_cost` tinyint(4) NOT NULL default 0,             # whether to show cost field
-  `show_task` tinyint(4) NOT NULL default 0,             # whether to show task column
  */
+    $options['show_task'] = $bean->getAttribute('chtask');
     $options['show_end'] = $bean->getAttribute('chfinish');
-    /*
-  `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
+/*
   `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
   `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
+ */
+    $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
+ /*
   `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
  **/
-  $options['group_by'] = $bean->getAttribute('group_by');
+    $options['group_by'] = $bean->getAttribute('group_by');
 /*
  * TODO: remaining fields to fill in...
-  `group_by` varchar(20) default NULL,                   # group by field
   `status` tinyint(4) default 1,                         # favorite report status
   PRIMARY KEY (`id`)
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90e9c5a95..4711f9317 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.17.97.4304 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4305 | 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>

From 47676f16efdde0b36a4ed09d2ab0476584aeb2a6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 31 Jul 2018 23:32:49 +0000
Subject: [PATCH 0202/1848] A little bit more refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 12 ++++++------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1b1adf90e..42463d08a 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -157,19 +157,19 @@ static function getItems($bean, $options) {
         array_push($fields, 'cfo.value as cf_1');
       }
     }
-
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add start time.
-    if ($bean->getAttribute('chstart')) {
+    if ($options['show_start']) {
       array_push($fields, "l.start as unformatted_start");
       array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start");
     }
     // Add finish time.
-    if ($bean->getAttribute('chfinish'))
+    if ($options['show_end'])
       array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish");
     // Add duration.
-    if ($bean->getAttribute('chduration'))
+    if ($options['show_duration'])
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
+
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add work units.
     if ($bean->getAttribute('chunits')) {
       if ($user->unit_totals_only)
@@ -1816,8 +1816,8 @@ static function getReportOptions($bean) {
  */
     $options['show_project'] = $bean->getAttribute('chproject');
     $options['show_start'] = $bean->getAttribute('chstart');
+    $options['show_duration'] = $bean->getAttribute('chduration');
 /*
-  `show_duration` tinyint(4) NOT NULL default 0,         # whether to show duration field
   `show_cost` tinyint(4) NOT NULL default 0,             # whether to show cost field
  */
     $options['show_task'] = $bean->getAttribute('chtask');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4711f9317..bcbfab0ee 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.17.97.4305 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4306 | 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>

From 7b3aad0973b1e581f32539cf96380f57e9f829ae Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 31 Jul 2018 23:54:08 +0000
Subject: [PATCH 0203/1848] More refactoring in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 38 +++++++++++++---------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 42463d08a..71fcb08f7 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -168,20 +168,18 @@ static function getItems($bean, $options) {
     // Add duration.
     if ($options['show_duration'])
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
-
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add work units.
-    if ($bean->getAttribute('chunits')) {
+    if ($options['show_work_units']) {
       if ($user->unit_totals_only)
         array_push($fields, "null as units");
       else
-       array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+        array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
     }
     // Add note.
-    if ($bean->getAttribute('chnote'))
+    if ($options['show_note'])
       array_push($fields, 'l.comment as note');
     // Handle cost.
-    $includeCost = $bean->getAttribute('chcost');
+    $includeCost = $options['show_cost'];
     if ($includeCost) {
       if (MODE_TIME == $user->tracking_mode)
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
@@ -190,8 +188,10 @@ static function getItems($bean, $options) {
       array_push($fields, "null as expense"); 
     }
     // Add paid status.
-    if ($canViewReports && $bean->getAttribute('chpaid'))
+    if ($canViewReports && $options['show_paid'])
       array_push($fields, 'l.paid as paid');
+
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add IP address.
     if ($canViewReports && $bean->getAttribute('chip')) {
       array_push($fields, 'l.created as created');
@@ -452,7 +452,6 @@ static function getFavItems($options) {
       else
         array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
     }
-
     // Add note.
     if ($options['show_note'])
       array_push($fields, 'l.comment as note');
@@ -1811,33 +1810,30 @@ static function getReportOptions($bean) {
 /*
  * TODO: remaining fields to fill in...
   `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
-  `show_paid` tinyint(4) NOT NULL default 0,             # whether to show paid column
+*/
+    $options['show_paid'] = $bean->getAttribute('chpaid');
+/*
   `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
- */
+*/
     $options['show_project'] = $bean->getAttribute('chproject');
     $options['show_start'] = $bean->getAttribute('chstart');
     $options['show_duration'] = $bean->getAttribute('chduration');
-/*
-  `show_cost` tinyint(4) NOT NULL default 0,             # whether to show cost field
- */
+    $options['show_cost'] = $bean->getAttribute('chcost');
     $options['show_task'] = $bean->getAttribute('chtask');
     $options['show_end'] = $bean->getAttribute('chfinish');
-/*
-  `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
-  `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
- */
+    $options['show_note'] = $bean->getAttribute('chnote');
     $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
- /*
-  `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
+    $options['show_work_units'] = $bean->getAttribute('chunits');
+/*
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
- **/
+*/
     $options['group_by'] = $bean->getAttribute('group_by');
 /*
  * TODO: remaining fields to fill in...
   `status` tinyint(4) default 1,                         # favorite report status
   PRIMARY KEY (`id`)
 );
-     */
+*/
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bcbfab0ee..14d389b67 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.17.97.4306 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4307 | 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>

From 0092d0f0e70b66795f5ab0fcff4bfcef89842f3d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 1 Aug 2018 00:06:10 +0000
Subject: [PATCH 0204/1848] A bit more refactoring...

---
 WEB-INF/lib/ttReportHelper.class.php | 27 ++++++++++-----------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 71fcb08f7..612180a94 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -190,31 +190,28 @@ static function getItems($bean, $options) {
     // Add paid status.
     if ($canViewReports && $options['show_paid'])
       array_push($fields, 'l.paid as paid');
-
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add IP address.
-    if ($canViewReports && $bean->getAttribute('chip')) {
+    if ($canViewReports && $options['show_ip']) {
       array_push($fields, 'l.created as created');
       array_push($fields, 'l.created_ip as created_ip');
       array_push($fields, 'l.modified as modified');
       array_push($fields, 'l.modified_ip as modified_ip');
     }
-
     // Add invoice name if it is selected.
-    if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+    if (($canViewReports || $isClient) && $options['show_invoice'])
       array_push($fields, 'i.name as invoice');
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-    if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
-    if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+    if (($canViewReports || $isClient) && $options['show_invoice'])
       $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
     if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))
        $left_joins .= " left join tt_users u on (u.id = l.user_id)";
-    if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+    if ($options['show_project'] || 'project' == $group_by_option)
       $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
-    if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
+    if ($options['show_task'] || 'task' == $group_by_option)
       $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
     if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
@@ -234,6 +231,8 @@ static function getItems($bean, $options) {
     // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
+
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
@@ -1806,15 +1805,9 @@ static function getReportOptions($bean) {
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
     $options['show_client'] = $bean->getAttribute('chclient');
-
-/*
- * TODO: remaining fields to fill in...
-  `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
-*/
+    $options['show_invoice'] = $bean->getAttribute('chinvoice');
     $options['show_paid'] = $bean->getAttribute('chpaid');
-/*
-  `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
-*/
+    $options['show_ip'] = $bean->getAttribute('chip');
     $options['show_project'] = $bean->getAttribute('chproject');
     $options['show_start'] = $bean->getAttribute('chstart');
     $options['show_duration'] = $bean->getAttribute('chduration');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 14d389b67..f620d8508 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.17.97.4307 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4308 | 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>

From 520f98abdb50f3ec9d0c0b27c7502b1c2a84034a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 1 Aug 2018 00:17:18 +0000
Subject: [PATCH 0205/1848] Some more refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 31 +++++++++++++---------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 612180a94..bc60fb804 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -231,10 +231,8 @@ static function getItems($bean, $options) {
     // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
-
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
       $fields = array(); // An array of fields for database query.
       array_push($fields, 'ei.id');
@@ -243,46 +241,45 @@ static function getItems($bean, $options) {
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
       // Add client name if it is selected.
-      if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+      if ($options['show_client'] || 'client' == $group_by_option)
         array_push($fields, 'c.name as client');
       // Add project name if it is selected.
-      if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+      if ($options['show_project'] || 'project' == $group_by_option)
         array_push($fields, 'p.name as project');
-      if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
+      if ($options['show_task'] || 'task' == $group_by_option)
         array_push($fields, 'null'); // null for task name. We need to match column count for union.
-      if ($bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option)
+      if ($options['show_custom_field_1'] || 'cf_1' == $group_by_option)
         array_push($fields, 'null'); // null for cf_1.
-      if ($bean->getAttribute('chstart')) {
+      if ($options['show_start']) {
         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
       }
-      if ($bean->getAttribute('chfinish'))
+      if ($options['show_end'])
         array_push($fields, 'null'); // null for finish.
-      if ($bean->getAttribute('chduration'))
+      if ($options['show_duration'])
         array_push($fields, 'null'); // null for duration.
-      // Add work units.
-      if ($bean->getAttribute('chunits'))
+      if ($options['show_work_units'])
         array_push($fields, 'null as units'); // null for work units.
       // Use the note field to print item name.
-      if ($bean->getAttribute('chnote'))
+      if ($options['show_note'])
         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
       // Add paid status.
-      if ($canViewReports && $bean->getAttribute('chpaid'))
+      if ($canViewReports && $options['show_paid'])
         array_push($fields, 'ei.paid as paid');
       // Add IP address.
-      if ($canViewReports && $bean->getAttribute('chip')) {
+      if ($canViewReports && $options['show_ip']) {
         array_push($fields, 'ei.created as created');
         array_push($fields, 'ei.created_ip as created_ip');
         array_push($fields, 'ei.modified as modified');
         array_push($fields, 'ei.modified_ip as modified_ip');
       }
-
       // Add invoice name if it is selected.
-      if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+      if (($canViewReports || $isClient) && $options['show_invoice'])
         array_push($fields, 'i.name as invoice');
 
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
       // Prepare sql query part for left joins.
       $left_joins = null;
       if ($canViewReports || $isClient)
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f620d8508..833f43748 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.17.97.4308 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4309 | 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>

From e4ddcc8ecb86ac997048d648ed82402eff2cbb4a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 1 Aug 2018 00:36:03 +0000
Subject: [PATCH 0206/1848] More refactoring in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 20 +++++++-------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index bc60fb804..a3b0b0d80 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -279,16 +279,15 @@ static function getItems($bean, $options) {
       if (($canViewReports || $isClient) && $options['show_invoice'])
         array_push($fields, 'i.name as invoice');
 
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
       // Prepare sql query part for left joins.
       $left_joins = null;
       if ($canViewReports || $isClient)
         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
-      if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+      if ($options['show_client'] || 'client' == $group_by_option)
         $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
-      if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+      if ($options['show_project'] || 'project' == $group_by_option)
         $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
-      if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+      if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
       $where = ttReportHelper::getExpenseWhere($options);
@@ -300,6 +299,9 @@ static function getItems($bean, $options) {
       $sql = "($sql) union all ($sql_for_expense_items)";
     }
 
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
+// Note: this sort part below is different in getFavItems. Need to figure out why and fix properly.
+
     // Determine sort part.
     $sort_part = ' order by ';
     if ('no_grouping' == $group_by_option || 'date' == $group_by_option)
@@ -1814,16 +1816,8 @@ static function getReportOptions($bean) {
     $options['show_note'] = $bean->getAttribute('chnote');
     $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
     $options['show_work_units'] = $bean->getAttribute('chunits');
-/*
-  `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
-*/
+    $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
     $options['group_by'] = $bean->getAttribute('group_by');
-/*
- * TODO: remaining fields to fill in...
-  `status` tinyint(4) default 1,                         # favorite report status
-  PRIMARY KEY (`id`)
-);
-*/
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 833f43748..56a708306 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.17.97.4309 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4310 | 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>

From 69f1f97814697d70aa31902ef35add23536baa60 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Aug 2018 16:30:38 +0000
Subject: [PATCH 0207/1848] Resuming refactoring reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 10 +++++-----
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a3b0b0d80..811312aef 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -299,15 +299,15 @@ static function getItems($bean, $options) {
       $sql = "($sql) union all ($sql_for_expense_items)";
     }
 
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
-// Note: this sort part below is different in getFavItems. Need to figure out why and fix properly.
-
     // Determine sort part.
     $sort_part = ' order by ';
-    if ('no_grouping' == $group_by_option || 'date' == $group_by_option)
+    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)
       $sort_part .= 'date';
     else
       $sort_part .= $group_by_option.', date';
+
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
+// Note: this sort part below is different in getFavItems. Need to figure out why and fix properly.
     if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option)
       $sort_part .= ', user, type';
     if ($bean->getAttribute('chstart'))
@@ -576,7 +576,7 @@ static function getFavItems($options) {
 
     // Determine sort part.
     $sort_part = ' order by ';
-    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option) // TODO: fix DB for NULL values in group_by field.
+    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)
       $sort_part .= 'date';
     else
       $sort_part .= $group_by_option.', date';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 56a708306..4d4cdf90d 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.17.97.4310 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4311 | 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>

From 85d475278111ea1ed81fcd0dd5eef7140d1cd493 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Aug 2018 16:57:45 +0000
Subject: [PATCH 0208/1848] Some more refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 13 +++++--------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 811312aef..641282758 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -124,7 +124,7 @@ static function getItems($bean, $options) {
     $mdb2 = getConnection();
 
     // Determine these once as they are used in multiple places in this function.
-    $canViewReports = $user->can('view_reports');
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
     $group_by_option = $options['group_by'];
@@ -305,12 +305,9 @@ static function getItems($bean, $options) {
       $sort_part .= 'date';
     else
       $sort_part .= $group_by_option.', date';
-
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
-// Note: this sort part below is different in getFavItems. Need to figure out why and fix properly.
-    if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option)
+    if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)
       $sort_part .= ', user, type';
-    if ($bean->getAttribute('chstart'))
+    if ($options['show_start'])
       $sort_part .= ', unformatted_start';
     $sort_part .= ', id';
 
@@ -399,7 +396,7 @@ static function getFavItems($options) {
     $mdb2 = getConnection();
 
     // Determine these once as they are used in multiple places in this function.
-    $canViewReports = $user->can('view_reports');
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
     $group_by_option = $options['group_by'];
@@ -580,7 +577,7 @@ static function getFavItems($options) {
       $sort_part .= 'date';
     else
       $sort_part .= $group_by_option.', date';
-    if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option)
+    if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)
       $sort_part .= ', user, type';
     if ($options['show_start'])
       $sort_part .= ', unformatted_start';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4d4cdf90d..edaf0900f 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.17.97.4311 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4312 | 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>

From 756657a71e251b65d8191636e33e5e4ea32767af Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Aug 2018 17:08:23 +0000
Subject: [PATCH 0209/1848] Merged getItems and getFavItems into one function.

---
 WEB-INF/lib/ttReportHelper.class.php | 251 +--------------------------
 WEB-INF/templates/footer.tpl         |   2 +-
 report.php                           |   2 +-
 tofile.php                           |   2 +-
 topdf.php                            |   2 +-
 5 files changed, 10 insertions(+), 249 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 641282758..85078db3b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -119,7 +119,7 @@ static function getExpenseWhere($options) {
   // getItems retrieves all items associated with a report.
   // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
   // Expense items use the "note" field for item name.
-  static function getItems($bean, $options) {
+  static function getItems($options) {
     global $user;
     $mdb2 = getConnection();
 
@@ -388,245 +388,6 @@ static function getFromSession() {
     return $items;
   }
 
-  // getFavItems retrieves all items associated with a favorite report.
-  // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
-  // Expense items use the "note" field for item name.
-  static function getFavItems($options) {
-    global $user;
-    $mdb2 = getConnection();
-
-    // Determine these once as they are used in multiple places in this function.
-    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
-    $isClient = $user->isClient();
-
-    $group_by_option = $options['group_by'];
-    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
-
-    // Prepare a query for time items in tt_log table.
-    $fields = array(); // An array of fields for database query.
-    array_push($fields, 'l.id as id');
-    array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
-    array_push($fields, 'l.date as date');
-    if($canViewReports || $isClient)
-      array_push($fields, 'u.name as user');
-    // Add client name if it is selected.
-    if ($options['show_client'] || 'client' == $group_by_option)
-      array_push($fields, 'c.name as client');
-    // Add project name if it is selected.
-    if ($options['show_project'] || 'project' == $group_by_option)
-      array_push($fields, 'p.name as project');
-    // Add task name if it is selected.
-    if ($options['show_task'] || 'task' == $group_by_option)
-      array_push($fields, 't.name as task');
-    // Add custom field.
-    $include_cf_1 = $options['show_custom_field_1'] || 'cf_1' == $group_by_option;
-    if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->group_id);
-      $cf_1_type = $custom_fields->fields[0]['type'];
-      if ($cf_1_type == CustomFields::TYPE_TEXT) {
-        array_push($fields, 'cfl.value as cf_1');
-      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        array_push($fields, 'cfo.value as cf_1');
-      }
-    }
-    // Add start time.
-    if ($options['show_start']) {
-      array_push($fields, "l.start as unformatted_start");
-      array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start");
-    }
-    // Add finish time.
-    if ($options['show_end'])
-      array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish");
-    // Add duration.
-    if ($options['show_duration'])
-      array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
-    // Add work units.
-    if ($options['show_work_units']) {
-      if ($user->unit_totals_only)
-        array_push($fields, "null as units");
-      else
-        array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
-    }
-    // Add note.
-    if ($options['show_note'])
-      array_push($fields, 'l.comment as note');
-    // Handle cost.
-    $includeCost = $options['show_cost'];
-    if ($includeCost) {
-      if (MODE_TIME == $user->tracking_mode)
-        array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
-      else
-        array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
-      array_push($fields, "null as expense"); 
-    }
-    // Add paid status.
-    if ($canViewReports && $options['show_paid'])
-      array_push($fields, 'l.paid as paid');
-    // Add IP address.
-    if ($canViewReports && $options['show_ip']) {
-      array_push($fields, 'l.created as created');
-      array_push($fields, 'l.created_ip as created_ip');
-      array_push($fields, 'l.modified as modified');
-      array_push($fields, 'l.modified_ip as modified_ip');
-    }
-    // Add invoice name if it is selected.
-    if (($canViewReports || $isClient) && $options['show_invoice'])
-      array_push($fields, 'i.name as invoice');
-
-    // Prepare sql query part for left joins.
-    $left_joins = null;
-    if ($options['show_client'] || 'client' == $group_by_option)
-      $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
-    if (($canViewReports || $isClient) && $options['show_invoice'])
-      $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
-    if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))
-       $left_joins .= " left join tt_users u on (u.id = l.user_id)";
-    if ($options['show_project'] || 'project' == $group_by_option)
-      $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
-    if ($options['show_task'] || 'task' == $group_by_option)
-      $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
-    if ($include_cf_1) {
-      if ($cf_1_type == CustomFields::TYPE_TEXT)
-        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
-      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
-          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
-      }
-    }
-    if ($includeCost && MODE_TIME != $user->tracking_mode)
-      $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
-
-    $where = ttReportHelper::getWhere($options);
-
-    // Construct sql query for tt_log items.
-    $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
-    // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
-    // with an exception of sorting part, that is added in the end.
-
-    // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
-
-      $fields = array(); // An array of fields for database query.
-      array_push($fields, 'ei.id');
-      array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
-      array_push($fields, 'ei.date');
-      if($canViewReports || $isClient)
-        array_push($fields, 'u.name as user');
-      // Add client name if it is selected.
-      if ($options['show_client'] || 'client' == $group_by_option)
-        array_push($fields, 'c.name as client');
-      // Add project name if it is selected.
-      if ($options['show_project'] || 'project' == $group_by_option)
-        array_push($fields, 'p.name as project');
-      if ($options['show_task'] || 'task' == $group_by_option)
-        array_push($fields, 'null'); // null for task name. We need to match column count for union.
-      if ($options['show_custom_field_1'] || 'cf_1' == $group_by_option)
-        array_push($fields, 'null'); // null for cf_1.
-      if ($options['show_start']) {
-        array_push($fields, 'null'); // null for unformatted_start.
-        array_push($fields, 'null'); // null for start.
-      }
-      if ($options['show_end'])
-        array_push($fields, 'null'); // null for finish.
-      if ($options['show_duration'])
-        array_push($fields, 'null'); // null for duration.
-      if ($options['show_work_units'])
-        array_push($fields, 'null as units'); // null for work units.
-      // Use the note field to print item name.
-      if ($options['show_note'])
-        array_push($fields, 'ei.name as note');
-      array_push($fields, 'ei.cost as cost');
-      array_push($fields, 'ei.cost as expense');
-      // Add paid status.
-      if ($canViewReports && $options['show_paid'])
-        array_push($fields, 'ei.paid as paid');
-      // Add IP address.
-      if ($canViewReports && $options['show_ip']) {
-        array_push($fields, 'ei.created as created');
-        array_push($fields, 'ei.created_ip as created_ip');
-        array_push($fields, 'ei.modified as modified');
-        array_push($fields, 'ei.modified_ip as modified_ip');
-      }
-      // Add invoice name if it is selected.
-      if (($canViewReports || $isClient) && $options['show_invoice'])
-        array_push($fields, 'i.name as invoice');
-
-      // Prepare sql query part for left joins.
-      $left_joins = null;
-      if ($canViewReports || $isClient)
-        $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
-      if ($options['show_client'] || 'client' == $group_by_option)
-        $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
-      if ($options['show_project'] || 'project' == $group_by_option)
-        $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
-      if (($canViewReports || $isClient) && $options['show_invoice'])
-        $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
-
-      $where = ttReportHelper::getExpenseWhere($options);
-
-      // Construct sql query for expense items.
-      $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
-
-      // Construct a union.
-      $sql = "($sql) union all ($sql_for_expense_items)";
-    }
-
-    // Determine sort part.
-    $sort_part = ' order by ';
-    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)
-      $sort_part .= 'date';
-    else
-      $sort_part .= $group_by_option.', date';
-    if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)
-      $sort_part .= ', user, type';
-    if ($options['show_start'])
-      $sort_part .= ', unformatted_start';
-    $sort_part .= ', id';
-
-    $sql .= $sort_part;
-    // By now we are ready with sql.
-
-    // Obtain items for report.
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
-
-    while ($val = $res->fetchRow()) {
-      if ($convertTo12Hour) {
-        if($val['start'] != '')
-          $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
-        if($val['finish'] != '')
-          $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
-      }
-      if (isset($val['cost'])) {
-        if ('.' != $user->decimal_mark)
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-      }
-      if (isset($val['expense'])) {
-        if ('.' != $user->decimal_mark)
-          $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
-      }
-      if ('no_grouping' != $group_by_option) {
-        $val['grouped_by'] = $val[$group_by_option];
-        if ('date' == $group_by_option) {
-          // This is needed to get the date in user date format.
-          $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
-          $val['grouped_by'] = $o_date->toString($user->date_format);
-          unset($o_date);
-        }
-      }
-
-      // This is needed to get the date in user date format.
-      $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
-      $val['date'] = $o_date->toString($user->date_format);
-      unset($o_date);
-
-      $row = $val;
-      $report_items[] = $row;
-    }
-
-    return $report_items;
-  }
-
   // getSubtotals calculates report items subtotals when a report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
@@ -1136,11 +897,11 @@ static function prepareReportBody($bean, $comment)
     global $i18n;
 
     // Determine these once as they are used in multiple places in this function.
-    $canViewReports = $user->can('view_reports');
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
     $options = ttReportHelper::getReportOptions($bean);
 
-    $items = ttReportHelper::getItems($bean, $options);
+    $items = ttReportHelper::getItems($options);
     $group_by = $bean->getAttribute('group_by');
     if ($group_by && 'no_grouping' != $group_by)
       $subtotals = ttReportHelper::getSubtotals($bean, $options);
@@ -1434,7 +1195,7 @@ static function prepareReportBody($bean, $comment)
   // checkFavReportCondition - checks whether it is okay to send fav report.
   static function checkFavReportCondition($options, $condition)
   {
-    $items = ttReportHelper::getFavItems($options);
+    $items = ttReportHelper::getItems($options);
 
     $condition = str_replace('count', '', $condition);
     $count_required = (int) trim(str_replace('>', '', $condition));
@@ -1452,10 +1213,10 @@ static function prepareFavReportBody($options)
     global $i18n;
 
     // Determine these once as they are used in multiple places in this function.
-    $canViewReports = $user->can('view_reports');
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
-    $items = ttReportHelper::getFavItems($options);
+    $items = ttReportHelper::getItems($options);
     $group_by = $options['group_by'];
     if ($group_by && 'no_grouping' != $group_by)
       $subtotals = ttReportHelper::getFavSubtotals($options);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index edaf0900f..8817aedd6 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.17.97.4312 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4313 | 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/report.php b/report.php
index 61b3587ff..1423706a4 100644
--- a/report.php
+++ b/report.php
@@ -173,7 +173,7 @@
 $group_by = $bean->getAttribute('group_by');
 
 $options = ttReportHelper::getReportOptions($bean);
-$report_items = ttReportHelper::getItems($bean, $options);
+$report_items = ttReportHelper::getItems($options);
 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $user->isPluginEnabled('ps'))
   ttReportHelper::putInSession($report_items);
diff --git a/tofile.php b/tofile.php
index 5a190f4bb..36bd7e1c9 100644
--- a/tofile.php
+++ b/tofile.php
@@ -62,7 +62,7 @@
 if ($totals_only)
   $subtotals = ttReportHelper::getSubtotals($bean, $options);
 else
-  $items = ttReportHelper::getItems($bean, $options);
+  $items = ttReportHelper::getItems($options);
 
 // Build a string to use as filename for the files being downloaded.
 $filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
diff --git a/topdf.php b/topdf.php
index 9d3164af1..b415f50de 100644
--- a/topdf.php
+++ b/topdf.php
@@ -76,7 +76,7 @@
 // Obtain items for report.
 $options = ttReportHelper::getReportOptions($bean);
 if (!$totals_only)
-  $items = ttReportHelper::getItems($bean, $options); // Individual entries.
+  $items = ttReportHelper::getItems($options); // Individual entries.
 if ($totals_only || 'no_grouping' != $group_by)
   $subtotals = ttReportHelper::getSubtotals($bean, $options); // Subtotals for groups of items.
 $totals = ttReportHelper::getTotals($bean, $options); // Totals for the entire report.

From 8009bd2e92e46bb3756ba69132dbca5e9e6d9895 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Aug 2018 17:36:41 +0000
Subject: [PATCH 0210/1848] Merged getTotals and getFavTotals into one
 function.

---
 WEB-INF/lib/ttReportHelper.class.php | 88 +---------------------------
 WEB-INF/templates/footer.tpl         |  2 +-
 report.php                           |  2 +-
 topdf.php                            |  2 +-
 4 files changed, 6 insertions(+), 88 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 85078db3b..28a0bc548 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -692,89 +692,7 @@ static function getFavSubtotals($options) {
   }
 
   // getTotals calculates total hours and cost for all report items.
-  static function getTotals($bean, $options)
-  {
-    global $user;
-
-    $mdb2 = getConnection();
-
-    $where = ttReportHelper::getWhere($options);
-
-    // Prepare parts.
-    $time_part = "sum(time_to_sec(l.duration)) as time";
-    if ($bean->getAttribute('chunits')) {
-      $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-    }
-    if ($bean->getAttribute('chcost')) {
-      if (MODE_TIME == $user->tracking_mode)
-        $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
-      else
-        $cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
-    } else {
-      $cost_part = ", null as cost, null as expenses";
-    }
-    if ($bean->getAttribute('chcost')) {
-      if (MODE_TIME == $user->tracking_mode) {
-        $left_joins = "left join tt_users u on (l.user_id = u.id)";
-      } else {
-        $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
-      }
-    }
-    // Prepare a query for time items.
-    $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
-
-    // If we have expenses, query becomes a bit more complex.
-    if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) {
-      $where = ttReportHelper::getExpenseWhere($options);
-      $sql_for_expenses = "select null as time";
-      if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
-
-      // Create a combined query.
-      $combined = "select sum(time) as time";
-      if ($bean->getAttribute('chunits')) $combined .= ", sum(units) as units";
-      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
-      $sql = $combined;
-    }
-
-    // Execute query.
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
-
-    $val = $res->fetchRow();
-    $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-    if ($bean->getAttribute('chcost')) {
-      $total_cost = $val['cost'];
-      if (!$total_cost) $total_cost = '0.00';
-      if ('.' != $user->decimal_mark)
-        $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
-      $total_expenses = $val['expenses'];
-      if (!$total_expenses) $total_expenses = '0.00';
-      if ('.' != $user->decimal_mark)
-        $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
-    }
-
-    if ($bean->getAttribute('period'))
-      $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
-    else {
-      $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
-        new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
-    }
-
-    $totals['start_date'] = $period->getStartDate();
-    $totals['end_date'] = $period->getEndDate();
-    $totals['time'] = $total_time;
-    $totals['units'] = $val['units'];
-    $totals['cost'] = $total_cost;
-    $totals['expenses'] = $total_expenses;
-
-    return $totals;
-  }
-
-  // getFavTotals calculates total hours and cost for all favorite report items.
-  static function getFavTotals($options)
+  static function getTotals($options)
   {
     global $user;
 
@@ -905,7 +823,7 @@ static function prepareReportBody($bean, $comment)
     $group_by = $bean->getAttribute('group_by');
     if ($group_by && 'no_grouping' != $group_by)
       $subtotals = ttReportHelper::getSubtotals($bean, $options);
-    $totals = ttReportHelper::getTotals($bean, $options);
+    $totals = ttReportHelper::getTotals($options);
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
@@ -1220,7 +1138,7 @@ static function prepareFavReportBody($options)
     $group_by = $options['group_by'];
     if ($group_by && 'no_grouping' != $group_by)
       $subtotals = ttReportHelper::getFavSubtotals($options);
-    $totals = ttReportHelper::getFavTotals($options);
+    $totals = ttReportHelper::getTotals($options);
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8817aedd6..27bbebd33 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.17.97.4313 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4314 | 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/report.php b/report.php
index 1423706a4..e59c759cf 100644
--- a/report.php
+++ b/report.php
@@ -180,7 +180,7 @@
 
 if ('no_grouping' != $group_by)
   $subtotals = ttReportHelper::getSubtotals($bean, $options);
-$totals = ttReportHelper::getTotals($bean, $options);
+$totals = ttReportHelper::getTotals($options);
 
 // Assign variables that are used to print subtotals.
 if ($report_items && 'no_grouping' != $group_by) {
diff --git a/topdf.php b/topdf.php
index b415f50de..fdcbf683e 100644
--- a/topdf.php
+++ b/topdf.php
@@ -79,7 +79,7 @@
   $items = ttReportHelper::getItems($options); // Individual entries.
 if ($totals_only || 'no_grouping' != $group_by)
   $subtotals = ttReportHelper::getSubtotals($bean, $options); // Subtotals for groups of items.
-$totals = ttReportHelper::getTotals($bean, $options); // Totals for the entire report.
+$totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.
 if ($items && 'no_grouping' != $group_by) {

From 02649cd1c0f39d44fd21e0ddc9f5e5eb428409c8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Aug 2018 18:58:36 +0000
Subject: [PATCH 0211/1848] Fixed a bug in sql query for work units
 calculation.

---
 WEB-INF/lib/ttReportHelper.class.php | 23 +++++++++++------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 28a0bc548..4fb5ca1f0 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -394,7 +394,7 @@ static function getFromSession() {
   static function getSubtotals($bean, $options) {
     global $user;
 
-    $group_by_option = $bean->getAttribute('group_by');
+    $group_by_option = $options['group_by'];
     if ('no_grouping' == $group_by_option) return null;
 
     $mdb2 = getConnection();
@@ -434,12 +434,12 @@ static function getSubtotals($bean, $options) {
     }
 
     $where = ttReportHelper::getWhere($options);
-    if ($bean->getAttribute('chcost')) {
+    if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
         $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-        if ($bean->getAttribute('chunits')) {
+        if ($options['show_work_units']) {
           if ($user->unit_totals_only)
             $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
           else
@@ -589,15 +589,14 @@ static function getFavSubtotals($options) {
       if (MODE_TIME == $user->tracking_mode) {
         if ($group_by_option != 'user')
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-          $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-          if ($options['show_work_units']) {
-            if ($user->unit_totals_only)
-              $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-            else
-              $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-          }
-          $sql .= ", sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-          $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($options['show_work_units']) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $group_join $left_join $where group by $group_field";
       } else {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 27bbebd33..766f8737a 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.17.97.4314 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4315 | 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>

From a58bca2afc5d6457d07c886c7c20fb10c941752a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Aug 2018 19:45:02 +0000
Subject: [PATCH 0212/1848] Merged getSubtotals and getFavSubtotals into one
 function.

---
 WEB-INF/lib/ttReportHelper.class.php | 157 +--------------------------
 WEB-INF/templates/footer.tpl         |   2 +-
 cron.php                             |   6 +
 report.php                           |   2 +-
 tofile.php                           |   2 +-
 topdf.php                            |   2 +-
 6 files changed, 13 insertions(+), 158 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4fb5ca1f0..4d510bbb2 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -391,158 +391,7 @@ static function getFromSession() {
   // getSubtotals calculates report items subtotals when a report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
-  static function getSubtotals($bean, $options) {
-    global $user;
-
-    $group_by_option = $options['group_by'];
-    if ('no_grouping' == $group_by_option) return null;
-
-    $mdb2 = getConnection();
-
-    // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.
-
-    // Determine group by field and a required join.
-    switch ($group_by_option) {
-      case 'date':
-        $group_field = 'l.date';
-        $group_join = '';
-        break;
-      case 'user':
-        $group_field = 'u.name';
-        $group_join = 'left join tt_users u on (l.user_id = u.id) ';
-        break;
-      case 'client':
-        $group_field = 'c.name';
-        $group_join = 'left join tt_clients c on (l.client_id = c.id) ';
-        break;
-      case 'project':
-        $group_field = 'p.name';
-        $group_join = 'left join tt_projects p on (l.project_id = p.id) ';
-        break;
-      case 'task':
-        $group_field = 't.name';
-        $group_join = 'left join tt_tasks t on (l.task_id = t.id) ';
-        break;
-      case 'cf_1':
-        $group_field = 'cfo.value';
-        $custom_fields = new CustomFields($user->group_id);
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
-        break;
-    }
-
-    $where = ttReportHelper::getWhere($options);
-    if ($options['show_cost']) {
-      if (MODE_TIME == $user->tracking_mode) {
-        if ($group_by_option != 'user')
-          $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-        if ($options['show_work_units']) {
-          if ($user->unit_totals_only)
-            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-          else
-            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-        }
-        $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
-          null as expenses from tt_log l
-          $group_join $left_join $where group by $group_field";
-      } else {
-        // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-        if ($bean->getAttribute('chunits')) {
-          if ($user->unit_totals_only)
-            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-          else
-            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-        }
-        $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses from tt_log l
-          $group_join
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
-      }
-    } else {
-      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-      if ($bean->getAttribute('chunits')) {
-        if ($user->unit_totals_only)
-          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-        else
-          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
-      }
-      $sql .= ", null as expenses from tt_log l
-        $group_join $where group by $group_field";
-    }
-    // By now we have sql for time items.
-
-    // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
-
-      // Determine group by field and a required join.
-      $group_join = null;
-      $group_field = 'null';
-      switch ($group_by_option) {
-        case 'date':
-          $group_field = 'ei.date';
-          $group_join = '';
-          break;
-        case 'user':
-          $group_field = 'u.name';
-          $group_join = 'left join tt_users u on (ei.user_id = u.id) ';
-          break;
-        case 'client':
-          $group_field = 'c.name';
-          $group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
-          break;
-        case 'project':
-          $group_field = 'p.name';
-          $group_join = 'left join tt_projects p on (ei.project_id = p.id) ';
-          break;
-      }
-
-      $where = ttReportHelper::getExpenseWhere($options);
-      $sql_for_expenses = "select $group_field as group_field, null as time";
-      if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
-      // Add a "group by" clause if we are grouping.
-      if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
-
-      // Create a combined query.
-      $combined = "select group_field, sum(time) as time";
-      if ($bean->getAttribute('chunits')) $combined .= ", sum(units) as units";
-      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
-      $sql = $combined;
-    }
-
-    // Execute query.
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
-
-    while ($val = $res->fetchRow()) {
-      if ('date' == $group_by_option) {
-        // This is needed to get the date in user date format.
-        $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
-        $val['group_field'] = $o_date->toString($user->date_format);
-        unset($o_date);
-      }
-      $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-      if ($bean->getAttribute('chcost')) {
-        if ('.' != $user->decimal_mark) {
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-          $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
-        }
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
-      } else
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']);
-    }
-
-    return $subtotals;
-  }
-
-  // getFavSubtotals calculates report items subtotals when a favorite report is grouped by.
-  // Without expenses, it's a simple select with group by.
-  // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
-  static function getFavSubtotals($options) {
+  static function getSubtotals($options) {
     global $user;
 
     $group_by_option = $options['group_by'];
@@ -821,7 +670,7 @@ static function prepareReportBody($bean, $comment)
     $items = ttReportHelper::getItems($options);
     $group_by = $bean->getAttribute('group_by');
     if ($group_by && 'no_grouping' != $group_by)
-      $subtotals = ttReportHelper::getSubtotals($bean, $options);
+      $subtotals = ttReportHelper::getSubtotals($options);
     $totals = ttReportHelper::getTotals($options);
 
     // Use custom fields plugin if it is enabled.
@@ -1136,7 +985,7 @@ static function prepareFavReportBody($options)
     $items = ttReportHelper::getItems($options);
     $group_by = $options['group_by'];
     if ($group_by && 'no_grouping' != $group_by)
-      $subtotals = ttReportHelper::getFavSubtotals($options);
+      $subtotals = ttReportHelper::getSubtotals($options);
     $totals = ttReportHelper::getTotals($options);
 
     // Use custom fields plugin if it is enabled.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 766f8737a..856333383 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.17.98.4315 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4316 | 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/cron.php b/cron.php
index 473f27eff..1b586cf0f 100644
--- a/cron.php
+++ b/cron.php
@@ -66,6 +66,12 @@
   $user = new ttUser(null, $options['user_id']);
   if (!$user->id) continue; // Skip not found user.
 
+  // TODO: write a new function ttFavReportHelper::adjustReportOptions that will use
+  // a $user objected recycled above. Put user handling below into it.
+  // Also adjust all other options for potentially changed user access rights and group properties.
+  // For example, tracking mode may have changed, but fav report options are still old...
+  // This needs to be fixed.
+
   // Special handling of the NULL $options['users'] field (this used to mean "all users").
   if (!$options['users']) {
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
diff --git a/report.php b/report.php
index e59c759cf..cd093e40b 100644
--- a/report.php
+++ b/report.php
@@ -179,7 +179,7 @@
   ttReportHelper::putInSession($report_items);
 
 if ('no_grouping' != $group_by)
-  $subtotals = ttReportHelper::getSubtotals($bean, $options);
+  $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
 
 // Assign variables that are used to print subtotals.
diff --git a/tofile.php b/tofile.php
index 36bd7e1c9..a40dbf0ac 100644
--- a/tofile.php
+++ b/tofile.php
@@ -60,7 +60,7 @@
 // Obtain items.
 $options = ttReportHelper::getReportOptions($bean);
 if ($totals_only)
-  $subtotals = ttReportHelper::getSubtotals($bean, $options);
+  $subtotals = ttReportHelper::getSubtotals($options);
 else
   $items = ttReportHelper::getItems($options);
 
diff --git a/topdf.php b/topdf.php
index fdcbf683e..69f5816d8 100644
--- a/topdf.php
+++ b/topdf.php
@@ -78,7 +78,7 @@
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
 if ($totals_only || 'no_grouping' != $group_by)
-  $subtotals = ttReportHelper::getSubtotals($bean, $options); // Subtotals for groups of items.
+  $subtotals = ttReportHelper::getSubtotals($options); // Subtotals for groups of items.
 $totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.

From f43392d109df8f4b04d623bd933f7a98089fb210 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 6 Aug 2018 13:49:19 +0000
Subject: [PATCH 0213/1848] Resuming refactoring report related functions.

---
 WEB-INF/lib/ttReportHelper.class.php | 11 ++++++-----
 WEB-INF/templates/footer.tpl         |  2 +-
 cron.php                             |  6 +++---
 report_send.php                      |  4 +++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4d510bbb2..46ce3f856 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -657,7 +657,7 @@ static function markPaid($time_log_ids, $expense_item_ids, $paid = true)
   }
 
   // prepareReportBody - prepares an email body for report.
-  static function prepareReportBody($bean, $comment)
+  static function prepareReportBody($bean, $options, $comment)
   {
     global $user;
     global $i18n;
@@ -665,10 +665,9 @@ static function prepareReportBody($bean, $comment)
     // Determine these once as they are used in multiple places in this function.
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
-    $options = ttReportHelper::getReportOptions($bean);
 
     $items = ttReportHelper::getItems($options);
-    $group_by = $bean->getAttribute('group_by');
+    $group_by = $options['group_by'];
     if ($group_by && 'no_grouping' != $group_by)
       $subtotals = ttReportHelper::getSubtotals($options);
     $totals = ttReportHelper::getTotals($options);
@@ -700,6 +699,8 @@ static function prepareReportBody($bean, $comment)
     // Output comment.
     if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
 
+// TODO: refactoring ongoing down from here...
+
     if ($bean->getAttribute('chtotalsonly')) {
       // Totals only report. Output subtotals.
 
@@ -973,7 +974,7 @@ static function checkFavReportCondition($options, $condition)
   }
 
   // prepareFavReportBody - prepares an email body for a favorite report.
-  static function prepareFavReportBody($options)
+  static function prepareFavReportBody($options, $comment = null)
   {
     global $user;
     global $i18n;
@@ -1013,7 +1014,7 @@ static function prepareFavReportBody($options)
     $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
 
     // Output comment.
-    // if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>'; // No comment for fav. reports.
+    if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
 
     if ($options['show_totals_only']) {
       // Totals only report. Output subtotals.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 856333383..c8a4919c9 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.17.98.4316 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4317 | 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/cron.php b/cron.php
index 1b586cf0f..7d766992c 100644
--- a/cron.php
+++ b/cron.php
@@ -66,9 +66,9 @@
   $user = new ttUser(null, $options['user_id']);
   if (!$user->id) continue; // Skip not found user.
 
-  // TODO: write a new function ttFavReportHelper::adjustReportOptions that will use
-  // a $user objected recycled above. Put user handling below into it.
-  // Also adjust all other options for potentially changed user access rights and group properties.
+  // TODO: write a new function ttFavReportHelper::adjustOptions that will use
+  // a $user objecte recycled above. Put user handling below into it.
+  // Also adjust remaining options for potentially changed user access rights and group properties.
   // For example, tracking mode may have changed, but fav report options are still old...
   // This needs to be fixed.
 
diff --git a/report_send.php b/report_send.php
index d7c031fd7..ea6c555b5 100644
--- a/report_send.php
+++ b/report_send.php
@@ -72,8 +72,10 @@
 
     // Obtain session bean with report attributes.
     $bean = new ActionForm('reportBean', new Form('reportForm'));
+    $options = ttReportHelper::getReportOptions($bean);
+
     // Prepare report body.
-    $body = ttReportHelper::prepareReportBody($bean, $cl_comment);
+    $body = ttReportHelper::prepareReportBody($bean, $options, $cl_comment);
 
     import('mail.Mailer');
     $mailer = new Mailer();

From bd92aeb3404ed8625272abccc9a8766f13ab75e6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 6 Aug 2018 14:02:29 +0000
Subject: [PATCH 0214/1848] A bit of refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 21 ++++++++++++---------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 46ce3f856..1f1654782 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -699,9 +699,7 @@ static function prepareReportBody($bean, $options, $comment)
     // Output comment.
     if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
 
-// TODO: refactoring ongoing down from here...
-
-    if ($bean->getAttribute('chtotalsonly')) {
+    if ($options['show_totals_only']) {
       // Totals only report. Output subtotals.
 
       // Determine group_by header.
@@ -715,27 +713,27 @@ static function prepareReportBody($bean, $options, $comment)
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
-      if ($bean->getAttribute('chduration'))
+      if ($options['show_duration'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
-      if ($bean->getAttribute('chunits'))
+      if ($options['show_work_units'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
-      if ($bean->getAttribute('chcost'))
+      if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : '&nbsp;').'</td>';
-        if ($bean->getAttribute('chduration')) {
+        if ($options['show_duration']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }
-        if ($bean->getAttribute('chunits')) {
+        if ($options['show_work_units']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= $subtotal['units'];
           $body .= '</td>';
         }
-        if ($bean->getAttribute('chcost')) {
+        if ($options['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
           $body .= '</td>';
@@ -743,6 +741,11 @@ static function prepareReportBody($bean, $options, $comment)
         $body .= '</tr>';
       }
 
+// TODO: refactoring ongoing down from here...
+
+
+
+
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c8a4919c9..cdbd8cbbe 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.17.98.4317 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4318 | 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>

From 6e023fcc8768de908976357682d951d9f9a42226 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 6 Aug 2018 14:41:50 +0000
Subject: [PATCH 0215/1848] Merged prepareReportBody and prepareFavReportBody
 into one function.

---
 WEB-INF/lib/ttReportHelper.class.php | 338 ++-------------------------
 WEB-INF/templates/footer.tpl         |   2 +-
 report_send.php                      |   2 +-
 3 files changed, 18 insertions(+), 324 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1f1654782..019293207 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -657,327 +657,7 @@ static function markPaid($time_log_ids, $expense_item_ids, $paid = true)
   }
 
   // prepareReportBody - prepares an email body for report.
-  static function prepareReportBody($bean, $options, $comment)
-  {
-    global $user;
-    global $i18n;
-
-    // Determine these once as they are used in multiple places in this function.
-    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
-    $isClient = $user->isClient();
-
-    $items = ttReportHelper::getItems($options);
-    $group_by = $options['group_by'];
-    if ($group_by && 'no_grouping' != $group_by)
-      $subtotals = ttReportHelper::getSubtotals($options);
-    $totals = ttReportHelper::getTotals($options);
-
-    // Use custom fields plugin if it is enabled.
-    if ($user->isPluginEnabled('cf'))
-      $custom_fields = new CustomFields($user->group_id);
-
-    // Define some styles to use in email.
-    $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
-    $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
-    $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
-    $rowItem = 'background-color: #ffffff;';
-    $rowItemAlt = 'background-color: #f5f5f5;';
-    $rowSubtotal = 'background-color: #e0e0e0;';
-    $cellLeftAligned = 'text-align: left; vertical-align: top;';
-    $cellRightAligned = 'text-align: right; vertical-align: top;';
-    $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
-    $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';
-
-    // Start creating email body.
-    $body = '<html>';
-    $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
-    $body .= '<body>';
-
-    // Output title.
-    $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
-
-    // Output comment.
-    if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
-
-    if ($options['show_totals_only']) {
-      // Totals only report. Output subtotals.
-
-      // Determine group_by header.
-      if ('cf_1' == $group_by)
-        $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
-      else {
-        $key = 'label.'.$group_by;
-        $group_by_header = $i18n->get($key);
-      }
-
-      $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
-      $body .= '<tr>';
-      $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
-      if ($options['show_duration'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
-      if ($options['show_work_units'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
-      if ($options['show_cost'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
-      $body .= '</tr>';
-      foreach($subtotals as $subtotal) {
-        $body .= '<tr style="'.$rowSubtotal.'">';
-        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : '&nbsp;').'</td>';
-        if ($options['show_duration']) {
-          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-          if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
-          $body .= '</td>';
-        }
-        if ($options['show_work_units']) {
-          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-          $body .= $subtotal['units'];
-          $body .= '</td>';
-        }
-        if ($options['show_cost']) {
-          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-          $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
-          $body .= '</td>';
-        }
-        $body .= '</tr>';
-      }
-
-// TODO: refactoring ongoing down from here...
-
-
-
-
-      // Print totals.
-      $body .= '<tr><td>&nbsp;</td></tr>';
-      $body .= '<tr style="'.$rowSubtotal.'">';
-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
-      if ($bean->getAttribute('chduration')) {
-        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-        if ($totals['time'] <> '0:00') $body .= $totals['time'];
-        $body .= '</td>';
-      }
-      if ($bean->getAttribute('chunits')) {
-        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-        $body .= $totals['units'];
-        $body .= '</td>';
-      }
-      if ($bean->getAttribute('chcost')) {
-        $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
-        $body .= '</td>';
-      }
-      $body .= '</tr>';
-
-      $body .= '</table>';
-    } else {
-      // Regular report.
-
-      // Print table header.
-      $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
-      $body .= '<tr>';
-      $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
-      if ($canViewReports || $isClient)
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
-      if ($bean->getAttribute('chclient'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
-      if ($bean->getAttribute('chproject'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
-      if ($bean->getAttribute('chtask'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
-      if ($bean->getAttribute('chcf_1'))
-        $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
-      if ($bean->getAttribute('chstart'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
-      if ($bean->getAttribute('chfinish'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
-      if ($bean->getAttribute('chduration'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
-      if ($bean->getAttribute('chunits'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
-      if ($bean->getAttribute('chnote'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
-      if ($bean->getAttribute('chcost'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
-      if ($bean->getAttribute('chpaid'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
-      if ($bean->getAttribute('chip'))
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
-      if ($bean->getAttribute('chinvoice'))
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
-      $body .= '</tr>';
-
-      // Initialize variables to print subtotals.
-      if ($items && 'no_grouping' != $group_by) {
-        $print_subtotals = true;
-        $first_pass = true;
-        $prev_grouped_by = '';
-        $cur_grouped_by = '';
-      }
-      // Initialize variables to alternate color of rows for different dates.
-      $prev_date = '';
-      $cur_date = '';
-      $row_style = $rowItem;
-
-      // Print report items.
-      if (is_array($items)) {
-        foreach ($items as $record) {
-          $cur_date = $record['date'];
-          // Print a subtotal row after a block of grouped items.
-          if ($print_subtotals) {
-            $cur_grouped_by = $record['grouped_by'];
-            if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
-              $body .= '<tr style="'.$rowSubtotal.'">';
-              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
-              $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
-              if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-              if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-              if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-              if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-              if ($bean->getAttribute('chcf_1')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
-              if ($bean->getAttribute('chstart')) $body .= '<td></td>';
-              if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
-              if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
-              if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
-              if ($bean->getAttribute('chnote')) $body .= '<td></td>';
-              if ($bean->getAttribute('chcost')) {
-                $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-                $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
-                $body .= '</td>';
-              }
-              if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
-              if ($bean->getAttribute('chip')) $body .= '<td></td>';
-              if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
-              $body .= '</tr>';
-              $body .= '<tr><td>&nbsp;</td></tr>';
-            }
-            $first_pass = false;
-          }
-
-          // Print a regular row.
-          if ($cur_date != $prev_date)
-            $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
-          $body .= '<tr style="'.$row_style.'">';
-          $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
-          if ($canViewReports || $isClient)
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
-          if ($bean->getAttribute('chclient'))
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
-          if ($bean->getAttribute('chproject'))
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['project']).'</td>';
-          if ($bean->getAttribute('chtask'))
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['task']).'</td>';
-          if ($bean->getAttribute('chcf_1'))
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['cf_1']).'</td>';
-          if ($bean->getAttribute('chstart'))
-            $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['start'].'</td>';
-          if ($bean->getAttribute('chfinish'))
-            $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
-          if ($bean->getAttribute('chduration'))
-            $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
-          if ($bean->getAttribute('chunits'))
-            $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
-          if ($bean->getAttribute('chnote'))
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
-          if ($bean->getAttribute('chcost'))
-            $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
-          if ($bean->getAttribute('chpaid')) {
-            $body .= '<td style="'.$cellRightAligned.'">';
-            $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
-            $body .= '</td>';
-          }
-          if ($bean->getAttribute('chip')) {
-            $body .= '<td style="'.$cellRightAligned.'">';
-            $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
-            $body .= '</td>';
-          }
-          if ($bean->getAttribute('chinvoice'))
-            $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
-          $body .= '</tr>';
-
-          $prev_date = $record['date'];
-          if ($print_subtotals)
-            $prev_grouped_by = $record['grouped_by'];
-        }
-      }
-
-      // Print a terminating subtotal.
-      if ($print_subtotals) {
-        $body .= '<tr style="'.$rowSubtotal.'">';
-        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
-        $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
-        if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-        if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-        if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-        if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-        if ($bean->getAttribute('chcf_1')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
-        if ($bean->getAttribute('chstart')) $body .= '<td></td>';
-        if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
-        if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
-        if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
-        if ($bean->getAttribute('chnote')) $body .= '<td></td>';
-        if ($bean->getAttribute('chcost')) {
-          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-          $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
-          $body .= '</td>';
-        }
-        if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
-        if ($bean->getAttribute('chip')) $body .= '<td></td>';
-        if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
-        $body .= '</tr>';
-      }
-
-      // Print totals.
-      $body .= '<tr><td>&nbsp;</td></tr>';
-      $body .= '<tr style="'.$rowSubtotal.'">';
-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
-      if ($canViewReports || $isClient) $body .= '<td></td>';
-      if ($bean->getAttribute('chclient')) $body .= '<td></td>';
-      if ($bean->getAttribute('chproject')) $body .= '<td></td>';
-      if ($bean->getAttribute('chtask')) $body .= '<td></td>';
-      if ($bean->getAttribute('chcf_1')) $body .= '<td></td>';
-      if ($bean->getAttribute('chstart')) $body .= '<td></td>';
-      if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
-      if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
-      if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
-      if ($bean->getAttribute('chnote')) $body .= '<td></td>';
-      if ($bean->getAttribute('chcost')) {
-        $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
-        $body .= '</td>';
-      }
-      if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
-      if ($bean->getAttribute('chip')) $body .= '<td></td>';
-      if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
-      $body .= '</tr>';
-
-      $body .= '</table>';
-    }
-
-    // Output footer.
-    if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
-      $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';
-
-    // Finish creating email body.
-    $body .= '</body></html>';
-
-    return $body;
-  }
-
-  // checkFavReportCondition - checks whether it is okay to send fav report.
-  static function checkFavReportCondition($options, $condition)
-  {
-    $items = ttReportHelper::getItems($options);
-
-    $condition = str_replace('count', '', $condition);
-    $count_required = (int) trim(str_replace('>', '', $condition));
-
-    if (count($items) > $count_required)
-      return true; // Condition ok.
-
-    return false;
-  }
-
-  // prepareFavReportBody - prepares an email body for a favorite report.
-  static function prepareFavReportBody($options, $comment = null)
+  static function prepareReportBody($options, $comment = null)
   {
     global $user;
     global $i18n;
@@ -1277,6 +957,20 @@ static function prepareFavReportBody($options, $comment = null)
     return $body;
   }
 
+  // checkFavReportCondition - checks whether it is okay to send fav report.
+  static function checkFavReportCondition($options, $condition)
+  {
+    $items = ttReportHelper::getItems($options);
+
+    $condition = str_replace('count', '', $condition);
+    $count_required = (int) trim(str_replace('>', '', $condition));
+
+    if (count($items) > $count_required)
+      return true; // Condition ok.
+
+    return false;
+  }
+
   // sendFavReport - sends a favorite report to a specified email, called from cron.php
   static function sendFavReport($options, $subject, $email, $cc) {
     // We are called from cron.php, we have no $bean in session.
@@ -1285,7 +979,7 @@ static function sendFavReport($options, $subject, $email, $cc) {
     global $i18n;
 
     // Prepare report body.
-    $body = ttReportHelper::prepareFavReportBody($options);
+    $body = ttReportHelper::prepareReportBody($options);
 
     import('mail.Mailer');
     $mailer = new Mailer();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cdbd8cbbe..1b7d29ce0 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.17.98.4318 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4319 | 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/report_send.php b/report_send.php
index ea6c555b5..9bbf9f51c 100644
--- a/report_send.php
+++ b/report_send.php
@@ -75,7 +75,7 @@
     $options = ttReportHelper::getReportOptions($bean);
 
     // Prepare report body.
-    $body = ttReportHelper::prepareReportBody($bean, $options, $cl_comment);
+    $body = ttReportHelper::prepareReportBody($options, $cl_comment);
 
     import('mail.Mailer');
     $mailer = new Mailer();

From 2ba240f9b321e7d2ccb9e7f9cf90a3be9d304a8d Mon Sep 17 00:00:00 2001
From: Stefan <roots84@users.noreply.github.com>
Date: Sat, 11 Aug 2018 19:13:06 +0200
Subject: [PATCH 0216/1848] German (formal) translation (#66)

* Update de.lang.php

* Update de.lang.php

Translated missing strings
---
 WEB-INF/resources/de.lang.php | 177 ++++++++++++++--------------------
 1 file changed, 72 insertions(+), 105 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ac6423de6..40e083fe8 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -44,11 +44,9 @@
 'menu.logout' => 'Abmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hilfe',
-// TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+'menu.create_group' => 'Erstelle Gruppe',
 'menu.profile' => 'Profil',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Gruppe',
 'menu.time' => 'Zeiten',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
@@ -56,8 +54,7 @@
 'menu.projects' => 'Projekte',
 'menu.tasks' => 'Aufgaben',
 'menu.users' => 'Personen',
-// TODO: translate the following.
-// 'menu.groups' => 'Groups',
+'menu.groups' => 'Gruppen',
 'menu.export' => 'Exportieren',
 'menu.clients' => 'Kunden',
 'menu.options' => 'Optionen',
@@ -72,8 +69,7 @@
 'error.access_denied' => 'Zugriff verweigert.',
 'error.sys' => 'Systemfehler.',
 'error.db' => 'Datenbankfehler.',
-// TODO: translate the following.
-// 'error.feature_disabled' => 'Feature is disabled.',
+'error.feature_disabled' => 'Funktion ist deaktiviert.',
 'error.field' => 'Ungültige "{0}" Daten.',
 'error.empty' => 'Feld "{0}" ist leer.',
 'error.not_equal' => 'Feld "{0}" ist nicht gleich Feld "{1}".',
@@ -82,18 +78,15 @@
 'error.task' => 'Aufgabe auswählen.',
 'error.client' => 'Kunde auswählen.',
 'error.report' => 'Bericht auswählen.',
-// TODO: translate the following.
-// 'error.record' => 'Select record.',
+'error.record' => 'Eintrag auswählen.',
 'error.auth' => 'Benutzername oder Passwort ungültig.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
-// TODO: translate the following.
-// 'error.object_exists' => 'Object with this name already exists.',
+'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
 'error.project_exists' => 'Es gibt bereits ein Projekt mit diesem Namen.',
 'error.task_exists' => 'Task mit diesem Namen existiert bereits.',
 'error.client_exists' => 'Der Kunde mit dem Namen existiert schon.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
-// TODO: translate the following.
-// 'error.role_exists' => 'Role with this rank already exists.',
+'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
 'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Team erzeugen.', // TODO: replace "team" with "group".
@@ -126,7 +119,7 @@
 'button.stop' => 'Stop',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-'label.group_name' => 'Teamname', // TODO: replace "team" with "group".
+'label.group_name' => 'Gruppenname',
 'label.address' => 'Adresse',
 'label.currency' => 'Währung',
 'label.manager_name' => 'Manager Name',
@@ -145,8 +138,7 @@
 'label.end_date' => 'Enddatum',
 'label.user' => 'Benutzer',
 'label.users' => 'Personen',
-// TODO: translate the following.
-// 'label.roles' => 'Roles',
+'label.roles' => 'Rollen',
 'label.client' => 'Kunde',
 'label.clients' => 'Kunden',
 'label.option' => 'Option',
@@ -163,8 +155,7 @@
 'label.notes' => 'Beschreibungen',
 'label.item' => 'Position',
 'label.cost' => 'Kosten',
-// TODO: translate the following.
-// 'label.ip' => 'IP',
+'label.ip' => 'IP',
 'label.day_total' => 'Summe (Tag)',
 'label.week_total' => 'Summe (Woche)',
 'label.month_total' => 'Summe (Monat)',
@@ -218,10 +209,10 @@
 'label.paid' => 'Bezahlt',
 'label.mark_paid' => 'Als bezahlt setzen',
 // TODO: translate the following.
-// 'label.week_note' => 'Week note',
-// 'label.week_list' => 'Week list',
-// 'label.work_units' => 'Work units',
-// 'label.work_units_short' => 'Units',
+'label.week_note' => 'Wochennotiz',
+'label.week_list' => 'Wochenliste',
+'label.work_units' => 'Arbeitseinheiten',
+'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
 
 // Form titles.
@@ -256,11 +247,10 @@
 'title.add_user' => 'Benutzerkonto erstellen',
 'title.edit_user' => 'Benutzerdaten bearbeiten',
 'title.delete_user' => 'Benutzer löschen',
-// TODO: translate the following.
-// 'title.roles' => 'Roles',
-// 'title.add_role' => 'Adding Role',
-// 'title.edit_role' => 'Editing Role',
-// 'title.delete_role' => 'Deleting Role',
+'title.roles' => 'Rolle',
+'title.add_role' => 'Rolle hinzufügen',
+'title.edit_role' => 'Rolle bearbeiten',
+'title.delete_role' => 'Rolle löschen',
 'title.clients' => 'Kunden',
 'title.add_client' => 'Kunden hinzufügen',
 'title.edit_client' => 'Kunden bearbeiten',
@@ -278,8 +268,7 @@
 'title.import' => 'Daten importieren',
 'title.options' => 'Optionen',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
+'title.group' => 'Gruppeneinstellungen',
 'title.cf_custom_fields' => 'Benutzerfelder',
 'title.cf_add_custom_field' => 'Benutzerfeld hinzufügen',
 'title.cf_edit_custom_field' => 'Benutzerfeld bearbeiten',
@@ -289,10 +278,9 @@
 'title.cf_edit_dropdown_option' => 'Auswahlmöglichkeit bearbeiten',
 'title.cf_delete_dropdown_option' => 'Auswahlmöglichkeit löschen',
 'title.locking' => 'Sperren',
-// TODO: translate the following.
-// 'title.week_view' => 'Week View',
-// 'title.swap_roles' => 'Swapping Roles',
-// 'title.work_units' => 'Work Units',
+'title.week_view' => 'Wochenansicht',
+'title.swap_roles' => 'Tausche Rollen',
+'title.work_units' => 'Arbeitseinheiten',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -335,10 +323,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker Anfrage zur Zurücksetzung des Passwortes',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
-// "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Sehr geehrter Nutzer,\n\nJemand, IP %s, sendete die Aufforderung Ihr Anuko Time Tracker Passwort zurückzusetzen. Bitte rufen Sie diesen Link auf wenn Sie Ihr Passwort zurücksetzen möchten.\n\n%s\n\nAnuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source Zeiterfassungs-System. Besuchen Sie https://www.anuko.com für weitere Informationen.\n\n",
+'form.reset_password.email_body' => "Sehr geehrte(r) Nutzer(in),\n\nEin Benutzer mit der IP %s hat vor Kurzem die Zurücksetzung Ihres Passworts für Anuko Time Tracker Passwort angefordert. Bitte rufen Sie diesen Link auf wenn Sie Ihr Passwort zurücksetzen möchten.\n\n%s\n\nAnuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source Zeiterfassungs-System. Besuchen Sie https://www.anuko.com für weitere Informationen.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Um das Passwort zurückzusetzen, geben Sie ein Neues ein und klicken dann auf Speichern.',
@@ -377,8 +362,7 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportiere',
-// TODO: translate the following.
-// 'form.report.assign_to_invoice' => 'Assign to invoice',
+'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
@@ -388,13 +372,7 @@
 // Deleting Invoice form. See example at https://timetracker.anuko.com/invoice_delete.php
 'form.invoice.invoice_to_delete' => 'Zu löschende Rechnung',
 'form.invoice.invoice_entries' => 'Rechnungseintrag',
-'form.invoice.confirm_deleting_entries' => 'Bitte die Löschung von Rechnungseinträgen bestätigen.',
-// TODO: consider improving translation of form.invoice.confirm_deleting_entries
-// This is a warning to user when they are deleting invoice entries.
-// They may believe they delete entries from the invoice only but keep the Time Tracker (reports, etc.).
-// What is really happening we delete entries from the system, so that they are no longer in reports, etc.
-// Original English wording is as follows.
-// 'form.invoice.confirm_deleting_entries' => 'Please confirm deleting invoice entries from Time Tracker.',
+'form.invoice.confirm_deleting_entries' => 'Bitte bestätigen Sie, dass die Einträge der Rechnung aus dem gesamten System gelöscht werden sollen.',
 
 // Charts form. See example at https://timetracker.anuko.com/charts.php
 'form.charts.interval' => 'Zeitraum',
@@ -419,17 +397,15 @@
 'form.users.default_rate' => 'Normaler Stundensatz',
 
 // Editing User form. See example at https://timetracker.anuko.com/user_edit.php
-// TODO: translate the following.
-// 'form.user_edit.swap_roles' => 'Swap roles',
+'form.user_edit.swap_roles' => 'Rollen tauschen',
 
 // Roles form. See example at https://timetracker.anuko.com/roles.php
-// TODO: translate the following.
-// 'form.roles.active_roles' => 'Active Roles',
-// 'form.roles.inactive_roles' => 'Inactive Roles',
-// 'form.roles.rank' => 'Rank',
-// 'form.roles.rights' => 'Rights',
-// 'form.roles.assigned' => 'Assigned',
-// 'form.roles.not_assigned' => 'Not assigned',
+'form.roles.active_roles' => 'Aktive Rollen',
+'form.roles.inactive_roles' => 'Inaktive Rollen',
+'form.roles.rank' => 'Rang',
+'form.roles.rights' => 'Rechte',
+'form.roles.assigned' => 'Zugewiesen',
+'form.roles.not_assigned' => 'Nicht zugewiesen',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
 'form.clients.active_clients' => 'Aktive Kunden',
@@ -440,26 +416,23 @@
 'form.client.client_entries' => 'Kundeneintrag',
 
 // Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
-// TODO: replace "team" with "group" in the string below.
-'form.export.hint' => 'Sie können alle Teamdaten in eine XML-Datei exportieren. Diese können in andere Zeiterfassungs-Programme importiert werden.',
+'form.export.hint' => 'Sie können alle Gruppendaten in eine XML-Datei exportieren. Diese können in andere Zeiterfassungs-Programme importiert werden.',
 'form.export.compression' => 'Kompression',
 'form.export.compression_none' => 'Keine',
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
-'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.', // TODO: replace "team" with "group".
+'form.import.hint' => 'Gruppendaten von einer XML-Datei importieren.',
 'form.import.file' => 'Datei auswählen',
 'form.import.success' => 'Import erfolgreich abgeschlossen.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-// TODO: replace "team" with "group" in the string below.
-'form.groups.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neues Team.<br>Diese Teams können auch von XML-Dateien importiert werden.',
+'form.groups.hint' => 'Das Erzeugen eines neuen Manager Kontos, erzeugt eine neue Gruppe.<br>Diese Gruppen können auch von XML-Dateien importiert werden.',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 Stunden',
 'form.group_edit.24_hours' => '24 Stunden',
-// TODO: translate the following.
-// 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.show_holidays' => 'Zeige Feiertage',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',
 'form.group_edit.mode_projects' => 'Projekte',
@@ -468,17 +441,15 @@
 'form.group_edit.type_all' => 'alle',
 'form.group_edit.type_start_finish' => 'Start und Ende',
 'form.group_edit.type_duration' => 'Dauer',
-// TODO: translate the following.
-// 'form.group_edit.punch_mode' => 'Punch mode',
-// 'form.group_edit.allow_overlap' => 'Allow overlap',
-// 'form.group_edit.future_entries' => 'Future entries',
-// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.punch_mode' => 'Stechuhr-Modus',
+'form.group_edit.allow_overlap' => 'Erlaube Überschneidung',
+'form.group_edit.future_entries' => 'Einträge in der Zukunft',
+'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
+'form.group_edit.allow_ip' => 'Erlaube IP',
 'form.group_edit.plugins' => 'Erweiterungen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
-// TODO: translate the following.
-// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+'form.group_delete.hint' => 'Sind Sie sicher, dass Sie die gesamte Gruppe löschen möchten?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Von',
@@ -489,44 +460,40 @@
 'form.mail.invoice_sent' => 'Die Rechnung wurde gesendet.',
 
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
-// TODO: translate the following.
-// 'form.quota.year' => 'Year',
-// 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
-// 'form.quota.workday_hours' => 'Hours in work day',
-// 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
+'form.quota.year' => 'Jahr',
+'form.quota.month' => 'Monat',
+'form.quota.quota' => 'Quote',
+'form.quota.workday_hours' => 'Arbeitsstunden pro Tag',
+'form.quota.hint' => 'Wenn leergelassen wird die Quote automatisch berechnet (Basierend auf Arbeitsstunden pro Tag und Feiertagen)',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
-// TODO: translate the following.
-// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
-// 'form.swap.swap_with' => 'Swap roles with',
+'form.swap.hint' => 'Stufen Sie ihre Rolle auf eine niedrigere indem Sie mit jemadem die Rollen tauschen. Dies kann nicht rückgängig gemacht werden.',  
+'form.swap.swap_with' => 'Tausche Rolle mit',
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
-// TODO: translate the following.
-// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
-// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+'form.work_units.minutes_in_unit' => 'Minuten in einer Arbeitseinheit',
+'form.work_units.1st_unit_threshold' => 'Schwellenwert für erste Arbeitseinheit',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
-// TODO: translate the following.
-// 'role.user.label' => 'User',
-// 'role.user.low_case_label' => 'user',
-// 'role.user.description' => 'A regular member without management rights.',
-// 'role.client.label' => 'Client',
-// 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
-// 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.low_case_label' => 'supervisor',
-// 'role.supervisor.description' => 'A person with a small set of management rights.',
-// 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.low_case_label' => 'co-manager',
-// 'role.comanager.description' => 'A person with a big set of management functions.',
-// 'role.manager.label' => 'Manager',
-// 'role.manager.low_case_label' => 'manager',
-// 'role.manager.description' => 'Group manager. Can do most of things for a group.',
-// 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.low_case_label' => 'top manager',
-// 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
-// 'role.admin.label' => 'Administrator',
-// 'role.admin.low_case_label' => 'administrator',
-// 'role.admin.description' => 'Site adminsitrator.',
+'role.user.label' => 'Benutzer',
+'role.user.low_case_label' => 'Benutzer',
+'role.user.description' => 'Ein normaler Benutzer ohne Administrationsrechte.',
+'role.client.label' => 'Kunde',
+'role.client.low_case_label' => 'Kunde',
+'role.client.description' => 'Ein Kunde kann zu ihm gehörende Berichte, Diagramme und Rechnungen ansehen.',
+'role.supervisor.label' => 'Dienstvorgesetzter',
+'role.supervisor.low_case_label' => 'Dienstvorgesetzter',
+'role.supervisor.description' => 'Eine Person mit ein paar Administrationsrechten.',
+'role.comanager.label' => 'Co-Manager',
+'role.comanager.low_case_label' => 'Co-Manager',
+'role.comanager.description' => 'Ein Person mit vielen Administrationsrechten.',
+'role.manager.label' => 'Manager',
+'role.manager.low_case_label' => 'Manager',
+'role.manager.description' => 'Gruppen-Manager. Kann fast alles innerhalb einer Gruppe administrieren.',
+'role.top_manager.label' => 'Top-Manager',
+'role.top_manager.low_case_label' => 'Top-Manager',
+'role.top_manager.description' => 'Top Gruppen-Manager. Kann alles innerhalb eines Gruppenbaums administrieren',
+'role.admin.label' => 'Administrator',
+'role.admin.low_case_label' => 'Administrator',
+'role.admin.description' => 'Aadminsitrator der Seite.',
 );

From 3a44195498f8f70c67f7122909c7977cad0351f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Aug 2018 17:19:28 +0000
Subject: [PATCH 0217/1848] Cosmetic changes in the German file.

---
 WEB-INF/resources/de.lang.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 40e083fe8..42c7c8aa9 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -89,7 +89,7 @@
 'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
-'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Team erzeugen.', // TODO: replace "team" with "group".
+'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Gruppe erzeugen.',
 'error.upload' => 'Fehler beim hochladen einer Datei.',
 'error.range_locked' => 'Zeitinterval ist gesperrt.',
 'error.mail_send' => 'Fehler beim versenden einer E-Mail.',
@@ -208,7 +208,6 @@
 'label.paid_status' => 'Bezahlstatus',
 'label.paid' => 'Bezahlt',
 'label.mark_paid' => 'Als bezahlt setzen',
-// TODO: translate the following.
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
 'label.work_units' => 'Arbeitseinheiten',
@@ -323,7 +322,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker Anfrage zur Zurücksetzung des Passwortes',
-'form.reset_password.email_body' => "Sehr geehrte(r) Nutzer(in),\n\nEin Benutzer mit der IP %s hat vor Kurzem die Zurücksetzung Ihres Passworts für Anuko Time Tracker Passwort angefordert. Bitte rufen Sie diesen Link auf wenn Sie Ihr Passwort zurücksetzen möchten.\n\n%s\n\nAnuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source Zeiterfassungs-System. Besuchen Sie https://www.anuko.com für weitere Informationen.\n\n",
+'form.reset_password.email_body' => "Sehr geehrter Nutzer,\n\nEin Benutzer mit der IP %s hat vor Kurzem die Zurücksetzung Ihres Passworts für Anuko Time Tracker Passwort angefordert. Bitte rufen Sie diesen Link auf wenn Sie Ihr Passwort zurücksetzen möchten.\n\n%s\n\nAnuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source Zeiterfassungs-System. Besuchen Sie https://www.anuko.com für weitere Informationen.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Um das Passwort zurückzusetzen, geben Sie ein Neues ein und klicken dann auf Speichern.',

From 98dfff814b103b57c450173804f92a255909a3ba Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 14 Aug 2018 21:16:29 +0000
Subject: [PATCH 0218/1848] Improved access check for cf_custom_field_add.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 cf_custom_field_add.php      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1b7d29ce0..99c9b21cb 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.17.98.4319 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4320 | 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/cf_custom_field_add.php b/cf_custom_field_add.php
index 922d83b7c..8227d2541 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -39,6 +39,12 @@
   header('Location: feature_disabled.php');
   exit();
 }
+$fields = CustomFields::getFields();
+// Deny access when max number of custom fields is already set.
+if (count($fields) >= 1) {
+  header('Location: access_denied.php');
+  exit();
+}
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));

From d2fa5b1566bf9834fd19e24231941a9a62e2164a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Sep 2018 18:04:49 +0000
Subject: [PATCH 0219/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 907b4a496..2e63e8436 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -210,9 +210,8 @@
 'label.mark_paid' => 'Markeer als betaald',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
-// TODO: translate the following.
-// 'label.work_units' => 'Work units',
-// 'label.work_units_short' => 'Units',
+'label.work_units' => 'Werk eenheid',
+'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
 
 // Form titles.
@@ -284,8 +283,7 @@
 'title.locking' => 'Blokkeren',
 'title.week_view' => 'Week overzicht',
 'title.swap_roles' => 'Rollen verruilen',
-// TODO: translate the following.
-// 'title.work_units' => 'Work Units',
+'title.work_units' => 'Werk eenheid',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -476,9 +474,8 @@
 'form.swap.swap_with' => 'Verruil rol met',
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
-// TODO: translate the following.
-// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
-// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+'form.work_units.minutes_in_unit' => 'Minuten per eenheid',
+'form.work_units.1st_unit_threshold' => 'Drempel eerste eenheid',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'Gebruiker',

From 34627c08c23651305a94e9e533249cc1d3472685 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Sep 2018 17:09:19 +0000
Subject: [PATCH 0220/1848] Added adjustOptions function to ttFavRepportHelper
 class and started to use it in cron.php.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 46 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 cron.php                                | 26 ++------------
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 0a21f7c94..069ecbb5f 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -325,4 +325,50 @@ static function getReportOptions($id) {
     // $options now is a subset of db fields from tt_fav_reports table.
     return $options;
   }
+
+  // adjustOptions takes and array or report options and adjusts them for current user
+  // (and group) settings. This is needed in situations when a fav report is stored in db
+  // long ago, but user or group attributes are now changed, so we have to adjust.
+  static function adjustOptions($options) {
+    global $user;
+
+    // Check and optionally adjust users.
+    // Special handling of the NULL $options['users'] field (this used to mean "all users").
+    if (!$options['users']) {
+      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
+        if ($user->can('view_reports') || $user->can('view_all_reports')) {
+          $max_rank = $user->rank-1;
+          if ($user->can('view_all_reports')) $max_rank = 512;
+          if ($user->can('view_own_reports'))
+            $user_options = array('max_rank'=>$max_rank,'include_self'=>true);
+          else
+            $user_options = array('max_rank'=>$max_rank);
+          $users = $user->getUsers($user_options); // Active and inactive users.
+        } elseif ($user->isClient()) {
+          $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+        }
+        foreach ($users as $single_user) {
+          $user_ids[] = $single_user['id'];
+        }
+        $options['users'] = implode(',', $user_ids);
+      }
+    } else {
+      $users_to_adjust = explode(',', $options['users']); // Users to adjust.
+      if ($user->isClient()) {
+        $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+        foreach ($users as $single_user) {
+          $user_ids[] = $single_user['id'];
+        }
+        foreach ($users_to_adjust as $user_to_adjust) {
+          if (in_array($user_to_adjust['id'], $user_ids)) {
+            $adjusted_user_ids[] = $user_to_adjust['id'];
+          }
+        }
+        $options['users'] = implode(',', $adjusted_user_ids);
+      }
+      // TODO: add checking the existing user list for potentially changed access rights for user.
+    }
+
+    return $options;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 99c9b21cb..2c74b1ec1 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.17.98.4320 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.98.4321 | 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/cron.php b/cron.php
index 7d766992c..eabcaa05c 100644
--- a/cron.php
+++ b/cron.php
@@ -67,33 +67,11 @@
   if (!$user->id) continue; // Skip not found user.
 
   // TODO: write a new function ttFavReportHelper::adjustOptions that will use
-  // a $user objecte recycled above. Put user handling below into it.
+  // a $user object recycled above. Put user handling below into it.
   // Also adjust remaining options for potentially changed user access rights and group properties.
   // For example, tracking mode may have changed, but fav report options are still old...
   // This needs to be fixed.
-
-  // Special handling of the NULL $options['users'] field (this used to mean "all users").
-  if (!$options['users']) {
-    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
-      if ($user->can('view_reports') || $user->can('view_all_reports')) {
-        $max_rank = $user->rank-1;
-        if ($user->can('view_all_reports')) $max_rank = 512;
-        if ($user->can('view_own_reports'))
-          $user_options = array('max_rank'=>$max_rank,'include_self'=>true);
-        else
-          $user_options = array('max_rank'=>$max_rank);
-        $users = $user->getUsers($user_options); // Active and inactive users.
-      } elseif ($user->isClient()) {
-        $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
-      }
-      foreach ($users as $single_user) {
-        $user_ids[] = $single_user['id'];
-      }
-      $options['users'] = implode(',', $user_ids);
-    }
-  } else {
-    // TODO: add checking the existing user list for potentially changed access rights for user.
-  }
+  $options = ttFavReportHelper::adjustOptions($options);
 
   // Skip users with disabled Notifications plugin.
   if (!$user->isPluginEnabled('no')) continue;

From 873cee05ecd24aa9066b467b2c90132ee08a99a1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Sep 2018 17:46:27 +0000
Subject: [PATCH 0221/1848] Work in progress on separate page for plugins
 config.

---
 WEB-INF/templates/group_edit.tpl |   2 +-
 WEB-INF/templates/plugins.tpl    | 147 ++++++++++++++++++++++++++++++
 plugins.php                      | 151 +++++++++++++++++++++++++++++++
 3 files changed, 299 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/plugins.tpl
 create mode 100644 plugins.php

diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index db66201c5..d2a9476ad 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -16,7 +16,7 @@ function handleTaskRequiredCheckbox() {
 }
 
 
-// handleControls - controls visibility of controls.
+// handlePluginCheckboxes - controls visibility of controls.
 function handlePluginCheckboxes() {
   var clientsCheckbox = document.getElementById("clients");
   var invoicesCheckbox = document.getElementById("invoices");
diff --git a/WEB-INF/templates/plugins.tpl b/WEB-INF/templates/plugins.tpl
new file mode 100644
index 000000000..f72d5699a
--- /dev/null
+++ b/WEB-INF/templates/plugins.tpl
@@ -0,0 +1,147 @@
+<script>
+// handlePluginCheckboxes - controls visibility of controls.
+function handlePluginCheckboxes() {
+  var clientsCheckbox = document.getElementById("clients");
+  var invoicesCheckbox = document.getElementById("invoices");
+  var requiredCheckbox = document.getElementById("client_required");
+  var requiredLabel = document.getElementById("client_required_label");
+  if (clientsCheckbox.checked) {
+    requiredCheckbox.style.visibility = "visible";
+    requiredLabel.style.visibility = "visible";
+    invoicesCheckbox.disabled = false;
+  } else {
+    requiredCheckbox.checked = false;
+    requiredCheckbox.style.visibility = "hidden";
+    requiredLabel.style.visibility = "hidden";
+    invoicesCheckbox.checked = false;
+    invoicesCheckbox.disabled = true;
+  }
+
+  var expensesCheckbox = document.getElementById("expenses");
+  var taxCheckbox = document.getElementById("tax_expenses");
+  var taxLabel = document.getElementById("tax_label");
+  if (expensesCheckbox.checked) {
+    taxCheckbox.style.visibility = "visible";
+    taxLabel.style.visibility = "visible";
+  } else {
+    taxCheckbox.checked = false;
+    taxCheckbox.style.visibility = "hidden";
+    taxLabel.style.visibility = "hidden";
+  }
+  var configureLabel = document.getElementById("expenses_config");
+  if (expensesCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var customFieldsCheckbox = document.getElementById("custom_fields");
+  configureLabel = document.getElementById("cf_config");
+  if (customFieldsCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var notificationsCheckbox = document.getElementById("notifications");
+  configureLabel = document.getElementById("notifications_config");
+  if (notificationsCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var lockingCheckbox = document.getElementById("locking");
+  configureLabel = document.getElementById("locking_config");
+  if (lockingCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var quotasCheckbox = document.getElementById("quotas");
+  configureLabel = document.getElementById("quotas_config");
+  if (quotasCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var weekViewCheckbox = document.getElementById("week_view");
+  configureLabel = document.getElementById("week_view_config");
+  if (weekViewCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var workUnitsCheckbox = document.getElementById("work_units");
+  configureLabel = document.getElementById("work_units_config");
+  if (workUnitsCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+}
+</script>
+
+{$forms.pluginsForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+    <tr>
+      <td>
+        <table cellspacing="1" cellpadding="2" border="0">
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.charts.control}</td>
+            <td><label for="charts">{$i18n.title.charts}</label></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.clients.control}</td>
+            <td><label for="clients">{$i18n.title.clients}</label> {$forms.pluginsForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.invoices.control}</td>
+            <td><label for="invoices">{$i18n.title.invoices}</label></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.paid_status.control}</td>
+            <td><label for="paid_status">{$i18n.label.paid_status}</label></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.custom_fields.control}</td>
+            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_config"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.expenses.control}</td>
+            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.notifications.control}</td>
+            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config"><a href="notifications.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.locking.control}</td>
+            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_config"><a href="locking.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.quotas.control}</td>
+            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_config"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.week_view.control}</td>
+            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
+            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+          <tr>
+            <td colspan="2">&nbsp;</td>
+          </tr>
+          <tr>
+            <td colspan="2" height="50" align="center">{$forms.pluginsForm.btn_save.control}</td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+</table>
+{$forms.pluginsForm.close}
diff --git a/plugins.php b/plugins.php
new file mode 100644
index 000000000..fce36a7e4
--- /dev/null
+++ b/plugins.php
@@ -0,0 +1,151 @@
+<?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');
+
+// Access checks.
+if (!ttAccessAllowed('manage_features')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$config = new ttConfigHelper($user->config);
+
+
+if ($request->isPost()) {
+  // Plugin checkboxes.
+  $cl_charts = $request->getParameter('charts');
+  $cl_clients = $request->getParameter('clients');
+  $cl_client_required = $request->getParameter('client_required');
+  $cl_invoices = $request->getParameter('invoices');
+  $cl_paid_status = $request->getParameter('paid_status');
+  $cl_custom_fields = $request->getParameter('custom_fields');
+  $cl_expenses = $request->getParameter('expenses');
+  $cl_tax_expenses = $request->getParameter('tax_expenses');
+  $cl_notifications = $request->getParameter('notifications');
+  $cl_locking = $request->getParameter('locking');
+  $cl_quotas = $request->getParameter('quotas');
+  $cl_week_view = $request->getParameter('week_view');
+  $cl_work_units = $request->getParameter('work_units');
+} else {
+  // Which plugins do we have enabled?
+  $plugins = explode(',', $user->plugins);
+  $cl_charts = in_array('ch', $plugins);
+  $cl_clients = in_array('cl', $plugins);
+  $cl_client_required = in_array('cm', $plugins);
+  $cl_invoices = in_array('iv', $plugins);
+  $cl_paid_status = in_array('ps', $plugins);
+  $cl_custom_fields = in_array('cf', $plugins);
+  $cl_expenses = in_array('ex', $plugins);
+  $cl_tax_expenses = in_array('et', $plugins);
+  $cl_notifications = in_array('no', $plugins);
+  $cl_locking = in_array('lk', $plugins);
+  $cl_quotas = in_array('mq', $plugins);
+  $cl_week_view = in_array('wv', $plugins);
+  $cl_work_units = in_array('wu', $plugins);
+}
+
+$form = new Form('pluginsForm');
+
+// Plugin checkboxes.
+$form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
+$form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'client_required','value'=>$cl_client_required));
+$form->addInput(array('type'=>'checkbox','name'=>'invoices','value'=>$cl_invoices));
+$form->addInput(array('type'=>'checkbox','name'=>'paid_status','value'=>$cl_paid_status));
+$form->addInput(array('type'=>'checkbox','name'=>'custom_fields','value'=>$cl_custom_fields,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'expenses','value'=>$cl_expenses,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'tax_expenses','value'=>$cl_tax_expenses));
+$form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
+
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+
+  // Validate user input. Do we have to?
+
+  if ($err->no()) {
+    // Prepare plugins string.
+    if ($cl_charts)
+      $plugins .= ',ch';
+    if ($cl_clients)
+      $plugins .= ',cl';
+    if ($cl_client_required)
+      $plugins .= ',cm';
+    if ($cl_invoices)
+      $plugins .= ',iv';
+    if ($cl_paid_status)
+      $plugins .= ',ps';
+    if ($cl_custom_fields)
+      $plugins .= ',cf';
+    if ($cl_expenses)
+      $plugins .= ',ex';
+    if ($cl_tax_expenses)
+      $plugins .= ',et';
+    if ($cl_notifications)
+      $plugins .= ',no';
+    if ($cl_locking)
+      $plugins .= ',lk';
+    if ($cl_quotas)
+      $plugins .= ',mq';
+    if ($cl_week_view)
+      $plugins .= ',wv';
+    if ($cl_work_units)
+      $plugins .= ',wu';
+
+    // Recycle week view plugin options as they are not configured on this page.
+    $existing_plugins = explode(',', $user->plugins);
+    if (in_array('wvn', $existing_plugins))
+      $plugins .= ',wvn';
+    if (in_array('wvl', $existing_plugins))
+      $plugins .= ',wvl';
+    if (in_array('wvns', $existing_plugins))
+      $plugins .= ',wvns';
+
+    $plugins = trim($plugins, ',');
+
+    if ($user->updateGroup(array(
+      'plugins' => $plugins))) {
+      header('Location: time.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
+$smarty->assign('title', $i18n->get('form.group_edit.plugins')); // TODO: fix this in transl;ation files.
+$smarty->assign('content_page_name', 'plugins.tpl');
+$smarty->display('index.tpl');

From 92dd94c462e142e8a5f7aae9594dd75b5b5a7afa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Sep 2018 17:59:02 +0000
Subject: [PATCH 0222/1848] A bit more work on separate page for plugins
 config.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 36 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9d446f2a4..59330487b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -50,6 +50,7 @@
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index fccc92b51..88f3fc08a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -52,6 +52,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Sestavy',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4390e22bb..85e6e3924 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 42c7c8aa9..0200660b0 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -47,6 +47,8 @@
 'menu.create_group' => 'Erstelle Gruppe',
 'menu.profile' => 'Profil',
 'menu.group' => 'Gruppe',
+// TODO: translate the following.
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Zeiten',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 50180602a..40c21d77a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -47,6 +47,7 @@
 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
+'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f03a331b1..661cd3d61 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tiempo',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f59da5646..0a82fbe02 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -52,6 +52,7 @@
 'menu.profile' => 'Profiili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Aeg',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f2a033312..ec2ff9658 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -50,6 +50,7 @@
 'menu.profile' => 'پروفايل',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'زمان',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f06429daa..661a0ba89 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Profiili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tunnit',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 49825603c..111aa811f 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 3c6d78a2e..342adde0c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -47,6 +47,8 @@
 'menu.create_group' => 'Δημιουργία ομάδας',
 'menu.profile' => 'Προφίλ',
 'menu.group' => 'Ομάδα',
+// TODO: translate the following.
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Χρόνος',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index cd61af660..9e5c0d18a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -50,6 +50,7 @@
 'menu.profile' => 'פרופיל',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'זמן',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f0dacf13e..372dd9437 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -49,6 +49,8 @@
 'menu.create_group' => 'Csoport létrehozása',
 'menu.profile' => 'Profil',
 'menu.group' => 'Csoport',
+// TODO: translate the following.
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Munkaidő',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ceedf9f52..2392815f6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -49,6 +49,8 @@
 'menu.create_group' => 'Crea gruppo',
 'menu.profile' => 'Profilo',
 'menu.group' => 'Gruppo',
+// TODO: translate the following.
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 07dc50b9f..e5f933d07 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -50,6 +50,7 @@
 'menu.profile' => 'プロファイル',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => '時間',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 21c34a561..36d888718 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -50,6 +50,7 @@
 'menu.profile' => '프로필',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => '시간',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2e63e8436..9c21e1201 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -47,6 +47,8 @@
 'menu.create_group' => 'Maak groep',
 'menu.profile' => 'Profiel',
 'menu.group' => 'Groep',
+// TODO: translate the following.
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 436f59016..e135b8d3c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -51,6 +51,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 6b262c22d..9e8e4c761 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Czas',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index afdd8eb94..f658e4a2e 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Gastos',
 'menu.reports' => 'Relatórios',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 834aaaf56..a6c48693c 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -52,6 +52,7 @@
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f00956294..e7fdbd35a 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -52,6 +52,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Timpul',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 85155b423..ad71ecc5b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -47,6 +47,7 @@
 'menu.create_group' => 'Создать группу',
 'menu.profile' => 'Профиль',
 'menu.group' => 'Группа',
+'menu.plugins' => 'Плагины',
 'menu.time' => 'Время',
 'menu.expenses' => 'Расходы',
 'menu.reports' => 'Отчёты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f79f4abd5..ed66a67bb 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Časový záznam',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 3e24c2541..5812629dd 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -52,6 +52,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Poročila',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7e7d7f4d1..8702df928 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Vreme',
 'menu.expenses' => 'Troškovi',
 'menu.reports' => 'Izveštaji',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c2159bb1a..f6b2b1bdb 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -47,6 +47,8 @@
 'menu.create_group' => 'Skapa grupp',
 'menu.profile' => 'Profil',
 'menu.group' => 'Grupp',
+// TODO: translate the following.
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tider',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 0159c7a9c..a2707fd92 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -52,6 +52,7 @@
 'menu.profile' => 'Profili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => 'Zaman',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4265532fd..3255dc211 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -49,6 +49,7 @@
 'menu.profile' => '简介',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 'menu.time' => '时间记录',
 'menu.expenses' => '费用',
 'menu.reports' => '报告',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 09712f483..45ca0eeb3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -49,6 +49,7 @@
 // 'menu.create_group' => 'Create Group',
 // 'menu.profile' => 'Profile',
 // 'menu.group' => 'Group',
+// 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '報告',

From f12ceba49cb845be385e6b7c7786fc7e5393e802 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Sep 2018 18:09:03 +0000
Subject: [PATCH 0223/1848] More work in progress on separate page for plugins
 config.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 32 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 59330487b..4d647f791 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -319,6 +319,7 @@
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 88f3fc08a..a0de85099 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -330,6 +330,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 85e6e3924..079750a58 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -289,6 +289,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Brugerdefineret Felt',
 'title.cf_add_custom_field' => 'Tilføj Brugerdefineret Felt',
 'title.cf_edit_custom_field' => 'Redigér Brugerdefineret Felt',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0200660b0..cf5e9757b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -270,6 +270,8 @@
 'title.options' => 'Optionen',
 'title.profile' => 'Profil',
 'title.group' => 'Gruppeneinstellungen',
+// TODO: translate the followwing.
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Benutzerfelder',
 'title.cf_add_custom_field' => 'Benutzerfeld hinzufügen',
 'title.cf_edit_custom_field' => 'Benutzerfeld bearbeiten',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 40c21d77a..98fc58982 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -274,6 +274,7 @@
 'title.options' => 'Options',
 'title.profile' => 'Profile',
 'title.group' => 'Group Settings',
+'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Custom Fields',
 'title.cf_add_custom_field' => 'Adding Custom Field',
 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 661cd3d61..eed4d9e3b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -318,6 +318,7 @@
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0a82fbe02..f30157f9e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -325,6 +325,7 @@
 'title.profile' => 'Profiili',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ec2ff9658..0a2ee38e0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -299,6 +299,7 @@
 'title.profile' => 'پروفایل',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'فیلدهای سفارشی',
 'title.cf_add_custom_field' => 'درج فیلد سفارشی',
 'title.cf_edit_custom_field' => 'ویرایش فیلد سفارشی',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 661a0ba89..9f54aa171 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -290,6 +290,7 @@
 'title.profile' => 'Profiili',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Omat kentät',
 'title.cf_add_custom_field' => 'Oman kentän lisäys',
 'title.cf_edit_custom_field' => 'Oman kentän muokkaus',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 111aa811f..85d52a337 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -283,6 +283,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Champs personalisés',
 'title.cf_add_custom_field' => 'Ajout d\\\'un champ',
 'title.cf_edit_custom_field' => 'Édition d\\\'un champ',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 342adde0c..73ed6f74e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -278,6 +278,7 @@
 'title.profile' => 'Προφίλ',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Προσαρμοσμένα πεδία',
 'title.cf_add_custom_field' => 'Προσθήκη προσαρμοσμένου πεδίου',
 'title.cf_edit_custom_field' => 'Επεξεργασία προσαρμοσμένου πεδίου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 9e5c0d18a..f1df92975 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -310,6 +310,7 @@
 'title.profile' => 'פרופיל',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'שדות אישיים',
 'title.cf_add_custom_field' => 'הוספת שדה אישי',
 'title.cf_edit_custom_field' => 'עריכת שדה אישי',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 372dd9437..2a4eab273 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -317,6 +317,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2392815f6..47157dbc1 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -288,6 +288,7 @@
 'title.profile' => 'Profilo',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Campi personalizzati',
 'title.cf_add_custom_field' => 'Aggiunta campo personalizzato',
 'title.cf_edit_custom_field' => 'Modifica campo personalizzato',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index e5f933d07..3f8d25cd9 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -323,6 +323,7 @@
 'title.profile' => 'プロファイル',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 36d888718..ff8012b8e 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -324,6 +324,7 @@
 'title.profile' => '프로필',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9c21e1201..474552604 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -274,6 +274,8 @@
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
 'title.group' => 'Groep instelling',
+// TODO: translate the following.
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Eigen velden',
 'title.cf_add_custom_field' => 'Eigen veld toevoegen',
 'title.cf_edit_custom_field' => 'Eigen veld bewerken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e135b8d3c..22e6edefb 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -320,6 +320,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9e8e4c761..f60c8394d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -290,6 +290,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Pola niestandardowe',
 'title.cf_add_custom_field' => 'Dodawanie pola niestandardowego',
 'title.cf_edit_custom_field' => 'Edytowanie pola niestandardowego',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f658e4a2e..55e8a7fa0 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -287,6 +287,7 @@
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Campos personalizados',
 'title.cf_add_custom_field' => 'Adicionando campo personalizado',
 'title.cf_edit_custom_field' => 'Editando campo personalizado',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a6c48693c..8e98496e8 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -306,6 +306,7 @@
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e7fdbd35a..6d41d6626 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -325,6 +325,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ad71ecc5b..8f4b5b063 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -273,6 +273,7 @@
 'title.options' => 'Опции',
 'title.profile' => 'Профиль',
 'title.group' => 'Настройки группы',
+'title.plugins' => 'Плагины',
 'title.cf_custom_fields' => 'Дополнительные поля',
 'title.cf_add_custom_field' => 'Добавление поля',
 'title.cf_edit_custom_field' => 'Редактирование поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ed66a67bb..d8f2cdd1a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -300,6 +300,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Vlastné polia',
 'title.cf_add_custom_field' => 'Pridávanie vlastného poľa',
 'title.cf_edit_custom_field' => 'Upravovanie vlastného poľa',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5812629dd..1e2e11c1a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -300,6 +300,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8702df928..1c7c1929e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -288,6 +288,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Dodatna polja',
 'title.cf_add_custom_field' => 'Dodavanje dodatnih polja',
 'title.cf_edit_custom_field' => 'Izmena dodatnih polja',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index f6b2b1bdb..c362381e4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -288,6 +288,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Egna fält',
 'title.cf_add_custom_field' => 'Lägg till fält',
 'title.cf_edit_custom_field' => 'Redigera fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a2707fd92..9ba985f67 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -334,6 +334,7 @@
 'title.profile' => 'Profili',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 3255dc211..2ed62dd76 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -312,6 +312,7 @@
 'title.profile' => '简介',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 45ca0eeb3..a7ce7c58e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -319,6 +319,7 @@
 // TODO: translate the following.
 // 'title.profile' => 'Profile',
 // 'title.group' => 'Group Settings',
+// 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',

From ea7a43edbe96f9741b734dc4ee5efc16b6c48244 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Sep 2018 18:29:00 +0000
Subject: [PATCH 0224/1848] Some recycling in translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 5 ++---
 WEB-INF/resources/de.lang.php    | 7 ++-----
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 5 ++---
 WEB-INF/resources/fi.lang.php    | 5 ++---
 WEB-INF/resources/fr.lang.php    | 5 ++---
 WEB-INF/resources/gr.lang.php    | 6 ++----
 WEB-INF/resources/he.lang.php    | 5 ++---
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 6 ++----
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 7 ++-----
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 5 ++---
 WEB-INF/resources/pt-br.lang.php | 5 ++---
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 5 ++---
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 5 ++---
 WEB-INF/resources/sv.lang.php    | 6 ++----
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 WEB-INF/templates/group_edit.tpl | 2 +-
 plugins.php                      | 2 +-
 32 files changed, 30 insertions(+), 67 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 4d647f791..f778db81e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -519,7 +519,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a0de85099..99531a5ee 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -533,7 +533,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 079750a58..7cff4bdde 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
@@ -289,7 +289,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Brugerdefineret Felt',
 'title.cf_add_custom_field' => 'Tilføj Brugerdefineret Felt',
 'title.cf_edit_custom_field' => 'Redigér Brugerdefineret Felt',
@@ -479,7 +479,6 @@
 'form.group_edit.uncompleted_indicators' => 'Uafsluttede indikatore',
 // TODO: translate the following.
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index cf5e9757b..51520a2af 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -47,8 +47,7 @@
 'menu.create_group' => 'Erstelle Gruppe',
 'menu.profile' => 'Profil',
 'menu.group' => 'Gruppe',
-// TODO: translate the following.
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Erweiterungen',
 'menu.time' => 'Zeiten',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
@@ -270,8 +269,7 @@
 'title.options' => 'Optionen',
 'title.profile' => 'Profil',
 'title.group' => 'Gruppeneinstellungen',
-// TODO: translate the followwing.
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Erweiterungen',
 'title.cf_custom_fields' => 'Benutzerfelder',
 'title.cf_add_custom_field' => 'Benutzerfeld hinzufügen',
 'title.cf_edit_custom_field' => 'Benutzerfeld bearbeiten',
@@ -449,7 +447,6 @@
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
 'form.group_edit.allow_ip' => 'Erlaube IP',
-'form.group_edit.plugins' => 'Erweiterungen',
 
 // 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?',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 98fc58982..1fe0874ef 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -454,7 +454,6 @@
 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Plugins',
 
 // 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?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index eed4d9e3b..58355a85c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -533,7 +533,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f30157f9e..a9f535f99 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -529,7 +529,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0a2ee38e0..bf82096f3 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -50,7 +50,7 @@
 'menu.profile' => 'پروفايل',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'پلاگین ها',
 'menu.time' => 'زمان',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
@@ -299,7 +299,7 @@
 'title.profile' => 'پروفایل',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'پلاگین ها',
 'title.cf_custom_fields' => 'فیلدهای سفارشی',
 'title.cf_add_custom_field' => 'درج فیلد سفارشی',
 'title.cf_edit_custom_field' => 'ویرایش فیلد سفارشی',
@@ -503,7 +503,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'پلاگین ها',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9f54aa171..65234876f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Profiili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Lisäosat',
 'menu.time' => 'Tunnit',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
@@ -290,7 +290,7 @@
 'title.profile' => 'Profiili',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Lisäosat',
 'title.cf_custom_fields' => 'Omat kentät',
 'title.cf_add_custom_field' => 'Oman kentän lisäys',
 'title.cf_edit_custom_field' => 'Oman kentän muokkaus',
@@ -486,7 +486,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Lisäosat',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 85d52a337..1ae8176d3 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
@@ -283,7 +283,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Champs personalisés',
 'title.cf_add_custom_field' => 'Ajout d\\\'un champ',
 'title.cf_edit_custom_field' => 'Édition d\\\'un champ',
@@ -475,7 +475,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 73ed6f74e..c5aea9e85 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -47,8 +47,7 @@
 'menu.create_group' => 'Δημιουργία ομάδας',
 'menu.profile' => 'Προφίλ',
 'menu.group' => 'Ομάδα',
-// TODO: translate the following.
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Πρόσθετα',
 'menu.time' => 'Χρόνος',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
@@ -278,7 +277,7 @@
 'title.profile' => 'Προφίλ',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Πρόσθετα',
 'title.cf_custom_fields' => 'Προσαρμοσμένα πεδία',
 'title.cf_add_custom_field' => 'Προσθήκη προσαρμοσμένου πεδίου',
 'title.cf_edit_custom_field' => 'Επεξεργασία προσαρμοσμένου πεδίου',
@@ -459,7 +458,6 @@
 'form.group_edit.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
 // TODO: translate the following.
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Πρόσθετα',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f1df92975..355e2ee79 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -50,7 +50,7 @@
 'menu.profile' => 'פרופיל',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'תוספים',
 'menu.time' => 'זמן',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
@@ -310,7 +310,7 @@
 'title.profile' => 'פרופיל',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'תוספים',
 'title.cf_custom_fields' => 'שדות אישיים',
 'title.cf_add_custom_field' => 'הוספת שדה אישי',
 'title.cf_edit_custom_field' => 'עריכת שדה אישי',
@@ -512,7 +512,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'תוספים',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 2a4eab273..9f64eb2fb 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -523,7 +523,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 47157dbc1..d20853596 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -49,8 +49,7 @@
 'menu.create_group' => 'Crea gruppo',
 'menu.profile' => 'Profilo',
 'menu.group' => 'Gruppo',
-// TODO: translate the following.
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Plugin',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
@@ -288,7 +287,7 @@
 'title.profile' => 'Profilo',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Plugin',
 'title.cf_custom_fields' => 'Campi personalizzati',
 'title.cf_add_custom_field' => 'Aggiunta campo personalizzato',
 'title.cf_edit_custom_field' => 'Modifica campo personalizzato',
@@ -475,7 +474,6 @@
 'form.group_edit.uncompleted_indicators' => 'Indicatori incompleti',
 // TODO: translate the following.
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Plugin',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3f8d25cd9..cb15bea93 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -525,7 +525,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ff8012b8e..5cd609360 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -523,7 +523,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 474552604..6eb372fe1 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -47,8 +47,7 @@
 'menu.create_group' => 'Maak groep',
 'menu.profile' => 'Profiel',
 'menu.group' => 'Groep',
-// TODO: translate the following.
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
@@ -274,8 +273,7 @@
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
 'title.group' => 'Groep instelling',
-// TODO: translate the following.
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Eigen velden',
 'title.cf_add_custom_field' => 'Eigen veld toevoegen',
 'title.cf_edit_custom_field' => 'Eigen veld bewerken',
@@ -453,7 +451,6 @@
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
-'form.group_edit.plugins' => 'Plugins',
 
 // 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?',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 22e6edefb..241d112a6 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -522,7 +522,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f60c8394d..606adf937 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Moduły',
 'menu.time' => 'Czas',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
@@ -290,7 +290,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Dodatkowe moduły',
 'title.cf_custom_fields' => 'Pola niestandardowe',
 'title.cf_add_custom_field' => 'Dodawanie pola niestandardowego',
 'title.cf_edit_custom_field' => 'Edytowanie pola niestandardowego',
@@ -488,7 +488,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Dodatkowe moduły',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 55e8a7fa0..41d406cf2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Gastos',
 'menu.reports' => 'Relatórios',
@@ -287,7 +287,7 @@
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Campos personalizados',
 'title.cf_add_custom_field' => 'Adicionando campo personalizado',
 'title.cf_edit_custom_field' => 'Editando campo personalizado',
@@ -483,7 +483,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8e98496e8..8e55e7a92 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -506,7 +506,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 6d41d6626..ce0e22eb0 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -528,7 +528,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 8f4b5b063..4b49fabf0 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -451,7 +451,6 @@
 'form.group_edit.future_entries' => 'Будущие записи',
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
 'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
-'form.group_edit.plugins' => 'Плагины',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d8f2cdd1a..339083457 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Moduly',
 'menu.time' => 'Časový záznam',
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
@@ -300,7 +300,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Doplnkové moduly',
 'title.cf_custom_fields' => 'Vlastné polia',
 'title.cf_add_custom_field' => 'Pridávanie vlastného poľa',
 'title.cf_edit_custom_field' => 'Upravovanie vlastného poľa',
@@ -503,7 +503,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Doplnkové moduly',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 1e2e11c1a..14a1b1ad8 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -502,7 +502,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1c7c1929e..7a4306518 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -49,7 +49,7 @@
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Dodaci',
 'menu.time' => 'Vreme',
 'menu.expenses' => 'Troškovi',
 'menu.reports' => 'Izveštaji',
@@ -288,7 +288,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Dodaci',
 'title.cf_custom_fields' => 'Dodatna polja',
 'title.cf_add_custom_field' => 'Dodavanje dodatnih polja',
 'title.cf_edit_custom_field' => 'Izmena dodatnih polja',
@@ -486,7 +486,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Dodaci',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c362381e4..dccb0f484 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -47,8 +47,7 @@
 'menu.create_group' => 'Skapa grupp',
 'menu.profile' => 'Profil',
 'menu.group' => 'Grupp',
-// TODO: translate the following.
-// 'menu.plugins' => 'Plugins',
+'menu.plugins' => 'Tillägg',
 'menu.time' => 'Tider',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
@@ -288,7 +287,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
-// 'title.plugins' => 'Plugins',
+'title.plugins' => 'Tillägg',
 'title.cf_custom_fields' => 'Egna fält',
 'title.cf_add_custom_field' => 'Lägg till fält',
 'title.cf_edit_custom_field' => 'Redigera fält',
@@ -483,7 +482,6 @@
 'form.group_edit.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
 // TODO: translate the following.
 // 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Tillägg',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9ba985f67..a0f43fc75 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -541,7 +541,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 2ed62dd76..13d570e08 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -509,7 +509,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a7ce7c58e..6750d90a6 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -517,7 +517,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.plugins' => 'Plugins',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index d2a9476ad..3e34054e1 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -204,7 +204,7 @@ function handlePluginCheckboxes() {
           </tr>
 
           <tr>
-             <td colspan="2" class="sectionHeader">{$i18n.form.group_edit.plugins}</td>
+             <td colspan="2" class="sectionHeader">{$i18n.title.plugins}</td>
           </tr>
           <tr><td>&nbsp;</td></tr>
           <tr>
diff --git a/plugins.php b/plugins.php
index fce36a7e4..60b86fede 100644
--- a/plugins.php
+++ b/plugins.php
@@ -146,6 +146,6 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
-$smarty->assign('title', $i18n->get('form.group_edit.plugins')); // TODO: fix this in transl;ation files.
+$smarty->assign('title', $i18n->get('title.plugins'));
 $smarty->assign('content_page_name', 'plugins.tpl');
 $smarty->display('index.tpl');

From 9b51878cb6636d768f5938615090c67f397a6558 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Sep 2018 18:42:53 +0000
Subject: [PATCH 0225/1848] Moved plugins config out to a separate plugins.php
 page.

---
 WEB-INF/templates/footer.tpl     |   2 +-
 WEB-INF/templates/group_edit.tpl | 140 -------------------------------
 WEB-INF/templates/header.tpl     |   3 +
 group_edit.php                   |  86 -------------------
 4 files changed, 4 insertions(+), 227 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2c74b1ec1..bfb6356cd 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.17.98.4321 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.99.4322 | 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 3e34054e1..ef00ca4db 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -14,92 +14,6 @@ function handleTaskRequiredCheckbox() {
     taskRequiredLabel.style.visibility = "hidden";
   }
 }
-
-
-// handlePluginCheckboxes - controls visibility of controls.
-function handlePluginCheckboxes() {
-  var clientsCheckbox = document.getElementById("clients");
-  var invoicesCheckbox = document.getElementById("invoices");
-  var requiredCheckbox = document.getElementById("client_required");
-  var requiredLabel = document.getElementById("client_required_label");
-  if (clientsCheckbox.checked) {
-    requiredCheckbox.style.visibility = "visible";
-    requiredLabel.style.visibility = "visible";
-    invoicesCheckbox.disabled = false;
-  } else {
-    requiredCheckbox.checked = false;
-    requiredCheckbox.style.visibility = "hidden";
-    requiredLabel.style.visibility = "hidden";
-    invoicesCheckbox.checked = false;
-    invoicesCheckbox.disabled = true;
-  }
-
-  var expensesCheckbox = document.getElementById("expenses");
-  var taxCheckbox = document.getElementById("tax_expenses");
-  var taxLabel = document.getElementById("tax_label");
-  if (expensesCheckbox.checked) {
-    taxCheckbox.style.visibility = "visible";
-    taxLabel.style.visibility = "visible";
-  } else {
-    taxCheckbox.checked = false;
-    taxCheckbox.style.visibility = "hidden";
-    taxLabel.style.visibility = "hidden";
-  }
-  var configureLabel = document.getElementById("expenses_config");
-  if (expensesCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var customFieldsCheckbox = document.getElementById("custom_fields");
-  configureLabel = document.getElementById("cf_config");
-  if (customFieldsCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var notificationsCheckbox = document.getElementById("notifications");
-  configureLabel = document.getElementById("notifications_config");
-  if (notificationsCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var lockingCheckbox = document.getElementById("locking");
-  configureLabel = document.getElementById("locking_config");
-  if (lockingCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var quotasCheckbox = document.getElementById("quotas");
-  configureLabel = document.getElementById("quotas_config");
-  if (quotasCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var weekViewCheckbox = document.getElementById("week_view");
-  configureLabel = document.getElementById("week_view_config");
-  if (weekViewCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var workUnitsCheckbox = document.getElementById("work_units");
-  configureLabel = document.getElementById("work_units_config");
-  if (workUnitsCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-}
 </script>
 
 {$forms.groupForm.open}
@@ -197,60 +111,6 @@ function handlePluginCheckboxes() {
             }
             adjustDecimalPreview();
           </script>
-
-          <tr>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-          </tr>
-
-          <tr>
-             <td colspan="2" class="sectionHeader">{$i18n.title.plugins}</td>
-          </tr>
-          <tr><td>&nbsp;</td></tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.charts.control}</td>
-            <td><label for="charts">{$i18n.title.charts}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.clients.control}</td>
-            <td><label for="clients">{$i18n.title.clients}</label> {$forms.groupForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.invoices.control}</td>
-            <td><label for="invoices">{$i18n.title.invoices}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.paid_status.control}</td>
-            <td><label for="paid_status">{$i18n.label.paid_status}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.custom_fields.control}</td>
-            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_config"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.expenses.control}</td>
-            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.groupForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config"><a href="notifications.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.locking.control}</td>
-            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_config"><a href="locking.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.quotas.control}</td>
-            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_config"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.week_view.control}</td>
-            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.groupForm.work_units.control}</td>
-            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
-          </tr>
 {/if}
 
           <tr>
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index aa59d3fff..c7c445a79 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -88,6 +88,9 @@
     {/if}
     {if $user->can('manage_basic_settings')}
             <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> &middot;
+    {/if}
+    {if $user->can('manage_features')}
+            <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a> &middot;
     {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
diff --git a/group_edit.php b/group_edit.php
index 01d2ecdc4..9c4cf3692 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -64,21 +64,6 @@
   $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
   $cl_allow_ip = trim($request->getParameter('allow_ip'));
-
-  // Plugin checkboxes.
-  $cl_charts = $request->getParameter('charts');
-  $cl_clients = $request->getParameter('clients');
-  $cl_client_required = $request->getParameter('client_required');
-  $cl_invoices = $request->getParameter('invoices');
-  $cl_paid_status = $request->getParameter('paid_status');
-  $cl_custom_fields = $request->getParameter('custom_fields');
-  $cl_expenses = $request->getParameter('expenses');
-  $cl_tax_expenses = $request->getParameter('tax_expenses');
-  $cl_notifications = $request->getParameter('notifications');
-  $cl_locking = $request->getParameter('locking');
-  $cl_quotas = $request->getParameter('quotas');
-  $cl_week_view = $request->getParameter('week_view');
-  $cl_work_units = $request->getParameter('work_units');
 } else {
   $cl_group = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
@@ -98,22 +83,6 @@
   $cl_uncompleted_indicators = $user->uncompleted_indicators;
   $cl_bcc_email = $user->bcc_email;
   $cl_allow_ip = $user->allow_ip;
-
-  // Which plugins do we have enabled?
-  $plugins = explode(',', $user->plugins);
-  $cl_charts = in_array('ch', $plugins);
-  $cl_clients = in_array('cl', $plugins);
-  $cl_client_required = in_array('cm', $plugins);
-  $cl_invoices = in_array('iv', $plugins);
-  $cl_paid_status = in_array('ps', $plugins);
-  $cl_custom_fields = in_array('cf', $plugins);
-  $cl_expenses = in_array('ex', $plugins);
-  $cl_tax_expenses = in_array('et', $plugins);
-  $cl_notifications = in_array('no', $plugins);
-  $cl_locking = in_array('lk', $plugins);
-  $cl_quotas = in_array('mq', $plugins);
-  $cl_week_view = in_array('wv', $plugins);
-  $cl_work_units = in_array('wu', $plugins);
 }
 
 $form = new Form('groupForm');
@@ -199,21 +168,6 @@
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'allow_ip','value'=>$cl_allow_ip));
 }
 
-// Plugin checkboxes.
-$form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
-$form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'client_required','value'=>$cl_client_required));
-$form->addInput(array('type'=>'checkbox','name'=>'invoices','value'=>$cl_invoices));
-$form->addInput(array('type'=>'checkbox','name'=>'paid_status','value'=>$cl_paid_status));
-$form->addInput(array('type'=>'checkbox','name'=>'custom_fields','value'=>$cl_custom_fields,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'expenses','value'=>$cl_expenses,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'tax_expenses','value'=>$cl_tax_expenses));
-$form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
-
 $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')));
 
@@ -235,45 +189,6 @@
   // Finished validating user input.
 
   if ($err->no()) {
-    // Prepare plugins string.
-    if ($cl_charts)
-      $plugins .= ',ch';
-    if ($cl_clients)
-      $plugins .= ',cl';
-    if ($cl_client_required)
-      $plugins .= ',cm';
-    if ($cl_invoices)
-      $plugins .= ',iv';
-    if ($cl_paid_status)
-      $plugins .= ',ps';
-    if ($cl_custom_fields)
-      $plugins .= ',cf';
-    if ($cl_expenses)
-      $plugins .= ',ex';
-    if ($cl_tax_expenses)
-      $plugins .= ',et';
-    if ($cl_notifications)
-      $plugins .= ',no';
-    if ($cl_locking)
-      $plugins .= ',lk';
-    if ($cl_quotas)
-      $plugins .= ',mq';
-    if ($cl_week_view)
-      $plugins .= ',wv';
-    if ($cl_work_units)
-      $plugins .= ',wu';
-
-    // Recycle week view plugin options as they are not configured on this page.
-    $existing_plugins = explode(',', $user->plugins);
-    if (in_array('wvn', $existing_plugins))
-      $plugins .= ',wvn';
-    if (in_array('wvl', $existing_plugins))
-      $plugins .= ',wvl';
-    if (in_array('wvns', $existing_plugins))
-      $plugins .= ',wvns';
-
-    $plugins = trim($plugins, ',');
-
     // Update config.
     $config->setDefinedValue('show_holidays', $cl_show_holidays);
     $config->setDefinedValue('punch_mode', $cl_punch_mode);
@@ -296,7 +211,6 @@
       'uncompleted_indicators' => $cl_uncompleted_indicators,
       'bcc_email' => $cl_bcc_email,
       'allow_ip' => $cl_allow_ip,
-      'plugins' => $plugins,
       'config' => $config->getConfig()))) {
       header('Location: time.php');
       exit();

From 93472f16bca36138fb4f227b262fe0a96a246776 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 25 Oct 2018 17:00:09 +0000
Subject: [PATCH 0226/1848] Extended conditions to include >=, <, <=, and =
 situations.

---
 WEB-INF/lib/common.lib.php           |  9 ++++++++-
 WEB-INF/lib/ttReportHelper.class.php | 27 +++++++++++++++++++++++----
 WEB-INF/templates/footer.tpl         |  2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 325ae73b4..d1ad384f5 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -319,7 +319,7 @@ function ttValidCondition($val, $emptyValid = true)
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
 
-  if (!preg_match("/^count\s?>\s?\d+$/", $val))
+  if (!preg_match("/^count\s?(=|[<>]=?)\s?\d+$/", $val))
     return false;
 
   return true;
@@ -383,3 +383,10 @@ function ttAccessAllowed($required_right)
 
   return false;
 }
+
+// ttStartsWith functions checks if a string starts with a given substring.
+function ttStartsWith($string, $startString)
+{
+    $len = strlen($startString);
+    return (substr($string, 0, $len) === $startString);
+}
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 019293207..14683e0ba 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -962,11 +962,30 @@ static function checkFavReportCondition($options, $condition)
   {
     $items = ttReportHelper::getItems($options);
 
-    $condition = str_replace('count', '', $condition);
-    $count_required = (int) trim(str_replace('>', '', $condition));
+    $condition = trim(str_replace('count', '', $condition));
 
-    if (count($items) > $count_required)
-      return true; // Condition ok.
+    $greater_or_equal = ttStartsWith($condition, '>=');
+    if ($greater_or_equal) $condition = trim(str_replace('>=', '', $condition));
+
+    $greater = ttStartsWith($condition, '>');
+    if ($greater) $condition = trim(str_replace('>', '', $condition));
+
+    $less_or_equal = ttStartsWith($condition, '<=');
+    if ($less_or_equal) $condition = trim(str_replace('<=', '', $condition));
+
+    $less = ttStartsWith($condition, '<');
+    if ($less) $condition = trim(str_replace('<', '', $condition));
+
+    $equal = ttStartsWith($condition, '=');
+    if ($equal) $condition = trim(str_replace('=', '', $condition));
+
+    $count_required = (int) $condition;
+
+    if ($greater && count($items) > $count_required) return true;
+    if ($greater_or_equal && count($items) >= $count_required) return true;
+    if ($less && count($items) < $count_required) return true;
+    if ($less_or_equal && count($items) <= $count_required) return true;
+    if ($equal && count($items) == $count_required) return true;
 
     return false;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bfb6356cd..3ba0f22a1 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.17.99.4322 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.100.4323 | 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>

From 60a7d2b7a9ba3f15874c359c0cba2ca97ff9eca8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 25 Oct 2018 18:47:30 +0000
Subject: [PATCH 0227/1848] Added <> handler to conditions.

---
 WEB-INF/lib/common.lib.php           |  2 +-
 WEB-INF/lib/ttReportHelper.class.php | 10 +++++++---
 WEB-INF/templates/footer.tpl         |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index d1ad384f5..43377103a 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -319,7 +319,7 @@ function ttValidCondition($val, $emptyValid = true)
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
 
-  if (!preg_match("/^count\s?(=|[<>]=?)\s?\d+$/", $val))
+  if (!preg_match("/^count\s?(=|[<>]=?|<>)\s?\d+$/", $val))
     return false;
 
   return true;
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 14683e0ba..e2bb8ddba 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -967,12 +967,15 @@ static function checkFavReportCondition($options, $condition)
     $greater_or_equal = ttStartsWith($condition, '>=');
     if ($greater_or_equal) $condition = trim(str_replace('>=', '', $condition));
 
-    $greater = ttStartsWith($condition, '>');
-    if ($greater) $condition = trim(str_replace('>', '', $condition));
-
     $less_or_equal = ttStartsWith($condition, '<=');
     if ($less_or_equal) $condition = trim(str_replace('<=', '', $condition));
 
+    $not_equal = ttStartsWith($condition, '<>');
+    if ($not_equal) $condition = trim(str_replace('<>', '', $condition));
+
+    $greater = ttStartsWith($condition, '>');
+    if ($greater) $condition = trim(str_replace('>', '', $condition));
+
     $less = ttStartsWith($condition, '<');
     if ($less) $condition = trim(str_replace('<', '', $condition));
 
@@ -986,6 +989,7 @@ static function checkFavReportCondition($options, $condition)
     if ($less && count($items) < $count_required) return true;
     if ($less_or_equal && count($items) <= $count_required) return true;
     if ($equal && count($items) == $count_required) return true;
+    if ($not_equal && count($items) <> $count_required) return true;
 
     return false;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3ba0f22a1..7167ac7f4 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.17.100.4323 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.100.4324 | 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>

From 25d6ffc5f17d0e016c2ebb5b51a222665834e9e4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 12:56:56 +0000
Subject: [PATCH 0228/1848] Improved error.mail_send text by adding
 MAIL_SMTP_DEBUG part.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 29 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f778db81e..42a9ea858 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -110,7 +110,7 @@
 'error.upload' => 'Error pujant l\\\'arxiu.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 99531a5ee..112538618 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -112,7 +112,7 @@
 'error.upload' => 'Chyba přenosu souboru.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7cff4bdde..eadafe7ea 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -101,6 +101,8 @@
 'error.upload' => 'Fil upload problem.',
 'error.range_locked' => 'Dato interval er spærret.',
 'error.mail_send' => 'Fejl under sending af mail.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Der er ingen email tilknyttet dette brugernavn.',
 'error.uncompleted_exists' => 'Uafsluttet registrering eksistere allerede. Luk eller slet det.',
 'error.goto_uncompleted' => 'Gå til uafsluttet registrering.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 51520a2af..9c6646bed 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -94,6 +94,8 @@
 'error.upload' => 'Fehler beim hochladen einer Datei.',
 'error.range_locked' => 'Zeitinterval ist gesperrt.',
 'error.mail_send' => 'Fehler beim versenden einer E-Mail.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Dieser Benutzer besitzt keine e-Mail Adresse.',
 'error.uncompleted_exists' => 'Unvollständiger Eintrag bereits vorhanden. Schließen oder Löschen.',
 'error.goto_uncompleted' => 'Zum unvollständigen Eintrag gehen.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 58355a85c..72ef4fdf4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -108,7 +108,7 @@
 'error.upload' => 'Error subiendo el archivo.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a9f535f99..68b238001 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -112,7 +112,7 @@
 'error.upload' => 'Viga faili vastuvõtmisel.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index bf82096f3..ca3c259f0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -107,6 +107,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'خطا در ارسال ایمیل.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'ایمیل مرتبط با این نام کاربری موجود نیست.',
 // TODO: check translation and punctuation of error.uncompleted_exists. Is the sentence ending dot in the right place?
 'error.uncompleted_exists' => 'قسمت ناتمامی موجود است. آن را تمام یا حذف کنید.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 65234876f..3e68704a8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -103,6 +103,8 @@
 'error.upload' => 'Virhe tiedoston lataus.',
 'error.range_locked' => 'Aikaväli on lukittu.',
 'error.mail_send' => 'Virhe postinlähetyksessä.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Käyttäjätunnukseen ei ole liitetty sähköpostiosoitetta.',
 'error.uncompleted_exists' => 'Kesken oleva syötetieto on jo olemassa. Sulje tai poista se.',
 'error.goto_uncompleted' => 'Siirry kesken olevaan syötteeseen.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1ae8176d3..3184a2b84 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -101,6 +101,8 @@
 'error.upload' => 'Erreur de chargement du fichier.',
 'error.range_locked' => 'Plage de date vérouillée.',
 'error.mail_send' => 'Erreur lors de l\\\'envoi du courriel.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Aucune adresse courriel n\\\'est associée à cet identifiant.',
 'error.uncompleted_exists' => 'Une entrée non terminée existe déjà. Fermer ou supprimer.',
 'error.goto_uncompleted' => 'Aller à l\\\'entrée non terminée.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c5aea9e85..4077becf8 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -95,6 +95,8 @@
 'error.upload' => 'Σφάλμα φόρτωσης αρχείου.',
 'error.range_locked' => 'Το χρονικό διάστημα είναι κλειδωμένο.',
 'error.mail_send' => 'Σφάλμα κατά την αποστολή του μηνύματος.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Δεν βρέθηκε διεύθυνση ηλεκτρονικού ταχυδρομείου που να αντιστοιχεί σε αυτή την σύνδεση.',
 'error.uncompleted_exists' => 'Η μη ολοκληρωμένη καταχώρηση υπάρχει ήδη. Κλείσιμο ή διαγραφή του.',
 'error.goto_uncompleted' => 'Μεταβείτε στην μη ολοκληρωμένη καταχώρηση.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 355e2ee79..c20692788 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -118,6 +118,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'שגיאה בשליחת הדואר אלקטרוני',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'אין דואר אלקטרוני השייך לשם משתמש זה',
 'error.uncompleted_exists' => 'רישום חלקי כבר קיים. סגור או מחק אותו.',
 'error.goto_uncompleted' => 'פתח את הרישום החלקי.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9f64eb2fb..5712426cd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -109,7 +109,7 @@
 'error.upload' => 'File feltöltési hiba.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d20853596..e6848fee4 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -99,6 +99,8 @@
 'error.upload' => 'Errore di caricamento file.',
 'error.range_locked' => 'Intervallo data bloccato.',
 'error.mail_send' => 'Errore nella fase di invio mail.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Non ci sono email associate a questo username.',
 'error.uncompleted_exists' => 'Esiste una voce incompleta. Chiudila o cancellala.',
 'error.goto_uncompleted' => 'Vai alle voce incompleta.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index cb15bea93..c1b745ab7 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -112,6 +112,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'メールの送信中のエラー。',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // TODO: translate the following.
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5cd609360..66837903f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -111,6 +111,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => '메일 보내기에서의 오류.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => '본 로그인과 연계된 이메일이 없습니다.',
 // TODO: translate the following.
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 6eb372fe1..43a77307b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -94,6 +94,8 @@
 'error.upload' => 'Fout bij het uploaden van het bestand.',
 'error.range_locked' => 'Datums zijn geblokkeerd.',
 'error.mail_send' => 'Fout bij het versturen van een e-mailbericht.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Geen e-mailadres bekend voor dit account.',
 'error.uncompleted_exists' => 'Niet afgeronde invoer bestaat al. Sluit of verwijder deze.',
 'error.goto_uncompleted' => 'Ga naar onvolledige invoer.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 241d112a6..5cf503178 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -112,6 +112,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Feil ved sending av e-post.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Det er ingen e-post knyttet til dette brukernavnet.',
 'error.uncompleted_exists' => 'Ufullført registrering finnes allerede. Lukk eller slett den.',
 'error.goto_uncompleted' => 'Gå til ufullført registrering.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 606adf937..22794b09b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -105,6 +105,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Błąd podczas wysyłania wiadomości e-mail.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Żaden adres e-mail nie jest skojarzony z tym loginem.',
 'error.uncompleted_exists' => 'Istnieje niedokończony wpis. Zamknij go lub usuń.',
 'error.goto_uncompleted' => 'Przejdź do niedokończonego wpisu.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 41d406cf2..48e425bbb 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -102,6 +102,8 @@
 'error.upload' => 'Erro no envio do arquivo.',
 'error.range_locked' => 'Período está bloqueado.',
 'error.mail_send' => 'Erro enviando o e-mail.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Não há e-mail associado a este login.',
 'error.uncompleted_exists' => 'Entrada incompleta existente. Feche ou remova-a.',
 'error.goto_uncompleted' => 'Ir até a entrada incompleta.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8e55e7a92..c5c906923 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -106,7 +106,7 @@
 // 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 // 'error.upload' => 'File upload error.',
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index ce0e22eb0..bbc412fb5 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -114,7 +114,7 @@
 'error.upload' => 'Eroare la upload-ul fisierului.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4b49fabf0..3a79929dc 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -93,7 +93,7 @@
 'error.no_groups' => 'Ваша база данных пуста. Войдите в систему как администратор и создайте новую группу.',
 'error.upload' => 'Ошибка загрузки файла.',
 'error.range_locked' => 'Диапазон дат заблокирован.',
-'error.mail_send' => 'Ошибка отправки почты.',
+'error.mail_send' => 'Ошибка отправки почты. Используйте MAIL_SMTP_DEBUG для диагностики.',
 'error.no_email' => 'Для данного логина не предоставлен e-mail.',
 'error.uncompleted_exists' => 'Неоконченная запись уже существует. Закройте или удалите её.',
 'error.goto_uncompleted' => 'Посмотреть неоконченную запись.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 339083457..e862bdc36 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -107,6 +107,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Chyba v odosielaní e-mailu.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'K tomuto prihlasovaciemu menu nie je priradený žiadny e-mail.',
 'error.uncompleted_exists' => 'Nekompletný záznam už existuje. Zatvorte ho alebo ho vymažte.',
 'error.goto_uncompleted' => 'Ísť na nekompletný záznam.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 14a1b1ad8..8985874c7 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -103,7 +103,7 @@
 // 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 // 'error.upload' => 'File upload error.',
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7a4306518..c0e6a144d 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -102,6 +102,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Greška u slanju mejla.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Nema imejla pod korisničkom imenom.',
 'error.uncompleted_exists' => 'Unos već postoji ali je nekompletan. Zatvorite postojeći ili obrišite unos.',
 'error.goto_uncompleted' => 'Prikaži postojeći unos.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index dccb0f484..b2ab95b70 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -99,6 +99,8 @@
 'error.upload' => 'Ett fel uppstod när filen laddades upp.',
 'error.range_locked' => 'Datumintervallet är låst.',
 'error.mail_send' => 'Ett fel uppstod när när e-postmeddelandet skulle skickas.',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Det finns ingen e-postadress kopplad till det här användarnamnet.',
 'error.uncompleted_exists' => 'En oavslutad registrering existerar redan. Avsluta eller ta bort den.',
 'error.goto_uncompleted' => 'Visa registrering.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a0f43fc75..9dab38b1b 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -117,7 +117,7 @@
 'error.upload' => 'Dosya yükleme hatası.',
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail.',
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // 'error.no_email' => 'No email associated with this login.',
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 13d570e08..e340d83d3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -104,6 +104,8 @@
 'error.upload' => '上传文件出错。',
 'error.range_locked' => '日期范围锁定。',
 'error.mail_send' => '发送邮件时出错。',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => '没有电子邮件与该用户名关联。',
 'error.uncompleted_exists' => '未完成的条目已经存在。关闭或删除。',
 'error.goto_uncompleted' => '进入未完成的条目。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6750d90a6..2d04d9b49 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -109,6 +109,8 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => '發送郵件時出錯。',
+// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => '沒有電子郵件與該用戶名關聯。',
 // TODO: translate the following.
 // 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',

From 8db9ef16cb3ca249a07b8621ac36a4b75af9dc59 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 13:01:51 +0000
Subject: [PATCH 0229/1848] Fixed a typo in comment.

---
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index eadafe7ea..8f6e8f4bb 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -101,7 +101,7 @@
 'error.upload' => 'Fil upload problem.',
 'error.range_locked' => 'Dato interval er spærret.',
 'error.mail_send' => 'Fejl under sending af mail.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Der er ingen email tilknyttet dette brugernavn.',
 'error.uncompleted_exists' => 'Uafsluttet registrering eksistere allerede. Luk eller slet det.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9c6646bed..e51ec1248 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -94,7 +94,7 @@
 'error.upload' => 'Fehler beim hochladen einer Datei.',
 'error.range_locked' => 'Zeitinterval ist gesperrt.',
 'error.mail_send' => 'Fehler beim versenden einer E-Mail.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Dieser Benutzer besitzt keine e-Mail Adresse.',
 'error.uncompleted_exists' => 'Unvollständiger Eintrag bereits vorhanden. Schließen oder Löschen.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1fe0874ef..3c04d5d74 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -94,7 +94,7 @@
 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 'error.upload' => 'File upload error.',
 'error.range_locked' => 'Date range is locked.',
-'error.mail_send' => 'Error sending mail.',
+'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'No email associated with this login.',
 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 'error.goto_uncompleted' => 'Go to uncompleted entry.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ca3c259f0..a728ba862 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -107,7 +107,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'خطا در ارسال ایمیل.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'ایمیل مرتبط با این نام کاربری موجود نیست.',
 // TODO: check translation and punctuation of error.uncompleted_exists. Is the sentence ending dot in the right place?
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3e68704a8..f9299b205 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -103,7 +103,7 @@
 'error.upload' => 'Virhe tiedoston lataus.',
 'error.range_locked' => 'Aikaväli on lukittu.',
 'error.mail_send' => 'Virhe postinlähetyksessä.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Käyttäjätunnukseen ei ole liitetty sähköpostiosoitetta.',
 'error.uncompleted_exists' => 'Kesken oleva syötetieto on jo olemassa. Sulje tai poista se.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3184a2b84..5213715ea 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -101,7 +101,7 @@
 'error.upload' => 'Erreur de chargement du fichier.',
 'error.range_locked' => 'Plage de date vérouillée.',
 'error.mail_send' => 'Erreur lors de l\\\'envoi du courriel.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Aucune adresse courriel n\\\'est associée à cet identifiant.',
 'error.uncompleted_exists' => 'Une entrée non terminée existe déjà. Fermer ou supprimer.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4077becf8..604456708 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -95,7 +95,7 @@
 'error.upload' => 'Σφάλμα φόρτωσης αρχείου.',
 'error.range_locked' => 'Το χρονικό διάστημα είναι κλειδωμένο.',
 'error.mail_send' => 'Σφάλμα κατά την αποστολή του μηνύματος.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Δεν βρέθηκε διεύθυνση ηλεκτρονικού ταχυδρομείου που να αντιστοιχεί σε αυτή την σύνδεση.',
 'error.uncompleted_exists' => 'Η μη ολοκληρωμένη καταχώρηση υπάρχει ήδη. Κλείσιμο ή διαγραφή του.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index c20692788..ea42550d7 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -118,7 +118,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'שגיאה בשליחת הדואר אלקטרוני',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'אין דואר אלקטרוני השייך לשם משתמש זה',
 'error.uncompleted_exists' => 'רישום חלקי כבר קיים. סגור או מחק אותו.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e6848fee4..d7b44f8ac 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -99,7 +99,7 @@
 'error.upload' => 'Errore di caricamento file.',
 'error.range_locked' => 'Intervallo data bloccato.',
 'error.mail_send' => 'Errore nella fase di invio mail.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Non ci sono email associate a questo username.',
 'error.uncompleted_exists' => 'Esiste una voce incompleta. Chiudila o cancellala.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c1b745ab7..7f9ee0587 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -112,7 +112,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'メールの送信中のエラー。',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 // TODO: translate the following.
 // 'error.no_email' => 'No email associated with this login.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 66837903f..862384d37 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -111,7 +111,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => '메일 보내기에서의 오류.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => '본 로그인과 연계된 이메일이 없습니다.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 43a77307b..78dc1a206 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -94,7 +94,7 @@
 'error.upload' => 'Fout bij het uploaden van het bestand.',
 'error.range_locked' => 'Datums zijn geblokkeerd.',
 'error.mail_send' => 'Fout bij het versturen van een e-mailbericht.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Geen e-mailadres bekend voor dit account.',
 'error.uncompleted_exists' => 'Niet afgeronde invoer bestaat al. Sluit of verwijder deze.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5cf503178..e24f3470b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -112,7 +112,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Feil ved sending av e-post.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Det er ingen e-post knyttet til dette brukernavnet.',
 'error.uncompleted_exists' => 'Ufullført registrering finnes allerede. Lukk eller slett den.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 22794b09b..1e77cfbb7 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -105,7 +105,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Błąd podczas wysyłania wiadomości e-mail.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Żaden adres e-mail nie jest skojarzony z tym loginem.',
 'error.uncompleted_exists' => 'Istnieje niedokończony wpis. Zamknij go lub usuń.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 48e425bbb..ba5d6f826 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -102,7 +102,7 @@
 'error.upload' => 'Erro no envio do arquivo.',
 'error.range_locked' => 'Período está bloqueado.',
 'error.mail_send' => 'Erro enviando o e-mail.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Não há e-mail associado a este login.',
 'error.uncompleted_exists' => 'Entrada incompleta existente. Feche ou remova-a.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e862bdc36..d48987320 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -107,7 +107,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Chyba v odosielaní e-mailu.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'K tomuto prihlasovaciemu menu nie je priradený žiadny e-mail.',
 'error.uncompleted_exists' => 'Nekompletný záznam už existuje. Zatvorte ho alebo ho vymažte.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c0e6a144d..19027adda 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -102,7 +102,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => 'Greška u slanju mejla.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Nema imejla pod korisničkom imenom.',
 'error.uncompleted_exists' => 'Unos već postoji ali je nekompletan. Zatvorite postojeći ili obrišite unos.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b2ab95b70..9472db288 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -99,7 +99,7 @@
 'error.upload' => 'Ett fel uppstod när filen laddades upp.',
 'error.range_locked' => 'Datumintervallet är låst.',
 'error.mail_send' => 'Ett fel uppstod när när e-postmeddelandet skulle skickas.',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'Det finns ingen e-postadress kopplad till det här användarnamnet.',
 'error.uncompleted_exists' => 'En oavslutad registrering existerar redan. Avsluta eller ta bort den.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e340d83d3..60fdeed1e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -104,7 +104,7 @@
 'error.upload' => '上传文件出错。',
 'error.range_locked' => '日期范围锁定。',
 'error.mail_send' => '发送邮件时出错。',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => '没有电子邮件与该用户名关联。',
 'error.uncompleted_exists' => '未完成的条目已经存在。关闭或删除。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2d04d9b49..1c794d38b 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -109,7 +109,7 @@
 // TODO: translate the following.
 // 'error.range_locked' => 'Date range is locked.',
 'error.mail_send' => '發送郵件時出錯。',
-// TODO: improve the translation above bv adding MAIL_SMTP_DEBUG part.
+// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
 // 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => '沒有電子郵件與該用戶名關聯。',
 // TODO: translate the following.

From e7d0e39030d3802cb732dab6ada9fbb049b4dc03 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 14:03:27 +0000
Subject: [PATCH 0230/1848] Started to work on multiple grouping in reports.

---
 WEB-INF/config.php.dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 1218f7f65..1fd74cce8 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -207,3 +207,6 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
+
+// A temporary config option while development on multiple grouping in reports is ongoing. To be removed when done.
+// define('MULTIPLE_GROUP_BY_DEBUG', false);

From 425bcc84f667a5a5d93bd306dfe4d04b04e9d534 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 15:24:34 +0000
Subject: [PATCH 0231/1848] Work in progress on multiple group by options in
 reports.

---
 WEB-INF/templates/reports.tpl | 9 +++++++--
 reports.php                   | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index af674785e..290e2249b 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -296,10 +296,15 @@ function handleCheckboxes() {
           </td>
         </tr>
         <tr>
-          <td><b>{$i18n.form.reports.group_by}</b></td>
+            <td><b>{$i18n.form.reports.group_by}</b></td>
         </tr>
         <tr valign="top">
-          <td>{$forms.reportForm.group_by.control} <label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>
+          <td>{$forms.reportForm.group_by.control}</td>
+          <td>{$forms.reportForm.group_by2.control}</td>
+          <td>{$forms.reportForm.group_by3.control}</td>
+        </tr>
+        <tr>
+          <td><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>
         </tr>
       </table>
 
diff --git a/reports.php b/reports.php
index a2825329e..ae5c9371b 100644
--- a/reports.php
+++ b/reports.php
@@ -232,7 +232,12 @@
 if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
 }
+$group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
+if (defined('MULTIPLE_GROUP_BY_DEBUG') && isTrue(MULTIPLE_GROUP_BY_DEBUG)) {
+  if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
+  if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
+}
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.

From bcbff1b505f315c05b45e5a2eaa707ed574d1a9a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 16:14:19 +0000
Subject: [PATCH 0232/1848] More work in progress on multiple group by.

---
 WEB-INF/templates/reports.tpl | 15 +++++++++------
 reports.php                   |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 290e2249b..9c8221ade 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -133,17 +133,20 @@ function selectAssignedUsers(project_id) {
   }
 }
 
-// handleCheckboxes - unmarks and disables the "Totals only" checkbox when
+// handleCheckboxes - unmarks and hides the "Totals only" checkbox when
 // "no grouping" is selected in the associated dropdown.
-// In future we need to improve this function and hide not relevant elements completely.
 function handleCheckboxes() {
   var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
+  var totalsOnlyLabel = document.getElementById("totals_only_label");
   if ("no_grouping" == document.getElementById("group_by").value) {
     // Unmark and disable the "Totals only" checkbox.
     totalsOnlyCheckbox.checked = false;
-    totalsOnlyCheckbox.disabled = true;
-  } else
-    totalsOnlyCheckbox.disabled = false;
+    totalsOnlyCheckbox.style.visibility = "hidden";
+    totalsOnlyLabel.style.visibility = "hidden";
+  } else {
+    totalsOnlyCheckbox.style.visibility = "visible";
+    totalsOnlyLabel.style.visibility = "visible";
+  }
 }
 </script>
 
@@ -304,7 +307,7 @@ function handleCheckboxes() {
           <td>{$forms.reportForm.group_by3.control}</td>
         </tr>
         <tr>
-          <td><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>
+            <td><span id="totals_only_label"><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></span></td>
         </tr>
       </table>
 
diff --git a/reports.php b/reports.php
index ae5c9371b..dae0c180b 100644
--- a/reports.php
+++ b/reports.php
@@ -235,8 +235,8 @@
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
 if (defined('MULTIPLE_GROUP_BY_DEBUG') && isTrue(MULTIPLE_GROUP_BY_DEBUG)) {
-  if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
-  if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
+  if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options));
+  if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options));
 }
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 

From 85329fe7459e5892082de3bd40459e7dfdb36f11 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 17:56:59 +0000
Subject: [PATCH 0233/1848] Added 2 additional group by fields in database as
 part of ongoing work on multiple level grouping.

---
 WEB-INF/lib/ttFavReportHelper.class.php |  6 +++---
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           | 16 ++++++++++++++--
 mysql.sql                               |  6 ++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 069ecbb5f..adc6e2ebb 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -84,7 +84,7 @@ static function insertReport($fields) {
       show_client, show_invoice, show_paid, show_ip,
       show_project, show_start, show_duration, show_cost,
       show_task, show_end, show_note, show_custom_field_1, show_work_units,
-      group_by, show_totals_only)
+      group_by1, show_totals_only)
       values(".
       $mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
@@ -139,7 +139,7 @@ function updateReport($fields) {
       "show_note = ".$fields['chnote'].", ".
       "show_custom_field_1 = ".$fields['chcf_1'].", ".
       "show_work_units = ".$fields['chunits'].", ".
-      "group_by = ".$mdb2->quote($fields['group_by']).", ".
+      "group_by1 = ".$mdb2->quote($fields['group_by']).", ".
       "show_totals_only = ".$fields['chtotalsonly'].
       " where id = ".$fields['id'];
     $affected = $mdb2->exec($sql);
@@ -270,7 +270,7 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttribute('chnote', $val['show_note']);
       $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
       $bean->setAttribute('chunits', $val['show_work_units']);
-      $bean->setAttribute('group_by', $val['group_by']);
+      $bean->setAttribute('group_by', $val['group_by1']);
       $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
       $bean->setAttribute('new_fav_report', $val['name']);
     } else {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7167ac7f4..52a5e8081 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.17.100.4324 | 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.00.4325 | 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/dbinstall.php b/dbinstall.php
index 5144d1962..097d2abe5 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,6 +956,13 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
+  if ($_POST["convert11797to11800"]) {
+    setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
+  }
+
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
@@ -999,7 +1006,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.17.97)</b>
+    <td width="80%"><b>Create database structure (v1.18.00)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1040,7 +1047,12 @@ function setChange($sql) {
   </tr>
     <tr valign="top">
     <td>Update database structure (v1.17.44 to v1.17.97)</td>
-    <td><input type="submit" name="convert11744to11797" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
+    <td><input type="submit" name="convert11744to117797" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
+  </tr>
+  </tr>
+  <tr valign="top">
+    <td>Update database structure (v1.17.97 to v1.18.00)</td>
+    <td><input type="submit" name="convert11797to11800" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 62c1d7c48..07a2323a1 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -269,7 +269,9 @@ CREATE TABLE `tt_fav_reports` (
   `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
   `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
-  `group_by` varchar(20) default NULL,                   # group by field
+  `group_by1` varchar(20) default NULL,                  # group by field 1
+  `group_by2` varchar(20) default NULL,                  # group by field 2
+  `group_by3` varchar(20) default NULL,                  # group by field 3
   `status` tinyint(4) default 1,                         # favorite report status
   PRIMARY KEY (`id`)
 );
@@ -454,4 +456,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.97', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.00', now()); # TODO: change when structure changes.

From 47b6c704a5375b9f98376bf4eb727d4ee49fe3e2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 18:43:40 +0000
Subject: [PATCH 0234/1848] Some fixes associated with renaming the group_by
 field.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 10 +++++-----
 WEB-INF/lib/ttReportHelper.class.php    |  8 ++++----
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/reports.tpl           |  4 ++--
 report.php                              | 10 +++++-----
 reports.php                             |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index adc6e2ebb..96188f22b 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -96,7 +96,7 @@ static function insertReport($fields) {
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
       $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
       $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
-      $mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")";
+      $mdb2->quote($fields['group_by1']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -139,7 +139,7 @@ function updateReport($fields) {
       "show_note = ".$fields['chnote'].", ".
       "show_custom_field_1 = ".$fields['chcf_1'].", ".
       "show_work_units = ".$fields['chunits'].", ".
-      "group_by1 = ".$mdb2->quote($fields['group_by']).", ".
+      "group_by1 = ".$mdb2->quote($fields['group_by1']).", ".
       "show_totals_only = ".$fields['chtotalsonly'].
       " where id = ".$fields['id'];
     $affected = $mdb2->exec($sql);
@@ -209,7 +209,7 @@ static function saveReport($user_id, $bean) {
       'chnote'=>$bean->getAttribute('chnote'),
       'chcf_1'=>$bean->getAttribute('chcf_1'),
       'chunits'=>$bean->getAttribute('chunits'),
-      'group_by'=>$bean->getAttribute('group_by'),
+      'group_by1'=>$bean->getAttribute('group_by1'),
       'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
 
     $id = false;
@@ -270,7 +270,7 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttribute('chnote', $val['show_note']);
       $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
       $bean->setAttribute('chunits', $val['show_work_units']);
-      $bean->setAttribute('group_by', $val['group_by1']);
+      $bean->setAttribute('group_by1', $val['group_by1']);
       $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
       $bean->setAttribute('new_fav_report', $val['name']);
     } else {
@@ -295,7 +295,7 @@ static function loadReport($user_id, &$bean) {
         'chnote'=>'1',
         'chcf_1'=>'',
         'chunits'=>'',
-        'group_by'=>'',
+        'group_by1'=>'',
         'chtotalsonly'=>'',
         'new_fav_report'=>''));
       $bean->setAttributes($attrs);
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index e2bb8ddba..538830c3c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -127,7 +127,7 @@ static function getItems($options) {
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
-    $group_by_option = $options['group_by'];
+    $group_by_option = $options['group_by1'];
     $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
 
     // Prepare a query for time items in tt_log table.
@@ -394,7 +394,7 @@ static function getFromSession() {
   static function getSubtotals($options) {
     global $user;
 
-    $group_by_option = $options['group_by'];
+    $group_by_option = $options['group_by1'];
     if ('no_grouping' == $group_by_option) return null;
 
     $mdb2 = getConnection();
@@ -667,7 +667,7 @@ static function prepareReportBody($options, $comment = null)
     $isClient = $user->isClient();
 
     $items = ttReportHelper::getItems($options);
-    $group_by = $options['group_by'];
+    $group_by = $options['group_by1'];
     if ($group_by && 'no_grouping' != $group_by)
       $subtotals = ttReportHelper::getSubtotals($options);
     $totals = ttReportHelper::getTotals($options);
@@ -1062,7 +1062,7 @@ static function getReportOptions($bean) {
     $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
     $options['show_work_units'] = $bean->getAttribute('chunits');
     $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
-    $options['group_by'] = $bean->getAttribute('group_by');
+    $options['group_by1'] = $bean->getAttribute('group_by1');
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 52a5e8081..a54d6aa67 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.00.4325 | 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.01.4326 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 9c8221ade..feb5800fe 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -138,7 +138,7 @@ function selectAssignedUsers(project_id) {
 function handleCheckboxes() {
   var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
   var totalsOnlyLabel = document.getElementById("totals_only_label");
-  if ("no_grouping" == document.getElementById("group_by").value) {
+  if ("no_grouping" == document.getElementById("group_by1").value) {
     // Unmark and disable the "Totals only" checkbox.
     totalsOnlyCheckbox.checked = false;
     totalsOnlyCheckbox.style.visibility = "hidden";
@@ -302,7 +302,7 @@ function handleCheckboxes() {
             <td><b>{$i18n.form.reports.group_by}</b></td>
         </tr>
         <tr valign="top">
-          <td>{$forms.reportForm.group_by.control}</td>
+          <td>{$forms.reportForm.group_by1.control}</td>
           <td>{$forms.reportForm.group_by2.control}</td>
           <td>{$forms.reportForm.group_by3.control}</td>
         </tr>
diff --git a/report.php b/report.php
index cd093e40b..efbaccea8 100644
--- a/report.php
+++ b/report.php
@@ -69,7 +69,7 @@
 
 // Do we need to show checkboxes?
 if ($bean->getAttribute('chpaid') ||
-   ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient())) {
+   ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
   if ($user->can('manage_invoices'))
     $smarty->assign('use_checkboxes', true);
 }
@@ -92,7 +92,7 @@
 
 // Controls for "Assign to invoice" block.
 if ($user->can('manage_invoices') &&
-  ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient())) {
+  ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttTeamHelper::getRecentInvoices($user->group_id, $client_id);
   if ($recent_invoices) {
@@ -170,7 +170,7 @@
   }
 } // isPost
 
-$group_by = $bean->getAttribute('group_by');
+$group_by = $bean->getAttribute('group_by1');
 
 $options = ttReportHelper::getReportOptions($bean);
 $report_items = ttReportHelper::getItems($options);
@@ -183,10 +183,10 @@
 $totals = ttReportHelper::getTotals($options);
 
 // Assign variables that are used to print subtotals.
-if ($report_items && 'no_grouping' != $group_by) {
+if ($report_items && 'no_grouping' != $group_by1) {
   $smarty->assign('print_subtotals', true);
   $smarty->assign('first_pass', true);
-  $smarty->assign('group_by', $group_by);
+  $smarty->assign('group_by1', $group_by1);
   $smarty->assign('prev_grouped_by', '');
   $smarty->assign('cur_grouped_by', '');
 }
diff --git a/reports.php b/reports.php
index dae0c180b..39f09c0b4 100644
--- a/reports.php
+++ b/reports.php
@@ -233,7 +233,7 @@
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
 }
 $group_by_options_size = sizeof($group_by_options);
-$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
+$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
 if (defined('MULTIPLE_GROUP_BY_DEBUG') && isTrue(MULTIPLE_GROUP_BY_DEBUG)) {
   if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options));
   if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options));

From 9e3d2ed2e3128245418e5cf5aff39f8695958d9a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 20:35:40 +0000
Subject: [PATCH 0235/1848] Fixed export-import for renamed field.

---
 WEB-INF/lib/ttExportHelper.class.php | 2 +-
 WEB-INF/lib/ttImportHelper.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index d0b533952..0c30b2f76 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -304,7 +304,7 @@ function createDataFile($compress = false) {
         " show_note=\"".$fav_report['show_note']."\"".
         " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
         " show_work_units=\"".$fav_report['show_work_units']."\"".
-        " group_by=\"".$fav_report['group_by']."\"".
+        " group_by1=\"".$fav_report['group_by1']."\"".
         " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
       fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
       fwrite($file, "  </fav_report>\n");
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 8be7a8310..c59f5e3f0 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -335,7 +335,7 @@ function endElement($parser, $name) {
         'chnote' => (int) $this->currentElement['SHOW_NOTE'],
         'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
         'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
-        'group_by' => $this->currentElement['GROUP_BY'],
+        'group_by1' => $this->currentElement['GROUP_BY1'],
         'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
     }
     $this->currentTag = '';

From e6463e1944221a524f49668b3b23032c3b9335f3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 20:46:08 +0000
Subject: [PATCH 0236/1848] Fixed report exports to files for a renamed field.

---
 WEB-INF/templates/footer.tpl |  2 +-
 tofile.php                   | 10 +++++-----
 topdf.php                    | 32 ++++++++++++++++----------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a54d6aa67..5d3d36a61 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.01.4326 | 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.01.4327 | 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/tofile.php b/tofile.php
index a40dbf0ac..42b734338 100644
--- a/tofile.php
+++ b/tofile.php
@@ -84,12 +84,12 @@
   print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
   print "<rows>\n";
 
-  $group_by = $bean->getAttribute('group_by');
+  $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
     // Totals only report. Print subtotals.
     foreach ($subtotals as $subtotal) {
       print "<row>\n";
-      print "\t<".$group_by."><![CDATA[".$subtotal['name']."]]></".$group_by.">\n";
+      print "\t<".$group_by1."><![CDATA[".$subtotal['name']."]]></".$group_by1.">\n";
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
         if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
@@ -161,15 +161,15 @@
   $bom = chr(239).chr(187).chr(191); // 0xEF 0xBB 0xBF in the beginning of the file is UTF8 BOM.
   print $bom; // Without this Excel does not display UTF8 characters properly.
 
-  $group_by = $bean->getAttribute('group_by');
+  $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
     // Totals only report.
 
     // Determine group_by header.
-    if ('cf_1' == $group_by)
+    if ('cf_1' == $group_by1)
       $group_by_header = $custom_fields->fields[0]['label'];
     else {
-      $key = 'label.'.$group_by;
+      $key = 'label.'.$group_by1;
       $group_by_header = $i18n->get($key);
     }
 
diff --git a/topdf.php b/topdf.php
index 69f5816d8..7d3fa0096 100644
--- a/topdf.php
+++ b/topdf.php
@@ -63,12 +63,12 @@
 $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
 
 // Determine group by header.
-$group_by = $bean->getAttribute('group_by');
-if ('no_grouping' != $group_by) {
-  if ('cf_1' == $group_by)
+$group_by1 = $bean->getAttribute('group_by1');
+if ('no_grouping' != $group_by1) {
+  if ('cf_1' == $group_by1)
     $group_by_header = $custom_fields->fields[0]['label'];
   else {
-    $key = 'label.'.$group_by;
+    $key = 'label.'.$group_by1;
     $group_by_header = $i18n->get($key);
   }
 }
@@ -77,12 +77,12 @@
 $options = ttReportHelper::getReportOptions($bean);
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
-if ($totals_only || 'no_grouping' != $group_by)
+if ($totals_only || 'no_grouping' != $group_by1)
   $subtotals = ttReportHelper::getSubtotals($options); // Subtotals for groups of items.
 $totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.
-if ($items && 'no_grouping' != $group_by) {
+if ($items && 'no_grouping' != $group_by1) {
   $print_subtotals = true;
   $first_pass = true;
   $prev_grouped_by = '';
@@ -181,27 +181,27 @@
         $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
         if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
             $html .= '<td>';
-            if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chclient')) {
             $html .= '<td>';
-            if ($group_by == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chproject')) {
             $html .= '<td>';
-            if ($group_by == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chtask')) {
             $html .= '<td>';
-            if ($group_by == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chcf_1')) {
             $html .= '<td>';
-            if ($group_by == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chstart')) $html .= '<td></td>';
@@ -270,27 +270,27 @@
     $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
       $html .= '<td>';
-      if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chclient')) {
       $html .= '<td>';
-      if ($group_by == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chproject')) {
       $html .= '<td>';
-      if ($group_by == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chtask')) {
       $html .= '<td>';
-      if ($group_by == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chcf_1')) {
       $html .= '<td>';
-      if ($group_by == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chstart')) $html .= '<td></td>';

From 5f56885676a5004de82919add3d309575514be1b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 21:21:49 +0000
Subject: [PATCH 0237/1848] A bit more work in progress on multiple levels of
 grouping by in reports.

---
 WEB-INF/lib/ttExportHelper.class.php    |  2 ++
 WEB-INF/lib/ttFavReportHelper.class.php | 13 +++++++++++--
 WEB-INF/lib/ttImportHelper.class.php    |  2 ++
 WEB-INF/templates/footer.tpl            |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 0c30b2f76..d40ce4528 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -305,6 +305,8 @@ function createDataFile($compress = false) {
         " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
         " show_work_units=\"".$fav_report['show_work_units']."\"".
         " group_by1=\"".$fav_report['group_by1']."\"".
+        " group_by2=\"".$fav_report['group_by2']."\"".
+        " group_by3=\"".$fav_report['group_by3']."\"".
         " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
       fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
       fwrite($file, "  </fav_report>\n");
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 96188f22b..305a4fc8c 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -84,7 +84,7 @@ static function insertReport($fields) {
       show_client, show_invoice, show_paid, show_ip,
       show_project, show_start, show_duration, show_cost,
       show_task, show_end, show_note, show_custom_field_1, show_work_units,
-      group_by1, show_totals_only)
+      group_by1, group_by2, group_by3, show_totals_only)
       values(".
       $mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
@@ -96,7 +96,8 @@ static function insertReport($fields) {
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
       $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
       $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
-      $mdb2->quote($fields['group_by1']).", ".$fields['chtotalsonly'].")";
+      $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
+      $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -140,6 +141,8 @@ function updateReport($fields) {
       "show_custom_field_1 = ".$fields['chcf_1'].", ".
       "show_work_units = ".$fields['chunits'].", ".
       "group_by1 = ".$mdb2->quote($fields['group_by1']).", ".
+      "group_by2 = ".$mdb2->quote($fields['group_by2']).", ".
+      "group_by3 = ".$mdb2->quote($fields['group_by3']).", ".
       "show_totals_only = ".$fields['chtotalsonly'].
       " where id = ".$fields['id'];
     $affected = $mdb2->exec($sql);
@@ -210,6 +213,8 @@ static function saveReport($user_id, $bean) {
       'chcf_1'=>$bean->getAttribute('chcf_1'),
       'chunits'=>$bean->getAttribute('chunits'),
       'group_by1'=>$bean->getAttribute('group_by1'),
+      'group_by2'=>$bean->getAttribute('group_by2'),
+      'group_by3'=>$bean->getAttribute('group_by3'),
       'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
 
     $id = false;
@@ -271,6 +276,8 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
       $bean->setAttribute('chunits', $val['show_work_units']);
       $bean->setAttribute('group_by1', $val['group_by1']);
+      $bean->setAttribute('group_by2', $val['group_by2']);
+      $bean->setAttribute('group_by3', $val['group_by3']);
       $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
       $bean->setAttribute('new_fav_report', $val['name']);
     } else {
@@ -296,6 +303,8 @@ static function loadReport($user_id, &$bean) {
         'chcf_1'=>'',
         'chunits'=>'',
         'group_by1'=>'',
+        'group_by2'=>'',
+        'group_by3'=>'',
         'chtotalsonly'=>'',
         'new_fav_report'=>''));
       $bean->setAttributes($attrs);
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index c59f5e3f0..d966f8963 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -336,6 +336,8 @@ function endElement($parser, $name) {
         'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
         'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
         'group_by1' => $this->currentElement['GROUP_BY1'],
+        'group_by2' => $this->currentElement['GROUP_BY2'],
+        'group_by3' => $this->currentElement['GROUP_BY3'],
         'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
     }
     $this->currentTag = '';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5d3d36a61..818b42753 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.01.4327 | 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.01.4328 | 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>

From b027028b5322fcbfb6de53e7a74529cbac7931de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Oct 2018 13:03:03 +0000
Subject: [PATCH 0238/1848] Some more work in progress on multiple grouping by.

---
 WEB-INF/lib/common.lib.php           |  8 ++++
 WEB-INF/lib/ttReportHelper.class.php | 62 ++++++++++++++++++----------
 WEB-INF/templates/footer.tpl         |  2 +-
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 43377103a..d29ba1a12 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -390,3 +390,11 @@ function ttStartsWith($string, $startString)
     $len = strlen($startString);
     return (substr($string, 0, $len) === $startString);
 }
+
+// ttDateToUserFormat converts a date from database format to user format.
+function ttDateToUserFormat($date)
+{
+  global $user;
+  $o_date = new DateAndTime(DB_DATEFORMAT, $date);
+  return $o_date->toString($user->date_format);
+}
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 538830c3c..280b70dbe 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -127,6 +127,16 @@ static function getItems($options) {
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
+    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
+                   ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
+                   ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
+    $grouping_by_date = ($options['group_by1'] == 'date'|| $options['group_by2'] == 'date' || $options['group_by3'] == 'date');
+    $grouping_by_client = ($options['group_by1'] == 'client'|| $options['group_by2'] == 'client' || $options['group_by3'] == 'client');
+    $grouping_by_project = ($options['group_by1'] == 'project'|| $options['group_by2'] == 'project' || $options['group_by3'] == 'project');
+    $grouping_by_task = ($options['group_by1'] == 'task'|| $options['group_by2'] == 'task' || $options['group_by3'] == 'task');
+    $grouping_by_user = ($options['group_by1'] == 'user'|| $options['group_by2'] == 'user' || $options['group_by3'] == 'user');
+    $grouping_by_cf_1 = ($options['group_by1'] == 'cf_1'|| $options['group_by2'] == 'cf_1' || $options['group_by3'] == 'cf_1');
+
     $group_by_option = $options['group_by1'];
     $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
 
@@ -138,16 +148,16 @@ static function getItems($options) {
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
-    if ($options['show_client'] || 'client' == $group_by_option)
+    if ($options['show_client'] || $grouping_by_client)
       array_push($fields, 'c.name as client');
     // Add project name if it is selected.
-    if ($options['show_project'] || 'project' == $group_by_option)
+    if ($options['show_project'] || $grouping_by_project)
       array_push($fields, 'p.name as project');
     // Add task name if it is selected.
-    if ($options['show_task'] || 'task' == $group_by_option)
+    if ($options['show_task'] || $grouping_by_task)
       array_push($fields, 't.name as task');
     // Add custom field.
-    $include_cf_1 = $options['show_custom_field_1'] || 'cf_1' == $group_by_option;
+    $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1;
     if ($include_cf_1) {
       $custom_fields = new CustomFields($user->group_id);
       $cf_1_type = $custom_fields->fields[0]['type'];
@@ -203,15 +213,15 @@ static function getItems($options) {
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-    if ($options['show_client'] || 'client' == $group_by_option)
+    if ($options['show_client'] || $grouping_by_client)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
     if (($canViewReports || $isClient) && $options['show_invoice'])
       $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
     if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))
        $left_joins .= " left join tt_users u on (u.id = l.user_id)";
-    if ($options['show_project'] || 'project' == $group_by_option)
+    if ($options['show_project'] || $grouping_by_project)
       $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
-    if ($options['show_task'] || 'task' == $group_by_option)
+    if ($options['show_task'] || $grouping_by_task)
       $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
     if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
@@ -228,7 +238,7 @@ static function getItems($options) {
 
     // Construct sql query for tt_log items.
     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
-    // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
+    // If we don't have expense items (such as when the Expenses plugin is disabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
@@ -241,14 +251,14 @@ static function getItems($options) {
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
       // Add client name if it is selected.
-      if ($options['show_client'] || 'client' == $group_by_option)
+      if ($options['show_client'] || $grouping_by_client)
         array_push($fields, 'c.name as client');
       // Add project name if it is selected.
-      if ($options['show_project'] || 'project' == $group_by_option)
+      if ($options['show_project'] || $grouping_by_project)
         array_push($fields, 'p.name as project');
-      if ($options['show_task'] || 'task' == $group_by_option)
+      if ($options['show_task'] || $grouping_by_task)
         array_push($fields, 'null'); // null for task name. We need to match column count for union.
-      if ($options['show_custom_field_1'] || 'cf_1' == $group_by_option)
+      if ($options['show_custom_field_1'] || $grouping_by_cf_1)
         array_push($fields, 'null'); // null for cf_1.
       if ($options['show_start']) {
         array_push($fields, 'null'); // null for unformatted_start.
@@ -283,9 +293,9 @@ static function getItems($options) {
       $left_joins = null;
       if ($canViewReports || $isClient)
         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
-      if ($options['show_client'] || 'client' == $group_by_option)
+      if ($options['show_client'] || $grouping_by_client)
         $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
-      if ($options['show_project'] || 'project' == $group_by_option)
+      if ($options['show_project'] || $grouping_by_project)
         $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
       if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
@@ -301,11 +311,16 @@ static function getItems($options) {
 
     // Determine sort part.
     $sort_part = ' order by ';
-    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)
+    if ($no_grouping)
       $sort_part .= 'date';
-    else
-      $sort_part .= $group_by_option.', date';
-    if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)
+    else {
+      $sort_part2 .= ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ? ', '.$options['group_by1'] : '';
+      $sort_part2 .= ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') ? ', '.$options['group_by2'] : '';
+      $sort_part2 .= ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') ? ', '.$options['group_by3'] : '';
+      if (!$grouping_by_date) $sort_part2 .= ', date';
+      $sort_part .= ltrim($sort_part2, ', '); // Remove leading comma and space.
+    }
+    if (($canViewReports || $isClient) && $options['users'] && !$grouping_by_user)
       $sort_part .= ', user, type';
     if ($options['show_start'])
       $sort_part .= ', unformatted_start';
@@ -333,13 +348,16 @@ static function getItems($options) {
         if ('.' != $user->decimal_mark)
           $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
       }
+// CODING STOPPED RIGHT HERE replace with a combined key...
       if ('no_grouping' != $group_by_option) {
         $val['grouped_by'] = $val[$group_by_option];
         if ('date' == $group_by_option) {
           // This is needed to get the date in user date format.
-          $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
-          $val['grouped_by'] = $o_date->toString($user->date_format);
-          unset($o_date);
+          //$o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
+          //$val['grouped_by'] = $o_date->toString($user->date_format);
+          //unset($o_date);
+
+          $val['grouped_by'] = ttDateToUserFormat($val['grouped_by']);
         }
       }
 
@@ -1063,6 +1081,8 @@ static function getReportOptions($bean) {
     $options['show_work_units'] = $bean->getAttribute('chunits');
     $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
     $options['group_by1'] = $bean->getAttribute('group_by1');
+    $options['group_by2'] = $bean->getAttribute('group_by2');
+    $options['group_by3'] = $bean->getAttribute('group_by3');
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 818b42753..54df5f942 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.01.4328 | 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.01.4329 | 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>

From a2c9be17652110a021c2a6ab867ad78ecd1bcc2d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Oct 2018 13:14:09 +0000
Subject: [PATCH 0239/1848] A bit of refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 15 ++-------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 280b70dbe..0b8dc83cd 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -352,19 +352,11 @@ static function getItems($options) {
       if ('no_grouping' != $group_by_option) {
         $val['grouped_by'] = $val[$group_by_option];
         if ('date' == $group_by_option) {
-          // This is needed to get the date in user date format.
-          //$o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
-          //$val['grouped_by'] = $o_date->toString($user->date_format);
-          //unset($o_date);
-
           $val['grouped_by'] = ttDateToUserFormat($val['grouped_by']);
         }
       }
 
-      // This is needed to get the date in user date format.
-      $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
-      $val['date'] = $o_date->toString($user->date_format);
-      unset($o_date);
+      $val['date'] = ttDateToUserFormat($val['date']);
 
       $row = $val;
       $report_items[] = $row;
@@ -538,10 +530,7 @@ static function getSubtotals($options) {
 
     while ($val = $res->fetchRow()) {
       if ('date' == $group_by_option) {
-        // This is needed to get the date in user date format.
-        $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
-        $val['group_field'] = $o_date->toString($user->date_format);
-        unset($o_date);
+        $val['group_field'] = ttDateToUserFormat($val['group_field']);
       }
       $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
       if ($options['show_cost']) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 54df5f942..5fe882778 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.01.4329 | 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.01.4330 | 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>

From 75f676a0c24fc8593c94ba3fedd366a99fe45a93 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Oct 2018 14:19:52 +0000
Subject: [PATCH 0240/1848] Refactored ttReportHelper::getItems for multiple
 group by condition.

---
 WEB-INF/lib/ttReportHelper.class.php | 39 +++++++++++++++++++++-------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 0b8dc83cd..e80e7d03c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -348,18 +348,11 @@ static function getItems($options) {
         if ('.' != $user->decimal_mark)
           $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
       }
-// CODING STOPPED RIGHT HERE replace with a combined key...
-      if ('no_grouping' != $group_by_option) {
-        $val['grouped_by'] = $val[$group_by_option];
-        if ('date' == $group_by_option) {
-          $val['grouped_by'] = ttDateToUserFormat($val['grouped_by']);
-        }
-      }
 
+      if (!$no_grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val);
       $val['date'] = ttDateToUserFormat($val['date']);
 
-      $row = $val;
-      $report_items[] = $row;
+      $report_items[] = $val;
     }
 
     return $report_items;
@@ -1096,4 +1089,32 @@ static function verifyBean($bean) {
     // TODO: add additional checks here. Perhaps do it before saving the bean for consistency.
     return true;
   }
+
+  // makeGroupByKey - builds a combined group by key from group_by1, group_by2 and group_by3 values
+  // (passed in $options) and a row of data ($row obtained from a db query).
+  static function makeGroupByKey($options, $row) {
+    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
+      // We have group_by1.
+      $group_by1 = $options['group_by1'];
+      $group_by1_value = $row[$group_by1];
+      if ($group_by1 == 'date') $group_by1_value = ttDateToUserFormat($group_by1_value);
+      $group_by_key .= ' - '.$group_by1_value;
+    }
+    if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
+      // We have group_by2.
+      $group_by2 = $options['group_by2'];
+      $group_by2_value = $row[$group_by2];
+      if ($group_by2 == 'date') $group_by2_value = ttDateToUserFormat($group_by2_value);
+      $group_by_key .= ' - '.$group_by2_value;
+    }
+    if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
+      // We have group_by3.
+      $group_by3 = $options['group_by3'];
+      $group_by3_value = $row[$group_by3];
+      if ($group_by3 == 'date') $group_by3_value = ttDateToUserFormat($group_by3_value);
+      $group_by_key .= ' - '.$group_by3_value;
+    }
+    $group_by_key = trim($group_by_key, ' -');
+    return $group_by_key;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5fe882778..81f2623ed 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.01.4330 | 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.01.4331 | 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>

From e99d8df6059bacd85be829c9a369f6a1e2994882 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Oct 2018 14:51:31 +0000
Subject: [PATCH 0241/1848] Added user input check for multiple group by.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 81f2623ed..d261f0815 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.01.4331 | 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.01.4332 | 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/reports.php b/reports.php
index 39f09c0b4..cba099160 100644
--- a/reports.php
+++ b/reports.php
@@ -338,6 +338,13 @@
       if ($start_date->compare($end_date) > 0)
         $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
     }
+    $group_by1 = $bean->getAttribute('group_by1');
+    $group_by2 = $bean->getAttribute('group_by2');
+    $group_by3 = $bean->getAttribute('group_by3');
+    if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
+      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+    if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
+      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
     // Check remaining values.
     if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
 

From 405a3dc75eaf770313b2da57bc25088e5c6e76bd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Oct 2018 16:13:22 +0000
Subject: [PATCH 0242/1848] Initial attempt to refactor
 ttReportHelper::getSubtotals to use multiple group by.

---
 WEB-INF/lib/ttReportHelper.class.php | 503 ++++++++++++++++++++++-----
 WEB-INF/templates/footer.tpl         |   2 +-
 report.php                           |   4 +-
 tofile.php                           |   9 +-
 topdf.php                            |  12 +-
 5 files changed, 430 insertions(+), 100 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index e80e7d03c..454b437df 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -397,51 +397,20 @@ static function getFromSession() {
   static function getSubtotals($options) {
     global $user;
 
-    $group_by_option = $options['group_by1'];
-    if ('no_grouping' == $group_by_option) return null;
+    $group_fields = ttReportHelper::makeGroupByFieldsPart($options);
+    if (!$group_fields) return null;
 
     $mdb2 = getConnection();
 
-    // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.
-
-    // Determine group by field and a required join.
-    switch ($group_by_option) {
-      case 'date':
-        $group_field = 'l.date';
-        $group_join = '';
-        break;
-      case 'user':
-        $group_field = 'u.name';
-        $group_join = 'left join tt_users u on (l.user_id = u.id) ';
-        break;
-      case 'client':
-        $group_field = 'c.name';
-        $group_join = 'left join tt_clients c on (l.client_id = c.id) ';
-        break;
-      case 'project':
-        $group_field = 'p.name';
-        $group_join = 'left join tt_projects p on (l.project_id = p.id) ';
-        break;
-      case 'task':
-        $group_field = 't.name';
-        $group_join = 'left join tt_tasks t on (l.task_id = t.id) ';
-        break;
-      case 'cf_1':
-        $group_field = 'cfo.value';
-        $custom_fields = new CustomFields($user->group_id);
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
-        break;
-    }
-
+    $concat_part = ttReportHelper::makeConcatPart($options);
+    $join_part = ttReportHelper::makeJoinPart($options);
     $where = ttReportHelper::getWhere($options);
+    $group_by_part = ttReportHelper::makeGroupByPart($options);
     if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
-        if ($group_by_option != 'user')
+        if (!ttReportHelper::groupingByUser($options))
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
         if ($options['show_work_units']) {
           if ($user->unit_totals_only)
             $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
@@ -450,10 +419,10 @@ static function getSubtotals($options) {
         }
         $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
-          $group_join $left_join $where group by $group_field";
+          $join_part $left_join $where $group_by_part";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
         if ($options['show_work_units']) {
           if ($user->unit_totals_only)
             $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
@@ -462,11 +431,12 @@ static function getSubtotals($options) {
         }
         $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l 
-          $group_join
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
+          $join_part
+          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where $group_by_part";
       }
-    } else {
-      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+    }  else {
+      // $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+      $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
       if ($options['show_work_units']) {
         if ($user->unit_totals_only)
           $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
@@ -474,41 +444,20 @@ static function getSubtotals($options) {
           $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
       }
       $sql .= ", null as expenses from tt_log l 
-        $group_join $where group by $group_field";
+        $join_part $where $group_by_part";
     }
     // By now we have sql for time items.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
-      // Determine group by field and a required join.
-      $group_join = null;
-      $group_field = 'null';
-      switch ($group_by_option) {
-        case 'date':
-          $group_field = 'ei.date';
-          $group_join = '';
-          break;
-        case 'user':
-          $group_field = 'u.name';
-          $group_join = 'left join tt_users u on (ei.user_id = u.id) ';
-          break;
-        case 'client':
-          $group_field = 'c.name';
-          $group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
-          break;
-        case 'project':
-          $group_field = 'p.name';
-          $group_join = 'left join tt_projects p on (ei.project_id = p.id) ';
-          break;
-      }
-
+      $concat_part = ttReportHelper::makeConcatExpensesPart($options);
+      $join_part = ttReportHelper::makeJoinExpensesPart($options);
       $where = ttReportHelper::getExpenseWhere($options);
-      $sql_for_expenses = "select $group_field as group_field, null as time";
+      $group_by_part = ttReportHelper::makeGroupByExpensesPart($options);
+      $sql_for_expenses = "select $concat_part, null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";
-      // Add a "group by" clause if we are grouping.
-      if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
+      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_part";
 
       // Create a combined query.
       $combined = "select group_field, sum(time) as time";
@@ -520,11 +469,12 @@ static function getSubtotals($options) {
     // Execute query.
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
-
     while ($val = $res->fetchRow()) {
-      if ('date' == $group_by_option) {
-        $val['group_field'] = ttDateToUserFormat($val['group_field']);
-      }
+// TODO: consider writing a function that properly formats a date part in a multi-part key.
+//
+//      if ('date' == $group_by_option) {
+//        $val['group_field'] = ttDateToUserFormat($val['group_field']);
+//      }
       $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
       if ($options['show_cost']) {
         if ('.' != $user->decimal_mark) {
@@ -1090,31 +1040,426 @@ static function verifyBean($bean) {
     return true;
   }
 
-  // makeGroupByKey - builds a combined group by key from group_by1, group_by2 and group_by3 values
+  // makeGroupByKey builds a combined group by key from group_by1, group_by2 and group_by3 values
   // (passed in $options) and a row of data ($row obtained from a db query).
   static function makeGroupByKey($options, $row) {
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
       $group_by1_value = $row[$group_by1];
-      if ($group_by1 == 'date') $group_by1_value = ttDateToUserFormat($group_by1_value);
+      //if ($group_by1 == 'date') $group_by1_value = ttDateToUserFormat($group_by1_value);
+      if (empty($group_by1_value)) $group_by1_value = 'Null'; // To match what comes out of makeConcatPart.
       $group_by_key .= ' - '.$group_by1_value;
     }
     if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
       // We have group_by2.
       $group_by2 = $options['group_by2'];
       $group_by2_value = $row[$group_by2];
-      if ($group_by2 == 'date') $group_by2_value = ttDateToUserFormat($group_by2_value);
+      //if ($group_by2 == 'date') $group_by2_value = ttDateToUserFormat($group_by2_value);
+      if (empty($group_by2_value)) $group_by2_value = 'Null'; // To match what comes out of makeConcatPart.
       $group_by_key .= ' - '.$group_by2_value;
     }
     if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
       // We have group_by3.
       $group_by3 = $options['group_by3'];
       $group_by3_value = $row[$group_by3];
-      if ($group_by3 == 'date') $group_by3_value = ttDateToUserFormat($group_by3_value);
+      //if ($group_by3 == 'date') $group_by3_value = ttDateToUserFormat($group_by3_value);
+      if (empty($group_by3_value)) $group_by3_value = 'Null'; // To match what comes out of makeConcatPart.
       $group_by_key .= ' - '.$group_by3_value;
     }
     $group_by_key = trim($group_by_key, ' -');
     return $group_by_key;
   }
+
+  // makeGroupByPart builds a combined group by part for sql query for time items using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByPart($options) {
+    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
+      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
+      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
+    if ($no_grouping) return null;
+
+    $group_by1 = $options['group_by1'];
+    $group_by2 = $options['group_by2'];
+    $group_by3 = $options['group_by3'];
+
+    switch ($group_by1) {
+      case 'date':
+        $group_by_parts .= ', l.date';
+        break;
+      case 'user':
+        $group_by_parts .= ', u.name';
+        break;
+      case 'client':
+        $group_by_parts .= ', c.name';
+        break;
+      case 'project':
+        $group_by_parts .= ', p.name';
+        break;
+      case 'task':
+        $group_by_parts .= ', t.name';
+        break;
+      case 'cf_1':
+        $group_by_parts .= ', cfo.value';
+        break;
+    }
+    switch ($group_by2) {
+      case 'date':
+        $group_by_parts .= ', l.date';
+        break;
+      case 'user':
+        $group_by_parts .= ', u.name';
+        break;
+      case 'client':
+        $group_by_parts .= ', c.name';
+        break;
+      case 'project':
+        $group_by_parts .= ', p.name';
+        break;
+      case 'task':
+        $group_by_parts .= ', t.name';
+        break;
+      case 'cf_1':
+        $group_by_parts .= ', cfo.value';
+        break;
+    }
+    switch ($group_by3) {
+      case 'date':
+        $group_by_parts .= ', l.date';
+        break;
+      case 'user':
+        $group_by_parts .= ', u.name';
+        break;
+      case 'client':
+        $group_by_parts .= ', c.name';
+        break;
+      case 'project':
+        $group_by_parts .= ', p.name';
+        break;
+      case 'task':
+        $group_by_parts .= ', t.name';
+        break;
+      case 'cf_1':
+        $group_by_parts .= ', cfo.value';
+        break;
+    }
+    // Remove garbage from the beginning.
+    $group_by_parts = ltrim($group_by_parts, ', ');
+    $group_by_part = "group by $group_by_parts";
+    return $group_by_part;
+  }
+
+  // makeGroupByExpensesPart builds a combined group by part for sql query for expense items using
+  // group_by1, group_by2, and group_by3 values passed in $options.
+  static function makeGroupByExpensesPart($options) {
+    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
+      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
+      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
+    if ($no_grouping) return null;
+
+    $group_by1 = $options['group_by1'];
+    $group_by2 = $options['group_by2'];
+    $group_by3 = $options['group_by3'];
+
+    switch ($group_by1) {
+      case 'date':
+        $group_by_parts .= ', ei.date';
+        break;
+      case 'user':
+        $group_by_parts .= ', u.name';
+        break;
+      case 'client':
+        $group_by_parts .= ', c.name';
+        break;
+      case 'project':
+        $group_by_parts .= ', p.name';
+        break;
+    }
+    switch ($group_by2) {
+      case 'date':
+        $group_by_parts .= ', ei.date';
+        break;
+      case 'user':
+        $group_by_parts .= ', u.name';
+        break;
+      case 'client':
+        $group_by_parts .= ', c.name';
+        break;
+      case 'project':
+        $group_by_parts .= ', p.name';
+        break;
+    }
+    switch ($group_by3) {
+      case 'date':
+        $group_by_parts .= ', ei.date';
+        break;
+      case 'user':
+        $group_by_parts .= ', u.name';
+        break;
+      case 'client':
+        $group_by_parts .= ', c.name';
+        break;
+      case 'project':
+        $group_by_parts .= ', p.name';
+        break;
+    }
+    // Remove garbage from the beginning.
+    $group_by_parts = ltrim($group_by_parts, ', ');
+    $group_by_part = "group by $group_by_parts";
+    return $group_by_part;
+  }
+
+  // makeConcatPart builds a concatenation part for getSubtotals query (for time items).
+  static function makeConcatPart($options) {
+    $group_by1 = $options['group_by1'];
+    $group_by2 = $options['group_by2'];
+    $group_by3 = $options['group_by3'];
+
+    switch ($group_by1) {
+      case 'date':
+        $what_to_concat .= ", ' - ', l.date";
+        break;
+      case 'user':
+        $what_to_concat .= ", ' - ', u.name";
+        break;
+      case 'client':
+        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        break;
+      case 'project':
+        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        break;
+      case 'task':
+        $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
+        break;
+      case 'cf_1':
+        $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
+        break;
+    }
+    switch ($group_by2) {
+      case 'date':
+        $what_to_concat .= ", ' - ', l.date";
+        break;
+      case 'user':
+        $what_to_concat .= ", ' - ', u.name";
+        break;
+      case 'client':
+        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        break;
+      case 'project':
+        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        break;
+      case 'task':
+        $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
+        break;
+      case 'cf_1':
+        $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
+        break;
+    }
+    switch ($group_by3) {
+      case 'date':
+        $what_to_concat .= ", ' - ', l.date";
+        break;
+      case 'user':
+        $what_to_concat .= ", ' - ', u.name";
+        break;
+      case 'client':
+        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        break;
+      case 'project':
+        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        break;
+      case 'task':
+        $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
+        break;
+      case 'cf_1':
+        $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
+        break;
+    }
+    // Remove garbage from both ends.
+    $what_to_concat = trim($what_to_concat, "', -");
+    $concat_part = "concat($what_to_concat) as group_field";
+    $concat_part = trim($concat_part, ' -');
+    return $concat_part;
+  }
+
+  // makeConcatPart builds a concatenation part for getSubtotals query (for expense items).
+  static function makeConcatExpensesPart($options) {
+    $group_by1 = $options['group_by1'];
+    $group_by2 = $options['group_by2'];
+    $group_by3 = $options['group_by3'];
+
+    switch ($group_by1) {
+      case 'date':
+        $what_to_concat .= ", ' - ', ei.date";
+        break;
+      case 'user':
+        $what_to_concat .= ", ' - ', u.name";
+        break;
+      case 'client':
+        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        break;
+      case 'project':
+        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        break;
+    }
+    switch ($group_by2) {
+      case 'date':
+        $what_to_concat .= ", ' - ', ei.date";
+        break;
+      case 'user':
+        $what_to_concat .= ", ' - ', u.name";
+        break;
+      case 'client':
+        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        break;
+      case 'project':
+        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        break;
+    }
+    switch ($group_by3) {
+      case 'date':
+        $what_to_concat .= ", ' - ', ei.date";
+        break;
+      case 'user':
+        $what_to_concat .= ", ' - ', u.name";
+        break;
+      case 'client':
+        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        break;
+      case 'project':
+        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        break;
+    }
+    // Remove garbage from both ends.
+    $what_to_concat = trim($what_to_concat, "', -");
+    $concat_part = "concat($what_to_concat) as group_field";
+    $concat_part = trim($concat_part, ' -');
+    return $concat_part;
+  }
+
+  // makeJoinPart builds a left join part for getSubtotals query (for time items).
+  static function makeJoinPart($options) {
+    global $custom_fields; // TODO: is it safe to assume the object is there when needed?
+
+    $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
+    if (strpos($group_by_fields, 'user') !== false) {
+      // Grouping by user, add a join on tt_users table.
+      $join .= ' left join tt_users u on (l.user_id = u.id)';
+    }
+    if (strpos($group_by_fields, 'client') !== false) {
+      // Grouping by client, add a join on tt_clients table.
+      $join .= ' left join tt_clients c on (l.client_id = c.id)';
+    }
+    if (strpos($group_by_fields, 'project') !== false) {
+      // Grouping by project, add a join on tt_projects table.
+      $join .= ' left join tt_projects p on (l.project_id = p.id)';
+    }
+    if (strpos($group_by_fields, 'task') !== false) {
+      // Grouping by task, add a join on tt_tasks table.
+      $join .= ' left join tt_tasks t on (l.task_id = t.id)';
+    }
+    if (strpos($group_by_fields, 'cf_1') !== false) {
+      // Grouping by custom field 1, add a join for it.
+      // $custom_fields = new CustomFields($user->group_id);
+      if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+        $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
+      elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+        $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)';
+    }
+    return $join;
+  }
+
+  // makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
+  static function makeJoinExpensesPart($options) {
+    $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
+    if (strpos($group_by_fields, 'user') !== false) {
+      // Grouping by user, add a join on tt_users table.
+      $join .= ' left join tt_users u on (ei.user_id = u.id)';
+    }
+    if (strpos($group_by_fields, 'client') !== false) {
+      // Grouping by client, add a join on tt_clients table.
+      $join .= ' left join tt_clients c on (ei.client_id = c.id)';
+    }
+    if (strpos($group_by_fields, 'project') !== false) {
+      // Grouping by project, add a join on tt_projects table.
+      $join .= ' left join tt_projects p on (ei.project_id = p.id)';
+    }
+    return $join;
+  }
+  
+  // makeGroupByFieldsPart builds a commma-separated list of fields for sql query using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByFieldsPart($options) {
+    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
+      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
+      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
+    if ($no_grouping) return null;
+
+    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
+      // We have group_by1.
+      $group_by_fields .= ', '.$options['group_by1'];
+    }
+    if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
+      // We have group_by2.
+      $group_by_fields .= ', '.$options['group_by2'];
+    }
+    if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
+      // We have group_by3.
+      $group_by_fields .= ', '.$options['group_by3'];
+    }
+    $group_by_fields = ltrim($group_by_fields, ', ');
+    return $group_by_fields;
+  }
+
+  // groupingByUser determines if we are grouping a report by user.
+  static function groupingByUser($options) {
+    if ($options['group_by1'] == 'user' || $options['group_by2'] == 'user' || $options['group_by3'] == 'user') return true;
+
+    return false;
+  }
+
+  // makeGroupByHeader builds a column header for a totals-only report using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByHeader($options) {
+    global $i18n;
+    global $custom_fields;
+
+    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
+      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
+      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
+    if ($no_grouping) return null;
+
+    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
+      // We have group_by1.
+      $group_by1 = $options['group_by1'];
+      if ('cf_1' == $group_by1)
+        $group_by_header .= ' - '.$custom_fields->fields[0]['label'];
+      else {
+        $key = 'label.'.$group_by1;
+        $group_by_header .= ' - '.$i18n->get($key);
+      }
+    }
+    if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
+      // We have group_by2.
+      $group_by2 = $options['group_by2'];
+      if ('cf_1' == $group_by2)
+        $group_by_header .= ' - '.$custom_fields->fields[0]['label'];
+      else {
+        $key = 'label.'.$group_by2;
+        $group_by_header .= ' - '.$i18n->get($key);
+      }
+    }
+    if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
+      // We have group_by3.
+      $group_by3 = $options['group_by3'];
+      if ('cf_1' == $group_by3)
+        $group_by_header .= ' - '.$custom_fields->fields[0]['label'];
+      else {
+        $key = 'label.'.$group_by3;
+        $group_by_header .= ' - '.$i18n->get($key);
+      }
+    }
+    $group_by_header = ltrim($group_by_header, ' -');
+    return $group_by_header;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d261f0815..7b0a56e40 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.01.4332 | 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.02.4333 | 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/report.php b/report.php
index efbaccea8..5f7e687bf 100644
--- a/report.php
+++ b/report.php
@@ -192,12 +192,14 @@
 }
 // Determine group by header.
 if ('no_grouping' != $group_by) {
+  /*
   if ('cf_1' == $group_by)
     $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
   else {
     $key = 'label.'.$group_by;
     $smarty->assign('group_by_header', $i18n->get($key));
-  }
+  } */
+  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 }
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
diff --git a/tofile.php b/tofile.php
index 42b734338..d996098b7 100644
--- a/tofile.php
+++ b/tofile.php
@@ -164,14 +164,7 @@
   $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
     // Totals only report.
-
-    // Determine group_by header.
-    if ('cf_1' == $group_by1)
-      $group_by_header = $custom_fields->fields[0]['label'];
-    else {
-      $key = 'label.'.$group_by1;
-      $group_by_header = $i18n->get($key);
-    }
+    $group_by_header = ttReportHelper::makeGroupByHeader($options);
 
     // Print headers.
     print '"'.$group_by_header.'"';
diff --git a/topdf.php b/topdf.php
index 7d3fa0096..0040c7be9 100644
--- a/topdf.php
+++ b/topdf.php
@@ -62,17 +62,6 @@
 // is grouped by either date, user, client, project, task or cf_1 and user only needs to see subtotals by group.
 $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
 
-// Determine group by header.
-$group_by1 = $bean->getAttribute('group_by1');
-if ('no_grouping' != $group_by1) {
-  if ('cf_1' == $group_by1)
-    $group_by_header = $custom_fields->fields[0]['label'];
-  else {
-    $key = 'label.'.$group_by1;
-    $group_by_header = $i18n->get($key);
-  }
-}
-
 // Obtain items for report.
 $options = ttReportHelper::getReportOptions($bean);
 if (!$totals_only)
@@ -104,6 +93,7 @@
 
 if ($totals_only) {
   // We are building a "totals only" report with only subtotals and total.
+  $group_by_header = ttReportHelper::makeGroupByHeader($options);
   $colspan = 1; // Column span for an empty row.
   // Table header.
   $html .= '<thead>';

From 3be2bc61911ea52fb39774f7e569f7f9f2552b58 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Oct 2018 16:17:54 +0000
Subject: [PATCH 0243/1848] Initial release of multiple group by in reports.

---
 WEB-INF/config.php.dist      | 3 ---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 6 ++----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 1fd74cce8..1218f7f65 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -207,6 +207,3 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
-
-// A temporary config option while development on multiple grouping in reports is ongoing. To be removed when done.
-// define('MULTIPLE_GROUP_BY_DEBUG', false);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7b0a56e40..f2bf5b5e5 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.02.4333 | 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.03.4334 | 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/reports.php b/reports.php
index cba099160..ae7f552cb 100644
--- a/reports.php
+++ b/reports.php
@@ -234,10 +234,8 @@
 }
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
-if (defined('MULTIPLE_GROUP_BY_DEBUG') && isTrue(MULTIPLE_GROUP_BY_DEBUG)) {
-  if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options));
-  if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options));
-}
+if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options));
+if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options));
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.

From 7562c5b6d68929eb4787749f8c10dc032ee9a1c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 31 Oct 2018 01:22:43 +0000
Subject: [PATCH 0244/1848] Fixed a condition that determines grouping for
 getting subtotals.

---
 WEB-INF/lib/ttReportHelper.class.php | 9 +++++++++
 WEB-INF/templates/footer.tpl         | 2 +-
 report.php                           | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 454b437df..3940a51b7 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1411,6 +1411,15 @@ static function makeGroupByFieldsPart($options) {
     return $group_by_fields;
   }
 
+  // grouping determines if we are grooping the project by either group_by1,
+  // group_by2, or group_by3 values passed in $options.
+  static function grouping($options) {
+    $grouping = ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ||
+      ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') ||
+      ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping');
+    return $grouping;
+  }
+
   // groupingByUser determines if we are grouping a report by user.
   static function groupingByUser($options) {
     if ($options['group_by1'] == 'user' || $options['group_by2'] == 'user' || $options['group_by3'] == 'user') return true;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f2bf5b5e5..be04ad962 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.03.4334 | 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.03.4335 | 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/report.php b/report.php
index 5f7e687bf..f6abcc4c6 100644
--- a/report.php
+++ b/report.php
@@ -178,7 +178,7 @@
 if ($request->isGet() && $user->isPluginEnabled('ps'))
   ttReportHelper::putInSession($report_items);
 
-if ('no_grouping' != $group_by)
+if (ttReportHelper::grouping($options))
   $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
 

From 5403806f9c5e87add5a1594835018125a5ed0b0b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 31 Oct 2018 12:40:28 +0000
Subject: [PATCH 0245/1848] Improved visibility of Totals only checkbox on
 reports.php for multiple group by.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/reports.tpl | 6 ++++--
 reports.php                   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index be04ad962..1a52dda6e 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.03.4335 | 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.03.4336 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index feb5800fe..418c172a3 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -138,8 +138,10 @@ function selectAssignedUsers(project_id) {
 function handleCheckboxes() {
   var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
   var totalsOnlyLabel = document.getElementById("totals_only_label");
-  if ("no_grouping" == document.getElementById("group_by1").value) {
-    // Unmark and disable the "Totals only" checkbox.
+  if ("no_grouping" == document.getElementById("group_by1").value
+      && "no_grouping" == document.getElementById("group_by2").value
+      && "no_grouping" == document.getElementById("group_by3").value) {
+    // Unmark and hide the "Totals only" checkbox.
     totalsOnlyCheckbox.checked = false;
     totalsOnlyCheckbox.style.visibility = "hidden";
     totalsOnlyLabel.style.visibility = "hidden";
diff --git a/reports.php b/reports.php
index ae7f552cb..31028f2f2 100644
--- a/reports.php
+++ b/reports.php
@@ -234,8 +234,8 @@
 }
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
-if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options));
-if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options));
+if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
+if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.

From f9e704d00a2d21b1a94332e088f78c22da03d37c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 31 Oct 2018 13:35:35 +0000
Subject: [PATCH 0246/1848] Improved the script that shows the Totals only
 checkbox.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/reports.tpl | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a52dda6e..bc3b468e3 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.03.4336 | 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.03.4337 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 418c172a3..95b4a4364 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -134,20 +134,28 @@ function selectAssignedUsers(project_id) {
 }
 
 // handleCheckboxes - unmarks and hides the "Totals only" checkbox when
-// "no grouping" is selected in the associated dropdown.
+// "no grouping" is selected in the associated group by dropdowns.
 function handleCheckboxes() {
   var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
   var totalsOnlyLabel = document.getElementById("totals_only_label");
-  if ("no_grouping" == document.getElementById("group_by1").value
-      && "no_grouping" == document.getElementById("group_by2").value
-      && "no_grouping" == document.getElementById("group_by3").value) {
+  var groupBy1 = document.getElementById("group_by1");
+  var groupBy2 = document.getElementById("group_by2");
+  var groupBy3 = document.getElementById("group_by3");
+  var grouping = false;
+  if ((groupBy1 != null && "no_grouping" != groupBy1.value) ||
+      (groupBy2 != null && "no_grouping" != groupBy2.value) ||
+      (groupBy3 != null && "no_grouping" != groupBy3.value)) {
+    grouping = true;
+  }
+  if (grouping) {
+    // Show the "Totals only" checkbox.
+    totalsOnlyCheckbox.style.visibility = "visible";
+    totalsOnlyLabel.style.visibility = "visible";
+  } else {
     // Unmark and hide the "Totals only" checkbox.
     totalsOnlyCheckbox.checked = false;
     totalsOnlyCheckbox.style.visibility = "hidden";
     totalsOnlyLabel.style.visibility = "hidden";
-  } else {
-    totalsOnlyCheckbox.style.visibility = "visible";
-    totalsOnlyLabel.style.visibility = "visible";
   }
 }
 </script>

From 913eba1427598741fcfb8d1e53746923c1f9e0e4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 31 Oct 2018 17:08:48 +0000
Subject: [PATCH 0247/1848] Fixed date format in Totals only reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 54 ++++++++++++++++++++--------
 WEB-INF/templates/footer.tpl         |  2 +-
 topdf.php                            |  2 +-
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 3940a51b7..7a4ba2664 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -127,9 +127,7 @@ static function getItems($options) {
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
-    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
-                   ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
-                   ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
+    $grouping = ttReportHelper::grouping($options);
     $grouping_by_date = ($options['group_by1'] == 'date'|| $options['group_by2'] == 'date' || $options['group_by3'] == 'date');
     $grouping_by_client = ($options['group_by1'] == 'client'|| $options['group_by2'] == 'client' || $options['group_by3'] == 'client');
     $grouping_by_project = ($options['group_by1'] == 'project'|| $options['group_by2'] == 'project' || $options['group_by3'] == 'project');
@@ -311,14 +309,14 @@ static function getItems($options) {
 
     // Determine sort part.
     $sort_part = ' order by ';
-    if ($no_grouping)
-      $sort_part .= 'date';
-    else {
+    if ($grouping) {
       $sort_part2 .= ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ? ', '.$options['group_by1'] : '';
       $sort_part2 .= ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') ? ', '.$options['group_by2'] : '';
       $sort_part2 .= ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') ? ', '.$options['group_by3'] : '';
       if (!$grouping_by_date) $sort_part2 .= ', date';
       $sort_part .= ltrim($sort_part2, ', '); // Remove leading comma and space.
+    } else {
+      $sort_part .= 'date';
     }
     if (($canViewReports || $isClient) && $options['users'] && !$grouping_by_user)
       $sort_part .= ', user, type';
@@ -349,7 +347,7 @@ static function getItems($options) {
           $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
       }
 
-      if (!$no_grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val);
+      if ($grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val);
       $val['date'] = ttDateToUserFormat($val['date']);
 
       $report_items[] = $val;
@@ -476,14 +474,15 @@ static function getSubtotals($options) {
 //        $val['group_field'] = ttDateToUserFormat($val['group_field']);
 //      }
       $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+      $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
       if ($options['show_cost']) {
         if ('.' != $user->decimal_mark) {
           $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
           $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
         }
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']);
       } else
-        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'time'=>$time, 'units'=> $val['units']);
     }
 
     return $subtotals;
@@ -1074,10 +1073,7 @@ static function makeGroupByKey($options, $row) {
   // makeGroupByPart builds a combined group by part for sql query for time items using group_by1,
   // group_by2, and group_by3 values passed in $options.
   static function makeGroupByPart($options) {
-    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
-      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
-      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
-    if ($no_grouping) return null;
+    if (!ttReportHelper::grouping($options)) return null;
 
     $group_by1 = $options['group_by1'];
     $group_by2 = $options['group_by2'];
@@ -1411,7 +1407,7 @@ static function makeGroupByFieldsPart($options) {
     return $group_by_fields;
   }
 
-  // grouping determines if we are grooping the project by either group_by1,
+  // grouping determines if we are grouping the report by either group_by1,
   // group_by2, or group_by3 values passed in $options.
   static function grouping($options) {
     $grouping = ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ||
@@ -1426,6 +1422,16 @@ static function groupingByUser($options) {
 
     return false;
   }
+  
+  // groupingBy determines if we are grouping a report by a value of $what
+  // ('user', 'project', etc.) by checking group_by1, group_by2, and group_by3
+  // values passed in $options.
+  static function groupingBy($what, $options) {
+    $grouping = ($options['group_by1'] != null && $options['group_by1'] != $what) ||
+      ($options['group_by2'] != null && $options['group_by2'] != $what) ||
+      ($options['group_by3'] != null && $options['group_by3'] != $what);
+    return $grouping;
+  }
 
   // makeGroupByHeader builds a column header for a totals-only report using group_by1,
   // group_by2, and group_by3 values passed in $options.
@@ -1471,4 +1477,24 @@ static function makeGroupByHeader($options) {
     $group_by_header = ltrim($group_by_header, ' -');
     return $group_by_header;
   }
+
+  // makeGroupByLabel builds a label for one row in a "Totals only" report of grouped by items.
+  // It does one thing: if we are grouping by date, the date format is converted for user.
+  static function makeGroupByLabel($key, $options) {
+    if (!ttReportHelper::groupingBy('date', $options))
+      return $key; // No need to format.
+
+    global $user;
+    if ($user->date_format == DB_DATEFORMAT)
+      return $key; // No need to format.
+
+    $label = $key;
+    if (preg_match('/\d\d\d\d-\d\d-\d\d/', $key, $matches)) {
+      // Replace the first found match of a date in DB_DATEFORMAT.
+      // This is not entirely clean but better than nothing for a label in a row.
+      $userDate = ttDateToUserFormat($matches[0]);
+      $label = str_replace($matches[0], $userDate, $key);
+    }
+    return $label;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bc3b468e3..d8a4447fc 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.03.4337 | 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.04.4338 | 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/topdf.php b/topdf.php
index 0040c7be9..23f29d508 100644
--- a/topdf.php
+++ b/topdf.php
@@ -66,7 +66,7 @@
 $options = ttReportHelper::getReportOptions($bean);
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
-if ($totals_only || 'no_grouping' != $group_by1)
+if ($totals_only || ttReportHelper::grouping($options))
   $subtotals = ttReportHelper::getSubtotals($options); // Subtotals for groups of items.
 $totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 

From 3297bc03f58074f5b688d867f3477e6af47d73de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 31 Oct 2018 18:31:50 +0000
Subject: [PATCH 0248/1848] Fixed creation of group by tag for XML report
 export.

---
 WEB-INF/lib/ttReportHelper.class.php | 24 +++++++++++++++++++-----
 WEB-INF/templates/footer.tpl         |  2 +-
 tofile.php                           |  9 +++++----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 7a4ba2664..60cac0790 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -468,11 +468,6 @@ static function getSubtotals($options) {
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
     while ($val = $res->fetchRow()) {
-// TODO: consider writing a function that properly formats a date part in a multi-part key.
-//
-//      if ('date' == $group_by_option) {
-//        $val['group_field'] = ttDateToUserFormat($val['group_field']);
-//      }
       $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
       $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
       if ($options['show_cost']) {
@@ -1478,6 +1473,25 @@ static function makeGroupByHeader($options) {
     return $group_by_header;
   }
 
+  // makeGroupByXmlTag creates an xml tag for a totals only report using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByXmlTag($options) {
+    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
+      // We have group_by1.
+      $tag .= '_'.$options['group_by1'];
+    }
+    if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
+      // We have group_by2.
+      $tag .= '_'.$options['group_by2'];
+    }
+    if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
+      // We have group_by3.
+      $tag .= '_'.$options['group_by3'];
+    }
+    $tag = ltrim($tag, '_');
+    return $tag;
+  }
+
   // makeGroupByLabel builds a label for one row in a "Totals only" report of grouped by items.
   // It does one thing: if we are grouping by date, the date format is converted for user.
   static function makeGroupByLabel($key, $options) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d8a4447fc..996c8dfce 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.04.4338 | 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.04.4339 | 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/tofile.php b/tofile.php
index d996098b7..07bbc11a6 100644
--- a/tofile.php
+++ b/tofile.php
@@ -84,12 +84,14 @@
   print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
   print "<rows>\n";
 
-  $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
-    // Totals only report. Print subtotals.
+    // Totals only report.
+    $group_by_tag = ttReportHelper::makeGroupByXmlTag($options);
+
+    // Print subtotals.
     foreach ($subtotals as $subtotal) {
       print "<row>\n";
-      print "\t<".$group_by1."><![CDATA[".$subtotal['name']."]]></".$group_by1.">\n";
+      print "\t<".$group_by_tag."><![CDATA[".$subtotal['name']."]]></".$group_by_tag.">\n";
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
         if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
@@ -161,7 +163,6 @@
   $bom = chr(239).chr(187).chr(191); // 0xEF 0xBB 0xBF in the beginning of the file is UTF8 BOM.
   print $bom; // Without this Excel does not display UTF8 characters properly.
 
-  $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
     // Totals only report.
     $group_by_header = ttReportHelper::makeGroupByHeader($options);

From 3b4f6b89a71f50d89d816129b27ee819a314620e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 31 Oct 2018 22:06:44 +0000
Subject: [PATCH 0249/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 4 +---
 WEB-INF/templates/footer.tpl  | 2 +-
 topdf.php                     | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 78dc1a206..5225d6763 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -93,9 +93,7 @@
 'error.no_groups' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw groep.',
 'error.upload' => 'Fout bij het uploaden van het bestand.',
 'error.range_locked' => 'Datums zijn geblokkeerd.',
-'error.mail_send' => 'Fout bij het versturen van een e-mailbericht.',
-// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
-// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
+'error.mail_send' => 'Fout bij het versturen van een e-mailbericht. Gebruik MAIL_SMTP_DEBUG om het probleem te diagnosticeren',
 'error.no_email' => 'Geen e-mailadres bekend voor dit account.',
 'error.uncompleted_exists' => 'Niet afgeronde invoer bestaat al. Sluit of verwijder deze.',
 'error.goto_uncompleted' => 'Ga naar onvolledige invoer.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 996c8dfce..c92fd1a92 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.04.4339 | 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.04.4340 | 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/topdf.php b/topdf.php
index 23f29d508..15ac1ee92 100644
--- a/topdf.php
+++ b/topdf.php
@@ -64,14 +64,15 @@
 
 // Obtain items for report.
 $options = ttReportHelper::getReportOptions($bean);
+$grouping = ttReportHelper::grouping($options);
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
-if ($totals_only || ttReportHelper::grouping($options))
+if ($totals_only || $grouping)
   $subtotals = ttReportHelper::getSubtotals($options); // Subtotals for groups of items.
 $totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.
-if ($items && 'no_grouping' != $group_by1) {
+if ($items && $grouping) {
   $print_subtotals = true;
   $first_pass = true;
   $prev_grouped_by = '';

From 6d706063e2f1c0555844c381ee98bd5a4a457d4e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 1 Nov 2018 18:13:07 +0000
Subject: [PATCH 0250/1848] Added an index on tt_custom_field_log for faster
 reporting, a few fixes.

---
 WEB-INF/lib/ttReportHelper.class.php | 82 +++++++++++++++++++++++-----
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         | 20 +++----
 dbinstall.php                        | 10 ++--
 mysql.sql                            |  4 +-
 report.php                           |  5 ++
 6 files changed, 92 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 60cac0790..85b2c8e9e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -395,9 +395,6 @@ static function getFromSession() {
   static function getSubtotals($options) {
     global $user;
 
-    $group_fields = ttReportHelper::makeGroupByFieldsPart($options);
-    if (!$group_fields) return null;
-
     $mdb2 = getConnection();
 
     $concat_part = ttReportHelper::makeConcatPart($options);
@@ -452,18 +449,18 @@ static function getSubtotals($options) {
       $concat_part = ttReportHelper::makeConcatExpensesPart($options);
       $join_part = ttReportHelper::makeJoinExpensesPart($options);
       $where = ttReportHelper::getExpenseWhere($options);
-      $group_by_part = ttReportHelper::makeGroupByExpensesPart($options);
+      $group_by_expenses_part = ttReportHelper::makeGroupByExpensesPart($options);
       $sql_for_expenses = "select $concat_part, null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_part";
-
+      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_expenses_part";
+//die($sql_for_expenses);
       // Create a combined query.
       $combined = "select group_field, sum(time) as time";
       if ($options['show_work_units']) $combined .= ", sum(units) as units";
       $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
       $sql = $combined;
     }
-
+//die($sql);
     // Execute query.
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
@@ -475,9 +472,9 @@ static function getSubtotals($options) {
           $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
           $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
         }
-        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
       } else
-        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'time'=>$time, 'units'=> $val['units']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time, 'units'=> $val['units']);
     }
 
     return $subtotals;
@@ -1196,7 +1193,8 @@ static function makeGroupByExpensesPart($options) {
     }
     // Remove garbage from the beginning.
     $group_by_parts = ltrim($group_by_parts, ', ');
-    $group_by_part = "group by $group_by_parts";
+    if ($group_by_parts)
+      $group_by_part = "group by $group_by_parts";
     return $group_by_part;
   }
 
@@ -1212,18 +1210,23 @@ static function makeConcatPart($options) {
         break;
       case 'user':
         $what_to_concat .= ", ' - ', u.name";
+        $fields_part .= ', u.name as user';
         break;
       case 'client':
         $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        $fields_part .= ', c.name as client';
         break;
       case 'project':
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        $fields_part .= ', p.name as project';
         break;
       case 'task':
         $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
+        $fields_part .= ', t.name as task';
         break;
       case 'cf_1':
         $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
+        $fields_part .= ', cfo.value as cf_1';
         break;
     }
     switch ($group_by2) {
@@ -1232,18 +1235,23 @@ static function makeConcatPart($options) {
         break;
       case 'user':
         $what_to_concat .= ", ' - ', u.name";
+        $fields_part .= ', u.name as user';
         break;
       case 'client':
         $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        $fields_part .= ', c.name as client';
         break;
       case 'project':
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        $fields_part .= ', p.name as project';
         break;
       case 'task':
         $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
+        $fields_part .= ', t.name as task';
         break;
       case 'cf_1':
         $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
+        $fields_part .= ', cfo.value as cf_1';
         break;
     }
     switch ($group_by3) {
@@ -1252,25 +1260,30 @@ static function makeConcatPart($options) {
         break;
       case 'user':
         $what_to_concat .= ", ' - ', u.name";
+        $fields_part .= ', u.name as user';
         break;
       case 'client':
         $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        $fields_part .= ', c.name as client';
         break;
       case 'project':
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        $fields_part .= ', p.name as project';
         break;
       case 'task':
         $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
+        $fields_part .= ', t.name as task';
         break;
       case 'cf_1':
         $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
+        $fields_part .= ', cfo.value as cf_1';
         break;
     }
     // Remove garbage from both ends.
     $what_to_concat = trim($what_to_concat, "', -");
     $concat_part = "concat($what_to_concat) as group_field";
     $concat_part = trim($concat_part, ' -');
-    return $concat_part;
+    return "$concat_part $fields_part";
   }
 
   // makeConcatPart builds a concatenation part for getSubtotals query (for expense items).
@@ -1285,12 +1298,25 @@ static function makeConcatExpensesPart($options) {
         break;
       case 'user':
         $what_to_concat .= ", ' - ', u.name";
+        $fields_part .= ', u.name as user';
         break;
       case 'client':
         $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        $fields_part .= ', c.name as client';
         break;
       case 'project':
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        $fields_part .= ', p.name as project';
+        break;
+
+      case 'task':
+        $what_to_concat .= ", ' - ', 'Null'";
+        $fields_part .= ', null as task';
+        break;
+
+      case 'cf_1':
+        $what_to_concat .= ", ' - ', 'Null'";
+        $fields_part .= ', null as cf_1';
         break;
     }
     switch ($group_by2) {
@@ -1299,12 +1325,25 @@ static function makeConcatExpensesPart($options) {
         break;
       case 'user':
         $what_to_concat .= ", ' - ', u.name";
+        $fields_part .= ', u.name as user';
         break;
       case 'client':
         $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        $fields_part .= ', c.name as client';
         break;
       case 'project':
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        $fields_part .= ', p.name as project';
+        break;
+
+      case 'task':
+        $what_to_concat .= ", ' - ', 'Null'";
+        $fields_part .= ', null as task';
+        break;
+
+      case 'cf_1':
+        $what_to_concat .= ", ' - ', 'Null'";
+        $fields_part .= ', null as cf_1';
         break;
     }
     switch ($group_by3) {
@@ -1313,19 +1352,32 @@ static function makeConcatExpensesPart($options) {
         break;
       case 'user':
         $what_to_concat .= ", ' - ', u.name";
+        $fields_part .= ', u.name as user';
         break;
       case 'client':
         $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
+        $fields_part .= ', c.name as client';
         break;
       case 'project':
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
+        $fields_part .= ', p.name as project';
+        break;
+
+      case 'task':
+        $what_to_concat .= ", ' - ', 'Null'";
+        $fields_part .= ', null as task';
+        break;
+
+      case 'cf_1':
+        $what_to_concat .= ", ' - ', 'Null'";
+        $fields_part .= ', null as cf_1';
         break;
     }
-    // Remove garbage from both ends.
-    $what_to_concat = trim($what_to_concat, "', -");
+    // Remove garbage from the beginning.
+    if ($what_to_concat)
+        $what_to_concat = substr($what_to_concat, 8);
     $concat_part = "concat($what_to_concat) as group_field";
-    $concat_part = trim($concat_part, ' -');
-    return $concat_part;
+    return "$concat_part $fields_part";
   }
 
   // makeJoinPart builds a left join part for getSubtotals query (for time items).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c92fd1a92..3cf6d4ae9 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.04.4340 | 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.05.4341 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 55438428c..0c98951f7 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -62,11 +62,11 @@
       {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
-        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
-        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
-        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
-        {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
+        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
+        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
+        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
+        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
+        {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['cf_1']|escape}</td>{/if}
         {if $bean->getAttribute('chstart')}<td></td>{/if}
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
@@ -114,11 +114,11 @@
   {if $print_subtotals}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
-    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
+    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
+    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
+    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
+    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['cf_1']|escape}</td>{/if}
     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
diff --git a/dbinstall.php b/dbinstall.php
index 097d2abe5..f6fd0c1b5 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,11 +956,13 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11800"]) {
+  if ($_POST["convert11797to11805"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
+    setChange("create index log_idx on tt_custom_field_log(log_id)");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.05', modified = now() where param_name = 'version_db' and param_value = '1.18.00'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1006,7 +1008,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.00)</b>
+    <td width="80%"><b>Create database structure (v1.18.05)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1051,8 +1053,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.00)</td>
-    <td><input type="submit" name="convert11797to11800" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.05)</td>
+    <td><input type="submit" name="convert11797to11805" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 07a2323a1..955f1b29c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -382,6 +382,8 @@ CREATE TABLE `tt_custom_field_log` (
   PRIMARY KEY  (`id`)
 );
 
+create index log_idx on tt_custom_field_log(log_id);
+
 
 #
 # Structure for table tt_expense_items.
@@ -456,4 +458,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.00', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.05', now()); # TODO: change when structure changes.
diff --git a/report.php b/report.php
index f6abcc4c6..28e086c4d 100644
--- a/report.php
+++ b/report.php
@@ -173,6 +173,8 @@
 $group_by = $bean->getAttribute('group_by1');
 
 $options = ttReportHelper::getReportOptions($bean);
+
+$group_by_tag = ttReportHelper::makeGroupByXmlTag($options);
 $report_items = ttReportHelper::getItems($options);
 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $user->isPluginEnabled('ps'))
@@ -201,6 +203,9 @@
   } */
   $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 }
+
+$smarty->assign('group_by', $group_by_tag);
+
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
 $smarty->assign('cur_date', '');

From 03c03896828d818303c12dfe2e368f5bd9e7dbae Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 1 Nov 2018 19:15:48 +0000
Subject: [PATCH 0251/1848] Improved output of grouped subtotals on reports by
 including grouped values.

---
 WEB-INF/lib/ttReportHelper.class.php | 78 ++++++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 85b2c8e9e..11f8841fe 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -453,14 +453,15 @@ static function getSubtotals($options) {
       $sql_for_expenses = "select $concat_part, null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
       $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_expenses_part";
-//die($sql_for_expenses);
+
       // Create a combined query.
-      $combined = "select group_field, sum(time) as time";
+      $fields = ttReportHelper::makeCombinedSelectPart($options);
+      $combined = "select $fields, sum(time) as time";
       if ($options['show_work_units']) $combined .= ", sum(units) as units";
-      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by $fields";
       $sql = $combined;
     }
-//die($sql);
+
     // Execute query.
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
@@ -1380,6 +1381,75 @@ static function makeConcatExpensesPart($options) {
     return "$concat_part $fields_part";
   }
 
+  // makeCombinedSelectPart builds a list of fields for a combined select on a union for getSubtotals.
+  // This is used when we include expenses.
+  static function makeCombinedSelectPart($options) {
+    $group_by1 = $options['group_by1'];
+    $group_by2 = $options['group_by2'];
+    $group_by3 = $options['group_by3'];
+
+    $fields = "group_field";
+
+    switch ($group_by1) {
+      case 'user':
+        $fields .= ', user';
+        break;
+      case 'client':
+        $fields_part .= ', client';
+        break;
+      case 'project':
+        $fields .= ', project';
+        break;
+
+      case 'task':
+        $fields .= ', task';
+        break;
+
+      case 'cf_1':
+        $fields .= ', cf_1';
+        break;
+    }
+    switch ($group_by2) {
+      case 'user':
+        $fields .= ', user';
+        break;
+      case 'client':
+        $fields_part .= ', client';
+        break;
+      case 'project':
+        $fields .= ', project';
+        break;
+
+      case 'task':
+        $fields .= ', task';
+        break;
+
+      case 'cf_1':
+        $fields .= ', cf_1';
+        break;
+    }
+    switch ($group_by3) {
+      case 'user':
+        $fields .= ', user';
+        break;
+      case 'client':
+        $fields_part .= ', client';
+        break;
+      case 'project':
+        $fields .= ', project';
+        break;
+
+      case 'task':
+        $fields .= ', task';
+        break;
+
+      case 'cf_1':
+        $fields .= ', cf_1';
+        break;
+    }
+    return $fields;
+  }
+
   // makeJoinPart builds a left join part for getSubtotals query (for time items).
   static function makeJoinPart($options) {
     global $custom_fields; // TODO: is it safe to assume the object is there when needed?
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3cf6d4ae9..af9a278a0 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.05.4341 | 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.05.4342 | 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>

From 2fb29ce0672acc8828496861db80f3cac32a49a1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 1 Nov 2018 19:46:45 +0000
Subject: [PATCH 0252/1848] Improved output of pdf reports by including grouped
 values in subtotals.

---
 WEB-INF/templates/footer.tpl |  2 +-
 topdf.php                    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index af9a278a0..90e8b3c53 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.05.4342 | 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.05.4343 | 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/topdf.php b/topdf.php
index 15ac1ee92..e3801d273 100644
--- a/topdf.php
+++ b/topdf.php
@@ -172,27 +172,27 @@
         $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
         if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
             $html .= '<td>';
-            if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chclient')) {
             $html .= '<td>';
-            if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chproject')) {
             $html .= '<td>';
-            if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chtask')) {
             $html .= '<td>';
-            if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chcf_1')) {
             $html .= '<td>';
-            if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chstart')) $html .= '<td></td>';
@@ -261,27 +261,27 @@
     $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
       $html .= '<td>';
-      if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chclient')) {
       $html .= '<td>';
-      if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chproject')) {
       $html .= '<td>';
-      if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chtask')) {
       $html .= '<td>';
-      if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chcf_1')) {
       $html .= '<td>';
-      if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chstart')) $html .= '<td></td>';

From d31bcc34081a36b3f45c080f3a5cd231ec417fa9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 1 Nov 2018 20:02:24 +0000
Subject: [PATCH 0253/1848] Improved emailed reports by including grouped
 vaalues in subtotals.

---
 WEB-INF/lib/ttReportHelper.class.php | 35 +++++++++++-----------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 11f8841fe..5dafe95be 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -609,8 +609,8 @@ static function prepareReportBody($options, $comment = null)
     $isClient = $user->isClient();
 
     $items = ttReportHelper::getItems($options);
-    $group_by = $options['group_by1'];
-    if ($group_by && 'no_grouping' != $group_by)
+    $grouping = ttReportHelper::grouping($options);
+    if ($grouping)
       $subtotals = ttReportHelper::getSubtotals($options);
     $totals = ttReportHelper::getTotals($options);
 
@@ -643,14 +643,7 @@ static function prepareReportBody($options, $comment = null)
 
     if ($options['show_totals_only']) {
       // Totals only report. Output subtotals.
-
-      // Determine group_by header.
-      if ('cf_1' == $group_by)
-        $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
-      else {
-        $key = 'label.'.$group_by;
-        $group_by_header = $i18n->get($key);
-      }
+      $group_by_header = ttReportHelper::makeGroupByHeader($options);
 
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
@@ -743,7 +736,7 @@ static function prepareReportBody($options, $comment = null)
       $body .= '</tr>';
 
       // Initialize variables to print subtotals.
-      if ($items && 'no_grouping' != $group_by) {
+      if ($items && $grouping) {
         $print_subtotals = true;
         $first_pass = true;
         $prev_grouped_by = '';
@@ -765,11 +758,11 @@ static function prepareReportBody($options, $comment = null)
               $body .= '<tr style="'.$rowSubtotal.'">';
               $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
-              if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-              if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-              if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-              if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-              if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
+              if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['user'].'</td>';
+              if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['client'].'</td>';
+              if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['project'].'</td>';
+              if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['task'].'</td>';
+              if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['cf_1'].'</td>';
               if ($options['show_start']) $body .= '<td></td>';
               if ($options['show_end']) $body .= '<td></td>';
               if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
@@ -841,11 +834,11 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<tr style="'.$rowSubtotal.'">';
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
-        if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-        if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-        if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-        if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-        if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
+        if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['user'].'</td>';
+        if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['client'].'</td>';
+        if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['project'].'</td>';
+        if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['task'].'</td>';
+        if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['cf_1'].'</td>';
         if ($options['show_start']) $body .= '<td></td>';
         if ($options['show_end']) $body .= '<td></td>';
         if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90e8b3c53..0b1969132 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.05.4343 | 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.05.4344 | 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>

From a48e5ff4ad629b551f6a94143a5e9d0f235b1953 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 1 Nov 2018 20:48:16 +0000
Subject: [PATCH 0254/1848] Fixed emailing reports grouped by custom field,
 hopefully.

---
 WEB-INF/lib/ttReportHelper.class.php | 5 ++++-
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5dafe95be..3a6a09608 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1445,7 +1445,10 @@ static function makeCombinedSelectPart($options) {
 
   // makeJoinPart builds a left join part for getSubtotals query (for time items).
   static function makeJoinPart($options) {
-    global $custom_fields; // TODO: is it safe to assume the object is there when needed?
+    global $user;
+    if (ttReportHelper::groupingBy('cf_1', $options)) {
+      $custom_fields = new CustomFields($user->group_id);
+    }
 
     $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
     if (strpos($group_by_fields, 'user') !== false) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0b1969132..ffb9e9c93 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.05.4344 | 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.05.4345 | 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>

From 6a2fb5042be34b6a15a2b57816aadefa661ee2c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 07:31:22 +0000
Subject: [PATCH 0255/1848] Starting work on subgroups.

---
 WEB-INF/config.php.dist      | 3 +++
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 1218f7f65..3f6fdaf33 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -207,3 +207,6 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
+
+// A temporary config option while development of subgroup support is ongoing. To be removed later.
+// define('SUBGROUP_DEBUG', false);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ffb9e9c93..a14235f23 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.05.4345 | 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.05.4346 | 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>

From 9def341e72ae78b8d0cb96ce425cdfb6824b00b6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 08:34:18 +0000
Subject: [PATCH 0256/1848] Some work in progress on subgroups.

---
 WEB-INF/lib/ttUser.class.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 65a1f5962..9ce67ac09 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -70,7 +70,7 @@ class ttUser {
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
   var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
   var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
-  var $unit_totals_only = 0;    // Totlas only option for the Work units plugin.
+  var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
 
   // Constructor.
   function __construct($login, $id = null) {
@@ -361,6 +361,22 @@ function getUsers($options) {
     return $user_list;
   }
 
+  // getGroups obtains an array consisting of:
+  // - A parent group (..) of a currently selected group, if available.
+  // - A currently selected group (.) represented by $behalf_group_id.
+  // - All subgroups (only immediate children) of a currently selected group.
+  function getGroups($options) {
+    $mdb2 = getConnection();
+
+    // $sql = 'select id, parent_id, name from tt_groups where org_id = $this->org_id ...'; // TODO: parent_id is now NULL in db, fix this.
+    // Step 1: Get parent group (sql query).
+    // Step 2: Get current group from the class.
+    // Step 3: Get immediate subgroups (sql query).
+    // Populate an array and return it,
+
+    return false; // Work in progress here...
+  }
+
   // getUser function is used to manage users in group and returns user details.
   // At the moment, the function is used for user edits and deletes.
   function getUser($user_id) {

From f066e7ba4d1141bad2f50e802c0911e5f76e8ef0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 12:36:58 +0000
Subject: [PATCH 0257/1848] Started to populate org_id upon group creation.

---
 WEB-INF/lib/ttGroupHelper.class.php |  2 +-
 WEB-INF/lib/ttRegistrator.class.php | 14 +++++++++-----
 WEB-INF/lib/ttUser.class.php        |  2 +-
 WEB-INF/templates/footer.tpl        |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 6ffa6b21a..d28c30670 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -36,7 +36,7 @@ static function getTopGroups() {
     $mdb2 = getConnection();
 
     $sql =  "select id, name, created, lang from tt_groups".
-            " where status = 1 and org_id is NULL order by id desc";
+            " where status = 1 and org_id is NULL or org_id = id order by id desc";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 6a2142b56..48f4b0aa0 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -137,12 +137,16 @@ function createGroup() {
 
     $sql = "insert into tt_groups (name, currency, lang, created, created_ip) values($name, $currency, $lang, $created, $created_ip)";
     $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
 
-    if (!is_a($affected, 'PEAR_Error')) {
-      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
-      return $group_id;
-    }
-    return false;
+    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+    // Update org_id with group_id.
+    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return $group_id;
   }
 
   // The createUser creates a user in database as part of registration process.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 9ce67ac09..3085a0d56 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -365,7 +365,7 @@ function getUsers($options) {
   // - A parent group (..) of a currently selected group, if available.
   // - A currently selected group (.) represented by $behalf_group_id.
   // - All subgroups (only immediate children) of a currently selected group.
-  function getGroups($options) {
+  function getGroups() {
     $mdb2 = getConnection();
 
     // $sql = 'select id, parent_id, name from tt_groups where org_id = $this->org_id ...'; // TODO: parent_id is now NULL in db, fix this.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a14235f23..80c891058 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.05.4346 | 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.06.4347 | 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>

From 8a0ec8135a1bb4f42c0ae89b7d97e3dfd500aba5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 12:55:44 +0000
Subject: [PATCH 0258/1848] Fixing org_id for existing groups.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 2 ++
 mysql.sql                    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 80c891058..74ea3c29b 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.06.4347 | 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.06.4348 | 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/dbinstall.php b/dbinstall.php
index f6fd0c1b5..9e71651ef 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -963,6 +963,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
     setChange("create index log_idx on tt_custom_field_log(log_id)");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.05', modified = now() where param_name = 'version_db' and param_value = '1.18.00'");
+    setChange("update `tt_groups` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.05') set org_id = id where org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.06', modified = now() where param_name = 'version_db' and param_value = '1.18.05'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 955f1b29c..3c2b786a3 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -458,4 +458,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.05', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.06', now()); # TODO: change when structure changes.

From 5d2849f60950348fd2b862f40ae98e9fce837528 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 13:23:35 +0000
Subject: [PATCH 0259/1848] Updated ttImportHelper class to populate org_id in
 newly imported groups.

---
 WEB-INF/lib/ttImportHelper.class.php | 17 ++++++++++++-----
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index d966f8963..6686d40f6 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -474,11 +474,18 @@ private function createGroup($fields) {
 
     $sql = 'insert into tt_groups '.$columns.$values;
     $affected = $mdb2->exec($sql);
-    if (!is_a($affected, 'PEAR_Error')) {
-      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
-      return $group_id;
-    }
-    return false;
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+    // Update org_id with group_id.
+    // NOTE: Both export and import need an additional effort to properly operate on subgroups.
+    // Currently we are importing one group only, which becomes a top level group.
+    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return $group_id;
   }
 
   // insertMonthlyQuota - a helper function to insert a monthly quota.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 74ea3c29b..878b85eea 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.06.4348 | 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.06.4349 | 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>

From 2ced7cd9d8dc6bb3225b9f2ec957cbfb1d7af285 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 14:42:01 +0000
Subject: [PATCH 0260/1848] Wrote getGroups function for ttUser class.

---
 WEB-INF/lib/ttUser.class.php | 47 ++++++++++++++++++++++++++++++------
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 3085a0d56..e7fa3fa0b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -32,6 +32,7 @@ class ttUser {
   var $login = null;            // User login.
   var $name = null;             // User name.
   var $id = null;               // User id.
+  var $org_id = null;           // Organization id.
   var $group_id = null;         // Group id.
   var $role_id = null;          // Role id.
   var $role_name = null;        // Role name.
@@ -81,8 +82,8 @@ function __construct($login, $id = null) {
 
     $mdb2 = getConnection();
 
-    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, g.name as group_name,
-      g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start,
+    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email,
+      g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start,
       g.tracking_mode, g.project_required, g.task_required, g.record_type,
       g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo
       FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
@@ -102,6 +103,7 @@ function __construct($login, $id = null) {
       $this->login = $val['login'];
       $this->name = $val['name'];
       $this->id = $val['id'];
+      $this->org_id = $val['org_id'];
       $this->group_id = $val['group_id'];
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
@@ -368,13 +370,42 @@ function getUsers($options) {
   function getGroups() {
     $mdb2 = getConnection();
 
-    // $sql = 'select id, parent_id, name from tt_groups where org_id = $this->org_id ...'; // TODO: parent_id is now NULL in db, fix this.
-    // Step 1: Get parent group (sql query).
-    // Step 2: Get current group from the class.
-    // Step 3: Get immediate subgroups (sql query).
-    // Populate an array and return it,
+    $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
+
+    // Start with parent group.
+    if ($selected_group_id != $this->org_id) {
+      // We are in one of the subgroups, and a parent exists.
+      // Get parent group info.
+      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id";
+      $res = $mdb2->query($sql);
+      if (!is_a($res, 'PEAR_Error')) {
+        $val = $res->fetchRow();
+        $parent_id = $val['parent_id'];
+        if ($parent_id) {
+          // Get parent group name.
+          $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id";
+          $res = $mdb2->query($sql);
+          if (!is_a($res, 'PEAR_Error')) {
+            $val = $res->fetchRow();
+            $groups[] = array('id'=>$parent_id,'name'=>$val['name']);
+          }
+        }
+      }
+    }
 
-    return false; // Work in progress here...
+    // Add current group.
+    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group : $this->group);
+    $groups[] = array('id'=>$selected_group_id,'name'=>$selected_group_name);
+
+    // Add subgroups.
+    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $groups[] = array('id'=>$val['id'],'name'=>$val['name']);
+      }
+    }
+    return $groups;
   }
 
   // getUser function is used to manage users in group and returns user details.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 878b85eea..e635a9777 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.06.4349 | 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.06.4350 | 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>

From 9045840bac7c2e7132555c199495b0477d07bc61 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 15:17:34 +0000
Subject: [PATCH 0261/1848] Added label.group string into translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 33 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 42a9ea858..64a3b86a6 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -163,6 +163,7 @@
 'label.user' => 'Usuari',
 'label.users' => 'Usuaris',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 112538618..1cc0734d1 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -167,6 +167,7 @@
 'label.user' => 'Uživatel',
 'label.users' => 'Uživatelů',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Zákazník',
 'label.clients' => 'Zákazníci',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 8f6e8f4bb..280c9945c 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -150,6 +150,7 @@
 'label.user' => 'Bruger',
 'label.users' => 'Brugere',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e51ec1248..48d5dcfaa 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -141,6 +141,8 @@
 'label.end_date' => 'Enddatum',
 'label.user' => 'Benutzer',
 'label.users' => 'Personen',
+// TODO: translate the following.
+// 'label.group' => 'Group',
 'label.roles' => 'Rollen',
 'label.client' => 'Kunde',
 'label.clients' => 'Kunden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 3c04d5d74..a28c87cfa 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -140,6 +140,7 @@
 'label.end_date' => 'End date',
 'label.user' => 'User',
 'label.users' => 'Users',
+'label.group' => 'Group',
 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 72ef4fdf4..28dbb500b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -162,6 +162,7 @@
 'label.user' => 'Usuario',
 // TODO: translate the following.
 // 'label.users' => 'Users',
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 68b238001..854021632 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -165,6 +165,7 @@
 'label.user' => 'Kasutaja',
 'label.users' => 'Kasutajad',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Kliendid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a728ba862..d220c13d8 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -158,6 +158,7 @@
 'label.user' => 'کاربر',
 'label.users' => 'کاربران',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'مشتری',
 'label.clients' => 'مشتریان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f9299b205..1e4b86a63 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -152,6 +152,7 @@
 'label.user' => 'Käyttäjä',
 'label.users' => 'Käyttäjät',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Asiakas',
 'label.clients' => 'Asiakkaat',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5213715ea..1e64e96d2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -149,6 +149,7 @@
 'label.user' => 'Utilisateur',
 'label.users' => 'Utilisateurs',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 604456708..180401534 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -142,6 +142,8 @@
 'label.end_date' => 'Ημερομηνία λήξης',
 'label.user' => 'Χρήστης',
 'label.users' => 'Χρήστες',
+// TODO: translate the following.
+// 'label.group' => 'Group',
 'label.roles' => 'Ρόλους',
 'label.client' => 'Πελάτης',
 'label.clients' => 'Πελάτες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ea42550d7..a44d82e50 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -168,6 +168,7 @@
 'label.user' => 'משתמש',
 'label.users' => 'משתמשים',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'לקוח',
 'label.clients' => 'לקוחות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5712426cd..9e59b544c 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -165,6 +165,7 @@
 // TODO: translate the following.
 // 'label.user' => 'User',
 // 'label.users' => 'Users',
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Ügyfél',
 'label.clients' => 'Ügyfelek',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d7b44f8ac..ea2b25140 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -147,6 +147,7 @@
 'label.user' => 'Utente',
 'label.users' => 'Utenti',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Cliente',
 'label.clients' => 'Clienti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7f9ee0587..23afc5d99 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -168,6 +168,7 @@
 'label.user' => 'ユーザー',
 'label.users' => 'ユーザー',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'クライアント',
 'label.clients' => 'クライアント',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 862384d37..6e0f59bdd 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -167,6 +167,7 @@
 'label.user' => '사용자',
 'label.users' => '사용자',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => '클라이언트',
 'label.clients' => '클라이언트',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5225d6763..b1f76af77 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -139,6 +139,8 @@
 'label.end_date' => 'Einddatum',
 'label.user' => 'Medewerker',
 'label.users' => 'Medewerkers',
+// TODO: translate the following.
+// 'label.group' => 'Group',
 'label.roles' => 'Rollen',
 'label.client' => 'Klant',
 'label.clients' => 'Klanten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e24f3470b..07026ae57 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -168,6 +168,7 @@
 'label.user' => 'Bruker',
 'label.users' => 'Brukere',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienter',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 1e77cfbb7..f88888fc3 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -154,6 +154,7 @@
 'label.user' => 'Użytkownik',
 'label.users' => 'Użytkownicy',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienci',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ba5d6f826..79370ec62 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -151,6 +151,7 @@
 'label.user' => 'Usuário',
 'label.users' => 'Usuários',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Cliente',
 'label.clients' => 'Clientes',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c5c906923..c9b24b347 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -159,6 +159,7 @@
 'label.user' => 'Usuário',
 'label.users' => 'Usuários',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index bbc412fb5..223415522 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -168,6 +168,7 @@
 'label.user' => 'Utilizator',
 'label.users' => 'Utilizatori',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clienti',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3a79929dc..4a5dbd629 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -139,6 +139,7 @@
 'label.end_date' => 'Конечная дата',
 'label.user' => 'Пользователь',
 'label.users' => 'Сотрудники',
+'label.group' => 'Группа',
 'label.roles' => 'Роли',
 'label.client' => 'Клиент',
 'label.clients' => 'Клиенты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d48987320..13992fe8b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -159,6 +159,7 @@
 'label.user' => 'Používateľ',
 'label.users' => 'Používatelia',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienti',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8985874c7..df5ddf52a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -157,6 +157,7 @@
 // 'label.end_date' => 'End date',
 // 'label.user' => 'User',
 // 'label.users' => 'Users',
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 19027adda..a35014c01 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -151,6 +151,7 @@
 'label.user' => 'Korisnik',
 'label.users' => 'Korisnici',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klijent',
 'label.clients' => 'Klijenti',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 9472db288..fb4289a81 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -147,6 +147,7 @@
 'label.user' => 'Användare',
 'label.users' => 'Användare',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Kund',
 'label.clients' => 'Kunder',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9dab38b1b..4b167e882 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -173,6 +173,7 @@
 'label.user' => 'Kullanıcı',
 'label.users' => 'Kullanıcılar',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => 'Müşteri',
 'label.clients' => 'Müşteriler',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 60fdeed1e..2d55378f9 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -158,6 +158,7 @@
 'label.user' => '用户',
 'label.users' => '用户',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => '客户',
 'label.clients' => '客户',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1c794d38b..74d379fc3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -165,6 +165,7 @@
 'label.user' => '用戶',
 'label.users' => '用戶',
 // TODO: translate the following.
+// 'label.group' => 'Group',
 // 'label.roles' => 'Roles',
 'label.client' => '客戶',
 'label.clients' => '客戶',

From 948617a6a0f129ba4090934ee8f544009dbcd935 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 17:36:47 +0000
Subject: [PATCH 0262/1848] A bit more work in progress on subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php | 14 +++++++++++++
 WEB-INF/lib/ttUser.class.php        |  4 ++--
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/time.tpl          |  6 ++++++
 time.php                            | 31 +++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index d28c30670..22362b5b9 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -48,4 +48,18 @@ static function getTopGroups() {
     }
     return false;
   }
+
+  // The getGroupName function returns group name.
+  static function getGroupName($group_id) {
+    $mdb2 = getConnection();
+
+    $sql = "select name from tt_groups where id = $group_id and (status = 1 or status = 0)";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val['name'];
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e7fa3fa0b..21cd19aa7 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -155,7 +155,7 @@ function __construct($login, $id = null) {
       // Set "on behalf" id and name (group).
       if (isset($_SESSION['behalf_group_id'])) {
           $this->behalf_group_id = $_SESSION['behalf_group_id'];
-          $this->behalf_group = $_SESSION['behalf_group'];
+          $this->behalf_group = $_SESSION['behalf_group_name'];
       }
     }
   }
@@ -371,6 +371,7 @@ function getGroups() {
     $mdb2 = getConnection();
 
     $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
+    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group : $this->group);
 
     // Start with parent group.
     if ($selected_group_id != $this->org_id) {
@@ -394,7 +395,6 @@ function getGroups() {
     }
 
     // Add current group.
-    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group : $this->group);
     $groups[] = array('id'=>$selected_group_id,'name'=>$selected_group_name);
 
     // Add subgroups.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e635a9777..3f32ac037 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.06.4350 | 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.06.4351 | 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/time.tpl b/WEB-INF/templates/time.tpl
index f532be424..0e05f05bc 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -18,6 +18,12 @@
   <tr>
     <td valign="top">
       <table>
+{if $on_behalf_group_control}
+        <tr>
+          <td align="right">{$i18n.label.group}:</td>
+          <td>{$forms.timeRecordForm.onBehalfGroup.control}</td>
+        </tr>
+{/if}
 {if $on_behalf_control}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
diff --git a/time.php b/time.php
index 98f6bbaf6..5307d8b2a 100644
--- a/time.php
+++ b/time.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
+import('ttGroupHelper');
 import('ttTeamHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -95,6 +96,7 @@
       $cl_billable = $_SESSION['billable'];
 }
 $on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
+$on_behalf_group_id = $request->getParameter('onBehalfGroup', (isset($_SESSION['behalf_group_id'])? $_SESSION['behalf_group_id'] : $user->group_id));
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -105,6 +107,22 @@
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
 
+if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroups();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.submit();',
+      'name'=>'onBehalfGroup',
+      'style'=>'width: 250px;',
+      'value'=>$on_behalf_group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $smarty->assign('on_behalf_group_control', 1);
+  }
+}
+} // SUBGROUP_DEBUG
+
 if ($user->can('track_time')) {
   if ($user->can('track_own_time'))
     $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
@@ -347,6 +365,19 @@
       exit();
     }
   }
+  elseif ($request->getParameter('onBehalfGroup')) {
+    if($user->can('manage_subgroups')) {
+      unset($_SESSION['behalf_group_id']);
+      unset($_SESSION['behalf_group_name']);
+
+      if($on_behalf_group_id != $user->group_id) {
+        $_SESSION['behalf_group_id'] = $on_behalf_group_id;
+        $_SESSION['behalf_group_name'] = ttGroupHelper::getGroupName($on_behalf_group_id);
+      }
+      header('Location: time.php');
+      exit();
+    }
+  }
   elseif ($request->getParameter('onBehalfUser')) {
     if($user->can('track_time')) {
       unset($_SESSION['behalf_id']);

From b4be5795ddbcef63b4b6fffb200c3dfc3ffcb530 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 2 Nov 2018 21:47:41 +0000
Subject: [PATCH 0263/1848] More work in progress on subgroups.

---
 WEB-INF/lib/ttRegistrator.class.php | 4 ++--
 WEB-INF/lib/ttUserHelper.class.php  | 5 +++--
 dbinstall.php                       | 5 ++++-
 mysql.sql                           | 5 +++--
 user_add.php                        | 3 ++-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 48f4b0aa0..b3551dad6 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -159,9 +159,9 @@ function createUser() {
     $email = $mdb2->quote($this->email);
     $created = 'now()';
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $values = "values($login, $password, $name, $this->group_id, $this->role_id, $email, $created, $created_ip)";
+    $values = "values($login, $password, $name, $this->group_id, $this->group_id, $this->role_id, $email, $created, $created_ip)";
 
-    $sql = 'insert into tt_users (login, password, name, group_id, role_id, email, created, created_ip) '.$values;
+    $sql = 'insert into tt_users (login, password, name, group_id, org_id, role_id, email, created, created_ip) '.$values;
     $affected = $mdb2->exec($sql);
     if (!is_a($affected, 'PEAR_Error')) {
       $user_id = $mdb2->lastInsertID('tt_users', 'id');
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 521bc8b7a..28175080f 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -102,6 +102,7 @@ static function insert($fields, $hash = true) {
       $password = 'md5('.$password.')';
     $email = isset($fields['email']) ? $fields['email'] : '';
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $rate = str_replace(',', '.', isset($fields['rate']) ? $fields['rate'] : 0);
     if($rate == '')
       $rate = 0;
@@ -112,9 +113,9 @@ static function insert($fields, $hash = true) {
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by_v = ', '.$mdb2->quote($user->id);
 
-    $sql = "insert into tt_users (name, login, password, group_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
+    $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
-      ", $password, $group_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
+      ", $password, $group_id, $org_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
diff --git a/dbinstall.php b/dbinstall.php
index 9e71651ef..5baff57e6 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -963,8 +963,11 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
     setChange("create index log_idx on tt_custom_field_log(log_id)");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.05', modified = now() where param_name = 'version_db' and param_value = '1.18.00'");
-    setChange("update `tt_groups` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.05') set org_id = id where org_id is null");
+    setChange("UPDATE `tt_groups` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.05') set org_id = id where org_id is null");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.06', modified = now() where param_name = 'version_db' and param_value = '1.18.05'");
+    setChange("ALTER TABLE `tt_users` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.06') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.07', modified = now() where param_name = 'version_db' and param_value = '1.18.06'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 3c2b786a3..bfa26a0da 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -85,6 +85,7 @@ CREATE TABLE `tt_users` (
   `password` varchar(50) default NULL,             # password hash
   `name` varchar(100) default NULL,                # user name
   `group_id` int(11) NOT NULL,                     # group id
+  `org_id` int(11) default NULL,                   # organization id
   `role_id` int(11) default NULL,                  # role id
   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
@@ -104,7 +105,7 @@ CREATE TABLE `tt_users` (
 # Create an index that guarantees unique active and inactive logins.
 create unique index login_idx on tt_users(login, status);
 
-# Create admin account with password 'secret'. Admin is a superuser, who can create groupd.
+# Create admin account with password 'secret'. Admin is a superuser who can create groups.
 DELETE from `tt_users` WHERE login = 'admin';
 INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024));
 
@@ -458,4 +459,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.06', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.07', now()); # TODO: change when structure changes.
diff --git a/user_add.php b/user_add.php
index 1ed0cb725..ac2d8c4e4 100644
--- a/user_add.php
+++ b/user_add.php
@@ -150,7 +150,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'group_id' => $user->group_id,
+        'group_id' => $user->group_id, // TODO: this needs to be fixed for on-behalf group work.
+        'org_id' => $user->org_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,

From 0bf91be4d6ee52adaf09a74d729c7a34cf012de7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Nov 2018 12:15:12 +0000
Subject: [PATCH 0264/1848] Some more work in progress on subgroups.

---
 WEB-INF/lib/ttUser.class.php | 17 +++++++++--------
 WEB-INF/templates/footer.tpl |  2 +-
 time.php                     |  6 ++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 21cd19aa7..003cf0fe3 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -41,7 +41,8 @@ class ttUser {
   var $behalf_id = null;        // User id, on behalf of whom we are working.
   var $behalf_group_id = null;  // Group id, on behalf of which we are working.
   var $behalf_name = null;      // User name, on behalf of whom we are working.
-  var $behalf_group = null;     // Group name, on behalf of which we are working.
+  var $group_name = null;       // Group name.
+  var $behalf_group_name = null;// Group name, on behalf of which we are working.
   var $email = null;            // User email.
   var $lang = null;             // Language.
   var $decimal_mark = null;     // Decimal separator.
@@ -63,7 +64,6 @@ class ttUser {
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
-  var $group = null;            // Group name.
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
@@ -124,7 +124,7 @@ function __construct($login, $id = null) {
       $this->bcc_email = $val['bcc_email'];
       $this->allow_ip = $val['allow_ip'];
       $this->password_complexity = $val['password_complexity'];
-      $this->group = $val['group_name'];
+      $this->group_name = $val['group_name'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
@@ -155,7 +155,7 @@ function __construct($login, $id = null) {
       // Set "on behalf" id and name (group).
       if (isset($_SESSION['behalf_group_id'])) {
           $this->behalf_group_id = $_SESSION['behalf_group_id'];
-          $this->behalf_group = $_SESSION['behalf_group_name'];
+          $this->behalf_group_name = $_SESSION['behalf_group_name'];
       }
     }
   }
@@ -309,6 +309,7 @@ function getUsers($options) {
 
     $skipClients = !isset($options['include_clients']);
     $includeSelf = isset($options['include_self']);
+    $group_id = isset($options['group_id']) ? $options['group_id'] : $this->group_id;
 
     $select_part = 'select u.id, u.name';
     if (isset($options['include_login'])) $select_part .= ', u.login';
@@ -321,7 +322,7 @@ function getUsers($options) {
     if (isset($options['max_rank']) || $skipClients || isset($options['include_role']))
         $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
 
-    $where_part = " where u.group_id = $this->group_id";
+    $where_part = " where u.org_id = $this->org_id and u.group_id = $group_id";
     if (isset($options['status']))
       $where_part .= ' and u.status = '.(int)$options['status'];
     else
@@ -371,11 +372,11 @@ function getGroups() {
     $mdb2 = getConnection();
 
     $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
-    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group : $this->group);
+    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
 
     // Start with parent group.
-    if ($selected_group_id != $this->org_id) {
-      // We are in one of the subgroups, and a parent exists.
+    if ($selected_group_id != $this->group_id) {
+      // We are in one of subgroups, and a parent exists.
       // Get parent group info.
       $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id";
       $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f32ac037..d9c3e334e 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.06.4351 | 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.06.4352 | 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/time.php b/time.php
index 5307d8b2a..da816362d 100644
--- a/time.php
+++ b/time.php
@@ -124,10 +124,12 @@
 } // SUBGROUP_DEBUG
 
 if ($user->can('track_time')) {
+  // Determine max rank.
+  $max_rank = $on_behalf_group_id == $user->group_id ? $user->rank-1 : 512; // TODO: stop using magic numbers.
   if ($user->can('track_own_time'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$max_rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$max_rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',

From b134135b685422ddcdc2d6856972c60ea15f661f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Nov 2018 15:34:15 +0000
Subject: [PATCH 0265/1848] Work in progress on subgroups. Made user list
 population more robust.

---
 WEB-INF/lib/ttGroupHelper.class.php | 16 +++++++++++++
 WEB-INF/lib/ttUser.class.php        | 35 +++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |  2 +-
 initialize.php                      |  1 +
 time.php                            |  7 +++---
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 22362b5b9..3fb01c604 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -62,4 +62,20 @@ static function getGroupName($group_id) {
     }
     return false;
   }
+
+  // The getParentGroup determines a parent group for a given group.
+  static function getParentGroup($group_id) {
+    global $user;
+
+    $mdb2 = getConnection();
+
+    $sql = "select parent_id from tt_groups where id = $group_id and org_id = $user->org_id and status = 1";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val['parent_id'];
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 003cf0fe3..b7ea34f07 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -559,4 +559,39 @@ function enablePlugin($plugin, $enable = true)
 
     return true;
   }
+
+  // isSubgroupValid determines if a subgroup is valid for user.
+  // A subgroup is valid if:
+  //   - user can manage_subgroups;
+  //   - subgroup is either a direct child of user group, or "on the path"
+  //   to it (grand-child, etc.).
+  function isSubgroupValid($subgroup_id) {
+    if (!$this->can('manage_subgroups')) return false; // User cannot manage subgroups.
+
+    $current_group_id = $subgroup_id;
+    while ($parent_group_id = ttGroupHelper::getParentGroup($current_group_id)) {
+      if ($parent_group_id == $this->group_id) {
+        return true; // Found it.
+      }
+      $current_group_id = $parent_group_id;
+    }
+    return false;
+  }
+
+  // getMaxRankForGroup determines effective user rank for a user in a given group.
+  // For home group it is the existing user rank (as per role) minus 1.
+  // For subgroups, if user can "manage_subgroups", it is MAX_RANK.
+  function getMaxRankForGroup($group_id) {
+
+    $max_rank = 0; // Start safely.
+    if ($this->group_id == $group_id) {
+      $max_rank = $this->rank - 1;
+      return $max_rank;
+    }
+
+    if ($this->isSubgroupValid($group_id))
+      $max_rank = MAX_RANK;
+
+    return $max_rank;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d9c3e334e..fda4c01ad 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.06.4352 | 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.06.4353 | 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/initialize.php b/initialize.php
index 795408507..241d72334 100644
--- a/initialize.php
+++ b/initialize.php
@@ -42,6 +42,7 @@
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
 // Date format for database and URI parameters.
 define('DB_DATEFORMAT', '%Y-%m-%d');
+define('MAX_RANK', 512); // Max user rank.
 
 require_once(LIBRARY_DIR.'/common.lib.php');
 
diff --git a/time.php b/time.php
index da816362d..6d62fb691 100644
--- a/time.php
+++ b/time.php
@@ -124,12 +124,11 @@
 } // SUBGROUP_DEBUG
 
 if ($user->can('track_time')) {
-  // Determine max rank.
-  $max_rank = $on_behalf_group_id == $user->group_id ? $user->rank-1 : 512; // TODO: stop using magic numbers.
+  $rank = $user->getMaxRankForGroup($on_behalf_group_id);
   if ($user->can('track_own_time'))
-    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$max_rank,'include_self'=>true,'self_first'=>true);
+    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$max_rank);
+    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',

From 5e861d92d6d758ba4888e35109cc6df4ab5e2df1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Nov 2018 20:56:08 +0000
Subject: [PATCH 0266/1848] More progress on subgroups, mostly about setting on
 behalf values properly.

---
 WEB-INF/lib/ttUser.class.php | 38 +++++++++++++++----
 WEB-INF/templates/footer.tpl |  2 +-
 reports.php                  |  2 +-
 time.php                     | 72 +++++++++++++++++++++++++-----------
 4 files changed, 84 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index b7ea34f07..469345b75 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -429,13 +429,32 @@ function getUser($user_id) {
   }
 
   // checkBehalfId checks whether behalf_id is appropriate.
-  // On behalf user must be active and have lower rank.
+  // On behalf user must be active and have lower rank if the user is from home group,
+  // otherwise:
+  // - subgroup must ve valid;
+  // - user should be a member of it.
   function checkBehalfId() {
-    $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
-    $users = $this->getUsers($options);
-    foreach($users as $one_user) {
-      if ($one_user['id'] == $this->behalf_id)
-        return true;
+    if (!$this->behalf_group_id) {
+      // Checking user from home group.
+      $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
+      $users = $this->getUsers($options);
+      foreach($users as $one_user) {
+        if ($one_user['id'] == $this->behalf_id)
+          return true;
+      }
+    } else {
+      // Checking user from a subgroup.
+      $group_id = $this->behalf_group_id;
+      if (!$this->isSubgroupValid($group_id))
+        return false;
+
+      // So far, so good. Check user now.
+      $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>MAX_RANK);
+      $users = $this->getUsers($options);
+      foreach($users as $one_user) {
+        if ($one_user['id'] == $this->behalf_id)
+          return true;
+      }
     }
     return false;
   }
@@ -446,8 +465,13 @@ function checkBehalfId() {
   // Needed for situations when user does not have do_own_something right.
   // Example: has view_charts but does not have view_own_charts.
   // In this case we still allow access to charts, but set behalf_id to someone else.
+  // Another example: working in a subgroup on behalf of someone else.
   function adjustBehalfId() {
-    $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
+    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
+    $rank = $this->getMaxRankForGroup($group_id);
+
+    // Adjust to first found user in group.
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
     $users = $this->getUsers($options);
     foreach($users as $one_user) {
       // Fake loop to access first element.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fda4c01ad..f29129e59 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.06.4353 | 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.06.4354 | 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/reports.php b/reports.php
index 31028f2f2..6a0687e60 100644
--- a/reports.php
+++ b/reports.php
@@ -149,7 +149,7 @@
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $max_rank = $user->rank-1;
-    if ($user->can('view_all_reports')) $max_rank = 512;
+    if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
     if ($user->can('view_own_reports'))
       $options = array('max_rank'=>$max_rank,'include_self'=>true);
     else
diff --git a/time.php b/time.php
index 6d62fb691..258f15c19 100644
--- a/time.php
+++ b/time.php
@@ -366,31 +366,61 @@
       exit();
     }
   }
-  elseif ($request->getParameter('onBehalfGroup')) {
-    if($user->can('manage_subgroups')) {
-      unset($_SESSION['behalf_group_id']);
-      unset($_SESSION['behalf_group_name']);
-
-      if($on_behalf_group_id != $user->group_id) {
-        $_SESSION['behalf_group_id'] = $on_behalf_group_id;
-        $_SESSION['behalf_group_name'] = ttGroupHelper::getGroupName($on_behalf_group_id);
+  elseif ($request->getParameter('onBehalfUser') || $request->getParameter('onBehalfGroup')) {
+    // User changed either on behalf user or group.
+    // TODO: Organize this code into a separate function.
+
+    // We get here if one of the dropdowns changed. Handle these 2 situations differently.
+    // 1) User changed. Determine if user changed. Then do exactly as before.
+    //
+    // Group changed. Determine if group changed.
+    // Adjust group info.
+    // Adjust user info to first user in group (or self if we are in home group now).
+    //
+    // Determine if user was changed.
+    if ($request->getParameter('onBehalfUser')) {
+      $request_user_id = $request->getParameter('onBehalfUser');
+      $session_user_id = $_SESSION['behalf_id'];
+      $user_changed = !(($session_user_id == null && ($user->id == $request_user_id))
+                      || ($session_user_id != null && ($request_user_id == $session_user_id)));
+      if ($user_changed && $user->can('track_time')) {
+        unset($_SESSION['behalf_id']);
+        unset($_SESSION['behalf_name']);
+
+        if($request_user_id != $user->id) {
+          $_SESSION['behalf_id'] = $request_user_id;
+          $_SESSION['behalf_name'] = ttUserHelper::getUserName($request_user_id);
+        }
       }
-      header('Location: time.php');
-      exit();
     }
-  }
-  elseif ($request->getParameter('onBehalfUser')) {
-    if($user->can('track_time')) {
-      unset($_SESSION['behalf_id']);
-      unset($_SESSION['behalf_name']);
-
-      if($on_behalf_id != $user->id) {
-        $_SESSION['behalf_id'] = $on_behalf_id;
-        $_SESSION['behalf_name'] = ttUserHelper::getUserName($on_behalf_id);
+
+    if ($request->getParameter('onBehalfGroup')) {
+      // Determine if group was changed.
+      $request_group_id = $request->getParameter('onBehalfGroup');
+      $session_group_id = $_SESSION['behalf_group_id'];
+      $group_changed = !(($session_group_id == null && ($user->group_id == $request_group_id))
+                      || ($session_group_id != null && ($request_group_id == $session_group_id)));
+
+      if ($group_changed && $user->can('manage_subgroups')) {
+        unset($_SESSION['behalf_group_id']);
+        unset($_SESSION['behalf_group_name']);
+        if ($request_group_id == $user->group_id)
+          $user->behalf_group_id = null;
+
+        if (($request_group_id != $user->group_id) && $user->isSubgroupValid($request_group_id)) {
+          $_SESSION['behalf_group_id'] = $request_group_id;
+          $_SESSION['behalf_group_name'] = ttGroupHelper::getGroupName($request_group_id);
+          $user->behalf_group_id = $request_group_id;
+        }
+
+        unset($_SESSION['behalf_id']);
+        unset($_SESSION['behalf_name']);
+        if ($request_group_id != $user->group_id)
+          $user->adjustBehalfId();
       }
-      header('Location: time.php');
-      exit();
     }
+    header('Location: time.php');
+    exit();
   }
 } // isPost
 

From 2d4eeda71b7c65a7af5359cb1ec2f29537d43d3a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Nov 2018 22:10:35 +0000
Subject: [PATCH 0267/1848] Fixed ttUser::getAssignedProjects to obtain
 projects in subgroups.

---
 WEB-INF/lib/ttUser.class.php | 3 ++-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 469345b75..6bac7cb46 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -192,10 +192,11 @@ function getAssignedProjects()
     $result = array();
     $mdb2 = getConnection();
 
+    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
       inner join tt_user_project_binds upb on (upb.user_id = ".$this->getActiveUser()." and upb.project_id = p.id and upb.status = 1)
-      where p.group_id = $this->group_id and p.status = 1 order by p.name";
+      where p.group_id = $group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f29129e59..438d7d5c4 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.06.4354 | 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.06.4355 | 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>

From 6b65ed469a258f8ece8bafa26379fdf546c23bc7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 12:13:01 +0000
Subject: [PATCH 0268/1848] Fixed ttReportHelper::groupingBy function.

---
 WEB-INF/lib/ttReportHelper.class.php | 20 +++++++++-----------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 3a6a09608..d1de3af8b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -128,14 +128,14 @@ static function getItems($options) {
     $isClient = $user->isClient();
 
     $grouping = ttReportHelper::grouping($options);
-    $grouping_by_date = ($options['group_by1'] == 'date'|| $options['group_by2'] == 'date' || $options['group_by3'] == 'date');
-    $grouping_by_client = ($options['group_by1'] == 'client'|| $options['group_by2'] == 'client' || $options['group_by3'] == 'client');
-    $grouping_by_project = ($options['group_by1'] == 'project'|| $options['group_by2'] == 'project' || $options['group_by3'] == 'project');
-    $grouping_by_task = ($options['group_by1'] == 'task'|| $options['group_by2'] == 'task' || $options['group_by3'] == 'task');
-    $grouping_by_user = ($options['group_by1'] == 'user'|| $options['group_by2'] == 'user' || $options['group_by3'] == 'user');
-    $grouping_by_cf_1 = ($options['group_by1'] == 'cf_1'|| $options['group_by2'] == 'cf_1' || $options['group_by3'] == 'cf_1');
-
-    $group_by_option = $options['group_by1'];
+    if ($grouping) {
+      $grouping_by_date = ttReportHelper::groupingBy('date', $options);
+      $grouping_by_client = ttReportHelper::groupingBy('client', $options);
+      $grouping_by_project = ttReportHelper::groupingBy('project', $options);
+      $grouping_by_task = ttReportHelper::groupingBy('task', $options);
+      $grouping_by_user = ttReportHelper::groupingBy('user', $options);
+      $grouping_by_cf_1 = ttReportHelper::groupingBy('cf_1', $options);
+    }
     $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
 
     // Prepare a query for time items in tt_log table.
@@ -1540,9 +1540,7 @@ static function groupingByUser($options) {
   // ('user', 'project', etc.) by checking group_by1, group_by2, and group_by3
   // values passed in $options.
   static function groupingBy($what, $options) {
-    $grouping = ($options['group_by1'] != null && $options['group_by1'] != $what) ||
-      ($options['group_by2'] != null && $options['group_by2'] != $what) ||
-      ($options['group_by3'] != null && $options['group_by3'] != $what);
+    $grouping = ($options['group_by1'] == $what) || ($options['group_by2'] == $what) || ($options['group_by3'] == $what);
     return $grouping;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 438d7d5c4..e22100338 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.06.4355 | 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.07.4356 | 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>

From aa93160fd2b4cccce4e14c96cc1c3e5e43218e4c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 12:50:08 +0000
Subject: [PATCH 0269/1848] A bit of refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 68 +++++-----------------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d1de3af8b..744ef97b0 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -403,7 +403,7 @@ static function getSubtotals($options) {
     $group_by_part = ttReportHelper::makeGroupByPart($options);
     if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode) {
-        if (!ttReportHelper::groupingByUser($options))
+        if (!ttReportHelper::groupingBy('user', $options))
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
         $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
         if ($options['show_work_units']) {
@@ -1446,30 +1446,21 @@ static function makeCombinedSelectPart($options) {
   // makeJoinPart builds a left join part for getSubtotals query (for time items).
   static function makeJoinPart($options) {
     global $user;
-    if (ttReportHelper::groupingBy('cf_1', $options)) {
-      $custom_fields = new CustomFields($user->group_id);
-    }
 
-    $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
-    if (strpos($group_by_fields, 'user') !== false) {
-      // Grouping by user, add a join on tt_users table.
+    if (ttReportHelper::groupingBy('user', $options)) {
       $join .= ' left join tt_users u on (l.user_id = u.id)';
     }
-    if (strpos($group_by_fields, 'client') !== false) {
-      // Grouping by client, add a join on tt_clients table.
+    if (ttReportHelper::groupingBy('client', $options)) {
       $join .= ' left join tt_clients c on (l.client_id = c.id)';
     }
-    if (strpos($group_by_fields, 'project') !== false) {
-      // Grouping by project, add a join on tt_projects table.
+    if (ttReportHelper::groupingBy('project', $options)) {
       $join .= ' left join tt_projects p on (l.project_id = p.id)';
     }
-    if (strpos($group_by_fields, 'task') !== false) {
-      // Grouping by task, add a join on tt_tasks table.
+    if (ttReportHelper::groupingBy('task', $options)) {
       $join .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
-    if (strpos($group_by_fields, 'cf_1') !== false) {
-      // Grouping by custom field 1, add a join for it.
-      // $custom_fields = new CustomFields($user->group_id);
+    if (ttReportHelper::groupingBy('cf_1', $options)) {
+      $custom_fields = new CustomFields($user->group_id);
       if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
         $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
@@ -1480,45 +1471,17 @@ static function makeJoinPart($options) {
 
   // makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
   static function makeJoinExpensesPart($options) {
-    $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
-    if (strpos($group_by_fields, 'user') !== false) {
-      // Grouping by user, add a join on tt_users table.
+    if (ttReportHelper::groupingBy('user', $options)) {
       $join .= ' left join tt_users u on (ei.user_id = u.id)';
     }
-    if (strpos($group_by_fields, 'client') !== false) {
-      // Grouping by client, add a join on tt_clients table.
+    if (ttReportHelper::groupingBy('client', $options)) {
       $join .= ' left join tt_clients c on (ei.client_id = c.id)';
     }
-    if (strpos($group_by_fields, 'project') !== false) {
-      // Grouping by project, add a join on tt_projects table.
+    if (ttReportHelper::groupingBy('project', $options)) {
       $join .= ' left join tt_projects p on (ei.project_id = p.id)';
     }
     return $join;
   }
-  
-  // makeGroupByFieldsPart builds a commma-separated list of fields for sql query using group_by1,
-  // group_by2, and group_by3 values passed in $options.
-  static function makeGroupByFieldsPart($options) {
-    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
-      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
-      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
-    if ($no_grouping) return null;
-
-    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
-      // We have group_by1.
-      $group_by_fields .= ', '.$options['group_by1'];
-    }
-    if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
-      // We have group_by2.
-      $group_by_fields .= ', '.$options['group_by2'];
-    }
-    if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
-      // We have group_by3.
-      $group_by_fields .= ', '.$options['group_by3'];
-    }
-    $group_by_fields = ltrim($group_by_fields, ', ');
-    return $group_by_fields;
-  }
 
   // grouping determines if we are grouping the report by either group_by1,
   // group_by2, or group_by3 values passed in $options.
@@ -1529,16 +1492,9 @@ static function grouping($options) {
     return $grouping;
   }
 
-  // groupingByUser determines if we are grouping a report by user.
-  static function groupingByUser($options) {
-    if ($options['group_by1'] == 'user' || $options['group_by2'] == 'user' || $options['group_by3'] == 'user') return true;
-
-    return false;
-  }
-  
   // groupingBy determines if we are grouping a report by a value of $what
-  // ('user', 'project', etc.) by checking group_by1, group_by2, and group_by3
-  // values passed in $options.
+  // ('date', 'user', 'project', etc.) by checking group_by1, group_by2,
+  // and group_by3 values passed in $options.
   static function groupingBy($what, $options) {
     $grouping = ($options['group_by1'] == $what) || ($options['group_by2'] == $what) || ($options['group_by3'] == $what);
     return $grouping;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e22100338..1d02b7d73 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.07.4356 | 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.07.4357 | 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>

From 39646912fc3018f2a6922ba6716be22a91da14e9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 13:28:51 +0000
Subject: [PATCH 0270/1848] Fixed changed name in a couple of places.

---
 WEB-INF/templates/footer.tpl | 2 +-
 group_edit.php               | 2 +-
 invoice_send.php             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1d02b7d73..c10f48c9c 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.07.4357 | 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.07.4358 | 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/group_edit.php b/group_edit.php
index 9c4cf3692..e9d5189a1 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -65,7 +65,7 @@
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
   $cl_allow_ip = trim($request->getParameter('allow_ip'));
 } else {
-  $cl_group = $user->group;
+  $cl_group = $user->group_name;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
   $cl_lang = $user->lang;
   $cl_decimal_mark = $user->decimal_mark;
diff --git a/invoice_send.php b/invoice_send.php
index ca76f34bb..135453b53 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -58,7 +58,7 @@
 } else {
   $cl_receiver = $sc->getValue(SYSC_LAST_INVOICE_EMAIL);
   $cl_cc = $sc->getValue(SYSC_LAST_INVOICE_CC);
-  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->group;
+  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->group_name;
 }
 
 $form = new Form('mailForm');

From c83e33b75d24c71b29df94a061e79a3079f7fe12 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 13:50:15 +0000
Subject: [PATCH 0271/1848] Fixed export of group name - broken during
 refactoring.

---
 WEB-INF/lib/ttExportHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl         | 2 +-
 WEB-INF/templates/header.tpl         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index d40ce4528..26c801d48 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -69,7 +69,7 @@ function createDataFile($compress = false) {
       "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
       "\" config=\"".$user->config.
       "\">\n");
-    fwrite($file, "  <name><![CDATA[".$user->group."]]></name>\n");
+    fwrite($file, "  <name><![CDATA[".$user->group_name."]]></name>\n");
     fwrite($file, "  <allow_ip><![CDATA[".$user->allow_ip."]]></allow_ip>\n");
     fwrite($file, "  <password_complexity><![CDATA[".$user->password_complexity."]]></password_complexity>\n");
     fwrite($file, "</group>\n");
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c10f48c9c..087433288 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.07.4358 | 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.07.4359 | 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/header.tpl b/WEB-INF/templates/header.tpl
index c7c445a79..430c1c2b0 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -161,7 +161,7 @@
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
   {if $user->name}
-        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->group}, {$user->group|escape}{/if}</td></tr>
+        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->group_name}, {$user->group_name|escape}{/if}</td></tr>
   {else}
         <tr><td>&nbsp;</td></tr>
   {/if}

From 0098044d9aa84b16c0a2fc6a028844b078a21ca0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 14:05:55 +0000
Subject: [PATCH 0272/1848] Fixed ttGroupHelper::getTopGroups to not display
 deleted groups.

---
 WEB-INF/lib/ttGroupHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 3fb01c604..44dc3e1b1 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -36,7 +36,7 @@ static function getTopGroups() {
     $mdb2 = getConnection();
 
     $sql =  "select id, name, created, lang from tt_groups".
-            " where status = 1 and org_id is NULL or org_id = id order by id desc";
+            " where status = 1 and (org_id is NULL or org_id = id) order by id desc";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 087433288..abee8d919 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.07.4359 | 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.07.4360 | 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>

From 41db697346ee4c6ca08d0c6891c7764ff5ce59b4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 14:37:55 +0000
Subject: [PATCH 0273/1848] Fixed creating org_id for newly imported users.

---
 WEB-INF/lib/ttImportHelper.class.php | 3 +++
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 6686d40f6..69af9e12c 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -47,6 +47,7 @@ class ttImportHelper {
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
   var $groupData      = array(); // Array of group data such as group name, etc.
+  var $org_id         = null;    // New organization id we are importing. It is created during the import operation.
   var $group_id       = null;    // New group id we are importing. It is created during the import operation.
   var $roles          = array(); // Array of arrays of role properties.
   var $users          = array(); // Array of arrays of user properties.
@@ -144,6 +145,7 @@ function endElement($parser, $name) {
           'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
           'config' => $this->groupData['CONFIG']));
         if ($group_id) {
+          $this->org_id = $group_id;
           $this->group_id = $group_id;
 
           // Create roles.
@@ -161,6 +163,7 @@ function endElement($parser, $name) {
             $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
             $user_id = ttUserHelper::insert(array(
               'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
               'role_id' => $role_id,
               'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
               'name' => $user_item['NAME'],
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index abee8d919..6f69b349a 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.07.4360 | 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.07.4361 | 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>

From a0656da39249cd92f75f9794ae08dd3a009bf7a1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 17:26:29 +0000
Subject: [PATCH 0274/1848] Starting redoing import for subgroup support.

---
 WEB-INF/lib/ttImportHelper2.class.php | 503 ++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl          |   2 +-
 import.php                            |   8 +-
 3 files changed, 510 insertions(+), 3 deletions(-)
 create mode 100644 WEB-INF/lib/ttImportHelper2.class.php

diff --git a/WEB-INF/lib/ttImportHelper2.class.php b/WEB-INF/lib/ttImportHelper2.class.php
new file mode 100644
index 000000000..c646b97e0
--- /dev/null
+++ b/WEB-INF/lib/ttImportHelper2.class.php
@@ -0,0 +1,503 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttTeamHelper');
+import('ttUserHelper');
+import('ttProjectHelper');
+import('ttTaskHelper');
+import('ttInvoiceHelper');
+import('ttTimeHelper');
+import('ttClientHelper');
+import('ttCustomFieldHelper');
+import('ttFavReportHelper');
+import('ttExpenseHelper');
+import('ttRoleHelper');
+
+// ttImportHelper2 - this class is a future replacement for ttImportHelper.
+// Currently, it is work in progress.
+// When done, it should handle import of complex groups consisting of other groups.
+class ttImportHelper2 {
+  var $errors         = null;    // Errors go here. Set in constructor by reference.
+
+  var $currentElement = array(); // Current element of the XML file we are parsing.
+  var $currentTag     = '';      // XML tag of the current element.
+
+  var $canImport      = true;    // False if we cannot import data due to a login collision.
+  var $groupData      = array(); // Array of group data such as group name, etc.
+  var $org_id         = null;    // New organization id we are importing. It is created during the import operation.
+  var $group_id       = null;    // New group id we are importing. It is created during the import operation.
+  var $roles          = array(); // Array of arrays of role properties.
+  var $users          = array(); // Array of arrays of user properties.
+  var $top_role_id    = null;    // Top manager role id on the new server.
+
+  // The following arrays are maps between entity ids in the file versus the database.
+  // In the file they are sequential (1,2,3...) while in the database the entities have different ids.
+  var $roleMap       = array(); // Role ids.
+  var $userMap       = array(); // User ids.
+  var $projectMap    = array(); // Project ids.
+  var $taskMap       = array(); // Task ids.
+  var $clientMap     = array(); // Client ids.
+  var $invoiceMap    = array(); // Invoice ids.
+
+  var $customFieldMap       = array(); // Custom field ids.
+  var $customFieldOptionMap = array(); // Custop field option ids.
+  var $logMap        = array(); // Time log ids.
+
+  // Constructor.
+  function ttImportHelper(&$errors) {
+    $this->errors = &$errors;
+  }
+
+  // startElement - callback handler for opening tag of an XML element.
+  // In this function we assign passed in attributes to currentElement.
+  function startElement($parser, $name, $attrs) {
+    if ($name == 'GROUP'
+      || $name == 'USER'
+      || $name == 'TASK'
+      || $name == 'PROJECT'
+      || $name == 'CLIENT'
+      || $name == 'INVOICE'
+      || $name == 'MONTHLY_QUOTA'
+      || $name == 'LOG_ITEM'
+      || $name == 'CUSTOM_FIELD'
+      || $name == 'CUSTOM_FIELD_OPTION'
+      || $name == 'CUSTOM_FIELD_LOG_ENTRY'
+      || $name == 'INVOICE_HEADER'
+      || $name == 'USER_PROJECT_BIND'
+      || $name == 'EXPENSE_ITEM'
+      || $name == 'FAV_REPORT'
+      || $name == 'ROLE') {
+      $this->currentElement = $attrs;
+    }
+    $this->currentTag = $name;
+  }
+
+  // endElement - callback handler for the closing tag of an XML element.
+  // When we are here, currentElement is an array of the element attributes (as set in startElement).
+  // Here we do the actual import of data into the database.
+  function endElement($parser, $name) {
+    if ($name == 'GROUP') {
+      $this->groupData = $this->currentElement;
+      // Now groupData is an array of group properties. We'll use it later to create a group.
+      // Cannot create the group here. Need to determine whether logins collide with existing logins.
+      $this->currentElement = array();
+    }
+    if ($name == 'ROLE') {
+      $this->roles[$this->currentElement['ID']] = $this->currentElement;
+      $this->currentElement = array();
+    }
+    if ($name == 'USER') {
+      $this->users[$this->currentElement['ID']] = $this->currentElement;
+      $this->currentElement = array();
+    }
+    if ($name == 'USERS') {
+      foreach ($this->users as $user_item) {
+        if (('' != $user_item['STATUS']) && ttUserHelper::getUserByLogin($user_item['LOGIN'])) {
+          // We have a login collision, cannot import any data.
+          $this->canImport = false;
+          break;
+        }
+      }
+
+      // Now we can create a group.
+      if ($this->canImport) {
+        $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
+        $group_id = $this->createGroup(array(
+          'name' => $this->groupData['NAME'],
+          'currency' => $this->groupData['CURRENCY'],
+          'decimal_mark' => $this->groupData['DECIMAL_MARK'],
+          'lang' => $this->groupData['LANG'],
+          'date_format' => $this->groupData['DATE_FORMAT'],
+          'time_format' => $this->groupData['TIME_FORMAT'],
+          'week_start' => $this->groupData['WEEK_START'],
+          'tracking_mode' => $this->groupData['TRACKING_MODE'],
+          'project_required' => $this->groupData['PROJECT_REQUIRED'],
+          'task_required' => $this->groupData['TASK_REQUIRED'],
+          'record_type' => $this->groupData['RECORD_TYPE'],
+          'bcc_email' => $this->groupData['BCC_EMAIL'],
+          'allow_ip' => $this->groupData['ALLOW_IP'],
+          'password_complexity' => $this->groupData['PASSWORD_COMPLEXITY'],
+          'plugins' => $this->groupData['PLUGINS'],
+          'lock_spec' => $this->groupData['LOCK_SPEC'],
+          'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
+          'config' => $this->groupData['CONFIG']));
+        if ($group_id) {
+          $this->org_id = $group_id;
+          $this->group_id = $group_id;
+
+          // Create roles.
+          foreach ($this->roles as $key=>$role_item) {
+            $role_id = ttRoleHelper::insert(array(
+              'group_id' => $this->group_id,
+              'name' => $role_item['NAME'],
+              'rank' => $role_item['RANK'],
+              'rights' => $role_item['RIGHTS'],
+              'status' => $role_item['STATUS']));
+            $this->roleMap[$role_item['ID']] = $role_id;
+          }
+
+          foreach ($this->users as $key=>$user_item) {
+            $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
+            $user_id = ttUserHelper::insert(array(
+              'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
+              'role_id' => $role_id,
+              'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
+              'name' => $user_item['NAME'],
+              'login' => $user_item['LOGIN'],
+              'password' => $user_item['PASSWORD'],
+              'rate' => $user_item['RATE'],
+              'email' => $user_item['EMAIL'],
+              'status' => $user_item['STATUS']), false);
+            $this->userMap[$key] = $user_id;
+          }
+        }
+      }
+    }
+
+    if ($name == 'TASK' && $this->canImport) {
+      $this->taskMap[$this->currentElement['ID']] =
+        ttTaskHelper::insert(array(
+          'group_id' => $this->group_id,
+          'name' => $this->currentElement['NAME'],
+          'description' => $this->currentElement['DESCRIPTION'],
+          'status' => $this->currentElement['STATUS']));
+    }
+    if ($name == 'PROJECT' && $this->canImport) {
+      // Prepare a list of task ids.
+      $tasks = explode(',', $this->currentElement['TASKS']);
+      foreach ($tasks as $id)
+        $mapped_tasks[] = $this->taskMap[$id];
+
+      // Add a new project.
+      $this->projectMap[$this->currentElement['ID']] =
+        ttProjectHelper::insert(array(
+          'group_id' => $this->group_id,
+          'name' => $this->currentElement['NAME'],
+          'description' => $this->currentElement['DESCRIPTION'],
+          'tasks' => $mapped_tasks,
+          'status' => $this->currentElement['STATUS']));
+    }
+    if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
+      ttUserHelper::insertBind(
+        $this->userMap[$this->currentElement['USER_ID']],
+        $this->projectMap[$this->currentElement['PROJECT_ID']],
+        $this->currentElement['RATE'],
+        $this->currentElement['STATUS']);
+    }
+
+    if ($name == 'CLIENT' && $this->canImport) {
+      // Prepare a list of project ids.
+      if ($this->currentElement['PROJECTS']) {
+        $projects = explode(',', $this->currentElement['PROJECTS']);
+        foreach ($projects as $id)
+          $mapped_projects[] = $this->projectMap[$id];
+      }
+
+      $this->clientMap[$this->currentElement['ID']] =
+        ttClientHelper::insert(array(
+          'group_id' => $this->group_id,
+          'name' => $this->currentElement['NAME'],
+          'address' => $this->currentElement['ADDRESS'],
+          'tax' => $this->currentElement['TAX'],
+          'projects' => $mapped_projects,
+          'status' => $this->currentElement['STATUS']));
+
+        // Update client_id for tt_users to a mapped value.
+        // We did not do it during user insertion because clientMap was not ready then.
+        if ($this->currentElement['ID'] != $this->clientMap[$this->currentElement['ID']])
+          ttClientHelper::setMappedClient($this->group_id, $this->currentElement['ID'], $this->clientMap[$this->currentElement['ID']]);
+    }
+
+    if ($name == 'INVOICE' && $this->canImport) {
+      $this->invoiceMap[$this->currentElement['ID']] =
+        ttInvoiceHelper::insert(array(
+          'group_id' => $this->group_id,
+          'name' => $this->currentElement['NAME'],
+          'date' => $this->currentElement['DATE'],
+          'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
+          'discount' => $this->currentElement['DISCOUNT'],
+          'status' => $this->currentElement['STATUS']));
+    }
+
+    if ($name == 'MONTHLY_QUOTA' && $this->canImport) {
+      $this->insertMonthlyQuota($this->group_id, $this->currentElement['YEAR'], $this->currentElement['MONTH'], $this->currentElement['MINUTES']);
+    }
+
+    if ($name == 'LOG_ITEM' && $this->canImport) {
+      $this->logMap[$this->currentElement['ID']] =
+        ttTimeHelper::insert(array(
+          'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+          'group_id' => $this->group_id,
+          'date' => $this->currentElement['DATE'],
+          'start' => $this->currentElement['START'],
+          'finish' => $this->currentElement['FINISH'],
+          'duration' => $this->currentElement['DURATION'],
+          'client' => $this->clientMap[$this->currentElement['CLIENT_ID']],
+          'project' => $this->projectMap[$this->currentElement['PROJECT_ID']],
+          'task' => $this->taskMap[$this->currentElement['TASK_ID']],
+          'invoice' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
+          'note' => (isset($this->currentElement['COMMENT']) ? $this->currentElement['COMMENT'] : ''),
+          'billable' => $this->currentElement['BILLABLE'],
+          'paid' => $this->currentElement['PAID'],
+          'status' => $this->currentElement['STATUS']));
+    }
+
+    if ($name == 'CUSTOM_FIELD' && $this->canImport) {
+      $this->customFieldMap[$this->currentElement['ID']] =
+        ttCustomFieldHelper::insertField(array(
+          'group_id' => $this->group_id,
+          'type' => $this->currentElement['TYPE'],
+          'label' => $this->currentElement['LABEL'],
+          'required' => $this->currentElement['REQUIRED'],
+          'status' => $this->currentElement['STATUS']));
+    }
+
+    if ($name == 'CUSTOM_FIELD_OPTION' && $this->canImport) {
+      $this->customFieldOptionMap[$this->currentElement['ID']] =
+        ttCustomFieldHelper::insertOption(array(
+          'field_id' => $this->customFieldMap[$this->currentElement['FIELD_ID']],
+          'value' => $this->currentElement['VALUE']));
+    }
+
+    if ($name == 'CUSTOM_FIELD_LOG_ENTRY' && $this->canImport) {
+      ttCustomFieldHelper::insertLogEntry(array(
+        'log_id' => $this->logMap[$this->currentElement['LOG_ID']],
+        'field_id' => $this->customFieldMap[$this->currentElement['FIELD_ID']],
+        'option_id' => $this->customFieldOptionMap[$this->currentElement['OPTION_ID']],
+        'value' => $this->currentElement['VALUE'],
+        'status' => $this->currentElement['STATUS']));
+    }
+
+    if ($name == 'EXPENSE_ITEM' && $this->canImport) {
+      ttExpenseHelper::insert(array(
+        'date' => $this->currentElement['DATE'],
+        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+        'group_id' => $this->group_id,
+        'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
+        'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
+        'name' => $this->currentElement['NAME'],
+        'cost' => $this->currentElement['COST'],
+        'invoice_id' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
+        'paid' => $this->currentElement['PAID'],
+        'status' => $this->currentElement['STATUS']));
+    }
+
+    if ($name == 'FAV_REPORT' && $this->canImport) {
+      $user_list = '';
+      if (strlen($this->currentElement['USERS']) > 0) {
+        $arr = explode(',', $this->currentElement['USERS']);
+        foreach ($arr as $v)
+          $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->userMap[$v];
+      }
+      ttFavReportHelper::insertReport(array(
+        'name' => $this->currentElement['NAME'],
+        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+        'client' => $this->clientMap[$this->currentElement['CLIENT_ID']],
+        'option' => $this->customFieldOptionMap[$this->currentElement['CF_1_OPTION_ID']],
+        'project' => $this->projectMap[$this->currentElement['PROJECT_ID']],
+        'task' => $this->taskMap[$this->currentElement['TASK_ID']],
+        'billable' => $this->currentElement['BILLABLE'],
+        'users' => $user_list,
+        'period' => $this->currentElement['PERIOD'],
+        'from' => $this->currentElement['PERIOD_START'],
+        'to' => $this->currentElement['PERIOD_END'],
+        'chclient' => (int) $this->currentElement['SHOW_CLIENT'],
+        'chinvoice' => (int) $this->currentElement['SHOW_INVOICE'],
+        'chpaid' => (int) $this->currentElement['SHOW_PAID'],
+        'chip' => (int) $this->currentElement['SHOW_IP'],
+        'chproject' => (int) $this->currentElement['SHOW_PROJECT'],
+        'chstart' => (int) $this->currentElement['SHOW_START'],
+        'chduration' => (int) $this->currentElement['SHOW_DURATION'],
+        'chcost' => (int) $this->currentElement['SHOW_COST'],
+        'chtask' => (int) $this->currentElement['SHOW_TASK'],
+        'chfinish' => (int) $this->currentElement['SHOW_END'],
+        'chnote' => (int) $this->currentElement['SHOW_NOTE'],
+        'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
+        'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
+        'group_by1' => $this->currentElement['GROUP_BY1'],
+        'group_by2' => $this->currentElement['GROUP_BY2'],
+        'group_by3' => $this->currentElement['GROUP_BY3'],
+        'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
+    }
+    $this->currentTag = '';
+  }
+
+  // dataElement - callback handler for text data fragments. It builds up currentElement array with text pieces from XML.
+  function dataElement($parser, $data) {
+    if ($this->currentTag == 'NAME'
+      || $this->currentTag == 'DESCRIPTION'
+      || $this->currentTag == 'LABEL'
+      || $this->currentTag == 'VALUE'
+      || $this->currentTag == 'COMMENT'
+      || $this->currentTag == 'ADDRESS'
+      || $this->currentTag == 'ALLOW_IP'
+      || $this->currentTag == 'PASSWORD_COMPLEXITY') {
+      if (isset($this->currentElement[$this->currentTag]))
+        $this->currentElement[$this->currentTag] .= trim($data);
+      else
+        $this->currentElement[$this->currentTag] = trim($data);
+    }
+  }
+
+  // importXml - uncompresses the file, reads and parses its content. During parsing,
+  // startElement, endElement, and dataElement functions are called as many times as necessary.
+  // Actual import occurs in the endElement handler.
+  function importXml() {
+    global $i18n;
+
+    // Do we have a compressed file?
+    $compressed = false;
+    $file_ext = substr($_FILES['xmlfile']['name'], strrpos($_FILES['xmlfile']['name'], '.') + 1);
+    if (in_array($file_ext, array('bz','tbz','bz2','tbz2'))) {
+      $compressed = true;
+    }
+
+    // Create a temporary file.
+    $dirName = dirname(TEMPLATE_DIR . '_c/.');
+    $filename = tempnam($dirName, 'import_');
+
+    // If the file is compressed - uncompress it.
+    if ($compressed) {
+      if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
+        $this->errors->add($i18n->get('error.sys'));
+        return;
+      }
+      unlink($_FILES['xmlfile']['tmp_name']);
+    } else {
+      if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
+        $this->errors->add($i18n->get('error.upload'));
+        return;
+      }
+    }
+
+    // Initialize XML parser.
+    $parser = xml_parser_create();
+    xml_set_object($parser, $this);
+    xml_set_element_handler($parser, 'startElement', 'endElement');
+    xml_set_character_data_handler($parser, 'dataElement');
+
+    // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
+    $file = fopen($filename, 'r');
+    while ($data = fread($file, 4096)) {
+      if (!xml_parse($parser, $data, feof($file))) {
+        $this->errors->add(sprintf("XML error: %s at line %d",
+          xml_error_string(xml_get_error_code($parser)),
+          xml_get_current_line_number($parser)));
+      }
+      if (!$this->canImport) {
+        $this->errors->add($i18n->get('error.user_exists'));
+        break;
+      }
+    }
+    xml_parser_free($parser);
+    if ($file) fclose($file);
+    unlink($filename);
+  }
+
+  // uncompress - uncompresses the content of the $in file into the $out file.
+  function uncompress($in, $out) {
+    // Do we have the uncompress function?
+    if (!function_exists('bzopen'))
+      return false;
+
+    // Initial checks of file names and permissions.
+    if (!file_exists($in) || !is_readable ($in))
+      return false;
+    if ((!file_exists($out) && !is_writable(dirname($out))) || (file_exists($out) && !is_writable($out)))
+      return false;
+
+    if (!$out_file = fopen($out, 'wb'))
+      return false;
+    if (!$in_file = bzopen ($in, 'r'))
+      return false;
+
+    while (!feof($in_file)) {
+      $buffer = bzread($in_file, 4096);
+      fwrite($out_file, $buffer, 4096);
+    }
+    bzclose($in_file);
+    fclose ($out_file);
+    return true;
+  }
+
+  // createGroup function creates a new group.
+  private function createGroup($fields) {
+
+    global $user;
+    $mdb2 = getConnection();
+
+    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
+      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
+      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
+
+    $values = ' values ('.$mdb2->quote(trim($fields['name']));
+    $values .= ', '.$mdb2->quote(trim($fields['currency']));
+    $values .= ', '.$mdb2->quote($fields['decimal_mark']);
+    $values .= ', '.$mdb2->quote($fields['lang']);
+    $values .= ', '.$mdb2->quote($fields['date_format']);
+    $values .= ', '.$mdb2->quote($fields['time_format']);
+    $values .= ', '.(int)$fields['week_start'];
+    $values .= ', '.(int)$fields['tracking_mode'];
+    $values .= ', '.(int)$fields['project_required'];
+    $values .= ', '.(int)$fields['task_required'];
+    $values .= ', '.(int)$fields['record_type'];
+    $values .= ', '.$mdb2->quote($fields['bcc_email']);
+    $values .= ', '.$mdb2->quote($fields['allow_ip']);
+    $values .= ', '.$mdb2->quote($fields['password_complexity']);
+    $values .= ', '.$mdb2->quote($fields['plugins']);
+    $values .= ', '.$mdb2->quote($fields['lock_spec']);
+    $values .= ', '.(int)$fields['workday_minutes'];
+    $values .= ', '.$mdb2->quote($fields['config']);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $values .= ')';
+
+    $sql = 'insert into tt_groups '.$columns.$values;
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+    // Update org_id with group_id.
+    // NOTE: Both export and import need an additional effort to properly operate on subgroups.
+    // Currently we are importing one group only, which becomes a top level group.
+    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return $group_id;
+  }
+
+  // insertMonthlyQuota - a helper function to insert a monthly quota.
+  private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
+    $mdb2 = getConnection();
+    $sql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6f69b349a..04c4015fd 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.07.4361 | 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.07.4362 | 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/import.php b/import.php
index f822cb793..3e375c981 100644
--- a/import.php
+++ b/import.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('ttImportHelper');
+import('ttImportHelper2');
 import('form.Form');
 
 // Access check.
@@ -42,8 +43,11 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
-
-  $import = new ttImportHelper($err);
+  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+    $import = new ttImportHelper2($err);
+  } else {
+    $import = new ttImportHelper($err);
+  }
   $import->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost

From de9b34758cdcbc54e7100c260591143445c3c5cf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 20:20:17 +0000
Subject: [PATCH 0275/1848] More work on new import. Implemented 2-pass
 approach.

---
 WEB-INF/lib/ttImportHelper2.class.php | 369 +++-----------------------
 WEB-INF/templates/footer.tpl          |   2 +-
 2 files changed, 42 insertions(+), 329 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper2.class.php b/WEB-INF/lib/ttImportHelper2.class.php
index c646b97e0..58bfa8866 100644
--- a/WEB-INF/lib/ttImportHelper2.class.php
+++ b/WEB-INF/lib/ttImportHelper2.class.php
@@ -48,28 +48,10 @@ class ttImportHelper2 {
   var $currentTag     = '';      // XML tag of the current element.
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
-  var $groupData      = array(); // Array of group data such as group name, etc.
-  var $org_id         = null;    // New organization id we are importing. It is created during the import operation.
-  var $group_id       = null;    // New group id we are importing. It is created during the import operation.
-  var $roles          = array(); // Array of arrays of role properties.
-  var $users          = array(); // Array of arrays of user properties.
-  var $top_role_id    = null;    // Top manager role id on the new server.
-
-  // The following arrays are maps between entity ids in the file versus the database.
-  // In the file they are sequential (1,2,3...) while in the database the entities have different ids.
-  var $roleMap       = array(); // Role ids.
-  var $userMap       = array(); // User ids.
-  var $projectMap    = array(); // Project ids.
-  var $taskMap       = array(); // Task ids.
-  var $clientMap     = array(); // Client ids.
-  var $invoiceMap    = array(); // Invoice ids.
-
-  var $customFieldMap       = array(); // Custom field ids.
-  var $customFieldOptionMap = array(); // Custop field option ids.
-  var $logMap        = array(); // Time log ids.
+  var $firstPass      = true;    // True during first pass through the file.
 
   // Constructor.
-  function ttImportHelper(&$errors) {
+  function ttImportHelper2(&$errors) {
     $this->errors = &$errors;
   }
 
@@ -77,21 +59,7 @@ function ttImportHelper(&$errors) {
   // In this function we assign passed in attributes to currentElement.
   function startElement($parser, $name, $attrs) {
     if ($name == 'GROUP'
-      || $name == 'USER'
-      || $name == 'TASK'
-      || $name == 'PROJECT'
-      || $name == 'CLIENT'
-      || $name == 'INVOICE'
-      || $name == 'MONTHLY_QUOTA'
-      || $name == 'LOG_ITEM'
-      || $name == 'CUSTOM_FIELD'
-      || $name == 'CUSTOM_FIELD_OPTION'
-      || $name == 'CUSTOM_FIELD_LOG_ENTRY'
-      || $name == 'INVOICE_HEADER'
-      || $name == 'USER_PROJECT_BIND'
-      || $name == 'EXPENSE_ITEM'
-      || $name == 'FAV_REPORT'
-      || $name == 'ROLE') {
+      || $name == 'USER') {
       $this->currentElement = $attrs;
     }
     $this->currentTag = $name;
@@ -101,251 +69,21 @@ function startElement($parser, $name, $attrs) {
   // When we are here, currentElement is an array of the element attributes (as set in startElement).
   // Here we do the actual import of data into the database.
   function endElement($parser, $name) {
-    if ($name == 'GROUP') {
-      $this->groupData = $this->currentElement;
-      // Now groupData is an array of group properties. We'll use it later to create a group.
-      // Cannot create the group here. Need to determine whether logins collide with existing logins.
-      $this->currentElement = array();
-    }
-    if ($name == 'ROLE') {
-      $this->roles[$this->currentElement['ID']] = $this->currentElement;
-      $this->currentElement = array();
-    }
-    if ($name == 'USER') {
-      $this->users[$this->currentElement['ID']] = $this->currentElement;
-      $this->currentElement = array();
-    }
-    if ($name == 'USERS') {
-      foreach ($this->users as $user_item) {
-        if (('' != $user_item['STATUS']) && ttUserHelper::getUserByLogin($user_item['LOGIN'])) {
+    // During first pass we only check user logins.
+    if ($this->firstPass) {
+      if ($name == 'USER' && $this->canImport) {
+        if ('' != $this->currentElement['STATUS'] && ttUserHelper::getUserByLogin($this->currentElement['LOGIN'])) {
           // We have a login collision, cannot import any data.
           $this->canImport = false;
-          break;
         }
       }
-
-      // Now we can create a group.
-      if ($this->canImport) {
-        $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
-        $group_id = $this->createGroup(array(
-          'name' => $this->groupData['NAME'],
-          'currency' => $this->groupData['CURRENCY'],
-          'decimal_mark' => $this->groupData['DECIMAL_MARK'],
-          'lang' => $this->groupData['LANG'],
-          'date_format' => $this->groupData['DATE_FORMAT'],
-          'time_format' => $this->groupData['TIME_FORMAT'],
-          'week_start' => $this->groupData['WEEK_START'],
-          'tracking_mode' => $this->groupData['TRACKING_MODE'],
-          'project_required' => $this->groupData['PROJECT_REQUIRED'],
-          'task_required' => $this->groupData['TASK_REQUIRED'],
-          'record_type' => $this->groupData['RECORD_TYPE'],
-          'bcc_email' => $this->groupData['BCC_EMAIL'],
-          'allow_ip' => $this->groupData['ALLOW_IP'],
-          'password_complexity' => $this->groupData['PASSWORD_COMPLEXITY'],
-          'plugins' => $this->groupData['PLUGINS'],
-          'lock_spec' => $this->groupData['LOCK_SPEC'],
-          'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
-          'config' => $this->groupData['CONFIG']));
-        if ($group_id) {
-          $this->org_id = $group_id;
-          $this->group_id = $group_id;
-
-          // Create roles.
-          foreach ($this->roles as $key=>$role_item) {
-            $role_id = ttRoleHelper::insert(array(
-              'group_id' => $this->group_id,
-              'name' => $role_item['NAME'],
-              'rank' => $role_item['RANK'],
-              'rights' => $role_item['RIGHTS'],
-              'status' => $role_item['STATUS']));
-            $this->roleMap[$role_item['ID']] = $role_id;
-          }
-
-          foreach ($this->users as $key=>$user_item) {
-            $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
-            $user_id = ttUserHelper::insert(array(
-              'group_id' => $this->group_id,
-              'org_id' => $this->org_id,
-              'role_id' => $role_id,
-              'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
-              'name' => $user_item['NAME'],
-              'login' => $user_item['LOGIN'],
-              'password' => $user_item['PASSWORD'],
-              'rate' => $user_item['RATE'],
-              'email' => $user_item['EMAIL'],
-              'status' => $user_item['STATUS']), false);
-            $this->userMap[$key] = $user_id;
-          }
-        }
-      }
-    }
-
-    if ($name == 'TASK' && $this->canImport) {
-      $this->taskMap[$this->currentElement['ID']] =
-        ttTaskHelper::insert(array(
-          'group_id' => $this->group_id,
-          'name' => $this->currentElement['NAME'],
-          'description' => $this->currentElement['DESCRIPTION'],
-          'status' => $this->currentElement['STATUS']));
+      $this->currentTag = '';
     }
-    if ($name == 'PROJECT' && $this->canImport) {
-      // Prepare a list of task ids.
-      $tasks = explode(',', $this->currentElement['TASKS']);
-      foreach ($tasks as $id)
-        $mapped_tasks[] = $this->taskMap[$id];
 
-      // Add a new project.
-      $this->projectMap[$this->currentElement['ID']] =
-        ttProjectHelper::insert(array(
-          'group_id' => $this->group_id,
-          'name' => $this->currentElement['NAME'],
-          'description' => $this->currentElement['DESCRIPTION'],
-          'tasks' => $mapped_tasks,
-          'status' => $this->currentElement['STATUS']));
-    }
-    if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
-      ttUserHelper::insertBind(
-        $this->userMap[$this->currentElement['USER_ID']],
-        $this->projectMap[$this->currentElement['PROJECT_ID']],
-        $this->currentElement['RATE'],
-        $this->currentElement['STATUS']);
+    // During second pass we import data.
+    if (!$this->firstPass && $this->canImport) {
+      // TODO: write code here.
     }
-
-    if ($name == 'CLIENT' && $this->canImport) {
-      // Prepare a list of project ids.
-      if ($this->currentElement['PROJECTS']) {
-        $projects = explode(',', $this->currentElement['PROJECTS']);
-        foreach ($projects as $id)
-          $mapped_projects[] = $this->projectMap[$id];
-      }
-
-      $this->clientMap[$this->currentElement['ID']] =
-        ttClientHelper::insert(array(
-          'group_id' => $this->group_id,
-          'name' => $this->currentElement['NAME'],
-          'address' => $this->currentElement['ADDRESS'],
-          'tax' => $this->currentElement['TAX'],
-          'projects' => $mapped_projects,
-          'status' => $this->currentElement['STATUS']));
-
-        // Update client_id for tt_users to a mapped value.
-        // We did not do it during user insertion because clientMap was not ready then.
-        if ($this->currentElement['ID'] != $this->clientMap[$this->currentElement['ID']])
-          ttClientHelper::setMappedClient($this->group_id, $this->currentElement['ID'], $this->clientMap[$this->currentElement['ID']]);
-    }
-
-    if ($name == 'INVOICE' && $this->canImport) {
-      $this->invoiceMap[$this->currentElement['ID']] =
-        ttInvoiceHelper::insert(array(
-          'group_id' => $this->group_id,
-          'name' => $this->currentElement['NAME'],
-          'date' => $this->currentElement['DATE'],
-          'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-          'discount' => $this->currentElement['DISCOUNT'],
-          'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'MONTHLY_QUOTA' && $this->canImport) {
-      $this->insertMonthlyQuota($this->group_id, $this->currentElement['YEAR'], $this->currentElement['MONTH'], $this->currentElement['MINUTES']);
-    }
-
-    if ($name == 'LOG_ITEM' && $this->canImport) {
-      $this->logMap[$this->currentElement['ID']] =
-        ttTimeHelper::insert(array(
-          'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-          'group_id' => $this->group_id,
-          'date' => $this->currentElement['DATE'],
-          'start' => $this->currentElement['START'],
-          'finish' => $this->currentElement['FINISH'],
-          'duration' => $this->currentElement['DURATION'],
-          'client' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-          'project' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-          'task' => $this->taskMap[$this->currentElement['TASK_ID']],
-          'invoice' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
-          'note' => (isset($this->currentElement['COMMENT']) ? $this->currentElement['COMMENT'] : ''),
-          'billable' => $this->currentElement['BILLABLE'],
-          'paid' => $this->currentElement['PAID'],
-          'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'CUSTOM_FIELD' && $this->canImport) {
-      $this->customFieldMap[$this->currentElement['ID']] =
-        ttCustomFieldHelper::insertField(array(
-          'group_id' => $this->group_id,
-          'type' => $this->currentElement['TYPE'],
-          'label' => $this->currentElement['LABEL'],
-          'required' => $this->currentElement['REQUIRED'],
-          'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'CUSTOM_FIELD_OPTION' && $this->canImport) {
-      $this->customFieldOptionMap[$this->currentElement['ID']] =
-        ttCustomFieldHelper::insertOption(array(
-          'field_id' => $this->customFieldMap[$this->currentElement['FIELD_ID']],
-          'value' => $this->currentElement['VALUE']));
-    }
-
-    if ($name == 'CUSTOM_FIELD_LOG_ENTRY' && $this->canImport) {
-      ttCustomFieldHelper::insertLogEntry(array(
-        'log_id' => $this->logMap[$this->currentElement['LOG_ID']],
-        'field_id' => $this->customFieldMap[$this->currentElement['FIELD_ID']],
-        'option_id' => $this->customFieldOptionMap[$this->currentElement['OPTION_ID']],
-        'value' => $this->currentElement['VALUE'],
-        'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'EXPENSE_ITEM' && $this->canImport) {
-      ttExpenseHelper::insert(array(
-        'date' => $this->currentElement['DATE'],
-        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-        'group_id' => $this->group_id,
-        'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-        'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-        'name' => $this->currentElement['NAME'],
-        'cost' => $this->currentElement['COST'],
-        'invoice_id' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
-        'paid' => $this->currentElement['PAID'],
-        'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'FAV_REPORT' && $this->canImport) {
-      $user_list = '';
-      if (strlen($this->currentElement['USERS']) > 0) {
-        $arr = explode(',', $this->currentElement['USERS']);
-        foreach ($arr as $v)
-          $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->userMap[$v];
-      }
-      ttFavReportHelper::insertReport(array(
-        'name' => $this->currentElement['NAME'],
-        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-        'client' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-        'option' => $this->customFieldOptionMap[$this->currentElement['CF_1_OPTION_ID']],
-        'project' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-        'task' => $this->taskMap[$this->currentElement['TASK_ID']],
-        'billable' => $this->currentElement['BILLABLE'],
-        'users' => $user_list,
-        'period' => $this->currentElement['PERIOD'],
-        'from' => $this->currentElement['PERIOD_START'],
-        'to' => $this->currentElement['PERIOD_END'],
-        'chclient' => (int) $this->currentElement['SHOW_CLIENT'],
-        'chinvoice' => (int) $this->currentElement['SHOW_INVOICE'],
-        'chpaid' => (int) $this->currentElement['SHOW_PAID'],
-        'chip' => (int) $this->currentElement['SHOW_IP'],
-        'chproject' => (int) $this->currentElement['SHOW_PROJECT'],
-        'chstart' => (int) $this->currentElement['SHOW_START'],
-        'chduration' => (int) $this->currentElement['SHOW_DURATION'],
-        'chcost' => (int) $this->currentElement['SHOW_COST'],
-        'chtask' => (int) $this->currentElement['SHOW_TASK'],
-        'chfinish' => (int) $this->currentElement['SHOW_END'],
-        'chnote' => (int) $this->currentElement['SHOW_NOTE'],
-        'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
-        'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
-        'group_by1' => $this->currentElement['GROUP_BY1'],
-        'group_by2' => $this->currentElement['GROUP_BY2'],
-        'group_by3' => $this->currentElement['GROUP_BY3'],
-        'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
-    }
-    $this->currentTag = '';
   }
 
   // dataElement - callback handler for text data fragments. It builds up currentElement array with text pieces from XML.
@@ -402,6 +140,13 @@ function importXml() {
     xml_set_element_handler($parser, 'startElement', 'endElement');
     xml_set_character_data_handler($parser, 'dataElement');
 
+    // We need to parse the file 2 times:
+    //   1) First pass: determine if import is possible - there must be no login collisions.
+    //   2) Second pass: if we can import, then do import in a second pass.
+    // This is different from earlier approach for single group import, where we could
+    // do both things in one pass because user info was in the beginning of XML file.
+    // Now, with subgroups, users can be located anywhere in the file.
+
     // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
     $file = fopen($filename, 'r');
     while ($data = fread($file, 4096)) {
@@ -415,6 +160,29 @@ function importXml() {
         break;
       }
     }
+    $this->firstPass = false; // We are done with 1st pass.
+    xml_parser_free($parser);
+    if ($file) fclose($file);
+    if (!$this->canImport) {
+      unlink($filename);
+      return;
+    }
+
+    // Now we can do a second pass, where real work is done.
+    $parser = xml_parser_create();
+    xml_set_object($parser, $this);
+    xml_set_element_handler($parser, 'startElement', 'endElement');
+    xml_set_character_data_handler($parser, 'dataElement');
+
+    // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
+    $file = fopen($filename, 'r');
+    while ($data = fread($file, 4096)) {
+      if (!xml_parse($parser, $data, feof($file))) {
+        $this->errors->add(sprintf("XML error: %s at line %d",
+          xml_error_string(xml_get_error_code($parser)),
+          xml_get_current_line_number($parser)));
+      }
+    }
     xml_parser_free($parser);
     if ($file) fclose($file);
     unlink($filename);
@@ -445,59 +213,4 @@ function uncompress($in, $out) {
     fclose ($out_file);
     return true;
   }
-
-  // createGroup function creates a new group.
-  private function createGroup($fields) {
-
-    global $user;
-    $mdb2 = getConnection();
-
-    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
-      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
-      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
-
-    $values = ' values ('.$mdb2->quote(trim($fields['name']));
-    $values .= ', '.$mdb2->quote(trim($fields['currency']));
-    $values .= ', '.$mdb2->quote($fields['decimal_mark']);
-    $values .= ', '.$mdb2->quote($fields['lang']);
-    $values .= ', '.$mdb2->quote($fields['date_format']);
-    $values .= ', '.$mdb2->quote($fields['time_format']);
-    $values .= ', '.(int)$fields['week_start'];
-    $values .= ', '.(int)$fields['tracking_mode'];
-    $values .= ', '.(int)$fields['project_required'];
-    $values .= ', '.(int)$fields['task_required'];
-    $values .= ', '.(int)$fields['record_type'];
-    $values .= ', '.$mdb2->quote($fields['bcc_email']);
-    $values .= ', '.$mdb2->quote($fields['allow_ip']);
-    $values .= ', '.$mdb2->quote($fields['password_complexity']);
-    $values .= ', '.$mdb2->quote($fields['plugins']);
-    $values .= ', '.$mdb2->quote($fields['lock_spec']);
-    $values .= ', '.(int)$fields['workday_minutes'];
-    $values .= ', '.$mdb2->quote($fields['config']);
-    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
-    $values .= ')';
-
-    $sql = 'insert into tt_groups '.$columns.$values;
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
-
-    // Update org_id with group_id.
-    // NOTE: Both export and import need an additional effort to properly operate on subgroups.
-    // Currently we are importing one group only, which becomes a top level group.
-    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return $group_id;
-  }
-
-  // insertMonthlyQuota - a helper function to insert a monthly quota.
-  private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
-    $mdb2 = getConnection();
-    $sql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 04c4015fd..5f015a501 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.07.4362 | 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.07.4363 | 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>

From 5210e7673369389701814dab3bf646b7a0d98437 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Nov 2018 20:36:55 +0000
Subject: [PATCH 0276/1848] Starting to work on ttExportHelper2 class as part
 of subgroup support.

---
 WEB-INF/lib/ttExportHelper2.class.php | 420 ++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl          |   2 +-
 export.php                            |   7 +-
 3 files changed, 427 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/lib/ttExportHelper2.class.php

diff --git a/WEB-INF/lib/ttExportHelper2.class.php b/WEB-INF/lib/ttExportHelper2.class.php
new file mode 100644
index 000000000..a34c66fa6
--- /dev/null
+++ b/WEB-INF/lib/ttExportHelper2.class.php
@@ -0,0 +1,420 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttTeamHelper');
+import('ttTimeHelper');
+
+// ttExportHelper2 - this class is a future replacement for ttExportHelper.
+// Currently, it is work in progress.
+// When done, it should handle exporting of complex groups containing other groups.
+class ttExportHelper2 {
+  // TODO: we need a constructor...
+  var $fileName    = null;    // Name of the file with data.
+
+  // The following arrays are maps between entity ids in the file versus the database.
+  // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
+  var $userMap     = array(); // User ids.
+  var $roleMap     = array(); // Role ids.
+  var $projectMap  = array(); // Project ids.
+  var $taskMap     = array(); // Task ids.
+  var $clientMap   = array(); // Client ids.
+  var $invoiceMap  = array(); // Invoice ids.
+  var $customFieldMap       = array(); // Custom field ids.
+  var $customFieldOptionMap = array(); // Custop field option ids.
+  var $logMap      = array(); // Time log ids.
+
+  // createDataFile creates a file with all data for a given group.
+  function createDataFile($compress = false) {
+    global $user;
+
+    // Create a temporary file.
+    $dirName = dirname(TEMPLATE_DIR . '_c/.');
+    $tmp_file = tempnam($dirName, 'tt');
+
+    // Open the file for writing.
+    $file = fopen($tmp_file, 'wb');
+    if (!$file) return false;
+
+    // Write XML to the file.
+    fwrite($file, "<?xml version=\"1.0\"?>\n");
+    fwrite($file, "<pack>\n");
+
+    // Write group info.
+    fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
+      "\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
+      "\" tracking_mode=\"".$user->tracking_mode."\" project_required=\"".$user->project_required."\" task_required=\"".$user->task_required.
+      "\" record_type=\"".$user->record_type."\" bcc_email=\"".$user->bcc_email.
+      "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
+      "\" config=\"".$user->config.
+      "\">\n");
+    fwrite($file, "  <name><![CDATA[".$user->group_name."]]></name>\n");
+    fwrite($file, "  <allow_ip><![CDATA[".$user->allow_ip."]]></allow_ip>\n");
+    fwrite($file, "  <password_complexity><![CDATA[".$user->password_complexity."]]></password_complexity>\n");
+    fwrite($file, "</group>\n");
+
+    // Prepare role map.
+    $roles = $this->getRoles();
+    foreach ($roles as $key=>$role_item)
+      $this->roleMap[$role_item['id']] = $key + 1;
+
+    // Prepare user map.
+    $users = $this->getUsers();
+    foreach ($users as $key=>$user_item)
+      $this->userMap[$user_item['id']] = $key + 1;
+
+    // Prepare project map.
+    $projects = ttTeamHelper::getAllProjects($user->group_id, true);
+    foreach ($projects as $key=>$project_item)
+      $this->projectMap[$project_item['id']] = $key + 1;
+
+    // Prepare task map.
+    $tasks = ttTeamHelper::getAllTasks($user->group_id, true);
+    foreach ($tasks as $key=>$task_item)
+      $this->taskMap[$task_item['id']] = $key + 1;
+
+    // Prepare client map.
+    $clients = ttTeamHelper::getAllClients($user->group_id, true);
+    foreach ($clients as $key=>$client_item)
+      $this->clientMap[$client_item['id']] = $key + 1;
+
+    // Prepare invoice map.
+    $invoices = ttTeamHelper::getAllInvoices();
+    foreach ($invoices as $key=>$invoice_item)
+      $this->invoiceMap[$invoice_item['id']] = $key + 1;
+
+    // Prepare custom fields map.
+    $custom_fields = ttTeamHelper::getAllCustomFields($user->group_id);
+    foreach ($custom_fields as $key=>$custom_field)
+      $this->customFieldMap[$custom_field['id']] = $key + 1;
+
+    // Prepare custom field options map.
+    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->group_id);
+    foreach ($custom_field_options as $key=>$option)
+      $this->customFieldOptionMap[$option['id']] = $key + 1;
+
+    // Write roles.
+    fwrite($file, "<roles>\n");
+    foreach ($roles as $role) {
+      fwrite($file, "  <role id=\"".$this->roleMap[$role['id']]."\" rank=\"".$role['rank']."\"".
+        " rights=\"".$role['rights']."\" status=\"".$role['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$role['name']."]]></name>\n");
+      fwrite($file, "  </role>\n");
+    }
+    fwrite($file, "</roles>\n");
+    unset($roles);
+
+    // Write users.
+    fwrite($file, "<users>\n");
+    foreach ($users as $user_item) {
+      $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
+      fwrite($file, "  <user id=\"".$this->userMap[$user_item['id']]."\" login=\"".htmlentities($user_item['login'])."\" password=\"".$user_item['password']."\" role_id=\"".$role_id."\" client_id=\"".$this->clientMap[$user_item['client_id']]."\" rate=\"".$user_item['rate']."\" email=\"".$user_item['email']."\" status=\"".$user_item['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$user_item['name']."]]></name>\n");
+      fwrite($file, "  </user>\n");
+    }
+    fwrite($file, "</users>\n");
+
+    // Write tasks.
+    fwrite($file, "<tasks>\n");
+    foreach ($tasks as $task_item) {
+      fwrite($file, "  <task id=\"".$this->taskMap[$task_item['id']]."\" status=\"".$task_item['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$task_item['name']."]]></name>\n");
+      fwrite($file, "    <description><![CDATA[".$task_item['description']."]]></description>\n");
+      fwrite($file, "  </task>\n");
+    }
+    fwrite($file, "</tasks>\n");
+    unset($tasks);
+
+    // Write projects.
+    fwrite($file, "<projects>\n");
+    foreach ($projects as $project_item) {
+      if($project_item['tasks']){
+        $tasks = explode(',', $project_item['tasks']);
+        $tasks_mapped = array();
+        foreach ($tasks as $item)
+          $tasks_mapped[] = $this->taskMap[$item];
+        $tasks_str = implode(',', $tasks_mapped);
+      }
+      fwrite($file, "  <project id=\"".$this->projectMap[$project_item['id']]."\" tasks=\"".$tasks_str."\" status=\"".$project_item['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$project_item['name']."]]></name>\n");
+      fwrite($file, "    <description><![CDATA[".$project_item['description']."]]></description>\n");
+      fwrite($file, "  </project>\n");
+    }
+    fwrite($file, "</projects>\n");
+    unset($projects);
+
+    // Write user to project binds.
+    fwrite($file, "<user_project_binds>\n");
+    $user_binds = ttTeamHelper::getUserToProjectBinds($user->group_id);
+    foreach ($user_binds as $bind) {
+      $user_id = $this->userMap[$bind['user_id']];
+      $project_id = $this->projectMap[$bind['project_id']];
+      fwrite($file, "  <user_project_bind user_id=\"{$user_id}\" project_id=\"{$project_id}\" rate=\"".$bind['rate']."\" status=\"".$bind['status']."\"/>\n");
+    }
+    fwrite($file, "</user_project_binds>\n");
+    unset($user_binds);
+
+    // Write clients.
+    fwrite($file, "<clients>\n");
+    foreach ($clients as $client_item) {
+      if($client_item['projects']){
+        $projects = explode(',', $client_item['projects']);
+        $projects_mapped = array();
+        foreach ($projects as $item)
+          $projects_mapped[] = $this->projectMap[$item];
+        $projects_str = implode(',', $projects_mapped);
+      }
+      fwrite($file, "  <client id=\"".$this->clientMap[$client_item['id']]."\" tax=\"".$client_item['tax']."\" projects=\"".$projects_str."\" status=\"".$client_item['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$client_item['name']."]]></name>\n");
+      fwrite($file, "    <address><![CDATA[".$client_item['address']."]]></address>\n");
+      fwrite($file, "  </client>\n");
+    }
+    fwrite($file, "</clients>\n");
+    unset($clients);
+
+    // Write invoices.
+    fwrite($file, "<invoices>\n");
+    foreach ($invoices as $invoice_item) {
+      fwrite($file, "  <invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\" date=\"".$invoice_item['date']."\" client_id=\"".$this->clientMap[$invoice_item['client_id']]."\" status=\"".$invoice_item['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$invoice_item['name']."]]></name>\n");
+      fwrite($file, "  </invoice>\n");
+    }
+    fwrite($file, "</invoices>\n");
+    unset($invoices);
+
+    // Write custom fields.
+    fwrite($file, "<custom_fields>\n");
+    foreach ($custom_fields as $custom_field) {
+      fwrite($file, "  <custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\" type=\"".$custom_field['type']."\" required=\"".$custom_field['required']."\" status=\"".$custom_field['status']."\">\n");
+      fwrite($file, "    <label><![CDATA[".$custom_field['label']."]]></label>\n");
+      fwrite($file, "  </custom_field>\n");
+    }
+    fwrite($file, "</custom_fields>\n");
+    unset($custom_fields);
+
+    // Write custom field options.
+    fwrite($file, "<custom_field_options>\n");
+    foreach ($custom_field_options as $option) {
+      fwrite($file, "  <custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\" field_id=\"".$this->customFieldMap[$option['field_id']]."\">\n");
+      fwrite($file, "    <value><![CDATA[".$option['value']."]]></value>\n");
+      fwrite($file, "  </custom_field_option>\n");
+    }
+    fwrite($file, "</custom_field_options>\n");
+    unset($custom_field_options);
+
+    // Write monthly quotas.
+    $quotas = ttTeamHelper::getMonthlyQuotas($user->group_id);
+    fwrite($file, "<monthly_quotas>\n");
+    foreach ($quotas as $quota) {
+      fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");
+    }
+    fwrite($file, "</monthly_quotas>\n");
+
+    // Write time log entries.
+    fwrite($file, "<log>\n");
+    $key = 0;
+    foreach ($users as $user_item) {
+      $records = ttTimeHelper::getAllRecords($user_item['id']);
+      foreach ($records as $record) {
+        $key++;
+        $this->logMap[$record['id']] = $key;
+        fwrite($file, "  <log_item id=\"$key\" user_id=\"".$this->userMap[$record['user_id']]."\" date=\"".$record['date']."\" start=\"".$record['start']."\" finish=\"".$record['finish']."\" duration=\"".($record['start']?"":$record['duration'])."\" client_id=\"".$this->clientMap[$record['client_id']]."\" project_id=\"".$this->projectMap[$record['project_id']]."\" task_id=\"".$this->taskMap[$record['task_id']]."\" invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\" billable=\"".$record['billable']."\" paid=\"".$record['paid']."\" status=\"".$record['status']."\">\n");
+        fwrite($file, "    <comment><![CDATA[".$record['comment']."]]></comment>\n");
+        fwrite($file, "  </log_item>\n");
+      }
+    }
+    fwrite($file, "</log>\n");
+    unset($records);
+
+    // Write custom field log.
+    $custom_field_log = ttTeamHelper::getCustomFieldLog($user->group_id);
+    fwrite($file, "<custom_field_log>\n");
+    foreach ($custom_field_log as $entry) {
+      fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");
+      fwrite($file, "    <value><![CDATA[".$entry['value']."]]></value>\n");
+      fwrite($file, "  </custom_field_log_entry>\n");
+    }
+    fwrite($file, "</custom_field_log>\n");
+    unset($custom_field_log);
+
+    // Write expense items.
+    $expense_items = ttTeamHelper::getExpenseItems($user->group_id);
+    fwrite($file, "<expense_items>\n");
+    foreach ($expense_items as $expense_item) {
+      fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$expense_item['name']."]]></name>\n");
+      fwrite($file, "  </expense_item>\n");
+    }
+    fwrite($file, "</expense_items>\n");
+    unset($expense_items);
+
+    // Write fav reports.
+    fwrite($file, "<fav_reports>\n");
+    $fav_reports = ttTeamHelper::getFavReports($user->group_id);
+    foreach ($fav_reports as $fav_report) {
+      $user_list = '';
+      if (strlen($fav_report['users']) > 0) {
+        $arr = explode(',', $fav_report['users']);
+        foreach ($arr as $k=>$v) {
+          if (array_key_exists($arr[$k], $this->userMap))
+            $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
+        }
+      }
+      fwrite($file, "  <fav_report user_id=\"".$this->userMap[$fav_report['user_id']]."\"".
+        " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"".
+        " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"".
+        " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"".
+        " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"".
+        " billable=\"".$fav_report['billable']."\"".
+        " users=\"".$user_list."\"".
+        " period=\"".$fav_report['period']."\"".
+        " period_start=\"".$fav_report['period_start']."\"".
+        " period_end=\"".$fav_report['period_end']."\"".
+        " show_client=\"".$fav_report['show_client']."\"".
+        " show_invoice=\"".$fav_report['show_invoice']."\"".
+        " show_paid=\"".$fav_report['show_paid']."\"".
+        " show_ip=\"".$fav_report['show_ip']."\"".
+        " show_project=\"".$fav_report['show_project']."\"".
+        " show_start=\"".$fav_report['show_start']."\"".
+        " show_duration=\"".$fav_report['show_duration']."\"".
+        " show_cost=\"".$fav_report['show_cost']."\"".
+        " show_task=\"".$fav_report['show_task']."\"".
+        " show_end=\"".$fav_report['show_end']."\"".
+        " show_note=\"".$fav_report['show_note']."\"".
+        " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
+        " show_work_units=\"".$fav_report['show_work_units']."\"".
+        " group_by1=\"".$fav_report['group_by1']."\"".
+        " group_by2=\"".$fav_report['group_by2']."\"".
+        " group_by3=\"".$fav_report['group_by3']."\"".
+        " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
+      fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
+      fwrite($file, "  </fav_report>\n");
+    }
+    fwrite($file, "</fav_reports>\n");
+    unset($fav_reports);
+
+    // Cleanup.
+    unset($users);
+    $this->roleMap = array();
+    $this->userMap = array();
+    $this->projectMap = array();
+    $this->taskMap = array();
+
+    fwrite($file, "</pack>\n");
+    fclose($file);
+
+    if ($compress) {
+      $this->fileName = tempnam($dirName, 'tt');
+      $this->compress($tmp_file, $this->fileName);
+      unlink($tmp_file);
+    } else
+      $this->fileName = $tmp_file;
+
+    return true;
+  }
+
+  // getFileName - returns file name.
+  function getFileName() {
+    return $this->fileName;
+  }
+
+  // compress - compresses the content of the $in file into $out file.
+  function compress($in, $out) {
+    // Initial checks of file names and permissions.
+    if (!file_exists($in) || !is_readable ($in))
+      return false;
+    if ((!file_exists($out) && !is_writable(dirname($out))) || (file_exists($out) && !is_writable($out)))
+      return false;
+
+    $in_file = fopen($in, 'rb');
+
+    if (function_exists('bzopen')) {
+      if (!$out_file = bzopen($out, 'w'))
+        return false;
+
+      while (!feof ($in_file)) {
+        $buffer = fread($in_file, 4096);
+        bzwrite($out_file, $buffer, 4096);
+      }
+      bzclose($out_file);
+    }
+    fclose ($in_file);
+    return true;
+  }
+
+  /*
+   * Note about the utility functions below.
+   * We have roughly 4 groups of operations:
+   *   1) Regular system usage for tracking time, etc.
+   *   2) Registration process - used infrequently.
+   *   3) Admin usage - used infrequently.
+   *   4) Export - used infrequently.
+   *
+   * It is tempting to have a generic function to get things done for
+   * all situations. However, as registration, export and admin access are one-off
+   * operations, while regular system usage is daily and must be efficient,
+   * the current approach is to have SEPARATE functions for each mode.
+   *
+   * This is because each mode requires a slightly different approach,
+   * and we don't want to over-complicate things.
+   */
+
+  // getRoles - obtains all roles defined for group.
+  function getRoles() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_roles where group_id = $user->group_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
+  // The getUsers obtains all users in group for the purpose of export.
+  function getUsers() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id order by upper(u.name)"; // Note: deleted users are included.
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5f015a501..45a12a655 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.07.4363 | 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.07.4364 | 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/export.php b/export.php
index 5f7bd02d4..b194adfb3 100644
--- a/export.php
+++ b/export.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('ttExportHelper');
+import('ttExportHelper2');
 import('form.Form');
 
 // Access check.
@@ -56,7 +57,11 @@
     $mime_type = 'application/x-bzip2';
   }
 
-  $exportHelper = new ttExportHelper();
+  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+    $exportHelper = new ttExportHelper2();
+  } else {
+    $exportHelper = new ttExportHelper();
+  }
   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);

From 51818601ad6bd5fafcbc93e171b51f9eaf98486c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 12:43:27 +0000
Subject: [PATCH 0277/1848] Renamed pack tag to org for clarity.

---
 WEB-INF/lib/ttExportHelper.class.php  | 4 ++--
 WEB-INF/lib/ttExportHelper2.class.php | 4 ++--
 WEB-INF/templates/footer.tpl          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 26c801d48..c5e7802d8 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -59,7 +59,7 @@ function createDataFile($compress = false) {
 
     // Write XML to the file.
     fwrite($file, "<?xml version=\"1.0\"?>\n");
-    fwrite($file, "<pack>\n");
+    fwrite($file, "<org>\n");
 
     // Write group info.
     fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
@@ -321,7 +321,7 @@ function createDataFile($compress = false) {
     $this->projectMap = array();
     $this->taskMap = array();
 
-    fwrite($file, "</pack>\n");
+    fwrite($file, "</org>\n");
     fclose($file);
 
     if ($compress) {
diff --git a/WEB-INF/lib/ttExportHelper2.class.php b/WEB-INF/lib/ttExportHelper2.class.php
index a34c66fa6..a179769eb 100644
--- a/WEB-INF/lib/ttExportHelper2.class.php
+++ b/WEB-INF/lib/ttExportHelper2.class.php
@@ -62,7 +62,7 @@ function createDataFile($compress = false) {
 
     // Write XML to the file.
     fwrite($file, "<?xml version=\"1.0\"?>\n");
-    fwrite($file, "<pack>\n");
+    fwrite($file, "<org>\n");
 
     // Write group info.
     fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
@@ -324,7 +324,7 @@ function createDataFile($compress = false) {
     $this->projectMap = array();
     $this->taskMap = array();
 
-    fwrite($file, "</pack>\n");
+    fwrite($file, "</org>\n");
     fclose($file);
 
     if ($compress) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 45a12a655..9581fdb9a 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.07.4364 | 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.07.4365 | 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>

From 2b02e65a452b9ab911d3a3c3072302f6e39dfec7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 13:00:46 +0000
Subject: [PATCH 0278/1848] Renamed ttExportHelper2 class to ttOrgExportHelper.

---
 ...tExportHelper2.class.php => ttOrgExportHelper.class.php} | 6 +++---
 export.php                                                  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename WEB-INF/lib/{ttExportHelper2.class.php => ttOrgExportHelper.class.php} (99%)

diff --git a/WEB-INF/lib/ttExportHelper2.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
similarity index 99%
rename from WEB-INF/lib/ttExportHelper2.class.php
rename to WEB-INF/lib/ttOrgExportHelper.class.php
index a179769eb..a6eb6af8f 100644
--- a/WEB-INF/lib/ttExportHelper2.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -29,10 +29,10 @@
 import('ttTeamHelper');
 import('ttTimeHelper');
 
-// ttExportHelper2 - this class is a future replacement for ttExportHelper.
+// ttOrgExportHelper - this class is a future replacement for ttExportHelper.
 // Currently, it is work in progress.
-// When done, it should handle exporting of complex groups containing other groups.
-class ttExportHelper2 {
+// When done, it should handle export of organizations containing multiple groups.
+class ttOrgExportHelper {
   // TODO: we need a constructor...
   var $fileName    = null;    // Name of the file with data.
 
diff --git a/export.php b/export.php
index b194adfb3..3d6178148 100644
--- a/export.php
+++ b/export.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('ttExportHelper');
-import('ttExportHelper2');
+import('ttOrgExportHelper');
 import('form.Form');
 
 // Access check.
@@ -58,7 +58,7 @@
   }
 
   if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
-    $exportHelper = new ttExportHelper2();
+    $exportHelper = new ttOrgExportHelper();
   } else {
     $exportHelper = new ttExportHelper();
   }

From ee95ed0e72258b76ed0280f04d6846d802aefa12 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 13:17:29 +0000
Subject: [PATCH 0279/1848] Renamed constructor function.

---
 WEB-INF/lib/ttImportHelper.class.php  | 2 +-
 WEB-INF/lib/ttImportHelper2.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 69af9e12c..42c7102be 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -67,7 +67,7 @@ class ttImportHelper {
   var $logMap        = array(); // Time log ids.
 
   // Constructor.
-  function ttImportHelper(&$errors) {
+  function __construct(&$errors) {
     $this->errors = &$errors;
   }
 
diff --git a/WEB-INF/lib/ttImportHelper2.class.php b/WEB-INF/lib/ttImportHelper2.class.php
index 58bfa8866..5de6d8c59 100644
--- a/WEB-INF/lib/ttImportHelper2.class.php
+++ b/WEB-INF/lib/ttImportHelper2.class.php
@@ -51,7 +51,7 @@ class ttImportHelper2 {
   var $firstPass      = true;    // True during first pass through the file.
 
   // Constructor.
-  function ttImportHelper2(&$errors) {
+  function __construct(&$errors) {
     $this->errors = &$errors;
   }
 

From abfd3bbc6a72c55b30d48466b2719804ebee6733 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 14:01:29 +0000
Subject: [PATCH 0280/1848] Started work on ttGroupExportHelper class for
 exporting single groups.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 56 +++++++++++++++++++++++
 WEB-INF/lib/ttOrgExportHelper.class.php   |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 WEB-INF/lib/ttGroupExportHelper.class.php

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
new file mode 100644
index 000000000..9ac4464aa
--- /dev/null
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -0,0 +1,56 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// ttGroupExportHelper - this class is used to write data for a single group
+// to a file. When group contains other groups, it reuses itself recursively.
+//
+// Currently, it is work in progress.
+// When done, it should handle export of organizations containing multiple groups.
+class ttGroupExportHelper {
+
+  var $group_id = null;    // Group we are exporting.
+  var $file     = null;    // File to write to.
+  var $indentation = null; // A string consisting of a number of spaces.
+
+  // Constructor.
+  function __construct($group_id, $file, $indentation) {
+
+    $this->group_id = $group_id;
+    $this->file = $file;
+    $this->indentation = $indentation;
+
+    // TODO: Build a list of subgroups here.
+  }
+
+  // writeData writes group data into file.
+  function writeData() {
+    // TODO: write code here.
+    //
+    // Call itself recursively for all subgroups.
+  }
+}
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index a6eb6af8f..07ad7488b 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -28,6 +28,7 @@
 
 import('ttTeamHelper');
 import('ttTimeHelper');
+import('ttGroupExportHelper');
 
 // ttOrgExportHelper - this class is a future replacement for ttExportHelper.
 // Currently, it is work in progress.

From 46e93b281cb1460848b14c9e6109789b7949072b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 14:29:21 +0000
Subject: [PATCH 0281/1848] A bit more work in progress on new export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |   5 +
 WEB-INF/lib/ttOrgExportHelper.class.php   | 330 +---------------------
 WEB-INF/templates/footer.tpl              |   2 +-
 3 files changed, 11 insertions(+), 326 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 9ac4464aa..331385469 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -50,6 +50,11 @@ function __construct($group_id, $file, $indentation) {
   // writeData writes group data into file.
   function writeData() {
     // TODO: write code here.
+
+    // Write group info. Something dummy for now to test...
+    fwrite($this->file, $this->indentation."<group>\n");
+    fwrite($this->file, $this->indentation."</group>\n");
+    //
     //
     // Call itself recursively for all subgroups.
   }
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index 07ad7488b..aa9c9051d 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -34,22 +34,10 @@
 // Currently, it is work in progress.
 // When done, it should handle export of organizations containing multiple groups.
 class ttOrgExportHelper {
-  // TODO: we need a constructor...
-  var $fileName    = null;    // Name of the file with data.
 
-  // The following arrays are maps between entity ids in the file versus the database.
-  // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
-  var $userMap     = array(); // User ids.
-  var $roleMap     = array(); // Role ids.
-  var $projectMap  = array(); // Project ids.
-  var $taskMap     = array(); // Task ids.
-  var $clientMap   = array(); // Client ids.
-  var $invoiceMap  = array(); // Invoice ids.
-  var $customFieldMap       = array(); // Custom field ids.
-  var $customFieldOptionMap = array(); // Custop field option ids.
-  var $logMap      = array(); // Time log ids.
+  var $fileName = null; // Name of file with data.
 
-  // createDataFile creates a file with all data for a given group.
+  // createDataFile creates a file with all data for the entire organization.
   function createDataFile($compress = false) {
     global $user;
 
@@ -65,265 +53,9 @@ function createDataFile($compress = false) {
     fwrite($file, "<?xml version=\"1.0\"?>\n");
     fwrite($file, "<org>\n");
 
-    // Write group info.
-    fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
-      "\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
-      "\" tracking_mode=\"".$user->tracking_mode."\" project_required=\"".$user->project_required."\" task_required=\"".$user->task_required.
-      "\" record_type=\"".$user->record_type."\" bcc_email=\"".$user->bcc_email.
-      "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
-      "\" config=\"".$user->config.
-      "\">\n");
-    fwrite($file, "  <name><![CDATA[".$user->group_name."]]></name>\n");
-    fwrite($file, "  <allow_ip><![CDATA[".$user->allow_ip."]]></allow_ip>\n");
-    fwrite($file, "  <password_complexity><![CDATA[".$user->password_complexity."]]></password_complexity>\n");
-    fwrite($file, "</group>\n");
-
-    // Prepare role map.
-    $roles = $this->getRoles();
-    foreach ($roles as $key=>$role_item)
-      $this->roleMap[$role_item['id']] = $key + 1;
-
-    // Prepare user map.
-    $users = $this->getUsers();
-    foreach ($users as $key=>$user_item)
-      $this->userMap[$user_item['id']] = $key + 1;
-
-    // Prepare project map.
-    $projects = ttTeamHelper::getAllProjects($user->group_id, true);
-    foreach ($projects as $key=>$project_item)
-      $this->projectMap[$project_item['id']] = $key + 1;
-
-    // Prepare task map.
-    $tasks = ttTeamHelper::getAllTasks($user->group_id, true);
-    foreach ($tasks as $key=>$task_item)
-      $this->taskMap[$task_item['id']] = $key + 1;
-
-    // Prepare client map.
-    $clients = ttTeamHelper::getAllClients($user->group_id, true);
-    foreach ($clients as $key=>$client_item)
-      $this->clientMap[$client_item['id']] = $key + 1;
-
-    // Prepare invoice map.
-    $invoices = ttTeamHelper::getAllInvoices();
-    foreach ($invoices as $key=>$invoice_item)
-      $this->invoiceMap[$invoice_item['id']] = $key + 1;
-
-    // Prepare custom fields map.
-    $custom_fields = ttTeamHelper::getAllCustomFields($user->group_id);
-    foreach ($custom_fields as $key=>$custom_field)
-      $this->customFieldMap[$custom_field['id']] = $key + 1;
-
-    // Prepare custom field options map.
-    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->group_id);
-    foreach ($custom_field_options as $key=>$option)
-      $this->customFieldOptionMap[$option['id']] = $key + 1;
-
-    // Write roles.
-    fwrite($file, "<roles>\n");
-    foreach ($roles as $role) {
-      fwrite($file, "  <role id=\"".$this->roleMap[$role['id']]."\" rank=\"".$role['rank']."\"".
-        " rights=\"".$role['rights']."\" status=\"".$role['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$role['name']."]]></name>\n");
-      fwrite($file, "  </role>\n");
-    }
-    fwrite($file, "</roles>\n");
-    unset($roles);
-
-    // Write users.
-    fwrite($file, "<users>\n");
-    foreach ($users as $user_item) {
-      $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
-      fwrite($file, "  <user id=\"".$this->userMap[$user_item['id']]."\" login=\"".htmlentities($user_item['login'])."\" password=\"".$user_item['password']."\" role_id=\"".$role_id."\" client_id=\"".$this->clientMap[$user_item['client_id']]."\" rate=\"".$user_item['rate']."\" email=\"".$user_item['email']."\" status=\"".$user_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$user_item['name']."]]></name>\n");
-      fwrite($file, "  </user>\n");
-    }
-    fwrite($file, "</users>\n");
-
-    // Write tasks.
-    fwrite($file, "<tasks>\n");
-    foreach ($tasks as $task_item) {
-      fwrite($file, "  <task id=\"".$this->taskMap[$task_item['id']]."\" status=\"".$task_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$task_item['name']."]]></name>\n");
-      fwrite($file, "    <description><![CDATA[".$task_item['description']."]]></description>\n");
-      fwrite($file, "  </task>\n");
-    }
-    fwrite($file, "</tasks>\n");
-    unset($tasks);
-
-    // Write projects.
-    fwrite($file, "<projects>\n");
-    foreach ($projects as $project_item) {
-      if($project_item['tasks']){
-        $tasks = explode(',', $project_item['tasks']);
-        $tasks_mapped = array();
-        foreach ($tasks as $item)
-          $tasks_mapped[] = $this->taskMap[$item];
-        $tasks_str = implode(',', $tasks_mapped);
-      }
-      fwrite($file, "  <project id=\"".$this->projectMap[$project_item['id']]."\" tasks=\"".$tasks_str."\" status=\"".$project_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$project_item['name']."]]></name>\n");
-      fwrite($file, "    <description><![CDATA[".$project_item['description']."]]></description>\n");
-      fwrite($file, "  </project>\n");
-    }
-    fwrite($file, "</projects>\n");
-    unset($projects);
-
-    // Write user to project binds.
-    fwrite($file, "<user_project_binds>\n");
-    $user_binds = ttTeamHelper::getUserToProjectBinds($user->group_id);
-    foreach ($user_binds as $bind) {
-      $user_id = $this->userMap[$bind['user_id']];
-      $project_id = $this->projectMap[$bind['project_id']];
-      fwrite($file, "  <user_project_bind user_id=\"{$user_id}\" project_id=\"{$project_id}\" rate=\"".$bind['rate']."\" status=\"".$bind['status']."\"/>\n");
-    }
-    fwrite($file, "</user_project_binds>\n");
-    unset($user_binds);
-
-    // Write clients.
-    fwrite($file, "<clients>\n");
-    foreach ($clients as $client_item) {
-      if($client_item['projects']){
-        $projects = explode(',', $client_item['projects']);
-        $projects_mapped = array();
-        foreach ($projects as $item)
-          $projects_mapped[] = $this->projectMap[$item];
-        $projects_str = implode(',', $projects_mapped);
-      }
-      fwrite($file, "  <client id=\"".$this->clientMap[$client_item['id']]."\" tax=\"".$client_item['tax']."\" projects=\"".$projects_str."\" status=\"".$client_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$client_item['name']."]]></name>\n");
-      fwrite($file, "    <address><![CDATA[".$client_item['address']."]]></address>\n");
-      fwrite($file, "  </client>\n");
-    }
-    fwrite($file, "</clients>\n");
-    unset($clients);
-
-    // Write invoices.
-    fwrite($file, "<invoices>\n");
-    foreach ($invoices as $invoice_item) {
-      fwrite($file, "  <invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\" date=\"".$invoice_item['date']."\" client_id=\"".$this->clientMap[$invoice_item['client_id']]."\" status=\"".$invoice_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$invoice_item['name']."]]></name>\n");
-      fwrite($file, "  </invoice>\n");
-    }
-    fwrite($file, "</invoices>\n");
-    unset($invoices);
-
-    // Write custom fields.
-    fwrite($file, "<custom_fields>\n");
-    foreach ($custom_fields as $custom_field) {
-      fwrite($file, "  <custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\" type=\"".$custom_field['type']."\" required=\"".$custom_field['required']."\" status=\"".$custom_field['status']."\">\n");
-      fwrite($file, "    <label><![CDATA[".$custom_field['label']."]]></label>\n");
-      fwrite($file, "  </custom_field>\n");
-    }
-    fwrite($file, "</custom_fields>\n");
-    unset($custom_fields);
-
-    // Write custom field options.
-    fwrite($file, "<custom_field_options>\n");
-    foreach ($custom_field_options as $option) {
-      fwrite($file, "  <custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\" field_id=\"".$this->customFieldMap[$option['field_id']]."\">\n");
-      fwrite($file, "    <value><![CDATA[".$option['value']."]]></value>\n");
-      fwrite($file, "  </custom_field_option>\n");
-    }
-    fwrite($file, "</custom_field_options>\n");
-    unset($custom_field_options);
-
-    // Write monthly quotas.
-    $quotas = ttTeamHelper::getMonthlyQuotas($user->group_id);
-    fwrite($file, "<monthly_quotas>\n");
-    foreach ($quotas as $quota) {
-      fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");
-    }
-    fwrite($file, "</monthly_quotas>\n");
-
-    // Write time log entries.
-    fwrite($file, "<log>\n");
-    $key = 0;
-    foreach ($users as $user_item) {
-      $records = ttTimeHelper::getAllRecords($user_item['id']);
-      foreach ($records as $record) {
-        $key++;
-        $this->logMap[$record['id']] = $key;
-        fwrite($file, "  <log_item id=\"$key\" user_id=\"".$this->userMap[$record['user_id']]."\" date=\"".$record['date']."\" start=\"".$record['start']."\" finish=\"".$record['finish']."\" duration=\"".($record['start']?"":$record['duration'])."\" client_id=\"".$this->clientMap[$record['client_id']]."\" project_id=\"".$this->projectMap[$record['project_id']]."\" task_id=\"".$this->taskMap[$record['task_id']]."\" invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\" billable=\"".$record['billable']."\" paid=\"".$record['paid']."\" status=\"".$record['status']."\">\n");
-        fwrite($file, "    <comment><![CDATA[".$record['comment']."]]></comment>\n");
-        fwrite($file, "  </log_item>\n");
-      }
-    }
-    fwrite($file, "</log>\n");
-    unset($records);
-
-    // Write custom field log.
-    $custom_field_log = ttTeamHelper::getCustomFieldLog($user->group_id);
-    fwrite($file, "<custom_field_log>\n");
-    foreach ($custom_field_log as $entry) {
-      fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");
-      fwrite($file, "    <value><![CDATA[".$entry['value']."]]></value>\n");
-      fwrite($file, "  </custom_field_log_entry>\n");
-    }
-    fwrite($file, "</custom_field_log>\n");
-    unset($custom_field_log);
-
-    // Write expense items.
-    $expense_items = ttTeamHelper::getExpenseItems($user->group_id);
-    fwrite($file, "<expense_items>\n");
-    foreach ($expense_items as $expense_item) {
-      fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$expense_item['name']."]]></name>\n");
-      fwrite($file, "  </expense_item>\n");
-    }
-    fwrite($file, "</expense_items>\n");
-    unset($expense_items);
-
-    // Write fav reports.
-    fwrite($file, "<fav_reports>\n");
-    $fav_reports = ttTeamHelper::getFavReports($user->group_id);
-    foreach ($fav_reports as $fav_report) {
-      $user_list = '';
-      if (strlen($fav_report['users']) > 0) {
-        $arr = explode(',', $fav_report['users']);
-        foreach ($arr as $k=>$v) {
-          if (array_key_exists($arr[$k], $this->userMap))
-            $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
-        }
-      }
-      fwrite($file, "  <fav_report user_id=\"".$this->userMap[$fav_report['user_id']]."\"".
-        " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"".
-        " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"".
-        " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"".
-        " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"".
-        " billable=\"".$fav_report['billable']."\"".
-        " users=\"".$user_list."\"".
-        " period=\"".$fav_report['period']."\"".
-        " period_start=\"".$fav_report['period_start']."\"".
-        " period_end=\"".$fav_report['period_end']."\"".
-        " show_client=\"".$fav_report['show_client']."\"".
-        " show_invoice=\"".$fav_report['show_invoice']."\"".
-        " show_paid=\"".$fav_report['show_paid']."\"".
-        " show_ip=\"".$fav_report['show_ip']."\"".
-        " show_project=\"".$fav_report['show_project']."\"".
-        " show_start=\"".$fav_report['show_start']."\"".
-        " show_duration=\"".$fav_report['show_duration']."\"".
-        " show_cost=\"".$fav_report['show_cost']."\"".
-        " show_task=\"".$fav_report['show_task']."\"".
-        " show_end=\"".$fav_report['show_end']."\"".
-        " show_note=\"".$fav_report['show_note']."\"".
-        " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
-        " show_work_units=\"".$fav_report['show_work_units']."\"".
-        " group_by1=\"".$fav_report['group_by1']."\"".
-        " group_by2=\"".$fav_report['group_by2']."\"".
-        " group_by3=\"".$fav_report['group_by3']."\"".
-        " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
-      fwrite($file, "  </fav_report>\n");
-    }
-    fwrite($file, "</fav_reports>\n");
-    unset($fav_reports);
-
-    // Cleanup.
-    unset($users);
-    $this->roleMap = array();
-    $this->userMap = array();
-    $this->projectMap = array();
-    $this->taskMap = array();
+    // Use ttGroupExportHelper to export all groups.
+    $groupExportHelper = new ttGroupExportHelper($user->group_id, $file, '  ');  // 2 spaces indentation for home group.
+    $groupExportHelper->writeData();
 
     fwrite($file, "</org>\n");
     fclose($file);
@@ -366,56 +98,4 @@ function compress($in, $out) {
     fclose ($in_file);
     return true;
   }
-
-  /*
-   * Note about the utility functions below.
-   * We have roughly 4 groups of operations:
-   *   1) Regular system usage for tracking time, etc.
-   *   2) Registration process - used infrequently.
-   *   3) Admin usage - used infrequently.
-   *   4) Export - used infrequently.
-   *
-   * It is tempting to have a generic function to get things done for
-   * all situations. However, as registration, export and admin access are one-off
-   * operations, while regular system usage is daily and must be efficient,
-   * the current approach is to have SEPARATE functions for each mode.
-   *
-   * This is because each mode requires a slightly different approach,
-   * and we don't want to over-complicate things.
-   */
-
-  // getRoles - obtains all roles defined for group.
-  function getRoles() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_roles where group_id = $user->group_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // The getUsers obtains all users in group for the purpose of export.
-  function getUsers() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id order by upper(u.name)"; // Note: deleted users are included.
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9581fdb9a..af3f176f6 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.07.4365 | 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.07.4366 | 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>

From 9d9131123acc4790f51cf844144ca144bbef9a28 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 15:40:55 +0000
Subject: [PATCH 0282/1848] A bit more progress on new export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 29 +++++++++++++++++------
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 331385469..59a19be29 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -33,18 +33,29 @@
 // When done, it should handle export of organizations containing multiple groups.
 class ttGroupExportHelper {
 
-  var $group_id = null;    // Group we are exporting.
-  var $file     = null;    // File to write to.
-  var $indentation = null; // A string consisting of a number of spaces.
+  var $group_id = null;     // Group we are exporting.
+  var $file     = null;     // File to write to.
+  var $indentation = null;  // A string consisting of a number of spaces.
+  var $subgroups = array(); // Immediate subgroups.
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
+    global $user;
 
     $this->group_id = $group_id;
     $this->file = $file;
     $this->indentation = $indentation;
 
-    // TODO: Build a list of subgroups here.
+    // Build a list of subgroups.
+    $mdb2 = getConnection();
+    $sql =  "select id from tt_groups".
+            " where status = 1 and parent_id = $this->group_id and org_id = $user->org_id order by id desc";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $this->subgroups[] = $val;
+      }
+    }
   }
 
   // writeData writes group data into file.
@@ -53,9 +64,13 @@ function writeData() {
 
     // Write group info. Something dummy for now to test...
     fwrite($this->file, $this->indentation."<group>\n");
-    fwrite($this->file, $this->indentation."</group>\n");
-    //
-    //
+
     // Call itself recursively for all subgroups.
+    foreach ($this->subgroups as $subgroup) {
+      $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
+      $subgroup_helper->writeData();
+    }
+
+    fwrite($this->file, $this->indentation."</group>\n");
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index af3f176f6..5b275168d 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.07.4366 | 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.07.4367 | 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>

From 60c61508f8586f489fc8795c93d9bd45e41467c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 16:53:55 +0000
Subject: [PATCH 0283/1848] Another small iteration for new export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 31 +++++++++++++++++++----
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 59a19be29..364f984dc 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -49,7 +49,7 @@ function __construct($group_id, $file, $indentation) {
     // Build a list of subgroups.
     $mdb2 = getConnection();
     $sql =  "select id from tt_groups".
-            " where status = 1 and parent_id = $this->group_id and org_id = $user->org_id order by id desc";
+            " where status = 1 and parent_id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -58,14 +58,35 @@ function __construct($group_id, $file, $indentation) {
     }
   }
 
+  // getGroupData obtains group attributes for export.
+  function getGroupData() {
+    global $user;
+
+    $mdb2 = getConnection();
+    $sql =  "select name, currency, lang from tt_groups".
+            " where status = 1 and id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+    }
+    return $val;
+  }
+
   // writeData writes group data into file.
   function writeData() {
-    // TODO: write code here.
 
-    // Write group info. Something dummy for now to test...
-    fwrite($this->file, $this->indentation."<group>\n");
+    // Write group info.
+    $group = $this->getGroupData();
+    $group_part = "<group name=\"".htmlentities($group['name'])."\"";
+    $group_part .= " currency=\"".htmlentities($group['currency'])."\"";
+    $group_part .= " lang=\"".$group['lang']."\"";
+    // TODO: add other group attributes here.
+    $group_part .= ">\n";
+
+    // Write group info.
+    fwrite($this->file, $this->indentation.$group_part);
 
-    // Call itself recursively for all subgroups.
+    // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
       $subgroup_helper->writeData();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5b275168d..058c96fe2 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.07.4367 | 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.07.4368 | 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>

From 40263b0f447ad572e5ba029bbaf9e5c47c4329bb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 18:39:12 +0000
Subject: [PATCH 0284/1848] More progress on new export, adding users to
 output.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 77 ++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 364f984dc..56533e10d 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -38,6 +38,12 @@ class ttGroupExportHelper {
   var $indentation = null;  // A string consisting of a number of spaces.
   var $subgroups = array(); // Immediate subgroups.
 
+  // The following arrays are maps between entity ids in the file versus the database.
+  // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
+  var $userMap   = array(); // User ids.
+  var $roleMap   = array(); // Role ids.
+  var $clientMap = array(); // Client ids.
+
   // Constructor.
   function __construct($group_id, $file, $indentation) {
     global $user;
@@ -61,8 +67,8 @@ function __construct($group_id, $file, $indentation) {
   // getGroupData obtains group attributes for export.
   function getGroupData() {
     global $user;
-
     $mdb2 = getConnection();
+
     $sql =  "select name, currency, lang from tt_groups".
             " where status = 1 and id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
@@ -72,6 +78,42 @@ function getGroupData() {
     return $val;
   }
 
+  // The getUsers obtains all users in group for the purpose of export.
+  function getUsers() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id)".
+      " where u.group_id = $this->group_id and u.org_id = $user->org_id order by upper(u.name)"; // Note: deleted users are included.
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
+  // getRoles - obtains all roles defined for group.
+  function getRoles() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_roles where group_id = $this->group_id"; // and org_id = $user->org_id <-- add this when possible
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -86,6 +128,39 @@ function writeData() {
     // Write group info.
     fwrite($this->file, $this->indentation.$group_part);
 
+    // Prepare user map.
+    $users = $this->getUsers();
+    foreach ($users as $key=>$user_item)
+      $this->userMap[$user_item['id']] = $key + 1;
+
+    // Prepare role map.
+    $roles = $this->getRoles();
+    foreach ($roles as $key=>$role_item)
+      $this->roleMap[$role_item['id']] = $key + 1;
+
+    // Prepare client map.
+    $clients = ttTeamHelper::getAllClients($this->group_id, true);
+    foreach ($clients as $key=>$client_item)
+      $this->clientMap[$client_item['id']] = $key + 1;
+
+    // Write users.
+    fwrite($this->file, $this->indentation."<users>\n");
+    foreach ($users as $user_item) {
+      $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
+      $user_part = $this->indentation.'  '."<user id=\"".$this->userMap[$user_item['id']]."\"";
+      $user_part .= " name=\"".htmlentities($user_item['name'])."\"";
+      $user_part .= " login=\"".htmlentities($user_item['login'])."\"";
+      $user_part .= " password=\"".$user_item['password']."\"";
+      $user_part .= " role_id=\"".$role_id."\"";
+      $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
+      $user_part .= " rate=\"".$user_item['rate']."\"";
+      $user_part .= " email=\"".$user_item['email']."\"";
+      $user_part .= " status=\"".$user_item['status']."\"";
+      $user_part .= "></user>\n";
+      fwrite($this->file, $user_part);
+    }
+    fwrite($this->file, $this->indentation."</users>\n");
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 058c96fe2..959fe31d3 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.07.4368 | 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.07.4369 | 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>

From 87b3867d52dbaf6c3db44cbcbe4d96a4def12dd2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 18:59:19 +0000
Subject: [PATCH 0285/1848] Introduced org_id in tt_roles table for better
 security and maintenance.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 959fe31d3..fe0ad54f6 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.07.4369 | 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.08.4370 | 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/dbinstall.php b/dbinstall.php
index 5baff57e6..b57f157cc 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11805"]) {
+  if ($_POST["convert11797to11808"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -968,6 +968,9 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_users` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.06') set org_id = group_id where org_id is null");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.07', modified = now() where param_name = 'version_db' and param_value = '1.18.06'");
+    setChange("ALTER TABLE `tt_roles` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.07') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.08', modified = now() where param_name = 'version_db' and param_value = '1.18.07'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1013,7 +1016,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.05)</b>
+    <td width="80%"><b>Create database structure (v1.18.08)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1058,8 +1061,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.05)</td>
-    <td><input type="submit" name="convert11797to11805" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.08)</td>
+    <td><input type="submit" name="convert11797to11808" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index bfa26a0da..79e2b3ff3 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -53,6 +53,7 @@ CREATE TABLE `tt_groups` (
 CREATE TABLE `tt_roles` (
   `id` int(11) NOT NULL auto_increment,    # Role id. Identifies roles for all groups on the server.
   `group_id` int(11) NOT NULL,             # Group id the role is defined for.
+  `org_id` int(11) default NULL,           # Organization id.
   `name` varchar(80) default NULL,         # Role name - custom role name. In case we are editing a
                                            # predefined role (USER, etc.), we can rename the role here.
   `description` varchar(255) default NULL, # Role description.
@@ -459,4 +460,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.07', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.08', now()); # TODO: change when structure changes.

From 207eb3b5bf14dcfeefead3a894c4056d06a102ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 20:36:24 +0000
Subject: [PATCH 0286/1848] Started to populate org_id furing creation of
 pre-defined roles.

---
 WEB-INF/lib/ttRoleHelper.class.php | 10 +++++-----
 WEB-INF/lib/ttTeamHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 958f034fc..51c95b1d1 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -193,7 +193,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.user.label'));
     $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 4, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -201,7 +201,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.client.label'));
     $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 16, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -209,7 +209,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.comanager.label'));
     $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 68, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -217,7 +217,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.manager.label'));
     $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 324, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -226,7 +226,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.supervisor.label'));
     $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
-    $sql = "insert into tt_roles (group_id, name, description, rank, rights, status) values($group_id, $name, $description, 12, $rights, 0)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index eafc9167c..8b9d7ed66 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -290,7 +290,7 @@ static function getActiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and rank < $user->rank and status = 1 order by rank";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and org_id = $user->org_id and rank < $user->rank and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -348,7 +348,7 @@ static function getInactiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and rank < $user->rank and status = 0 order by rank";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and org_id = $user->org_id and rank < $user->rank and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fe0ad54f6..90828c1b6 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.08.4370 | 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.08.4371 | 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>

From 96dd4d9712381a9c2d9df96961f96dc4c2dcc6f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 21:49:07 +0000
Subject: [PATCH 0287/1848] Fixed adding custom role with org_id field
 population.

---
 WEB-INF/lib/ttImportHelper.class.php | 1 +
 WEB-INF/lib/ttRoleHelper.class.php   | 5 +++--
 WEB-INF/templates/footer.tpl         | 2 +-
 role_add.php                         | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 42c7102be..e250a4fca 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -152,6 +152,7 @@ function endElement($parser, $name) {
           foreach ($this->roles as $key=>$role_item) {
             $role_id = ttRoleHelper::insert(array(
               'group_id' => $this->group_id,
+              'org_id' => $this->org_id,
               'name' => $role_item['NAME'],
               'rank' => $role_item['RANK'],
               'rights' => $role_item['RIGHTS'],
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 51c95b1d1..e5bf6a7dc 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -154,14 +154,15 @@ static function insert($fields)
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     $rank = (int) $fields['rank'];
     $description = $fields['description'];
     $rights = $fields['rights'];
     $status = $fields['status'];
 
-    $sql = "insert into tt_roles (group_id, name, rank, description, rights, status)
-      values ($group_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_roles (group_id, org_id, name, rank, description, rights, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90828c1b6..6430f8a68 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.08.4371 | 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.08.4372 | 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/role_add.php b/role_add.php
index c8df24c73..cb3d6f407 100644
--- a/role_add.php
+++ b/role_add.php
@@ -63,6 +63,7 @@
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(
           'group_id' => $user->group_id,
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,

From 566bd317d329af1fe9935edfcefafee7f07ebc2b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 5 Nov 2018 22:18:37 +0000
Subject: [PATCH 0288/1848] Fixed import and export of role descriptions.

---
 WEB-INF/lib/ttExportHelper.class.php | 1 +
 WEB-INF/lib/ttImportHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index c5e7802d8..310af9137 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -120,6 +120,7 @@ function createDataFile($compress = false) {
       fwrite($file, "  <role id=\"".$this->roleMap[$role['id']]."\" rank=\"".$role['rank']."\"".
         " rights=\"".$role['rights']."\" status=\"".$role['status']."\">\n");
       fwrite($file, "    <name><![CDATA[".$role['name']."]]></name>\n");
+      fwrite($file, "    <description><![CDATA[".$role['description']."]]></description>\n");
       fwrite($file, "  </role>\n");
     }
     fwrite($file, "</roles>\n");
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index e250a4fca..8c6fd0c08 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -154,6 +154,7 @@ function endElement($parser, $name) {
               'group_id' => $this->group_id,
               'org_id' => $this->org_id,
               'name' => $role_item['NAME'],
+              'description' => $role_item['DESCRIPTION'],
               'rank' => $role_item['RANK'],
               'rights' => $role_item['RIGHTS'],
               'status' => $role_item['STATUS']));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6430f8a68..bd83dd666 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.08.4372 | 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.08.4373 | 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>

From cc89430b244535c67dbb7d1f8813a4ba56b1ffc0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Nov 2018 15:25:31 +0000
Subject: [PATCH 0289/1848] More use of getActiveGroup as part of ongoing
 subgroup support.

---
 WEB-INF/lib/ttClientHelper.class.php | 15 +++++++--------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index afa7afbd1..855458987 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -41,8 +41,8 @@ static function getClient($client_id, $all_fields = false) {
     else
       $sql .= 'name ';
 
-    $sql .= "from tt_clients where group_id = $user->group_id
-      and id = $client_id and (status = 1 or status = 0)";
+    $sql .= "from tt_clients where group_id = ".$user->getActiveGroup().
+      " and id = $client_id and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -59,8 +59,7 @@ static function getClients()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name from tt_clients
-      where group_id = $user->group_id and (status = 0 or status = 1) order by upper(name)";
+    $sql = "select id, name from tt_clients where group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1) order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -76,8 +75,8 @@ static function getClientByName($client_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_clients where group_id = $user->group_id and name = ".
-      $mdb2->quote($client_name)." and (status = 1 or status = 0)";
+    $sql = "select id from tt_clients where group_id = ".$user->getActiveGroup().
+      " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -95,8 +94,8 @@ static function getDeletedClient($client_id) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select name, address from tt_clients where group_id = $user->group_id
-      and id = $client_id and status is NULL";
+    $sql = "select name, address from tt_clients where group_id = ".$user->getActiveGroup().
+      " and id = $client_id and status is NULL";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bd83dd666..cca966e63 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.08.4373 | 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.08.4374 | 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>

From e7152db9fac2662f92f2ea37723de3f1ec5f93f3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Nov 2018 16:47:40 +0000
Subject: [PATCH 0290/1848] More refactoring as part of subgroup support.

---
 WEB-INF/lib/ttClientHelper.class.php | 38 ++++++----------------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 855458987..19409b905 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -137,7 +137,7 @@ static function delete($id, $delete_client_entries) {
 
     // Handle invoices.
     if ($delete_client_entries) {
-      $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = $user->group_id";
+      $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = ".$user->getActiveGroup();
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -150,13 +150,13 @@ static function delete($id, $delete_client_entries) {
       return false;
 
     // Handle users for client.
-    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = $user->group_id";
+    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark client deleted.
-    $sql = "update tt_clients set status = NULL where id = $id and group_id = $user->group_id";
+    $sql = "update tt_clients set status = NULL where id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -235,7 +235,8 @@ static function update($fields)
     // Update client properties in tt_clients table.
     $comma_separated = implode(",", $projects); // This is a comma-separated list of associated project ids.
     $sql = "update tt_clients set name = ".$mdb2->quote($name).", address = ".$mdb2->quote($address).
-      ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status where group_id = ".$user->group_id." and id = ".$id;
+      ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status".
+      " where group_id = ".$user->getActiveGroup()." and id = ".$id;
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -269,9 +270,9 @@ static function getAssignedProjects($client_id)
     $mdb2 = getConnection();
 
     // Do a query with inner join to get assigned projects.
-    $sql = "select p.id, p.name from tt_projects p
-      inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)
-      where p.group_id = $user->group_id and p.status = 1 order by p.name";
+    $sql = "select p.id, p.name from tt_projects p".
+      " inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)".
+      " where p.group_id = ".$user->getActiveGroup()." and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -303,27 +304,4 @@ static function getClientsForUser()
     }
     return $result;
   }
-
-  // getAssignedProjectsForUser - returns an array of projects assigned to a user and associatied with a client.
-  static function getAssignedProjectsForUser($client_id)
-  {
-    global $user;
-    $user_id = $user->getActiveUser();
-
-    $result = array();
-    $mdb2 = getConnection();
-
-    // Do a query with inner join to get assigned projects.
-    $sql = "select p.id, p.name from tt_projects p
-      inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)
-      inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)
-      where p.group_id = $user->group_id and p.status = 1 order by p.name";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cca966e63..bbff9a4c5 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.08.4374 | 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.08.4375 | 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>

From 5afa29dbbc20b43e3ae11cf8dfb6d535586b831a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Nov 2018 17:10:30 +0000
Subject: [PATCH 0291/1848] A bit more refactoring.

---
 WEB-INF/lib/ttExportHelper.class.php | 26 ++++++++++++++------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 310af9137..7072f2b73 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -48,6 +48,7 @@ class ttExportHelper {
   // createDataFile creates a file with all data for a given group.
   function createDataFile($compress = false) {
     global $user;
+    $group_id = $user->getActiveGroup();
 
     // Create a temporary file.
     $dirName = dirname(TEMPLATE_DIR . '_c/.');
@@ -85,17 +86,17 @@ function createDataFile($compress = false) {
       $this->userMap[$user_item['id']] = $key + 1;
 
     // Prepare project map.
-    $projects = ttTeamHelper::getAllProjects($user->group_id, true);
+    $projects = ttTeamHelper::getAllProjects($group_id, true);
     foreach ($projects as $key=>$project_item)
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare task map.
-    $tasks = ttTeamHelper::getAllTasks($user->group_id, true);
+    $tasks = ttTeamHelper::getAllTasks($group_id, true);
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
     // Prepare client map.
-    $clients = ttTeamHelper::getAllClients($user->group_id, true);
+    $clients = ttTeamHelper::getAllClients($group_id, true);
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
@@ -105,12 +106,12 @@ function createDataFile($compress = false) {
       $this->invoiceMap[$invoice_item['id']] = $key + 1;
 
     // Prepare custom fields map.
-    $custom_fields = ttTeamHelper::getAllCustomFields($user->group_id);
+    $custom_fields = ttTeamHelper::getAllCustomFields($group_id);
     foreach ($custom_fields as $key=>$custom_field)
       $this->customFieldMap[$custom_field['id']] = $key + 1;
 
     // Prepare custom field options map.
-    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->group_id);
+    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($group_id);
     foreach ($custom_field_options as $key=>$option)
       $this->customFieldOptionMap[$option['id']] = $key + 1;
 
@@ -167,7 +168,7 @@ function createDataFile($compress = false) {
 
     // Write user to project binds.
     fwrite($file, "<user_project_binds>\n");
-    $user_binds = ttTeamHelper::getUserToProjectBinds($user->group_id);
+    $user_binds = ttTeamHelper::getUserToProjectBinds($group_id);
     foreach ($user_binds as $bind) {
       $user_id = $this->userMap[$bind['user_id']];
       $project_id = $this->projectMap[$bind['project_id']];
@@ -225,7 +226,7 @@ function createDataFile($compress = false) {
     unset($custom_field_options);
 
     // Write monthly quotas.
-    $quotas = ttTeamHelper::getMonthlyQuotas($user->group_id);
+    $quotas = ttTeamHelper::getMonthlyQuotas($group_id);
     fwrite($file, "<monthly_quotas>\n");
     foreach ($quotas as $quota) {
       fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");
@@ -249,7 +250,7 @@ function createDataFile($compress = false) {
     unset($records);
 
     // Write custom field log.
-    $custom_field_log = ttTeamHelper::getCustomFieldLog($user->group_id);
+    $custom_field_log = ttTeamHelper::getCustomFieldLog($group_id);
     fwrite($file, "<custom_field_log>\n");
     foreach ($custom_field_log as $entry) {
       fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");
@@ -260,7 +261,7 @@ function createDataFile($compress = false) {
     unset($custom_field_log);
 
     // Write expense items.
-    $expense_items = ttTeamHelper::getExpenseItems($user->group_id);
+    $expense_items = ttTeamHelper::getExpenseItems($group_id);
     fwrite($file, "<expense_items>\n");
     foreach ($expense_items as $expense_item) {
       fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");
@@ -272,7 +273,7 @@ function createDataFile($compress = false) {
 
     // Write fav reports.
     fwrite($file, "<fav_reports>\n");
-    $fav_reports = ttTeamHelper::getFavReports($user->group_id);
+    $fav_reports = ttTeamHelper::getFavReports($group_id);
     foreach ($fav_reports as $fav_report) {
       $user_list = '';
       if (strlen($fav_report['users']) > 0) {
@@ -387,7 +388,7 @@ function getRoles() {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_roles where group_id = $user->group_id";
+    $sql = "select * from tt_roles where group_id = ".$user->getActiveGroup();
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -404,7 +405,8 @@ function getUsers() {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id order by upper(u.name)"; // Note: deleted users are included.
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = ".
+            $user->getActiveGroup()." order by upper(u.name)"; // Note: deleted users are included.
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bbff9a4c5..53e4ad54b 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.08.4375 | 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.08.4376 | 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>

From e73ed25068a87e7a70f634aed888acafda5139aa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Nov 2018 18:22:57 +0000
Subject: [PATCH 0292/1848] A bit more refactoring for subgroups.

---
 WEB-INF/lib/ttInvoiceHelper.class.php           | 12 +++++++-----
 WEB-INF/lib/ttNotificationHelper.class.php      |  4 ++--
 WEB-INF/lib/ttPredefinedExpenseHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl                    |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index d35aa3486..5c5d7141f 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -71,7 +71,8 @@ static function getInvoice($invoice_id) {
 
     if ($user->isClient()) $client_part = " and client_id = $user->client_id";
 
-    $sql = "select * from tt_invoices where id = $invoice_id and group_id = $user->group_id $client_part and status = 1";
+    $sql = "select * from tt_invoices where id = $invoice_id and group_id = ".
+            $user->getActiveGroup()."$client_part and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
@@ -86,7 +87,8 @@ static function getInvoiceByName($invoice_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_invoices where group_id = $user->group_id and name = ".$mdb2->quote($invoice_name)." and status = 1";
+    $sql = "select id from tt_invoices where group_id = ".
+            $user->getActiveGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -233,7 +235,7 @@ static function delete($invoice_id, $delete_invoice_items) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = $user->group_id";
+    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -328,8 +330,8 @@ static function createInvoice($fields) {
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Create a new invoice record.
-    $sql = "insert into tt_invoices (group_id, name, date, client_id)
-      values($user->group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+    $sql = "insert into tt_invoices (group_id, name, date, client_id) values(".
+            $user->getActiveGroup().", ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index 35a96970e..af1bcd3c8 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -38,7 +38,7 @@ static function get($id)
 
     $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.id = $id and c.group_id = $user->group_id";
+      where c.id = $id and c.group_id = ".$user->getActiveGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -54,7 +54,7 @@ static function delete($id) {
   	    
     $mdb2 = getConnection();
     
-    $sql = "delete from tt_cron where id = $id and group_id = $user->group_id";
+    $sql = "delete from tt_cron where id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index c292870fb..2de4dfad3 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -39,7 +39,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and group_id = $user->group_id";
+      where id = $id and group_id = ".$user->getActiveGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -58,7 +58,7 @@ static function delete($id) {
 
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and group_id = $user->group_id";
+    $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 53e4ad54b..760672f71 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.08.4376 | 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.08.4377 | 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>

From 3a835e437ea379fb2ddd6b532f4a61bc5d5bbf33 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Nov 2018 19:42:21 +0000
Subject: [PATCH 0293/1848] More refactoring for subgroup support.

---
 WEB-INF/lib/ttProjectHelper.class.php | 34 ++++++++++++++-------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 174a31cea..9203b5607 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -41,9 +41,9 @@ static function getAssignedProjects($user_id)
     $mdb2 = getConnection();
     
     // Do a query with inner join to get assigned projects.
-    $sql = "select p.id, p.name, p.tasks, upb.rate from tt_projects p
-      inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)
-      where p.group_id = $user->group_id and p.status = 1 order by p.name";
+    $sql = "select p.id, p.name, p.tasks, upb.rate from tt_projects p".
+      " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
+      " where p.group_id = ".$user->getActiveGroup()." and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -61,9 +61,9 @@ static function getRates($user_id)
     $result = array();
     $mdb2 = getConnection();
     
-    $sql = "select p.id, upb.rate from tt_projects p
-      inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id)
-      where group_id = $user->group_id";
+    $sql = "select p.id, upb.rate from tt_projects p".
+      " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id)".
+      " where group_id = ".$user->getActiveGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -83,7 +83,7 @@ static function getProjects()
     $mdb2 = getConnection();
     
     $sql = "select id, name, tasks from tt_projects".
-      " where group_id = $user->group_id and (status = 0 or status = 1) order by name";
+      " where group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1) order by name";
         
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -104,7 +104,7 @@ static function getProjectsForClient()
 
     $sql = "select p.id, p.name, p.tasks from tt_projects p".
       " inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)".
-      " where p.group_id = $user->group_id and (p.status = 0 or p.status = 1)".
+      " where p.group_id = ".$user->getActiveGroup()." and (p.status = 0 or p.status = 1)".
       " order by p.name";
 
     $res = $mdb2->query($sql);
@@ -124,7 +124,8 @@ static function get($id)
  
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, status, tasks from tt_projects where id = $id and group_id = $user->group_id and (status = 0 or status = 1)";
+    $sql = "select id, name, description, status, tasks from tt_projects where id = $id and group_id = ".
+            $user->getActiveGroup()." and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -140,12 +141,13 @@ static function getProjectByName($name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_projects where group_id = $user->group_id and name = ".
-      $mdb2->quote($name)." and (status = 1 or status = 0)";
-  	$res = $mdb2->query($sql);
-  	if (!is_a($res, 'PEAR_Error')) {
+    $sql = "select id from tt_projects where group_id = ".
+      $user->getActiveGroup()." and name = ".$mdb2->quote($name).
+      " and (status = 1 or status = 0)";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-	  if ($val && $val['id'])
+      if ($val && $val['id'])
         return $val;
     }
     return false;
@@ -161,7 +163,7 @@ static function delete($id) {
     // we'll fail right here and don't damage any other data.
 
     // Mark project as deleted and remove associated tasks.
-    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and group_id = $user->group_id";
+    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error') || 0 == $affected)
       return false; // An error ocurred, or 0 rows updated.
@@ -312,7 +314,7 @@ static function update($fields) {
     // Update project name, description, tasks and status in tt_projects table.
     $comma_separated = implode(",", $tasks_to_bind); // This is a comma-separated list of associated task ids.
     $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and group_id = $user->group_id";
+           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 760672f71..d0d15732e 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.08.4377 | 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.08.4378 | 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>

From 085cb5b327f095bcd55f0764b8ab7b7fb3b6bcfa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Nov 2018 21:57:37 +0000
Subject: [PATCH 0294/1848] Fixed role_add.php with a check for existing role
 name.

---
 WEB-INF/lib/ttReportHelper.class.php | 6 +++---
 WEB-INF/lib/ttRoleHelper.class.php   | 8 ++++----
 WEB-INF/templates/footer.tpl         | 2 +-
 role_add.php                         | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 744ef97b0..76c1765e8 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -157,7 +157,7 @@ static function getItems($options) {
     // Add custom field.
     $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1;
     if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->group_id);
+      $custom_fields = new CustomFields($user->getActiveGroup());
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         array_push($fields, 'cfl.value as cf_1');
@@ -616,7 +616,7 @@ static function prepareReportBody($options, $comment = null)
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
-      $custom_fields = new CustomFields($user->group_id);
+      $custom_fields = new CustomFields($user->getActiveGroup());
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
@@ -1460,7 +1460,7 @@ static function makeJoinPart($options) {
       $join .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
     if (ttReportHelper::groupingBy('cf_1', $options)) {
-      $custom_fields = new CustomFields($user->group_id);
+      $custom_fields = new CustomFields($user->getActiveGroup());
       if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
         $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index e5bf6a7dc..2751756b7 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -37,7 +37,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, rank, rights, status from tt_roles
-      where id = $id and group_id = $user->group_id and (status = 0 or status = 1)";
+      where id = $id and group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -56,8 +56,8 @@ static function getRoleByName($role_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_roles where group_id = $user->group_id and name = ".
-      $mdb2->quote($role_name)." and (status = 1 or status = 0)";
+    $sql = "select id from tt_roles where group_id = ".$user->getActiveGroup().
+      " and name = ".$mdb2->quote($role_name)." and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -89,7 +89,7 @@ static function isClientRole($role_id) {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select rights from tt_roles where group_id = $user->group_id and id = $role_id";
+    $sql = "select rights from tt_roles where group_id = ".$user->getActiveGroup()." and id = $role_id";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d0d15732e..5e48388e4 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.08.4378 | 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.08.4379 | 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/role_add.php b/role_add.php
index cb3d6f407..e1e16cc77 100644
--- a/role_add.php
+++ b/role_add.php
@@ -56,6 +56,7 @@
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
+  if ($err->no() && ttRoleHelper::getRoleByName($cl_name)) $err->add($i18n->get('error.object_exists'));
 
   if ($err->no()) {
     $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->group_id);

From 39988068b83854ecfd7f0a86ccfe4bfb8fc89644 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 11:59:11 +0000
Subject: [PATCH 0295/1848] Introduced org_id field in tt_clients table.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl              |  2 +-
 dbinstall.php                             | 10 ++++++----
 mysql.sql                                 |  3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 56533e10d..d643ed9d6 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -102,7 +102,7 @@ function getRoles() {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_roles where group_id = $this->group_id"; // and org_id = $user->org_id <-- add this when possible
+    $sql = "select * from tt_roles where group_id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e48388e4..0148ae7b4 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.08.4379 | 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.09.4380 | 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/dbinstall.php b/dbinstall.php
index b57f157cc..9ba804fd4 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11808"]) {
+  if ($_POST["convert11797to11809"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -971,6 +971,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_roles` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.07') set org_id = group_id where org_id is null");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.08', modified = now() where param_name = 'version_db' and param_value = '1.18.07'");
+    setChange("ALTER TABLE `tt_clients` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.09', modified = now() where param_name = 'version_db' and param_value = '1.18.08'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1016,7 +1018,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.08)</b>
+    <td width="80%"><b>Create database structure (v1.18.09)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1061,8 +1063,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.08)</td>
-    <td><input type="submit" name="convert11797to11808" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.09)</td>
+    <td><input type="submit" name="convert11797to11809" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 79e2b3ff3..b29d08dce 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -304,6 +304,7 @@ CREATE TABLE `tt_cron` (
 CREATE TABLE `tt_clients` (
   `id` int(11) NOT NULL AUTO_INCREMENT,         # client id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # client name
   `address` varchar(255) default NULL,          # client address
   `tax` float(6,2) default '0.00',              # applicable tax for this client
@@ -460,4 +461,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.08', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.09', now()); # TODO: change when structure changes.

From 0fdda830ba3e780c365c90e1fdfd5cfa7ed77244 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 12:43:23 +0000
Subject: [PATCH 0296/1848] Started to populate org_id upon client creation.

---
 WEB-INF/lib/ttClientHelper.class.php | 5 +++--
 WEB-INF/lib/ttImportHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl         | 2 +-
 client_add.php                       | 3 ++-
 client_edit.php                      | 3 ++-
 mobile/client_add.php                | 3 ++-
 mobile/client_edit.php               | 3 ++-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 19409b905..0c12a9538 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -168,6 +168,7 @@ static function insert($fields)
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     $address = $fields['address'];
     $tax = $fields['tax'];
@@ -179,8 +180,8 @@ static function insert($fields)
     $tax = str_replace(',', '.', $tax);
     if ($tax == '') $tax = 0;
 
-    $sql = "insert into tt_clients (group_id, name, address, tax, projects, status)".
-      " values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_clients (group_id, org_id, name, address, tax, projects, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
 
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 8c6fd0c08..e732b9890 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -222,6 +222,7 @@ function endElement($parser, $name) {
       $this->clientMap[$this->currentElement['ID']] =
         ttClientHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'address' => $this->currentElement['ADDRESS'],
           'tax' => $this->currentElement['TAX'],
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0148ae7b4..c94ea8584 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.09.4380 | 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.09.4381 | 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/client_add.php b/client_add.php
index 3afcbc072..dc99e6c89 100644
--- a/client_add.php
+++ b/client_add.php
@@ -71,7 +71,8 @@
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
diff --git a/client_edit.php b/client_edit.php
index 74062d06e..19aa5f893 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -103,7 +103,8 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
diff --git a/mobile/client_add.php b/mobile/client_add.php
index f83c720ae..7a097b5ff 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -71,7 +71,8 @@
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index 093e9668c..73d50cac2 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -104,7 +104,8 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,

From 264ed2176f4d55449f4a329d6b85fcb48fd50fb4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 13:16:41 +0000
Subject: [PATCH 0297/1848] Introduced org_id field in tt_projects and tt_tasks
 tables.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 12 ++++++++----
 mysql.sql                    |  4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c94ea8584..f36602e58 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.09.4381 | 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.10.4382 | 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/dbinstall.php b/dbinstall.php
index 9ba804fd4..a4a6eba71 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11809"]) {
+  if ($_POST["convert11797to11810"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -973,6 +973,10 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.08', modified = now() where param_name = 'version_db' and param_value = '1.18.07'");
     setChange("ALTER TABLE `tt_clients` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.09', modified = now() where param_name = 'version_db' and param_value = '1.18.08'");
+    setChange("UPDATE `tt_clients` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.09') set org_id = group_id where org_id is null");
+    setChange("ALTER TABLE `tt_projects` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("ALTER TABLE `tt_tasks` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1018,7 +1022,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.09)</b>
+    <td width="80%"><b>Create database structure (v1.18.10)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1063,8 +1067,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.09)</td>
-    <td><input type="submit" name="convert11797to11809" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.10)</td>
+    <td><input type="submit" name="convert11797to11810" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index b29d08dce..32ba202eb 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -117,6 +117,7 @@ INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALU
 CREATE TABLE `tt_projects` (
   `id` int(11) NOT NULL auto_increment,         # project id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # project name
   `description` varchar(255) default NULL,      # project description
   `tasks` text default NULL,                    # comma-separated list of task ids associated with this project
@@ -134,6 +135,7 @@ create unique index project_idx on tt_projects(group_id, name, status);
 CREATE TABLE `tt_tasks` (
   `id` int(11) NOT NULL auto_increment,         # task id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # task name
   `description` varchar(255) default NULL,      # task description
   `status` tinyint(4) default 1,                # task status
@@ -461,4 +463,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.09', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.10', now()); # TODO: change when structure changes.

From a711e76851f29c7e0ac290a279eb4dd984ea7167 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 14:12:04 +0000
Subject: [PATCH 0298/1848] Started populating org_id in projects and tasks.

---
 WEB-INF/lib/ttImportHelper.class.php  | 2 ++
 WEB-INF/lib/ttProjectHelper.class.php | 5 +++--
 WEB-INF/lib/ttTaskHelper.class.php    | 5 +++--
 WEB-INF/templates/footer.tpl          | 2 +-
 dbinstall.php                         | 2 ++
 mobile/project_add.php                | 3 ++-
 mobile/project_edit.php               | 3 ++-
 mobile/task_add.php                   | 3 ++-
 mobile/task_edit.php                  | 3 ++-
 project_add.php                       | 3 ++-
 project_edit.php                      | 3 ++-
 task_add.php                          | 3 ++-
 task_edit.php                         | 3 ++-
 13 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index e732b9890..350b0c1ff 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -184,6 +184,7 @@ function endElement($parser, $name) {
       $this->taskMap[$this->currentElement['ID']] =
         ttTaskHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'status' => $this->currentElement['STATUS']));
@@ -198,6 +199,7 @@ function endElement($parser, $name) {
       $this->projectMap[$this->currentElement['ID']] =
         ttProjectHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'description' => $this->currentElement['DESCRIPTION'],
           'tasks' => $mapped_tasks,
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 9203b5607..72b717117 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -189,6 +189,7 @@ static function insert($fields)
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
 
     $name = $fields['name'];
     $description = $fields['description'];
@@ -197,8 +198,8 @@ static function insert($fields)
     $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
     $status = $fields['status'];
     
-    $sql = "insert into tt_projects (group_id, name, description, tasks, status)
-      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_projects (group_id, org_id, name, description, tasks, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index b02271b95..b4644d513 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -136,13 +136,14 @@ static function insert($fields)
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     $description = $fields['description'];
     $projects = $fields['projects'];
     $status = $fields['status'];
         
-    $sql = "insert into tt_tasks (group_id, name, description, status)
-      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_tasks (group_id, org_id, name, description, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     $last_id = 0;
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f36602e58..8da3be0e6 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.10.4382 | 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.10.4383 | 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/dbinstall.php b/dbinstall.php
index a4a6eba71..e77c24b91 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -977,6 +977,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_projects` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("ALTER TABLE `tt_tasks` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'");
+    setChange("UPDATE `tt_projects` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_tasks` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mobile/project_add.php b/mobile/project_add.php
index b0d5394d4..6d68a178e 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -78,7 +78,8 @@
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 94f3e514d..defec7add 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -119,7 +119,8 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
diff --git a/mobile/task_add.php b/mobile/task_add.php
index 4b257edc5..796c725c9 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -68,7 +68,8 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index f1e256892..030cacd1b 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -103,7 +103,8 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
diff --git a/project_add.php b/project_add.php
index 980870250..3b4c73d36 100644
--- a/project_add.php
+++ b/project_add.php
@@ -77,7 +77,8 @@
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
diff --git a/project_edit.php b/project_edit.php
index 14e8e7713..77312b0b2 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -118,7 +118,8 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
diff --git a/task_add.php b/task_add.php
index e25fa3908..383a3935a 100644
--- a/task_add.php
+++ b/task_add.php
@@ -68,7 +68,8 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->group_id,
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,
diff --git a/task_edit.php b/task_edit.php
index feff4e52d..e63817313 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -101,7 +101,8 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->group_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,

From c0ddf2c276ccbb7480ab690edfbd6c6e42a3ae39 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 22:40:17 +0000
Subject: [PATCH 0299/1848] Added org_id to a couple more tables.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 3 +++
 mysql.sql                    | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8da3be0e6..b56b168de 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.10.4383 | 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.11.4384 | 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/dbinstall.php b/dbinstall.php
index e77c24b91..9a87d38e3 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -979,6 +979,9 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'");
     setChange("UPDATE `tt_projects` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
     setChange("UPDATE `tt_tasks` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
+    setChange("ALTER TABLE `tt_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("ALTER TABLE `tt_invoices` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.11', modified = now() where param_name = 'version_db' and param_value = '1.18.10'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 32ba202eb..396fd2d21 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -183,6 +183,7 @@ CREATE TABLE `tt_log` (
   `id` bigint NOT NULL auto_increment,             # time record id
   `user_id` int(11) NOT NULL,                      # user id
   `group_id` int(11) default NULL,                 # group id
+  `org_id` int(11) default NULL,                   # organization id
   `date` date NOT NULL,                            # date the record is for
   `start` time default NULL,                       # record start time (for example, 09:00)
   `duration` time default NULL,                    # record duration (for example, 1 hour)
@@ -219,6 +220,7 @@ create index task_idx on tt_log(task_id);
 CREATE TABLE `tt_invoices` (
   `id` int(11) NOT NULL auto_increment,         # invoice id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `name` varchar(80) COLLATE utf8_bin NOT NULL, # invoice name
   `date` date NOT NULL,                         # invoice date
   `client_id` int(11) NOT NULL,                 # client id
@@ -463,4 +465,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.10', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.11', now()); # TODO: change when structure changes.

From 7f313df2fbc1b28531adccbf022d6fdde0d6fdc8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 22:45:51 +0000
Subject: [PATCH 0300/1848] Cosmetic version fixes in dbinstall.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b56b168de..4f98ebca7 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.11.4384 | 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.11.4385 | 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/dbinstall.php b/dbinstall.php
index 9a87d38e3..a2ff4331c 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11810"]) {
+  if ($_POST["convert11797to11811"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1027,7 +1027,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.10)</b>
+    <td width="80%"><b>Create database structure (v1.18.11)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1072,8 +1072,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.10)</td>
-    <td><input type="submit" name="convert11797to11810" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.11)</td>
+    <td><input type="submit" name="convert11797to11811" value="Update"></td>
   </tr>
 </table>
 

From 3c5f822f90846e9a65866c9e33b7e1ff81b46b1f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Nov 2018 23:38:00 +0000
Subject: [PATCH 0301/1848] Started to populate org_id in tt_log and
 tt_invoices tables.

---
 WEB-INF/lib/ttImportHelper.class.php   | 2 ++
 WEB-INF/lib/ttInvoiceHelper.class.php  | 9 +++++----
 WEB-INF/lib/ttTimeHelper.class.php     | 9 +++++----
 WEB-INF/lib/ttWeekViewHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl           | 2 +-
 dbinstall.php                          | 2 ++
 mobile/time.php                        | 1 +
 mobile/timer.php                       | 1 +
 time.php                               | 1 +
 time_edit.php                          | 1 +
 10 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 350b0c1ff..64a32e0e6 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -241,6 +241,7 @@ function endElement($parser, $name) {
       $this->invoiceMap[$this->currentElement['ID']] =
         ttInvoiceHelper::insert(array(
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'name' => $this->currentElement['NAME'],
           'date' => $this->currentElement['DATE'],
           'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
@@ -257,6 +258,7 @@ function endElement($parser, $name) {
         ttTimeHelper::insert(array(
           'user_id' => $this->userMap[$this->currentElement['USER_ID']],
           'group_id' => $this->group_id,
+          'org_id' => $this->org_id,
           'date' => $this->currentElement['DATE'],
           'start' => $this->currentElement['START'],
           'finish' => $this->currentElement['FINISH'],
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 5c5d7141f..3a8dbe27b 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -38,6 +38,7 @@ static function insert($fields)
     $mdb2 = getConnection();
 
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     if (!$name) return false;
 
@@ -49,8 +50,8 @@ static function insert($fields)
     }
 
     // Insert a new invoice record.
-    $sql = "insert into tt_invoices (group_id, name, date, client_id $status_f)".
-      " values($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)";
+    $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id $status_f)".
+      " values($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)";
     $affected = $mdb2->exec($sql);
 
     if (is_a($affected, 'PEAR_Error')) return false;
@@ -330,8 +331,8 @@ static function createInvoice($fields) {
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Create a new invoice record.
-    $sql = "insert into tt_invoices (group_id, name, date, client_id) values(".
-            $user->getActiveGroup().", ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+    $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id) values(".
+      $user->getActiveGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index e30203540..245067804 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -391,6 +391,7 @@ static function insert($fields)
 
     $user_id = (int) $fields['user_id'];
     $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
     $date = $fields['date'];
     $start = $fields['start'];
     $finish = $fields['finish'];
@@ -423,8 +424,8 @@ static function insert($fields)
     if (!$paid) $paid = 0;
 
     if ($duration) {
-      $sql = "insert into tt_log (user_id, group_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, $group_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+      $sql = "insert into tt_log (user_id, group_id, org_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
+        "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -433,8 +434,8 @@ static function insert($fields)
       if ($duration === false) $duration = 0;
       if (!$duration && ttTimeHelper::getUncompleted($user_id)) return false;
 
-      $sql = "insert into tt_log (user_id, group_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, $group_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+      $sql = "insert into tt_log (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
+        "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index dcb39af63..53065d380 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -494,6 +494,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     $fields4insert = array();
     $fields4insert['user_id'] = $user->getActiveUser();
     $fields4insert['group_id'] = $user->getActiveGroup();
+    $fields4insert['org_id'] = $user->org_id;
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
     $fields4insert['client'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4f98ebca7..98b2ad53f 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.11.4385 | 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.11.4386 | 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/dbinstall.php b/dbinstall.php
index a2ff4331c..1c5fa9009 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -982,6 +982,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("ALTER TABLE `tt_invoices` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.11', modified = now() where param_name = 'version_db' and param_value = '1.18.10'");
+    setChange("UPDATE `tt_log` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_invoices` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mobile/time.php b/mobile/time.php
index 76296f64b..a25cf90c8 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -253,6 +253,7 @@
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
         'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/mobile/timer.php b/mobile/timer.php
index 09500bd22..2f5dbad4c 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -226,6 +226,7 @@
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
         'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time.php b/time.php
index 258f15c19..68aaf40e7 100644
--- a/time.php
+++ b/time.php
@@ -313,6 +313,7 @@
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
         'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time_edit.php b/time_edit.php
index 5f4068829..21c3effa7 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -366,6 +366,7 @@
         'date'=>$new_date->toString(DB_DATEFORMAT),
         'user_id'=>$user->getActiveUser(),
         'group_id'=>$user->getActiveGroup(),
+        'org_id' => $user->org_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,

From eae8b284cbee2b8e78b311bfa3a94f731f5056ee Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Nov 2018 08:55:16 +0000
Subject: [PATCH 0302/1848] A bit more progress with introducing org_id in
 tables.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 13 +++++++++----
 mysql.sql                    | 10 +++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98b2ad53f..f807fe1c3 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.11.4386 | 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.12.4387 | 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/dbinstall.php b/dbinstall.php
index 1c5fa9009..26f1a33aa 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11811"]) {
+  if ($_POST["convert11797to11812"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -984,6 +984,11 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.11', modified = now() where param_name = 'version_db' and param_value = '1.18.10'");
     setChange("UPDATE `tt_log` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
     setChange("UPDATE `tt_invoices` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
+    setChange("ALTER TABLE `tt_user_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
+    setChange("ALTER TABLE `tt_user_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("ALTER TABLE `tt_project_task_binds` ADD `group_id` int(11) default NULL AFTER `task_id`");
+    setChange("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1029,7 +1034,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.11)</b>
+    <td width="80%"><b>Create database structure (v1.18.12)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1074,8 +1079,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.11)</td>
-    <td><input type="submit" name="convert11797to11811" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.12)</td>
+    <td><input type="submit" name="convert11797to11812" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 396fd2d21..00abb462f 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -153,6 +153,8 @@ CREATE TABLE `tt_user_project_binds` (
   `id` int(11) NOT NULL auto_increment, # bind id
   `user_id` int(11) NOT NULL,           # user id
   `project_id` int(11) NOT NULL,        # project id
+  `group_id` int(11) default NULL,      # group id
+  `org_id` int(11) default NULL,        # organization id
   `rate` float(6,2) default '0.00',     # rate for this user when working on this project
   `status` tinyint(4) default 1,        # bind status
   PRIMARY KEY (`id`)
@@ -166,8 +168,10 @@ create unique index bind_idx on tt_user_project_binds(user_id, project_id);
 # Structure for table tt_project_task_binds. This table maps projects to assigned tasks.
 #
 CREATE TABLE `tt_project_task_binds` (
-  `project_id` int(11) NOT NULL, # project id
-  `task_id` int(11) NOT NULL     # task id
+  `project_id` int(11) NOT NULL,        # project id
+  `task_id` int(11) NOT NULL            # task id
+  `group_id` int(11) default NULL,      # group id
+  `org_id` int(11) default NULL,        # organization id
 );
 
 # Indexes for tt_project_task_binds.
@@ -465,4 +469,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.11', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.12', now()); # TODO: change when structure changes.

From 8fc038ec7505483c193e290423623b6a66ee3797 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Nov 2018 15:57:34 +0000
Subject: [PATCH 0303/1848] Started to populate group_id and org_id in
 tt_user_project_binds.

---
 WEB-INF/lib/ttImportHelper.class.php  | 12 +++++++++--
 WEB-INF/lib/ttProjectHelper.class.php |  9 +++++---
 WEB-INF/lib/ttUserHelper.class.php    | 30 ++++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl          |  2 +-
 user_add.php                          |  2 +-
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 64a32e0e6..307be1677 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -206,11 +206,19 @@ function endElement($parser, $name) {
           'status' => $this->currentElement['STATUS']));
     }
     if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
-      ttUserHelper::insertBind(
+/*
+        ttUserHelper::insertBind(
         $this->userMap[$this->currentElement['USER_ID']],
         $this->projectMap[$this->currentElement['PROJECT_ID']],
         $this->currentElement['RATE'],
-        $this->currentElement['STATUS']);
+        $this->currentElement['STATUS']);*/
+      ttUserHelper::insertBind2(array(
+        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+        'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
+        'group_id' => $this->group_id,
+        'org_id' => $this->org_id,
+        'rate' => $this->currentElement['RATE'],
+        'status' => $this->currentElement['STATUS']));
     }
 
     if ($name == 'CLIENT' && $this->canImport) {
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 72b717117..47783d59d 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -214,8 +214,8 @@ static function insert($fields)
     $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
     foreach ($active_users as $u) {
       if(in_array($u['id'], $users)) {
-        $sql = "insert into tt_user_project_binds (project_id, user_id, status, rate) values(
-          $last_id, ".$u['id'].", 1, ".$u['rate'].")";
+        $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, status, rate) values(
+          $last_id, ".$u['id'].", $group_id, $org_id, 1, ".$u['rate'].")";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
@@ -271,8 +271,11 @@ static function update($fields) {
       while ($row = $res->fetchRow()) {
         $user_rate[$row['id']] = $row['rate'];
       }
+      $group_id = $user->getActiveGroup();
+      $org_id = $user->org_id;
       foreach ($users_to_add as $id) {
-        $sql = "insert into tt_user_project_binds (user_id, project_id, rate, status) values($id, $project_id, ".$user_rate[$id].", 1)";
+        $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
+          " values($id, $project_id, $group_id, $org_id, ".$user_rate[$id].", 1)";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 28175080f..bd5e46b8f 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -134,7 +134,8 @@ static function insert($fields, $hash = true) {
           else
             $p['rate'] = str_replace(',', '.', $p['rate']);
 
-          $sql = "insert into tt_user_project_binds (project_id, user_id, rate, status) values(".$p['id'].",".$last_id.",".$p['rate'].", 1)";
+          $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, rate, status)".
+            " values(".$p['id'].", $last_id, $group_id, $org_id, ".$p['rate'].", 1)";
           $affected = $mdb2->exec($sql);
         }
       }
@@ -309,10 +310,33 @@ static function setPassword($user_id, $password) {
 
   // insertBind - inserts a user to project bind into tt_user_project_binds table.
   static function insertBind($user_id, $project_id, $rate, $status) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+    $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
+      " values($user_id, $project_id, $group_id, $org_id, ".$mdb2->quote($rate).", $status)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+    // insertBind2 - inserts a user to project bind into tt_user_project_binds table.
+  static function insertBind2($fields) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "insert into tt_user_project_binds (user_id, project_id, rate, status)
-      values($user_id, $project_id, ".$mdb2->quote($rate).", $status)";
+    // This may be used during import. Use the following until we have import refactored.
+    $group_id = $fields['group_id'] ? (int) $fields['group_id'] : $user->getActiveGroup();
+    $org_id = $fields['org_id'] ? (int) $fields['org_id'] : $user->org_id;
+
+    $user_id = (int) $fields['user_id'];
+    $project_id = (int) $fields['project_id'];
+    $rate = $mdb2->quote($fields['rate']);
+    $status = $mdb2->quote($fields['status']);
+
+    $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
+      " values($user_id, $project_id, $group_id, $org_id, $rate, $status)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f807fe1c3..ee8659bf9 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.12.4387 | 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.12.4388 | 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/user_add.php b/user_add.php
index ac2d8c4e4..eb9391472 100644
--- a/user_add.php
+++ b/user_add.php
@@ -150,7 +150,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'group_id' => $user->group_id, // TODO: this needs to be fixed for on-behalf group work.
+        'group_id' => $user->getActiveGroup(),
         'org_id' => $user->org_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,

From 1cfc9f9452a2e397fca1886825fff29fad409e5c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Nov 2018 17:04:02 +0000
Subject: [PATCH 0304/1848] A bit of refactoring.

---
 WEB-INF/lib/ttImportHelper.class.php |  8 +-------
 WEB-INF/lib/ttUserHelper.class.php   | 25 +++++++++----------------
 WEB-INF/templates/footer.tpl         |  2 +-
 dbinstall.php                        |  2 ++
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 307be1677..ea899821a 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -206,13 +206,7 @@ function endElement($parser, $name) {
           'status' => $this->currentElement['STATUS']));
     }
     if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
-/*
-        ttUserHelper::insertBind(
-        $this->userMap[$this->currentElement['USER_ID']],
-        $this->projectMap[$this->currentElement['PROJECT_ID']],
-        $this->currentElement['RATE'],
-        $this->currentElement['STATUS']);*/
-      ttUserHelper::insertBind2(array(
+      ttUserHelper::insertBind(array(
         'user_id' => $this->userMap[$this->currentElement['USER_ID']],
         'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
         'group_id' => $this->group_id,
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index bd5e46b8f..222cfdaa4 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -229,8 +229,14 @@ static function update($user_id, $fields) {
             if (is_a($affected, 'PEAR_Error')) die ($affected->getMessage());
           } else {
             // Record does not exist. Insert it.
-            ttUserHelper::insertBind($user_id, $project_id, $rate, 1);
-          }
+            ttUserHelper::insertBind(array(
+              'user_id' => $user_id,
+              'project_id' => $project_id,
+              'group_id' => $user->getActiveGroup(),
+              'org_id' => $user->org_id,
+              'rate' => $rate,
+              'status' => ACTIVE));
+           }
         }
       }
     }
@@ -309,20 +315,7 @@ static function setPassword($user_id, $password) {
   }
 
   // insertBind - inserts a user to project bind into tt_user_project_binds table.
-  static function insertBind($user_id, $project_id, $rate, $status) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getActiveGroup();
-    $org_id = $user->org_id;
-    $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
-      " values($user_id, $project_id, $group_id, $org_id, ".$mdb2->quote($rate).", $status)";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-    // insertBind2 - inserts a user to project bind into tt_user_project_binds table.
-  static function insertBind2($fields) {
+  static function insertBind($fields) {
     global $user;
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ee8659bf9..73feb65aa 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.12.4388 | 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.12.4389 | 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/dbinstall.php b/dbinstall.php
index 26f1a33aa..d150e7350 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -989,6 +989,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_project_task_binds` ADD `group_id` int(11) default NULL AFTER `task_id`");
     setChange("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'");
+    // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
+    // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
   }
 
   if ($_POST["cleanup"]) {

From f54ca9d66b525ec1cd7076744c8a022e8b4b488d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Nov 2018 19:01:42 +0000
Subject: [PATCH 0305/1848] Resuming work on new import - renamed a class.

---
 ...tImportHelper2.class.php => ttOrgImportHelper.class.php} | 6 +++---
 WEB-INF/templates/footer.tpl                                | 2 +-
 import.php                                                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename WEB-INF/lib/{ttImportHelper2.class.php => ttOrgImportHelper.class.php} (97%)

diff --git a/WEB-INF/lib/ttImportHelper2.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
similarity index 97%
rename from WEB-INF/lib/ttImportHelper2.class.php
rename to WEB-INF/lib/ttOrgImportHelper.class.php
index 5de6d8c59..cce763da6 100644
--- a/WEB-INF/lib/ttImportHelper2.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -38,10 +38,10 @@
 import('ttExpenseHelper');
 import('ttRoleHelper');
 
-// ttImportHelper2 - this class is a future replacement for ttImportHelper.
+// ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
 // When done, it should handle import of complex groups consisting of other groups.
-class ttImportHelper2 {
+class ttOrgImportHelper {
   var $errors         = null;    // Errors go here. Set in constructor by reference.
 
   var $currentElement = array(); // Current element of the XML file we are parsing.
@@ -82,7 +82,7 @@ function endElement($parser, $name) {
 
     // During second pass we import data.
     if (!$this->firstPass && $this->canImport) {
-      // TODO: write code here.
+      // TODO: write code here. Nothing is imported currently.
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 73feb65aa..d459f13a1 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.12.4389 | 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.12.4390 | 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/import.php b/import.php
index 3e375c981..235924ac4 100644
--- a/import.php
+++ b/import.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('ttImportHelper');
-import('ttImportHelper2');
+import('ttOrgImportHelper');
 import('form.Form');
 
 // Access check.
@@ -44,7 +44,7 @@
 
 if ($request->isPost()) {
   if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
-    $import = new ttImportHelper2($err);
+    $import = new ttOrgImportHelper($err);
   } else {
     $import = new ttImportHelper($err);
   }

From 7051fc8c0f68618bbaff5f8bb48d3478ce93836a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Nov 2018 20:41:48 +0000
Subject: [PATCH 0306/1848] Some progress with writing new export.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 77 ++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index cce763da6..e64019154 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -50,6 +50,10 @@ class ttOrgImportHelper {
   var $canImport      = true;    // False if we cannot import data due to a login collision.
   var $firstPass      = true;    // True during first pass through the file.
 
+  var $org_id         = null;    // Organization id (same as top group_id).
+  var $current_parent_group_id = null; // Current parent group id as we parse the file.
+                                       // Set when we create a new group.
+
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
@@ -63,6 +67,32 @@ function startElement($parser, $name, $attrs) {
       $this->currentElement = $attrs;
     }
     $this->currentTag = $name;
+
+    if (!$this->firstPass && $this->canImport) {
+      $mdb2 = getConnection();
+
+      // We are in second pass through the XML file and can import data.
+      if ($name == 'GROUP') {
+        // Create a new group.
+        $group_id = $this->createGroup(array(
+          'parent_id' => $this->current_parent_group_id,
+          'org_id' => $this->org_id,
+          'name' => $this->currentElement['NAME'],
+          'currency' => $this->currentElement['CURRENCY'],
+          'lang' => $this->currentElement['LANG']));
+        // We only have 3 properties in export at the moment, while work is ongoing...
+
+        // Special handling for top group.
+        if (!$this->org_id) {
+          $this->org_id = $group_id;
+          $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+          $affected = $mdb2->exec($sql);
+          // TODO: design a better error handling approach for the entire import process.
+        }
+        // Set current parent group.
+        $this->current_parent_group_id = $group_id;
+      }
+    }
   }
 
   // endElement - callback handler for the closing tag of an XML element.
@@ -82,7 +112,7 @@ function endElement($parser, $name) {
 
     // During second pass we import data.
     if (!$this->firstPass && $this->canImport) {
-      // TODO: write code here. Nothing is imported currently.
+      // Nothing is done here, see startElement for second pass.
     }
   }
 
@@ -213,4 +243,49 @@ function uncompress($in, $out) {
     fclose ($out_file);
     return true;
   }
+
+  // createGroup function creates a new group.
+  private function createGroup($fields) {
+
+    global $user;
+    $mdb2 = getConnection();
+
+    $columns = '(parent_id, org_id, name, currency, lang)';
+
+//    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
+//      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
+//      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
+
+    $values = ' values (';
+    $values .= $mdb2->quote($fields['parent_id']);
+    $values .= ', '.$mdb2->quote($fields['org_id']);
+    $values .= ', '.$mdb2->quote(trim($fields['name']));
+    $values .= ', '.$mdb2->quote(trim($fields['currency']));
+    //$values .= ', '.$mdb2->quote($fields['decimal_mark']);
+    $values .= ', '.$mdb2->quote($fields['lang']);
+/*
+    $values .= ', '.$mdb2->quote($fields['date_format']);
+    $values .= ', '.$mdb2->quote($fields['time_format']);
+    $values .= ', '.(int)$fields['week_start'];
+    $values .= ', '.(int)$fields['tracking_mode'];
+    $values .= ', '.(int)$fields['project_required'];
+    $values .= ', '.(int)$fields['task_required'];
+    $values .= ', '.(int)$fields['record_type'];
+    $values .= ', '.$mdb2->quote($fields['bcc_email']);
+    $values .= ', '.$mdb2->quote($fields['allow_ip']);
+    $values .= ', '.$mdb2->quote($fields['password_complexity']);
+    $values .= ', '.$mdb2->quote($fields['plugins']);
+    $values .= ', '.$mdb2->quote($fields['lock_spec']);
+    $values .= ', '.(int)$fields['workday_minutes'];
+    $values .= ', '.$mdb2->quote($fields['config']);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id); */
+    $values .= ')';
+
+    $sql = 'insert into tt_groups '.$columns.$values;
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+    return $group_id;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d459f13a1..b0b2e53f0 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.12.4390 | 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.12.4391 | 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>

From a1d3d5c5d92eed842325de1c62295cb01d070228 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Nov 2018 20:57:44 +0000
Subject: [PATCH 0307/1848] Improved new export to include roles in output.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 14 ++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index d643ed9d6..af49e19e6 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -143,6 +143,20 @@ function writeData() {
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
+    // Write roles.
+    fwrite($this->file, $this->indentation."<roles>\n");
+    foreach ($roles as $role) {
+      $role_part = $this->indentation.'  '."<role id=\"".$this->roleMap[$role['id']]."\"";
+      $role_part .= " name=\"".htmlentities($role['name'])."\"";
+      $role_part .= " description=\"".htmlentities($role['description'])."\"";
+      $role_part .= " rank=\"".$role['rank']."\"";
+      $role_part .= " rights=\"".htmlentities($role['rights'])."\"";
+      $role_part .= " status=\"".$role['status']."\"";
+      $role_part .= "></role>\n";
+      fwrite($this->file, $role_part);
+    }
+    fwrite($this->file, $this->indentation."</roles>\n");
+
     // Write users.
     fwrite($this->file, $this->indentation."<users>\n");
     foreach ($users as $user_item) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b0b2e53f0..6e4cc7431 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.12.4391 | 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.12.4392 | 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>

From fb57263a487993f368478238d3f65d3495349b22 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 12:39:23 +0000
Subject: [PATCH 0308/1848] A bit of refactoring in ttOrgImportHelper class.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 48 ++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index e64019154..f3a2d8eaa 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -53,6 +53,17 @@ class ttOrgImportHelper {
   var $org_id         = null;    // Organization id (same as top group_id).
   var $current_parent_group_id = null; // Current parent group id as we parse the file.
                                        // Set when we create a new group.
+  // Entities for current group.
+  var $currentGroupRoles = array(); // Array of arrays of role properties.
+  // var $currentGroupUsers = array(); // Array of arrays of user properties.
+
+  // Entity maps for current group. They map XML ids with database ids.
+  var $currentGroupRoleMap = array(); // Maps role ids from XML to their database ids.
+  //var $userMap       = array(); // User ids.
+  //var $projectMap    = array(); // Project ids.
+  //var $taskMap       = array(); // Task ids.
+  //var $clientMap     = array(); // Client ids.
+  //var $invoiceMap    = array(); // Invoice ids.
 
   // Constructor.
   function __construct(&$errors) {
@@ -62,12 +73,25 @@ function __construct(&$errors) {
   // startElement - callback handler for opening tag of an XML element.
   // In this function we assign passed in attributes to currentElement.
   function startElement($parser, $name, $attrs) {
+/*
     if ($name == 'GROUP'
       || $name == 'USER') {
       $this->currentElement = $attrs;
     }
     $this->currentTag = $name;
+*/
+    // First pass. We only check user logins for potential collisions with existing.
+    if ($this->firstPass) {
+      if ($name == 'USER' && $this->canImport) {
+        if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($attrs['LOGIN'])) {
+          // We have a login collision, cannot import any data.
+          $this->canImport = false;
+        }
+      }
+      //$this->currentTag = '';
+    }
 
+    // Second pass processing. We import data here, one tag at a time.
     if (!$this->firstPass && $this->canImport) {
       $mdb2 = getConnection();
 
@@ -92,6 +116,23 @@ function startElement($parser, $name, $attrs) {
         // Set current parent group.
         $this->current_parent_group_id = $group_id;
       }
+
+      if ($name == 'ROLES') {
+        // If we get here, we have to recycle both $currentGroupRoles and $currentGroupRoleMap.
+        unset($this->currentGroupRoles);
+        unset($this->currentGroupRoleMap);
+        $this->currentGroupRoles = array();
+        $this->currentGroupRoleMap = array();
+        // Both arrays are now empty.
+        // They will get reconstructed after processing of <role> elements in XML. See below.
+      }
+
+      if ($name == 'ROLE') {
+        // We get here when processing a <role> tag for the current group.
+        // Add new role to $this->currentGroupRoles and a mapping to $this->currentGroupRoleMap.
+        $this->currentGroupRoles[$this->currentElement['ID']] = $this->currentElement;
+      $this->currentElement = array();
+      }
     }
   }
 
@@ -99,6 +140,8 @@ function startElement($parser, $name, $attrs) {
   // When we are here, currentElement is an array of the element attributes (as set in startElement).
   // Here we do the actual import of data into the database.
   function endElement($parser, $name) {
+    // Do nothing here. Everything is done in startElement to keep things simple.
+    /*
     // During first pass we only check user logins.
     if ($this->firstPass) {
       if ($name == 'USER' && $this->canImport) {
@@ -113,11 +156,13 @@ function endElement($parser, $name) {
     // During second pass we import data.
     if (!$this->firstPass && $this->canImport) {
       // Nothing is done here, see startElement for second pass.
-    }
+    }*/
   }
 
   // dataElement - callback handler for text data fragments. It builds up currentElement array with text pieces from XML.
   function dataElement($parser, $data) {
+    // New approach is to do nothing here. Everything is now done when processing start tag (startElement).
+      /*
     if ($this->currentTag == 'NAME'
       || $this->currentTag == 'DESCRIPTION'
       || $this->currentTag == 'LABEL'
@@ -131,6 +176,7 @@ function dataElement($parser, $data) {
       else
         $this->currentElement[$this->currentTag] = trim($data);
     }
+       * */
   }
 
   // importXml - uncompresses the file, reads and parses its content. During parsing,
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6e4cc7431..69cf517ed 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.12.4392 | 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.12.4393 | 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>

From 7af7d601282b0ea3138d05c300163e18e121ec32 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 13:08:04 +0000
Subject: [PATCH 0309/1848] A bit more work in progress in ttOrgImportHelper
 class.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 53 ++-----------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index f3a2d8eaa..c70d25805 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -26,7 +26,6 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttTeamHelper');
 import('ttUserHelper');
 import('ttProjectHelper');
 import('ttTaskHelper');
@@ -70,8 +69,7 @@ function __construct(&$errors) {
     $this->errors = &$errors;
   }
 
-  // startElement - callback handler for opening tag of an XML element.
-  // In this function we assign passed in attributes to currentElement.
+  // startElement - callback handler for opening tag of an XML element in the file.
   function startElement($parser, $name, $attrs) {
 /*
     if ($name == 'GROUP'
@@ -136,49 +134,6 @@ function startElement($parser, $name, $attrs) {
     }
   }
 
-  // endElement - callback handler for the closing tag of an XML element.
-  // When we are here, currentElement is an array of the element attributes (as set in startElement).
-  // Here we do the actual import of data into the database.
-  function endElement($parser, $name) {
-    // Do nothing here. Everything is done in startElement to keep things simple.
-    /*
-    // During first pass we only check user logins.
-    if ($this->firstPass) {
-      if ($name == 'USER' && $this->canImport) {
-        if ('' != $this->currentElement['STATUS'] && ttUserHelper::getUserByLogin($this->currentElement['LOGIN'])) {
-          // We have a login collision, cannot import any data.
-          $this->canImport = false;
-        }
-      }
-      $this->currentTag = '';
-    }
-
-    // During second pass we import data.
-    if (!$this->firstPass && $this->canImport) {
-      // Nothing is done here, see startElement for second pass.
-    }*/
-  }
-
-  // dataElement - callback handler for text data fragments. It builds up currentElement array with text pieces from XML.
-  function dataElement($parser, $data) {
-    // New approach is to do nothing here. Everything is now done when processing start tag (startElement).
-      /*
-    if ($this->currentTag == 'NAME'
-      || $this->currentTag == 'DESCRIPTION'
-      || $this->currentTag == 'LABEL'
-      || $this->currentTag == 'VALUE'
-      || $this->currentTag == 'COMMENT'
-      || $this->currentTag == 'ADDRESS'
-      || $this->currentTag == 'ALLOW_IP'
-      || $this->currentTag == 'PASSWORD_COMPLEXITY') {
-      if (isset($this->currentElement[$this->currentTag]))
-        $this->currentElement[$this->currentTag] .= trim($data);
-      else
-        $this->currentElement[$this->currentTag] = trim($data);
-    }
-       * */
-  }
-
   // importXml - uncompresses the file, reads and parses its content. During parsing,
   // startElement, endElement, and dataElement functions are called as many times as necessary.
   // Actual import occurs in the endElement handler.
@@ -213,8 +168,7 @@ function importXml() {
     // Initialize XML parser.
     $parser = xml_parser_create();
     xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', 'endElement');
-    xml_set_character_data_handler($parser, 'dataElement');
+    xml_set_element_handler($parser, 'startElement', false);
 
     // We need to parse the file 2 times:
     //   1) First pass: determine if import is possible - there must be no login collisions.
@@ -247,8 +201,7 @@ function importXml() {
     // Now we can do a second pass, where real work is done.
     $parser = xml_parser_create();
     xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', 'endElement');
-    xml_set_character_data_handler($parser, 'dataElement');
+    xml_set_element_handler($parser, 'startElement', false);
 
     // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
     $file = fopen($filename, 'r');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 69cf517ed..ea363bc86 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.12.4393 | 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.12.4394 | 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>

From 15ae2165165da813912300d223c50b74f44cc1e0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 14:25:57 +0000
Subject: [PATCH 0310/1848] ttOrgImportHelper class impoved to output
 conflicting login names.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 54 +++++++++----------------
 WEB-INF/resources/ca.lang.php           |  1 +
 WEB-INF/resources/cs.lang.php           |  1 +
 WEB-INF/resources/da.lang.php           |  2 +
 WEB-INF/resources/de.lang.php           |  2 +
 WEB-INF/resources/en.lang.php           |  1 +
 WEB-INF/resources/es.lang.php           |  1 +
 WEB-INF/resources/et.lang.php           |  2 +
 WEB-INF/resources/fa.lang.php           |  1 +
 WEB-INF/resources/fi.lang.php           |  2 +
 WEB-INF/resources/fr.lang.php           |  2 +
 WEB-INF/resources/gr.lang.php           |  2 +
 WEB-INF/resources/he.lang.php           |  1 +
 WEB-INF/resources/hu.lang.php           |  1 +
 WEB-INF/resources/it.lang.php           |  2 +
 WEB-INF/resources/ja.lang.php           |  1 +
 WEB-INF/resources/ko.lang.php           |  1 +
 WEB-INF/resources/nl.lang.php           |  2 +
 WEB-INF/resources/no.lang.php           |  1 +
 WEB-INF/resources/pl.lang.php           |  2 +
 WEB-INF/resources/pt-br.lang.php        |  2 +
 WEB-INF/resources/pt.lang.php           |  1 +
 WEB-INF/resources/ro.lang.php           |  1 +
 WEB-INF/resources/ru.lang.php           |  1 +
 WEB-INF/resources/sk.lang.php           |  1 +
 WEB-INF/resources/sl.lang.php           |  1 +
 WEB-INF/resources/sr.lang.php           |  2 +
 WEB-INF/resources/sv.lang.php           |  2 +
 WEB-INF/resources/tr.lang.php           |  1 +
 WEB-INF/resources/zh-cn.lang.php        |  1 +
 WEB-INF/resources/zh-tw.lang.php        |  1 +
 31 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index c70d25805..b22c4fe3d 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,28 +27,17 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
-import('ttProjectHelper');
-import('ttTaskHelper');
-import('ttInvoiceHelper');
-import('ttTimeHelper');
-import('ttClientHelper');
-import('ttCustomFieldHelper');
-import('ttFavReportHelper');
-import('ttExpenseHelper');
-import('ttRoleHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
 // When done, it should handle import of complex groups consisting of other groups.
 class ttOrgImportHelper {
   var $errors         = null;    // Errors go here. Set in constructor by reference.
-
-  var $currentElement = array(); // Current element of the XML file we are parsing.
-  var $currentTag     = '';      // XML tag of the current element.
+  var $cannotImport   = null;    // A comma-separated string of entity names that we cannot import.
+                                 // TODO: rename the above to something better.
 
   var $canImport      = true;    // False if we cannot import data due to a login collision.
   var $firstPass      = true;    // True during first pass through the file.
-
   var $org_id         = null;    // Organization id (same as top group_id).
   var $current_parent_group_id = null; // Current parent group id as we parse the file.
                                        // Set when we create a new group.
@@ -71,38 +60,32 @@ function __construct(&$errors) {
 
   // startElement - callback handler for opening tag of an XML element in the file.
   function startElement($parser, $name, $attrs) {
-/*
-    if ($name == 'GROUP'
-      || $name == 'USER') {
-      $this->currentElement = $attrs;
-    }
-    $this->currentTag = $name;
-*/
+
     // First pass. We only check user logins for potential collisions with existing.
     if ($this->firstPass) {
       if ($name == 'USER' && $this->canImport) {
-        if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($attrs['LOGIN'])) {
-          // We have a login collision, cannot import any data.
-          $this->canImport = false;
+        $login = $attrs['LOGIN'];
+        if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($login)) {
+          // We have a login collision. Append colliding login to a list of things we cannot import.
+          $this->cannotImport .= ($this->cannotImport ? ", $login" : $login);
         }
       }
-      //$this->currentTag = '';
     }
 
     // Second pass processing. We import data here, one tag at a time.
     if (!$this->firstPass && $this->canImport) {
       $mdb2 = getConnection();
 
-      // We are in second pass through the XML file and can import data.
+      // We are in second pass and can import data.
       if ($name == 'GROUP') {
         // Create a new group.
         $group_id = $this->createGroup(array(
           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
-          'name' => $this->currentElement['NAME'],
-          'currency' => $this->currentElement['CURRENCY'],
-          'lang' => $this->currentElement['LANG']));
-        // We only have 3 properties in export at the moment, while work is ongoing...
+          'name' => $attrs['NAME'],
+          'currency' => $attrs['CURRENCY'],
+          'lang' => $attrs['LANG']));
+        // We only have 3 properties at the moment, while work is ongoing...
 
         // Special handling for top group.
         if (!$this->org_id) {
@@ -128,8 +111,7 @@ function startElement($parser, $name, $attrs) {
       if ($name == 'ROLE') {
         // We get here when processing a <role> tag for the current group.
         // Add new role to $this->currentGroupRoles and a mapping to $this->currentGroupRoleMap.
-        $this->currentGroupRoles[$this->currentElement['ID']] = $this->currentElement;
-      $this->currentElement = array();
+        $this->currentGroupRoles[$attrs['ID']] = $attrs;
       }
     }
   }
@@ -185,11 +167,13 @@ function importXml() {
           xml_error_string(xml_get_error_code($parser)),
           xml_get_current_line_number($parser)));
       }
-      if (!$this->canImport) {
-        $this->errors->add($i18n->get('error.user_exists'));
-        break;
-      }
     }
+    if ($this->cannotImport) {
+      $this->canImport = false;
+      $this->errors->add($i18n->get('error.user_exists'));
+      $this->errors->add(sprintf($i18n->get('error.cannot_import'), $this->cannotImport));
+    }
+
     $this->firstPass = false; // We are done with 1st pass.
     xml_parser_free($parser);
     if ($file) fclose($file);
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 64a3b86a6..2a74077ea 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -116,6 +116,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Iniciar sessió',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1cc0734d1..4d5937494 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -118,6 +118,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Přihlásit',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 280c9945c..914bba6d9 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -108,6 +108,8 @@
 'error.goto_uncompleted' => 'Gå til uafsluttet registrering.',
 'error.overlap' => 'Tidsinterval overlapper eksisterende poster.',
 'error.future_date' => 'Datoen er ud i fremtiden.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Log ind',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 48d5dcfaa..9e118e4ac 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -101,6 +101,8 @@
 'error.goto_uncompleted' => 'Zum unvollständigen Eintrag gehen.',
 'error.overlap' => 'Der Zeitinterval überschneidet sich mit vorhandenen Einträgen.',
 'error.future_date' => 'Datum ist in der Zukunft.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Anmelden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index a28c87cfa..16f61f22a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -100,6 +100,7 @@
 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 'error.overlap' => 'Time interval overlaps with existing records.',
 'error.future_date' => 'Date is in future.',
+'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 28dbb500b..2ee7de8c3 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -114,6 +114,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Iniciar sesion',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 854021632..86cde2a33 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -118,6 +118,8 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index d220c13d8..55625a883 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -116,6 +116,7 @@
 'error.overlap' => 'بازه زمانی با سوابق موجود هم پوشانی دارد.',
 // TODO: translate the following.
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'ورود',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1e4b86a63..36b4d0bd3 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -110,6 +110,8 @@
 'error.goto_uncompleted' => 'Siirry kesken olevaan syötteeseen.',
 'error.overlap' => 'Aikavälillä on päällekkäisiä syötteitä.',
 'error.future_date' => 'Aika on tulevaisuudessa.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Kirjaudu',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1e64e96d2..6290479f2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -108,6 +108,8 @@
 'error.goto_uncompleted' => 'Aller à l\\\'entrée non terminée.',
 'error.overlap' => 'Les heures des projets ne peuvent se chevaucher.',
 'error.future_date' => 'Date ultérieure.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Connexion',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 180401534..f2de6f519 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -102,6 +102,8 @@
 'error.goto_uncompleted' => 'Μεταβείτε στην μη ολοκληρωμένη καταχώρηση.',
 'error.overlap' => 'Το χρονικό διάστημα επικαλύπτει υπάρχουσες καταχωρήσεις.',
 'error.future_date' => 'Η ημερομηνία είναι στο μέλλον.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Σύνδεση',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a44d82e50..66cbea766 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -126,6 +126,7 @@
 'error.overlap' => 'טווח הזמן מתנגש עם רישומים קיימים.',
 // TODO: translate the following.
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'היכנס',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9e59b544c..b740fe356 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -115,6 +115,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Bejelentkezés',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ea2b25140..5d0600aa1 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -106,6 +106,8 @@
 'error.goto_uncompleted' => 'Vai alle voce incompleta.',
 'error.overlap' => 'Intervallo temporale sovrapposto a voci esistenti.',
 'error.future_date' => 'La data è nel futuro.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 23afc5d99..6149e7c4b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -120,6 +120,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'ログイン',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6e0f59bdd..fa41f2ca0 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -119,6 +119,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => '로그인',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b1f76af77..8c4a5244c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -99,6 +99,8 @@
 'error.goto_uncompleted' => 'Ga naar onvolledige invoer.',
 'error.overlap' => 'De huidige registratie overlapt een reeds bestaande registratie.',
 'error.future_date' => 'Datum ligt in de toekomst.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Aanmelden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 07026ae57..044a6f338 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -120,6 +120,7 @@
 // TODO: translate the following.
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Innlogging',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f88888fc3..c94ae1c95 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -112,6 +112,8 @@
 'error.goto_uncompleted' => 'Przejdź do niedokończonego wpisu.',
 'error.overlap' => 'Okres czasowy nakłada się z istniejącymi wpisami.',
 'error.future_date' => 'Data jest w przyszłości.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 79370ec62..f40b5f017 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -109,6 +109,8 @@
 'error.goto_uncompleted' => 'Ir até a entrada incompleta.',
 'error.overlap' => 'O intervalo se sobrepõe com entradas já existentes.',
 'error.future_date' => 'Data é no futuro.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c9b24b347..4f7d748b9 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -112,6 +112,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 223415522..82d5d3e6a 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -120,6 +120,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Autentifica',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4a5dbd629..3974d1673 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -99,6 +99,7 @@
 'error.goto_uncompleted' => 'Посмотреть неоконченную запись.',
 'error.overlap' => 'Интервал времени перекрывается с существующими записями.',
 'error.future_date' => 'Дата в будущем.',
+'error.cannot_import' => 'Невозможно импортировать: %s.',
 
 // Labels for buttons.
 'button.login' => 'Войти',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 13992fe8b..cfca9b0a8 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -115,6 +115,7 @@
 // TODO: translate the following.
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Prihlásiť',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index df5ddf52a..e07b20898 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -109,6 +109,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Prijava',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a35014c01..6bc886a0a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -109,6 +109,8 @@
 'error.goto_uncompleted' => 'Prikaži postojeći unos.',
 'error.overlap' => 'Navedeni vremenski interval se podudara sa već unetim vremenom.',
 'error.future_date' => 'Naveli ste budući datum.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Prijava',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index fb4289a81..a646aab5e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -106,6 +106,8 @@
 'error.goto_uncompleted' => 'Visa registrering.',
 'error.overlap' => 'Tidsintervallet överlappar med en redan existerande tidsregistrering.',
 'error.future_date' => 'Det går inte att registrera tider framåt i tiden.',
+// TODO: translate the following.
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Logga in',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4b167e882..eb4887542 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -123,6 +123,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => 'Giriş',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 2d55378f9..e37138ba3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -112,6 +112,7 @@
 // TODO: translate the following.
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => '登录',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 74d379fc3..f46f45627 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -117,6 +117,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
 'button.login' => '登錄',

From 6825261fd55ae8caf490fe52e5cad466cc6deb81 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 14:47:05 +0000
Subject: [PATCH 0311/1848] Renamed a class member to avoid confusion.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 14 ++++++--------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index b22c4fe3d..ba1b120fe 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -32,11 +32,9 @@
 // Currently, it is work in progress.
 // When done, it should handle import of complex groups consisting of other groups.
 class ttOrgImportHelper {
-  var $errors         = null;    // Errors go here. Set in constructor by reference.
-  var $cannotImport   = null;    // A comma-separated string of entity names that we cannot import.
-                                 // TODO: rename the above to something better.
-
-  var $canImport      = true;    // False if we cannot import data due to a login collision.
+  var $errors               = null; // Errors go here. Set in constructor by reference.
+  var $conflicting_entities = null; // A comma-separated list of entity names we cannot import.
+  var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).
   var $current_parent_group_id = null; // Current parent group id as we parse the file.
@@ -67,7 +65,7 @@ function startElement($parser, $name, $attrs) {
         $login = $attrs['LOGIN'];
         if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($login)) {
           // We have a login collision. Append colliding login to a list of things we cannot import.
-          $this->cannotImport .= ($this->cannotImport ? ", $login" : $login);
+          $this->conflicting_entities .= ($this->conflicting_entities ? ", $login" : $login);
         }
       }
     }
@@ -168,10 +166,10 @@ function importXml() {
           xml_get_current_line_number($parser)));
       }
     }
-    if ($this->cannotImport) {
+    if ($this->conflicting_entities) {
       $this->canImport = false;
       $this->errors->add($i18n->get('error.user_exists'));
-      $this->errors->add(sprintf($i18n->get('error.cannot_import'), $this->cannotImport));
+      $this->errors->add(sprintf($i18n->get('error.cannot_import'), $this->conflicting_entities));
     }
 
     $this->firstPass = false; // We are done with 1st pass.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ea363bc86..bb6e438b9 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.12.4394 | 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.12.4395 | 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>

From 94af2134f643b14c7f1a4838e88f7d6ed36aebcc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 16:58:25 +0000
Subject: [PATCH 0312/1848] Disabled bot protection check for logged in site
 admin.

---
 WEB-INF/lib/ttRegistrator.class.php | 9 ++++++---
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index b3551dad6..44841f503 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -84,11 +84,14 @@ function register() {
     if ($this->err->yes()) return false; // There are errors, do not proceed.
 
     global $i18n;
+    global $user;
 
     // Protection fom too many recent bot registrations from user IP.
-    if ($this->registeredRecently()) {
-      $this->err->add($i18n->get('error.access_denied'));
-      return false;
+    if (!$user->can('administer_site')) { // No problems for site admin.
+      if ($this->registeredRecently()) {
+        $this->err->add($i18n->get('error.access_denied'));
+        return false;
+      }
     }
 
     import('ttUserHelper');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bb6e438b9..848425e0b 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.12.4395 | 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.12.4396 | 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>

From ce2ddc553c3e30ffaa62d6e0f2e1220ca7f63f34 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 17:36:29 +0000
Subject: [PATCH 0313/1848] Fixed populating created_by for user created by
 admin.

---
 WEB-INF/lib/ttRegistrator.class.php | 8 +++++---
 WEB-INF/templates/footer.tpl        | 2 +-
 admin_group_add.php                 | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 44841f503..c206881dc 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -86,7 +86,7 @@ function register() {
     global $i18n;
     global $user;
 
-    // Protection fom too many recent bot registrations from user IP.
+    // Protection from too many recent bot registrations from user IP.
     if (!$user->can('administer_site')) { // No problems for site admin.
       if ($this->registeredRecently()) {
         $this->err->add($i18n->get('error.access_denied'));
@@ -121,7 +121,9 @@ function register() {
       return false;
     }
 
-    if (!$this->setCreatedBy($this->user_id))
+    // Set created_by appropriately (admin or self).
+    $created_by = $user->can('administer_site') ? $user->id : $this->user_id;
+    if (!$this->setCreatedBy($created_by))
       return false;
 
     return true;
@@ -189,7 +191,7 @@ function setCreatedBy($user_id) {
     }
 
     // Update top manager.
-    $sql = "update tt_users set created_by = $user_id where id = $user_id and group_id = $this->group_id";
+    $sql = "update tt_users set created_by = $user_id where id = $this->user_id and group_id = $this->group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
       $this->err->add($i18n->get('error.db'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 848425e0b..67fbea434 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.12.4396 | 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.12.4397 | 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/admin_group_add.php b/admin_group_add.php
index 21570a967..71dde8a08 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -106,7 +106,8 @@
   import('ttRegistrator');
   $registrator = new ttRegistrator($fields, $err);
   $registrator->register();
-  $registrator->setCreatedBy($user->id); // Override created_by to admin account.
+  // $registrator->setCreatedBy($user->id); // Override created_by to admin account.
+  // TODO: redo ttRegistrator class by passing in created_by_id in $fields to keep code straightforward.
   if ($err->no()) {
     header('Location: admin_groups.php');
     exit();

From 725af06a89e5a7014dfdc9081222f313a58a6bb6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 19:24:35 +0000
Subject: [PATCH 0314/1848] Some refactoring and cleanup in ttRegistrator
 class.

---
 WEB-INF/lib/ttRegistrator.class.php | 21 ++++++++++++++-------
 WEB-INF/templates/footer.tpl        |  2 +-
 admin_group_add.php                 |  5 ++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index c206881dc..8e755837e 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -35,7 +35,12 @@ class ttRegistrator {
   var $group_name = null; // Group name.
   var $currency = null;   // Currency.
   var $lang = null;       // Language.
+  var $created_by_id = null; // User, who uses the instance.
+                             // Currently, there are 2 possibilities:
+                             // 1) Self-registration, or null here.
+                             // 2) Registration by admin with a user_id.
   var $group_id = null;   // Group id, set after we create a group.
+  var $org_id = null;     // Organization id, the same as group_id (top group in org).
   var $role_id = null;    // Role id for top managers.
   var $user_id = null;    // User id after registration.
   var $err = null;        // Error object, passed to us as reference.
@@ -52,6 +57,7 @@ function __construct($fields, &$err) {
     $this->currency = $fields['currency'];
     $this->lang = $fields['lang'];
     if (!$this->lang) $this->lang = 'en';
+    $this->created_by_id = (int) $fields['created_by_id'];
     $this->err = $err;
 
     // Validate passed in parameters.
@@ -87,7 +93,7 @@ function register() {
     global $user;
 
     // Protection from too many recent bot registrations from user IP.
-    if (!$user->can('administer_site')) { // No problems for site admin.
+    if (!$this->created_by_id) { // No problems for logged in user (site admin).
       if ($this->registeredRecently()) {
         $this->err->add($i18n->get('error.access_denied'));
         return false;
@@ -103,6 +109,7 @@ function register() {
 
     // Create a new group.
     $this->group_id = $this->createGroup();
+    $this->org_id = $this->group_id;
     if (!$this->group_id) {
       $this->err->add($i18n->get('error.db'));
       return false;
@@ -121,8 +128,8 @@ function register() {
       return false;
     }
 
-    // Set created_by appropriately (admin or self).
-    $created_by = $user->can('administer_site') ? $user->id : $this->user_id;
+    // Set created_by appropriately.
+    $created_by = $this->created_by_id ? $this->created_by_id : $this->user_id;
     if (!$this->setCreatedBy($created_by))
       return false;
 
@@ -164,7 +171,7 @@ function createUser() {
     $email = $mdb2->quote($this->email);
     $created = 'now()';
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $values = "values($login, $password, $name, $this->group_id, $this->group_id, $this->role_id, $email, $created, $created_ip)";
+    $values = "values($login, $password, $name, $this->group_id, $this->org_id, $this->role_id, $email, $created, $created_ip)";
 
     $sql = 'insert into tt_users (login, password, name, group_id, org_id, role_id, email, created, created_ip) '.$values;
     $affected = $mdb2->exec($sql);
@@ -176,14 +183,14 @@ function createUser() {
   }
 
   // The setCreatedBy sets created_by field for both group and user to passed in user_id.
-  function setCreatedBy($user_id) {
+  private function setCreatedBy($user_id) {
     if ($this->err->yes()) return false; // There are errors, do not proceed.
 
     global $i18n;
     $mdb2 = getConnection();
 
     // Update group.
-    $sql = "update tt_groups set created_by = $user_id where id = $this->group_id";
+    $sql = "update tt_groups set created_by = $user_id where id = $this->group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
       $this->err->add($i18n->get('error.db'));
@@ -191,7 +198,7 @@ function setCreatedBy($user_id) {
     }
 
     // Update top manager.
-    $sql = "update tt_users set created_by = $user_id where id = $this->user_id and group_id = $this->group_id";
+    $sql = "update tt_users set created_by = $user_id where id = $this->user_id and group_id = $this->group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
       $this->err->add($i18n->get('error.db'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 67fbea434..fd5880c7d 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.12.4397 | 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.12.4398 | 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/admin_group_add.php b/admin_group_add.php
index 71dde8a08..e40be98e4 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -100,14 +100,13 @@
     'email' => $cl_manager_email,
     'group_name' => $cl_group_name,
     'currency' => CURRENCY_DEFAULT,
-    'lang' => $cl_lang);
+    'lang' => $cl_lang,
+    'created_by_id' => $user->id);
 
   // Create an instance of ttRegistrator class.
   import('ttRegistrator');
   $registrator = new ttRegistrator($fields, $err);
   $registrator->register();
-  // $registrator->setCreatedBy($user->id); // Override created_by to admin account.
-  // TODO: redo ttRegistrator class by passing in created_by_id in $fields to keep code straightforward.
   if ($err->no()) {
     header('Location: admin_groups.php');
     exit();

From bf2399f1315130312cc513cdd4efbcffaeb617d0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Nov 2018 22:18:20 +0000
Subject: [PATCH 0315/1848] Improved new export a bit by adding tasks to
 output.

---
 WEB-INF/lib/ttAdmin.class.php             | 12 +++++-
 WEB-INF/lib/ttGroupExportHelper.class.php | 48 ++++++++++++++++++++---
 WEB-INF/lib/ttOrgImportHelper.class.php   | 28 ++++++++-----
 WEB-INF/templates/footer.tpl              |  2 +-
 4 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 30c78f94b..23d8480d7 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -41,7 +41,17 @@ function __construct(&$err = null) {
 
   // getSubgroups rerurns an array of subgroups for a group.
   function getSubgroups($group_id) {
-    return array(); // TODO: not yet implemented.
+    $mdb2 = getConnection();
+
+    $subgroups = array();
+    $sql =  "select id from tt_groups where parent_id = $group_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $subgroups[] = $val;
+      }
+    }
+    return $subgroups;
   }
 
   // getUsers obtains user ids in a group.
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index af49e19e6..5338d2d46 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -42,6 +42,7 @@ class ttGroupExportHelper {
   // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
   var $userMap   = array(); // User ids.
   var $roleMap   = array(); // Role ids.
+  var $taskMap   = array(); // Task ids.
   var $clientMap = array(); // Client ids.
 
   // Constructor.
@@ -114,6 +115,24 @@ function getRoles() {
     return false;
   }
 
+  // getTasks - obtains all tasks defined for group.
+  function getTasks() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_tasks where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -138,15 +157,20 @@ function writeData() {
     foreach ($roles as $key=>$role_item)
       $this->roleMap[$role_item['id']] = $key + 1;
 
+    // Prepare task map.
+    $tasks = $this->getTasks();
+    foreach ($tasks as $key=>$task_item)
+      $this->taskMap[$task_item['id']] = $key + 1;
+
     // Prepare client map.
     $clients = ttTeamHelper::getAllClients($this->group_id, true);
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
     // Write roles.
-    fwrite($this->file, $this->indentation."<roles>\n");
+    fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
-      $role_part = $this->indentation.'  '."<role id=\"".$this->roleMap[$role['id']]."\"";
+      $role_part = $this->indentation.'    '."<role id=\"".$this->roleMap[$role['id']]."\"";
       $role_part .= " name=\"".htmlentities($role['name'])."\"";
       $role_part .= " description=\"".htmlentities($role['description'])."\"";
       $role_part .= " rank=\"".$role['rank']."\"";
@@ -155,13 +179,25 @@ function writeData() {
       $role_part .= "></role>\n";
       fwrite($this->file, $role_part);
     }
-    fwrite($this->file, $this->indentation."</roles>\n");
+    fwrite($this->file, $this->indentation."  </roles>\n");
+
+    // Write tasks.
+    fwrite($this->file, $this->indentation."  <tasks>\n");
+    foreach ($tasks as $task) {
+      $task_part = $this->indentation.'    '."<task id=\"".$this->taskMap[$task['id']]."\"";
+      $task_part .= " name=\"".htmlentities($task['name'])."\"";
+      $task_part .= " description=\"".htmlentities($task['description'])."\"";
+      $task_part .= " status=\"".$task['status']."\"";
+      $task_part .= "></task>\n";
+      fwrite($this->file, $task_part);
+    }
+    fwrite($this->file, $this->indentation."  </tasks>\n");
 
     // Write users.
-    fwrite($this->file, $this->indentation."<users>\n");
+    fwrite($this->file, $this->indentation."  <users>\n");
     foreach ($users as $user_item) {
       $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
-      $user_part = $this->indentation.'  '."<user id=\"".$this->userMap[$user_item['id']]."\"";
+      $user_part = $this->indentation.'    '."<user id=\"".$this->userMap[$user_item['id']]."\"";
       $user_part .= " name=\"".htmlentities($user_item['name'])."\"";
       $user_part .= " login=\"".htmlentities($user_item['login'])."\"";
       $user_part .= " password=\"".$user_item['password']."\"";
@@ -173,7 +209,7 @@ function writeData() {
       $user_part .= "></user>\n";
       fwrite($this->file, $user_part);
     }
-    fwrite($this->file, $this->indentation."</users>\n");
+    fwrite($this->file, $this->indentation."  </users>\n");
 
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ba1b120fe..015579c00 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
+import('ttRoleHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -37,10 +38,11 @@ class ttOrgImportHelper {
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).
-  var $current_parent_group_id = null; // Current parent group id as we parse the file.
+  var $current_group_id        = null; // Current group id during parsing.
+  var $current_parent_group_id = null; // Current parent group id during parsing.
                                        // Set when we create a new group.
-  // Entities for current group.
-  var $currentGroupRoles = array(); // Array of arrays of role properties.
+  // Entities for current group. -- Looks like they are not needed as we insert right away...
+  // var $currentGroupRoles = array(); // Array of arrays of role properties.
   // var $currentGroupUsers = array(); // Array of arrays of user properties.
 
   // Entity maps for current group. They map XML ids with database ids.
@@ -77,7 +79,7 @@ function startElement($parser, $name, $attrs) {
       // We are in second pass and can import data.
       if ($name == 'GROUP') {
         // Create a new group.
-        $group_id = $this->createGroup(array(
+        $this->current_group_id = $this->createGroup(array(
           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
@@ -87,13 +89,13 @@ function startElement($parser, $name, $attrs) {
 
         // Special handling for top group.
         if (!$this->org_id) {
-          $this->org_id = $group_id;
-          $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+          $this->org_id = $this->current_group_id;
+          $sql = "update tt_groups set org_id = $this->current_group_id where org_id is NULL and id = $this->current_group_id";
           $affected = $mdb2->exec($sql);
           // TODO: design a better error handling approach for the entire import process.
         }
         // Set current parent group.
-        $this->current_parent_group_id = $group_id;
+        $this->current_parent_group_id = $this->current_group_id;
       }
 
       if ($name == 'ROLES') {
@@ -108,8 +110,16 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'ROLE') {
         // We get here when processing a <role> tag for the current group.
-        // Add new role to $this->currentGroupRoles and a mapping to $this->currentGroupRoleMap.
-        $this->currentGroupRoles[$attrs['ID']] = $attrs;
+        $role_id = ttRoleHelper::insert(array(
+              'group_id' => $this->current_group_id,
+              'org_id' => $this->org_id,
+              'name' => $attrs['NAME'],
+              'description' => $attrs['DESCRIPTION'],
+              'rank' => $attrs['RANK'],
+              'rights' => $attrs['RIGHTS'],
+              'status' => $attrs['STATUS']));
+        // Add a mapping.
+        $this->currentGroupRoleMap[$attrs['ID']] = $role_id;
       }
     }
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fd5880c7d..9e7af7c95 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.12.4398 | 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.12.4399 | 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>

From da1736600c488f35a9b900a79ed4fe9b53d909a5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 12:12:17 +0000
Subject: [PATCH 0316/1848] Localized xml parsing error string.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 12 ++++++------
 WEB-INF/resources/ca.lang.php           |  1 +
 WEB-INF/resources/cs.lang.php           |  1 +
 WEB-INF/resources/da.lang.php           |  1 +
 WEB-INF/resources/de.lang.php           |  1 +
 WEB-INF/resources/en.lang.php           |  1 +
 WEB-INF/resources/es.lang.php           |  1 +
 WEB-INF/resources/et.lang.php           |  1 +
 WEB-INF/resources/fa.lang.php           |  1 +
 WEB-INF/resources/fi.lang.php           |  1 +
 WEB-INF/resources/fr.lang.php           |  1 +
 WEB-INF/resources/gr.lang.php           |  1 +
 WEB-INF/resources/he.lang.php           |  1 +
 WEB-INF/resources/hu.lang.php           |  1 +
 WEB-INF/resources/it.lang.php           |  1 +
 WEB-INF/resources/ja.lang.php           |  1 +
 WEB-INF/resources/ko.lang.php           |  1 +
 WEB-INF/resources/nl.lang.php           |  1 +
 WEB-INF/resources/no.lang.php           |  1 +
 WEB-INF/resources/pl.lang.php           |  1 +
 WEB-INF/resources/pt-br.lang.php        |  1 +
 WEB-INF/resources/pt.lang.php           |  1 +
 WEB-INF/resources/ro.lang.php           |  1 +
 WEB-INF/resources/ru.lang.php           |  1 +
 WEB-INF/resources/sk.lang.php           |  1 +
 WEB-INF/resources/sl.lang.php           |  1 +
 WEB-INF/resources/sr.lang.php           |  1 +
 WEB-INF/resources/sv.lang.php           |  1 +
 WEB-INF/resources/tr.lang.php           |  1 +
 WEB-INF/resources/zh-cn.lang.php        |  1 +
 WEB-INF/resources/zh-tw.lang.php        |  1 +
 WEB-INF/templates/footer.tpl            |  2 +-
 32 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 015579c00..57f221082 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -171,9 +171,9 @@ function importXml() {
     $file = fopen($filename, 'r');
     while ($data = fread($file, 4096)) {
       if (!xml_parse($parser, $data, feof($file))) {
-        $this->errors->add(sprintf("XML error: %s at line %d",
-          xml_error_string(xml_get_error_code($parser)),
-          xml_get_current_line_number($parser)));
+        $this->errors->add(sprintf($i18n->get('error.xml'),
+          xml_get_current_line_number($parser),
+          xml_error_string(xml_get_error_code($parser))));
       }
     }
     if ($this->conflicting_entities) {
@@ -199,9 +199,9 @@ function importXml() {
     $file = fopen($filename, 'r');
     while ($data = fread($file, 4096)) {
       if (!xml_parse($parser, $data, feof($file))) {
-        $this->errors->add(sprintf("XML error: %s at line %d",
-          xml_error_string(xml_get_error_code($parser)),
-          xml_get_current_line_number($parser)));
+        $this->errors->add(sprintf($i18n->get('error.xml'),
+          xml_get_current_line_number($parser),
+          xml_error_string(xml_get_error_code($parser))));
       }
     }
     xml_parser_free($parser);
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2a74077ea..5bfd796e9 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -116,6 +116,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 4d5937494..d407dccf6 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -118,6 +118,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 914bba6d9..f475e06f1 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -109,6 +109,7 @@
 'error.overlap' => 'Tidsinterval overlapper eksisterende poster.',
 'error.future_date' => 'Datoen er ud i fremtiden.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9e118e4ac..ea58b9a4e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -102,6 +102,7 @@
 'error.overlap' => 'Der Zeitinterval überschneidet sich mit vorhandenen Einträgen.',
 'error.future_date' => 'Datum ist in der Zukunft.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 16f61f22a..82059051e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -100,6 +100,7 @@
 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 'error.overlap' => 'Time interval overlaps with existing records.',
 'error.future_date' => 'Date is in future.',
+'error.xml' => 'Error in XML file at line %d: %s.',
 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 2ee7de8c3..740be1230 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -114,6 +114,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 86cde2a33..b9f784f73 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -119,6 +119,7 @@
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 55625a883..e6d54ee93 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -116,6 +116,7 @@
 'error.overlap' => 'بازه زمانی با سوابق موجود هم پوشانی دارد.',
 // TODO: translate the following.
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 36b4d0bd3..316b3f8f9 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -111,6 +111,7 @@
 'error.overlap' => 'Aikavälillä on päällekkäisiä syötteitä.',
 'error.future_date' => 'Aika on tulevaisuudessa.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6290479f2..529fc2da0 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -109,6 +109,7 @@
 'error.overlap' => 'Les heures des projets ne peuvent se chevaucher.',
 'error.future_date' => 'Date ultérieure.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f2de6f519..2b523141b 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -103,6 +103,7 @@
 'error.overlap' => 'Το χρονικό διάστημα επικαλύπτει υπάρχουσες καταχωρήσεις.',
 'error.future_date' => 'Η ημερομηνία είναι στο μέλλον.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 66cbea766..878e5ba9d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -126,6 +126,7 @@
 'error.overlap' => 'טווח הזמן מתנגש עם רישומים קיימים.',
 // TODO: translate the following.
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b740fe356..f98dffa13 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -115,6 +115,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5d0600aa1..07ed67c56 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -107,6 +107,7 @@
 'error.overlap' => 'Intervallo temporale sovrapposto a voci esistenti.',
 'error.future_date' => 'La data è nel futuro.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 6149e7c4b..0d077507c 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -120,6 +120,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index fa41f2ca0..0bc21ee8a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -119,6 +119,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8c4a5244c..02e0ab326 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -100,6 +100,7 @@
 'error.overlap' => 'De huidige registratie overlapt een reeds bestaande registratie.',
 'error.future_date' => 'Datum ligt in de toekomst.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 044a6f338..c7f0fe254 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -120,6 +120,7 @@
 // TODO: translate the following.
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c94ae1c95..ffc6d37bb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -113,6 +113,7 @@
 'error.overlap' => 'Okres czasowy nakłada się z istniejącymi wpisami.',
 'error.future_date' => 'Data jest w przyszłości.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f40b5f017..9b5bf7594 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -110,6 +110,7 @@
 'error.overlap' => 'O intervalo se sobrepõe com entradas já existentes.',
 'error.future_date' => 'Data é no futuro.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 4f7d748b9..e2e95a8a7 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -112,6 +112,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 82d5d3e6a..6840977e6 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -120,6 +120,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3974d1673..3354eaaae 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -99,6 +99,7 @@
 'error.goto_uncompleted' => 'Посмотреть неоконченную запись.',
 'error.overlap' => 'Интервал времени перекрывается с существующими записями.',
 'error.future_date' => 'Дата в будущем.',
+'error.xml' => 'Ошибка в файле XML на строке %d: %s.',
 'error.cannot_import' => 'Невозможно импортировать: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index cfca9b0a8..18fa470d1 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -115,6 +115,7 @@
 // TODO: translate the following.
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e07b20898..7f09aac45 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -109,6 +109,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6bc886a0a..890b8ee95 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -110,6 +110,7 @@
 'error.overlap' => 'Navedeni vremenski interval se podudara sa već unetim vremenom.',
 'error.future_date' => 'Naveli ste budući datum.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a646aab5e..d2e227dc5 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -107,6 +107,7 @@
 'error.overlap' => 'Tidsintervallet överlappar med en redan existerande tidsregistrering.',
 'error.future_date' => 'Det går inte att registrera tider framåt i tiden.',
 // TODO: translate the following.
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index eb4887542..7f34cb370 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -123,6 +123,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e37138ba3..96e43164c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -112,6 +112,7 @@
 // TODO: translate the following.
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f46f45627..8664f1934 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -117,6 +117,7 @@
 // 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 // 'error.overlap' => 'Time interval overlaps with existing records.',
 // 'error.future_date' => 'Date is in future.',
+// 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 
 // Labels for buttons.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9e7af7c95..3789b25cb 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.12.4399 | 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.12.4400 | 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>

From 310dc5d75dc9ee3edac18b362a71cee758376d53 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 13:08:22 +0000
Subject: [PATCH 0317/1848] Imporved error handling in new import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 31 ++++++++++++++-----------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 57f221082..991424e61 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -60,6 +60,7 @@ function __construct(&$errors) {
 
   // startElement - callback handler for opening tag of an XML element in the file.
   function startElement($parser, $name, $attrs) {
+    global $i18n;
 
     // First pass. We only check user logins for potential collisions with existing.
     if ($this->firstPass) {
@@ -73,7 +74,7 @@ function startElement($parser, $name, $attrs) {
     }
 
     // Second pass processing. We import data here, one tag at a time.
-    if (!$this->firstPass && $this->canImport) {
+    if (!$this->firstPass && $this->canImport && $this->errors->no()) {
       $mdb2 = getConnection();
 
       // We are in second pass and can import data.
@@ -88,28 +89,24 @@ function startElement($parser, $name, $attrs) {
         // We only have 3 properties at the moment, while work is ongoing...
 
         // Special handling for top group.
-        if (!$this->org_id) {
+        if (!$this->org_id && $this->current_group_id) {
           $this->org_id = $this->current_group_id;
           $sql = "update tt_groups set org_id = $this->current_group_id where org_id is NULL and id = $this->current_group_id";
           $affected = $mdb2->exec($sql);
-          // TODO: design a better error handling approach for the entire import process.
         }
-        // Set current parent group.
+        // Set parent group to create subgroups with this group as parent at next entry here.
         $this->current_parent_group_id = $this->current_group_id;
       }
 
       if ($name == 'ROLES') {
-        // If we get here, we have to recycle both $currentGroupRoles and $currentGroupRoleMap.
-        unset($this->currentGroupRoles);
+        // If we get here, we have to recycle $currentGroupRoleMap.
         unset($this->currentGroupRoleMap);
-        $this->currentGroupRoles = array();
         $this->currentGroupRoleMap = array();
-        // Both arrays are now empty.
-        // They will get reconstructed after processing of <role> elements in XML. See below.
+        // Role map is reconstructed after processing <role> elements in XML. See below.
       }
 
       if ($name == 'ROLE') {
-        // We get here when processing a <role> tag for the current group.
+        // We get here when processing <role> tags for the current group.
         $role_id = ttRoleHelper::insert(array(
               'group_id' => $this->current_group_id,
               'org_id' => $this->org_id,
@@ -118,8 +115,10 @@ function startElement($parser, $name, $attrs) {
               'rank' => $attrs['RANK'],
               'rights' => $attrs['RIGHTS'],
               'status' => $attrs['STATUS']));
-        // Add a mapping.
-        $this->currentGroupRoleMap[$attrs['ID']] = $role_id;
+        if ($role_id) {
+          // Add a mapping.
+          $this->currentGroupRoleMap[$attrs['ID']] = $role_id;
+        } else $this->errors->add($i18n->get('error.db'));
       }
     }
   }
@@ -189,6 +188,7 @@ function importXml() {
       unlink($filename);
       return;
     }
+    if ($this->errors->yes()) return; // Exit if we have errors.
 
     // Now we can do a second pass, where real work is done.
     $parser = xml_parser_create();
@@ -238,7 +238,7 @@ function uncompress($in, $out) {
   // createGroup function creates a new group.
   private function createGroup($fields) {
 
-    global $user;
+    global $i18n;
     $mdb2 = getConnection();
 
     $columns = '(parent_id, org_id, name, currency, lang)';
@@ -274,7 +274,10 @@ private function createGroup($fields) {
 
     $sql = 'insert into tt_groups '.$columns.$values;
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->errors->add($i18n->get('error.db'));
+      return false;
+    }
 
     $group_id = $mdb2->lastInsertID('tt_groups', 'id');
     return $group_id;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3789b25cb..45cd36fd7 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.12.4400 | 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.12.4401 | 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>

From 3b5e01059ad07bfc7ef7c07ba235a73a92ddc3f3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 13:43:14 +0000
Subject: [PATCH 0318/1848] Added importing of tasks in new import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 25 ++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 991424e61..3ccd3a665 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -28,6 +28,7 @@
 
 import('ttUserHelper');
 import('ttRoleHelper');
+import('ttTaskHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -46,7 +47,8 @@ class ttOrgImportHelper {
   // var $currentGroupUsers = array(); // Array of arrays of user properties.
 
   // Entity maps for current group. They map XML ids with database ids.
-  var $currentGroupRoleMap = array(); // Maps role ids from XML to their database ids.
+  var $currentGroupRoleMap = array();
+  var $currentGroupTaskMap = array();
   //var $userMap       = array(); // User ids.
   //var $projectMap    = array(); // Project ids.
   //var $taskMap       = array(); // Task ids.
@@ -120,6 +122,27 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupRoleMap[$attrs['ID']] = $role_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'TASKS') {
+        // If we get here, we have to recycle $currentGroupTaskMap.
+        unset($this->currentGroupTaskMap);
+        $this->currentGroupTaskMap = array();
+        // Task map is reconstructed after processing <task> elements in XML. See below.
+      }
+
+      if ($name == 'TASK') {
+        // We get here when processing <task> tags for the current group.
+        $task_id = ttTaskHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'description' => $attrs['DESCRIPTION'],
+          'status' => $attrs['STATUS']));
+        if ($task_id) {
+          // Add a mapping.
+          $this->currentGroupTaskMap[$attrs['ID']] = $task_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 45cd36fd7..92fda1f14 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.12.4401 | 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.12.4402 | 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>

From da106606ea1e1553b080bf4491188d92a436b990 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 14:07:30 +0000
Subject: [PATCH 0319/1848] Improved new export by adding projects in output.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 52 +++++++++++++++++++++--
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 5338d2d46..215414f64 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -40,10 +40,11 @@ class ttGroupExportHelper {
 
   // The following arrays are maps between entity ids in the file versus the database.
   // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
-  var $userMap   = array(); // User ids.
-  var $roleMap   = array(); // Role ids.
-  var $taskMap   = array(); // Task ids.
-  var $clientMap = array(); // Client ids.
+  var $userMap    = array(); // User ids.
+  var $roleMap    = array(); // Role ids.
+  var $taskMap    = array(); // Task ids.
+  var $projectMap = array(); // Project ids.
+  var $clientMap  = array(); // Client ids.
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
@@ -133,6 +134,24 @@ function getTasks() {
     return false;
   }
 
+  // getProjects - obtains all projects defined for group.
+  function getProjects() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_projects where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -162,6 +181,11 @@ function writeData() {
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
+    // Prepare project map.
+    $projects = $this->getProjects();
+    foreach ($projects as $key=>$project_item)
+      $this->projectMap[$project_item['id']] = $key + 1;
+
     // Prepare client map.
     $clients = ttTeamHelper::getAllClients($this->group_id, true);
     foreach ($clients as $key=>$client_item)
@@ -193,6 +217,26 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </tasks>\n");
 
+    // Write projects.
+    fwrite($this->file, $this->indentation."  <projects>\n");
+    foreach ($projects as $project_item) {
+      if($project_item['tasks']){
+        $tasks = explode(',', $project_item['tasks']);
+        $tasks_mapped = array();
+        foreach ($tasks as $item)
+          $tasks_mapped[] = $this->taskMap[$item];
+        $tasks_str = implode(',', $tasks_mapped);
+      }
+      $project_part = $this->indentation.'    '."<project id=\"".$this->projectMap[$project_item['id']]."\"";
+      $project_part .= " name=\"".htmlentities($project_item['name'])."\"";
+      $project_part .= " description=\"".htmlentities($project_item['description'])."\"";
+      $project_part .= " tasks=\"".$tasks_str."\"";
+      $project_part .= " status=\"".$project_item['status']."\"";
+      $project_part .= "></project>\n";
+      fwrite($this->file, $project_part);
+    }
+    fwrite($this->file, $this->indentation."  </projects>\n");
+
     // Write users.
     fwrite($this->file, $this->indentation."  <users>\n");
     foreach ($users as $user_item) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 92fda1f14..98575976c 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.12.4402 | 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.12.4403 | 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>

From 6bbd7742c4daa1b3d16e14cfb7f64c2b651a5362 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 14:29:51 +0000
Subject: [PATCH 0320/1848] Improved new import by adding projects.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 34 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 3ccd3a665..f8dbc523b 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -29,6 +29,7 @@
 import('ttUserHelper');
 import('ttRoleHelper');
 import('ttTaskHelper');
+import('ttProjectHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -47,8 +48,9 @@ class ttOrgImportHelper {
   // var $currentGroupUsers = array(); // Array of arrays of user properties.
 
   // Entity maps for current group. They map XML ids with database ids.
-  var $currentGroupRoleMap = array();
-  var $currentGroupTaskMap = array();
+  var $currentGroupRoleMap    = array();
+  var $currentGroupTaskMap    = array();
+  var $currentGroupProjectMap = array();
   //var $userMap       = array(); // User ids.
   //var $projectMap    = array(); // Project ids.
   //var $taskMap       = array(); // Task ids.
@@ -143,6 +145,34 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupTaskMap[$attrs['ID']] = $task_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'PROJECTS') {
+        // If we get here, we have to recycle $currentGroupProjectMap.
+        unset($this->currentGroupProjectMap);
+        $this->currentGroupProjectMap = array();
+        // Project map is reconstructed after processing <project> elements in XML. See below.
+      }
+
+      if ($name == 'PROJECT') {
+        // We get here when processing <project> tags for the current group.
+
+        // Prepare a list of task ids.
+        $tasks = explode(',', $attrs['TASKS']);
+        foreach ($tasks as $id)
+          $mapped_tasks[] = $this->currentGroupTaskMap[$id];
+
+        $project_id = ttProjectHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'description' => $attrs['DESCRIPTION'],
+          'tasks' => $mapped_tasks,
+          'status' => $attrs['STATUS']));
+        if ($project_id) {
+          // Add a mapping.
+          $this->currentGroupProjectMap[$attrs['ID']] = $project_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98575976c..b09112d37 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.12.4403 | 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.12.4404 | 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>

From d79a4bb229f2ce666fdb8d663e51e55e39a91827 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 14:53:37 +0000
Subject: [PATCH 0321/1848] Improved new export by adding clients in output.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 41 ++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 215414f64..054c43546 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -152,6 +152,24 @@ function getProjects() {
     return false;
   }
 
+  // getClients - obtains all clients defined for group.
+  function getClients() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_clients where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -187,7 +205,7 @@ function writeData() {
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare client map.
-    $clients = ttTeamHelper::getAllClients($this->group_id, true);
+    $clients = $this->getClients();
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
@@ -237,6 +255,27 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </projects>\n");
 
+    // Write clients.
+    fwrite($this->file, $this->indentation."  <clients>\n");
+    foreach ($clients as $client_item) {
+      if($client_item['projects']){
+        $projects_db = explode(',', $client_item['projects']);
+        $projects_mapped = array();
+        foreach ($projects_db as $item)
+          $projects_mapped[] = $this->projectMap[$item];
+        $projects_str = implode(',', $projects_mapped);
+      }
+      $client_part = $this->indentation.'    '."<client id=\"".$this->clientMap[$client_item['id']]."\"";
+      $client_part .= " name=\"".htmlentities($client_item['name'])."\"";
+      $client_part .= " address=\"".htmlentities($client_item['address'])."\"";
+      $client_part .= " tax=\"".$client_item['tax']."\"";
+      $client_part .= " projects=\"".$projects_str."\"";
+      $client_part .= " status=\"".$client_item['status']."\"";
+      $client_part .= "></client>\n";
+      fwrite($this->file, $client_part);
+    }
+    fwrite($this->file, $this->indentation."  </clients>\n");
+
     // Write users.
     fwrite($this->file, $this->indentation."  <users>\n");
     foreach ($users as $user_item) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b09112d37..4d6e74dad 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.12.4404 | 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.12.4405 | 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>

From a9354220ac7de34e59172d112884acab96f37538 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 15:17:30 +0000
Subject: [PATCH 0322/1848] Improved new import with integrating clients.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 36 +++++++++++++++++++++----
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index f8dbc523b..7c00f2543 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -30,6 +30,7 @@
 import('ttRoleHelper');
 import('ttTaskHelper');
 import('ttProjectHelper');
+import('ttClientHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -51,11 +52,7 @@ class ttOrgImportHelper {
   var $currentGroupRoleMap    = array();
   var $currentGroupTaskMap    = array();
   var $currentGroupProjectMap = array();
-  //var $userMap       = array(); // User ids.
-  //var $projectMap    = array(); // Project ids.
-  //var $taskMap       = array(); // Task ids.
-  //var $clientMap     = array(); // Client ids.
-  //var $invoiceMap    = array(); // Invoice ids.
+  var $currentGroupClientMap  = array();
 
   // Constructor.
   function __construct(&$errors) {
@@ -173,6 +170,35 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupProjectMap[$attrs['ID']] = $project_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'CLIENTS') {
+        // If we get here, we have to recycle $currentGroupClientMap.
+        unset($this->currentGroupClientMap);
+        $this->currentGroupClientMap = array();
+        // Client map is reconstructed after processing <client> elements in XML. See below.
+      }
+
+      if ($name == 'CLIENT') {
+        // We get here when processing <client> tags for the current group.
+
+        // Prepare a list of project ids.
+        $projects = explode(',', $attrs['PROJECTS']);
+        foreach ($projects as $id)
+          $mapped_projects[] = $this->currentGroupProjectMap[$id];
+
+        $client_id = ttClientHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'address' => $attrs['ADDRESS'],
+          'tax' => $attrs['TAX'],
+          'projects' => $mapped_projects,
+          'status' => $attrs['STATUS']));
+        if ($client_id) {
+          // Add a mapping.
+          $this->currentGroupClientMap[$attrs['ID']] = $client_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4d6e74dad..d4275c187 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.12.4405 | 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.12.4406 | 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>

From b0cd6a547ce6a16f0f26667016efce5b66211e54 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 15:57:09 +0000
Subject: [PATCH 0323/1848] Added users to new import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 36 ++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 7c00f2543..6519ffaee 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -44,19 +44,19 @@ class ttOrgImportHelper {
   var $current_group_id        = null; // Current group id during parsing.
   var $current_parent_group_id = null; // Current parent group id during parsing.
                                        // Set when we create a new group.
-  // Entities for current group. -- Looks like they are not needed as we insert right away...
-  // var $currentGroupRoles = array(); // Array of arrays of role properties.
-  // var $currentGroupUsers = array(); // Array of arrays of user properties.
+  var $top_role_id    = 0;       // Top role id.
 
   // Entity maps for current group. They map XML ids with database ids.
   var $currentGroupRoleMap    = array();
   var $currentGroupTaskMap    = array();
   var $currentGroupProjectMap = array();
   var $currentGroupClientMap  = array();
+  var $currentGroupUserMap    = array();
 
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
+    $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
   }
 
   // startElement - callback handler for opening tag of an XML element in the file.
@@ -199,6 +199,36 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupClientMap[$attrs['ID']] = $client_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'USERS') {
+        // If we get here, we have to recycle $currentGroupUserMap.
+        unset($this->currentGroupUserMap);
+        $this->currentGroupUserMap = array();
+        // User map is reconstructed after processing <user> elements in XML. See below.
+      }
+
+      if ($name == 'USER') {
+        // We get here when processing <user> tags for the current group.
+
+        $role_id = $attrs['ROLE_ID'] === '0' ? $this->top_role_id :  $this->currentGroupRoleMap[$attrs['ROLE_ID']]; // 0 (not null) means top manager role.
+
+        $user_id = ttUserHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'role_id' => $role_id,
+          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'name' => $attrs['NAME'], // TODO: check if we need to decode all such things from htmlentities back. Refactor from the beginning if necessary.
+          'login' => $attrs['LOGIN'],
+          'password' => $attrs['PASSWORD'],
+          'rate' => $attrs['RATE'],
+          'email' => $attrs['EMAIL'],
+          'status' => $attrs['STATUS']), false);
+        // TODO: what about created_by and other audit info?
+        if ($user_id) {
+          // Add a mapping.
+          $this->currentGroupUserMap[$attrs['ID']] = $user_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d4275c187..f9a335067 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.12.4406 | 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.12.4407 | 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>

From 414ac81236ce044edc1ee194e58238d3a216c934 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 18:15:11 +0000
Subject: [PATCH 0324/1848] Improved new export-import by including all group
 attributes.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 19 ++++++++++--
 WEB-INF/lib/ttOrgImportHelper.class.php   | 37 +++++++++++++++--------
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 054c43546..4a2eb7859 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -71,7 +71,7 @@ function getGroupData() {
     global $user;
     $mdb2 = getConnection();
 
-    $sql =  "select name, currency, lang from tt_groups".
+    $sql =  "select * from tt_groups".
             " where status = 1 and id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -177,8 +177,23 @@ function writeData() {
     $group = $this->getGroupData();
     $group_part = "<group name=\"".htmlentities($group['name'])."\"";
     $group_part .= " currency=\"".htmlentities($group['currency'])."\"";
+    $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";
-    // TODO: add other group attributes here.
+    $group_part .= " date_format=\"".$group['date_format']."\"";
+    $group_part .= " time_format=\"".$group['time_format']."\"";
+    $group_part .= " week_start=\"".$group['week_start']."\"";
+    $group_part .= " tracking_mode=\"".$group['tracking_mode']."\"";
+    $group_part .= " project_required=\"".$group['project_required']."\"";
+    $group_part .= " task_required=\"".$group['task_required']."\"";
+    $group_part .= " record_type=\"".$group['record_type']."\"";
+    $group_part .= " bcc_email=\"".$group['bcc_email']."\"";
+    $group_part .= " allow_ip=\"".$group['allow_ip']."\"";
+    $group_part .= " password_complexity=\"".$group['password_complexity']."\"";
+    $group_part .= " plugins=\"".$group['plugins']."\"";
+    $group_part .= " lock_spec=\"".$group['lock_spec']."\"";
+    $group_part .= " workday_minutes=\"".$group['workday_minutes']."\"";
+    $group_part .= " custom_logo=\"".$group['custom_logo']."\"";
+    $group_part .= " config=\"".$group['config']."\"";
     $group_part .= ">\n";
 
     // Write group info.
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 6519ffaee..06d205e6a 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -86,8 +86,23 @@ function startElement($parser, $name, $attrs) {
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'currency' => $attrs['CURRENCY'],
-          'lang' => $attrs['LANG']));
-        // We only have 3 properties at the moment, while work is ongoing...
+          'decimal_mark' => $attrs['DECIMAL_MARK'],
+          'lang' => $attrs['LANG'],
+          'date_format' => $attrs['DATE_FORMAT'],
+          'time_format' => $attrs['TIME_FORMAT'],
+          'week_start' => $attrs['WEEK_START'],
+          'tracking_mode' => $attrs['TRACKING_MODE'],
+          'project_required' => $attrs['PROJECT_REQUIRED'],
+          'task_required' => $attrs['TASK_REQUIRED'],
+          'record_type' => $attrs['RECORD_TYPE'],
+          'bcc_email' => $attrs['BCC_EMAIL'],
+          'allow_ip' => $attrs['ALLOW_IP'],
+          'password_complexity' => $attrs['PASSWORD_COMPLEXITY'],
+          'plugins' => $attrs['PLUGINS'],
+          'lock_spec' => $attrs['LOCK_SPEC'],
+          'workday_minutes' => $attrs['WORKDAY_MINUTES'],
+          'custom_logo' => $attrs['CUSTOM_LOGO'],
+          'config' => $attrs['CONFIG']));
 
         // Special handling for top group.
         if (!$this->org_id && $this->current_group_id) {
@@ -217,7 +232,7 @@ function startElement($parser, $name, $attrs) {
           'org_id' => $this->org_id,
           'role_id' => $role_id,
           'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
-          'name' => $attrs['NAME'], // TODO: check if we need to decode all such things from htmlentities back. Refactor from the beginning if necessary.
+          'name' => $attrs['NAME'],
           'login' => $attrs['LOGIN'],
           'password' => $attrs['PASSWORD'],
           'rate' => $attrs['RATE'],
@@ -346,24 +361,22 @@ function uncompress($in, $out) {
 
   // createGroup function creates a new group.
   private function createGroup($fields) {
-
+    global $user;
     global $i18n;
     $mdb2 = getConnection();
 
-    $columns = '(parent_id, org_id, name, currency, lang)';
-
-//    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
-//      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
-//      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
+    $columns = '(parent_id, org_id, name, currency, decimal_mark, lang, date_format, time_format'.
+      ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
+      ', allow_ip, password_complexity, plugins, lock_spec'.
+      ', workday_minutes, config, created, created_ip, created_by)';
 
     $values = ' values (';
     $values .= $mdb2->quote($fields['parent_id']);
     $values .= ', '.$mdb2->quote($fields['org_id']);
     $values .= ', '.$mdb2->quote(trim($fields['name']));
     $values .= ', '.$mdb2->quote(trim($fields['currency']));
-    //$values .= ', '.$mdb2->quote($fields['decimal_mark']);
+    $values .= ', '.$mdb2->quote($fields['decimal_mark']);
     $values .= ', '.$mdb2->quote($fields['lang']);
-/*
     $values .= ', '.$mdb2->quote($fields['date_format']);
     $values .= ', '.$mdb2->quote($fields['time_format']);
     $values .= ', '.(int)$fields['week_start'];
@@ -378,7 +391,7 @@ private function createGroup($fields) {
     $values .= ', '.$mdb2->quote($fields['lock_spec']);
     $values .= ', '.(int)$fields['workday_minutes'];
     $values .= ', '.$mdb2->quote($fields['config']);
-    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id); */
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
     $values .= ')';
 
     $sql = 'insert into tt_groups '.$columns.$values;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f9a335067..931ae5f1d 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.12.4407 | 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.12.4408 | 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>

From b06601362567c117bdc889277d554c8c58f0efdc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 20:27:17 +0000
Subject: [PATCH 0325/1848] Improved new export-import by including user to
 project binds.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 15 +++++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 13 ++++++++++++-
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 4a2eb7859..125df0ff0 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -309,6 +309,21 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </users>\n");
 
+    // Write user to project binds.
+    fwrite($this->file, $this->indentation."  <user_project_binds>\n");
+    $user_binds = ttTeamHelper::getUserToProjectBinds($this->group_id);
+    foreach ($user_binds as $bind) {
+      $user_id = $this->userMap[$bind['user_id']];
+      $project_id = $this->projectMap[$bind['project_id']];
+      $bind_part = $this->indentation.'    '."<user_project_bind user_id=\"".$user_id."\"";
+      $bind_part .= " project_id=\"".$project_id."\"";
+      $bind_part .= " rate=\"".$bind['rate']."\"";
+      $bind_part .= " status=\"".$bind['status']."\"";
+      $bind_part .= "></user_project_bind>\n";
+      fwrite($this->file, $bind_part);
+    }
+    fwrite($this->file, $this->indentation."  </user_project_binds>\n");
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 06d205e6a..ccdc05b20 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -238,12 +238,23 @@ function startElement($parser, $name, $attrs) {
           'rate' => $attrs['RATE'],
           'email' => $attrs['EMAIL'],
           'status' => $attrs['STATUS']), false);
-        // TODO: what about created_by and other audit info?
         if ($user_id) {
           // Add a mapping.
           $this->currentGroupUserMap[$attrs['ID']] = $user_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'USER_PROJECT_BIND') {
+        if (!ttUserHelper::insertBind(array(
+          'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'rate' => $attrs['RATE'],
+          'status' => $attrs['STATUS']))) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 931ae5f1d..cff882273 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.12.4408 | 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.12.4409 | 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>

From e88a31092d2dbcd535a1704ed4410e92ca3be914 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 21:20:54 +0000
Subject: [PATCH 0326/1848] Improved new export-import by adding invoices.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 19 ++++++++++++++++++
 WEB-INF/lib/ttImportHelper.class.php      |  1 -
 WEB-INF/lib/ttOrgImportHelper.class.php   | 24 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 125df0ff0..91a36ce97 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -45,6 +45,7 @@ class ttGroupExportHelper {
   var $taskMap    = array(); // Task ids.
   var $projectMap = array(); // Project ids.
   var $clientMap  = array(); // Client ids.
+  var $invoiceMap = array(); // Invoice ids.
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
@@ -224,6 +225,11 @@ function writeData() {
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
+    // Prepare invoice map.
+    $invoices = ttTeamHelper::getAllInvoices();
+    foreach ($invoices as $key=>$invoice_item)
+      $this->invoiceMap[$invoice_item['id']] = $key + 1;
+
     // Write roles.
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
@@ -324,6 +330,19 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </user_project_binds>\n");
 
+    // Write invoices.
+    fwrite($this->file, $this->indentation."  <invoices>\n");
+    foreach ($invoices as $invoice_item) {
+      $invoice_part = $this->indentation.'    '."<invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\"";
+      $invoice_part .= " name=\"".htmlentities($invoice_item['name'])."\"";
+      $invoice_part .= " date=\"".$invoice_item['date']."\"";
+      $invoice_part .= " client_id=\"".$this->clientMap[$invoice_item['client_id']]."\"";
+      $invoice_part .= " status=\"".$invoice_item['status']."\"";
+      $invoice_part .= "></invoice>\n";
+      fwrite($this->file, $invoice_part);
+    }
+    fwrite($this->file, $this->indentation."  </invoices>\n");
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index ea899821a..7fa1e2830 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -247,7 +247,6 @@ function endElement($parser, $name) {
           'name' => $this->currentElement['NAME'],
           'date' => $this->currentElement['DATE'],
           'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-          'discount' => $this->currentElement['DISCOUNT'],
           'status' => $this->currentElement['STATUS']));
     }
 
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ccdc05b20..015668807 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -31,6 +31,7 @@
 import('ttTaskHelper');
 import('ttProjectHelper');
 import('ttClientHelper');
+import('ttInvoiceHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -52,6 +53,7 @@ class ttOrgImportHelper {
   var $currentGroupProjectMap = array();
   var $currentGroupClientMap  = array();
   var $currentGroupUserMap    = array();
+  var $currentGroupInvoiceMap = array();
 
   // Constructor.
   function __construct(&$errors) {
@@ -255,6 +257,28 @@ function startElement($parser, $name, $attrs) {
           $this->errors->add($i18n->get('error.db'));
         }
       }
+
+      if ($name == 'INVOICES') {
+        // If we get here, we have to recycle $currentGroupInvoiceMap.
+        unset($this->currentGroupInvoiceMap);
+        $this->currentGroupInvoiceMap = array();
+        // Invoice map is reconstructed after processing <invoice> elements in XML. See below.
+      }
+
+      if ($name == 'INVOICE') {
+        // We get here when processing <invoice> tags for the current group.
+        $invoice_id = ttInvoiceHelper::insert(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'date' => $attrs['DATE'],
+          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'status' => $attrs['STATUS']));
+        if ($invoice_id) {
+          // Add a mapping.
+          $this->currentGroupInvoiceMap[$attrs['ID']] = $invoice_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cff882273..8995b12b2 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.12.4409 | 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.12.4410 | 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>

From 56f1fd19f2c9c72878395b3275f03f192ccca082 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Nov 2018 23:02:08 +0000
Subject: [PATCH 0327/1848] Improved new export-import by adding time log.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 30 +++++++++++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 32 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 91a36ce97..fecfba8a8 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -46,6 +46,7 @@ class ttGroupExportHelper {
   var $projectMap = array(); // Project ids.
   var $clientMap  = array(); // Client ids.
   var $invoiceMap = array(); // Invoice ids.
+  var $logMap     = array(); // Time log ids.
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
@@ -343,6 +344,35 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </invoices>\n");
 
+    // Write time log entries and build logMap at the same time.
+    fwrite($this->file, $this->indentation."  <log>\n");
+    $key = 0;
+    foreach ($users as $user_item) {
+      $records = ttTimeHelper::getAllRecords($user_item['id']);
+      foreach ($records as $record) {
+        $key++;
+        $this->logMap[$record['id']] = $key;
+        $log_part = $this->indentation.'    '."<log_item id=\"$key\"";
+        $log_part .= " user_id=\"".$this->userMap[$record['user_id']]."\"";
+        $log_part .= " date=\"".$record['date']."\"";
+        $log_part .= " start=\"".$record['start']."\"";
+        $log_part .= " finish=\"".$record['finish']."\"";
+        $log_part .= " duration=\"".($record['start']?"":$record['duration'])."\"";
+        $log_part .= " client_id=\"".$this->clientMap[$record['client_id']]."\"";
+        $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\"";
+        $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
+        $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
+        $log_part .= " comment=\"".htmlentities($record['comment'])."\"";
+        $log_part .= " billable=\"".$record['billable']."\"";
+        $log_part .= " paid=\"".$record['paid']."\"";
+        $log_part .= " status=\"".$record['status']."\"";
+        $log_part .= "></log_item>\n";
+        fwrite($this->file, $log_part);
+      }
+    }
+    fwrite($this->file, $this->indentation."  </log>\n");
+    unset($records);
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 015668807..622b3fec5 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -54,6 +54,7 @@ class ttOrgImportHelper {
   var $currentGroupClientMap  = array();
   var $currentGroupUserMap    = array();
   var $currentGroupInvoiceMap = array();
+  var $currentGroupLogMap     = array();
 
   // Constructor.
   function __construct(&$errors) {
@@ -279,6 +280,37 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupInvoiceMap[$attrs['ID']] = $invoice_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'LOG') {
+        // If we get here, we have to recycle $currentGroupLogMap.
+        unset($this->currentGroupLogMap);
+        $this->currentGroupLogMap = array();
+        // Log map is reconstructed after processing <log_item> elements in XML. See below.
+      }
+
+      if ($name == 'LOG_ITEM') {
+        // We get here when processing <log_item> tags for the current group.
+        $log_item_id = ttTimeHelper::insert(array(
+          'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'date' => $attrs['DATE'],
+          'start' => $attrs['START'],
+          'finish' => $attrs['FINISH'],
+          'duration' => $attrs['DURATION'],
+          'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
+          'invoice' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+          'note' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
+          'billable' => $attrs['BILLABLE'],
+          'paid' => $attrs['PAID'],
+          'status' => $attrs['STATUS']));
+        if ($log_item_id) {
+          // Add a mapping.
+          $this->currentGroupLogMap[$attrs['ID']] = $log_item_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8995b12b2..a93f706aa 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.12.4410 | 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.12.4411 | 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>

From bf300dab88607ee209b83f16a6915bb9d61787bb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 12:15:22 +0000
Subject: [PATCH 0328/1848] Added custom fields to new export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 40 +++++++++++++++++++----
 WEB-INF/lib/ttOrgImportHelper.class.php   | 25 ++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index fecfba8a8..1b7e74a75 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -40,13 +40,15 @@ class ttGroupExportHelper {
 
   // The following arrays are maps between entity ids in the file versus the database.
   // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
-  var $userMap    = array(); // User ids.
-  var $roleMap    = array(); // Role ids.
-  var $taskMap    = array(); // Task ids.
-  var $projectMap = array(); // Project ids.
-  var $clientMap  = array(); // Client ids.
-  var $invoiceMap = array(); // Invoice ids.
-  var $logMap     = array(); // Time log ids.
+  var $userMap    = array();
+  var $roleMap    = array();
+  var $taskMap    = array();
+  var $projectMap = array();
+  var $clientMap  = array();
+  var $invoiceMap = array();
+  var $logMap     = array();
+  var $customFieldMap = array();
+  var $customFieldOptionMap = array();
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
@@ -231,6 +233,16 @@ function writeData() {
     foreach ($invoices as $key=>$invoice_item)
       $this->invoiceMap[$invoice_item['id']] = $key + 1;
 
+    // Prepare custom fields map.
+    $custom_fields = ttTeamHelper::getAllCustomFields($this->group_id);
+    foreach ($custom_fields as $key=>$custom_field)
+      $this->customFieldMap[$custom_field['id']] = $key + 1;
+
+    // Prepare custom field options map.
+    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($this->group_id);
+    foreach ($custom_field_options as $key=>$option)
+      $this->customFieldOptionMap[$option['id']] = $key + 1;
+
     // Write roles.
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
@@ -373,6 +385,20 @@ function writeData() {
     fwrite($this->file, $this->indentation."  </log>\n");
     unset($records);
 
+    // Write custom fields.
+    fwrite($this->file, $this->indentation."  <custom_fields>\n");
+    foreach ($custom_fields as $custom_field) {
+      $custom_field_part = $this->indentation.'    '."<custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\"";
+      $custom_field_part .= " type=\"".$custom_field['type']."\"";
+      $custom_field_part .= " label=\"".htmlentities($custom_field['label'])."\"";
+      $custom_field_part .= " required=\"".$custom_field['required']."\"";
+      $custom_field_part .= " status=\"".$custom_field['status']."\"";
+      $custom_field_part .= "></custom_field>\n";
+      fwrite($this->file, $custom_field_part);
+    }
+    fwrite($this->file, $this->indentation."  </custom_fields>\n");
+    unset($custom_fields);
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 622b3fec5..2cb693445 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -32,6 +32,7 @@
 import('ttProjectHelper');
 import('ttClientHelper');
 import('ttInvoiceHelper');
+import('ttCustomFieldHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -55,6 +56,8 @@ class ttOrgImportHelper {
   var $currentGroupUserMap    = array();
   var $currentGroupInvoiceMap = array();
   var $currentGroupLogMap     = array();
+  var $currentGroupCustomFieldMap = array();
+  var $currentGroupCustomFieldOptionMap = array();
 
   // Constructor.
   function __construct(&$errors) {
@@ -311,6 +314,28 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupLogMap[$attrs['ID']] = $log_item_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'CUSTOM_FIELDS') {
+        // If we get here, we have to recycle $currentGroupCustomFieldMap.
+        unset($this->currentGroupCustomFieldMap);
+        $this->currentGroupCustomFieldMap = array();
+        // Custom field map is reconstructed after processing <custom_field> elements in XML. See below.
+      }
+
+      if ($name == 'CUSTOM_FIELD') {
+        // We get here when processing <custom_field> tags for the current group.
+        $custom_field_id = ttCustomFieldHelper::insertField(array(
+          'group_id' => $this->current_group_id,
+          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          'type' => $attrs['TYPE'],
+          'label' => $attrs['LABEL'],
+          'required' => $attrs['REQUIRED'],
+          'status' => $attrs['STATUS']));
+        if ($custom_field_id) {
+          // Add a mapping.
+          $this->currentGroupCustomFieldMap[$attrs['ID']] = $custom_field_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a93f706aa..4e17b95e5 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.12.4411 | 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.12.4412 | 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>

From 77f0fbc75930d7d2f9a3d3acadb64be44b871621 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 13:25:11 +0000
Subject: [PATCH 0329/1848] Improved new export-import by adding custom field
 options.

---
 .gitignore                                |  1 +
 WEB-INF/lib/ttGroupExportHelper.class.php | 12 ++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 20 ++++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9bfa047e7..dc348cfac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 config.php
 WEB-INF/templates_c/*.*
+WEB-INF/templates_c/import_*
 WEB-INF/lib/tcpdf/
 nbproject/
 upload/
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 1b7e74a75..f1ea228d1 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -399,6 +399,18 @@ function writeData() {
     fwrite($this->file, $this->indentation."  </custom_fields>\n");
     unset($custom_fields);
 
+    // Write custom field options.
+    fwrite($this->file, $this->indentation."  <custom_field_options>\n");
+    foreach ($custom_field_options as $option) {
+      $custom_field_option_part = $this->indentation.'    '."<custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\"";
+      $custom_field_option_part .= " field_id=\"".$this->customFieldMap[$option['field_id']]."\"";
+      $custom_field_option_part .= " value=\"".htmlentities($option['value'])."\"";
+      $custom_field_option_part .= "></custom_field_option>\n";
+      fwrite($this->file, $custom_field_option_part);
+    }
+    fwrite($this->file, $this->indentation."  </custom_field_options>\n");
+    unset($custom_field_options);
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 2cb693445..9c39810f2 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -336,6 +336,26 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupCustomFieldMap[$attrs['ID']] = $custom_field_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'CUSTOM_FIELD_OPTIONS') {
+        // If we get here, we have to recycle $currentGroupCustomFieldOptionMap.
+        unset($this->currentGroupCustomFieldOptionMap);
+        $this->currentGroupCustomFieldOptionMap = array();
+        // Custom field option map is reconstructed after processing <custom_field_option> elements in XML. See below.
+      }
+
+      if ($name == 'CUSTOM_FIELD_OPTION') {
+        // We get here when processing <custom_field_option> tags for the current group.
+        $custom_field_option_id = ttCustomFieldHelper::insertOption(array(
+          // 'group_id' => $this->current_group_id, TODO: add this when group_id field is added to the table.
+          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          'field_id' => $this->currentGroupCustomFieldMap[$attrs['FIELD_ID']],
+          'value' => $attrs['VALUE']));
+        if ($custom_field_option_id) {
+          // Add a mapping.
+          $this->currentGroupCustomFieldOptionMap[$attrs['ID']] = $custom_field_option_id;
+        } else $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4e17b95e5..bd9cdf511 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.12.4412 | 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.12.4413 | 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>

From 6ede4ba89cf66620bd1c40d092b3518fd51ba69c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 13:58:21 +0000
Subject: [PATCH 0330/1848] Integrated custom field log in new export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 15 +++++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 14 ++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index f1ea228d1..aba161f6c 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -411,6 +411,21 @@ function writeData() {
     fwrite($this->file, $this->indentation."  </custom_field_options>\n");
     unset($custom_field_options);
 
+    // Write custom field log.
+    $custom_field_log = ttTeamHelper::getCustomFieldLog($this->group_id);
+    fwrite($this->file, $this->indentation."  <custom_field_log>\n");
+    foreach ($custom_field_log as $entry) {
+      $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
+      $custom_field_log_part .= " field_id=\"".$this->customFieldMap[$entry['field_id']]."\"";
+      $custom_field_log_part .= " option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\"";
+      $custom_field_log_part .= " value=\"".htmlentities($entry['value'])."\"";
+      $custom_field_log_part .= " status=\"".$entry['status']."\"";
+      $custom_field_log_part .= "></custom_field_log_entry>\n";
+      fwrite($this->file, $custom_field_log_part);
+    }
+    fwrite($this->file, $this->indentation."  </custom_field_log>\n");
+    unset($custom_field_log);
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 9c39810f2..17827986c 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -356,6 +356,20 @@ function startElement($parser, $name, $attrs) {
           $this->currentGroupCustomFieldOptionMap[$attrs['ID']] = $custom_field_option_id;
         } else $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'CUSTOM_FIELD_LOG_ENTRY') {
+        // We get here when processing <custom_field_log_entry> tags for the current group.
+        if (!ttCustomFieldHelper::insertLogEntry(array(
+          // 'group_id' => $this->current_group_id, TODO: add this when group_id field is added to the table.
+          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          'log_id' => $this->currentGroupLogMap[$attrs['LOG_ID']],
+          'field_id' => $this->currentGroupCustomFieldMap[$attrs['FIELD_ID']],
+          'option_id' => $this->currentGroupCustomFieldOptionMap[$attrs['OPTION_ID']],
+          'value' => $attrs['VALUE'],
+          'status' => $attrs['STATUS']))) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bd9cdf511..b8cedad7c 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.12.4413 | 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.12.4414 | 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>

From b5c16658c0a91c98bb4e41bb6c0e1cc254222a68 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 14:39:41 +0000
Subject: [PATCH 0331/1848] Integrated expense items in new export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 19 +++++++++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 18 ++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index aba161f6c..e18f8c9f4 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -426,6 +426,25 @@ function writeData() {
     fwrite($this->file, $this->indentation."  </custom_field_log>\n");
     unset($custom_field_log);
 
+    // Write expense items.
+    $expense_items = ttTeamHelper::getExpenseItems($this->group_id);
+    fwrite($this->file, $this->indentation."  <expense_items>\n");
+    foreach ($expense_items as $expense_item) {
+      $expense_item_part = $this->indentation.'    '."<expense_item date=\"".$expense_item['date']."\"";
+      $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
+      $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
+      $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
+      $expense_item_part .= " name=\"".htmlentities($expense_item['name'])."\"";
+      $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
+      $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
+      $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
+      $expense_item_part .= " status=\"".$expense_item['status']."\"";
+      $expense_item_part .= "></expense_item>\n";
+      fwrite($this->file, $expense_item_part);
+    }
+    fwrite($this->file, $this->indentation."  </expense_items>\n");
+    unset($expense_items);
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 17827986c..89428c4c9 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -33,6 +33,7 @@
 import('ttClientHelper');
 import('ttInvoiceHelper');
 import('ttCustomFieldHelper');
+import('ttExpenseHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -370,6 +371,23 @@ function startElement($parser, $name, $attrs) {
           $this->errors->add($i18n->get('error.db'));
         }
       }
+
+      if ($name == 'EXPENSE_ITEM') {
+        // We get here when processing <expense_item> tags for the current group.
+        $expense_item_id = ttExpenseHelper::insert(array(
+          'date' => $attrs['DATE'],
+          'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'group_id' => $this->current_group_id,
+          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'name' => $attrs['NAME'],
+          'cost' => $attrs['COST'],
+          'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+          'paid' => $attrs['PAID'],
+          'status' => $attrs['STATUS']));
+        if (!$expense_item_id) $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b8cedad7c..dbce25f8c 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.12.4414 | 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.12.4415 | 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>

From a4298d704504e90da27dfdae71aaf6cc2faa9844 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 15:09:54 +0000
Subject: [PATCH 0332/1848] Added monthly quotas to new export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 12 ++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 18 ++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index e18f8c9f4..b1aa35c03 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -445,6 +445,18 @@ function writeData() {
     fwrite($this->file, $this->indentation."  </expense_items>\n");
     unset($expense_items);
 
+    // Write monthly quotas.
+    $quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
+    fwrite($this->file, $this->indentation."  <monthly_quotas>\n");
+    foreach ($quotas as $quota) {
+      $quota_part = $this->indentation.'    '."<monthly_quota year=\"".$quota['year']."\"";
+      $quota_part .= " month=\"".$quota['month']."\"";
+      $quota_part .= " minutes=\"".$quota['minutes']."\"";
+      $quota_part .= "></monthly_quota>\n";
+      fwrite($this->file, $quota_part);
+    }
+    fwrite($this->file, $this->indentation."  </monthly_quotas>\n");
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 89428c4c9..cc632f180 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -388,6 +388,16 @@ function startElement($parser, $name, $attrs) {
           'status' => $attrs['STATUS']));
         if (!$expense_item_id) $this->errors->add($i18n->get('error.db'));
       }
+
+      if ($name == 'MONTHLY_QUOTA') {
+        if (!$this->insertMonthlyQuota($this->current_group_id,
+          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          $attrs['YEAR'],
+          $attrs['MONTH'],
+          $attrs['MINUTES'])) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+      }
     }
   }
 
@@ -548,4 +558,12 @@ private function createGroup($fields) {
     $group_id = $mdb2->lastInsertID('tt_groups', 'id');
     return $group_id;
   }
+
+  // insertMonthlyQuota - a helper function to insert a monthly quota.
+  private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
+    $mdb2 = getConnection();
+    $sql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dbce25f8c..338b37b45 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.12.4415 | 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.12.4416 | 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>

From 67c8fa59139659b2da15c560dd10d18601ab311f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 15:56:52 +0000
Subject: [PATCH 0333/1848] Added fav reports to new export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 46 +++++++++++++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 40 ++++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index b1aa35c03..17d40435a 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -457,6 +457,52 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </monthly_quotas>\n");
 
+    // Write fav reports.
+    $fav_reports = ttTeamHelper::getFavReports($this->group_id);
+    fwrite($this->file, $this->indentation."  <fav_reports>\n");
+    foreach ($fav_reports as $fav_report) {
+      $user_list = '';
+      if (strlen($fav_report['users']) > 0) {
+        $arr = explode(',', $fav_report['users']);
+        foreach ($arr as $k=>$v) {
+          if (array_key_exists($arr[$k], $this->userMap))
+            $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
+        }
+      }
+      $fav_report_part = $this->indentation.'    '."<fav_report user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
+      $fav_report_part .= " name=\"".htmlentities($fav_report['name'])."\"";
+      $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
+      $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"";
+      $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
+      $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
+      $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
+      $fav_report_part .= " users=\"".$user_list."\"";
+      $fav_report_part .= " period=\"".$fav_report['period']."\"";
+      $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
+      $fav_report_part .= " period_end=\"".$fav_report['period_end']."\"";
+      $fav_report_part .= " show_client=\"".$fav_report['show_client']."\"";
+      $fav_report_part .= " show_invoice=\"".$fav_report['show_invoice']."\"";
+      $fav_report_part .= " show_paid=\"".$fav_report['show_paid']."\"";
+      $fav_report_part .= " show_ip=\"".$fav_report['show_ip']."\"";
+      $fav_report_part .= " show_project=\"".$fav_report['show_project']."\"";
+      $fav_report_part .= " show_start=\"".$fav_report['show_start']."\"";
+      $fav_report_part .= " show_duration=\"".$fav_report['show_duration']."\"";
+      $fav_report_part .= " show_cost=\"".$fav_report['show_cost']."\"";
+      $fav_report_part .= " show_task=\"".$fav_report['show_task']."\"";
+      $fav_report_part .= " show_end=\"".$fav_report['show_end']."\"";
+      $fav_report_part .= " show_note=\"".$fav_report['show_note']."\"";
+      $fav_report_part .= " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"";
+      $fav_report_part .= " show_work_units=\"".$fav_report['show_work_units']."\"";
+      $fav_report_part .= " group_by1=\"".$fav_report['group_by1']."\"";
+      $fav_report_part .= " group_by2=\"".$fav_report['group_by2']."\"";
+      $fav_report_part .= " group_by3=\"".$fav_report['group_by3']."\"";
+      $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
+      $fav_report_part .= "></fav_report>\n";
+      fwrite($this->file, $fav_report_part);
+    }
+    fwrite($this->file, $this->indentation."  </fav_reports>\n");
+    unset($fav_reports);
+
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index cc632f180..80dc8a199 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -34,6 +34,7 @@
 import('ttInvoiceHelper');
 import('ttCustomFieldHelper');
 import('ttExpenseHelper');
+import('ttFavReportHelper');
 
 // ttOrgImportHelper - this class is a future replacement for ttImportHelper.
 // Currently, it is work in progress.
@@ -398,6 +399,45 @@ function startElement($parser, $name, $attrs) {
           $this->errors->add($i18n->get('error.db'));
         }
       }
+
+      if ($name == 'FAV_REPORT') {
+        $user_list = '';
+        if (strlen($attrs['USERS']) > 0) {
+          $arr = explode(',', $attrs['USERS']);
+          foreach ($arr as $v)
+            $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->currentGroupUserMap[$v];
+        }
+        $fav_report_id = ttFavReportHelper::insertReport(array(
+          'name' => $attrs['NAME'],
+          'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'option' => $this->currentGroupCustomFieldOptionMap[$attrs['CF_1_OPTION_ID']],
+          'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
+          'billable' => $attrs['BILLABLE'],
+          'users' => $user_list,
+          'period' => $attrs['PERIOD'],
+          'from' => $attrs['PERIOD_START'],
+          'to' => $attrs['PERIOD_END'],
+          'chclient' => (int) $attrs['SHOW_CLIENT'],
+          'chinvoice' => (int) $attrs['SHOW_INVOICE'],
+          'chpaid' => (int) $attrs['SHOW_PAID'],
+          'chip' => (int) $attrs['SHOW_IP'],
+          'chproject' => (int) $attrs['SHOW_PROJECT'],
+          'chstart' => (int) $attrs['SHOW_START'],
+          'chduration' => (int) $attrs['SHOW_DURATION'],
+          'chcost' => (int) $attrs['SHOW_COST'],
+          'chtask' => (int) $attrs['SHOW_TASK'],
+          'chfinish' => (int) $attrs['SHOW_END'],
+          'chnote' => (int) $attrs['SHOW_NOTE'],
+          'chcf_1' => (int) $attrs['SHOW_CUSTOM_FIELD_1'],
+          'chunits' => (int) $attrs['SHOW_WORK_UNITS'],
+          'group_by1' => $attrs['GROUP_BY1'],
+          'group_by2' => $attrs['GROUP_BY2'],
+          'group_by3' => $attrs['GROUP_BY3'],
+          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']));
+         if (!$fav_report_id) $this->errors->add($i18n->get('error.db'));
+      }
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 338b37b45..38980481d 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.12.4416 | 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.12.4417 | 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>

From 4255418fd8d5a23ff005e4136a0b173b9ad62bd0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 16:56:06 +0000
Subject: [PATCH 0334/1848] Added database schema attribute to export files.

---
 WEB-INF/lib/ttOrgExportHelper.class.php | 15 ++++++++++++++-
 WEB-INF/lib/ttOrgImportHelper.class.php | 13 +++++++++++++
 WEB-INF/resources/en.lang.php           |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index aa9c9051d..719c486b5 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -51,7 +51,8 @@ function createDataFile($compress = false) {
 
     // Write XML to the file.
     fwrite($file, "<?xml version=\"1.0\"?>\n");
-    fwrite($file, "<org>\n");
+    $org_part = "<org schema=\"".$this->getVersion()."\">\n";
+    fwrite($file, $org_part);
 
     // Use ttGroupExportHelper to export all groups.
     $groupExportHelper = new ttGroupExportHelper($user->group_id, $file, '  ');  // 2 spaces indentation for home group.
@@ -98,4 +99,16 @@ function compress($in, $out) {
     fclose ($in_file);
     return true;
   }
+
+  private function getVersion() {
+    $mdb2 = getConnection();
+    $sql = "select param_value from tt_site_config where param_name = 'version_db'";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val['param_value'];
+        $result[] = $val;
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 80dc8a199..ada232862 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -41,6 +41,7 @@
 // When done, it should handle import of complex groups consisting of other groups.
 class ttOrgImportHelper {
   var $errors               = null; // Errors go here. Set in constructor by reference.
+  var $schema_version       = null; // Database schema version from XML file we import from.
   var $conflicting_entities = null; // A comma-separated list of entity names we cannot import.
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
@@ -73,6 +74,18 @@ function startElement($parser, $name, $attrs) {
 
     // First pass. We only check user logins for potential collisions with existing.
     if ($this->firstPass) {
+      if ($name == 'ORG' && $this->canImport) {
+         if ($attrs['SCHEMA'] == null) {
+           // We need (database) schema attribute to be available for import to work.
+           // Old Time Tracker export files don't have this.
+           // Current import code does not work with old format because we had to
+           // restructure data in export files for subgroup support.
+           $this->canImport = false;
+           $this->errors->add($i18n->get('error.format'));
+           return;
+         }
+      }
+
       if ($name == 'USER' && $this->canImport) {
         $login = $attrs['LOGIN'];
         if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($login)) {
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 82059051e..31f0ebb8e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -102,6 +102,7 @@
 'error.future_date' => 'Date is in future.',
 'error.xml' => 'Error in XML file at line %d: %s.',
 'error.cannot_import' => 'Cannot import: %s.',
+'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Login',

From f6c7709e92252811cc6f9997b86ac14e3f0dc4f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 17:03:50 +0000
Subject: [PATCH 0335/1848] Switched to new export-import with subgroup
 support.

---
 WEB-INF/templates/footer.tpl | 2 +-
 export.php                   | 8 ++++----
 import.php                   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 38980481d..e294c882e 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.12.4417 | 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.12.4418 | 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/export.php b/export.php
index 3d6178148..2b52acae0 100644
--- a/export.php
+++ b/export.php
@@ -57,11 +57,11 @@
     $mime_type = 'application/x-bzip2';
   }
 
-  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+  //if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
     $exportHelper = new ttOrgExportHelper();
-  } else {
-    $exportHelper = new ttExportHelper();
-  }
+  //} else {
+  //    $exportHelper = new ttExportHelper();
+  //}
   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);
diff --git a/import.php b/import.php
index 235924ac4..78630866b 100644
--- a/import.php
+++ b/import.php
@@ -43,11 +43,11 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
-  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
     $import = new ttOrgImportHelper($err);
-  } else {
-    $import = new ttImportHelper($err);
-  }
+//  } else {
+//    $import = new ttImportHelper($err);
+//  }
   $import->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost

From 220824961aa7e1d0da738de5a1feacc3c5832b7c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Nov 2018 17:51:08 +0000
Subject: [PATCH 0336/1848] Introduced a new string in translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5bfd796e9..1e5b6f3d2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -118,6 +118,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Iniciar sessió',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d407dccf6..d8f647dd2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -120,6 +120,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Přihlásit',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f475e06f1..344bf05c3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -111,6 +111,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Log ind',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ea58b9a4e..9a778429c 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -104,6 +104,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Anmelden',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 740be1230..622c1d87a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -116,6 +116,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Iniciar sesion',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b9f784f73..ad3698003 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -121,6 +121,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e6d54ee93..26b236393 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -118,6 +118,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'ورود',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 316b3f8f9..208c25598 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -113,6 +113,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Kirjaudu',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 529fc2da0..c164138c5 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -111,6 +111,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Connexion',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 2b523141b..925abcafc 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -105,6 +105,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Σύνδεση',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 878e5ba9d..0c6ad0bfb 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -128,6 +128,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'היכנס',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f98dffa13..c7eb011a0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -117,6 +117,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Bejelentkezés',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 07ed67c56..ac542965e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -109,6 +109,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0d077507c..7bc81789a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -122,6 +122,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'ログイン',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 0bc21ee8a..6121b38fb 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -121,6 +121,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => '로그인',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 02e0ab326..9c036716a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -102,6 +102,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Aanmelden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c7f0fe254..af6943cb6 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -122,6 +122,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Innlogging',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ffc6d37bb..39e7c9f57 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -115,6 +115,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9b5bf7594..4355f748d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -112,6 +112,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e2e95a8a7..9225d2bfc 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -114,6 +114,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 6840977e6..a3a91d752 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -122,6 +122,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Autentifica',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3354eaaae..f11fff5bc 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -101,6 +101,7 @@
 'error.future_date' => 'Дата в будущем.',
 'error.xml' => 'Ошибка в файле XML на строке %d: %s.',
 'error.cannot_import' => 'Невозможно импортировать: %s.',
+'error.format' => 'Неверный формат файла.',
 
 // Labels for buttons.
 'button.login' => 'Войти',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 18fa470d1..0bd2af038 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -117,6 +117,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Prihlásiť',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7f09aac45..be971e790 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -111,6 +111,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Prijava',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 890b8ee95..aef73a45f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -112,6 +112,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Prijava',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d2e227dc5..fe4ab32db 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -109,6 +109,7 @@
 // TODO: translate the following.
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Logga in',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7f34cb370..a0916ba99 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -125,6 +125,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => 'Giriş',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 96e43164c..5cabb5fc1 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -114,6 +114,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => '登录',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 8664f1934..168a6d442 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -119,6 +119,7 @@
 // 'error.future_date' => 'Date is in future.',
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
+// 'error.format' => 'Invalid file format.',
 
 // Labels for buttons.
 'button.login' => '登錄',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e294c882e..81bfe05d0 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.12.4418 | 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.12.4419 | 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>

From 252197d9417610f49c555a454995e0949741a01e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 12 Nov 2018 12:43:36 +0000
Subject: [PATCH 0337/1848] More consistent cleanup in group export.

---
 .gitignore                                |  1 +
 WEB-INF/lib/ttGroupExportHelper.class.php | 41 +++++++++++++++++++++--
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc348cfac..d73d85537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 config.php
 WEB-INF/templates_c/*.*
 WEB-INF/templates_c/import_*
+WEB-INF/templates_c/tt*
 WEB-INF/lib/tcpdf/
 nbproject/
 upload/
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 17d40435a..ce3dbb672 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -202,6 +202,8 @@ function writeData() {
 
     // Write group info.
     fwrite($this->file, $this->indentation.$group_part);
+    unset($group);
+    unset($group_part);
 
     // Prepare user map.
     $users = $this->getUsers();
@@ -256,6 +258,8 @@ function writeData() {
       fwrite($this->file, $role_part);
     }
     fwrite($this->file, $this->indentation."  </roles>\n");
+    unset($roles);
+    unset($role_part);
 
     // Write tasks.
     fwrite($this->file, $this->indentation."  <tasks>\n");
@@ -268,6 +272,8 @@ function writeData() {
       fwrite($this->file, $task_part);
     }
     fwrite($this->file, $this->indentation."  </tasks>\n");
+    unset($tasks);
+    unset($task_part);
 
     // Write projects.
     fwrite($this->file, $this->indentation."  <projects>\n");
@@ -288,6 +294,8 @@ function writeData() {
       fwrite($this->file, $project_part);
     }
     fwrite($this->file, $this->indentation."  </projects>\n");
+    unset($projects);
+    unset($project_part);
 
     // Write clients.
     fwrite($this->file, $this->indentation."  <clients>\n");
@@ -309,6 +317,8 @@ function writeData() {
       fwrite($this->file, $client_part);
     }
     fwrite($this->file, $this->indentation."  </clients>\n");
+    unset($clients);
+    unset($client_part);
 
     // Write users.
     fwrite($this->file, $this->indentation."  <users>\n");
@@ -327,6 +337,8 @@ function writeData() {
       fwrite($this->file, $user_part);
     }
     fwrite($this->file, $this->indentation."  </users>\n");
+    unset($users);
+    unset($user_part);
 
     // Write user to project binds.
     fwrite($this->file, $this->indentation."  <user_project_binds>\n");
@@ -342,6 +354,8 @@ function writeData() {
       fwrite($this->file, $bind_part);
     }
     fwrite($this->file, $this->indentation."  </user_project_binds>\n");
+    unset($user_binds);
+    unset($bind_part);
 
     // Write invoices.
     fwrite($this->file, $this->indentation."  <invoices>\n");
@@ -355,12 +369,15 @@ function writeData() {
       fwrite($this->file, $invoice_part);
     }
     fwrite($this->file, $this->indentation."  </invoices>\n");
+    unset($invoices);
+    unset($invoice_part);
 
     // Write time log entries and build logMap at the same time.
     fwrite($this->file, $this->indentation."  <log>\n");
     $key = 0;
-    foreach ($users as $user_item) {
-      $records = ttTimeHelper::getAllRecords($user_item['id']);
+    foreach ($this->userMap as $key => $value) {
+      $user_id = $key;
+      $records = ttTimeHelper::getAllRecords($user_id);
       foreach ($records as $record) {
         $key++;
         $this->logMap[$record['id']] = $key;
@@ -384,6 +401,7 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </log>\n");
     unset($records);
+    unset($log_part);
 
     // Write custom fields.
     fwrite($this->file, $this->indentation."  <custom_fields>\n");
@@ -398,6 +416,7 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </custom_fields>\n");
     unset($custom_fields);
+    unset($custom_field_part);
 
     // Write custom field options.
     fwrite($this->file, $this->indentation."  <custom_field_options>\n");
@@ -410,6 +429,7 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </custom_field_options>\n");
     unset($custom_field_options);
+    unset($custom_field_option_part);
 
     // Write custom field log.
     $custom_field_log = ttTeamHelper::getCustomFieldLog($this->group_id);
@@ -425,6 +445,7 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </custom_field_log>\n");
     unset($custom_field_log);
+    unset($custom_field_log_part);
 
     // Write expense items.
     $expense_items = ttTeamHelper::getExpenseItems($this->group_id);
@@ -444,6 +465,7 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </expense_items>\n");
     unset($expense_items);
+    unset($expense_item_part);
 
     // Write monthly quotas.
     $quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
@@ -456,6 +478,8 @@ function writeData() {
       fwrite($this->file, $quota_part);
     }
     fwrite($this->file, $this->indentation."  </monthly_quotas>\n");
+    unset($quotas);
+    unset($quota_part);
 
     // Write fav reports.
     $fav_reports = ttTeamHelper::getFavReports($this->group_id);
@@ -502,12 +526,25 @@ function writeData() {
     }
     fwrite($this->file, $this->indentation."  </fav_reports>\n");
     unset($fav_reports);
+    unset($fav_report_part);
+
+    // We are mostly done with writing this group data, destroy all maps.
+    unset($this->roleMap);
+    unset($this->userMap);
+    unset($this->taskMap);
+    unset($this->projectMap);
+    unset($this->clientMap);
+    unset($this->invoiceMap);
+    unset($this->logMap);
+    unset($this->customFieldMap);
+    unset($this->customFieldOptionMap);
 
     // Call self recursively for all subgroups.
     foreach ($this->subgroups as $subgroup) {
       $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.'  ');
       $subgroup_helper->writeData();
     }
+    unset($this->subgroups);
 
     fwrite($this->file, $this->indentation."</group>\n");
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 81bfe05d0..48b80bfae 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.12.4419 | 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.12.4420 | 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>

From 89d113bd3f5ab38ee7ecd7166ce420cad0634fa3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 12 Nov 2018 13:43:38 +0000
Subject: [PATCH 0338/1848] Improved efficiency of ttOrgImportHelper a bit.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 72 ++++++++++++++++---------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ada232862..73f1f09e2 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -36,19 +36,17 @@
 import('ttExpenseHelper');
 import('ttFavReportHelper');
 
-// ttOrgImportHelper - this class is a future replacement for ttImportHelper.
-// Currently, it is work in progress.
-// When done, it should handle import of complex groups consisting of other groups.
+// ttOrgImportHelper class is used to import organization data from an XML file
+// prepared by ttOrgExportHelper and consisting of nested groups with their info.
 class ttOrgImportHelper {
   var $errors               = null; // Errors go here. Set in constructor by reference.
   var $schema_version       = null; // Database schema version from XML file we import from.
-  var $conflicting_entities = null; // A comma-separated list of entity names we cannot import.
+  var $conflicting_logins   = null; // A comma-separated list of logins we cannot import.
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).
   var $current_group_id        = null; // Current group id during parsing.
   var $current_parent_group_id = null; // Current parent group id during parsing.
-                                       // Set when we create a new group.
   var $top_role_id    = 0;       // Top role id.
 
   // Entity maps for current group. They map XML ids with database ids.
@@ -68,11 +66,14 @@ function __construct(&$errors) {
     $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
   }
 
-  // startElement - callback handler for opening tag of an XML element in the file.
+  // startElement - callback handler for opening tags in XML.
   function startElement($parser, $name, $attrs) {
     global $i18n;
 
-    // First pass. We only check user logins for potential collisions with existing.
+    // First pass through the file determines if we can import data.
+    // We require 2 things:
+    //   1) Database schema version must be set. This ensures we have a compatible file.
+    //   2) No login coillisions are allowed.
     if ($this->firstPass) {
       if ($name == 'ORG' && $this->canImport) {
          if ($attrs['SCHEMA'] == null) {
@@ -86,11 +87,13 @@ function startElement($parser, $name, $attrs) {
          }
       }
 
+      // In first pass we check user logins for potential collisions with existing.
       if ($name == 'USER' && $this->canImport) {
         $login = $attrs['LOGIN'];
         if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($login)) {
           // We have a login collision. Append colliding login to a list of things we cannot import.
-          $this->conflicting_entities .= ($this->conflicting_entities ? ", $login" : $login);
+          $this->conflicting_logins .= ($this->conflicting_logins ? ", $login" : $login);
+          // The above is printed in error message with all found colliding logins.
         }
       }
     }
@@ -133,6 +136,7 @@ function startElement($parser, $name, $attrs) {
         }
         // Set parent group to create subgroups with this group as parent at next entry here.
         $this->current_parent_group_id = $this->current_group_id;
+        return;
       }
 
       if ($name == 'ROLES') {
@@ -140,22 +144,24 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupRoleMap);
         $this->currentGroupRoleMap = array();
         // Role map is reconstructed after processing <role> elements in XML. See below.
+        return;
       }
 
       if ($name == 'ROLE') {
         // We get here when processing <role> tags for the current group.
         $role_id = ttRoleHelper::insert(array(
-              'group_id' => $this->current_group_id,
-              'org_id' => $this->org_id,
-              'name' => $attrs['NAME'],
-              'description' => $attrs['DESCRIPTION'],
-              'rank' => $attrs['RANK'],
-              'rights' => $attrs['RIGHTS'],
-              'status' => $attrs['STATUS']));
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'description' => $attrs['DESCRIPTION'],
+          'rank' => $attrs['RANK'],
+          'rights' => $attrs['RIGHTS'],
+          'status' => $attrs['STATUS']));
         if ($role_id) {
           // Add a mapping.
           $this->currentGroupRoleMap[$attrs['ID']] = $role_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'TASKS') {
@@ -163,6 +169,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupTaskMap);
         $this->currentGroupTaskMap = array();
         // Task map is reconstructed after processing <task> elements in XML. See below.
+        return;
       }
 
       if ($name == 'TASK') {
@@ -177,6 +184,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupTaskMap[$attrs['ID']] = $task_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'PROJECTS') {
@@ -184,6 +192,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupProjectMap);
         $this->currentGroupProjectMap = array();
         // Project map is reconstructed after processing <project> elements in XML. See below.
+        return;
       }
 
       if ($name == 'PROJECT') {
@@ -205,6 +214,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupProjectMap[$attrs['ID']] = $project_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'CLIENTS') {
@@ -212,6 +222,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupClientMap);
         $this->currentGroupClientMap = array();
         // Client map is reconstructed after processing <client> elements in XML. See below.
+        return;
       }
 
       if ($name == 'CLIENT') {
@@ -234,6 +245,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupClientMap[$attrs['ID']] = $client_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'USERS') {
@@ -241,6 +253,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupUserMap);
         $this->currentGroupUserMap = array();
         // User map is reconstructed after processing <user> elements in XML. See below.
+        return;
       }
 
       if ($name == 'USER') {
@@ -263,6 +276,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupUserMap[$attrs['ID']] = $user_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'USER_PROJECT_BIND') {
@@ -275,6 +289,7 @@ function startElement($parser, $name, $attrs) {
           'status' => $attrs['STATUS']))) {
           $this->errors->add($i18n->get('error.db'));
         }
+        return;
       }
 
       if ($name == 'INVOICES') {
@@ -282,6 +297,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupInvoiceMap);
         $this->currentGroupInvoiceMap = array();
         // Invoice map is reconstructed after processing <invoice> elements in XML. See below.
+        return;
       }
 
       if ($name == 'INVOICE') {
@@ -297,6 +313,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupInvoiceMap[$attrs['ID']] = $invoice_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'LOG') {
@@ -304,6 +321,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupLogMap);
         $this->currentGroupLogMap = array();
         // Log map is reconstructed after processing <log_item> elements in XML. See below.
+        return;
       }
 
       if ($name == 'LOG_ITEM') {
@@ -328,6 +346,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupLogMap[$attrs['ID']] = $log_item_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'CUSTOM_FIELDS') {
@@ -335,6 +354,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupCustomFieldMap);
         $this->currentGroupCustomFieldMap = array();
         // Custom field map is reconstructed after processing <custom_field> elements in XML. See below.
+        return;
       }
 
       if ($name == 'CUSTOM_FIELD') {
@@ -350,6 +370,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupCustomFieldMap[$attrs['ID']] = $custom_field_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'CUSTOM_FIELD_OPTIONS') {
@@ -357,6 +378,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupCustomFieldOptionMap);
         $this->currentGroupCustomFieldOptionMap = array();
         // Custom field option map is reconstructed after processing <custom_field_option> elements in XML. See below.
+        return;
       }
 
       if ($name == 'CUSTOM_FIELD_OPTION') {
@@ -370,6 +392,7 @@ function startElement($parser, $name, $attrs) {
           // Add a mapping.
           $this->currentGroupCustomFieldOptionMap[$attrs['ID']] = $custom_field_option_id;
         } else $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'CUSTOM_FIELD_LOG_ENTRY') {
@@ -384,6 +407,7 @@ function startElement($parser, $name, $attrs) {
           'status' => $attrs['STATUS']))) {
           $this->errors->add($i18n->get('error.db'));
         }
+        return;
       }
 
       if ($name == 'EXPENSE_ITEM') {
@@ -401,6 +425,7 @@ function startElement($parser, $name, $attrs) {
           'paid' => $attrs['PAID'],
           'status' => $attrs['STATUS']));
         if (!$expense_item_id) $this->errors->add($i18n->get('error.db'));
+        return;
       }
 
       if ($name == 'MONTHLY_QUOTA') {
@@ -411,6 +436,7 @@ function startElement($parser, $name, $attrs) {
           $attrs['MINUTES'])) {
           $this->errors->add($i18n->get('error.db'));
         }
+        return;
       }
 
       if ($name == 'FAV_REPORT') {
@@ -450,6 +476,7 @@ function startElement($parser, $name, $attrs) {
           'group_by3' => $attrs['GROUP_BY3'],
           'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']));
          if (!$fav_report_id) $this->errors->add($i18n->get('error.db'));
+         return;
       }
     }
   }
@@ -491,13 +518,10 @@ function importXml() {
     xml_set_element_handler($parser, 'startElement', false);
 
     // We need to parse the file 2 times:
-    //   1) First pass: determine if import is possible - there must be no login collisions.
-    //   2) Second pass: if we can import, then do import in a second pass.
-    // This is different from earlier approach for single group import, where we could
-    // do both things in one pass because user info was in the beginning of XML file.
-    // Now, with subgroups, users can be located anywhere in the file.
+    //   1) First pass: determine if import is possible.
+    //   2) Second pass: import data, one tag at a time.
 
-    // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
+    // Read and parse the content of the file. During parsing, startElement is called back for each tag.
     $file = fopen($filename, 'r');
     while ($data = fread($file, 4096)) {
       if (!xml_parse($parser, $data, feof($file))) {
@@ -506,10 +530,10 @@ function importXml() {
           xml_error_string(xml_get_error_code($parser))));
       }
     }
-    if ($this->conflicting_entities) {
+    if ($this->conflicting_logins) {
       $this->canImport = false;
       $this->errors->add($i18n->get('error.user_exists'));
-      $this->errors->add(sprintf($i18n->get('error.cannot_import'), $this->conflicting_entities));
+      $this->errors->add(sprintf($i18n->get('error.cannot_import'), $this->conflicting_logins));
     }
 
     $this->firstPass = false; // We are done with 1st pass.
@@ -526,7 +550,7 @@ function importXml() {
     xml_set_object($parser, $this);
     xml_set_element_handler($parser, 'startElement', false);
 
-    // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
+    // Read and parse the content of the file. During parsing, startElement is called back for each tag.
     $file = fopen($filename, 'r');
     while ($data = fread($file, 4096)) {
       if (!xml_parse($parser, $data, feof($file))) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 48b80bfae..c79767d2b 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.12.4420 | 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.12.4421 | 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>

From bea65bba9873151a4d31f944d90d9b93c72727b0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 12 Nov 2018 14:42:20 +0000
Subject: [PATCH 0339/1848] Rolling back old import-export due to a problem
 with undeclared entities during XML parsing.

---
 WEB-INF/templates/footer.tpl | 2 +-
 export.php                   | 8 ++++----
 import.php                   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c79767d2b..218053a7a 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.12.4421 | 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.12.4422 | 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/export.php b/export.php
index 2b52acae0..cf3bccfa9 100644
--- a/export.php
+++ b/export.php
@@ -57,11 +57,11 @@
     $mime_type = 'application/x-bzip2';
   }
 
-  //if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
     $exportHelper = new ttOrgExportHelper();
-  //} else {
-  //    $exportHelper = new ttExportHelper();
-  //}
+  } else {
+      $exportHelper = new ttExportHelper();
+  }
   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);
diff --git a/import.php b/import.php
index 78630866b..235924ac4 100644
--- a/import.php
+++ b/import.php
@@ -43,11 +43,11 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
-//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
     $import = new ttOrgImportHelper($err);
-//  } else {
-//    $import = new ttImportHelper($err);
-//  }
+  } else {
+    $import = new ttImportHelper($err);
+  }
   $import->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost

From 50062ed6562d3588745bca1fbd12e6ff063d8d74 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 14 Nov 2018 16:30:19 +0000
Subject: [PATCH 0340/1848] Another try to start using new export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 40 +++++++++++------------
 WEB-INF/templates/footer.tpl              |  2 +-
 export.php                                |  8 ++---
 import.php                                |  8 ++---
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index ce3dbb672..4e6daad26 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -179,8 +179,8 @@ function writeData() {
 
     // Write group info.
     $group = $this->getGroupData();
-    $group_part = "<group name=\"".htmlentities($group['name'])."\"";
-    $group_part .= " currency=\"".htmlentities($group['currency'])."\"";
+    $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
+    $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";
     $group_part .= " date_format=\"".$group['date_format']."\"";
@@ -249,10 +249,10 @@ function writeData() {
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
       $role_part = $this->indentation.'    '."<role id=\"".$this->roleMap[$role['id']]."\"";
-      $role_part .= " name=\"".htmlentities($role['name'])."\"";
-      $role_part .= " description=\"".htmlentities($role['description'])."\"";
+      $role_part .= " name=\"".htmlspecialchars($role['name'])."\"";
+      $role_part .= " description=\"".htmlspecialchars($role['description'])."\"";
       $role_part .= " rank=\"".$role['rank']."\"";
-      $role_part .= " rights=\"".htmlentities($role['rights'])."\"";
+      $role_part .= " rights=\"".htmlspecialchars($role['rights'])."\"";
       $role_part .= " status=\"".$role['status']."\"";
       $role_part .= "></role>\n";
       fwrite($this->file, $role_part);
@@ -265,8 +265,8 @@ function writeData() {
     fwrite($this->file, $this->indentation."  <tasks>\n");
     foreach ($tasks as $task) {
       $task_part = $this->indentation.'    '."<task id=\"".$this->taskMap[$task['id']]."\"";
-      $task_part .= " name=\"".htmlentities($task['name'])."\"";
-      $task_part .= " description=\"".htmlentities($task['description'])."\"";
+      $task_part .= " name=\"".htmlspecialchars($task['name'])."\"";
+      $task_part .= " description=\"".htmlspecialchars($task['description'])."\"";
       $task_part .= " status=\"".$task['status']."\"";
       $task_part .= "></task>\n";
       fwrite($this->file, $task_part);
@@ -286,8 +286,8 @@ function writeData() {
         $tasks_str = implode(',', $tasks_mapped);
       }
       $project_part = $this->indentation.'    '."<project id=\"".$this->projectMap[$project_item['id']]."\"";
-      $project_part .= " name=\"".htmlentities($project_item['name'])."\"";
-      $project_part .= " description=\"".htmlentities($project_item['description'])."\"";
+      $project_part .= " name=\"".htmlspecialchars($project_item['name'])."\"";
+      $project_part .= " description=\"".htmlspecialchars($project_item['description'])."\"";
       $project_part .= " tasks=\"".$tasks_str."\"";
       $project_part .= " status=\"".$project_item['status']."\"";
       $project_part .= "></project>\n";
@@ -308,8 +308,8 @@ function writeData() {
         $projects_str = implode(',', $projects_mapped);
       }
       $client_part = $this->indentation.'    '."<client id=\"".$this->clientMap[$client_item['id']]."\"";
-      $client_part .= " name=\"".htmlentities($client_item['name'])."\"";
-      $client_part .= " address=\"".htmlentities($client_item['address'])."\"";
+      $client_part .= " name=\"".htmlspecialchars($client_item['name'])."\"";
+      $client_part .= " address=\"".htmlspecialchars($client_item['address'])."\"";
       $client_part .= " tax=\"".$client_item['tax']."\"";
       $client_part .= " projects=\"".$projects_str."\"";
       $client_part .= " status=\"".$client_item['status']."\"";
@@ -325,8 +325,8 @@ function writeData() {
     foreach ($users as $user_item) {
       $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
       $user_part = $this->indentation.'    '."<user id=\"".$this->userMap[$user_item['id']]."\"";
-      $user_part .= " name=\"".htmlentities($user_item['name'])."\"";
-      $user_part .= " login=\"".htmlentities($user_item['login'])."\"";
+      $user_part .= " name=\"".htmlspecialchars($user_item['name'])."\"";
+      $user_part .= " login=\"".htmlspecialchars($user_item['login'])."\"";
       $user_part .= " password=\"".$user_item['password']."\"";
       $user_part .= " role_id=\"".$role_id."\"";
       $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
@@ -361,7 +361,7 @@ function writeData() {
     fwrite($this->file, $this->indentation."  <invoices>\n");
     foreach ($invoices as $invoice_item) {
       $invoice_part = $this->indentation.'    '."<invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\"";
-      $invoice_part .= " name=\"".htmlentities($invoice_item['name'])."\"";
+      $invoice_part .= " name=\"".htmlspecialchars($invoice_item['name'])."\"";
       $invoice_part .= " date=\"".$invoice_item['date']."\"";
       $invoice_part .= " client_id=\"".$this->clientMap[$invoice_item['client_id']]."\"";
       $invoice_part .= " status=\"".$invoice_item['status']."\"";
@@ -391,7 +391,7 @@ function writeData() {
         $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\"";
         $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
         $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
-        $log_part .= " comment=\"".htmlentities($record['comment'])."\"";
+        $log_part .= " comment=\"".htmlspecialchars($record['comment'])."\"";
         $log_part .= " billable=\"".$record['billable']."\"";
         $log_part .= " paid=\"".$record['paid']."\"";
         $log_part .= " status=\"".$record['status']."\"";
@@ -408,7 +408,7 @@ function writeData() {
     foreach ($custom_fields as $custom_field) {
       $custom_field_part = $this->indentation.'    '."<custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\"";
       $custom_field_part .= " type=\"".$custom_field['type']."\"";
-      $custom_field_part .= " label=\"".htmlentities($custom_field['label'])."\"";
+      $custom_field_part .= " label=\"".htmlspecialchars($custom_field['label'])."\"";
       $custom_field_part .= " required=\"".$custom_field['required']."\"";
       $custom_field_part .= " status=\"".$custom_field['status']."\"";
       $custom_field_part .= "></custom_field>\n";
@@ -423,7 +423,7 @@ function writeData() {
     foreach ($custom_field_options as $option) {
       $custom_field_option_part = $this->indentation.'    '."<custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\"";
       $custom_field_option_part .= " field_id=\"".$this->customFieldMap[$option['field_id']]."\"";
-      $custom_field_option_part .= " value=\"".htmlentities($option['value'])."\"";
+      $custom_field_option_part .= " value=\"".htmlspecialchars($option['value'])."\"";
       $custom_field_option_part .= "></custom_field_option>\n";
       fwrite($this->file, $custom_field_option_part);
     }
@@ -438,7 +438,7 @@ function writeData() {
       $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
       $custom_field_log_part .= " field_id=\"".$this->customFieldMap[$entry['field_id']]."\"";
       $custom_field_log_part .= " option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\"";
-      $custom_field_log_part .= " value=\"".htmlentities($entry['value'])."\"";
+      $custom_field_log_part .= " value=\"".htmlspecialchars($entry['value'])."\"";
       $custom_field_log_part .= " status=\"".$entry['status']."\"";
       $custom_field_log_part .= "></custom_field_log_entry>\n";
       fwrite($this->file, $custom_field_log_part);
@@ -455,7 +455,7 @@ function writeData() {
       $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
       $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
       $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
-      $expense_item_part .= " name=\"".htmlentities($expense_item['name'])."\"";
+      $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
       $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
       $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
       $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
@@ -494,7 +494,7 @@ function writeData() {
         }
       }
       $fav_report_part = $this->indentation.'    '."<fav_report user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
-      $fav_report_part .= " name=\"".htmlentities($fav_report['name'])."\"";
+      $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\"";
       $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
       $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"";
       $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 218053a7a..e6132be19 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.12.4422 | 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.12.4423 | 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/export.php b/export.php
index cf3bccfa9..f278b7c96 100644
--- a/export.php
+++ b/export.php
@@ -57,11 +57,11 @@
     $mime_type = 'application/x-bzip2';
   }
 
-  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
     $exportHelper = new ttOrgExportHelper();
-  } else {
-      $exportHelper = new ttExportHelper();
-  }
+//  } else {
+//      $exportHelper = new ttExportHelper();
+//  }
   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);
diff --git a/import.php b/import.php
index 235924ac4..78630866b 100644
--- a/import.php
+++ b/import.php
@@ -43,11 +43,11 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
-  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
     $import = new ttOrgImportHelper($err);
-  } else {
-    $import = new ttImportHelper($err);
-  }
+//  } else {
+//    $import = new ttImportHelper($err);
+//  }
   $import->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost

From 509d1d70d0580e26a4467e123c06d2c8939f32cc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 14 Nov 2018 17:52:45 +0000
Subject: [PATCH 0341/1848] Fixed importing clients without projects in new
 import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 8 +++++---
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 73f1f09e2..77458cfaa 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -229,9 +229,11 @@ function startElement($parser, $name, $attrs) {
         // We get here when processing <client> tags for the current group.
 
         // Prepare a list of project ids.
-        $projects = explode(',', $attrs['PROJECTS']);
-        foreach ($projects as $id)
-          $mapped_projects[] = $this->currentGroupProjectMap[$id];
+        if ($attrs['PROJECTS']) {
+          $projects = explode(',', $attrs['PROJECTS']);
+          foreach ($projects as $id)
+            $mapped_projects[] = $this->currentGroupProjectMap[$id];
+        }
 
         $client_id = ttClientHelper::insert(array(
           'group_id' => $this->current_group_id,
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e6132be19..16196a606 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.12.4423 | 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.12.4424 | 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>

From af4d194c7beb4020c7aff5f8c9eb36156b9b407e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 14 Nov 2018 23:57:41 +0000
Subject: [PATCH 0342/1848] Improved new import so that it does not flood the
 output with multiple XML errors.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 77458cfaa..96ac5708c 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -525,7 +525,7 @@ function importXml() {
 
     // Read and parse the content of the file. During parsing, startElement is called back for each tag.
     $file = fopen($filename, 'r');
-    while ($data = fread($file, 4096)) {
+    while (($data = fread($file, 4096)) && $this->errors->no()) {
       if (!xml_parse($parser, $data, feof($file))) {
         $this->errors->add(sprintf($i18n->get('error.xml'),
           xml_get_current_line_number($parser),
@@ -554,7 +554,7 @@ function importXml() {
 
     // Read and parse the content of the file. During parsing, startElement is called back for each tag.
     $file = fopen($filename, 'r');
-    while ($data = fread($file, 4096)) {
+    while (($data = fread($file, 4096)) && $this->errors->no()) {
       if (!xml_parse($parser, $data, feof($file))) {
         $this->errors->add(sprintf($i18n->get('error.xml'),
           xml_get_current_line_number($parser),
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 16196a606..1f8ef090b 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.12.4424 | 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.12.4425 | 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>

From e56ae75283e1ce89e9188184e950cc8e38e11f8e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Nov 2018 11:39:38 +0000
Subject: [PATCH 0343/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 10 ++++------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9c036716a..af118f147 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -99,10 +99,9 @@
 'error.goto_uncompleted' => 'Ga naar onvolledige invoer.',
 'error.overlap' => 'De huidige registratie overlapt een reeds bestaande registratie.',
 'error.future_date' => 'Datum ligt in de toekomst.',
-// TODO: translate the following.
-// 'error.xml' => 'Error in XML file at line %d: %s.',
-// 'error.cannot_import' => 'Cannot import: %s.',
-// 'error.format' => 'Invalid file format.',
+'error.xml' => 'Fout in XML bestand in regel line %d: %s.',
+'error.cannot_import' => 'Kan niet importeren: %s.',
+'error.format' => 'Bestandsformaat niet valide.',
 
 // Labels for buttons.
 'button.login' => 'Aanmelden',
@@ -143,8 +142,7 @@
 'label.end_date' => 'Einddatum',
 'label.user' => 'Medewerker',
 'label.users' => 'Medewerkers',
-// TODO: translate the following.
-// 'label.group' => 'Group',
+'label.group' => 'Groep',
 'label.roles' => 'Rollen',
 'label.client' => 'Klant',
 'label.clients' => 'Klanten',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1f8ef090b..d9982336f 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.12.4425 | 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.12.4426 | 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>

From 5f1e536c60f1b70dae7253e7ce7256b5f030074c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Nov 2018 15:31:17 +0000
Subject: [PATCH 0344/1848] Cosmetic improvements.

---
 WEB-INF/lib/ttGroupHelper.class.php | 2 +-
 WEB-INF/resources/nl.lang.php       | 2 +-
 WEB-INF/templates/footer.tpl        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 44dc3e1b1..128650c62 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -36,7 +36,7 @@ static function getTopGroups() {
     $mdb2 = getConnection();
 
     $sql =  "select id, name, created, lang from tt_groups".
-            " where status = 1 and (org_id is NULL or org_id = id) order by id desc";
+            " where status = 1 and org_id = id order by id desc";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index af118f147..fb2e9b420 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -100,7 +100,7 @@
 'error.overlap' => 'De huidige registratie overlapt een reeds bestaande registratie.',
 'error.future_date' => 'Datum ligt in de toekomst.',
 'error.xml' => 'Fout in XML bestand in regel line %d: %s.',
-'error.cannot_import' => 'Kan niet importeren: %s.',
+'error.cannot_import' => 'Kan het volgende niet importeren: %s.',
 'error.format' => 'Bestandsformaat niet valide.',
 
 // Labels for buttons.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d9982336f..89261e30d 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.12.4426 | 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.12.4427 | 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>

From 4cf643dd179f2784af068a5bbfbc0168ab9ad591 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Nov 2018 16:07:16 +0000
Subject: [PATCH 0345/1848] Added error output.

---
 WEB-INF/templates/footer.tpl | 2 +-
 admin_group_edit.php         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 89261e30d..b1b51b776 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.12.4427 | 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.12.4428 | 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/admin_group_edit.php b/admin_group_edit.php
index 6306bdd08..bb0fc4134 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -95,7 +95,8 @@
     if ($result) {
       header('Location: admin_groups.php');
       exit();
-    }
+    } else
+      $err->add($i18n->get('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {

From 4da474b3fee7606ff8ce81b9e9c9d1fe82a82bdc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Nov 2018 16:21:24 +0000
Subject: [PATCH 0346/1848] Switching from utf8 to utf8mb4 character set for
 full Unicode support (emoji, etc.).

---
 WEB-INF/config.php.dist      | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 mysql.sql                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 3f6fdaf33..1d852c21a 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -37,7 +37,7 @@ set_include_path(realpath(dirname(__FILE__).'/lib/pear') . PATH_SEPARATOR . get_
 // CHANGE 3 PARAMETERS HERE!
 // In this example: "root" is username, "no" is password, "dbname" is database name.
 //
-define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8');
+define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8mb4');
 // Do NOT change charset unless you upgraded from an older Time Tracker where charset was NOT specified
 // and now you see some corrupted characters. See http://dev.mysql.com/doc/refman/5.0/en/charset-mysql.html
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b1b51b776..c45141d05 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.12.4428 | 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.12.4429 | 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/mysql.sql b/mysql.sql
index 00abb462f..5237dfe31 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -3,7 +3,7 @@
 # 2) Then, execute this script from command prompt with a command like this:
 # mysql -h host -u user -p -D db_name < mysql.sql
 
-# create database timetracker character set = 'utf8';
+# create database timetracker character set = 'utf8mb4';
 
 # use timetracker;
 

From 1a7f5dda663493a6ea33a86a58b3caab7fd94062 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Nov 2018 00:04:10 +0000
Subject: [PATCH 0347/1848] Fixed mysql.sql for new installs - one table was
 not being created.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 9 +++++----
 mysql.sql                    | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c45141d05..cb9bed062 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.12.4429 | 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.13.4430 | 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/dbinstall.php b/dbinstall.php
index d150e7350..8a6d66fde 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11812"]) {
+  if ($_POST["convert11797to11813"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -989,6 +989,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_project_task_binds` ADD `group_id` int(11) default NULL AFTER `task_id`");
     setChange("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.13', modified = now() where param_name = 'version_db' and param_value = '1.18.12'");
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
   }
@@ -1036,7 +1037,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.12)</b>
+    <td width="80%"><b>Create database structure (v1.18.13)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1081,8 +1082,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.12)</td>
-    <td><input type="submit" name="convert11797to11812" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.13)</td>
+    <td><input type="submit" name="convert11797to11813" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 5237dfe31..1b510a73d 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -169,9 +169,9 @@ create unique index bind_idx on tt_user_project_binds(user_id, project_id);
 #
 CREATE TABLE `tt_project_task_binds` (
   `project_id` int(11) NOT NULL,        # project id
-  `task_id` int(11) NOT NULL            # task id
+  `task_id` int(11) NOT NULL,           # task id
   `group_id` int(11) default NULL,      # group id
-  `org_id` int(11) default NULL,        # organization id
+  `org_id` int(11) default NULL         # organization id
 );
 
 # Indexes for tt_project_task_binds.
@@ -469,4 +469,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.12', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.13', now()); # TODO: change when structure changes.

From b36d1978a980173bae78818be6254041533a4d98 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Nov 2018 01:21:24 +0000
Subject: [PATCH 0348/1848] Changed collation to utf8mb4_bin to support 4-byte
 UTF-8 characters.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 15 ++++++---
 mysql.sql                    | 60 ++++++++++++++++++------------------
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cb9bed062..e6154271f 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.13.4430 | 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.14.4431 | 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/dbinstall.php b/dbinstall.php
index 8a6d66fde..f81e31f7e 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,7 +956,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11813"]) {
+  if ($_POST["convert11797to11814"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -990,6 +990,13 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.13', modified = now() where param_name = 'version_db' and param_value = '1.18.12'");
+    setChange("ALTER TABLE `tt_users` MODIFY `login` varchar(50) COLLATE utf8mb4_bin NOT NULL");
+    setChange("ALTER TABLE `tt_projects` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    setChange("ALTER TABLE `tt_tasks` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    setChange("ALTER TABLE `tt_invoices` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    setChange("ALTER TABLE `tt_clients` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.14', modified = now() where param_name = 'version_db' and param_value = '1.18.13'");
+
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
   }
@@ -1037,7 +1044,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.13)</b>
+    <td width="80%"><b>Create database structure (v1.18.14)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1082,8 +1089,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.13)</td>
-    <td><input type="submit" name="convert11797to11813" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.14)</td>
+    <td><input type="submit" name="convert11797to11814" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 1b510a73d..14a8aa0f9 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -82,7 +82,7 @@ INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top ma
 #
 CREATE TABLE `tt_users` (
   `id` int(11) NOT NULL auto_increment,            # user id
-  `login` varchar(50) COLLATE utf8_bin NOT NULL,   # user login
+  `login` varchar(50) COLLATE utf8mb4_bin NOT NULL,# user login
   `password` varchar(50) default NULL,             # password hash
   `name` varchar(100) default NULL,                # user name
   `group_id` int(11) NOT NULL,                     # group id
@@ -115,13 +115,13 @@ INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALU
 # Structure for table tt_projects.
 #
 CREATE TABLE `tt_projects` (
-  `id` int(11) NOT NULL auto_increment,         # project id
-  `group_id` int(11) NOT NULL,                  # group id
-  `org_id` int(11) default NULL,                # organization id
-  `name` varchar(80) COLLATE utf8_bin NOT NULL, # project name
-  `description` varchar(255) default NULL,      # project description
-  `tasks` text default NULL,                    # comma-separated list of task ids associated with this project
-  `status` tinyint(4) default 1,                # project status
+  `id` int(11) NOT NULL auto_increment,            # project id
+  `group_id` int(11) NOT NULL,                     # group id
+  `org_id` int(11) default NULL,                   # organization id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # project name
+  `description` varchar(255) default NULL,         # project description
+  `tasks` text default NULL,                       # comma-separated list of task ids associated with this project
+  `status` tinyint(4) default 1,                   # project status
   PRIMARY KEY (`id`)
 );
 
@@ -133,12 +133,12 @@ create unique index project_idx on tt_projects(group_id, name, status);
 # Structure for table tt_tasks.
 #
 CREATE TABLE `tt_tasks` (
-  `id` int(11) NOT NULL auto_increment,         # task id
-  `group_id` int(11) NOT NULL,                  # group id
-  `org_id` int(11) default NULL,                # organization id
-  `name` varchar(80) COLLATE utf8_bin NOT NULL, # task name
-  `description` varchar(255) default NULL,      # task description
-  `status` tinyint(4) default 1,                # task status
+  `id` int(11) NOT NULL auto_increment,            # task id
+  `group_id` int(11) NOT NULL,                     # group id
+  `org_id` int(11) default NULL,                   # organization id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # task name
+  `description` varchar(255) default NULL,         # task description
+  `status` tinyint(4) default 1,                   # task status
   PRIMARY KEY (`id`)
 );
 
@@ -222,13 +222,13 @@ create index task_idx on tt_log(task_id);
 # Structure for table tt_invoices. Invoices are issued to clients for billable work.
 #
 CREATE TABLE `tt_invoices` (
-  `id` int(11) NOT NULL auto_increment,         # invoice id
-  `group_id` int(11) NOT NULL,                  # group id
-  `org_id` int(11) default NULL,                # organization id
-  `name` varchar(80) COLLATE utf8_bin NOT NULL, # invoice name
-  `date` date NOT NULL,                         # invoice date
-  `client_id` int(11) NOT NULL,                 # client id
-  `status` tinyint(4) default 1,                # invoice status
+  `id` int(11) NOT NULL auto_increment,            # invoice id
+  `group_id` int(11) NOT NULL,                     # group id
+  `org_id` int(11) default NULL,                   # organization id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # invoice name
+  `date` date NOT NULL,                            # invoice date
+  `client_id` int(11) NOT NULL,                    # client id
+  `status` tinyint(4) default 1,                   # invoice status
   PRIMARY KEY (`id`)
 );
 
@@ -310,14 +310,14 @@ CREATE TABLE `tt_cron` (
 # Structure for table tt_clients. A client is an entity for whom work is performed and who may be invoiced.
 #
 CREATE TABLE `tt_clients` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,         # client id
-  `group_id` int(11) NOT NULL,                  # group id
-  `org_id` int(11) default NULL,                # organization id
-  `name` varchar(80) COLLATE utf8_bin NOT NULL, # client name
-  `address` varchar(255) default NULL,          # client address
-  `tax` float(6,2) default '0.00',              # applicable tax for this client
-  `projects` text default NULL,                 # comma-separated list of project ids assigned to this client
-  `status` tinyint(4) default 1,                # client status
+  `id` int(11) NOT NULL AUTO_INCREMENT,            # client id
+  `group_id` int(11) NOT NULL,                     # group id
+  `org_id` int(11) default NULL,                   # organization id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # client name
+  `address` varchar(255) default NULL,             # client address
+  `tax` float(6,2) default '0.00',                 # applicable tax for this client
+  `projects` text default NULL,                    # comma-separated list of project ids assigned to this client
+  `status` tinyint(4) default 1,                   # client status
   PRIMARY KEY (`id`)
 );
 
@@ -469,4 +469,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.13', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.14', now()); # TODO: change when structure changes.

From e61ac06c8cef6425af27ee29a0cd0ca908108eb2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Nov 2018 16:10:25 +0000
Subject: [PATCH 0349/1848] Removed old import and export classes.

---
 WEB-INF/lib/ttExportHelper.class.php    | 420 -------------------
 WEB-INF/lib/ttImportHelper.class.php    | 509 ------------------------
 WEB-INF/lib/ttOrgExportHelper.class.php |   5 +-
 WEB-INF/lib/ttOrgImportHelper.class.php |   1 +
 WEB-INF/templates/footer.tpl            |   2 +-
 export.php                              |   7 +-
 import.php                              |   9 +-
 7 files changed, 7 insertions(+), 946 deletions(-)
 delete mode 100644 WEB-INF/lib/ttExportHelper.class.php
 delete mode 100644 WEB-INF/lib/ttImportHelper.class.php

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
deleted file mode 100644
index 7072f2b73..000000000
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-import('ttTeamHelper');
-import('ttTimeHelper');
-
-// ttExportHelper - this class is used to export group data to a file.
-class ttExportHelper {
-  var $fileName    = null;    // Name of the file with data.
-
-  // The following arrays are maps between entity ids in the file versus the database.
-  // We write to the file sequentially (1,2,3...) while in the database the entities have different ids.
-  var $userMap     = array(); // User ids.
-  var $roleMap     = array(); // Role ids.
-  var $projectMap  = array(); // Project ids.
-  var $taskMap     = array(); // Task ids.
-  var $clientMap   = array(); // Client ids.
-  var $invoiceMap  = array(); // Invoice ids.
-  var $customFieldMap       = array(); // Custom field ids.
-  var $customFieldOptionMap = array(); // Custop field option ids.
-  var $logMap      = array(); // Time log ids.
-
-  // createDataFile creates a file with all data for a given group.
-  function createDataFile($compress = false) {
-    global $user;
-    $group_id = $user->getActiveGroup();
-
-    // Create a temporary file.
-    $dirName = dirname(TEMPLATE_DIR . '_c/.');
-    $tmp_file = tempnam($dirName, 'tt');
-
-    // Open the file for writing.
-    $file = fopen($tmp_file, 'wb');
-    if (!$file) return false;
-
-    // Write XML to the file.
-    fwrite($file, "<?xml version=\"1.0\"?>\n");
-    fwrite($file, "<org>\n");
-
-    // Write group info.
-    fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
-      "\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
-      "\" tracking_mode=\"".$user->tracking_mode."\" project_required=\"".$user->project_required."\" task_required=\"".$user->task_required.
-      "\" record_type=\"".$user->record_type."\" bcc_email=\"".$user->bcc_email.
-      "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
-      "\" config=\"".$user->config.
-      "\">\n");
-    fwrite($file, "  <name><![CDATA[".$user->group_name."]]></name>\n");
-    fwrite($file, "  <allow_ip><![CDATA[".$user->allow_ip."]]></allow_ip>\n");
-    fwrite($file, "  <password_complexity><![CDATA[".$user->password_complexity."]]></password_complexity>\n");
-    fwrite($file, "</group>\n");
-
-    // Prepare role map.
-    $roles = $this->getRoles();
-    foreach ($roles as $key=>$role_item)
-      $this->roleMap[$role_item['id']] = $key + 1;
-
-    // Prepare user map.
-    $users = $this->getUsers();
-    foreach ($users as $key=>$user_item)
-      $this->userMap[$user_item['id']] = $key + 1;
-
-    // Prepare project map.
-    $projects = ttTeamHelper::getAllProjects($group_id, true);
-    foreach ($projects as $key=>$project_item)
-      $this->projectMap[$project_item['id']] = $key + 1;
-
-    // Prepare task map.
-    $tasks = ttTeamHelper::getAllTasks($group_id, true);
-    foreach ($tasks as $key=>$task_item)
-      $this->taskMap[$task_item['id']] = $key + 1;
-
-    // Prepare client map.
-    $clients = ttTeamHelper::getAllClients($group_id, true);
-    foreach ($clients as $key=>$client_item)
-      $this->clientMap[$client_item['id']] = $key + 1;
-
-    // Prepare invoice map.
-    $invoices = ttTeamHelper::getAllInvoices();
-    foreach ($invoices as $key=>$invoice_item)
-      $this->invoiceMap[$invoice_item['id']] = $key + 1;
-
-    // Prepare custom fields map.
-    $custom_fields = ttTeamHelper::getAllCustomFields($group_id);
-    foreach ($custom_fields as $key=>$custom_field)
-      $this->customFieldMap[$custom_field['id']] = $key + 1;
-
-    // Prepare custom field options map.
-    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($group_id);
-    foreach ($custom_field_options as $key=>$option)
-      $this->customFieldOptionMap[$option['id']] = $key + 1;
-
-    // Write roles.
-    fwrite($file, "<roles>\n");
-    foreach ($roles as $role) {
-      fwrite($file, "  <role id=\"".$this->roleMap[$role['id']]."\" rank=\"".$role['rank']."\"".
-        " rights=\"".$role['rights']."\" status=\"".$role['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$role['name']."]]></name>\n");
-      fwrite($file, "    <description><![CDATA[".$role['description']."]]></description>\n");
-      fwrite($file, "  </role>\n");
-    }
-    fwrite($file, "</roles>\n");
-    unset($roles);
-
-    // Write users.
-    fwrite($file, "<users>\n");
-    foreach ($users as $user_item) {
-      $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
-      fwrite($file, "  <user id=\"".$this->userMap[$user_item['id']]."\" login=\"".htmlentities($user_item['login'])."\" password=\"".$user_item['password']."\" role_id=\"".$role_id."\" client_id=\"".$this->clientMap[$user_item['client_id']]."\" rate=\"".$user_item['rate']."\" email=\"".$user_item['email']."\" status=\"".$user_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$user_item['name']."]]></name>\n");
-      fwrite($file, "  </user>\n");
-    }
-    fwrite($file, "</users>\n");
-
-    // Write tasks.
-    fwrite($file, "<tasks>\n");
-    foreach ($tasks as $task_item) {
-      fwrite($file, "  <task id=\"".$this->taskMap[$task_item['id']]."\" status=\"".$task_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$task_item['name']."]]></name>\n");
-      fwrite($file, "    <description><![CDATA[".$task_item['description']."]]></description>\n");
-      fwrite($file, "  </task>\n");
-    }
-    fwrite($file, "</tasks>\n");
-    unset($tasks);
-
-    // Write projects.
-    fwrite($file, "<projects>\n");
-    foreach ($projects as $project_item) {
-      if($project_item['tasks']){
-        $tasks = explode(',', $project_item['tasks']);
-        $tasks_mapped = array();
-        foreach ($tasks as $item)
-          $tasks_mapped[] = $this->taskMap[$item];
-        $tasks_str = implode(',', $tasks_mapped);
-      }
-      fwrite($file, "  <project id=\"".$this->projectMap[$project_item['id']]."\" tasks=\"".$tasks_str."\" status=\"".$project_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$project_item['name']."]]></name>\n");
-      fwrite($file, "    <description><![CDATA[".$project_item['description']."]]></description>\n");
-      fwrite($file, "  </project>\n");
-    }
-    fwrite($file, "</projects>\n");
-    unset($projects);
-
-    // Write user to project binds.
-    fwrite($file, "<user_project_binds>\n");
-    $user_binds = ttTeamHelper::getUserToProjectBinds($group_id);
-    foreach ($user_binds as $bind) {
-      $user_id = $this->userMap[$bind['user_id']];
-      $project_id = $this->projectMap[$bind['project_id']];
-      fwrite($file, "  <user_project_bind user_id=\"{$user_id}\" project_id=\"{$project_id}\" rate=\"".$bind['rate']."\" status=\"".$bind['status']."\"/>\n");
-    }
-    fwrite($file, "</user_project_binds>\n");
-    unset($user_binds);
-
-    // Write clients.
-    fwrite($file, "<clients>\n");
-    foreach ($clients as $client_item) {
-      if($client_item['projects']){
-        $projects = explode(',', $client_item['projects']);
-        $projects_mapped = array();
-        foreach ($projects as $item)
-          $projects_mapped[] = $this->projectMap[$item];
-        $projects_str = implode(',', $projects_mapped);
-      }
-      fwrite($file, "  <client id=\"".$this->clientMap[$client_item['id']]."\" tax=\"".$client_item['tax']."\" projects=\"".$projects_str."\" status=\"".$client_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$client_item['name']."]]></name>\n");
-      fwrite($file, "    <address><![CDATA[".$client_item['address']."]]></address>\n");
-      fwrite($file, "  </client>\n");
-    }
-    fwrite($file, "</clients>\n");
-    unset($clients);
-
-    // Write invoices.
-    fwrite($file, "<invoices>\n");
-    foreach ($invoices as $invoice_item) {
-      fwrite($file, "  <invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\" date=\"".$invoice_item['date']."\" client_id=\"".$this->clientMap[$invoice_item['client_id']]."\" status=\"".$invoice_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$invoice_item['name']."]]></name>\n");
-      fwrite($file, "  </invoice>\n");
-    }
-    fwrite($file, "</invoices>\n");
-    unset($invoices);
-
-    // Write custom fields.
-    fwrite($file, "<custom_fields>\n");
-    foreach ($custom_fields as $custom_field) {
-      fwrite($file, "  <custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\" type=\"".$custom_field['type']."\" required=\"".$custom_field['required']."\" status=\"".$custom_field['status']."\">\n");
-      fwrite($file, "    <label><![CDATA[".$custom_field['label']."]]></label>\n");
-      fwrite($file, "  </custom_field>\n");
-    }
-    fwrite($file, "</custom_fields>\n");
-    unset($custom_fields);
-
-    // Write custom field options.
-    fwrite($file, "<custom_field_options>\n");
-    foreach ($custom_field_options as $option) {
-      fwrite($file, "  <custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\" field_id=\"".$this->customFieldMap[$option['field_id']]."\">\n");
-      fwrite($file, "    <value><![CDATA[".$option['value']."]]></value>\n");
-      fwrite($file, "  </custom_field_option>\n");
-    }
-    fwrite($file, "</custom_field_options>\n");
-    unset($custom_field_options);
-
-    // Write monthly quotas.
-    $quotas = ttTeamHelper::getMonthlyQuotas($group_id);
-    fwrite($file, "<monthly_quotas>\n");
-    foreach ($quotas as $quota) {
-      fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");
-    }
-    fwrite($file, "</monthly_quotas>\n");
-
-    // Write time log entries.
-    fwrite($file, "<log>\n");
-    $key = 0;
-    foreach ($users as $user_item) {
-      $records = ttTimeHelper::getAllRecords($user_item['id']);
-      foreach ($records as $record) {
-        $key++;
-        $this->logMap[$record['id']] = $key;
-        fwrite($file, "  <log_item id=\"$key\" user_id=\"".$this->userMap[$record['user_id']]."\" date=\"".$record['date']."\" start=\"".$record['start']."\" finish=\"".$record['finish']."\" duration=\"".($record['start']?"":$record['duration'])."\" client_id=\"".$this->clientMap[$record['client_id']]."\" project_id=\"".$this->projectMap[$record['project_id']]."\" task_id=\"".$this->taskMap[$record['task_id']]."\" invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\" billable=\"".$record['billable']."\" paid=\"".$record['paid']."\" status=\"".$record['status']."\">\n");
-        fwrite($file, "    <comment><![CDATA[".$record['comment']."]]></comment>\n");
-        fwrite($file, "  </log_item>\n");
-      }
-    }
-    fwrite($file, "</log>\n");
-    unset($records);
-
-    // Write custom field log.
-    $custom_field_log = ttTeamHelper::getCustomFieldLog($group_id);
-    fwrite($file, "<custom_field_log>\n");
-    foreach ($custom_field_log as $entry) {
-      fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");
-      fwrite($file, "    <value><![CDATA[".$entry['value']."]]></value>\n");
-      fwrite($file, "  </custom_field_log_entry>\n");
-    }
-    fwrite($file, "</custom_field_log>\n");
-    unset($custom_field_log);
-
-    // Write expense items.
-    $expense_items = ttTeamHelper::getExpenseItems($group_id);
-    fwrite($file, "<expense_items>\n");
-    foreach ($expense_items as $expense_item) {
-      fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$expense_item['name']."]]></name>\n");
-      fwrite($file, "  </expense_item>\n");
-    }
-    fwrite($file, "</expense_items>\n");
-    unset($expense_items);
-
-    // Write fav reports.
-    fwrite($file, "<fav_reports>\n");
-    $fav_reports = ttTeamHelper::getFavReports($group_id);
-    foreach ($fav_reports as $fav_report) {
-      $user_list = '';
-      if (strlen($fav_report['users']) > 0) {
-        $arr = explode(',', $fav_report['users']);
-        foreach ($arr as $k=>$v) {
-          if (array_key_exists($arr[$k], $this->userMap))
-            $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
-        }
-      }
-      fwrite($file, "  <fav_report user_id=\"".$this->userMap[$fav_report['user_id']]."\"".
-        " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"".
-        " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"".
-        " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"".
-        " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"".
-        " billable=\"".$fav_report['billable']."\"".
-        " users=\"".$user_list."\"".
-        " period=\"".$fav_report['period']."\"".
-        " period_start=\"".$fav_report['period_start']."\"".
-        " period_end=\"".$fav_report['period_end']."\"".
-        " show_client=\"".$fav_report['show_client']."\"".
-        " show_invoice=\"".$fav_report['show_invoice']."\"".
-        " show_paid=\"".$fav_report['show_paid']."\"".
-        " show_ip=\"".$fav_report['show_ip']."\"".
-        " show_project=\"".$fav_report['show_project']."\"".
-        " show_start=\"".$fav_report['show_start']."\"".
-        " show_duration=\"".$fav_report['show_duration']."\"".
-        " show_cost=\"".$fav_report['show_cost']."\"".
-        " show_task=\"".$fav_report['show_task']."\"".
-        " show_end=\"".$fav_report['show_end']."\"".
-        " show_note=\"".$fav_report['show_note']."\"".
-        " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
-        " show_work_units=\"".$fav_report['show_work_units']."\"".
-        " group_by1=\"".$fav_report['group_by1']."\"".
-        " group_by2=\"".$fav_report['group_by2']."\"".
-        " group_by3=\"".$fav_report['group_by3']."\"".
-        " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
-      fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
-      fwrite($file, "  </fav_report>\n");
-    }
-    fwrite($file, "</fav_reports>\n");
-    unset($fav_reports);
-
-    // Cleanup.
-    unset($users);
-    $this->roleMap = array();
-    $this->userMap = array();
-    $this->projectMap = array();
-    $this->taskMap = array();
-
-    fwrite($file, "</org>\n");
-    fclose($file);
-
-    if ($compress) {
-      $this->fileName = tempnam($dirName, 'tt');
-      $this->compress($tmp_file, $this->fileName);
-      unlink($tmp_file);
-    } else
-      $this->fileName = $tmp_file;
-
-    return true;
-  }
-
-  // getFileName - returns file name.
-  function getFileName() {
-    return $this->fileName;
-  }
-
-  // compress - compresses the content of the $in file into $out file.
-  function compress($in, $out) {
-    // Initial checks of file names and permissions.
-    if (!file_exists($in) || !is_readable ($in))
-      return false;
-    if ((!file_exists($out) && !is_writable(dirname($out))) || (file_exists($out) && !is_writable($out)))
-      return false;
-
-    $in_file = fopen($in, 'rb');
-
-    if (function_exists('bzopen')) {
-      if (!$out_file = bzopen($out, 'w'))
-        return false;
-
-      while (!feof ($in_file)) {
-        $buffer = fread($in_file, 4096);
-        bzwrite($out_file, $buffer, 4096);
-      }
-      bzclose($out_file);
-    }
-    fclose ($in_file);
-    return true;
-  }
-
-  /*
-   * Note about the utility functions below.
-   * We have roughly 4 groups of operations:
-   *   1) Regular system usage for tracking time, etc.
-   *   2) Registration process - used infrequently.
-   *   3) Admin usage - used infrequently.
-   *   4) Export - used infrequently.
-   *
-   * It is tempting to have a generic function to get things done for
-   * all situations. However, as registration, export and admin access are one-off
-   * operations, while regular system usage is daily and must be efficient,
-   * the current approach is to have SEPARATE functions for each mode.
-   *
-   * This is because each mode requires a slightly different approach,
-   * and we don't want to over-complicate things.
-   */
-
-  // getRoles - obtains all roles defined for group.
-  function getRoles() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_roles where group_id = ".$user->getActiveGroup();
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // The getUsers obtains all users in group for the purpose of export.
-  function getUsers() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = ".
-            $user->getActiveGroup()." order by upper(u.name)"; // Note: deleted users are included.
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-}
diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
deleted file mode 100644
index 7fa1e2830..000000000
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-import('ttTeamHelper');
-import('ttUserHelper');
-import('ttProjectHelper');
-import('ttTaskHelper');
-import('ttInvoiceHelper');
-import('ttTimeHelper');
-import('ttClientHelper');
-import('ttCustomFieldHelper');
-import('ttFavReportHelper');
-import('ttExpenseHelper');
-import('ttRoleHelper');
-
-// ttImportHelper - this class is used to import group data from a file.
-class ttImportHelper {
-  var $errors         = null;    // Errors go here. Set in constructor by reference.
-
-  var $currentElement = array(); // Current element of the XML file we are parsing.
-  var $currentTag     = '';      // XML tag of the current element.
-
-  var $canImport      = true;    // False if we cannot import data due to a login collision.
-  var $groupData      = array(); // Array of group data such as group name, etc.
-  var $org_id         = null;    // New organization id we are importing. It is created during the import operation.
-  var $group_id       = null;    // New group id we are importing. It is created during the import operation.
-  var $roles          = array(); // Array of arrays of role properties.
-  var $users          = array(); // Array of arrays of user properties.
-  var $top_role_id    = null;    // Top manager role id on the new server.
-
-  // The following arrays are maps between entity ids in the file versus the database.
-  // In the file they are sequential (1,2,3...) while in the database the entities have different ids.
-  var $roleMap       = array(); // Role ids.
-  var $userMap       = array(); // User ids.
-  var $projectMap    = array(); // Project ids.
-  var $taskMap       = array(); // Task ids.
-  var $clientMap     = array(); // Client ids.
-  var $invoiceMap    = array(); // Invoice ids.
-
-  var $customFieldMap       = array(); // Custom field ids.
-  var $customFieldOptionMap = array(); // Custop field option ids.
-  var $logMap        = array(); // Time log ids.
-
-  // Constructor.
-  function __construct(&$errors) {
-    $this->errors = &$errors;
-  }
-
-  // startElement - callback handler for opening tag of an XML element.
-  // In this function we assign passed in attributes to currentElement.
-  function startElement($parser, $name, $attrs) {
-    if ($name == 'GROUP'
-      || $name == 'USER'
-      || $name == 'TASK'
-      || $name == 'PROJECT'
-      || $name == 'CLIENT'
-      || $name == 'INVOICE'
-      || $name == 'MONTHLY_QUOTA'
-      || $name == 'LOG_ITEM'
-      || $name == 'CUSTOM_FIELD'
-      || $name == 'CUSTOM_FIELD_OPTION'
-      || $name == 'CUSTOM_FIELD_LOG_ENTRY'
-      || $name == 'INVOICE_HEADER'
-      || $name == 'USER_PROJECT_BIND'
-      || $name == 'EXPENSE_ITEM'
-      || $name == 'FAV_REPORT'
-      || $name == 'ROLE') {
-      $this->currentElement = $attrs;
-    }
-    $this->currentTag = $name;
-  }
-
-  // endElement - callback handler for the closing tag of an XML element.
-  // When we are here, currentElement is an array of the element attributes (as set in startElement).
-  // Here we do the actual import of data into the database.
-  function endElement($parser, $name) {
-    if ($name == 'GROUP') {
-      $this->groupData = $this->currentElement;
-      // Now groupData is an array of group properties. We'll use it later to create a group.
-      // Cannot create the group here. Need to determine whether logins collide with existing logins.
-      $this->currentElement = array();
-    }
-    if ($name == 'ROLE') {
-      $this->roles[$this->currentElement['ID']] = $this->currentElement;
-      $this->currentElement = array();
-    }
-    if ($name == 'USER') {
-      $this->users[$this->currentElement['ID']] = $this->currentElement;
-      $this->currentElement = array();
-    }
-    if ($name == 'USERS') {
-      foreach ($this->users as $user_item) {
-        if (('' != $user_item['STATUS']) && ttUserHelper::getUserByLogin($user_item['LOGIN'])) {
-          // We have a login collision, cannot import any data.
-          $this->canImport = false;
-          break;
-        }
-      }
-
-      // Now we can create a group.
-      if ($this->canImport) {
-        $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
-        $group_id = $this->createGroup(array(
-          'name' => $this->groupData['NAME'],
-          'currency' => $this->groupData['CURRENCY'],
-          'decimal_mark' => $this->groupData['DECIMAL_MARK'],
-          'lang' => $this->groupData['LANG'],
-          'date_format' => $this->groupData['DATE_FORMAT'],
-          'time_format' => $this->groupData['TIME_FORMAT'],
-          'week_start' => $this->groupData['WEEK_START'],
-          'tracking_mode' => $this->groupData['TRACKING_MODE'],
-          'project_required' => $this->groupData['PROJECT_REQUIRED'],
-          'task_required' => $this->groupData['TASK_REQUIRED'],
-          'record_type' => $this->groupData['RECORD_TYPE'],
-          'bcc_email' => $this->groupData['BCC_EMAIL'],
-          'allow_ip' => $this->groupData['ALLOW_IP'],
-          'password_complexity' => $this->groupData['PASSWORD_COMPLEXITY'],
-          'plugins' => $this->groupData['PLUGINS'],
-          'lock_spec' => $this->groupData['LOCK_SPEC'],
-          'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
-          'config' => $this->groupData['CONFIG']));
-        if ($group_id) {
-          $this->org_id = $group_id;
-          $this->group_id = $group_id;
-
-          // Create roles.
-          foreach ($this->roles as $key=>$role_item) {
-            $role_id = ttRoleHelper::insert(array(
-              'group_id' => $this->group_id,
-              'org_id' => $this->org_id,
-              'name' => $role_item['NAME'],
-              'description' => $role_item['DESCRIPTION'],
-              'rank' => $role_item['RANK'],
-              'rights' => $role_item['RIGHTS'],
-              'status' => $role_item['STATUS']));
-            $this->roleMap[$role_item['ID']] = $role_id;
-          }
-
-          foreach ($this->users as $key=>$user_item) {
-            $role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id :  $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
-            $user_id = ttUserHelper::insert(array(
-              'group_id' => $this->group_id,
-              'org_id' => $this->org_id,
-              'role_id' => $role_id,
-              'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
-              'name' => $user_item['NAME'],
-              'login' => $user_item['LOGIN'],
-              'password' => $user_item['PASSWORD'],
-              'rate' => $user_item['RATE'],
-              'email' => $user_item['EMAIL'],
-              'status' => $user_item['STATUS']), false);
-            $this->userMap[$key] = $user_id;
-          }
-        }
-      }
-    }
-
-    if ($name == 'TASK' && $this->canImport) {
-      $this->taskMap[$this->currentElement['ID']] =
-        ttTaskHelper::insert(array(
-          'group_id' => $this->group_id,
-          'org_id' => $this->org_id,
-          'name' => $this->currentElement['NAME'],
-          'description' => $this->currentElement['DESCRIPTION'],
-          'status' => $this->currentElement['STATUS']));
-    }
-    if ($name == 'PROJECT' && $this->canImport) {
-      // Prepare a list of task ids.
-      $tasks = explode(',', $this->currentElement['TASKS']);
-      foreach ($tasks as $id)
-        $mapped_tasks[] = $this->taskMap[$id];
-
-      // Add a new project.
-      $this->projectMap[$this->currentElement['ID']] =
-        ttProjectHelper::insert(array(
-          'group_id' => $this->group_id,
-          'org_id' => $this->org_id,
-          'name' => $this->currentElement['NAME'],
-          'description' => $this->currentElement['DESCRIPTION'],
-          'tasks' => $mapped_tasks,
-          'status' => $this->currentElement['STATUS']));
-    }
-    if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
-      ttUserHelper::insertBind(array(
-        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-        'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-        'group_id' => $this->group_id,
-        'org_id' => $this->org_id,
-        'rate' => $this->currentElement['RATE'],
-        'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'CLIENT' && $this->canImport) {
-      // Prepare a list of project ids.
-      if ($this->currentElement['PROJECTS']) {
-        $projects = explode(',', $this->currentElement['PROJECTS']);
-        foreach ($projects as $id)
-          $mapped_projects[] = $this->projectMap[$id];
-      }
-
-      $this->clientMap[$this->currentElement['ID']] =
-        ttClientHelper::insert(array(
-          'group_id' => $this->group_id,
-          'org_id' => $this->org_id,
-          'name' => $this->currentElement['NAME'],
-          'address' => $this->currentElement['ADDRESS'],
-          'tax' => $this->currentElement['TAX'],
-          'projects' => $mapped_projects,
-          'status' => $this->currentElement['STATUS']));
-
-        // Update client_id for tt_users to a mapped value.
-        // We did not do it during user insertion because clientMap was not ready then.
-        if ($this->currentElement['ID'] != $this->clientMap[$this->currentElement['ID']])
-          ttClientHelper::setMappedClient($this->group_id, $this->currentElement['ID'], $this->clientMap[$this->currentElement['ID']]);
-    }
-
-    if ($name == 'INVOICE' && $this->canImport) {
-      $this->invoiceMap[$this->currentElement['ID']] =
-        ttInvoiceHelper::insert(array(
-          'group_id' => $this->group_id,
-          'org_id' => $this->org_id,
-          'name' => $this->currentElement['NAME'],
-          'date' => $this->currentElement['DATE'],
-          'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-          'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'MONTHLY_QUOTA' && $this->canImport) {
-      $this->insertMonthlyQuota($this->group_id, $this->currentElement['YEAR'], $this->currentElement['MONTH'], $this->currentElement['MINUTES']);
-    }
-
-    if ($name == 'LOG_ITEM' && $this->canImport) {
-      $this->logMap[$this->currentElement['ID']] =
-        ttTimeHelper::insert(array(
-          'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-          'group_id' => $this->group_id,
-          'org_id' => $this->org_id,
-          'date' => $this->currentElement['DATE'],
-          'start' => $this->currentElement['START'],
-          'finish' => $this->currentElement['FINISH'],
-          'duration' => $this->currentElement['DURATION'],
-          'client' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-          'project' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-          'task' => $this->taskMap[$this->currentElement['TASK_ID']],
-          'invoice' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
-          'note' => (isset($this->currentElement['COMMENT']) ? $this->currentElement['COMMENT'] : ''),
-          'billable' => $this->currentElement['BILLABLE'],
-          'paid' => $this->currentElement['PAID'],
-          'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'CUSTOM_FIELD' && $this->canImport) {
-      $this->customFieldMap[$this->currentElement['ID']] =
-        ttCustomFieldHelper::insertField(array(
-          'group_id' => $this->group_id,
-          'type' => $this->currentElement['TYPE'],
-          'label' => $this->currentElement['LABEL'],
-          'required' => $this->currentElement['REQUIRED'],
-          'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'CUSTOM_FIELD_OPTION' && $this->canImport) {
-      $this->customFieldOptionMap[$this->currentElement['ID']] =
-        ttCustomFieldHelper::insertOption(array(
-          'field_id' => $this->customFieldMap[$this->currentElement['FIELD_ID']],
-          'value' => $this->currentElement['VALUE']));
-    }
-
-    if ($name == 'CUSTOM_FIELD_LOG_ENTRY' && $this->canImport) {
-      ttCustomFieldHelper::insertLogEntry(array(
-        'log_id' => $this->logMap[$this->currentElement['LOG_ID']],
-        'field_id' => $this->customFieldMap[$this->currentElement['FIELD_ID']],
-        'option_id' => $this->customFieldOptionMap[$this->currentElement['OPTION_ID']],
-        'value' => $this->currentElement['VALUE'],
-        'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'EXPENSE_ITEM' && $this->canImport) {
-      ttExpenseHelper::insert(array(
-        'date' => $this->currentElement['DATE'],
-        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-        'group_id' => $this->group_id,
-        'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-        'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-        'name' => $this->currentElement['NAME'],
-        'cost' => $this->currentElement['COST'],
-        'invoice_id' => $this->invoiceMap[$this->currentElement['INVOICE_ID']],
-        'paid' => $this->currentElement['PAID'],
-        'status' => $this->currentElement['STATUS']));
-    }
-
-    if ($name == 'FAV_REPORT' && $this->canImport) {
-      $user_list = '';
-      if (strlen($this->currentElement['USERS']) > 0) {
-        $arr = explode(',', $this->currentElement['USERS']);
-        foreach ($arr as $v)
-          $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->userMap[$v];
-      }
-      ttFavReportHelper::insertReport(array(
-        'name' => $this->currentElement['NAME'],
-        'user_id' => $this->userMap[$this->currentElement['USER_ID']],
-        'client' => $this->clientMap[$this->currentElement['CLIENT_ID']],
-        'option' => $this->customFieldOptionMap[$this->currentElement['CF_1_OPTION_ID']],
-        'project' => $this->projectMap[$this->currentElement['PROJECT_ID']],
-        'task' => $this->taskMap[$this->currentElement['TASK_ID']],
-        'billable' => $this->currentElement['BILLABLE'],
-        'users' => $user_list,
-        'period' => $this->currentElement['PERIOD'],
-        'from' => $this->currentElement['PERIOD_START'],
-        'to' => $this->currentElement['PERIOD_END'],
-        'chclient' => (int) $this->currentElement['SHOW_CLIENT'],
-        'chinvoice' => (int) $this->currentElement['SHOW_INVOICE'],
-        'chpaid' => (int) $this->currentElement['SHOW_PAID'],
-        'chip' => (int) $this->currentElement['SHOW_IP'],
-        'chproject' => (int) $this->currentElement['SHOW_PROJECT'],
-        'chstart' => (int) $this->currentElement['SHOW_START'],
-        'chduration' => (int) $this->currentElement['SHOW_DURATION'],
-        'chcost' => (int) $this->currentElement['SHOW_COST'],
-        'chtask' => (int) $this->currentElement['SHOW_TASK'],
-        'chfinish' => (int) $this->currentElement['SHOW_END'],
-        'chnote' => (int) $this->currentElement['SHOW_NOTE'],
-        'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
-        'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
-        'group_by1' => $this->currentElement['GROUP_BY1'],
-        'group_by2' => $this->currentElement['GROUP_BY2'],
-        'group_by3' => $this->currentElement['GROUP_BY3'],
-        'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
-    }
-    $this->currentTag = '';
-  }
-
-  // dataElement - callback handler for text data fragments. It builds up currentElement array with text pieces from XML.
-  function dataElement($parser, $data) {
-    if ($this->currentTag == 'NAME'
-      || $this->currentTag == 'DESCRIPTION'
-      || $this->currentTag == 'LABEL'
-      || $this->currentTag == 'VALUE'
-      || $this->currentTag == 'COMMENT'
-      || $this->currentTag == 'ADDRESS'
-      || $this->currentTag == 'ALLOW_IP'
-      || $this->currentTag == 'PASSWORD_COMPLEXITY') {
-      if (isset($this->currentElement[$this->currentTag]))
-        $this->currentElement[$this->currentTag] .= trim($data);
-      else
-        $this->currentElement[$this->currentTag] = trim($data);
-    }
-  }
-
-  // importXml - uncompresses the file, reads and parses its content. During parsing,
-  // startElement, endElement, and dataElement functions are called as many times as necessary.
-  // Actual import occurs in the endElement handler.
-  function importXml() {
-    global $i18n;
-
-    // Do we have a compressed file?
-    $compressed = false;
-    $file_ext = substr($_FILES['xmlfile']['name'], strrpos($_FILES['xmlfile']['name'], '.') + 1);
-    if (in_array($file_ext, array('bz','tbz','bz2','tbz2'))) {
-      $compressed = true;
-    }
-
-    // Create a temporary file.
-    $dirName = dirname(TEMPLATE_DIR . '_c/.');
-    $filename = tempnam($dirName, 'import_');
-
-    // If the file is compressed - uncompress it.
-    if ($compressed) {
-      if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->get('error.sys'));
-        return;
-      }
-      unlink($_FILES['xmlfile']['tmp_name']);
-    } else {
-      if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->get('error.upload'));
-        return;
-      }
-    }
-
-    // Initialize XML parser.
-    $parser = xml_parser_create();
-    xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', 'endElement');
-    xml_set_character_data_handler($parser, 'dataElement');
-
-    // Read and parse the content of the file. During parsing, startElement, endElement, and dataElement functions are called.
-    $file = fopen($filename, 'r');
-    while ($data = fread($file, 4096)) {
-      if (!xml_parse($parser, $data, feof($file))) {
-        $this->errors->add(sprintf("XML error: %s at line %d",
-          xml_error_string(xml_get_error_code($parser)),
-          xml_get_current_line_number($parser)));
-      }
-      if (!$this->canImport) {
-        $this->errors->add($i18n->get('error.user_exists'));
-        break;
-      }
-    }
-    xml_parser_free($parser);
-    if ($file) fclose($file);
-    unlink($filename);
-  }
-
-  // uncompress - uncompresses the content of the $in file into the $out file.
-  function uncompress($in, $out) {
-    // Do we have the uncompress function?
-    if (!function_exists('bzopen'))
-      return false;
-
-    // Initial checks of file names and permissions.
-    if (!file_exists($in) || !is_readable ($in))
-      return false;
-    if ((!file_exists($out) && !is_writable(dirname($out))) || (file_exists($out) && !is_writable($out)))
-      return false;
-
-    if (!$out_file = fopen($out, 'wb'))
-      return false;
-    if (!$in_file = bzopen ($in, 'r'))
-      return false;
-
-    while (!feof($in_file)) {
-      $buffer = bzread($in_file, 4096);
-      fwrite($out_file, $buffer, 4096);
-    }
-    bzclose($in_file);
-    fclose ($out_file);
-    return true;
-  }
-
-  // createGroup function creates a new group.
-  private function createGroup($fields) {
-
-    global $user;
-    $mdb2 = getConnection();
-
-    $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
-      ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
-      ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
-
-    $values = ' values ('.$mdb2->quote(trim($fields['name']));
-    $values .= ', '.$mdb2->quote(trim($fields['currency']));
-    $values .= ', '.$mdb2->quote($fields['decimal_mark']);
-    $values .= ', '.$mdb2->quote($fields['lang']);
-    $values .= ', '.$mdb2->quote($fields['date_format']);
-    $values .= ', '.$mdb2->quote($fields['time_format']);
-    $values .= ', '.(int)$fields['week_start'];
-    $values .= ', '.(int)$fields['tracking_mode'];
-    $values .= ', '.(int)$fields['project_required'];
-    $values .= ', '.(int)$fields['task_required'];
-    $values .= ', '.(int)$fields['record_type'];
-    $values .= ', '.$mdb2->quote($fields['bcc_email']);
-    $values .= ', '.$mdb2->quote($fields['allow_ip']);
-    $values .= ', '.$mdb2->quote($fields['password_complexity']);
-    $values .= ', '.$mdb2->quote($fields['plugins']);
-    $values .= ', '.$mdb2->quote($fields['lock_spec']);
-    $values .= ', '.(int)$fields['workday_minutes'];
-    $values .= ', '.$mdb2->quote($fields['config']);
-    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
-    $values .= ')';
-
-    $sql = 'insert into tt_groups '.$columns.$values;
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
-
-    // Update org_id with group_id.
-    // NOTE: Both export and import need an additional effort to properly operate on subgroups.
-    // Currently we are importing one group only, which becomes a top level group.
-    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return $group_id;
-  }
-
-  // insertMonthlyQuota - a helper function to insert a monthly quota.
-  private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
-    $mdb2 = getConnection();
-    $sql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-}
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index 719c486b5..2dd54f1b3 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -30,9 +30,8 @@
 import('ttTimeHelper');
 import('ttGroupExportHelper');
 
-// ttOrgExportHelper - this class is a future replacement for ttExportHelper.
-// Currently, it is work in progress.
-// When done, it should handle export of organizations containing multiple groups.
+// ttOrgExportHelper handles export of organizations consisting of multiple groups
+// into XML file for import (migrating) to another server.
 class ttOrgExportHelper {
 
   var $fileName = null; // Name of file with data.
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 96ac5708c..3afe26948 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -32,6 +32,7 @@
 import('ttProjectHelper');
 import('ttClientHelper');
 import('ttInvoiceHelper');
+import('ttTimeHelper');
 import('ttCustomFieldHelper');
 import('ttExpenseHelper');
 import('ttFavReportHelper');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e6154271f..06e093932 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.14.4431 | 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.14.4432 | 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/export.php b/export.php
index f278b7c96..2206def2d 100644
--- a/export.php
+++ b/export.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttExportHelper');
 import('ttOrgExportHelper');
 import('form.Form');
 
@@ -57,11 +56,7 @@
     $mime_type = 'application/x-bzip2';
   }
 
-//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
-    $exportHelper = new ttOrgExportHelper();
-//  } else {
-//      $exportHelper = new ttExportHelper();
-//  }
+  $exportHelper = new ttOrgExportHelper();
   if ($exportHelper->createDataFile($compress)) {
     header('Pragma: public'); // This is needed for IE8 to download files over https.
     header('Content-Type: '.$mime_type);
diff --git a/import.php b/import.php
index 78630866b..938fdb3dd 100644
--- a/import.php
+++ b/import.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttImportHelper');
 import('ttOrgImportHelper');
 import('form.Form');
 
@@ -43,12 +42,8 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
 
 if ($request->isPost()) {
-//  if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
-    $import = new ttOrgImportHelper($err);
-//  } else {
-//    $import = new ttImportHelper($err);
-//  }
-  $import->importXml();
+  $importHelper = new ttOrgImportHelper($err);
+  $importHelper->importXml();
   if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost
 

From 8492dc052ad85039e0bbe11c7c3e1b8554907f64 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Nov 2018 18:54:40 +0000
Subject: [PATCH 0350/1848] Some refactoring for subgroup support.

---
 WEB-INF/lib/ttAdmin.class.php       |  2 +-
 WEB-INF/lib/ttGroupHelper.class.php | 19 ---------
 WEB-INF/lib/ttOrgHelper.class.php   | 65 +++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |  2 +-
 admin_groups.php                    |  4 +-
 login.php                           |  4 +-
 mobile/login.php                    |  4 +-
 7 files changed, 73 insertions(+), 27 deletions(-)
 create mode 100644 WEB-INF/lib/ttOrgHelper.class.php

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 23d8480d7..ef55ae50b 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -176,7 +176,7 @@ function markGroupDeleted($group_id) {
     //
     // 1) Users may mark some of them deleted during their work.
     // If we mark all of them deleted here, we can't recover nicely
-    // as we'll lose track of what was deleted by user.
+    // as we'll lose track of what was accidentally deleted by user.
     //
     // 2) DB maintenance script (Clean up DB from inactive groups) should
     // get rid of these items permanently eventually.
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 128650c62..6ddffaa8c 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -30,25 +30,6 @@
 // This is a planned replacement for ttTeamHelper as we move forward with subgroups.
 class ttGroupHelper {
 
-  // The getTopGroups function returns an array of all active top groups on the server.
-  static function getTopGroups() {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql =  "select id, name, created, lang from tt_groups".
-            " where status = 1 and org_id = id order by id desc";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $val['date'] = substr($val['created'], 0, 10); // Strip the time.
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // The getGroupName function returns group name.
   static function getGroupName($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
new file mode 100644
index 000000000..2cf045060
--- /dev/null
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -0,0 +1,65 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// Class ttOrgHelper contains helper functions that operate with organizations.
+// Organizations are collections of nested groups of users.
+class ttOrgHelper {
+
+  // The getOrgs function returns an array of all active organizations on the server.
+  static function getOrgs() {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql =  "select id, name, created, lang from tt_groups".
+            " where status = 1 and org_id = id and parent_id is NULL order by id desc";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $val['date'] = substr($val['created'], 0, 10); // Strip the time.
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
+  // The getName function returns organization name (which is a name of its top group).
+  static function getName($org_id) {
+    $mdb2 = getConnection();
+
+    $sql = "select name from tt_groups where id = $org_id and (status = 1 or status = 0) and parent_id is NULL";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val['name'];
+    }
+    return false;
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 06e093932..8529b53cd 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.14.4432 | 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.14.4433 | 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/admin_groups.php b/admin_groups.php
index 78e083ca5..ae66d1501 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -27,7 +27,7 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttGroupHelper');
+import('ttOrgHelper');
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
@@ -36,7 +36,7 @@
 }
 // End of access checks.
 
-$smarty->assign('groups', ttGroupHelper::getTopGroups());
+$smarty->assign('groups', ttOrgHelper::getOrgs());
 $smarty->assign('title', $i18n->get('title.groups'));
 $smarty->assign('content_page_name', 'admin_groups.tpl');
 $smarty->display('index.tpl');
diff --git a/login.php b/login.php
index 3bfed9a4d..e7254152c 100644
--- a/login.php
+++ b/login.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttGroupHelper');
+import('ttOrgHelper');
 import('ttUser');
 
 $cl_login = $request->getParameter('login');
@@ -75,7 +75,7 @@
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
+if(!isTrue(MULTITEAM_MODE) && !ttOrgHelper::getOrgs())
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
diff --git a/mobile/login.php b/mobile/login.php
index d094dfbf1..243aa5781 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttGroupHelper');
+import('ttOrgHelper');
 import('ttUser');
 
 if ($request->isPost()) {
@@ -80,7 +80,7 @@
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
+if(!isTrue(MULTITEAM_MODE) && !ttOrgHelper::getOrgs())
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.

From 3adb3c8c419ca1a01edac5fa62d5f88898415bfa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Nov 2018 21:18:43 +0000
Subject: [PATCH 0351/1848] More progress with db maintenance code to support
 subgroups.

---
 WEB-INF/lib/ttOrgHelper.class.php | 20 ++++++++++++++++++++
 WEB-INF/templates/footer.tpl      |  2 +-
 dbinstall.php                     |  5 +++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 2cf045060..d93e25916 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -62,4 +62,24 @@ static function getName($org_id) {
     }
     return false;
   }
+
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 5 for now).
+  static function getInactiveOrgs() {
+    $inactive_orgs = array();
+    $mdb2 = getConnection();
+
+    // Determine inactive organizations by querying the database for max access timestamp for its users.
+    $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
+    $sql = "select org_id from".
+      " (select max(accessed) as last_access, org_id from tt_users group by org_id order by last_access, org_id) as t".
+      " where last_access is null or last_access < $cutoff_timestamp limit 5"; // Max 5 orgs at a time for now...
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $inactive_orgs[] = $val['org_id'];
+      }
+      return $inactive_orgs;
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8529b53cd..626610856 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.14.4433 | 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.14.4434 | 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/dbinstall.php b/dbinstall.php
index f81e31f7e..f02e90215 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -32,6 +32,7 @@
 import('ttUserHelper');
 import('ttTaskHelper');
 import('ttRoleHelper');
+import('ttOrgHelper');
 
 // setChange - executes an sql statement. TODO: rename this function to something better.
 // Better yet, redo the entire thing and make an installer.
@@ -1004,13 +1005,13 @@ function setChange($sql) {
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
-    $inactive_groups = ttTeamHelper::getInactiveGroups();
+    $inactive_groups = ttOrgHelper::getInactiveOrgs();
 
     $count = count($inactive_groups);
     print "$count inactive groups found...<br>\n";
     for ($i = 0; $i < $count; $i++) {
       print "  deleting group ".$inactive_groups[$i]."<br>\n";
-      $res = ttTeamHelper::delete($inactive_groups[$i]);
+      $res = ttTeamHelper::delete($inactive_groups[$i]); // TODO: rewrite this to delete subgroups, too.
     }
 
     setChange("OPTIMIZE TABLE tt_client_project_binds");

From 32173f5d1d4c523d9f3223489651049cafad9a5e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 11:29:56 +0000
Subject: [PATCH 0352/1848] Removed no longer used maintenance code.

---
 WEB-INF/lib/ttOrgHelper.class.php  |  9 +++++
 WEB-INF/lib/ttTeamHelper.class.php | 60 ------------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 3 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index d93e25916..4a322f07d 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -82,4 +82,13 @@ static function getInactiveOrgs() {
     }
     return false;
   }
+
+  // deleteOrg deletes data for the entire organization from database permanently.
+  static function deleteOrg() {
+    return false; // Work in progress, currently not implemented.
+
+    // We shall do it in a straightforward way by a delete operation from all tables by org_id.
+    // However, at this time not all tables have org_id.
+    // So, we need to add the field as we write code here.
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 8b9d7ed66..40da2720b 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -659,66 +659,6 @@ static function getMonthlyQuotas($group_id) {
     return false;
   }
 
-  // The getInactiveGroups is a maintenance function that returns an array of inactive group ids (max 100).
-  static function getInactiveGroups() {
-    $inactive_groups = array();
-    $mdb2 = getConnection();
-
-    // Get all group ids for groups created or modified more than 1 year ago.
-    $ts = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
-    $sql =  "select id from tt_groups where created < $ts and (modified is null or modified < $ts) order by id";
-    $res = $mdb2->query($sql);
-
-    $count = 0;
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $group_id = $val['id'];
-        if (ttTeamHelper::isGroupActive($group_id) == false) {
-          $count++;
-          $inactive_groups[] = $group_id;
-          // Limit the array size for perfomance by allowing this operation on small chunks only.
-          if ($count >= 100) break;
-        }
-      }
-      return $inactive_groups;
-    }
-    return false;
-  }
-
-  // The isGroupActive determines if a group is using Time Tracker or abandoned it.
-  static function isGroupActive($group_id) {
-    $mdb2 = getConnection();
-
-    $count = 0;
-    $ts = date('Y-m-d', strtotime('-2 years'));
-    $sql = "select count(*) as cnt from tt_log where group_id = $group_id and created > '$ts'";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      if ($val = $res->fetchRow()) {
-        $count = $val['cnt'];
-      }
-    }
-
-    if ($count == 0)
-      return false;  // No time entries for the last 2 years.
-
-    if ($count <= 5) {
-      // We will consider a group inactive if it has 5 or less time entries made more than 1 year ago.
-      $count_last_year = 0;
-      $ts = date('Y-m-d', strtotime('-1 year'));
-      $sql = "select count(*) as cnt from tt_log where group_id = $group_id and created > '$ts'";
-      $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        if ($val = $res->fetchRow()) {
-          $count_last_year = $val['cnt'];
-        }
-        if ($count_last_year == 0)
-          return false;  // No time entries for the last year and only a few entries before that.
-      }
-    }
-    return true;
-  }
-
   // The delete function permanently deletes all data for a group.
   static function delete($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 626610856..ab54bf610 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.14.4434 | 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.14.4435 | 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>

From 5db12e31e86ebd4cb4be29851c07139edcca5ac4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 12:04:20 +0000
Subject: [PATCH 0353/1848] Introduced org_id in tt_monthly_quotas table.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 dbinstall.php                  | 11 +++++++----
 mysql.sql                      |  3 ++-
 plugins/MonthlyQuota.class.php | 16 ++++++++--------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ab54bf610..a89ed9b30 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.14.4435 | 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.15.4436 | 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/dbinstall.php b/dbinstall.php
index f02e90215..0c26a4578 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11814"]) {
+  if ($_POST["convert11797to11815"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -997,6 +997,9 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_invoices` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
     setChange("ALTER TABLE `tt_clients` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.14', modified = now() where param_name = 'version_db' and param_value = '1.18.13'");
+    setChange("ALTER TABLE `tt_monthly_quotas` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_monthly_quotas` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.14') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.15', modified = now() where param_name = 'version_db' and param_value = '1.18.14'");
 
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
@@ -1045,7 +1048,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.14)</b>
+    <td width="80%"><b>Create database structure (v1.18.15)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1090,8 +1093,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.14)</td>
-    <td><input type="submit" name="convert11797to11814" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.15)</td>
+    <td><input type="submit" name="convert11797to11815" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 14a8aa0f9..3652c5288 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -449,6 +449,7 @@ CREATE TABLE `tt_predefined_expenses` (
 #
 CREATE TABLE `tt_monthly_quotas` (
   `group_id` int(11) NOT NULL,            # group id
+  `org_id` int(11) default NULL           # organization id
   `year` smallint(5) UNSIGNED NOT NULL,   # quota year
   `month` tinyint(3) UNSIGNED NOT NULL,   # quota month
   `minutes` int(11) default NULL,         # quota in minutes in specified month and year
@@ -469,4 +470,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.14', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.15', now()); # TODO: change when structure changes.
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 5a4e70798..6a047badd 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -33,20 +33,22 @@ class MonthlyQuota {
 
   var $db;       // Database connection.
   var $group_id; // Group id.
+  var $org_id;   // Organization id.
 
   function __construct() {
     $this->db = getConnection();
     global $user;
-    $this->group_id = $user->group_id;
+    $this->group_id = $user->getActiveGroup();
+    $this->org_id = $user->org_id;
   }
 
   // update - deletes a quota, then inserts a new one.
   public function update($year, $month, $minutes) {
-    $group_id = $this->group_id;
-    $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $group_id";
+    $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $this->group_id";
     $this->db->exec($deleteSql);
     if ($minutes){
-      $insertSql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
+      $insertSql = "INSERT INTO tt_monthly_quotas (group_id, org_id, year, month, minutes)".
+        " values ($this->group_id, $this->org_id, $year, $month, $minutes)";
       $affected = $this->db->exec($insertSql);
       return (!is_a($affected, 'PEAR_Error'));
     }
@@ -64,8 +66,7 @@ public function get($year, $month = null) {
 
   // getSingle - obtains a quota for a single month.
   private function getSingle($year, $month) {
-    $group_id = $this->group_id;
-    $sql = "SELECT minutes FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $group_id";
+    $sql = "SELECT minutes FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $this->group_id";
     $reader = $this->db->query($sql);
     if (is_a($reader, 'PEAR_Error')) {
       return false;
@@ -83,8 +84,7 @@ private function getSingle($year, $month) {
 
   // getMany - returns an array of quotas for a given year for group.
   private function getMany($year){
-    $group_id = $this->group_id;
-    $sql = "SELECT month, minutes FROM tt_monthly_quotas WHERE year = $year AND group_id = $group_id";
+    $sql = "SELECT month, minutes FROM tt_monthly_quotas WHERE year = $year AND group_id = $this->group_id";
     $result = array();
     $res = $this->db->query($sql);
     if (is_a($res, 'PEAR_Error')) {

From 871d0e2a62747b03609afc04e0ed84cfb0b1d776 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 12:45:02 +0000
Subject: [PATCH 0354/1848] Fixed db maintenance code to delete monthly qoutas.

---
 WEB-INF/lib/ttOrgHelper.class.php  | 12 +++++++++---
 WEB-INF/lib/ttTeamHelper.class.php |  5 +++++
 WEB-INF/templates/footer.tpl       |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 4a322f07d..81bfbcf70 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -84,11 +84,17 @@ static function getInactiveOrgs() {
   }
 
   // deleteOrg deletes data for the entire organization from database permanently.
-  static function deleteOrg() {
-    return false; // Work in progress, currently not implemented.
-
+  // Work in progress, currently not fully implemented.
+  static function deleteOrg($org_id) {
     // We shall do it in a straightforward way by a delete operation from all tables by org_id.
     // However, at this time not all tables have org_id.
     // So, we need to add the field as we write code here.
+
+    // Delete monthly quotas.
+    $sql = "delete from tt_monthly_quotas where org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return true; // Work in progress, currently not fully implemented.
   }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 40da2720b..2198c0a85 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -703,6 +703,11 @@ static function delete($group_id) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
+    // Delete monthly quotas.
+    $sql = "delete from tt_monthly_quotas where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
     // Delete group.
     $sql = "delete from tt_groups where id = $group_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a89ed9b30..4239f5132 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.15.4436 | 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.15.4437 | 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>

From 208b036ea536d9d0e96e008c524a52fa3626dcdb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 12:56:15 +0000
Subject: [PATCH 0355/1848] Fixed mysql.sql - broken at 2nd commit earlier.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mysql.sql                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4239f5132..4923429a5 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.15.4437 | 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.15.4438 | 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/mysql.sql b/mysql.sql
index 3652c5288..14fa2aaba 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -449,7 +449,7 @@ CREATE TABLE `tt_predefined_expenses` (
 #
 CREATE TABLE `tt_monthly_quotas` (
   `group_id` int(11) NOT NULL,            # group id
-  `org_id` int(11) default NULL           # organization id
+  `org_id` int(11) default NULL,          # organization id
   `year` smallint(5) UNSIGNED NOT NULL,   # quota year
   `month` tinyint(3) UNSIGNED NOT NULL,   # quota month
   `minutes` int(11) default NULL,         # quota in minutes in specified month and year

From b50c69326fc036816418d39d04ff58062421644d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 13:33:04 +0000
Subject: [PATCH 0356/1848] Introduced org_id in tt_predefined_expenses table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4923429a5..a7e71cff2 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.15.4438 | 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.16.4439 | 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/dbinstall.php b/dbinstall.php
index 0c26a4578..23eac7308 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11815"]) {
+  if ($_POST["convert11797to11816"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1000,6 +1000,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_monthly_quotas` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_monthly_quotas` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.14') set org_id = group_id where org_id is null");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.15', modified = now() where param_name = 'version_db' and param_value = '1.18.14'");
+    setChange("ALTER TABLE `tt_predefined_expenses` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.16', modified = now() where param_name = 'version_db' and param_value = '1.18.15'");
 
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
@@ -1048,7 +1050,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.15)</b>
+    <td width="80%"><b>Create database structure (v1.18.16)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1093,8 +1095,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.15)</td>
-    <td><input type="submit" name="convert11797to11815" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.16)</td>
+    <td><input type="submit" name="convert11797to11816" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 14fa2aaba..9a6030c10 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -437,6 +437,7 @@ create index invoice_idx on tt_expense_items(invoice_id);
 CREATE TABLE `tt_predefined_expenses` (
   `id` int(11) NOT NULL auto_increment, # predefined expense id
   `group_id` int(11) NOT NULL,          # group id
+  `org_id` int(11) default NULL,        # organization id
   `name` varchar(255) NOT NULL,         # predefined expense name, such as mileage
   `cost` decimal(10,2) default '0.00',  # cost for one unit
   PRIMARY KEY  (`id`)
@@ -470,4 +471,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.15', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.16', now()); # TODO: change when structure changes.

From c13d7023d283bda30121b8c9be56f982feeed89c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 15:40:55 +0000
Subject: [PATCH 0357/1848] Added predefined expenses to export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 31 +++++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 47 +++++++++++++++++++----
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 4e6daad26..0e4777a2c 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -174,6 +174,24 @@ function getClients() {
     return false;
   }
 
+  // getPredefinedExpenses - obtains all predefined expenses for group.
+  function getPredefinedExpenses() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_predefined_expenses where group_id = $this->group_id"; // TODO: add " and org_id = $user->org_id" when possible.
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -467,6 +485,19 @@ function writeData() {
     unset($expense_items);
     unset($expense_item_part);
 
+    // Write predefined expenses.
+    $predefined_expenses = $this->getPredefinedExpenses();
+    fwrite($this->file, $this->indentation."  <predefined_expenses>\n");
+    foreach ($predefined_expenses as $predefined_expense) {
+      $predefined_expense_part = $this->indentation.'    '."<predefined_expense name=\"".htmlspecialchars($predefined_expense['name'])."\"";
+      $predefined_expense_part .= " cost=\"".$predefined_expense['cost']."\"";
+      $predefined_expense_part .= "></predefined_expense>\n";
+      fwrite($this->file, $predefined_expense_part);
+    }
+    fwrite($this->file, $this->indentation."  </predefined_expenses>\n");
+    unset($predefined_expenses);
+    unset($predefined_expense_part);
+
     // Write monthly quotas.
     $quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
     fwrite($this->file, $this->indentation."  <monthly_quotas>\n");
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 3afe26948..9f5dd7884 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -431,12 +431,24 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
+      if ($name == 'PREDEFINED_EXPENSE') {
+        if (!$this->insertPredefinedExpense(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'cost' => $attrs['COST']))) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+        return;
+      }
+
       if ($name == 'MONTHLY_QUOTA') {
-        if (!$this->insertMonthlyQuota($this->current_group_id,
-          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
-          $attrs['YEAR'],
-          $attrs['MONTH'],
-          $attrs['MINUTES'])) {
+        if (!$this->insertMonthlyQuota(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'year' => $attrs['YEAR'],
+          'month' => $attrs['MONTH'],
+          'minutes' => $attrs['MINUTES']))) {
           $this->errors->add($i18n->get('error.db'));
         }
         return;
@@ -640,9 +652,30 @@ private function createGroup($fields) {
   }
 
   // insertMonthlyQuota - a helper function to insert a monthly quota.
-  private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
+  private function insertMonthlyQuota($fields) {
+    $mdb2 = getConnection();
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $year = (int) $fields['year'];
+    $month = (int) $fields['month'];
+    $minutes = (int) $fields['minutes'];
+
+    $sql = "INSERT INTO tt_monthly_quotas (group_id, org_id, year, month, minutes)".
+      " values ($group_id, $org_id, $year, $month, $minutes)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // insertPredefinedExpense - a helper function to insert a predefined expense.
+  private function insertPredefinedExpense($fields) {
     $mdb2 = getConnection();
-    $sql = "INSERT INTO tt_monthly_quotas (group_id, year, month, minutes) values ($group_id, $year, $month, $minutes)";
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $mdb2->quote($fields['name']);
+    $cost = $mdb2->quote($fields['cost']);
+
+    $sql = "INSERT INTO tt_predefined_expenses (group_id, org_id, name, cost)".
+      " values ($group_id, $org_id, $name, $cost)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a7e71cff2..60ca1c166 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.16.4439 | 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.16.4440 | 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>

From 07ee49d8208cc8308a167487f010e4b919555e03 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 16:10:00 +0000
Subject: [PATCH 0358/1848] A bit more refactoring towards subgroup support.

---
 WEB-INF/lib/ttPredefinedExpenseHelper.class.php | 12 +++++++-----
 WEB-INF/templates/footer.tpl                    |  2 +-
 dbinstall.php                                   |  1 +
 predefined_expense_add.php                      |  1 -
 predefined_expense_edit.php                     |  1 -
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 2de4dfad3..16826a9d7 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -73,14 +73,15 @@ static function insert($fields)
 
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->decimal_mark)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
-    $sql = "insert into tt_predefined_expenses (group_id, name, cost)
-      values ($group_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
+    $sql = "insert into tt_predefined_expenses (group_id, org_id, name, cost)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -95,15 +96,16 @@ static function update($fields)
 
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $predefined_expense_id = (int) $fields['id'];
-    $group_id = (int) $fields['group_id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->decimal_mark)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
-      " where id = $predefined_expense_id and group_id = $group_id";
+      " where id = $predefined_expense_id and group_id = $group_id"; // TODO: add org_id when possible.
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 60ca1c166..f5c805742 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.16.4440 | 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.16.4441 | 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/dbinstall.php b/dbinstall.php
index 23eac7308..8b7e8c5e1 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1002,6 +1002,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.15', modified = now() where param_name = 'version_db' and param_value = '1.18.14'");
     setChange("ALTER TABLE `tt_predefined_expenses` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.16', modified = now() where param_name = 'version_db' and param_value = '1.18.15'");
+    setChange("UPDATE `tt_predefined_expenses` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.16') set org_id = group_id where org_id is null");
 
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index e653192b8..0bff7e051 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -56,7 +56,6 @@
   if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
   if ($err->no()) {
     if (ttPredefinedExpenseHelper::insert(array(
-        'group_id' => $user->group_id,
         'name' => $cl_name,
         'cost' => $cl_cost))) {
         header('Location: predefined_expenses.php');
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index 9b3727bf1..ab2299c0a 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -64,7 +64,6 @@
   if ($err->no()) {
     if (ttPredefinedExpenseHelper::update(array(
         'id' => $predefined_expense_id,
-        'group_id' => $user->group_id,
         'name' => $cl_name,
         'cost' => $cl_cost))) {
         header('Location: predefined_expenses.php');

From d906edf1ba6fe68dc39f811cbb6fd6b5e94d9d4c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 16:52:44 +0000
Subject: [PATCH 0359/1848] Fixed db cleanup script by including predefined
 expenses.

---
 WEB-INF/lib/ttOrgHelper.class.php  | 5 +++++
 WEB-INF/lib/ttTeamHelper.class.php | 5 +++++
 WEB-INF/templates/footer.tpl       | 2 +-
 dbinstall.php                      | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 81bfbcf70..369212391 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -90,6 +90,11 @@ static function deleteOrg($org_id) {
     // However, at this time not all tables have org_id.
     // So, we need to add the field as we write code here.
 
+    // Delete predefined expenses.
+    $sql = "delete from tt_predefined_expenses where org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
     // Delete monthly quotas.
     $sql = "delete from tt_monthly_quotas where org_id = $org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 2198c0a85..4203fdc61 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -703,6 +703,11 @@ static function delete($group_id) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
+    // Delete predefined expenses.
+    $sql = "delete from tt_predefined_expenses where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
     // Delete monthly quotas.
     $sql = "delete from tt_monthly_quotas where group_id = $group_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f5c805742..232208f90 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.16.4441 | 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.16.4442 | 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/dbinstall.php b/dbinstall.php
index 8b7e8c5e1..069016abe 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1031,6 +1031,7 @@ function setChange($sql) {
     setChange("OPTIMIZE TABLE tt_invoices");
     setChange("OPTIMIZE TABLE tt_log");
     setChange("OPTIMIZE TABLE tt_monthly_quotas");
+    setChange("OPTIMIZE TABLE tt_predefined_expenses");
     setChange("OPTIMIZE TABLE tt_project_task_binds");
     setChange("OPTIMIZE TABLE tt_projects");
     setChange("OPTIMIZE TABLE tt_tasks");

From 0f552019a1c58ff22df3e9f59b9efe22261931fa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 17:48:55 +0000
Subject: [PATCH 0360/1848] Introduced org_id in tt_expense_items table.

---
 WEB-INF/lib/ttPredefinedExpenseHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl                    |  2 +-
 dbinstall.php                                   | 10 ++++++----
 mysql.sql                                       |  3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 16826a9d7..27a3a8332 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -105,7 +105,7 @@ static function update($fields)
       $cost = str_replace($user->decimal_mark, '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
-      " where id = $predefined_expense_id and group_id = $group_id"; // TODO: add org_id when possible.
+      " where id = $predefined_expense_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 232208f90..091178955 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.16.4442 | 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.17.4443 | 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/dbinstall.php b/dbinstall.php
index 069016abe..e8dc454bd 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11816"]) {
+  if ($_POST["convert11797to11817"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1003,6 +1003,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_predefined_expenses` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.16', modified = now() where param_name = 'version_db' and param_value = '1.18.15'");
     setChange("UPDATE `tt_predefined_expenses` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.16') set org_id = group_id where org_id is null");
+    setChange("ALTER TABLE `tt_expense_items` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.17', modified = now() where param_name = 'version_db' and param_value = '1.18.16'");
 
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
@@ -1052,7 +1054,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.16)</b>
+    <td width="80%"><b>Create database structure (v1.18.17)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1097,8 +1099,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.16)</td>
-    <td><input type="submit" name="convert11797to11816" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.17)</td>
+    <td><input type="submit" name="convert11797to11817" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 9a6030c10..5ffc79e43 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -405,6 +405,7 @@ CREATE TABLE `tt_expense_items` (
   `date` date NOT NULL,                   # date the record is for
   `user_id` int(11) NOT NULL,             # user id the expense item is reported by
   `group_id` int(11) default NULL,        # group id
+  `org_id` int(11) default NULL,          # organization id
   `client_id` int(11) default NULL,       # client id
   `project_id` int(11) default NULL,      # project id
   `name` text NOT NULL,                   # expense item name (what is an expense for)
@@ -471,4 +472,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.16', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.17', now()); # TODO: change when structure changes.

From 2352b1096ea3b8301f06d3e5b072022ae08a2f73 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 18:24:14 +0000
Subject: [PATCH 0361/1848] Started to populate org_id during import of expense
 items.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 30 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 9f5dd7884..6764ba53e 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -415,11 +415,11 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'EXPENSE_ITEM') {
         // We get here when processing <expense_item> tags for the current group.
-        $expense_item_id = ttExpenseHelper::insert(array(
+        $expense_item_id = $this->insertExpense(array(
           'date' => $attrs['DATE'],
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'group_id' => $this->current_group_id,
-          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          'org_id' => $this->org_id,
           'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'name' => $attrs['NAME'],
@@ -679,4 +679,30 @@ private function insertPredefinedExpense($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // insertExpense - a helper function to insert an expense item.
+  private function insertExpense($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $date = $fields['date'];
+    $user_id = (int) $fields['user_id'];
+    $client_id = $fields['client_id'];
+    $project_id = $fields['project_id'];
+    $name = $fields['name'];
+    $cost = str_replace(',', '.', $fields['cost']);
+    $invoice_id = $fields['invoice_id'];
+    $status = $fields['status'];
+    $paid = (int) $fields['paid'];
+    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+
+    $sql = "insert into tt_expense_items".
+      " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
+      " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
+      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 091178955..58b036cad 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.17.4443 | 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.17.4444 | 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>

From 1e49bbdab2c6d229a22ed10495b526ac703b0be8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 18:44:00 +0000
Subject: [PATCH 0362/1848] Started to populate org_id on creation of expense
 items.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 28 ++++++++++-----------------
 WEB-INF/templates/footer.tpl          |  2 +-
 dbinstall.php                         |  1 +
 expense_edit.php                      |  4 ++--
 expenses.php                          |  4 ++--
 mobile/expense_edit.php               |  4 ++--
 mobile/expenses.php                   |  4 ++--
 7 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 6d3128fd4..7c0d83ff3 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -34,9 +34,11 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getActiveUser();
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
     $date = $fields['date'];
-    $user_id = (int) $fields['user_id'];
-    $group_id = (int) $fields['group_id'];
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
     $name = $fields['name'];
@@ -46,15 +48,12 @@ static function insert($fields)
     $paid = (int) $fields['paid'];
     $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
 
-    $sql = "insert into tt_expense_items (date, user_id, group_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status) ".
-      "values (".$mdb2->quote($date).", $user_id, $group_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
+    $sql = "insert into tt_expense_items".
+      " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
+      " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
       ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    $id = $mdb2->lastInsertID('tt_expense_items', 'id');
-    return $id;
+    return (!is_a($affected, 'PEAR_Error'));
   }
 
   // update - updates a record in tt_expense_items table.
@@ -82,12 +81,8 @@ static function update($fields)
       ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).
       ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part, invoice_id = ".$mdb2->quote($invoice_id).
       " WHERE id = $id";
-
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
 
   // markDeleted - marks an item as deleted in tt_expense_items table.
@@ -96,10 +91,7 @@ static function markDeleted($id, $user_id) {
 
     $sql = "update tt_expense_items set status = NULL where id = $id and user_id = $user_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
 
   // getTotalForDay - gets total expenses for a user for a specific date.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 58b036cad..0fa85daaf 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.17.4444 | 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.17.4445 | 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/dbinstall.php b/dbinstall.php
index e8dc454bd..437dac2e9 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1005,6 +1005,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_predefined_expenses` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.16') set org_id = group_id where org_id is null");
     setChange("ALTER TABLE `tt_expense_items` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.17', modified = now() where param_name = 'version_db' and param_value = '1.18.16'");
+    setChange("UPDATE `tt_expense_items` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') set org_id = group_id where org_id is null");
 
     // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
     // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
diff --git a/expense_edit.php b/expense_edit.php
index 353f5ce53..0c7cee5cd 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -205,8 +205,8 @@
 
     // Now, a new insert.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
-        'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
+      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       } else
diff --git a/expenses.php b/expenses.php
index fa45ad444..69d8ae72a 100644
--- a/expenses.php
+++ b/expenses.php
@@ -188,8 +188,8 @@
 
     // Insert record.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
-        'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
+      if (ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php');
         exit();
       } else
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 338e6c778..61edca261 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -200,8 +200,8 @@
 
     // Now, a new insert.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
-        'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
+      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       } else
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 25a1c6025..97232f70d 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -192,8 +192,8 @@
 
     // Insert record.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(),'group_id'=>$user->getActiveGroup(),
-        'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
+      if (ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
         header('Location: expenses.php');
         exit();
       } else

From 6bd6e0481ca4c22c47de758d53eef9db5e565e5c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 21:24:23 +0000
Subject: [PATCH 0363/1848] Populating tt_user_project_binds.

---
 WEB-INF/lib/ttOrgHelper.class.php | 5 +++++
 WEB-INF/templates/footer.tpl      | 2 +-
 dbinstall.php                     | 4 +---
 mysql.sql                         | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 369212391..c69fc7a7a 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -90,6 +90,11 @@ static function deleteOrg($org_id) {
     // However, at this time not all tables have org_id.
     // So, we need to add the field as we write code here.
 
+    // Delete expense items.
+    $sql = "delete from tt_expense_items where org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
     // Delete predefined expenses.
     $sql = "delete from tt_predefined_expenses where org_id = $org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0fa85daaf..433f5934b 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.17.4445 | 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.17.4446 | 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/dbinstall.php b/dbinstall.php
index 437dac2e9..eec023683 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1006,9 +1006,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_expense_items` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.17', modified = now() where param_name = 'version_db' and param_value = '1.18.16'");
     setChange("UPDATE `tt_expense_items` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') set org_id = group_id where org_id is null");
-
-    // TODO: this does not work as we just introduced group_id and it is NULL. Same for tt_project_task_binds. Improve.
-    // setChange("UPDATE `tt_user_project_binds` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.12') set org_id = group_id where org_id is null");
+    setChange("update `tt_user_project_binds` upb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_users` u on u.id = upb.user_id set upb.group_id = u.group_id, upb.org_id = u.org_id where upb.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 5ffc79e43..5ee9ad4a3 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -384,7 +384,7 @@ CREATE TABLE `tt_custom_field_options` (
 # This table supplements tt_log and contains custom field values for records.
 #
 CREATE TABLE `tt_custom_field_log` (
-  `id` bigint NOT NULL auto_increment, # cutom field log id
+  `id` bigint NOT NULL auto_increment, # custom field log id
   `log_id` bigint NOT NULL,            # id of a record in tt_log this record corresponds to
   `field_id` int(11) NOT NULL,         # custom field id
   `option_id` int(11) default NULL,    # Option id. Used for dropdown custom fields.

From 280d6ea0ee096843551d7734b23377ec06d42e81 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 17 Nov 2018 22:38:52 +0000
Subject: [PATCH 0364/1848] Started to populate tt_project_task_binds with
 group_id and org_id.

---
 WEB-INF/lib/ttOrgImportHelper.class.php |  4 ++--
 WEB-INF/lib/ttProjectHelper.class.php   | 12 +++++-----
 WEB-INF/lib/ttTaskHelper.class.php      | 29 ++++++++++++++-----------
 WEB-INF/templates/footer.tpl            |  2 +-
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 6764ba53e..d95aabb46 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -204,8 +204,8 @@ function startElement($parser, $name, $attrs) {
         foreach ($tasks as $id)
           $mapped_tasks[] = $this->currentGroupTaskMap[$id];
 
-        $project_id = ttProjectHelper::insert(array(
-          'group_id' => $this->current_group_id,
+        $project_id = ttProjectHelper::insert(array( // TODO: continue refactoring, write a separate, simple function to import projects
+          'group_id' => $this->current_group_id,     // because ttProjectHelper::insert is complicated.
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'description' => $attrs['DESCRIPTION'],
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 47783d59d..240760df3 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -226,7 +226,8 @@ static function insert($fields)
     $all_tasks = ttTeamHelper::getAllTasks($group_id);
     foreach ($all_tasks as $task) {
       if(in_array($task['id'], $tasks)) {
-        $sql = "insert into tt_project_task_binds (project_id, task_id) values($last_id, ".$task['id'].")";
+        $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
+          " values($last_id, ".$task['id'].", $group_id, $org_id)";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
@@ -240,7 +241,9 @@ static function insert($fields)
   static function update($fields) {
     global $user;
     $mdb2 = getConnection();
-    
+
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $project_id = $fields['id']; // Project we are updating.
     $name = $fields['name']; // Project name.
     $description = $fields['description']; // Project description.
@@ -271,8 +274,6 @@ static function update($fields) {
       while ($row = $res->fetchRow()) {
         $user_rate[$row['id']] = $row['rate'];
       }
-      $group_id = $user->getActiveGroup();
-      $org_id = $user->org_id;
       foreach ($users_to_add as $id) {
         $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
           " values($id, $project_id, $group_id, $org_id, ".$user_rate[$id].", 1)";
@@ -308,7 +309,8 @@ static function update($fields) {
         return false;
     }    
     foreach ($task_binds_to_add as $task_id) {
-      $sql = "insert into tt_project_task_binds (project_id, task_id) values($project_id, $task_id)";
+      $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
+        " values($project_id, $task_id, $group_id, $org_id)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index b4644d513..2c0fbe1e1 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -157,12 +157,13 @@ static function insert($fields)
     if (is_array($projects)) {
       foreach ($projects as $p_id) {
         // Insert task binds into tt_project_task_binds table.
-        $sql = "insert into tt_project_task_binds (project_id, task_id) values($p_id, $last_id)";
+        $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
+          " values($p_id, $last_id, $group_id, $org_id)";
         $affected = $mdb2->exec($sql);
-   		if (is_a($affected, 'PEAR_Error'))
-   		  return false;
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
 
-   		// Add task bind to the tasks field of the tt_projects table.
+        // Add task bind to the tasks field of the tt_projects table.
         $sql = "select tasks from tt_projects where id = $p_id";
         $res = $mdb2->query($sql);
         if (is_a($res, 'PEAR_Error'))
@@ -171,16 +172,16 @@ static function insert($fields)
         $val = $res->fetchRow();
         $task_ids = $val['tasks'];
         if ($task_ids) {
-		  $task_ids .= ",$last_id";
-		  $task_ids = ttTaskHelper::sort($task_ids);
-		} else
-		  $task_ids = $last_id;
+          $task_ids .= ",$last_id";
+          $task_ids = ttTaskHelper::sort($task_ids);
+        } else
+          $task_ids = $last_id;
 
         $sql = "update tt_projects set tasks = ".$mdb2->quote($task_ids)." where id = $p_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
-	  }
+      }
     }
     return $last_id;
   }
@@ -189,9 +190,10 @@ static function insert($fields)
   static function update($fields)
   {
     global $user;
-  	    
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $task_id = (int)$fields['task_id'];
     $name = $fields['name'];
     $description = $fields['description'];
@@ -199,7 +201,7 @@ static function update($fields)
     $projects = $fields['projects'];
 
     $sql = "update tt_tasks set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-      ", status = $status where id = $task_id and group_id = $user->group_id";
+      ", status = $status where id = $task_id and group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       die($affected->getMessage());
@@ -211,7 +213,8 @@ static function update($fields)
       die($affected->getMessage());
     if (count($projects) > 0)
       foreach ($projects as $p_id) {
-        $sql = "insert into tt_project_task_binds (project_id, task_id) values($p_id, $task_id)";
+        $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
+          " values($p_id, $task_id, $group_id, $org_id)";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           die($affected->getMessage());
@@ -221,7 +224,7 @@ static function update($fields)
     // We need to either delete or insert task id in all affected projects.
     
     // Get all not deleted projects for group.
-    $sql = "select id, tasks from tt_projects where group_id = $user->group_id and status is not NULL";
+    $sql = "select id, tasks from tt_projects where group_id = $group_id and status is not NULL";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       die($res->getMessage());
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 433f5934b..a01384ccc 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.17.4446 | 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.17.4447 | 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>

From 4dab570c0194d954b9b0a064c1d5249ffb19981d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 16:19:35 +0000
Subject: [PATCH 0365/1848] Fixed export for project to task binds.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 0e4777a2c..0c56117e0 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -296,6 +296,7 @@ function writeData() {
     // Write projects.
     fwrite($this->file, $this->indentation."  <projects>\n");
     foreach ($projects as $project_item) {
+      $tasks_str = null;
       if($project_item['tasks']){
         $tasks = explode(',', $project_item['tasks']);
         $tasks_mapped = array();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a01384ccc..22d4c5e10 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.17.4447 | 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.17.4448 | 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>

From 61866da737a6cc06ae2c1e4ba766a0c46ab4fb8a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 17:54:44 +0000
Subject: [PATCH 0366/1848] Populating group_id and org_id in
 tt_project_task_binds table.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 22d4c5e10..7eb704844 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.17.4448 | 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.17.4449 | 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/dbinstall.php b/dbinstall.php
index eec023683..ef895bdd3 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1007,6 +1007,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.17', modified = now() where param_name = 'version_db' and param_value = '1.18.16'");
     setChange("UPDATE `tt_expense_items` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') set org_id = group_id where org_id is null");
     setChange("update `tt_user_project_binds` upb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_users` u on u.id = upb.user_id set upb.group_id = u.group_id, upb.org_id = u.org_id where upb.org_id is null");
+    setChange("update `tt_project_task_binds` ptb inner join tt_site_config sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_projects` p on p.id = ptb.project_id set ptb.group_id = p.group_id, ptb.org_id = p.org_id where ptb.org_id is null");
   }
 
   if ($_POST["cleanup"]) {

From 06b80cf38fc0268250fcca3b7270801b4991505f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 18:14:03 +0000
Subject: [PATCH 0367/1848] Introduced an index in tt_project_task_binds to
 eliminate duplicates.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 mysql.sql                    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7eb704844..f66ff9ba2 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.17.4449 | 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.17.4450 | 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/dbinstall.php b/dbinstall.php
index ef895bdd3..e3561eddb 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1008,6 +1008,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_expense_items` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') set org_id = group_id where org_id is null");
     setChange("update `tt_user_project_binds` upb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_users` u on u.id = upb.user_id set upb.group_id = u.group_id, upb.org_id = u.org_id where upb.org_id is null");
     setChange("update `tt_project_task_binds` ptb inner join tt_site_config sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_projects` p on p.id = ptb.project_id set ptb.group_id = p.group_id, ptb.org_id = p.org_id where ptb.org_id is null");
+    setChange("create unique index project_task_idx on tt_project_task_binds(project_id, task_id)");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 5ee9ad4a3..23dbb14ad 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -177,6 +177,7 @@ CREATE TABLE `tt_project_task_binds` (
 # Indexes for tt_project_task_binds.
 create index project_idx on tt_project_task_binds(project_id);
 create index task_idx on tt_project_task_binds(task_id);
+create unique index project_tax_idx on tt_project_task_binds(project_id, task_id);
 
 
 #
@@ -472,4 +473,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.17', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.18', now()); # TODO: change when structure changes.

From 8e10219e51dcb9c39d84fe792b6207227d12b46a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 18:39:45 +0000
Subject: [PATCH 0368/1848] Version update.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f66ff9ba2..cf8c742be 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.17.4450 | 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.18.4451 | 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/dbinstall.php b/dbinstall.php
index e3561eddb..3dfcb9316 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11817"]) {
+  if ($_POST["convert11797to11818"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1009,6 +1009,7 @@ function setChange($sql) {
     setChange("update `tt_user_project_binds` upb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_users` u on u.id = upb.user_id set upb.group_id = u.group_id, upb.org_id = u.org_id where upb.org_id is null");
     setChange("update `tt_project_task_binds` ptb inner join tt_site_config sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_projects` p on p.id = ptb.project_id set ptb.group_id = p.group_id, ptb.org_id = p.org_id where ptb.org_id is null");
     setChange("create unique index project_task_idx on tt_project_task_binds(project_id, task_id)");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.18', modified = now() where param_name = 'version_db' and param_value = '1.18.17'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1055,7 +1056,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.17)</b>
+    <td width="80%"><b>Create database structure (v1.18.18)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1100,8 +1101,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.17)</td>
-    <td><input type="submit" name="convert11797to11817" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.18)</td>
+    <td><input type="submit" name="convert11797to11818" value="Update"></td>
   </tr>
 </table>
 

From b0e20fffa896966634ad3274225c317003331a04 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 18:43:29 +0000
Subject: [PATCH 0369/1848] Fixed index name.

---
 mysql.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql.sql b/mysql.sql
index 23dbb14ad..692a8d25c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -177,7 +177,7 @@ CREATE TABLE `tt_project_task_binds` (
 # Indexes for tt_project_task_binds.
 create index project_idx on tt_project_task_binds(project_id);
 create index task_idx on tt_project_task_binds(task_id);
-create unique index project_tax_idx on tt_project_task_binds(project_id, task_id);
+create unique index project_task_idx on tt_project_task_binds(project_id, task_id);
 
 
 #

From c5742659a15a48bd5ddcba78d648a26cc6c520ee Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 22:14:32 +0000
Subject: [PATCH 0370/1848] Refactored import a bit by writing a function to
 insert projects with binds.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 53 ++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index d95aabb46..4c57739b3 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -29,7 +29,6 @@
 import('ttUserHelper');
 import('ttRoleHelper');
 import('ttTaskHelper');
-import('ttProjectHelper');
 import('ttClientHelper');
 import('ttInvoiceHelper');
 import('ttTimeHelper');
@@ -200,12 +199,14 @@ function startElement($parser, $name, $attrs) {
         // We get here when processing <project> tags for the current group.
 
         // Prepare a list of task ids.
-        $tasks = explode(',', $attrs['TASKS']);
-        foreach ($tasks as $id)
-          $mapped_tasks[] = $this->currentGroupTaskMap[$id];
+        if ($attrs['TASKS']) {
+          $tasks = explode(',', $attrs['TASKS']);
+          foreach ($tasks as $id)
+            $mapped_tasks[] = $this->currentGroupTaskMap[$id];
+        }
 
-        $project_id = ttProjectHelper::insert(array( // TODO: continue refactoring, write a separate, simple function to import projects
-          'group_id' => $this->current_group_id,     // because ttProjectHelper::insert is complicated.
+        $project_id = $this->insertProject(array(
+          'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'description' => $attrs['DESCRIPTION'],
@@ -705,4 +706,44 @@ private function insertExpense($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // insertProject - a helper function to insert a project as well as project to task binds.
+  private function insertProject($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+
+    $name = $fields['name'];
+    $description = $fields['description'];
+    $tasks = $fields['tasks'];
+    $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
+    $status = $fields['status'];
+
+    $sql = "insert into tt_projects (group_id, org_id, name, description, tasks, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = 0;
+    $sql = "select last_insert_id() as last_insert_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $last_id = $val['last_insert_id'];
+
+    // Insert binds into tt_project_task_binds table.
+    if (is_array($tasks)) {
+      foreach ($tasks as $task_id) {
+        $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
+          " values($last_id, $task_id, $group_id, $org_id)";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+      }
+    }
+
+    return $last_id;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cf8c742be..417439b12 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.18.4451 | 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.18.4453 | 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>

From 3510da81df216bb117f197dc69366fc564902754 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Nov 2018 22:30:56 +0000
Subject: [PATCH 0371/1848] Added group_id and org_id to tt_fav_reports table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 417439b12..f7d31bb22 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.18.4453 | 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.19.4454 | 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/dbinstall.php b/dbinstall.php
index 3dfcb9316..7dda42134 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11818"]) {
+  if ($_POST["convert11797to11819"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1010,6 +1010,9 @@ function setChange($sql) {
     setChange("update `tt_project_task_binds` ptb inner join tt_site_config sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_projects` p on p.id = ptb.project_id set ptb.group_id = p.group_id, ptb.org_id = p.org_id where ptb.org_id is null");
     setChange("create unique index project_task_idx on tt_project_task_binds(project_id, task_id)");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.18', modified = now() where param_name = 'version_db' and param_value = '1.18.17'");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.19', modified = now() where param_name = 'version_db' and param_value = '1.18.18'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1056,7 +1059,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.18)</b>
+    <td width="80%"><b>Create database structure (v1.18.19)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1101,8 +1104,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.18)</td>
-    <td><input type="submit" name="convert11797to11818" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.19)</td>
+    <td><input type="submit" name="convert11797to11819" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 692a8d25c..d5dbe4100 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -254,6 +254,8 @@ CREATE TABLE `tt_fav_reports` (
   `id` int(11) NOT NULL auto_increment,                  # favorite report id
   `name` varchar(200) NOT NULL,                          # favorite report name
   `user_id` int(11) NOT NULL,                            # user id favorite report belongs to
+  `group_id` int(11) default NULL,                       # group id
+  `org_id` int(11) default NULL,                         # organization id
   `report_spec` text default NULL,                       # future replacement field for all report settings
   `client_id` int(11) default NULL,                      # client id (if selected)
   `cf_1_option_id` int(11) default NULL,                 # custom field 1 option id (if selected)
@@ -473,4 +475,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.18', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.19', now()); # TODO: change when structure changes.

From f1025fe95f90cd8dc7fa3b3f75617e447ab33f2e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 09:05:24 +0000
Subject: [PATCH 0372/1848] Populated group_id and org_id in tt_fav_reports
 table.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 21 ++++++++-----
 WEB-INF/lib/ttOrgImportHelper.class.php | 40 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           |  1 +
 reports.php                             |  2 +-
 5 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 305a4fc8c..ab9fa0e09 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -77,16 +77,21 @@ static function getReportByName($user_id, $report_name) {
 
   // insertReport - stores reports settings in database.
   static function insertReport($fields) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "insert into tt_fav_reports (name, user_id, client_id, cf_1_option_id, project_id, task_id,
-      billable, invoice, paid_status, users, period, period_start, period_end,
-      show_client, show_invoice, show_paid, show_ip,
-      show_project, show_start, show_duration, show_cost,
-      show_task, show_end, show_note, show_custom_field_1, show_work_units,
-      group_by1, group_by2, group_by3, show_totals_only)
-      values(".
-      $mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    $sql = "insert into tt_fav_reports".
+      " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
+      " billable, invoice, paid_status, users, period, period_start, period_end,".
+      " show_client, show_invoice, show_paid, show_ip,".
+      " show_project, show_start, show_duration, show_cost,".
+      " show_task, show_end, show_note, show_custom_field_1, show_work_units,".
+      " group_by1, group_by2, group_by3, show_totals_only)".
+      " values(".
+      $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 4c57739b3..c57cc6405 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -462,9 +462,11 @@ function startElement($parser, $name, $attrs) {
           foreach ($arr as $v)
             $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->currentGroupUserMap[$v];
         }
-        $fav_report_id = ttFavReportHelper::insertReport(array(
+        if (!$this->insertFavReport(array(
           'name' => $attrs['NAME'],
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
           'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'option' => $this->currentGroupCustomFieldOptionMap[$attrs['CF_1_OPTION_ID']],
           'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
@@ -490,8 +492,9 @@ function startElement($parser, $name, $attrs) {
           'group_by1' => $attrs['GROUP_BY1'],
           'group_by2' => $attrs['GROUP_BY2'],
           'group_by3' => $attrs['GROUP_BY3'],
-          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']));
-         if (!$fav_report_id) $this->errors->add($i18n->get('error.db'));
+          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']))) {
+           $this->errors->add($i18n->get('error.db'));
+         }
          return;
       }
     }
@@ -746,4 +749,35 @@ private function insertProject($fields)
 
     return $last_id;
   }
+
+  // insertFavReport - inserts a favorite report in database.
+  private function insertFavReport($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+
+    $sql = "insert into tt_fav_reports".
+      " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
+      " billable, invoice, paid_status, users, period, period_start, period_end,".
+      " show_client, show_invoice, show_paid, show_ip,".
+      " show_project, show_start, show_duration, show_cost,".
+      " show_task, show_end, show_note, show_custom_field_1, show_work_units,".
+      " group_by1, group_by2, group_by3, show_totals_only)".
+      " values(".
+      $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
+      $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
+      $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
+      $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
+      $mdb2->quote($fields['paid_status']).", ".
+      $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
+      $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
+      $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
+      $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
+      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
+      $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
+      $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f7d31bb22..463340b76 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.19.4454 | 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.19.4455 | 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/dbinstall.php b/dbinstall.php
index 7dda42134..0d8ea9a40 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1013,6 +1013,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_id` int(11) default NULL AFTER `user_id`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.19', modified = now() where param_name = 'version_db' and param_value = '1.18.18'");
+    setChange("update `tt_fav_reports` fr inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.19') inner join `tt_users` u on u.id = fr.user_id set fr.group_id = u.group_id, fr.org_id = u.org_id where fr.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/reports.php b/reports.php
index 6a0687e60..efbf96421 100644
--- a/reports.php
+++ b/reports.php
@@ -298,7 +298,7 @@
     if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
 
     if ($err->no()) {
-      $id = ttFavReportHelper::saveReport($user->id, $bean);
+      $id = ttFavReportHelper::saveReport($user->id, $bean); // TODO: review "on behalf" situations (both user and group), redesign if needed.
       if (!$id)
         $err->add($i18n->get('error.db'));
       if ($err->no()) {

From 57babce3424b88837a797860b52b9546908d478f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 13:07:53 +0000
Subject: [PATCH 0373/1848] Introduced org_id in tt_cron table as part of
 subgroup support work.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 463340b76..397c66008 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.19.4455 | 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.20.4456 | 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/dbinstall.php b/dbinstall.php
index 0d8ea9a40..6497dbbf7 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11819"]) {
+  if ($_POST["convert11797to11820"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1014,6 +1014,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_fav_reports` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.19', modified = now() where param_name = 'version_db' and param_value = '1.18.18'");
     setChange("update `tt_fav_reports` fr inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.19') inner join `tt_users` u on u.id = fr.user_id set fr.group_id = u.group_id, fr.org_id = u.org_id where fr.org_id is null");
+    setChange("ALTER TABLE `tt_cron` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.20', modified = now() where param_name = 'version_db' and param_value = '1.18.19'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1060,7 +1062,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.19)</b>
+    <td width="80%"><b>Create database structure (v1.18.20)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1105,8 +1107,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.19)</td>
-    <td><input type="submit" name="convert11797to11819" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.20)</td>
+    <td><input type="submit" name="convert11797to11820" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index d5dbe4100..e3f0bd83c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -296,6 +296,7 @@ CREATE TABLE `tt_fav_reports` (
 CREATE TABLE `tt_cron` (
   `id` int(11) NOT NULL auto_increment,         # entry id
   `group_id` int(11) NOT NULL,                  # group id
+  `org_id` int(11) default NULL,                # organization id
   `cron_spec` varchar(255) NOT NULL,            # cron specification, "0 1 * * *" for "daily at 01:00"
   `last` int(11) default NULL,                  # UNIX timestamp of when job was last run
   `next` int(11) default NULL,                  # UNIX timestamp of when to run next job
@@ -475,4 +476,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.19', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.20', now()); # TODO: change when structure changes.

From 118c3d9a6326a6b1ebc3c5a018047cec00ffbd62 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 13:32:15 +0000
Subject: [PATCH 0374/1848] Populating org_id in tt_cron table.

---
 WEB-INF/lib/ttNotificationHelper.class.php | 8 +++++---
 WEB-INF/lib/ttTeamHelper.class.php         | 5 +++++
 WEB-INF/templates/footer.tpl               | 2 +-
 dbinstall.php                              | 1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index af1bcd3c8..a4fa5e6dc 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -65,9 +65,11 @@ static function delete($id) {
   // insert function inserts a new notification into database.
   static function insert($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
@@ -77,8 +79,8 @@ static function insert($fields)
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
-    $sql = "insert into tt_cron (group_id, cron_spec, next, report_id, email, cc, subject, report_condition, status)
-      values ($group_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_cron (group_id, org_id, cron_spec, next, report_id, email, cc, subject, report_condition, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 4203fdc61..b861e669e 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -703,6 +703,11 @@ static function delete($group_id) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
+    // Delete cron entries.
+    $sql = "delete from tt_cron where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
     // Delete predefined expenses.
     $sql = "delete from tt_predefined_expenses where group_id = $group_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 397c66008..a63402887 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.20.4456 | 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.20.4457 | 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/dbinstall.php b/dbinstall.php
index 6497dbbf7..e31783a7e 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1016,6 +1016,7 @@ function setChange($sql) {
     setChange("update `tt_fav_reports` fr inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.19') inner join `tt_users` u on u.id = fr.user_id set fr.group_id = u.group_id, fr.org_id = u.org_id where fr.org_id is null");
     setChange("ALTER TABLE `tt_cron` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.20', modified = now() where param_name = 'version_db' and param_value = '1.18.19'");
+    setChange("UPDATE `tt_cron` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') set org_id = group_id where org_id is null");
   }
 
   if ($_POST["cleanup"]) {

From e8612865ad9644fad85cd0d6fef32ea07c8acdf9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 14:50:44 +0000
Subject: [PATCH 0375/1848] Added notifications to export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 72 ++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 0c56117e0..cf64cede7 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -49,6 +49,7 @@ class ttGroupExportHelper {
   var $logMap     = array();
   var $customFieldMap = array();
   var $customFieldOptionMap = array();
+  var $favReportMap = array();
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
@@ -102,6 +103,9 @@ function getUsers() {
     return false;
   }
 
+  // TODO: write a generic (private?) get function for exclusive use in this class, that obtains
+  // all fields from a given table.
+
   // getRoles - obtains all roles defined for group.
   function getRoles() {
     global $user;
@@ -174,13 +178,49 @@ function getClients() {
     return false;
   }
 
+  // getFavReports - obtains all favorite reports defined for group.
+  function getFavReports() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_fav_reports where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // getPredefinedExpenses - obtains all predefined expenses for group.
   function getPredefinedExpenses() {
     global $user;
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_predefined_expenses where group_id = $this->group_id"; // TODO: add " and org_id = $user->org_id" when possible.
+    $sql = "select * from tt_predefined_expenses where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
+  // getNotifications - obtains all notifications defined for group.
+  function getNotifications() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from tt_cron where group_id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -263,6 +303,11 @@ function writeData() {
     foreach ($custom_field_options as $key=>$option)
       $this->customFieldOptionMap[$option['id']] = $key + 1;
 
+    // Prepare favorite report map.
+    $fav_reports = $this->getFavReports();
+    foreach ($fav_reports as $key=>$fav_report)
+      $this->favReportMap[$fav_report['id']] = $key + 1;
+
     // Write roles.
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
@@ -514,7 +559,7 @@ function writeData() {
     unset($quota_part);
 
     // Write fav reports.
-    $fav_reports = ttTeamHelper::getFavReports($this->group_id);
+    $fav_reports = $this->getFavReports();
     fwrite($this->file, $this->indentation."  <fav_reports>\n");
     foreach ($fav_reports as $fav_report) {
       $user_list = '';
@@ -525,7 +570,8 @@ function writeData() {
             $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
         }
       }
-      $fav_report_part = $this->indentation.'    '."<fav_report user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
+      $fav_report_part = $this->indentation.'    '."<fav_report id=\"".$this->favReportMap[$fav_report['id']]."\"";
+      $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
       $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\"";
       $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
       $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"";
@@ -560,6 +606,26 @@ function writeData() {
     unset($fav_reports);
     unset($fav_report_part);
 
+    // Write notifications.
+    $notifications = $this->getNotifications();
+    fwrite($this->file, $this->indentation."  <notifications>\n");
+    foreach ($notifications as $notification) {
+      $notification_part = $this->indentation.'    '."<notification cron_spec=\"".$notification['cron_spec']."\"";
+      $notification_part .= " last=\"".$notification['last']."\"";
+      $notification_part .= " next=\"".$notification['next']."\"";
+      $notification_part .= " report_id=\"".$this->favReportMap[$notification['report_id']]."\"";
+      $notification_part .= " email=\"".htmlspecialchars($notification['email'])."\"";
+      $notification_part .= " cc=\"".htmlspecialchars($notification['cc'])."\"";
+      $notification_part .= " subject=\"".htmlspecialchars($notification['subject'])."\"";
+      $notification_part .= " report_condition=\"".htmlspecialchars($notification['report_condition'])."\"";
+      $notification_part .= " status=\"".$notification['status']."\"";
+      $notification_part .= "></notification>\n";
+      fwrite($this->file, $notification_part);
+    }
+    fwrite($this->file, $this->indentation."  </notifications>\n");
+    unset($notifications);
+    unset($notification_part);
+
     // We are mostly done with writing this group data, destroy all maps.
     unset($this->roleMap);
     unset($this->userMap);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a63402887..855cc77ec 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.20.4457 | 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.20.4458 | 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>

From 3fe430d82ad416d1766b9f0cd558e2e1f26900a9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 15:41:51 +0000
Subject: [PATCH 0376/1848] Added notifications to import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 72 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index c57cc6405..0da0a7eac 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -59,6 +59,7 @@ class ttOrgImportHelper {
   var $currentGroupLogMap     = array();
   var $currentGroupCustomFieldMap = array();
   var $currentGroupCustomFieldOptionMap = array();
+  var $currentGroupFavReportMap = array();
 
   // Constructor.
   function __construct(&$errors) {
@@ -455,6 +456,14 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
+      if ($name == 'FAV_REPORTS') {
+        // If we get here, we have to recycle $currentGroupFavReportMap.
+        unset($this->currentGroupFavReportMap);
+        $this->currentGroupFavReportMap = array();
+        // Favorite report map is reconstructed after processing <fav_report> elements in XML. See below.
+        return;
+      }
+
       if ($name == 'FAV_REPORT') {
         $user_list = '';
         if (strlen($attrs['USERS']) > 0) {
@@ -462,7 +471,7 @@ function startElement($parser, $name, $attrs) {
           foreach ($arr as $v)
             $user_list .= (strlen($user_list) == 0 ? '' : ',').$this->currentGroupUserMap[$v];
         }
-        if (!$this->insertFavReport(array(
+        $fav_report_id = $this->insertFavReport(array(
           'name' => $attrs['NAME'],
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'group_id' => $this->current_group_id,
@@ -492,10 +501,30 @@ function startElement($parser, $name, $attrs) {
           'group_by1' => $attrs['GROUP_BY1'],
           'group_by2' => $attrs['GROUP_BY2'],
           'group_by3' => $attrs['GROUP_BY3'],
-          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']))) {
-           $this->errors->add($i18n->get('error.db'));
-         }
-         return;
+          'chtotalsonly' => (int) $attrs['SHOW_TOTALS_ONLY']));
+        if ($fav_report_id) {
+          // Add a mapping.
+          $this->currentGroupFavReportMap[$attrs['ID']] = $fav_report_id;
+          } else $this->errors->add($i18n->get('error.db'));
+        return;
+      }
+
+      if ($name == 'NOTIFICATION') {
+        if (!$this->insertNotification(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'cron_spec' => $attrs['CRON_SPEC'],
+          'last' => $attrs['LAST'],
+          'next' => $attrs['NEXT'],
+          'report_id' => $this->currentGroupFavReportMap[$attrs['REPORT_ID']],
+          'email' => $attrs['EMAIL'],
+          'cc' => $attrs['CC'],
+          'subject' => $attrs['SUBJECT'],
+          'report_condition' => $attrs['REPORT_CONDITION'],
+          'status' => $attrs['STATUS']))) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+        return;
       }
     }
   }
@@ -778,6 +807,39 @@ private function insertFavReport($fields) {
       $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
       $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $sql = "select last_insert_id() as last_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+
+    $val = $res->fetchRow();
+    return $val['last_id'];
+  }
+
+  // insertNotification function inserts a new notification into database.
+  static function insertNotification($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $cron_spec = $fields['cron_spec'];
+    $last = (int) $fields['last'];
+    $next = (int) $fields['next'];
+    $report_id = (int) $fields['report_id'];
+    $email = $fields['email'];
+    $cc = $fields['cc'];
+    $subject = $fields['subject'];
+    $report_condition = $fields['report_condition'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_cron".
+      " (group_id, org_id, cron_spec, last, next, report_id, email, cc, subject, report_condition, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($cron_spec).", $last, $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 855cc77ec..01941ccc8 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.20.4458 | 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.20.4459 | 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>

From e9ae98c2cb2bc7455aa52ec6efa557b051429281 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 16:08:36 +0000
Subject: [PATCH 0377/1848] Added group_id and org_id in
 tt_client_project_binds table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  8 +++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 01941ccc8..b9077c05e 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.20.4459 | 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.21.4460 | 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/dbinstall.php b/dbinstall.php
index e31783a7e..63bfdc0bd 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11820"]) {
+  if ($_POST["convert11797to11821"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1017,6 +1017,8 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_cron` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.20', modified = now() where param_name = 'version_db' and param_value = '1.18.19'");
     setChange("UPDATE `tt_cron` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') set org_id = group_id where org_id is null");
+    setChange("ALTER TABLE `tt_client_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
+    setChange("ALTER TABLE `tt_client_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
   }
 
   if ($_POST["cleanup"]) {
@@ -1034,6 +1036,7 @@ function setChange($sql) {
     setChange("OPTIMIZE TABLE tt_client_project_binds");
     setChange("OPTIMIZE TABLE tt_clients");
     setChange("OPTIMIZE TABLE tt_config");
+    setChange("OPTIMIZE TABLE tt_cron");
     setChange("OPTIMIZE TABLE tt_custom_field_log");
     setChange("OPTIMIZE TABLE tt_custom_field_options");
     setChange("OPTIMIZE TABLE tt_custom_fields"); 
@@ -1063,7 +1066,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.20)</b>
+    <td width="80%"><b>Create database structure (v1.18.21)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1108,8 +1111,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.20)</td>
-    <td><input type="submit" name="convert11797to11820" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.21)</td>
+    <td><input type="submit" name="convert11797to11821" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index e3f0bd83c..705e664f1 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -333,8 +333,10 @@ create unique index client_name_idx on tt_clients(group_id, name, status);
 # Structure for table tt_client_project_binds. This table maps clients to assigned projects.
 #
 CREATE TABLE `tt_client_project_binds` (
-  `client_id` int(11) NOT NULL, # client id
-  `project_id` int(11) NOT NULL # project id
+  `client_id` int(11) NOT NULL,                    # client id
+  `project_id` int(11) NOT NULL,                   # project id
+  `group_id` int(11) default NULL,                 # group id
+  `org_id` int(11) default NULL                    # organization id
 );
 
 # Indexes for tt_client_project_binds.
@@ -476,4 +478,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.20', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.21', now()); # TODO: change when structure changes.

From e5c2856600ec9c939f011226c78f39ae9a63d8b0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 16:47:54 +0000
Subject: [PATCH 0378/1848] Populating group_id and org_id in
 tt_client_project_binds.

---
 WEB-INF/lib/ttClientHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl         | 2 +-
 dbinstall.php                        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 0c12a9538..eeb77f77a 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -195,7 +195,7 @@ static function insert($fields)
 
     if (count($projects) > 0)
       foreach ($projects as $p_id) {
-        $sql = "insert into tt_client_project_binds (client_id, project_id) values($last_id, $p_id)";
+        $sql = "insert into tt_client_project_binds (client_id, project_id, group_id, org_id) values($last_id, $p_id, $group_id, $org_id)";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b9077c05e..8d292fc5d 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.21.4460 | 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.21.4461 | 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/dbinstall.php b/dbinstall.php
index 63bfdc0bd..bfbb5c2c1 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1019,6 +1019,8 @@ function setChange($sql) {
     setChange("UPDATE `tt_cron` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') set org_id = group_id where org_id is null");
     setChange("ALTER TABLE `tt_client_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
     setChange("ALTER TABLE `tt_client_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.21', modified = now() where param_name = 'version_db' and param_value = '1.18.20'");
   }
 
   if ($_POST["cleanup"]) {

From ad495718373d61982d81c3eebd3bc9d2921186b1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 17:01:51 +0000
Subject: [PATCH 0379/1848] Added an index to tt_client_project_binds to
 guarantee uniqueness.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 mysql.sql                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8d292fc5d..cab56b71c 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.21.4461 | 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.21.4462 | 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/dbinstall.php b/dbinstall.php
index bfbb5c2c1..602449145 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1021,6 +1021,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_client_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.21', modified = now() where param_name = 'version_db' and param_value = '1.18.20'");
+    setChange("create unique index client_project_idx on tt_client_project_binds(client_id, project_id)");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 705e664f1..bc970f734 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -342,6 +342,7 @@ CREATE TABLE `tt_client_project_binds` (
 # Indexes for tt_client_project_binds.
 create index client_idx on tt_client_project_binds(client_id);
 create index project_idx on tt_client_project_binds(project_id);
+create unique index client_project_idx on tt_client_project_binds(client_id, project_id);
 
 
 #

From dc298aa5a82fc2aa86a27a1c106cf42881376004 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 18:00:03 +0000
Subject: [PATCH 0380/1848] Refactoring - wrote insertClient for import, to
 separate import from other stuff.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 46 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 0da0a7eac..9907f6e71 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -238,7 +238,7 @@ function startElement($parser, $name, $attrs) {
             $mapped_projects[] = $this->currentGroupProjectMap[$id];
         }
 
-        $client_id = ttClientHelper::insert(array(
+        $client_id = $this->insertClient(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
@@ -779,6 +779,48 @@ private function insertProject($fields)
     return $last_id;
   }
 
+  // The insertClient function inserts a new client as well as client to project binds.
+  private function insertClient($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $fields['name'];
+    $address = $fields['address'];
+    $tax = $fields['tax'];
+    $projects = $fields['projects'];
+    if ($projects)
+      $comma_separated = implode(',', $projects); // This is a comma-separated list of associated projects ids.
+    $status = $fields['status'];
+
+    $tax = str_replace(',', '.', $tax);
+    if ($tax == '') $tax = 0;
+
+    $sql = "insert into tt_clients (group_id, org_id, name, address, tax, projects, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($address).", $tax, ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = 0;
+    $sql = "select last_insert_id() as last_insert_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $last_id = $val['last_insert_id'];
+
+    if (count($projects) > 0)
+      foreach ($projects as $p_id) {
+        $sql = "insert into tt_client_project_binds (client_id, project_id, group_id, org_id) values($last_id, $p_id, $group_id, $org_id)";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+      }
+
+    return $last_id;
+  }
+
   // insertFavReport - inserts a favorite report in database.
   private function insertFavReport($fields) {
     $mdb2 = getConnection();
@@ -820,7 +862,7 @@ private function insertFavReport($fields) {
   }
 
   // insertNotification function inserts a new notification into database.
-  static function insertNotification($fields)
+  private function insertNotification($fields)
   {
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cab56b71c..627f0acc2 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.21.4462 | 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.21.4463 | 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>

From abc243a67d158977ad2400ae4c41c447448473b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 18:14:05 +0000
Subject: [PATCH 0381/1848] Added group_id and org_id to tt_config table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 627f0acc2..3315253f0 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.21.4463 | 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.22.4464 | 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/dbinstall.php b/dbinstall.php
index 602449145..5ee0337e3 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11821"]) {
+  if ($_POST["convert11797to11822"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1022,6 +1022,9 @@ function setChange($sql) {
     setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.21', modified = now() where param_name = 'version_db' and param_value = '1.18.20'");
     setChange("create unique index client_project_idx on tt_client_project_binds(client_id, project_id)");
+    setChange("ALTER TABLE `tt_config` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    setChange("ALTER TABLE `tt_config` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.22', modified = now() where param_name = 'version_db' and param_value = '1.18.21'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1069,7 +1072,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.21)</b>
+    <td width="80%"><b>Create database structure (v1.18.22)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1114,8 +1117,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.21)</td>
-    <td><input type="submit" name="convert11797to11821" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.22)</td>
+    <td><input type="submit" name="convert11797to11822" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index bc970f734..e0c4145d5 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -351,6 +351,8 @@ create unique index client_project_idx on tt_client_project_binds(client_id, pro
 #
 CREATE TABLE `tt_config` (
   `user_id` int(11) NOT NULL,            # user id
+  `group_id` int(11) default NULL,       # group id
+  `org_id` int(11) default NULL,         # organization id
   `param_name` varchar(32) NOT NULL,     # parameter name
   `param_value` varchar(80) default NULL # parameter value
 );
@@ -479,4 +481,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.21', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.22', now()); # TODO: change when structure changes.

From cfc33172165a50572d74d808c3c523484f60800f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 19:40:18 +0000
Subject: [PATCH 0382/1848] Populating group_id and org_id in tt_config table.

---
 WEB-INF/lib/ttSysConfig.class.php | 21 ++++++++++++++-------
 WEB-INF/templates/footer.tpl      |  2 +-
 dbinstall.php                     |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttSysConfig.class.php b/WEB-INF/lib/ttSysConfig.class.php
index cb7637d15..fd9905210 100644
--- a/WEB-INF/lib/ttSysConfig.class.php
+++ b/WEB-INF/lib/ttSysConfig.class.php
@@ -35,18 +35,23 @@
 
 // Class ttSysConfig is used for storing and retrieving named values associated with users.
 class ttSysConfig {
-  var $u_id = null;
+  var $user_id = null;
+  var $group_id = null;
+  var $org_id = null;
   var $mdb2 = null;
 
   // Constructor.
-  function __construct($u_id) {
-    $this->u_id = $u_id;
+  function __construct($user_id) {
+    global $user;
+    $this->user_id = $user_id; // TODO: review "on behalf" situation and refactor if necessary.
+    $this->group_id = $user->getActiveGroup();
+    $this->org_id = $user->org_id;
     $this->mdb2 = getConnection();
   }
 
   // The getValue retrieves a value identified by name.
   function getValue($name) {
-    $res = $this->mdb2->query("select param_value from tt_config where user_id = ".$this->u_id." and param_name=".$this->mdb2->quote($name));
+    $res = $this->mdb2->query("select param_value from tt_config where user_id = ".$this->user_id." and param_name=".$this->mdb2->quote($name));
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
       return $val['param_value'];
@@ -57,13 +62,15 @@ function getValue($name) {
   // The setValue sets a value identified by name.
   function setValue($name, $value) {
     $rcnt = 0;
-    $res = $this->mdb2->query("select count(*) as rcnt from tt_config where user_id = ".$this->u_id." and param_name = ".$this->mdb2->quote($name));
+    $res = $this->mdb2->query("select count(*) as rcnt from tt_config where user_id = ".$this->user_id." and param_name = ".$this->mdb2->quote($name));
     if ($val = $res->fetchRow()) $rcnt = $val['rcnt'];
     
     if ($rcnt > 0) {
-      $affected = $this->mdb2->exec("update tt_config set param_value = ".$this->mdb2->quote($value)." where user_id = ".$this->u_id." and param_name=".$this->mdb2->quote($name));
+      $affected = $this->mdb2->exec("update tt_config set param_value = ".$this->mdb2->quote($value)." where user_id = ".$this->user_id." and param_name=".$this->mdb2->quote($name));
     } else {
-      $affected = $this->mdb2->exec("insert into tt_config set param_value = ".$this->mdb2->quote($value).", param_name = ".$this->mdb2->quote($name).", user_id = ".$this->u_id);
+      $sql = "insert into tt_config set param_value = ".$this->mdb2->quote($value).
+        ", param_name = ".$this->mdb2->quote($name).", user_id = ".$this->user_id.", group_id = ".$this->group_id.", org_id = ".$this->org_id;
+      $affected = $this->mdb2->exec($sql);
     }
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3315253f0..92095cf01 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.22.4464 | 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.22.4465 | 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/dbinstall.php b/dbinstall.php
index 5ee0337e3..c65175d57 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1025,6 +1025,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_config` ADD `group_id` int(11) default NULL AFTER `user_id`");
     setChange("ALTER TABLE `tt_config` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.22', modified = now() where param_name = 'version_db' and param_value = '1.18.21'");
+    setChange("update `tt_config` c inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.22') inner join `tt_users` u on u.id = c.user_id set c.group_id = u.group_id, c.org_id = u.org_id where c.org_id is null");
   }
 
   if ($_POST["cleanup"]) {

From 191af95a641e560104be099de62ea45ac5cd6315 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 20:46:11 +0000
Subject: [PATCH 0383/1848] Added user config params to export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 36 +++++++++++++++++++++--
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index cf64cede7..c6e1d9a5d 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -72,7 +72,7 @@ function __construct($group_id, $file, $indentation) {
   }
 
   // getGroupData obtains group attributes for export.
-  function getGroupData() {
+  private function getGroupData() {
     global $user;
     $mdb2 = getConnection();
 
@@ -86,7 +86,7 @@ function getGroupData() {
   }
 
   // The getUsers obtains all users in group for the purpose of export.
-  function getUsers() {
+  private function getUsers() {
     global $user;
     $mdb2 = getConnection();
 
@@ -232,6 +232,24 @@ function getNotifications() {
     return false;
   }
 
+  // getRecordsFromTable - obtains all fields from a given table for a group.
+  function getRecordsFromTable($table_name) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select * from $table_name where group_id = $this->group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -626,6 +644,20 @@ function writeData() {
     unset($notifications);
     unset($notification_part);
 
+    // Write user config parameters.
+    $user_params = $this->getRecordsFromTable('tt_config');
+    fwrite($this->file, $this->indentation."  <user_params>\n");
+    foreach ($user_params as $user_param) {
+      $user_param_part = $this->indentation.'    '."<user_param user_id=\"".$this->userMap[$user_param['user_id']]."\"";
+      $user_param_part .= " param_name=\"".htmlspecialchars($user_param['param_name'])."\"";
+      $user_param_part .= " param_value=\"".htmlspecialchars($user_param['param_value'])."\"";
+      $user_param_part .= "></user_param>\n";
+      fwrite($this->file, $user_param_part);
+    }
+    fwrite($this->file, $this->indentation."  </user_params>\n");
+    unset($user_params);
+    unset($user_param_part);
+
     // We are mostly done with writing this group data, destroy all maps.
     unset($this->roleMap);
     unset($this->userMap);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 92095cf01..23cc0edb5 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.22.4465 | 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.22.4466 | 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>

From f6afe28937ca24f05e0a4fc0f4b4054d1832f5a9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 21:01:53 +0000
Subject: [PATCH 0384/1848] Added user config params to import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 29 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 9907f6e71..dda7f75df 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -526,6 +526,18 @@ function startElement($parser, $name, $attrs) {
         }
         return;
       }
+
+      if ($name == 'USER_PARAM') {
+        if (!$this->insertUserParam(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'param_name' => $attrs['PARAM_NAME'],
+          'param_value' => $attrs['PARAM_VALUE']))) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+        return;
+      }
     }
   }
 
@@ -884,4 +896,21 @@ private function insertNotification($fields)
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // insertUserParam - a helper function to insert a user parameter.
+  private function insertUserParam($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $user_id = (int) $fields['user_id'];
+    $param_name = $fields['param_name'];
+    $param_value = $fields['param_value'];
+
+    $sql = "insert into tt_config".
+      " (user_id, group_id, org_id, param_name, param_value)".
+      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($param_name).", ".$mdb2->quote($param_value).")";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 23cc0edb5..c6c6ed7d7 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.22.4466 | 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.22.4467 | 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>

From 0d139d09bd3304dd9666ea4a74d367ad16c85604 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 21:12:06 +0000
Subject: [PATCH 0385/1848] Adding group_id and org_id to last 3 remaining
 tables.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 6 ++++++
 mysql.sql                    | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c6c6ed7d7..9ace916c9 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.22.4467 | 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.23.4468 | 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/dbinstall.php b/dbinstall.php
index c65175d57..90067399b 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1026,6 +1026,12 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_config` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.22', modified = now() where param_name = 'version_db' and param_value = '1.18.21'");
     setChange("update `tt_config` c inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.22') inner join `tt_users` u on u.id = c.user_id set c.group_id = u.group_id, c.org_id = u.org_id where c.org_id is null");
+    setChange("ALTER TABLE `tt_custom_fields` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("ALTER TABLE `tt_custom_field_options` ADD `group_id` int(11) default NULL AFTER `id`");
+    setChange("ALTER TABLE `tt_custom_field_options` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("ALTER TABLE `tt_custom_field_log` ADD `group_id` int(11) default NULL AFTER `id`");
+    setChange("ALTER TABLE `tt_custom_field_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index e0c4145d5..0bbf15d43 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -369,6 +369,7 @@ create unique index param_idx on tt_config(user_id, param_name);
 CREATE TABLE `tt_custom_fields` (
   `id` int(11) NOT NULL auto_increment,    # custom field id
   `group_id` int(11) NOT NULL,             # group id
+  `org_id` int(11) default NULL,           # organization id
   `type` tinyint(4) NOT NULL default 0,    # custom field type (text or dropdown)
   `label` varchar(32) NOT NULL default '', # custom field label
   `required` tinyint(4) default 0,         # whether this custom field is mandatory for time records
@@ -382,6 +383,8 @@ CREATE TABLE `tt_custom_fields` (
 #
 CREATE TABLE `tt_custom_field_options` (
   `id` int(11) NOT NULL auto_increment,    # option id
+  `group_id` int(11) default NULL,         # group id
+  `org_id` int(11) default NULL,           # organization id
   `field_id` int(11) NOT NULL,             # custom field id
   `value` varchar(32) NOT NULL default '', # option value
   PRIMARY KEY  (`id`)
@@ -394,6 +397,8 @@ CREATE TABLE `tt_custom_field_options` (
 #
 CREATE TABLE `tt_custom_field_log` (
   `id` bigint NOT NULL auto_increment, # custom field log id
+  `group_id` int(11) default NULL,     # group id
+  `org_id` int(11) default NULL,       # organization id
   `log_id` bigint NOT NULL,            # id of a record in tt_log this record corresponds to
   `field_id` int(11) NOT NULL,         # custom field id
   `option_id` int(11) default NULL,    # Option id. Used for dropdown custom fields.
@@ -481,4 +486,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.22', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.23', now()); # TODO: change when structure changes.

From cd0fdd6bdf0879f047732df3d0092a291b35ff6c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Nov 2018 23:11:58 +0000
Subject: [PATCH 0386/1848] Populating org_id in tt_custom_fields table.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 30 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           |  1 +
 plugins/CustomFields.class.php          |  5 ++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index dda7f75df..2758ac21d 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -364,9 +364,9 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'CUSTOM_FIELD') {
         // We get here when processing <custom_field> tags for the current group.
-        $custom_field_id = ttCustomFieldHelper::insertField(array(
+        $custom_field_id = $this->insertCustomField(array(
           'group_id' => $this->current_group_id,
-          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+          'org_id' => $this->org_id,
           'type' => $attrs['TYPE'],
           'label' => $attrs['LABEL'],
           'required' => $attrs['REQUIRED'],
@@ -913,4 +913,30 @@ private function insertUserParam($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // insertCustomField - a helper function to insert a custom field.
+  private function insertCustomField($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $type = (int) $fields['type'];
+    $label = $fields['label'];
+    $required = (int) $fields['required'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_custom_fields".
+      " (group_id, org_id, type, label, required, status)".
+      " values($group_id, $org_id, $type, ".$mdb2->quote($label).", $required, ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = 0;
+    $sql = "select last_insert_id() as last_insert_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $last_id = $val['last_insert_id'];
+    return $last_id;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9ace916c9..00b5047c9 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.23.4468 | 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.23.4469 | 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/dbinstall.php b/dbinstall.php
index 90067399b..a6c499bd2 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1032,6 +1032,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_custom_field_log` ADD `group_id` int(11) default NULL AFTER `id`");
     setChange("ALTER TABLE `tt_custom_field_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
+    setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 00582e3e9..57f1d86c6 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -274,7 +274,10 @@ static function getFieldIdForOption($option_id) {
   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
-    $sql = "insert into tt_custom_fields (group_id, type, label, required, status) values($user->group_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+    $sql = "insert into tt_custom_fields (group_id, org_id, type, label, required, status)".
+      " values($group_id, $org_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }

From a4c1ced936fb1a1b71d4d34479a9c999aef4b338 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 08:02:25 +0000
Subject: [PATCH 0387/1848] Populating group_id and org_id in
 tt_custom_field_options table.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 29 ++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           |  1 +
 plugins/CustomFields.class.php          |  8 +++++--
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 2758ac21d..7ff3b5b6b 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -388,9 +388,9 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'CUSTOM_FIELD_OPTION') {
         // We get here when processing <custom_field_option> tags for the current group.
-        $custom_field_option_id = ttCustomFieldHelper::insertOption(array(
-          // 'group_id' => $this->current_group_id, TODO: add this when group_id field is added to the table.
-          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+        $custom_field_option_id = $this->insertCustomFieldOption(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
           'field_id' => $this->currentGroupCustomFieldMap[$attrs['FIELD_ID']],
           'value' => $attrs['VALUE']));
         if ($custom_field_option_id) {
@@ -939,4 +939,27 @@ private function insertCustomField($fields) {
     $last_id = $val['last_insert_id'];
     return $last_id;
   }
+
+  // insertCustomFieldOption - a helper function to insert a custom field option.
+  private function insertCustomFieldOption($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $field_id = (int) $fields['field_id'];
+    $value = $fields['value'];
+
+    $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value)".
+      " values ($group_id, $org_id, $field_id, ".$mdb2->quote($value).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = 0;
+    $sql = "select last_insert_id() as last_insert_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $last_id = $val['last_insert_id'];
+    return $last_id;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 00b5047c9..305fc79c2 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.23.4469 | 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.23.4470 | 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/dbinstall.php b/dbinstall.php
index a6c499bd2..f7254ad63 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1033,6 +1033,7 @@ function setChange($sql) {
     setChange("ALTER TABLE `tt_custom_field_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
     setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
+    setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 57f1d86c6..306b5993d 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -110,9 +110,12 @@ function get($log_id) {
 
   // insertOption adds a new option to a custom field.
   static function insertOption($field_id, $option_name) {
-
+    global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
     // Check if the option exists.
     $id = 0;
     $sql = "select id from tt_custom_field_options where field_id = $field_id and value = ".$mdb2->quote($option_name);
@@ -123,7 +126,8 @@ static function insertOption($field_id, $option_name) {
 
     // Insert option.
     if (!$id) {
-      $sql = "insert into tt_custom_field_options (field_id, value) values($field_id, ".$mdb2->quote($option_name).")";
+      $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value)".
+        " values($group_id, $org_id, $field_id, ".$mdb2->quote($option_name).")";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;

From 6ebd9b5c4aa66017858979cf00ac1db700f9d643 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 08:33:15 +0000
Subject: [PATCH 0388/1848] Populating group_id and org_id in
 tt_custom_field_log.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 25 +++++++++++++++++++++----
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           |  1 +
 plugins/CustomFields.class.php          |  9 +++++++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 7ff3b5b6b..a14d9714b 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -32,7 +32,6 @@
 import('ttClientHelper');
 import('ttInvoiceHelper');
 import('ttTimeHelper');
-import('ttCustomFieldHelper');
 import('ttExpenseHelper');
 import('ttFavReportHelper');
 
@@ -402,9 +401,9 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'CUSTOM_FIELD_LOG_ENTRY') {
         // We get here when processing <custom_field_log_entry> tags for the current group.
-        if (!ttCustomFieldHelper::insertLogEntry(array(
-          // 'group_id' => $this->current_group_id, TODO: add this when group_id field is added to the table.
-          // 'org_id' => $this->org_id, TODO: add this when org_id field is added to the table.
+        if (!$this->insertCustomFieldLogEntry(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
           'log_id' => $this->currentGroupLogMap[$attrs['LOG_ID']],
           'field_id' => $this->currentGroupCustomFieldMap[$attrs['FIELD_ID']],
           'option_id' => $this->currentGroupCustomFieldOptionMap[$attrs['OPTION_ID']],
@@ -962,4 +961,22 @@ private function insertCustomFieldOption($fields) {
     $last_id = $val['last_insert_id'];
     return $last_id;
   }
+
+  // insertCustomFieldLogEntry - a helper function to insert a custom field log entry.
+  private function insertCustomFieldLogEntry($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $log_id = (int) $fields['log_id'];
+    $field_id = (int) $fields['field_id'];
+    $option_id = $fields['option_id'];
+    $value = $fields['value'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value, status)".
+      " values ($group_id, $org_id, $log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 305fc79c2..405a939b8 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.23.4470 | 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.23.4471 | 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/dbinstall.php b/dbinstall.php
index f7254ad63..d0ccbe335 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1034,6 +1034,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
     setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
     setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
+    setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 306b5993d..0e450b14d 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -63,9 +63,14 @@ function __construct($group_id) {
   }
 
   function insert($log_id, $field_id, $option_id, $value) {
-
+    global $user;
     $mdb2 = getConnection();
-    $sql = "insert into tt_custom_field_log (log_id, field_id, option_id, value) values($log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).")";
+
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value)".
+      " values($group_id, $org_id, $log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).")";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }

From 94081b97e54440c0d7b1b5b3f2faf0db4f0c4687 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 12:51:18 +0000
Subject: [PATCH 0389/1848] Introduced status field in tt_custom_field_options
 for consistency.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 9 +++++----
 mysql.sql                    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 405a939b8..02b735550 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.23.4471 | 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.24.4472 | 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/dbinstall.php b/dbinstall.php
index d0ccbe335..6818e0d3e 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11822"]) {
+  if ($_POST["convert11797to11824"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1035,6 +1035,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
     setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
     setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
+    setChange("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
   }
 
   if ($_POST["cleanup"]) {
@@ -1082,7 +1083,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.22)</b>
+    <td width="80%"><b>Create database structure (v1.18.24)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1127,8 +1128,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.22)</td>
-    <td><input type="submit" name="convert11797to11822" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.24)</td>
+    <td><input type="submit" name="convert11797to11824" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 0bbf15d43..0ddf3bfa9 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -387,6 +387,7 @@ CREATE TABLE `tt_custom_field_options` (
   `org_id` int(11) default NULL,           # organization id
   `field_id` int(11) NOT NULL,             # custom field id
   `value` varchar(32) NOT NULL default '', # option value
+  `status` tinyint(4) default 1,           # option status
   PRIMARY KEY  (`id`)
 );
 
@@ -486,4 +487,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.23', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.24', now()); # TODO: change when structure changes.

From f5a86ad6b1e247ff6bd83d12fb1f4cfdce581192 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 12:55:50 +0000
Subject: [PATCH 0390/1848] Version update.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 02b735550..0af745e7f 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.24.4472 | 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.24.4473 | 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/dbinstall.php b/dbinstall.php
index 6818e0d3e..0d50381dd 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1036,6 +1036,7 @@ function setChange($sql) {
     setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
     setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
     setChange("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
   }
 
   if ($_POST["cleanup"]) {

From 9e55571e568f9653c94860ab308cd781e20d13eb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 13:35:43 +0000
Subject: [PATCH 0391/1848] Reworked custom fields a bit to mark things deleted
 instead of deleting.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 plugins/CustomFields.class.php | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0af745e7f..412285de9 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.24.4473 | 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.24.4474 | 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/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 0e450b14d..1517bf085 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -52,7 +52,7 @@ function __construct($group_id) {
     // If we have a dropdown obtain options for it.
     if ((count($this->fields) > 0) && ($this->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)) {
 
-      $sql = "select id, value from tt_custom_field_options where field_id = ".$this->fields[0]['id']." order by value";
+      $sql = "select id, value from tt_custom_field_options where field_id = ".$this->fields[0]['id']." and status = 1 order by value";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         while ($val = $res->fetchRow()) {
@@ -173,7 +173,7 @@ static function deleteOption($id) {
       return false;
 
     // Delete the option.
-    $sql = "delete from tt_custom_field_options where id = $id";
+    $sql = "update tt_custom_field_options set status = NULL where id = $id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -194,7 +194,7 @@ static function getOptions($field_id) {
       return false;
 
     // Get options.
-    $sql = "select id, value from tt_custom_field_options where field_id = $field_id order by value";
+    $sql = "select id, value from tt_custom_field_options where field_id = $field_id and status = 1 order by value";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -303,10 +303,6 @@ static function updateField($id, $name, $type, $required) {
   // The deleteField deletes a custom field, its options and log entries for group.
   static function deleteField($field_id) {
 
-    // Our overall intention is to keep the code simple and manageable.
-    // If a user wishes to delete a field, we will delete all its options and log entries.
-    // Otherwise we have to do conditional queries depending on field status (this complicates things).
-
     global $user;
     $mdb2 = getConnection();
 
@@ -325,14 +321,14 @@ static function deleteField($field_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Delete field options.
-    $sql = "delete from tt_custom_field_options where field_id = $field_id";
+    // Mark field options as deleted.
+    $sql = "update tt_custom_field_options set status = NULL where field_id = $field_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Delete the field.
-    $sql = "delete from tt_custom_fields where id = $field_id and group_id = $user->group_id";
+    // Mark custom field as deleted.
+    $sql = "update tt_custom_fields set status = NULL where id = $field_id and group_id = $user->group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }

From c9ab657042ee613e3e2b896c8cf381fee7dd3ff5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 14:36:07 +0000
Subject: [PATCH 0392/1848] Redone db cleanup to support subgroups.

---
 WEB-INF/lib/ttOrgHelper.class.php | 56 +++++++++++++++++++------------
 WEB-INF/templates/footer.tpl      |  2 +-
 dbinstall.php                     | 10 +++---
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index c69fc7a7a..6d7ae678c 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -63,7 +63,7 @@ static function getName($org_id) {
     return false;
   }
 
-  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 5 for now).
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 1 for now).
   static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
@@ -72,7 +72,7 @@ static function getInactiveOrgs() {
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
       " (select max(accessed) as last_access, org_id from tt_users group by org_id order by last_access, org_id) as t".
-      " where last_access is null or last_access < $cutoff_timestamp limit 5"; // Max 5 orgs at a time for now...
+      " where last_access is null or last_access < $cutoff_timestamp limit 1"; // Max 1 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -84,27 +84,39 @@ static function getInactiveOrgs() {
   }
 
   // deleteOrg deletes data for the entire organization from database permanently.
-  // Work in progress, currently not fully implemented.
   static function deleteOrg($org_id) {
-    // We shall do it in a straightforward way by a delete operation from all tables by org_id.
-    // However, at this time not all tables have org_id.
-    // So, we need to add the field as we write code here.
-
-    // Delete expense items.
-    $sql = "delete from tt_expense_items where org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Delete predefined expenses.
-    $sql = "delete from tt_predefined_expenses where org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Delete monthly quotas.
-    $sql = "delete from tt_monthly_quotas where org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
+    // Go one table at a time and remove all records with matching org_id.
+    // The order is backwards to import (see ttOrgImportHelper). Remove groups last.
+    // This leaves us with something partially working if an error occurs.
+    $mdb2 = getConnection();
 
-    return true; // Work in progress, currently not fully implemented.
+    $tables = array(
+      'tt_config',
+      'tt_cron',
+      'tt_fav_reports',
+      'tt_monthly_quotas',
+      'tt_predefined_expenses',
+      'tt_expense_items',
+      'tt_custom_field_log',
+      'tt_custom_field_options',
+      'tt_custom_fields',
+      'tt_log',
+      'tt_invoices',
+      'tt_user_project_binds',
+      'tt_users',
+      'tt_client_project_binds',
+      'tt_clients',
+      'tt_project_task_binds',
+      'tt_projects',
+      'tt_tasks',
+      'tt_roles',
+      'tt_groups'
+    );
+    foreach($tables as $table) {
+      $sql = "delete from $table where org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+    return true;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 412285de9..c74e2d020 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.24.4474 | 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.25.4475 | 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/dbinstall.php b/dbinstall.php
index 0d50381dd..264fc379d 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1042,13 +1042,13 @@ function setChange($sql) {
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
-    $inactive_groups = ttOrgHelper::getInactiveOrgs();
+    $inactive_orgs = ttOrgHelper::getInactiveOrgs();
 
-    $count = count($inactive_groups);
-    print "$count inactive groups found...<br>\n";
+    $count = count($inactive_orgs);
+    print "$count inactive organizations found...<br>\n";
     for ($i = 0; $i < $count; $i++) {
-      print "  deleting group ".$inactive_groups[$i]."<br>\n";
-      $res = ttTeamHelper::delete($inactive_groups[$i]); // TODO: rewrite this to delete subgroups, too.
+      print "  deleting organization ".$inactive_orgs[$i]."<br>\n";
+      $res = ttOrgHelper::deleteOrg($inactive_orgs[$i]);
     }
 
     setChange("OPTIMIZE TABLE tt_client_project_binds");

From 2eb17adc82261776d7bc3b19942e5e6da2778e11 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 14:53:15 +0000
Subject: [PATCH 0393/1848] Increased db cleanup scope to 5 orgs at a time.

---
 WEB-INF/lib/ttOrgHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 6d7ae678c..8b3f95ff0 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -63,7 +63,7 @@ static function getName($org_id) {
     return false;
   }
 
-  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 1 for now).
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 5 for now).
   static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
@@ -72,7 +72,7 @@ static function getInactiveOrgs() {
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
       " (select max(accessed) as last_access, org_id from tt_users group by org_id order by last_access, org_id) as t".
-      " where last_access is null or last_access < $cutoff_timestamp limit 1"; // Max 1 orgs at a time for now...
+      " where last_access is null or last_access < $cutoff_timestamp limit 5"; // Max 5 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c74e2d020..98ee48de8 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.25.4475 | 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.25.4476 | 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>

From 78ef5f9b455fc04a3fe8535f234d98bddf4de6c9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 21:56:40 +0000
Subject: [PATCH 0394/1848] Started to work on group editor for subgroups.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/groups.tpl | 31 +++++++++++++++++++++++++
 groups.php                   | 45 ++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/groups.tpl
 create mode 100644 groups.php

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98ee48de8..9a9be2d06 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.25.4476 | 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.25.4477 | 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/groups.tpl b/WEB-INF/templates/groups.tpl
new file mode 100644
index 000000000..d9748bcbd
--- /dev/null
+++ b/WEB-INF/templates/groups.tpl
@@ -0,0 +1,31 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="1" cellpadding="3" border="0" width="720">
+  <tr>
+    <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td class="tableHeader">{$i18n.label.edit}</td>
+    <td class="tableHeader">{$i18n.label.delete}</td>
+  </tr>
+{if $groups}
+  {foreach $groups as $group}
+  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+    <td>{$group.name|escape}</td>
+    <td><a href="group_edit.php?id={$group.id}">{$i18n.label.edit}</a></td>
+    <td><a href="group_delete.php?id={$group.id}">{$i18n.label.delete}</a></td>
+  </tr>
+  {/foreach}
+{/if}
+</table>
+
+<table width="100%">
+  <tr>
+    <td align="center">
+      <br>
+      <form>
+        <input type="button" onclick="chLocation('group_add.php');" value="{$i18n.button.add}">
+      </form>
+    </td>
+  </tr>
+</table>
diff --git a/groups.php b/groups.php
new file mode 100644
index 000000000..5a612c130
--- /dev/null
+++ b/groups.php
@@ -0,0 +1,45 @@
+<?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_subgroups')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$smarty->assign('groups', $user->getGroups());
+$smarty->assign('title', $i18n->get('title.groups'));
+$smarty->assign('content_page_name', 'groups.tpl');
+$smarty->display('index.tpl');

From a4fd787ff4452eb1a7e3d0c0a24d8fcebd7b8b43 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 08:26:43 +0000
Subject: [PATCH 0395/1848] Added label.subgroups to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 31 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1e5b6f3d2..c74d35a36 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -167,6 +167,7 @@
 'label.users' => 'Usuaris',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d8f647dd2..dc118550f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -171,6 +171,7 @@
 'label.users' => 'Uživatelů',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Zákazník',
 'label.clients' => 'Zákazníci',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 344bf05c3..01a71f892 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -155,6 +155,7 @@
 'label.users' => 'Brugere',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9a778429c..aa828b220 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -147,6 +147,7 @@
 'label.users' => 'Personen',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 'label.roles' => 'Rollen',
 'label.client' => 'Kunde',
 'label.clients' => 'Kunden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 31f0ebb8e..31a243414 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -144,6 +144,7 @@
 'label.user' => 'User',
 'label.users' => 'Users',
 'label.group' => 'Group',
+'label.subgroups' => 'Subgroups',
 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 622c1d87a..f9139807c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -166,6 +166,7 @@
 // TODO: translate the following.
 // 'label.users' => 'Users',
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ad3698003..03d5c3603 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -170,6 +170,7 @@
 'label.users' => 'Kasutajad',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Kliendid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 26b236393..e90fd976c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -162,6 +162,7 @@
 'label.users' => 'کاربران',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'مشتری',
 'label.clients' => 'مشتریان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 208c25598..8ec0afc59 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -157,6 +157,7 @@
 'label.users' => 'Käyttäjät',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Asiakas',
 'label.clients' => 'Asiakkaat',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index c164138c5..9805bfd4c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -154,6 +154,7 @@
 'label.users' => 'Utilisateurs',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 925abcafc..90a5fea85 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -148,6 +148,7 @@
 'label.users' => 'Χρήστες',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 'label.roles' => 'Ρόλους',
 'label.client' => 'Πελάτης',
 'label.clients' => 'Πελάτες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 0c6ad0bfb..615e40ada 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -172,6 +172,7 @@
 'label.users' => 'משתמשים',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'לקוח',
 'label.clients' => 'לקוחות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c7eb011a0..bcb236bc9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -169,6 +169,7 @@
 // 'label.user' => 'User',
 // 'label.users' => 'Users',
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Ügyfél',
 'label.clients' => 'Ügyfelek',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ac542965e..fa488a65e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -152,6 +152,7 @@
 'label.users' => 'Utenti',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Cliente',
 'label.clients' => 'Clienti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7bc81789a..142e4c684 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -172,6 +172,7 @@
 'label.users' => 'ユーザー',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'クライアント',
 'label.clients' => 'クライアント',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6121b38fb..f30d279e4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -171,6 +171,7 @@
 'label.users' => '사용자',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => '클라이언트',
 'label.clients' => '클라이언트',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index fb2e9b420..c6786e0c7 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -143,6 +143,8 @@
 'label.user' => 'Medewerker',
 'label.users' => 'Medewerkers',
 'label.group' => 'Groep',
+// TODO: translate the following.
+// 'label.subgroups' => 'Subgroups',
 'label.roles' => 'Rollen',
 'label.client' => 'Klant',
 'label.clients' => 'Klanten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index af6943cb6..c14345d1b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -172,6 +172,7 @@
 'label.users' => 'Brukere',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienter',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 39e7c9f57..92df49acb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -159,6 +159,7 @@
 'label.users' => 'Użytkownicy',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienci',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 4355f748d..7a508d98d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -156,6 +156,7 @@
 'label.users' => 'Usuários',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Cliente',
 'label.clients' => 'Clientes',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9225d2bfc..2ec859189 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -163,6 +163,7 @@
 'label.users' => 'Usuários',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a3a91d752..978117524 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -172,6 +172,7 @@
 'label.users' => 'Utilizatori',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clienti',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f11fff5bc..d026b2811 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -143,6 +143,7 @@
 'label.user' => 'Пользователь',
 'label.users' => 'Сотрудники',
 'label.group' => 'Группа',
+'label.subgroups' => 'Подгруппы',
 'label.roles' => 'Роли',
 'label.client' => 'Клиент',
 'label.clients' => 'Клиенты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 0bd2af038..5f454d1a6 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -163,6 +163,7 @@
 'label.users' => 'Používatelia',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klient',
 'label.clients' => 'Klienti',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index be971e790..f980d69e3 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -161,6 +161,7 @@
 // 'label.user' => 'User',
 // 'label.users' => 'Users',
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index aef73a45f..5165ca61b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -156,6 +156,7 @@
 'label.users' => 'Korisnici',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Klijent',
 'label.clients' => 'Klijenti',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index fe4ab32db..a8e793364 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -152,6 +152,7 @@
 'label.users' => 'Användare',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Kund',
 'label.clients' => 'Kunder',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a0916ba99..2600f1d40 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -177,6 +177,7 @@
 'label.users' => 'Kullanıcılar',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => 'Müşteri',
 'label.clients' => 'Müşteriler',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5cabb5fc1..511963efb 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -162,6 +162,7 @@
 'label.users' => '用户',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => '客户',
 'label.clients' => '客户',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 168a6d442..49fd53b6d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -169,6 +169,7 @@
 'label.users' => '用戶',
 // TODO: translate the following.
 // 'label.group' => 'Group',
+// 'label.subgroups' => 'Subgroups',
 // 'label.roles' => 'Roles',
 'label.client' => '客戶',
 'label.clients' => '客戶',

From d6a5ffec0f76b9ab5b1ee4f8e69ecdb2afd7c0ff Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 08:49:12 +0000
Subject: [PATCH 0396/1848] A bit more progress on subgroups.

---
 WEB-INF/lib/ttUser.class.php     | 14 ++++++++++++++
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/group_edit.tpl |  8 ++++++++
 groups.php                       |  4 ++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 6bac7cb46..86174547e 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -410,6 +410,20 @@ function getGroups() {
     return $groups;
   }
 
+  // getSubgroups obtains a list of immediate subgroups.
+  function getSubgroups() {
+    $mdb2 = getConnection();
+
+    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = ".$this->getActiveGroup();;
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $groups[] = array('id'=>$val['id'],'name'=>$val['name']);
+      }
+    }
+    return $groups;
+  }
+
   // getUser function is used to manage users in group and returns user details.
   // At the moment, the function is used for user edits and deletes.
   function getUser($user_id) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9a9be2d06..53f93aceb 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.25.4477 | 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.25.4478 | 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 ef00ca4db..ea46bec6f 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -41,6 +41,14 @@ function handleTaskRequiredCheckbox() {
             <td><a href="roles.php">{$i18n.label.configure}</a></td>
           </tr>
   {/if}
+{if $smarty.const.SUBGROUP_DEBUG == 'true'}
+  {if $user->can('manage_subgroups')}
+          <tr>
+            <td align="right" nowrap>{$i18n.label.subgroups}:</td>
+            <td><a href="groups.php">{$i18n.label.configure}</a></td>
+          </tr>
+  {/if}
+{/if}
           <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
            <td>{$forms.groupForm.lang.control}</td>
diff --git a/groups.php b/groups.php
index 5a612c130..12e54da20 100644
--- a/groups.php
+++ b/groups.php
@@ -39,7 +39,7 @@
 }
 // End of access checks.
 
-$smarty->assign('groups', $user->getGroups());
-$smarty->assign('title', $i18n->get('title.groups'));
+$smarty->assign('groups', $user->getSubgroups());
+$smarty->assign('title', $i18n->get('label.subgroups'));
 $smarty->assign('content_page_name', 'groups.tpl');
 $smarty->display('index.tpl');

From d25b2051caf684cb847977474f03ee0d3c1046e4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 13:15:32 +0000
Subject: [PATCH 0397/1848] Introduced menu.subgroups in translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c74d35a36..d42e37e6b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -63,6 +63,7 @@
 'menu.users' => 'Usuaris',
 'menu.groups' => 'Grups',
 // TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clients',
 'menu.options' => 'Opcions',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index dc118550f..526b2215d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -64,6 +64,7 @@
 'menu.users' => 'Uživatelů',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Export',
 'menu.clients' => 'Zákazníci',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 01a71f892..02b75e54d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => 'Brugere',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Indstillinger',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index aa828b220..b0729b6ea 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -56,6 +56,8 @@
 'menu.tasks' => 'Aufgaben',
 'menu.users' => 'Personen',
 'menu.groups' => 'Gruppen',
+// TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportieren',
 'menu.clients' => 'Kunden',
 'menu.options' => 'Optionen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 31a243414..c230ebad5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -47,6 +47,7 @@
 'menu.create_group' => 'Create Group',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
+'menu.subgroups' => 'Subgroups',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
 'menu.expenses' => 'Expenses',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f9139807c..d9db4ffe9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -62,6 +62,7 @@
 'menu.users' => 'Personas',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opciones',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 03d5c3603..bbd21100e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -65,6 +65,7 @@
 'menu.users' => 'Kasutajad',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Kliendid',
 'menu.options' => 'Suvandid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e90fd976c..41e87c53a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -60,6 +60,7 @@
 'menu.users' => 'کاربران',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'پشتیبانی',
 'menu.clients' => 'مشتری ها',
 'menu.options' => 'تنظیمات',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 8ec0afc59..3ed9b100f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => 'Käyttäjät',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Vie',
 'menu.clients' => 'Asiakkaat',
 'menu.options' => 'Optiot',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9805bfd4c..fd6cef4d9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => 'Utilisateurs',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exporter',
 'menu.clients' => 'Clients',
 'menu.options' => 'Options',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 90a5fea85..f2b7551c7 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -56,6 +56,8 @@
 'menu.tasks' => 'Εργασίες',
 'menu.users' => 'Χρήστες',
 'menu.groups' => 'Ομάδες',
+// TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Εξαγωγή',
 'menu.clients' => 'Πελάτες',
 'menu.options' => 'Επιλογές',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 615e40ada..8433cc585 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -61,6 +61,7 @@
 'menu.users' => 'משתמשים',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'ייצוא',
 'menu.clients' => 'לקוחות',
 'menu.options' => 'אפשרויות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index bcb236bc9..d5a3bb12a 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -63,6 +63,8 @@
 // 'menu.users' => 'Users',
 'menu.groups' => 'Csoportok',
 // TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
+// TODO: translate the following.
 // 'menu.export' => 'Export',
 'menu.clients' => 'Ügyfelek',
 'menu.options' => 'Opciók',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index fa488a65e..fdb1df325 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -58,6 +58,8 @@
 'menu.tasks' => 'Compiti',
 'menu.users' => 'Utenti',
 'menu.groups' => 'Gruppi',
+// TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Esportazione',
 'menu.clients' => 'Clienti',
 'menu.options' => 'Opzioni',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 142e4c684..6eb90e805 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -63,6 +63,7 @@
 'menu.users' => 'ユーザー',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'クライアント',
 'menu.options' => 'オプション',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f30d279e4..03730d428 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -63,6 +63,7 @@
 'menu.users' => '사용자',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => '클라이언트',
 'menu.options' => '옵션',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c6786e0c7..26f76b55a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -56,6 +56,8 @@
 'menu.tasks' => 'Taken',
 'menu.users' => 'Medewerkers',
 'menu.groups' => 'Groepen',
+// TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exporteren',
 'menu.clients' => 'Klanten',
 'menu.options' => 'Opties',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c14345d1b..7202ac1c2 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -63,6 +63,7 @@
 'menu.users' => 'Brukere',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienter',
 'menu.options' => 'Opsjoner',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 92df49acb..5e448b729 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => 'Użytkownicy',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienci',
 'menu.options' => 'Opcje',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7a508d98d..9c20ecd7c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => 'Usuários',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportar',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opções',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2ec859189..fd0f8d680 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -65,6 +65,7 @@
 'menu.users' => 'Usuários',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 // 'menu.clients' => 'Clients',
 'menu.options' => 'Opções',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 978117524..2f9bcfef7 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -65,6 +65,7 @@
 'menu.users' => 'Utilizatori',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clienti',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d026b2811..44b702b07 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -56,6 +56,7 @@
 'menu.tasks' => 'Задачи',
 'menu.users' => 'Пользователи',
 'menu.groups' => 'Группы',
+'menu.subgroups' => 'Подгруппы',
 'menu.export' => 'Экспорт',
 'menu.clients' => 'Клиенты',
 'menu.options' => 'Опции',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 5f454d1a6..630ba5a73 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -60,6 +60,7 @@
 'menu.users' => 'Používatelia',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Export',
 'menu.clients' => 'Klienti',
 'menu.options' => 'Nastavenia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f980d69e3..ec6ad45d2 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -63,6 +63,7 @@
 // 'menu.tasks' => 'Tasks',
 // 'menu.users' => 'Users',
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Stranke',
 'menu.options' => 'Možnosti',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5165ca61b..bc411671b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => 'Korisnici',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Izvoz',
 'menu.clients' => 'Klijenti',
 'menu.options' => 'Opcije',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a8e793364..969380b5d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -56,6 +56,8 @@
 'menu.tasks' => 'Arbetsuppgifter',
 'menu.users' => 'Användare',
 'menu.groups' => 'Grupper',
+// TODO: translate the following.
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportera',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Alternativ',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2600f1d40..cf64056a0 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -65,6 +65,7 @@
 'menu.users' => 'Kullanıcılar',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Müşteriler',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 511963efb..36b078454 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -59,6 +59,7 @@
 'menu.users' => '用户',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => '导出数据',
 'menu.clients' => '客户',
 'menu.options' => '选项',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 49fd53b6d..d6eebdb90 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -61,6 +61,7 @@
 'menu.users' => '用戶',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
+// 'menu.subgroups' => 'Subgroups',
 'menu.export' => '輸出資料',
 'menu.clients' => '客戶',
 'menu.options' => '選項',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 53f93aceb..7fa4b1383 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.25.4478 | 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.25.4479 | 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>

From 235858d0ca557daca78f85706512dfd01fe1f77d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 13:44:18 +0000
Subject: [PATCH 0398/1848] Introduced title.subgroups in translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 4 +++-
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 4 +++-
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index d42e37e6b..47b3e8a19 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -262,6 +262,7 @@
 'title.login' => 'Sessió iniciada',
 'title.groups' => 'Grups',
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Eliminar grup',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 526b2215d..179b5a3c7 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -272,6 +272,7 @@
 'title.login' => 'Přihlásit',
 'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Smazat tým', // TODO: change "team" to "group".
@@ -336,6 +337,7 @@
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.group' => 'Group Settings',
+// 'title.subgroups' => 'Subgroups',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 02b75e54d..0fe7c608a 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -241,7 +241,9 @@
 // Form titles.
 'title.login' => 'Login',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
-'title.create_gtoup' => 'Opret Team', // TODO: change "team" to "group".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
+'title.create_group' => 'Opret Team', // TODO: change "team" to "group".
 'title.edit_group' => 'Redigér Team', // TODO: change "team" to "group".
 'title.delete_group' => 'Slet Team', // TODO: change "team" to "group".
 'title.reset_password' => 'Nulstilling af Adgangskode',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b0729b6ea..6a90ab1fa 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -229,6 +229,8 @@
 // Form titles.
 'title.login' => 'Anmelden',
 'title.groups' => 'Gruppen',
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Gruppe anlegen',
 'title.edit_group' => 'Gruppe bearbeiten',
 'title.delete_group' => 'Gruppe löschen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index c230ebad5..fbe1f0dcd 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -225,6 +225,7 @@
 // Form titles.
 'title.login' => 'Login',
 'title.groups' => 'Groups',
+'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Creating Group',
 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d9db4ffe9..b525fe61a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -261,6 +261,7 @@
 'title.login' => 'Sesión iniciada',
 'title.groups' => 'Grupos',
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index bbd21100e..56459f121 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -269,6 +269,7 @@
 'title.login' => 'Login',
 'title.groups' => 'Meeskonnad', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Kustuta meeskond',  // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 41e87c53a..dd3e879e1 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -252,6 +252,8 @@
 // Form titles.
 'title.login' => 'ورود',
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'ایجاد تیم', // TODO: change "team" to "group".
 // TODO: translate the following.
 // 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3ed9b100f..18eb89c09 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -244,7 +244,9 @@
 
 // Form titles.
 'title.login' => 'Kirjautuminen',
-'title.groupd' => 'Tiimit', // TODO: change "teams" to "groups".
+'title.groups' => 'Tiimit', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Tiimin luonti', // TODO: change "team" to "group".
 'title.edit_group' => 'Tiimin muokkaus', // TODO: change "team" to "group".
 'title.delete_group' => 'Tiimin poisto', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index fd6cef4d9..e0e4eb9a5 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -239,6 +239,8 @@
 // Form titles.
 'title.login' => 'Connexion',
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Création d\\\'une nouvelle équipe', // TODO: change "team" to "group".
 'title.edit_group' => 'Modification d\\\'une équipe', // TODO: change "team" to "group".
 'title.delete_group' => 'Suppression d\\\'une équipe', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f2b7551c7..fbdf23950 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -232,6 +232,8 @@
 // Form titles.
 'title.login' => 'Σύνδεση',
 'title.groups' => 'Ομάδες',
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Δημιουργία ομάδας',
 'title.edit_group' => 'Επεξεργασία ομάδας',
 'title.delete_group' => 'Διαγραφή ομάδας',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8433cc585..a1b09733c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -262,6 +262,8 @@
 // Form titles.
 'title.login' => 'כניסה',
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'יצירת צוות', // TODO: change "team" to "group".
 // TODO: translate the following.
 // 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d5a3bb12a..a7bcb7874 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -263,6 +263,7 @@
 'title.login' => 'Bejelentkezés',
 'title.groups' => 'Csoportok',
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Csoport törlése',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index fdb1df325..5dcf7f3d8 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -240,6 +240,8 @@
 // Specifically: Eliminazione vs Elimina - we probably want nouns in titles.
 'title.login' => 'Login',
 'title.groups' => 'Gruppi',
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Creazione gruppo',
 'title.edit_group' => 'Modifica gruppo',
 'title.delete_group' => 'Elimina gruppo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 6eb90e805..917112ac0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -268,6 +268,7 @@
 'title.login' => 'ログイン',
 'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'チームの削除',  // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 03730d428..b78d5b364 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -268,6 +268,7 @@
 'title.login' => '로그인',
 'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '팀 삭제',  // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 26f76b55a..20b42e1ed 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -226,6 +226,8 @@
 // Form titles.
 'title.login' => 'Aanmelden',
 'title.groups' => 'Groepen',
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Groep maken',
 'title.edit_group' => 'Groep bewerken',
 'title.delete_group' => 'Groep aan het verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 7202ac1c2..60899aeea 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -266,6 +266,7 @@
 'title.login' => 'Innlogging',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Slett team', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 5e448b729..d2bc47b39 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -246,6 +246,8 @@
 // Form titles.
 'title.login' => 'Logowanie',
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Zakładanie zespołu', // TODO: change "team" to "group".
 'title.edit_group' => 'Edytowanie zespołu', // TODO: change "team" to "group".
 'title.delete_group' => 'Usuwanie zespołu', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9c20ecd7c..5895273ca 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -243,6 +243,8 @@
 // Form titles.
 'title.login' => 'Login',
 'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Criando equipe', // TODO: change "team" to "group".
 'title.edit_group' => 'Editando equipe', // TODO: change "team" to "group".
 'title.delete_group' => 'Apagando equipe', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fd0f8d680..52abd787e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -253,6 +253,7 @@
 'title.login' => 'Login',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 2f9bcfef7..e7e638be3 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -268,6 +268,7 @@
 'title.login' => 'Autentificare',
 'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Team',
 // 'title.edit_group' => 'Editing Team',
 'title.delete_group' => 'Șterge echipa', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 44b702b07..5c364bb15 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -224,6 +224,7 @@
 // Form titles.
 'title.login' => 'Вход в систему',
 'title.groups' => 'Группы',
+'title.subgroups' => 'Подгруппы',
 'title.create_group' => 'Создание группы',
 'title.edit_group' => 'Редактирование группы',
 'title.delete_group' => 'Удаление группы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 630ba5a73..2b2fe7376 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -252,6 +252,8 @@
 // Form titles.
 'title.login' => 'Prihlásenie',
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Vytváranie tímu', // TODO: change "team" to "group".
 // TODO: translate the following.
 // 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ec6ad45d2..dafd82b72 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -248,6 +248,7 @@
 'title.login' => 'Prijava',
 'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index bc411671b..79712abf7 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -244,6 +244,8 @@
 // Form titles.
 'title.login' => 'Prijava',
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Napravi tim', // TODO: change "team" to "group".
 'title.edit_group' => 'Izmeni tim', // TODO: change "team" to "group".
 'title.delete_group' => 'Obriši tim', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 969380b5d..785a88ee4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -240,6 +240,8 @@
 // Rubriker för formulär
 'title.login' => 'Logga in',
 'title.groups' => 'Grupper',
+// TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 'title.create_group' => 'Skapa grupp',
 'title.edit_group' => 'Redigera grupp',
 'title.delete_group' => 'Ta bort grupp',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cf64056a0..b813f8a46 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -277,6 +277,7 @@
 'title.login' => 'Giriş',
 'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Ekibi sil', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 36b078454..4ecbc340d 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -257,6 +257,7 @@
 'title.login' => '登录',
 'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '删除团队', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index d6eebdb90..40a5265c7 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -264,6 +264,7 @@
 'title.login' => '登錄',
 'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.
+// 'title.subgroups' => 'Subgroups',
 // 'title.create_group' => 'Creating Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '刪除團隊', // TODO: change "team" to "group".
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7fa4b1383..d4a8f9087 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.25.4479 | 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.25.4480 | 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>

From 62bebb89af9afb9c4008d799c67e24988cb3688d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 14:18:28 +0000
Subject: [PATCH 0399/1848] Refactoring - renamed title.create_group with
 title.add_group for consistency.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 3 +--
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 3 +--
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 4 ++--
 WEB-INF/resources/ru.lang.php    | 4 ++--
 WEB-INF/resources/sk.lang.php    | 3 +--
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 admin_group_add.php              | 2 +-
 register.php                     | 2 +-
 33 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 47b3e8a19..b250c85d9 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -263,7 +263,7 @@
 'title.groups' => 'Grups',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Eliminar grup',
 'title.reset_password' => 'Restablir paraula de pas',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 179b5a3c7..12cf6ba1c 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -273,7 +273,7 @@
 'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Smazat tým', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetovat heslo',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 0fe7c608a..581b3056d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -243,7 +243,7 @@
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Opret Team', // TODO: change "team" to "group".
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Redigér Team', // TODO: change "team" to "group".
 'title.delete_group' => 'Slet Team', // TODO: change "team" to "group".
 'title.reset_password' => 'Nulstilling af Adgangskode',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6a90ab1fa..be82a10d9 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -231,7 +231,7 @@
 'title.groups' => 'Gruppen',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Gruppe anlegen',
+'title.add_group' => 'Gruppe anlegen',
 'title.edit_group' => 'Gruppe bearbeiten',
 'title.delete_group' => 'Gruppe löschen',
 'title.reset_password' => 'Passworterinnerung',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index fbe1f0dcd..3c955c3e9 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -226,7 +226,7 @@
 'title.login' => 'Login',
 'title.groups' => 'Groups',
 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Creating Group',
+'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Resetting Password',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b525fe61a..71efd88c7 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -262,7 +262,7 @@
 'title.groups' => 'Grupos',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Reestablecer contraseña',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 56459f121..338765bd0 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -270,7 +270,7 @@
 'title.groups' => 'Meeskonnad', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Kustuta meeskond',  // TODO: change "team" to "group".
 'title.reset_password' => 'Tühjenda salasõna',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index dd3e879e1..ccc73725b 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -254,8 +254,7 @@
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'ایجاد تیم', // TODO: change "team" to "group".
-// TODO: translate the following.
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'حذف تیم', // TODO: change "team" to "group".
 'title.reset_password' => 'بازیابی رمزعبور',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 18eb89c09..37477d1c7 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -247,7 +247,7 @@
 'title.groups' => 'Tiimit', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Tiimin luonti', // TODO: change "team" to "group".
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Tiimin muokkaus', // TODO: change "team" to "group".
 'title.delete_group' => 'Tiimin poisto', // TODO: change "team" to "group".
 'title.reset_password' => 'Salasanan nollaus',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e0e4eb9a5..983bb1b0e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -241,7 +241,7 @@
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Création d\\\'une nouvelle équipe', // TODO: change "team" to "group".
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Modification d\\\'une équipe', // TODO: change "team" to "group".
 'title.delete_group' => 'Suppression d\\\'une équipe', // TODO: change "team" to "group".
 'title.reset_password' => 'Réinitialisation du mot de passe',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index fbdf23950..ea70b4b41 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -234,7 +234,7 @@
 'title.groups' => 'Ομάδες',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Δημιουργία ομάδας',
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Επεξεργασία ομάδας',
 'title.delete_group' => 'Διαγραφή ομάδας',
 'title.reset_password' => 'Επαναφορά κωδικού πρόσβασης',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a1b09733c..0df67c7fc 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -264,8 +264,7 @@
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'יצירת צוות', // TODO: change "team" to "group".
-// TODO: translate the following.
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'מחיקת צוות', // TODO: change "team" to "group".
 'title.reset_password' => 'איפוס סיסמה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a7bcb7874..305d5b6be 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -264,7 +264,7 @@
 'title.groups' => 'Csoportok',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Csoport törlése',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5dcf7f3d8..2d9a3cf44 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -242,7 +242,7 @@
 'title.groups' => 'Gruppi',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Creazione gruppo',
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Modifica gruppo',
 'title.delete_group' => 'Elimina gruppo',
 'title.reset_password' => 'Reset password',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 917112ac0..8bb27cfde 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -269,7 +269,7 @@
 'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'チームの削除',  // TODO: change "team" to "group".
 'title.reset_password' => 'パスワードの初期化',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b78d5b364..825971039 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -269,7 +269,7 @@
 'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '팀 삭제',  // TODO: change "team" to "group".
 'title.reset_password' => '암호 재설정',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 20b42e1ed..a23985599 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -228,7 +228,7 @@
 'title.groups' => 'Groepen',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Groep maken',
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Groep bewerken',
 'title.delete_group' => 'Groep aan het verwijderen',
 'title.reset_password' => 'Wachtwoord herstellen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 60899aeea..6b4e37604 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -267,7 +267,7 @@
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Slett team', // TODO: change "team" to "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d2bc47b39..dc79976db 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -248,7 +248,7 @@
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Zakładanie zespołu', // TODO: change "team" to "group".
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Edytowanie zespołu', // TODO: change "team" to "group".
 'title.delete_group' => 'Usuwanie zespołu', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetowanie hasła',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5895273ca..1ad30fcc1 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -245,7 +245,7 @@
 'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Criando equipe', // TODO: change "team" to "group".
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editando equipe', // TODO: change "team" to "group".
 'title.delete_group' => 'Apagando equipe', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetando a senha',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 52abd787e..fd50d487a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -254,7 +254,7 @@
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
 // 'title.reset_password' => 'Resetting Password',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e7e638be3..37f55ba8d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -269,8 +269,8 @@
 'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Team',
-// 'title.edit_group' => 'Editing Team',
+// 'title.add_group' => 'Adding Group',
+// 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Șterge echipa', // TODO: change "team" to "group".
 'title.reset_password' => 'Reseteaza parola',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5c364bb15..d02b91c5d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -225,7 +225,7 @@
 'title.login' => 'Вход в систему',
 'title.groups' => 'Группы',
 'title.subgroups' => 'Подгруппы',
-'title.create_group' => 'Создание группы',
+'title.add_group' => 'Добавление группы',
 'title.edit_group' => 'Редактирование группы',
 'title.delete_group' => 'Удаление группы',
 'title.reset_password' => 'Cброс пароля',
@@ -247,7 +247,7 @@
 'title.send_invoice' => 'Отсылка счёта',
 'title.charts' => 'Диаграммы',
 'title.projects' => 'Проекты',
-'title.add_project' => 'Создание проекта',
+'title.add_project' => 'Добавление проекта',
 'title.edit_project' => 'Редактирование проекта',
 'title.delete_project' => 'Удаление проекта',
 'title.tasks' => 'Задачи',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2b2fe7376..a4dee66f7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -254,8 +254,7 @@
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Vytváranie tímu', // TODO: change "team" to "group".
-// TODO: translate the following.
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Vymazávanie tímu', // TODO: change "team" to "group".
 'title.reset_password' => 'Obnovovanie hesla',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index dafd82b72..c989f8a2c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -249,7 +249,7 @@
 'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Razveljavi geslo',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 79712abf7..73baaf8bd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -246,7 +246,7 @@
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Napravi tim', // TODO: change "team" to "group".
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Izmeni tim', // TODO: change "team" to "group".
 'title.delete_group' => 'Obriši tim', // TODO: change "team" to "group".
 'title.reset_password' => 'Resetuj Lozinku',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 785a88ee4..84716b72e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -242,7 +242,7 @@
 'title.groups' => 'Grupper',
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-'title.create_group' => 'Skapa grupp',
+// 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Redigera grupp',
 'title.delete_group' => 'Ta bort grupp',
 'title.reset_password' => 'Återställ lösenord',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b813f8a46..9bcab60d8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -278,7 +278,7 @@
 'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Ekibi sil', // TODO: change "team" to "group".
 'title.reset_password' => 'Parolayı sıfırla',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4ecbc340d..f8104a67e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -258,7 +258,7 @@
 'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '删除团队', // TODO: change "team" to "group".
 'title.reset_password' => '重设密码',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 40a5265c7..a2cbd5188 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -265,7 +265,7 @@
 'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.subgroups' => 'Subgroups',
-// 'title.create_group' => 'Creating Group',
+// 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '刪除團隊', // TODO: change "team" to "group".
 'title.reset_password' => '重設密碼',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d4a8f9087..40e99b909 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.25.4480 | 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.25.4481 | 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/admin_group_add.php b/admin_group_add.php
index e40be98e4..40d7a8748 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -117,5 +117,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('content_page_name', 'admin_group_add.tpl');
-$smarty->assign('title', $i18n->get('title.create_group'));
+$smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->display('index.tpl');
diff --git a/register.php b/register.php
index 4568e3709..298f2818f 100644
--- a/register.php
+++ b/register.php
@@ -111,7 +111,7 @@
   }
 } // isPost
 
-$smarty->assign('title', $i18n->get('title.create_group'));
+$smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('content_page_name', 'register.tpl');

From 69915aba68a312fb2080c2356a482736efc254ae Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 14:38:03 +0000
Subject: [PATCH 0400/1848] Replaced usage of title.group with
 title.group_edit.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 2 --
 WEB-INF/resources/da.lang.php    | 2 --
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 2 --
 WEB-INF/resources/fi.lang.php    | 2 --
 WEB-INF/resources/fr.lang.php    | 2 --
 WEB-INF/resources/gr.lang.php    | 2 --
 WEB-INF/resources/he.lang.php    | 2 --
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 2 --
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 2 --
 WEB-INF/resources/pt-br.lang.php | 2 --
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 2 --
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 2 --
 WEB-INF/resources/sv.lang.php    | 2 --
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 WEB-INF/templates/footer.tpl     | 2 +-
 group_edit.php                   | 2 +-
 32 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b250c85d9..a0accefda 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -325,7 +325,6 @@
 'title.options' => 'Opcions',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 12cf6ba1c..a42826fad 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -336,8 +336,6 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
-// 'title.subgroups' => 'Subgroups',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 581b3056d..7eaec94cc 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -298,8 +298,6 @@
 'title.import' => 'Importer Team Data', // TODO: replace "team" with "group".
 'title.options' => 'Indstillinger',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Brugerdefineret Felt',
 'title.cf_add_custom_field' => 'Tilføj Brugerdefineret Felt',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index be82a10d9..627941493 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -281,7 +281,6 @@
 'title.import' => 'Daten importieren',
 'title.options' => 'Optionen',
 'title.profile' => 'Profil',
-'title.group' => 'Gruppeneinstellungen',
 'title.plugins' => 'Erweiterungen',
 'title.cf_custom_fields' => 'Benutzerfelder',
 'title.cf_add_custom_field' => 'Benutzerfeld hinzufügen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 3c955c3e9..6d7a47c73 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -280,7 +280,6 @@
 'title.import' => 'Importing Group Data',
 'title.options' => 'Options',
 'title.profile' => 'Profile',
-'title.group' => 'Group Settings',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Custom Fields',
 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 71efd88c7..b53ebd944 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -324,7 +324,6 @@
 'title.options' => 'Opciones',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 338765bd0..4aede3a4d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -332,7 +332,6 @@
 'title.options' => 'Suvandid',
 'title.profile' => 'Profiili',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ccc73725b..140da1bcb 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -306,8 +306,6 @@
 'title.import' => 'وارد کردن اطلاعات تیم', // TODO: replace "team" with "group".
 'title.options' => 'گزینه ها',
 'title.profile' => 'پروفایل',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'پلاگین ها',
 'title.cf_custom_fields' => 'فیلدهای سفارشی',
 'title.cf_add_custom_field' => 'درج فیلد سفارشی',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 37477d1c7..f290ff5ba 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -299,8 +299,6 @@
 'title.import' => 'Tiimitietojen tunti', // TODO: replace "team" with "group".
 'title.options' => 'Optiot',
 'title.profile' => 'Profiili',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Lisäosat',
 'title.cf_custom_fields' => 'Omat kentät',
 'title.cf_add_custom_field' => 'Oman kentän lisäys',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 983bb1b0e..d4f372b17 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -292,8 +292,6 @@
 'title.import' => 'Importation des données',
 'title.options' => 'Options',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Champs personalisés',
 'title.cf_add_custom_field' => 'Ajout d\\\'un champ',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ea70b4b41..ef78fd501 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -288,8 +288,6 @@
 'title.import' => 'Εισαγωγή δεδομένων ομάδας',
 'title.options' => 'Επιλογές',
 'title.profile' => 'Προφίλ',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Πρόσθετα',
 'title.cf_custom_fields' => 'Προσαρμοσμένα πεδία',
 'title.cf_add_custom_field' => 'Προσθήκη προσαρμοσμένου πεδίου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 0df67c7fc..661ff27a4 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -317,8 +317,6 @@
 'title.import' => 'ייבוא נתוני צוות', // TODO: replace "team" with "group".
 'title.options' => 'אפשרויות',
 'title.profile' => 'פרופיל',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'תוספים',
 'title.cf_custom_fields' => 'שדות אישיים',
 'title.cf_add_custom_field' => 'הוספת שדה אישי',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 305d5b6be..30d9a9a0e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -324,7 +324,6 @@
 'title.options' => 'Opciók',
 'title.profile' => 'Profil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2d9a3cf44..2f0535781 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -297,8 +297,6 @@
 'title.import' => 'Importa i dati del gruppo',
 'title.options' => 'Opzioni',
 'title.profile' => 'Profilo',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Plugin',
 'title.cf_custom_fields' => 'Campi personalizzati',
 'title.cf_add_custom_field' => 'Aggiunta campo personalizzato',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8bb27cfde..29a7a034b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -331,7 +331,6 @@
 'title.options' => 'オプション',
 'title.profile' => 'プロファイル',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 825971039..f8d99f1b4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -332,7 +332,6 @@
 'title.options' => '옵션',
 'title.profile' => '프로필',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a23985599..531953e23 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -282,7 +282,6 @@
 'title.import' => 'Importeer groepsgegevens',
 'title.options' => 'Opties',
 'title.profile' => 'Profiel',
-'title.group' => 'Groep instelling',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Eigen velden',
 'title.cf_add_custom_field' => 'Eigen veld toevoegen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6b4e37604..35ec512be 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -328,7 +328,6 @@
 'title.options' => 'Opsjoner',
 'title.profile' => 'Profil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index dc79976db..301e002cb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -299,8 +299,6 @@
 'title.import' => 'Import danych zespołu', // TODO: replace "team" with "group".
 'title.options' => 'Opcje',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Dodatkowe moduły',
 'title.cf_custom_fields' => 'Pola niestandardowe',
 'title.cf_add_custom_field' => 'Dodawanie pola niestandardowego',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 1ad30fcc1..b97881572 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -296,8 +296,6 @@
 'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
 'title.options' => 'Opções',
 'title.profile' => 'Perfil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Campos personalizados',
 'title.cf_add_custom_field' => 'Adicionando campo personalizado',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fd50d487a..8de4afaf0 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -312,7 +312,6 @@
 'title.options' => 'Opções',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 37f55ba8d..d43f76b42 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -331,7 +331,6 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d02b91c5d..40a5c1e30 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -279,7 +279,6 @@
 'title.import' => 'Импортирование данных группы',
 'title.options' => 'Опции',
 'title.profile' => 'Профиль',
-'title.group' => 'Настройки группы',
 'title.plugins' => 'Плагины',
 'title.cf_custom_fields' => 'Дополнительные поля',
 'title.cf_add_custom_field' => 'Добавление поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a4dee66f7..de985d430 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -307,8 +307,6 @@
 'title.import' => 'Importovanie údajov o tíme', // TODO: replace "team" with "group".
 'title.options' => 'Nastavenia',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Doplnkové moduly',
 'title.cf_custom_fields' => 'Vlastné polia',
 'title.cf_add_custom_field' => 'Pridávanie vlastného poľa',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c989f8a2c..83815f7de 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -306,7 +306,6 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 73baaf8bd..42ded8f94 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -297,8 +297,6 @@
 'title.import' => 'Uvoz podataka tim-a', // TODO: replace "team" with "group".
 'title.options' => 'Opcije',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Dodaci',
 'title.cf_custom_fields' => 'Dodatna polja',
 'title.cf_add_custom_field' => 'Dodavanje dodatnih polja',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 84716b72e..43c76d0e4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -297,8 +297,6 @@
 'title.import' => 'Importera grupp',
 'title.options' => 'Alternativ',
 'title.profile' => 'Profil',
-// TODO: translate the following.
-// 'title.group' => 'Group Settings',
 'title.plugins' => 'Tillägg',
 'title.cf_custom_fields' => 'Egna fält',
 'title.cf_add_custom_field' => 'Lägg till fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9bcab60d8..d5764bedf 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -340,7 +340,6 @@
 // 'title.options' => 'Options',
 'title.profile' => 'Profili',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f8104a67e..a60145578 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -320,7 +320,6 @@
 'title.options' => '选项',
 'title.profile' => '简介',
 // TODO: translate the following.
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a2cbd5188..c51900fac 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -327,7 +327,6 @@
 'title.options' => '選項',
 // TODO: translate the following.
 // 'title.profile' => 'Profile',
-// 'title.group' => 'Group Settings',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 40e99b909..f1450a136 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.25.4481 | 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.25.4482 | 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/group_edit.php b/group_edit.php
index e9d5189a1..872fe1480 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -222,6 +222,6 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
-$smarty->assign('title', $i18n->get('title.group'));
+$smarty->assign('title', $i18n->get('title.edit_group'));
 $smarty->assign('content_page_name', 'group_edit.tpl');
 $smarty->display('index.tpl');

From 7faef0e6d81444ad3ae10d1a2ce62fa753c80a9f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 15:42:59 +0000
Subject: [PATCH 0401/1848] Improved isTrue() function and its usage to
 streamline code.

---
 WEB-INF/lib/Auth.class.php           |  6 +++---
 WEB-INF/lib/I18n.class.php           |  4 ----
 WEB-INF/lib/auth/Auth_db.class.php   |  2 +-
 WEB-INF/lib/auth/Auth_ldap.class.php | 24 ++++++++++++------------
 WEB-INF/lib/common.lib.php           |  2 +-
 WEB-INF/lib/mail/Mailer.class.php    |  6 +++---
 WEB-INF/templates/footer.tpl         |  2 +-
 time.php                             |  2 +-
 tofile.php                           |  8 ++++----
 9 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/Auth.class.php b/WEB-INF/lib/Auth.class.php
index 354d34ba2..d57a0c4a3 100644
--- a/WEB-INF/lib/Auth.class.php
+++ b/WEB-INF/lib/Auth.class.php
@@ -64,7 +64,7 @@ function isPasswordExternal()
   function doLogin($login, $password) {
     $auth = $this->authenticate($login, $password);
 
-    if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+    if (isTrue(AUTH_DEBUG)) {
       echo '<br>'; var_dump($auth); echo '<br />';
     }
 
@@ -77,13 +77,13 @@ function doLogin($login, $password) {
     $sql = "SELECT id FROM tt_users WHERE login = ".$mdb2->quote($login)." AND status = 1";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
-      if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG))
+      if (isTrue(AUTH_DEBUG))
         echo 'db error!<br />';
       return false;
     }
     $val = $res->fetchRow();
     if (!$val['id']) {
-      if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG))
+      if (isTrue(AUTH_DEBUG))
         echo 'login "'.$login.'" does not exist in Time Tracker database.<br />';
       return false;
     }
diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 0e3dd02a4..15799c23e 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -70,9 +70,7 @@ function load($localName) {
       $this->weekdayNames = $i18n_weekdays;
 
         $this->weekdayShortNames = $i18n_weekdays_short;
-//      if (defined('SHOW_HOLIDAYS') && isTrue(SHOW_HOLIDAYS)) {
         $this->holidays = $i18n_holidays;
-//      }
 
       foreach ($i18n_key_words as $kword=>$value) {
         $pos = strpos($kword, ".");
@@ -97,9 +95,7 @@ function load($localName) {
       $this->monthNames = $i18n_months;
       $this->weekdayNames = $i18n_weekdays;
         $this->weekdayShortNames = $i18n_weekdays_short;
-//      if (defined('SHOW_HOLIDAYS') && isTrue(SHOW_HOLIDAYS)) {
         $this->holidays = $i18n_holidays;
-//      }
       foreach ($i18n_key_words as $kword=>$value) {
         if (!$value) continue;
         $pos = strpos($kword, ".");
diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index 937ad3cc9..c380330c0 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -58,7 +58,7 @@ function authenticate($login, $password)
     } else {
 
       // If the OLD_PASSWORDS option is defined - set it.
-      if (defined('OLD_PASSWORDS') && isTrue(OLD_PASSWORDS)) {
+      if (isTrue(OLD_PASSWORDS)) {
         $sql = "SET SESSION old_passwords = 1";
         $res = $mdb2->query($sql);
         if (is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index e17b6e7c9..23ea127e6 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -96,7 +96,7 @@ function authenticate($login, $password)
 
     $lc = ldap_connect($this->params['server']);
 
-    if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+    if (isTrue(AUTH_DEBUG)) {
       echo '<br />';
       echo '$lc='; var_dump($lc); echo '<br />';
       echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
@@ -106,7 +106,7 @@ function authenticate($login, $password)
 
     ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, 3);
     ldap_set_option($lc, LDAP_OPT_REFERRALS, 0);
-    if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+    if (isTrue(AUTH_DEBUG)) {
       ldap_set_option($lc, LDAP_OPT_DEBUG_LEVEL, 7);
     }
 
@@ -119,13 +119,13 @@ function authenticate($login, $password)
         $login .= '@' . $this->params['default_domain'];
       }
 
-      if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+      if (isTrue(AUTH_DEBUG)) {
         echo '$login='; var_dump($login); echo '<br />';
       }
 
       $lb = @ldap_bind($lc, $login, $password);
 
-      if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+      if (isTrue(AUTH_DEBUG)) {
         echo '$lb='; var_dump($lb); echo '<br />';
         echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
       }
@@ -142,7 +142,7 @@ function authenticate($login, $password)
         $fields = array('memberof');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
-        if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+        if (isTrue(AUTH_DEBUG)) {
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -154,7 +154,7 @@ function authenticate($login, $password)
 
         $entries = @ldap_get_entries($lc, $sr);
 
-        if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+        if (isTrue(AUTH_DEBUG)) {
           echo '$entries='; var_dump($entries); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -173,7 +173,7 @@ function authenticate($login, $password)
           $groups[] = substr($grp_fields[0], 3);
         }
 
-        if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+        if (isTrue(AUTH_DEBUG)) {
           echo '$member_of'; var_dump($member_of); echo '<br />';
         };
 
@@ -195,7 +195,7 @@ function authenticate($login, $password)
       // Assuming OpenLDAP server.
       $login_oldap = 'uid='.$login.','.$this->params['base_dn'];
 
-      if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+      if (isTrue(AUTH_DEBUG)) {
         echo '$login_oldap='; var_dump($login_oldap); echo '<br />';
       }
 
@@ -207,7 +207,7 @@ function authenticate($login, $password)
 
       $lb = @ldap_bind($lc, $login_oldap, $password);
 
-      if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+      if (isTrue(AUTH_DEBUG)) {
         echo '$lb='; var_dump($lb); echo '<br />';
         echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
       }
@@ -225,7 +225,7 @@ function authenticate($login, $password)
         $fields = array('samaccountname', 'mail', 'memberof', 'department', 'displayname', 'telephonenumber', 'primarygroupid');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
-        if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+        if (isTrue(AUTH_DEBUG)) {
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -238,7 +238,7 @@ function authenticate($login, $password)
 
         $entries = @ldap_get_entries($lc, $sr);
 
-        if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+        if (isTrue(AUTH_DEBUG)) {
           echo '$entries='; var_dump($entries); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -258,7 +258,7 @@ function authenticate($login, $password)
           $groups[] = substr($grp_fields[0], 3);
         }
 
-        if (defined('AUTH_DEBUG') && isTrue(AUTH_DEBUG)) {
+        if (isTrue(AUTH_DEBUG)) {
           echo '$member_of'; var_dump($member_of); echo '<br />';
         }
 
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index d29ba1a12..4411fb585 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -165,7 +165,7 @@ function check_extension($ext)
 // isTrue is a helper function to return correct false for older config.php values defined as a string 'false'.
 function isTrue($val)
 {
-  return ($val == false || $val === 'false') ? false : true;
+  return ($val === true);
 }
 
 // ttValidString is used to check user input to validate a string.
diff --git a/WEB-INF/lib/mail/Mailer.class.php b/WEB-INF/lib/mail/Mailer.class.php
index 2d674ac3d..68142028e 100644
--- a/WEB-INF/lib/mail/Mailer.class.php
+++ b/WEB-INF/lib/mail/Mailer.class.php
@@ -104,8 +104,8 @@ function send($subject, $data) {
         $port = defined('MAIL_SMTP_PORT') ? MAIL_SMTP_PORT : '25';
         $username = defined('MAIL_SMTP_USER') ? MAIL_SMTP_USER : null;
         $password = defined('MAIL_SMTP_PASSWORD') ? MAIL_SMTP_PASSWORD : null;
-        $auth = (defined('MAIL_SMTP_AUTH') && isTrue(MAIL_SMTP_AUTH)) ? true : false;
-        $debug = (defined('MAIL_SMTP_DEBUG') && isTrue(MAIL_SMTP_DEBUG)) ? true : false;
+        $auth = isTrue(MAIL_SMTP_AUTH);
+        $debug = isTrue(MAIL_SMTP_DEBUG);
 
         $mail = Mail::factory('smtp', array ('host' => $host,
           'port' => $port,
@@ -116,7 +116,7 @@ function send($subject, $data) {
         break;
     }
 
-    if (defined('MAIL_SMTP_DEBUG') && isTrue(MAIL_SMTP_DEBUG))
+    if (isTrue(MAIL_SMTP_DEBUG))
       PEAR::setErrorHandling(PEAR_ERROR_PRINT);
 
     $res = $mail->send($recipients, $headers, $data);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f1450a136..73cd97e03 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.25.4482 | 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.25.4483 | 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/time.php b/time.php
index 68aaf40e7..9e6be9a8f 100644
--- a/time.php
+++ b/time.php
@@ -107,7 +107,7 @@
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
 
-if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+if (isTrue(SUBGROUP_DEBUG)) {
 if ($user->can('manage_subgroups')) {
   $groups = $user->getGroups();
   if (count($groups) > 1) {
diff --git a/tofile.php b/tofile.php
index 07bbc11a6..445b32d94 100644
--- a/tofile.php
+++ b/tofile.php
@@ -94,7 +94,7 @@
       print "\t<".$group_by_tag."><![CDATA[".$subtotal['name']."]]></".$group_by_tag.">\n";
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
-        if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
+        if($val && isTrue(EXPORT_DECIMAL_DURATION))
           $val = time_to_decimal($val);
         print "\t<duration><![CDATA[".$val."]]></duration>\n";
       }
@@ -126,7 +126,7 @@
       if ($bean->getAttribute('chfinish')) print "\t<finish><![CDATA[".$item['finish']."]]></finish>\n";
       if ($bean->getAttribute('chduration')) {
         $duration = $item['duration'];
-        if($duration && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
+        if($duration && isTrue(EXPORT_DECIMAL_DURATION))
           $duration = time_to_decimal($duration);
           print "\t<duration><![CDATA[".$duration."]]></duration>\n";
       }
@@ -179,7 +179,7 @@
       print '"'.$subtotal['name'].'"';
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
-        if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
+        if($val && isTrue(EXPORT_DECIMAL_DURATION))
           $val = time_to_decimal($val);
         print ',"'.$val.'"';
       }
@@ -223,7 +223,7 @@
       if ($bean->getAttribute('chfinish')) print ',"'.$item['finish'].'"';
       if ($bean->getAttribute('chduration')) {
         $val = $item['duration'];
-        if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
+        if($val && isTrue(EXPORT_DECIMAL_DURATION))
           $val = time_to_decimal($val);
         print ',"'.$val.'"';
       }

From 4782eac1a659d576f7e50e6a9e94fdfa316bfc7f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 16:05:22 +0000
Subject: [PATCH 0402/1848] Removed handling of OLD_PASSWORDS to simplify login
 code.

---
 WEB-INF/config.php.dist            | 10 ----------
 WEB-INF/lib/auth/Auth_db.class.php | 25 -------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 1d852c21a..17b4d087d 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -59,16 +59,6 @@ define('MULTITEAM_MODE', true);
 define('APP_NAME', '');
 
 
-// OLD_PASSWORDS
-//
-// You may need to set this option if you migrate an older version of TT installation to a new server.
-// Older versions of TT used mysql password function to hash user passwords. Newer versions use md5.
-// Because the password function may behave differently between servers, the OLD_PASSWORD settings
-// gives you an opportunity to control it, if needed.
-//  
-// define('OLD_PASSWORDS', true);
-
-
 // WEEKEND_START_DAY
 //
 // This option defines which days are highlighted with weekend color.
diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index c380330c0..a3885fb66 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -55,31 +55,6 @@ function authenticate($login, $password)
     $val = $res->fetchRow();
     if ($val['id'] > 0) {
       return array('login'=>$login,'id'=>$val['id']);
-    } else {
-
-      // If the OLD_PASSWORDS option is defined - set it.
-      if (isTrue(OLD_PASSWORDS)) {
-        $sql = "SET SESSION old_passwords = 1";
-        $res = $mdb2->query($sql);
-        if (is_a($res, 'PEAR_Error')) {
-          die($res->getMessage());
-        }
-      }
-
-      // Try legacy password match. This is needed for compatibility with older versions of TT.
-      $sql = "SELECT id FROM tt_users
-        WHERE login = ".$mdb2->quote($login)." AND password = old_password(".$mdb2->quote($password).") AND status = 1";
-      $res = $mdb2->query($sql);
-      if (is_a($res, 'PEAR_Error')) {
-        return false; // Simply return false for a meaningful error message on screen, see the comment below.
-        // die($res->getMessage()); // old_password() function is removed in MySQL 5.7.5.
-                                    // We are getting a confusing "MDB2 Error: not found" in this case if we die.
-        // TODO: perhaps it's time to simplify things and remove handling of old passwords completely.
-      }
-      $val = $res->fetchRow();
-      if ($val['id'] > 0) {
-        return array('login'=>$login,'id'=>$val['id']);
-      }
     }
 
     // Special handling for admin@localhost - search for an account with admin role with a matching password.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 73cd97e03..04f99546c 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.25.4483 | 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.25.4484 | 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>

From 80d8ba7ca7444b575edc4930ee45e46dca66144b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 17:01:12 +0000
Subject: [PATCH 0403/1848] Refactoring in export to use a generic get function
 to keep things simple.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 173 ++--------------------
 WEB-INF/templates/footer.tpl              |   2 +-
 2 files changed, 12 insertions(+), 163 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index c6e1d9a5d..a520e7fbe 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -28,9 +28,6 @@
 
 // ttGroupExportHelper - this class is used to write data for a single group
 // to a file. When group contains other groups, it reuses itself recursively.
-//
-// Currently, it is work in progress.
-// When done, it should handle export of organizations containing multiple groups.
 class ttGroupExportHelper {
 
   var $group_id = null;     // Group we are exporting.
@@ -71,8 +68,8 @@ function __construct($group_id, $file, $indentation) {
     }
   }
 
-  // getGroupData obtains group attributes for export.
-  private function getGroupData() {
+  // getGroupAttrs obtains group attributes for export.
+  private function getGroupAttrs() {
     global $user;
     $mdb2 = getConnection();
 
@@ -85,153 +82,6 @@ private function getGroupData() {
     return $val;
   }
 
-  // The getUsers obtains all users in group for the purpose of export.
-  private function getUsers() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id)".
-      " where u.group_id = $this->group_id and u.org_id = $user->org_id order by upper(u.name)"; // Note: deleted users are included.
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // TODO: write a generic (private?) get function for exclusive use in this class, that obtains
-  // all fields from a given table.
-
-  // getRoles - obtains all roles defined for group.
-  function getRoles() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_roles where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // getTasks - obtains all tasks defined for group.
-  function getTasks() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_tasks where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // getProjects - obtains all projects defined for group.
-  function getProjects() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_projects where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // getClients - obtains all clients defined for group.
-  function getClients() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_clients where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // getFavReports - obtains all favorite reports defined for group.
-  function getFavReports() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_fav_reports where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // getPredefinedExpenses - obtains all predefined expenses for group.
-  function getPredefinedExpenses() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_predefined_expenses where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // getNotifications - obtains all notifications defined for group.
-  function getNotifications() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_cron where group_id = $this->group_id and org_id = $user->org_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getRecordsFromTable - obtains all fields from a given table for a group.
   function getRecordsFromTable($table_name) {
     global $user;
@@ -254,7 +104,7 @@ function getRecordsFromTable($table_name) {
   function writeData() {
 
     // Write group info.
-    $group = $this->getGroupData();
+    $group = $this->getGroupAttrs();
     $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
     $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
@@ -282,27 +132,27 @@ function writeData() {
     unset($group_part);
 
     // Prepare user map.
-    $users = $this->getUsers();
+    $users = $this->getRecordsFromTable('tt_users');
     foreach ($users as $key=>$user_item)
       $this->userMap[$user_item['id']] = $key + 1;
 
     // Prepare role map.
-    $roles = $this->getRoles();
+    $roles = $this->getRecordsFromTable('tt_roles');
     foreach ($roles as $key=>$role_item)
       $this->roleMap[$role_item['id']] = $key + 1;
 
     // Prepare task map.
-    $tasks = $this->getTasks();
+    $tasks = $this->getRecordsFromTable('tt_tasks');
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
     // Prepare project map.
-    $projects = $this->getProjects();
+    $projects = $this->getRecordsFromTable('tt_projects');
     foreach ($projects as $key=>$project_item)
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare client map.
-    $clients = $this->getClients();
+    $clients = $this->getRecordsFromTable('tt_clients');
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
@@ -322,7 +172,7 @@ function writeData() {
       $this->customFieldOptionMap[$option['id']] = $key + 1;
 
     // Prepare favorite report map.
-    $fav_reports = $this->getFavReports();
+    $fav_reports = $this->getRecordsFromTable('tt_fav_reports');
     foreach ($fav_reports as $key=>$fav_report)
       $this->favReportMap[$fav_report['id']] = $key + 1;
 
@@ -550,7 +400,7 @@ function writeData() {
     unset($expense_item_part);
 
     // Write predefined expenses.
-    $predefined_expenses = $this->getPredefinedExpenses();
+    $predefined_expenses = $this->getRecordsFromTable('tt_predefined_expenses');
     fwrite($this->file, $this->indentation."  <predefined_expenses>\n");
     foreach ($predefined_expenses as $predefined_expense) {
       $predefined_expense_part = $this->indentation.'    '."<predefined_expense name=\"".htmlspecialchars($predefined_expense['name'])."\"";
@@ -577,7 +427,6 @@ function writeData() {
     unset($quota_part);
 
     // Write fav reports.
-    $fav_reports = $this->getFavReports();
     fwrite($this->file, $this->indentation."  <fav_reports>\n");
     foreach ($fav_reports as $fav_report) {
       $user_list = '';
@@ -625,7 +474,7 @@ function writeData() {
     unset($fav_report_part);
 
     // Write notifications.
-    $notifications = $this->getNotifications();
+    $notifications = $this->getRecordsFromTable('tt_cron');
     fwrite($this->file, $this->indentation."  <notifications>\n");
     foreach ($notifications as $notification) {
       $notification_part = $this->indentation.'    '."<notification cron_spec=\"".$notification['cron_spec']."\"";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 04f99546c..7e7093dc7 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.25.4484 | 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.25.4485 | 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>

From 7143cc6750a18461fcd29964c41f23b4cbd27d21 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 18:23:49 +0000
Subject: [PATCH 0404/1848] Rolling back getUsers as previous commit broke
 export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 19 ++++++++++++++++++-
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index a520e7fbe..54b8aaa11 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -82,6 +82,23 @@ private function getGroupAttrs() {
     return $val;
   }
 
+  // The getUsers obtains all users in group for the purpose of export.
+  private function getUsers() {
+    global $user;
+    $mdb2 = getConnection();
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id)".
+      " where u.group_id = $this->group_id and u.org_id = $user->org_id order by upper(u.name)"; // Note: deleted users are included.
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // getRecordsFromTable - obtains all fields from a given table for a group.
   function getRecordsFromTable($table_name) {
     global $user;
@@ -132,7 +149,7 @@ function writeData() {
     unset($group_part);
 
     // Prepare user map.
-    $users = $this->getRecordsFromTable('tt_users');
+    $users = $this->getUsers();
     foreach ($users as $key=>$user_item)
       $this->userMap[$user_item['id']] = $key + 1;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7e7093dc7..d6b001fa0 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.25.4485 | 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.26.4486 | 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>

From 15c56c8682a43ed4ac3cbe98ca1772478876d5b9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 18:41:49 +0000
Subject: [PATCH 0405/1848] Added subgroups menu.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d6b001fa0..8831f22f3 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.26.4486 | 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.26.4487 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 430c1c2b0..23dfdc117 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -89,6 +89,11 @@
     {if $user->can('manage_basic_settings')}
             <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> &middot;
     {/if}
+{if isTrue($smarty.const.SUBGROUP_DEBUG)}
+    {if $user->can('manage_subgroups')}
+            <a class="systemMenu" href="groups.php">{$i18n.menu.subgroups}</a> &middot;
+    {/if}
+{/if}
     {if $user->can('manage_features')}
             <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a> &middot;
     {/if}

From 32e0397e34d3092eb2b89411ab97ee288f88038a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 18:51:25 +0000
Subject: [PATCH 0406/1848] Introduced description field for groups as part of
 subgroup support.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 2 ++
 mysql.sql                    | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8831f22f3..81f3d40a2 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.26.4487 | 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.26.4488 | 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/dbinstall.php b/dbinstall.php
index 264fc379d..f87b2a4e9 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1037,6 +1037,8 @@ function setChange($sql) {
     setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
     setChange("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
+    setChange("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 0ddf3bfa9..0f3f00c9b 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -17,6 +17,7 @@ CREATE TABLE `tt_groups` (
   `parent_id` int(11) default NULL,                      # parent group id
   `org_id` int(11) default NULL,                         # organization id (id of top group)
   `name` varchar(80) default NULL,                       # group name
+  `description` varchar(255) default NULL,               # group description
   `currency` varchar(7) default NULL,                    # currency symbol
   `decimal_mark` char(1) NOT NULL default '.',           # separator in decimals
   `lang` varchar(10) NOT NULL default 'en',              # language
@@ -487,4 +488,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.24', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.26', now()); # TODO: change when structure changes.

From 6f1a57ddce604840c432915d97574f175b935475 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 21:24:01 +0000
Subject: [PATCH 0407/1848] Some more work in progress on subgroups.

---
 WEB-INF/templates/group_add.tpl | 28 ++++++++++++
 WEB-INF/templates/groups.tpl    |  4 +-
 dbinstall.php                   |  8 ++--
 group_add.php                   | 78 +++++++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 WEB-INF/templates/group_add.tpl
 create mode 100644 group_add.php

diff --git a/WEB-INF/templates/group_add.tpl b/WEB-INF/templates/group_add.tpl
new file mode 100644
index 000000000..852f1b78b
--- /dev/null
+++ b/WEB-INF/templates/group_add.tpl
@@ -0,0 +1,28 @@
+{$forms.groupForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_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></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td colspan="2">&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.groupForm.close}
diff --git a/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl
index d9748bcbd..581055193 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -4,7 +4,8 @@
 
 <table cellspacing="1" cellpadding="3" border="0" width="720">
   <tr>
-    <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td width="35%" class="tableHeader">{$i18n.label.description}</td>
     <td class="tableHeader">{$i18n.label.edit}</td>
     <td class="tableHeader">{$i18n.label.delete}</td>
   </tr>
@@ -12,6 +13,7 @@
   {foreach $groups as $group}
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$group.name|escape}</td>
+    <td>{$group.description|escape}</td>
     <td><a href="group_edit.php?id={$group.id}">{$i18n.label.edit}</a></td>
     <td><a href="group_delete.php?id={$group.id}">{$i18n.label.delete}</a></td>
   </tr>
diff --git a/dbinstall.php b/dbinstall.php
index f87b2a4e9..653d13a1f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function setChange($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11824"]) {
+  if ($_POST["convert11797to11826"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1086,7 +1086,7 @@ function setChange($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.24)</b>
+    <td width="80%"><b>Create database structure (v1.18.26)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1131,8 +1131,8 @@ function setChange($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.24)</td>
-    <td><input type="submit" name="convert11797to11824" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.26)</td>
+    <td><input type="submit" name="convert11797to11826" value="Update"></td>
   </tr>
 </table>
 
diff --git a/group_add.php b/group_add.php
new file mode 100644
index 000000000..8bb8d003f
--- /dev/null
+++ b/group_add.php
@@ -0,0 +1,78 @@
+<?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');
+
+// Access checks.
+if (!ttAccessAllowed('manage_subgroups')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('group_name'));
+  $cl_description = trim($request->getParameter('description'));
+}
+
+$form = new Form('groupForm');
+$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'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+/*
+  if ($err->no()) {
+    if (!ttProjectHelper::getProjectByName($cl_name)) {
+      if (ttProjectHelper::insert(array(
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
+        'name' => $cl_name,
+        'description' => $cl_description,
+        'users' => $cl_users,
+        'tasks' => $cl_tasks,
+        'status' => ACTIVE))) {
+          header('Location: projects.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.project_exists'));
+  }
+*/
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+//$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_group'));
+$smarty->assign('content_page_name', 'group_add.tpl');
+$smarty->display('index.tpl');

From d3bcdee6ccc7bd00dce1fdfd89dc604f9016b52c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 21:36:26 +0000
Subject: [PATCH 0408/1848] Using error.object_exists instead of
 error.project_exists to streamline error messages.

---
 WEB-INF/resources/ca.lang.php    | 2 --
 WEB-INF/resources/cs.lang.php    | 2 --
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 2 --
 WEB-INF/resources/et.lang.php    | 2 --
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 1 -
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 2 --
 WEB-INF/resources/it.lang.php    | 1 -
 WEB-INF/resources/ja.lang.php    | 2 --
 WEB-INF/resources/ko.lang.php    | 2 --
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 2 --
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 2 --
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 2 --
 WEB-INF/resources/zh-cn.lang.php | 2 --
 WEB-INF/resources/zh-tw.lang.php | 2 --
 WEB-INF/templates/footer.tpl     | 2 +-
 group_add.php                    | 2 +-
 mobile/project_add.php           | 2 +-
 mobile/project_edit.php          | 4 ++--
 project_add.php                  | 2 +-
 project_edit.php                 | 4 ++--
 36 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a0accefda..dc1e2070b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -99,8 +99,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Ja existeix un projecte amb aquest nom.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a42826fad..529e8020b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -101,8 +101,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Projekt tohoto jména již existuje.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7eaec94cc..995ce5e08 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Brugernavn eksistere allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Der eksiterer allerede et projekt med det navn.',
 'error.task_exists' => 'Opgavenavn eksistere allerede.',
 'error.client_exists' => 'Der eksistere allerede en klient med dette navn.',
 'error.invoice_exists' => 'Fakturanummer eksistere allerede.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 627941493..425f1fcf2 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Benutzername oder Passwort ungültig.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
-'error.project_exists' => 'Es gibt bereits ein Projekt mit diesem Namen.',
 'error.task_exists' => 'Task mit diesem Namen existiert bereits.',
 'error.client_exists' => 'Der Kunde mit dem Namen existiert schon.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 6d7a47c73..6282874cd 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Incorrect login or password.',
 'error.user_exists' => 'User with this login already exists.',
 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Project with this name already exists.',
 'error.task_exists' => 'Task with this name already exists.',
 'error.client_exists' => 'Client with this name already exists.',
 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b53ebd944..94d506374 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -97,8 +97,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Ya existe un proyecto con este nombre.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 4aede3a4d..5ab3de4a5 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -101,8 +101,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Selle nimega projekt on juba olemas.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 140da1bcb..4e5b011aa 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -95,7 +95,6 @@
 'error.user_exists' => 'کاربری با این نام کاربری موجود است.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'پروژه ای با این نام موجود است.',
 'error.task_exists' => 'وظیفه ای با این نام هم اکنون وجود دارد.',
 'error.client_exists' => 'مشتری با این نام هم اکنون وجود دارد.',
 'error.invoice_exists' => 'فاکتوری با این شماره هم اکنون موجود است.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f290ff5ba..f4ac6c4e2 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -92,7 +92,6 @@
 'error.user_exists' => 'Tämä käyttäjänimi on jo olemassa.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Tämän niminen projekti on jo olemassa.',
 'error.task_exists' => 'Tämän niminen tehtävä on jo olemassa.',
 'error.client_exists' => 'Tämän niminen asiakas on jo olemassa.',
 'error.invoice_exists' => 'Tällä numerolla oleva lasku on jo olemassa.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d4f372b17..47dc7f79b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Un utilisateur avec cet identifiant existe déjà.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Un projet avec ce nom existe déjà.',
 'error.task_exists' => 'Une tâche avec ce nom existe déjà.',
 'error.client_exists' => 'Un client avec ce nom existe déjà.',
 'error.invoice_exists' => 'Une facture avec ce numéro existe déjà.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ef78fd501..a85c30e9b 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -86,7 +86,6 @@
 'error.auth' => 'Λανθασμένο όνομα εισόδου ή κωδικός.',
 'error.user_exists' => 'Ο χρήστης με αυτήν τη σύνδεση υπάρχει ήδη.',
 'error.object_exists' => 'Το αντικείμενο με αυτό το όνομα υπάρχει ήδη.',
-'error.project_exists' => 'Το έργα με αυτό το όνομα υπάρχει ήδη.',
 'error.task_exists' => 'Η εργασία με αυτό το όνομα υπάρχει ήδη.',
 'error.client_exists' => 'Ο πελάτης με αυτό το όνομα υπάρχει ήδη.',
 'error.invoice_exists' => 'Το τιμολόγιο με αυτόν τον αριθμό υπάρχει ήδη.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 661ff27a4..cfa471e69 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -106,7 +106,6 @@
 'error.user_exists' => 'שם משתמש כבר קיים',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'שם פרוייקט כבר קיים',
 'error.task_exists' => 'קיימת משימה עם שם דומה',
 'error.client_exists' => 'שם לקוח כבר קיים',
 'error.invoice_exists' => 'קיימת חשבונית עם מספר זה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 30d9a9a0e..beea7ac4e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -99,8 +99,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Ilyen nevű projekt már létezik.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2f0535781..063318ebd 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -89,7 +89,6 @@
 'error.user_exists' => 'Esiste già un utente con questo username.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Esiste già un progetto con questo nome.',
 'error.task_exists' => 'Esiste già un compito con questo nome.',
 'error.client_exists' => 'Esiste già un cliente con questo nome.',
 'error.invoice_exists' => 'Esiste già una fattura con questo numero.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 29a7a034b..f0c52121e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -99,8 +99,6 @@
 'error.user_exists' => 'このログインと関連されたユーザーは既に存在します。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'この名前のプロジェクトは既に存在します。',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f8d99f1b4..a426f24d2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -99,8 +99,6 @@
 'error.user_exists' => '본 로그인과 연계된 사용자가 이미 있습니다.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => '본 이름과 연계된 프로젝트가 이미 있습니다.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 531953e23..d30caf44a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
-'error.project_exists' => 'Een project met deze naam bestaat al.',
 'error.task_exists' => 'Er bestaat al een taak met deze naam.',
 'error.client_exists' => 'Een klant met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 35ec512be..a8cdd34a9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -99,8 +99,6 @@
 'error.user_exists' => 'Bruker med et slikt brukernavn eksisterer allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Et prosjekt med dette navnet er allerede opprettet.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 'error.client_exists' => 'En klient med dette navnet er allerede opprettet.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 301e002cb..b2bf0e153 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -93,7 +93,6 @@
 'error.user_exists' => 'Użytkownik o takiej nazwie już istnieje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Projekt o takiej nazwie już istnieje.',
 'error.task_exists' => 'Zadanie o takiej nazwie już istnieje.',
 'error.client_exists' => 'Klient o takiej nazwie już istnieje.',
 'error.invoice_exists' => 'Faktura o tym numerze już istnieje.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b97881572..7077f2e13 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -91,7 +91,6 @@
 'error.user_exists' => 'Já existe usuário com este login.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Já existe projeto com este nome.',
 'error.task_exists' => 'Já existe tarefa com este nome.',
 'error.client_exists' => 'Já existe cliente com este nome.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8de4afaf0..595e9c0fa 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -97,7 +97,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.project_exists' => 'Project with this name already exists.',
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index d43f76b42..1e5eb55c2 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -103,8 +103,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Proiectul cu acest nume exista deja.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 40a5c1e30..4b2a9ca7b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -84,7 +84,6 @@
 'error.auth' => 'Неправильно введен логин или пароль.',
 'error.user_exists' => 'Пользователь с таким логином уже существует.',
 'error.object_exists' => 'Объект с таким именем уже есть.',
-'error.project_exists' => 'Проект с таким именем уже есть.',
 'error.task_exists' => 'Задача с таким названием уже есть.',
 'error.client_exists' => 'Клиент с таким именем уже есть.',
 'error.invoice_exists' => 'Счёт с таким номером уже есть.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index de985d430..a2ae001b9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -95,7 +95,6 @@
 'error.user_exists' => 'Používateľ s týmto prihlasovacím menom už existuje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Projekt s týmto názvom už existuje.',
 'error.task_exists' => 'Úloha s týmto názvom už existuje.',
 'error.client_exists' => 'Klient s týmto menom už existuje.',
 'error.invoice_exists' => 'Faktúra s týmto číslom už existuje.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 83815f7de..490677a23 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -94,7 +94,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.project_exists' => 'Project with this name already exists.',
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 42ded8f94..39aa0b334 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Korisnik pod ovim imenom već postoji.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Projekat pod ovim nazivom već postoji.',
 'error.task_exists' => 'Zadatak pod ovim nazivom već postoji.',
 'error.client_exists' => 'Klijent pod ovim imenom već postoji.',
 'error.invoice_exists' => 'Račun pod ovim brojem već postoji.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 43c76d0e4..3861f8d45 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -89,7 +89,6 @@
 'error.user_exists' => 'Det finns redan en användare med det här användarnamnet.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Det finns redan ett projekt med det här namnet.',
 'error.task_exists' => 'Det finns redan en arbetsuppgift med det här namnet.',
 'error.client_exists' => 'Det finns redan en kund med det här namnet.',
 'error.invoice_exists' => 'Det finns redan en faktura med det här numret.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d5764bedf..de1c41aec 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -106,8 +106,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Bu isimde proje zaten vardır.',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a60145578..271ad93e2 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -92,8 +92,6 @@
 'error.user_exists' => '该用户登录信息已经存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => '该项目名称已经存在。',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 'error.client_exists' => '具有此名称的客户端已经存在。',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c51900fac..81a90380a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -97,8 +97,6 @@
 'error.user_exists' => '該使用者登錄資訊已經存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => '該專案名稱已經存在。',
-// TODO: translate the following.
 // 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 81f3d40a2..a6ffa5370 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.26.4488 | 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.26.4489 | 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/group_add.php b/group_add.php
index 8bb8d003f..4e8cb91a3 100644
--- a/group_add.php
+++ b/group_add.php
@@ -66,7 +66,7 @@
         } else
           $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->get('error.project_exists'));
+      $err->add($i18n->get('error.object_exists'));
   }
 */
 } // isPost
diff --git a/mobile/project_add.php b/mobile/project_add.php
index 6d68a178e..3b1d0fb0d 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -90,7 +90,7 @@
         } else
           $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->get('error.project_exists'));
+      $err->add($i18n->get('error.object_exists'));
   }
 } // isPost
 
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index defec7add..2d67b88d8 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -113,7 +113,7 @@
         } else
            $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -131,7 +131,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
     
     if ($request->getParameter('btn_delete')) {
diff --git a/project_add.php b/project_add.php
index 3b4c73d36..930adf1f8 100644
--- a/project_add.php
+++ b/project_add.php
@@ -89,7 +89,7 @@
         } else
           $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->get('error.project_exists'));
+      $err->add($i18n->get('error.object_exists'));
   }
 } // isPost
 
diff --git a/project_edit.php b/project_edit.php
index 77312b0b2..3cdb44375 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -112,7 +112,7 @@
         } else
            $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -130,7 +130,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
   }
 } // isPost

From 04565403a39edd462f6f7d2ef737366cdc40acf1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 21:51:56 +0000
Subject: [PATCH 0409/1848] Using error.object_exists instead of
 error.task_exists to streamline error messages.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 1 -
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 1 -
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 WEB-INF/templates/footer.tpl     | 2 +-
 mobile/task_add.php              | 2 +-
 mobile/task_edit.php             | 4 ++--
 task_add.php                     | 2 +-
 task_edit.php                    | 4 ++--
 35 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index dc1e2070b..e8c811893 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -99,7 +99,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 529e8020b..d80ebf09d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -101,7 +101,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 995ce5e08..fc165df4b 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Brugernavn eksistere allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Opgavenavn eksistere allerede.',
 'error.client_exists' => 'Der eksistere allerede en klient med dette navn.',
 'error.invoice_exists' => 'Fakturanummer eksistere allerede.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 425f1fcf2..940ca1d87 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Benutzername oder Passwort ungültig.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
-'error.task_exists' => 'Task mit diesem Namen existiert bereits.',
 'error.client_exists' => 'Der Kunde mit dem Namen existiert schon.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
 'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 6282874cd..ad1aabf9a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Incorrect login or password.',
 'error.user_exists' => 'User with this login already exists.',
 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Task with this name already exists.',
 'error.client_exists' => 'Client with this name already exists.',
 'error.invoice_exists' => 'Invoice with this number already exists.',
 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 94d506374..e19eb4a87 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -97,7 +97,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5ab3de4a5..f5a580bf3 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -101,7 +101,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 4e5b011aa..ef7a57068 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -95,7 +95,6 @@
 'error.user_exists' => 'کاربری با این نام کاربری موجود است.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'وظیفه ای با این نام هم اکنون وجود دارد.',
 'error.client_exists' => 'مشتری با این نام هم اکنون وجود دارد.',
 'error.invoice_exists' => 'فاکتوری با این شماره هم اکنون موجود است.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f4ac6c4e2..0aab41824 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -92,7 +92,6 @@
 'error.user_exists' => 'Tämä käyttäjänimi on jo olemassa.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Tämän niminen tehtävä on jo olemassa.',
 'error.client_exists' => 'Tämän niminen asiakas on jo olemassa.',
 'error.invoice_exists' => 'Tällä numerolla oleva lasku on jo olemassa.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 47dc7f79b..d0ca0fa20 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Un utilisateur avec cet identifiant existe déjà.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Une tâche avec ce nom existe déjà.',
 'error.client_exists' => 'Un client avec ce nom existe déjà.',
 'error.invoice_exists' => 'Une facture avec ce numéro existe déjà.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a85c30e9b..d4bca60ce 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -86,7 +86,6 @@
 'error.auth' => 'Λανθασμένο όνομα εισόδου ή κωδικός.',
 'error.user_exists' => 'Ο χρήστης με αυτήν τη σύνδεση υπάρχει ήδη.',
 'error.object_exists' => 'Το αντικείμενο με αυτό το όνομα υπάρχει ήδη.',
-'error.task_exists' => 'Η εργασία με αυτό το όνομα υπάρχει ήδη.',
 'error.client_exists' => 'Ο πελάτης με αυτό το όνομα υπάρχει ήδη.',
 'error.invoice_exists' => 'Το τιμολόγιο με αυτόν τον αριθμό υπάρχει ήδη.',
 'error.role_exists' => 'Ο ρόλος σε αυτή τη σειρά υπάρχει ήδη.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index cfa471e69..e9e9dd709 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -106,7 +106,6 @@
 'error.user_exists' => 'שם משתמש כבר קיים',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'קיימת משימה עם שם דומה',
 'error.client_exists' => 'שם לקוח כבר קיים',
 'error.invoice_exists' => 'קיימת חשבונית עם מספר זה',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index beea7ac4e..0c8dc240f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -99,7 +99,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 063318ebd..476b1000d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -89,7 +89,6 @@
 'error.user_exists' => 'Esiste già un utente con questo username.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Esiste già un compito con questo nome.',
 'error.client_exists' => 'Esiste già un cliente con questo nome.',
 'error.invoice_exists' => 'Esiste già una fattura con questo numero.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f0c52121e..08ca910fb 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -99,7 +99,6 @@
 'error.user_exists' => 'このログインと関連されたユーザーは既に存在します。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index a426f24d2..91bbf5be6 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -99,7 +99,6 @@
 'error.user_exists' => '본 로그인과 연계된 사용자가 이미 있습니다.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index d30caf44a..434ec9e70 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
-'error.task_exists' => 'Er bestaat al een taak met deze naam.',
 'error.client_exists' => 'Een klant met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
 'error.role_exists' => 'Een rol met deze rangorde bestaat al.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a8cdd34a9..16a9d83ae 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -99,7 +99,6 @@
 'error.user_exists' => 'Bruker med et slikt brukernavn eksisterer allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 'error.client_exists' => 'En klient med dette navnet er allerede opprettet.',
 // TODO: translate the following.
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b2bf0e153..8e07da861 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -93,7 +93,6 @@
 'error.user_exists' => 'Użytkownik o takiej nazwie już istnieje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Zadanie o takiej nazwie już istnieje.',
 'error.client_exists' => 'Klient o takiej nazwie już istnieje.',
 'error.invoice_exists' => 'Faktura o tym numerze już istnieje.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7077f2e13..566c654bb 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -91,7 +91,6 @@
 'error.user_exists' => 'Já existe usuário com este login.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Já existe tarefa com este nome.',
 'error.client_exists' => 'Já existe cliente com este nome.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 595e9c0fa..5a05d16c2 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -97,7 +97,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1e5eb55c2..783219ffc 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -103,7 +103,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4b2a9ca7b..0d57fe1dc 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -84,7 +84,6 @@
 'error.auth' => 'Неправильно введен логин или пароль.',
 'error.user_exists' => 'Пользователь с таким логином уже существует.',
 'error.object_exists' => 'Объект с таким именем уже есть.',
-'error.task_exists' => 'Задача с таким названием уже есть.',
 'error.client_exists' => 'Клиент с таким именем уже есть.',
 'error.invoice_exists' => 'Счёт с таким номером уже есть.',
 'error.role_exists' => 'Роль с таким рангом уже есть.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a2ae001b9..40e671795 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -95,7 +95,6 @@
 'error.user_exists' => 'Používateľ s týmto prihlasovacím menom už existuje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Úloha s týmto názvom už existuje.',
 'error.client_exists' => 'Klient s týmto menom už existuje.',
 'error.invoice_exists' => 'Faktúra s týmto číslom už existuje.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 490677a23..ebbe4f30f 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -94,7 +94,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 39aa0b334..fe9a47ead 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Korisnik pod ovim imenom već postoji.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Zadatak pod ovim nazivom već postoji.',
 'error.client_exists' => 'Klijent pod ovim imenom već postoji.',
 'error.invoice_exists' => 'Račun pod ovim brojem već postoji.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3861f8d45..60afbfc87 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -89,7 +89,6 @@
 'error.user_exists' => 'Det finns redan en användare med det här användarnamnet.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.task_exists' => 'Det finns redan en arbetsuppgift med det här namnet.',
 'error.client_exists' => 'Det finns redan en kund med det här namnet.',
 'error.invoice_exists' => 'Det finns redan en faktura med det här numret.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index de1c41aec..7beba1506 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -106,7 +106,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 271ad93e2..c5da9b5c9 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -92,7 +92,6 @@
 'error.user_exists' => '该用户登录信息已经存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 'error.client_exists' => '具有此名称的客户端已经存在。',
 // TODO: translate the following.
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 81a90380a..f48e154da 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -97,7 +97,6 @@
 'error.user_exists' => '該使用者登錄資訊已經存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.task_exists' => 'Task with this name already exists.',
 // 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a6ffa5370..01892fc8f 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.26.4489 | 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.26.4490 | 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/task_add.php b/mobile/task_add.php
index 796c725c9..d1eab74bc 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -79,7 +79,7 @@
         } else
           $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->get('error.task_exists'));
+      $err->add($i18n->get('error.object_exists'));
   }
 } // isPost
 
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index 030cacd1b..784028ee5 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -97,7 +97,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.task_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -114,7 +114,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.task_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
     
     if ($request->getParameter('btn_delete')) {
diff --git a/task_add.php b/task_add.php
index 383a3935a..a93c80e28 100644
--- a/task_add.php
+++ b/task_add.php
@@ -79,7 +79,7 @@
         } else
           $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->get('error.task_exists'));
+      $err->add($i18n->get('error.object_exists'));
   }
 } // isPost
 
diff --git a/task_edit.php b/task_edit.php
index e63817313..630a22cd2 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -95,7 +95,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.task_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -112,7 +112,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.task_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
   }
 } // isPost

From 79a38d5d7579d6ba89efdc1b077b87a2e324cbd3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 22:06:27 +0000
Subject: [PATCH 0410/1848] Further streamlining of error messages.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 1 -
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 1 -
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 2 --
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 2 --
 WEB-INF/resources/zh-tw.lang.php | 1 -
 WEB-INF/templates/footer.tpl     | 2 +-
 client_add.php                   | 2 +-
 client_edit.php                  | 4 ++--
 mobile/client_add.php            | 2 +-
 mobile/client_edit.php           | 4 ++--
 35 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e8c811893..80d11cdfe 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -99,7 +99,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d80ebf09d..191600627 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -101,7 +101,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index fc165df4b..f0d7c4382 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Brugernavn eksistere allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Der eksistere allerede en klient med dette navn.',
 'error.invoice_exists' => 'Fakturanummer eksistere allerede.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 940ca1d87..69bdffba2 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Benutzername oder Passwort ungültig.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
-'error.client_exists' => 'Der Kunde mit dem Namen existiert schon.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
 'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ad1aabf9a..4c569dc68 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Incorrect login or password.',
 'error.user_exists' => 'User with this login already exists.',
 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Client with this name already exists.',
 'error.invoice_exists' => 'Invoice with this number already exists.',
 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e19eb4a87..44bca1bbe 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -97,7 +97,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f5a580bf3..8f159c0b7 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -101,7 +101,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ef7a57068..2620ffc12 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -95,7 +95,6 @@
 'error.user_exists' => 'کاربری با این نام کاربری موجود است.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'مشتری با این نام هم اکنون وجود دارد.',
 'error.invoice_exists' => 'فاکتوری با این شماره هم اکنون موجود است.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 0aab41824..2067595de 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -92,7 +92,6 @@
 'error.user_exists' => 'Tämä käyttäjänimi on jo olemassa.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Tämän niminen asiakas on jo olemassa.',
 'error.invoice_exists' => 'Tällä numerolla oleva lasku on jo olemassa.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d0ca0fa20..bbd315b0f 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Un utilisateur avec cet identifiant existe déjà.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Un client avec ce nom existe déjà.',
 'error.invoice_exists' => 'Une facture avec ce numéro existe déjà.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d4bca60ce..6520d46b9 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -86,7 +86,6 @@
 'error.auth' => 'Λανθασμένο όνομα εισόδου ή κωδικός.',
 'error.user_exists' => 'Ο χρήστης με αυτήν τη σύνδεση υπάρχει ήδη.',
 'error.object_exists' => 'Το αντικείμενο με αυτό το όνομα υπάρχει ήδη.',
-'error.client_exists' => 'Ο πελάτης με αυτό το όνομα υπάρχει ήδη.',
 'error.invoice_exists' => 'Το τιμολόγιο με αυτόν τον αριθμό υπάρχει ήδη.',
 'error.role_exists' => 'Ο ρόλος σε αυτή τη σειρά υπάρχει ήδη.',
 'error.no_invoiceable_items' => 'Δεν υπάρχουν στοιχεία προς τιμολόγηση.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e9e9dd709..250ea7dc0 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -106,7 +106,6 @@
 'error.user_exists' => 'שם משתמש כבר קיים',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'שם לקוח כבר קיים',
 'error.invoice_exists' => 'קיימת חשבונית עם מספר זה',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 0c8dc240f..ae7920530 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -99,7 +99,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 476b1000d..7ecc26e4a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -89,7 +89,6 @@
 'error.user_exists' => 'Esiste già un utente con questo username.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Esiste già un cliente con questo nome.',
 'error.invoice_exists' => 'Esiste già una fattura con questo numero.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 08ca910fb..9e6d99a79 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -99,7 +99,6 @@
 'error.user_exists' => 'このログインと関連されたユーザーは既に存在します。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 91bbf5be6..f577566dd 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -99,7 +99,6 @@
 'error.user_exists' => '본 로그인과 연계된 사용자가 이미 있습니다.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 434ec9e70..5d11a8a0d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -85,7 +85,6 @@
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
-'error.client_exists' => 'Een klant met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
 'error.role_exists' => 'Een rol met deze rangorde bestaat al.',
 'error.no_invoiceable_items' => 'Er zijn geen factuureerbare onderdelen.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 16a9d83ae..a7a82d753 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -99,8 +99,6 @@
 'error.user_exists' => 'Bruker med et slikt brukernavn eksisterer allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'En klient med dette navnet er allerede opprettet.',
-// TODO: translate the following.
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8e07da861..eeedb29c2 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -93,7 +93,6 @@
 'error.user_exists' => 'Użytkownik o takiej nazwie już istnieje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Klient o takiej nazwie już istnieje.',
 'error.invoice_exists' => 'Faktura o tym numerze już istnieje.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 566c654bb..e72b03b6e 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -91,7 +91,6 @@
 'error.user_exists' => 'Já existe usuário com este login.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Já existe cliente com este nome.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5a05d16c2..e5a5c5022 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -97,7 +97,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 783219ffc..8cf13bb96 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -103,7 +103,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 0d57fe1dc..926834e23 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -84,7 +84,6 @@
 'error.auth' => 'Неправильно введен логин или пароль.',
 'error.user_exists' => 'Пользователь с таким логином уже существует.',
 'error.object_exists' => 'Объект с таким именем уже есть.',
-'error.client_exists' => 'Клиент с таким именем уже есть.',
 'error.invoice_exists' => 'Счёт с таким номером уже есть.',
 'error.role_exists' => 'Роль с таким рангом уже есть.',
 'error.no_invoiceable_items' => 'Нет записей для включения в счёт.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 40e671795..2499ea753 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -95,7 +95,6 @@
 'error.user_exists' => 'Používateľ s týmto prihlasovacím menom už existuje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Klient s týmto menom už existuje.',
 'error.invoice_exists' => 'Faktúra s týmto číslom už existuje.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ebbe4f30f..c52130efa 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -94,7 +94,6 @@
 // 'error.auth' => 'Incorrect login or password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index fe9a47ead..bd041e508 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -90,7 +90,6 @@
 'error.user_exists' => 'Korisnik pod ovim imenom već postoji.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Klijent pod ovim imenom već postoji.',
 'error.invoice_exists' => 'Račun pod ovim brojem već postoji.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 60afbfc87..8e776e889 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -89,7 +89,6 @@
 'error.user_exists' => 'Det finns redan en användare med det här användarnamnet.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => 'Det finns redan en kund med det här namnet.',
 'error.invoice_exists' => 'Det finns redan en faktura med det här numret.',
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7beba1506..4ea24ff15 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -106,7 +106,6 @@
 // TODO: translate the following.
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index c5da9b5c9..29cb05ca4 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -92,8 +92,6 @@
 'error.user_exists' => '该用户登录信息已经存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-'error.client_exists' => '具有此名称的客户端已经存在。',
-// TODO: translate the following.
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f48e154da..2a005abc4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -97,7 +97,6 @@
 'error.user_exists' => '該使用者登錄資訊已經存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
-// 'error.client_exists' => 'Client with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 01892fc8f..c1be43aea 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.26.4490 | 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.26.4491 | 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/client_add.php b/client_add.php
index dc99e6c89..db94e6206 100644
--- a/client_add.php
+++ b/client_add.php
@@ -83,7 +83,7 @@
       } else
         $err->add($i18n->get('error.db'));
      } else
-       $err->add($i18n->get('error.client_exists'));
+       $err->add($i18n->get('error.object_exists'));
   }
 } // isPost
 
diff --git a/client_edit.php b/client_edit.php
index 19aa5f893..a5c1b8b72 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -97,7 +97,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -115,7 +115,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
   }
 } // isPost
diff --git a/mobile/client_add.php b/mobile/client_add.php
index 7a097b5ff..02de56d1e 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -83,7 +83,7 @@
       } else
         $err->add($i18n->get('error.db'));
      } else
-       $err->add($i18n->get('error.client_exists'));
+       $err->add($i18n->get('error.object_exists'));
   }
 } // isPost
 
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index 73d50cac2..c1004b1bb 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -98,7 +98,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -116,7 +116,7 @@
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
     
     if ($request->getParameter('btn_delete')) {

From ee3957cfc30d8ba3ed92ac99f3e5b784df1a9c58 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Nov 2018 23:05:10 +0000
Subject: [PATCH 0411/1848] Some more work in progress on group editor.

---
 WEB-INF/lib/ttGroupHelper.class.php | 41 +++++++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php        |  4 +--
 WEB-INF/templates/footer.tpl        |  2 +-
 group_add.php                       | 21 ++++++---------
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 6ddffaa8c..41c03114e 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -59,4 +59,45 @@ static function getParentGroup($group_id) {
     }
     return false;
   }
+
+  // The getSubgroupByName obtain an immediate subgroup by name if one exists.
+  static function getSubgroupByName($name) {
+    global $user;
+
+    $mdb2 = getConnection();
+    $parent_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_groups where parent_id = $parent_id and org_id = $org_id".
+      " and name = ".$mdb2->quote($name)." and status is not null";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val && $val['id'])
+        return $val;
+    }
+    return false;
+  }
+
+  // The insertSubgroup inserts a new subgroup in database.
+  static function insertSubgroup($fields) {
+    global $user;
+
+    $mdb2 = getConnection();
+    $parent_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    // TODO: inherit all attributes from the parent group, if not supplied.
+    $name = $fields['name'];
+    $description = $fields['description'];
+
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+
+    $sql = "insert into tt_groups (parent_id, org_id, name, description, created, created_ip)".
+      " values($parent_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", $created, $created_ip)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+    // TODO: design subgroup roles carefully. Perhaps roles are not to be touched in subgroups at all.
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 86174547e..8e9a8f215 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -414,11 +414,11 @@ function getGroups() {
   function getSubgroups() {
     $mdb2 = getConnection();
 
-    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = ".$this->getActiveGroup();;
+    $sql = "select id, name, description from tt_groups where org_id = $this->org_id and parent_id = ".$this->getActiveGroup();;
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $groups[] = array('id'=>$val['id'],'name'=>$val['name']);
+        $groups[] = $val; // array('id'=>$val['id'],'name'=>$val['name']);
       }
     }
     return $groups;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c1be43aea..4a7317266 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.26.4491 | 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.26.4492 | 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/group_add.php b/group_add.php
index 4e8cb91a3..f39ec016c 100644
--- a/group_add.php
+++ b/group_add.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_subgroups')) {
@@ -42,7 +43,7 @@
 }
 
 $form = new Form('groupForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -50,29 +51,23 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-/*
+
   if ($err->no()) {
-    if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
-        'org_id' => $user->org_id,
+    if (!ttGroupHelper::getSubgroupByName($cl_name)) {
+       if (ttGroupHelper::insertSubgroup(array(
         'name' => $cl_name,
-        'description' => $cl_description,
-        'users' => $cl_users,
-        'tasks' => $cl_tasks,
-        'status' => ACTIVE))) {
-          header('Location: projects.php');
+        'description' => $cl_description))) {
+          header('Location: groups.php');
           exit();
         } else
           $err->add($i18n->get('error.db'));
     } else
       $err->add($i18n->get('error.object_exists'));
   }
-*/
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-//$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->assign('content_page_name', 'group_add.tpl');
 $smarty->display('index.tpl');

From 8b1efafeb5921f14235cf45cf58ef404700141aa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 13:22:50 +0000
Subject: [PATCH 0412/1848] Rolling back old passwords support as some users
 never change them.

---
 WEB-INF/lib/auth/Auth_db.class.php | 25 +++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php       |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/groups.tpl       | 22 +++++++++++++++-------
 groups.php                         | 16 +++++++++++++++-
 5 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index a3885fb66..bdde007a9 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -55,6 +55,31 @@ function authenticate($login, $password)
     $val = $res->fetchRow();
     if ($val['id'] > 0) {
       return array('login'=>$login,'id'=>$val['id']);
+    } else {
+      // If the OLD_PASSWORDS option is defined - set it.
+      if (isTrue(OLD_PASSWORDS)) {
+        $sql = "SET SESSION old_passwords = 1";
+        $res = $mdb2->query($sql);
+        if (is_a($res, 'PEAR_Error')) {
+          die($res->getMessage());
+        }
+      }
+      // Try legacy password match. This is needed for compatibility with older versions of TT.
+      $sql = "SELECT id FROM tt_users
+        WHERE login = ".$mdb2->quote($login)." AND password = old_password(".$mdb2->quote($password).") AND status = 1";
+      $res = $mdb2->query($sql);
+      if (is_a($res, 'PEAR_Error')) {
+        return false; // Simply return false for a meaningful error message on screen, see the comment below.
+        // die($res->getMessage()); // old_password() function is removed in MySQL 5.7.5.
+                                    // We are getting a confusing "MDB2 Error: not found" in this case if we die.
+        // TODO: perhaps it's time to simplify things and remove handling of old passwords completely.
+        // HOWEVER: some users apparently never change their passwords. When I tried removing OLD_PASSWORDS
+        // support in November 2018, there were login issues with such users.
+      }
+      $val = $res->fetchRow();
+      if ($val['id'] > 0) {
+        return array('login'=>$login,'id'=>$val['id']);
+      }
     }
 
     // Special handling for admin@localhost - search for an account with admin role with a matching password.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 8e9a8f215..7a37109eb 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -418,7 +418,7 @@ function getSubgroups() {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $groups[] = $val; // array('id'=>$val['id'],'name'=>$val['name']);
+        $groups[] = $val;
       }
     }
     return $groups;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4a7317266..0e481fee9 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.26.4492 | 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.4493 | 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/groups.tpl b/WEB-INF/templates/groups.tpl
index 581055193..508f17878 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -1,25 +1,33 @@
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
-
+{$forms.groupsForm.open}
 <table cellspacing="1" cellpadding="3" border="0" width="720">
+{if $on_behalf_group_control}
+  <tr>
+    <td align="right">{$i18n.label.group}:</td>
+    <td>{$forms.groupsForm.onBehalfGroup.control}</td>
+  </tr>
+  <tr><td colspan="2">&nbsp;</td></tr>
+{/if}
   <tr>
     <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
     <td width="35%" class="tableHeader">{$i18n.label.description}</td>
     <td class="tableHeader">{$i18n.label.edit}</td>
     <td class="tableHeader">{$i18n.label.delete}</td>
   </tr>
-{if $groups}
-  {foreach $groups as $group}
+{if $subgroups}
+  {foreach $subgroups as $subgroup}
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    <td>{$group.name|escape}</td>
-    <td>{$group.description|escape}</td>
-    <td><a href="group_edit.php?id={$group.id}">{$i18n.label.edit}</a></td>
-    <td><a href="group_delete.php?id={$group.id}">{$i18n.label.delete}</a></td>
+    <td>{$subgroup.name|escape}</td>
+    <td>{$subgroup.description|escape}</td>
+    <td><a href="group_edit.php?id={$subgroup.id}">{$i18n.label.edit}</a></td>
+    <td><a href="group_delete.php?id={$subgroup.id}">{$i18n.label.delete}</a></td>
   </tr>
   {/foreach}
 {/if}
 </table>
+{$forms.groupsForm.close}
 
 <table width="100%">
   <tr>
diff --git a/groups.php b/groups.php
index 12e54da20..7f4937c9f 100644
--- a/groups.php
+++ b/groups.php
@@ -39,7 +39,21 @@
 }
 // End of access checks.
 
-$smarty->assign('groups', $user->getSubgroups());
+$form = new Form('groupsForm');
+$groups = $user->getGroups();
+if (count($groups) > 1) {
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'this.form.submit();',
+    'name'=>'onBehalfGroup',
+    'style'=>'width: 250px;',
+    'value'=>$on_behalf_group_id,
+    'data'=>$groups,
+    'datakeys'=>array('id','name')));
+  $smarty->assign('on_behalf_group_control', 1);
+}
+
+$smarty->assign('subgroups', $user->getSubgroups());
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('label.subgroups'));
 $smarty->assign('content_page_name', 'groups.tpl');
 $smarty->display('index.tpl');

From ea0882f0753da7c4426b55e7ec526e455ada03a3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 14:58:05 +0000
Subject: [PATCH 0413/1848] Some more progress on group editor.

---
 WEB-INF/lib/ttUser.class.php | 15 +++++++++++++--
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/groups.tpl |  8 ++++----
 groups.php                   | 24 ++++++++++++++++--------
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7a37109eb..16b536c22 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 import('ttConfigHelper');
+import('ttGroupHelper');
 
 class ttUser {
   var $login = null;            // User login.
@@ -411,10 +412,12 @@ function getGroups() {
   }
 
   // getSubgroups obtains a list of immediate subgroups.
-  function getSubgroups() {
+  function getSubgroups($group_id = null) {
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description from tt_groups where org_id = $this->org_id and parent_id = ".$this->getActiveGroup();;
+    if (!$group_id) $group_id = $this->getActiveGroup();
+
+    $sql = "select id, name, description from tt_groups where org_id = $this->org_id and parent_id = $group_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -599,6 +602,14 @@ function enablePlugin($plugin, $enable = true)
     return true;
   }
 
+  // isGroupValid determines if a group is valid for user.
+  function isGroupValid($group_id) {
+    if ($group_id == $this->group_id)
+      return true;
+    else
+      return $this->isSubgroupValid($group_id);
+  }
+
   // isSubgroupValid determines if a subgroup is valid for user.
   // A subgroup is valid if:
   //   - user can manage_subgroups;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0e481fee9..0419e9e9f 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.4493 | 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.4494 | 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/groups.tpl b/WEB-INF/templates/groups.tpl
index 508f17878..d1f174fa5 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -1,12 +1,12 @@
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
-{$forms.groupsForm.open}
+{$forms.subgroupsForm.open}
 <table cellspacing="1" cellpadding="3" border="0" width="720">
-{if $on_behalf_group_control}
+{if $group_dropdown}
   <tr>
     <td align="right">{$i18n.label.group}:</td>
-    <td>{$forms.groupsForm.onBehalfGroup.control}</td>
+    <td>{$forms.subgroupsForm.group.control}</td>
   </tr>
   <tr><td colspan="2">&nbsp;</td></tr>
 {/if}
@@ -27,7 +27,7 @@
   {/foreach}
 {/if}
 </table>
-{$forms.groupsForm.close}
+{$forms.subgroupsForm.close}
 
 <table width="100%">
   <tr>
diff --git a/groups.php b/groups.php
index 7f4937c9f..279e50834 100644
--- a/groups.php
+++ b/groups.php
@@ -27,32 +27,40 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
+import('ttUser');
 import('form.Form');
-import('ttUserHelper');
-import('ttRoleHelper');
-import('ttConfigHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_subgroups')) {
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
+  header('Location: access_denied.php'); // Wrong group id in post.
+  exit();
+}
 // End of access checks.
 
-$form = new Form('groupsForm');
+if ($request->isPost()) {
+  $group_id = $request->getParameter('group');
+} else {
+  $group_id = $user->getActiveGroup();
+}
+
+$form = new Form('subgroupsForm');
 $groups = $user->getGroups();
 if (count($groups) > 1) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',
-    'name'=>'onBehalfGroup',
+    'name'=>'group',
     'style'=>'width: 250px;',
-    'value'=>$on_behalf_group_id,
+    'value'=>$group_id,
     'data'=>$groups,
     'datakeys'=>array('id','name')));
-  $smarty->assign('on_behalf_group_control', 1);
+  $smarty->assign('group_dropdown', 1);
 }
 
-$smarty->assign('subgroups', $user->getSubgroups());
+$smarty->assign('subgroups', $user->getSubgroups($group_id));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('label.subgroups'));
 $smarty->assign('content_page_name', 'groups.tpl');

From 7961e2909a8c8c456c1b0d6bee2944cabde592c0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 19:33:31 +0000
Subject: [PATCH 0414/1848] Implemented delete group feature in group editor.

---
 WEB-INF/lib/ttAdmin.class.php       |   2 +-
 WEB-INF/lib/ttGroupHelper.class.php | 105 ++++++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php        |  12 ++--
 WEB-INF/templates/footer.tpl        |   2 +-
 group_delete.php                    |  46 +++++++-----
 5 files changed, 142 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index ef55ae50b..a2388edf6 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -115,7 +115,7 @@ function markTasksDeleted($group_id) {
     return true;
   }
 
-  // markGroupDeleted marks the group and everything in it as deleted.
+  // markGroupDeleted marks a group and everything in it as deleted.
   function markGroupDeleted($group_id) {
 
     // Keep the logic simple by returning false on first error.
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 41c03114e..a6d5fea79 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -100,4 +100,109 @@ static function insertSubgroup($fields) {
     return (!is_a($affected, 'PEAR_Error'));
     // TODO: design subgroup roles carefully. Perhaps roles are not to be touched in subgroups at all.
   }
+
+  // markGroupDeleted marks a group and everything in it as deleted.
+  // This function is called in context of a logged on user (global $user object).
+  // It uses current user attributes for access checks and in sql queries.
+  // Compare this with admin:
+  //   admin can delete any group.
+  //   user can delete only relevant groups and only if allowed.
+  static function markGroupDeleted($group_id) {
+    global $user;
+
+    $mdb2 = getConnection();
+    $org_id = $user->org_id;
+
+    // Security check.
+    if (!$user->isGroupValid($group_id))
+      return false;
+
+    // Keep the logic simple by returning false on first error.
+
+    // Obtain subgroups and call self recursively on them.
+    $subgroups = $user->getSubgroups($group_id);
+    foreach($subgroups as $subgroup) {
+      if (!$this->markGroupDeleted($subgroup['id']))
+        return false;
+    }
+
+    // Now do actual work with all entities.
+
+    // Some things cannot be marked deleted as we don't have the status field for them.
+    // Just delete such things (until we have a better way to deal with them).
+    $tables_to_delete_from = array(
+      'tt_config',
+      'tt_predefined_expenses',
+      'tt_client_project_binds',
+      'tt_project_task_binds'
+    );
+    foreach($tables_to_delete_from as $table) {
+      if (!ttGroupHelper::deleteGroupEntriesFromTable($group_id, $table))
+        return false;
+    }
+
+    // Now mark status deleted where we can.
+    // Note: we don't mark tt_log, tt_custom_field_lod, or tt_expense_items deleted here.
+    // Reasoning is:
+    //
+    // 1) Users may mark some of them deleted during their work.
+    // If we mark all of them deleted here, we can't recover nicely
+    // as we'll lose track of what was accidentally deleted by user.
+    //
+    // 2) DB maintenance script (Clean up DB from inactive groups) should
+    // get rid of these items permanently eventually.
+    $tables_to_mark_deleted_in = array(
+      'tt_cron',
+      'tt_fav_reports',
+      // 'tt_expense_items',
+      // 'tt_custom_field_log',
+      'tt_custom_field_options',
+      'tt_custom_fields',
+      // 'tt_log',
+      'tt_invoices',
+      'tt_user_project_binds',
+      'tt_users',
+      'tt_clients',
+      'tt_projects',
+      'tt_tasks',
+      'tt_roles'
+    );
+    foreach($tables_to_mark_deleted_in as $table) {
+      if (!ttGroupHelper::markGroupDeletedInTable($group_id, $table))
+        return false;
+    }
+
+    // Mark group deleted.
+    $sql = "update tt_groups set status = null where id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return true;
+  }
+
+  // markGroupDeletedInTable is a generic helper function for markGroupDeleted.
+  // It updates ONE table by setting status to NULL for all records belonging to a group.
+  static function markGroupDeletedInTable($group_id, $table_name) {
+    global $user;
+    $mdb2 = getConnection();
+
+    // TODO: add modified info to sql for some tables, depending on table name.
+
+    $org_id = $user->org_id; // The only security measure we use here for match.
+    $sql = "update $table_name set status = null where group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // deleteGroupEntriesFromTable is a generic helper function for markGroupDeleted.
+  // It deletes entries in ONE table belonging to a given group.
+  static function deleteGroupEntriesFromTable($group_id, $table_name) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $org_id = $user->org_id; // The only security measure we use here for match.
+    $sql = "delete from $table_name where group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 16b536c22..ad5c04101 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -380,14 +380,14 @@ function getGroups() {
     if ($selected_group_id != $this->group_id) {
       // We are in one of subgroups, and a parent exists.
       // Get parent group info.
-      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id";
+      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id and status = 1";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         $val = $res->fetchRow();
         $parent_id = $val['parent_id'];
         if ($parent_id) {
           // Get parent group name.
-          $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id";
+          $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
           $res = $mdb2->query($sql);
           if (!is_a($res, 'PEAR_Error')) {
             $val = $res->fetchRow();
@@ -401,11 +401,12 @@ function getGroups() {
     $groups[] = array('id'=>$selected_group_id,'name'=>$selected_group_name);
 
     // Add subgroups.
-    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id";
+    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id and status = 1";
+    //die($sql);
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $groups[] = array('id'=>$val['id'],'name'=>$val['name']);
+        $groups[] = $val;
       }
     }
     return $groups;
@@ -417,7 +418,8 @@ function getSubgroups($group_id = null) {
 
     if (!$group_id) $group_id = $this->getActiveGroup();
 
-    $sql = "select id, name, description from tt_groups where org_id = $this->org_id and parent_id = $group_id";
+    $sql = "select id, name, description from tt_groups where org_id = $this->org_id".
+      " and parent_id = $group_id and status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0419e9e9f..50749d42f 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.4494 | 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.4495 | 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/group_delete.php b/group_delete.php
index b2977ee44..db24a4481 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -28,26 +28,21 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttAdmin');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('delete_group')) {
-  header('Location: access_denied.php');
+  header('Location: access_denied.php'); // No rights.
   exit();
 }
-$group_id = (int)$request->getParameter('id');
-if ($user->group_id != $group_id) {
-  header('Location: access_denied.php');
+if (!$user->isGroupValid($request->getParameter('id'))) {
+  header('Location: access_denied.php'); // Wrong group id.
   exit();
 }
 // End of access checks.
 
-// Note: reuse ttAdmin class here because deleting a group is a complicated task.
-// This creates an issue of using the class for not intended purpose.
-// However, otherwise we have to duplicate code, so reuse it is, for now.
-$admin = new ttAdmin();
-$group_details = $admin->getGroupDetails($group_id);
-$group_name = $group_details['group_name'];
+$group_id = (int)$request->getParameter('id');
+$group_name = ttGroupHelper::getGroupName($group_id);
 
 $form = new Form('groupForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
@@ -56,18 +51,33 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if ($admin->markGroupDeleted($group_id)) {
-      $auth->doLogout();
-      session_unset();
-      header('Location: login.php');
-      exit();
+    $markedDeleted = ttGroupHelper::markGroupDeleted($group_id);
+    if ($markedDeleted) {
+      // TODO: conditional redirects don't look nice. Any better ideas?
+      if ($group_id == $user->group_id) {
+        // We marked deleted our own group. Logout and redirect to login page.
+        $auth->doLogout();
+        session_unset();
+        header('Location: login.php');
+        exit();
+      } else {
+        // We marked deleted a subgroup. Redirect to groups.pgp.
+        header('Location: groups.php');
+        exit();
+      }
     } else
       $err->add($i18n->get('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {
-    header('Location: group_edit.php');
-    exit();
+    // TODO: conditional redirects don't look nice. Any better ideas?
+    if ($group_id == $user->group_id) {
+      header('Location: group_edit.php');
+      exit();
+    } else {
+      header('Location: groups.php');
+      exit();
+    }
   }
 } // isPost
 

From 78fdadfb6001c22512856ee6a5771b8d5a5ae122 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 23:11:25 +0000
Subject: [PATCH 0415/1848] Introduced 2 more localization strings.

---
 WEB-INF/resources/ca.lang.php    | 3 +++
 WEB-INF/resources/cs.lang.php    | 3 +++
 WEB-INF/resources/da.lang.php    | 3 +++
 WEB-INF/resources/de.lang.php    | 3 +++
 WEB-INF/resources/en.lang.php    | 5 +++++
 WEB-INF/resources/es.lang.php    | 3 +++
 WEB-INF/resources/et.lang.php    | 3 +++
 WEB-INF/resources/fa.lang.php    | 3 +++
 WEB-INF/resources/fi.lang.php    | 3 +++
 WEB-INF/resources/fr.lang.php    | 3 +++
 WEB-INF/resources/gr.lang.php    | 3 +++
 WEB-INF/resources/he.lang.php    | 3 +++
 WEB-INF/resources/hu.lang.php    | 3 +++
 WEB-INF/resources/it.lang.php    | 3 +++
 WEB-INF/resources/ja.lang.php    | 3 +++
 WEB-INF/resources/ko.lang.php    | 3 +++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 3 +++
 WEB-INF/resources/pl.lang.php    | 3 +++
 WEB-INF/resources/pt-br.lang.php | 3 +++
 WEB-INF/resources/pt.lang.php    | 3 +++
 WEB-INF/resources/ro.lang.php    | 3 +++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 3 +++
 WEB-INF/resources/sl.lang.php    | 3 +++
 WEB-INF/resources/sr.lang.php    | 3 +++
 WEB-INF/resources/sv.lang.php    | 3 +++
 WEB-INF/resources/tr.lang.php    | 3 +++
 WEB-INF/resources/zh-cn.lang.php | 3 +++
 WEB-INF/resources/zh-tw.lang.php | 3 +++
 30 files changed, 91 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 80d11cdfe..a54e3d7a2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -255,6 +255,9 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Catalan titles similarly.
 // Specifically: Agregant vs Agregar, etc.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Sessió iniciada',
 'title.groups' => 'Grups',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 191600627..6dfed8f29 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -265,6 +265,9 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Czech titles similarly.
 // Specifically: Vytváření vs Pridat, etc.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Přihlásit',
 'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f0d7c4382..475da0010 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -236,6 +236,9 @@
 'label.totals_only' => 'Kun Total',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 69bdffba2..16994c9f4 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -224,6 +224,9 @@
 'label.totals_only' => 'Nur Gesamtstunden',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Anmelden',
 'title.groups' => 'Gruppen',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4c569dc68..54ebbd94b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -102,6 +102,9 @@
 'error.cannot_import' => 'Cannot import: %s.',
 'error.format' => 'Invalid file format.',
 
+// Success messages.
+'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Login',
 'button.now' => 'Now',
@@ -220,6 +223,8 @@
 'label.totals_only' => 'Totals only',
 
 // Form titles.
+'title.error' => 'Error',
+'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Groups',
 'title.subgroups' => 'Subgroups',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 44bca1bbe..f4f803d38 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -254,6 +254,9 @@
 'label.totals_only' => 'Solo totales',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Sesión iniciada',
 'title.groups' => 'Grupos',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 8f159c0b7..821247454 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -262,6 +262,9 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Estonian titles similarly.
 // Specifically: lisamine vs lisa, etc.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Meeskonnad', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2620ffc12..afc378eb7 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -247,6 +247,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'ورود',
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 2067595de..8efb0bf38 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -240,6 +240,9 @@
 'label.totals_only' => 'Vain yhteissummat',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Kirjautuminen',
 'title.groups' => 'Tiimit', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index bbd315b0f..3a8804944 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -234,6 +234,9 @@
 'label.totals_only' => 'Totaux uniquement',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Connexion',
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 6520d46b9..5f2f9176a 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -227,6 +227,9 @@
 'label.totals_only' => 'Σύνολα μόνο',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Σύνδεση',
 'title.groups' => 'Ομάδες',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 250ea7dc0..37ed7ace4 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -257,6 +257,9 @@
 'labl.totals_only' => 'סיכומים בלבד',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'כניסה',
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index ae7920530..e90c53e3e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -256,6 +256,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Bejelentkezés',
 'title.groups' => 'Csoportok',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7ecc26e4a..923e5b80e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -235,6 +235,9 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Italian titles similarly.
 // Specifically: Eliminazione vs Elimina - we probably want nouns in titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Gruppi',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9e6d99a79..3ce170cde 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -261,6 +261,9 @@
 'label.totals_only' => '全体だけ',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'ログイン',
 'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f577566dd..2e9a03f6c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -261,6 +261,9 @@
 'label.totals_only' => '오직 전체만',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => '로그인',
 'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5d11a8a0d..0c449ced5 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -221,6 +221,9 @@
 'label.totals_only' => 'Alleen totalen',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Aanmelden',
 'title.groups' => 'Groepen',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a7a82d753..03a86435d 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -258,6 +258,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Innlogging',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index eeedb29c2..2847ba517 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -241,6 +241,9 @@
 'label.totals_only' => 'Tylko sumy',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Logowanie',
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index e72b03b6e..58795b961 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -238,6 +238,9 @@
 'label.totals_only' => 'Somente totais',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e5a5c5022..6ee2ac68f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -247,6 +247,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Login',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 8cf13bb96..a125e2559 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -261,6 +261,9 @@
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Romanian titles similarly.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Autentificare',
 'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 926834e23..cbfc3d77f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -219,6 +219,8 @@
 'label.totals_only' => 'Только итоги',
 
 // Form titles.
+'title.error' => 'Ошибка',
+'title.success' => 'Успешная операция',
 'title.login' => 'Вход в систему',
 'title.groups' => 'Группы',
 'title.subgroups' => 'Подгруппы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2499ea753..56de57ba7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -247,6 +247,9 @@
 'label.totals_only' => 'Iba celkové',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Prihlásenie',
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c52130efa..59e05d7fd 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -242,6 +242,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Prijava',
 'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index bd041e508..9bf436fde 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -239,6 +239,9 @@
 'label.totals_only' => 'Samo zbirno',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Prijava',
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 8e776e889..1b309afd4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -235,6 +235,9 @@
 'label.totals_only' => 'Visa endast summeringar',
 
 // Rubriker för formulär
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Logga in',
 'title.groups' => 'Grupper',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4ea24ff15..27742da24 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -270,6 +270,9 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Romanian titles similarly.
 // Specifically: compare project and client titles and see how they differ.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => 'Giriş',
 'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 29cb05ca4..ec2e54615 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -249,6 +249,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => '登录',
 'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2a005abc4..3ede87156 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -257,6 +257,9 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+// TODO: Translate the following.
+// 'title.error' => 'Error',
+// 'title.success' => 'Success',
 'title.login' => '登錄',
 'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.

From 7f0309861f7e86e63d71775df7e491cdb25433e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 23:27:06 +0000
Subject: [PATCH 0416/1848] Some recycling in translation files.

---
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 475da0010..29aff6cd8 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -236,8 +236,8 @@
 'label.totals_only' => 'Kun Total',
 
 // Form titles.
+'title.error' => 'Fejl',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 16994c9f4..f58a50880 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -224,8 +224,8 @@
 'label.totals_only' => 'Nur Gesamtstunden',
 
 // Form titles.
+'title.error' => 'Fehler',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Anmelden',
 'title.groups' => 'Gruppen',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index afc378eb7..8f374cc32 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -247,8 +247,8 @@
 // 'label.totals_only' => 'Totals only',
 
 // Form titles.
+'title.error' => 'خطا',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'ورود',
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 8efb0bf38..9fcfdce51 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -240,8 +240,8 @@
 'label.totals_only' => 'Vain yhteissummat',
 
 // Form titles.
+'title.error' => 'Virhe',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Kirjautuminen',
 'title.groups' => 'Tiimit', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3a8804944..9b39ee17f 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -234,8 +234,8 @@
 'label.totals_only' => 'Totaux uniquement',
 
 // Form titles.
+'title.error' => 'Erreur',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Connexion',
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5f2f9176a..bfc15b015 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -227,8 +227,8 @@
 'label.totals_only' => 'Σύνολα μόνο',
 
 // Form titles.
+'title.error' => 'Σφάλμα',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Σύνδεση',
 'title.groups' => 'Ομάδες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 37ed7ace4..94d0f5e76 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -257,8 +257,8 @@
 'labl.totals_only' => 'סיכומים בלבד',
 
 // Form titles.
+'title.error' => 'שגיאה',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'כניסה',
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 923e5b80e..2cb823628 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -235,8 +235,8 @@
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Italian titles similarly.
 // Specifically: Eliminazione vs Elimina - we probably want nouns in titles.
+'title.error' => 'Errore',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Gruppi',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0c449ced5..94f612c65 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -221,8 +221,8 @@
 'label.totals_only' => 'Alleen totalen',
 
 // Form titles.
+'title.error' => 'Fout',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Aanmelden',
 'title.groups' => 'Groepen',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2847ba517..16d4a5d27 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -241,8 +241,8 @@
 'label.totals_only' => 'Tylko sumy',
 
 // Form titles.
+'title.error' => 'Błąd',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Logowanie',
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 58795b961..69976b08d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -238,8 +238,8 @@
 'label.totals_only' => 'Somente totais',
 
 // Form titles.
+'title.error' => 'Erro',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index cbfc3d77f..8c0aebfec 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -220,7 +220,7 @@
 
 // Form titles.
 'title.error' => 'Ошибка',
-'title.success' => 'Успешная операция',
+'title.success' => 'Успех',
 'title.login' => 'Вход в систему',
 'title.groups' => 'Группы',
 'title.subgroups' => 'Подгруппы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 56de57ba7..a2b79c4ba 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -247,8 +247,8 @@
 'label.totals_only' => 'Iba celkové',
 
 // Form titles.
+'title.error' => 'Chyba',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Prihlásenie',
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 9bf436fde..1b3f4719d 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -239,8 +239,8 @@
 'label.totals_only' => 'Samo zbirno',
 
 // Form titles.
+'title.error' => 'Greška',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Prijava',
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1b309afd4..c09bb77fd 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -235,8 +235,8 @@
 'label.totals_only' => 'Visa endast summeringar',
 
 // Rubriker för formulär
+'title.error' => 'Fel',
 // TODO: Translate the following.
-// 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Logga in',
 'title.groups' => 'Grupper',

From 220a0a7280b0fc7baa5a26123ac32b148c567d83 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 23:35:45 +0000
Subject: [PATCH 0417/1848] Introduced msg.success in translation files.

---
 WEB-INF/resources/ca.lang.php    | 4 ++++
 WEB-INF/resources/cs.lang.php    | 4 ++++
 WEB-INF/resources/da.lang.php    | 4 ++++
 WEB-INF/resources/de.lang.php    | 4 ++++
 WEB-INF/resources/es.lang.php    | 4 ++++
 WEB-INF/resources/et.lang.php    | 4 ++++
 WEB-INF/resources/fa.lang.php    | 4 ++++
 WEB-INF/resources/fi.lang.php    | 4 ++++
 WEB-INF/resources/fr.lang.php    | 4 ++++
 WEB-INF/resources/gr.lang.php    | 4 ++++
 WEB-INF/resources/he.lang.php    | 4 ++++
 WEB-INF/resources/hu.lang.php    | 4 ++++
 WEB-INF/resources/it.lang.php    | 4 ++++
 WEB-INF/resources/ja.lang.php    | 4 ++++
 WEB-INF/resources/ko.lang.php    | 4 ++++
 WEB-INF/resources/nl.lang.php    | 4 ++++
 WEB-INF/resources/no.lang.php    | 4 ++++
 WEB-INF/resources/pl.lang.php    | 4 ++++
 WEB-INF/resources/pt-br.lang.php | 4 ++++
 WEB-INF/resources/pt.lang.php    | 4 ++++
 WEB-INF/resources/ro.lang.php    | 4 ++++
 WEB-INF/resources/ru.lang.php    | 3 +++
 WEB-INF/resources/sk.lang.php    | 4 ++++
 WEB-INF/resources/sl.lang.php    | 4 ++++
 WEB-INF/resources/sr.lang.php    | 4 ++++
 WEB-INF/resources/sv.lang.php    | 4 ++++
 WEB-INF/resources/tr.lang.php    | 4 ++++
 WEB-INF/resources/zh-cn.lang.php | 4 ++++
 WEB-INF/resources/zh-tw.lang.php | 4 ++++
 29 files changed, 115 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a54e3d7a2..2aa222ddd 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -117,6 +117,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Iniciar sessió',
 'button.now' => 'Ara',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 6dfed8f29..92ce94280 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -119,6 +119,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Přihlásit',
 'button.now' => 'Teď',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 29aff6cd8..7ffc07992 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -111,6 +111,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Log ind',
 'button.now' => 'Nu',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index f58a50880..07da56ca0 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -105,6 +105,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Anmelden',
 'button.now' => 'Jetzt',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f4f803d38..819df1a32 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -115,6 +115,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Iniciar sesion',
 'button.now' => 'Ahora',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 821247454..b8679a4ea 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -120,6 +120,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Login',
 'button.now' => 'Kohe',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8f374cc32..a9533c72e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -118,6 +118,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'ورود',
 'button.now' => 'هم اکنون',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9fcfdce51..d8454884d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -113,6 +113,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Kirjaudu',
 'button.now' => 'Nyt',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9b39ee17f..0b274de7e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -111,6 +111,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Connexion',
 'button.now' => 'Maintenant',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index bfc15b015..d98ad087e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -106,6 +106,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Σύνδεση',
 'button.now' => 'Τώρα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 94d0f5e76..6529b77c4 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -128,6 +128,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'היכנס',
 'button.now' => 'עכשיו',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e90c53e3e..5bcd7ee39 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -117,6 +117,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Bejelentkezés',
 'button.now' => 'Most',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2cb823628..5c82b747f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -110,6 +110,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Login',
 'button.now' => 'Adesso',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3ce170cde..4342bc55e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -121,6 +121,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'ログイン',
 'button.now' => '現在',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2e9a03f6c..9cbc4e5ec 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -120,6 +120,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => '로그인',
 'button.now' => '지금',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 94f612c65..3fe368186 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -102,6 +102,10 @@
 'error.cannot_import' => 'Kan het volgende niet importeren: %s.',
 'error.format' => 'Bestandsformaat niet valide.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Aanmelden',
 'button.now' => 'Nu',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 03a86435d..f494bc0f1 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -120,6 +120,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Innlogging',
 'button.now' => 'Nå',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 16d4a5d27..e21bf1be1 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -115,6 +115,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons
 'button.login' => 'Login',
 'button.now' => 'Teraz',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 69976b08d..98a9b4a61 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -112,6 +112,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Login',
 'button.now' => 'Agora',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 6ee2ac68f..9b7cd5d8e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -114,6 +114,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Login',
 'button.now' => 'Hoje',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a125e2559..2763bac03 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -121,6 +121,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Autentifica',
 'button.now' => 'Acum',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 8c0aebfec..ad24983c3 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -101,6 +101,9 @@
 'error.cannot_import' => 'Невозможно импортировать: %s.',
 'error.format' => 'Неверный формат файла.',
 
+// Success messages.
+'msg.success' => 'Операция завершена успешно.',
+
 // Labels for buttons.
 'button.login' => 'Войти',
 'button.now' => 'Сейчас',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a2b79c4ba..a70af3993 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -117,6 +117,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Prihlásiť',
 'button.now' => 'Teraz',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 59e05d7fd..b0d4a0b18 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -111,6 +111,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Prijava',
 'button.now' => 'Zdaj',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1b3f4719d..dd9c3476a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -112,6 +112,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Prijava',
 'button.now' => 'Sada',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c09bb77fd..4fe3b0422 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -110,6 +110,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Logga in',
 'button.now' => 'Nu',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 27742da24..1d0c0ea75 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -124,6 +124,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => 'Giriş',
 'button.now' => 'Şimdi',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index ec2e54615..7bad3fa9d 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -112,6 +112,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => '登录',
 'button.now' => '当前时间',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 3ede87156..d25f94979 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -118,6 +118,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Success messages.
+// TODO: translate the following.
+// 'msg.success' => 'Operation completed successfully.',
+
 // Labels for buttons.
 'button.login' => '登錄',
 'button.now' => '當前時間',

From 24d92ab1a3273b9aa6e678f3d381ef9f931ceeb6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Nov 2018 23:39:35 +0000
Subject: [PATCH 0418/1848] Added success.php and .tpl for redirect to.

---
 WEB-INF/templates/success.tpl |  1 +
 success.php                   | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 WEB-INF/templates/success.tpl
 create mode 100644 success.php

diff --git a/WEB-INF/templates/success.tpl b/WEB-INF/templates/success.tpl
new file mode 100644
index 000000000..c341a4039
--- /dev/null
+++ b/WEB-INF/templates/success.tpl
@@ -0,0 +1 @@
+<!-- empty -->
diff --git a/success.php b/success.php
new file mode 100644
index 000000000..6af07ef6b
--- /dev/null
+++ b/success.php
@@ -0,0 +1,36 @@
+<?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');
+
+$msg->add($i18n->get('msg.success'));
+if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
+
+$smarty->assign('title', $i18n->get('title.success'));
+$smarty->assign('content_page_name', 'success.tpl');
+$smarty->display('index.tpl');

From 94737b99e973c5ff06e58d10f1c32c0955462a8f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 12:20:09 +0000
Subject: [PATCH 0419/1848] Improved ttUser::updateGroup for subgroup support.

---
 WEB-INF/lib/ttUser.class.php | 7 ++++++-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ad5c04101..79f7ae77b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -509,8 +509,13 @@ function updateGroup($fields) {
     if (!($this->can('manage_basic_settings') ||
       $this->can('manage_advanced_settings') ||
       $this->can('manage_features'))) return false;
+    // TODO: update the above for subgroup updates.
+
+    $group_id = $fields['group_id'];
+    if ($group_id && !$this->isGroupValid($group_id)) return false;
 
     $mdb2 = getConnection();
+    if (!$group_id) $group_id = $this->getActiveGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
@@ -537,7 +542,7 @@ function updateGroup($fields) {
       $time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
       $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$workday_minutes_part.$modified_part, ',');
 
-    $sql = "update tt_groups set $parts where id = $this->group_id";
+    $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 50749d42f..72436ab58 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.4495 | 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.4496 | 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>

From 8a47b340fd212894ebb7b4456f3f0cb647c9ac68 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 12:26:28 +0000
Subject: [PATCH 0420/1848] Wrote ttGroupHelper::getGroupAttrs function.

---
 WEB-INF/lib/ttGroupHelper.class.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index a6d5fea79..21e62a602 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -205,4 +205,18 @@ static function deleteGroupEntriesFromTable($group_id, $table_name) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getGroupAttrs obtains all group attributes.
+  static function getGroupAttrs($group_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql =  "select * from tt_groups".
+            " where status = 1 and id = $group_id and org_id = $user->org_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+    }
+    return $val;
+  }
 }

From 807daaa6d030a1ee01a5fb3822db3a299a84bfc9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 12:46:40 +0000
Subject: [PATCH 0421/1848] Adjusted group_edit.php to work with subgroups.

---
 WEB-INF/templates/footer.tpl |  2 +-
 group_edit.php               | 51 +++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 72436ab58..ab601cace 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.4496 | 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.4497 | 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/group_edit.php b/group_edit.php
index 872fe1480..a98243cbb 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -37,9 +37,16 @@
   header('Location: access_denied.php');
   exit();
 }
+$group_id = (int)$request->getParameter('id');
+if ($group_id && !$user->isGroupValid($group_id)) {
+  header('Location: access_denied.php');
+  exit();
+}
 // End of access checks.
 
-$config = new ttConfigHelper($user->config);
+if (!$group_id) $group_id = $user->getActiveGroup();
+$group = ttGroupHelper::getGroupAttrs($group_id);
+$config = new ttConfigHelper($group['config']);
 
 $advanced_settings = $user->can('manage_advanced_settings');
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
@@ -65,27 +72,28 @@
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
   $cl_allow_ip = trim($request->getParameter('allow_ip'));
 } else {
-  $cl_group = $user->group_name;
-  $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
-  $cl_lang = $user->lang;
-  $cl_decimal_mark = $user->decimal_mark;
-  $cl_date_format = $user->date_format;
-  $cl_time_format = $user->time_format;
-  $cl_start_week = $user->week_start;
-  $cl_show_holidays = $user->show_holidays;
-  $cl_tracking_mode = $user->tracking_mode;
-  $cl_project_required = $user->project_required;
-  $cl_task_required = $user->task_required;
-  $cl_record_type = $user->record_type;
-  $cl_punch_mode = $user->punch_mode;
-  $cl_allow_overlap = $user->allow_overlap;
-  $cl_future_entries = $user->future_entries;
-  $cl_uncompleted_indicators = $user->uncompleted_indicators;
-  $cl_bcc_email = $user->bcc_email;
-  $cl_allow_ip = $user->allow_ip;
+  $cl_group = $group['name'];
+  $cl_currency = ($group['currency'] == ''? CURRENCY_DEFAULT : $group['currency']);
+  $cl_lang = $group['lang'];
+  $cl_decimal_mark = $group['decimal_mark'];
+  $cl_date_format = $group['date_format'];
+  $cl_time_format = $group['time_format'];
+  $cl_start_week = $group['week_start'];
+  $cl_show_holidays = $config->getDefinedValue('show_holidays');
+  $cl_tracking_mode = $group['tracking_mode'];
+  $cl_project_required = $group['project_required'];
+  $cl_task_required = $group['task_required'];
+  $cl_record_type = $group['record_type'];
+  $cl_punch_mode = $config->getDefinedValue('punch_mode');
+  $cl_allow_overlap = $config->getDefinedValue('allow_overlap');
+  $cl_future_entries = $config->getDefinedValue('future_entries');
+  $cl_uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
+  $cl_bcc_email = $group['bcc_email'];
+  $cl_allow_ip = $group['allow_ip'];
 }
 
 $form = new Form('groupForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
 $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
@@ -175,7 +183,7 @@
 
   if ($request->getParameter('btn_delete')) {
     // Delete button pressed, redirect.
-    header('Location: group_delete.php?id='.$user->group_id);
+    header('Location: group_delete.php?id='.$group_id);
     exit();
   }
 
@@ -197,6 +205,7 @@
     $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
 
     if ($user->updateGroup(array(
+      'group_id' => $group_id,
       'name' => $cl_group,
       'currency' => $cl_currency,
       'lang' => $cl_lang,
@@ -212,7 +221,7 @@
       'bcc_email' => $cl_bcc_email,
       'allow_ip' => $cl_allow_ip,
       'config' => $config->getConfig()))) {
-      header('Location: time.php');
+      header('Location: success.php');
       exit();
     } else
       $err->add($i18n->get('error.db'));

From e19990636073ca1aa353a67033dc0cec311fdab9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 13:10:34 +0000
Subject: [PATCH 0422/1848] Added description field on group_edit.php.

---
 WEB-INF/lib/ttUser.class.php     | 3 ++-
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 4 ++++
 group_edit.php                   | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 79f7ae77b..ab5bdbff4 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -518,6 +518,7 @@ function updateGroup($fields) {
     if (!$group_id) $group_id = $this->getActiveGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
+    if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
     if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
     if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
@@ -538,7 +539,7 @@ function updateGroup($fields) {
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
 
-    $parts = trim($name_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
+    $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
       $time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
       $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$workday_minutes_part.$modified_part, ',');
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ab601cace..814be7981 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.4497 | 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.4498 | 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 ea46bec6f..d15944899 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -31,6 +31,10 @@ function handleTaskRequiredCheckbox() {
             <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>
diff --git a/group_edit.php b/group_edit.php
index a98243cbb..77ddc6189 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -53,6 +53,7 @@
 
 if ($request->isPost()) {
   $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');
@@ -73,6 +74,7 @@
   $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'];
@@ -95,6 +97,7 @@
 $form = new Form('groupForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
 $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.
@@ -189,6 +192,7 @@
 
   // Validate user input.
   if (!ttValidString($cl_group, true)) $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) {
     if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
@@ -207,6 +211,7 @@
     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,

From 2f8a9f1fb0051c27a7235ef42af6502782cf2f83 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 13:38:45 +0000
Subject: [PATCH 0423/1848] Fixed export-import to include group descriptions.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 4 +++-
 WEB-INF/templates/footer.tpl              | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 54b8aaa11..9490f0757 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -123,6 +123,7 @@ function writeData() {
     // Write group info.
     $group = $this->getGroupAttrs();
     $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
+    $group_part .= " description=\"".htmlspecialchars($group['description'])."\"";
     $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index a14d9714b..124b035b0 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -109,6 +109,7 @@ function startElement($parser, $name, $attrs) {
           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
+          'description' => $attrs['DESCRIPTION'],
           'currency' => $attrs['CURRENCY'],
           'decimal_mark' => $attrs['DECIMAL_MARK'],
           'lang' => $attrs['LANG'],
@@ -655,7 +656,7 @@ private function createGroup($fields) {
     global $i18n;
     $mdb2 = getConnection();
 
-    $columns = '(parent_id, org_id, name, currency, decimal_mark, lang, date_format, time_format'.
+    $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.
       ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
       ', allow_ip, password_complexity, plugins, lock_spec'.
       ', workday_minutes, config, created, created_ip, created_by)';
@@ -664,6 +665,7 @@ private function createGroup($fields) {
     $values .= $mdb2->quote($fields['parent_id']);
     $values .= ', '.$mdb2->quote($fields['org_id']);
     $values .= ', '.$mdb2->quote(trim($fields['name']));
+    $values .= ', '.$mdb2->quote(trim($fields['description']));
     $values .= ', '.$mdb2->quote(trim($fields['currency']));
     $values .= ', '.$mdb2->quote($fields['decimal_mark']);
     $values .= ', '.$mdb2->quote($fields['lang']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 814be7981..4829793a8 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.4498 | 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.4499 | 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>

From d82f2da8a4df2190f26f1ce8a44fe35c42bba1da Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 15:16:32 +0000
Subject: [PATCH 0424/1848] Fixed import for subgroups.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 30 +++++++++++++++++++------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 124b035b0..30b9a09da 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -45,7 +45,7 @@ class ttOrgImportHelper {
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).
   var $current_group_id        = null; // Current group id during parsing.
-  var $current_parent_group_id = null; // Current parent group id during parsing.
+  var $parents        = array(); // A stack of parent group ids for current group all the way to the root including self.
   var $top_role_id    = 0;       // Top role id.
 
   // Entity maps for current group. They map XML ids with database ids.
@@ -106,7 +106,7 @@ function startElement($parser, $name, $attrs) {
       if ($name == 'GROUP') {
         // Create a new group.
         $this->current_group_id = $this->createGroup(array(
-          'parent_id' => $this->current_parent_group_id,
+          'parent_id' => $this->current_group_id, // Note: after insert current_group_id changes.
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'description' => $attrs['DESCRIPTION'],
@@ -135,8 +135,8 @@ function startElement($parser, $name, $attrs) {
           $sql = "update tt_groups set org_id = $this->current_group_id where org_id is NULL and id = $this->current_group_id";
           $affected = $mdb2->exec($sql);
         }
-        // Set parent group to create subgroups with this group as parent at next entry here.
-        $this->current_parent_group_id = $this->current_group_id;
+        // Add self to parent stack.
+        array_push($this->parents, $this->current_group_id);
         return;
       }
 
@@ -541,6 +541,22 @@ function startElement($parser, $name, $attrs) {
     }
   }
 
+  // endElement - callback handler for ending tags in XML.
+  // We use this only for process </group> element endings and
+  // set current_group_id to an immediate parent.
+  // This is required to import group hierarchy correctly.
+  function endElement($parser, $name) {
+    // No need to care about first or second pass, as this is used only in second pass.
+    // See 2nd xml_set_element_handler, where this handler is set.
+    if ($name == 'GROUP') {
+      // Remove self from the parent stack.
+      $self = array_pop($this->parents);
+      // Set current group id to an immediate parent.
+      $len = count($this->parents);
+      $this->current_group_id = $len ? $this->parents[$len-1] : null;
+    }
+  }
+
   // importXml - uncompresses the file, reads and parses its content. During parsing,
   // startElement, endElement, and dataElement functions are called as many times as necessary.
   // Actual import occurs in the endElement handler.
@@ -575,7 +591,7 @@ function importXml() {
     // Initialize XML parser.
     $parser = xml_parser_create();
     xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', false);
+    xml_set_element_handler($parser, 'startElement', false); // No need to process end tags in 1st pass.
 
     // We need to parse the file 2 times:
     //   1) First pass: determine if import is possible.
@@ -608,9 +624,9 @@ function importXml() {
     // Now we can do a second pass, where real work is done.
     $parser = xml_parser_create();
     xml_set_object($parser, $this);
-    xml_set_element_handler($parser, 'startElement', false);
+    xml_set_element_handler($parser, 'startElement', 'endElement'); // Need to process ending tags too.
 
-    // Read and parse the content of the file. During parsing, startElement is called back for each tag.
+    // Read and parse the content of the file. During parsing, startElement and endElement are called back for each tag.
     $file = fopen($filename, 'r');
     while (($data = fread($file, 4096)) && $this->errors->no()) {
       if (!xml_parse($parser, $data, feof($file))) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4829793a8..a59278ed9 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.4499 | 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.4500 | 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>

From b9450dc964f5b244713dc5c799a81a660269f22b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 16:58:23 +0000
Subject: [PATCH 0425/1848] Wrote ttUser::getUserPartForHeader and included on
 behalf group in output.

---
 WEB-INF/lib/ttUser.class.php | 19 +++++++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/header.tpl |  6 +-----
 default.css                  |  4 ++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ab5bdbff4..f89bba684 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -652,4 +652,23 @@ function getMaxRankForGroup($group_id) {
 
     return $max_rank;
   }
+
+  // getUserPartForHeader constructs a string for user to display on pages header.
+  // It changes with "on behalf" attributes for both user and group.
+  function getUserPartForHeader() {
+    global $i18n;
+
+    $user_part = htmlspecialchars($this->name);
+    $user_part .= ' - '.htmlspecialchars($this->role_name);
+    if ($this->behalf_id) {
+      $user_part .= ' <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_name).'</span>';
+    }
+    if ($this->behalf_group_id) {
+      $user_part .= ',  <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_group_name).'</span>';
+    } else {
+      if ($this->group_name) // Note: we did not require group names in the past.
+        $user_part .= ', '.$this->group_name;
+    }
+    return $user_part;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a59278ed9..0240ecfba 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.4500 | 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.4501 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 23dfdc117..de25c0660 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -165,11 +165,7 @@
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
-  {if $user->name}
-        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->group_name}, {$user->group_name|escape}{/if}</td></tr>
-  {else}
-        <tr><td>&nbsp;</td></tr>
-  {/if}
+        <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
       </table>
 {/if}
       <!-- end of page title and user details -->
diff --git a/default.css b/default.css
index ee6a5b167..47dc81e44 100644
--- a/default.css
+++ b/default.css
@@ -74,6 +74,10 @@ input[type=checkbox], label {
   color: #444444;
 }
 
+.onBehalf {
+  font-weight: bold;
+}
+
 .tableHeader {
   font-weight: bold;
   text-align: left;

From 460983ff96c7f6b57d7d7d567c767730fb1ba36e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 17:04:48 +0000
Subject: [PATCH 0426/1848] Fixed user details output.

---
 WEB-INF/lib/ttUser.class.php | 1 +
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index f89bba684..25cc83f7a 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -657,6 +657,7 @@ function getMaxRankForGroup($group_id) {
   // It changes with "on behalf" attributes for both user and group.
   function getUserPartForHeader() {
     global $i18n;
+    if (!$this->id) return null;
 
     $user_part = htmlspecialchars($this->name);
     $user_part .= ' - '.htmlspecialchars($this->role_name);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0240ecfba..161df0208 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.4501 | 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.4503 | 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>

From d27960ac5530c7c81b9adba85253b0e216f81476 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 19:14:59 +0000
Subject: [PATCH 0427/1848] Made group name mandatory for subgroup support.

---
 WEB-INF/lib/ttAdmin.class.php          | 2 +-
 WEB-INF/lib/ttRegistrator.class.php    | 2 +-
 WEB-INF/templates/admin_group_add.tpl  | 2 +-
 WEB-INF/templates/admin_group_edit.tpl | 2 +-
 WEB-INF/templates/footer.tpl           | 2 +-
 WEB-INF/templates/group_edit.tpl       | 6 +++++-
 WEB-INF/templates/register.tpl         | 2 +-
 group_edit.php                         | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index a2388edf6..747274f12 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -198,7 +198,7 @@ function validateGroupInfo($fields) {
 
     $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 8e755837e..77ffb6b57 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -67,7 +67,7 @@ function __construct($fields, &$err) {
   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 fd671e9c7..029b52545 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 4c52580eb..70443e327 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 161df0208..ec0063a31 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 d15944899..8ccb258fd 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 96687797d..3d7678af4 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 77ddc6189..84c66df97 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -191,7 +191,7 @@
   }
 
   // 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) {

From 10e652b9628722c1aad1ab875a3bda1007167c31 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 21:03:09 +0000
Subject: [PATCH 0428/1848] Fixed adding subgroups with a proper parent group.

---
 WEB-INF/lib/ttUser.class.php | 35 ++++++++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl |  2 +-
 groups.php                   |  1 +
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 25cc83f7a..e50d9a3ea 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -419,7 +419,7 @@ function getSubgroups($group_id = null) {
     if (!$group_id) $group_id = $this->getActiveGroup();
 
     $sql = "select id, name, description from tt_groups where org_id = $this->org_id".
-      " and parent_id = $group_id and status is not null";
+      " and parent_id = $group_id and status is not null order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -672,4 +672,37 @@ function getUserPartForHeader() {
     }
     return $user_part;
   }
+
+  // setOnBehalfGroup sets on behalf group for the user in both the object and the session.
+  function setOnBehalfGroup($group_id) {
+
+    // Unset things first.
+    $this->behalf_group_id = null;
+    $this->behalf_group_name = null;
+    unset($_SESSION['behalf_group_id']);
+    unset($_SESSION['behalf_group_name']);
+
+    // Do not do anything if we don't have rights.
+    if (!$this->can('manage_subgroups')) return;
+
+    // No need to set if the group is our home group.
+    if ($group_id == $this->group_id) return;
+
+    // No need to set if the subgroup is not valid.
+    if (!$this->isSubgroupValid($group_id)) return;
+
+    // We are good to set on behalf group.
+    $onBehalfGroupName = ttGroupHelper::getGroupName($group_id);
+    $_SESSION['behalf_group_id'] = $group_id;
+    $_SESSION['behalf_group_name'] = $onBehalfGroupName;
+    $this->behalf_group_id = $group_id;
+    $this->behalf_group_name = $onBehalfGroupName;
+
+    // Question remains whether or not we need to adjust on behalf user.
+    // Adjusting for now. Test it and redesign if necessary.
+    unset($_SESSION['behalf_id']);
+    unset($_SESSION['behalf_name']);
+    $this->adjustBehalfId();
+    return;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ec0063a31..425975da7 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.4504 | 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.4505 | 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/groups.php b/groups.php
index 279e50834..172dd3298 100644
--- a/groups.php
+++ b/groups.php
@@ -43,6 +43,7 @@
 
 if ($request->isPost()) {
   $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
 } else {
   $group_id = $user->getActiveGroup();
 }

From fec6ce6d32cc779e350a65c641f1b1eafa096ea8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 22:20:01 +0000
Subject: [PATCH 0429/1848] Improved subgroup addition by copying attributes
 and roles from a parent group.

---
 WEB-INF/lib/ttGroupHelper.class.php | 69 +++++++++++++++++++++++++----
 WEB-INF/lib/ttRoleHelper.class.php  | 25 +++++++++++
 WEB-INF/templates/footer.tpl        |  2 +-
 3 files changed, 86 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 21e62a602..01429aa67 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -26,6 +26,8 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
+import('ttRoleHelper');
+
 // Class ttGroupHelper - contains helper functions that operate with groups.
 // This is a planned replacement for ttTeamHelper as we move forward with subgroups.
 class ttGroupHelper {
@@ -86,19 +88,51 @@ static function insertSubgroup($fields) {
     $mdb2 = getConnection();
     $parent_id = $user->getActiveGroup();
     $org_id = $user->org_id;
-
-    // TODO: inherit all attributes from the parent group, if not supplied.
     $name = $fields['name'];
     $description = $fields['description'];
 
-    $created = 'now()';
-    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
-
-    $sql = "insert into tt_groups (parent_id, org_id, name, description, created, created_ip)".
-      " values($parent_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", $created, $created_ip)";
+    // We need to inherit other attributes from the parent group.
+    $attrs = ttGroupHelper::getGroupAttrs($parent_id);
+
+    $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.
+      ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
+      ', allow_ip, password_complexity, plugins, lock_spec'.
+      ', workday_minutes, config, created, created_ip, created_by)';
+
+    $values = " values ($parent_id, $org_id";
+    $values .= ', '.$mdb2->quote($name);
+    $values .= ', '.$mdb2->quote($description);
+    $values .= ', '.$mdb2->quote($attrs['currency']);
+    $values .= ', '.$mdb2->quote($attrs['decimal_mark']);
+    $values .= ', '.$mdb2->quote($attrs['lang']);
+    $values .= ', '.$mdb2->quote($attrs['date_format']);
+    $values .= ', '.$mdb2->quote($attrs['time_format']);
+    $values .= ', '.(int)$attrs['week_start'];
+    $values .= ', '.(int)$attrs['tracking_mode'];
+    $values .= ', '.(int)$attrs['project_required'];
+    $values .= ', '.(int)$attrs['task_required'];
+    $values .= ', '.(int)$attrs['record_type'];
+    $values .= ', '.$mdb2->quote($attrs['bcc_email']);
+    $values .= ', '.$mdb2->quote($attrs['allow_ip']);
+    $values .= ', '.$mdb2->quote($attrs['password_complexity']);
+    $values .= ', '.$mdb2->quote($attrs['plugins']);
+    $values .= ', '.$mdb2->quote($attrs['lock_spec']);
+    $values .= ', '.(int)$attrs['workday_minutes'];
+    $values .= ', '.$mdb2->quote($attrs['config']);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $values .= ')';
+
+    $sql = 'insert into tt_groups '.$columns.$values;
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-    // TODO: design subgroup roles carefully. Perhaps roles are not to be touched in subgroups at all.
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $subgroup_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+    // Copy roles from the parent group to child group.
+    if (!ttRoleHelper::copyRolesToGroup($subgroup_id))
+      return false;
+    
+    return $subgroup_id;
   }
 
   // markGroupDeleted marks a group and everything in it as deleted.
@@ -219,4 +253,21 @@ static function getGroupAttrs($group_id) {
     }
     return $val;
   }
+
+  // getRoles obtains all active and inactive roles in current group.
+  static function getRoles() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+    $sql =  "select * from tt_roles".
+      " where group_id = $group_id and org_id = $org_id and status is not null";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    while ($val = $res->fetchRow()) {
+      $roles[] = $val;
+    }
+    return $roles;
+  }
 }
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 2751756b7..53fe571a9 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -313,4 +313,29 @@ static function getRoleByRank_1_17_44($rank, $group_id) {
     }
     return false;
   }
+
+  // copyRoles copies roles from one group to another.
+  static function copyRolesToGroup($group_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $org_id = $user->org_id;
+    $columns = '(group_id, org_id, name, description, rank, rights, status)';
+    $roles = ttGroupHelper::getRoles(); // Roles in current on behalf group.
+
+    foreach ($roles as $role) {
+      $values = "values($group_id, $org_id".
+        ', '.$mdb2->quote($role['name']).
+        ', '.$mdb2->quote($role['description']).
+        ', '.(int)$role['rank'].
+        ', '.$mdb2->quote($role['rights']).
+        ', '.$mdb2->quote($role['status']).
+        ')';
+      $sql = "insert into tt_roles $columns $values";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+    }
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 425975da7..aa0be4dce 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.4505 | 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.4506 | 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>

From 5bb07193aba175a45ab558116aa8c0caeef02f15 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 13:48:00 +0000
Subject: [PATCH 0430/1848] Improved export by not writing empty elements.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 486 ++++++++++++----------
 WEB-INF/lib/ttRoleHelper.class.php        |   2 +-
 WEB-INF/templates/footer.tpl              |   2 +-
 3 files changed, 260 insertions(+), 230 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 9490f0757..41f773d73 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -211,116 +211,128 @@ function writeData() {
     unset($role_part);
 
     // Write tasks.
-    fwrite($this->file, $this->indentation."  <tasks>\n");
-    foreach ($tasks as $task) {
-      $task_part = $this->indentation.'    '."<task id=\"".$this->taskMap[$task['id']]."\"";
-      $task_part .= " name=\"".htmlspecialchars($task['name'])."\"";
-      $task_part .= " description=\"".htmlspecialchars($task['description'])."\"";
-      $task_part .= " status=\"".$task['status']."\"";
-      $task_part .= "></task>\n";
-      fwrite($this->file, $task_part);
+    if (count($tasks) > 0) {
+      fwrite($this->file, $this->indentation."  <tasks>\n");
+      foreach ($tasks as $task) {
+        $task_part = $this->indentation.'    '."<task id=\"".$this->taskMap[$task['id']]."\"";
+        $task_part .= " name=\"".htmlspecialchars($task['name'])."\"";
+        $task_part .= " description=\"".htmlspecialchars($task['description'])."\"";
+        $task_part .= " status=\"".$task['status']."\"";
+        $task_part .= "></task>\n";
+        fwrite($this->file, $task_part);
+      }
+      fwrite($this->file, $this->indentation."  </tasks>\n");
+      unset($tasks);
+      unset($task_part);
     }
-    fwrite($this->file, $this->indentation."  </tasks>\n");
-    unset($tasks);
-    unset($task_part);
 
     // Write projects.
-    fwrite($this->file, $this->indentation."  <projects>\n");
-    foreach ($projects as $project_item) {
-      $tasks_str = null;
-      if($project_item['tasks']){
-        $tasks = explode(',', $project_item['tasks']);
-        $tasks_mapped = array();
-        foreach ($tasks as $item)
-          $tasks_mapped[] = $this->taskMap[$item];
-        $tasks_str = implode(',', $tasks_mapped);
+    if (count($projects) > 0) {
+      fwrite($this->file, $this->indentation."  <projects>\n");
+      foreach ($projects as $project_item) {
+        $tasks_str = null;
+        if($project_item['tasks']){
+          $tasks = explode(',', $project_item['tasks']);
+          $tasks_mapped = array();
+          foreach ($tasks as $item)
+            $tasks_mapped[] = $this->taskMap[$item];
+          $tasks_str = implode(',', $tasks_mapped);
+        }
+        $project_part = $this->indentation.'    '."<project id=\"".$this->projectMap[$project_item['id']]."\"";
+        $project_part .= " name=\"".htmlspecialchars($project_item['name'])."\"";
+        $project_part .= " description=\"".htmlspecialchars($project_item['description'])."\"";
+        $project_part .= " tasks=\"".$tasks_str."\"";
+        $project_part .= " status=\"".$project_item['status']."\"";
+        $project_part .= "></project>\n";
+        fwrite($this->file, $project_part);
       }
-      $project_part = $this->indentation.'    '."<project id=\"".$this->projectMap[$project_item['id']]."\"";
-      $project_part .= " name=\"".htmlspecialchars($project_item['name'])."\"";
-      $project_part .= " description=\"".htmlspecialchars($project_item['description'])."\"";
-      $project_part .= " tasks=\"".$tasks_str."\"";
-      $project_part .= " status=\"".$project_item['status']."\"";
-      $project_part .= "></project>\n";
-      fwrite($this->file, $project_part);
+      fwrite($this->file, $this->indentation."  </projects>\n");
+      unset($projects);
+      unset($project_part);
     }
-    fwrite($this->file, $this->indentation."  </projects>\n");
-    unset($projects);
-    unset($project_part);
 
     // Write clients.
-    fwrite($this->file, $this->indentation."  <clients>\n");
-    foreach ($clients as $client_item) {
-      if($client_item['projects']){
-        $projects_db = explode(',', $client_item['projects']);
-        $projects_mapped = array();
-        foreach ($projects_db as $item)
-          $projects_mapped[] = $this->projectMap[$item];
-        $projects_str = implode(',', $projects_mapped);
+    if (count($clients) > 0) {
+      fwrite($this->file, $this->indentation."  <clients>\n");
+      foreach ($clients as $client_item) {
+        if($client_item['projects']){
+          $projects_db = explode(',', $client_item['projects']);
+          $projects_mapped = array();
+          foreach ($projects_db as $item)
+            $projects_mapped[] = $this->projectMap[$item];
+          $projects_str = implode(',', $projects_mapped);
+        }
+        $client_part = $this->indentation.'    '."<client id=\"".$this->clientMap[$client_item['id']]."\"";
+        $client_part .= " name=\"".htmlspecialchars($client_item['name'])."\"";
+        $client_part .= " address=\"".htmlspecialchars($client_item['address'])."\"";
+        $client_part .= " tax=\"".$client_item['tax']."\"";
+        $client_part .= " projects=\"".$projects_str."\"";
+        $client_part .= " status=\"".$client_item['status']."\"";
+        $client_part .= "></client>\n";
+        fwrite($this->file, $client_part);
       }
-      $client_part = $this->indentation.'    '."<client id=\"".$this->clientMap[$client_item['id']]."\"";
-      $client_part .= " name=\"".htmlspecialchars($client_item['name'])."\"";
-      $client_part .= " address=\"".htmlspecialchars($client_item['address'])."\"";
-      $client_part .= " tax=\"".$client_item['tax']."\"";
-      $client_part .= " projects=\"".$projects_str."\"";
-      $client_part .= " status=\"".$client_item['status']."\"";
-      $client_part .= "></client>\n";
-      fwrite($this->file, $client_part);
+      fwrite($this->file, $this->indentation."  </clients>\n");
+      unset($clients);
+      unset($client_part);
     }
-    fwrite($this->file, $this->indentation."  </clients>\n");
-    unset($clients);
-    unset($client_part);
 
     // Write users.
-    fwrite($this->file, $this->indentation."  <users>\n");
-    foreach ($users as $user_item) {
-      $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
-      $user_part = $this->indentation.'    '."<user id=\"".$this->userMap[$user_item['id']]."\"";
-      $user_part .= " name=\"".htmlspecialchars($user_item['name'])."\"";
-      $user_part .= " login=\"".htmlspecialchars($user_item['login'])."\"";
-      $user_part .= " password=\"".$user_item['password']."\"";
-      $user_part .= " role_id=\"".$role_id."\"";
-      $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
-      $user_part .= " rate=\"".$user_item['rate']."\"";
-      $user_part .= " email=\"".$user_item['email']."\"";
-      $user_part .= " status=\"".$user_item['status']."\"";
-      $user_part .= "></user>\n";
-      fwrite($this->file, $user_part);
+    if (count($users) > 0) {
+      fwrite($this->file, $this->indentation."  <users>\n");
+      foreach ($users as $user_item) {
+        $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
+        $user_part = $this->indentation.'    '."<user id=\"".$this->userMap[$user_item['id']]."\"";
+        $user_part .= " name=\"".htmlspecialchars($user_item['name'])."\"";
+        $user_part .= " login=\"".htmlspecialchars($user_item['login'])."\"";
+        $user_part .= " password=\"".$user_item['password']."\"";
+        $user_part .= " role_id=\"".$role_id."\"";
+        $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
+        $user_part .= " rate=\"".$user_item['rate']."\"";
+        $user_part .= " email=\"".$user_item['email']."\"";
+        $user_part .= " status=\"".$user_item['status']."\"";
+        $user_part .= "></user>\n";
+        fwrite($this->file, $user_part);
+      }
+      fwrite($this->file, $this->indentation."  </users>\n");
+      unset($users);
+      unset($user_part);
     }
-    fwrite($this->file, $this->indentation."  </users>\n");
-    unset($users);
-    unset($user_part);
 
     // Write user to project binds.
-    fwrite($this->file, $this->indentation."  <user_project_binds>\n");
     $user_binds = ttTeamHelper::getUserToProjectBinds($this->group_id);
-    foreach ($user_binds as $bind) {
-      $user_id = $this->userMap[$bind['user_id']];
-      $project_id = $this->projectMap[$bind['project_id']];
-      $bind_part = $this->indentation.'    '."<user_project_bind user_id=\"".$user_id."\"";
-      $bind_part .= " project_id=\"".$project_id."\"";
-      $bind_part .= " rate=\"".$bind['rate']."\"";
-      $bind_part .= " status=\"".$bind['status']."\"";
-      $bind_part .= "></user_project_bind>\n";
-      fwrite($this->file, $bind_part);
+    if (count($user_binds) > 0) {
+      fwrite($this->file, $this->indentation."  <user_project_binds>\n");
+      foreach ($user_binds as $bind) {
+        $user_id = $this->userMap[$bind['user_id']];
+        $project_id = $this->projectMap[$bind['project_id']];
+        $bind_part = $this->indentation.'    '."<user_project_bind user_id=\"".$user_id."\"";
+        $bind_part .= " project_id=\"".$project_id."\"";
+        $bind_part .= " rate=\"".$bind['rate']."\"";
+        $bind_part .= " status=\"".$bind['status']."\"";
+        $bind_part .= "></user_project_bind>\n";
+        fwrite($this->file, $bind_part);
+      }
+      fwrite($this->file, $this->indentation."  </user_project_binds>\n");
+      unset($user_binds);
+      unset($bind_part);
     }
-    fwrite($this->file, $this->indentation."  </user_project_binds>\n");
-    unset($user_binds);
-    unset($bind_part);
 
     // Write invoices.
-    fwrite($this->file, $this->indentation."  <invoices>\n");
-    foreach ($invoices as $invoice_item) {
-      $invoice_part = $this->indentation.'    '."<invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\"";
-      $invoice_part .= " name=\"".htmlspecialchars($invoice_item['name'])."\"";
-      $invoice_part .= " date=\"".$invoice_item['date']."\"";
-      $invoice_part .= " client_id=\"".$this->clientMap[$invoice_item['client_id']]."\"";
-      $invoice_part .= " status=\"".$invoice_item['status']."\"";
-      $invoice_part .= "></invoice>\n";
-      fwrite($this->file, $invoice_part);
+    if (count($invoices) > 0) {
+      fwrite($this->file, $this->indentation."  <invoices>\n");
+      foreach ($invoices as $invoice_item) {
+        $invoice_part = $this->indentation.'    '."<invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\"";
+        $invoice_part .= " name=\"".htmlspecialchars($invoice_item['name'])."\"";
+        $invoice_part .= " date=\"".$invoice_item['date']."\"";
+        $invoice_part .= " client_id=\"".$this->clientMap[$invoice_item['client_id']]."\"";
+        $invoice_part .= " status=\"".$invoice_item['status']."\"";
+        $invoice_part .= "></invoice>\n";
+        fwrite($this->file, $invoice_part);
+      }
+      fwrite($this->file, $this->indentation."  </invoices>\n");
+      unset($invoices);
+      unset($invoice_part);
     }
-    fwrite($this->file, $this->indentation."  </invoices>\n");
-    unset($invoices);
-    unset($invoice_part);
 
     // Write time log entries and build logMap at the same time.
     fwrite($this->file, $this->indentation."  <log>\n");
@@ -354,176 +366,194 @@ function writeData() {
     unset($log_part);
 
     // Write custom fields.
-    fwrite($this->file, $this->indentation."  <custom_fields>\n");
-    foreach ($custom_fields as $custom_field) {
-      $custom_field_part = $this->indentation.'    '."<custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\"";
-      $custom_field_part .= " type=\"".$custom_field['type']."\"";
-      $custom_field_part .= " label=\"".htmlspecialchars($custom_field['label'])."\"";
-      $custom_field_part .= " required=\"".$custom_field['required']."\"";
-      $custom_field_part .= " status=\"".$custom_field['status']."\"";
-      $custom_field_part .= "></custom_field>\n";
-      fwrite($this->file, $custom_field_part);
+    if (count($custom_fields) > 0) {
+      fwrite($this->file, $this->indentation."  <custom_fields>\n");
+      foreach ($custom_fields as $custom_field) {
+        $custom_field_part = $this->indentation.'    '."<custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\"";
+        $custom_field_part .= " type=\"".$custom_field['type']."\"";
+        $custom_field_part .= " label=\"".htmlspecialchars($custom_field['label'])."\"";
+        $custom_field_part .= " required=\"".$custom_field['required']."\"";
+        $custom_field_part .= " status=\"".$custom_field['status']."\"";
+        $custom_field_part .= "></custom_field>\n";
+        fwrite($this->file, $custom_field_part);
+      }
+      fwrite($this->file, $this->indentation."  </custom_fields>\n");
+      unset($custom_fields);
+      unset($custom_field_part);
     }
-    fwrite($this->file, $this->indentation."  </custom_fields>\n");
-    unset($custom_fields);
-    unset($custom_field_part);
 
     // Write custom field options.
-    fwrite($this->file, $this->indentation."  <custom_field_options>\n");
-    foreach ($custom_field_options as $option) {
-      $custom_field_option_part = $this->indentation.'    '."<custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\"";
-      $custom_field_option_part .= " field_id=\"".$this->customFieldMap[$option['field_id']]."\"";
-      $custom_field_option_part .= " value=\"".htmlspecialchars($option['value'])."\"";
-      $custom_field_option_part .= "></custom_field_option>\n";
-      fwrite($this->file, $custom_field_option_part);
+    if (count($custom_field_options) > 0) {
+      fwrite($this->file, $this->indentation."  <custom_field_options>\n");
+      foreach ($custom_field_options as $option) {
+        $custom_field_option_part = $this->indentation.'    '."<custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\"";
+        $custom_field_option_part .= " field_id=\"".$this->customFieldMap[$option['field_id']]."\"";
+        $custom_field_option_part .= " value=\"".htmlspecialchars($option['value'])."\"";
+        $custom_field_option_part .= "></custom_field_option>\n";
+        fwrite($this->file, $custom_field_option_part);
+      }
+      fwrite($this->file, $this->indentation."  </custom_field_options>\n");
+      unset($custom_field_options);
+      unset($custom_field_option_part);
     }
-    fwrite($this->file, $this->indentation."  </custom_field_options>\n");
-    unset($custom_field_options);
-    unset($custom_field_option_part);
 
     // Write custom field log.
     $custom_field_log = ttTeamHelper::getCustomFieldLog($this->group_id);
-    fwrite($this->file, $this->indentation."  <custom_field_log>\n");
-    foreach ($custom_field_log as $entry) {
-      $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
-      $custom_field_log_part .= " field_id=\"".$this->customFieldMap[$entry['field_id']]."\"";
-      $custom_field_log_part .= " option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\"";
-      $custom_field_log_part .= " value=\"".htmlspecialchars($entry['value'])."\"";
-      $custom_field_log_part .= " status=\"".$entry['status']."\"";
-      $custom_field_log_part .= "></custom_field_log_entry>\n";
-      fwrite($this->file, $custom_field_log_part);
+    if (count($custom_field_log) > 0) {
+      fwrite($this->file, $this->indentation."  <custom_field_log>\n");
+      foreach ($custom_field_log as $entry) {
+        $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
+        $custom_field_log_part .= " field_id=\"".$this->customFieldMap[$entry['field_id']]."\"";
+        $custom_field_log_part .= " option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\"";
+        $custom_field_log_part .= " value=\"".htmlspecialchars($entry['value'])."\"";
+        $custom_field_log_part .= " status=\"".$entry['status']."\"";
+        $custom_field_log_part .= "></custom_field_log_entry>\n";
+        fwrite($this->file, $custom_field_log_part);
+      }
+      fwrite($this->file, $this->indentation."  </custom_field_log>\n");
+      unset($custom_field_log);
+      unset($custom_field_log_part);
     }
-    fwrite($this->file, $this->indentation."  </custom_field_log>\n");
-    unset($custom_field_log);
-    unset($custom_field_log_part);
 
     // Write expense items.
     $expense_items = ttTeamHelper::getExpenseItems($this->group_id);
-    fwrite($this->file, $this->indentation."  <expense_items>\n");
-    foreach ($expense_items as $expense_item) {
-      $expense_item_part = $this->indentation.'    '."<expense_item date=\"".$expense_item['date']."\"";
-      $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
-      $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
-      $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
-      $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
-      $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
-      $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
-      $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
-      $expense_item_part .= " status=\"".$expense_item['status']."\"";
-      $expense_item_part .= "></expense_item>\n";
-      fwrite($this->file, $expense_item_part);
+    if (count($expense_items) > 0) {
+      fwrite($this->file, $this->indentation."  <expense_items>\n");
+      foreach ($expense_items as $expense_item) {
+        $expense_item_part = $this->indentation.'    '."<expense_item date=\"".$expense_item['date']."\"";
+        $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
+        $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
+        $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
+        $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
+        $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
+        $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
+        $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
+        $expense_item_part .= " status=\"".$expense_item['status']."\"";
+        $expense_item_part .= "></expense_item>\n";
+        fwrite($this->file, $expense_item_part);
+      }
+      fwrite($this->file, $this->indentation."  </expense_items>\n");
+      unset($expense_items);
+      unset($expense_item_part);
     }
-    fwrite($this->file, $this->indentation."  </expense_items>\n");
-    unset($expense_items);
-    unset($expense_item_part);
 
     // Write predefined expenses.
     $predefined_expenses = $this->getRecordsFromTable('tt_predefined_expenses');
-    fwrite($this->file, $this->indentation."  <predefined_expenses>\n");
-    foreach ($predefined_expenses as $predefined_expense) {
-      $predefined_expense_part = $this->indentation.'    '."<predefined_expense name=\"".htmlspecialchars($predefined_expense['name'])."\"";
-      $predefined_expense_part .= " cost=\"".$predefined_expense['cost']."\"";
-      $predefined_expense_part .= "></predefined_expense>\n";
-      fwrite($this->file, $predefined_expense_part);
+    if (count($predefined_expenses) > 0) {
+      fwrite($this->file, $this->indentation."  <predefined_expenses>\n");
+      foreach ($predefined_expenses as $predefined_expense) {
+        $predefined_expense_part = $this->indentation.'    '."<predefined_expense name=\"".htmlspecialchars($predefined_expense['name'])."\"";
+        $predefined_expense_part .= " cost=\"".$predefined_expense['cost']."\"";
+        $predefined_expense_part .= "></predefined_expense>\n";
+        fwrite($this->file, $predefined_expense_part);
+      }
+      fwrite($this->file, $this->indentation."  </predefined_expenses>\n");
+      unset($predefined_expenses);
+      unset($predefined_expense_part);
     }
-    fwrite($this->file, $this->indentation."  </predefined_expenses>\n");
-    unset($predefined_expenses);
-    unset($predefined_expense_part);
 
     // Write monthly quotas.
     $quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
-    fwrite($this->file, $this->indentation."  <monthly_quotas>\n");
-    foreach ($quotas as $quota) {
-      $quota_part = $this->indentation.'    '."<monthly_quota year=\"".$quota['year']."\"";
-      $quota_part .= " month=\"".$quota['month']."\"";
-      $quota_part .= " minutes=\"".$quota['minutes']."\"";
-      $quota_part .= "></monthly_quota>\n";
-      fwrite($this->file, $quota_part);
+    if (count($quotas) > 0) {
+      fwrite($this->file, $this->indentation."  <monthly_quotas>\n");
+      foreach ($quotas as $quota) {
+        $quota_part = $this->indentation.'    '."<monthly_quota year=\"".$quota['year']."\"";
+        $quota_part .= " month=\"".$quota['month']."\"";
+        $quota_part .= " minutes=\"".$quota['minutes']."\"";
+        $quota_part .= "></monthly_quota>\n";
+        fwrite($this->file, $quota_part);
+      }
+      fwrite($this->file, $this->indentation."  </monthly_quotas>\n");
+      unset($quotas);
+      unset($quota_part);
     }
-    fwrite($this->file, $this->indentation."  </monthly_quotas>\n");
-    unset($quotas);
-    unset($quota_part);
 
     // Write fav reports.
-    fwrite($this->file, $this->indentation."  <fav_reports>\n");
-    foreach ($fav_reports as $fav_report) {
-      $user_list = '';
-      if (strlen($fav_report['users']) > 0) {
-        $arr = explode(',', $fav_report['users']);
-        foreach ($arr as $k=>$v) {
-          if (array_key_exists($arr[$k], $this->userMap))
-            $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
+    if (count($fav_reports) > 0) {
+      fwrite($this->file, $this->indentation."  <fav_reports>\n");
+      foreach ($fav_reports as $fav_report) {
+        $user_list = '';
+        if (strlen($fav_report['users']) > 0) {
+          $arr = explode(',', $fav_report['users']);
+          foreach ($arr as $k=>$v) {
+            if (array_key_exists($arr[$k], $this->userMap))
+              $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
+          }
         }
+        $fav_report_part = $this->indentation.'    '."<fav_report id=\"".$this->favReportMap[$fav_report['id']]."\"";
+        $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
+        $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\"";
+        $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
+        $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"";
+        $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
+        $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
+        $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
+        $fav_report_part .= " users=\"".$user_list."\"";
+        $fav_report_part .= " period=\"".$fav_report['period']."\"";
+        $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
+        $fav_report_part .= " period_end=\"".$fav_report['period_end']."\"";
+        $fav_report_part .= " show_client=\"".$fav_report['show_client']."\"";
+        $fav_report_part .= " show_invoice=\"".$fav_report['show_invoice']."\"";
+        $fav_report_part .= " show_paid=\"".$fav_report['show_paid']."\"";
+        $fav_report_part .= " show_ip=\"".$fav_report['show_ip']."\"";
+        $fav_report_part .= " show_project=\"".$fav_report['show_project']."\"";
+        $fav_report_part .= " show_start=\"".$fav_report['show_start']."\"";
+        $fav_report_part .= " show_duration=\"".$fav_report['show_duration']."\"";
+        $fav_report_part .= " show_cost=\"".$fav_report['show_cost']."\"";
+        $fav_report_part .= " show_task=\"".$fav_report['show_task']."\"";
+        $fav_report_part .= " show_end=\"".$fav_report['show_end']."\"";
+        $fav_report_part .= " show_note=\"".$fav_report['show_note']."\"";
+        $fav_report_part .= " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"";
+        $fav_report_part .= " show_work_units=\"".$fav_report['show_work_units']."\"";
+        $fav_report_part .= " group_by1=\"".$fav_report['group_by1']."\"";
+        $fav_report_part .= " group_by2=\"".$fav_report['group_by2']."\"";
+        $fav_report_part .= " group_by3=\"".$fav_report['group_by3']."\"";
+        $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
+        $fav_report_part .= "></fav_report>\n";
+        fwrite($this->file, $fav_report_part);
       }
-      $fav_report_part = $this->indentation.'    '."<fav_report id=\"".$this->favReportMap[$fav_report['id']]."\"";
-      $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
-      $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\"";
-      $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
-      $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"";
-      $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
-      $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
-      $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
-      $fav_report_part .= " users=\"".$user_list."\"";
-      $fav_report_part .= " period=\"".$fav_report['period']."\"";
-      $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
-      $fav_report_part .= " period_end=\"".$fav_report['period_end']."\"";
-      $fav_report_part .= " show_client=\"".$fav_report['show_client']."\"";
-      $fav_report_part .= " show_invoice=\"".$fav_report['show_invoice']."\"";
-      $fav_report_part .= " show_paid=\"".$fav_report['show_paid']."\"";
-      $fav_report_part .= " show_ip=\"".$fav_report['show_ip']."\"";
-      $fav_report_part .= " show_project=\"".$fav_report['show_project']."\"";
-      $fav_report_part .= " show_start=\"".$fav_report['show_start']."\"";
-      $fav_report_part .= " show_duration=\"".$fav_report['show_duration']."\"";
-      $fav_report_part .= " show_cost=\"".$fav_report['show_cost']."\"";
-      $fav_report_part .= " show_task=\"".$fav_report['show_task']."\"";
-      $fav_report_part .= " show_end=\"".$fav_report['show_end']."\"";
-      $fav_report_part .= " show_note=\"".$fav_report['show_note']."\"";
-      $fav_report_part .= " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"";
-      $fav_report_part .= " show_work_units=\"".$fav_report['show_work_units']."\"";
-      $fav_report_part .= " group_by1=\"".$fav_report['group_by1']."\"";
-      $fav_report_part .= " group_by2=\"".$fav_report['group_by2']."\"";
-      $fav_report_part .= " group_by3=\"".$fav_report['group_by3']."\"";
-      $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
-      $fav_report_part .= "></fav_report>\n";
-      fwrite($this->file, $fav_report_part);
+      fwrite($this->file, $this->indentation."  </fav_reports>\n");
+      unset($fav_reports);
+      unset($fav_report_part);
     }
-    fwrite($this->file, $this->indentation."  </fav_reports>\n");
-    unset($fav_reports);
-    unset($fav_report_part);
 
     // Write notifications.
     $notifications = $this->getRecordsFromTable('tt_cron');
-    fwrite($this->file, $this->indentation."  <notifications>\n");
-    foreach ($notifications as $notification) {
-      $notification_part = $this->indentation.'    '."<notification cron_spec=\"".$notification['cron_spec']."\"";
-      $notification_part .= " last=\"".$notification['last']."\"";
-      $notification_part .= " next=\"".$notification['next']."\"";
-      $notification_part .= " report_id=\"".$this->favReportMap[$notification['report_id']]."\"";
-      $notification_part .= " email=\"".htmlspecialchars($notification['email'])."\"";
-      $notification_part .= " cc=\"".htmlspecialchars($notification['cc'])."\"";
-      $notification_part .= " subject=\"".htmlspecialchars($notification['subject'])."\"";
-      $notification_part .= " report_condition=\"".htmlspecialchars($notification['report_condition'])."\"";
-      $notification_part .= " status=\"".$notification['status']."\"";
-      $notification_part .= "></notification>\n";
-      fwrite($this->file, $notification_part);
+    if (count($notifications) > 0) {
+      fwrite($this->file, $this->indentation."  <notifications>\n");
+      foreach ($notifications as $notification) {
+        $notification_part = $this->indentation.'    '."<notification cron_spec=\"".$notification['cron_spec']."\"";
+        $notification_part .= " last=\"".$notification['last']."\"";
+        $notification_part .= " next=\"".$notification['next']."\"";
+        $notification_part .= " report_id=\"".$this->favReportMap[$notification['report_id']]."\"";
+        $notification_part .= " email=\"".htmlspecialchars($notification['email'])."\"";
+        $notification_part .= " cc=\"".htmlspecialchars($notification['cc'])."\"";
+        $notification_part .= " subject=\"".htmlspecialchars($notification['subject'])."\"";
+        $notification_part .= " report_condition=\"".htmlspecialchars($notification['report_condition'])."\"";
+        $notification_part .= " status=\"".$notification['status']."\"";
+        $notification_part .= "></notification>\n";
+        fwrite($this->file, $notification_part);
+      }
+      fwrite($this->file, $this->indentation."  </notifications>\n");
+      unset($notifications);
+      unset($notification_part);
     }
-    fwrite($this->file, $this->indentation."  </notifications>\n");
-    unset($notifications);
-    unset($notification_part);
 
     // Write user config parameters.
     $user_params = $this->getRecordsFromTable('tt_config');
-    fwrite($this->file, $this->indentation."  <user_params>\n");
-    foreach ($user_params as $user_param) {
-      $user_param_part = $this->indentation.'    '."<user_param user_id=\"".$this->userMap[$user_param['user_id']]."\"";
-      $user_param_part .= " param_name=\"".htmlspecialchars($user_param['param_name'])."\"";
-      $user_param_part .= " param_value=\"".htmlspecialchars($user_param['param_value'])."\"";
-      $user_param_part .= "></user_param>\n";
-      fwrite($this->file, $user_param_part);
+    if (count($user_params) > 0) {
+      fwrite($this->file, $this->indentation."  <user_params>\n");
+      foreach ($user_params as $user_param) {
+        $user_param_part = $this->indentation.'    '."<user_param user_id=\"".$this->userMap[$user_param['user_id']]."\"";
+        $user_param_part .= " param_name=\"".htmlspecialchars($user_param['param_name'])."\"";
+        $user_param_part .= " param_value=\"".htmlspecialchars($user_param['param_value'])."\"";
+        $user_param_part .= "></user_param>\n";
+        fwrite($this->file, $user_param_part);
+      }
+      fwrite($this->file, $this->indentation."  </user_params>\n");
+      unset($user_params);
+      unset($user_param_part);
     }
-    fwrite($this->file, $this->indentation."  </user_params>\n");
-    unset($user_params);
-    unset($user_param_part);
 
     // We are mostly done with writing this group data, destroy all maps.
     unset($this->roleMap);
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 53fe571a9..fc9a4c13c 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -314,7 +314,7 @@ static function getRoleByRank_1_17_44($rank, $group_id) {
     return false;
   }
 
-  // copyRoles copies roles from one group to another.
+  // copyRolesToGroup copies roles from current on behalf group to another.
   static function copyRolesToGroup($group_id) {
     global $user;
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aa0be4dce..a154b7def 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.4506 | 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.4507 | 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>

From f05a2db179417c20c7d841f0363bca4988c8a2ca Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 15:29:14 +0000
Subject: [PATCH 0431/1848] Fixed import-export for correct associations in
 custom field log.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 30 ++++++++++++
 WEB-INF/lib/ttOrgImportHelper.class.php   | 57 ++++++++++++++++++++---
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 41f773d73..4ce8eed65 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -335,6 +335,35 @@ function writeData() {
     }
 
     // Write time log entries and build logMap at the same time.
+    $records = $this->getRecordsFromTable('tt_log');
+    if (count($records) > 0) {
+      fwrite($this->file, $this->indentation."  <log>\n");
+      $key = 0;
+      foreach ($records as $record) {
+        $key++;
+        $this->logMap[$record['id']] = $key;
+        $log_part = $this->indentation.'    '."<log_item id=\"$key\"";
+        $log_part .= " user_id=\"".$this->userMap[$record['user_id']]."\"";
+        $log_part .= " date=\"".$record['date']."\"";
+        $log_part .= " start=\"".$record['start']."\"";
+        $log_part .= " duration=\"".$record['duration']."\"";
+        $log_part .= " client_id=\"".$this->clientMap[$record['client_id']]."\"";
+        $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\"";
+        $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
+        $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
+        $log_part .= " comment=\"".htmlspecialchars($record['comment'])."\"";
+        $log_part .= " billable=\"".$record['billable']."\"";
+        $log_part .= " paid=\"".$record['paid']."\"";
+        $log_part .= " status=\"".$record['status']."\"";
+        $log_part .= "></log_item>\n";
+        fwrite($this->file, $log_part);
+      }
+      fwrite($this->file, $this->indentation."  </log>\n");
+      unset($records);
+      unset($log_part);
+    }
+
+    /*
     fwrite($this->file, $this->indentation."  <log>\n");
     $key = 0;
     foreach ($this->userMap as $key => $value) {
@@ -364,6 +393,7 @@ function writeData() {
     fwrite($this->file, $this->indentation."  </log>\n");
     unset($records);
     unset($log_part);
+    */
 
     // Write custom fields.
     if (count($custom_fields) > 0) {
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 30b9a09da..1bfa07c72 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -331,7 +331,7 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'LOG_ITEM') {
         // We get here when processing <log_item> tags for the current group.
-        $log_item_id = ttTimeHelper::insert(array(
+        $log_item_id = $this->insertLogEntry(array(
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
@@ -339,11 +339,11 @@ function startElement($parser, $name, $attrs) {
           'start' => $attrs['START'],
           'finish' => $attrs['FINISH'],
           'duration' => $attrs['DURATION'],
-          'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
-          'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
-          'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
-          'invoice' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
-          'note' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
+          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'task_id' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
+          'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+          'comment' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
           'billable' => $attrs['BILLABLE'],
           'paid' => $attrs['PAID'],
           'status' => $attrs['STATUS']));
@@ -980,6 +980,51 @@ private function insertCustomFieldOption($fields) {
     return $last_id;
   }
 
+  // insertLogEntry - a helper function to insert a time log entry.
+  private function insertLogEntry($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $user_id = (int) $fields['user_id'];
+    $date = $fields['date'];
+    $start = $fields['start'];
+    $duration = $fields['duration'];
+    $client_id = $fields['client_id'];
+    $project_id = $fields['project_id'];
+    $task_id = $fields['task_id'];
+    $invoice_id = $fields['invoice_id'];
+    $comment = $fields['comment'];
+    $billable = (int) $fields['billable'];
+    $paid = (int) $fields['paid'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_log".
+      " (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment".
+      ", billable, paid, created, created_ip, created_by, status)".
+      " values ($user_id, $group_id, $org_id".
+      ", ".$mdb2->quote($date).
+      ", ".$mdb2->quote($start).
+      ", ".$mdb2->quote($duration).
+      ", ".$mdb2->quote($client_id).
+      ", ".$mdb2->quote($project_id).
+      ", ".$mdb2->quote($task_id).
+      ", ".$mdb2->quote($invoice_id).
+      ", ".$mdb2->quote($comment).
+      ", $billable, $paid".
+      ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$mdb2->quote($user->id).
+      ", ". $mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->errors->add($i18n->get('error.db')); // TODO: review whether or not to add error here in all insert calls.
+      return false;
+    }
+
+    $log_id = $mdb2->lastInsertID('tt_log', 'id');
+    return $log_id;
+  }
+
   // insertCustomFieldLogEntry - a helper function to insert a custom field log entry.
   private function insertCustomFieldLogEntry($fields) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a154b7def..9757471dd 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.4507 | 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.28.4508 | 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>

From a2c6a874b43c46bd110fc8f6d5faf9796e931d8d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 15:32:41 +0000
Subject: [PATCH 0432/1848] Removed commented out code.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 32 -----------------------
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 4ce8eed65..d2ee6413d 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -363,38 +363,6 @@ function writeData() {
       unset($log_part);
     }
 
-    /*
-    fwrite($this->file, $this->indentation."  <log>\n");
-    $key = 0;
-    foreach ($this->userMap as $key => $value) {
-      $user_id = $key;
-      $records = ttTimeHelper::getAllRecords($user_id);
-      foreach ($records as $record) {
-        $key++;
-        $this->logMap[$record['id']] = $key;
-        $log_part = $this->indentation.'    '."<log_item id=\"$key\"";
-        $log_part .= " user_id=\"".$this->userMap[$record['user_id']]."\"";
-        $log_part .= " date=\"".$record['date']."\"";
-        $log_part .= " start=\"".$record['start']."\"";
-        $log_part .= " finish=\"".$record['finish']."\"";
-        $log_part .= " duration=\"".($record['start']?"":$record['duration'])."\"";
-        $log_part .= " client_id=\"".$this->clientMap[$record['client_id']]."\"";
-        $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\"";
-        $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
-        $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
-        $log_part .= " comment=\"".htmlspecialchars($record['comment'])."\"";
-        $log_part .= " billable=\"".$record['billable']."\"";
-        $log_part .= " paid=\"".$record['paid']."\"";
-        $log_part .= " status=\"".$record['status']."\"";
-        $log_part .= "></log_item>\n";
-        fwrite($this->file, $log_part);
-      }
-    }
-    fwrite($this->file, $this->indentation."  </log>\n");
-    unset($records);
-    unset($log_part);
-    */
-
     // Write custom fields.
     if (count($custom_fields) > 0) {
       fwrite($this->file, $this->indentation."  <custom_fields>\n");
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9757471dd..25340ba9d 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.28.4508 | 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.28.4509 | 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>

From 1a6b352052d17eff5027ff20fe4f204f08893ec3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 16:35:52 +0000
Subject: [PATCH 0433/1848] Refactored import by recycling all maps in the
 group element handler.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 91 ++++---------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 13 insertions(+), 80 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 1bfa07c72..ec5593c24 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -137,14 +137,19 @@ function startElement($parser, $name, $attrs) {
         }
         // Add self to parent stack.
         array_push($this->parents, $this->current_group_id);
-        return;
-      }
 
-      if ($name == 'ROLES') {
-        // If we get here, we have to recycle $currentGroupRoleMap.
-        unset($this->currentGroupRoleMap);
-        $this->currentGroupRoleMap = array();
-        // Role map is reconstructed after processing <role> elements in XML. See below.
+        // Recycle all maps as we are starting to work on new group.
+        // Note that for this to work properly all nested groups must be last entries in xml for each group.
+        unset($this->currentGroupRoleMap); $this->currentGroupRoleMap = array();
+        unset($this->currentGroupTaskMap); $this->currentGroupTaskMap = array();
+        unset($this->currentGroupProjectMap); $this->currentGroupProjectMap = array();
+        unset($this->currentGroupClientMap); $this->currentGroupClientMap = array();
+        unset($this->currentGroupUserMap); $this->currentGroupUserMap = array();
+        unset($this->currentGroupInvoiceMap); $this->currentGroupInvoiceMap = array();
+        unset($this->currentGroupLogMap); $this->currentGroupLogMap = array();
+        unset($this->currentGroupCustomFieldMap); $this->currentGroupCustomFieldMap = array();
+        unset($this->currentGroupCustomFieldOptionMap); $this->currentGroupCustomFieldOptionMap = array();
+        unset($this->currentGroupFavReportMap); $this->currentGroupCustomFavReportMap = array();
         return;
       }
 
@@ -165,14 +170,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'TASKS') {
-        // If we get here, we have to recycle $currentGroupTaskMap.
-        unset($this->currentGroupTaskMap);
-        $this->currentGroupTaskMap = array();
-        // Task map is reconstructed after processing <task> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'TASK') {
         // We get here when processing <task> tags for the current group.
         $task_id = ttTaskHelper::insert(array(
@@ -188,14 +185,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'PROJECTS') {
-        // If we get here, we have to recycle $currentGroupProjectMap.
-        unset($this->currentGroupProjectMap);
-        $this->currentGroupProjectMap = array();
-        // Project map is reconstructed after processing <project> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'PROJECT') {
         // We get here when processing <project> tags for the current group.
 
@@ -220,14 +209,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'CLIENTS') {
-        // If we get here, we have to recycle $currentGroupClientMap.
-        unset($this->currentGroupClientMap);
-        $this->currentGroupClientMap = array();
-        // Client map is reconstructed after processing <client> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'CLIENT') {
         // We get here when processing <client> tags for the current group.
 
@@ -253,14 +234,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'USERS') {
-        // If we get here, we have to recycle $currentGroupUserMap.
-        unset($this->currentGroupUserMap);
-        $this->currentGroupUserMap = array();
-        // User map is reconstructed after processing <user> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'USER') {
         // We get here when processing <user> tags for the current group.
 
@@ -297,14 +270,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'INVOICES') {
-        // If we get here, we have to recycle $currentGroupInvoiceMap.
-        unset($this->currentGroupInvoiceMap);
-        $this->currentGroupInvoiceMap = array();
-        // Invoice map is reconstructed after processing <invoice> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'INVOICE') {
         // We get here when processing <invoice> tags for the current group.
         $invoice_id = ttInvoiceHelper::insert(array(
@@ -321,14 +286,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'LOG') {
-        // If we get here, we have to recycle $currentGroupLogMap.
-        unset($this->currentGroupLogMap);
-        $this->currentGroupLogMap = array();
-        // Log map is reconstructed after processing <log_item> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'LOG_ITEM') {
         // We get here when processing <log_item> tags for the current group.
         $log_item_id = $this->insertLogEntry(array(
@@ -354,14 +311,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'CUSTOM_FIELDS') {
-        // If we get here, we have to recycle $currentGroupCustomFieldMap.
-        unset($this->currentGroupCustomFieldMap);
-        $this->currentGroupCustomFieldMap = array();
-        // Custom field map is reconstructed after processing <custom_field> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'CUSTOM_FIELD') {
         // We get here when processing <custom_field> tags for the current group.
         $custom_field_id = $this->insertCustomField(array(
@@ -378,14 +327,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'CUSTOM_FIELD_OPTIONS') {
-        // If we get here, we have to recycle $currentGroupCustomFieldOptionMap.
-        unset($this->currentGroupCustomFieldOptionMap);
-        $this->currentGroupCustomFieldOptionMap = array();
-        // Custom field option map is reconstructed after processing <custom_field_option> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'CUSTOM_FIELD_OPTION') {
         // We get here when processing <custom_field_option> tags for the current group.
         $custom_field_option_id = $this->insertCustomFieldOption(array(
@@ -456,14 +397,6 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
-      if ($name == 'FAV_REPORTS') {
-        // If we get here, we have to recycle $currentGroupFavReportMap.
-        unset($this->currentGroupFavReportMap);
-        $this->currentGroupFavReportMap = array();
-        // Favorite report map is reconstructed after processing <fav_report> elements in XML. See below.
-        return;
-      }
-
       if ($name == 'FAV_REPORT') {
         $user_list = '';
         if (strlen($attrs['USERS']) > 0) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 25340ba9d..c4db5512a 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.28.4509 | 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.28.4510 | 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>

From 1a1ae10cf832a697192fc5e1e84debe930ce3c9f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 17:26:05 +0000
Subject: [PATCH 0434/1848] Improved population of group dropdown to include
 the entire stack of groups.

---
 WEB-INF/lib/ttUser.class.php | 72 +++++++++++++++++++-----------------
 WEB-INF/templates/footer.tpl |  2 +-
 groups.php                   |  2 +-
 time.php                     |  2 +-
 4 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e50d9a3ea..859d08817 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -366,47 +366,51 @@ function getUsers($options) {
     return $user_list;
   }
 
-  // getGroups obtains an array consisting of:
-  // - A parent group (..) of a currently selected group, if available.
-  // - A currently selected group (.) represented by $behalf_group_id.
-  // - All subgroups (only immediate children) of a currently selected group.
-  function getGroups() {
+  // getGroupsForDropdown obtains an array of groups to populate "Group" dropdown.
+  // It consists of:
+  //   - User home group.
+  //   - The entire stack of groups all the way down to current on behalf group.
+  //   - All immediate children of the current on behalf group.
+  // This allows user to navigate easily to home group, anything in between, and 1 level below.
+  function getGroupsForDropdown() {
     $mdb2 = getConnection();
 
+    // Start with subgroups.
+    $groups = array();
+    $group_id = $this->getActiveGroup();
+    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $groups[] = $val;
+      }
+    }
+
+    // Add current on behalf group to the beginning of array.
     $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
     $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
+    array_unshift($groups,  array('id'=>$selected_group_id,'name'=>$selected_group_name));
 
-    // Start with parent group.
-    if ($selected_group_id != $this->group_id) {
-      // We are in one of subgroups, and a parent exists.
-      // Get parent group info.
-      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id and status = 1";
+    // Iterate all the way to the home group, starting with selected ("on behalf") group.
+    $current_group_id = $selected_group_id;
+    while ($current_group_id != $this->group_id) {
+      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $current_group_id and status = 1";
       $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        $val = $res->fetchRow();
-        $parent_id = $val['parent_id'];
-        if ($parent_id) {
-          // Get parent group name.
-          $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
-          $res = $mdb2->query($sql);
-          if (!is_a($res, 'PEAR_Error')) {
-            $val = $res->fetchRow();
-            $groups[] = array('id'=>$parent_id,'name'=>$val['name']);
-          }
-        }
-      }
-    }
-
-    // Add current group.
-    $groups[] = array('id'=>$selected_group_id,'name'=>$selected_group_name);
+      if (is_a($res, 'PEAR_Error')) return false;
 
-    // Add subgroups.
-    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id and status = 1";
-    //die($sql);
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $groups[] = $val;
+      $val = $res->fetchRow();
+      $parent_id = $val['parent_id'];
+      if ($parent_id) {
+        // Get parent group name.
+        $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
+        $res = $mdb2->query($sql);
+        if (is_a($res, 'PEAR_Error')) return false;
+        $val = $res->fetchRow();
+        if (!$val) return false;
+        array_unshift($groups, array('id'=>$parent_id,'name'=>$val['name']));
+        $current_group_id = $parent_id;
+      } else {
+        return false;
       }
     }
     return $groups;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c4db5512a..5c42acc73 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.28.4510 | 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.28.4511 | 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/groups.php b/groups.php
index 172dd3298..6c35bfb30 100644
--- a/groups.php
+++ b/groups.php
@@ -49,7 +49,7 @@
 }
 
 $form = new Form('subgroupsForm');
-$groups = $user->getGroups();
+$groups = $user->getGroupsForDropdown();
 if (count($groups) > 1) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',
diff --git a/time.php b/time.php
index 9e6be9a8f..c7d2979cd 100644
--- a/time.php
+++ b/time.php
@@ -109,7 +109,7 @@
 
 if (isTrue(SUBGROUP_DEBUG)) {
 if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroups();
+  $groups = $user->getGroupsForDropdown();
   if (count($groups) > 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',

From 2908e17af44b65d6a97e299edd03293ddd802802 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 21:20:27 +0000
Subject: [PATCH 0435/1848] Initial coding of group editor done.

---
 WEB-INF/lib/ttRoleHelper.class.php |  9 +++++++--
 WEB-INF/lib/ttTeamHelper.class.php | 10 ++++++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/group_edit.tpl   | 18 +++++++++---------
 group_edit.php                     | 28 ++++++++++++++++++++++++++++
 roles.php                          | 11 +++++++++++
 6 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index fc9a4c13c..ee151462b 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -124,6 +124,9 @@ static function update($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
     $id = (int)$fields['id'];
     if (isset($fields['name'])) $name_part = 'name = '.$mdb2->quote($fields['name']);
     if (isset($fields['rank'])) $rank_part = ', rank = '.(int)$fields['rank'];
@@ -131,7 +134,7 @@ static function update($fields) {
     if (isset($fields['status'])) $status_part = ', status = '.(int)$fields['status'];
     if (isset($fields['rights'])) $rights_part = ', rights = '.$mdb2->quote($fields['rights']);
     $parts = trim($name_part.$rank_part.$descr_part.$status_part.$rights_part, ',');
-    $sql = "update tt_roles set $parts where id = $id and group_id = $user->group_id";
+    $sql = "update tt_roles set $parts where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -141,9 +144,11 @@ static function delete($role_id) {
     global $user;
 
     $mdb2 = getConnection();
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
 
     // Mark the task as deleted.
-    $sql = "update tt_roles set status = NULL where id = $role_id and group_id = $user->group_id";
+    $sql = "update tt_roles set status = NULL where id = $role_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b861e669e..b4454a92b 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -290,7 +290,10 @@ static function getActiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and org_id = $user->org_id and rank < $user->rank and status = 1 order by rank";
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -348,7 +351,10 @@ static function getInactiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and org_id = $user->org_id and rank < $user->rank and status = 0 order by rank";
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5c42acc73..06d71595b 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.28.4511 | 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.28.4512 | 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 8ccb258fd..8f683de44 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -26,6 +26,14 @@ function handleTaskRequiredCheckbox() {
     <tr>
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
+{if isTrue($smarty.const.SUBGROUP_DEBUG)}
+{if $user->can('manage_subgroups')}
+          <tr>
+            <td align="right" nowrap>{$i18n.label.group}:</td>
+            <td>{$forms.groupForm.group.control}</td>
+          </tr>
+{/if}
+{/if}
 {if $user->can('manage_basic_settings')}
           <tr>
             <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
@@ -42,17 +50,9 @@ function handleTaskRequiredCheckbox() {
   {if $user->can('manage_roles')}
           <tr>
             <td align="right" nowrap>{$i18n.label.roles}:</td>
-            <td><a href="roles.php">{$i18n.label.configure}</a></td>
+            <td><a href="roles.php?group_id={$group_id}">{$i18n.label.configure}</a></td>
           </tr>
   {/if}
-{if $smarty.const.SUBGROUP_DEBUG == 'true'}
-  {if $user->can('manage_subgroups')}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.subgroups}:</td>
-            <td><a href="groups.php">{$i18n.label.configure}</a></td>
-          </tr>
-  {/if}
-{/if}
           <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
            <td>{$forms.groupForm.lang.control}</td>
diff --git a/group_edit.php b/group_edit.php
index 84c66df97..ed2002d74 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -44,7 +44,14 @@
 }
 // End of access checks.
 
+if ($group_id) {
+  // We are passed a valid group_id.
+  // Set on behalf group accordingly.
+  $user->setOnBehalfGroup($group_id);
+}
+
 if (!$group_id) $group_id = $user->getActiveGroup();
+$groups = $user->getGroupsForDropdown();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = new ttConfigHelper($group['config']);
 
@@ -96,6 +103,16 @@
 
 $form = new Form('groupForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
+if (count($groups) > 1) {
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'document.groupForm.group_changed.value=1;document.groupForm.submit();',
+    'name'=>'group',
+    'style'=>'width: 250px;',
+    'value'=>$group_id,
+    'data'=>$groups,
+    'datakeys'=>array('id','name')));
+  $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
+}
 $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));
@@ -182,7 +199,16 @@
 $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')));
 
+$form->setValueByElement('group_changed','');
+
 if ($request->isPost()) {
+  if ($request->getParameter('group_changed')) {
+    // User changed the group in dropdown.
+    $new_group_id = $request->getParameter('group');
+    // Redirect to self.
+    header('Location: group_edit.php?id='.$new_group_id);
+    exit();
+  }
 
   if ($request->getParameter('btn_delete')) {
     // Delete button pressed, redirect.
@@ -234,6 +260,8 @@
 } // 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();"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
diff --git a/roles.php b/roles.php
index cd17da3c4..fe68329d3 100644
--- a/roles.php
+++ b/roles.php
@@ -36,8 +36,19 @@
   header('Location: access_denied.php');
   exit();
 }
+$group_id = (int)$request->getParameter('group_id');
+if ($group_id && !$user->isGroupValid($group_id)) {
+  header('Location: access_denied.php');
+  exit();
+}
 // End of access checks.
 
+if ($group_id) {
+  // We are passed a valid group_id (most likely from group_edit.php).
+  // Set on behalf group accordingly.
+  $user->setOnBehalfGroup($group_id);
+}
+
 $smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
 $smarty->assign('title', $i18n->get('title.roles'));

From 39bde74f3805057f70c81494e04e460f9b3b59dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 12:39:20 +0000
Subject: [PATCH 0436/1848] Added group selector on users.php.

---
 WEB-INF/lib/ttUser.class.php |  7 ++++---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/users.tpl  | 10 ++++++++++
 users.php                    | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 859d08817..e150f0b5c 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -306,12 +306,13 @@ function canOverridePunchMode()
 
   // getUsers obtains users in a group, as specififed by options.
   function getUsers($options) {
-
     $mdb2 = getConnection();
 
+    $group_id = $this->getActiveGroup();
+    $org_id = $this->org_id;
+
     $skipClients = !isset($options['include_clients']);
     $includeSelf = isset($options['include_self']);
-    $group_id = isset($options['group_id']) ? $options['group_id'] : $this->group_id;
 
     $select_part = 'select u.id, u.name';
     if (isset($options['include_login'])) $select_part .= ', u.login';
@@ -324,7 +325,7 @@ function getUsers($options) {
     if (isset($options['max_rank']) || $skipClients || isset($options['include_role']))
         $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
 
-    $where_part = " where u.org_id = $this->org_id and u.group_id = $group_id";
+    $where_part = " where u.org_id = $org_id and u.group_id = $group_id";
     if (isset($options['status']))
       $where_part .= ' and u.status = '.(int)$options['status'];
     else
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 06d71595b..188c495f5 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.28.4512 | 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.28.4513 | 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/users.tpl b/WEB-INF/templates/users.tpl
index 008413391..d729c41c9 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -6,6 +6,16 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_users')}
+  {if $group_dropdown}
+{$forms.usersForm.open} {* usersForm consists only of one dropdown group control *}
+      <table width="100%">
+        <tr>
+          <td align="center">{$i18n.label.group}: {$forms.usersForm.group.control}</td>
+        </tr>
+      </table>
+{$forms.usersForm.close}
+  {/if}
+
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
diff --git a/users.php b/users.php
index b7a6606ca..4afd5521f 100644
--- a/users.php
+++ b/users.php
@@ -36,8 +36,36 @@
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
+  header('Location: access_denied.php'); // Wrong group id in post.
+  exit();
+}
+// Note: we don't use "manage_subgroups" in access check, because when user cannot
+// "manage_users" or "view_users" they do not belong here.
 // End of access checks.
 
+if ($request->isPost()) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getActiveGroup();
+}
+
+$form = new Form('usersForm');
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
+
 // Prepare a list of active users.
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
@@ -59,6 +87,7 @@
   }
 }
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('title', $i18n->get('title.users'));

From 1f470d31dc499b7a196184157c6dd77225b448e8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 13:38:39 +0000
Subject: [PATCH 0437/1848] Adjusted user_add.php and user_edit.php to operate
 with subgroups.

---
 WEB-INF/lib/ttUser.class.php | 28 ++++++++++++++++++----------
 WEB-INF/templates/footer.tpl |  2 +-
 user_add.php                 |  4 ++--
 user_edit.php                |  4 ++--
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e150f0b5c..8c4595dbb 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -440,11 +440,13 @@ function getUser($user_id) {
     if (!$this->can('manage_users')) return false;
 
     $mdb2 = getConnection();
+    $group_id = $this->getActiveGroup();
+    $org_id = $this->org_id;
 
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
-            " left join tt_roles r on (u.role_id = r.id)".
-            " where u.id = $user_id and u.group_id = $this->group_id and u.status is not null".
-            " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
+      " left join tt_roles r on (u.role_id = r.id)".
+      " where u.id = $user_id and u.group_id = $group_id and u.org_id = $org_id and u.status is not null".
+      " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -565,21 +567,26 @@ function markUserDeleted($user_id) {
     if (!$user_details) return false;
 
     $mdb2 = getConnection();
+    $group_id = $this->getActiveGroup();
+    $org_id = $this->org_id;
 
     // Mark user to project binds as deleted.
-    $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
+    $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id".
+      " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark user favorite reports as deleted.
-    $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
+    $sql = "update tt_fav_reports set status = NULL where user_id = $user_id".
+      " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark user as deleted.
-    $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$this->group_id;
+    $sql = "update tt_users set status = NULL where id = $user_id".
+      " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -684,8 +691,12 @@ function setOnBehalfGroup($group_id) {
     // Unset things first.
     $this->behalf_group_id = null;
     $this->behalf_group_name = null;
+    $this->behalf_id = null;
+    $this->behalf_name = null;
     unset($_SESSION['behalf_group_id']);
     unset($_SESSION['behalf_group_name']);
+    unset($_SESSION['behalf_id']);
+    unset($_SESSION['behalf_name']);
 
     // Do not do anything if we don't have rights.
     if (!$this->can('manage_subgroups')) return;
@@ -703,10 +714,7 @@ function setOnBehalfGroup($group_id) {
     $this->behalf_group_id = $group_id;
     $this->behalf_group_name = $onBehalfGroupName;
 
-    // Question remains whether or not we need to adjust on behalf user.
-    // Adjusting for now. Test it and redesign if necessary.
-    unset($_SESSION['behalf_id']);
-    unset($_SESSION['behalf_name']);
+    // Adjust on behalf user.
     $this->adjustBehalfId();
     return;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 188c495f5..dee9c5e1f 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.28.4513 | 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.28.4514 | 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/user_add.php b/user_add.php
index eb9391472..662813ea6 100644
--- a/user_add.php
+++ b/user_add.php
@@ -46,7 +46,7 @@
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttTeamHelper::getActiveClients($user->getActiveGroup());
 
 $assigned_projects = array();
 if ($request->isPost()) {
@@ -90,7 +90,7 @@
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttTeamHelper::getActiveProjects($user->getActiveGroup());
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
diff --git a/user_edit.php b/user_edit.php
index f370f451d..49e2505db 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -49,9 +49,9 @@
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttTeamHelper::getActiveClients($user->getActiveGroup());
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttTeamHelper::getActiveProjects($user->getActiveGroup());
 $assigned_projects = array();
 
 if ($request->isPost()) {

From 05cc6905eba759b924e2dc4efc884a930711f928 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 14:17:17 +0000
Subject: [PATCH 0438/1848] Added group selector on projects.php.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/projects.tpl | 10 ++++++++++
 projects.php                   | 31 +++++++++++++++++++++++++++++--
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dee9c5e1f..4cb0d9128 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.28.4514 | 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.28.4515 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 589993652..09966a843 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -6,6 +6,16 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_projects')}
+  {if $group_dropdown}
+{$forms.projectsForm.open} {* projectsForm consists only of one dropdown group control *}
+      <table width="100%">
+        <tr>
+          <td align="center">{$i18n.label.group}: {$forms.projectsForm.group.control}</td>
+        </tr>
+      </table>
+{$forms.projectsForm.close}
+  {/if}
+
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
diff --git a/projects.php b/projects.php
index d206fe8c2..3845db67f 100644
--- a/projects.php
+++ b/projects.php
@@ -39,14 +39,41 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
+  header('Location: access_denied.php'); // Wrong group id in post.
+  exit();
+}
 // End of access checks.
 
+if ($request->isPost()) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getActiveGroup();
+}
+
+$form = new Form('projectsForm');
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
+
 if($user->can('manage_projects')) {
-  $active_projects = ttTeamHelper::getActiveProjects($user->group_id);
-  $inactive_projects = ttTeamHelper::getInactiveProjects($user->group_id);
+  $active_projects = ttTeamHelper::getActiveProjects($group_id);
+  $inactive_projects = ttTeamHelper::getInactiveProjects($group_id);
 } else
   $active_projects = $user->getAssignedProjects();
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
 $smarty->assign('title', $i18n->get('title.projects'));

From 7bc3223af35eeceb1e63daf3ae3cb66739337696 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 15:01:24 +0000
Subject: [PATCH 0439/1848] Adjusted project_add.php and project_edit.php to
 work with subgroups.

---
 WEB-INF/lib/ttProjectHelper.class.php | 9 ++++++---
 WEB-INF/lib/ttTeamHelper.class.php    | 7 +++++--
 WEB-INF/templates/footer.tpl          | 2 +-
 project_add.php                       | 3 ++-
 project_edit.php                      | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 240760df3..5e59a9289 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -159,23 +159,26 @@ static function delete($id) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
     // Start with project itself. Reason: if the passed in project_id is bogus,
     // we'll fail right here and don't damage any other data.
 
     // Mark project as deleted and remove associated tasks.
-    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and group_id = ".$user->getActiveGroup();
+    $sql = "update tt_projects set status = NULL, tasks = NULL where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error') || 0 == $affected)
       return false; // An error ocurred, or 0 rows updated.
 
     // Delete user binds to this project.
-    $sql = "delete from tt_user_project_binds where project_id = $id";
+    $sql = "delete from tt_user_project_binds where project_id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Delete task binds to this project.
-    $sql = "delete from tt_project_task_binds where project_id = $id";
+    $sql = "delete from tt_project_task_binds where project_id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b4454a92b..1b2616b38 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -60,10 +60,13 @@ static function getActiveUsers($options = null) {
     global $i18n;
     $mdb2 = getConnection();
 
+    $group_id = $user->getActiveGroup();
+    $org_id = $user->org_id;
+
     if (isset($options['getAllFields']))
-      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id and u.status = 1 order by upper(u.name)";
+      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.org_id = $org_id and u.status = 1 order by upper(u.name)";
     else
-      $sql = "select id, name from tt_users where group_id = $user->group_id and status = 1 order by upper(name)";
+      $sql = "select id, name from tt_users where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4cb0d9128..47031b29f 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.28.4515 | 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.28.4516 | 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/project_add.php b/project_add.php
index 930adf1f8..d32c88029 100644
--- a/project_add.php
+++ b/project_add.php
@@ -40,12 +40,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $users = ttTeamHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->group_id);
+$tasks = ttTeamHelper::getActiveTasks($user->getActiveGroup());
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
diff --git a/project_edit.php b/project_edit.php
index 3cdb44375..203763251 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -52,7 +52,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->group_id);
+$tasks = ttTeamHelper::getActiveTasks($user->getActiveGroup());
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 

From ca6d2f927b985f4d80b31e5e2c6deb98e4fae6f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 22:06:55 +0000
Subject: [PATCH 0440/1848] Introduced ttGroup class to store attributes of on
 behalf group.

---
 WEB-INF/lib/ttGroup.class.php | 131 ++++++++++++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php  |  16 +++--
 WEB-INF/templates/footer.tpl  |   2 +-
 3 files changed, 144 insertions(+), 5 deletions(-)
 create mode 100644 WEB-INF/lib/ttGroup.class.php

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
new file mode 100644
index 000000000..2943438a6
--- /dev/null
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -0,0 +1,131 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttConfigHelper');
+import('ttGroupHelper');
+
+// ttGroup class is used to store attributes for a single group in Time Tracker.
+// We use it in ttUser class to have acces to "on behalf" group properties.
+class ttGroup {
+  var $id = null;               // Group id.
+  var $parent_id = null;        // Paerent group id.
+  var $org_id = null;           // Organization id.
+  var $name = null;             // Group name.
+  var $lang = null;             // Language.
+  var $decimal_mark = null;     // Decimal separator.
+  var $date_format = null;      // Date format.
+  var $time_format = null;      // Time format.
+  var $week_start = 0;          // Week start day.
+  var $show_holidays = 0;       // Whether to show holidays in calendar.
+  var $tracking_mode = 0;       // Tracking mode.
+  var $project_required = 0;    // Whether project selection is required on time entires.
+  var $task_required = 0;       // Whether task selection is required on time entires.
+  var $record_type = 0;         // Record type (duration vs start and finish, or both).
+  var $punch_mode = 0;          // Whether punch mode is enabled for user.
+  var $allow_overlap = 0;       // Whether to allow overlapping time entries.
+  var $future_entries = 0;      // Whether to allow creating future entries.
+  var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
+  var $bcc_email = null;        // Bcc email.
+  var $allow_ip = null;         // Specification from where user is allowed access.
+  var $password_complexity = null; // Password complexity example.
+  var $currency = null;         // Currency.
+  var $plugins = null;          // Comma-separated list of enabled plugins.
+  var $config = null;           // Comma-separated list of miscellaneous config options.
+  var $custom_logo = 0;         // Whether to use a custom logo for group.
+  var $lock_spec = null;        // Cron specification for record locking.
+  var $workday_minutes = 480;   // Number of work minutes in a regular day.
+  var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
+  var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
+  var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
+
+  // Constructor.
+  function __construct($id, $org_id) {
+    $mdb2 = getConnection();
+
+    $sql = "select * from tt_groups where id = $id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) {
+      return;
+    }
+
+    $val = $res->fetchRow();
+    if ($val['id'] > 0) {
+      $this->id = $val['id'];
+      $this->parent_id = $val['parent_id'];
+      $this->org_id = $val['org_id'];
+      $this->name = $val['name'];
+      $this->lang = $val['lang'];
+      $this->decimal_mark = $val['decimal_mark'];
+      $this->date_format = $val['date_format'];
+      $this->time_format = $val['time_format'];
+      $this->week_start = $val['week_start'];
+      /* TODO: initialize other things here.
+      $this->tracking_mode = $val['tracking_mode'];
+      $this->project_required = $val['project_required'];
+      $this->task_required = $val['task_required'];
+      $this->record_type = $val['record_type'];
+      $this->bcc_email = $val['bcc_email'];
+      $this->allow_ip = $val['allow_ip'];
+      $this->password_complexity = $val['password_complexity'];
+      $this->group_name = $val['group_name'];
+      $this->currency = $val['currency'];
+      $this->plugins = $val['plugins'];
+      $this->lock_spec = $val['lock_spec'];
+      $this->workday_minutes = $val['workday_minutes'];
+      $this->custom_logo = $val['custom_logo'];
+
+      $this->config = $val['config'];
+      $config = new ttConfigHelper($this->config);
+      // Set user config options.
+      $this->show_holidays = $config->getDefinedValue('show_holidays');
+      $this->punch_mode = $config->getDefinedValue('punch_mode');
+      $this->allow_overlap = $config->getDefinedValue('allow_overlap');
+      $this->future_entries = $config->getDefinedValue('future_entries');
+      $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
+      if ($this->isPluginEnabled('wu')) {
+        $minutes_in_unit = $config->getIntValue('minutes_in_unit');
+        if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
+        $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
+        if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
+        $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
+      }
+
+      // Set "on behalf" id and name (user).
+      if (isset($_SESSION['behalf_id'])) {
+          $this->behalf_id = $_SESSION['behalf_id'];
+          $this->behalf_name = $_SESSION['behalf_name'];
+      }
+      // Set "on behalf" id and name (group).
+      if (isset($_SESSION['behalf_group_id'])) {
+          $this->behalf_group_id = $_SESSION['behalf_group_id'];
+          $this->behalf_group_name = $_SESSION['behalf_group_name'];
+      }
+      */
+    }
+  }
+}
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 8c4595dbb..ccd1f961e 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -28,6 +28,7 @@
 
 import('ttConfigHelper');
 import('ttGroupHelper');
+import('ttGroup');
 
 class ttUser {
   var $login = null;            // User login.
@@ -74,6 +75,8 @@ class ttUser {
   var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
   var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
 
+  var $behalfGroup = null;      // A ttGroup instance with on behalf group attributes.
+
   // Constructor.
   function __construct($login, $id = null) {
     if (!$login && !$id) {
@@ -150,13 +153,15 @@ function __construct($login, $id = null) {
       
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
-          $this->behalf_id = $_SESSION['behalf_id'];
-          $this->behalf_name = $_SESSION['behalf_name'];
+        $this->behalf_id = $_SESSION['behalf_id'];
+        $this->behalf_name = $_SESSION['behalf_name'];
       }
       // Set "on behalf" id and name (group).
       if (isset($_SESSION['behalf_group_id'])) {
-          $this->behalf_group_id = $_SESSION['behalf_group_id'];
-          $this->behalf_group_name = $_SESSION['behalf_group_name'];
+        $this->behalf_group_id = $_SESSION['behalf_group_id'];
+        $this->behalf_group_name = $_SESSION['behalf_group_name'];
+
+        $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
       }
     }
   }
@@ -714,6 +719,9 @@ function setOnBehalfGroup($group_id) {
     $this->behalf_group_id = $group_id;
     $this->behalf_group_name = $onBehalfGroupName;
 
+    unset($this->behalfGroup);
+    $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
+
     // Adjust on behalf user.
     $this->adjustBehalfId();
     return;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 47031b29f..13992f25f 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.28.4516 | 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.28.4517 | 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>

From d374f7228d4ece31f60028d798f6dbdef78f7925 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 22:23:03 +0000
Subject: [PATCH 0441/1848] Starting to use on behalf group properties.

---
 WEB-INF/lib/ttGroup.class.php  |  2 +-
 WEB-INF/lib/ttUser.class.php   | 10 ++++++++++
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/user_add.tpl |  4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 2943438a6..c12be7788 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -84,8 +84,8 @@ function __construct($id, $org_id) {
       $this->date_format = $val['date_format'];
       $this->time_format = $val['time_format'];
       $this->week_start = $val['week_start'];
-      /* TODO: initialize other things here.
       $this->tracking_mode = $val['tracking_mode'];
+      /* TODO: initialize other things here.
       $this->project_required = $val['project_required'];
       $this->task_required = $val['task_required'];
       $this->record_type = $val['record_type'];
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ccd1f961e..5f97ae28b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -166,6 +166,16 @@ function __construct($login, $id = null) {
     }
   }
 
+  // getDecimalMark returns decimal mark for active group.
+  function getDecimalMark() {
+    return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
+  }
+
+  // getTrackingMode returns tracking mode for active group.
+  function getTrackingMode() {
+    return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
+  }
+
   // The getActiveUser returns user id on behalf of whom the current user is operating.
   function getActiveUser() {
     return ($this->behalf_id ? $this->behalf_id : $this->id);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 13992f25f..bd293c455 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.28.4517 | 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.28.4518 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index e1a053502..762f0528e 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -78,10 +78,10 @@ function handleClientControl() {
       <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
     </tr>
     <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
+      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>

From f18a557af5593668fe61b8e86db4bcf50970e0bd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Nov 2018 22:37:45 +0000
Subject: [PATCH 0442/1848] Started using on behalf group attributes on user
 edit page.

---
 WEB-INF/lib/form/FloatField.class.php | 4 ++--
 WEB-INF/templates/footer.tpl          | 2 +-
 WEB-INF/templates/user_edit.tpl       | 4 ++--
 user_edit.php                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/form/FloatField.class.php b/WEB-INF/lib/form/FloatField.class.php
index cb035c7c3..5b939754e 100644
--- a/WEB-INF/lib/form/FloatField.class.php
+++ b/WEB-INF/lib/form/FloatField.class.php
@@ -37,12 +37,12 @@ function __construct($name) {
 
     $this->class = 'FloatField';
     $this->name = $name;
-    $this->mDelimiter = $user->decimal_mark;
+    $this->mDelimiter = $user->getDecimalMark();
   }
 
   function localize() {
     global $user;
-    $this->mDelimiter = $user->decimal_mark;
+    $this->mDelimiter = $user->getDecimalMark();
   }
 
   function setFormat($format) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bd293c455..8b1628293 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.28.4518 | 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.28.4519 | 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/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index e7d9dd92f..a0872a1fb 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -112,10 +112,10 @@ function handleClientControl() {
     </tr>
 {/if}
     <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
+      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
diff --git a/user_edit.php b/user_edit.php
index 49e2505db..580ad73c3 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -82,7 +82,7 @@
   $cl_name = $user_details['name'];
   $cl_login = $user_details['login'];
   $cl_email = $user_details['email'];
-  $cl_rate = str_replace('.', $user->decimal_mark, $user_details['rate']);
+  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
   $cl_role_id = $user_details['role_id'];
   $cl_client_id = $user_details['client_id'];
   $cl_status = $user_details['status'];

From 6cdff5151bba8cd6c8bd1bb90b1b2c18457ecb88 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 00:04:18 +0000
Subject: [PATCH 0443/1848] Added some comments clarifying the design approach.

---
 WEB-INF/lib/ttUser.class.php | 15 +++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 projects.php                 |  7 ++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5f97ae28b..8e907c8ab 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -388,6 +388,21 @@ function getUsers($options) {
   //   - The entire stack of groups all the way down to current on behalf group.
   //   - All immediate children of the current on behalf group.
   // This allows user to navigate easily to home group, anything in between, and 1 level below.
+  //
+  // Note 1: group dropdown is, by design, to be placed on all pages where "relevant",
+  // such as users.php, projects.php, tasks.php, etc. But some features may be disabled
+  // in some groups. We should check for feature availability on group change
+  // in post and redirect to feature_disabled.php when this happens.
+  // This will allow us to keep dropdown content consistent on all pages.
+  // Filtering content of the dropdown does not seem right.
+  //
+  // Note 2: Menu should display according to $user home group settings.
+  //         Pages, should look according to $user->behalfGroup settings (if set).
+  //         For example, if home group allows tasks, menu should display Tasks,
+  //         even when we are on behalf of a subgroup without tasks.
+  //
+  // Note 3: Language of all pages should be as in $user home group even when
+  //         subgroups have a different language.
   function getGroupsForDropdown() {
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b1628293..d037aa872 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.28.4519 | 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.28.4520 | 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/projects.php b/projects.php
index 3845db67f..d149d841d 100644
--- a/projects.php
+++ b/projects.php
@@ -35,7 +35,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
@@ -48,6 +48,11 @@
 if ($request->isPost()) {
   $group_id = $request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
+  // Projects feature may not be available in new group, check and redirect.
+  if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+    header('Location: feature_disabled.php');
+    exit();
+  }
 } else {
   $group_id = $user->getActiveGroup();
 }

From 7797eda9fb04c217a813db88e00bb9ee541eabbb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 10:03:45 +0000
Subject: [PATCH 0444/1848] Some refactoring for subgroups.

---
 WEB-INF/lib/ttClientHelper.class.php          | 18 +++++++--------
 WEB-INF/lib/ttExpenseHelper.class.php         |  2 +-
 WEB-INF/lib/ttFavReportHelper.class.php       |  2 +-
 WEB-INF/lib/ttGroupHelper.class.php           |  6 ++---
 WEB-INF/lib/ttInvoiceHelper.class.php         |  8 +++----
 WEB-INF/lib/ttNotificationHelper.class.php    |  6 ++---
 .../lib/ttPredefinedExpenseHelper.class.php   |  8 +++----
 WEB-INF/lib/ttProjectHelper.class.php         | 18 +++++++--------
 WEB-INF/lib/ttReportHelper.class.php          | 10 ++++-----
 WEB-INF/lib/ttRoleHelper.class.php            | 10 ++++-----
 WEB-INF/lib/ttSysConfig.class.php             |  2 +-
 WEB-INF/lib/ttTaskHelper.class.php            |  2 +-
 WEB-INF/lib/ttTeamHelper.class.php            |  6 ++---
 WEB-INF/lib/ttUser.class.php                  | 22 +++++++++----------
 WEB-INF/lib/ttUserHelper.class.php            |  4 ++--
 WEB-INF/lib/ttWeekViewHelper.class.php        |  2 +-
 WEB-INF/templates/footer.tpl                  |  2 +-
 client_add.php                                |  2 +-
 client_edit.php                               |  2 +-
 group_edit.php                                |  2 +-
 groups.php                                    |  2 +-
 mobile/client_add.php                         |  2 +-
 mobile/client_edit.php                        |  2 +-
 mobile/project_add.php                        |  2 +-
 mobile/project_edit.php                       |  2 +-
 mobile/task_add.php                           |  2 +-
 mobile/task_edit.php                          |  2 +-
 mobile/time.php                               |  2 +-
 mobile/timer.php                              |  2 +-
 plugins/CustomFields.class.php                |  6 ++---
 plugins/MonthlyQuota.class.php                |  2 +-
 project_add.php                               |  4 ++--
 project_edit.php                              |  4 ++--
 projects.php                                  |  2 +-
 task_add.php                                  |  2 +-
 task_edit.php                                 |  2 +-
 time.php                                      |  2 +-
 time_edit.php                                 |  2 +-
 user_add.php                                  |  6 ++---
 user_edit.php                                 |  4 ++--
 users.php                                     |  2 +-
 41 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index eeb77f77a..e557676fa 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -41,7 +41,7 @@ static function getClient($client_id, $all_fields = false) {
     else
       $sql .= 'name ';
 
-    $sql .= "from tt_clients where group_id = ".$user->getActiveGroup().
+    $sql .= "from tt_clients where group_id = ".$user->getGroup().
       " and id = $client_id and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -59,7 +59,7 @@ static function getClients()
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name from tt_clients where group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1) order by upper(name)";
+    $sql = "select id, name from tt_clients where group_id = ".$user->getGroup()." and (status = 0 or status = 1) order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -75,7 +75,7 @@ static function getClientByName($client_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_clients where group_id = ".$user->getActiveGroup().
+    $sql = "select id from tt_clients where group_id = ".$user->getGroup().
       " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
 
     $res = $mdb2->query($sql);
@@ -94,7 +94,7 @@ static function getDeletedClient($client_id) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select name, address from tt_clients where group_id = ".$user->getActiveGroup().
+    $sql = "select name, address from tt_clients where group_id = ".$user->getGroup().
       " and id = $client_id and status is NULL";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -137,7 +137,7 @@ static function delete($id, $delete_client_entries) {
 
     // Handle invoices.
     if ($delete_client_entries) {
-      $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = ".$user->getActiveGroup();
+      $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = ".$user->getGroup();
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -150,13 +150,13 @@ static function delete($id, $delete_client_entries) {
       return false;
 
     // Handle users for client.
-    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = ".$user->getActiveGroup();
+    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark client deleted.
-    $sql = "update tt_clients set status = NULL where id = $id and group_id = ".$user->getActiveGroup();
+    $sql = "update tt_clients set status = NULL where id = $id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -237,7 +237,7 @@ static function update($fields)
     $comma_separated = implode(",", $projects); // This is a comma-separated list of associated project ids.
     $sql = "update tt_clients set name = ".$mdb2->quote($name).", address = ".$mdb2->quote($address).
       ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status".
-      " where group_id = ".$user->getActiveGroup()." and id = ".$id;
+      " where group_id = ".$user->getGroup()." and id = ".$id;
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -273,7 +273,7 @@ static function getAssignedProjects($client_id)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name from tt_projects p".
       " inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)".
-      " where p.group_id = ".$user->getActiveGroup()." and p.status = 1 order by p.name";
+      " where p.group_id = ".$user->getGroup()." and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 7c0d83ff3..e42a0ab5e 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -35,7 +35,7 @@ static function insert($fields)
     $mdb2 = getConnection();
 
     $user_id = $user->getActiveUser();
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $date = $fields['date'];
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index ab9fa0e09..f1943f71f 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -80,7 +80,7 @@ static function insertReport($fields) {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $sql = "insert into tt_fav_reports".
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 01429aa67..d332060a9 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -67,7 +67,7 @@ static function getSubgroupByName($name) {
     global $user;
 
     $mdb2 = getConnection();
-    $parent_id = $user->getActiveGroup();
+    $parent_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $sql = "select id from tt_groups where parent_id = $parent_id and org_id = $org_id".
@@ -86,7 +86,7 @@ static function insertSubgroup($fields) {
     global $user;
 
     $mdb2 = getConnection();
-    $parent_id = $user->getActiveGroup();
+    $parent_id = $user->getGroup();
     $org_id = $user->org_id;
     $name = $fields['name'];
     $description = $fields['description'];
@@ -259,7 +259,7 @@ static function getRoles() {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $sql =  "select * from tt_roles".
       " where group_id = $group_id and org_id = $org_id and status is not null";
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 3a8dbe27b..13e5dea08 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -73,7 +73,7 @@ static function getInvoice($invoice_id) {
     if ($user->isClient()) $client_part = " and client_id = $user->client_id";
 
     $sql = "select * from tt_invoices where id = $invoice_id and group_id = ".
-            $user->getActiveGroup()."$client_part and status = 1";
+            $user->getGroup()."$client_part and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
@@ -89,7 +89,7 @@ static function getInvoiceByName($invoice_name) {
     global $user;
 
     $sql = "select id from tt_invoices where group_id = ".
-            $user->getActiveGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1";
+            $user->getGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -236,7 +236,7 @@ static function delete($invoice_id, $delete_invoice_items) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getActiveGroup();
+    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -332,7 +332,7 @@ static function createInvoice($fields) {
 
     // Create a new invoice record.
     $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id) values(".
-      $user->getActiveGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+      $user->getGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index a4fa5e6dc..c9f0a1e9c 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -38,7 +38,7 @@ static function get($id)
 
     $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.id = $id and c.group_id = ".$user->getActiveGroup();
+      where c.id = $id and c.group_id = ".$user->getGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -54,7 +54,7 @@ static function delete($id) {
   	    
     $mdb2 = getConnection();
     
-    $sql = "delete from tt_cron where id = $id and group_id = ".$user->getActiveGroup();
+    $sql = "delete from tt_cron where id = $id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -68,7 +68,7 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 27a3a8332..16dff2840 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -39,7 +39,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and group_id = ".$user->getActiveGroup();
+      where id = $id and group_id = ".$user->getGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -58,7 +58,7 @@ static function delete($id) {
 
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getActiveGroup();
+    $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -73,7 +73,7 @@ static function insert($fields)
 
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $name = $fields['name'];
     $cost = $fields['cost'];
@@ -96,7 +96,7 @@ static function update($fields)
 
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $predefined_expense_id = (int) $fields['id'];
     $name = $fields['name'];
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 5e59a9289..2a439dd9f 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -43,7 +43,7 @@ static function getAssignedProjects($user_id)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.tasks, upb.rate from tt_projects p".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
-      " where p.group_id = ".$user->getActiveGroup()." and p.status = 1 order by p.name";
+      " where p.group_id = ".$user->getGroup()." and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -63,7 +63,7 @@ static function getRates($user_id)
     
     $sql = "select p.id, upb.rate from tt_projects p".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id)".
-      " where group_id = ".$user->getActiveGroup();
+      " where group_id = ".$user->getGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -83,7 +83,7 @@ static function getProjects()
     $mdb2 = getConnection();
     
     $sql = "select id, name, tasks from tt_projects".
-      " where group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1) order by name";
+      " where group_id = ".$user->getGroup()." and (status = 0 or status = 1) order by name";
         
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -104,7 +104,7 @@ static function getProjectsForClient()
 
     $sql = "select p.id, p.name, p.tasks from tt_projects p".
       " inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)".
-      " where p.group_id = ".$user->getActiveGroup()." and (p.status = 0 or p.status = 1)".
+      " where p.group_id = ".$user->getGroup()." and (p.status = 0 or p.status = 1)".
       " order by p.name";
 
     $res = $mdb2->query($sql);
@@ -125,7 +125,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, status, tasks from tt_projects where id = $id and group_id = ".
-            $user->getActiveGroup()." and (status = 0 or status = 1)";
+            $user->getGroup()." and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -142,7 +142,7 @@ static function getProjectByName($name) {
     global $user;
 
     $sql = "select id from tt_projects where group_id = ".
-      $user->getActiveGroup()." and name = ".$mdb2->quote($name).
+      $user->getGroup()." and name = ".$mdb2->quote($name).
       " and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -159,7 +159,7 @@ static function delete($id) {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     // Start with project itself. Reason: if the passed in project_id is bogus,
@@ -245,7 +245,7 @@ static function update($fields) {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $project_id = $fields['id']; // Project we are updating.
     $name = $fields['name']; // Project name.
@@ -323,7 +323,7 @@ static function update($fields) {
     // Update project name, description, tasks and status in tt_projects table.
     $comma_separated = implode(",", $tasks_to_bind); // This is a comma-separated list of associated task ids.
     $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and group_id = ".$user->getActiveGroup();
+           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 76c1765e8..16277bd19 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -62,7 +62,7 @@ static function getWhere($options) {
       $user_list_part = " and l.user_id in ($userlist)";
     else
       $user_list_part = " and l.user_id = ".$user->id;
-    $user_list_part .= " and l.group_id = ".$user->getActiveGroup();
+    $user_list_part .= " and l.group_id = ".$user->getGroup();
 
     // Prepare sql query part for where.
     if ($options['period'])
@@ -100,7 +100,7 @@ static function getExpenseWhere($options) {
       $user_list_part = " and ei.user_id in ($userlist)";
     else
       $user_list_part = " and ei.user_id = ".$user->id;
-    $user_list_part .= " and ei.group_id = ".$user->getActiveGroup();
+    $user_list_part .= " and ei.group_id = ".$user->getGroup();
 
     // Prepare sql query part for where.
     if ($options['period'])
@@ -157,7 +157,7 @@ static function getItems($options) {
     // Add custom field.
     $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1;
     if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->getActiveGroup());
+      $custom_fields = new CustomFields($user->getGroup());
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         array_push($fields, 'cfl.value as cf_1');
@@ -616,7 +616,7 @@ static function prepareReportBody($options, $comment = null)
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
-      $custom_fields = new CustomFields($user->getActiveGroup());
+      $custom_fields = new CustomFields($user->getGroup());
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
@@ -1460,7 +1460,7 @@ static function makeJoinPart($options) {
       $join .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
     if (ttReportHelper::groupingBy('cf_1', $options)) {
-      $custom_fields = new CustomFields($user->getActiveGroup());
+      $custom_fields = new CustomFields($user->getGroup());
       if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
         $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index ee151462b..353744699 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -37,7 +37,7 @@ static function get($id)
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, rank, rights, status from tt_roles
-      where id = $id and group_id = ".$user->getActiveGroup()." and (status = 0 or status = 1)";
+      where id = $id and group_id = ".$user->getGroup()." and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -56,7 +56,7 @@ static function getRoleByName($role_name) {
     $mdb2 = getConnection();
     global $user;
 
-    $sql = "select id from tt_roles where group_id = ".$user->getActiveGroup().
+    $sql = "select id from tt_roles where group_id = ".$user->getGroup().
       " and name = ".$mdb2->quote($role_name)." and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
@@ -89,7 +89,7 @@ static function isClientRole($role_id) {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select rights from tt_roles where group_id = ".$user->getActiveGroup()." and id = $role_id";
+    $sql = "select rights from tt_roles where group_id = ".$user->getGroup()." and id = $role_id";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -124,7 +124,7 @@ static function update($fields) {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $id = (int)$fields['id'];
@@ -144,7 +144,7 @@ static function delete($role_id) {
     global $user;
 
     $mdb2 = getConnection();
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     // Mark the task as deleted.
diff --git a/WEB-INF/lib/ttSysConfig.class.php b/WEB-INF/lib/ttSysConfig.class.php
index fd9905210..4cc5f8c26 100644
--- a/WEB-INF/lib/ttSysConfig.class.php
+++ b/WEB-INF/lib/ttSysConfig.class.php
@@ -44,7 +44,7 @@ class ttSysConfig {
   function __construct($user_id) {
     global $user;
     $this->user_id = $user_id; // TODO: review "on behalf" situation and refactor if necessary.
-    $this->group_id = $user->getActiveGroup();
+    $this->group_id = $user->getGroup();
     $this->org_id = $user->org_id;
     $this->mdb2 = getConnection();
   }
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 2c0fbe1e1..c7f25d1a2 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -192,7 +192,7 @@ static function update($fields)
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $task_id = (int)$fields['task_id'];
     $name = $fields['name'];
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 1b2616b38..241c92c04 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -60,7 +60,7 @@ static function getActiveUsers($options = null) {
     global $i18n;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     if (isset($options['getAllFields']))
@@ -293,7 +293,7 @@ static function getActiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 1 order by rank";
@@ -354,7 +354,7 @@ static function getInactiveRolesForUser()
     $result = array();
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 0 order by rank";
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 8e907c8ab..04273aa78 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -166,6 +166,11 @@ function __construct($login, $id = null) {
     }
   }
 
+  // The getGroup returns group id on behalf of which the current user is operating.
+   function getGroup() {
+    return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
+  }
+
   // getDecimalMark returns decimal mark for active group.
   function getDecimalMark() {
     return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
@@ -181,11 +186,6 @@ function getActiveUser() {
     return ($this->behalf_id ? $this->behalf_id : $this->id);
   }
 
-  // The getActiveGroup returns group id on behalf of which the current user is operating.
-  function getActiveGroup() {
-    return ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
-  }
-
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
@@ -323,7 +323,7 @@ function canOverridePunchMode()
   function getUsers($options) {
     $mdb2 = getConnection();
 
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
     $skipClients = !isset($options['include_clients']);
@@ -408,7 +408,7 @@ function getGroupsForDropdown() {
 
     // Start with subgroups.
     $groups = array();
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -451,7 +451,7 @@ function getGroupsForDropdown() {
   function getSubgroups($group_id = null) {
     $mdb2 = getConnection();
 
-    if (!$group_id) $group_id = $this->getActiveGroup();
+    if (!$group_id) $group_id = $this->getGroup();
 
     $sql = "select id, name, description from tt_groups where org_id = $this->org_id".
       " and parent_id = $group_id and status is not null order by upper(name)";
@@ -470,7 +470,7 @@ function getUser($user_id) {
     if (!$this->can('manage_users')) return false;
 
     $mdb2 = getConnection();
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
@@ -552,7 +552,7 @@ function updateGroup($fields) {
     if ($group_id && !$this->isGroupValid($group_id)) return false;
 
     $mdb2 = getConnection();
-    if (!$group_id) $group_id = $this->getActiveGroup();
+    if (!$group_id) $group_id = $this->getGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
@@ -597,7 +597,7 @@ function markUserDeleted($user_id) {
     if (!$user_details) return false;
 
     $mdb2 = getConnection();
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
     // Mark user to project binds as deleted.
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 222cfdaa4..d1e112684 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -232,7 +232,7 @@ static function update($user_id, $fields) {
             ttUserHelper::insertBind(array(
               'user_id' => $user_id,
               'project_id' => $project_id,
-              'group_id' => $user->getActiveGroup(),
+              'group_id' => $user->getGroup(),
               'org_id' => $user->org_id,
               'rate' => $rate,
               'status' => ACTIVE));
@@ -320,7 +320,7 @@ static function insertBind($fields) {
     $mdb2 = getConnection();
 
     // This may be used during import. Use the following until we have import refactored.
-    $group_id = $fields['group_id'] ? (int) $fields['group_id'] : $user->getActiveGroup();
+    $group_id = $fields['group_id'] ? (int) $fields['group_id'] : $user->getGroup();
     $org_id = $fields['org_id'] ? (int) $fields['org_id'] : $user->org_id;
 
     $user_id = (int) $fields['user_id'];
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 53065d380..f0bc13bda 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -493,7 +493,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     // Prepare an array of fields for regular insert function.
     $fields4insert = array();
     $fields4insert['user_id'] = $user->getActiveUser();
-    $fields4insert['group_id'] = $user->getActiveGroup();
+    $fields4insert['group_id'] = $user->getGroup();
     $fields4insert['org_id'] = $user->org_id;
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d037aa872..8c299c99f 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.28.4520 | 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.28.4521 | 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/client_add.php b/client_add.php
index db94e6206..b3d27ac79 100644
--- a/client_add.php
+++ b/client_add.php
@@ -71,7 +71,7 @@
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'name' => $cl_name,
         'address' => $cl_address,
diff --git a/client_edit.php b/client_edit.php
index a5c1b8b72..34c0a0706 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -103,7 +103,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'address' => $cl_address,
diff --git a/group_edit.php b/group_edit.php
index ed2002d74..08c1db590 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -50,7 +50,7 @@
   $user->setOnBehalfGroup($group_id);
 }
 
-if (!$group_id) $group_id = $user->getActiveGroup();
+if (!$group_id) $group_id = $user->getGroup();
 $groups = $user->getGroupsForDropdown();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = new ttConfigHelper($group['config']);
diff --git a/groups.php b/groups.php
index 6c35bfb30..f335153ce 100644
--- a/groups.php
+++ b/groups.php
@@ -45,7 +45,7 @@
   $group_id = $request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
 } else {
-  $group_id = $user->getActiveGroup();
+  $group_id = $user->getGroup();
 }
 
 $form = new Form('subgroupsForm');
diff --git a/mobile/client_add.php b/mobile/client_add.php
index 02de56d1e..222012d48 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -71,7 +71,7 @@
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'name' => $cl_name,
         'address' => $cl_address,
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index c1004b1bb..917b656a8 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -104,7 +104,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'address' => $cl_address,
diff --git a/mobile/project_add.php b/mobile/project_add.php
index 3b1d0fb0d..a7a540d05 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -78,7 +78,7 @@
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 2d67b88d8..887946154 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -119,7 +119,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
diff --git a/mobile/task_add.php b/mobile/task_add.php
index d1eab74bc..003003479 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -68,7 +68,7 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index 784028ee5..47dc5d710 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -103,7 +103,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
diff --git a/mobile/time.php b/mobile/time.php
index a25cf90c8..25f832bc4 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -252,7 +252,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
diff --git a/mobile/timer.php b/mobile/timer.php
index 2f5dbad4c..8422338b7 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -225,7 +225,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 1517bf085..74fef831c 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -66,7 +66,7 @@ function insert($log_id, $field_id, $option_id, $value) {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value)".
@@ -118,7 +118,7 @@ static function insertOption($field_id, $option_name) {
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     // Check if the option exists.
@@ -283,7 +283,7 @@ static function getFieldIdForOption($option_id) {
   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
-    $group_id = $user->getActiveGroup();
+    $group_id = $user->getGroup();
     $org_id = $user->org_id;
     $sql = "insert into tt_custom_fields (group_id, org_id, type, label, required, status)".
       " values($group_id, $org_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 6a047badd..36f2d8cb4 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -38,7 +38,7 @@ class MonthlyQuota {
   function __construct() {
     $this->db = getConnection();
     global $user;
-    $this->group_id = $user->getActiveGroup();
+    $this->group_id = $user->getGroup();
     $this->org_id = $user->org_id;
   }
 
diff --git a/project_add.php b/project_add.php
index d32c88029..6b41c15c6 100644
--- a/project_add.php
+++ b/project_add.php
@@ -46,7 +46,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->getActiveGroup());
+$tasks = ttTeamHelper::getActiveTasks($user->getGroup());
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -78,7 +78,7 @@
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
diff --git a/project_edit.php b/project_edit.php
index 203763251..29c0d51b9 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -52,7 +52,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->getActiveGroup());
+$tasks = ttTeamHelper::getActiveTasks($user->getGroup());
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -118,7 +118,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
diff --git a/projects.php b/projects.php
index d149d841d..b8faa14d6 100644
--- a/projects.php
+++ b/projects.php
@@ -54,7 +54,7 @@
     exit();
   }
 } else {
-  $group_id = $user->getActiveGroup();
+  $group_id = $user->getGroup();
 }
 
 $form = new Form('projectsForm');
diff --git a/task_add.php b/task_add.php
index a93c80e28..28a554bbd 100644
--- a/task_add.php
+++ b/task_add.php
@@ -68,7 +68,7 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
diff --git a/task_edit.php b/task_edit.php
index 630a22cd2..2b91f058e 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -101,7 +101,7 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
diff --git a/time.php b/time.php
index c7d2979cd..ae17aa0ad 100644
--- a/time.php
+++ b/time.php
@@ -312,7 +312,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
diff --git a/time_edit.php b/time_edit.php
index 21c3effa7..d0689ba70 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -365,7 +365,7 @@
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
         'user_id'=>$user->getActiveUser(),
-        'group_id'=>$user->getActiveGroup(),
+        'group_id'=>$user->getGroup(),
         'org_id' => $user->org_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
diff --git a/user_add.php b/user_add.php
index 662813ea6..bc78adbfa 100644
--- a/user_add.php
+++ b/user_add.php
@@ -46,7 +46,7 @@
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->getActiveGroup());
+  $clients = ttTeamHelper::getActiveClients($user->getGroup());
 
 $assigned_projects = array();
 if ($request->isPost()) {
@@ -90,7 +90,7 @@
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->getActiveGroup());
+$projects = ttTeamHelper::getActiveProjects($user->getGroup());
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -150,7 +150,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'group_id' => $user->getActiveGroup(),
+        'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
diff --git a/user_edit.php b/user_edit.php
index 580ad73c3..26dfa01a0 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -49,9 +49,9 @@
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->getActiveGroup());
+  $clients = ttTeamHelper::getActiveClients($user->getGroup());
 
-$projects = ttTeamHelper::getActiveProjects($user->getActiveGroup());
+$projects = ttTeamHelper::getActiveProjects($user->getGroup());
 $assigned_projects = array();
 
 if ($request->isPost()) {
diff --git a/users.php b/users.php
index 4afd5521f..fe0e92da9 100644
--- a/users.php
+++ b/users.php
@@ -48,7 +48,7 @@
   $group_id = $request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
 } else {
-  $group_id = $user->getActiveGroup();
+  $group_id = $user->getGroup();
 }
 
 $form = new Form('usersForm');

From 3cd4cdb1567b3b71fec7a980a3c1a432eb3a41a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 14:24:53 +0000
Subject: [PATCH 0445/1848] Added group dropdown in tasks.php page.

---
 WEB-INF/lib/ttGroup.class.php | 11 ----------
 WEB-INF/lib/ttUser.class.php  |  1 +
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/tasks.tpl   | 10 +++++++++
 tasks.php                     | 38 ++++++++++++++++++++++++++++++++---
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index c12be7788..26f2ee6c3 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -114,17 +114,6 @@ function __construct($id, $org_id) {
         if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
         $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
       }
-
-      // Set "on behalf" id and name (user).
-      if (isset($_SESSION['behalf_id'])) {
-          $this->behalf_id = $_SESSION['behalf_id'];
-          $this->behalf_name = $_SESSION['behalf_name'];
-      }
-      // Set "on behalf" id and name (group).
-      if (isset($_SESSION['behalf_group_id'])) {
-          $this->behalf_group_id = $_SESSION['behalf_group_id'];
-          $this->behalf_group_name = $_SESSION['behalf_group_name'];
-      }
       */
     }
   }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 04273aa78..2da8f9811 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -723,6 +723,7 @@ function setOnBehalfGroup($group_id) {
     $this->behalf_group_name = null;
     $this->behalf_id = null;
     $this->behalf_name = null;
+    unset($this->behalfGroup);
     unset($_SESSION['behalf_group_id']);
     unset($_SESSION['behalf_group_name']);
     unset($_SESSION['behalf_id']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8c299c99f..20cb8ff30 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.28.4521 | 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.28.4522 | 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/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 647a6a787..9db99069c 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -6,6 +6,16 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_tasks')}
+  {if $group_dropdown}
+{$forms.tasksForm.open} {* tasksForm consists only of one dropdown group control *}
+      <table width="100%">
+        <tr>
+          <td align="center">{$i18n.label.group}: {$forms.tasksForm.group.control}</td>
+        </tr>
+      </table>
+{$forms.tasksForm.close}
+  {/if}
+
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_tasks}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
diff --git a/tasks.php b/tasks.php
index c3903f94e..6c79fd50d 100644
--- a/tasks.php
+++ b/tasks.php
@@ -35,18 +35,50 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
+if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
+  header('Location: access_denied.php'); // Wrong group id in post.
+  exit();
+}
 // End of access checks.
 
+if ($request->isPost()) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+  // Tasks feature may not be available in new group, check and redirect.
+  if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+    header('Location: feature_disabled.php');
+    exit();
+  }
+} else {
+  $group_id = $user->getGroup();
+}
+
+$form = new Form('tasksForm');
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
+
 if($user->can('manage_tasks')) {
-  $active_tasks = ttTeamHelper::getActiveTasks($user->group_id);
-  $inactive_tasks = ttTeamHelper::getInactiveTasks($user->group_id);
+  $active_tasks = ttTeamHelper::getActiveTasks($group_id);
+  $inactive_tasks = ttTeamHelper::getInactiveTasks($group_id);
 } else
   $active_tasks = $user->getAssignedTasks();
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_tasks', $active_tasks);
 $smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));

From f58ab716cb0cc4b8be8e48723b345bfab29697a6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 15:54:11 +0000
Subject: [PATCH 0446/1848] Adjusted task_add.php and task_edit.php to operate
 with subgroups.

---
 WEB-INF/lib/ttOrgImportHelper.class.php |  8 ++++++--
 WEB-INF/lib/ttTaskHelper.class.php      | 10 +++++++---
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/task_edit.tpl         |  2 ++
 task_add.php                            |  4 ++--
 task_edit.php                           |  5 +++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ec5593c24..b5a28c8e8 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -181,7 +181,9 @@ function startElement($parser, $name, $attrs) {
         if ($task_id) {
           // Add a mapping.
           $this->currentGroupTaskMap[$attrs['ID']] = $task_id;
-        } else $this->errors->add($i18n->get('error.db'));
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
         return;
       }
 
@@ -205,7 +207,9 @@ function startElement($parser, $name, $attrs) {
         if ($project_id) {
           // Add a mapping.
           $this->currentGroupProjectMap[$attrs['ID']] = $project_id;
-        } else $this->errors->add($i18n->get('error.db'));
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
         return;
       }
 
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index c7f25d1a2..0d4d5eff4 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -35,9 +35,11 @@ static function get($id)
     global $user;
  
     $mdb2 = getConnection();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $sql = "select id, name, description, status from tt_tasks
-      where id = $id and group_id = $user->group_id and (status = 0 or status = 1)";
+      where id = $id and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -53,15 +55,17 @@ static function get($id)
   // getAssignedProjects - returns an array of projects associatied with a task.
   static function getAssignedProjects($task_id)
   {
-  	global $user;
+    global $user;
   	
     $result = array();
     $mdb2 = getConnection();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
     
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name from tt_projects p
       inner join tt_project_task_binds ptb on (ptb.project_id = p.id and ptb.task_id = $task_id)
-      where p.group_id = $user->group_id and p.status = 1 order by p.name";
+      where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 20cb8ff30..443e58683 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.28.4522 | 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.28.4523 | 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/task_edit.tpl b/WEB-INF/templates/task_edit.tpl
index 5af8d9355..f8b45a394 100644
--- a/WEB-INF/templates/task_edit.tpl
+++ b/WEB-INF/templates/task_edit.tpl
@@ -15,10 +15,12 @@
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.taskForm.status.control}</td>
         </tr>
+{if $show_projects}
         <tr valign="top">
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.taskForm.projects.control}</td>
         </tr>
+{/if}
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/task_add.php b/task_add.php
index 28a554bbd..b1ad08a09 100644
--- a/task_add.php
+++ b/task_add.php
@@ -37,13 +37,13 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttTeamHelper::getActiveProjects($user->getGroup());
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/task_edit.php b/task_edit.php
index 2b91f058e..c9f95ecb7 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
@@ -48,7 +48,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttTeamHelper::getActiveProjects($user->getGroup());
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -118,6 +118,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.edit_task'));
 $smarty->assign('content_page_name', 'task_edit.tpl');
 $smarty->display('index.tpl');

From c0f56fa7d299a4261fc77ba16b9d8f5a027b499f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 16:35:25 +0000
Subject: [PATCH 0447/1848] Usability improvements - conditional display of
 controls.

---
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/project_add.tpl  | 5 +++--
 WEB-INF/templates/project_edit.tpl | 4 +++-
 WEB-INF/templates/task_add.tpl     | 3 +++
 WEB-INF/templates/task_edit.tpl    | 1 +
 project_add.php                    | 6 ++++--
 project_edit.php                   | 6 ++++--
 task_add.php                       | 1 +
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 443e58683..fe920a007 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.28.4523 | 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.28.4524 | 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/project_add.tpl b/WEB-INF/templates/project_add.tpl
index 3aad22c20..2f2fb996e 100644
--- a/WEB-INF/templates/project_add.tpl
+++ b/WEB-INF/templates/project_add.tpl
@@ -11,13 +11,14 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.projectForm.description.control}</td>
         </tr>
+{if $show_users}
         <tr><td>&nbsp;</td></tr>
- 
         <tr>
           <td align="right">{$i18n.label.users}:</td>
           <td>{$forms.projectForm.users.control}</td>
         </tr>
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{/if}
+{if $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
diff --git a/WEB-INF/templates/project_edit.tpl b/WEB-INF/templates/project_edit.tpl
index 8faf675cb..bcabc37ac 100644
--- a/WEB-INF/templates/project_edit.tpl
+++ b/WEB-INF/templates/project_edit.tpl
@@ -15,12 +15,14 @@
           <td align="right">{$i18n.label.status}:</td>
           <td>{$forms.projectForm.status.control}</td>
         </tr>
+{if $show_users}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.users}:</td>
           <td>{$forms.projectForm.users.control}</td>
         </tr>
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{/if}
+{if $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
diff --git a/WEB-INF/templates/task_add.tpl b/WEB-INF/templates/task_add.tpl
index 53ce483d9..8e7f7882f 100644
--- a/WEB-INF/templates/task_add.tpl
+++ b/WEB-INF/templates/task_add.tpl
@@ -11,10 +11,13 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.taskForm.description.control}</td>
         </tr>
+{if $show_projects}
+        <tr><td>&nbsp;</td></tr>
         <tr valign="top">
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.taskForm.projects.control}</td>
         </tr>
+{/if}
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/WEB-INF/templates/task_edit.tpl b/WEB-INF/templates/task_edit.tpl
index f8b45a394..0bf189bba 100644
--- a/WEB-INF/templates/task_edit.tpl
+++ b/WEB-INF/templates/task_edit.tpl
@@ -16,6 +16,7 @@
           <td>{$forms.taskForm.status.control}</td>
         </tr>
 {if $show_projects}
+        <tr><td>&nbsp;</td></tr>
         <tr valign="top">
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.taskForm.projects.control}</td>
diff --git a/project_add.php b/project_add.php
index 6b41c15c6..9800b7215 100644
--- a/project_add.php
+++ b/project_add.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
@@ -66,7 +66,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -95,6 +95,8 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', count($tasks) > 0);
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_project'));
 $smarty->assign('content_page_name', 'project_add.tpl');
diff --git a/project_edit.php b/project_edit.php
index 29c0d51b9..542fb4647 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
@@ -85,7 +85,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
@@ -136,6 +136,8 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', count($tasks) > 0);
 $smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');
diff --git a/task_add.php b/task_add.php
index b1ad08a09..91f0e4fcd 100644
--- a/task_add.php
+++ b/task_add.php
@@ -84,6 +84,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_task'));
 $smarty->assign('content_page_name', 'task_add.tpl');

From 30bb88aea34039db35d696233149168a14af024c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 17:42:30 +0000
Subject: [PATCH 0448/1848] Made display of projects conditional on
 user_add.php and user_edit.php.

---
 WEB-INF/templates/footer.tpl    | 2 +-
 WEB-INF/templates/user_add.tpl  | 6 ++++--
 WEB-INF/templates/user_edit.tpl | 3 ++-
 user_add.php                    | 1 +
 user_edit.php                   | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fe920a007..40949083e 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.28.4524 | 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.28.4525 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 762f0528e..29218d866 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -81,15 +81,17 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && $show_projects}
+    <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>
+{/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
     </tr>
-{/if}
+
     <tr>
       <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
     </tr>
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index a0872a1fb..0c24a0113 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -115,7 +115,8 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && $show_projects}
+    <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
diff --git a/user_add.php b/user_add.php
index bc78adbfa..7fb6ea3c7 100644
--- a/user_add.php
+++ b/user_add.php
@@ -169,6 +169,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'user_add.tpl');
diff --git a/user_edit.php b/user_edit.php
index 26dfa01a0..c1c9e6c85 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -227,6 +227,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('can_swap', $can_swap);
+$smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('user_id', $user_id);

From 5492c8b02d8f7ff98a159c01948101000d98e06e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Nov 2018 19:04:56 +0000
Subject: [PATCH 0449/1848] A bit more refactoring for subgroups.

---
 WEB-INF/lib/ttClientHelper.class.php  |  8 +++++---
 WEB-INF/lib/ttInvoiceHelper.class.php | 21 ++++++++++++---------
 WEB-INF/templates/footer.tpl          |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index e557676fa..8f673f43e 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -31,9 +31,11 @@ class ttClientHelper {
 
   // The getClient looks up a client by id.
   static function getClient($client_id, $all_fields = false) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $sql = 'select ';
     if ($all_fields)
@@ -41,7 +43,7 @@ static function getClient($client_id, $all_fields = false) {
     else
       $sql .= 'name ';
 
-    $sql .= "from tt_clients where group_id = ".$user->getGroup().
+    $sql .= "from tt_clients where group_id = $group_id and org_id = $org_id".
       " and id = $client_id and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 13e5dea08..3d67f6a78 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -155,7 +155,7 @@ static function getInvoiceItems($invoice_id) {
     // It is anticipated to support "totals only" option later on.
 
     // Our query is different depending on tracking mode.
-    if (MODE_TIME == $user->tracking_mode) {
+    if (MODE_TIME == $user->getTrackingMode()) {
       // In "time only" tracking mode there is a single user rate.
       $sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name,
       t.name as task_name, l.comment as note,
@@ -258,7 +258,7 @@ static function invoiceableItemsExist($fields) {
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Our query is different depending on tracking mode.
-    if (MODE_TIME == $user->tracking_mode) {
+    if (MODE_TIME == $user->getTrackingMode()) {
       // In "time only" tracking mode there is a single user rate.
       $sql = "select count(*) as num from tt_log l, tt_users u
         where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL
@@ -344,7 +344,7 @@ static function createInvoice($fields) {
     $last_id = $val['last_insert_id'];
 
     // Our update sql is different depending on tracking mode.
-    if (MODE_TIME == $user->tracking_mode) {
+    if (MODE_TIME == $user->getTrackingMode()) {
       // In "time only" tracking mode there is a single user rate.
       $sql = "update tt_log l
         left join tt_users u on (u.id = l.user_id)
@@ -426,6 +426,9 @@ static function prepareInvoiceBody($invoice_id, $comment)
     $style_tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $style_tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
 
+    // Determine tracking mode once for multiple reuse below.
+    $trackingMode = $user->getTrackingMode();
+
     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
@@ -451,9 +454,9 @@ static function prepareInvoiceBody($invoice_id, $comment)
     $body .= '<tr>';
     $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.date').'</td>';
     $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('form.invoice.person').'</td>';
-    if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+    if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
       $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.project').'</td>';
-    if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+    if (MODE_PROJECTS_AND_TASKS == $trackingMode)
       $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.task').'</td>';
     $body .= '<td style="'.$style_tableHeader.'">'.$i18n->get('label.note').'</td>';
     $body .= '<td style="'.$style_tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
@@ -463,9 +466,9 @@ static function prepareInvoiceBody($invoice_id, $comment)
       $body .= '<tr>';
       $body .= '<td>'.$item['date'].'</td>';
       $body .= '<td>'.htmlspecialchars($item['user_name']).'</td>';
-      if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+      if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
         $body .= '<td>'.htmlspecialchars($item['project_name']).'</td>';
-      if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+      if (MODE_PROJECTS_AND_TASKS == $trackingMode)
         $body .= '<td>'.htmlspecialchars($item['task_name']).'</td>';
       $body .= '<td>'.htmlspecialchars($item['note']).'</td>';
       $body .= '<td align="right">'.$item['duration'].'</td>';
@@ -474,9 +477,9 @@ static function prepareInvoiceBody($invoice_id, $comment)
     }
     // Output summary.
     $colspan = 4;
-    if (MODE_PROJECTS == $user->tracking_mode)
+    if (MODE_PROJECTS == $trackingMode)
       $colspan++;
-    elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+    elseif (MODE_PROJECTS_AND_TASKS == $trackingMode)
       $colspan += 2;
     $body .= '<tr><td>&nbsp;</td></tr>';
     if ($tax) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 40949083e..dba4a8b67 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.28.4525 | 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.28.4526 | 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>

From dc825d15a8f66df15a52af1275fbaad594e93aa1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Nov 2018 00:32:34 +0000
Subject: [PATCH 0450/1848] Adjusted plugins.php page to support subgroups.

---
 WEB-INF/lib/ttGroup.class.php |  5 ++++-
 WEB-INF/lib/ttUser.class.php  | 10 +++++++++
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/plugins.tpl |  7 ++++++
 plugins.php                   | 42 ++++++++++++++++++++++++++++++-----
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 26f2ee6c3..1d33fe111 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -94,12 +94,15 @@ function __construct($id, $org_id) {
       $this->password_complexity = $val['password_complexity'];
       $this->group_name = $val['group_name'];
       $this->currency = $val['currency'];
+      */
       $this->plugins = $val['plugins'];
+      /*
       $this->lock_spec = $val['lock_spec'];
       $this->workday_minutes = $val['workday_minutes'];
       $this->custom_logo = $val['custom_logo'];
-
+      */
       $this->config = $val['config'];
+      /*
       $config = new ttConfigHelper($this->config);
       // Set user config options.
       $this->show_holidays = $config->getDefinedValue('show_holidays');
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2da8f9811..bece653d7 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -181,6 +181,16 @@ function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
   }
 
+  // getPlugins returns plugins string for active group.
+  function getPlugins() {
+    return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins);
+  }
+
+  // getConfig returns config string for active group.
+  function getConfig() {
+    return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
+  }
+
   // The getActiveUser returns user id on behalf of whom the current user is operating.
   function getActiveUser() {
     return ($this->behalf_id ? $this->behalf_id : $this->id);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dba4a8b67..fa2392329 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.28.4526 | 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.28.4527 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index f72d5699a..d31bb841a 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -89,6 +89,13 @@ function handlePluginCheckboxes() {
 <table cellspacing="4" cellpadding="7" border="0">
     <tr>
       <td>
+{if $group_dropdown}
+        <table width="100%">
+          <tr>
+            <td align="center">{$i18n.label.group}: {$forms.pluginsForm.group.control}</td>
+          </tr>
+        </table>
+{/if}
         <table cellspacing="1" cellpadding="2" border="0">
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.charts.control}</td>
diff --git a/plugins.php b/plugins.php
index 60b86fede..5c830149b 100644
--- a/plugins.php
+++ b/plugins.php
@@ -34,10 +34,19 @@
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost() && $request->getParameter('group_changed') && !$user->isGroupValid($request->getParameter('group'))) {
+  header('Location: access_denied.php'); // Wrong group id in post.
+  exit();
+}
 // End of access checks.
 
-$config = new ttConfigHelper($user->config);
-
+// TODO: re-structure the file, perhaps by separating post and get processing into whole different sections.
+if ($request->isPost() && $request->getParameter('group_changed')) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getGroup();
+}
 
 if ($request->isPost()) {
   // Plugin checkboxes.
@@ -56,7 +65,7 @@
   $cl_work_units = $request->getParameter('work_units');
 } else {
   // Which plugins do we have enabled?
-  $plugins = explode(',', $user->plugins);
+  $plugins = explode(',', $user->getPlugins());
   $cl_charts = in_array('ch', $plugins);
   $cl_clients = in_array('cl', $plugins);
   $cl_client_required = in_array('cm', $plugins);
@@ -74,6 +83,21 @@
 
 $form = new Form('pluginsForm');
 
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.pluginsForm.group_changed.value=1;document.pluginsForm.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
+
 // Plugin checkboxes.
 $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
 $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
@@ -91,7 +115,15 @@
 
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
+$form->setValueByElement('group_changed','');
+
 if ($request->isPost()) {
+  if ($request->getParameter('group_changed')) {
+    // User changed the group in dropdown.
+    // Redirect to self.
+    header('Location: plugins.php');
+    exit();
+  }
 
   // Validate user input. Do we have to?
 
@@ -125,7 +157,7 @@
       $plugins .= ',wu';
 
     // Recycle week view plugin options as they are not configured on this page.
-    $existing_plugins = explode(',', $user->plugins);
+    $existing_plugins = explode(',', $user->getPlugins());
     if (in_array('wvn', $existing_plugins))
       $plugins .= ',wvn';
     if (in_array('wvl', $existing_plugins))
@@ -137,7 +169,7 @@
 
     if ($user->updateGroup(array(
       'plugins' => $plugins))) {
-      header('Location: time.php');
+      header('Location: success.php');
       exit();
     } else
       $err->add($i18n->get('error.db'));

From 0c28ebb2ecb192d9d1976d86de7d1f24f109171d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Nov 2018 15:00:48 +0000
Subject: [PATCH 0451/1848] Some refactoring in plugins.php to make things
 better.

---
 WEB-INF/lib/ttUser.class.php |   1 -
 WEB-INF/templates/footer.tpl |   2 +-
 plugins.php                  | 134 +++++++++++++++++------------------
 3 files changed, 66 insertions(+), 71 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index bece653d7..a6047a7f0 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -755,7 +755,6 @@ function setOnBehalfGroup($group_id) {
     $this->behalf_group_id = $group_id;
     $this->behalf_group_name = $onBehalfGroupName;
 
-    unset($this->behalfGroup);
     $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
 
     // Adjust on behalf user.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fa2392329..79ff7901a 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.28.4527 | 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.28.4528 | 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/plugins.php b/plugins.php
index 5c830149b..e036c1738 100644
--- a/plugins.php
+++ b/plugins.php
@@ -34,22 +34,25 @@
   header('Location: access_denied.php');
   exit();
 }
-if ($request->isPost() && $request->getParameter('group_changed') && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
+if ($request->isPost()) {
+  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
+  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    exit();
+  }
 }
 // End of access checks.
 
-// TODO: re-structure the file, perhaps by separating post and get processing into whole different sections.
-if ($request->isPost() && $request->getParameter('group_changed')) {
+// Determine group for which we display this page.
+if ($request->isPost() && $groupChanged) {
   $group_id = $request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
 } else {
   $group_id = $user->getGroup();
 }
 
-if ($request->isPost()) {
-  // Plugin checkboxes.
+if ($request->isPost() && $request->getParameter('btn_save')) {
+  // Plugins that user wants to save for the current group.
   $cl_charts = $request->getParameter('charts');
   $cl_clients = $request->getParameter('clients');
   $cl_client_required = $request->getParameter('client_required');
@@ -64,7 +67,8 @@
   $cl_week_view = $request->getParameter('week_view');
   $cl_work_units = $request->getParameter('work_units');
 } else {
-  // Which plugins do we have enabled?
+  // Note: we get here in get, and also in post when group changes.
+  // Which plugins do we have enabled in currently selected group?
   $plugins = explode(',', $user->getPlugins());
   $cl_charts = in_array('ch', $plugins);
   $cl_clients = in_array('cl', $plugins);
@@ -82,7 +86,7 @@
 }
 
 $form = new Form('pluginsForm');
-
+// Group dropdown.
 if ($user->can('manage_subgroups')) {
   $groups = $user->getGroupsForDropdown();
   if (count($groups) > 1) {
@@ -97,7 +101,6 @@
     $smarty->assign('group_dropdown', 1);
   }
 }
-
 // Plugin checkboxes.
 $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
 $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
@@ -112,68 +115,61 @@
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
-
+// Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
-$form->setValueByElement('group_changed','');
-
-if ($request->isPost()) {
-  if ($request->getParameter('group_changed')) {
-    // User changed the group in dropdown.
-    // Redirect to self.
-    header('Location: plugins.php');
+if ($request->isPost() && $request->getParameter('btn_save')) {
+  // Note: we get here when the Save button is clicked.
+  // We update plugin list for the currently selected group.
+  //
+  // We don't get here if group changed in post.
+  // In this case the page is simply re-displayed for new group.
+
+  // Prepare plugins string.
+  if ($cl_charts)
+    $plugins .= ',ch';
+  if ($cl_clients)
+     $plugins .= ',cl';
+  if ($cl_client_required)
+    $plugins .= ',cm';
+  if ($cl_invoices)
+    $plugins .= ',iv';
+  if ($cl_paid_status)
+    $plugins .= ',ps';
+  if ($cl_custom_fields)
+    $plugins .= ',cf';
+  if ($cl_expenses)
+    $plugins .= ',ex';
+  if ($cl_tax_expenses)
+    $plugins .= ',et';
+  if ($cl_notifications)
+    $plugins .= ',no';
+  if ($cl_locking)
+    $plugins .= ',lk';
+  if ($cl_quotas)
+    $plugins .= ',mq';
+  if ($cl_week_view)
+    $plugins .= ',wv';
+  if ($cl_work_units)
+    $plugins .= ',wu';
+
+  // Recycle week view plugin options as they are not configured on this page.
+  $existing_plugins = explode(',', $user->getPlugins());
+  if (in_array('wvn', $existing_plugins))
+    $plugins .= ',wvn';
+  if (in_array('wvl', $existing_plugins))
+    $plugins .= ',wvl';
+  if (in_array('wvns', $existing_plugins))
+    $plugins .= ',wvns';
+
+  $plugins = trim($plugins, ',');
+
+  if ($user->updateGroup(array(
+    'plugins' => $plugins))) {
+    header('Location: success.php');
     exit();
-  }
-
-  // Validate user input. Do we have to?
-
-  if ($err->no()) {
-    // Prepare plugins string.
-    if ($cl_charts)
-      $plugins .= ',ch';
-    if ($cl_clients)
-      $plugins .= ',cl';
-    if ($cl_client_required)
-      $plugins .= ',cm';
-    if ($cl_invoices)
-      $plugins .= ',iv';
-    if ($cl_paid_status)
-      $plugins .= ',ps';
-    if ($cl_custom_fields)
-      $plugins .= ',cf';
-    if ($cl_expenses)
-      $plugins .= ',ex';
-    if ($cl_tax_expenses)
-      $plugins .= ',et';
-    if ($cl_notifications)
-      $plugins .= ',no';
-    if ($cl_locking)
-      $plugins .= ',lk';
-    if ($cl_quotas)
-      $plugins .= ',mq';
-    if ($cl_week_view)
-      $plugins .= ',wv';
-    if ($cl_work_units)
-      $plugins .= ',wu';
-
-    // Recycle week view plugin options as they are not configured on this page.
-    $existing_plugins = explode(',', $user->getPlugins());
-    if (in_array('wvn', $existing_plugins))
-      $plugins .= ',wvn';
-    if (in_array('wvl', $existing_plugins))
-      $plugins .= ',wvl';
-    if (in_array('wvns', $existing_plugins))
-      $plugins .= ',wvns';
-
-    $plugins = trim($plugins, ',');
-
-    if ($user->updateGroup(array(
-      'plugins' => $plugins))) {
-      header('Location: success.php');
-      exit();
-    } else
-      $err->add($i18n->get('error.db'));
-  }
+  } else
+    $err->add($i18n->get('error.db'));
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From 52efa3cc9f8ad94f363f41cc2bca472b6492268d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Nov 2018 19:35:03 +0000
Subject: [PATCH 0452/1848] Ongoing refactoring in time.php to support
 subgroups.

---
 WEB-INF/lib/ttGroup.class.php |   2 +
 WEB-INF/lib/ttUser.class.php  |  49 ++++++++++++-
 WEB-INF/templates/footer.tpl  |   2 +-
 WEB-INF/templates/time.tpl    |   8 +-
 time.php                      | 134 +++++++++++++---------------------
 5 files changed, 105 insertions(+), 90 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 1d33fe111..e232a0e1a 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -88,7 +88,9 @@ function __construct($id, $org_id) {
       /* TODO: initialize other things here.
       $this->project_required = $val['project_required'];
       $this->task_required = $val['task_required'];
+       */
       $this->record_type = $val['record_type'];
+      /*
       $this->bcc_email = $val['bcc_email'];
       $this->allow_ip = $val['allow_ip'];
       $this->password_complexity = $val['password_complexity'];
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a6047a7f0..968a1f100 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -181,6 +181,11 @@ function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
   }
 
+  // getRecordType returns record type for active group.
+  function getRecordType() {
+    return ($this->behalfGroup ? $this->behalfGroup->record_type : $this->record_type);
+  }
+
   // getPlugins returns plugins string for active group.
   function getPlugins() {
     return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins);
@@ -209,7 +214,7 @@ function isClient() {
   // isPluginEnabled checks whether a plugin is enabled for user.
   function isPluginEnabled($plugin)
   {
-    return in_array($plugin, explode(',', $this->plugins));
+    return in_array($plugin, explode(',', $this->getPlugins()));
   }
 
   // getAssignedProjects - returns an array of assigned projects.
@@ -662,6 +667,20 @@ function enablePlugin($plugin, $enable = true)
     return true;
   }
 
+  // isUserValid determines if a user is valid for on behalf work.
+  function isUserValid($user_id) {
+    if ($user_id == $this->id)
+      return true;
+
+    $user_details = $this->getUser($user_id); // TODO: this will probably not work for higher ranks.
+                                              // In this case we'll need another function.
+                                              // Or adjust getUser for max rank.
+    if (!$user_details)
+      return false;
+
+    return true;
+  }
+
   // isGroupValid determines if a group is valid for user.
   function isGroupValid($group_id) {
     if ($group_id == $this->group_id)
@@ -742,10 +761,10 @@ function setOnBehalfGroup($group_id) {
     // Do not do anything if we don't have rights.
     if (!$this->can('manage_subgroups')) return;
 
-    // No need to set if the group is our home group.
+    // No need to set if group is our home group.
     if ($group_id == $this->group_id) return;
 
-    // No need to set if the subgroup is not valid.
+    // No need to set if subgroup is not valid.
     if (!$this->isSubgroupValid($group_id)) return;
 
     // We are good to set on behalf group.
@@ -761,4 +780,28 @@ function setOnBehalfGroup($group_id) {
     $this->adjustBehalfId();
     return;
   }
+
+   // setOnBehalfUser sets on behalf user both the object and the session.
+  function setOnBehalfUser($user_id) {
+
+    // Unset things first.
+    $this->behalf_id = null;
+    $this->behalf_name = null;
+    unset($_SESSION['behalf_id']);
+    unset($_SESSION['behalf_name']);
+
+    // No need to set if user is us.
+    if ($user_id == $this->id) return;
+
+    // No need to set if user id is not valid.
+    if (!$this->isUserValid($user_id)) return;
+
+    // We are good to set on behalf user.
+    $onBehalfUserName = ttUserHelper::getUserName($user_id);
+    $_SESSION['behalf_id'] = $user_id;
+    $_SESSION['behalf_name'] = $onBehalfUserName;
+    $this->behalf_id = $user_id;
+    $this->behalf_name = $onBehalfUserName;
+    return;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 79ff7901a..6e62d6e37 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.28.4528 | 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.28.4529 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 0e05f05bc..bb8628713 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -18,16 +18,16 @@
   <tr>
     <td valign="top">
       <table>
-{if $on_behalf_group_control}
+{if $group_dropdown}
         <tr>
           <td align="right">{$i18n.label.group}:</td>
-          <td>{$forms.timeRecordForm.onBehalfGroup.control}</td>
+          <td>{$forms.timeRecordForm.group.control}</td>
         </tr>
 {/if}
-{if $on_behalf_control}
+{if $user_dropdown}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.timeRecordForm.onBehalfUser.control}</td>
+          <td>{$forms.timeRecordForm.user.control}</td>
         </tr>
 {/if}
 {if $user->isPluginEnabled('cl')}
diff --git a/time.php b/time.php
index ae17aa0ad..33768d463 100644
--- a/time.php
+++ b/time.php
@@ -48,8 +48,35 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+if ($request->isPost()) {
+  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
+  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    exit();
+  }
+  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    exit();
+  }
+}
 // End of access checks.
 
+// Determine group for which we display this page.
+if ($request->isPost() && $groupChanged) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getGroup();
+}
+// Determine user for which we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getActiveUser();
+}
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -62,7 +89,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields($user->getGroup());
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -95,8 +122,8 @@
     if (isset($_SESSION['billable']))
       $cl_billable = $_SESSION['billable'];
 }
-$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
-$on_behalf_group_id = $request->getParameter('onBehalfGroup', (isset($_SESSION['behalf_group_id'])? $_SESSION['behalf_group_id'] : $user->group_id));
+//$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
+//$on_behalf_group_id = $request->getParameter('onBehalfGroup', (isset($_SESSION['behalf_group_id'])? $_SESSION['behalf_group_id'] : $user->group_id));
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -106,45 +133,44 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
-
-if (isTrue(SUBGROUP_DEBUG)) {
+// Group dropdown.
 if ($user->can('manage_subgroups')) {
   $groups = $user->getGroupsForDropdown();
   if (count($groups) > 1) {
     $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'onBehalfGroup',
+      'onchange'=>'document.timeRecordForm.group_changed.value=1;document.timeRecordForm.submit();',
+      'name'=>'group',
       'style'=>'width: 250px;',
-      'value'=>$on_behalf_group_id,
+      'value'=>$group_id,
       'data'=>$groups,
       'datakeys'=>array('id','name')));
-    $smarty->assign('on_behalf_group_control', 1);
+    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
+    $smarty->assign('group_dropdown', 1);
   }
 }
-} // SUBGROUP_DEBUG
-
 if ($user->can('track_time')) {
-  $rank = $user->getMaxRankForGroup($on_behalf_group_id);
+  $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
-    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'onBehalfUser',
+      'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
+      'name'=>'user',
       'style'=>'width: 250px;',
-      'value'=>$on_behalf_id,
+      'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
-    $smarty->assign('on_behalf_control', 1);
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
   }
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
+  $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -156,7 +182,7 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -170,7 +196,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -197,8 +223,8 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+  $task_list = ttTeamHelper::getActiveTasks($user->getGroup());
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
@@ -209,7 +235,7 @@
 }
 
 // Add other controls.
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
   if ($user->punch_mode && !$user->canOverridePunchMode()) {
@@ -218,7 +244,7 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 if (!defined('NOTE_INPUT_HEIGHT'))
   define('NOTE_INPUT_HEIGHT', 40);
@@ -367,62 +393,6 @@
       exit();
     }
   }
-  elseif ($request->getParameter('onBehalfUser') || $request->getParameter('onBehalfGroup')) {
-    // User changed either on behalf user or group.
-    // TODO: Organize this code into a separate function.
-
-    // We get here if one of the dropdowns changed. Handle these 2 situations differently.
-    // 1) User changed. Determine if user changed. Then do exactly as before.
-    //
-    // Group changed. Determine if group changed.
-    // Adjust group info.
-    // Adjust user info to first user in group (or self if we are in home group now).
-    //
-    // Determine if user was changed.
-    if ($request->getParameter('onBehalfUser')) {
-      $request_user_id = $request->getParameter('onBehalfUser');
-      $session_user_id = $_SESSION['behalf_id'];
-      $user_changed = !(($session_user_id == null && ($user->id == $request_user_id))
-                      || ($session_user_id != null && ($request_user_id == $session_user_id)));
-      if ($user_changed && $user->can('track_time')) {
-        unset($_SESSION['behalf_id']);
-        unset($_SESSION['behalf_name']);
-
-        if($request_user_id != $user->id) {
-          $_SESSION['behalf_id'] = $request_user_id;
-          $_SESSION['behalf_name'] = ttUserHelper::getUserName($request_user_id);
-        }
-      }
-    }
-
-    if ($request->getParameter('onBehalfGroup')) {
-      // Determine if group was changed.
-      $request_group_id = $request->getParameter('onBehalfGroup');
-      $session_group_id = $_SESSION['behalf_group_id'];
-      $group_changed = !(($session_group_id == null && ($user->group_id == $request_group_id))
-                      || ($session_group_id != null && ($request_group_id == $session_group_id)));
-
-      if ($group_changed && $user->can('manage_subgroups')) {
-        unset($_SESSION['behalf_group_id']);
-        unset($_SESSION['behalf_group_name']);
-        if ($request_group_id == $user->group_id)
-          $user->behalf_group_id = null;
-
-        if (($request_group_id != $user->group_id) && $user->isSubgroupValid($request_group_id)) {
-          $_SESSION['behalf_group_id'] = $request_group_id;
-          $_SESSION['behalf_group_name'] = ttGroupHelper::getGroupName($request_group_id);
-          $user->behalf_group_id = $request_group_id;
-        }
-
-        unset($_SESSION['behalf_id']);
-        unset($_SESSION['behalf_name']);
-        if ($request_group_id != $user->group_id)
-          $user->adjustBehalfId();
-      }
-    }
-    header('Location: time.php');
-    exit();
-  }
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);

From eb88312a950031020c710aa5994c445a0dfd4443 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Nov 2018 21:11:38 +0000
Subject: [PATCH 0453/1848] Fixed time.php for subgroup support in high rank
 situations.

---
 WEB-INF/lib/ttUser.class.php | 21 +++++++++------------
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/user_delete.php       |  2 +-
 mobile/user_edit.php         |  2 +-
 swap_roles.php               |  2 +-
 time.php                     |  2 +-
 user_delete.php              |  2 +-
 user_edit.php                |  2 +-
 8 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 968a1f100..82a31958e 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -479,19 +479,23 @@ function getSubgroups($group_id = null) {
     return $groups;
   }
 
-  // getUser function is used to manage users in group and returns user details.
+  // getUserDetails function is used to manage users in group and returns user details.
   // At the moment, the function is used for user edits and deletes.
-  function getUser($user_id) {
+  function getUserDetails($user_id) {
     if (!$this->can('manage_users')) return false;
 
     $mdb2 = getConnection();
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
+    // Determine max rank. If we are searching in on behalf group
+    // then rank restriction does not apply.
+    $max_rank = $this->behalfGroup ? MAX_RANK : $this->rank;
+
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
       " left join tt_roles r on (u.role_id = r.id)".
       " where u.id = $user_id and u.group_id = $group_id and u.org_id = $org_id and u.status is not null".
-      " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
+      " and (r.rank < $max_rank or (r.rank = $max_rank and u.id = $this->id))"; // Users with lesser roles or self.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -608,7 +612,7 @@ function markUserDeleted($user_id) {
       return false;
 
     // Make sure we operate on a legit user.
-    $user_details = $this->getUser($user_id);
+    $user_details = $this->getUserDetails($user_id);
     if (!$user_details) return false;
 
     $mdb2 = getConnection();
@@ -671,14 +675,7 @@ function enablePlugin($plugin, $enable = true)
   function isUserValid($user_id) {
     if ($user_id == $this->id)
       return true;
-
-    $user_details = $this->getUser($user_id); // TODO: this will probably not work for higher ranks.
-                                              // In this case we'll need another function.
-                                              // Or adjust getUser for max rank.
-    if (!$user_details)
-      return false;
-
-    return true;
+    return ($this->getUserDetails($user_id) != null);
   }
 
   // isGroupValid determines if a group is valid for user.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6e62d6e37..1f6329b17 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.28.4529 | 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.28.4530 | 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_delete.php b/mobile/user_delete.php
index ac6c7c88c..e44483ecc 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -36,7 +36,7 @@
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 46646bcaf..c9b4af81c 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -40,7 +40,7 @@
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();
diff --git a/swap_roles.php b/swap_roles.php
index 05485018b..1652ae2a8 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -42,7 +42,7 @@
 }
 if ($request->isPost()) {
   $user_id = (int)$request->getParameter('swap_with');
-  $user_details = $user->getUser($user_id);
+  $user_details = $user->getUserDetails($user_id);
   if (!$user_details) {
     header('Location: access_denied.php');
     exit();
diff --git a/time.php b/time.php
index 33768d463..782c3472a 100644
--- a/time.php
+++ b/time.php
@@ -56,7 +56,7 @@
   }
   $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
   if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
     exit();
   }
 }
diff --git a/user_delete.php b/user_delete.php
index 13b5ed0b7..38d4f5424 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -36,7 +36,7 @@
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();
diff --git a/user_edit.php b/user_edit.php
index c1c9e6c85..8a4e421b1 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -41,7 +41,7 @@
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();

From 1e7092b2a85592240048d9622a6f619aa2a7c68a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Nov 2018 22:14:54 +0000
Subject: [PATCH 0454/1848] A few fixes for subgroup support.

---
 WEB-INF/lib/ttTeamHelper.class.php | 12 ++++++++++--
 WEB-INF/lib/ttUser.class.php       |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/users.tpl        |  4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 241c92c04..5a3dd2fb6 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -296,7 +296,11 @@ static function getActiveRolesForUser()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 1 order by rank";
+    // Determine max rank. If we are working in on behalf group
+    // then rank restriction does not apply.
+    $max_rank = $user->behalfGroup ? MAX_RANK : $user->rank;
+
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $max_rank and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -357,7 +361,11 @@ static function getInactiveRolesForUser()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 0 order by rank";
+    // Determine max rank. If we are working in on behalf group
+    // then rank restriction does not apply.
+    $max_rank = $user->behalfGroup ? MAX_RANK : $user->rank;
+
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $max_rank and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 82a31958e..457d23022 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -344,7 +344,7 @@ function getUsers($options) {
     $skipClients = !isset($options['include_clients']);
     $includeSelf = isset($options['include_self']);
 
-    $select_part = 'select u.id, u.name';
+    $select_part = 'select u.id, u.group_id, u.name';
     if (isset($options['include_login'])) $select_part .= ', u.login';
     if (!isset($options['include_clients'])) $select_part .= ', r.rights';
     if (isset($options['include_role'])) $select_part .= ', r.name as role_name, r.rank';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1f6329b17..aba47ce47 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.28.4530 | 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.28.4531 | 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/users.tpl b/WEB-INF/templates/users.tpl
index d729c41c9..d539f8d54 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -38,7 +38,7 @@
           </td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
-      {if $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
          {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>{else}<td></td>{/if}
       {else}
@@ -73,7 +73,7 @@
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
-      {if $u.rank < $user->rank}
+      {if $u.rank < $user->rank || $u.group_id != $user->group_id}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
           <td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>
       {else}

From fa6508ac21c30d6bfef008387fabd29a843d7b66 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Nov 2018 22:49:50 +0000
Subject: [PATCH 0455/1848] Refactoring: renamed getActiveUser() to getUser().

---
 WEB-INF/lib/form/Calendar.class.php    |  2 +-
 WEB-INF/lib/ttClientHelper.class.php   |  2 +-
 WEB-INF/lib/ttExpenseHelper.class.php  |  2 +-
 WEB-INF/lib/ttUser.class.php           | 14 +++++++-------
 WEB-INF/lib/ttWeekViewHelper.class.php | 10 +++++-----
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/users.tpl            |  2 +-
 expense_delete.php                     |  4 ++--
 expense_edit.php                       |  4 ++--
 expenses.php                           |  4 ++--
 mobile/expense_delete.php              |  4 ++--
 mobile/expense_edit.php                |  4 ++--
 mobile/expenses.php                    |  4 ++--
 mobile/time.php                        | 10 +++++-----
 mobile/time_delete.php                 |  4 ++--
 mobile/time_edit.php                   |  8 ++++----
 mobile/timer.php                       | 18 +++++++++---------
 time.php                               | 22 +++++++++++-----------
 time_delete.php                        |  4 ++--
 time_edit.php                          | 14 +++++++-------
 week.php                               |  8 ++++----
 21 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 4c835f62e..6c4a42231 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -260,7 +260,7 @@ function _genStyles() {
     function _getActiveDates($start, $end) {
       
       global $user;
-      $user_id = $user->getActiveUser();
+      $user_id = $user->getUser();
       
       $table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';
       
diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 8f673f43e..3ae662a11 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -289,7 +289,7 @@ static function getAssignedProjects($client_id)
   static function getClientsForUser()
   {
     global $user;
-    $user_id = $user->getActiveUser();
+    $user_id = $user->getUser();
 
     $result = array();
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index e42a0ab5e..622e035ce 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -34,7 +34,7 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
-    $user_id = $user->getActiveUser();
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 457d23022..eae6b83f1 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -166,8 +166,13 @@ function __construct($login, $id = null) {
     }
   }
 
+  // The getUser returns user id on behalf of whom the current user is operating.
+  function getUser() {
+    return ($this->behalf_id ? $this->behalf_id : $this->id);
+  }
+
   // The getGroup returns group id on behalf of which the current user is operating.
-   function getGroup() {
+  function getGroup() {
     return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
   }
 
@@ -196,11 +201,6 @@ function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
   }
 
-  // The getActiveUser returns user id on behalf of whom the current user is operating.
-  function getActiveUser() {
-    return ($this->behalf_id ? $this->behalf_id : $this->id);
-  }
-
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
@@ -226,7 +226,7 @@ function getAssignedProjects()
     $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
-      inner join tt_user_project_binds upb on (upb.user_id = ".$this->getActiveUser()." and upb.project_id = p.id and upb.status = 1)
+      inner join tt_user_project_binds upb on (upb.user_id = ".$this->getUser()." and upb.project_id = p.id and upb.status = 1)
       where p.group_id = $group_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index f0bc13bda..2cfb3813d 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -236,7 +236,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
     unset($objDate);
 
     // Obtain past week(s) records.
-    $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $pastWeekStartDate, $pastWeekEndDate);
+    $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
     // Handle potential situation of no records by re-trying for up to 4 more previous weeks (after a long vacation, etc.).
     if (!$records) {
       for ($i = 0; $i < 4; $i++) {
@@ -247,7 +247,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
         $pastWeekEndDate = $objDate->toString(DB_DATEFORMAT);
         unset($objDate);
 
-        $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $pastWeekStartDate, $pastWeekEndDate);
+        $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
         // Break out of the loop if we found something.
         if ($records) break;
       }
@@ -492,7 +492,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
 
     // Prepare an array of fields for regular insert function.
     $fields4insert = array();
-    $fields4insert['user_id'] = $user->getActiveUser();
+    $fields4insert['user_id'] = $user->getUser();
     $fields4insert['group_id'] = $user->getGroup();
     $fields4insert['org_id'] = $user->org_id;
     $fields4insert['date'] = $entry_date;
@@ -532,7 +532,7 @@ static function modifyDurationFromWeekView($fields, $err) {
     $mdb2 = getConnection();
     $duration = $fields['duration'];
     $tt_log_id = $fields['tt_log_id'];
-    $user_id = $user->getActiveUser();
+    $user_id = $user->getUser();
     $sql = "update tt_log set duration = '$duration' where id = $tt_log_id and user_id = $user_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -598,7 +598,7 @@ static function modifyCommentFromWeekView($fields) {
     $mdb2 = getConnection();
     $tt_log_id = $fields['tt_log_id'];
     $comment = $fields['comment'];
-    $user_id = $user->getActiveUser();
+    $user_id = $user->getUser();
     $sql = "update tt_log set comment = ".$mdb2->quote($fields['comment'])." where id = $tt_log_id and user_id = $user_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aba47ce47..702256243 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.28.4531 | 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.28.4532 | 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/users.tpl b/WEB-INF/templates/users.tpl
index d539f8d54..fb46c96d6 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -73,7 +73,7 @@
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
-      {if $u.rank < $user->rank || $u.group_id != $user->group_id}
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
           <td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>
       {else}
diff --git a/expense_delete.php b/expense_delete.php
index 49bb8ac1b..fcb039f07 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -42,7 +42,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are deleting.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
+$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit deleting not ours or invoiced items.
   header('Location: access_denied.php');
@@ -59,7 +59,7 @@
 
     if ($err->no()) {
       // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id, $user->getActiveUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id, $user->getUser())) {
         header('Location: expenses.php');
         exit();
       } else
diff --git a/expense_edit.php b/expense_edit.php
index 0c7cee5cd..049bc4bee 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -43,7 +43,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
+$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit editing not ours or invoiced items.
   header('Location: access_denied.php');
@@ -189,7 +189,7 @@
 
     // Now, an update.
     if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),
+      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getUser(),
           'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'paid'=>$cl_paid))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
diff --git a/expenses.php b/expenses.php
index 69d8ae72a..aa0d97769 100644
--- a/expenses.php
+++ b/expenses.php
@@ -210,8 +210,8 @@
   }
 }
 
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getActiveUser(), $cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getActiveUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index a6f0989e6..c0fa032eb 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -42,7 +42,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are deleting.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
+$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit deleting not ours or invoiced items.
   header('Location: access_denied.php');
@@ -59,7 +59,7 @@
 
     if ($err->no()) {
       // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id, $user->getActiveUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id, $user->getUser())) {
         header('Location: expenses.php');
         exit();
       } else
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 61edca261..a039f42f8 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -43,7 +43,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
+$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit editing not ours or invoiced items.
   header('Location: access_denied.php');
@@ -184,7 +184,7 @@
 
     // Now, an update.
     if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(),
+      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getUser(),
           'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 97232f70d..de1e67783 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -216,8 +216,8 @@
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getActiveUser(), $cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getActiveUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/mobile/time.php b/mobile/time.php
index 25f832bc4..6aa97330e 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -238,20 +238,20 @@
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
+      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getUser())) && (($cl_finish == '') && ($cl_duration == '')))
         $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user->getActiveUser(),
+        'user_id' => $user->getUser(),
         'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
@@ -283,8 +283,8 @@
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
-$smarty->assign('time_records', ttTimeHelper::getRecords($user->getActiveUser(), $cl_date));
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getActiveUser(), $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 399895c7a..55bdffe61 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -38,7 +38,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit deleting not ours or invoiced records.
   header('Location: access_denied.php');
@@ -64,7 +64,7 @@
     if ($err->no()) {
 
       // Delete the record.
-      $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
+      $result = ttTimeHelper::delete($cl_id, $user->getUser());
 
       if ($result) {
         header('Location: time.php');
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 40f58e8d9..56d373ff9 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -40,7 +40,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
@@ -279,7 +279,7 @@
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
@@ -289,7 +289,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -298,7 +298,7 @@
       $res = ttTimeHelper::update(array(
           'id'=>$cl_id,  
           'date'=>$new_date->toString(DB_DATEFORMAT),
-          'user_id'=>$user->getActiveUser(),
+          'user_id'=>$user->getUser(),
           'client'=>$cl_client,
           'project'=>$cl_project,
           'task'=>$cl_task,
diff --git a/mobile/timer.php b/mobile/timer.php
index 8422338b7..ae5a96f59 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -80,7 +80,7 @@
 $_SESSION['task'] = $cl_task;
 
 // Obtain uncompleted record. Assumtion is that only 1 uncompleted record is allowed.
-$uncompleted = ttTimeHelper::getUncompleted($user->getActiveUser());
+$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
 $enable_controls = ($uncompleted == null);
 
 // Elements of timeRecordForm.
@@ -217,14 +217,14 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user->getActiveUser(),
+        'user_id' => $user->getUser(),
         'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
@@ -254,15 +254,15 @@
   }
   if ($request->getParameter('btn_stop')) {
     // Stop button clicked. We need to finish an uncompleted record in progress.
-    $record = ttTimeHelper::getRecord($uncompleted['id'], $user->getActiveUser());
+    $record = ttTimeHelper::getRecord($uncompleted['id'], $user->getUser());
 
     // Can we complete this record?
     if (ttTimeHelper::isValidInterval($record['start'], $cl_finish) // finish time is greater than start time
-      && !ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $record['start'], $cl_finish)) { // no overlap
+      && !ttTimeHelper::overlaps($user->getUser(), $cl_date, $record['start'], $cl_finish)) { // no overlap
       $res = ttTimeHelper::update(array(
         'id'=>$record['id'],
         'date'=>$cl_date,
-        'user_id'=>$user->getActiveUser(),
+        'user_id'=>$user->getUser(),
         'client'=>$record['client_id'],
         'project'=>$record['project_id'],
         'task'=>$record['task_id'],
@@ -283,15 +283,15 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $cl_date);
+$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $cl_date);
 $smarty->assign('week_total', $week_total);
 
 $smarty->assign('uncompleted', $uncompleted);
 
 
 
-$smarty->assign('time_records', ttTimeHelper::getRecords($user->getActiveUser(), $cl_date));
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getActiveUser(), $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/time.php b/time.php
index 782c3472a..89f7389f6 100644
--- a/time.php
+++ b/time.php
@@ -74,7 +74,7 @@
   $user_id = $request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
-  $user_id = $user->getActiveUser();
+  $user_id = $user->getUser();
 }
 
 // Initialize and store date in session.
@@ -97,7 +97,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($user->getActiveUser(), $selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($user->getUser(), $selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
   
   $smarty->assign('month_total', $month_total);
@@ -323,13 +323,13 @@
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
+      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getUser())) && (($cl_finish == '') && ($cl_duration == '')))
         $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -337,7 +337,7 @@
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user->getActiveUser(),
+        'user_id' => $user->getUser(),
         'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
@@ -366,18 +366,18 @@
   } elseif ($request->getParameter('btn_stop')) {
     // Stop button pressed to finish an uncompleted record.
     $record_id = $request->getParameter('record_id');
-    $record = ttTimeHelper::getRecord($record_id, $user->getActiveUser());
+    $record = ttTimeHelper::getRecord($record_id, $user->getUser());
     $browser_date = $request->getParameter('browser_date');
     $browser_time = $request->getParameter('browser_time');
 
     // Can we complete this record?
     if ($record['date'] == $browser_date                                // closing today's record
       && ttTimeHelper::isValidInterval($record['start'], $browser_time) // finish time is greater than start time
-      && !ttTimeHelper::overlaps($user->getActiveUser(), $browser_date, $record['start'], $browser_time)) { // no overlap
+      && !ttTimeHelper::overlaps($user->getUser(), $browser_date, $record['start'], $browser_time)) { // no overlap
       $res = ttTimeHelper::update(array(
           'id'=>$record['id'],
           'date'=>$record['date'],
-          'user_id'=>$user->getActiveUser(),
+          'user_id'=>$user->getUser(),
           'client'=>$record['client_id'],
           'project'=>$record['project_id'],
           'task'=>$record['task_id'],
@@ -395,12 +395,12 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $selected_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getActiveUser(), $cl_date));
-$smarty->assign('time_records', ttTimeHelper::getRecords($user->getActiveUser(), $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/time_delete.php b/time_delete.php
index 5d721ab1f..4e368df24 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -38,7 +38,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit deleting not ours or invoiced records.
   header('Location: access_denied.php');
@@ -64,7 +64,7 @@
     if ($err->no()) {
 
       // Delete the record.
-      $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
+      $result = ttTimeHelper::delete($cl_id, $user->getUser());
 
       if ($result) {
         header('Location: time.php');
diff --git a/time_edit.php b/time_edit.php
index d0689ba70..99110096a 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -40,7 +40,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
@@ -285,7 +285,7 @@
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
@@ -295,7 +295,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -304,7 +304,7 @@
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user->getActiveUser(),
+        'user_id'=>$user->getUser(),
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,
@@ -345,7 +345,7 @@
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());
         if ($not_completed_rec) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
@@ -355,7 +355,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -364,7 +364,7 @@
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user->getActiveUser(),
+        'user_id'=>$user->getUser(),
         'group_id'=>$user->getGroup(),
         'org_id' => $user->org_id,
         'client'=>$cl_client,
diff --git a/week.php b/week.php
index c71a2ccd0..927e8a776 100644
--- a/week.php
+++ b/week.php
@@ -92,7 +92,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota = $quota->get($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($user->getActiveUser(), $selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($user->getUser(), $selected_date);
   $minutes_left = round(60*$month_quota) - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);
@@ -128,7 +128,7 @@
 $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
 $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
 // Get already existing records.
-$records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
+$records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
 // Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function.
 if ($records)
   $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders);
@@ -433,7 +433,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
               $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
             } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
               // Delete an already existing record here.
-              $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getActiveUser());
+              $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getUser());
             } else {
               $fields = array();
               $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
@@ -494,7 +494,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $selected_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);

From 7d4e0805bf2f55c97c750021ebdd0ff0a1b44b0b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Nov 2018 14:26:34 +0000
Subject: [PATCH 0456/1848] A bit of refactoring in time.php.

---
 WEB-INF/templates/footer.tpl |  2 +-
 group_edit.php               |  1 +
 time.php                     | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 702256243..312131d20 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.28.4532 | 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.28.4533 | 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/group_edit.php b/group_edit.php
index 08c1db590..6a16dc1f0 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -112,6 +112,7 @@
     'data'=>$groups,
     'datakeys'=>array('id','name')));
   $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));
diff --git a/time.php b/time.php
index 89f7389f6..ce622b233 100644
--- a/time.php
+++ b/time.php
@@ -89,7 +89,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->getGroup());
+  $custom_fields = new CustomFields($group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -97,7 +97,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($user->getUser(), $selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($user_id, $selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
   
   $smarty->assign('month_total', $month_total);
@@ -170,7 +170,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
+  $active_clients = ttTeamHelper::getActiveClients($group_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -196,7 +196,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
+    $active_clients = ttTeamHelper::getActiveClients($group_id, true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -224,7 +224,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
-  $task_list = ttTeamHelper::getActiveTasks($user->getGroup());
+  $task_list = ttTeamHelper::getActiveTasks($group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
@@ -323,13 +323,13 @@
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getUser())) && (($cl_finish == '') && ($cl_duration == '')))
+      if (($not_completed_rec = ttTimeHelper::getUncompleted($user_id)) && (($cl_finish == '') && ($cl_duration == '')))
         $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -337,8 +337,8 @@
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user->getUser(),
-        'group_id' => $user->getGroup(),
+        'user_id' => $user_id,
+        'group_id' => $group_id,
         'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
@@ -366,18 +366,18 @@
   } elseif ($request->getParameter('btn_stop')) {
     // Stop button pressed to finish an uncompleted record.
     $record_id = $request->getParameter('record_id');
-    $record = ttTimeHelper::getRecord($record_id, $user->getUser());
+    $record = ttTimeHelper::getRecord($record_id, $user_id);
     $browser_date = $request->getParameter('browser_date');
     $browser_time = $request->getParameter('browser_time');
 
     // Can we complete this record?
     if ($record['date'] == $browser_date                                // closing today's record
       && ttTimeHelper::isValidInterval($record['start'], $browser_time) // finish time is greater than start time
-      && !ttTimeHelper::overlaps($user->getUser(), $browser_date, $record['start'], $browser_time)) { // no overlap
+      && !ttTimeHelper::overlaps($user_id, $browser_date, $record['start'], $browser_time)) { // no overlap
       $res = ttTimeHelper::update(array(
           'id'=>$record['id'],
           'date'=>$record['date'],
-          'user_id'=>$user->getUser(),
+          'user_id'=>$user_id,
           'client'=>$record['client_id'],
           'project'=>$record['project_id'],
           'task'=>$record['task_id'],
@@ -395,12 +395,12 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($user_id, $selected_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date));
-$smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user_id, $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 997b32f47f535f6e801bb220749826f1c179bfba Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Nov 2018 14:59:19 +0000
Subject: [PATCH 0457/1848] A bit more refactoring on time entry pages.

---
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/time.php              | 12 +++++++-----
 mobile/time_delete.php       |  8 +++-----
 mobile/time_edit.php         |  9 +++++----
 time_delete.php              |  8 +++-----
 time_edit.php                | 15 ++++++++-------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 312131d20..ae1e68c77 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.28.4533 | 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.28.4534 | 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/time.php b/mobile/time.php
index 6aa97330e..2b8e01f05 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -41,6 +41,8 @@
 }
 // End of access checks.
 
+$user_id = $user->getUser();
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -238,20 +240,20 @@
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getUser())) && (($cl_finish == '') && ($cl_duration == '')))
+      if (($not_completed_rec = ttTimeHelper::getUncompleted($user_id)) && (($cl_finish == '') && ($cl_duration == '')))
         $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user->getUser(),
+        'user_id' => $user_id,
         'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'client' => $cl_client,
@@ -283,8 +285,8 @@
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
-$smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user_id, $cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 55bdffe61..f5305bc62 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -38,7 +38,8 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
+$user_id = $user->getUser();
+$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit deleting not ours or invoiced records.
   header('Location: access_denied.php');
@@ -62,11 +63,8 @@
       $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
-
       // Delete the record.
-      $result = ttTimeHelper::delete($cl_id, $user->getUser());
-
-      if ($result) {
+      if (ttTimeHelper::delete($cl_id, $user_id)) {
         header('Location: time.php');
         exit();
       } else {
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 56d373ff9..b2655e8f6 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -40,7 +40,8 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
+$user_id = $user->getUser();
+$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
@@ -279,7 +280,7 @@
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
@@ -289,7 +290,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -298,7 +299,7 @@
       $res = ttTimeHelper::update(array(
           'id'=>$cl_id,  
           'date'=>$new_date->toString(DB_DATEFORMAT),
-          'user_id'=>$user->getUser(),
+          'user_id'=>$user_id,
           'client'=>$cl_client,
           'project'=>$cl_project,
           'task'=>$cl_task,
diff --git a/time_delete.php b/time_delete.php
index 4e368df24..385e4f114 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -38,7 +38,8 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
+$user_id = $user->getUser();
+$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit deleting not ours or invoiced records.
   header('Location: access_denied.php');
@@ -62,11 +63,8 @@
       $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
-
       // Delete the record.
-      $result = ttTimeHelper::delete($cl_id, $user->getUser());
-
-      if ($result) {
+      if (ttTimeHelper::delete($cl_id, $user_id)) {
         header('Location: time.php');
         exit();
       } else {
diff --git a/time_edit.php b/time_edit.php
index 99110096a..5670f1936 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -40,7 +40,8 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
+$user_id = $user->getUser();
+$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
@@ -285,7 +286,7 @@
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
@@ -295,7 +296,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -304,7 +305,7 @@
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user->getUser(),
+        'user_id'=>$user_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,
@@ -345,7 +346,7 @@
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
@@ -355,7 +356,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -364,7 +365,7 @@
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user->getUser(),
+        'user_id'=>$user_id,
         'group_id'=>$user->getGroup(),
         'org_id' => $user->org_id,
         'client'=>$cl_client,

From fd6aa4c43cecf1754280ae8abb9f58add8c6c977 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Nov 2018 20:00:35 +0000
Subject: [PATCH 0458/1848] Refactoring in ttAdmin class.

---
 WEB-INF/lib/ttAdmin.class.php |  2 +-
 WEB-INF/templates/footer.tpl  |  2 +-
 admin_group_delete.php        | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 747274f12..3b6b008a2 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -344,7 +344,7 @@ function updateSelf($fields) {
   }
 
   // getGroupDetails obtains group name and its top manager details.
-  function getGroupDetails($group_id) {
+  static function getGroupDetails($group_id) {
     $result = array();
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ae1e68c77..0cafe7eec 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.28.4534 | 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.28.4535 | 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/admin_group_delete.php b/admin_group_delete.php
index 7c7df615a..fea57365c 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -35,13 +35,13 @@
   header('Location: access_denied.php');
   exit();
 }
-// End of access checks.
-
 $group_id = (int)$request->getParameter('id');
-
-$admin = new ttAdmin();
-$group_details = $admin->getGroupDetails($group_id);
-$group_name = $group_details['group_name'];
+$group_details = ttAdmin::getGroupDetails($group_id);
+if (!($group_id && $group_details)) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $form = new Form('groupForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id));
@@ -50,8 +50,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    $result = $admin->markGroupDeleted($group_id);
-    if ($result) {
+    if (ttAdmin::markGroupDeleted($group_id)) {
       header('Location: admin_groups.php');
       exit();
     } else
@@ -64,7 +63,7 @@
   }
 } // isPost
 
-$smarty->assign('group_to_delete', $group_name);
+$smarty->assign('group_to_delete', $group_details['group_name']);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
 $smarty->assign('content_page_name', 'admin_group_delete.tpl');

From 7a8644d6bfb64933de8a22a2479562d938d8bd9c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Nov 2018 20:58:39 +0000
Subject: [PATCH 0459/1848] Improving deleting groups.

---
 WEB-INF/lib/ttAdmin.class.php       | 115 ++++++++++++++++------------
 WEB-INF/lib/ttGroupHelper.class.php |  12 ++-
 WEB-INF/templates/footer.tpl        |   2 +-
 3 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 3b6b008a2..2e0e69573 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -116,62 +116,37 @@ function markTasksDeleted($group_id) {
   }
 
   // markGroupDeleted marks a group and everything in it as deleted.
-  function markGroupDeleted($group_id) {
+  // This function is called in context of a logged on admin who may
+  // operate on any group.
+  static function markGroupDeleted($group_id) {
+    $mdb2 = getConnection();
 
     // Keep the logic simple by returning false on first error.
 
     // Obtain subgroups and call self recursively on them.
-    $subgroups = $this->getSubgroups($group_id);
+    $subgroups = ttAdmin::getSubgroups($group_id);
     foreach($subgroups as $subgroup) {
-      if (!$this->markGroupDeleted($subgroup['id']))
+      if (!ttAdmin::markGroupDeleted($subgroup['id']))
         return false;
     }
 
-    // Now that we are done with subgroups, handle this group.
-    $users = $this->getUsers($group_id);
-
-    // Iterate through group users and mark them as deleted.
-    foreach ($users as $one_user) {
-      if (!$this->markUserDeleted($one_user['id']))
-          return false;
+    // Now do actual work with all entities.
+
+    // Some things cannot be marked deleted as we don't have the status field for them.
+    // Just delete such things (until we have a better way to deal with them).
+    $tables_to_delete_from = array(
+      'tt_config',
+      'tt_predefined_expenses',
+      'tt_client_project_binds',
+      'tt_project_task_binds'
+    );
+    foreach($tables_to_delete_from as $table) {
+      if (!ttAdmin::deleteGroupEntriesFromTable($group_id, $table))
+        return false;
     }
 
-    // Mark tasks deleted.
-    if (!$this->markTasksDeleted($group_id)) return false;
-
-    $mdb2 = getConnection();
-
-    // Mark roles deleted.
-    $sql = "update tt_roles set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark clients deleted.
-    $sql = "update tt_clients set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark invoices deleted.
-    $sql = "update tt_invoices set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark custom fields deleted.
-    $sql = "update tt_custom_fields set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark notifications deleted.
-    $sql = "update tt_cron set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Note: we don't mark tt_log or tt_expense_items deleted here.
+    // Now mark status deleted where we can.
+    // Note: we don't mark tt_log, tt_custom_field_lod, or tt_expense_items deleted here.
     // Reasoning is:
     //
     // 1) Users may mark some of them deleted during their work.
@@ -180,11 +155,31 @@ function markGroupDeleted($group_id) {
     //
     // 2) DB maintenance script (Clean up DB from inactive groups) should
     // get rid of these items permanently eventually.
+    $tables_to_mark_deleted_in = array(
+      'tt_cron',
+      'tt_fav_reports',
+      // 'tt_expense_items',
+      // 'tt_custom_field_log',
+      'tt_custom_field_options',
+      'tt_custom_fields',
+      // 'tt_log',
+      'tt_invoices',
+      'tt_user_project_binds',
+      'tt_users',
+      'tt_clients',
+      'tt_projects',
+      'tt_tasks',
+      'tt_roles'
+    );
+    foreach($tables_to_mark_deleted_in as $table) {
+      if (!ttAdmin::markGroupDeletedInTable($group_id, $table))
+        return false;
+    }
 
     // Mark group deleted.
     global $user;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-    $sql = "update tt_groups set status = NULL $modified_part where id = $group_id";
+    $sql = "update tt_groups set status = null $modified_part where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -362,4 +357,30 @@ static function getGroupDetails($group_id) {
 
     return false;
   }
+
+  // deleteGroupEntriesFromTable is a generic helper function for markGroupDeleted.
+  // It deletes entries in ONE table belonging to a given group.
+  static function deleteGroupEntriesFromTable($group_id, $table_name) {
+    $mdb2 = getConnection();
+
+    $sql = "delete from $table_name where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // markGroupDeletedInTable is a generic helper function for markGroupDeleted.
+  // It updates ONE table by setting status to NULL for all records belonging to a group.
+  static function markGroupDeletedInTable($group_id, $table_name) {
+    $mdb2 = getConnection();
+
+    // Add modified info to sql for some tables, depending on table name.
+    if ($table_name == 'tt_users') {
+      global $user;
+      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    }
+
+    $sql = "update $table_name set status = null $modified_part where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index d332060a9..39cdb7800 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -156,7 +156,7 @@ static function markGroupDeleted($group_id) {
     // Obtain subgroups and call self recursively on them.
     $subgroups = $user->getSubgroups($group_id);
     foreach($subgroups as $subgroup) {
-      if (!$this->markGroupDeleted($subgroup['id']))
+      if (!ttGroupHelper::markGroupDeleted($subgroup['id']))
         return false;
     }
 
@@ -207,7 +207,8 @@ static function markGroupDeleted($group_id) {
     }
 
     // Mark group deleted.
-    $sql = "update tt_groups set status = null where id = $group_id and org_id = $org_id";
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $sql = "update tt_groups set status = null $modified_part where id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -220,10 +221,13 @@ static function markGroupDeletedInTable($group_id, $table_name) {
     global $user;
     $mdb2 = getConnection();
 
-    // TODO: add modified info to sql for some tables, depending on table name.
+    // Add modified info to sql for some tables, depending on table name.
+    if ($table_name == 'tt_users') {
+      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    }
 
     $org_id = $user->org_id; // The only security measure we use here for match.
-    $sql = "update $table_name set status = null where group_id = $group_id and org_id = $org_id";
+    $sql = "update $table_name set status = null $modified_part where group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0cafe7eec..77022528f 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.28.4535 | 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.28.4536 | 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>

From bde9999ab047052540e9b57ce39d7932bcb00f9d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Nov 2018 22:16:52 +0000
Subject: [PATCH 0460/1848] Refactored admin_group_editp.php.

---
 WEB-INF/lib/ttAdmin.class.php | 12 +++---
 WEB-INF/templates/footer.tpl  |  2 +-
 admin_group_edit.php          | 70 +++++++++++++++++++++++------------
 3 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 2e0e69573..6a16034e3 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -236,17 +236,18 @@ function validateGroupInfo($fields) {
     return $result;
   }
 
-  // updateGroup validates user input and updates the group with new information.
-  function updateGroup($group_id, $fields) {
-    if (!$this->validateGroupInfo($fields)) return false; // Can't continue as user input is invalid.
+  // updateGroup updates a (top) group with new information.
+  static function updateGroup($fields) {
+    $group_id = (int)$fields['group_id'];
+    if (!$group_id) return false; // Nothing to update.
 
-    global $user;
     $mdb2 = getConnection();
+    global $user;
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
 
     // Update group name if it changed.
     if ($fields['old_group_name'] != $fields['new_group_name']) {
       $name_part = 'name = '.$mdb2->quote($fields['new_group_name']);
-      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
       $sql = 'update tt_groups set '.$name_part.$modified_part.' where id = '.$group_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
@@ -259,7 +260,6 @@ function updateGroup($group_id, $fields) {
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['user_name']);
     $email_part = ', email = '.$mdb2->quote($fields['email']);
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
     $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.'where id = '.$user_id;
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 77022528f..587079ff1 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.28.4536 | 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.28.4537 | 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/admin_group_edit.php b/admin_group_edit.php
index bb0fc4134..5e34e807b 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -36,13 +36,14 @@
   header('Location: access_denied.php');
   exit();
 }
+$group_id = (int)$request->getParameter('id');
+$group_details = ttAdmin::getGroupDetails($group_id);
+if (!($group_id && $group_details)) {
+  header('Location: access_denied.php');
+  exit();
+}
 // End of access checks.
 
-$group_id = $request->getParameter('id');
-
-$admin = new ttAdmin();
-$group_details = $admin->getGroupDetails($group_id);
-
 if ($request->isPost()) {
   $cl_group_name = trim($request->getParameter('group_name'));
   $cl_manager_name = trim($request->getParameter('manager_name'));
@@ -77,26 +78,47 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_save')) {
-    // Create fields array for ttAdmin instance.
-    $fields = array(
-      'old_group_name' => $group_details['group_name'],
-      'new_group_name' => $cl_group_name,
-      'user_id' => $group_details['manager_id'],
-      'user_name' => $cl_manager_name,
-      'old_login' => $group_details['manager_login'],
-      'new_login' => $cl_manager_login,
-      'password1' => $cl_password1,
-      'password2' => $cl_password2,
-      'email' => $cl_manager_email);
 
-    import('ttAdmin');
-    $admin = new ttAdmin($err);
-    $result = $admin->updateGroup($group_id, $fields);
-    if ($result) {
-      header('Location: admin_groups.php');
-      exit();
-    } else
-      $err->add($i18n->get('error.db'));
+    // Validate user input.
+    if (!ttValidString($cl_group_name))
+      $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
+    if (!ttValidString($cl_manager_name))
+      $err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
+    if (!ttValidString($cl_manager_login))
+      $err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
+    // If we change login, it must be unique.
+    if ($cl_manager_login != $group_details['manager_login']) {
+      if (ttUserHelper::getUserByLogin($cl_manager_login)) {
+        $err->add($i18n->get('error.user_exists'));
+      }
+    }
+    if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
+      if (!ttValidString($cl_password1))
+        $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+      if (!ttValidString($cl_password2))
+        $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
+      if ($cl_password1 !== $cl_password2)
+        $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+    }
+    if (!ttValidEmail($cl_manager_email, true))
+      $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+
+    if ($err->no()) {
+      if (ttAdmin::updateGroup(array('group_id' => $group_id,
+        'old_group_name' => $group_details['group_name'],
+        'new_group_name' => $cl_group_name,
+        'user_id' => $group_details['manager_id'],
+        'user_name' => $cl_manager_name,
+        'old_login' => $group_details['manager_login'],
+        'new_login' => $cl_manager_login,
+        'password1' => $cl_password1,
+        'password2' => $cl_password2,
+        'email' => $cl_manager_email))) {
+        header('Location: admin_groups.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
   }
 
   if ($request->getParameter('btn_cancel')) {

From 2d3de45e7035c94e64bf54d6e610ac613724b912 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Nov 2018 14:04:05 +0000
Subject: [PATCH 0461/1848] Refactoring in ttAdmin class and its use.

---
 WEB-INF/lib/ttAdmin.class.php | 210 ++++++++++++++++------------------
 WEB-INF/templates/footer.tpl  |   2 +-
 admin_group_add.php           |  55 +++++----
 admin_group_delete.php        |   6 +-
 admin_group_edit.php          |  23 ++--
 5 files changed, 143 insertions(+), 153 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 6a16034e3..d0a1b8dc9 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 import('ttUser');
+import('ttRoleHelper');
 
 // ttAdmin class is used to perform admin tasks.
 class ttAdmin {
@@ -40,7 +41,7 @@ function __construct(&$err = null) {
   }
 
   // getSubgroups rerurns an array of subgroups for a group.
-  function getSubgroups($group_id) {
+  static function getSubgroups($group_id) {
     $mdb2 = getConnection();
 
     $subgroups = array();
@@ -54,67 +55,6 @@ function getSubgroups($group_id) {
     return $subgroups;
   }
 
-  // getUsers obtains user ids in a group.
-  function getUsers($group_id) {
-    $mdb2 = getConnection();
-    $sql = "select id from tt_users where group_id = $group_id";
-    $res = $mdb2->query($sql);
-    $users = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $users[] = $val;
-      }
-    }
-    return $users;
-  }
-
-  // markUserDeleted marks a user and all things associated with user as deleted.
-  function markUserDeleted($user_id) {
-    $mdb2 = getConnection();
-
-    // Mark user binds as deleted.
-    $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark favorite reports as deleted.
-    $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark user as deleted.
-    global $user;
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-    $sql = "update tt_users set status = NULL $modified_part where id = $user_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return true;
-  }
-
-  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group.
-  function markTasksDeleted($group_id) {
-    $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where group_id = $group_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) return false;
-
-    while ($val = $res->fetchRow()) {
-      // Delete task binds.
-      $task_id = $val['id'];
-      $sql = "delete from tt_project_task_binds where task_id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error')) return false;
-
-      // Mark task as deleted.
-      $sql = "update tt_tasks set status = NULL where id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error')) return false;
-    }
-
-    return true;
-  }
-
   // markGroupDeleted marks a group and everything in it as deleted.
   // This function is called in context of a logged on admin who may
   // operate on any group.
@@ -186,56 +126,6 @@ static function markGroupDeleted($group_id) {
     return true;
   }
 
-  // validateGroupInfo validates group information entered by user.
-  function validateGroupInfo($fields) {
-    global $i18n;
-    global $auth;
-
-    $result = true;
-
-    if (!ttValidString($fields['new_group_name'])) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
-      $result = false;
-    }
-    if (!ttValidString($fields['user_name'])) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
-      $result = false;
-    }
-    if (!ttValidString($fields['new_login'])) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
-      $result = false;
-    }
-
-    // If we change login, it must be unique.
-    if ($fields['new_login'] != $fields['old_login']) {
-      if (ttUserHelper::getUserByLogin($fields['new_login'])) {
-        $this->err->add($i18n->get('error.user_exists'));
-        $result = false;
-      }
-    }
-
-    if (!$auth->isPasswordExternal() && ($fields['password1'] || $fields['password2'])) {
-      if (!ttValidString($fields['password1'])) {
-        $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
-        $result = false;
-      }
-      if (!ttValidString($fields['password2'])) {
-        $this->err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-        $result = false;
-      }
-      if ($fields['password1'] !== $fields['password2']) {
-        $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-        $result = false;
-      }
-    }
-    if (!ttValidEmail($fields['email'], true)) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
-      $result = false;
-    }
-
-    return $result;
-  }
-
   // updateGroup updates a (top) group with new information.
   static function updateGroup($fields) {
     $group_id = (int)$fields['group_id'];
@@ -338,8 +228,24 @@ function updateSelf($fields) {
     return true;
   }
 
-  // getGroupDetails obtains group name and its top manager details.
-  static function getGroupDetails($group_id) {
+  // getGroupName obtains group name.
+  static function getGroupName($group_id) {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select name from tt_groups where id = $group_id";
+
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val['name'];
+    }
+
+    return false;
+  }
+
+  // getOrgDetails obtains group name and its top manager details.
+  static function getOrgDetails($group_id) {
     $result = array();
     $mdb2 = getConnection();
 
@@ -383,4 +289,80 @@ static function markGroupDeletedInTable($group_id, $table_name) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // createGroup creates a new top group and returns its id.
+  // It is a helper function for createOrg.
+  static function createGroup($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $name = $mdb2->quote($fields['group_name']);
+    $currency = $mdb2->quote($fields['currency']);
+    $lang = $mdb2->quote($fields['lang']);
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $created_by = $user->id;
+
+    $sql = "insert into tt_groups (name, currency, lang, created, created_ip, created_by)".
+      " values($name, $currency, $lang, $created, $created_ip, $created_by)";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+    // Update org_id with group_id.
+    $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return $group_id;
+  }
+
+  // createOrgManager creates a new user (top manager role) in a group.
+  // It is a helper function for createOrg.
+  static function createOrgManager($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $role_id = ttRoleHelper::getTopManagerRoleID();
+    $login = $mdb2->quote($fields['login']);
+    $password = 'md5('.$mdb2->quote($fields['password']).')';
+    $name = $mdb2->quote($fields['user_name']);
+    $group_id = (int) $fields['group_id'];
+    $org_id = $group_id;
+    $email = $mdb2->quote($fields['email']);
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $created_by = $user->id;
+
+    $columns = '(login, password, name, group_id, org_id, role_id, email, created, created_ip, created_by)';
+    $values = "values($login, $password, $name, $group_id, $org_id, $role_id, $email, $created, $created_ip, $created_by)";
+
+    $sql = "insert into tt_users $columns $values";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // The createOrg function creates an organization in Time Tracker.
+  static function createOrg($fields) {
+    // There are 3 steps that we need to 2 when creating a new organization.
+    //   1. Create a new group with null parent_id.
+    //   2. Create pre-defined roles in it.
+    //   3. Create a top manager account for new group.
+
+    // Create a new group.
+    $group_id = ttAdmin::createGroup($fields);
+    if (!$group_id) return false;
+
+    // Create predefined roles.
+    if (!ttRoleHelper::createPredefinedRoles($group_id, $fields['lang']))
+      return false;
+
+    // Create user.
+    $fields['group_id'] = $group_id;
+    if (!ttAdmin::createOrgManager($fields))
+      return false;
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 587079ff1..321397a86 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.28.4537 | 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.28.4538 | 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/admin_group_add.php b/admin_group_add.php
index 40d7a8748..52b4134f1 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttRoleHelper');
+import('ttAdmin');
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
@@ -82,34 +82,39 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_group_name))
+    $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
+  if (!ttValidString($cl_manager_name))
+    $err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
+  if (!ttValidString($cl_manager_login))
+    $err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
+  if (ttUserHelper::getUserByLogin($cl_manager_login))
+    $err->add($i18n->get('error.user_exists'));
+  if (!ttValidString($cl_password1))
+    $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+  if (!ttValidString($cl_password2))
+    $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
+  if ($cl_password1 !== $cl_password2)
+    $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  if (!ttValidEmail($cl_manager_email, true))
+    $err->add($i18n->get('error.field'), $i18n->get('label.email'));
 
-  /*
-   * Note: creating a group by admin is pretty much the same as self-registration,
-   * except that created_by fields for group and user must be set to admin account.
-   * Therefore, we'll reuse ttRegistrator instance to create a group here
-   * and override created_by fields using ttRegistrator::setCreatedBy() function.
-   */
-
-  // Create fields array for ttRegistrator instance.
   if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
-  $fields = array(
-    'user_name' => $cl_manager_name,
-    'login' => $cl_manager_login,
-    'password1' => $cl_password1,
-    'password2' => $cl_password2,
-    'email' => $cl_manager_email,
-    'group_name' => $cl_group_name,
-    'currency' => CURRENCY_DEFAULT,
-    'lang' => $cl_lang,
-    'created_by_id' => $user->id);
 
-  // Create an instance of ttRegistrator class.
-  import('ttRegistrator');
-  $registrator = new ttRegistrator($fields, $err);
-  $registrator->register();
   if ($err->no()) {
-    header('Location: admin_groups.php');
-    exit();
+    if (ttAdmin::createOrg(array('group_name' => $cl_group_name,
+      'currency' => CURRENCY_DEFAULT,
+      'lang' => $cl_lang,
+      'user_name' => $cl_manager_name,
+      'login' => $cl_manager_login,
+      'password' => $cl_password1,
+      'email' => $cl_manager_email))) {
+      header('Location: admin_groups.php');
+      exit();
+    } else {
+      $err->add($i18n->get('error.db'));
+    }
   }
 } // isPost
 
diff --git a/admin_group_delete.php b/admin_group_delete.php
index fea57365c..944500195 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -36,8 +36,8 @@
   exit();
 }
 $group_id = (int)$request->getParameter('id');
-$group_details = ttAdmin::getGroupDetails($group_id);
-if (!($group_id && $group_details)) {
+$group_name = ttAdmin::getGroupName($group_id);
+if (!($group_id && $group_name)) {
   header('Location: access_denied.php');
   exit();
 }
@@ -63,7 +63,7 @@
   }
 } // isPost
 
-$smarty->assign('group_to_delete', $group_details['group_name']);
+$smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
 $smarty->assign('content_page_name', 'admin_group_delete.tpl');
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 5e34e807b..ee639d042 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -37,13 +37,16 @@
   exit();
 }
 $group_id = (int)$request->getParameter('id');
-$group_details = ttAdmin::getGroupDetails($group_id);
-if (!($group_id && $group_details)) {
+$group_name = ttAdmin::getGroupName($group_id);
+if (!($group_id && $group_name)) {
   header('Location: access_denied.php');
   exit();
 }
 // End of access checks.
 
+$org_details = ttAdmin::getOrgDetails($group_id);
+if (!$org_details) $err->add($i18n->get('error.db'));
+
 if ($request->isPost()) {
   $cl_group_name = trim($request->getParameter('group_name'));
   $cl_manager_name = trim($request->getParameter('manager_name'));
@@ -54,13 +57,13 @@
   }
   $cl_manager_email = trim($request->getParameter('manager_email'));
 } else {
-  $cl_group_name = $group_details['group_name'];
-  $cl_manager_name = $group_details['manager_name'];
-  $cl_manager_login = $group_details['manager_login'];
+  $cl_group_name = $org_details['group_name'];
+  $cl_manager_name = $org_details['manager_name'];
+  $cl_manager_login = $org_details['manager_login'];
   if (!$auth->isPasswordExternal()) {
     $cl_password1 = $cl_password2 = '';
   }
-  $cl_manager_email = $group_details['manager_email'];
+  $cl_manager_email = $org_details['manager_email'];
 }
 
 $form = new Form('groupForm');
@@ -87,7 +90,7 @@
     if (!ttValidString($cl_manager_login))
       $err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
     // If we change login, it must be unique.
-    if ($cl_manager_login != $group_details['manager_login']) {
+    if ($cl_manager_login != $org_details['manager_login']) {
       if (ttUserHelper::getUserByLogin($cl_manager_login)) {
         $err->add($i18n->get('error.user_exists'));
       }
@@ -105,11 +108,11 @@
 
     if ($err->no()) {
       if (ttAdmin::updateGroup(array('group_id' => $group_id,
-        'old_group_name' => $group_details['group_name'],
+        'old_group_name' => $org_details['group_name'],
         'new_group_name' => $cl_group_name,
-        'user_id' => $group_details['manager_id'],
+        'user_id' => $org_details['manager_id'],
         'user_name' => $cl_manager_name,
-        'old_login' => $group_details['manager_login'],
+        'old_login' => $org_details['manager_login'],
         'new_login' => $cl_manager_login,
         'password1' => $cl_password1,
         'password2' => $cl_password2,

From f613bf4ab8b4c818c9381d4e5e1af5fe5d0a6052 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Nov 2018 15:19:25 +0000
Subject: [PATCH 0462/1848] Finished refactoring ttAdmin class.

---
 WEB-INF/lib/ttAdmin.class.php           | 80 ++++---------------------
 WEB-INF/lib/ttClientHelper.class.php    |  2 +-
 WEB-INF/lib/ttExpenseHelper.class.php   |  4 +-
 WEB-INF/lib/ttGroupHelper.class.php     |  6 +-
 WEB-INF/lib/ttOrgImportHelper.class.php |  6 +-
 WEB-INF/lib/ttTeamHelper.class.php      |  2 +-
 WEB-INF/lib/ttTimeHelper.class.php      |  4 +-
 WEB-INF/lib/ttUserHelper.class.php      |  4 +-
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_options.php                       | 31 +++++++---
 10 files changed, 47 insertions(+), 94 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index d0a1b8dc9..0e0532cee 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -26,20 +26,13 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttUser');
 import('ttRoleHelper');
 
 // ttAdmin class is used to perform admin tasks.
+// Used as namespace, as it is a collection of static functions that we call
+// from admin pages to administer the site as a whole.
 class ttAdmin {
 
-  var $err = null; // Error object, passed to us as reference.
-                   // We use it to communicate errors to caller.
-
-  // Constructor.
-  function __construct(&$err = null) {
-    $this->err = $err;
-  }
-
   // getSubgroups rerurns an array of subgroups for a group.
   static function getSubgroups($group_id) {
     $mdb2 = getConnection();
@@ -118,7 +111,7 @@ static function markGroupDeleted($group_id) {
 
     // Mark group deleted.
     global $user;
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     $sql = "update tt_groups set status = null $modified_part where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
@@ -133,7 +126,7 @@ static function updateGroup($fields) {
 
     $mdb2 = getConnection();
     global $user;
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     // Update group name if it changed.
     if ($fields['old_group_name'] != $fields['new_group_name']) {
@@ -157,57 +150,9 @@ static function updateGroup($fields) {
     return true;
   }
 
-  // validateUserInfo validates account information entered by user.
-  function validateUserInfo($fields) {
-    global $i18n;
+  // updateSelf updates admin account with new information.
+  static function updateSelf($fields) {
     global $user;
-    global $auth;
-
-    $result = true;
-
-    if (!ttValidString($fields['name'])) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
-      $result = false;
-    }
-    if (!ttValidString($fields['login'])) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.login'));
-      $result = false;
-    }
-    // If we change login, it must be unique.
-    if ($fields['login'] != $user->login) {
-      if (ttUserHelper::getUserByLogin($fields['login'])) {
-        $this->err->add($i18n->get('error.user_exists'));
-        $result = false;
-      }
-    }
-    if (!$auth->isPasswordExternal() && ($fields['password1'] || $fields['password2'])) {
-      if (!ttValidString($fields['password1'])) {
-        $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
-        $result = false;
-      }
-      if (!ttValidString($fields['password2'])) {
-        $this->err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-        $result = false;
-      }
-      if ($fields['password1'] !== $fields['password2']) {
-        $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-        $result = false;
-      }
-    }
-    if (!ttValidEmail($fields['email'], true)) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
-      $result = false;
-    }
-
-    return $result;
-  }
-
-  // updateSelf validates user input and updates admin account with new information.
-  function updateSelf($fields) {
-    if (!$this->validateUserInfo($fields)) return false; // Can't continue as user input is invalid.
-
-    global $user;
-    global $i18n;
     $mdb2 = getConnection();
 
     // Update self.
@@ -217,15 +162,10 @@ function updateSelf($fields) {
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['name']);
     $email_part = ', email = '.$mdb2->quote($fields['email']);
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.'where id = '.$user_id;
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.' where id = '.$user_id;
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) {
-      $this->err->add($i18n->get('error.db'));
-      return false;
-    }
-
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
 
   // getGroupName obtains group name.
@@ -282,7 +222,7 @@ static function markGroupDeletedInTable($group_id, $table_name) {
     // Add modified info to sql for some tables, depending on table name.
     if ($table_name == 'tt_users') {
       global $user;
-      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     }
 
     $sql = "update $table_name set status = null $modified_part where group_id = $group_id";
diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 3ae662a11..24d00d236 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -121,7 +121,7 @@ static function delete($id, $delete_client_entries) {
     }
 
     // Handle time records.
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     if ($delete_client_entries) {
       $sql = 'update tt_log set status = NULL'.$modified_part." where client_id = $id";
       $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 622e035ce..b11e71fd0 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -46,7 +46,7 @@ static function insert($fields)
     $invoice_id = $fields['invoice_id'];
     $status = $fields['status'];
     $paid = (int) $fields['paid'];
-    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     $sql = "insert into tt_expense_items".
       " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
@@ -75,7 +75,7 @@ static function update($fields)
     if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
       $paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0';
     }
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     $sql = "UPDATE tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id).
       ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 39cdb7800..8b02c85e1 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -119,7 +119,7 @@ static function insertSubgroup($fields) {
     $values .= ', '.$mdb2->quote($attrs['lock_spec']);
     $values .= ', '.(int)$attrs['workday_minutes'];
     $values .= ', '.$mdb2->quote($attrs['config']);
-    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
     $sql = 'insert into tt_groups '.$columns.$values;
@@ -207,7 +207,7 @@ static function markGroupDeleted($group_id) {
     }
 
     // Mark group deleted.
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     $sql = "update tt_groups set status = null $modified_part where id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
@@ -223,7 +223,7 @@ static function markGroupDeletedInTable($group_id, $table_name) {
 
     // Add modified info to sql for some tables, depending on table name.
     if ($table_name == 'tt_users') {
-      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+      $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     }
 
     $org_id = $user->org_id; // The only security measure we use here for match.
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index b5a28c8e8..345b1d2e4 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -636,7 +636,7 @@ private function createGroup($fields) {
     $values .= ', '.$mdb2->quote($fields['lock_spec']);
     $values .= ', '.(int)$fields['workday_minutes'];
     $values .= ', '.$mdb2->quote($fields['config']);
-    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
     $sql = 'insert into tt_groups '.$columns.$values;
@@ -695,7 +695,7 @@ private function insertExpense($fields) {
     $invoice_id = $fields['invoice_id'];
     $status = $fields['status'];
     $paid = (int) $fields['paid'];
-    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     $sql = "insert into tt_expense_items".
       " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
@@ -950,7 +950,7 @@ private function insertLogEntry($fields) {
       ", ".$mdb2->quote($invoice_id).
       ", ".$mdb2->quote($comment).
       ", $billable, $paid".
-      ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$mdb2->quote($user->id).
+      ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$user->id.
       ", ". $mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 5a3dd2fb6..08c52f453 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -106,7 +106,7 @@ static function swapRolesWith($user_id) {
     if (!$val['id'] || !$val['role_id'])
       return false;
 
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     // Promote user.
     $sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and group_id = $user->group_id";
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 245067804..5f8852eff 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -418,7 +418,7 @@ static function insert($fields)
       if ('00:00' == $finish) $finish = '24:00';
     }
 
-    $created_v = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+    $created_v = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     if (!$billable) $billable = 0;
     if (!$paid) $paid = 0;
@@ -474,7 +474,7 @@ static function update($fields)
     if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
       $paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0';
     }
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     $start = ttTimeHelper::to24HourFormat($start);
     $finish = ttTimeHelper::to24HourFormat($finish);
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index d1e112684..2ff774ff5 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -111,7 +111,7 @@ static function insert($fields, $hash = true) {
       $status_v = ', '.$mdb2->quote($fields['status']);
     }
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $created_by_v = ', '.$mdb2->quote($user->id);
+    $created_by_v = ', '.$user->id;
 
     $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
@@ -176,7 +176,7 @@ static function update($user_id, $fields) {
       $status_part = ", status = $status";
     }
 
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     $sql = "update tt_users set login = ".$mdb2->quote($fields['login']).
       "$pass_part, name = ".$mdb2->quote($fields['name']).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 321397a86..9f23d86b6 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.28.4538 | 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.28.4539 | 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/admin_options.php b/admin_options.php
index 226a8a5e7..164ff33a1 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
+import('ttAdmin');
 
 // Access check.
 if (!ttAccessAllowed('administer_site')) {
@@ -61,18 +62,30 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
-  // Create fields array for ttAdmin instance.
-  $fields = array(
-    'name' => $cl_name,
+  // Validate user input.
+  if (!ttValidString($cl_name))
+    $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login))
+    $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  // If we change login, it must be unique.
+  if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
+    $err->add($i18n->get('error.user_exists'));
+  if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
+      if (!ttValidString($cl_password1))
+        $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+      if (!ttValidString($cl_password2))
+        $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
+      if ($cl_password1 !== $cl_password2)
+        $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+    }
+  if (!ttValidEmail($cl_email, true))
+    $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+
+  if ($err->no() && ttAdmin::updateSelf(array('name' => $cl_name,
     'login' => $cl_login,
     'password1' => $cl_password1,
     'password2' => $cl_password2,
-    'email' => $cl_email);
-
-  import('ttAdmin');
-  $admin = new ttAdmin($err);
-  $result = $admin->updateSelf($fields);
-  if ($result) {
+    'email' => $cl_email))) {
     header('Location: admin_groups.php');
     exit();
   }

From 0ac41d7a52de7b0f6083d9bb1734beef7c517f30 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Nov 2018 15:41:36 +0000
Subject: [PATCH 0463/1848] Introduced a generic warning in translation files.

---
 WEB-INF/resources/ca.lang.php    | 4 ++++
 WEB-INF/resources/cs.lang.php    | 4 ++++
 WEB-INF/resources/da.lang.php    | 4 ++++
 WEB-INF/resources/de.lang.php    | 4 ++++
 WEB-INF/resources/en.lang.php    | 3 +++
 WEB-INF/resources/es.lang.php    | 4 ++++
 WEB-INF/resources/et.lang.php    | 4 ++++
 WEB-INF/resources/fa.lang.php    | 4 ++++
 WEB-INF/resources/fi.lang.php    | 4 ++++
 WEB-INF/resources/fr.lang.php    | 4 ++++
 WEB-INF/resources/gr.lang.php    | 4 ++++
 WEB-INF/resources/he.lang.php    | 4 ++++
 WEB-INF/resources/hu.lang.php    | 4 ++++
 WEB-INF/resources/it.lang.php    | 4 ++++
 WEB-INF/resources/ja.lang.php    | 4 ++++
 WEB-INF/resources/ko.lang.php    | 4 ++++
 WEB-INF/resources/nl.lang.php    | 4 ++++
 WEB-INF/resources/no.lang.php    | 4 ++++
 WEB-INF/resources/pl.lang.php    | 4 ++++
 WEB-INF/resources/pt-br.lang.php | 4 ++++
 WEB-INF/resources/pt.lang.php    | 4 ++++
 WEB-INF/resources/ro.lang.php    | 4 ++++
 WEB-INF/resources/ru.lang.php    | 3 +++
 WEB-INF/resources/sk.lang.php    | 4 ++++
 WEB-INF/resources/sl.lang.php    | 4 ++++
 WEB-INF/resources/sr.lang.php    | 4 ++++
 WEB-INF/resources/sv.lang.php    | 4 ++++
 WEB-INF/resources/tr.lang.php    | 4 ++++
 WEB-INF/resources/zh-cn.lang.php | 4 ++++
 WEB-INF/resources/zh-tw.lang.php | 4 ++++
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2aa222ddd..41a7a323e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -117,6 +117,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 92ce94280..9d81f681c 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -119,6 +119,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7ffc07992..3599090b1 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -111,6 +111,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 07da56ca0..8951dd04e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -105,6 +105,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 54ebbd94b..b45eb9cee 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -102,6 +102,9 @@
 'error.cannot_import' => 'Cannot import: %s.',
 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+'warn.sure' => 'Are you sure?',
+
 // Success messages.
 'msg.success' => 'Operation completed successfully.',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 819df1a32..46d3c0974 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -115,6 +115,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b8679a4ea..b75550c40 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -120,6 +120,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a9533c72e..68eeb2843 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -118,6 +118,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d8454884d..b7d044f2f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -113,6 +113,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 0b274de7e..dd45db345 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -111,6 +111,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d98ad087e..9bee96344 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -106,6 +106,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6529b77c4..df463b56b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -128,6 +128,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5bcd7ee39..89407de2b 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -117,6 +117,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5c82b747f..26ec0c10a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -110,6 +110,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 4342bc55e..b8b61410b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -121,6 +121,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 9cbc4e5ec..457f482e4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -120,6 +120,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 3fe368186..8e8e4f6e7 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -102,6 +102,10 @@
 'error.cannot_import' => 'Kan het volgende niet importeren: %s.',
 'error.format' => 'Bestandsformaat niet valide.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index f494bc0f1..6caea59a5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -120,6 +120,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e21bf1be1..9e9e390ea 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -115,6 +115,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 98a9b4a61..d52f487f4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -112,6 +112,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9b7cd5d8e..571cb59c2 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -114,6 +114,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 2763bac03..eb71cea20 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -121,6 +121,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ad24983c3..c877b793d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -101,6 +101,9 @@
 'error.cannot_import' => 'Невозможно импортировать: %s.',
 'error.format' => 'Неверный формат файла.',
 
+// Warning messages.
+'warn.sure' => 'Вы уверены?',
+
 // Success messages.
 'msg.success' => 'Операция завершена успешно.',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a70af3993..fbdcebc7d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -117,6 +117,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b0d4a0b18..7ada5144c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -111,6 +111,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index dd9c3476a..5c0e3c7d3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -112,6 +112,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4fe3b0422..79eea6a0a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -110,6 +110,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1d0c0ea75..bef878a80 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -124,6 +124,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7bad3fa9d..283eae89a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -112,6 +112,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index d25f94979..58729dd78 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -118,6 +118,10 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 
+// Warning messages.
+// TODO: translate the following.
+// 'warn.sure' => 'Are you sure?',
+
 // Success messages.
 // TODO: translate the following.
 // 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9f23d86b6..c8e1d2ced 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.28.4539 | 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.28.4540 | 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>

From 183a8116593400e16ec4d3ddf2e770091f403319 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Nov 2018 16:01:13 +0000
Subject: [PATCH 0464/1848] Introduced form.group_edit.copy_warning in
 translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 41a7a323e..efb84a2b8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -531,6 +531,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9d81f681c..73caac54b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -545,6 +545,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3599090b1..9a0e81aef 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -495,6 +495,7 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uafsluttede indikatore',
 // TODO: translate the following.
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8951dd04e..d80a76309 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -466,6 +466,8 @@
 'form.group_edit.allow_overlap' => 'Erlaube Überschneidung',
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
+// TODO: translate the following.
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 'form.group_edit.allow_ip' => 'Erlaube IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b45eb9cee..0ae1b272f 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -464,6 +464,7 @@
 'form.group_edit.allow_overlap' => 'Allow overlap',
 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+'form.group_edit.copy_warning' => 'Warn on copy',
 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 46d3c0974..a5274d603 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -545,6 +545,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b75550c40..36c36ee7c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -542,6 +542,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 68eeb2843..81abe9279 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -517,6 +517,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index b7d044f2f..a66c9e585 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -502,6 +502,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index dd45db345..54e7f45a7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -491,6 +491,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9bee96344..7b36caf19 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -476,6 +476,7 @@
 'form.group_edit.future_entries' => 'Μελλοντικές καταχωρήσεις',
 'form.group_edit.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
 // TODO: translate the following.
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index df463b56b..084a830ef 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -526,6 +526,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 89407de2b..4d74b97e5 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -536,6 +536,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 26ec0c10a..ceb109794 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -491,6 +491,7 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Indicatori incompleti',
 // TODO: translate the following.
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b8b61410b..6f23cc289 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -539,6 +539,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 457f482e4..f77702467 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -537,6 +537,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8e8e4f6e7..5dd2c4532 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -467,6 +467,8 @@
 'form.group_edit.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
+// TODO: translate the following.
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6caea59a5..ad503e01b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -535,6 +535,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9e9e390ea..f202eb0e6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -504,6 +504,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d52f487f4..9d05ef31f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -499,6 +499,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 571cb59c2..fc14e8fb0 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -519,6 +519,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index eb71cea20..1016f1735 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -540,6 +540,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c877b793d..917aaf18b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -461,6 +461,7 @@
 'form.group_edit.allow_overlap' => 'Возможное перекрывание',
 'form.group_edit.future_entries' => 'Будущие записи',
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
+'form.group_edit.copy_warning' => 'Предупреждать при копировании',
 'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index fbdcebc7d..d925191ed 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -517,6 +517,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7ada5144c..a500b4929 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -515,6 +515,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5c0e3c7d3..8e8bfa32f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -502,6 +502,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 79eea6a0a..105d66cbb 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -499,6 +499,7 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
 // TODO: translate the following.
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index bef878a80..40f74c6ac 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -553,6 +553,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 283eae89a..7099476f4 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -522,6 +522,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 58729dd78..fc8d6f074 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -531,6 +531,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+// 'form.group_edit.copy_warning' => 'Warn on copy',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c8e1d2ced..86f7c491b 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.28.4540 | 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.28.4541 | 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>

From 9396e4eb81c51af990a074c0042980e938612b59 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Nov 2018 22:55:12 +0000
Subject: [PATCH 0465/1848] Introduced warn.confirm_save string in translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 30 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index efb84a2b8..2b0b17bdb 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -120,6 +120,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 73caac54b..7150a6fb1 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -122,6 +122,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9a0e81aef..bad0297c2 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -114,6 +114,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index d80a76309..cc2800655 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -108,6 +108,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0ae1b272f..1d27ce90a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -104,6 +104,7 @@
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',
+'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 'msg.success' => 'Operation completed successfully.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a5274d603..c82df5b55 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -118,6 +118,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 36c36ee7c..e6d2dbe86 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -123,6 +123,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 81abe9279..412345f1a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -121,6 +121,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a66c9e585..1dcc17081 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -116,6 +116,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 54e7f45a7..6900fa7bc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -114,6 +114,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 7b36caf19..ce382635a 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -109,6 +109,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 084a830ef..d955c857d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -131,6 +131,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 4d74b97e5..884db355c 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -120,6 +120,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ceb109794..8c9a07dab 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -113,6 +113,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 6f23cc289..5211d0684 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -124,6 +124,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f77702467..2344ac14c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -123,6 +123,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5dd2c4532..2e357f9c6 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -105,6 +105,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ad503e01b..8b7762e2a 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -123,6 +123,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f202eb0e6..7a7852a73 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -118,6 +118,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9d05ef31f..df2ccc0e3 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -115,6 +115,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fc14e8fb0..d963d1ea3 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -117,6 +117,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1016f1735..e8f84cbc8 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -124,6 +124,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 917aaf18b..3d7ff8585 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -103,6 +103,7 @@
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
+'warn.confirm_save' => 'Дата изменена. Подвердите сохранение, а не копирование этой записи.',
 
 // Success messages.
 'msg.success' => 'Операция завершена успешно.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d925191ed..d3e4f4d40 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -120,6 +120,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index a500b4929..c9a4a1b71 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -114,6 +114,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8e8bfa32f..6e5dbbbd3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -115,6 +115,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 105d66cbb..e23ea1a7a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -113,6 +113,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 40f74c6ac..b2f705a42 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -127,6 +127,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7099476f4..5470ffec6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -115,6 +115,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index fc8d6f074..a8f7224a3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -121,6 +121,7 @@
 // Warning messages.
 // TODO: translate the following.
 // 'warn.sure' => 'Are you sure?',
+// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
 // TODO: translate the following.

From 722638fd8cc9400c5228106537effa1dcd0f7fa5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Nov 2018 23:54:09 +0000
Subject: [PATCH 0466/1848] Initial work done on confirmSave dialogs when date
 is changed.

---
 WEB-INF/lib/ttUser.class.php       |  1 +
 WEB-INF/resources/ru.lang.php      |  2 +-
 WEB-INF/templates/expense_edit.tpl | 12 ++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/time_edit.tpl    | 14 ++++++++++++++
 expense_edit.php                   |  6 +++++-
 time_edit.php                      |  6 +++++-
 7 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index eae6b83f1..8b98caa37 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -60,6 +60,7 @@ class ttUser {
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
+  var $confirm_save = 1; // Work in progress. TODO: change default to 0 and get from group config upon init.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3d7ff8585..dede24edd 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -103,7 +103,7 @@
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
-'warn.confirm_save' => 'Дата изменена. Подвердите сохранение, а не копирование этой записи.',
+'warn.confirm_save' => 'Дата изменена. Подтвердите сохранение, а не копирование записи.',
 
 // Success messages.
 'msg.success' => 'Операция завершена успешно.',
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index 953f78d5e..9e447a30b 100644
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.tpl
@@ -34,6 +34,18 @@ var defined_expenses = new Array();
   idx++;
 {/foreach}
 
+// TODO: improve on conditional confirmSave.
+// Existing entry date for confirm save warnings.
+var original_date = "{$entry_date}";
+
+function confirmSave() {
+  var date_on_save = document.getElementById("date").value;
+  if (original_date != date_on_save) {
+    return confirm("{$i18n.warn.confirm_save}");
+  }
+}
+// TODO: improve on conditional confirmSave above.
+
 // The fillProjectDropdown function populates the project combo box with
 // projects associated with a selected client (client id is passed here as id).
 function fillProjectDropdown(id) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 86f7c491b..5879e8894 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.28.4541 | 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.28.4542 | 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/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index a5017ce74..f6f469398 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -1,5 +1,19 @@
 {include file="time_script.tpl"}
 
+<script>
+// TODO: improve on conditional confirmSave.
+// Existing entry date for confirm save warnings.
+var original_date = "{$entry_date}";
+
+function confirmSave() {
+  var date_on_save = document.getElementById("date").value;
+  if (original_date != date_on_save) {
+    return confirm("{$i18n.warn.confirm_save}");
+  }
+}
+// TODO: improve on conditional confirmSave above.
+</script>
+
 {$forms.timeRecordForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
 <tr>
diff --git a/expense_edit.php b/expense_edit.php
index 049bc4bee..cca8225a4 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -147,7 +147,8 @@
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+// TODO: improve on conditional confirmSave.
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date();return(confirmSave())','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
@@ -220,6 +221,9 @@
   }
 } // isPost
 
+// TODO: improve on conditional confirmSave.
+$smarty->assign('entry_date', $cl_date);
+
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/time_edit.php b/time_edit.php
index 5670f1936..17ba34b41 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -210,7 +210,8 @@
 if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+// TODO: improve on conditional confirmSave.
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date();return(confirmSave())','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
@@ -400,6 +401,9 @@
   }
 } // isPost
 
+// TODO: improve on conditional confirmSave.
+$smarty->assign('entry_date', $cl_date);
+
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From b1082e6ec27ca11586bd786b65f509d1a20220f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 12:35:35 +0000
Subject: [PATCH 0467/1848] Refactoring in import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 28 ++++++++++++++++++++++++-
 WEB-INF/lib/ttRoleHelper.class.php      |  5 +++--
 WEB-INF/templates/footer.tpl            |  2 +-
 role_add.php                            |  2 --
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 345b1d2e4..011f2081d 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -155,7 +155,7 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'ROLE') {
         // We get here when processing <role> tags for the current group.
-        $role_id = ttRoleHelper::insert(array(
+        $role_id = $this->insertRole(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
@@ -745,6 +745,32 @@ private function insertProject($fields)
     return $last_id;
   }
 
+  // insertRole - inserts a role into tt_roles table.
+  private function insertRole($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $fields['name'];
+    $rank = (int) $fields['rank'];
+    $description = $fields['description'];
+    $rights = $fields['rights'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_roles (group_id, org_id, name, rank, description, rights, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $sql = "SELECT LAST_INSERT_ID() AS last_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $last_id = $val['last_id'];
+    return $last_id;
+  }
+
   // The insertClient function inserts a new client as well as client to project binds.
   private function insertClient($fields)
   {
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 353744699..c14bc970f 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -156,10 +156,11 @@ static function delete($role_id) {
   // insert - inserts an entry into tt_roles table.
   static function insert($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
     $name = $fields['name'];
     $rank = (int) $fields['rank'];
     $description = $fields['description'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5879e8894..9f251f40c 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.28.4542 | 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.28.4543 | 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/role_add.php b/role_add.php
index e1e16cc77..0386e5b14 100644
--- a/role_add.php
+++ b/role_add.php
@@ -63,8 +63,6 @@
     if (!$existing_role) {
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(
-          'group_id' => $user->group_id,
-          'org_id' => $user->org_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,

From cbc2ae6c2e83edfe7b4242b7dd2f9bfb1359820e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 13:22:19 +0000
Subject: [PATCH 0468/1848] Ongoing refactoring, replacing the method to obtain
 last insert ids.

---
 WEB-INF/lib/ttClientHelper.class.php      |   7 +-
 WEB-INF/lib/ttCustomFieldHelper.class.php | 100 ----------------------
 WEB-INF/lib/ttUserHelper.class.php        |   6 +-
 WEB-INF/templates/footer.tpl              |   2 +-
 4 files changed, 3 insertions(+), 112 deletions(-)
 delete mode 100644 WEB-INF/lib/ttCustomFieldHelper.class.php

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 24d00d236..3dc60bdb7 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -189,12 +189,7 @@ static function insert($fields)
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
-
+    $last_id = $mdb2->lastInsertID('tt_clients', 'id');
     if (count($projects) > 0)
       foreach ($projects as $p_id) {
         $sql = "insert into tt_client_project_binds (client_id, project_id, group_id, org_id) values($last_id, $p_id, $group_id, $org_id)";
diff --git a/WEB-INF/lib/ttCustomFieldHelper.class.php b/WEB-INF/lib/ttCustomFieldHelper.class.php
deleted file mode 100644
index 15c7ca054..000000000
--- a/WEB-INF/lib/ttCustomFieldHelper.class.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-// Class ttCustomFieldHelper is used to help with custom field related tasks.
-class ttCustomFieldHelper {
-	
-  // The insertField function inserts a new custom field in database.
-  static function insertField($fields)
-  {
-    $mdb2 = getConnection();
-
-    $group_id = (int) $fields['group_id'];
-    $type = (int) $fields['type'];
-    $label = $fields['label'];
-    $required = (int) $fields['required'];
-    $status = $fields['status'];
-    
-    $sql = "insert into tt_custom_fields (group_id, type, label, required, status)".
-      " values ($group_id, $type, ".$mdb2->quote($label).", $required, ".$mdb2->quote($status).")";
-      
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-      
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
-      
-    return $last_id;
-  }
-  
-  // The insertOption function inserts a new custom field option in database.
-  static function insertOption($fields)
-  {
-    $mdb2 = getConnection();
-
-    $field_id = (int) $fields['field_id'];
-    $value = $fields['value'];
-    
-    $sql = "insert into tt_custom_field_options (field_id, value) 
-      values ($field_id, ".$mdb2->quote($value).")";
-      
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-      
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
-      
-    return $last_id;
-  }
-  
-  // The insertLogEntry function inserts a new custom field log entry in database.
-  static function insertLogEntry($fields)
-  {
-    $mdb2 = getConnection();
-
-    $log_id = (int) $fields['log_id'];
-    $field_id = (int) $fields['field_id'];
-    $option_id = $fields['option_id'];
-    $value = $fields['value'];
-    $status = $fields['status'];
-    
-    $sql = "insert into tt_custom_field_log (log_id, field_id, option_id, value, status) 
-      values ($log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).", ".$mdb2->quote($status).")";
-      
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-}
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 2ff774ff5..42d7c9109 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -120,11 +120,7 @@ static function insert($fields, $hash = true) {
 
     // Now deal with project assignment.
     if (!is_a($affected, 'PEAR_Error')) {
-      $sql = "SELECT LAST_INSERT_ID() AS last_id";
-      $res = $mdb2->query($sql);
-      $val = $res->fetchRow();
-      $last_id = $val['last_id'];
-
+      $last_id = $mdb2->lastInsertID('tt_users', 'id');
       $projects = isset($fields['projects']) ? $fields['projects'] : array();
       if (count($projects) > 0) {
         // We have at least one project assigned. Insert corresponding entries in tt_user_project_binds table.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9f251f40c..501ebf76a 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.28.4543 | 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.28.4544 | 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>

From b43967e75a9a02e61a8ac2263f3b5432556d661f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 13:32:31 +0000
Subject: [PATCH 0469/1848] A bit more refactoring.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 9 ++-------
 WEB-INF/lib/ttInvoiceHelper.class.php   | 7 +------
 WEB-INF/templates/footer.tpl            | 2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index f1943f71f..36600e219 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -107,13 +107,8 @@ static function insertReport($fields) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "select last_insert_id() as last_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-
-    $val = $res->fetchRow();
-    return $val['last_id'];
+    $last_id = $mdb2->lastInsertID('tt_fav_reports', 'id');
+    return $last_id;
   }
 
   // updateReport - updates report options in the database.
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 3d67f6a78..41dace01b 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -56,12 +56,7 @@ static function insert($fields)
 
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
-
+    $last_id = $mdb2->lastInsertID('tt_invoices', 'id');
     return $last_id;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 501ebf76a..c16158002 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.28.4544 | 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.28.4545 | 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>

From c30bd94928988ff03ade10ca872968681456e12c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 14:31:27 +0000
Subject: [PATCH 0470/1848] Refactoring, finished with last insert ids.

---
 WEB-INF/lib/ttInvoiceHelper.class.php   |  6 +---
 WEB-INF/lib/ttOrgImportHelper.class.php | 38 +++++--------------------
 WEB-INF/lib/ttProjectHelper.class.php   |  8 ++----
 WEB-INF/lib/ttRoleHelper.class.php      |  5 +---
 WEB-INF/lib/ttTaskHelper.class.php      |  7 ++---
 WEB-INF/templates/footer.tpl            |  2 +-
 6 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 41dace01b..0867ee1eb 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -332,11 +332,7 @@ static function createInvoice($fields) {
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark associated invoice items with invoice id.
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_invoices', 'id');
 
     // Our update sql is different depending on tracking mode.
     if (MODE_TIME == $user->getTrackingMode()) {
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 011f2081d..328eabefb 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -725,11 +725,7 @@ private function insertProject($fields)
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_projects', 'id');
 
     // Insert binds into tt_project_task_binds table.
     if (is_array($tasks)) {
@@ -764,10 +760,7 @@ private function insertRole($fields)
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "SELECT LAST_INSERT_ID() AS last_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_id'];
+    $last_id = $mdb2->lastInsertID('tt_roles', 'id');
     return $last_id;
   }
 
@@ -796,11 +789,7 @@ private function insertClient($fields)
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_clients', 'id');
 
     if (count($projects) > 0)
       foreach ($projects as $p_id) {
@@ -844,13 +833,8 @@ private function insertFavReport($fields) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "select last_insert_id() as last_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-
-    $val = $res->fetchRow();
-    return $val['last_id'];
+    $last_id = $mdb2->lastInsertID('tt_fav_reports', 'id');
+    return $last_id;
   }
 
   // insertNotification function inserts a new notification into database.
@@ -912,11 +896,7 @@ private function insertCustomField($fields) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_custom_fields', 'id');
     return $last_id;
   }
 
@@ -935,11 +915,7 @@ private function insertCustomFieldOption($fields) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+    $last_id = $mdb2->lastInsertID('tt_custom_field_options', 'id');
     return $last_id;
   }
 
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 2a439dd9f..98d928f96 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -206,12 +206,8 @@ static function insert($fields)
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
-    
-    $last_id = 0;
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
+
+    $last_id = $mdb2->lastInsertID('tt_projects', 'id');
 
     // Bind the project to users.
     $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index c14bc970f..0686b1cdf 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -173,10 +173,7 @@ static function insert($fields)
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "SELECT LAST_INSERT_ID() AS last_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_id'];
+    $last_id = $mdb2->lastInsertID('tt_roles', 'id');
     return $last_id;
   }
 
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 0d4d5eff4..2987d2781 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -153,11 +153,8 @@ static function insert($fields)
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "select last_insert_id() as last_insert_id";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    $last_id = $val['last_insert_id'];
-    
+    $last_id = $mdb2->lastInsertID('tt_tasks', 'id');
+
     if (is_array($projects)) {
       foreach ($projects as $p_id) {
         // Insert task binds into tt_project_task_binds table.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c16158002..0b4dd2b45 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.28.4545 | 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.28.4546 | 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>

From db51a4b1e95f48d82bf2a214f8d0736f2485e3a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 14:51:33 +0000
Subject: [PATCH 0471/1848] Ongoing refactoring on decoupling import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 23 +++++++++++++++++------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 328eabefb..060a7c1d8 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,13 +27,8 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
-import('ttRoleHelper');
 import('ttTaskHelper');
-import('ttClientHelper');
 import('ttInvoiceHelper');
-import('ttTimeHelper');
-import('ttExpenseHelper');
-import('ttFavReportHelper');
 
 // ttOrgImportHelper class is used to import organization data from an XML file
 // prepared by ttOrgExportHelper and consisting of nested groups with their info.
@@ -63,7 +58,7 @@ class ttOrgImportHelper {
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
-    $this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
+    $this->top_role_id = $this->getTopRole();
   }
 
   // startElement - callback handler for opening tags in XML.
@@ -981,4 +976,20 @@ private function insertCustomFieldLogEntry($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getTopRole returns top role id.
+  private function getTopRole() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql = "select id from tt_roles where group_id = 0 and rank = ".MAX_RANK." and status = 1";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val['id'])
+        return $val['id'];
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0b4dd2b45..f0d3ff542 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.28.4546 | 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.28.4547 | 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>

From 109089e858e28200e714a790883c236230b3922f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 15:09:02 +0000
Subject: [PATCH 0472/1848] Refactored ttRoleHelper::getRoleByRank().

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 1 -
 WEB-INF/lib/ttRoleHelper.class.php      | 8 +++++---
 WEB-INF/templates/footer.tpl            | 2 +-
 role_add.php                            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 060a7c1d8..ebb5febd2 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -979,7 +979,6 @@ private function insertCustomFieldLogEntry($fields) {
 
   // getTopRole returns top role id.
   private function getTopRole() {
-    global $user;
     $mdb2 = getConnection();
 
     $sql = "select id from tt_roles where group_id = 0 and rank = ".MAX_RANK." and status = 1";
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 0686b1cdf..c324d6805 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -102,13 +102,15 @@ static function isClientRole($role_id) {
   }
 
   // getRoleByRank looks up a role by its rank.
-  static function getRoleByRank($rank, $group_id) {
+  static function getRoleByRank($rank) {
     global $user;
     $mdb2 = getConnection();
 
-    $rank = (int) $rank; // Cast to int just in case for better security.
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+    $rank = (int) $rank; // Cast to int just in case.
 
-    $sql = "select id from tt_roles where group_id = $group_id and rank = $rank and (status = 1 or status = 0)";
+    $sql = "select id from tt_roles where group_id = $group_id and org_id = $org_id and rank = $rank and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f0d3ff542..3b96b55be 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.28.4547 | 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.28.4548 | 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/role_add.php b/role_add.php
index 0386e5b14..97883151b 100644
--- a/role_add.php
+++ b/role_add.php
@@ -59,7 +59,7 @@
   if ($err->no() && ttRoleHelper::getRoleByName($cl_name)) $err->add($i18n->get('error.object_exists'));
 
   if ($err->no()) {
-    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->group_id);
+    $existing_role = ttRoleHelper::getRoleByRank($cl_rank);
     if (!$existing_role) {
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(

From dd0021e48080a708591d7ad763c63f5fb98e3fb7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 15:57:21 +0000
Subject: [PATCH 0473/1848] A bit more progress on decoupling import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 26 +++++++++++++++++++++++--
 WEB-INF/lib/ttTaskHelper.class.php      | 21 ++++++++++----------
 WEB-INF/templates/footer.tpl            |  2 +-
 mobile/task_add.php                     |  2 --
 mobile/task_edit.php                    |  2 --
 task_add.php                            |  2 --
 task_edit.php                           |  2 --
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ebb5febd2..cbf7d28a2 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
-import('ttTaskHelper');
 import('ttInvoiceHelper');
 
 // ttOrgImportHelper class is used to import organization data from an XML file
@@ -167,7 +166,7 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'TASK') {
         // We get here when processing <task> tags for the current group.
-        $task_id = ttTaskHelper::insert(array(
+        $task_id = $this->insertTask(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
@@ -700,6 +699,29 @@ private function insertExpense($fields) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
+  // insertTask function inserts a new task into database.
+  private function insertTask($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $fields['name'];
+    $description = $fields['description'];
+    $projects = $fields['projects'];
+    $status = $fields['status'];
+
+    $sql = "insert into tt_tasks (group_id, org_id, name, description, status)
+      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($status).")";
+    $affected = $mdb2->exec($sql);
+    $last_id = 0;
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = $mdb2->lastInsertID('tt_tasks', 'id');
+    return $last_id;
+  }
+
   // insertProject - a helper function to insert a project as well as project to task binds.
   private function insertProject($fields)
   {
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 2987d2781..015674067 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -137,10 +137,11 @@ static function delete($task_id) {
  // insert function inserts a new task into database.
   static function insert($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
     $name = $fields['name'];
     $description = $fields['description'];
     $projects = $fields['projects'];
@@ -270,17 +271,17 @@ static function update($fields)
 
   // sort function sorts task ids passed as comma-separated list by their name.
   static function sort($comma_separated) {
-  	// We can't sort an empty string.
-  	if (!$comma_separated)
-  	  return $comma_separated;
-  	  	  
+    // We can't sort an empty string.
+    if (!$comma_separated)
+      return $comma_separated;
+
     $mdb2 = getConnection();
-      
-	$sql = "select id, name from tt_tasks where id in ($comma_separated)";
+
+    $sql = "select id, name from tt_tasks where id in ($comma_separated)";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       die ($res->getMessage());
-    
+
     $task_arr = array();
     while ($val = $res->fetchRow()) {
       $task_arr[] = array('id'=>$val['id'],'name'=>$val['name']);
@@ -290,7 +291,7 @@ static function sort($comma_separated) {
     for($i = 0; $i < count($task_arr); $i++) {
 	  $task_ids[] = $task_arr[$i]['id'];
     }
-	$result = implode(',', $task_ids);
+    $result = implode(',', $task_ids);
     return $result;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3b96b55be..85ad89fe3 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.28.4548 | 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.28.4549 | 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/task_add.php b/mobile/task_add.php
index 003003479..9deed925d 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -68,8 +68,6 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index 47dc5d710..ba36ea56e 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -103,8 +103,6 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
diff --git a/task_add.php b/task_add.php
index 91f0e4fcd..1fdc7b18c 100644
--- a/task_add.php
+++ b/task_add.php
@@ -68,8 +68,6 @@
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
         'name' => $cl_name,
         'description' => $cl_description,
         'status' => ACTIVE,
diff --git a/task_edit.php b/task_edit.php
index c9f95ecb7..efe8509d3 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -101,8 +101,6 @@
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,

From a2f024d2184505a889e51d92337d9f40e392a1be Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 18:32:47 +0000
Subject: [PATCH 0474/1848] More refactoring on decoupling import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 41 +++++++++++++++++++++----
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index cbf7d28a2..349334114 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
-import('ttInvoiceHelper');
 
 // ttOrgImportHelper class is used to import organization data from an XML file
 // prepared by ttOrgExportHelper and consisting of nested groups with their info.
@@ -160,7 +159,9 @@ function startElement($parser, $name, $attrs) {
         if ($role_id) {
           // Add a mapping.
           $this->currentGroupRoleMap[$attrs['ID']] = $role_id;
-        } else $this->errors->add($i18n->get('error.db'));
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
         return;
       }
 
@@ -228,7 +229,9 @@ function startElement($parser, $name, $attrs) {
         if ($client_id) {
           // Add a mapping.
           $this->currentGroupClientMap[$attrs['ID']] = $client_id;
-        } else $this->errors->add($i18n->get('error.db'));
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
         return;
       }
 
@@ -251,7 +254,9 @@ function startElement($parser, $name, $attrs) {
         if ($user_id) {
           // Add a mapping.
           $this->currentGroupUserMap[$attrs['ID']] = $user_id;
-        } else $this->errors->add($i18n->get('error.db'));
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
         return;
       }
 
@@ -270,7 +275,7 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'INVOICE') {
         // We get here when processing <invoice> tags for the current group.
-        $invoice_id = ttInvoiceHelper::insert(array(
+        $invoice_id = $this->insertInvoice(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
@@ -280,7 +285,9 @@ function startElement($parser, $name, $attrs) {
         if ($invoice_id) {
           // Add a mapping.
           $this->currentGroupInvoiceMap[$attrs['ID']] = $invoice_id;
-        } else $this->errors->add($i18n->get('error.db'));
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
         return;
       }
 
@@ -781,6 +788,28 @@ private function insertRole($fields)
     return $last_id;
   }
 
+  // insertInvoice - inserts an invoice in database.
+  private function insertInvoice($fields)
+  {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $fields['name'];
+    $client_id = (int) $fields['client_id'];
+    $date = $fields['date'];
+    $status = $fields['status'];
+
+    // Insert a new invoice record.
+    $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id, status)".
+      " values($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id, ".$mdb2->quote($fields['status']).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $last_id = $mdb2->lastInsertID('tt_invoices', 'id');
+    return $last_id;
+  }
+
   // The insertClient function inserts a new client as well as client to project binds.
   private function insertClient($fields)
   {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 85ad89fe3..9b68b6a8b 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.28.4549 | 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.28.4550 | 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>

From 42dcc17360038e8fdfdb3bbdc7983bf5fe727954 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 19:45:19 +0000
Subject: [PATCH 0475/1848] Fully decoupled import code from the rest of the
 app.

---
 WEB-INF/lib/ttInvoiceHelper.class.php   | 28 ----------
 WEB-INF/lib/ttOrgImportHelper.class.php | 74 +++++++++++++++++++++++--
 WEB-INF/lib/ttUserHelper.class.php      |  8 +--
 WEB-INF/templates/footer.tpl            |  2 +-
 4 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 0867ee1eb..13e784d07 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -32,34 +32,6 @@
 // Class ttInvoiceHelper is used for help with invoices.
 class ttInvoiceHelper {
 
-  // insert - inserts an invoice in database.
-  static function insert($fields)
-  {
-    $mdb2 = getConnection();
-
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
-    $name = $fields['name'];
-    if (!$name) return false;
-
-    $client_id = (int) $fields['client_id'];
-    $date = $fields['date'];
-    if (array_key_exists('status', $fields)) { // Key exists and may be NULL during migration of data.
-      $status_f = ', status';
-      $status_v = ', '.$mdb2->quote($fields['status']);
-    }
-
-    // Insert a new invoice record.
-    $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id $status_f)".
-      " values($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id $status_v)";
-    $affected = $mdb2->exec($sql);
-
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    $last_id = $mdb2->lastInsertID('tt_invoices', 'id');
-    return $last_id;
-  }
-
   // getInvoice - obtains invoice data from the database.
   static function getInvoice($invoice_id) {
     global $user;
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 349334114..ff3376d32 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -26,8 +26,6 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttUserHelper');
-
 // ttOrgImportHelper class is used to import organization data from an XML file
 // prepared by ttOrgExportHelper and consisting of nested groups with their info.
 class ttOrgImportHelper {
@@ -83,7 +81,7 @@ function startElement($parser, $name, $attrs) {
       // In first pass we check user logins for potential collisions with existing.
       if ($name == 'USER' && $this->canImport) {
         $login = $attrs['LOGIN'];
-        if ('' != $attrs['STATUS'] && ttUserHelper::getUserByLogin($login)) {
+        if ('' != $attrs['STATUS'] && $this->loginExists($login)) {
           // We have a login collision. Append colliding login to a list of things we cannot import.
           $this->conflicting_logins .= ($this->conflicting_logins ? ", $login" : $login);
           // The above is printed in error message with all found colliding logins.
@@ -240,7 +238,7 @@ function startElement($parser, $name, $attrs) {
 
         $role_id = $attrs['ROLE_ID'] === '0' ? $this->top_role_id :  $this->currentGroupRoleMap[$attrs['ROLE_ID']]; // 0 (not null) means top manager role.
 
-        $user_id = ttUserHelper::insert(array(
+        $user_id = $this->insertUser(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'role_id' => $role_id,
@@ -261,7 +259,7 @@ function startElement($parser, $name, $attrs) {
       }
 
       if ($name == 'USER_PROJECT_BIND') {
-        if (!ttUserHelper::insertBind(array(
+        if (!$this->insertUserProjectBind(array(
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'group_id' => $this->current_group_id,
@@ -654,6 +652,7 @@ private function createGroup($fields) {
   // insertMonthlyQuota - a helper function to insert a monthly quota.
   private function insertMonthlyQuota($fields) {
     $mdb2 = getConnection();
+
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
     $year = (int) $fields['year'];
@@ -669,6 +668,7 @@ private function insertMonthlyQuota($fields) {
   // insertPredefinedExpense - a helper function to insert a predefined expense.
   private function insertPredefinedExpense($fields) {
     $mdb2 = getConnection();
+
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
     $name = $mdb2->quote($fields['name']);
@@ -729,6 +729,55 @@ private function insertTask($fields)
     return $last_id;
   }
 
+  // insertUserProjectBind - inserts a user to project bind into tt_user_project_binds table.
+  private function insertUserProjectBind($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $user_id = (int) $fields['user_id'];
+    $project_id = (int) $fields['project_id'];
+    $rate = $mdb2->quote($fields['rate']);
+    $status = $mdb2->quote($fields['status']);
+
+    $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
+      " values($user_id, $project_id, $group_id, $org_id, $rate, $status)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // insertUser - inserts a user into database.
+  private function insertUser($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+
+    $columns = '(login, password, name, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by, status)';
+
+    $values = 'values (';
+    $values .= $mdb2->quote($fields['login']);
+    $values .= ', '.$mdb2->quote($fields['password']);
+    $values .= ', '.$mdb2->quote($fields['name']);
+    $values .= ', '.$group_id;
+    $values .= ', '.$org_id;
+    $values .= ', '.(int)$fields['role_id'];
+    $values .= ', '.$mdb2->quote($fields['client_id']);
+    $values .= ', '.$mdb2->quote($fields['rate']);
+    $values .= ', '.$mdb2->quote($fields['email']);
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
+    $values .= ', '.$mdb2->quote($fields['status']);
+    $values .= ')';
+
+    $sql = "insert into tt_users $columns $values";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $last_id = $mdb2->lastInsertID('tt_users', 'id');
+    return $last_id;
+  }
+
   // insertProject - a helper function to insert a project as well as project to task binds.
   private function insertProject($fields)
   {
@@ -736,7 +785,6 @@ private function insertProject($fields)
 
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
-
     $name = $fields['name'];
     $description = $fields['description'];
     $tasks = $fields['tasks'];
@@ -1042,4 +1090,18 @@ private function getTopRole() {
     }
     return false;
   }
+
+  // The loginExists function detrmines if a login already exists.
+  private function loginExists($login) {
+    $mdb2 = getConnection();
+
+    $sql = "select id from tt_users where login = ".$mdb2->quote($login)." and (status = 1 or status = 0)";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if ($val = $res->fetchRow()) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 42d7c9109..1d1b178a6 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -228,8 +228,6 @@ static function update($user_id, $fields) {
             ttUserHelper::insertBind(array(
               'user_id' => $user_id,
               'project_id' => $project_id,
-              'group_id' => $user->getGroup(),
-              'org_id' => $user->org_id,
               'rate' => $rate,
               'status' => ACTIVE));
            }
@@ -315,10 +313,8 @@ static function insertBind($fields) {
     global $user;
     $mdb2 = getConnection();
 
-    // This may be used during import. Use the following until we have import refactored.
-    $group_id = $fields['group_id'] ? (int) $fields['group_id'] : $user->getGroup();
-    $org_id = $fields['org_id'] ? (int) $fields['org_id'] : $user->org_id;
-
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
     $user_id = (int) $fields['user_id'];
     $project_id = (int) $fields['project_id'];
     $rate = $mdb2->quote($fields['rate']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9b68b6a8b..b54e88149 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.28.4550 | 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.28.4551 | 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>

From 35af76f7c66ba10e2e1279f2e9afbdb2b09a141d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 21:27:42 +0000
Subject: [PATCH 0476/1848] Some improvements to confirm save feature.

---
 WEB-INF/lib/ttUser.class.php              |  6 ++
 WEB-INF/templates/expense_edit.tpl        |  6 +-
 WEB-INF/templates/footer.tpl              |  2 +-
 WEB-INF/templates/mobile/expense_edit.tpl | 12 ++++
 WEB-INF/templates/mobile/time_edit.tpl    | 16 ++++-
 WEB-INF/templates/time_edit.tpl           |  6 +-
 expense_edit.php                          | 15 +++--
 mobile/expense_edit.php                   | 11 +++-
 mobile/time_edit.php                      | 73 ++++++++++++++++++++++-
 time_edit.php                             | 15 +++--
 10 files changed, 139 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 8b98caa37..692d80ef0 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -202,6 +202,12 @@ function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
   }
 
+  // getConfirmSave returns confirm_save option for user.
+  function getConfirmSave() {
+    return true; // TODO: implement this properly.
+    // return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
+  }
+
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index 9e447a30b..d3a27375c 100644
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.tpl
@@ -34,8 +34,8 @@ var defined_expenses = new Array();
   idx++;
 {/foreach}
 
-// TODO: improve on conditional confirmSave.
-// Existing entry date for confirm save warnings.
+{* Conditional include of confirmSave handler. *}
+{if $confirm_save}
 var original_date = "{$entry_date}";
 
 function confirmSave() {
@@ -44,7 +44,7 @@ function confirmSave() {
     return confirm("{$i18n.warn.confirm_save}");
   }
 }
-// TODO: improve on conditional confirmSave above.
+{/if}
 
 // The fillProjectDropdown function populates the project combo box with
 // projects associated with a selected client (client id is passed here as id).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b54e88149..9d88e933e 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.28.4551 | 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.28.4552 | 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/mobile/expense_edit.tpl b/WEB-INF/templates/mobile/expense_edit.tpl
index ea2972381..971405079 100644
--- a/WEB-INF/templates/mobile/expense_edit.tpl
+++ b/WEB-INF/templates/mobile/expense_edit.tpl
@@ -34,6 +34,18 @@ var defined_expenses = new Array();
   idx++;
 {/foreach}
 
+{* Conditional include of confirmSave handler. *}
+{if $confirm_save}
+var original_date = "{$entry_date}";
+
+function confirmSave() {
+  var date_on_save = document.getElementById("date").value;
+  if (original_date != date_on_save) {
+    return confirm("{$i18n.warn.confirm_save}");
+  }
+}
+{/if}
+
 // The fillProjectDropdown function populates the project combo box with
 // projects associated with a selected client (client id is passed here as id).
 function fillProjectDropdown(id) {
diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
index 8c6a14142..79c5c03c4 100644
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ b/WEB-INF/templates/mobile/time_edit.tpl
@@ -1,5 +1,19 @@
 {include file="time_script.tpl"}
 
+{* Conditional include of confirmSave handler. *}
+{if $confirm_save}
+<script>
+var original_date = "{$entry_date}";
+
+function confirmSave() {
+  var date_on_save = document.getElementById("date").value;
+  if (original_date != date_on_save) {
+    return confirm("{$i18n.warn.confirm_save}");
+  }
+}
+</script>
+{/if}
+
 {$forms.timeRecordForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
 <tr>
@@ -41,7 +55,7 @@
     <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
     <tr><td>{$i18n.label.note}:</td></tr>
     <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
-    <tr><td align="center">{$forms.timeRecordForm.btn_save.control}&nbsp;{$forms.timeRecordForm.btn_delete.control}</td></tr>
+    <tr><td align="center">{$forms.timeRecordForm.btn_save.control} {$forms.timeRecordForm.btn_copy.control} {$forms.timeRecordForm.btn_delete.control}</td></tr>
     </table>
     </td>
     </tr>
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index f6f469398..bc563e9ea 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -1,8 +1,8 @@
 {include file="time_script.tpl"}
 
+{* Conditional include of confirmSave handler. *}
+{if $confirm_save}
 <script>
-// TODO: improve on conditional confirmSave.
-// Existing entry date for confirm save warnings.
 var original_date = "{$entry_date}";
 
 function confirmSave() {
@@ -11,8 +11,8 @@ function confirmSave() {
     return confirm("{$i18n.warn.confirm_save}");
   }
 }
-// TODO: improve on conditional confirmSave above.
 </script>
+{/if}
 
 {$forms.timeRecordForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
diff --git a/expense_edit.php b/expense_edit.php
index cca8225a4..a4bb6a4f4 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -51,6 +51,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+$confirm_save = $user->getConfirmSave();
 
 // Initialize variables.
 $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
@@ -147,9 +148,10 @@
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-// TODO: improve on conditional confirmSave.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date();return(confirmSave())','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$on_click_action = 'browser_today.value=get_date();';
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+if ($confirm_save) $on_click_action .= 'return(confirmSave());';
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
@@ -221,9 +223,10 @@
   }
 } // isPost
 
-// TODO: improve on conditional confirmSave.
-$smarty->assign('entry_date', $cl_date);
-
+if ($confirm_save) {
+  $smarty->assign('confirm_save', true);
+  $smarty->assign('entry_date', $cl_date);
+}
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index a039f42f8..9cae01814 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -51,6 +51,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+$confirm_save = $user->getConfirmSave();
 
 // Initialize variables.
 $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
@@ -142,8 +143,10 @@
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$on_click_action = 'browser_today.value=get_date();';
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+if ($confirm_save) $on_click_action .= 'return(confirmSave());';
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
@@ -215,6 +218,10 @@
   }
 } // isPost
 
+if ($confirm_save) {
+  $smarty->assign('confirm_save', true);
+  $smarty->assign('entry_date', $cl_date);
+}
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index b2655e8f6..3094df64b 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -57,6 +57,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
+$confirm_save = $user->getConfirmSave();
 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
@@ -205,7 +206,10 @@
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save click.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.save')));
+$on_click_action = 'browser_today.value=get_date();';
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+if ($confirm_save) $on_click_action .= 'return(confirmSave());';
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
@@ -324,12 +328,79 @@
     }
   }
 
+  // Save as new record.
+  if ($request->getParameter('btn_copy')) {
+    // We need to:
+    // 1) Prohibit saving into locked range.
+    // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
+
+    // Now, step by step.
+    if ($err->no()) {
+      // 1) Prohibit saving into locked range.
+      if ($user->isDateLocked($new_date))
+        $err->add($i18n->get('error.range_locked'));
+
+      // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
+      $uncompleted = ($cl_finish == '' && $cl_duration == '');
+      if ($uncompleted) {
+        $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
+        if ($not_completed_rec) {
+          // We have another not completed record.
+          $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
+        }
+      }
+    }
+
+    // Prohibit creating an overlapping record.
+    if ($err->no()) {
+      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
+        $err->add($i18n->get('error.overlap'));
+    }
+
+    // Now, a new insert.
+    if ($err->no()) {
+
+      $id = ttTimeHelper::insert(array(
+        'date'=>$new_date->toString(DB_DATEFORMAT),
+        'user_id'=>$user_id,
+        'group_id'=>$user->getGroup(),
+        'org_id' => $user->org_id,
+        'client'=>$cl_client,
+        'project'=>$cl_project,
+        'task'=>$cl_task,
+        'start'=>$cl_start,
+        'finish'=>$cl_finish,
+        'duration'=>$cl_duration,
+        'note'=>$cl_note,
+        'billable'=>$cl_billable,
+        'paid'=>$cl_paid));
+
+      // Insert a custom field if we have it.
+      $res = true;
+      if ($id && $custom_fields && $cl_cf_1) {
+        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+          $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
+        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+          $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      }
+      if ($id && $res) {
+        header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
+        exit();
+      }
+      $err->add($i18n->get('error.db'));
+    }
+  }
+
   if ($request->getParameter('btn_delete')) {
     header("Location: time_delete.php?id=$cl_id");
     exit();
   }
 } // isPost
 
+if ($confirm_save) {
+  $smarty->assign('confirm_save', true);
+  $smarty->assign('entry_date', $cl_date);
+}
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/time_edit.php b/time_edit.php
index 17ba34b41..5dd958b5b 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -57,6 +57,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
+$confirm_save = $user->getConfirmSave();
 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
@@ -210,9 +211,10 @@
 if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-// TODO: improve on conditional confirmSave.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date();return(confirmSave())','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.copy')));
+$on_click_action = 'browser_today.value=get_date();';
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+if ($confirm_save) $on_click_action .= 'return(confirmSave());';
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
@@ -401,9 +403,10 @@
   }
 } // isPost
 
-// TODO: improve on conditional confirmSave.
-$smarty->assign('entry_date', $cl_date);
-
+if ($confirm_save) {
+  $smarty->assign('confirm_save', true);
+  $smarty->assign('entry_date', $cl_date);
+}
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From a8d2a373388113fc60233feda3b971c4d67e6211 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Nov 2018 23:28:06 +0000
Subject: [PATCH 0477/1848] Implemented configurable confirm save option.

---
 WEB-INF/lib/ttGroup.class.php    | 4 +++-
 WEB-INF/lib/ttUser.class.php     | 6 +++---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 4 ++++
 group_edit.php                   | 6 ++++++
 35 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index e232a0e1a..865363494 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -50,6 +50,7 @@ class ttGroup {
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
+  var $confirm_save = 0;        // Whether to show warnings for save action when date changed.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -104,7 +105,6 @@ function __construct($id, $org_id) {
       $this->custom_logo = $val['custom_logo'];
       */
       $this->config = $val['config'];
-      /*
       $config = new ttConfigHelper($this->config);
       // Set user config options.
       $this->show_holidays = $config->getDefinedValue('show_holidays');
@@ -112,6 +112,8 @@ function __construct($id, $org_id) {
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
       $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
+      $this->confirm_save = $config->getDefinedValue('confirm_save');
+      /*
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 692d80ef0..7a102a27c 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -60,7 +60,7 @@ class ttUser {
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
-  var $confirm_save = 1; // Work in progress. TODO: change default to 0 and get from group config upon init.
+  var $confirm_save = 0;        // Whether to show warnings for save action when date changed.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -144,6 +144,7 @@ function __construct($login, $id = null) {
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
       $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
+      $this->confirm_save = $config->getDefinedValue('confirm_save');
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
@@ -204,8 +205,7 @@ function getConfig() {
 
   // getConfirmSave returns confirm_save option for user.
   function getConfirmSave() {
-    return true; // TODO: implement this properly.
-    // return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
+    return ($this->behalfGroup ? $this->behalfGroup->confirm_save : $this->confirm_save);
   }
 
   // can - determines whether user has a right to do something.
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2b0b17bdb..68c6e6a96 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -532,7 +532,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 7150a6fb1..bcda74010 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -546,7 +546,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index bad0297c2..45cf377ee 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -496,7 +496,7 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uafsluttede indikatore',
 // TODO: translate the following.
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index cc2800655..80c78537b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -468,7 +468,7 @@
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
 // TODO: translate the following.
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Erlaube IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1d27ce90a..fee9fdbf0 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -465,7 +465,7 @@
 'form.group_edit.allow_overlap' => 'Allow overlap',
 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-'form.group_edit.copy_warning' => 'Warn on copy',
+'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c82df5b55..aa6425547 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -546,7 +546,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e6d2dbe86..a61a13056 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -543,7 +543,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 412345f1a..86f3930de 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -518,7 +518,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1dcc17081..4687e6f53 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -503,7 +503,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6900fa7bc..ad77095c2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -492,7 +492,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ce382635a..f4859df7f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -477,7 +477,7 @@
 'form.group_edit.future_entries' => 'Μελλοντικές καταχωρήσεις',
 'form.group_edit.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
 // TODO: translate the following.
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d955c857d..d7abe002d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -527,7 +527,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 884db355c..0e0e4522f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -537,7 +537,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8c9a07dab..ce1ab88cc 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -492,7 +492,7 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Indicatori incompleti',
 // TODO: translate the following.
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 5211d0684..431915fd8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -540,7 +540,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2344ac14c..7ac2dd4ef 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -538,7 +538,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2e357f9c6..3cad307be 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -469,7 +469,7 @@
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
 // TODO: translate the following.
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8b7762e2a..d7847c153 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -536,7 +536,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 7a7852a73..a36b06c14 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -505,7 +505,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index df2ccc0e3..7bfb95529 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -500,7 +500,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d963d1ea3..bdb1c3753 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -520,7 +520,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e8f84cbc8..e1c24e2de 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -541,7 +541,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index dede24edd..5710cbb36 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -462,7 +462,7 @@
 'form.group_edit.allow_overlap' => 'Возможное перекрывание',
 'form.group_edit.future_entries' => 'Будущие записи',
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
-'form.group_edit.copy_warning' => 'Предупреждать при копировании',
+'form.group_edit.confirm_save' => 'Предупреждать при сохранении',
 'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d3e4f4d40..0097e09b7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -518,7 +518,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c9a4a1b71..dfc9fd32a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -516,7 +516,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6e5dbbbd3..1c59de37e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -503,7 +503,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index e23ea1a7a..a20aed921 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -500,7 +500,7 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
 // TODO: translate the following.
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b2f705a42..771ccb904 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -554,7 +554,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5470ffec6..190cf5a48 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -523,7 +523,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a8f7224a3..7b1bcdba0 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -532,7 +532,7 @@
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.copy_warning' => 'Warn on copy',
+// 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9d88e933e..d942b96c6 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.28.4552 | 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.29.4553 | 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 8f683de44..f839d7e93 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -100,6 +100,10 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.uncompleted_indicators}:</td>
             <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
+          <tr>
+            <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>
diff --git a/group_edit.php b/group_edit.php
index 6a16dc1f0..44c5d7f9b 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -77,6 +77,7 @@
   $cl_allow_overlap = $request->getParameter('allow_overlap');
   $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 {
@@ -97,6 +98,7 @@
   $cl_allow_overlap = $config->getDefinedValue('allow_overlap');
   $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'];
 }
@@ -191,6 +193,9 @@
 // Uncompleted indicators checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
 
+// 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));
@@ -234,6 +239,7 @@
     $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
     $config->setDefinedValue('future_entries', $cl_future_entries);
     $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
+    $config->setDefinedValue('confirm_save', $cl_confirm_save);
 
     if ($user->updateGroup(array(
       'group_id' => $group_id,

From 7a59cd1320f833a7cc2a29f5fd2806f84a4f0e94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 14:23:31 +0000
Subject: [PATCH 0478/1848] Some improvements in ttConfigHelper class.

---
 WEB-INF/lib/ttConfigHelper.class.php | 63 +++++++++++++++-------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
index 20af19ad0..6790e2140 100644
--- a/WEB-INF/lib/ttConfigHelper.class.php
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -38,13 +38,15 @@ class ttConfigHelper {
 
   // Constructor.
   function __construct($config) {
-    $this->config = $config;
-    $this->config_array = explode(',', $this->config);
+    $this->config = trim($config, ' ,');
+    if ($this->config)
+      $this->config_array = explode(',', $this->config);
   }
 
   // getDefinedValue determines if a value identified by name is defined.
   function getDefinedValue($name) {
-    return in_array($name, $this->config_array);
+    $defined = $this->config_array ? in_array($name, $this->config_array) : false;
+    return $defined;
   }
 
   // setDefinedValue either sets or deletes a defined value identified by name.
@@ -58,29 +60,32 @@ function setDefinedValue($name, $set = true) {
       }
     } else {
       // Deleting part.
-      foreach ($this->config_array as $key => $value) {
-        if ($value === $name) {
-          unset($this->config_array[$key]);
-          $this->config = implode(',', $this->config_array);
-          return;
+      if ($this->config_array) {
+        foreach ($this->config_array as $key => $value) {
+          if ($value === $name) {
+            unset($this->config_array[$key]);
+            $this->config = implode(',', $this->config_array);
+            return;
+          }
         }
       }
     }
   }
 
-  // The getIntValue parses an integer value from the source config string.
+  // The getIntValue parses an integer value from the source config array.
   function getIntValue($name) {
     $name_with_colon = $name.':';
     $len = strlen($name_with_colon);
 
-    foreach ($this->config_array as $unparsed_value) {
-      if (substr($unparsed_value, 0, $len) === $name_with_colon) {
-        // Found value.
-        $unparsed_len = strlen($unparsed_value);
-        $int_value = (int) substr($unparsed_value, -($unparsed_len - $len));
-        return $int_value;
+    if ($this->config_array) {
+      foreach ($this->config_array as $unparsed_value) {
+        if (substr($unparsed_value, 0, $len) === $name_with_colon) {
+          // Found value.
+          $unparsed_len = strlen($unparsed_value);
+          $int_value = (int) substr($unparsed_value, -($unparsed_len - $len));
+          return $int_value;
+        }
       }
-        
     }
     return false;
   }
@@ -91,18 +96,20 @@ function setIntValue($name, $value) {
     $name_with_colon = $name.':';
     $len = strlen($name_with_colon);
 
-    foreach ($this->config_array as $key => $unparsed_value) {
-      if (substr($unparsed_value, 0, $len) === $name_with_colon) {
-        // Found an already existing value.
-        if ($value !== null) {
-          // Replace value.
-          $this->config_array[$key] = $name.':'.$value;
-        } else {
-          // Remove value if our new value is NULL.
-          unset($this->config_array[$key]);
+    if ($this->config_array) {
+      foreach ($this->config_array as $key => $unparsed_value) {
+        if (substr($unparsed_value, 0, $len) === $name_with_colon) {
+          // Found an already existing value.
+          if ($value !== null) {
+            // Replace value.
+            $this->config_array[$key] = $name.':'.$value;
+          } else {
+            // Remove value if our new value is NULL.
+            unset($this->config_array[$key]);
+          }
+          $this->config = implode(',', $this->config_array);
+          return;
         }
-        $this->config = implode(',', $this->config_array);
-        return;
       }
     }
     // If we get here, the value was not found, so add it.
@@ -113,6 +120,6 @@ function setIntValue($name, $value) {
 
   // The getConfig returns the config string.
   function getConfig() {
-    return $this->config;
+    return trim($this->config, ' ,');
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d942b96c6..90b3e9000 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.29.4553 | 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.29.4554 | 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>

From 91f127aa192430faa62c59530f42ee5d82b9f7e3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 15:46:45 +0000
Subject: [PATCH 0479/1848] Some optimization related to confirm save feature.

---
 WEB-INF/lib/ttGroup.class.php |  2 --
 WEB-INF/lib/ttUser.class.php  | 12 +++++++-----
 WEB-INF/templates/footer.tpl  |  2 +-
 expense_edit.php              |  2 +-
 mobile/expense_edit.php       |  2 +-
 mobile/time_edit.php          |  2 +-
 time_edit.php                 |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 865363494..44e225b23 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -50,7 +50,6 @@ class ttGroup {
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
-  var $confirm_save = 0;        // Whether to show warnings for save action when date changed.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -112,7 +111,6 @@ function __construct($id, $org_id) {
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
       $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
-      $this->confirm_save = $config->getDefinedValue('confirm_save');
       /*
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7a102a27c..60f4f984b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -60,7 +60,6 @@ class ttUser {
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
-  var $confirm_save = 0;        // Whether to show warnings for save action when date changed.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -144,7 +143,6 @@ function __construct($login, $id = null) {
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
       $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
-      $this->confirm_save = $config->getDefinedValue('confirm_save');
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
@@ -203,9 +201,13 @@ function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
   }
 
-  // getConfirmSave returns confirm_save option for user.
-  function getConfirmSave() {
-    return ($this->behalfGroup ? $this->behalfGroup->confirm_save : $this->confirm_save);
+  // getConfigOption returns true if an option is defined for group.
+  // This helps us keeping a set of user attributes smaller.
+  // We determine whether the option is set only on pages that need to know.
+  // For example: confirm_save is used only on time and expense edit pages.
+  function getConfigOption($name) {
+    $config = new ttConfigHelper($this->getConfig());
+    return $config->getDefinedValue($name);
   }
 
   // can - determines whether user has a right to do something.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90b3e9000..b17fa6750 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.29.4554 | 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.29.4555 | 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/expense_edit.php b/expense_edit.php
index a4bb6a4f4..9768fa23e 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -51,7 +51,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
-$confirm_save = $user->getConfirmSave();
+$confirm_save = $user->getConfigOption('confirm_save');
 
 // Initialize variables.
 $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 9cae01814..d139530c9 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -51,7 +51,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
-$confirm_save = $user->getConfirmSave();
+$confirm_save = $user->getConfigOption('confirm_save');
 
 // Initialize variables.
 $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 3094df64b..925220430 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -57,7 +57,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-$confirm_save = $user->getConfirmSave();
+$confirm_save = $user->getConfigOption('confirm_save');
 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
diff --git a/time_edit.php b/time_edit.php
index 5dd958b5b..08a5f392e 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -57,7 +57,7 @@
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-$confirm_save = $user->getConfirmSave();
+$confirm_save = $user->getConfigOption('confirm_save');
 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;

From 035970e91c0a4c132874656b8f13a88c46684717 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 16:25:54 +0000
Subject: [PATCH 0480/1848] Optimized a bit more for uncompleted indicators
 option.

---
 WEB-INF/lib/ttGroup.class.php      | 2 --
 WEB-INF/lib/ttUser.class.php       | 2 --
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/mobile/users.tpl | 2 +-
 WEB-INF/templates/users.tpl        | 2 +-
 mobile/users.php                   | 6 ++++--
 users.php                          | 5 +++--
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 44e225b23..b7e78f959 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -49,7 +49,6 @@ class ttGroup {
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
-  var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -110,7 +109,6 @@ function __construct($id, $org_id) {
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
-      $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
       /*
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 60f4f984b..0db272ff6 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -59,7 +59,6 @@ class ttUser {
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
-  var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -142,7 +141,6 @@ function __construct($login, $id = null) {
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
-      $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b17fa6750..071a29a46 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.29.4555 | 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.29.4556 | 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/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index e2b815f1b..ae04bd448 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -19,7 +19,7 @@
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-            {if $user->uncompleted_indicators}
+            {if $uncompleted_indicators}
               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {/if}
             {if $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index fb46c96d6..4faf1249d 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -31,7 +31,7 @@
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-          {if $user->uncompleted_indicators}
+          {if $uncompleted_indicators}
             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
           {/if}
             {$u.name|escape}
diff --git a/mobile/users.php b/mobile/users.php
index d0b5d2189..874b07634 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -38,6 +38,8 @@
 }
 // End of access checks.
 
+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
+
 // Get users.
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
 if($user->can('manage_users')) {
@@ -45,12 +47,12 @@
   $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
 
-// Check if the group is set to show indicators for uncompleted time entries.
-if ($user->uncompleted_indicators) {
+if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
   }
+  $smarty->assign('uncompleted_indicators', true);
 }
 
 $smarty->assign('active_users', $active_users);
diff --git a/users.php b/users.php
index fe0e92da9..47ec0145a 100644
--- a/users.php
+++ b/users.php
@@ -50,6 +50,7 @@
 } else {
   $group_id = $user->getGroup();
 }
+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 
 $form = new Form('usersForm');
 if ($user->can('manage_subgroups')) {
@@ -79,12 +80,12 @@
   $inactive_users = $user->getUsers($options);
 }
 
-// Check if the group is set to show indicators for uncompleted time entries.
-if ($user->uncompleted_indicators) {
+if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
   }
+  $smarty->assign('uncompleted_indicators', true);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From 5be0f37534b82691a7707cde3aeb3d0b41fd71e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 17:32:37 +0000
Subject: [PATCH 0481/1848] Resuming refactoring for subgroup support.

---
 WEB-INF/templates/clients.tpl |  9 +++++++++
 WEB-INF/templates/footer.tpl  |  2 +-
 clients.php                   | 36 +++++++++++++++++++++++++++++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index a31a8cd05..2e8b2b82f 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -6,6 +6,15 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_clients')}
+  {if $group_dropdown}
+{$forms.clientsForm.open} {* clientsForm consists only of one dropdown group control *}
+      <table width="100%">
+        <tr>
+          <td align="center">{$i18n.label.group}: {$forms.clientsForm.group.control}</td>
+        </tr>
+      </table>
+{$forms.clientsForm.close}
+  {/if}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_clients}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.active_clients}</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 071a29a46..1a9987d8c 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.29.4556 | 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.29.4557 | 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/clients.php b/clients.php
index 6bf48097f..ca83efd90 100644
--- a/clients.php
+++ b/clients.php
@@ -39,13 +39,45 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($request->isPost()) {
+  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
+  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    exit();
+  }
+}
+
+// Determine group for which we display this page.
+if ($request->isPost() && $groupChanged) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getGroup();
+}
+
+$form = new Form('clientsForm');
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.clientsForm.group_changed.value=1;document.clientsForm.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
 
 if($user->can('manage_clients')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
-  $inactive_clients = ttTeamHelper::getInactiveClients($user->group_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
+  $inactive_clients = ttTeamHelper::getInactiveClients($user->getGroup(), true);
 } else
   $active_clients = $user->getAssignedClients();
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_clients', $active_clients);
 $smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));

From a96c4f4e05e68e875ce088201ad011d6fc3e1e1c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 17:49:11 +0000
Subject: [PATCH 0482/1848] A bit more refactoring of clients.php for
 subgroups.

---
 WEB-INF/lib/ttClientHelper.class.php | 12 --------
 WEB-INF/lib/ttGroupHelper.class.php  | 46 ++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 clients.php                          |  5 +--
 4 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 3dc60bdb7..9009f570a 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -239,18 +239,6 @@ static function update($fields)
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // The setMappedClient function is used during group import to change client_id value for tt_users to a mapped value.
-  static function setMappedClient($group_id, $imported_id, $mapped_id)
-  {
-    $mdb2 = getConnection();
-    $sql = "update tt_users set client_id = $mapped_id where client_id = $imported_id and group_id = $group_id ";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    return true;
-  }
-
   // The fillBean function fills the ActionForm object with client data.
   static function fillBean($client_id, &$bean) {
     $client = ttClientHelper::getClient($client_id, true);
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 8b02c85e1..e04c221d1 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -274,4 +274,50 @@ static function getRoles() {
     }
     return $roles;
   }
+
+  // The getActiveClients returns an array of active clients for a group.
+  static function getActiveClients($all_fields = false)
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+    if ($all_fields)
+      $sql = "select * from tt_clients where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+    else
+      $sql = "select id, name from tt_clients where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // The getInactiveClients returns an array of inactive clients for a group.
+  static function getInactiveClients($all_fields = false)
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+    if ($all_fields)
+      $sql = "select * from tt_clients where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
+    else
+      $sql = "select id, name from tt_clients where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
+
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a9987d8c..b11d78eb7 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.29.4557 | 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.29.4559 | 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/clients.php b/clients.php
index ca83efd90..cc08f9a3c 100644
--- a/clients.php
+++ b/clients.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
@@ -72,8 +73,8 @@
 }
 
 if($user->can('manage_clients')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
-  $inactive_clients = ttTeamHelper::getInactiveClients($user->getGroup(), true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
+  $inactive_clients = ttGroupHelper::getInactiveClients(true);
 } else
   $active_clients = $user->getAssignedClients();
 

From 38b85fc251ea53e5d5842e25c8fc9b066a474a54 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 18:58:57 +0000
Subject: [PATCH 0483/1848] More refactoring for subgroups.

---
 WEB-INF/lib/ttTeamHelper.class.php | 21 ---------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 expense_edit.php                   |  5 +++--
 expenses.php                       |  5 +++--
 invoice_add.php                    |  3 ++-
 mobile/clients.php                 |  6 +++---
 6 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 08c52f453..44f3d7a01 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -400,27 +400,6 @@ static function getActiveClients($group_id, $all_fields = false)
     return $result;
   }
 
-  // The getInactiveClients returns an array of inactive clients for a group.
-  static function getInactiveClients($group_id, $all_fields = false)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    if ($all_fields)
-      $sql = "select * from tt_clients where group_id = $group_id and status = 0 order by upper(name)";
-    else
-      $sql = "select id, name from tt_clients where group_id = $group_id and status = 0 order by upper(name)";
-
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-      	$result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllClients obtains all clients in a group.
   static function getAllClients($group_id, $all_fields = false) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b11d78eb7..501e850dc 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.29.4559 | 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.29.4560 | 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/expense_edit.php b/expense_edit.php
index 9768fa23e..80f861c8b 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
 
@@ -77,7 +78,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -102,7 +103,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/expenses.php b/expenses.php
index aa0d97769..1ff638fbe 100644
--- a/expenses.php
+++ b/expenses.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
 
@@ -92,7 +93,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -118,7 +119,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/invoice_add.php b/invoice_add.php
index 61568e2aa..0cda1a386 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttInvoiceHelper');
 
 // Access checks.
@@ -56,7 +57,7 @@
 
 // Dropdown for clients if the clients plugin is enabled.
 if ($user->isPluginEnabled('cl')) {
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttGroupHelper::getActiveClients();
   $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
diff --git a/mobile/clients.php b/mobile/clients.php
index 61cc304ea..d1e6b38f3 100644
--- a/mobile/clients.php
+++ b/mobile/clients.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
@@ -42,8 +42,8 @@
 // End of access checks.
 
 if($user->can('manage_clients')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
-  $inactive_clients = ttTeamHelper::getInactiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
+  $inactive_clients = ttGroupHelper::getInactiveClients(true);
 } else
   $active_clients = $user->getAssignedClients();
 

From 1bebedf4f6025a06d5c738a82ef057d2d0200eac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 20:20:08 +0000
Subject: [PATCH 0484/1848] More refactoring for subgroups.

---
 WEB-INF/lib/ttTeamHelper.class.php | 21 ---------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/expense_edit.php            |  5 +++--
 mobile/expenses.php                |  5 +++--
 mobile/time.php                    |  5 +++--
 mobile/time_edit.php               |  5 +++--
 mobile/timer.php                   |  5 +++--
 mobile/user_add.php                |  3 ++-
 mobile/user_edit.php               |  3 ++-
 time.php                           |  4 ++--
 time_edit.php                      |  5 +++--
 user_add.php                       |  3 ++-
 user_edit.php                      |  3 ++-
 week.php                           |  5 +++--
 14 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 44f3d7a01..f82fc2630 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -379,27 +379,6 @@ static function getInactiveRolesForUser()
     return $result;
   }
 
-  // The getActiveClients returns an array of active clients for a group.
-  static function getActiveClients($group_id, $all_fields = false)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    if ($all_fields)
-      $sql = "select * from tt_clients where group_id = $group_id and status = 1 order by upper(name)";
-    else
-      $sql = "select id, name from tt_clients where group_id = $group_id and status = 1 order by upper(name)";
-
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllClients obtains all clients in a group.
   static function getAllClients($group_id, $all_fields = false) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 501e850dc..7c66412a1 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.29.4560 | 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.29.4561 | 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/expense_edit.php b/mobile/expense_edit.php
index d139530c9..fa00b5863 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
 
@@ -74,7 +75,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -99,7 +100,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/mobile/expenses.php b/mobile/expenses.php
index de1e67783..a39bf4a99 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
 
@@ -96,7 +97,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -122,7 +123,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/mobile/time.php b/mobile/time.php
index 2b8e01f05..c8ec97977 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -92,7 +93,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -118,7 +119,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 925220430..cbe4c9359 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -109,7 +110,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -135,7 +136,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/mobile/timer.php b/mobile/timer.php
index ae5a96f59..bf92a89ef 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -88,7 +89,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -116,7 +117,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/mobile/user_add.php b/mobile/user_add.php
index 9d2b539e0..20c2b1ffb 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -45,7 +46,7 @@
 @include('../plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttGroupHelper::getActiveClients();
 
 $assigned_projects = array();
 if ($request->isPost()) {
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index c9b4af81c..81947dbdc 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -48,7 +49,7 @@
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttGroupHelper::getActiveClients();
 
 $projects = ttTeamHelper::getActiveProjects($user->group_id);
 $assigned_projects = array();
diff --git a/time.php b/time.php
index ce622b233..fb507fb5f 100644
--- a/time.php
+++ b/time.php
@@ -170,7 +170,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -196,7 +196,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/time_edit.php b/time_edit.php
index 08a5f392e..e6a8adb81 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -112,7 +113,7 @@
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -138,7 +139,7 @@
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
diff --git a/user_add.php b/user_add.php
index 7fb6ea3c7..e948aa712 100644
--- a/user_add.php
+++ b/user_add.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -46,7 +47,7 @@
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->getGroup());
+  $clients = ttGroupHelper::getActiveClients();
 
 $assigned_projects = array();
 if ($request->isPost()) {
diff --git a/user_edit.php b/user_edit.php
index 8a4e421b1..df3ada4f1 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -49,7 +50,7 @@
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->getGroup());
+  $clients = ttGroupHelper::getActiveClients();
 
 $projects = ttTeamHelper::getActiveProjects($user->getGroup());
 $assigned_projects = array();
diff --git a/week.php b/week.php
index 927e8a776..95dc31b12 100644
--- a/week.php
+++ b/week.php
@@ -33,6 +33,7 @@
 import('form.TextField');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttWeekViewHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -244,7 +245,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -270,7 +271,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];

From 884b152e088f23cfec4342db48fb9924cc647cee Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 21:30:52 +0000
Subject: [PATCH 0485/1848] Improved clients.php to support subgroups.

---
 WEB-INF/lib/ttUser.class.php | 16 +++++++++++-----
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0db272ff6..73393c0ac 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -230,11 +230,14 @@ function getAssignedProjects()
     $result = array();
     $mdb2 = getConnection();
 
-    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+    $user_id = $this->getUser();
+
     // Do a query with inner join to get assigned projects.
-    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
-      inner join tt_user_project_binds upb on (upb.user_id = ".$this->getUser()." and upb.project_id = p.id and upb.status = 1)
-      where p.group_id = $group_id and p.status = 1 order by p.name";
+    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p".
+      " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -288,9 +291,12 @@ function getAssignedClients()
 
     $mdb2 = getConnection();
 
+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+
     // Get active clients for group.
     $clients = array();
-    $sql = "select id, name, address, projects from tt_clients where group_id = $this->group_id and status = 1";
+    $sql = "select id, name, address, projects from tt_clients where group_id = $group_id and org_id = $org_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7c66412a1..111e83dd0 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.29.4561 | 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.29.4562 | 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>

From e92d4ffe1d8dfe70c11be7862b31de432a6bab07 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 22:07:26 +0000
Subject: [PATCH 0486/1848] Adjusting client_add.php and client_edit.php for
 subgroups.

---
 WEB-INF/templates/footer.tpl | 2 +-
 client_add.php               | 4 ++--
 client_edit.php              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 111e83dd0..83288cf47 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.29.4562 | 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.29.4563 | 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/client_add.php b/client_add.php
index b3d27ac79..6f678cea2 100644
--- a/client_add.php
+++ b/client_add.php
@@ -41,7 +41,7 @@
   exit();
 }
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttTeamHelper::getActiveProjects($user->getGroup());
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -58,7 +58,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
diff --git a/client_edit.php b/client_edit.php
index 34c0a0706..0d57c9d29 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -43,7 +43,7 @@
 
 $cl_id = (int) $request->getParameter('id');
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttTeamHelper::getActiveProjects($user->getGroup());
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -70,7 +70,7 @@
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));

From 75ff7ff29a038803d3b6e2c31b793049bbb2fbd4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 22:58:13 +0000
Subject: [PATCH 0487/1848] Some more refactoring for subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php | 42 +++++++++++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php  | 18 -------------
 WEB-INF/templates/footer.tpl        |  2 +-
 mobile/projects.php                 |  5 ++--
 projects.php                        |  5 ++--
 5 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index e04c221d1..9f9f4a2f9 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -320,4 +320,46 @@ static function getInactiveClients($all_fields = false)
     }
     return $result;
   }
+
+  // getActiveProjects - returns an array of active projects for a group.
+  static function getActiveProjects()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description, tasks from tt_projects".
+      " where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // getInactiveProjects - returns an array of inactive projects for a group.
+  static function getInactiveProjects()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description, tasks from tt_projects".
+      "  where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index f82fc2630..67d97b850 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -194,24 +194,6 @@ static function getActiveProjects($group_id)
     return $result;
   }
 
-  // getInactiveProjects - returns an array of inactive projects for a group.
-  static function getInactiveProjects($group_id)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql = "select id, name, description, tasks from tt_projects
-      where group_id = $group_id and status = 0 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllProjects obtains all projects in a group.
   static function getAllProjects($group_id, $all_fields = false) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 83288cf47..00eaa060a 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.29.4563 | 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.29.4564 | 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/projects.php b/mobile/projects.php
index e3dc2f87e..d244ae1b7 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
@@ -42,8 +43,8 @@
 // End of access checks.
 
 if($user->can('manage_projects')) {
-  $active_projects = ttTeamHelper::getActiveProjects($user->group_id);
-  $inactive_projects = ttTeamHelper::getInactiveProjects($user->group_id);
+  $active_projects = ttGroupHelper::getActiveProjects();
+  $inactive_projects = ttGroupHelper::getInactiveProjects();
 } else
   $active_projects = $user->getAssignedProjects();
 
diff --git a/projects.php b/projects.php
index b8faa14d6..8b4537e79 100644
--- a/projects.php
+++ b/projects.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
@@ -73,8 +74,8 @@
 }
 
 if($user->can('manage_projects')) {
-  $active_projects = ttTeamHelper::getActiveProjects($group_id);
-  $inactive_projects = ttTeamHelper::getInactiveProjects($group_id);
+  $active_projects = ttGroupHelper::getActiveProjects();
+  $inactive_projects = ttGroupHelper::getInactiveProjects();
 } else
   $active_projects = $user->getAssignedProjects();
 

From 11868a92089a10db070993b89e595f45fac3f6ff Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Dec 2018 23:19:41 +0000
Subject: [PATCH 0488/1848] Some more refactoring for subgroups.

---
 WEB-INF/templates/footer.tpl | 2 +-
 client_add.php               | 4 ++--
 client_edit.php              | 3 ++-
 invoice_add.php              | 4 ++--
 mobile/client_add.php        | 6 +++---
 mobile/client_edit.php       | 6 +++---
 mobile/task_add.php          | 7 +++----
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 00eaa060a..5c66c159e 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.29.4564 | 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.29.4565 | 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/client_add.php b/client_add.php
index 6f678cea2..b14e8b454 100644
--- a/client_add.php
+++ b/client_add.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttClientHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_clients')) {
@@ -41,7 +41,7 @@
   exit();
 }
 
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/client_edit.php b/client_edit.php
index 0d57c9d29..0dc3bb655 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttClientHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_clients')) {
@@ -43,7 +44,7 @@
 
 $cl_id = (int) $request->getParameter('id');
 
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/invoice_add.php b/invoice_add.php
index 0cda1a386..e29de2eb6 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -61,8 +61,8 @@
   $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $projects = ttTeamHelper::getActiveProjects($user->group_id);
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+  $projects = ttGroupHelper::getActiveProjects();
   $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'number','style'=>'width: 250px;','value'=>$cl_number));
diff --git a/mobile/client_add.php b/mobile/client_add.php
index 222012d48..f5cc5b694 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -29,7 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttClientHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_clients')) {
@@ -41,7 +41,7 @@
   exit();
 }
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -58,7 +58,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','class'=>'mobile-textarea','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index 917b656a8..4044637bf 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -29,7 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttClientHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_clients')) {
@@ -43,7 +43,7 @@
 
 $cl_id = (int) $request->getParameter('id');
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -70,7 +70,7 @@
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
diff --git a/mobile/task_add.php b/mobile/task_add.php
index 9deed925d..db73d1c77 100644
--- a/mobile/task_add.php
+++ b/mobile/task_add.php
@@ -28,8 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('form.ActionForm');
-import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttTaskHelper');
 
 // Access checks.
@@ -37,13 +36,13 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));

From 81763e3414521856124ea022ab9ef52947da89b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 13:13:05 +0000
Subject: [PATCH 0489/1848] A bit more refactoring.

---
 WEB-INF/lib/ttTeamHelper.class.php | 18 ------------------
 WEB-INF/lib/ttUser.class.php       |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/task_edit.php               |  4 ++--
 mobile/user_add.php                |  2 +-
 mobile/user_edit.php               |  2 +-
 task_add.php                       |  4 ++--
 task_edit.php                      |  4 ++--
 user_add.php                       |  2 +-
 user_edit.php                      |  2 +-
 10 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 67d97b850..e64bd6724 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -176,24 +176,6 @@ static function getInactiveUsers($group_id, $all_fields = false) {
     return false;
   }
 
-  // getActiveProjects - returns an array of active projects for a group.
-  static function getActiveProjects($group_id)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql = "select id, name, description, tasks from tt_projects
-      where group_id = $group_id and status = 1 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllProjects obtains all projects in a group.
   static function getAllProjects($group_id, $all_fields = false) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 73393c0ac..587ca73c6 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -746,7 +746,7 @@ function getUserPartForHeader() {
       $user_part .= ' <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_name).'</span>';
     }
     if ($this->behalf_group_id) {
-      $user_part .= ',  <span class="onBehalf">'.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_group_name).'</span>';
+      $user_part .= ',  <span class="onBehalf">'.htmlspecialchars($this->behalf_group_name).'</span>';
     } else {
       if ($this->group_name) // Note: we did not require group names in the past.
         $user_part .= ', '.$this->group_name;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5c66c159e..91ff8c9f5 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.29.4565 | 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.29.4566 | 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/task_edit.php b/mobile/task_edit.php
index ba36ea56e..facf18c67 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttTaskHelper');
 
 // Access checks.
@@ -48,7 +48,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/mobile/user_add.php b/mobile/user_add.php
index 20c2b1ffb..fbd82835f 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -90,7 +90,7 @@
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 81947dbdc..df184fcfb 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -51,7 +51,7 @@
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 $assigned_projects = array();
 
 if ($request->isPost()) {
diff --git a/task_add.php b/task_add.php
index 1fdc7b18c..078bd5ca1 100644
--- a/task_add.php
+++ b/task_add.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('form.ActionForm');
-import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttTaskHelper');
 
 // Access checks.
@@ -43,7 +43,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/task_edit.php b/task_edit.php
index efe8509d3..10410c4b3 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttTaskHelper');
 
 // Access checks.
@@ -48,7 +48,7 @@
 }
 // End of access checks.
 
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/user_add.php b/user_add.php
index e948aa712..8a507e9ee 100644
--- a/user_add.php
+++ b/user_add.php
@@ -91,7 +91,7 @@
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$projects = ttGroupHelper::getActiveProjects();
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
diff --git a/user_edit.php b/user_edit.php
index df3ada4f1..531d2efec 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -52,7 +52,7 @@
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$projects = ttGroupHelper::getActiveProjects();
 $assigned_projects = array();
 
 if ($request->isPost()) {

From b5426618bbd3ee3178a86f6318b321632047f25b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 14:01:13 +0000
Subject: [PATCH 0490/1848] Adjusted custom field config pages for subgroups.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 admin_options.php              |  1 +
 cf_custom_field_add.php        |  1 +
 cf_custom_field_delete.php     | 21 +++++++++---------
 cf_custom_field_edit.php       | 10 +++++----
 cf_custom_fields.php           |  1 +
 plugins/CustomFields.class.php | 39 ++++++++++++++++++++--------------
 7 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 91ff8c9f5..77ebe494d 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.29.4566 | 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.29.4567 | 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/admin_options.php b/admin_options.php
index 164ff33a1..9448ef788 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -36,6 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 8227d2541..c0dc255f6 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -45,6 +45,7 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));
diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index 86c10b1ff..c8a133692 100644
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -39,8 +39,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$id = $request->getParameter('id');
+$id = (int)$request->getParameter('id');
+$field = CustomFields::getField($id);
+if (!$field) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $form = new Form('fieldDeleteForm');
 
@@ -60,15 +65,9 @@
     exit();
   }
 } else {
-  $field = CustomFields::getField($id);	
-  if (false === $field)
-    $err->add($i18n->get('error.db'));
-
-  if ($err->no()) {
-    $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
-    $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-    $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-  }
+  $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
+  $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 }
 
 $smarty->assign('field', $field['label']);
diff --git a/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 499f6d02a..0bf5818d8 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -39,11 +39,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
 $field = CustomFields::getField($cl_id);
-if (false === $field)
-  $err->add($i18n->get('error.db'));
+if (!$field) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $form = new Form('fieldForm');
 if ($err->no()) {
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 53f80e400..6de626cc9 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -39,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $form = new Form('customFieldsForm');
 
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 74fef831c..885f60b90 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -237,8 +237,12 @@ static function getFields() {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $fields = array();
-    $sql = "select id, type, label from tt_custom_fields where group_id = $user->group_id and status = 1 and type > 0";
+    $sql = "select id, type, label from tt_custom_fields".
+      " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -254,7 +258,11 @@ static function getField($id) {
     global $user;
     $mdb2 = getConnection();
 
-    $sql = "select label, type, required from tt_custom_fields where id = $id and group_id = $user->group_id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select label, type, required from tt_custom_fields".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -295,40 +303,39 @@ static function insertField($field_name, $field_type, $required) {
   static function updateField($id, $name, $type, $required) {
     global $user;
     $mdb2 = getConnection();
-    $sql = "update tt_custom_fields set label = ".$mdb2->quote($name).", type = $type, required = $required where id = $id and group_id = $user->group_id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+    $sql = "update tt_custom_fields set label = ".$mdb2->quote($name).", type = $type, required = $required".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // The deleteField deletes a custom field, its options and log entries for group.
   static function deleteField($field_id) {
-
     global $user;
     $mdb2 = getConnection();
 
-    // First make sure that the field is ours so that we can safely delete it.
-    $sql = "select group_id from tt_custom_fields where id = $field_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    $val = $res->fetchRow();
-    if ($user->group_id != $val['group_id'])
-      return false;
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    // Mark log entries as deleted.
-    $sql = "update tt_custom_field_log set status = NULL where field_id = $field_id";
+    // Mark log entries as deleted. TODO: why are we doing this? Research impact.
+    $sql = "update tt_custom_field_log set status = null".
+      " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark field options as deleted.
-    $sql = "update tt_custom_field_options set status = NULL where field_id = $field_id";
+    $sql = "update tt_custom_field_options set status = null".
+      " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark custom field as deleted.
-    $sql = "update tt_custom_fields set status = NULL where id = $field_id and group_id = $user->group_id";
+    $sql = "update tt_custom_fields set status = null".
+      " where id = $field_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }

From 95d031241d1e1970e92171e733c81896b53f7cdc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 15:38:41 +0000
Subject: [PATCH 0491/1848] Ongoing refactoring of custom fields for subgroups.

---
 WEB-INF/templates/cf_dropdown_options.tpl |  2 -
 WEB-INF/templates/footer.tpl              |  2 +-
 cf_dropdown_options.php                   | 13 ++--
 plugins/CustomFields.class.php            | 94 ++++++++++++-----------
 time_edit.php                             |  2 +-
 5 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index ba15a416f..f9dfcd0d7 100644
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -2,7 +2,6 @@
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
-{$forms.dropdownOptionsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
@@ -38,4 +37,3 @@
     </td>
   </tr>
 </table>
-{$forms.dropdownOptionsForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 77ebe494d..4cfac191c 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.29.4567 | 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.29.4568 | 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/cf_dropdown_options.php b/cf_dropdown_options.php
index 1afce7348..3b4663f8c 100644
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -39,15 +39,16 @@
   header('Location: feature_disabled.php');
   exit();
 }
+$field_id = (int)$request->getParameter('field_id');
+$field = CustomFields::getField($field_id);
+if (!$field) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
-$field_id = $request->getParameter('field_id');
 $options = CustomFields::getOptions($field_id);
-if (false === $options)
-  $err->add($i18n->get('error.db'));
-
-$form = new Form('dropdownOptionsForm');
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('field_id', $field_id);
 $smarty->assign('options', $options);
 $smarty->assign('title', $i18n->get('title.cf_dropdown_options'));
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 885f60b90..a2e883269 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -91,20 +91,30 @@ function update($log_id, $field_id, $option_id, $value) {
   }
 
   function delete($log_id) {
-
+    global $user;
     $mdb2 = getConnection();
-    $sql = "update tt_custom_field_log set status = NULL where log_id = $log_id";
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "update tt_custom_field_log set status = null".
+      " where log_id = $log_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   function get($log_id) {
-    $fields = array();
-
+    global $user;
     $mdb2 = getConnection();
-    $sql = "select id, field_id, option_id, value from tt_custom_field_log where log_id = $log_id and status = 1";
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, field_id, option_id, value from tt_custom_field_log".
+      " where log_id = $log_id and group_id = $group_id and org_id = $org_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
+      $fields = array();
       while ($val = $res->fetchRow()) {
         $fields[] = $val;
       }
@@ -123,7 +133,8 @@ static function insertOption($field_id, $option_name) {
 
     // Check if the option exists.
     $id = 0;
-    $sql = "select id from tt_custom_field_options where field_id = $field_id and value = ".$mdb2->quote($option_name);
+    $sql = "select id from tt_custom_field_options".
+      " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = ".$mdb2->quote($option_name);
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
@@ -142,10 +153,14 @@ static function insertOption($field_id, $option_name) {
 
   // updateOption updates option name.
   static function updateOption($id, $option_name) {
-
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "update tt_custom_field_options set value = ".$mdb2->quote($option_name)." where id = $id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "update tt_custom_field_options set value = ".$mdb2->quote($option_name).
+       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -155,25 +170,22 @@ static function deleteOption($id) {
     global $user;
     $mdb2 = getConnection();
 
-    $field_id = CustomFields::getFieldIdForOption($id);
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    // First make sure that the field is ours.
-    $sql = "select group_id from tt_custom_fields where id = $field_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    $val = $res->fetchRow();
-    if ($user->group_id != $val['group_id'])
-      return false;
+    $field_id = CustomFields::getFieldIdForOption($id);
+    if (!$field_id) return false;
 
-    // Delete log entries with this option.
-    $sql = "update tt_custom_field_log set status = NULL where field_id = $field_id and value = ".$mdb2->quote($id);
+    // Delete log entries with this option. TODO: why? Research impact.
+    $sql = "update tt_custom_field_log set status = null".
+      " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = ".$mdb2->quote($id);
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Delete the option.
-    $sql = "update tt_custom_field_options set status = NULL where id = $id";
+    $sql = "update tt_custom_field_options set status = null".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -182,21 +194,16 @@ static function deleteOption($id) {
   static function getOptions($field_id) {
     global $user;
     $mdb2 = getConnection();
-    $options = array();
 
-    // First make sure that the field is ours.
-    $sql = "select group_id from tt_custom_fields where id = $field_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    $val = $res->fetchRow();
-    if ($user->group_id != $val['group_id'])
-      return false;
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     // Get options.
-    $sql = "select id, value from tt_custom_field_options where field_id = $field_id and status = 1 order by value";
+    $sql = "select id, value from tt_custom_field_options".
+      " where field_id = $field_id and group_id = $group_id and org_id = $org_id and status = 1 order by value";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
+      $options = array();
       while ($val = $res->fetchRow()) {
         $options[$val['id']] = $val['value'];
       }
@@ -210,19 +217,11 @@ static function getOptionName($id) {
     global $user;
     $mdb2 = getConnection();
 
-    $field_id = CustomFields::getFieldIdForOption($id);
-
-    // First make sure that the field is ours.
-    $sql = "select group_id from tt_custom_fields where id = $field_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    $val = $res->fetchRow();
-    if ($user->group_id != $val['group_id'])
-      return false;
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    // Get option name.
-    $sql = "select value from tt_custom_field_options where id = $id";
+    $sql = "select value from tt_custom_field_options".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -275,9 +274,14 @@ static function getField($id) {
 
   // getFieldIdForOption returns field id from an associated option id.
   static function getFieldIdForOption($option_id) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "select field_id from tt_custom_field_options where id = $option_id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select field_id from tt_custom_field_options".
+      " where id = $option_id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -291,8 +295,10 @@ static function getFieldIdForOption($option_id) {
   static function insertField($field_name, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
+
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
+
     $sql = "insert into tt_custom_fields (group_id, org_id, type, label, required, status)".
       " values($group_id, $org_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
     $affected = $mdb2->exec($sql);
@@ -303,8 +309,10 @@ static function insertField($field_name, $field_type, $required) {
   static function updateField($id, $name, $type, $required) {
     global $user;
     $mdb2 = getConnection();
+
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
+
     $sql = "update tt_custom_fields set label = ".$mdb2->quote($name).", type = $type, required = $required".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
diff --git a/time_edit.php b/time_edit.php
index e6a8adb81..f4eb41d29 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -53,7 +53,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields($user->getGroup());
   $smarty->assign('custom_fields', $custom_fields);
 }
 

From 45a530c33fdd7ab2ccd1905c24a371c94e17eac5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 15:58:41 +0000
Subject: [PATCH 0492/1848] More refactoring for subgroups.

---
 WEB-INF/lib/ttTimeHelper.class.php | 13 ++++++++++---
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/time_delete.php             |  2 +-
 time_delete.php                    |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 5f8852eff..6ddedc456 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -506,15 +506,22 @@ static function update($fields)
   }
 
   // delete - deletes a record from tt_log table and its associated custom field values.
-  static function delete($id, $user_id) {
+  static function delete($id) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "update tt_log set status = NULL where id = $id and user_id = $user_id";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "update tt_log set status = null".
+      " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "update tt_custom_field_log set status = NULL where log_id = $id";
+    $sql = "update tt_custom_field_log set status = null".
+      " where log_id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4cfac191c..b0529d290 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.29.4568 | 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.29.4569 | 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/time_delete.php b/mobile/time_delete.php
index f5305bc62..104732601 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -64,7 +64,7 @@
 
     if ($err->no()) {
       // Delete the record.
-      if (ttTimeHelper::delete($cl_id, $user_id)) {
+      if (ttTimeHelper::delete($cl_id)) {
         header('Location: time.php');
         exit();
       } else {
diff --git a/time_delete.php b/time_delete.php
index 385e4f114..5d6e57298 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -64,7 +64,7 @@
 
     if ($err->no()) {
       // Delete the record.
-      if (ttTimeHelper::delete($cl_id, $user_id)) {
+      if (ttTimeHelper::delete($cl_id)) {
         header('Location: time.php');
         exit();
       } else {

From 49c25be4ace17ab7495824a08c37a061a5a75b25 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 16:18:14 +0000
Subject: [PATCH 0493/1848] More refactoring in custom fields for subgroups.

---
 WEB-INF/lib/ttReportHelper.class.php   |  6 +++---
 WEB-INF/lib/ttWeekViewHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl           |  2 +-
 mobile/time.php                        |  2 +-
 mobile/time_edit.php                   |  2 +-
 mobile/timer.php                       |  2 +-
 plugins/CustomFields.class.php         | 12 +++++++++---
 report.php                             |  2 +-
 reports.php                            |  2 +-
 time.php                               |  2 +-
 time_edit.php                          |  2 +-
 tofile.php                             |  2 +-
 topdf.php                              |  2 +-
 week.php                               |  2 +-
 14 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 16277bd19..0d99ce88a 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -157,7 +157,7 @@ static function getItems($options) {
     // Add custom field.
     $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1;
     if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->getGroup());
+      $custom_fields = new CustomFields();
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         array_push($fields, 'cfl.value as cf_1');
@@ -616,7 +616,7 @@ static function prepareReportBody($options, $comment = null)
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf'))
-      $custom_fields = new CustomFields($user->getGroup());
+      $custom_fields = new CustomFields();
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
@@ -1460,7 +1460,7 @@ static function makeJoinPart($options) {
       $join .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
     if (ttReportHelper::groupingBy('cf_1', $options)) {
-      $custom_fields = new CustomFields($user->getGroup());
+      $custom_fields = new CustomFields();
       if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
         $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 2cfb3813d..782f309b4 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -45,7 +45,7 @@ static function getRecordsForInterval($user_id, $start_date, $end_date) {
 
     $custom_field_1 = null;
     if ($user->isPluginEnabled('cf')) {
-      $custom_fields = new CustomFields($user->group_id);
+      $custom_fields = new CustomFields();
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         $custom_field_1 = ', cfl.value as cf_1_value';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b0529d290..c391edf46 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.29.4569 | 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.29.4570 | 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/time.php b/mobile/time.php
index c8ec97977..9e51633b2 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -60,7 +60,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index cbe4c9359..60a14e2c6 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -53,7 +53,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/mobile/timer.php b/mobile/timer.php
index bf92a89ef..184e6274c 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -54,7 +54,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index a2e883269..a7945aba4 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -37,11 +37,16 @@ class CustomFields {
   var $options = array(); // Array of options for a dropdown custom field.
 
   // Constructor.
-  function __construct($group_id) {
+  function __construct() {
+    global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Get fields.
-    $sql = "select id, type, label, required from tt_custom_fields where group_id = $group_id and status = 1 and type > 0";
+    $sql = "select id, type, label, required from tt_custom_fields".
+      " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -52,7 +57,8 @@ function __construct($group_id) {
     // If we have a dropdown obtain options for it.
     if ((count($this->fields) > 0) && ($this->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)) {
 
-      $sql = "select id, value from tt_custom_field_options where field_id = ".$this->fields[0]['id']." and status = 1 order by value";
+      $sql = "select id, value from tt_custom_field_options".
+        " where field_id = ".$this->fields[0]['id']." and group_id = $group_id and org_id = $org_id and status = 1 order by value";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         while ($val = $res->fetchRow()) {
diff --git a/report.php b/report.php
index 28e086c4d..1a8ce63cc 100644
--- a/report.php
+++ b/report.php
@@ -54,7 +54,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/reports.php b/reports.php
index efbf96421..8310f5ddc 100644
--- a/reports.php
+++ b/reports.php
@@ -46,7 +46,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/time.php b/time.php
index fb507fb5f..a428b9a2b 100644
--- a/time.php
+++ b/time.php
@@ -89,7 +89,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/time_edit.php b/time_edit.php
index f4eb41d29..4b3f4c2c0 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -53,7 +53,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->getGroup());
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
diff --git a/tofile.php b/tofile.php
index 445b32d94..990b8a555 100644
--- a/tofile.php
+++ b/tofile.php
@@ -41,7 +41,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
 }
 
 // Report settings are stored in session bean before we get here.
diff --git a/topdf.php b/topdf.php
index e3801d273..fd3016e55 100644
--- a/topdf.php
+++ b/topdf.php
@@ -52,7 +52,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
 }
 
 // Report settings are stored in session bean before we get here.
diff --git a/week.php b/week.php
index 95dc31b12..289d95127 100644
--- a/week.php
+++ b/week.php
@@ -84,7 +84,7 @@
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 

From 2da96fa165c607461c7f518a08cc4040f92801bb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 17:03:32 +0000
Subject: [PATCH 0494/1848] Refactored custom field option config pages.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 cf_dropdown_option_add.php     | 10 ++++++----
 cf_dropdown_option_delete.php  | 20 ++++++++++----------
 cf_dropdown_option_edit.php    |  8 +++++---
 plugins/CustomFields.class.php |  2 +-
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c391edf46..fab529754 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.29.4570 | 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.29.4571 | 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/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index 7b49424e5..de598186e 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -39,11 +39,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_field_id = $request->getParameter('field_id');
+$cl_field_id = (int)$request->getParameter('field_id');
 $field = CustomFields::getField($cl_field_id);
-if (false === $field)
-  $err->add($i18n->get('error.db'));
+if (!$field) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $form = new Form('optionAddForm');
 if ($err->no()) {
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 4cb2aca8a..999094e53 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -39,8 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_id = $request->getParameter('id');
+$option = CustomFields::getOptionName($cl_id);
+if (!$option) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $form = new Form('optionDeleteForm');
 
 if ($request->isPost()) {
@@ -62,15 +68,9 @@
     exit();
   }
 } else {
-  $option = CustomFields::getOptionName($cl_id);
-  if (false === $option)
-    $err->add($i18n->get('error.db'));
-
-  if ($err->no()) {
-    $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-    $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-    $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-  }
+  $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+  $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 }
 
 $smarty->assign('option', $option);
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 5522accf1..4f1103d7b 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -39,11 +39,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_id = $request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
-if (false === $cl_name)
-  $err->add($i18n->get('error.db'));
+if (!$cl_name) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $form = new Form('optionEditForm');
 if ($err->no()) {
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index a7945aba4..d9762b58d 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -227,7 +227,7 @@ static function getOptionName($id) {
     $org_id = $user->org_id;
 
     $sql = "select value from tt_custom_field_options".
-      " where id = $id and group_id = $group_id and org_id = $org_id";
+      " where id = $id and group_id = $group_id and org_id = $org_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();

From 796b9e17473ca045e448b7876472bb73015247e9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Dec 2018 20:30:27 +0000
Subject: [PATCH 0495/1848] Refactored and renamed ttSysConfig class.

---
 WEB-INF/lib/ttInvoiceHelper.class.php         | 26 +++++++++-------
 ...onfig.class.php => ttUserConfig.class.php} | 31 +++++++++++--------
 WEB-INF/templates/footer.tpl                  |  2 +-
 charts.php                                    | 22 ++++++-------
 invoice_send.php                              | 12 +++----
 report_send.php                               | 12 +++----
 6 files changed, 56 insertions(+), 49 deletions(-)
 rename WEB-INF/lib/{ttSysConfig.class.php => ttUserConfig.class.php} (71%)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 13e784d07..042acd821 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -257,18 +257,20 @@ static function invoiceableItemsExist($fields) {
       }
     }
 
-    // sql part for project id.
-    if ($project_id) $project_part = " and ei.project_id = $project_id";
-
-    $sql = "select count(*) as num from tt_expense_items ei
-      where ei.client_id = $client_id $project_part and ei.invoice_id is NULL
-      and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end)."
-      and ei.cost <> 0 and ei.status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      if ($val['num']) {
-        return true;
+    if ($user->isPluginEnabled('ex')) {
+      // sql part for project id.
+      if ($project_id) $project_part = " and ei.project_id = $project_id";
+
+      $sql = "select count(*) as num from tt_expense_items ei
+        where ei.client_id = $client_id $project_part and ei.invoice_id is NULL
+        and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end)."
+        and ei.cost <> 0 and ei.status = 1";
+      $res = $mdb2->query($sql);
+      if (!is_a($res, 'PEAR_Error')) {
+        $val = $res->fetchRow();
+        if ($val['num']) {
+          return true;
+        }
       }
     }
 
diff --git a/WEB-INF/lib/ttSysConfig.class.php b/WEB-INF/lib/ttUserConfig.class.php
similarity index 71%
rename from WEB-INF/lib/ttSysConfig.class.php
rename to WEB-INF/lib/ttUserConfig.class.php
index 4cc5f8c26..b92699440 100644
--- a/WEB-INF/lib/ttSysConfig.class.php
+++ b/WEB-INF/lib/ttUserConfig.class.php
@@ -33,25 +33,28 @@
 define('SYSC_LAST_INVOICE_EMAIL', 'last_invoice_email');
 define('SYSC_LAST_INVOICE_CC', 'last_invoice_cc');
 
-// Class ttSysConfig is used for storing and retrieving named values associated with users.
-class ttSysConfig {
+// Class ttUserConfig is used for storing and retrieving named values associated with users.
+// When user is working on behalf of someone else, this class is still associated with a user.
+class ttUserConfig {
   var $user_id = null;
   var $group_id = null;
   var $org_id = null;
   var $mdb2 = null;
 
   // Constructor.
-  function __construct($user_id) {
+  function __construct() {
     global $user;
-    $this->user_id = $user_id; // TODO: review "on behalf" situation and refactor if necessary.
-    $this->group_id = $user->getGroup();
+    $this->user_id = $user->id; // Not behalf id by design.
+    $this->group_id = $user->group_id;
     $this->org_id = $user->org_id;
     $this->mdb2 = getConnection();
   }
 
   // The getValue retrieves a value identified by name.
   function getValue($name) {
-    $res = $this->mdb2->query("select param_value from tt_config where user_id = ".$this->user_id." and param_name=".$this->mdb2->quote($name));
+    $res = $this->mdb2->query("select param_value from tt_config".
+      " where user_id = $this->user_id and group_id = $this->group_id and org_id = $this->org_id".
+      " and param_name=".$this->mdb2->quote($name));
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
       return $val['param_value'];
@@ -61,15 +64,17 @@ function getValue($name) {
 
   // The setValue sets a value identified by name.
   function setValue($name, $value) {
-    $rcnt = 0;
-    $res = $this->mdb2->query("select count(*) as rcnt from tt_config where user_id = ".$this->user_id." and param_name = ".$this->mdb2->quote($name));
-    if ($val = $res->fetchRow()) $rcnt = $val['rcnt'];
-    
-    if ($rcnt > 0) {
-      $affected = $this->mdb2->exec("update tt_config set param_value = ".$this->mdb2->quote($value)." where user_id = ".$this->user_id." and param_name=".$this->mdb2->quote($name));
+    $count = 0;
+    $res = $this->mdb2->query("select count(*) as count from tt_config where user_id = ".$this->user_id." and param_name = ".$this->mdb2->quote($name));
+    if ($val = $res->fetchRow()) $count = $val['count'];
+
+    if ($count > 0) {
+      $affected = $this->mdb2->exec("update tt_config set param_value = ".$this->mdb2->quote($value).
+        " where user_id = $this->user_id and group_id = $this->group_id and org_id = $this->org_id".
+        " and param_name=".$this->mdb2->quote($name));
     } else {
       $sql = "insert into tt_config set param_value = ".$this->mdb2->quote($value).
-        ", param_name = ".$this->mdb2->quote($name).", user_id = ".$this->user_id.", group_id = ".$this->group_id.", org_id = ".$this->org_id;
+        ", param_name = ".$this->mdb2->quote($name).", user_id = $this->user_id, group_id = $this->group_id, org_id = ".$this->org_id;
       $affected = $this->mdb2->exec($sql);
     }
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fab529754..dbbcb63f9 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.29.4571 | 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.29.4572 | 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/charts.php b/charts.php
index d6707038f..3923d9a0a 100644
--- a/charts.php
+++ b/charts.php
@@ -32,7 +32,7 @@
 import('form.Form');
 import('DateAndTime');
 import('ttChartHelper');
-import('ttSysConfig');
+import('ttUserConfig');
 import('PieChartEx');
 import('ttUserHelper');
 import('ttTeamHelper');
@@ -66,8 +66,8 @@
 // Initialize chart interval.
 $cl_interval = $_SESSION['chart_interval'];
 if (!$cl_interval) {
-  $sc = new ttSysConfig($user->id);
-  $cl_interval = $sc->getValue(SYSC_CHART_INTERVAL);
+  $uc = new ttUserConfig();
+  $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
 }
 if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
 $_SESSION['chart_interval'] = $cl_interval;
@@ -75,10 +75,10 @@
 // Initialize chart type.
 $cl_type = $_SESSION['chart_type'];
 if (!$cl_type) {
-  $sc = new ttSysConfig($user->id);
-  $cl_type = $sc->getValue(SYSC_CHART_TYPE);
+  $uc = new ttUserConfig();
+  $cl_type = $uc->getValue(SYSC_CHART_TYPE);
 }
-if (MODE_TIME == $user->tracking_mode) {
+if (MODE_TIME == $user->getTrackingMode()) {
   if ($user->isPluginEnabled('cl'))
     $cl_type = CHART_CLIENTS;
 } else {
@@ -86,7 +86,7 @@
     if (!$user->isPluginEnabled('cl'))
       $cl_type = CHART_PROJECTS;	
   } elseif ($cl_type == CHART_TASKS) {
-    if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode)
+    if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode())
       $cl_type = CHART_PROJECTS;
   }
 }
@@ -103,8 +103,8 @@
     // Save in the session
     $_SESSION['chart_interval'] = $cl_interval;
     // and permanently.
-    $sc = new ttSysConfig($user->id);
-    $sc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+    $uc = new ttUserConfig();
+    $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
   }
   // If chart type changed - save it.
   $cl_type = $request->getParameter('type');
@@ -112,8 +112,8 @@
     // Save in the session
     $_SESSION['chart_type'] = $cl_type;
     // and permanently.
-    $sc = new ttSysConfig($user->id);
-    $sc->setValue(SYSC_CHART_TYPE, $cl_type);
+    $uc = new ttUserConfig();
+    $uc->setValue(SYSC_CHART_TYPE, $cl_type);
   }
   // If user has changed - set behalf_id accordingly in the session.
   if ($request->getParameter('onBehalfUser')) {
diff --git a/invoice_send.php b/invoice_send.php
index 135453b53..c86cebb53 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttInvoiceHelper');
-import('ttSysConfig');
+import('ttUserConfig');
 
 // Access checks.
 if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
@@ -48,7 +48,7 @@
 }
 // End of access checks.
 
-$sc = new ttSysConfig($user->id);
+$uc = new ttUserConfig();
 
 if ($request->isPost()) {
   $cl_receiver = trim($request->getParameter('receiver'));
@@ -56,8 +56,8 @@
   $cl_subject = trim($request->getParameter('subject'));
   $cl_comment = trim($request->getParameter('comment'));
 } else {
-  $cl_receiver = $sc->getValue(SYSC_LAST_INVOICE_EMAIL);
-  $cl_cc = $sc->getValue(SYSC_LAST_INVOICE_CC);
+  $cl_receiver = $uc->getValue(SYSC_LAST_INVOICE_EMAIL);
+  $cl_cc = $uc->getValue(SYSC_LAST_INVOICE_CC);
   $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->group_name;
 }
 
@@ -78,8 +78,8 @@
 
   if ($err->no()) {
     // Save last invoice emails for future use.
-    $sc->setValue(SYSC_LAST_INVOICE_EMAIL, $cl_receiver);
-    $sc->setValue(SYSC_LAST_INVOICE_CC, $cl_cc);
+    $uc->setValue(SYSC_LAST_INVOICE_EMAIL, $cl_receiver);
+    $uc->setValue(SYSC_LAST_INVOICE_CC, $cl_cc);
 
     $body = ttInvoiceHelper::prepareInvoiceBody($cl_invoice_id, $cl_comment);
 
diff --git a/report_send.php b/report_send.php
index 9bbf9f51c..526457bf4 100644
--- a/report_send.php
+++ b/report_send.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('form.ActionForm');
-import('ttSysConfig');
+import('ttUserConfig');
 import('ttReportHelper');
 
 // Access check.
@@ -38,7 +38,7 @@
   exit();
 }
 
-$sc = new ttSysConfig($user->id);
+$uc = new ttUserConfig();
 
 if ($request->isPost()) {
   $cl_receiver = trim($request->getParameter('receiver'));
@@ -46,8 +46,8 @@
   $cl_subject = trim($request->getParameter('subject'));
   $cl_comment = trim($request->getParameter('comment'));
 } else {
-  $cl_receiver = $sc->getValue(SYSC_LAST_REPORT_EMAIL);
-  $cl_cc = $sc->getValue(SYSC_LAST_REPORT_CC);
+  $cl_receiver = $uc->getValue(SYSC_LAST_REPORT_EMAIL);
+  $cl_cc = $uc->getValue(SYSC_LAST_REPORT_CC);
   $cl_subject = $i18n->get('form.mail.report_subject');
 }
 
@@ -67,8 +67,8 @@
 
   if ($err->no()) {
     // Save last report emails for future use.
-    $sc->setValue(SYSC_LAST_REPORT_EMAIL, $cl_receiver);
-    $sc->setValue(SYSC_LAST_REPORT_CC, $cl_cc);
+    $uc->setValue(SYSC_LAST_REPORT_EMAIL, $cl_receiver);
+    $uc->setValue(SYSC_LAST_REPORT_CC, $cl_cc);
 
     // Obtain session bean with report attributes.
     $bean = new ActionForm('reportBean', new Form('reportForm'));

From 059ee30555153c4a73ee68f80c78351f15feb723 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Dec 2018 13:03:39 +0000
Subject: [PATCH 0496/1848] Improved db cleanup code to not operate on admin
 group.

---
 WEB-INF/lib/ttOrgHelper.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 8b3f95ff0..f77d1eb6e 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -71,7 +71,7 @@ static function getInactiveOrgs() {
     // Determine inactive organizations by querying the database for max access timestamp for its users.
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
-      " (select max(accessed) as last_access, org_id from tt_users group by org_id order by last_access, org_id) as t".
+      " (select max(accessed) as last_access, org_id from tt_users where org_id > 0 group by org_id order by last_access, org_id) as t".
       " where last_access is null or last_access < $cutoff_timestamp limit 5"; // Max 5 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {

From 9af5722a81d1999243ac3a3d51d3cf3c3256d86a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Dec 2018 15:09:57 +0000
Subject: [PATCH 0497/1848] Adjusted charts.php for subgroups.

---
 WEB-INF/lib/ttChartHelper.class.php |  35 ++++++++
 WEB-INF/lib/ttUser.class.php        |  11 ++-
 WEB-INF/templates/charts.tpl        |   4 +-
 WEB-INF/templates/footer.tpl        |   2 +-
 WEB-INF/templates/header.tpl        |   8 +-
 charts.php                          | 127 ++++++++++++----------------
 6 files changed, 100 insertions(+), 87 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 75a38d072..7a4d25843 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -132,4 +132,39 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
 
     return $result;
   }
+
+  // adjustType - adjust chart type to something that is available for a group.
+  static function adjustType($requested_type) {
+    global $user;
+    $tracking_mode = $user->getTrackingMode();
+    $client_option = $user->isPluginEnabled('cl');
+
+    // We have 3 possible options for chart tyep: projects, tasks, or clients.
+    // Deal with each one individually.
+
+    if ($requested_type == CHART_PROJECTS) {
+      if ($tracking_mode == MODE_PROJECTS || $tracking_mode == MODE_PROJECTS_AND_TASKS)
+        return CHART_PROJECTS;
+      else if ($client_option)
+        return CHART_CLIENTS;
+    }
+
+    if ($requested_type == CHART_TASKS) {
+      if ($tracking_mode == MODE_PROJECTS_AND_TASKS)
+        return CHART_TASKS;
+      if ($tracking_mode == MODE_PROJECTS)
+        return CHART_PROJECTS;
+      else if ($client_option)
+        return CHART_CLIENTS;
+    }
+
+    if ($requested_type == CHART_CLIENTS) {
+      if ($client_option)
+        return CHART_CLIENTS;
+      else if ($tracking_mode == MODE_PROJECTS || ($tracking_mode == MODE_PROJECTS_AND_TASKS))
+        return CHART_PROJECTS;
+    }
+
+    return  CHART_PROJECTS;
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 587ca73c6..5e359cd21 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -523,7 +523,7 @@ function getUserDetails($user_id) {
   // - subgroup must ve valid;
   // - user should be a member of it.
   function checkBehalfId() {
-    if (!$this->behalf_group_id) {
+    if (!$this->behalfGroup) {
       // Checking user from home group.
       $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
       $users = $this->getUsers($options);
@@ -533,7 +533,7 @@ function checkBehalfId() {
       }
     } else {
       // Checking user from a subgroup.
-      $group_id = $this->behalf_group_id;
+      $group_id = $this->behalfGroup->id;
       if (!$this->isSubgroupValid($group_id))
         return false;
 
@@ -556,11 +556,10 @@ function checkBehalfId() {
   // In this case we still allow access to charts, but set behalf_id to someone else.
   // Another example: working in a subgroup on behalf of someone else.
   function adjustBehalfId() {
-    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
-    $rank = $this->getMaxRankForGroup($group_id);
+    $rank = $this->getMaxRankForGroup($this->getGroup());
 
     // Adjust to first found user in group.
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
     $users = $this->getUsers($options);
     foreach($users as $one_user) {
       // Fake loop to access first element.
@@ -786,7 +785,7 @@ function setOnBehalfGroup($group_id) {
 
     $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
 
-    // Adjust on behalf user.
+    // Adjust on behalf user to first found user in subgroup.
     $this->adjustBehalfId();
     return;
   }
diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index 5e173e109..b7df0e85e 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -2,8 +2,8 @@
 {$forms.chartForm.open}
 <table border="0" width="720">
   <tr>
-{if $on_behalf_control}
-      <td width="50%" align="center">{$i18n.label.user}: {$forms.chartForm.onBehalfUser.control}</td>
+{if $user_dropdown}
+      <td width="50%" align="center">{$i18n.label.user}: {$forms.chartForm.user.control}</td>
   {if $chart_selector}
       <td width="50%" align="left">{$i18n.form.charts.chart}: {$forms.chartForm.type.control}</td>
   {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dbbcb63f9..aacf7a64c 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.29.4572 | 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.29.4573 | 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/header.tpl b/WEB-INF/templates/header.tpl
index de25c0660..57e842ee1 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -120,14 +120,14 @@
     {if $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
-    {if ($user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode
-      || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'))}
+    {if ($user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode()
+      || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() || $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
             &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
diff --git a/charts.php b/charts.php
index 3923d9a0a..adaa8ae52 100644
--- a/charts.php
+++ b/charts.php
@@ -54,6 +54,28 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
   exit();
 }
+if ($request->isPost() && $request->getParameter('user')) {
+  if (!$user->isUserValid($request->getParameter('user'))) {
+    header('Location: access_denied.php'); // Wrong user id on post.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for which we display this page.
+$userChanged = $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+  // Handle a situation for no users in on behalf group.
+  if ($user->behalfGroup && $user_id == $user->id)
+    $user_id = null;
+}
+
+$uc = new ttUserConfig();
+$tracking_mode = $user->getTrackingMode();
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -63,73 +85,29 @@
 }
 $_SESSION['date'] = $cl_date;
 
-// Initialize chart interval.
-$cl_interval = $_SESSION['chart_interval'];
-if (!$cl_interval) {
-  $uc = new ttUserConfig();
-  $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
-}
-if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
-$_SESSION['chart_interval'] = $cl_interval;
-
-// Initialize chart type.
-$cl_type = $_SESSION['chart_type'];
-if (!$cl_type) {
-  $uc = new ttUserConfig();
-  $cl_type = $uc->getValue(SYSC_CHART_TYPE);
-}
-if (MODE_TIME == $user->getTrackingMode()) {
-  if ($user->isPluginEnabled('cl'))
-    $cl_type = CHART_CLIENTS;
-} else {
-  if ($cl_type == CHART_CLIENTS) {
-    if (!$user->isPluginEnabled('cl'))
-      $cl_type = CHART_PROJECTS;	
-  } elseif ($cl_type == CHART_TASKS) {
-    if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode())
-      $cl_type = CHART_PROJECTS;
-  }
-}
-if (!$cl_type) $cl_type = CHART_PROJECTS;
-$_SESSION['chart_type'] = $cl_type;
-
-// Who do we draw charts for?
-$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
-
 if ($request->isPost()) {
-  // If chart interval changed - save it.
   $cl_interval = $request->getParameter('interval');
-  if ($cl_interval) {
-    // Save in the session
-    $_SESSION['chart_interval'] = $cl_interval;
-    // and permanently.
-    $uc = new ttUserConfig();
-    $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
-  }
-  // If chart type changed - save it.
+  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+  $_SESSION['chart_interval'] = $cl_interval;
+  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+
   $cl_type = $request->getParameter('type');
-  if ($cl_type) {
-    // Save in the session
-    $_SESSION['chart_type'] = $cl_type;
-    // and permanently.
-    $uc = new ttUserConfig();
-    $uc->setValue(SYSC_CHART_TYPE, $cl_type);
-  }
-  // If user has changed - set behalf_id accordingly in the session.
-  if ($request->getParameter('onBehalfUser')) {
-    if($user->can('view_charts')) {
-      unset($_SESSION['behalf_id']);
-      unset($_SESSION['behalf_name']);
-
-      if($on_behalf_id != $user->id) {
-        $_SESSION['behalf_id'] = $on_behalf_id;
-        $_SESSION['behalf_name'] = ttUserHelper::getUserName($on_behalf_id);
-      }
-      header('Location: charts.php');
-      exit();
-    }
-  }
-} // isPost
+  if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
+  $_SESSION['chart_type'] = $cl_type;
+  $uc->setValue(SYSC_CHART_TYPE, $cl_type);
+} else {
+  // Initialize chart interval.
+  $cl_interval = $_SESSION['chart_interval'];
+  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+  $_SESSION['chart_interval'] = $cl_interval;
+
+  // Initialize chart type.
+  $cl_type = $_SESSION['chart_type'];
+  if (!$cl_type) $cl_type = $uc->getValue(SYSC_CHART_TYPE);
+  $cl_type = ttChartHelper::adjustType($cl_type);
+  $_SESSION['chart_type'] = $cl_type;
+}
 
 // Elements of chartForm.
 $chart_form = new Form('chartForm');
@@ -143,13 +121,14 @@
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $chart_form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'onBehalfUser',
-      'value'=>$on_behalf_id,
+      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
+      'name'=>'user',
+      'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name'),
     ));
-    $smarty->assign('on_behalf_control', 1);
+    $chart_form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
   }
 }
 
@@ -163,26 +142,26 @@
 
 // Chart interval dropdown.
 $chart_form->addInput(array('type' => 'combobox',
-  'onchange' => 'if(this.form) this.form.submit();',
+  'onchange' => 'this.form.submit();',
   'name' => 'interval',
   'value' => $cl_interval,
   'data' => $intervals
 ));
 
 // Chart type options.
-$chart_selector = (MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'));
+$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
 if ($chart_selector) {
   $types = array();
-  if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+  if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
     $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
-  if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+  if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
     $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
   if ($user->isPluginEnabled('cl'))
     $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
 
   // Add chart type dropdown.
   $chart_form->addInput(array('type' => 'combobox',
-    'onchange' => 'if(this.form) this.form.submit();',
+    'onchange' => 'this.form.submit();',
     'name' => 'type',
     'value' => $cl_type,
     'data' => $types
@@ -193,7 +172,7 @@
 $chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 
 // Get data for our chart.
-$totals = ttChartHelper::getTotals($on_behalf_id, $cl_type, $cl_date, $cl_interval);
+$totals = ttChartHelper::getTotals($user_id, $cl_type, $cl_date, $cl_interval);
 $smarty->assign('totals', $totals);
 
 // Prepare chart for drawing.

From d6949642980a9d59eae3378d5b350fd59b6905fe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Dec 2018 15:54:34 +0000
Subject: [PATCH 0498/1848] Reduced flicker on charts.php by specifying image
 size.

---
 WEB-INF/lib/ttChartHelper.class.php | 2 +-
 WEB-INF/templates/charts.tpl        | 2 +-
 WEB-INF/templates/footer.tpl        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 7a4d25843..528fcdb0a 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -77,7 +77,7 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
         where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.task_id";
     } elseif (CHART_CLIENTS == $chart_type) {
       // Data for clients.
-      $sql = "select coalesce(c.name, 'NULL') as name, sum(time_to_sec(l.duration)) as time from tt_log l
+      $sql = "select c.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_clients c on (c.id = l.client_id)
         where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.client_id";
     }
diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index b7df0e85e..8e05e1985 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -17,7 +17,7 @@
 </table>
 <table border="0" width="720">
   <tr>
-    <td width="50%" align="center"><img src="{$img_file_name}" border="0"/></td>
+    <td width="50%" align="center"><img src="{$img_file_name}" height="300" width="300" border="0"/></td>
     <td>
       <table border="0" cellspacing="3">
       {section name=i loop=$totals}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aacf7a64c..00e7a3f05 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.29.4573 | 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.29.4574 | 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>

From b239e5e01ca823026e96776413f6bb0de0f9e478 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Dec 2018 17:46:41 +0000
Subject: [PATCH 0499/1848] Improved access checks on client_delete.php.

---
 WEB-INF/templates/footer.tpl |  2 +-
 client_delete.php            | 23 ++++++++++++-----------
 mobile/client_delete.php     | 21 +++++++++++----------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 00e7a3f05..ba7efd420 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.29.4574 | 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.29.4575 | 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/client_delete.php b/client_delete.php
index 22ae9d4a6..a5f00656e 100644
--- a/client_delete.php
+++ b/client_delete.php
@@ -39,9 +39,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $id = (int)$request->getParameter('id');
 $client = ttClientHelper::getClient($id);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $client_to_delete = $client['name'];
 
@@ -53,16 +57,13 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
-  if(ttClientHelper::getClient($id)) {
-    if ($request->getParameter('btn_delete')) {
-      if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
-        header('Location: clients.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  } else
-    $err->add($i18n->get('error.db'));
+  if ($request->getParameter('btn_delete')) {
+    if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
+      header('Location: clients.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
 
   if ($request->getParameter('btn_cancel')) {
     header('Location: clients.php');
diff --git a/mobile/client_delete.php b/mobile/client_delete.php
index 154d89308..8e05ccde8 100644
--- a/mobile/client_delete.php
+++ b/mobile/client_delete.php
@@ -39,9 +39,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $id = (int)$request->getParameter('id');
 $client = ttClientHelper::getClient($id);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $client_to_delete = $client['name'];
 
@@ -53,16 +57,13 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
-  if(ttClientHelper::getClient($id)) {
-    if ($request->getParameter('btn_delete')) {
-      if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
-        header('Location: clients.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  } else 
+  if ($request->getParameter('btn_delete')) {
+    if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
+      header('Location: clients.php');
+      exit();
+    } else
       $err->add($i18n->get('error.db'));
+  }
 
   if ($request->getParameter('btn_cancel')) {
     header('Location: clients.php');

From caa61e7cf00098a2cd64d0d716abb2d6b09982e7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Dec 2018 20:24:43 +0000
Subject: [PATCH 0500/1848] Refactoring of client config pages for subgroups.

---
 WEB-INF/lib/ttClientHelper.class.php    | 75 ++++++++++++++++---------
 WEB-INF/templates/client_add.tpl        |  4 +-
 WEB-INF/templates/client_edit.tpl       |  2 +-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/mobile/client_add.tpl |  4 +-
 client_add.php                          | 10 ++--
 mobile/client_add.php                   | 10 ++--
 7 files changed, 63 insertions(+), 44 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 9009f570a..42eb128a8 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -54,14 +54,16 @@ static function getClient($client_id, $all_fields = false) {
   }
 
   // getClients - returns an array of active and inactive clients in a group.
-  static function getClients()
-  {
+  static function getClients() {
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $result = array();
-    $mdb2 = getConnection();
 
-    $sql = "select id, name from tt_clients where group_id = ".$user->getGroup()." and (status = 0 or status = 1) order by upper(name)";
+    $sql = "select id, name from tt_clients where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -73,13 +75,14 @@ static function getClients()
 
   // The getClientByName looks up a client by name.
   static function getClientByName($client_name) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
 
-    $sql = "select id from tt_clients where group_id = ".$user->getGroup().
-      " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
+    $sql = "select id from tt_clients where group_id = $group_id and org_id = $org_id".
+      " and name = ".$mdb2->quote($client_name)." and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -92,11 +95,13 @@ static function getClientByName($client_name) {
 
   // The getDeletedClient looks up a deleted client by id.
   static function getDeletedClient($client_id) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    $sql = "select name, address from tt_clients where group_id = ".$user->getGroup().
+    $sql = "select name, address from tt_clients where group_id = $group_id and org_id = $org_id".
       " and id = $client_id and status is NULL";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -108,22 +113,26 @@ static function getDeletedClient($client_id) {
 
   // The delete function marks client as deleded.
   static function delete($id, $delete_client_entries) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     // Handle custom field log records.
     if ($delete_client_entries) {
-      $sql = "update tt_custom_field_log set status = NULL where log_id in (select id from tt_log where client_id = $id and status = 1)";
+      $sql = "update tt_custom_field_log set status = null".
+        " where log_id in (select id from tt_log where client_id = $id and status = 1) and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
     }
 
     // Handle time records.
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     if ($delete_client_entries) {
-      $sql = 'update tt_log set status = NULL'.$modified_part." where client_id = $id";
+      $sql = 'update tt_log set status = null'.$modified_part.
+        " where client_id = $id and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -131,7 +140,8 @@ static function delete($id, $delete_client_entries) {
 
     // Handle expense items.
     if ($delete_client_entries) {
-      $sql = 'update tt_expense_items set status = NULL'.$modified_part." where client_id = $id";
+      $sql = 'update tt_expense_items set status = null'.$modified_part.
+        " where client_id = $id and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -139,26 +149,30 @@ static function delete($id, $delete_client_entries) {
 
     // Handle invoices.
     if ($delete_client_entries) {
-      $sql = "update tt_invoices set status = NULL where client_id = $id and group_id = ".$user->getGroup();
+      $sql = "update tt_invoices set status = null".
+        " where client_id = $id and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
     }
 
     // Delete project binds to this client.
-    $sql = "delete from tt_client_project_binds where client_id = $id";
+    $sql = "delete from tt_client_project_binds".
+      " where client_id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Handle users for client.
-    $sql = 'update tt_users set status = NULL'.$modified_part." where client_id = $id and group_id = ".$user->getGroup();
+    $sql = 'update tt_users set status = null'.$modified_part.
+      " where client_id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     // Mark client deleted.
-    $sql = "update tt_clients set status = NULL where id = $id and group_id = ".$user->getGroup();
+    $sql = "update tt_clients set status = null".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -169,8 +183,9 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $name = $fields['name'];
     $address = $fields['address'];
     $tax = $fields['tax'];
@@ -204,8 +219,11 @@ static function insert($fields)
   // The update function updates a client record in tt_clients table.  
   static function update($fields)
   {
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $id = $fields['id'];
     $name = $fields['name'];
@@ -218,13 +236,14 @@ static function update($fields)
     if ($tax == '') $tax = 0;
 
     // Insert client to project binds into tt_client_project_binds table.
-    $sql = "delete from tt_client_project_binds where client_id = $id";
+    $sql = "delete from tt_client_project_binds".
+      " where client_id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       die($affected->getMessage());
     if (count($projects) > 0)
       foreach ($projects as $p_id) {
-        $sql = "insert into tt_client_project_binds (client_id, project_id) values($id, $p_id)";
+        $sql = "insert into tt_client_project_binds (client_id, project_id, group_id, org_id) values($id, $p_id, $group_id, $org_id)";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
@@ -234,7 +253,7 @@ static function update($fields)
     $comma_separated = implode(",", $projects); // This is a comma-separated list of associated project ids.
     $sql = "update tt_clients set name = ".$mdb2->quote($name).", address = ".$mdb2->quote($address).
       ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status".
-      " where group_id = ".$user->getGroup()." and id = ".$id;
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/client_add.tpl b/WEB-INF/templates/client_add.tpl
index 8db93a418..db10ede45 100644
--- a/WEB-INF/templates/client_add.tpl
+++ b/WEB-INF/templates/client_add.tpl
@@ -13,14 +13,14 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->decimal_mark}00)</td>
+          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
         </tr>
         <tr>
           <td height="40"></td>
           <td>{$i18n.label.required_fields}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_projects}
         <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.clientForm.projects.control}</td>
diff --git a/WEB-INF/templates/client_edit.tpl b/WEB-INF/templates/client_edit.tpl
index 92319b68f..12f6bf0d7 100644
--- a/WEB-INF/templates/client_edit.tpl
+++ b/WEB-INF/templates/client_edit.tpl
@@ -13,7 +13,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->decimal_mark}00)</td>
+          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
         </tr>
         <tr>
           <td align = "right">{$i18n.label.status}:</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ba7efd420..2031cbf1d 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.29.4575 | 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.29.4576 | 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/mobile/client_add.tpl b/WEB-INF/templates/mobile/client_add.tpl
index 8db93a418..db10ede45 100644
--- a/WEB-INF/templates/mobile/client_add.tpl
+++ b/WEB-INF/templates/mobile/client_add.tpl
@@ -13,14 +13,14 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->decimal_mark}00)</td>
+          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
         </tr>
         <tr>
           <td height="40"></td>
           <td>{$i18n.label.required_fields}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_projects}
         <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.clientForm.projects.control}</td>
diff --git a/client_add.php b/client_add.php
index b14e8b454..4d26e2a11 100644
--- a/client_add.php
+++ b/client_add.php
@@ -54,11 +54,13 @@
   //   $cl_projects[] = $project_item['id'];
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
@@ -70,10 +72,7 @@
 
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
-      if (ttClientHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'name' => $cl_name,
+      if (ttClientHelper::insert(array('name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
         'projects' => $cl_projects,
@@ -89,6 +88,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
+$smarty->assign('show_projects',$show_projects);
 $smarty->assign('title', $i18n->get('title.add_client'));
 $smarty->assign('content_page_name', 'client_add.tpl');
 $smarty->display('index.tpl');
diff --git a/mobile/client_add.php b/mobile/client_add.php
index f5cc5b694..2050204a6 100644
--- a/mobile/client_add.php
+++ b/mobile/client_add.php
@@ -54,11 +54,13 @@
   //   $cl_projects[] = $project_item['id'];
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','class'=>'mobile-textarea','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
@@ -70,10 +72,7 @@
 
   if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
-      if (ttClientHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'name' => $cl_name,
+      if (ttClientHelper::insert(array('name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
         'projects' => $cl_projects,
@@ -89,6 +88,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
+$smarty->assign('show_projects',$show_projects);
 $smarty->assign('title', $i18n->get('title.add_client'));
 $smarty->assign('content_page_name', 'mobile/client_add.tpl');
 $smarty->display('mobile/index.tpl');

From f5d19e5d5fd205d81367ab2c82d41c154cad50ff Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 12:59:29 +0000
Subject: [PATCH 0501/1848] Some more refactoring for subgroups.

---
 WEB-INF/lib/ttClientHelper.class.php | 21 ++++++++++++++-------
 WEB-INF/templates/client_edit.tpl    |  2 +-
 WEB-INF/templates/footer.tpl         |  2 +-
 client_add.php                       |  2 +-
 client_edit.php                      |  5 ++++-
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 42eb128a8..02014f1f5 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -270,14 +270,17 @@ static function fillBean($client_id, &$bean) {
   static function getAssignedProjects($client_id)
   {
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $result = array();
-    $mdb2 = getConnection();
 
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name from tt_projects p".
       " inner join tt_client_project_binds cpb on (cpb.client_id = $client_id and cpb.project_id = p.id)".
-      " where p.group_id = ".$user->getGroup()." and p.status = 1 order by p.name";
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -291,15 +294,19 @@ static function getAssignedProjects($client_id)
   static function getClientsForUser()
   {
     global $user;
+    $mdb2 = getConnection();
+
     $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $result = array();
-    $mdb2 = getConnection();
 
-    $sql = "select distinct c.id, c.name, c.projects from tt_user_project_binds upb
-      inner join tt_client_project_binds cpb on (cpb.project_id = upb.project_id)
-      inner join tt_clients c on (c.id = cpb.client_id and c.status = 1)
-      where upb.user_id = $user_id and upb.status = 1 order by upper(c.name)";
+    $sql = "select distinct c.id, c.name, c.projects from tt_user_project_binds upb".
+      " inner join tt_client_project_binds cpb on (cpb.project_id = upb.project_id)".
+      " inner join tt_clients c on (c.id = cpb.client_id and c.status = 1)".
+      " where upb.user_id = $user_id and upb.group_id = $group_id and upb.org_id = $org_id".
+      " and upb.status = 1 order by upper(c.name)";
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/client_edit.tpl b/WEB-INF/templates/client_edit.tpl
index 12f6bf0d7..2abf70dc1 100644
--- a/WEB-INF/templates/client_edit.tpl
+++ b/WEB-INF/templates/client_edit.tpl
@@ -24,7 +24,7 @@
           <td>{$i18n.label.required_fields}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_projects}
         <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.clientForm.projects.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2031cbf1d..5bb1100af 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.29.4576 | 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.29.4578 | 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/client_add.php b/client_add.php
index 4d26e2a11..820a32fde 100644
--- a/client_add.php
+++ b/client_add.php
@@ -88,7 +88,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
-$smarty->assign('show_projects',$show_projects);
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_client'));
 $smarty->assign('content_page_name', 'client_add.tpl');
 $smarty->display('index.tpl');
diff --git a/client_edit.php b/client_edit.php
index 0dc3bb655..2b26d86df 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -64,6 +64,8 @@
   }
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','style'=>'width: 350px;','value'=>$cl_name));
@@ -71,7 +73,7 @@
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
@@ -122,6 +124,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.edit_client'));
 $smarty->assign('content_page_name', 'client_edit.tpl');
 $smarty->display('index.tpl');

From cb86dc570b33c9ed1199a5b9c473c0cdbbed32a3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 13:41:13 +0000
Subject: [PATCH 0502/1848] Improved project delete by also deleting client
 binds.

---
 WEB-INF/lib/ttProjectHelper.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 98d928f96..b5fb74dc0 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -183,6 +183,12 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Delete client binds to this project.
+    $sql = "delete from tt_client_project_binds where project_id = $id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
     return true;
   }
   

From 9a1496f75c8f6cb5304968b2c0a377161af8f973 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 14:48:38 +0000
Subject: [PATCH 0503/1848] A bit more refactoring.

---
 WEB-INF/templates/footer.tpl             |  2 +-
 WEB-INF/templates/mobile/client_edit.tpl |  2 +-
 client_edit.php                          |  5 +----
 mobile/client_edit.php                   | 13 ++++++-------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5bb1100af..09e0d89cf 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.29.4578 | 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.29.4579 | 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/mobile/client_edit.tpl b/WEB-INF/templates/mobile/client_edit.tpl
index d01731f0a..4f70ced7a 100644
--- a/WEB-INF/templates/mobile/client_edit.tpl
+++ b/WEB-INF/templates/mobile/client_edit.tpl
@@ -24,7 +24,7 @@
           <td>{$i18n.label.required_fields}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_projects}
         <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.clientForm.projects.control}</td>
diff --git a/client_edit.php b/client_edit.php
index 2b26d86df..a1f98249c 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -105,10 +105,7 @@
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttClientHelper::insert(array('name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
           'status' => $cl_status,
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index 4044637bf..b65ac99dc 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -63,6 +63,8 @@
   }
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','value'=>$cl_name));
@@ -70,7 +72,7 @@
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
@@ -86,8 +88,7 @@
     if ($request->getParameter('btn_save')) {
       $client = ttClientHelper::getClientByName($cl_name);
       if (($client && ($cl_id == $client['id'])) || !$client) {
-        if (ttClientHelper::update(array(
-          'id' => $cl_id,
+        if (ttClientHelper::update(array('id' => $cl_id,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
@@ -103,10 +104,7 @@
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttClientHelper::insert(array('name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
           'status' => $cl_status,
@@ -127,6 +125,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.edit_client'));
 $smarty->assign('content_page_name', 'mobile/client_edit.tpl');
 $smarty->display('mobile/index.tpl');

From e63eef54095a467d0dfd64646c6ef574bab09e89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 15:07:39 +0000
Subject: [PATCH 0504/1848] Improved access check for client edit.

---
 WEB-INF/templates/footer.tpl |  2 +-
 client_edit.php              | 10 +++++++---
 mobile/client_edit.php       | 10 +++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 09e0d89cf..c5ff71ca3 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.29.4579 | 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.29.4580 | 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/client_edit.php b/client_edit.php
index a1f98249c..7b572ea7c 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -41,8 +41,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = (int) $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
+$client = ttClientHelper::getClient($cl_id, true);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $projects = ttGroupHelper::getActiveProjects();
 
@@ -53,7 +58,6 @@
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $client = ttClientHelper::getClient($cl_id, true);
   $cl_name = $client['name'];
   $cl_address = $client['address'];
   $cl_tax = $client['tax'];
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index b65ac99dc..ab8686509 100644
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -40,8 +40,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
-$cl_id = (int) $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
+$client = ttClientHelper::getClient($cl_id, true);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $projects = ttGroupHelper::getActiveProjects();
 
@@ -52,7 +57,6 @@
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $client = ttClientHelper::getClient($cl_id, true);
   $cl_name = $client['name'];
   $cl_address = $client['address'];
   $cl_tax = $client['tax'];

From 21a88534ce3aeaf84ea76f4fef0581f2eec037b6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 15:31:07 +0000
Subject: [PATCH 0505/1848] Removed group selector from clients.php as design
 approach changed.

---
 WEB-INF/templates/clients.tpl |  9 ---------
 WEB-INF/templates/footer.tpl  |  2 +-
 clients.php                   | 33 +--------------------------------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index 2e8b2b82f..a31a8cd05 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -6,15 +6,6 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_clients')}
-  {if $group_dropdown}
-{$forms.clientsForm.open} {* clientsForm consists only of one dropdown group control *}
-      <table width="100%">
-        <tr>
-          <td align="center">{$i18n.label.group}: {$forms.clientsForm.group.control}</td>
-        </tr>
-      </table>
-{$forms.clientsForm.close}
-  {/if}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_clients}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.active_clients}</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c5ff71ca3..a4ddf7cc1 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.29.4580 | 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.29.4581 | 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/clients.php b/clients.php
index cc08f9a3c..a299d3061 100644
--- a/clients.php
+++ b/clients.php
@@ -40,37 +40,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
-if ($request->isPost()) {
-  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
-  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
-    exit();
-  }
-}
-
-// Determine group for which we display this page.
-if ($request->isPost() && $groupChanged) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-} else {
-  $group_id = $user->getGroup();
-}
-
-$form = new Form('clientsForm');
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.clientsForm.group_changed.value=1;document.clientsForm.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
+// End of access checks.
 
 if($user->can('manage_clients')) {
   $active_clients = ttGroupHelper::getActiveClients(true);
@@ -78,7 +48,6 @@
 } else
   $active_clients = $user->getAssignedClients();
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_clients', $active_clients);
 $smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));

From c294ba4289d15382b0889be57d63a9297e10291d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 15:57:22 +0000
Subject: [PATCH 0506/1848] Refactoring expense related things for subgroups.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 36 ++++++++++++++++++---------
 WEB-INF/templates/footer.tpl          |  2 +-
 expense_delete.php                    |  2 +-
 expenses.php                          |  2 +-
 mobile/expense_delete.php             |  2 +-
 mobile/expenses.php                   |  2 +-
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index b11e71fd0..bfc3ab727 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -29,8 +29,7 @@
 // The ttExpenseHelper is a class to help with expense items.
 class ttExpenseHelper {
   // insert - inserts an entry into tt_expense_items table.
-  static function insert($fields)
-  {
+  static function insert($fields) {
     global $user;
     $mdb2 = getConnection();
 
@@ -57,11 +56,13 @@ static function insert($fields)
   }
 
   // update - updates a record in tt_expense_items table.
-  static function update($fields)
-  {
+  static function update($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $id = (int) $fields['id'];
     $date = $fields['date'];
     $user_id = (int) $fields['user_id'];
@@ -77,34 +78,45 @@ static function update($fields)
     }
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
-    $sql = "UPDATE tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id).
+    $sql = "update tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id).
       ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).
       ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part, invoice_id = ".$mdb2->quote($invoice_id).
-      " WHERE id = $id";
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // markDeleted - marks an item as deleted in tt_expense_items table.
-  static function markDeleted($id, $user_id) {
+  static function markDeleted($id) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "update tt_expense_items set status = NULL where id = $id and user_id = $user_id";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "update tt_expense_items set status = null".
+      " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
   // getTotalForDay - gets total expenses for a user for a specific date.
-  static function getTotalForDay($user_id, $date) {
+  static function getTotalForDay($date) {
     global $user;
-
     $mdb2 = getConnection();
 
-    $sql = "select sum(cost) as sm from tt_expense_items where user_id = $user_id and date = ".$mdb2->quote($date)." and status = 1";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select sum(cost) as sm from tt_expense_items".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date = ".$mdb2->quote($date)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      $val['sm'] = str_replace('.', $user->decimal_mark, $val['sm']);
+      $val['sm'] = str_replace('.', $user->getDecimalMark(), $val['sm']);
       return $val['sm'];
     }
     return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4ddf7cc1..05f357bc6 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.29.4581 | 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.29.4582 | 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/expense_delete.php b/expense_delete.php
index fcb039f07..32b9ab679 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -59,7 +59,7 @@
 
     if ($err->no()) {
       // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id, $user->getUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id)) {
         header('Location: expenses.php');
         exit();
       } else
diff --git a/expenses.php b/expenses.php
index 1ff638fbe..eea55d1c0 100644
--- a/expenses.php
+++ b/expenses.php
@@ -211,7 +211,7 @@
   }
 }
 
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
 $smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index c0fa032eb..93d6d59f1 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -59,7 +59,7 @@
 
     if ($err->no()) {
       // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id, $user->getUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id)) {
         header('Location: expenses.php');
         exit();
       } else
diff --git a/mobile/expenses.php b/mobile/expenses.php
index a39bf4a99..656b20e05 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -217,7 +217,7 @@
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
 $smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);

From 6289820a41e9ab79635294c1d6a22583aacf6e77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 16:40:34 +0000
Subject: [PATCH 0507/1848] Some more progress with refactoring for subgroups.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 35 +++++++++++++++------------
 WEB-INF/templates/footer.tpl          |  2 +-
 expense_delete.php                    |  2 +-
 expense_edit.php                      |  2 +-
 expenses.php                          |  2 +-
 mobile/expense_delete.php             |  2 +-
 mobile/expense_edit.php               |  2 +-
 mobile/expenses.php                   |  2 +-
 8 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index bfc3ab727..9f5e838d2 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -123,11 +123,14 @@ static function getTotalForDay($date) {
   }
 
   // getItem - retrieves an entry from tt_expense_items table.
-  static function getItem($id, $user_id) {
+  static function getItem($id) {
     global $user;
-
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $client_field = null;
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client_name";
@@ -137,17 +140,16 @@ static function getItem($id, $user_id) {
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
 
-    $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.paid $client_field, p.name as project_name
-      from tt_expense_items ei
-      $left_joins
-      where ei.id = $id and ei.user_id = $user_id and ei.status = 1";
+    $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.paid $client_field, p.name as project_name".
+      " from tt_expense_items ei $left_joins".
+      " where ei.id = $id and ei.group_id = $group_id and ei.org_id = $org_id and ei.user_id = $user_id and ei.status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
         return false;
       }
       if ($val = $res->fetchRow()) {
-        $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+        $val['cost'] = str_replace('.', $user->getDecimalMark(), $val['cost']);
         return $val;
       }
     }
@@ -155,11 +157,15 @@ static function getItem($id, $user_id) {
   }
 
   // getItems - returns expense items for a user for a given date.
-  static function getItems($user_id, $date) {
+  static function getItems($date) {
     global $user;
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $result = array();
-    $mdb2 = getConnection();
 
     $client_field = null;
     if ($user->isPluginEnabled('cl'))
@@ -170,16 +176,15 @@ static function getItems($user_id, $date) {
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
 
-    $sql = "select ei.id as id $client_field, p.name as project, ei.name as item, ei.cost as cost,
-      ei.invoice_id from tt_expense_items ei
-      $left_joins
-      where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id and ei.status = 1
-      order by ei.id";
+    $sql = "select ei.id as id $client_field, p.name as project, ei.name as item, ei.cost as cost,".
+      " ei.invoice_id from tt_expense_items ei $left_joins".
+      " where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id".
+      " and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1 order by ei.id";
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-      	$val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+      	$val['cost'] = str_replace('.', $user->getDecimalMark(), $val['cost']);
         $result[] = $val;
       }
     } else return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 05f357bc6..747f72017 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.29.4582 | 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.29.4583 | 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/expense_delete.php b/expense_delete.php
index 32b9ab679..d5eccf79d 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -42,7 +42,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are deleting.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
+$expense_item = ttExpenseHelper::getItem($cl_id);
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit deleting not ours or invoiced items.
   header('Location: access_denied.php');
diff --git a/expense_edit.php b/expense_edit.php
index 80f861c8b..dd4a133bd 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -44,7 +44,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
+$expense_item = ttExpenseHelper::getItem($cl_id);
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit editing not ours or invoiced items.
   header('Location: access_denied.php');
diff --git a/expenses.php b/expenses.php
index eea55d1c0..1c70a5a3d 100644
--- a/expenses.php
+++ b/expenses.php
@@ -212,7 +212,7 @@
 }
 
 $smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index 93d6d59f1..c33f5232e 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -42,7 +42,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are deleting.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
+$expense_item = ttExpenseHelper::getItem($cl_id);
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit deleting not ours or invoiced items.
   header('Location: access_denied.php');
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index fa00b5863..7938a4f1a 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -44,7 +44,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getUser());
+$expense_item = ttExpenseHelper::getItem($cl_id);
 if (!$expense_item || $expense_item['invoice_id']) {
   // Prohibit editing not ours or invoiced items.
   header('Location: access_denied.php');
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 656b20e05..15f914b24 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -218,7 +218,7 @@
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
 $smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From b10bedad0cf854c9cb49bf0582b20869cb0c458d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 17:33:36 +0000
Subject: [PATCH 0508/1848] A bit more refactoring for subgroups.

---
 WEB-INF/lib/ttExpenseHelper.class.php |  6 +++---
 WEB-INF/lib/ttGroup.class.php         |  2 +-
 WEB-INF/lib/ttUser.class.php          | 15 +++++++++++++++
 WEB-INF/templates/expenses.tpl        |  8 ++++----
 WEB-INF/templates/footer.tpl          |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 9f5e838d2..0b202c6bf 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -110,14 +110,14 @@ static function getTotalForDay($date) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select sum(cost) as sm from tt_expense_items".
+    $sql = "select sum(cost) as total from tt_expense_items".
       " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
       " and date = ".$mdb2->quote($date)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      $val['sm'] = str_replace('.', $user->getDecimalMark(), $val['sm']);
-      return $val['sm'];
+      $val['total'] = str_replace('.', $user->getDecimalMark(), $val['total']);
+      return $val['total'];
     }
     return false;
   }
diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index b7e78f959..b0c50eef5 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -94,8 +94,8 @@ function __construct($id, $org_id) {
       $this->allow_ip = $val['allow_ip'];
       $this->password_complexity = $val['password_complexity'];
       $this->group_name = $val['group_name'];
-      $this->currency = $val['currency'];
       */
+      $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       /*
       $this->lock_spec = $val['lock_spec'];
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5e359cd21..548d70ec7 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -179,6 +179,16 @@ function getDecimalMark() {
     return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
   }
 
+  // getDateFormat returns date format for active group.
+  function getDateFormat() {
+    return ($this->behalfGroup ? $this->behalfGroup->date_format : $this->date_format);
+  }
+
+  // getTimeFormat returns time format for active group.
+  function getTimeFormat() {
+    return ($this->behalfGroup ? $this->behalfGroup->time_format : $this->time_format);
+  }
+
   // getTrackingMode returns tracking mode for active group.
   function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
@@ -189,6 +199,11 @@ function getRecordType() {
     return ($this->behalfGroup ? $this->behalfGroup->record_type : $this->record_type);
   }
 
+  // getCurrency returns currency string for active group.
+  function getCurrency() {
+    return ($this->behalfGroup ? $this->behalfGroup->currency : $this->currency);
+  }
+
   // getPlugins returns plugins string for active group.
   function getPlugins() {
     return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins);
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index ed98bb575..8e1ef0a8d 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -86,7 +86,7 @@ function recalculateCost() {
 
   var comment_control = document.getElementById("item_name");
   var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->decimal_mark}");
+  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
 
   // Calculate cost.
   var dropdown = document.getElementById("predefined_expense");
@@ -102,10 +102,10 @@ function recalculateCost() {
     else {
       var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
       if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->decimal_mark}", ".");
+        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
       var newCost = (quantity_control.value * expenseCost).toFixed(2);
       if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->decimal_mark}");
+        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
       cost_control.value = newCost;
     }
   }
@@ -201,7 +201,7 @@ function recalculateCost() {
     </table>
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
-        <td nowrap align="right">{$i18n.label.day_total}: {$user->currency|escape} {$day_total}</td>
+        <td nowrap align="right">{$i18n.label.day_total}: {$user->getCurrency()|escape} {$day_total}</td>
       </tr>
     </table>
 {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 747f72017..7654f5d8b 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.29.4583 | 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.29.4584 | 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>

From f8292d356ef3ac53b2bb1183dd462f7c453c20e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 20:13:57 +0000
Subject: [PATCH 0509/1848] More progress on refactoring expenses for
 subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php           | 27 +++++++++++++++++++
 .../lib/ttPredefinedExpenseHelper.class.php   |  9 +++----
 WEB-INF/lib/ttTeamHelper.class.php            | 22 ---------------
 WEB-INF/templates/expense_delete.tpl          |  4 +--
 WEB-INF/templates/footer.tpl                  |  2 +-
 WEB-INF/templates/mobile/expense_delete.tpl   |  4 +--
 expense_delete.php                            |  6 ++++-
 expense_edit.php                              | 14 +++++-----
 expenses.php                                  |  3 +--
 mobile/expense_delete.php                     |  6 ++++-
 mobile/expense_edit.php                       |  3 +--
 mobile/expenses.php                           |  3 +--
 predefined_expenses.php                       |  4 +--
 13 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 9f9f4a2f9..e5288a096 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -362,4 +362,31 @@ static function getInactiveProjects()
     }
     return $result;
   }
+
+  // getPredefinedExpenses - obtains predefined expenses for a group.
+  static function getPredefinedExpenses() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
+    $sql = "select id, name, cost from tt_predefined_expenses".
+      " where group_id = $group_id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      $decimal_mark = $user->getDecimalMark();
+      $replaceDecimalMark = ('.' != $decimal_mark);
+
+      while ($val = $res->fetchRow()) {
+        if ($replaceDecimalMark)
+          $val['cost'] = str_replace('.', $decimal_mark, $val['cost']);
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 16dff2840..670e061c4 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -67,18 +67,17 @@ static function delete($id) {
   }
 
   // insert function inserts a new predefined expense into database.
-  static function insert($fields)
-  {
+  static function insert($fields) {
     global $user;
-
     $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
+
     $name = $fields['name'];
     $cost = $fields['cost'];
-    if ('.' != $user->decimal_mark)
-      $cost = str_replace($user->decimal_mark, '.', $cost);
+    if ('.' != $user->getDecimalMark())
+      $cost = str_replace($user->getDecimalMark, '.', $cost);
 
     $sql = "insert into tt_predefined_expenses (group_id, org_id, name, cost)".
       " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index e64bd6724..1e6263131 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -540,28 +540,6 @@ static function getExpenseItems($group_id) {
     return false;
   }
 
-  // getPredefinedExpenses - obtains predefined expenses for a group.
-  static function getPredefinedExpenses($group_id) {
-    global $user;
-    $replaceDecimalMark = ('.' != $user->decimal_mark);
-
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select id, name, cost from tt_predefined_expenses where group_id = $group_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        if ($replaceDecimalMark)
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getNotifications - obtains notification descriptions for a group.
   static function getNotifications($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl
index 52462c8d2..e2c1b6710 100644
--- a/WEB-INF/templates/expense_delete.tpl
+++ b/WEB-INF/templates/expense_delete.tpl
@@ -8,7 +8,7 @@
     <td class="tableHeader" align="center">{$i18n.label.client}</td>
 {/if}
 
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td class="tableHeader" align="center">{$i18n.label.project}</td>
 {/if}
     <td class="tableHeader" align="center">{$i18n.label.item}</td>
@@ -18,7 +18,7 @@
 {if $user->isPluginEnabled('cl')}
   <td>{$expense_item.client_name|escape}</td>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td>{$expense_item.project_name|escape}</td>
 {/if}
     <td>{$expense_item.name|escape}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7654f5d8b..e74a6a5e0 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.29.4584 | 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.29.4585 | 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/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl
index bfd6dbc17..cbd75aed4 100644
--- a/WEB-INF/templates/mobile/expense_delete.tpl
+++ b/WEB-INF/templates/mobile/expense_delete.tpl
@@ -8,7 +8,7 @@
     <td class="tableHeader" align="center">{$i18n.label.client}</td>
 {/if}
 
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td class="tableHeader" align="center">{$i18n.label.project}</td>
 {/if}
     <td class="tableHeader" align="center">{$i18n.label.item}</td>
@@ -18,7 +18,7 @@
 {if $user->isPluginEnabled('cl')}
   <td>{$expense_item.client_name|escape}</td>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td>{$expense_item.project_name|escape}</td>
 {/if}
     <td>{$expense_item.name|escape}</td>
diff --git a/expense_delete.php b/expense_delete.php
index d5eccf79d..c7031769b 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -48,6 +48,7 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
@@ -77,8 +78,11 @@
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
-$smarty->assign('expense_item', $expense_item);
+$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
+$smarty->assign('expense_item', $expense_item);
+$smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.delete_expense'));
 $smarty->assign('content_page_name', 'expense_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/expense_edit.php b/expense_edit.php
index dd4a133bd..c42bddc8b 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
@@ -50,9 +49,12 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
 $confirm_save = $user->getConfigOption('confirm_save');
+$trackingMode = $user->getTrackingMode();
+$show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
 // Initialize variables.
 $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
@@ -65,7 +67,7 @@
   if ($user->isPluginEnabled('ps'))
     $cl_paid = $request->getParameter('paid');
 } else {
-  $cl_date = $item_date->toString($user->date_format);
+  $cl_date = $item_date->toString($user->getDateFormat());
   $cl_client = $expense_item['client_id'];
   $cl_project = $expense_item['project_id'];
   $cl_item_name = $expense_item['name'];
@@ -77,7 +79,7 @@
 $form = new Form('expenseItemForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $trackingMode && $user->isPluginEnabled('cl')) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -90,7 +92,7 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if ($show_project) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -129,7 +131,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
 if ($predefined_expenses) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'recalculateCost();',
@@ -159,7 +161,7 @@
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
     $err->add($i18n->get('error.client'));
-  if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+  if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
   }
   if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
diff --git a/expenses.php b/expenses.php
index 1c70a5a3d..882e520b1 100644
--- a/expenses.php
+++ b/expenses.php
@@ -29,7 +29,6 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
@@ -145,7 +144,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
 if ($predefined_expenses) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index c33f5232e..3bdc179d4 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -48,6 +48,7 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
@@ -77,8 +78,11 @@
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
-$smarty->assign('expense_item', $expense_item);
+$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
+$smarty->assign('expense_item', $expense_item);
+$smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.delete_expense'));
 $smarty->assign('content_page_name', 'mobile/expense_delete.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 7938a4f1a..0f657973c 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -28,7 +28,6 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
@@ -126,7 +125,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
 if ($predefined_expenses) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'recalculateCost();',
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 15f914b24..84d29738a 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -29,7 +29,6 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
@@ -149,7 +148,7 @@
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
 if ($predefined_expenses) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
diff --git a/predefined_expenses.php b/predefined_expenses.php
index 88ac44d70..99c2c899f 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_advanced_settings')) {
@@ -50,7 +50,7 @@
   }
 } else {
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $predefinedExpenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
+  $predefinedExpenses = ttGroupHelper::getPredefinedExpenses();
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From d24d7483854015ce95488831aed43255261a7baf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 20:51:54 +0000
Subject: [PATCH 0510/1848] Refactored ttPredefinedExpenseHelper class.

---
 .../lib/ttPredefinedExpenseHelper.class.php   | 34 ++++++++++---------
 WEB-INF/templates/footer.tpl                  |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 670e061c4..8ec8ccfee 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -31,21 +31,21 @@
 class ttPredefinedExpenseHelper {
 
   // get - gets predefined expense details.
-  static function get($id)
-  {
+  static function get($id) {
     global $user;
-    $replaceDecimalMark = ('.' != $user->decimal_mark);
-
     $mdb2 = getConnection();
 
-    $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and group_id = ".$user->getGroup();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, cost from tt_predefined_expenses".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
       if ($val && $val['id']) {
-        if ($replaceDecimalMark)
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+        if ('.' != $user->getDecimalMark())
+          $val['cost'] = str_replace('.', $user->getDecimalMark(), $val['cost']);
         return $val;
       }
     }
@@ -55,10 +55,13 @@ static function get($id)
   // delete - deletes a predefined expense from tt_predefined_expenses table.
   static function delete($id) {
     global $user;
-
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getGroup();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "delete from tt_predefined_expenses".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -77,7 +80,7 @@ static function insert($fields) {
     $name = $fields['name'];
     $cost = $fields['cost'];
     if ('.' != $user->getDecimalMark())
-      $cost = str_replace($user->getDecimalMark, '.', $cost);
+      $cost = str_replace($user->getDecimalMark(), '.', $cost);
 
     $sql = "insert into tt_predefined_expenses (group_id, org_id, name, cost)".
       " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
@@ -89,19 +92,18 @@ static function insert($fields) {
   }
 
   // update function - updates a predefined expense in database.
-  static function update($fields)
-  {
+  static function update($fields) {
     global $user;
-
     $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
+
     $predefined_expense_id = (int) $fields['id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
-    if ('.' != $user->decimal_mark)
-      $cost = str_replace($user->decimal_mark, '.', $cost);
+    if ('.' != $user->getDecimalMark())
+      $cost = str_replace($user->getDecimalMark(), '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
       " where id = $predefined_expense_id and group_id = $group_id and org_id = $org_id";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e74a6a5e0..3af107e9e 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.29.4585 | 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.29.4586 | 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>

From 7b271fc399126b3dc32aadb30cb839241668cead Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 21:49:24 +0000
Subject: [PATCH 0511/1848] More refactoring for subgroups.

---
 WEB-INF/lib/form/DateField.class.php | 4 ++--
 WEB-INF/templates/footer.tpl         | 2 +-
 expense_edit.php                     | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 9016dff0c..f1487d04b 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -48,7 +48,7 @@ function localize()  {
     global $user;
     global $i18n;
   	
-    $this->mDateObj->setFormat($user->date_format);
+    $this->mDateObj->setFormat($user->getDateFormat());
 
     $this->mMonthNames = $i18n->monthNames;
     $this->mWeekDayShortNames = $i18n->weekdayShortNames;
@@ -56,7 +56,7 @@ function localize()  {
     $this->lCalendarButtons['today'] = $i18n->get('label.today');
     $this->lCalendarButtons['close'] = $i18n->get('button.close');
 
-    $this->mDateFormat = $user->date_format;
+    $this->mDateFormat = $user->getDateFormat();
     $this->mWeekStartDay = $user->week_start;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3af107e9e..1ed3fe62f 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.29.4586 | 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.29.4587 | 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/expense_edit.php b/expense_edit.php
index c42bddc8b..667d03468 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -161,18 +161,17 @@
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
     $err->add($i18n->get('error.client'));
-  if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode) {
-    if (!$cl_project) $err->add($i18n->get('error.project'));
-  }
+  if ($show_project && !$cl_project)
+    $err->add($i18n->get('error.project'));
   if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
   if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
 
   // This is a new date for the expense item.
-  $new_date = new DateAndTime($user->date_format, $cl_date);
+  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
 
   // Prohibit creating entries in future.
-  if (!$user->future_entries) {
+  if (!$user->getConfigOption('future_entries')) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));

From 80481c14be5a7ac9e4d386ad7b3ec71d7628e03b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Dec 2018 22:07:41 +0000
Subject: [PATCH 0512/1848] Fixed a check if ldap expension is loaded as per PR
 #68 by Frank Giesecke.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1ed3fe62f..6d454f1f4 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.29.4587 | 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.29.4588 | 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/dbinstall.php b/dbinstall.php
index 653d13a1f..67fac3182 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -124,7 +124,7 @@ function setChange($sql) {
 
   // Check ldap extension.
   if (AUTH_MODULE == 'ldap') {
-    if (extension_loaded('ldap_')) {
+    if (extension_loaded('ldap')) {
       echo('ldap PHP extension is loaded.<br>');
     } else {
       echo('<font color="red">Error: ldap PHP extension is not loaded. It is required for LDAP authentication.</font><br>');

From 2a7ba96739989c4ae4c8554a37aef62b7066f1ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 13:19:26 +0000
Subject: [PATCH 0513/1848] Another try to fix tt_client_project_binds.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 expenses.php                 | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6d454f1f4..db9ec58ce 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.29.4588 | 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.29.4589 | 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/dbinstall.php b/dbinstall.php
index 67fac3182..c9dcc1857 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1039,6 +1039,7 @@ function setChange($sql) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
     setChange("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
+    setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/expenses.php b/expenses.php
index 882e520b1..e459c37c5 100644
--- a/expenses.php
+++ b/expenses.php
@@ -50,6 +50,7 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+// End of access checks.
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);

From ec990c16140c0a4793c7510e684e7617c5d5306d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 15:20:58 +0000
Subject: [PATCH 0514/1848] Renamed a function and made error output red.

---
 WEB-INF/templates/footer.tpl |    2 +-
 dbinstall.php                | 1078 +++++++++++++++++-----------------
 2 files changed, 540 insertions(+), 540 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index db9ec58ce..d7903e75c 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.29.4589 | 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.29.4590 | 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/dbinstall.php b/dbinstall.php
index c9dcc1857..55d09be0a 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -34,19 +34,19 @@
 import('ttRoleHelper');
 import('ttOrgHelper');
 
-// setChange - executes an sql statement. TODO: rename this function to something better.
-// Better yet, redo the entire thing and make an installer.
-function setChange($sql) {
+// TODO: we need an installer.
+
+// ttExecute - executes an sql statement and prints either an error or a success message.
+function ttExecute($sql) {
   print "<pre>".$sql."</pre>";
   $mdb2 = getConnection();
   $affected = $mdb2->exec($sql);
   if (is_a($affected, 'PEAR_Error'))
-    print "error: ".$affected->getMessage()."<br>";
+    print '<font color="red">Error: '.$affected->getMessage().'.</font><br>';
   else
-    print "successful update<br>\n";
+    print "Successful update.<br>\n";
 }
 
-
 if ($request->isGet()) {
   echo('<h2>Environment Checks</h2>');
 
@@ -182,37 +182,37 @@ function setChange($sql) {
       foreach ($queries as $query) {
         $query = trim($query);
         if (strlen($query)>0) {
-          setChange($query);
+          ttExecute($query);
         }
       }
     }
   }
 
   if ($_POST["convert5to7"]) {
-    setChange("alter table `activity_log` CHANGE al_comment al_comment text");
-    setChange("CREATE TABLE `sysconfig` (`sysc_id` int(11) unsigned NOT NULL auto_increment,`sysc_name` varchar(32) NOT NULL default '',`sysc_value` varchar(70) default NULL, PRIMARY KEY  (`sysc_id`), UNIQUE KEY `sysc_id` (`sysc_id`), UNIQUE KEY `sysc_name` (`sysc_name`))");
-    setChange("alter table `companies` add c_locktime int(4) default -1");
-    setChange("alter table `activity_log` add al_billable tinyint(4) default 0");
-    setChange("alter table `sysconfig` drop INDEX `sysc_name`");
-    setChange("alter table `sysconfig` add sysc_id_u int(4)");
-    setChange("alter table `report_filter_set` add rfs_billable VARCHAR(10)");
-    setChange("ALTER TABLE clients MODIFY clnt_id int(11) NOT NULL AUTO_INCREMENT");
-    setChange("ALTER TABLE `users` ADD `u_show_pie` smallint(2) DEFAULT '1'");
-    setChange("alter table `users` ADD `u_pie_mode` smallint(2) DEFAULT '1'");
-    setChange("alter table users drop `u_aprojects`");
+    ttExecute("alter table `activity_log` CHANGE al_comment al_comment text");
+    ttExecute("CREATE TABLE `sysconfig` (`sysc_id` int(11) unsigned NOT NULL auto_increment,`sysc_name` varchar(32) NOT NULL default '',`sysc_value` varchar(70) default NULL, PRIMARY KEY  (`sysc_id`), UNIQUE KEY `sysc_id` (`sysc_id`), UNIQUE KEY `sysc_name` (`sysc_name`))");
+    ttExecute("alter table `companies` add c_locktime int(4) default -1");
+    ttExecute("alter table `activity_log` add al_billable tinyint(4) default 0");
+    ttExecute("alter table `sysconfig` drop INDEX `sysc_name`");
+    ttExecute("alter table `sysconfig` add sysc_id_u int(4)");
+    ttExecute("alter table `report_filter_set` add rfs_billable VARCHAR(10)");
+    ttExecute("ALTER TABLE clients MODIFY clnt_id int(11) NOT NULL AUTO_INCREMENT");
+    ttExecute("ALTER TABLE `users` ADD `u_show_pie` smallint(2) DEFAULT '1'");
+    ttExecute("alter table `users` ADD `u_pie_mode` smallint(2) DEFAULT '1'");
+    ttExecute("alter table users drop `u_aprojects`");
   }
 
   if ($_POST["convert7to133"]) {
-    setChange("ALTER TABLE users ADD COLUMN u_lang VARCHAR(20) DEFAULT NULL");
-    setChange("ALTER TABLE users ADD COLUMN u_email VARCHAR(100) DEFAULT NULL");
-    setChange("ALTER TABLE `activity_log` drop `al_proof`");
-    setChange("ALTER TABLE `activity_log` drop `al_charge`");
-    setChange("ALTER TABLE `activities` drop `a_project_id`");
-    setChange("DROP TABLE `activity_status_list`");
-    setChange("DROP TABLE `project_status_list`");
-    setChange("DROP TABLE `user_status_list`");
-    setChange("DROP TABLE `companies_c_id_seq`");
-    setChange("ALTER TABLE projects ADD COLUMN p_activities TEXT");
+    ttExecute("ALTER TABLE users ADD COLUMN u_lang VARCHAR(20) DEFAULT NULL");
+    ttExecute("ALTER TABLE users ADD COLUMN u_email VARCHAR(100) DEFAULT NULL");
+    ttExecute("ALTER TABLE `activity_log` drop `al_proof`");
+    ttExecute("ALTER TABLE `activity_log` drop `al_charge`");
+    ttExecute("ALTER TABLE `activities` drop `a_project_id`");
+    ttExecute("DROP TABLE `activity_status_list`");
+    ttExecute("DROP TABLE `project_status_list`");
+    ttExecute("DROP TABLE `user_status_list`");
+    ttExecute("DROP TABLE `companies_c_id_seq`");
+    ttExecute("ALTER TABLE projects ADD COLUMN p_activities TEXT");
   }
 
   // The update_projects function updates p_activities field in the projects table so that we could
@@ -255,9 +255,9 @@ function setChange($sql) {
   }
 
   if ($_POST["convert133to1340"]) {
-    setChange("ALTER TABLE companies ADD COLUMN c_show_pie smallint(2) DEFAULT 1");
-    setChange("ALTER TABLE companies ADD COLUMN c_pie_mode smallint(2) DEFAULT 1");
-    setChange("ALTER TABLE companies ADD COLUMN c_lang varchar(20) default NULL");
+    ttExecute("ALTER TABLE companies ADD COLUMN c_show_pie smallint(2) DEFAULT 1");
+    ttExecute("ALTER TABLE companies ADD COLUMN c_pie_mode smallint(2) DEFAULT 1");
+    ttExecute("ALTER TABLE companies ADD COLUMN c_lang varchar(20) default NULL");
   }
 
   // The update_companies function sets up c_show_pie, c_pie_mode, and c_lang
@@ -290,107 +290,107 @@ function setChange($sql) {
   }
 
   if ($_POST["convert1340to1485"]) {
-    setChange("ALTER TABLE users DROP u_show_pie");
-    setChange("ALTER TABLE users DROP u_pie_mode");
-    setChange("ALTER TABLE users DROP u_lang");
-    setChange("ALTER TABLE `users` modify u_login varchar(100) NOT NULL");
-    setChange("ALTER TABLE `users` modify u_active smallint(6) default '1'");
-    setChange("drop index u_login_idx on users");
-    setChange("create unique index u_login_idx on users(u_login, u_active)");
-    setChange("ALTER TABLE companies MODIFY `c_lang` varchar(20) NOT NULL default 'en'");
-    setChange("ALTER TABLE companies ADD COLUMN `c_date_format` varchar(20) NOT NULL default '%Y-%m-%d'");
-    setChange("ALTER TABLE companies ADD COLUMN `c_time_format` varchar(20) NOT NULL default '%H:%M'");
-    setChange("ALTER TABLE companies ADD COLUMN `c_week_start` smallint(2) NOT NULL DEFAULT '0'");
-    setChange("ALTER TABLE clients MODIFY `clnt_status` smallint(6) default '1'");
-    setChange("create unique index clnt_name_idx on clients(clnt_id_um, clnt_name, clnt_status)");
-    setChange("ALTER TABLE projects modify p_status smallint(6) default '1'");
-    setChange("update projects set p_status = NULL where p_status = 1000");
-    setChange("drop index p_manager_idx on projects");
-    setChange("create unique index p_name_idx on projects(p_manager_id, p_name, p_status)");
-    setChange("ALTER TABLE activities modify a_status smallint(6) default '1'");
-    setChange("update activities set a_status = NULL where a_status = 1000");
-    setChange("drop index a_manager_idx on activities");
-    setChange("create unique index a_name_idx on activities(a_manager_id, a_name, a_status)");
-    setChange("RENAME TABLE companies TO teams");
-    setChange("RENAME TABLE teams TO att_teams");
-    setChange("ALTER TABLE att_teams CHANGE c_id id int(11) NOT NULL auto_increment");
-    setChange("RENAME TABLE users TO att_users");
-    setChange("update att_users set u_company_id = 0 where u_company_id is NULL");
-    setChange("ALTER TABLE att_users CHANGE u_company_id team_id int(11) NOT NULL");
-    setChange("RENAME TABLE att_teams TO tt_teams");
-    setChange("RENAME TABLE att_users TO tt_users");
-    setChange("ALTER TABLE tt_teams CHANGE c_name name varchar(80) NOT NULL");
-    setChange("ALTER TABLE `tt_teams` drop `c_www`");
-    setChange("ALTER TABLE `tt_teams` MODIFY `name` varchar(80) default NULL");
-    setChange("ALTER TABLE clients ADD COLUMN `your_name` varchar(255) default NULL");
-    setChange("ALTER TABLE tt_teams ADD COLUMN `address` varchar(255) default NULL");
-    setChange("ALTER TABLE invoice_header ADD COLUMN `client_name` varchar(255) default NULL");
-    setChange("ALTER TABLE invoice_header ADD COLUMN `client_addr` varchar(255) default NULL");
-    setChange("ALTER TABLE report_filter_set ADD COLUMN `rfs_cb_cost` tinyint(4) default '0'");
-    setChange("ALTER TABLE activity_log DROP primary key");
-    setChange("ALTER TABLE activity_log ADD COLUMN `id` bigint NOT NULL auto_increment primary key"); 
-    setChange("CREATE TABLE `tt_custom_fields` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `type` tinyint(4) NOT NULL default '0', `label` varchar(32) NOT NULL default '', PRIMARY KEY (`id`))");
-    setChange("CREATE TABLE `tt_custom_field_options` (`id` int(11) NOT NULL auto_increment, `field_id` int(11) NOT NULL, `value` varchar(32) NOT NULL default '', PRIMARY KEY (`id`))");
-    setChange("CREATE TABLE `tt_custom_field_log` (`id` bigint NOT NULL auto_increment, `al_id` bigint NOT NULL, `field_id` int(11) NOT NULL, `value` varchar(255) default NULL, PRIMARY KEY (`id`))");
-    setChange("ALTER TABLE tt_users DROP u_level");
-    setChange("ALTER TABLE tt_custom_fields ADD COLUMN `status` tinyint(4) default '1'");
-    setChange("ALTER TABLE report_filter_set ADD COLUMN `rfs_cb_cf_1` tinyint(4) default '0'");
-    setChange("ALTER TABLE tt_teams ADD COLUMN `plugins` varchar(255) default NULL");
-    setChange("ALTER TABLE tt_teams MODIFY c_locktime int(4) default '0'");
-    setChange("ALTER TABLE clients DROP your_name");
-    setChange("ALTER TABLE clients DROP clnt_addr_your");
-    setChange("ALTER TABLE `tt_custom_fields` ADD COLUMN `required` tinyint(4) default '0'");
-    setChange("ALTER TABLE tt_teams DROP c_pie_mode");
-    setChange("RENAME TABLE report_filter_set TO tt_fav_reports");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_id id int(11) unsigned NOT NULL auto_increment");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_name name varchar(200) NOT NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_id_u user_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_id_p project_id int(11) default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_id_a task_id int(11) default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_users users text default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_period period tinyint(4) default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_period_start period_start date default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_period_finish period_end date default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_project show_project tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_activity show_task tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_note show_note tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_start show_start tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_finish show_end tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_duration show_duration tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_cost show_cost tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_cf_1 show_custom_field_1 tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_idle show_empty_days tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_cb_totals_only show_totals_only tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_groupby group_by varchar(20) default NULL");
-    setChange("ALTER TABLE tt_fav_reports CHANGE rfs_billable billable tinyint(4) default NULL");
-    setChange("ALTER TABLE projects CHANGE p_activities tasks text default NULL");
-    setChange("ALTER TABLE tt_teams CHANGE c_currency currency varchar(7) default NULL");
-    setChange("ALTER TABLE tt_teams CHANGE c_locktime locktime int(4) default '0'");
-    setChange("ALTER TABLE tt_teams CHANGE c_show_pie show_pie smallint(2) DEFAULT '1'");
-    setChange("ALTER TABLE tt_teams CHANGE c_lang lang varchar(10) NOT NULL default 'en'");
-    setChange("ALTER TABLE tt_teams CHANGE c_date_format date_format varchar(20) NOT NULL default '%Y-%m-%d'");
-    setChange("ALTER TABLE tt_teams CHANGE c_time_format time_format varchar(20) NOT NULL default '%H:%M'");
-    setChange("ALTER TABLE tt_teams CHANGE c_week_start week_start smallint(2) NOT NULL DEFAULT '0'");
-    setChange("ALTER TABLE tt_users CHANGE u_id id int(11) NOT NULL auto_increment");
-    setChange("ALTER TABLE tt_users CHANGE u_timestamp timestamp timestamp NOT NULL");
-    setChange("ALTER TABLE tt_users CHANGE u_login login varchar(50) NOT NULL");
-    setChange("drop index u_login_idx on tt_users");
-    setChange("create unique index login_idx on tt_users(login, u_active)");
-    setChange("ALTER TABLE tt_users CHANGE u_password password varchar(50) default NULL");
-    setChange("ALTER TABLE tt_users CHANGE u_name name varchar(100) default NULL");
-    setChange("ALTER TABLE tt_users CHANGE u_email email varchar(100) default NULL");
-    setChange("ALTER TABLE tt_users CHANGE u_rate rate float(6,2) NOT NULL default '0.00'");
-    setChange("update tt_users set u_active = NULL where u_active = 1000");
-    setChange("ALTER TABLE tt_users CHANGE u_active status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_teams ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_users ADD COLUMN role int(11) default '4'");
-    setChange("update tt_users set role = 1024 where login = 'admin'");
-    setChange("update tt_users set role = 68 where u_comanager = 1");
-    setChange("update tt_users set role = 324 where u_manager_id is null and login != 'admin'");
-    setChange("ALTER TABLE user_bind CHANGE ub_checked status tinyint(4) default '1'");
-    setChange("ALTER TABLE activities ADD COLUMN team_id int(11) NOT NULL");
-    setChange("ALTER TABLE clients ADD COLUMN team_id int(11) NOT NULL");
-    setChange("ALTER TABLE projects ADD COLUMN team_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE users DROP u_show_pie");
+    ttExecute("ALTER TABLE users DROP u_pie_mode");
+    ttExecute("ALTER TABLE users DROP u_lang");
+    ttExecute("ALTER TABLE `users` modify u_login varchar(100) NOT NULL");
+    ttExecute("ALTER TABLE `users` modify u_active smallint(6) default '1'");
+    ttExecute("drop index u_login_idx on users");
+    ttExecute("create unique index u_login_idx on users(u_login, u_active)");
+    ttExecute("ALTER TABLE companies MODIFY `c_lang` varchar(20) NOT NULL default 'en'");
+    ttExecute("ALTER TABLE companies ADD COLUMN `c_date_format` varchar(20) NOT NULL default '%Y-%m-%d'");
+    ttExecute("ALTER TABLE companies ADD COLUMN `c_time_format` varchar(20) NOT NULL default '%H:%M'");
+    ttExecute("ALTER TABLE companies ADD COLUMN `c_week_start` smallint(2) NOT NULL DEFAULT '0'");
+    ttExecute("ALTER TABLE clients MODIFY `clnt_status` smallint(6) default '1'");
+    ttExecute("create unique index clnt_name_idx on clients(clnt_id_um, clnt_name, clnt_status)");
+    ttExecute("ALTER TABLE projects modify p_status smallint(6) default '1'");
+    ttExecute("update projects set p_status = NULL where p_status = 1000");
+    ttExecute("drop index p_manager_idx on projects");
+    ttExecute("create unique index p_name_idx on projects(p_manager_id, p_name, p_status)");
+    ttExecute("ALTER TABLE activities modify a_status smallint(6) default '1'");
+    ttExecute("update activities set a_status = NULL where a_status = 1000");
+    ttExecute("drop index a_manager_idx on activities");
+    ttExecute("create unique index a_name_idx on activities(a_manager_id, a_name, a_status)");
+    ttExecute("RENAME TABLE companies TO teams");
+    ttExecute("RENAME TABLE teams TO att_teams");
+    ttExecute("ALTER TABLE att_teams CHANGE c_id id int(11) NOT NULL auto_increment");
+    ttExecute("RENAME TABLE users TO att_users");
+    ttExecute("update att_users set u_company_id = 0 where u_company_id is NULL");
+    ttExecute("ALTER TABLE att_users CHANGE u_company_id team_id int(11) NOT NULL");
+    ttExecute("RENAME TABLE att_teams TO tt_teams");
+    ttExecute("RENAME TABLE att_users TO tt_users");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_name name varchar(80) NOT NULL");
+    ttExecute("ALTER TABLE `tt_teams` drop `c_www`");
+    ttExecute("ALTER TABLE `tt_teams` MODIFY `name` varchar(80) default NULL");
+    ttExecute("ALTER TABLE clients ADD COLUMN `your_name` varchar(255) default NULL");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN `address` varchar(255) default NULL");
+    ttExecute("ALTER TABLE invoice_header ADD COLUMN `client_name` varchar(255) default NULL");
+    ttExecute("ALTER TABLE invoice_header ADD COLUMN `client_addr` varchar(255) default NULL");
+    ttExecute("ALTER TABLE report_filter_set ADD COLUMN `rfs_cb_cost` tinyint(4) default '0'");
+    ttExecute("ALTER TABLE activity_log DROP primary key");
+    ttExecute("ALTER TABLE activity_log ADD COLUMN `id` bigint NOT NULL auto_increment primary key");
+    ttExecute("CREATE TABLE `tt_custom_fields` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `type` tinyint(4) NOT NULL default '0', `label` varchar(32) NOT NULL default '', PRIMARY KEY (`id`))");
+    ttExecute("CREATE TABLE `tt_custom_field_options` (`id` int(11) NOT NULL auto_increment, `field_id` int(11) NOT NULL, `value` varchar(32) NOT NULL default '', PRIMARY KEY (`id`))");
+    ttExecute("CREATE TABLE `tt_custom_field_log` (`id` bigint NOT NULL auto_increment, `al_id` bigint NOT NULL, `field_id` int(11) NOT NULL, `value` varchar(255) default NULL, PRIMARY KEY (`id`))");
+    ttExecute("ALTER TABLE tt_users DROP u_level");
+    ttExecute("ALTER TABLE tt_custom_fields ADD COLUMN `status` tinyint(4) default '1'");
+    ttExecute("ALTER TABLE report_filter_set ADD COLUMN `rfs_cb_cf_1` tinyint(4) default '0'");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN `plugins` varchar(255) default NULL");
+    ttExecute("ALTER TABLE tt_teams MODIFY c_locktime int(4) default '0'");
+    ttExecute("ALTER TABLE clients DROP your_name");
+    ttExecute("ALTER TABLE clients DROP clnt_addr_your");
+    ttExecute("ALTER TABLE `tt_custom_fields` ADD COLUMN `required` tinyint(4) default '0'");
+    ttExecute("ALTER TABLE tt_teams DROP c_pie_mode");
+    ttExecute("RENAME TABLE report_filter_set TO tt_fav_reports");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_id id int(11) unsigned NOT NULL auto_increment");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_name name varchar(200) NOT NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_id_u user_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_id_p project_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_id_a task_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_users users text default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_period period tinyint(4) default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_period_start period_start date default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_period_finish period_end date default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_project show_project tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_activity show_task tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_note show_note tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_start show_start tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_finish show_end tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_duration show_duration tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_cost show_cost tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_cf_1 show_custom_field_1 tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_idle show_empty_days tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_cb_totals_only show_totals_only tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_groupby group_by varchar(20) default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE rfs_billable billable tinyint(4) default NULL");
+    ttExecute("ALTER TABLE projects CHANGE p_activities tasks text default NULL");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_currency currency varchar(7) default NULL");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_locktime locktime int(4) default '0'");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_show_pie show_pie smallint(2) DEFAULT '1'");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_lang lang varchar(10) NOT NULL default 'en'");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_date_format date_format varchar(20) NOT NULL default '%Y-%m-%d'");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_time_format time_format varchar(20) NOT NULL default '%H:%M'");
+    ttExecute("ALTER TABLE tt_teams CHANGE c_week_start week_start smallint(2) NOT NULL DEFAULT '0'");
+    ttExecute("ALTER TABLE tt_users CHANGE u_id id int(11) NOT NULL auto_increment");
+    ttExecute("ALTER TABLE tt_users CHANGE u_timestamp timestamp timestamp NOT NULL");
+    ttExecute("ALTER TABLE tt_users CHANGE u_login login varchar(50) NOT NULL");
+    ttExecute("drop index u_login_idx on tt_users");
+    ttExecute("create unique index login_idx on tt_users(login, u_active)");
+    ttExecute("ALTER TABLE tt_users CHANGE u_password password varchar(50) default NULL");
+    ttExecute("ALTER TABLE tt_users CHANGE u_name name varchar(100) default NULL");
+    ttExecute("ALTER TABLE tt_users CHANGE u_email email varchar(100) default NULL");
+    ttExecute("ALTER TABLE tt_users CHANGE u_rate rate float(6,2) NOT NULL default '0.00'");
+    ttExecute("update tt_users set u_active = NULL where u_active = 1000");
+    ttExecute("ALTER TABLE tt_users CHANGE u_active status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE tt_users ADD COLUMN role int(11) default '4'");
+    ttExecute("update tt_users set role = 1024 where login = 'admin'");
+    ttExecute("update tt_users set role = 68 where u_comanager = 1");
+    ttExecute("update tt_users set role = 324 where u_manager_id is null and login != 'admin'");
+    ttExecute("ALTER TABLE user_bind CHANGE ub_checked status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE activities ADD COLUMN team_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE clients ADD COLUMN team_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE projects ADD COLUMN team_id int(11) NOT NULL");
   }
 
   // The update_to_team_id function sets team_id field projects, activities, and clients tables.
@@ -492,127 +492,127 @@ function setChange($sql) {
   }
 
   if ($_POST["convert1485to1579"]) {
-    setChange("ALTER TABLE tt_fav_reports MODIFY id int(11) NOT NULL auto_increment");
-    setChange("RENAME TABLE clients TO tt_clients");
-    setChange("ALTER TABLE tt_clients CHANGE clnt_id id int(11) NOT NULL AUTO_INCREMENT");
-    setChange("ALTER TABLE tt_clients CHANGE clnt_status status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_clients DROP clnt_id_um");
-    setChange("ALTER TABLE tt_clients CHANGE clnt_name name varchar(80) NOT NULL");
-    setChange("drop index clnt_name_idx on tt_clients");
-    setChange("drop index client_name_idx on tt_clients");
-    setChange("create unique index client_name_idx on tt_clients(team_id, name, status)");
-    setChange("ALTER TABLE tt_teams ADD COLUMN `timestamp` timestamp NOT NULL");
-    setChange("ALTER TABLE tt_clients CHANGE clnt_addr_cust address varchar(255) default NULL");
-    setChange("ALTER TABLE tt_clients DROP clnt_discount");
-    setChange("ALTER TABLE tt_clients DROP clnt_comment");
-    setChange("ALTER TABLE tt_clients DROP clnt_fsubtotals");
-    setChange("ALTER TABLE tt_clients CHANGE clnt_tax tax float(6,2) NOT NULL default '0.00'");
-    setChange("ALTER TABLE activity_log ADD COLUMN client_id int(11) default NULL");
-    setChange("ALTER TABLE tt_teams DROP show_pie");
-    setChange("ALTER TABLE tt_fav_reports CHANGE group_by sort_by varchar(20) default 'date'");
-    setChange("RENAME TABLE tmp_refs TO tt_tmp_refs");
-    setChange("ALTER TABLE tt_tmp_refs CHANGE tr_created timestamp timestamp NOT NULL");
-    setChange("ALTER TABLE tt_tmp_refs CHANGE tr_code ref char(32) NOT NULL default ''");
-    setChange("ALTER TABLE tt_tmp_refs CHANGE tr_userid user_id int(11) NOT NULL");
-    setChange("RENAME TABLE projects TO tt_projects");
-    setChange("ALTER TABLE tt_projects CHANGE p_id id int(11) NOT NULL auto_increment");
-    setChange("ALTER TABLE tt_projects DROP p_timestamp");
-    setChange("ALTER TABLE tt_projects CHANGE p_name name varchar(80) NOT NULL");
-    setChange("ALTER TABLE tt_projects CHANGE p_status status tinyint(4) default '1'");
-    setChange("drop index p_name_idx on tt_projects");
-    setChange("create unique index project_idx on tt_projects(team_id, name, status)");
-    setChange("RENAME TABLE activities TO tt_tasks");
-    setChange("ALTER TABLE tt_tasks CHANGE a_id id int(11) NOT NULL auto_increment");
-    setChange("ALTER TABLE tt_tasks DROP a_timestamp");
-    setChange("ALTER TABLE tt_tasks CHANGE a_name name varchar(80) NOT NULL");
-    setChange("ALTER TABLE tt_tasks CHANGE a_status status tinyint(4) default '1'");
-    setChange("drop index a_name_idx on tt_tasks");
-    setChange("create unique index task_idx on tt_tasks(team_id, name, status)");
-    setChange("RENAME TABLE invoice_header TO tt_invoice_headers");
-    setChange("ALTER TABLE tt_invoice_headers CHANGE ih_user_id user_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_invoice_headers CHANGE ih_number number varchar(20) default NULL");
-    setChange("ALTER TABLE tt_invoice_headers DROP ih_addr_your");
-    setChange("ALTER TABLE tt_invoice_headers DROP ih_addr_cust");
-    setChange("ALTER TABLE tt_invoice_headers CHANGE ih_comment comment varchar(255) default NULL");
-    setChange("ALTER TABLE tt_invoice_headers CHANGE ih_tax tax float(6,2) default '0.00'");
-    setChange("ALTER TABLE tt_invoice_headers CHANGE ih_discount discount float(6,2) default '0.00'");
-    setChange("ALTER TABLE tt_invoice_headers CHANGE ih_fsubtotals subtotals tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_users DROP u_comanager");
-    setChange("ALTER TABLE tt_tasks DROP a_manager_id");
-    setChange("ALTER TABLE tt_projects DROP p_manager_id");
-    setChange("ALTER TABLE tt_users DROP u_manager_id");
-    setChange("ALTER TABLE activity_bind DROP ab_id");
-    setChange("RENAME TABLE activity_bind TO tt_project_task_binds");
-    setChange("ALTER TABLE tt_project_task_binds CHANGE ab_id_p project_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_project_task_binds CHANGE ab_id_a task_id int(11) NOT NULL");
-    setChange("RENAME TABLE user_bind TO tt_user_project_binds");
-    setChange("ALTER TABLE tt_user_project_binds CHANGE ub_rate rate float(6,2) NOT NULL default '0.00'");
-    setChange("ALTER TABLE tt_user_project_binds CHANGE ub_id_p project_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_user_project_binds CHANGE ub_id_u user_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_user_project_binds CHANGE ub_id id int(11) NOT NULL auto_increment");
-    setChange("CREATE TABLE `tt_client_project_binds` (`client_id` int(11) NOT NULL, `project_id` int(11) NOT NULL)");
-    setChange("ALTER TABLE tt_user_project_binds MODIFY rate float(6,2) default '0.00'");
-    setChange("ALTER TABLE tt_clients MODIFY tax float(6,2) default '0.00'");
-    setChange("RENAME TABLE activity_log TO tt_log");
-    setChange("ALTER TABLE tt_log CHANGE al_timestamp timestamp timestamp NOT NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_user_id user_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_date date date NOT NULL");
-    setChange("drop index al_date_idx on tt_log");
-    setChange("create index date_idx on tt_log(date)");
-    setChange("ALTER TABLE tt_log CHANGE al_from start time default NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_duration duration time default NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_project_id project_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_log MODIFY project_id int(11) default NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_activity_id task_id int(11) default NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_comment comment text");
-    setChange("ALTER TABLE tt_log CHANGE al_billable billable tinyint(4) default '0'");
-    setChange("drop index al_user_id_idx on tt_log");
-    setChange("drop index al_project_id_idx on tt_log");
-    setChange("drop index al_activity_id_idx on tt_log");
-    setChange("create index user_idx on tt_log(user_id)");
-    setChange("create index project_idx on tt_log(project_id)");
-    setChange("create index task_idx on tt_log(task_id)");
-    setChange("ALTER TABLE tt_custom_field_log CHANGE al_id log_id bigint NOT NULL");
-    setChange("RENAME TABLE sysconfig TO tt_config");
-    setChange("ALTER TABLE tt_config DROP sysc_id");
-    setChange("ALTER TABLE tt_config CHANGE sysc_id_u user_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_config CHANGE sysc_name param_name varchar(32) NOT NULL");
-    setChange("ALTER TABLE tt_config CHANGE sysc_value param_value varchar(80) default NULL");
-    setChange("create unique index param_idx on tt_config(user_id, param_name)");
-    setChange("ALTER TABLE tt_log ADD COLUMN invoice_id int(11) default NULL");
-    setChange("ALTER TABLE tt_projects ADD COLUMN description varchar(255) default NULL");
-    setChange("CREATE TABLE `tt_invoices` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `number` varchar(20) default NULL, `client_name` varchar(255) default NULL, `client_addr` varchar(255) default NULL, `comment` varchar(255) default NULL, `tax` float(6,2) default '0.00', `discount` float(6,2) default '0.00', PRIMARY KEY (`id`))");
-    setChange("ALTER TABLE tt_invoices drop number");
-    setChange("ALTER TABLE tt_invoices drop client_name");
-    setChange("ALTER TABLE tt_invoices drop client_addr");
-    setChange("ALTER TABLE tt_invoices drop comment");
-    setChange("ALTER TABLE tt_invoices drop tax");
-    setChange("ALTER TABLE tt_invoices ADD COLUMN name varchar(80) NOT NULL");
-    setChange("ALTER TABLE tt_invoices ADD COLUMN client_id int(11) NOT NULL");
-    setChange("ALTER TABLE tt_invoices ADD COLUMN start_date date NOT NULL");
-    setChange("ALTER TABLE tt_invoices ADD COLUMN end_date date NOT NULL");
-    setChange("create unique index name_idx on tt_invoices(team_id, name)");
-    setChange("drop index ub_id_u on tt_user_project_binds");
-    setChange("create unique index bind_idx on tt_user_project_binds(user_id, project_id)");
-    setChange("create index client_idx on tt_log(client_id)");
-    setChange("create index invoice_idx on tt_log(invoice_id)");
+    ttExecute("ALTER TABLE tt_fav_reports MODIFY id int(11) NOT NULL auto_increment");
+    ttExecute("RENAME TABLE clients TO tt_clients");
+    ttExecute("ALTER TABLE tt_clients CHANGE clnt_id id int(11) NOT NULL AUTO_INCREMENT");
+    ttExecute("ALTER TABLE tt_clients CHANGE clnt_status status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE tt_clients DROP clnt_id_um");
+    ttExecute("ALTER TABLE tt_clients CHANGE clnt_name name varchar(80) NOT NULL");
+    ttExecute("drop index clnt_name_idx on tt_clients");
+    ttExecute("drop index client_name_idx on tt_clients");
+    ttExecute("create unique index client_name_idx on tt_clients(team_id, name, status)");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN `timestamp` timestamp NOT NULL");
+    ttExecute("ALTER TABLE tt_clients CHANGE clnt_addr_cust address varchar(255) default NULL");
+    ttExecute("ALTER TABLE tt_clients DROP clnt_discount");
+    ttExecute("ALTER TABLE tt_clients DROP clnt_comment");
+    ttExecute("ALTER TABLE tt_clients DROP clnt_fsubtotals");
+    ttExecute("ALTER TABLE tt_clients CHANGE clnt_tax tax float(6,2) NOT NULL default '0.00'");
+    ttExecute("ALTER TABLE activity_log ADD COLUMN client_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_teams DROP show_pie");
+    ttExecute("ALTER TABLE tt_fav_reports CHANGE group_by sort_by varchar(20) default 'date'");
+    ttExecute("RENAME TABLE tmp_refs TO tt_tmp_refs");
+    ttExecute("ALTER TABLE tt_tmp_refs CHANGE tr_created timestamp timestamp NOT NULL");
+    ttExecute("ALTER TABLE tt_tmp_refs CHANGE tr_code ref char(32) NOT NULL default ''");
+    ttExecute("ALTER TABLE tt_tmp_refs CHANGE tr_userid user_id int(11) NOT NULL");
+    ttExecute("RENAME TABLE projects TO tt_projects");
+    ttExecute("ALTER TABLE tt_projects CHANGE p_id id int(11) NOT NULL auto_increment");
+    ttExecute("ALTER TABLE tt_projects DROP p_timestamp");
+    ttExecute("ALTER TABLE tt_projects CHANGE p_name name varchar(80) NOT NULL");
+    ttExecute("ALTER TABLE tt_projects CHANGE p_status status tinyint(4) default '1'");
+    ttExecute("drop index p_name_idx on tt_projects");
+    ttExecute("create unique index project_idx on tt_projects(team_id, name, status)");
+    ttExecute("RENAME TABLE activities TO tt_tasks");
+    ttExecute("ALTER TABLE tt_tasks CHANGE a_id id int(11) NOT NULL auto_increment");
+    ttExecute("ALTER TABLE tt_tasks DROP a_timestamp");
+    ttExecute("ALTER TABLE tt_tasks CHANGE a_name name varchar(80) NOT NULL");
+    ttExecute("ALTER TABLE tt_tasks CHANGE a_status status tinyint(4) default '1'");
+    ttExecute("drop index a_name_idx on tt_tasks");
+    ttExecute("create unique index task_idx on tt_tasks(team_id, name, status)");
+    ttExecute("RENAME TABLE invoice_header TO tt_invoice_headers");
+    ttExecute("ALTER TABLE tt_invoice_headers CHANGE ih_user_id user_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_invoice_headers CHANGE ih_number number varchar(20) default NULL");
+    ttExecute("ALTER TABLE tt_invoice_headers DROP ih_addr_your");
+    ttExecute("ALTER TABLE tt_invoice_headers DROP ih_addr_cust");
+    ttExecute("ALTER TABLE tt_invoice_headers CHANGE ih_comment comment varchar(255) default NULL");
+    ttExecute("ALTER TABLE tt_invoice_headers CHANGE ih_tax tax float(6,2) default '0.00'");
+    ttExecute("ALTER TABLE tt_invoice_headers CHANGE ih_discount discount float(6,2) default '0.00'");
+    ttExecute("ALTER TABLE tt_invoice_headers CHANGE ih_fsubtotals subtotals tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_users DROP u_comanager");
+    ttExecute("ALTER TABLE tt_tasks DROP a_manager_id");
+    ttExecute("ALTER TABLE tt_projects DROP p_manager_id");
+    ttExecute("ALTER TABLE tt_users DROP u_manager_id");
+    ttExecute("ALTER TABLE activity_bind DROP ab_id");
+    ttExecute("RENAME TABLE activity_bind TO tt_project_task_binds");
+    ttExecute("ALTER TABLE tt_project_task_binds CHANGE ab_id_p project_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_project_task_binds CHANGE ab_id_a task_id int(11) NOT NULL");
+    ttExecute("RENAME TABLE user_bind TO tt_user_project_binds");
+    ttExecute("ALTER TABLE tt_user_project_binds CHANGE ub_rate rate float(6,2) NOT NULL default '0.00'");
+    ttExecute("ALTER TABLE tt_user_project_binds CHANGE ub_id_p project_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_user_project_binds CHANGE ub_id_u user_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_user_project_binds CHANGE ub_id id int(11) NOT NULL auto_increment");
+    ttExecute("CREATE TABLE `tt_client_project_binds` (`client_id` int(11) NOT NULL, `project_id` int(11) NOT NULL)");
+    ttExecute("ALTER TABLE tt_user_project_binds MODIFY rate float(6,2) default '0.00'");
+    ttExecute("ALTER TABLE tt_clients MODIFY tax float(6,2) default '0.00'");
+    ttExecute("RENAME TABLE activity_log TO tt_log");
+    ttExecute("ALTER TABLE tt_log CHANGE al_timestamp timestamp timestamp NOT NULL");
+    ttExecute("ALTER TABLE tt_log CHANGE al_user_id user_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_log CHANGE al_date date date NOT NULL");
+    ttExecute("drop index al_date_idx on tt_log");
+    ttExecute("create index date_idx on tt_log(date)");
+    ttExecute("ALTER TABLE tt_log CHANGE al_from start time default NULL");
+    ttExecute("ALTER TABLE tt_log CHANGE al_duration duration time default NULL");
+    ttExecute("ALTER TABLE tt_log CHANGE al_project_id project_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_log MODIFY project_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_log CHANGE al_activity_id task_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_log CHANGE al_comment comment text");
+    ttExecute("ALTER TABLE tt_log CHANGE al_billable billable tinyint(4) default '0'");
+    ttExecute("drop index al_user_id_idx on tt_log");
+    ttExecute("drop index al_project_id_idx on tt_log");
+    ttExecute("drop index al_activity_id_idx on tt_log");
+    ttExecute("create index user_idx on tt_log(user_id)");
+    ttExecute("create index project_idx on tt_log(project_id)");
+    ttExecute("create index task_idx on tt_log(task_id)");
+    ttExecute("ALTER TABLE tt_custom_field_log CHANGE al_id log_id bigint NOT NULL");
+    ttExecute("RENAME TABLE sysconfig TO tt_config");
+    ttExecute("ALTER TABLE tt_config DROP sysc_id");
+    ttExecute("ALTER TABLE tt_config CHANGE sysc_id_u user_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_config CHANGE sysc_name param_name varchar(32) NOT NULL");
+    ttExecute("ALTER TABLE tt_config CHANGE sysc_value param_value varchar(80) default NULL");
+    ttExecute("create unique index param_idx on tt_config(user_id, param_name)");
+    ttExecute("ALTER TABLE tt_log ADD COLUMN invoice_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_projects ADD COLUMN description varchar(255) default NULL");
+    ttExecute("CREATE TABLE `tt_invoices` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `number` varchar(20) default NULL, `client_name` varchar(255) default NULL, `client_addr` varchar(255) default NULL, `comment` varchar(255) default NULL, `tax` float(6,2) default '0.00', `discount` float(6,2) default '0.00', PRIMARY KEY (`id`))");
+    ttExecute("ALTER TABLE tt_invoices drop number");
+    ttExecute("ALTER TABLE tt_invoices drop client_name");
+    ttExecute("ALTER TABLE tt_invoices drop client_addr");
+    ttExecute("ALTER TABLE tt_invoices drop comment");
+    ttExecute("ALTER TABLE tt_invoices drop tax");
+    ttExecute("ALTER TABLE tt_invoices ADD COLUMN name varchar(80) NOT NULL");
+    ttExecute("ALTER TABLE tt_invoices ADD COLUMN client_id int(11) NOT NULL");
+    ttExecute("ALTER TABLE tt_invoices ADD COLUMN start_date date NOT NULL");
+    ttExecute("ALTER TABLE tt_invoices ADD COLUMN end_date date NOT NULL");
+    ttExecute("create unique index name_idx on tt_invoices(team_id, name)");
+    ttExecute("drop index ub_id_u on tt_user_project_binds");
+    ttExecute("create unique index bind_idx on tt_user_project_binds(user_id, project_id)");
+    ttExecute("create index client_idx on tt_log(client_id)");
+    ttExecute("create index invoice_idx on tt_log(invoice_id)");
   }
 
   if ($_POST["convert1579to1600"]) {
-    setChange("ALTER TABLE tt_invoices ADD COLUMN date date NOT NULL");
-    setChange("ALTER TABLE tt_teams ADD COLUMN custom_logo tinyint(4) default '0'");
-    setChange("ALTER TABLE tt_tasks ADD COLUMN description varchar(255) default NULL");
-    setChange("ALTER TABLE tt_projects MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
-    setChange("ALTER TABLE tt_users MODIFY login varchar(50) COLLATE utf8_bin NOT NULL");
-    setChange("ALTER TABLE tt_tasks MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
-    setChange("ALTER TABLE tt_invoices MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
-    setChange("ALTER TABLE tt_clients MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
-    setChange("ALTER TABLE tt_clients ADD COLUMN projects text default NULL");
-    setChange("ALTER TABLE tt_custom_field_log ADD COLUMN option_id int(11) default NULL");
-    setChange("ALTER TABLE tt_teams ADD COLUMN tracking_mode smallint(2) NOT NULL DEFAULT '2'");
-    setChange("ALTER TABLE tt_teams ADD COLUMN record_type smallint(2) NOT NULL DEFAULT '0'");
-    setChange("ALTER TABLE tt_invoices DROP start_date");
-    setChange("ALTER TABLE tt_invoices DROP end_date");
+    ttExecute("ALTER TABLE tt_invoices ADD COLUMN date date NOT NULL");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN custom_logo tinyint(4) default '0'");
+    ttExecute("ALTER TABLE tt_tasks ADD COLUMN description varchar(255) default NULL");
+    ttExecute("ALTER TABLE tt_projects MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
+    ttExecute("ALTER TABLE tt_users MODIFY login varchar(50) COLLATE utf8_bin NOT NULL");
+    ttExecute("ALTER TABLE tt_tasks MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
+    ttExecute("ALTER TABLE tt_invoices MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
+    ttExecute("ALTER TABLE tt_clients MODIFY name varchar(80) COLLATE utf8_bin NOT NULL");
+    ttExecute("ALTER TABLE tt_clients ADD COLUMN projects text default NULL");
+    ttExecute("ALTER TABLE tt_custom_field_log ADD COLUMN option_id int(11) default NULL");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN tracking_mode smallint(2) NOT NULL DEFAULT '2'");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN record_type smallint(2) NOT NULL DEFAULT '0'");
+    ttExecute("ALTER TABLE tt_invoices DROP start_date");
+    ttExecute("ALTER TABLE tt_invoices DROP end_date");
   }
 
   // The update_clients function updates projects field in tt_clients table.
@@ -677,93 +677,93 @@ function setChange($sql) {
   }
 
   if ($_POST["convert1600to11400"]) {
-    setChange("DROP TABLE IF EXISTS tt_invoice_headers");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL");
-    setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY  (`id`))");
-    setChange("create index date_idx on tt_expense_items(date)");
-    setChange("create index user_idx on tt_expense_items(user_id)");
-    setChange("create index client_idx on tt_expense_items(client_id)");
-    setChange("create index project_idx on tt_expense_items(project_id)");
-    setChange("create index invoice_idx on tt_expense_items(invoice_id)");
-    setChange("ALTER TABLE tt_fav_reports DROP sort_by");
-    setChange("ALTER TABLE tt_fav_reports DROP show_empty_days");
-    setChange("ALTER TABLE tt_invoices DROP discount");
-    setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL");
-    setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL");
-    setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))");
-    setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL");
-    setChange("create index client_idx on tt_client_project_binds(client_id)");
-    setChange("create index project_idx on tt_client_project_binds(project_id)");
-    setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
-    setChange("DROP INDEX name_idx on tt_invoices");
-    setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
-    setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
-    setChange("ALTER TABLE tt_teams DROP locktime");
-    setChange("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))");
-    setChange("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE");
-    setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
-    setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
-    setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL");
-    setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
-    setChange("CREATE TABLE `tt_predefined_expenses` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', PRIMARY KEY  (`id`))");
-    setChange("ALTER TABLE `tt_teams` ADD `task_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
-    setChange("ALTER TABLE `tt_teams` ADD `project_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
-    setChange("ALTER TABLE `tt_cron` ADD `report_condition` varchar(255) default NULL AFTER `email`");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `status` tinyint(4) default '1'");
-    setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`");
-    setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`");
-    setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");
-    setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
+    ttExecute("DROP TABLE IF EXISTS tt_invoice_headers");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL");
+    ttExecute("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY  (`id`))");
+    ttExecute("create index date_idx on tt_expense_items(date)");
+    ttExecute("create index user_idx on tt_expense_items(user_id)");
+    ttExecute("create index client_idx on tt_expense_items(client_id)");
+    ttExecute("create index project_idx on tt_expense_items(project_id)");
+    ttExecute("create index invoice_idx on tt_expense_items(invoice_id)");
+    ttExecute("ALTER TABLE tt_fav_reports DROP sort_by");
+    ttExecute("ALTER TABLE tt_fav_reports DROP show_empty_days");
+    ttExecute("ALTER TABLE tt_invoices DROP discount");
+    ttExecute("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL");
+    ttExecute("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))");
+    ttExecute("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL");
+    ttExecute("create index client_idx on tt_client_project_binds(client_id)");
+    ttExecute("create index project_idx on tt_client_project_binds(project_id)");
+    ttExecute("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'");
+    ttExecute("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
+    ttExecute("DROP INDEX name_idx on tt_invoices");
+    ttExecute("create unique index name_idx on tt_invoices(team_id, name, status)");
+    ttExecute("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
+    ttExecute("ALTER TABLE tt_teams DROP locktime");
+    ttExecute("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))");
+    ttExecute("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE");
+    ttExecute("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
+    ttExecute("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
+    ttExecute("ALTER TABLE tt_expense_items modify `name` text NOT NULL");
+    ttExecute("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
+    ttExecute("CREATE TABLE `tt_predefined_expenses` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', PRIMARY KEY  (`id`))");
+    ttExecute("ALTER TABLE `tt_teams` ADD `task_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `project_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
+    ttExecute("ALTER TABLE `tt_cron` ADD `report_condition` varchar(255) default NULL AFTER `email`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `status` tinyint(4) default '1'");
+    ttExecute("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`");
+    ttExecute("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`");
+    ttExecute("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");
+    ttExecute("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
   }
 
   if ($_POST["convert11400to11744"]) {
-    setChange("ALTER TABLE `tt_teams` DROP `address`");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `show_paid` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_invoice`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `paid` tinyint(4) NULL default '0' AFTER `invoice_id`");
-    setChange("ALTER TABLE `tt_monthly_quotas` MODIFY `quota` decimal(5,2) NOT NULL");
-    setChange("ALTER TABLE `tt_teams` MODIFY `workday_hours` decimal(5,2) DEFAULT '8.00'");
-    setChange("ALTER TABLE `tt_teams` ADD `config` text default NULL AFTER `custom_logo`");
-    setChange("ALTER TABLE `tt_monthly_quotas` ADD `minutes` int(11) DEFAULT NULL");
-    setChange("ALTER TABLE `tt_teams` ADD `workday_minutes` smallint(4) DEFAULT '480' AFTER `workday_hours`");
-    setChange("UPDATE `tt_teams` SET `workday_minutes` = 60 * `workday_hours`");
-    setChange("ALTER TABLE `tt_teams` DROP `workday_hours`");
-    setChange("UPDATE `tt_monthly_quotas` SET `minutes` = 60 * `quota`");
-    setChange("ALTER TABLE `tt_monthly_quotas` DROP `quota`");
-    setChange("ALTER TABLE `tt_teams` DROP `uncompleted_indicators`");
-    setChange("ALTER TABLE `tt_users` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
-    setChange("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
-    setChange("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
-    setChange("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
-    setChange("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
-    setChange("create unique index role_idx on tt_roles(team_id, rank, status)");
-    setChange("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
-    setChange("ALTER TABLE `tt_users` ADD `role_id` int(11) default NULL AFTER `role`");
-    setChange("CREATE TABLE `tt_site_config` (`param_name` varchar(32) NOT NULL, `param_value` text default NULL, `created` datetime default NULL, `updated` datetime default NULL, PRIMARY KEY (`param_name`))");
-    setChange("INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.34', now())");
-    setChange("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site')");
-    setChange("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'data_entry,view_own_data,manage_own_settings,view_users,on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups')");
-    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.35' where param_name = 'version_db'");
-    setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set role_id = (select id from tt_roles where rank = 1024) where role = 1024");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = 'data_entry,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,on_behalf_data_entry,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups' where team_id = 0 and rank = 512");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_data', 'view_own_reports,view_own_charts') where team_id > 0");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_data', 'view_reports,view_charts') where team_id > 0");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_charts,manage_own_settings', 'view_own_charts,view_own_invoices,manage_own_settings') where team_id > 0 and rank = 16");
-    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.40' where param_name = 'version_db'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'on_behalf_data_entry', 'track_time,track_expenses')");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'data_entry', 'track_own_time,track_own_expenses')");
-    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.43' where param_name = 'version_db'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.43') set rights = replace(rights, 'override_punch_mode,swap_roles', 'override_punch_mode,override_date_lock,swap_roles')");
-    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.44' where param_name = 'version_db'");
+    ttExecute("ALTER TABLE `tt_teams` DROP `address`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_paid` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_invoice`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `paid` tinyint(4) NULL default '0' AFTER `invoice_id`");
+    ttExecute("ALTER TABLE `tt_monthly_quotas` MODIFY `quota` decimal(5,2) NOT NULL");
+    ttExecute("ALTER TABLE `tt_teams` MODIFY `workday_hours` decimal(5,2) DEFAULT '8.00'");
+    ttExecute("ALTER TABLE `tt_teams` ADD `config` text default NULL AFTER `custom_logo`");
+    ttExecute("ALTER TABLE `tt_monthly_quotas` ADD `minutes` int(11) DEFAULT NULL");
+    ttExecute("ALTER TABLE `tt_teams` ADD `workday_minutes` smallint(4) DEFAULT '480' AFTER `workday_hours`");
+    ttExecute("UPDATE `tt_teams` SET `workday_minutes` = 60 * `workday_hours`");
+    ttExecute("ALTER TABLE `tt_teams` DROP `workday_hours`");
+    ttExecute("UPDATE `tt_monthly_quotas` SET `minutes` = 60 * `quota`");
+    ttExecute("ALTER TABLE `tt_monthly_quotas` DROP `quota`");
+    ttExecute("ALTER TABLE `tt_teams` DROP `uncompleted_indicators`");
+    ttExecute("ALTER TABLE `tt_users` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    ttExecute("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    ttExecute("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    ttExecute("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    ttExecute("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
+    ttExecute("create unique index role_idx on tt_roles(team_id, rank, status)");
+    ttExecute("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
+    ttExecute("ALTER TABLE `tt_users` ADD `role_id` int(11) default NULL AFTER `role`");
+    ttExecute("CREATE TABLE `tt_site_config` (`param_name` varchar(32) NOT NULL, `param_value` text default NULL, `created` datetime default NULL, `updated` datetime default NULL, PRIMARY KEY (`param_name`))");
+    ttExecute("INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.34', now())");
+    ttExecute("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site')");
+    ttExecute("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'data_entry,view_own_data,manage_own_settings,view_users,on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups')");
+    ttExecute("UPDATE `tt_site_config` SET `param_value` = '1.17.35' where param_name = 'version_db'");
+    ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set role_id = (select id from tt_roles where rank = 1024) where role = 1024");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = 'data_entry,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,on_behalf_data_entry,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups' where team_id = 0 and rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_data', 'view_own_reports,view_own_charts') where team_id > 0");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_data', 'view_reports,view_charts') where team_id > 0");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_charts,manage_own_settings', 'view_own_charts,view_own_invoices,manage_own_settings') where team_id > 0 and rank = 16");
+    ttExecute("UPDATE `tt_site_config` SET `param_value` = '1.17.40' where param_name = 'version_db'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'on_behalf_data_entry', 'track_time,track_expenses')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'data_entry', 'track_own_time,track_own_expenses')");
+    ttExecute("UPDATE `tt_site_config` SET `param_value` = '1.17.43' where param_name = 'version_db'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.43') set rights = replace(rights, 'override_punch_mode,swap_roles', 'override_punch_mode,override_date_lock,swap_roles')");
+    ttExecute("UPDATE `tt_site_config` SET `param_value` = '1.17.44' where param_name = 'version_db'");
   }
 
   // The update_role_id function assigns a role_id to users, who don't have it.
@@ -807,107 +807,107 @@ function setChange($sql) {
   }
 
   if ($_POST["convert11744to11797"]) {
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
-    setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.49' where param_name = 'version_db' and param_value = '1.17.48'");
-    setChange("ALTER TABLE `tt_users` drop role");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.50' where param_name = 'version_db' and param_value = '1.17.49'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.50') set rights = replace(rights, 'override_date_lock,swap_roles', 'override_date_lock,override_own_date_lock,swap_roles')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.51' where param_name = 'version_db' and param_value = '1.17.50'");
-    setChange("ALTER TABLE `tt_users` ADD `created` datetime default NULL AFTER `email`");
-    setChange("ALTER TABLE `tt_users` ADD `created_ip` varchar(45) default NULL AFTER `created`");
-    setChange("ALTER TABLE `tt_users` ADD `created_by` int(11) default NULL AFTER `created_ip`");
-    setChange("ALTER TABLE `tt_users` ADD `modified` datetime default NULL AFTER `created_by`");
-    setChange("ALTER TABLE `tt_users` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
-    setChange("ALTER TABLE `tt_users` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
-    setChange("ALTER TABLE `tt_users` ADD `accessed` datetime default NULL AFTER `modified_by`");
-    setChange("ALTER TABLE `tt_users` ADD `accessed_ip` varchar(45) default NULL AFTER `accessed`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.52' where param_name = 'version_db' and param_value = '1.17.51'");
-    setChange("ALTER TABLE `tt_site_config` CHANGE `updated` `modified` datetime default NULL");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.53', modified = now() where param_name = 'version_db' and param_value = '1.17.52'");
-    setChange("ALTER TABLE `tt_log` ADD `created` datetime default NULL AFTER `paid`");
-    setChange("ALTER TABLE `tt_log` ADD `created_ip` varchar(45) default NULL AFTER `created`");
-    setChange("ALTER TABLE `tt_log` ADD `created_by` int(11) default NULL AFTER `created_ip`");
-    setChange("ALTER TABLE `tt_log` ADD `modified` datetime default NULL AFTER `created_by`");
-    setChange("ALTER TABLE `tt_log` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
-    setChange("ALTER TABLE `tt_log` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.56', modified = now() where param_name = 'version_db' and param_value = '1.17.53'");
-    setChange("ALTER TABLE `tt_expense_items` ADD `created` datetime default NULL AFTER `paid`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `created_ip` varchar(45) default NULL AFTER `created`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `created_by` int(11) default NULL AFTER `created_ip`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `modified` datetime default NULL AFTER `created_by`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.59', modified = now() where param_name = 'version_db' and param_value = '1.17.56'");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `show_ip` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_paid`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.61', modified = now() where param_name = 'version_db' and param_value = '1.17.59'");
-    setChange("update `tt_log` l inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.61') set l.created = l.timestamp where l.created is null");
-    setChange("ALTER TABLE `tt_log` drop `timestamp`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.64', modified = now() where param_name = 'version_db' and param_value = '1.17.61'");
-    setChange("ALTER TABLE `tt_teams` ADD `created` datetime default NULL AFTER `config`");
-    setChange("ALTER TABLE `tt_teams` ADD `created_ip` varchar(45) default NULL AFTER `created`");
-    setChange("ALTER TABLE `tt_teams` ADD `created_by` int(11) default NULL AFTER `created_ip`");
-    setChange("ALTER TABLE `tt_teams` ADD `modified` datetime default NULL AFTER `created_by`");
-    setChange("ALTER TABLE `tt_teams` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
-    setChange("ALTER TABLE `tt_teams` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'");
-    setChange("update `tt_teams` t inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set t.created = t.timestamp where t.created is null");
-    setChange("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set u.created = u.timestamp where u.created is null");
-    setChange("ALTER TABLE `tt_teams` drop `timestamp`");
-    setChange("ALTER TABLE `tt_users` drop `timestamp`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.66', modified = now() where param_name = 'version_db' and param_value = '1.17.65'");
-    setChange("ALTER TABLE `tt_tmp_refs` ADD `created` datetime default NULL AFTER `timestamp`");
-    setChange("ALTER TABLE `tt_tmp_refs` drop `timestamp`");
-    setChange("delete from `tt_tmp_refs`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.67', modified = now() where param_name = 'version_db' and param_value = '1.17.66'");
-    setChange("ALTER TABLE `tt_teams` ADD `parent_id` int(11) default NULL AFTER `id`");
-    setChange("ALTER TABLE `tt_teams` ADD `org_id` int(11) default NULL AFTER `parent_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.76', modified = now() where param_name = 'version_db' and param_value = '1.17.67'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.76') set rights = replace(rights, ',manage_users', ',manage_own_account,manage_users')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.77', modified = now() where param_name = 'version_db' and param_value = '1.17.76'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.77') set rights = replace(rights, 'manage_own_settings,view_users', 'manage_own_settings,view_projects,view_users')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.78', modified = now() where param_name = 'version_db' and param_value = '1.17.77'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.78') set rights = replace(rights, 'manage_own_settings,view_projects,view_users', 'view_own_projects,manage_own_settings,view_users')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.79', modified = now() where param_name = 'version_db' and param_value = '1.17.78'");
-    setChange("RENAME TABLE `tt_teams` TO `tt_groups`");
-    setChange("ALTER TABLE `tt_monthly_quotas` DROP FOREIGN KEY FK_TT_TEAM_CONSTRAING");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.80', modified = now() where param_name = 'version_db' and param_value = '1.17.79'");
-    setChange("ALTER TABLE `tt_roles` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_users` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_projects` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_tasks` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_invoices` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_cron` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_clients` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_custom_fields` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_predefined_expenses` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("ALTER TABLE `tt_monthly_quotas` CHANGE `team_id` `group_id` int(11) NOT NULL");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.81', modified = now() where param_name = 'version_db' and param_value = '1.17.80'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.81') set rights = replace(rights, ',manage_invoices', ',manage_invoices,view_all_reports')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.82', modified = now() where param_name = 'version_db' and param_value = '1.17.81'");
-    setChange("ALTER TABLE `tt_groups` ADD `allow_ip` varchar(255) default NULL AFTER `bcc_email`");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.82') set rights = replace(rights, 'manage_invoices,view_all_reports', 'manage_invoices,override_allow_ip,view_all_reports')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.83', modified = now() where param_name = 'version_db' and param_value = '1.17.82'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.83') set rights = replace(rights, 'view_own_projects,manage_own_settings', 'view_own_projects,view_own_tasks,manage_own_settings')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.84', modified = now() where param_name = 'version_db' and param_value = '1.17.83'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.84') set rights = replace(rights, 'view_charts,override_punch_mode', 'view_charts,view_own_clients,override_punch_mode')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.85', modified = now() where param_name = 'version_db' and param_value = '1.17.84'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'override_allow_ip,view_all_reports', 'override_allow_ip,manage_basic_settings,view_all_reports')");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'manage_features,manage_basic_setting,manage_advanced_settings', 'manage_features,manage_advanced_settings')");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.86', modified = now() where param_name = 'version_db' and param_value = '1.17.85'");
-    setChange("ALTER TABLE `tt_groups` ADD `password_complexity` varchar(64) default NULL AFTER `allow_ip`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
-    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'");
-    setChange("ALTER TABLE `tt_log` ADD `group_id` int(11) default NULL AFTER `user_id`");
-    setChange("ALTER TABLE `tt_expense_items` ADD `group_id` int(11) default NULL AFTER `user_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.96', modified = now() where param_name = 'version_db' and param_value = '1.17.92'");
-    setChange("create index group_idx on tt_log(group_id)");
-    setChange("create index group_idx on tt_expense_items(group_id)");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.17.97', modified = now() where param_name = 'version_db' and param_value = '1.17.96'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
+    ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.49' where param_name = 'version_db' and param_value = '1.17.48'");
+    ttExecute("ALTER TABLE `tt_users` drop role");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.50' where param_name = 'version_db' and param_value = '1.17.49'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.50') set rights = replace(rights, 'override_date_lock,swap_roles', 'override_date_lock,override_own_date_lock,swap_roles')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.51' where param_name = 'version_db' and param_value = '1.17.50'");
+    ttExecute("ALTER TABLE `tt_users` ADD `created` datetime default NULL AFTER `email`");
+    ttExecute("ALTER TABLE `tt_users` ADD `created_ip` varchar(45) default NULL AFTER `created`");
+    ttExecute("ALTER TABLE `tt_users` ADD `created_by` int(11) default NULL AFTER `created_ip`");
+    ttExecute("ALTER TABLE `tt_users` ADD `modified` datetime default NULL AFTER `created_by`");
+    ttExecute("ALTER TABLE `tt_users` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
+    ttExecute("ALTER TABLE `tt_users` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
+    ttExecute("ALTER TABLE `tt_users` ADD `accessed` datetime default NULL AFTER `modified_by`");
+    ttExecute("ALTER TABLE `tt_users` ADD `accessed_ip` varchar(45) default NULL AFTER `accessed`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.52' where param_name = 'version_db' and param_value = '1.17.51'");
+    ttExecute("ALTER TABLE `tt_site_config` CHANGE `updated` `modified` datetime default NULL");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.53', modified = now() where param_name = 'version_db' and param_value = '1.17.52'");
+    ttExecute("ALTER TABLE `tt_log` ADD `created` datetime default NULL AFTER `paid`");
+    ttExecute("ALTER TABLE `tt_log` ADD `created_ip` varchar(45) default NULL AFTER `created`");
+    ttExecute("ALTER TABLE `tt_log` ADD `created_by` int(11) default NULL AFTER `created_ip`");
+    ttExecute("ALTER TABLE `tt_log` ADD `modified` datetime default NULL AFTER `created_by`");
+    ttExecute("ALTER TABLE `tt_log` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
+    ttExecute("ALTER TABLE `tt_log` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.56', modified = now() where param_name = 'version_db' and param_value = '1.17.53'");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `created` datetime default NULL AFTER `paid`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `created_ip` varchar(45) default NULL AFTER `created`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `created_by` int(11) default NULL AFTER `created_ip`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `modified` datetime default NULL AFTER `created_by`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.59', modified = now() where param_name = 'version_db' and param_value = '1.17.56'");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_ip` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_paid`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.61', modified = now() where param_name = 'version_db' and param_value = '1.17.59'");
+    ttExecute("update `tt_log` l inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.61') set l.created = l.timestamp where l.created is null");
+    ttExecute("ALTER TABLE `tt_log` drop `timestamp`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.64', modified = now() where param_name = 'version_db' and param_value = '1.17.61'");
+    ttExecute("ALTER TABLE `tt_teams` ADD `created` datetime default NULL AFTER `config`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `created_ip` varchar(45) default NULL AFTER `created`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `created_by` int(11) default NULL AFTER `created_ip`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `modified` datetime default NULL AFTER `created_by`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `modified_ip` varchar(45) default NULL AFTER `modified`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `modified_by` int(11) default NULL AFTER `modified_ip`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'");
+    ttExecute("update `tt_teams` t inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set t.created = t.timestamp where t.created is null");
+    ttExecute("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set u.created = u.timestamp where u.created is null");
+    ttExecute("ALTER TABLE `tt_teams` drop `timestamp`");
+    ttExecute("ALTER TABLE `tt_users` drop `timestamp`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.66', modified = now() where param_name = 'version_db' and param_value = '1.17.65'");
+    ttExecute("ALTER TABLE `tt_tmp_refs` ADD `created` datetime default NULL AFTER `timestamp`");
+    ttExecute("ALTER TABLE `tt_tmp_refs` drop `timestamp`");
+    ttExecute("delete from `tt_tmp_refs`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.67', modified = now() where param_name = 'version_db' and param_value = '1.17.66'");
+    ttExecute("ALTER TABLE `tt_teams` ADD `parent_id` int(11) default NULL AFTER `id`");
+    ttExecute("ALTER TABLE `tt_teams` ADD `org_id` int(11) default NULL AFTER `parent_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.76', modified = now() where param_name = 'version_db' and param_value = '1.17.67'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.76') set rights = replace(rights, ',manage_users', ',manage_own_account,manage_users')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.77', modified = now() where param_name = 'version_db' and param_value = '1.17.76'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.77') set rights = replace(rights, 'manage_own_settings,view_users', 'manage_own_settings,view_projects,view_users')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.78', modified = now() where param_name = 'version_db' and param_value = '1.17.77'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.78') set rights = replace(rights, 'manage_own_settings,view_projects,view_users', 'view_own_projects,manage_own_settings,view_users')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.79', modified = now() where param_name = 'version_db' and param_value = '1.17.78'");
+    ttExecute("RENAME TABLE `tt_teams` TO `tt_groups`");
+    ttExecute("ALTER TABLE `tt_monthly_quotas` DROP FOREIGN KEY FK_TT_TEAM_CONSTRAING");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.80', modified = now() where param_name = 'version_db' and param_value = '1.17.79'");
+    ttExecute("ALTER TABLE `tt_roles` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_users` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_projects` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_tasks` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_invoices` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_cron` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_clients` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_custom_fields` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_predefined_expenses` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("ALTER TABLE `tt_monthly_quotas` CHANGE `team_id` `group_id` int(11) NOT NULL");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.81', modified = now() where param_name = 'version_db' and param_value = '1.17.80'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.81') set rights = replace(rights, ',manage_invoices', ',manage_invoices,view_all_reports')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.82', modified = now() where param_name = 'version_db' and param_value = '1.17.81'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `allow_ip` varchar(255) default NULL AFTER `bcc_email`");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.82') set rights = replace(rights, 'manage_invoices,view_all_reports', 'manage_invoices,override_allow_ip,view_all_reports')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.83', modified = now() where param_name = 'version_db' and param_value = '1.17.82'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.83') set rights = replace(rights, 'view_own_projects,manage_own_settings', 'view_own_projects,view_own_tasks,manage_own_settings')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.84', modified = now() where param_name = 'version_db' and param_value = '1.17.83'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.84') set rights = replace(rights, 'view_charts,override_punch_mode', 'view_charts,view_own_clients,override_punch_mode')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.85', modified = now() where param_name = 'version_db' and param_value = '1.17.84'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'override_allow_ip,view_all_reports', 'override_allow_ip,manage_basic_settings,view_all_reports')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.85') set rights = replace(rights, 'manage_features,manage_basic_setting,manage_advanced_settings', 'manage_features,manage_advanced_settings')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.86', modified = now() where param_name = 'version_db' and param_value = '1.17.85'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `password_complexity` varchar(64) default NULL AFTER `allow_ip`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'");
+    ttExecute("ALTER TABLE `tt_log` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.96', modified = now() where param_name = 'version_db' and param_value = '1.17.92'");
+    ttExecute("create index group_idx on tt_log(group_id)");
+    ttExecute("create index group_idx on tt_expense_items(group_id)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.97', modified = now() where param_name = 'version_db' and param_value = '1.17.96'");
   }
 
   // The update_group_id function updates group_id field in tt_log and tt_expense_items tables.
@@ -958,88 +958,88 @@ function setChange($sql) {
   }
 
   if ($_POST["convert11797to11826"]) {
-    setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
-    setChange("create index log_idx on tt_custom_field_log(log_id)");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.05', modified = now() where param_name = 'version_db' and param_value = '1.18.00'");
-    setChange("UPDATE `tt_groups` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.05') set org_id = id where org_id is null");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.06', modified = now() where param_name = 'version_db' and param_value = '1.18.05'");
-    setChange("ALTER TABLE `tt_users` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.06') set org_id = group_id where org_id is null");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.07', modified = now() where param_name = 'version_db' and param_value = '1.18.06'");
-    setChange("ALTER TABLE `tt_roles` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.07') set org_id = group_id where org_id is null");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.08', modified = now() where param_name = 'version_db' and param_value = '1.18.07'");
-    setChange("ALTER TABLE `tt_clients` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.09', modified = now() where param_name = 'version_db' and param_value = '1.18.08'");
-    setChange("UPDATE `tt_clients` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.09') set org_id = group_id where org_id is null");
-    setChange("ALTER TABLE `tt_projects` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("ALTER TABLE `tt_tasks` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'");
-    setChange("UPDATE `tt_projects` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
-    setChange("UPDATE `tt_tasks` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
-    setChange("ALTER TABLE `tt_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("ALTER TABLE `tt_invoices` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.11', modified = now() where param_name = 'version_db' and param_value = '1.18.10'");
-    setChange("UPDATE `tt_log` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
-    setChange("UPDATE `tt_invoices` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
-    setChange("ALTER TABLE `tt_user_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
-    setChange("ALTER TABLE `tt_user_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("ALTER TABLE `tt_project_task_binds` ADD `group_id` int(11) default NULL AFTER `task_id`");
-    setChange("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.13', modified = now() where param_name = 'version_db' and param_value = '1.18.12'");
-    setChange("ALTER TABLE `tt_users` MODIFY `login` varchar(50) COLLATE utf8mb4_bin NOT NULL");
-    setChange("ALTER TABLE `tt_projects` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
-    setChange("ALTER TABLE `tt_tasks` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
-    setChange("ALTER TABLE `tt_invoices` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
-    setChange("ALTER TABLE `tt_clients` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.14', modified = now() where param_name = 'version_db' and param_value = '1.18.13'");
-    setChange("ALTER TABLE `tt_monthly_quotas` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_monthly_quotas` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.14') set org_id = group_id where org_id is null");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.15', modified = now() where param_name = 'version_db' and param_value = '1.18.14'");
-    setChange("ALTER TABLE `tt_predefined_expenses` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.16', modified = now() where param_name = 'version_db' and param_value = '1.18.15'");
-    setChange("UPDATE `tt_predefined_expenses` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.16') set org_id = group_id where org_id is null");
-    setChange("ALTER TABLE `tt_expense_items` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.17', modified = now() where param_name = 'version_db' and param_value = '1.18.16'");
-    setChange("UPDATE `tt_expense_items` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') set org_id = group_id where org_id is null");
-    setChange("update `tt_user_project_binds` upb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_users` u on u.id = upb.user_id set upb.group_id = u.group_id, upb.org_id = u.org_id where upb.org_id is null");
-    setChange("update `tt_project_task_binds` ptb inner join tt_site_config sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_projects` p on p.id = ptb.project_id set ptb.group_id = p.group_id, ptb.org_id = p.org_id where ptb.org_id is null");
-    setChange("create unique index project_task_idx on tt_project_task_binds(project_id, task_id)");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.18', modified = now() where param_name = 'version_db' and param_value = '1.18.17'");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `group_id` int(11) default NULL AFTER `user_id`");
-    setChange("ALTER TABLE `tt_fav_reports` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.19', modified = now() where param_name = 'version_db' and param_value = '1.18.18'");
-    setChange("update `tt_fav_reports` fr inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.19') inner join `tt_users` u on u.id = fr.user_id set fr.group_id = u.group_id, fr.org_id = u.org_id where fr.org_id is null");
-    setChange("ALTER TABLE `tt_cron` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.20', modified = now() where param_name = 'version_db' and param_value = '1.18.19'");
-    setChange("UPDATE `tt_cron` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') set org_id = group_id where org_id is null");
-    setChange("ALTER TABLE `tt_client_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
-    setChange("ALTER TABLE `tt_client_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.21', modified = now() where param_name = 'version_db' and param_value = '1.18.20'");
-    setChange("create unique index client_project_idx on tt_client_project_binds(client_id, project_id)");
-    setChange("ALTER TABLE `tt_config` ADD `group_id` int(11) default NULL AFTER `user_id`");
-    setChange("ALTER TABLE `tt_config` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.22', modified = now() where param_name = 'version_db' and param_value = '1.18.21'");
-    setChange("update `tt_config` c inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.22') inner join `tt_users` u on u.id = c.user_id set c.group_id = u.group_id, c.org_id = u.org_id where c.org_id is null");
-    setChange("ALTER TABLE `tt_custom_fields` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("ALTER TABLE `tt_custom_field_options` ADD `group_id` int(11) default NULL AFTER `id`");
-    setChange("ALTER TABLE `tt_custom_field_options` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("ALTER TABLE `tt_custom_field_log` ADD `group_id` int(11) default NULL AFTER `id`");
-    setChange("ALTER TABLE `tt_custom_field_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
-    setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
-    setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
-    setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
-    setChange("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
-    setChange("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
-    setChange("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
-    setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
+    ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
+    ttExecute("create index log_idx on tt_custom_field_log(log_id)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.05', modified = now() where param_name = 'version_db' and param_value = '1.18.00'");
+    ttExecute("UPDATE `tt_groups` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.05') set org_id = id where org_id is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.06', modified = now() where param_name = 'version_db' and param_value = '1.18.05'");
+    ttExecute("ALTER TABLE `tt_users` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.06') set org_id = group_id where org_id is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.07', modified = now() where param_name = 'version_db' and param_value = '1.18.06'");
+    ttExecute("ALTER TABLE `tt_roles` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.07') set org_id = group_id where org_id is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.08', modified = now() where param_name = 'version_db' and param_value = '1.18.07'");
+    ttExecute("ALTER TABLE `tt_clients` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.09', modified = now() where param_name = 'version_db' and param_value = '1.18.08'");
+    ttExecute("UPDATE `tt_clients` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.09') set org_id = group_id where org_id is null");
+    ttExecute("ALTER TABLE `tt_projects` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("ALTER TABLE `tt_tasks` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'");
+    ttExecute("UPDATE `tt_projects` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
+    ttExecute("UPDATE `tt_tasks` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.10') set org_id = group_id where org_id is null");
+    ttExecute("ALTER TABLE `tt_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("ALTER TABLE `tt_invoices` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.11', modified = now() where param_name = 'version_db' and param_value = '1.18.10'");
+    ttExecute("UPDATE `tt_log` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
+    ttExecute("UPDATE `tt_invoices` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null");
+    ttExecute("ALTER TABLE `tt_user_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
+    ttExecute("ALTER TABLE `tt_user_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("ALTER TABLE `tt_project_task_binds` ADD `group_id` int(11) default NULL AFTER `task_id`");
+    ttExecute("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.13', modified = now() where param_name = 'version_db' and param_value = '1.18.12'");
+    ttExecute("ALTER TABLE `tt_users` MODIFY `login` varchar(50) COLLATE utf8mb4_bin NOT NULL");
+    ttExecute("ALTER TABLE `tt_projects` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    ttExecute("ALTER TABLE `tt_tasks` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    ttExecute("ALTER TABLE `tt_invoices` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    ttExecute("ALTER TABLE `tt_clients` MODIFY `name` varchar(80) COLLATE utf8mb4_bin NOT NULL");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.14', modified = now() where param_name = 'version_db' and param_value = '1.18.13'");
+    ttExecute("ALTER TABLE `tt_monthly_quotas` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_monthly_quotas` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.14') set org_id = group_id where org_id is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.15', modified = now() where param_name = 'version_db' and param_value = '1.18.14'");
+    ttExecute("ALTER TABLE `tt_predefined_expenses` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.16', modified = now() where param_name = 'version_db' and param_value = '1.18.15'");
+    ttExecute("UPDATE `tt_predefined_expenses` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.16') set org_id = group_id where org_id is null");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.17', modified = now() where param_name = 'version_db' and param_value = '1.18.16'");
+    ttExecute("UPDATE `tt_expense_items` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') set org_id = group_id where org_id is null");
+    ttExecute("update `tt_user_project_binds` upb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_users` u on u.id = upb.user_id set upb.group_id = u.group_id, upb.org_id = u.org_id where upb.org_id is null");
+    ttExecute("update `tt_project_task_binds` ptb inner join tt_site_config sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.17') inner join `tt_projects` p on p.id = ptb.project_id set ptb.group_id = p.group_id, ptb.org_id = p.org_id where ptb.org_id is null");
+    ttExecute("create unique index project_task_idx on tt_project_task_binds(project_id, task_id)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.18', modified = now() where param_name = 'version_db' and param_value = '1.18.17'");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.19', modified = now() where param_name = 'version_db' and param_value = '1.18.18'");
+    ttExecute("update `tt_fav_reports` fr inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.19') inner join `tt_users` u on u.id = fr.user_id set fr.group_id = u.group_id, fr.org_id = u.org_id where fr.org_id is null");
+    ttExecute("ALTER TABLE `tt_cron` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.20', modified = now() where param_name = 'version_db' and param_value = '1.18.19'");
+    ttExecute("UPDATE `tt_cron` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') set org_id = group_id where org_id is null");
+    ttExecute("ALTER TABLE `tt_client_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`");
+    ttExecute("ALTER TABLE `tt_client_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.20') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.21', modified = now() where param_name = 'version_db' and param_value = '1.18.20'");
+    ttExecute("create unique index client_project_idx on tt_client_project_binds(client_id, project_id)");
+    ttExecute("ALTER TABLE `tt_config` ADD `group_id` int(11) default NULL AFTER `user_id`");
+    ttExecute("ALTER TABLE `tt_config` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.22', modified = now() where param_name = 'version_db' and param_value = '1.18.21'");
+    ttExecute("update `tt_config` c inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.22') inner join `tt_users` u on u.id = c.user_id set c.group_id = u.group_id, c.org_id = u.org_id where c.org_id is null");
+    ttExecute("ALTER TABLE `tt_custom_fields` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("ALTER TABLE `tt_custom_field_options` ADD `group_id` int(11) default NULL AFTER `id`");
+    ttExecute("ALTER TABLE `tt_custom_field_options` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("ALTER TABLE `tt_custom_field_log` ADD `group_id` int(11) default NULL AFTER `id`");
+    ttExecute("ALTER TABLE `tt_custom_field_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
+    ttExecute("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
+    ttExecute("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
+    ttExecute("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
+    ttExecute("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
+    ttExecute("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
+    ttExecute("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
@@ -1054,30 +1054,30 @@ function setChange($sql) {
       $res = ttOrgHelper::deleteOrg($inactive_orgs[$i]);
     }
 
-    setChange("OPTIMIZE TABLE tt_client_project_binds");
-    setChange("OPTIMIZE TABLE tt_clients");
-    setChange("OPTIMIZE TABLE tt_config");
-    setChange("OPTIMIZE TABLE tt_cron");
-    setChange("OPTIMIZE TABLE tt_custom_field_log");
-    setChange("OPTIMIZE TABLE tt_custom_field_options");
-    setChange("OPTIMIZE TABLE tt_custom_fields"); 
-    setChange("OPTIMIZE TABLE tt_expense_items");
-    setChange("OPTIMIZE TABLE tt_fav_reports");
-    setChange("OPTIMIZE TABLE tt_invoices");
-    setChange("OPTIMIZE TABLE tt_log");
-    setChange("OPTIMIZE TABLE tt_monthly_quotas");
-    setChange("OPTIMIZE TABLE tt_predefined_expenses");
-    setChange("OPTIMIZE TABLE tt_project_task_binds");
-    setChange("OPTIMIZE TABLE tt_projects");
-    setChange("OPTIMIZE TABLE tt_tasks");
-    setChange("OPTIMIZE TABLE tt_groups");
-    setChange("OPTIMIZE TABLE tt_tmp_refs");
-    setChange("OPTIMIZE TABLE tt_user_project_binds");
-    setChange("OPTIMIZE TABLE tt_users");
-    setChange("OPTIMIZE TABLE tt_roles");
+    ttExecute("OPTIMIZE TABLE tt_client_project_binds");
+    ttExecute("OPTIMIZE TABLE tt_clients");
+    ttExecute("OPTIMIZE TABLE tt_config");
+    ttExecute("OPTIMIZE TABLE tt_cron");
+    ttExecute("OPTIMIZE TABLE tt_custom_field_log");
+    ttExecute("OPTIMIZE TABLE tt_custom_field_options");
+    ttExecute("OPTIMIZE TABLE tt_custom_fields");
+    ttExecute("OPTIMIZE TABLE tt_expense_items");
+    ttExecute("OPTIMIZE TABLE tt_fav_reports");
+    ttExecute("OPTIMIZE TABLE tt_invoices");
+    ttExecute("OPTIMIZE TABLE tt_log");
+    ttExecute("OPTIMIZE TABLE tt_monthly_quotas");
+    ttExecute("OPTIMIZE TABLE tt_predefined_expenses");
+    ttExecute("OPTIMIZE TABLE tt_project_task_binds");
+    ttExecute("OPTIMIZE TABLE tt_projects");
+    ttExecute("OPTIMIZE TABLE tt_tasks");
+    ttExecute("OPTIMIZE TABLE tt_groups");
+    ttExecute("OPTIMIZE TABLE tt_tmp_refs");
+    ttExecute("OPTIMIZE TABLE tt_user_project_binds");
+    ttExecute("OPTIMIZE TABLE tt_users");
+    ttExecute("OPTIMIZE TABLE tt_roles");
   }
 
-  print "done.<br>\n";
+  print "Done.<br>\n";
 }
 ?>
 <html>

From 03e3d32869aa0791e1d841be69cf5c0c84a5450f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 16:43:13 +0000
Subject: [PATCH 0515/1848] More refactoring for subgroups.

---
 WEB-INF/lib/ttGroup.class.php  |  2 +-
 WEB-INF/lib/ttUser.class.php   |  9 +++--
 WEB-INF/templates/expenses.tpl |  4 +--
 WEB-INF/templates/footer.tpl   |  2 +-
 charts.php                     |  5 +--
 expenses.php                   | 60 +++++++++++++++++++---------------
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index b0c50eef5..bb03845d8 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -97,8 +97,8 @@ function __construct($id, $org_id) {
       */
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
-      /*
       $this->lock_spec = $val['lock_spec'];
+      /*
       $this->workday_minutes = $val['workday_minutes'];
       $this->custom_logo = $val['custom_logo'];
       */
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 548d70ec7..05081c5ab 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -209,6 +209,11 @@ function getPlugins() {
     return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins);
   }
 
+  // getLockSpec returns lock specification for active group.
+  function getLockSpec() {
+    return ($this->behalfGroup ? $this->behalfGroup->lock_spec : $this->lock_spec);
+  }
+
   // getConfig returns config string for active group.
   function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
@@ -329,7 +334,7 @@ function isDateLocked($date)
     if (!$this->isPluginEnabled('lk'))
       return false; // Locking feature is disabled.
 
-    if (!$this->lock_spec)
+    if (!$this->getLockSpec())
       return false; // There is no lock specification.
 
     if (!$this->behalf_id && $this->can('override_own_date_lock'))
@@ -342,7 +347,7 @@ function isDateLocked($date)
     require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
 
     // Calculate the last occurrence of a lock.
-    $last = tdCron::getLastOccurrence($this->lock_spec, time());
+    $last = tdCron::getLastOccurrence($this->getLockSpec(), time());
     $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
     if ($date->before($lockdate))
       return true;
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 8e1ef0a8d..17b8c8fb5 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -117,10 +117,10 @@ function recalculateCost() {
   <tr>
     <td valign="top">
       <table>
-{if $on_behalf_control}
+{if $user_dropdown}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.expensesForm.onBehalfUser.control}</td>
+          <td>{$forms.expensesForm.user.control}</td>
         </tr>
 {/if}
 {if $user->isPluginEnabled('cl')}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d7903e75c..96fdee801 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.29.4590 | 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.29.4591 | 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/charts.php b/charts.php
index adaa8ae52..6329e14f8 100644
--- a/charts.php
+++ b/charts.php
@@ -114,10 +114,11 @@
 
 // User dropdown. Changes the user "on behalf" of whom we are working. 
 if ($user->can('view_charts')) {
+  $rank = $user->getMaxRankForGroup($user->getGroup());
   if ($user->can('view_own_charts'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $chart_form->addInput(array('type'=>'combobox',
diff --git a/expenses.php b/expenses.php
index e459c37c5..fa844a22b 100644
--- a/expenses.php
+++ b/expenses.php
@@ -50,8 +50,26 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+if ($request->isPost() && $request->getParameter('user')) {
+  if (!$user->isUserValid($request->getParameter('user'))) {
+    header('Location: access_denied.php'); // Wrong user id on post.
+    exit();
+  }
+}
 // End of access checks.
 
+// Determine user for which we display this page.
+$userChanged = $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+  // Handle a situation for no users in on behalf group.
+  if ($user->behalfGroup && $user_id == $user->id)
+    $user_id = null;
+}
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -61,8 +79,10 @@
   $cl_date = $selected_date->toString(DB_DATEFORMAT);
 $_SESSION['date'] = $cl_date;
 
+$tracking_mode = $user->getTrackingMode();
+$show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
+
 // Initialize variables.
-$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id']) ? $_SESSION['behalf_id'] : $user->id));
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -74,25 +94,27 @@
 $form = new Form('expensesForm');
 
 if ($user->can('track_expenses')) {
+  $rank = $user->getMaxRankForGroup($user->getGroup());
   if ($user->can('track_own_expenses'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'onBehalfUser',
+      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
+      'name'=>'user',
       'style'=>'width: 250px;',
-      'value'=>$on_behalf_id,
+      'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
-    $smarty->assign('on_behalf_control', 1);
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
   }
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $tracking_mode && $user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -105,11 +127,10 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if ($show_project) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
-    // 'onchange'=>'fillTaskDropdown(this.value);',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
@@ -169,14 +190,13 @@
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
       $err->add($i18n->get('error.client'));
-    if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->get('error.project'));
-    }
+    if ($show_project && !$cl_project)
+      $err->add($i18n->get('error.project'));
     if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
     if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
-    if (!$user->future_entries) {
+    if (!$user->getConfigOption('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
@@ -196,18 +216,6 @@
       } else
         $err->add($i18n->get('error.db'));
     }
-  } elseif ($request->getParameter('onBehalfUser')) {
-    if($user->can('track_expenses')) {
-      unset($_SESSION['behalf_id']);
-      unset($_SESSION['behalf_name']);
-
-      if($on_behalf_id != $user->id) {
-        $_SESSION['behalf_id'] = $on_behalf_id;
-        $_SESSION['behalf_name'] = ttUserHelper::getUserName($on_behalf_id);
-      }
-      header('Location: expenses.php');
-      exit();
-    }
   }
 }
 

From 7b6cfb2cceac61a6e899590ac8ac9fa8cb326c6a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 17:29:56 +0000
Subject: [PATCH 0516/1848] A bit more refactoring for subgroups.

---
 WEB-INF/templates/expenses.tpl | 6 +++---
 WEB-INF/templates/footer.tpl   | 2 +-
 expenses.php                   | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 17b8c8fb5..4eea0b8d6 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -129,7 +129,7 @@ function recalculateCost() {
           <td>{$forms.expensesForm.client.control}</td>
         </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
         <tr>
           <td align="right">{$i18n.label.project} (*):</td>
           <td>{$forms.expensesForm.project.control}</td>
@@ -178,7 +178,7 @@ function recalculateCost() {
   {if $user->isPluginEnabled('cl')}
         <td width="20%" class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
         <td class="tableHeader">{$i18n.label.item}</td>
@@ -190,7 +190,7 @@ function recalculateCost() {
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$item.client|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}
         <td valign="top">{$item.project|escape}</td>
     {/if}
         <td valign="top">{$item.item|escape}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 96fdee801..99e8d0eee 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.29.4591 | 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.29.4592 | 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/expenses.php b/expenses.php
index fa844a22b..eb11e73a3 100644
--- a/expenses.php
+++ b/expenses.php
@@ -219,13 +219,14 @@
   }
 }
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_project', $show_project);
 $smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
 $smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('timestring', $selected_date->toString($user->date_format));
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.expenses'));
 $smarty->assign('content_page_name', 'expenses.tpl');
 $smarty->display('index.tpl');

From cb611bf2abbb4072459632155b11301ae6fe840b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 19:31:43 +0000
Subject: [PATCH 0517/1848] Refactored regular expense pages for subgroups.

---
 WEB-INF/lib/common.lib.php            |  2 +-
 WEB-INF/lib/ttExpenseHelper.class.php |  2 +-
 WEB-INF/lib/ttUserHelper.class.php    |  2 +-
 WEB-INF/templates/expense_edit.tpl    | 10 +++++-----
 WEB-INF/templates/expenses.tpl        |  2 +-
 WEB-INF/templates/footer.tpl          |  2 +-
 expense_edit.php                      |  5 +++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 4411fb585..0e9ff9e49 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -226,7 +226,7 @@ function ttValidFloat($val, $emptyValid = false)
     return ($emptyValid ? true : false);
     
   global $user;
-  $decimal = $user->decimal_mark;
+  $decimal = $user->getDecimalMark();
 	
   if (!preg_match('/^-?[0-9'.$decimal.']+$/', $val))
     return false;
diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 0b202c6bf..40a3e88f0 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -60,12 +60,12 @@ static function update($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $id = (int) $fields['id'];
     $date = $fields['date'];
-    $user_id = (int) $fields['user_id'];
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
     $name = $fields['name'];
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 1d1b178a6..0d628f6d0 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -189,7 +189,7 @@ static function update($user_id, $fields) {
       // otherwise de-activate the bind (set its status to inactive). This will keep the bind
       // and its rate in database for reporting.
 
-      $all_projects = ttTeamHelper::getAllProjects($user->group_id);
+      $all_projects = ttTeamHelper::getAllProjects($user->getGroup());
       $assigned_projects = isset($fields['projects']) ? $fields['projects'] : array();
 
       foreach($all_projects as $p) {
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index d3a27375c..850e6442a 100644
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.tpl
@@ -98,7 +98,7 @@ function recalculateCost() {
 
   var comment_control = document.getElementById("item_name");
   var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->decimal_mark}");
+  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
 
   // Calculate cost.
   var dropdown = document.getElementById("predefined_expense");
@@ -114,10 +114,10 @@ function recalculateCost() {
     else {
       var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
       if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->decimal_mark}", ".");
+        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
       var newCost = (quantity_control.value * expenseCost).toFixed(2);
       if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->decimal_mark}");
+        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
       cost_control.value = newCost;
     }
   }
@@ -138,7 +138,7 @@ function recalculateCost() {
       <td>{$forms.expenseItemForm.client.control}</td>
     </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <tr>
       <td align="right">{$i18n.label.project} (*):</td>
       <td>{$forms.expenseItemForm.project.control}</td>
@@ -160,7 +160,7 @@ function recalculateCost() {
     </tr>
     <tr>
       <td align="right">{$i18n.label.cost}:</td>
-      <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>
+      <td>{$forms.expenseItemForm.cost.control} {$user->getCurrency()|escape}</td>
     </tr>
 {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
     <tr>
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 4eea0b8d6..45a8ef274 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -151,7 +151,7 @@ function recalculateCost() {
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.expensesForm.cost.control} {$user->currency|escape}</td>
+          <td>{$forms.expensesForm.cost.control} {$user->getCurrency()|escape}</td>
         </tr>
       </table>
     </td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 99e8d0eee..20a0db7cb 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.29.4592 | 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.29.4593 | 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/expense_edit.php b/expense_edit.php
index 667d03468..8eb7d4fe0 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -194,7 +194,7 @@
 
     // Now, an update.
     if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getUser(),
+      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),
           'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'paid'=>$cl_paid))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
@@ -229,11 +229,12 @@
   $smarty->assign('confirm_save', true);
   $smarty->assign('entry_date', $cl_date);
 }
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_project', $show_project);
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_expense'));
 $smarty->assign('content_page_name', 'expense_edit.tpl');
 $smarty->display('index.tpl');

From aeb30899d6ec142220d83b34fd8f6c68c05e8e90 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 20:39:25 +0000
Subject: [PATCH 0518/1848] Refactored mobile expenses.php for subgroups.

---
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/mobile/expenses.tpl | 20 +++++-----
 mobile/expenses.php                   | 53 +++++++++++++++++++--------
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 20a0db7cb..14d272ea3 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.29.4593 | 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.29.4594 | 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/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
index d8e8612da..a6aa66d99 100644
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ b/WEB-INF/templates/mobile/expenses.tpl
@@ -86,7 +86,7 @@ function recalculateCost() {
 
   var comment_control = document.getElementById("item_name");
   var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->decimal_mark}");
+  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
 
   // Calculate cost.
   var dropdown = document.getElementById("predefined_expense");
@@ -102,10 +102,10 @@ function recalculateCost() {
     else {
       var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
       if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->decimal_mark}", ".");
+        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
       var newCost = (quantity_control.value * expenseCost).toFixed(2);
       if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->decimal_mark}");
+        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
       cost_control.value = newCost;
     }
   }
@@ -126,10 +126,10 @@ function recalculateCost() {
   <tr>
     <td valign="top">
       <table>
-{if $on_behalf_control}
+{if $user_dropdown}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.expensesForm.onBehalfUser.control}</td>
+          <td>{$forms.expensesForm.user.control}</td>
         </tr>
 {/if}
 {if $user->isPluginEnabled('cl')}
@@ -138,7 +138,7 @@ function recalculateCost() {
           <td>{$forms.expensesForm.client.control}</td>
         </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
         <tr>
           <td align="right">{$i18n.label.project} (*):</td>
           <td>{$forms.expensesForm.project.control}</td>
@@ -160,7 +160,7 @@ function recalculateCost() {
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.expensesForm.cost.control} {$user->currency|escape}</td>
+          <td>{$forms.expensesForm.cost.control} {$user->getCurrency()|escape}</td>
         </tr>
       </table>
     </td>
@@ -189,7 +189,7 @@ function recalculateCost() {
   {if $user->isPluginEnabled('cl')}
         <td width="20%" class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
         <td class="tableHeader">{$i18n.label.item}</td>
@@ -200,7 +200,7 @@ function recalculateCost() {
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$item.client|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}
         <td valign="top">{$item.project|escape}</td>
     {/if}
         <td valign="top">{if $item.invoice_id} {$item.item|escape} {else}<a href="expense_edit.php?id={$item.id}">{$item.item|escape}</a>{/if}</td>
@@ -210,7 +210,7 @@ function recalculateCost() {
     </table>
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
-        <td nowrap align="right">{$i18n.label.day_total}: {$user->currency|escape} {$day_total}</td>
+        <td nowrap align="right">{$i18n.label.day_total}: {$user->getCurrency()|escape} {$day_total}</td>
       </tr>
     </table>
 {/if}
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 84d29738a..eeece0035 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -50,6 +50,25 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+if ($request->isPost() && $request->getParameter('user')) {
+  if (!$user->isUserValid($request->getParameter('user'))) {
+    header('Location: access_denied.php'); // Wrong user id on post.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for which we display this page.
+$userChanged = $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+  // Handle a situation for no users in on behalf group.
+  if ($user->behalfGroup && $user_id == $user->id)
+    $user_id = null;
+}
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -64,8 +83,10 @@
 $prev_date = date('Y-m-d', strtotime('-1 day', strtotime($cl_date)));
 $next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date)));
 
+$tracking_mode = $user->getTrackingMode();
+$show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
+
 // Initialize variables.
-$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id']) ? $_SESSION['behalf_id'] : $user->id));
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -77,25 +98,27 @@
 $form = new Form('expensesForm');
 
 if ($user->can('track_expenses')) {
+  $rank = $user->getMaxRankForGroup($user->getGroup());
   if ($user->can('track_own_expenses'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'onBehalfUser',
+      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
+      'name'=>'user',
       'style'=>'width: 250px;',
-      'value'=>$on_behalf_id,
+      'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
-    $smarty->assign('on_behalf_control', 1);
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
   }
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $tracking_mode && $user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -108,7 +131,7 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if ($show_project) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -172,14 +195,13 @@
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
       $err->add($i18n->get('error.client'));
-    if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $err->add($i18n->get('error.project'));
-    }
+    if ($show_project && !$cl_project)
+      $err->add($i18n->get('error.project'));
     if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
     if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
-    if (!$user->future_entries) {
+    if (!$user->getConfigOption('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
@@ -214,6 +236,8 @@
   }
 }
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_project', $show_project);
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
 $smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
@@ -221,8 +245,7 @@
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('timestring', $selected_date->toString($user->date_format));
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.expenses'));
 $smarty->assign('content_page_name', 'mobile/expenses.tpl');
 $smarty->display('mobile/index.tpl');

From bfc14fc0033335223de2268ecbd9c7a3e8d8aa21 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Dec 2018 21:10:40 +0000
Subject: [PATCH 0519/1848] Finished refactoring mobile expense pages for
 subgroups.

---
 WEB-INF/templates/expense_delete.tpl        |  2 +-
 WEB-INF/templates/footer.tpl                |  2 +-
 WEB-INF/templates/mobile/expense_delete.tpl |  2 +-
 WEB-INF/templates/mobile/expense_edit.tpl   | 10 ++++-----
 mobile/expense_edit.php                     | 23 ++++++++++++---------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl
index e2c1b6710..6e5bf12c8 100644
--- a/WEB-INF/templates/expense_delete.tpl
+++ b/WEB-INF/templates/expense_delete.tpl
@@ -16,7 +16,7 @@
   </tr>
   <tr>
 {if $user->isPluginEnabled('cl')}
-  <td>{$expense_item.client_name|escape}</td>
+    <td>{$expense_item.client_name|escape}</td>
 {/if}
 {if $show_project}
     <td>{$expense_item.project_name|escape}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 14d272ea3..b2cdebb71 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.29.4594 | 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.29.4595 | 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/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl
index cbd75aed4..bd14824e2 100644
--- a/WEB-INF/templates/mobile/expense_delete.tpl
+++ b/WEB-INF/templates/mobile/expense_delete.tpl
@@ -16,7 +16,7 @@
   </tr>
   <tr>
 {if $user->isPluginEnabled('cl')}
-  <td>{$expense_item.client_name|escape}</td>
+    <td>{$expense_item.client_name|escape}</td>
 {/if}
 {if $show_project}
     <td>{$expense_item.project_name|escape}</td>
diff --git a/WEB-INF/templates/mobile/expense_edit.tpl b/WEB-INF/templates/mobile/expense_edit.tpl
index 971405079..708cc23c4 100644
--- a/WEB-INF/templates/mobile/expense_edit.tpl
+++ b/WEB-INF/templates/mobile/expense_edit.tpl
@@ -98,7 +98,7 @@ function recalculateCost() {
 
   var comment_control = document.getElementById("item_name");
   var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->decimal_mark}");
+  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
 
   // Calculate cost.
   var dropdown = document.getElementById("predefined_expense");
@@ -114,10 +114,10 @@ function recalculateCost() {
     else {
       var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
       if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->decimal_mark}", ".");
+        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
       var newCost = (quantity_control.value * expenseCost).toFixed(2);
       if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->decimal_mark}");
+        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
       cost_control.value = newCost;
     }
   }
@@ -138,7 +138,7 @@ function recalculateCost() {
       <td>{$forms.expenseItemForm.client.control}</td>
     </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <tr>
       <td align="right">{$i18n.label.project} (*):</td>
       <td>{$forms.expenseItemForm.project.control}</td>
@@ -160,7 +160,7 @@ function recalculateCost() {
     </tr>
     <tr>
       <td align="right">{$i18n.label.cost}:</td>
-      <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>
+      <td>{$forms.expenseItemForm.cost.control} {$user->getCurrency()|escape}</td>
     </tr>
     <tr>
       <td align="right">{$i18n.label.date}:</td>
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 0f657973c..4c183afd9 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -49,9 +49,12 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
 $confirm_save = $user->getConfigOption('confirm_save');
+$trackingMode = $user->getTrackingMode();
+$show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
 // Initialize variables.
 $cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
@@ -62,7 +65,7 @@
   $cl_item_name = trim($request->getParameter('item_name'));
   $cl_cost = trim($request->getParameter('cost'));
 } else {
-  $cl_date = $item_date->toString($user->date_format);
+  $cl_date = $item_date->toString($user->getDateFormat());
   $cl_client = $expense_item['client_id'];
   $cl_project = $expense_item['project_id'];
   $cl_item_name = $expense_item['name'];
@@ -73,7 +76,7 @@
 $form = new Form('expenseItemForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $trackingMode && $user->isPluginEnabled('cl')) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -86,7 +89,7 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if ($show_project) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -153,18 +156,17 @@
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
     $err->add($i18n->get('error.client'));
-  if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $err->add($i18n->get('error.project'));
-  }
+  if ($show_project && !$cl_project)
+    $err->add($i18n->get('error.project'));
   if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
   if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
 
   // This is a new date for the expense item.
-  $new_date = new DateAndTime($user->date_format, $cl_date);
+  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
 
   // Prohibit creating entries in future.
-  if (!$user->future_entries) {
+  if (!$user->getConfigOption('future_entries')) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
@@ -187,7 +189,7 @@
 
     // Now, an update.
     if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getUser(),
+      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),
           'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost))) {
         header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
@@ -222,11 +224,12 @@
   $smarty->assign('confirm_save', true);
   $smarty->assign('entry_date', $cl_date);
 }
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_project', $show_project);
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_expense'));
 $smarty->assign('content_page_name', 'mobile/expense_edit.tpl');
 $smarty->display('mobile/index.tpl');

From a106b7a2db73b3e1fdab428b218212f6f38d7623 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Dec 2018 13:39:13 +0000
Subject: [PATCH 0520/1848] Added conditional display of pages depending on
 subgroup active users.

---
 WEB-INF/lib/ttGroup.class.php       | 15 +++++++++++++++
 WEB-INF/lib/ttUser.class.php        | 15 ++++++++++++++-
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/header.tpl        | 13 +++++++------
 WEB-INF/templates/mobile/header.tpl |  8 ++++----
 charts.php                          |  7 ++++---
 expenses.php                        |  7 ++++---
 mobile/expenses.php                 |  7 ++++---
 mobile/projects.php                 |  2 +-
 mobile/tasks.php                    |  6 +++---
 10 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index bb03845d8..fe8c8a983 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -62,6 +62,9 @@ class ttGroup {
   var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
   var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
 
+  var $active_users = 0;        // Count of active users in group.
+                                // We need a non-zero count to display some menus.
+
   // Constructor.
   function __construct($id, $org_id) {
     $mdb2 = getConnection();
@@ -119,5 +122,17 @@ function __construct($id, $org_id) {
       }
       */
     }
+
+    // Determine active user count in a separate query.
+    // TODO: If performance becomes an issue, ivestigate combining 2 queries in one.
+    // At this time we only need to know if at least 1 active user exists.
+    $sql = "select count(*) as user_count from tt_users".
+      "  where group_id = $id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) {
+      return;
+    }
+    $val = $res->fetchRow();
+    $this->active_users = $val['user_count'];
   }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 05081c5ab..7867ac8e8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -810,7 +810,7 @@ function setOnBehalfGroup($group_id) {
     return;
   }
 
-   // setOnBehalfUser sets on behalf user both the object and the session.
+  // setOnBehalfUser sets on behalf user both the object and the session.
   function setOnBehalfUser($user_id) {
 
     // Unset things first.
@@ -833,4 +833,17 @@ function setOnBehalfUser($user_id) {
     $this->behalf_name = $onBehalfUserName;
     return;
   }
+
+  // The exists() function determines if an active user exists in context of a page.
+  // If we are working as self, true.
+  // If we are working in a subgroup with active users, true.
+  // If we are working in a subgroup without active users, false.
+  function exists() {
+    if (!$this->behalfGroup)
+      return true; // Working as self.
+    else if ($this->behalfGroup->active_users)
+      return true; // Subgroup has users.
+
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b2cdebb71..d59ff9e7d 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.29.4595 | 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.29.4596 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 57e842ee1..052702975 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -108,20 +108,21 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
-    {if $user->can('track_own_time') || $user->can('track_time')}
+    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
-    {if $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if $user->can('view_own_reports') || $user->can('view_reports')}
+    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports'))}
             &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
     {/if}        
-    {if $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
+    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
-    {if ($user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode()
-      || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() || $user->isPluginEnabled('cl'))}
+    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        $user->isPluginEnabled('cl'))}
             &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
     {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index fdded891c..9e1c452da 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -73,16 +73,16 @@
       <table cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
-    {if $user->can('track_own_time') || $user->can('track_time')}
+    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
-    {if $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
             &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode}
+    {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()}
             &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
diff --git a/charts.php b/charts.php
index 6329e14f8..862a2fad6 100644
--- a/charts.php
+++ b/charts.php
@@ -46,6 +46,10 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // Nobody to display a chart for.
+  exit();
+}
 if ($user->behalf_id && (!$user->can('view_charts') || !$user->checkBehalfId())) {
   header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
   exit();
@@ -69,9 +73,6 @@
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
-  // Handle a situation for no users in on behalf group.
-  if ($user->behalfGroup && $user_id == $user->id)
-    $user_id = null;
 }
 
 $uc = new ttUserConfig();
diff --git a/expenses.php b/expenses.php
index eb11e73a3..9a3454221 100644
--- a/expenses.php
+++ b/expenses.php
@@ -42,6 +42,10 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // Nobody to enter expenses for.
+  exit();
+}
 if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
   header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
   exit();
@@ -65,9 +69,6 @@
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
-  // Handle a situation for no users in on behalf group.
-  if ($user->behalfGroup && $user_id == $user->id)
-    $user_id = null;
 }
 
 // Initialize and store date in session.
diff --git a/mobile/expenses.php b/mobile/expenses.php
index eeece0035..ac565207b 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -42,6 +42,10 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // Nobody to enter expenses for.
+  exit();
+}
 if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
   header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
   exit();
@@ -65,9 +69,6 @@
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
-  // Handle a situation for no users in on behalf group.
-  if ($user->behalfGroup && $user_id == $user->id)
-    $user_id = null;
 }
 
 // Initialize and store date in session.
diff --git a/mobile/projects.php b/mobile/projects.php
index d244ae1b7..6a5ac572a 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
diff --git a/mobile/tasks.php b/mobile/tasks.php
index c45f9bf04..0667bc3bd 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -35,15 +35,15 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
 // End of access checks.
 
 if($user->can('manage_tasks')) {
-  $active_tasks = ttTeamHelper::getActiveTasks($user->group_id);
-  $inactive_tasks = ttTeamHelper::getInactiveTasks($user->group_id);
+  $active_tasks = ttTeamHelper::getActiveTasks($user->getGroup());
+  $inactive_tasks = ttTeamHelper::getInactiveTasks($user->getGroup());
 } else
   $active_tasks = $user->getAssignedTasks();
 

From d368d8cfe50268648a7c9f94a031c9aa8f0f4549 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Dec 2018 15:06:05 +0000
Subject: [PATCH 0521/1848] Fixed editing org by admin, added a comment for
 imported subgroups.

---
 WEB-INF/lib/ttAdmin.class.php | 13 +++++++++++--
 WEB-INF/lib/ttGroup.class.php |  2 +-
 WEB-INF/templates/footer.tpl  |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 0e0532cee..383eb44c1 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -143,7 +143,7 @@ static function updateGroup($fields) {
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['user_name']);
     $email_part = ', email = '.$mdb2->quote($fields['email']);
-    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.'where id = '.$user_id;
+    $sql = 'update tt_users set '.$login_part.$password_part.$name_part.$email_part.$modified_part.' where id = '.$user_id;
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -189,10 +189,19 @@ static function getOrgDetails($group_id) {
     $result = array();
     $mdb2 = getConnection();
 
+    // Note: current code works with properly set top manager (rank 512).
+    // However, we now allow export and import of subgroups, which seems to work well.
+    // In this situation, imported role is no longer "Top manager", and this call fails.
+    // Setting role id manually in database for top user to Top manager resolves the issue.
+    //
+    // TODO: assess whether it is safe / reasonable to promote role during export or import.
+    // The problem is that user having 'export_data' right is not necessarily top user.
+    // And if we do it by rank, what to do for multiple managers situation? First found?
+    // Leaving to manual fixing for now.
     $sql = "select g.name as group_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email".
       " from tt_groups g".
       " inner join tt_users u on (u.group_id = g.id)".
-      " inner join tt_roles r on (r.id = u.role_id and r.rank = 512)".
+      " inner join tt_roles r on (r.id = u.role_id and r.rank = 512)". // Fails for partially imported org. See comment above.
       " where g.id = $group_id";
 
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index fe8c8a983..1aa422c72 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -124,7 +124,7 @@ function __construct($id, $org_id) {
     }
 
     // Determine active user count in a separate query.
-    // TODO: If performance becomes an issue, ivestigate combining 2 queries in one.
+    // TODO: If performance becomes an issue, investigate combining 2 queries in one.
     // At this time we only need to know if at least 1 active user exists.
     $sql = "select count(*) as user_count from tt_users".
       "  where group_id = $id and org_id = $org_id and status = 1";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d59ff9e7d..9d8323c4c 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.29.4596 | 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.29.4597 | 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>

From 3b59dadb0e60b3379dc2230ffd06c49eaa2e5ef3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Dec 2018 19:22:54 +0000
Subject: [PATCH 0522/1848] Improvements to group editor - access checks and
 usability.

---
 WEB-INF/lib/ttGroupHelper.class.php |   2 +-
 WEB-INF/templates/footer.tpl        |   2 +-
 WEB-INF/templates/group_edit.tpl    |   2 +-
 group_delete.php                    |  18 ++--
 group_edit.php                      | 132 +++++++++++++++-------------
 5 files changed, 86 insertions(+), 70 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index e5288a096..1a32124cf 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -91,7 +91,7 @@ static function insertSubgroup($fields) {
     $name = $fields['name'];
     $description = $fields['description'];
 
-    // We need to inherit other attributes from the parent group.
+    // We need to inherit attributes from the parent group.
     $attrs = ttGroupHelper::getGroupAttrs($parent_id);
 
     $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9d8323c4c..e57d10e18 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.29.4597 | 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.29.4598 | 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 f839d7e93..bb83d3a3e 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -27,7 +27,7 @@ function handleTaskRequiredCheckbox() {
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
 {if isTrue($smarty.const.SUBGROUP_DEBUG)}
-{if $user->can('manage_subgroups')}
+{if $user->can('manage_subgroups') && $group_dropdown}
           <tr>
             <td align="right" nowrap>{$i18n.label.group}:</td>
             <td>{$forms.groupForm.group.control}</td>
diff --git a/group_delete.php b/group_delete.php
index db24a4481..2865351a4 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -31,17 +31,21 @@
 import('ttGroupHelper');
 
 // Access checks.
-if (!ttAccessAllowed('delete_group')) {
+if (!(ttAccessAllowed('delete_group') || ttAccessAllowed('manage_subgroups'))) {
   header('Location: access_denied.php'); // No rights.
   exit();
 }
-if (!$user->isGroupValid($request->getParameter('id'))) {
+$group_id = (int)$request->getParameter('id');
+if (!$user->isGroupValid($group_id)) {
   header('Location: access_denied.php'); // Wrong group id.
   exit();
 }
+if ($group_id == $user->group_id && !$user->can('delete_group')) {
+  header('Location: access_denied.php'); // Trying to delete home group without right.
+  exit();
+}
 // End of access checks.
 
-$group_id = (int)$request->getParameter('id');
 $group_name = ttGroupHelper::getGroupName($group_id);
 
 $form = new Form('groupForm');
@@ -53,7 +57,6 @@
   if ($request->getParameter('btn_delete')) {
     $markedDeleted = ttGroupHelper::markGroupDeleted($group_id);
     if ($markedDeleted) {
-      // TODO: conditional redirects don't look nice. Any better ideas?
       if ($group_id == $user->group_id) {
         // We marked deleted our own group. Logout and redirect to login page.
         $auth->doLogout();
@@ -61,8 +64,10 @@
         header('Location: login.php');
         exit();
       } else {
-        // We marked deleted a subgroup. Redirect to groups.pgp.
-        header('Location: groups.php');
+        // We marked deleted a subgroup.
+        if ($user->behalfGroup && $user->behalfGroup->id == $group_id)
+          $user->setOnBehalfGroup($user->group_id); // Remove on behalf group from session.
+        header('Location: success.php');
         exit();
       }
     } else
@@ -70,7 +75,6 @@
   }
 
   if ($request->getParameter('btn_cancel')) {
-    // TODO: conditional redirects don't look nice. Any better ideas?
     if ($group_id == $user->group_id) {
       header('Location: group_edit.php');
       exit();
diff --git a/group_edit.php b/group_edit.php
index 44c5d7f9b..29bfd801b 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -33,32 +33,49 @@
 import('ttConfigHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) {
-  header('Location: access_denied.php');
-  exit();
+// There are 4 distinct situations:
+//   1) Editing home group in get or post.
+//   2) Editing a subgroup in get or post.
+// We'll check access separately as it is about different right checks.
+if ($request->isGet()) {
+  $group_id = $request->getParameter('id') ? $request->getParameter('id') : $user->getGroup();
+} else {
+  $group_id = $request->getParameter('group');
 }
-$group_id = (int)$request->getParameter('id');
-if ($group_id && !$user->isGroupValid($group_id)) {
-  header('Location: access_denied.php');
-  exit();
+$home_group = $user->group_id == $group_id;
+if ($home_group) {
+  // Editing home group.
+  if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) {
+    header('Location: access_denied.php'); // Not allowed to edit home group settings.
+    exit();
+  }
+} else {
+  // Editing a subgroup.
+  if (!ttAccessAllowed('manage_subgroups')) {
+    header('Location: access_denied.php'); // No right to manage subgroups.
+    exit();
+  }
+  if (!$user->isSubgroupValid($group_id)) {
+    header('Location: access_denied.php'); // Wrong subgroup.
+    exit();
+  }
 }
 // End of access checks.
 
-if ($group_id) {
-  // We are passed a valid group_id.
-  // Set on behalf group accordingly.
-  $user->setOnBehalfGroup($group_id);
+// Set on behalf group accordingly.
+$groupChanged = $request->getParameter('group_changed');
+if ($request->isPost() && $groupChanged) {
+ $user->setOnBehalfGroup($group_id);
 }
 
-if (!$group_id) $group_id = $user->getGroup();
 $groups = $user->getGroupsForDropdown();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = new ttConfigHelper($group['config']);
 
-$advanced_settings = $user->can('manage_advanced_settings');
+$advanced_settings = $home_group ? $user->can('manage_advanced_settings') : true;
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
-if ($request->isPost()) {
+if ($request->isPost() && !$groupChanged) {
   $cl_group = trim($request->getParameter('group_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_currency = trim($request->getParameter('currency'));
@@ -208,13 +225,6 @@
 $form->setValueByElement('group_changed','');
 
 if ($request->isPost()) {
-  if ($request->getParameter('group_changed')) {
-    // User changed the group in dropdown.
-    $new_group_id = $request->getParameter('group');
-    // Redirect to self.
-    header('Location: group_edit.php?id='.$new_group_id);
-    exit();
-  }
 
   if ($request->getParameter('btn_delete')) {
     // Delete button pressed, redirect.
@@ -222,47 +232,49 @@
     exit();
   }
 
-  // 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 ($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 ($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 ($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()) {
-    // Update config.
-    $config->setDefinedValue('show_holidays', $cl_show_holidays);
-    $config->setDefinedValue('punch_mode', $cl_punch_mode);
-    $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
-    $config->setDefinedValue('future_entries', $cl_future_entries);
-    $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
-    $config->setDefinedValue('confirm_save', $cl_confirm_save);
+    if ($err->no()) {
+      // Update config.
+      $config->setDefinedValue('show_holidays', $cl_show_holidays);
+      $config->setDefinedValue('punch_mode', $cl_punch_mode);
+      $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
+      $config->setDefinedValue('future_entries', $cl_future_entries);
+      $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
+      $config->setDefinedValue('confirm_save', $cl_confirm_save);
 
-    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,
-      'date_format' => $cl_date_format,
-      'time_format' => $cl_time_format,
-      'week_start' => $cl_start_week,
-      'tracking_mode' => $cl_tracking_mode,
-      'project_required' => $cl_project_required,
-      '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();
-    } else
-      $err->add($i18n->get('error.db'));
+      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,
+        'date_format' => $cl_date_format,
+        'time_format' => $cl_time_format,
+        'week_start' => $cl_start_week,
+        'tracking_mode' => $cl_tracking_mode,
+        'project_required' => $cl_project_required,
+        '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();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
   }
 } // isPost
 

From e3df211bb657c8036e7c767eeee660fc402a357e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Dec 2018 20:34:14 +0000
Subject: [PATCH 0523/1848] Work in progress on subgroups in invoices.

---
 WEB-INF/lib/ttGroupHelper.class.php | 34 +++++++++++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php  | 32 ---------------------------
 WEB-INF/templates/footer.tpl        |  2 +-
 invoices.php                        |  4 ++--
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 1a32124cf..3ae408af9 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -389,4 +389,38 @@ static function getPredefinedExpenses() {
     }
     return false;
   }
+
+  // The getActiveInvoices returns an array of active invoices for a group.
+  static function getActiveInvoices()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $addPaidStatus = $user->isPluginEnabled('ps');
+    $result = array();
+
+    if ($user->isClient())
+      $client_part = "and i.client_id = $user->client_id";
+
+    $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i".
+      " left join tt_clients c on (c.id = i.client_id)".
+      " where i.status = 1 and i.group_id = $group_id and i.org_id = $org_id $client_part order by i.name";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      $dt = new DateAndTime(DB_DATEFORMAT);
+      while ($val = $res->fetchRow()) {
+        // Localize date.
+        $dt->parseVal($val['date']);
+        $val['date'] = $dt->toString($user->getDateFormat());
+        if ($addPaidStatus)
+          $val['paid'] = ttInvoiceHelper::isPaid($val['id']);
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 1e6263131..16896ac58 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -363,38 +363,6 @@ static function getAllClients($group_id, $all_fields = false) {
     return false;
   }
 
-  // The getActiveInvoices returns an array of active invoices for a group.
-  static function getActiveInvoices($localizeDates = true)
-  {
-    global $user;
-    $addPaidStatus = $user->isPluginEnabled('ps');
-
-    $result = array();
-    $mdb2 = getConnection();
-
-    if ($user->isClient())
-      $client_part = " and i.client_id = $user->client_id";
-
-    $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i
-      left join tt_clients c on (c.id = i.client_id)
-      where i.status = 1 and i.group_id = $user->group_id $client_part order by i.name";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
-      while ($val = $res->fetchRow()) {
-        if ($localizeDates) {
-          $dt->parseVal($val['date']);
-          $val['date'] = $dt->toString($user->date_format);
-        }
-        if ($addPaidStatus)
-          $val['paid'] = ttInvoiceHelper::isPaid($val['id']);
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllInvoices returns an array of all invoices for a group.
   static function getAllInvoices()
   {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e57d10e18..dbb5b1c4b 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.29.4598 | 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.29.4599 | 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/invoices.php b/invoices.php
index 1723a8d1d..eb89e0ea7 100644
--- a/invoices.php
+++ b/invoices.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
@@ -40,7 +40,7 @@
   exit();
 }
 
-$invoices = ttTeamHelper::getActiveInvoices();
+$invoices = ttGroupHelper::getActiveInvoices();
 
 $smarty->assign('invoices', $invoices);
 $smarty->assign('title', $i18n->get('title.invoices'));

From 005295b05a6f3418db5dc3fb79fe73e2c7d01d2f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Dec 2018 20:54:00 +0000
Subject: [PATCH 0524/1848] More refactoring of invoices for subgroups.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 31 +++++++++++++++++----------
 WEB-INF/templates/footer.tpl          |  2 +-
 invoices.php                          |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 042acd821..445c02c21 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -37,10 +37,13 @@ static function getInvoice($invoice_id) {
     global $user;
     $mdb2 = getConnection();
 
-    if ($user->isClient()) $client_part = " and client_id = $user->client_id";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    $sql = "select * from tt_invoices where id = $invoice_id and group_id = ".
-            $user->getGroup()."$client_part and status = 1";
+    if ($user->isClient()) $client_part = "and client_id = $user->client_id";
+
+    $sql = "select * from tt_invoices".
+      " where id = $invoice_id and group_id = $group_id and org_id = $org_id $client_part and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
@@ -51,12 +54,14 @@ static function getInvoice($invoice_id) {
 
   // The getInvoiceByName looks up an invoice by name.
   static function getInvoiceByName($invoice_name) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    $sql = "select id from tt_invoices where group_id = ".
-            $user->getGroup()." and name = ".$mdb2->quote($invoice_name)." and status = 1";
+    $sql = "select id from tt_invoices where group_id = $group_id and org_id = $org_id".
+      " and name = ".$mdb2->quote($invoice_name)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -72,18 +77,22 @@ static function getInvoiceByName($invoice_name) {
   // Therefore, the paid status of the invoice is a calculated value.
   // This is because we maintain the paid status on individual item level.
   static function isPaid($invoice_id) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    $sql = "select count(*) as count from tt_log where invoice_id = $invoice_id and status = 1 and paid < 1";
+    $sql = "select count(*) as count from tt_log".
+      " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id and status = 1 and paid < 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
       if ($val['count'] > 0)
         return false; // A non-paid time item exists.
     }
-    $sql = "select count(*) as count from tt_expense_items where invoice_id = $invoice_id and status = 1 and paid < 1";
+    $sql = "select count(*) as count from tt_expense_items".
+      " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id and status = 1 and paid < 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dbb5b1c4b..39b3280fa 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.29.4599 | 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.29.4600 | 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/invoices.php b/invoices.php
index eb89e0ea7..ba1cad462 100644
--- a/invoices.php
+++ b/invoices.php
@@ -39,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $invoices = ttGroupHelper::getActiveInvoices();
 

From 241fff8e23fee4caddf4038ad83df75e8146f1a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Dec 2018 21:52:32 +0000
Subject: [PATCH 0525/1848] Some more refactoring in invoices for subgroups.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 65 +++++++++++++++------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 445c02c21..3e29e0e04 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -106,16 +106,20 @@ static function isPaid($invoice_id) {
 
   // markPaid marks invoice items as paid.
   static function markPaid($invoice_id, $mark_paid = true) {
-
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $paid_status = $mark_paid ? 1 : 0;
-    $sql = "update tt_log set paid = $paid_status where invoice_id = $invoice_id and status = 1";
+    $sql = "update tt_log set paid = $paid_status".
+      " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id and status = 1";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    $sql = "update tt_expense_items set paid = $paid_status where invoice_id = $invoice_id and status = 1";
+    $sql = "update tt_expense_items set paid = $paid_status".
+      " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id and status = 1";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -127,43 +131,46 @@ static function getInvoiceItems($invoice_id) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // At this time only detailed invoice is supported.
     // It is anticipated to support "totals only" option later on.
 
     // Our query is different depending on tracking mode.
     if (MODE_TIME == $user->getTrackingMode()) {
       // In "time only" tracking mode there is a single user rate.
-      $sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name,
-      t.name as task_name, l.comment as note,
-      time_format(l.duration, '%k:%i') as duration,
-      cast(l.billable * u.rate * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost,
-      l.paid as paid from tt_log l
-      inner join tt_users u on (l.user_id = u.id)
-      left join tt_projects p on (p.id = l.project_id)
-      left join tt_tasks t on (t.id = l.task_id)
-      where l.status = 1 and l.billable = 1 and l.invoice_id = $invoice_id order by l.date, u.name";
+      $sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name,".
+        " t.name as task_name, l.comment as note, time_format(l.duration, '%k:%i') as duration,".
+        " cast(l.billable * u.rate * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost,".
+        " l.paid as paid from tt_log l".
+        " inner join tt_users u on (l.user_id = u.id)".
+        " left join tt_projects p on (p.id = l.project_id)".
+        " left join tt_tasks t on (t.id = l.task_id)".
+        " where l.status = 1 and l.billable = 1 and l.invoice_id = $invoice_id".
+        " and l.group_id = $group_id and l.org_id = $org_id order by l.date, u.name";
     } else {
-      $sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name,
-        t.name as task_name, l.comment as note,
-        time_format(l.duration, '%k:%i') as duration,
-        cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost,
-        l.paid as paid from tt_log l
-        inner join tt_users u on (l.user_id = u.id)
-        left join tt_projects p on (p.id = l.project_id)
-        left join tt_tasks t on (t.id = l.task_id)
-        left join tt_user_project_binds upb on (upb.user_id = l.user_id and upb.project_id = l.project_id)
-        where l.status = 1 and l.billable = 1 and l.invoice_id = $invoice_id order by l.date, u.name";
+      $sql = "select l.date as date, 1 as type, u.name as user_name, p.name as project_name,".
+        " t.name as task_name, l.comment as note, time_format(l.duration, '%k:%i') as duration,".
+        " cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2)) as cost,".
+        " l.paid as paid from tt_log l".
+        " inner join tt_users u on (l.user_id = u.id)".
+        " left join tt_projects p on (p.id = l.project_id)".
+        " left join tt_tasks t on (t.id = l.task_id)".
+        " left join tt_user_project_binds upb on (upb.user_id = l.user_id and upb.project_id = l.project_id)".
+        " where l.status = 1 and l.billable = 1 and l.invoice_id = $invoice_id".
+        " and l.group_id = $group_id and l.org_id = $org_id order by l.date, u.name";
     }
 
     // If we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     if ($user->isPluginEnabled('ex')) {
-      $sql_for_expense_items = "select ei.date as date, 2 as type, u.name as user_name, p.name as project_name,
-        null as task_name, ei.name as note,
-        null as duration, ei.cost as cost,
-        ei.paid as paid from tt_expense_items ei
-        inner join tt_users u on (ei.user_id = u.id)
-        left join tt_projects p on (p.id = ei.project_id)
-        where ei.invoice_id = $invoice_id and ei.status = 1";
+      $sql_for_expense_items = "select ei.date as date, 2 as type, u.name as user_name, p.name as project_name,".
+        " null as task_name, ei.name as note,".
+        " null as duration, ei.cost as cost,".
+        " ei.paid as paid from tt_expense_items ei".
+        " inner join tt_users u on (ei.user_id = u.id)".
+        " left join tt_projects p on (p.id = ei.project_id)".
+        " where ei.invoice_id = $invoice_id and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1";
 
       // Construct a union.
       $sql = "($sql) union all ($sql_for_expense_items)";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 39b3280fa..e78233847 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.29.4600 | 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.29.4601 | 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>

From 57f7eb0666795f48f63f71eeb741af2eb7588427 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 13:16:11 +0000
Subject: [PATCH 0526/1848] Resuming refactoring of invoices for subgroups.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 34 ++++++++++++++++++---------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 3e29e0e04..93d272b43 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -184,7 +184,7 @@ static function getInvoiceItems($invoice_id) {
       $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
         $dt->parseVal($val['date']);
-        $val['date'] = $dt->toString($user->date_format);
+        $val['date'] = $dt->toString($user->getDateFormat());
         $result[] = $val;
       }
     }
@@ -196,30 +196,42 @@ static function delete($invoice_id, $delete_invoice_items) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Handle custom field log records.
     if ($delete_invoice_items) {
-      $sql = "update tt_custom_field_log set status = NULL where log_id in (select id from tt_log where invoice_id = $invoice_id and status = 1)";
+      $sql = "update tt_custom_field_log set status = null".
+        " where log_id in".
+        " (select id from tt_log where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id and status = 1)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
 
     // Handle time records.
-    if ($delete_invoice_items)
-      $sql = "update tt_log set status = NULL where invoice_id = $invoice_id";
-    else
-      $sql = "update tt_log set invoice_id = NULL where invoice_id = $invoice_id";
+    if ($delete_invoice_items) {
+      $sql = "update tt_log set status = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    } else {
+      $sql = "update tt_log set invoice_id = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    }
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Handle expense items.
-    if ($delete_invoice_items)
-      $sql = "update tt_expense_items set status = NULL where invoice_id = $invoice_id";
-    else
-      $sql = "update tt_expense_items set invoice_id = NULL where invoice_id = $invoice_id";
+    if ($delete_invoice_items) {
+      $sql = "update tt_expense_items set status = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    } else {
+      $sql = "update tt_expense_items set invoice_id = null".
+        " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
+    }
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    $sql = "update tt_invoices set status = NULL where id = $invoice_id and group_id = ".$user->getGroup();
+    $sql = "update tt_invoices set status = null".
+      " where id = $invoice_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e78233847..ffb82d9de 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.29.4601 | 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.29.4602 | 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>

From 00b824b147ae7e63fcd8fc1c41e54c356d975a02 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 13:41:43 +0000
Subject: [PATCH 0527/1848] More refactoring.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 36 +++++++++++++++------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 93d272b43..78987b40f 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -238,9 +238,11 @@ static function delete($invoice_id, $delete_invoice_items) {
 
   // The invoiceableItemsExist determines whether invoiceable records exist in the specified period.
   static function invoiceableItemsExist($fields) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $client_id = (int) $fields['client_id'];
 
@@ -255,21 +257,22 @@ static function invoiceableItemsExist($fields) {
     // Our query is different depending on tracking mode.
     if (MODE_TIME == $user->getTrackingMode()) {
       // In "time only" tracking mode there is a single user rate.
-      $sql = "select count(*) as num from tt_log l, tt_users u
-        where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL
-        and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)."
-        and l.user_id = u.id
-        and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
+      $sql = "select count(*) as num from tt_log l, tt_users u".
+        " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
+        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+        " and l.user_id = u.id and l.group_id = $group_id and l.org_id = $org_id".
+        " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
     } else {
       // sql part for project id.
       if ($project_id) $project_part = " and l.project_id = $project_id";
 
       // When we have projects, rates are defined for each project in tt_user_project_binds table.
-      $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb
-        where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is NULL
-        and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)."
-        and upb.user_id = l.user_id and upb.project_id = l.project_id
-        and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
+      $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb".
+        " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
+        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+        " and l.group_id = $group_id and l.org_id = $org_id".
+        " and upb.user_id = l.user_id and upb.project_id = l.project_id".
+        " and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
         // Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
         // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
         // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
@@ -289,10 +292,11 @@ static function invoiceableItemsExist($fields) {
       // sql part for project id.
       if ($project_id) $project_part = " and ei.project_id = $project_id";
 
-      $sql = "select count(*) as num from tt_expense_items ei
-        where ei.client_id = $client_id $project_part and ei.invoice_id is NULL
-        and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end)."
-        and ei.cost <> 0 and ei.status = 1";
+      $sql = "select count(*) as num from tt_expense_items ei".
+        " where ei.client_id = $client_id $project_part and ei.invoice_id is null".
+        " and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end).
+        " and ei.group_id = $group_id and ei.org_id = $org_id".
+        " and ei.cost <> 0 and ei.status = 1";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         $val = $res->fetchRow();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ffb82d9de..fafccace1 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.29.4602 | 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.29.4603 | 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>

From 6f6512e1d85460b13910a3ce0e081750ae9a5642 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 14:02:20 +0000
Subject: [PATCH 0528/1848] A bit more refactoring in invoices.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 42 +++++++++++++++------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 78987b40f..ff4a9f29b 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -311,9 +311,11 @@ static function invoiceableItemsExist($fields) {
 
   // createInvoice - marks items for invoice as belonging to it (with its reference number).
   static function createInvoice($fields) {
-
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $name = $fields['name'];
     if (!$name) return false;
@@ -332,8 +334,8 @@ static function createInvoice($fields) {
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Create a new invoice record.
-    $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id) values(".
-      $user->getGroup().", $user->org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
+    $sql = "insert into tt_invoices (group_id, org_id, name, date, client_id)".
+      " values($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($date).", $client_id)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -343,23 +345,25 @@ static function createInvoice($fields) {
     // Our update sql is different depending on tracking mode.
     if (MODE_TIME == $user->getTrackingMode()) {
       // In "time only" tracking mode there is a single user rate.
-      $sql = "update tt_log l
-        left join tt_users u on (u.id = l.user_id)
-        set l.invoice_id = $last_id
-        where l.status = 1 and l.client_id = $client_id and l.invoice_id is NULL
-        and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)."
-        and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; // See explanation below.
+      $sql = "update tt_log l".
+        " left join tt_users u on (u.id = l.user_id)".
+        " set l.invoice_id = $last_id".
+        " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
+        " and l.group_id = $group_id and l.org_id = $org_id".
+        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+        " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; // See explanation below.
     } else {
        // sql part for project id.
       if ($project_id) $project_part = " and l.project_id = $project_id";
 
       // When we have projects, rates are defined for each project in tt_user_project_binds.
-      $sql = "update tt_log l
-        left join tt_user_project_binds upb on (upb.user_id = l.user_id and upb.project_id = l.project_id)
-        set l.invoice_id = $last_id
-        where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is NULL
-        and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end)."
-        and l.billable = 1"; //  l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0";
+      $sql = "update tt_log l".
+        " left join tt_user_project_binds upb on (upb.user_id = l.user_id and upb.project_id = l.project_id)".
+        " set l.invoice_id = $last_id".
+        " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
+        " and l.group_id = $group_id and l.org_id = $org_id".
+        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+        " and l.billable = 1"; //  l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0";
         // Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
         // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
         // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
@@ -374,8 +378,10 @@ static function createInvoice($fields) {
     // sql part for project id.
     if ($project_id) $project_part = " and project_id = $project_id";
 
-    $sql = "update tt_expense_items set invoice_id = $last_id where client_id = $client_id $project_part and invoice_id is NULL
-      and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end)." and cost <> 0 and status = 1";
+    $sql = "update tt_expense_items set invoice_id = $last_id".
+      " where client_id = $client_id $project_part and invoice_id is null".
+      " and group_id = $group_id and org_id = $org_id".
+      " and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end)." and cost <> 0 and status = 1";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fafccace1..1168961f1 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.29.4603 | 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.29.4604 | 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>

From 2578cc5eb4d64b7f785967ff895e810e0db5c1b3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 14:25:55 +0000
Subject: [PATCH 0529/1848] Finished refactoring ttInvoiceHelper class for
 subgroups.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 13 ++++++++-----
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index ff4a9f29b..becea87bc 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -392,6 +392,9 @@ static function prepareInvoiceBody($invoice_id, $comment)
     global $user;
     global $i18n;
 
+    $currency = $user->getCurrency();
+    $decimalMark = $user->getDecimalMark();
+
     $invoice = ttInvoiceHelper::getInvoice($invoice_id);
     $client = ttClientHelper::getClient($invoice['client_id'], true);
     $invoice_items = ttInvoiceHelper::getInvoiceItems($invoice_id);
@@ -412,13 +415,13 @@ static function prepareInvoiceBody($invoice_id, $comment)
     }
     $total = $subtotal + $tax;
 
-    $subtotal = htmlspecialchars($user->currency).' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($subtotal, 2)));
-    if ($tax) $tax = htmlspecialchars($user->currency).' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($tax, 2)));
-    $total = htmlspecialchars($user->currency).' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($total, 2)));
+    $subtotal = htmlspecialchars($currency).' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($subtotal, 2)));
+    if ($tax) $tax = htmlspecialchars($currency).' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($tax, 2)));
+    $total = htmlspecialchars($currency).' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($total, 2)));
 
-    if ('.' != $user->decimal_mark) {
+    if ('.' != $decimalMark) {
       foreach ($invoice_items as &$item) {
-        $item['cost'] = str_replace('.', $user->decimal_mark, $item['cost']);
+        $item['cost'] = str_replace('.', $decimalMark, $item['cost']);
       }
       unset($item); // Unset the reference. If we don't, the foreach loop below modifies the array while printing.
                     // See http://stackoverflow.com/questions/8220399/php-foreach-pass-by-reference-last-element-duplicating-bug
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1168961f1..db006ef82 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.29.4604 | 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.29.4605 | 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>

From 4153fc2584a62ab3949b182e42fb61c804925a08 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 14:37:28 +0000
Subject: [PATCH 0530/1848] Fixed group_edit.php for no subgroups situation.

---
 WEB-INF/templates/footer.tpl | 2 +-
 group_edit.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index db006ef82..696890b6f 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.29.4605 | 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.29.4606 | 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/group_edit.php b/group_edit.php
index 29bfd801b..b16a15f09 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -40,7 +40,7 @@
 if ($request->isGet()) {
   $group_id = $request->getParameter('id') ? $request->getParameter('id') : $user->getGroup();
 } else {
-  $group_id = $request->getParameter('group');
+  $group_id = $request->getParameter('group') ? $request->getParameter('group') : $user->getGroup();
 }
 $home_group = $user->group_id == $group_id;
 if ($home_group) {

From 3c60698710dfd998fd1488c674b944f5df9b0dce Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 15:16:22 +0000
Subject: [PATCH 0531/1848] Adjusted invoice_view.php for subgroups.

---
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/invoice_view.tpl |  8 ++++----
 invoice_view.php                   | 22 ++++++++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 696890b6f..ca4c7a04a 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.29.4606 | 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.29.4607 | 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/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index 9faa3bb21..6441b44db 100644
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -20,10 +20,10 @@
         <tr>
           <td class="tableHeader">{$i18n.label.date}</td>
           <td class="tableHeader">{$i18n.form.invoice.person}</td>
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}
           <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_task}
           <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
           <td class="tableHeader">{$i18n.label.note}</td>
@@ -37,10 +37,10 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td valign="top">{$invoice_item.date}</td>
           <td valign="top">{$invoice_item.user_name|escape}</td>
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}
           <td valign="top">{$invoice_item.project_name|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_task}
           <td valign="top">{$invoice_item.task_name|escape}</td>
     {/if}
           <td valign="top">{$invoice_item.note|escape}</td>
diff --git a/invoice_view.php b/invoice_view.php
index 8168c3ad8..772500ef5 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -71,20 +71,24 @@
 }
 $total = $subtotal + $tax; 
 
-$smarty->assign('subtotal', $user->currency.' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($subtotal, 2))));
-if ($tax) $smarty->assign('tax', $user->currency.' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($tax, 2))));
-$smarty->assign('total', $user->currency.' '.str_replace('.', $user->decimal_mark, sprintf('%8.2f', round($total, 2))));
+$currency = $user->getCurrency();
+$decimalMark = $user->getDecimalMark();
 
-if ('.' != $user->decimal_mark) {
+$smarty->assign('subtotal', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($subtotal, 2))));
+if ($tax) $smarty->assign('tax', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($tax, 2))));
+$smarty->assign('total', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($total, 2))));
+
+if ('.' != $decimalMark) {
   foreach ($invoice_items as &$item)
-    $item['cost'] = str_replace('.', $user->decimal_mark, $item['cost']);
+    $item['cost'] = str_replace('.', $decimalMark, $item['cost']);
 }
 
 // Calculate colspan for invoice summary.
 $colspan = 4;
-if (MODE_PROJECTS == $user->tracking_mode)
+$trackingMode = $user->getTrackingMode();
+if (MODE_PROJECTS == $trackingMode)
   $colspan++;
-elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+elseif (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $colspan += 2;
 
 $form = new Form('invoiceForm');
@@ -117,9 +121,11 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('invoice_id', $cl_invoice_id);
 $smarty->assign('invoice_name', $invoice['name']);
-$smarty->assign('invoice_date', $invoice_date->toString($user->date_format));
+$smarty->assign('invoice_date', $invoice_date->toString($user->getDateFormat()));
 $smarty->assign('client_name', $client['name']);
 $smarty->assign('client_address', $client['address']);
+$smarty->assign('show_project', MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode);
+$smarty->assign('show_task', MODE_PROJECTS_AND_TASKS == $trackingMode);
 $smarty->assign('invoice_items', $invoice_items);
 $smarty->assign('colspan', $colspan);
 $smarty->assign('title', $i18n->get('title.view_invoice'));

From aa0c3ca69e801da029d6ec90937dd8017186c91f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 17:12:53 +0000
Subject: [PATCH 0532/1848] Updated Locking config to support subgroups.

---
 WEB-INF/lib/ttUser.class.php      | 7 +------
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/invoice_add.tpl | 2 +-
 invoice_add.php                   | 4 +++-
 locking.php                       | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7867ac8e8..5c21879bf 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -594,15 +594,10 @@ function adjustBehalfId() {
 
   // updateGroup updates group information with new data.
   function updateGroup($fields) {
-    if (!($this->can('manage_basic_settings') ||
-      $this->can('manage_advanced_settings') ||
-      $this->can('manage_features'))) return false;
-    // TODO: update the above for subgroup updates.
+    $mdb2 = getConnection();
 
     $group_id = $fields['group_id'];
     if ($group_id && !$this->isGroupValid($group_id)) return false;
-
-    $mdb2 = getConnection();
     if (!$group_id) $group_id = $this->getGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ca4c7a04a..cd126f2c8 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.29.4607 | 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.29.4608 | 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/invoice_add.tpl b/WEB-INF/templates/invoice_add.tpl
index e166b089f..f5211eeef 100644
--- a/WEB-INF/templates/invoice_add.tpl
+++ b/WEB-INF/templates/invoice_add.tpl
@@ -15,7 +15,7 @@
           <td align="right">{$i18n.label.client} (*):</td>
           <td>{$forms.invoiceForm.client.control}</td>
         </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
         <tr>
           <td align="right">{$i18n.label.project}:</td>
           <td>{$forms.invoiceForm.project.control}</td>
diff --git a/invoice_add.php b/invoice_add.php
index e29de2eb6..273d761ef 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -61,7 +61,8 @@
   $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_project) {
   $projects = ttGroupHelper::getActiveProjects();
   $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
@@ -100,6 +101,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceForm.number.focus()"');
+$smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.add_invoice'));
 $smarty->assign('content_page_name', 'invoice_add.tpl');
 $smarty->display('index.tpl');
diff --git a/locking.php b/locking.php
index 4359f2197..9b23c876a 100644
--- a/locking.php
+++ b/locking.php
@@ -39,7 +39,7 @@
   exit();
 }
 
-$cl_lock_spec = $request->isPost() ? $request->getParameter('lock_spec') : $user->lock_spec;
+$cl_lock_spec = $request->isPost() ? $request->getParameter('lock_spec') : $user->getLockSpec();
 
 $form = new Form('lockingForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'lock_spec','style'=>'width: 250px;','value'=>$cl_lock_spec));

From 30f870da6d0f5d73cd6f33ab284ff45559d1ee13 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 17:48:04 +0000
Subject: [PATCH 0533/1848] Refactored ttNotificationHelper class for
 subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php        | 23 +++++++++++
 WEB-INF/lib/ttNotificationHelper.class.php | 44 +++++++++++++---------
 WEB-INF/lib/ttTeamHelper.class.php         | 19 ----------
 WEB-INF/templates/footer.tpl               |  2 +-
 notification_edit.php                      |  1 -
 notifications.php                          |  4 +-
 6 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 3ae408af9..4ba7805e4 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -423,4 +423,27 @@ static function getActiveInvoices()
     }
     return $result;
   }
+
+  // getNotifications - obtains notification descriptions for a group.
+  static function getNotifications() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
+    $sql = "select c.id, c.cron_spec, c.email, c.report_condition, fr.name from tt_cron c".
+      " left join tt_fav_reports fr on (fr.id = c.report_id)".
+      " where c.group_id = $group_id and c.org_id = $org_id and c.status = 1 and fr.status = 1";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index c9f0a1e9c..8e5cb8aff 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -30,15 +30,16 @@
 class ttNotificationHelper {
 	
   // get - gets notification details. 
-  static function get($id)
-  {
+  static function get($id) {
     global $user;
- 
     $mdb2 = getConnection();
 
-    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c
-      left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.id = $id and c.group_id = ".$user->getGroup();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c".
+      " left join tt_fav_reports fr on (fr.id = c.report_id)".
+      " where c.id = $id and c.group_id = $group_id and c.org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -51,25 +52,27 @@ static function get($id)
   // delete - deletes a notification from tt_cron table. 
   static function delete($id) {
     global $user;
-  	    
     $mdb2 = getConnection();
-    
-    $sql = "delete from tt_cron where id = $id and group_id = ".$user->getGroup();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "delete from tt_cron where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-  	return true;
+    return true;
   }
   
   // insert function inserts a new notification into database.
-  static function insert($fields)
-  {
+  static function insert($fields) {
     global $user;
     $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
+
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
@@ -89,12 +92,14 @@ static function insert($fields)
   } 
   
   // update function - updates a notification in database.
-  static function update($fields)
-  {
+  static function update($fields) {
+    global $user;
     $mdb2 = getConnection();
-    
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $notification_id = (int) $fields['id'];
-    $group_id = (int) $fields['group_id'];
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
@@ -104,8 +109,11 @@ static function update($fields)
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
-    $sql = "update tt_cron set cron_spec = ".$mdb2->quote($cron_spec).", next = $next, report_id = $report_id, email = ".$mdb2->quote($email).", cc = ".$mdb2->quote($cc).", subject = ".$mdb2->quote($subject).", report_condition = ".$mdb2->quote($report_condition).", status = ".$mdb2->quote($status).
-      " where id = $notification_id and group_id = $group_id";
+    $sql = "update tt_cron".
+      " set cron_spec = ".$mdb2->quote($cron_spec).", next = $next, report_id = $report_id".
+      ",  email = ".$mdb2->quote($email).", cc = ".$mdb2->quote($cc).", subject = ".$mdb2->quote($subject).
+      ", report_condition = ".$mdb2->quote($report_condition).", status = ".$mdb2->quote($status).
+      " where id = $notification_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 16896ac58..cf455405b 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -508,25 +508,6 @@ static function getExpenseItems($group_id) {
     return false;
   }
 
-  // getNotifications - obtains notification descriptions for a group.
-  static function getNotifications($group_id) {
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select c.id, c.cron_spec, c.email, c.report_condition, fr.name from tt_cron c
-      left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.group_id = $group_id and c.status = 1 and fr.status = 1";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getMonthlyQuotas - obtains monthly quotas for a group.
   static function getMonthlyQuotas($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cd126f2c8..bdd2fd617 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.29.4608 | 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.29.4609 | 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/notification_edit.php b/notification_edit.php
index 69535815d..7442305a8 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -94,7 +94,6 @@
 
     if (ttNotificationHelper::update(array(
         'id' => $notification_id,
-        'group_id' => $user->group_id,
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
         'report_id' => $cl_fav_report,
diff --git a/notifications.php b/notifications.php
index 23400beb4..d70f5b48b 100644
--- a/notifications.php
+++ b/notifications.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_advanced_settings')) {
@@ -50,7 +50,7 @@
   }
 } else {
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $notifications = ttTeamHelper::getNotifications($user->group_id);
+  $notifications = ttGroupHelper::getNotifications();
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From 35a538725eb9bc8a651a012a7bccc546aa22e6b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 Dec 2018 22:42:31 +0000
Subject: [PATCH 0534/1848] Improved access checks in notifications config.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/plugins.tpl |  2 +-
 notification_add.php          | 18 +++++++++++++++---
 notification_delete.php       | 20 +++++++++++++-------
 notification_edit.php         | 24 +++++++++++++++++++++---
 notifications.php             |  8 ++++++++
 plugins.php                   |  1 +
 user_add.php                  |  8 +++++++-
 8 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bdd2fd617..bf2c3a051 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.29.4609 | 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.29.4610 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index d31bb841a..6b88725b9 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -123,7 +123,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config"><a href="notifications.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config">{if $user_exists}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.locking.control}</td>
diff --git a/notification_add.php b/notification_add.php
index e30970afa..f1221117a 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -42,11 +42,24 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
+if ($request->isPost()) {
+  // TODO: improve this, perhaps by refactoring elsewhere.
+  $cl_fav_report = (int) $request->getParameter('fav_report');
+  $fav_report = ttFavReportHelper::getReport($cl_fav_report);
+  if ($user->getUser() != $fav_report['user_id']) {
+    header('Location: access_denied.php'); // Invalid fav report id in post.
+    exit();
+  }
+}
+// End of access checks.
 
-$fav_reports = ttFavReportHelper::getReports($user->id);
+$fav_reports = ttFavReportHelper::getReports($user->getUser());
 
 if ($request->isPost()) {
-  $cl_fav_report = trim($request->getParameter('fav_report'));
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
   $cl_email = trim($request->getParameter('email'));
   $cl_cc = trim($request->getParameter('cc'));
@@ -86,7 +99,6 @@
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); 
 
     if (ttNotificationHelper::insert(array(
-        'group_id' => $user->group_id,
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
         'report_id' => $cl_fav_report,
diff --git a/notification_delete.php b/notification_delete.php
index b18ac614f..c1f0785e2 100644
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -39,9 +39,18 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
 $cl_notification_id = (int)$request->getParameter('id');
 $notification = ttNotificationHelper::get($cl_notification_id);
+if (!$notification) {
+  header('Location: access_denied.php'); // Wrong notification id.
+  exit();
+}
+// End of access checks.
+
 $notification_to_delete = $notification['name'];
 
 $form = new Form('notificationDeleteForm');
@@ -51,12 +60,9 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttNotificationHelper::get($cl_notification_id)) {
-      if (ttNotificationHelper::delete($cl_notification_id)) {
-        header('Location: notifications.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
+    if (ttNotificationHelper::delete($cl_notification_id)) {
+      header('Location: notifications.php');
+      exit();
     } else
       $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
diff --git a/notification_edit.php b/notification_edit.php
index 7442305a8..de09f75ea 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -42,12 +42,30 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
+$notification_id = (int)$request->getParameter('id');
+$notification = ttNotificationHelper::get($notification_id);
+if (!$notification) {
+  header('Location: access_denied.php'); // Wrong notification id.
+  exit();
+}
+if ($request->isPost()) {
+  // TODO: improve this, perhaps by refactoring elsewhere.
+  $cl_fav_report = (int) $request->getParameter('fav_report');
+  $fav_report = ttFavReportHelper::getReport($cl_fav_report);
+  if ($user->getUser() != $fav_report['user_id']) {
+    header('Location: access_denied.php'); // Invalid fav report id in post.
+    exit();
+  }
+}
+// End of access checks.
 
-$notification_id = (int) $request->getParameter('id');
-$fav_reports = ttFavReportHelper::getReports($user->id);
+$fav_reports = ttFavReportHelper::getReports($user->getUser());
 
 if ($request->isPost()) {
-  $cl_fav_report = trim($request->getParameter('fav_report'));
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
   $cl_email = trim($request->getParameter('email'));
   $cl_cc = trim($request->getParameter('cc'));
diff --git a/notifications.php b/notifications.php
index d70f5b48b..7fe0e11d1 100644
--- a/notifications.php
+++ b/notifications.php
@@ -39,6 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
+// End of access checks.
+
+// TODO: extend and re-design notifications.
+// Currently they only work with fav reports, which are bound to users.
 
 $form = new Form('notificationsForm');
 
diff --git a/plugins.php b/plugins.php
index e036c1738..a19c1e128 100644
--- a/plugins.php
+++ b/plugins.php
@@ -174,6 +174,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
+$smarty->assign('user_exists', $user->exists());
 $smarty->assign('title', $i18n->get('title.plugins'));
 $smarty->assign('content_page_name', 'plugins.tpl');
 $smarty->display('index.tpl');
diff --git a/user_add.php b/user_add.php
index 8a507e9ee..9fa611294 100644
--- a/user_add.php
+++ b/user_add.php
@@ -157,7 +157,13 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
         'email' => $cl_email);
-      if (ttUserHelper::insert($fields)) {
+      $user_id = ttUserHelper::insert($fields);
+      if ($user_id) {
+        if (!$user->exists()) {
+          // We added a user to an empty subgroup. Set new user as on behalf user.
+          // Needed for user-based things to work (such as notifications config).
+          $user->setOnBehalfUser($user_id);
+        }
         header('Location: users.php');
         exit();
       } else

From 95c5359666f6dae7d0426f0a1fc41c925b996086 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 14:13:54 +0000
Subject: [PATCH 0535/1848] Improved cron.php security-wise with a more
 specific sql.

---
 WEB-INF/templates/footer.tpl | 2 +-
 cron.php                     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bf2c3a051..9c086022f 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.29.4610 | 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.29.4611 | 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/cron.php b/cron.php
index eabcaa05c..98c1456fe 100644
--- a/cron.php
+++ b/cron.php
@@ -47,10 +47,10 @@
 $mdb2 = getConnection();
 $now = time();
 
- $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c
-   left join tt_fav_reports fr on (c.report_id = fr.id)
-   where $now >= c.next and fr.status = 1
-   and c.status = 1 and c.report_id is not null and c.email is not null";
+ $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c".
+   " inner join tt_fav_reports fr on (c.report_id = fr.id and c.group_id = fr.group_id and c.org_id = fr.org_id)".
+   " where $now >= c.next and fr.status = 1".
+   " and c.status = 1 and c.report_id is not null and c.email is not null";
 $res = $mdb2->query($sql);
 if (is_a($res, 'PEAR_Error'))
   exit();

From f32f30fa61a2937ea1bda8b28b748c854b997f15 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 15:12:26 +0000
Subject: [PATCH 0536/1848] Starting refactoring ttFavReportHelper class for
 subgroups.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 10 ++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 notification_add.php                    |  2 +-
 notification_edit.php                   |  2 +-
 reports.php                             |  2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 36600e219..3625c9de0 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -32,11 +32,17 @@
 class ttFavReportHelper {
 
   // getReports - returns an array of favorite reports for user.
-  static function getReports($user_id) {
+  static function getReports() {
+    global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $result = array();
-    $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1";
+    $sql = "select * from tt_fav_reports".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9c086022f..8e93961ac 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.29.4611 | 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.29.4612 | 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/notification_add.php b/notification_add.php
index f1221117a..e7f541bb9 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -57,7 +57,7 @@
 }
 // End of access checks.
 
-$fav_reports = ttFavReportHelper::getReports($user->getUser());
+$fav_reports = ttFavReportHelper::getReports();
 
 if ($request->isPost()) {
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
diff --git a/notification_edit.php b/notification_edit.php
index de09f75ea..5755e95cc 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -63,7 +63,7 @@
 }
 // End of access checks.
 
-$fav_reports = ttFavReportHelper::getReports($user->getUser());
+$fav_reports = ttFavReportHelper::getReports();
 
 if ($request->isPost()) {
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
diff --git a/reports.php b/reports.php
index 8310f5ddc..e617285c9 100644
--- a/reports.php
+++ b/reports.php
@@ -53,7 +53,7 @@
 $form = new Form('reportForm');
 
 // Get saved favorite reports for user.
-$report_list = ttFavReportHelper::getReports($user->id);
+$report_list = ttFavReportHelper::getReports();
 $form->addInput(array('type'=>'combobox',
   'name'=>'favorite_report',
   'onchange'=>'document.reportForm.fav_report_changed.value=1;document.reportForm.submit();',

From bfaedf194df864a24ea4a44c359435be68983909 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 15:16:26 +0000
Subject: [PATCH 0537/1848] Refactoring.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8e93961ac..7e5b94b1a 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.29.4612 | 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.29.4613 | 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/reports.php b/reports.php
index e617285c9..f4306961e 100644
--- a/reports.php
+++ b/reports.php
@@ -56,7 +56,7 @@
 $report_list = ttFavReportHelper::getReports();
 $form->addInput(array('type'=>'combobox',
   'name'=>'favorite_report',
-  'onchange'=>'document.reportForm.fav_report_changed.value=1;document.reportForm.submit();',
+  'onchange'=>'this.form.fav_report_changed.value=1;this.form.submit();',
   'style'=>'width: 250px;',
   'data'=>$report_list,
   'datakeys'=>array('id','name'),

From 63413a7d9e47dbd3d91de82e02f8c6d4ee4d4c21 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 16:02:00 +0000
Subject: [PATCH 0538/1848] Some more refactoring in notification config.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 23 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 notification_add.php                    | 12 +++++-------
 notification_edit.php                   | 14 ++++++--------
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 3625c9de0..a1f2b945d 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -53,7 +53,30 @@ static function getReports() {
     return false;
   }
 
+  // get - returns a report identified by its id for user.
+  static function get($id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select * from tt_fav_reports".
+      " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if ($val = $res->fetchRow()) {
+        return $val;
+      }
+    }
+    return false;
+  }
+
   // getReport - returns a report identified by its id.
+  // TODO: get rid of this function by encapsulating all cron related tasks in its own class.
+  // Because cron works for all orgs and we want this class to always work in context of
+  // a logged on user, for better security.
   static function getReport($id) {
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7e5b94b1a..eb75ce260 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.29.4613 | 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.29.4614 | 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/notification_add.php b/notification_add.php
index e7f541bb9..05a095468 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -47,10 +47,8 @@
   exit();
 }
 if ($request->isPost()) {
-  // TODO: improve this, perhaps by refactoring elsewhere.
-  $cl_fav_report = (int) $request->getParameter('fav_report');
-  $fav_report = ttFavReportHelper::getReport($cl_fav_report);
-  if ($user->getUser() != $fav_report['user_id']) {
+  $cl_fav_report_id = (int) $request->getParameter('fav_report');
+  if (!ttFavReportHelper::get($cl_fav_report_id)) {
     header('Location: access_denied.php'); // Invalid fav report id in post.
     exit();
   }
@@ -73,7 +71,7 @@
 $form->addInput(array('type'=>'combobox',
   'name'=>'fav_report',
   'style'=>'width: 250px;',
-  'value'=>$cl_fav_report,
+  'value'=>$cl_fav_report_id,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.select'))
@@ -87,7 +85,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $err->add($i18n->get('error.report'));
+  if (!$cl_fav_report_id) $err->add($i18n->get('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
   if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
@@ -101,7 +99,7 @@
     if (ttNotificationHelper::insert(array(
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
-        'report_id' => $cl_fav_report,
+        'report_id' => $cl_fav_report_id,
         'email' => $cl_email,
         'cc' => $cl_cc,
         'subject' => $cl_subject,
diff --git a/notification_edit.php b/notification_edit.php
index 5755e95cc..90b84e5a3 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -53,10 +53,8 @@
   exit();
 }
 if ($request->isPost()) {
-  // TODO: improve this, perhaps by refactoring elsewhere.
-  $cl_fav_report = (int) $request->getParameter('fav_report');
-  $fav_report = ttFavReportHelper::getReport($cl_fav_report);
-  if ($user->getUser() != $fav_report['user_id']) {
+  $cl_fav_report_id = (int) $request->getParameter('fav_report');
+  if ($cl_fav_report_id && !ttFavReportHelper::get($cl_fav_report_id)) {
     header('Location: access_denied.php'); // Invalid fav report id in post.
     exit();
   }
@@ -73,7 +71,7 @@
   $cl_report_condition = trim($request->getParameter('report_condition'));
 } else {
   $notification = ttNotificationHelper::get($notification_id);
-  $cl_fav_report = $notification['report_id'];
+  $cl_fav_report_id = $notification['report_id'];
   $cl_cron_spec = $notification['cron_spec'];
   $cl_email = $notification['email'];
   $cl_cc = $notification['cc'];
@@ -86,7 +84,7 @@
 $form->addInput(array('type'=>'combobox',
   'name'=>'fav_report',
   'style'=>'width: 250px;',
-  'value'=>$cl_fav_report,
+  'value'=>$cl_fav_report_id,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -99,7 +97,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $err->add($i18n->get('error.report'));
+  if (!$cl_fav_report_id) $err->add($i18n->get('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
   if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
@@ -114,7 +112,7 @@
         'id' => $notification_id,
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
-        'report_id' => $cl_fav_report,
+        'report_id' => $cl_fav_report_id,
         'email' => $cl_email,
         'cc' => $cl_cc,
         'subject' => $cl_subject,

From d537315bdd0072e25558ba006bfbfba13a84b8d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 18:56:53 +0000
Subject: [PATCH 0539/1848] A bit more refactoring.

---
 WEB-INF/lib/ttFavReportHelper.class.php |  1 -
 WEB-INF/templates/footer.tpl            |  2 +-
 password_change.php                     | 31 ++++++++++++++-----------
 password_reset.php                      |  6 ++---
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index a1f2b945d..b056bd819 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -72,7 +72,6 @@ static function get($id) {
     }
     return false;
   }
-
   // getReport - returns a report identified by its id.
   // TODO: get rid of this function by encapsulating all cron related tasks in its own class.
   // Because cron works for all orgs and we want this class to always work in context of
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eb75ce260..63adffd9f 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.29.4614 | 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.29.4615 | 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/password_change.php b/password_change.php
index 2dce99f9a..b4e577557 100644
--- a/password_change.php
+++ b/password_change.php
@@ -33,27 +33,30 @@
 
 $auth->doLogout();
 
+// Access checks.
 $cl_ref = $request->getParameter('ref');
 if (!$cl_ref || $auth->isPasswordExternal()) {
   header('Location: login.php');
   exit();
 }
-
-// Get user ID.
 $user_id = ttUserHelper::getUserIdByTmpRef($cl_ref);
-if ($user_id) {
-  $user = new ttUser(null, $user_id); // Note: reusing $user from initialize.php.
-  // In case user language is different - reload $i18n.
-  if ($i18n->lang != $user->lang) {
-    $i18n->load($user->lang);
-    $smarty->assign('i18n', $i18n->keys);
-  }
-  if ($user->custom_logo) {
-    $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
-    $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
-  }
-  $smarty->assign('user', $user);
+if (!$user_id) {
+  header('Location: access_denied.php'); // No user found by provided reference.
+  exit();
+}
+// End of access checks.
+
+$user = new ttUser(null, $user_id); // Note: reusing $user from initialize.php.
+// In case user language is different - reload $i18n.
+if ($i18n->lang != $user->lang) {
+  $i18n->load($user->lang);
+  $smarty->assign('i18n', $i18n->keys);
+}
+if ($user->custom_logo) {
+  $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
+  $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
 }
+$smarty->assign('user', $user);
 
 $cl_password1 = $request->getParameter('password1');
 $cl_password2 = $request->getParameter('password2');
diff --git a/password_reset.php b/password_reset.php
index 1ee4711ed..4d4e24867 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -36,13 +36,13 @@
   exit();
 }
 
+$cl_login = $request->getParameter('login');
+
 $form = new Form('resetPasswordForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;'));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.reset_password')));
 
 if ($request->isPost()) {
-  $cl_login = $request->getParameter('login');
-
   // Validate user input.
   if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
 

From 2469578bc42cdad7caf9ca05855726be8e953fbc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 19:26:42 +0000
Subject: [PATCH 0540/1848] Removed group selector from plugins.php to keep
 things simple.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/plugins.tpl |  7 ------
 plugins.php                   | 40 ++++-------------------------------
 3 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 63adffd9f..507e6e5a1 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.29.4615 | 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.29.4616 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 6b88725b9..11514d16a 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -89,13 +89,6 @@ function handlePluginCheckboxes() {
 <table cellspacing="4" cellpadding="7" border="0">
     <tr>
       <td>
-{if $group_dropdown}
-        <table width="100%">
-          <tr>
-            <td align="center">{$i18n.label.group}: {$forms.pluginsForm.group.control}</td>
-          </tr>
-        </table>
-{/if}
         <table cellspacing="1" cellpadding="2" border="0">
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.charts.control}</td>
diff --git a/plugins.php b/plugins.php
index a19c1e128..5027420e0 100644
--- a/plugins.php
+++ b/plugins.php
@@ -34,24 +34,9 @@
   header('Location: access_denied.php');
   exit();
 }
-if ($request->isPost()) {
-  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
-  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
-    exit();
-  }
-}
 // End of access checks.
 
-// Determine group for which we display this page.
-if ($request->isPost() && $groupChanged) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-} else {
-  $group_id = $user->getGroup();
-}
-
-if ($request->isPost() && $request->getParameter('btn_save')) {
+if ($request->isPost()) {
   // Plugins that user wants to save for the current group.
   $cl_charts = $request->getParameter('charts');
   $cl_clients = $request->getParameter('clients');
@@ -86,21 +71,7 @@
 }
 
 $form = new Form('pluginsForm');
-// Group dropdown.
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.pluginsForm.group_changed.value=1;document.pluginsForm.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
+
 // Plugin checkboxes.
 $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
 $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
@@ -118,12 +89,9 @@
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
-if ($request->isPost() && $request->getParameter('btn_save')) {
+if ($request->isPost()) {
   // Note: we get here when the Save button is clicked.
-  // We update plugin list for the currently selected group.
-  //
-  // We don't get here if group changed in post.
-  // In this case the page is simply re-displayed for new group.
+  // We update plugin list for the current group.
 
   // Prepare plugins string.
   if ($cl_charts)

From 35727570b2274aca4f0d816372dabfc93d00cf2d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Dec 2018 22:50:43 +0000
Subject: [PATCH 0541/1848] Refactored predefined expenses config for
 subgroups.

---
 WEB-INF/templates/footer.tpl                  |  2 +-
 WEB-INF/templates/predefined_expense_add.tpl  |  2 +-
 WEB-INF/templates/predefined_expense_edit.tpl |  2 +-
 predefined_expense_delete.php                 | 17 ++++++++++-------
 predefined_expense_edit.php                   |  8 ++++++--
 predefined_expenses.php                       |  1 +
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 507e6e5a1..ed2a2f050 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.29.4616 | 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.29.4617 | 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/predefined_expense_add.tpl b/WEB-INF/templates/predefined_expense_add.tpl
index 1bb788df9..fd2983a70 100644
--- a/WEB-INF/templates/predefined_expense_add.tpl
+++ b/WEB-INF/templates/predefined_expense_add.tpl
@@ -9,7 +9,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.predefinedExpenseForm.cost.control} {$user->currency|escape}</td>
+          <td>{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
         </tr>
         <tr>
           <td height="40"></td>
diff --git a/WEB-INF/templates/predefined_expense_edit.tpl b/WEB-INF/templates/predefined_expense_edit.tpl
index c9947aecf..f53b512ad 100644
--- a/WEB-INF/templates/predefined_expense_edit.tpl
+++ b/WEB-INF/templates/predefined_expense_edit.tpl
@@ -9,7 +9,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.predefinedExpenseForm.cost.control} {$user->currency|escape}</td>
+          <td>{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
         </tr>
         <tr>
           <td height="40"></td>
diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index 9b4450325..d8fc057fc 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -39,9 +39,15 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $cl_predefined_expense_id = (int)$request->getParameter('id');
 $predefined_expense = ttPredefinedExpenseHelper::get($cl_predefined_expense_id);
+if (!$predefined_expense) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+
 $predefined_expense_to_delete = $predefined_expense['name'];
 
 $form = new Form('predefinedExpenseDeleteForm');
@@ -51,12 +57,9 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttPredefinedExpenseHelper::get($cl_predefined_expense_id)) {
-      if (ttPredefinedExpenseHelper::delete($cl_predefined_expense_id)) {
-        header('Location: predefined_expenses.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
+    if (ttPredefinedExpenseHelper::delete($cl_predefined_expense_id)) {
+      header('Location: predefined_expenses.php');
+      exit();
     } else
       $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index ab2299c0a..3f0cb0c8c 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -39,14 +39,18 @@
   header('Location: feature_disabled.php');
   exit();
 }
-
 $predefined_expense_id = (int) $request->getParameter('id');
+$predefined_expense = ttPredefinedExpenseHelper::get($predefined_expense_id);
+if (!$predefined_expense) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_cost = trim($request->getParameter('cost'));
 } else {
-  $predefined_expense = ttPredefinedExpenseHelper::get($predefined_expense_id);
   $cl_name = $predefined_expense['name'];
   $cl_cost = $predefined_expense['cost'];
 }
diff --git a/predefined_expenses.php b/predefined_expenses.php
index 99c2c899f..e1c14d802 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -39,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 $form = new Form('predefinedExpensesForm');
 

From a3eb3cd074e8b579c9948a6b12587f033ecb3c7e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 14:05:19 +0000
Subject: [PATCH 0542/1848] Refactored profile_edit.php for subgroups.

---
 WEB-INF/lib/ttUserHelper.class.php | 27 ++++++++++++++++++-------
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/header.tpl       |  2 +-
 predefined_expense_add.php         |  1 +
 profile_edit.php                   | 32 ++++++++++++++++++++----------
 5 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 0d628f6d0..f91128e7e 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -146,16 +146,27 @@ static function update($user_id, $fields) {
     $mdb2 = getConnection();
 
     // Check parameters.
-    if (!$user_id || !isset($fields['login']))
+    if (!$user_id)
       return false;
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Prepare query parts.
+    if (isset($fields['login'])) {
+      $login_part = ", login = ".$mdb2->quote($fields['login']);
+    }
+
     if (isset($fields['password']))
       $pass_part = ', password = md5('.$mdb2->quote($fields['password']).')';
-    if (in_array('manage_users', $user->rights)) {
+
+    if (isset($fields['name']))
+      $name_part = ', name = '.$mdb2->quote($fields['name']);
+
+    if ($user->can('manage_users')) {
       if (isset($fields['role_id'])) {
         $role_id = (int) $fields['role_id'];
-        $role_id_part = ", role_id = $role_id";
+        $role_part = ", role_id = $role_id";
       }
       if (array_key_exists('client_id', $fields)) // Could be NULL.
         $client_part = ", client_id = ".$mdb2->quote($fields['client_id']);
@@ -167,17 +178,19 @@ static function update($user_id, $fields) {
       $rate_part = ", rate = ".$mdb2->quote($rate); 
     }
 
+    if (isset($fields['email']))
+      $email_part = ', email = '.$mdb2->quote($fields['email']);
+
     if (isset($fields['status'])) {
       $status = (int) $fields['status']; 
       $status_part = ", status = $status";
     }
 
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+    $parts = ltrim($login_part.$pass_part.$name_part.$role_part.$client_part.$rate_part.$email_part.$modified_part.$status_part, ',');
 
-    $sql = "update tt_users set login = ".$mdb2->quote($fields['login']).
-      "$pass_part, name = ".$mdb2->quote($fields['name']).
-      "$role_id_part $client_part $rate_part $modified_part $status_part, email = ".$mdb2->quote($fields['email']).
-      " where id = $user_id";
+    $sql = "update tt_users set $parts".
+      " where id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ed2a2f050..d703090c2 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.29.4617 | 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.29.4618 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 052702975..546fffaa1 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -83,7 +83,7 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
-    {if $user->can('manage_own_settings')}
+    {if $user->exists() && $user->can('manage_own_settings')}
             <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
     {/if}
     {if $user->can('manage_basic_settings')}
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 0bff7e051..2a0ab6be9 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -39,6 +39,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
diff --git a/profile_edit.php b/profile_edit.php
index 9de1820ee..d0d3de5fe 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -36,9 +36,15 @@
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php');  // No users in subgroup.
+  exit();
+}
 // End of access checks.
 
-$can_manage_account = $user->can('manage_own_account');
+$can_manage_account = $user->behalfGroup ? $user->can('manage_subgroups') : $user->can('manage_own_account');
+if ($user->behalf_id) $user_details = $user->getUserDetails($user->behalf_id);
+$current_login = $user->behalf_id ? $user_details['login'] : $user->login;
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -49,9 +55,15 @@
   }
   $cl_email = trim($request->getParameter('email'));
 } else {
-  $cl_name = $user->name;
-  $cl_login = $user->login;
-  $cl_email = $user->email;
+  if ($user->behalf_id) {
+    $cl_name = $user_details['name'];
+    $cl_login = $user_details['login'];
+    $cl_email = $user_details['email'];
+  } else {
+    $cl_name = $user->name;
+    $cl_login = $user->login;
+    $cl_email = $user->email;
+  }
 }
 
 $form = new Form('profileForm');
@@ -70,7 +82,7 @@
   if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
 
   // New login must be unique.
-  if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
+  if ($cl_login != $current_login && ttUserHelper::getUserByLogin($cl_login))
     $err->add($i18n->get('error.user_exists'));
 
   if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
@@ -83,12 +95,10 @@
   // Finished validating user input.
 
   if ($err->no()) {
-    $update_result = ttUserHelper::update($user->id, array(
-        'name' => $cl_name,
-        'login' => $cl_login,
-        'password' => $cl_password1,
-        'email' => $cl_email,
-        'status' => ACTIVE));
+    $fields = $can_manage_account ?
+      array('name'=>$cl_name,'login'=>$cl_login,'password'=>$cl_password1,'email'=>$cl_email) :
+      array('password'=>$cl_password1);
+    $update_result = ttUserHelper::update($user->getUser(), $fields);
     if ($update_result) {
       header('Location: time.php');
       exit();

From 337ae7c9f4cf2cabcbf20f6844a6e71562263500 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 14:23:25 +0000
Subject: [PATCH 0543/1848] Removed group selector from projects.php to keep
 things simple.

---
 WEB-INF/lib/ttUser.class.php   |  2 +-
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/projects.tpl | 10 ----------
 projects.php                   | 33 ---------------------------------
 4 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5c21879bf..e6f271df8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -250,9 +250,9 @@ function getAssignedProjects()
     $result = array();
     $mdb2 = getConnection();
 
+    $user_id = $this->getUser();
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
-    $user_id = $this->getUser();
 
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p".
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d703090c2..d6037b025 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.29.4618 | 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.29.4619 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 09966a843..589993652 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -6,16 +6,6 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_projects')}
-  {if $group_dropdown}
-{$forms.projectsForm.open} {* projectsForm consists only of one dropdown group control *}
-      <table width="100%">
-        <tr>
-          <td align="center">{$i18n.label.group}: {$forms.projectsForm.group.control}</td>
-        </tr>
-      </table>
-{$forms.projectsForm.close}
-  {/if}
-
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
diff --git a/projects.php b/projects.php
index 8b4537e79..5b562366e 100644
--- a/projects.php
+++ b/projects.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -40,46 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
-}
 // End of access checks.
 
-if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-  // Projects feature may not be available in new group, check and redirect.
-  if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-    header('Location: feature_disabled.php');
-    exit();
-  }
-} else {
-  $group_id = $user->getGroup();
-}
-
-$form = new Form('projectsForm');
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
-
 if($user->can('manage_projects')) {
   $active_projects = ttGroupHelper::getActiveProjects();
   $inactive_projects = ttGroupHelper::getInactiveProjects();
 } else
   $active_projects = $user->getAssignedProjects();
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
 $smarty->assign('title', $i18n->get('title.projects'));

From 01654e65fdac375c1db8317a956b727987c98c04 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 14:51:25 +0000
Subject: [PATCH 0544/1848] Refactoring - ongoing.

---
 WEB-INF/lib/ttGroupHelper.class.php   | 38 +++++++++++++++++++++++++++
 WEB-INF/lib/ttProjectHelper.class.php |  3 ++-
 WEB-INF/lib/ttTeamHelper.class.php    | 38 ---------------------------
 WEB-INF/templates/footer.tpl          |  2 +-
 mobile/project_add.php                |  3 ++-
 mobile/project_edit.php               |  3 ++-
 mobile/users.php                      |  3 ++-
 project_add.php                       |  3 ++-
 project_edit.php                      |  3 ++-
 9 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 4ba7805e4..8298627ac 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -446,4 +446,42 @@ static function getNotifications() {
     }
     return false;
   }
+
+  // The getActiveUsers obtains all active users in a given group.
+  static function getActiveUsers($options = null) {
+    global $user;
+    global $i18n;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    if (isset($options['getAllFields']))
+      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.org_id = $org_id and u.status = 1 order by upper(u.name)";
+    else
+      $sql = "select id, name from tt_users where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $user_list = array();
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    while ($val = $res->fetchRow()) {
+      // Localize top manager role name, as it is not localized in db.
+      if ($val['rank'] == 512)
+        $val['role_name'] = $i18n->get('role.top_manager.label');
+      $user_list[] = $val;
+    }
+
+    if (isset($options['putSelfFirst'])) {
+      // Put own entry at the front.
+      $cnt = count($user_list);
+      for($i = 0; $i < $cnt; $i++) {
+        if ($user_list[$i]['id'] == $user->id) {
+          $self = $user_list[$i]; // Found self.
+          array_unshift($user_list, $self); // Put own entry at the front.
+          array_splice($user_list, $i+1, 1); // Remove duplicate.
+        }
+      }
+    }
+    return $user_list;
+  }
 }
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index b5fb74dc0..87d75c623 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -28,6 +28,7 @@
 
 import('ttTeamHelper');
 import('ttUserHelper');
+import('ttGroupHelper');
 
 // Class ttProjectHelper is used to help with project related tasks.
 class ttProjectHelper {
@@ -216,7 +217,7 @@ static function insert($fields)
     $last_id = $mdb2->lastInsertID('tt_projects', 'id');
 
     // Bind the project to users.
-    $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
+    $active_users = ttGroupHelper::getActiveUsers(array('getAllFields'=>true));
     foreach ($active_users as $u) {
       if(in_array($u['id'], $users)) {
         $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, status, rate) values(
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index cf455405b..2aab936a0 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -54,44 +54,6 @@ static function getUsersForClient() {
     return $user_list;
   }
 
-  // The getActiveUsers obtains all active users in a given group.
-  static function getActiveUsers($options = null) {
-    global $user;
-    global $i18n;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    if (isset($options['getAllFields']))
-      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.org_id = $org_id and u.status = 1 order by upper(u.name)";
-    else
-      $sql = "select id, name from tt_users where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $user_list = array();
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    while ($val = $res->fetchRow()) {
-      // Localize top manager role name, as it is not localized in db.
-      if ($val['rank'] == 512)
-        $val['role_name'] = $i18n->get('role.top_manager.label');
-      $user_list[] = $val;
-    }
-
-    if (isset($options['putSelfFirst'])) {
-      // Put own entry at the front.
-      $cnt = count($user_list);
-      for($i = 0; $i < $cnt; $i++) {
-        if ($user_list[$i]['id'] == $user->id) {
-          $self = $user_list[$i]; // Found self.
-          array_unshift($user_list, $self); // Put own entry at the front.
-          array_splice($user_list, $i+1, 1); // Remove duplicate.
-        }
-      }
-    }
-    return $user_list;
-  }
-
   // The swapRolesWith swaps existing user role with that of another user.
   static function swapRolesWith($user_id) {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d6037b025..dff1dd795 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.29.4619 | 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.29.4620 | 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/project_add.php b/mobile/project_add.php
index a7a540d05..a6ed2e8d9 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
@@ -42,7 +43,7 @@
 }
 // End of access checks.
 
-$users = ttTeamHelper::getActiveUsers();
+$users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 887946154..ec8c53bab 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
@@ -48,7 +49,7 @@
 }
 // End of access checks.
 
-$users = ttTeamHelper::getActiveUsers();
+$users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
diff --git a/mobile/users.php b/mobile/users.php
index 874b07634..594fa5bf1 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttTimeHelper');
 
 // Access checks.
@@ -41,7 +42,7 @@
 $uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 
 // Get users.
-$active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
+$active_users = ttGroupHelper::getActiveUsers(array('getAllFields'=>true));
 if($user->can('manage_users')) {
   $can_delete_manager = (1 == count($active_users));
   $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
diff --git a/project_add.php b/project_add.php
index 9800b7215..53cad4bc7 100644
--- a/project_add.php
+++ b/project_add.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
@@ -42,7 +43,7 @@
 }
 // End of access checks.
 
-$users = ttTeamHelper::getActiveUsers();
+$users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
diff --git a/project_edit.php b/project_edit.php
index 542fb4647..14f319e90 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
@@ -48,7 +49,7 @@
 }
 // End of access checks.
 
-$users = ttTeamHelper::getActiveUsers();
+$users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 

From 38dd91dcf8a9ecf6b7ceb73a9aabf787b96b6f6e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 15:41:22 +0000
Subject: [PATCH 0545/1848] More refactoring for subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php | 21 +++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php  | 17 -----------------
 WEB-INF/templates/footer.tpl        |  2 +-
 mobile/project_add.php              |  3 +--
 mobile/project_edit.php             |  3 +--
 mobile/tasks.php                    |  3 ++-
 mobile/time.php                     |  3 +--
 mobile/time_edit.php                |  3 +--
 mobile/timer.php                    |  3 +--
 project_add.php                     |  3 +--
 project_edit.php                    |  3 +--
 reports.php                         |  3 ++-
 tasks.php                           |  3 ++-
 time.php                            |  3 +--
 time_edit.php                       |  3 +--
 week.php                            |  3 +--
 16 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 8298627ac..801793ffd 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -484,4 +484,25 @@ static function getActiveUsers($options = null) {
     }
     return $user_list;
   }
+
+  // getActiveTasks - returns an array of active tasks for a group.
+  static function getActiveTasks()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description from tt_tasks".
+      " where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 2aab936a0..6aa7b917d 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -157,23 +157,6 @@ static function getAllProjects($group_id, $all_fields = false) {
     return false;
   }
 
-  // getActiveTasks - returns an array of active tasks for a group.
-  static function getActiveTasks($group_id)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql = "select id, name, description from tt_tasks where group_id = $group_id and status = 1 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // getInactiveTasks - returns an array of inactive tasks for a group.
   static function getInactiveTasks($group_id)
   {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dff1dd795..60f6f55c9 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.29.4620 | 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.29.4621 | 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/project_add.php b/mobile/project_add.php
index a6ed2e8d9..aa3e40f73 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -29,7 +29,6 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttProjectHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -47,7 +46,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->group_id);
+$tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index ec8c53bab..afe999536 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -29,7 +29,6 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttProjectHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -53,7 +52,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->group_id);
+$tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
diff --git a/mobile/tasks.php b/mobile/tasks.php
index 0667bc3bd..67adab041 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
@@ -42,7 +43,7 @@
 // End of access checks.
 
 if($user->can('manage_tasks')) {
-  $active_tasks = ttTeamHelper::getActiveTasks($user->getGroup());
+  $active_tasks = ttGroupHelper::getActiveTasks();
   $inactive_tasks = ttTeamHelper::getInactiveTasks($user->getGroup());
 } else
   $active_tasks = $user->getAssignedTasks();
diff --git a/mobile/time.php b/mobile/time.php
index 9e51633b2..6bacd0842 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -29,7 +29,6 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -147,7 +146,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 60a14e2c6..cdd507077 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -29,7 +29,6 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -164,7 +163,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/mobile/timer.php b/mobile/timer.php
index 184e6274c..73035a395 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -29,7 +29,6 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -145,7 +144,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/project_add.php b/project_add.php
index 53cad4bc7..e8f988834 100644
--- a/project_add.php
+++ b/project_add.php
@@ -29,7 +29,6 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttProjectHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -47,7 +46,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->getGroup());
+$tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
diff --git a/project_edit.php b/project_edit.php
index 14f319e90..7f48c910c 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -29,7 +29,6 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttProjectHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -53,7 +52,7 @@
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->getGroup());
+$tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
diff --git a/reports.php b/reports.php
index f4306961e..31209995e 100644
--- a/reports.php
+++ b/reports.php
@@ -31,6 +31,7 @@
 import('form.ActionForm');
 import('DateAndTime');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('Period');
 import('ttProjectHelper');
 import('ttFavReportHelper');
@@ -106,7 +107,7 @@
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/tasks.php b/tasks.php
index 6c79fd50d..49d126f01 100644
--- a/tasks.php
+++ b/tasks.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
@@ -73,7 +74,7 @@
 }
 
 if($user->can('manage_tasks')) {
-  $active_tasks = ttTeamHelper::getActiveTasks($group_id);
+  $active_tasks = ttGroupHelper::getActiveTasks();
   $inactive_tasks = ttTeamHelper::getInactiveTasks($group_id);
 } else
   $active_tasks = $user->getAssignedTasks();
diff --git a/time.php b/time.php
index a428b9a2b..066653100 100644
--- a/time.php
+++ b/time.php
@@ -30,7 +30,6 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttGroupHelper');
-import('ttTeamHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -224,7 +223,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
-  $task_list = ttTeamHelper::getActiveTasks($group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/time_edit.php b/time_edit.php
index 4b3f4c2c0..16f69d2ab 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -29,7 +29,6 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -167,7 +166,7 @@
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
diff --git a/week.php b/week.php
index 289d95127..edba8996e 100644
--- a/week.php
+++ b/week.php
@@ -32,7 +32,6 @@
 import('form.Table');
 import('form.TextField');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('ttWeekViewHelper');
 import('ttClientHelper');
@@ -299,7 +298,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',

From ef3d1adc569966ab70efa4c780e2165cccaaa205 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 15:54:42 +0000
Subject: [PATCH 0546/1848] Some more refactoring for subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php | 21 +++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php  | 18 ------------------
 WEB-INF/templates/footer.tpl        |  2 +-
 mobile/tasks.php                    |  3 +--
 tasks.php                           |  3 +--
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 801793ffd..0e45110c0 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -505,4 +505,25 @@ static function getActiveTasks()
     }
     return $result;
   }
+
+  // getInactiveTasks - returns an array of inactive tasks for a group.
+  static function getInactiveTasks()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description from tt_tasks".
+      " where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6aa7b917d..aa3893c65 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -157,24 +157,6 @@ static function getAllProjects($group_id, $all_fields = false) {
     return false;
   }
 
-  // getInactiveTasks - returns an array of inactive tasks for a group.
-  static function getInactiveTasks($group_id)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql = "select id, name, description from tt_tasks
-      where group_id = $group_id and status = 0 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllTasks obtains all tasks in a group.
   static function getAllTasks($group_id, $all_fields = false) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 60f6f55c9..96e605845 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.29.4621 | 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.29.4622 | 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/tasks.php b/mobile/tasks.php
index 67adab041..2745df23a 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -28,7 +28,6 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -44,7 +43,7 @@
 
 if($user->can('manage_tasks')) {
   $active_tasks = ttGroupHelper::getActiveTasks();
-  $inactive_tasks = ttTeamHelper::getInactiveTasks($user->getGroup());
+  $inactive_tasks = ttGroupHelper::getInactiveTasks();
 } else
   $active_tasks = $user->getAssignedTasks();
 
diff --git a/tasks.php b/tasks.php
index 49d126f01..ba91ed01c 100644
--- a/tasks.php
+++ b/tasks.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttGroupHelper');
 
 // Access checks.
@@ -75,7 +74,7 @@
 
 if($user->can('manage_tasks')) {
   $active_tasks = ttGroupHelper::getActiveTasks();
-  $inactive_tasks = ttTeamHelper::getInactiveTasks($group_id);
+  $inactive_tasks = ttGroupHelper::getInactiveTasks();
 } else
   $active_tasks = $user->getAssignedTasks();
 

From 6ab97ede1a08afd9f703a713b0eb6addd560a589 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 17:34:37 +0000
Subject: [PATCH 0547/1848] A bit more refactoring for subgroups.

---
 WEB-INF/lib/ttProjectHelper.class.php | 5 +++--
 WEB-INF/templates/footer.tpl          | 2 +-
 mobile/project_add.php                | 5 +----
 mobile/project_edit.php               | 5 +----
 project_add.php                       | 5 +----
 project_edit.php                      | 5 +----
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 87d75c623..06dcd2866 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -196,10 +196,11 @@ static function delete($id) {
   // insert function inserts a new project into database.
   static function insert($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $name = $fields['name'];
     $description = $fields['description'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 96e605845..1cb0da709 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.29.4622 | 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.29.4623 | 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/project_add.php b/mobile/project_add.php
index aa3e40f73..98f7c064b 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -77,10 +77,7 @@
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'name' => $cl_name,
+      if (ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index afe999536..40728aaf7 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -118,10 +118,7 @@
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,
diff --git a/project_add.php b/project_add.php
index e8f988834..e00a0316f 100644
--- a/project_add.php
+++ b/project_add.php
@@ -77,10 +77,7 @@
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'name' => $cl_name,
+      if (ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
diff --git a/project_edit.php b/project_edit.php
index 7f48c910c..6fe082873 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -117,10 +117,7 @@
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,

From c059d4ceb33fc1a959028abd85808e33b910cf7e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 18:40:14 +0000
Subject: [PATCH 0548/1848] Added validation of checkbox group input on project
 config.

---
 WEB-INF/lib/ttGroupHelper.class.php | 38 +++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |  2 +-
 mobile/project_add.php              |  2 ++
 mobile/project_edit.php             |  2 ++
 project_add.php                     |  2 ++
 project_edit.php                    |  2 ++
 6 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 0e45110c0..780e39ed6 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -526,4 +526,42 @@ static function getInactiveTasks()
     }
     return $result;
   }
+
+  // validateCheckboxGroupInput - validates user input in a group of checkboxes
+  // in context of a specific database table.
+  //
+  // We need to make sure that input is a set of unique positive integers, and is
+  // "relevant" to the current group (entities exists in table).
+  //
+  // It is a safeguard against manipulation of data in posts.
+  static function validateCheckboxGroupInput($input, $table) {
+    // Empty input is valid.
+    if (!$input) return true;
+
+    // Input containing duplicates is invalid.
+    if (count($input) !== count(array_unique($input))) return false;
+
+    // Input containing anything but positive integers is invalid.
+    foreach ($input as $single_selection) {
+      if (!is_numeric($single_selection) || $single_selection <= 0) return false;
+    }
+
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // Now check the table. It must contain all entities associated with current group and org.
+    $comma_separated = implode(',', $input);
+    $sql = "select count(*) as item_count from $table".
+      " where id in ($comma_separated) and group_id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    $val = $res->fetchRow();
+    if (count($input) != $val['item_count'])
+      return false; // Number of entities in table is different.
+
+    return true; // All is good.
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1cb0da709..4631c2ec0 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.29.4623 | 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.29.4624 | 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/project_add.php b/mobile/project_add.php
index 98f7c064b..6f6f452d4 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -74,6 +74,8 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 40728aaf7..8bccd1107 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -95,6 +95,8 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
diff --git a/project_add.php b/project_add.php
index e00a0316f..70327eb36 100644
--- a/project_add.php
+++ b/project_add.php
@@ -74,6 +74,8 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
diff --git a/project_edit.php b/project_edit.php
index 6fe082873..106e657bc 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -94,6 +94,8 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {

From f4916707c8af136a72a12933d01a5fea1a4322ab Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 Dec 2018 20:04:40 +0000
Subject: [PATCH 0549/1848] Refactoring in ttProjectHelper class.

---
 WEB-INF/lib/ttProjectHelper.class.php | 84 ++++++++++++++-------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 06dcd2866..455076fa7 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -34,17 +34,18 @@
 class ttProjectHelper {
 	
   // getAssignedProjects - returns an array of assigned projects.
-  static function getAssignedProjects($user_id)
-  {
+  static function getAssignedProjects($user_id) {
     global $user;
-  	
-    $result = array();
     $mdb2 = getConnection();
-    
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.tasks, upb.rate from tt_projects p".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
-      " where p.group_id = ".$user->getGroup()." and p.status = 1 order by p.name";
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -55,20 +56,21 @@ static function getAssignedProjects($user_id)
   }
 
   // getRates - returns an array of project rates for user, including deassigned and deactivated projects.
-  static function getRates($user_id)
-  {
+  static function getRates($user_id) {
     global $user;
-  	
-    $result = array();
     $mdb2 = getConnection();
-    
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
     $sql = "select p.id, upb.rate from tt_projects p".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id)".
-      " where group_id = ".$user->getGroup();
+      " where p.group_id = $group_id and p.org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $val['rate'] = str_replace('.', $user->decimal_mark, $val['rate']);
+        $val['rate'] = str_replace('.', $user->getDecimalMark(), $val['rate']);
         $result[] = $val;
       }
     }
@@ -76,16 +78,16 @@ static function getRates($user_id)
   }
   
   // getProjects - returns an array of active and inactive projects in group.
-  static function getProjects()
-  {
+  static function getProjects() {
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $result = array();
-    $mdb2 = getConnection();
-    
     $sql = "select id, name, tasks from tt_projects".
-      " where group_id = ".$user->getGroup()." and (status = 0 or status = 1) order by name";
-        
+      " where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -96,16 +98,17 @@ static function getProjects()
   }
 
   // getProjectsForClient - returns an array of active and inactive projects in a group for a client.
-  static function getProjectsForClient()
-  {
+  static function getProjectsForClient() {
     global $user;
-
-    $result = array();
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
     $sql = "select p.id, p.name, p.tasks from tt_projects p".
       " inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)".
-      " where p.group_id = ".$user->getGroup()." and (p.status = 0 or p.status = 1)".
+      " where p.group_id = $group_id and p.org_id = $org_id and (p.status = 0 or p.status = 1)".
       " order by p.name";
 
     $res = $mdb2->query($sql);
@@ -116,34 +119,36 @@ static function getProjectsForClient()
     }
     return $result;
   }
-  
-  
+
   // get - gets details of the project identified by its id. 
-  static function get($id)
-  {
+  static function get($id) {
     global $user;
- 
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, status, tasks from tt_projects where id = $id and group_id = ".
-            $user->getGroup()." and (status = 0 or status = 1)";
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description, status, tasks from tt_projects".
+      " where id = $id and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-	  if ($val && $val['id'])
+      if ($val && $val['id'])
         return $val;
     }
     return false;
   }
-  
+
   // The getProjectByName looks up a project by name.
   static function getProjectByName($name) {
-  	
-    $mdb2 = getConnection();
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
-    $sql = "select id from tt_projects where group_id = ".
-      $user->getGroup()." and name = ".$mdb2->quote($name).
+    $sql = "select id from tt_projects".
+      " where group_id = $group_id and org_id = $org_id and name = ".$mdb2->quote($name).
       " and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -209,8 +214,8 @@ static function insert($fields)
     $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
     $status = $fields['status'];
     
-    $sql = "insert into tt_projects (group_id, org_id, name, description, tasks, status)
-      values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_projects (group_id, org_id, name, description, tasks, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($description).", ".$mdb2->quote($comma_separated).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -251,6 +256,7 @@ static function update($fields) {
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
+
     $project_id = $fields['id']; // Project we are updating.
     $name = $fields['name']; // Project name.
     $description = $fields['description']; // Project description.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4631c2ec0..a5ede572e 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.29.4624 | 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.29.4625 | 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>

From c595ddbfdf0515e5fc91cc998bdf2bf92875c998 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 12:12:36 +0000
Subject: [PATCH 0550/1848] A bit more refactoring ttProjectHelper class for
 subgroups.

---
 WEB-INF/lib/ttProjectHelper.class.php |  5 ++---
 WEB-INF/lib/ttTeamHelper.class.php    | 19 -------------------
 WEB-INF/templates/footer.tpl          |  2 +-
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 455076fa7..fe033b9d4 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -26,7 +26,6 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttTeamHelper');
 import('ttUserHelper');
 import('ttGroupHelper');
 
@@ -235,8 +234,8 @@ static function insert($fields)
     }
 
     // Bind the project to tasks in tt_project_task_binds table.
-    $all_tasks = ttTeamHelper::getAllTasks($group_id);
-    foreach ($all_tasks as $task) {
+    $active_tasks = ttGroupHelper::getActiveTasks();
+    foreach ($active_tasks as $task) {
       if(in_array($task['id'], $tasks)) {
         $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
           " values($last_id, ".$task['id'].", $group_id, $org_id)";
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index aa3893c65..3fc06cc73 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -157,25 +157,6 @@ static function getAllProjects($group_id, $all_fields = false) {
     return false;
   }
 
-  // The getAllTasks obtains all tasks in a group.
-  static function getAllTasks($group_id, $all_fields = false) {
-    $mdb2 = getConnection();
-
-    if ($all_fields)
-      $sql = "select * from tt_tasks where group_id = $group_id order by status, upper(name)";
-    else
-      $sql = "select id, name from tt_tasks where group_id = $group_id order by status, upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getActiveRolesForUser - returns an array of relevant active roles for user with rank less than self.
   // "Relevant" means that client roles are filtered out if Client plugin is disabled.
   static function getActiveRolesForUser()
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a5ede572e..2ab232e46 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.29.4625 | 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.29.4626 | 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>

From e295d86a05616ecdae11dd1212f25625424983c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 13:10:52 +0000
Subject: [PATCH 0551/1848] Finished refactoring ttProjectHelper class for
 subgroups.

---
 WEB-INF/lib/ttProjectHelper.class.php | 63 ++++++++-------------------
 WEB-INF/templates/footer.tpl          |  2 +-
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index fe033b9d4..362a2b622 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -264,7 +264,10 @@ static function update($fields) {
     $status = $fields['status']; // Project status.
     
     // Update records in tt_user_project_binds table.
-    $sql = "select user_id, status from tt_user_project_binds where project_id = $project_id";
+    // This logic is complicated because these binds have rates associated with them.
+    // We try to recover old rates if a bind existed before and is now reactivated.
+    $sql = "select user_id, status from tt_user_project_binds".
+      " where project_id = $project_id and group_id = $group_id and org_id = $org_id";
     $all_users = array();
     $users_to_update = array();
     $res2 = $mdb2->query($sql);
@@ -273,7 +276,7 @@ static function update($fields) {
       	// Delete tt_user_project_binds record (safely).
       	ttUserHelper::deleteBind($row['user_id'], $project_id);
       } elseif (!$row['status']) {
-      	// If we are here, status of the bind is not active. Memorize such users to update their bind status.
+        // If we are here, status of the bind is not active. Memorize such users to activate their bind status.
         $users_to_update[] = $row['user_id'];  // Users we need to update in tt_user_project_binds.
       }
       $all_users[] = $row['user_id']; // All users from tt_user_project_binds for project.
@@ -281,7 +284,8 @@ static function update($fields) {
     // Insert records.
     $users_to_add = array_diff($users_to_bind, $all_users); // Users missing from tt_user_project_binds, that we need to insert.
     if(count($users_to_add) > 0) {
-      $sql = "select id, rate from tt_users where id in (".join(', ', $users_to_add).")";
+      $sql = "select id, rate from tt_users".
+        " where id in (".join(', ', $users_to_add).") and group_id = $group_id and org_id = $org_id";
       $res = $mdb2->query($sql);
       while ($row = $res->fetchRow()) {
         $user_rate[$row['id']] = $row['rate'];
@@ -296,31 +300,22 @@ static function update($fields) {
     }
     // Update status (to active) in existing tt_user_project_binds records.
     if ($users_to_update) {
-      $sql = "update tt_user_project_binds set status = 1 where project_id = $project_id and user_id in (".join(', ', $users_to_update).")";
+      $sql = "update tt_user_project_binds set status = 1".
+        " where project_id = $project_id and user_id in (".join(', ', $users_to_update).") and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
     }
     // End of updating tt_user_project_binds table.
 
-    // Update records in tt_project_task_binds table.
-    // Obtain existing task binds.
-    $existing_task_binds = array();
-    $sql = "select task_id from tt_project_task_binds where project_id = $project_id";
-    $res = $mdb2->query($sql);
-    while ($val = $res->fetchRow()) {
-      $existing_task_binds[] = $val['task_id'];
-    }
-    // Determine which task binds to delete and which ones to add.
-    $task_binds_to_delete = array_diff($existing_task_binds, $tasks_to_bind);
-    $task_binds_to_add = array_diff($tasks_to_bind, $existing_task_binds);
-    foreach ($task_binds_to_delete as $task_id) {
-      $sql = "delete from tt_project_task_binds where project_id = $project_id and task_id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-    }    
-    foreach ($task_binds_to_add as $task_id) {
+    // Update records in tt_project_task_binds table by deleting and inserting.
+    $sql = "delete from tt_project_task_binds".
+      " where project_id = $project_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    foreach ($tasks_to_bind as $task_id) {
       $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)".
         " values($project_id, $task_id, $group_id, $org_id)";
       $affected = $mdb2->exec($sql);
@@ -332,29 +327,9 @@ static function update($fields) {
     // Update project name, description, tasks and status in tt_projects table.
     $comma_separated = implode(",", $tasks_to_bind); // This is a comma-separated list of associated task ids.
     $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
-           ", tasks = ".$mdb2->quote($comma_separated).", status = $status where id = $project_id and group_id = ".$user->getGroup();
+      ", tasks = ".$mdb2->quote($comma_separated).", status = ".$mdb2->quote($status).
+      " where id = $project_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
-  
-  /*
-  // getAssignedUsers - returns an array of user ids assigned to a project.
-  static function getAssignedUsers($project_id)
-  {
-  	global $user;
-  	
-    $result = array();
-    $mdb2 = getConnection();
-    
-    // Do a query with inner join to get assigned users.
-    $sql = "select id, name from tt_users u
-      inner join tt_user_project_binds ub on (ub.user_id = u.id and ub.project_id = $project_id and ub.status = 1)";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }*/
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2ab232e46..9e1ca1404 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.29.4626 | 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.29.4627 | 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>

From a0410750589c12e822f5f3d1f6ff7f020f41e0bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 13:30:57 +0000
Subject: [PATCH 0552/1848] Refactored project add for subgroups.

---
 WEB-INF/templates/footer.tpl             | 2 +-
 WEB-INF/templates/mobile/project_add.tpl | 5 +++--
 WEB-INF/templates/project_add.tpl        | 2 +-
 mobile/project_add.php                   | 5 ++++-
 project_add.php                          | 7 ++++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9e1ca1404..1903310b3 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.29.4627 | 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.29.4628 | 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/mobile/project_add.tpl b/WEB-INF/templates/mobile/project_add.tpl
index 3aad22c20..d49b9a33e 100644
--- a/WEB-INF/templates/mobile/project_add.tpl
+++ b/WEB-INF/templates/mobile/project_add.tpl
@@ -11,13 +11,14 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.projectForm.description.control}</td>
         </tr>
+{if $show_users}
         <tr><td>&nbsp;</td></tr>
- 
         <tr>
           <td align="right">{$i18n.label.users}:</td>
           <td>{$forms.projectForm.users.control}</td>
         </tr>
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{/if}
+{if $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
diff --git a/WEB-INF/templates/project_add.tpl b/WEB-INF/templates/project_add.tpl
index 2f2fb996e..d49b9a33e 100644
--- a/WEB-INF/templates/project_add.tpl
+++ b/WEB-INF/templates/project_add.tpl
@@ -18,7 +18,7 @@
           <td>{$forms.projectForm.users.control}</td>
         </tr>
 {/if}
-{if $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $show_tasks}
+{if $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
diff --git a/mobile/project_add.php b/mobile/project_add.php
index 6f6f452d4..c8c661ed2 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -49,6 +49,7 @@
 $tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('project_name'));
@@ -66,7 +67,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if ($show_tasks)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -95,6 +96,8 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_project'));
 $smarty->assign('content_page_name', 'mobile/project_add.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/project_add.php b/project_add.php
index 70327eb36..004168045 100644
--- a/project_add.php
+++ b/project_add.php
@@ -49,6 +49,7 @@
 $tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('project_name'));
@@ -66,7 +67,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_tasks)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -94,9 +95,9 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', count($tasks) > 0);
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_project'));
 $smarty->assign('content_page_name', 'project_add.tpl');
 $smarty->display('index.tpl');

From ea116938e30f04a448b87956b7660baeec83876e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 14:32:18 +0000
Subject: [PATCH 0553/1848] Refactored project edit for subgroups.

---
 WEB-INF/lib/ttProjectHelper.class.php     | 19 +++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 WEB-INF/templates/mobile/project_edit.tpl |  4 +++-
 WEB-INF/templates/project_edit.tpl        |  2 +-
 mobile/project_edit.php                   | 17 ++++++-----------
 project_edit.php                          | 17 +++++------------
 6 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 362a2b622..31a88ccc4 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -332,4 +332,23 @@ static function update($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getAssignedUsers - returns an array of user ids assigned to a project.
+  static function getAssignedUsers($project_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
+    $sql = "select user_id from tt_user_project_binds".
+      " where project_id = $project_id and group_id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    while ($row = $res->fetchRow()) {
+      $result[] = $row['user_id'];
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1903310b3..6209ab653 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.29.4628 | 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.29.4629 | 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/mobile/project_edit.tpl b/WEB-INF/templates/mobile/project_edit.tpl
index 4a94bfeb9..871f5c1dc 100644
--- a/WEB-INF/templates/mobile/project_edit.tpl
+++ b/WEB-INF/templates/mobile/project_edit.tpl
@@ -15,12 +15,14 @@
           <td align="right">{$i18n.label.status}:</td>
           <td>{$forms.projectForm.status.control}</td>
         </tr>
+{if $show_users}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.users}:</td>
           <td>{$forms.projectForm.users.control}</td>
         </tr>
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{/if}
+{if $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
diff --git a/WEB-INF/templates/project_edit.tpl b/WEB-INF/templates/project_edit.tpl
index bcabc37ac..2a2364f20 100644
--- a/WEB-INF/templates/project_edit.tpl
+++ b/WEB-INF/templates/project_edit.tpl
@@ -22,7 +22,7 @@
           <td>{$forms.projectForm.users.control}</td>
         </tr>
 {/if}
-{if $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $show_tasks}
+{if $show_tasks}
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td align="right">{$i18n.label.tasks}:</td>
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 8bccd1107..31da38903 100644
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
@@ -55,6 +55,7 @@
 $tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('project_name'));
@@ -66,15 +67,7 @@
   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];
-
-  $mdb2 = getConnection();
-  $sql = "select user_id from tt_user_project_binds where status = 1 and project_id = $cl_project_id";
-  $res = $mdb2->query($sql);
-  if (is_a($res, 'PEAR_Error'))
-    die($res->getMessage());
-  while ($row = $res->fetchRow())
-    $cl_users[] = $row['user_id'];
-
+  $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
   $cl_tasks = explode(',', $project['tasks']);
 }
 
@@ -85,7 +78,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if ($show_tasks)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
@@ -142,6 +135,8 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'mobile/project_edit.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/project_edit.php b/project_edit.php
index 106e657bc..1402eb112 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -55,6 +55,7 @@
 $tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('project_name'));
@@ -66,15 +67,7 @@
   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];
-
-  $mdb2 = getConnection();
-  $sql = "select user_id from tt_user_project_binds where status = 1 and project_id = $cl_project_id";
-  $res = $mdb2->query($sql);
-  if (is_a($res, 'PEAR_Error'))
-    die($res->getMessage());
-  while ($row = $res->fetchRow())
-    $cl_users[] = $row['user_id'];
-
+  $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
   $cl_tasks = explode(',', $project['tasks']);
 }
 
@@ -85,7 +78,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_tasks)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
@@ -135,9 +128,9 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', count($tasks) > 0);
 $smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');
 $smarty->display('index.tpl');

From 45a82f93d80cf124930d1535d4dc7dd15c63e5de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 14:40:33 +0000
Subject: [PATCH 0554/1848] Finished refactoring project config for subgroups.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/project_delete.php    | 2 +-
 project_delete.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6209ab653..d68ab3dff 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.29.4629 | 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.29.4630 | 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/project_delete.php b/mobile/project_delete.php
index 5785496aa..ac957e249 100644
--- a/mobile/project_delete.php
+++ b/mobile/project_delete.php
@@ -35,7 +35,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
diff --git a/project_delete.php b/project_delete.php
index 450241e79..3b165a33d 100644
--- a/project_delete.php
+++ b/project_delete.php
@@ -35,7 +35,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }

From aa8ffdcec75ded579362d1274e985b4b35a9ac95 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 Dec 2018 16:00:40 +0000
Subject: [PATCH 0555/1848] Refactored monthly quota config for subgroups.

---
 WEB-INF/lib/ttGroup.class.php      |  2 +-
 WEB-INF/lib/ttTimeHelper.class.php | 17 ++++++++++-------
 WEB-INF/lib/ttUser.class.php       |  5 +++++
 WEB-INF/templates/footer.tpl       |  2 +-
 plugins/MonthlyQuota.class.php     | 19 +++++++++++--------
 quotas.php                         |  4 ++--
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 1aa422c72..f85f90971 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -101,8 +101,8 @@ function __construct($id, $org_id) {
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
-      /*
       $this->workday_minutes = $val['workday_minutes'];
+      /*
       $this->custom_logo = $val['custom_logo'];
       */
       $this->config = $val['config'];
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 6ddedc456..f48ecc8a0 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -147,9 +147,9 @@ static function postedDurationToMinutes($duration, $max = 1440) {
 
     // Handle localized fractional hours.
     global $user;
-    $localizedPattern = '/^(\d{1,3})?['.$user->decimal_mark.'][0-9]{1,4}h?$/';
+    $localizedPattern = '/^(\d{1,3})?['.$user->getDecimalMark().'][0-9]{1,4}h?$/';
     if (preg_match($localizedPattern, $duration )) { // decimal values like .5, 1.25h, ... .. 999.9999h (or with comma)
-        if ($user->decimal_mark == ',')
+        if ($user->getDecimalMark() == ',')
           $duration = str_replace (',', '.', $duration);
 
         $minutes = (int)round(60 * floatval($duration));
@@ -691,13 +691,15 @@ static function getAllRecords($user_id) {
   // getRecords - returns time records for a user for a given date.
   static function getRecords($user_id, $date) {
     global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $sql_time_format = "'%k:%i'"; //  24 hour format.
-    if ('%I:%M %p' == $user->time_format)
+    if ('%I:%M %p' == $user->getTimeFormat())
       $sql_time_format = "'%h:%i %p'"; // 12 hour format for MySQL TIME_FORMAT function.
 
-    $result = array();
-    $mdb2 = getConnection();
-
     $client_field = null;
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
@@ -707,12 +709,13 @@ static function getRecords($user_id, $date) {
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
 
+    $result = array();
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,
       TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,
       TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment, l.billable, l.invoice_id $client_field
       from tt_log l
       $left_joins
-      where l.date = '$date' and l.user_id = $user_id and l.status = 1
+      where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1
       order by l.start, l.id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e6f271df8..5a3289171 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -214,6 +214,11 @@ function getLockSpec() {
     return ($this->behalfGroup ? $this->behalfGroup->lock_spec : $this->lock_spec);
   }
 
+  // getWorkdayMinutes returns workday_minutes for active group.
+  function getWorkdayMinutes() {
+    return ($this->behalfGroup ? $this->behalfGroup->workday_minutes : $this->workday_minutes);
+  }
+
   // getConfig returns config string for active group.
   function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d68ab3dff..98e8e1c98 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.29.4630 | 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.29.4631 | 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/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 36f2d8cb4..29d8cfb7b 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -44,10 +44,11 @@ function __construct() {
 
   // update - deletes a quota, then inserts a new one.
   public function update($year, $month, $minutes) {
-    $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $this->group_id";
+    $deleteSql = "delete from tt_monthly_quotas".
+      " where year = $year and month = $month and group_id = $this->group_id and org_id = $this->org_id";
     $this->db->exec($deleteSql);
     if ($minutes){
-      $insertSql = "INSERT INTO tt_monthly_quotas (group_id, org_id, year, month, minutes)".
+      $insertSql = "insert into tt_monthly_quotas (group_id, org_id, year, month, minutes)".
         " values ($this->group_id, $this->org_id, $year, $month, $minutes)";
       $affected = $this->db->exec($insertSql);
       return (!is_a($affected, 'PEAR_Error'));
@@ -66,7 +67,8 @@ public function get($year, $month = null) {
 
   // getSingle - obtains a quota for a single month.
   private function getSingle($year, $month) {
-    $sql = "SELECT minutes FROM tt_monthly_quotas WHERE year = $year AND month = $month AND group_id = $this->group_id";
+    $sql = "select minutes from tt_monthly_quotas".
+      " where year = $year and month = $month and group_id = $this->group_id and org_id = $this->org_id";
     $reader = $this->db->query($sql);
     if (is_a($reader, 'PEAR_Error')) {
       return false;
@@ -79,12 +81,13 @@ private function getSingle($year, $month) {
     // If we did not find a record, return a calculated monthly quota.
     $numWorkdays = $this->getNumWorkdays($month, $year);
     global $user;
-    return $numWorkdays * $user->workday_minutes;
+    return $numWorkdays * $user->getWorkdayMinutes();
   }
 
   // getMany - returns an array of quotas for a given year for group.
   private function getMany($year){
-    $sql = "SELECT month, minutes FROM tt_monthly_quotas WHERE year = $year AND group_id = $this->group_id";
+    $sql = "select month, minutes from tt_monthly_quotas".
+      " where year = $year and group_id = $this->group_id and org_id = $this->org_id";
     $result = array();
     $res = $this->db->query($sql);
     if (is_a($res, 'PEAR_Error')) {
@@ -128,7 +131,7 @@ public function isValidQuota($value) {
     }
 
     global $user;
-    $localizedPattern = '/^([0-9]{1,3})?['.$user->decimal_mark.'][0-9]{1,4}h?$/';
+    $localizedPattern = '/^([0-9]{1,3})?['.$user->getDecimalMark().'][0-9]{1,4}h?$/';
     if (preg_match($localizedPattern, $value )) { // decimal values like 000.5, 999.25h, ... .. 999.9999h (or with comma)
       return true;
     }
@@ -149,11 +152,11 @@ public function quotaToFloat($value) {
     }
 
     global $user;
-    $localizedPattern = '/^([0-9]{1,3})?['.$user->decimal_mark.'][0-9]{1,4}h?$/';
+    $localizedPattern = '/^([0-9]{1,3})?['.$user->getDecimalMark().'][0-9]{1,4}h?$/';
     if (preg_match($localizedPattern, $value )) { // decimal values like 000.5, 999.25h, ... .. 999.9999h (or with comma)
       // Strip optional h in the end.
       $value = trim($value, 'h');
-      if ($user->decimal_mark == ',')
+      if ($user->getDecimalMark() == ',')
         $value = str_replace(',', '.', $value);
       return (float) $value;
     }
diff --git a/quotas.php b/quotas.php
index 8381c3b6a..1f376190e 100644
--- a/quotas.php
+++ b/quotas.php
@@ -88,7 +88,7 @@
 
     // Handle workday hours.
     $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
-    if ($workday_minutes != $user->workday_minutes) {
+    if ($workday_minutes != $user->getWorkdayMinutes()) {
       if (!$user->updateGroup(array('workday_minutes'=>$workday_minutes)))
         $err->add($i18n->get('error.db'));
     }
@@ -111,7 +111,7 @@
 
 // Get monthly quotas for the entire year.
 $monthsData = $quota->get($selectedYear);
-$workdayHours = ttTimeHelper::toAbsDuration($user->workday_minutes, true);
+$workdayHours = ttTimeHelper::toAbsDuration($user->getWorkdayMinutes(), true);
 
 $form = new Form('monthlyQuotasForm');
 $form->addInput(array('type'=>'text', 'name'=>'workdayHours', 'value'=>$workdayHours, 'style'=>'width:60px'));

From 0bc24003fa4ca271427a082b85ebd6edd4219c55 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 11 Dec 2018 14:33:21 +0000
Subject: [PATCH 0556/1848] Work in progress refactoring reports for subgroups.

---
 WEB-INF/lib/ttUser.class.php |  9 +++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 reports.php                  | 27 +++++++++++++++++----------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5a3289171..d320e3815 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -29,6 +29,8 @@
 import('ttConfigHelper');
 import('ttGroupHelper');
 import('ttGroup');
+import('form.Form');
+import('form.ActionForm');
 
 class ttUser {
   var $login = null;            // User login.
@@ -787,6 +789,13 @@ function setOnBehalfGroup($group_id) {
     unset($_SESSION['behalf_id']);
     unset($_SESSION['behalf_name']);
 
+    // Destroy report bean if it was set in session.
+    $form = new Form('dummyForm');
+    $bean = new ActionForm('reportBean', $form, $request);
+    if ($bean->isSaved()) {
+      $bean->destroyBean();
+    }
+
     // Do not do anything if we don't have rights.
     if (!$this->can('manage_subgroups')) return;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98e8e1c98..9f603c43e 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.29.4631 | 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.29.4632 | 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/reports.php b/reports.php
index 31209995e..e6334f9b6 100644
--- a/reports.php
+++ b/reports.php
@@ -43,6 +43,13 @@
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
+// End of access checks.
+
+$trackingMode = $user->getTrackingMode();
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -97,7 +104,7 @@
 } elseif ($user->isClient()) {
   $project_list = ttProjectHelper::getProjectsForClient();
 } else {
-  $project_list = ttProjectHelper::getAssignedProjects($user->id);	
+  $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
 }
 $form->addInput(array('type'=>'combobox',
   'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
@@ -106,7 +113,7 @@
   'data'=>$project_list,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS == $trackingMode) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -149,7 +156,7 @@
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
-    $max_rank = $user->rank-1;
+    $rank = $user->getMaxRankForGroup($user->getGroup());
     if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
     if ($user->can('view_own_reports'))
       $options = array('max_rank'=>$max_rank,'include_self'=>true);
@@ -202,11 +209,11 @@
   $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
 if ($user->can('view_reports') || $user->can('view_all_reports'))
   $form->addInput(array('type'=>'checkbox','name'=>'chip'));
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
   $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
   $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
   $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
 }
@@ -226,9 +233,9 @@
   $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
 if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
   $group_by_options['client'] = $i18n->get('form.reports.group_by_client');
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
   $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
 if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
@@ -253,7 +260,7 @@
 if ($request->isGet() && !$bean->isSaved()) {
   // No previous form data were found in session. Use the following default values.
   $form->setValueByElement('users', array_keys($user_list));
-  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format));
+  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
   $form->setValueByElement('start_date', $period->getStartDate());
   $form->setValueByElement('end_date', $period->getEndDate());
   $form->setValueByElement('chclient', '1');
@@ -283,7 +290,7 @@
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {
       // This loads new favorite report options into the bean (into our form).
-      ttFavReportHelper::loadReport($user->id, $bean);
+      ttFavReportHelper::loadReport($user->getUser(), $bean);
 
       // If user selected no favorite report - mark all user checkboxes (most probable scenario).
       if ($bean->getAttribute('favorite_report') == -1)

From b8d9247f09f3dfbd35a724ba5ac1b8e433dc1fd1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 11 Dec 2018 15:00:07 +0000
Subject: [PATCH 0557/1848] Fixed saving fav report in a subgroup.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 14 ++++++++------
 WEB-INF/templates/footer.tpl            |  2 +-
 reports.php                             |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index b056bd819..d37830090 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -181,8 +181,9 @@ function updateReport($fields) {
   }
 
   // saveReport - saves report options in the database.
-  static function saveReport($user_id, $bean) {
+  static function saveReport($bean) {
     global $user;
+    $user_id = $user->getUser();
 
     //  Set default value of 0 for not set checkboxes (in bean).
     //  Later in this function we use it to construct $fields array to update database.
@@ -206,11 +207,11 @@ static function saveReport($user_id, $bean) {
       $users = join(',', $users_in_bean);
     }
     if ($bean->getAttribute('start_date')) {
-      $dt = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
+      $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
       $from = $dt->toString(DB_DATEFORMAT);
     }
     if ($bean->getAttribute('end_date')) {
-      $dt = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
+      $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
       $to = $dt->toString(DB_DATEFORMAT);
     }
 
@@ -268,8 +269,9 @@ static function deleteReport($id) {
   }
 
   // loadReport - loads report options from database into a bean.
-  static function loadReport($user_id, &$bean) {
+  static function loadReport(&$bean) {
     global $user;
+    $user_id = $user->getUser();
 
     $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
     if ($val) {
@@ -284,11 +286,11 @@ static function loadReport($user_id, &$bean) {
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);
-        $bean->setAttribute('start_date', $dt->toString($user->date_format));
+        $bean->setAttribute('start_date', $dt->toString($user->getDateFormat()));
       }
       if ($val['period_end']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_end']);
-        $bean->setAttribute('end_date', $dt->toString($user->date_format));
+        $bean->setAttribute('end_date', $dt->toString($user->getDateFormat()));
       }
       $bean->setAttribute('chclient', $val['show_client']);
       $bean->setAttribute('chinvoice', $val['show_invoice']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9f603c43e..c49c2e568 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.29.4632 | 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.29.4633 | 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/reports.php b/reports.php
index e6334f9b6..7c7ac0119 100644
--- a/reports.php
+++ b/reports.php
@@ -290,7 +290,7 @@
     // User changed favorite report. We need to load new values into the form.
     if ($bean->getAttribute('favorite_report')) {
       // This loads new favorite report options into the bean (into our form).
-      ttFavReportHelper::loadReport($user->getUser(), $bean);
+      ttFavReportHelper::loadReport($bean);
 
       // If user selected no favorite report - mark all user checkboxes (most probable scenario).
       if ($bean->getAttribute('favorite_report') == -1)
@@ -306,7 +306,7 @@
     if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
 
     if ($err->no()) {
-      $id = ttFavReportHelper::saveReport($user->id, $bean); // TODO: review "on behalf" situations (both user and group), redesign if needed.
+      $id = ttFavReportHelper::saveReport($bean);
       if (!$id)
         $err->add($i18n->get('error.db'));
       if ($err->no()) {
@@ -323,7 +323,7 @@
       // Load default report.
       $bean->setAttribute('favorite_report','');
       $bean->setAttribute('new_fav_report', $report_list[0]['name']);
-      ttFavReportHelper::loadReport($user->id, $bean);
+      ttFavReportHelper::loadReport($bean);
       $form->setValueByElement('users', array_keys($user_list));
       $bean->saveBean();
       header('Location: reports.php');

From 24759567f66e185d193d48b81acef9b842d96c84 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 11 Dec 2018 16:12:33 +0000
Subject: [PATCH 0558/1848] More refactoring in reports for subgroups.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 43 +++++++++++++++++++------
 WEB-INF/lib/ttGroupHelper.class.php     | 19 +++++++++++
 WEB-INF/lib/ttReportHelper.class.php    |  2 +-
 WEB-INF/lib/ttTeamHelper.class.php      | 15 ---------
 WEB-INF/templates/footer.tpl            |  2 +-
 reports.php                             |  4 +--
 6 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index d37830090..165f42a3c 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -90,10 +90,16 @@ static function getReport($id) {
   }
 
   // getReportByName - returns a report identified by its name.
-  static function getReportByName($user_id, $report_name) {
+  static function getReportByName($report_name) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1 and name = ".$mdb2->quote($report_name);
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_fav_reports".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id and status = 1 and name = ".$mdb2->quote($report_name);
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow()) {
@@ -108,6 +114,7 @@ static function insertReport($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
@@ -119,7 +126,7 @@ static function insertReport($fields) {
       " show_task, show_end, show_note, show_custom_field_1, show_work_units,".
       " group_by1, group_by2, group_by3, show_totals_only)".
       " values(".
-      $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
+      $mdb2->quote($fields['name']).", $user_id, $group_id, $org_id, ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
@@ -140,8 +147,14 @@ static function insertReport($fields) {
   }
 
   // updateReport - updates report options in the database.
-  function updateReport($fields) {
+  static function updateReport($fields) {
+    global $user;
     $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $sql = "update tt_fav_reports set ".
       "name = ".$mdb2->quote($fields['name']).", ".
       "client_id = ".$mdb2->quote($fields['client']).", ".
@@ -172,7 +185,7 @@ function updateReport($fields) {
       "group_by2 = ".$mdb2->quote($fields['group_by2']).", ".
       "group_by3 = ".$mdb2->quote($fields['group_by3']).", ".
       "show_totals_only = ".$fields['chtotalsonly'].
-      " where id = ".$fields['id'];
+      " where id = ".$fields['id']." and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -183,7 +196,6 @@ function updateReport($fields) {
   // saveReport - saves report options in the database.
   static function saveReport($bean) {
     global $user;
-    $user_id = $user->getUser();
 
     //  Set default value of 0 for not set checkboxes (in bean).
     //  Later in this function we use it to construct $fields array to update database.
@@ -247,12 +259,11 @@ static function saveReport($bean) {
       'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
 
     $id = false;
-    $report = ttFavReportHelper::getReportByName($user_id, $fields['name']);
+    $report = ttFavReportHelper::getReportByName($fields['name']);
     if ($report) {
       $fields['id'] = $report['id'];
       $id = ttFavReportHelper::updateReport($fields);
     } else {
-      $fields['user_id'] = $user_id;
       $id = ttFavReportHelper::insertReport($fields);
     }
 
@@ -261,9 +272,21 @@ static function saveReport($bean) {
 
   // deleteReport - deletes a favorite report.
   static function deleteReport($id) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_fav_reports where id = $id";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "delete from tt_cron".
+      " where report_id = $id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $sql = "delete from tt_fav_reports".
+      " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -273,7 +296,7 @@ static function loadReport(&$bean) {
     global $user;
     $user_id = $user->getUser();
 
-    $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
+    $val = ttFavReportHelper::get($bean->getAttribute('favorite_report'));
     if ($val) {
       $bean->setAttribute('client', $val['client_id']);
       $bean->setAttribute('option', $val['cf_1_option_id']);
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 780e39ed6..ad2316756 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -564,4 +564,23 @@ static function validateCheckboxGroupInput($input, $table) {
 
     return true; // All is good.
   }
+
+  // The getUsers obtains all active and inactive (but not deleted) users in a group.
+  static function getUsers() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name from tt_users where group_id = $group_id and org_id = $org_id and (status = 1 or status = 0) order by upper(name)";
+    $res = $mdb2->query($sql);
+    $user_list = array();
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    while ($val = $res->fetchRow()) {
+      $user_list[] = $val;
+    }
+    return $user_list;
+  }
 }
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 0d99ce88a..13226ca44 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1010,7 +1010,7 @@ static function verifyBean($bean) {
     // Check users.
     $users_in_bean = $bean->getAttribute('users');
     if (is_array($users_in_bean)) {
-      $users_in_group = ttTeamHelper::getUsers();
+      $users_in_group = ttGroupHelper::getUsers();
       foreach ($users_in_group as $user_in_group) {
         $valid_ids[] = $user_in_group['id'];
       }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 3fc06cc73..4dd2f9aaa 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -104,21 +104,6 @@ static function getUsersForSwap() {
     return $user_list;
   }
 
-  // The getUsers obtains all active and inactive (but not deleted) users in a group.
-  static function getUsers() {
-    global $user;
-    $mdb2 = getConnection();
-    $sql = "select id, name from tt_users where group_id = $user->group_id and (status = 1 or status = 0) order by upper(name)";
-    $res = $mdb2->query($sql);
-    $user_list = array();
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    while ($val = $res->fetchRow()) {
-      $user_list[] = $val;
-    }
-    return $user_list;
-  }
-
   // The getInactiveUsers obtains all inactive users in a group.
   static function getInactiveUsers($group_id, $all_fields = false) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c49c2e568..244dc3137 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.29.4633 | 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.29.4634 | 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/reports.php b/reports.php
index 7c7ac0119..c3bb88096 100644
--- a/reports.php
+++ b/reports.php
@@ -332,12 +332,12 @@
   } else {
     // Generate button pressed. Check some values.
     if (!$bean->getAttribute('period')) {
-      $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
+      $start_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
 
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
         $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
 
-      $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
+      $end_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
       if ($end_date->isError() || !$bean->getAttribute('end_date'))
         $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
 

From 29d6481a7dc9e1538be50a942e4891db17467ec4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 14:40:21 +0000
Subject: [PATCH 0559/1848] Failed attempt to write ttCronJobHelper, some
 improvements to cron.php.

---
 WEB-INF/lib/ttCronJobHelper.class.php | 111 ++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl          |   2 +-
 cron.php                              |  19 +++--
 3 files changed, 125 insertions(+), 7 deletions(-)
 create mode 100644 WEB-INF/lib/ttCronJobHelper.class.php

diff --git a/WEB-INF/lib/ttCronJobHelper.class.php b/WEB-INF/lib/ttCronJobHelper.class.php
new file mode 100644
index 000000000..5dcc0b69b
--- /dev/null
+++ b/WEB-INF/lib/ttCronJobHelper.class.php
@@ -0,0 +1,111 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttRoleHelper');
+
+// ttCronJobHelper class will be used to execute scheduled jobs in Time Tracker.
+//
+// This is work in progress, NOT FINISHED.
+//
+// Current complication is with global $user object and a difficulty to achieve
+// separation between user-specific tasks that utilize $user object and
+// cron jobs, that must work for ALL users. Specifically, report body building
+// heavily relies on $user.
+//
+// An instance will be created in cron.php by an external call to it.
+// Then the exec method is called to execute all jobs that are due.
+class ttCronJobHelper {
+
+  var $reports = array(); // A list of reports to email.
+
+  // Constructor. Constructs a list of reports to send.
+  function __construct() {
+    $mdb2 = getConnection();
+    $now = time();
+
+    // Note: review security implications each time this query is revised.
+    // Because:
+    //   1) There is no logged on user to reduce scope.
+    //   2) Query may be executed by anonymous http get (of cron.php).
+    //
+    // Therefore, in query make sure we obtain only relevant info.
+    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c".
+      " inner join tt_fav_reports fr on".
+      " (c.report_id = fr.id and c.group_id = fr.group_id and c.org_id = fr.org_id)". // Report for a correct group.
+      " inner join tt_users u on (u.id = fr.user_id and u.status = 1)". // Report for an active user.
+      " where $now >= c.next and fr.status = 1". // Due now.
+      " and c.status = 1 and c.report_id is not null and c.email is not null";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return;
+    while ($val = $res->fetchRow()) {
+      $this->reports[] = $val;
+    }
+  }
+
+  // exec - processes reports one at a time by sending each out.
+  function exec() {
+    foreach ($this->reports as $report) {
+      // Get favorite report details.
+      $options = $this->getReportOptions($report['report_id']);
+      if (!$options) continue; // Skip not found report.
+
+      // Recycle global $user object, as user settings are specific for each report.
+      unset($user);
+      $user = new ttUser(null, $options['user_id']);
+      if (!$user->id) continue; // Skip not found user.
+
+      // Avoid complications with impersonated users, possibly from subgroups.
+      // Note: this may happen when cron.php is called by a browser who already impersonates.
+      // This is not supposed to happen in automatic cron job.
+      if ($user->behalf_id)
+        continue; // Skip processing on behalf situations entirely.
+
+      // TODO: coding ongoing here. Not finished. Add other processing when ready.
+
+    }
+  }
+
+  // getReportOptions - returns an array of fav report options from database data.
+  private function getReportOptions($id) {
+    $mdb2 = getConnection();
+
+    $sql = "select * from tt_fav_reports where id = $id and status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a(res, 'PEAR_Error')) return false;
+
+    $val = $res->fetchRow();
+    if (!$val) return false;
+
+    // Drop things we don't need.
+    unset($val['id']);
+    unset($val['report_spec']);
+    unset($val['status']);
+
+    return $val;
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 244dc3137..1caa6b555 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.29.4634 | 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.29.4635 | 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/cron.php b/cron.php
index 98c1456fe..19384df40 100644
--- a/cron.php
+++ b/cron.php
@@ -47,10 +47,12 @@
 $mdb2 = getConnection();
 $now = time();
 
- $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c".
-   " inner join tt_fav_reports fr on (c.report_id = fr.id and c.group_id = fr.group_id and c.org_id = fr.org_id)".
-   " where $now >= c.next and fr.status = 1".
-   " and c.status = 1 and c.report_id is not null and c.email is not null";
+$sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c".
+  " inner join tt_fav_reports fr on".
+  " (c.report_id = fr.id and c.group_id = fr.group_id and c.org_id = fr.org_id)". // Report for a correct group.
+  " inner join tt_users u on (u.id = fr.user_id and u.status = 1)". // Report for an active user.
+  " where $now >= c.next and fr.status = 1". // Due now.
+  " and c.status = 1 and c.report_id is not null and c.email is not null";
 $res = $mdb2->query($sql);
 if (is_a($res, 'PEAR_Error'))
   exit();
@@ -66,6 +68,12 @@
   $user = new ttUser(null, $options['user_id']);
   if (!$user->id) continue; // Skip not found user.
 
+  // Avoid complications with impersonated users, possibly from subgroups.
+  // Note: this may happen when cron.php is called by a browser who already impersonates.
+  // This is not supposed to happen in automatic cron job.
+  if ($user->behalf_id)
+    continue; // Skip processing on behalf situations entirely.
+
   // TODO: write a new function ttFavReportHelper::adjustOptions that will use
   // a $user object recycled above. Put user handling below into it.
   // Also adjust remaining options for potentially changed user access rights and group properties.
@@ -93,9 +101,8 @@
   }
 
   // Calculate next execution time.
-  $next = tdCron::getNextOccurrence($val['cron_spec'], $now + 60); // +60 sec is here to get us correct $next when $now is close to existing "next".
+  $next = tdCron::getNextOccurrence($val['cron_spec'], $now + 60); // +60 sec is here to get us correct $next when $now is close to existing "next".///
                                                                    // This is because the accuracy of tdcron class appears to be 1 minute.
-
   // Update last and next values in tt_cron.
   $sql = "update tt_cron set last = $now, next = $next where id = ".$val['id'];
   $affected = $mdb2->exec($sql);

From 59368101167c11a1a7dc80050fcf3262e99d87aa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 14:44:51 +0000
Subject: [PATCH 0560/1848] Cosmetic.

---
 cron.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cron.php b/cron.php
index 19384df40..337f96aef 100644
--- a/cron.php
+++ b/cron.php
@@ -101,7 +101,7 @@
   }
 
   // Calculate next execution time.
-  $next = tdCron::getNextOccurrence($val['cron_spec'], $now + 60); // +60 sec is here to get us correct $next when $now is close to existing "next".///
+  $next = tdCron::getNextOccurrence($val['cron_spec'], $now + 60); // +60 sec is here to get us correct $next when $now is close to existing "next".
                                                                    // This is because the accuracy of tdcron class appears to be 1 minute.
   // Update last and next values in tt_cron.
   $sql = "update tt_cron set last = $now, next = $next where id = ".$val['id'];

From fafb0ae8f7098ffafa6799627891bd40f4811a52 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 17:24:33 +0000
Subject: [PATCH 0561/1848] Excluded clients from getActiveUsers call.

---
 WEB-INF/lib/ttFavReportHelper.class.php |  6 ++--
 WEB-INF/lib/ttGroupHelper.class.php     | 43 +++++++++++++++++--------
 WEB-INF/lib/ttTeamHelper.class.php      | 21 ------------
 WEB-INF/lib/ttUser.class.php            |  2 +-
 WEB-INF/templates/footer.tpl            |  2 +-
 mobile/project_add.php                  |  2 +-
 mobile/users.php                        | 15 ++++++---
 reports.php                             |  3 +-
 users.php                               |  2 +-
 9 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 165f42a3c..30bfc235f 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -26,7 +26,7 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Class ttFavReportHelper is used to help with favorite report related tasks.
 class ttFavReportHelper {
@@ -407,7 +407,7 @@ static function adjustOptions($options) {
             $user_options = array('max_rank'=>$max_rank);
           $users = $user->getUsers($user_options); // Active and inactive users.
         } elseif ($user->isClient()) {
-          $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+          $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
         }
         foreach ($users as $single_user) {
           $user_ids[] = $single_user['id'];
@@ -417,7 +417,7 @@ static function adjustOptions($options) {
     } else {
       $users_to_adjust = explode(',', $options['users']); // Users to adjust.
       if ($user->isClient()) {
-        $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+        $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
         foreach ($users as $single_user) {
           $user_ids[] = $single_user['id'];
         }
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index ad2316756..fb895c460 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -447,7 +447,7 @@ static function getNotifications() {
     return false;
   }
 
-  // The getActiveUsers obtains all active users in a given group.
+  // The getActiveUsers obtains all active users excluding clients in a given group.
   static function getActiveUsers($options = null) {
     global $user;
     global $i18n;
@@ -456,10 +456,12 @@ static function getActiveUsers($options = null) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $client_part = " and u.client_id is null";
+
     if (isset($options['getAllFields']))
-      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.org_id = $org_id and u.status = 1 order by upper(u.name)";
+      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.org_id = $org_id and u.status = 1 $client_part order by upper(u.name)";
     else
-      $sql = "select id, name from tt_users where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+      $sql = "select u.id, u.name from tt_users u where u.group_id = $group_id and u.org_id = $org_id and u.status = 1 $client_part order by upper(u.name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
@@ -471,17 +473,6 @@ static function getActiveUsers($options = null) {
       $user_list[] = $val;
     }
 
-    if (isset($options['putSelfFirst'])) {
-      // Put own entry at the front.
-      $cnt = count($user_list);
-      for($i = 0; $i < $cnt; $i++) {
-        if ($user_list[$i]['id'] == $user->id) {
-          $self = $user_list[$i]; // Found self.
-          array_unshift($user_list, $self); // Put own entry at the front.
-          array_splice($user_list, $i+1, 1); // Remove duplicate.
-        }
-      }
-    }
     return $user_list;
   }
 
@@ -583,4 +574,28 @@ static function getUsers() {
     }
     return $user_list;
   }
+
+  // The getUsersForClient obtains all active and inactive users in a group that are relevant to a client.
+  static function getUsersForClient() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select u.id, u.name from tt_user_project_binds upb".
+      " inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)".
+      " inner join tt_users u on (u.id = upb.user_id and u.group_id = $group_id and u.org_id = $org_id)".
+      " where (u.status = 1 or u.status = 0)".
+      " group by u.id".
+      " order by upper(u.name)";
+    $res = $mdb2->query($sql);
+    $user_list = array();
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    while ($val = $res->fetchRow()) {
+      $user_list[] = $val;
+    }
+    return $user_list;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 4dd2f9aaa..720708778 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -33,27 +33,6 @@
 // Class ttTeamHelper - contains helper functions that operate with groups.
 class ttTeamHelper {
 
-  // The getUsersForClient obtains all active and inactive users in a group that are relevant to a client.
-  static function getUsersForClient() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $sql = "select u.id, u.name from tt_user_project_binds upb".
-      " inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)".
-      " inner join tt_users u on (u.id = upb.user_id)".
-      " where (u.status = 1 or u.status = 0)".
-      " group by u.id".
-      " order by upper(u.name)";
-    $res = $mdb2->query($sql);
-    $user_list = array();
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    while ($val = $res->fetchRow()) {
-      $user_list[] = $val;
-    }
-    return $user_list;
-  }
-
   // The swapRolesWith swaps existing user role with that of another user.
   static function swapRolesWith($user_id) {
     global $user;
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index d320e3815..c00bd9f42 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -113,9 +113,9 @@ function __construct($login, $id = null) {
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);
-      $this->is_client = !in_array('track_own_time', $this->rights);
       $this->rank = $val['rank'];
       $this->client_id = $val['client_id'];
+      $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
       $this->email = $val['email'];
       $this->lang = $val['lang'];
       $this->decimal_mark = $val['decimal_mark'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1caa6b555..d2754e7d4 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.29.4635 | 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.29.4636 | 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/project_add.php b/mobile/project_add.php
index c8c661ed2..c152006f3 100644
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
diff --git a/mobile/users.php b/mobile/users.php
index 594fa5bf1..0c54751de 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -39,15 +39,20 @@
 }
 // End of access checks.
 
-$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
+// Prepare a list of active users.
+if ($user->can('view_users'))
+  $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+else /* if ($user->can('manage_users')) */
+  $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
+$active_users = $user->getUsers($options);
 
-// Get users.
-$active_users = ttGroupHelper::getActiveUsers(array('getAllFields'=>true));
+// Prepare a list of inactive users.
 if($user->can('manage_users')) {
-  $can_delete_manager = (1 == count($active_users));
-  $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
+  $options = array('status'=>INACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+  $inactive_users = $user->getUsers($options);
 }
 
+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
diff --git a/reports.php b/reports.php
index c3bb88096..ee82a64f3 100644
--- a/reports.php
+++ b/reports.php
@@ -30,7 +30,6 @@
 import('form.Form');
 import('form.ActionForm');
 import('DateAndTime');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('Period');
 import('ttProjectHelper');
@@ -165,7 +164,7 @@
     $users = $user->getUsers($options); // Active and inactive users.
   }
   elseif ($user->isClient())
-    $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+    $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
 
   foreach ($users as $single_user) {
     $user_list[$single_user['id']] = $single_user['name'];
diff --git a/users.php b/users.php
index 47ec0145a..77b7e5525 100644
--- a/users.php
+++ b/users.php
@@ -50,7 +50,6 @@
 } else {
   $group_id = $user->getGroup();
 }
-$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 
 $form = new Form('usersForm');
 if ($user->can('manage_subgroups')) {
@@ -80,6 +79,7 @@
   $inactive_users = $user->getUsers($options);
 }
 
+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {

From f9e5e8956921839e6742a85db2067ddc6ef5b2b8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 17:40:36 +0000
Subject: [PATCH 0562/1848] Removed group selector from users.php page to keep
 things simple.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/users.tpl  | 10 ----------
 users.php                    | 29 -----------------------------
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d2754e7d4..d7560f930 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.29.4636 | 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.29.4637 | 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/users.tpl b/WEB-INF/templates/users.tpl
index 4faf1249d..236475c19 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -6,16 +6,6 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_users')}
-  {if $group_dropdown}
-{$forms.usersForm.open} {* usersForm consists only of one dropdown group control *}
-      <table width="100%">
-        <tr>
-          <td align="center">{$i18n.label.group}: {$forms.usersForm.group.control}</td>
-        </tr>
-      </table>
-{$forms.usersForm.close}
-  {/if}
-
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
diff --git a/users.php b/users.php
index 77b7e5525..d19ba7de6 100644
--- a/users.php
+++ b/users.php
@@ -36,36 +36,8 @@
   header('Location: access_denied.php');
   exit();
 }
-if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
-}
-// Note: we don't use "manage_subgroups" in access check, because when user cannot
-// "manage_users" or "view_users" they do not belong here.
 // End of access checks.
 
-if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-} else {
-  $group_id = $user->getGroup();
-}
-
-$form = new Form('usersForm');
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
-
 // Prepare a list of active users.
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
@@ -88,7 +60,6 @@
   $smarty->assign('uncompleted_indicators', true);
 }
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('title', $i18n->get('title.users'));

From bd5a201697a949a00738c890b227eda0948c0bf2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 18:48:35 +0000
Subject: [PATCH 0563/1848] A few fixes to users pages for subgroups.

---
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/mobile/users.tpl | 4 ++--
 mobile/users.php                   | 5 +++--
 users.php                          | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d7560f930..51675b024 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.29.4637 | 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.29.4638 | 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/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index ae04bd448..b3af8e206 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -22,7 +22,7 @@
             {if $uncompleted_indicators}
               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {/if}
-            {if $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
+            {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
               <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
             {else}
               {$u.name|escape}
@@ -54,7 +54,7 @@
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-            {if $u.rank < $user->rank}
+            {if $u.group_id != $user->group_id || $u.rank < $user->rank}
               <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
             {else}
               {$u.name|escape}
diff --git a/mobile/users.php b/mobile/users.php
index 0c54751de..d6d08457a 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -40,15 +40,16 @@
 // End of access checks.
 
 // Prepare a list of active users.
+$rank = $user->getMaxRankForGroup($user->getGroup());
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
 else /* if ($user->can('manage_users')) */
-  $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
+  $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
 $active_users = $user->getUsers($options);
 
 // Prepare a list of inactive users.
 if($user->can('manage_users')) {
-  $options = array('status'=>INACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+  $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
   $inactive_users = $user->getUsers($options);
 }
 
diff --git a/users.php b/users.php
index d19ba7de6..fd9e7593f 100644
--- a/users.php
+++ b/users.php
@@ -39,15 +39,16 @@
 // End of access checks.
 
 // Prepare a list of active users.
+$rank = $user->getMaxRankForGroup($user->getGroup());
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
 else /* if ($user->can('manage_users')) */
-  $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
+  $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
 $active_users = $user->getUsers($options);
 
 // Prepare a list of inactive users.
 if($user->can('manage_users')) {
-  $options = array('status'=>INACTIVE,'max_rank'=>$user->rank-1,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+  $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
   $inactive_users = $user->getUsers($options);
 }
 

From ff088165333067ad603805039778e9bc56671b89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 19:35:53 +0000
Subject: [PATCH 0564/1848] Refactored getRecentInvoices and moved to another
 class.

---
 WEB-INF/lib/ttGroupHelper.class.php | 23 +++++++++++++++++++++++
 WEB-INF/lib/ttTeamHelper.class.php  | 23 -----------------------
 WEB-INF/templates/footer.tpl        |  2 +-
 report.php                          |  4 ++--
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index fb895c460..762fffb69 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -598,4 +598,27 @@ static function getUsersForClient() {
     }
     return $user_list;
   }
+
+  // The getRecentInvoices returns an array of recent invoices (max 3) for a client.
+  static function getRecentInvoices($client_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select i.id, i.name from tt_invoices i".
+      " left join tt_clients c on (c.id = i.client_id)".
+      " where i.group_id = $group_id and i.org_id = $org_id and i.status = 1 and c.id = $client_id".
+      " order by i.id desc limit 3";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      $dt = new DateAndTime(DB_DATEFORMAT);
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 720708778..6c058c5d1 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -255,29 +255,6 @@ static function getAllInvoices()
     return $result;
   }
 
-  // The getRecentInvoices returns an array of recent invoices (max 3) for a client.
-  static function getRecentInvoices($group_id, $client_id)
-  {
-    global $user;
-
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql = "select i.id, i.name from tt_invoices i
-      left join tt_clients c on (c.id = i.client_id)
-      where i.group_id = $group_id and i.status = 1 and c.id = $client_id
-      order by i.id desc limit 3";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // getUserToProjectBinds - obtains all user to project binds for a group.
   static function getUserToProjectBinds($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 51675b024..2a14a1fa8 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.29.4638 | 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.29.4639 | 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/report.php b/report.php
index 1a8ce63cc..924c7801a 100644
--- a/report.php
+++ b/report.php
@@ -30,7 +30,7 @@
 import('form.Form');
 import('form.ActionForm');
 import('ttReportHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access check.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
@@ -94,7 +94,7 @@
 if ($user->can('manage_invoices') &&
   ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
   // Client is selected and we are displaying the invoice column.
-  $recent_invoices = ttTeamHelper::getRecentInvoices($user->group_id, $client_id);
+  $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
   if ($recent_invoices) {
     $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
     $form->addInput(array('type'=>'combobox',

From a08292683b29da0946e2099e3fd94bc2d19688f3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 12 Dec 2018 19:55:03 +0000
Subject: [PATCH 0565/1848] Some more refactoring of reports for subgroups.

---
 WEB-INF/lib/ttReportHelper.class.php | 26 ++++++++++++++++++--------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 13226ca44..38da98791 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -564,35 +564,45 @@ static function getTotals($options)
   }
 
   // The assignToInvoice assigns a set of records to a specific invoice.
-  static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids)
-  {
+  static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids) {
+    global $user;
     $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     if ($time_log_ids) {
       $sql = "update tt_log set invoice_id = ".$mdb2->quote($invoice_id).
-        " where id in(".join(', ', $time_log_ids).")";
+        " where id in(".join(', ', $time_log_ids).") and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
     }
     if ($expense_item_ids) {
       $sql = "update tt_expense_items set invoice_id = ".$mdb2->quote($invoice_id).
-        " where id in(".join(', ', $expense_item_ids).")";
+        " where id in(".join(', ', $expense_item_ids).") and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
     }
   }
 
   // The markPaid marks a set of records as either paid or unpaid.
-  static function markPaid($time_log_ids, $expense_item_ids, $paid = true)
-  {
+  static function markPaid($time_log_ids, $expense_item_ids, $paid = true) {
+    global $user;
     $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $paid_val = (int) $paid;
     if ($time_log_ids) {
-      $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")";
+      $sql = "update tt_log set paid = $paid_val".
+        " where id in(".join(', ', $time_log_ids).") and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
     }
     if ($expense_item_ids) {
-      $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")";
+      $sql = "update tt_expense_items set paid = $paid_val".
+        " where id in(".join(', ', $expense_item_ids).") and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2a14a1fa8..490d773c6 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.29.4639 | 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.29.4640 | 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>

From c1aacad4a4123391e6aae4352963f33b6895d66c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 13:08:59 +0000
Subject: [PATCH 0566/1848] Fixed update link for version 1.17.44 to 1.17.97.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 490d773c6..21f8a94ab 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.29.4640 | 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.30.4641 | 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/dbinstall.php b/dbinstall.php
index 55d09be0a..197c43b0b 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1128,7 +1128,7 @@ function ttExecute($sql) {
   </tr>
     <tr valign="top">
     <td>Update database structure (v1.17.44 to v1.17.97)</td>
-    <td><input type="submit" name="convert11744to117797" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
+    <td><input type="submit" name="convert11744to11797" value="Update"><br><input type="submit" name="update_group_id" value="Update group_id"></td>
   </tr>
   </tr>
   <tr valign="top">

From 2da2031951c852b4620c173e21c24f148fdf4999 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 15:10:55 +0000
Subject: [PATCH 0567/1848] Cosmetic.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/login.php             | 2 +-
 mobile/user_add.php          | 2 +-
 register.php                 | 4 ++++
 user_add.php                 | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 21f8a94ab..29e2eea32 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.30.4641 | 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.30.4642 | 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/login.php b/mobile/login.php
index 243aa5781..59fc6000f 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -52,7 +52,7 @@
   if ($err->no()) {
 
     // Use the "limit" plugin if we have one. Ignore include errors.
-    // The "limit" plugin is not required for normal operation of the Time Tracker.
+    // The "limit" plugin is not required for normal operation of Time Tracker.
     @include('../plugins/limit/access_check.php');
 
     if ($auth->doLogin($cl_login, $cl_password)) {
diff --git a/mobile/user_add.php b/mobile/user_add.php
index fbd82835f..ab6f5e2da 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -42,7 +42,7 @@
 // End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.
-// The "limit" plugin is not required for normal operation of the Time Tracker.
+// The "limit" plugin is not required for normal operation of Time Tracker.
 @include('../plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
diff --git a/register.php b/register.php
index 298f2818f..0a8e6d156 100644
--- a/register.php
+++ b/register.php
@@ -34,6 +34,10 @@
   exit();
 }
 
+// Use the "limit" plugin if we have one. Ignore include errors.
+// The "limit" plugin is not required for normal operation of Time Tracker.
+@include('plugins/limit/register.php');
+
 $auth->doLogout();
 
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
diff --git a/user_add.php b/user_add.php
index 9fa611294..28baa2cf5 100644
--- a/user_add.php
+++ b/user_add.php
@@ -43,7 +43,7 @@
 // End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.
-// The "limit" plugin is not required for normal operation of the Time Tracker.
+// The "limit" plugin is not required for normal operation of Time Tracker.
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))

From 83e5b07e961d0060f759dd8c59ef2c26d66b0c97 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 16:00:06 +0000
Subject: [PATCH 0568/1848] A bit of cleanup in report.php.

---
 WEB-INF/templates/footer.tpl |  2 +-
 report.php                   | 25 ++++---------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 29e2eea32..e031d3832 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.30.4642 | 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.30.4643 | 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/report.php b/report.php
index 924c7801a..cb563b9b0 100644
--- a/report.php
+++ b/report.php
@@ -170,49 +170,32 @@
   }
 } // isPost
 
-$group_by = $bean->getAttribute('group_by1');
-
 $options = ttReportHelper::getReportOptions($bean);
 
-$group_by_tag = ttReportHelper::makeGroupByXmlTag($options);
 $report_items = ttReportHelper::getItems($options);
 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $user->isPluginEnabled('ps'))
   ttReportHelper::putInSession($report_items);
 
-if (ttReportHelper::grouping($options))
+if (ttReportHelper::grouping($options)) {
   $subtotals = ttReportHelper::getSubtotals($options);
+  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
+}
 $totals = ttReportHelper::getTotals($options);
 
 // Assign variables that are used to print subtotals.
-if ($report_items && 'no_grouping' != $group_by1) {
+if ($report_items) {
   $smarty->assign('print_subtotals', true);
   $smarty->assign('first_pass', true);
-  $smarty->assign('group_by1', $group_by1);
   $smarty->assign('prev_grouped_by', '');
   $smarty->assign('cur_grouped_by', '');
 }
-// Determine group by header.
-if ('no_grouping' != $group_by) {
-  /*
-  if ('cf_1' == $group_by)
-    $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
-  else {
-    $key = 'label.'.$group_by;
-    $smarty->assign('group_by_header', $i18n->get($key));
-  } */
-  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
-}
-
-$smarty->assign('group_by', $group_by_tag);
 
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
 $smarty->assign('cur_date', '');
 $smarty->assign('report_row_class', 'rowReportItem');
-
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);

From 06f5163f4a234e89b5d761e7f537160f40d4a2e8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 17:11:47 +0000
Subject: [PATCH 0569/1848] Some more refactoring for subgroups.

---
 WEB-INF/lib/ttReportHelper.class.php | 14 +++++++++-----
 WEB-INF/lib/ttTimeHelper.class.php   | 10 ++++++++--
 WEB-INF/templates/footer.tpl         |  2 +-
 mobile/time.php                      |  2 +-
 mobile/timer.php                     |  2 +-
 time.php                             |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 38da98791..26478c3b7 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -40,6 +40,9 @@ class ttReportHelper {
   static function getWhere($options) {
     global $user;
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Prepare dropdown parts.
     $dropdown_parts = '';
     if ($options['client_id'])
@@ -61,17 +64,18 @@ static function getWhere($options) {
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and l.user_id in ($userlist)";
     else
-      $user_list_part = " and l.user_id = ".$user->id;
-    $user_list_part .= " and l.group_id = ".$user->getGroup();
+      $user_list_part = " and l.user_id = ".$user->getUser();
+    $user_list_part .= " and l.group_id = $group_id and l.org_id = $org_id";
 
     // Prepare sql query part for where.
+    $dateFormat = $user->getDateFormat();
     if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($user->date_format));
+      $period = new Period($options['period'], new DateAndTime($dateFormat));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $options['period_start']),
-        new DateAndTime($user->date_format, $options['period_end']));
+        new DateAndTime($dateFormat, $options['period_start']),
+        new DateAndTime($dateFormat, $options['period_end']));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts";
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f48ecc8a0..5eeed1f04 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -530,10 +530,16 @@ static function delete($id) {
   }
 
   // getTimeForDay - gets total time for a user for a specific date.
-  static function getTimeForDay($user_id, $date) {
+  static function getTimeForDay($date) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "select sum(time_to_sec(duration)) as sm from tt_log where user_id = $user_id and date = '$date' and status = 1";
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id and date = '$date' and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e031d3832..861431d99 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.30.4643 | 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.30.4644 | 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/time.php b/mobile/time.php
index 6bacd0842..80049a9cb 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -286,7 +286,7 @@
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
 $smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user_id, $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/mobile/timer.php b/mobile/timer.php
index 73035a395..682634c87 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -291,7 +291,7 @@
 
 
 $smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/time.php b/time.php
index 066653100..b85cad0ef 100644
--- a/time.php
+++ b/time.php
@@ -398,7 +398,7 @@
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($user_id, $cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From 1ca0df080b44b700872bec9216d8405b1f90bc11 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 17:19:52 +0000
Subject: [PATCH 0570/1848] A bit more refactoring for subgroups.

---
 WEB-INF/lib/ttTimeHelper.class.php | 11 +++++++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/timer.php                   |  2 +-
 time.php                           |  2 +-
 week.php                           |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 5eeed1f04..a8bde9872 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -549,12 +549,19 @@ static function getTimeForDay($date) {
   }
 
   // getTimeForWeek - gets total time for a user for a given week.
-  static function getTimeForWeek($user_id, $date) {
+  static function getTimeForWeek($date) {
+    global $user;
     import('Period');
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $period = new Period(INTERVAL_THIS_WEEK, $date);
-    $sql = "select sum(time_to_sec(duration)) as sm from tt_log where user_id = $user_id and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
+    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 861431d99..2b6eb7913 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.30.4644 | 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.30.4645 | 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/timer.php b/mobile/timer.php
index 682634c87..c754740a6 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -283,7 +283,7 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $cl_date);
+$week_total = ttTimeHelper::getTimeForWeek($cl_date);
 $smarty->assign('week_total', $week_total);
 
 $smarty->assign('uncompleted', $uncompleted);
diff --git a/time.php b/time.php
index b85cad0ef..462389af8 100644
--- a/time.php
+++ b/time.php
@@ -394,7 +394,7 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user_id, $selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
diff --git a/week.php b/week.php
index edba8996e..bf2378537 100644
--- a/week.php
+++ b/week.php
@@ -494,7 +494,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($user->getUser(), $selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);

From 8f1159deac6c05f4d864cd140d9c66f007601e7e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 17:33:21 +0000
Subject: [PATCH 0571/1848] Cosmetic, changed return values.

---
 WEB-INF/lib/ttTimeHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index a8bde9872..70844eebb 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -567,7 +567,7 @@ static function getTimeForWeek($date) {
       $val = $res->fetchRow();
       return sec_to_time_fmt_hm($val['sm']);
     }
-    return 0;
+    return false;
   }
 
   // getTimeForMonth - gets total time for a user for a given month.
@@ -582,7 +582,7 @@ static function getTimeForMonth($user_id, $date){
       $val = $res->fetchRow();
       return sec_to_time_fmt_hm($val['sm']);
     }
-    return 0;
+    return false;
   }
 
   // getUncompleted - retrieves an uncompleted record for user, if one exists.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2b6eb7913..5e51061b6 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.30.4645 | 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.30.4646 | 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>

From 54bb71ed8e6b7f79e3b26bc1c8a70a95793950c8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 17:37:51 +0000
Subject: [PATCH 0572/1848] More refactoring for subgroups.

---
 WEB-INF/lib/ttTimeHelper.class.php | 11 +++++++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 time.php                           |  2 +-
 week.php                           |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 70844eebb..4e10f4ed7 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -571,12 +571,19 @@ static function getTimeForWeek($date) {
   }
 
   // getTimeForMonth - gets total time for a user for a given month.
-  static function getTimeForMonth($user_id, $date){
+  static function getTimeForMonth($date) {
+    global $user;
     import('Period');
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $period = new Period(INTERVAL_THIS_MONTH, $date);
-    $sql = "select sum(time_to_sec(duration)) as sm from tt_log where user_id = $user_id and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
+    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e51061b6..a7e4b134a 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.30.4646 | 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.30.4647 | 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/time.php b/time.php
index 462389af8..7e4e8adce 100644
--- a/time.php
+++ b/time.php
@@ -96,7 +96,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($user_id, $selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
   
   $smarty->assign('month_total', $month_total);
diff --git a/week.php b/week.php
index bf2378537..c1c76f9de 100644
--- a/week.php
+++ b/week.php
@@ -92,7 +92,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota = $quota->get($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($user->getUser(), $selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $minutes_left = round(60*$month_quota) - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);

From bacdf3405307cfc27832db00b09bbf52d4b9f72c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 18:42:32 +0000
Subject: [PATCH 0573/1848] A bit more refactoring for subgroups.

---
 WEB-INF/lib/ttReportHelper.class.php | 32 +++++++++++++++++-----------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 26478c3b7..d3c7b7ce3 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -86,6 +86,9 @@ static function getWhere($options) {
   static function getExpenseWhere($options) {
     global $user;
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Prepare dropdown parts.
     $dropdown_parts = '';
     if ($options['client_id'])
@@ -103,17 +106,18 @@ static function getExpenseWhere($options) {
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and ei.user_id in ($userlist)";
     else
-      $user_list_part = " and ei.user_id = ".$user->id;
-    $user_list_part .= " and ei.group_id = ".$user->getGroup();
+      $user_list_part = " and ei.user_id = ".$user->getUser();
+    $user_list_part .= " and ei.group_id = $group_id and ei.org_id = $org_id";
 
     // Prepare sql query part for where.
+    $dateFormat = $user->getDateFormat();
     if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($user->date_format));
+      $period = new Period($options['period'], new DateAndTime($dateFormat));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $options['period_start']),
-        new DateAndTime($user->date_format, $options['period_end']));
+        new DateAndTime($dateFormat, $options['period_start']),
+        new DateAndTime($dateFormat, $options['period_end']));
     }
     $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts";
@@ -140,7 +144,9 @@ static function getItems($options) {
       $grouping_by_user = ttReportHelper::groupingBy('user', $options);
       $grouping_by_cf_1 = ttReportHelper::groupingBy('cf_1', $options);
     }
-    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
+    $convertTo12Hour = ('%I:%M %p' == $user->getTimeFormat()) && ($options['show_start'] || $options['show_end']);
+    $trackingMode = $user->getTrackingMode();
+    $decimalMark = $user->getDecimalMark();
 
     // Prepare a query for time items in tt_log table.
     $fields = array(); // An array of fields for database query.
@@ -182,7 +188,7 @@ static function getItems($options) {
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
     // Add work units.
     if ($options['show_work_units']) {
-      if ($user->unit_totals_only)
+      if ($user->getConfigOption('unit_totals_only'))
         array_push($fields, "null as units");
       else
         array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
@@ -193,7 +199,7 @@ static function getItems($options) {
     // Handle cost.
     $includeCost = $options['show_cost'];
     if ($includeCost) {
-      if (MODE_TIME == $user->tracking_mode)
+      if (MODE_TIME == $trackingMode)
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
       else
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
@@ -233,7 +239,7 @@ static function getItems($options) {
           " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
       }
     }
-    if ($includeCost && MODE_TIME != $user->tracking_mode)
+    if ($includeCost && MODE_TIME != $trackingMode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
 
     $where = ttReportHelper::getWhere($options);
@@ -343,12 +349,12 @@ static function getItems($options) {
           $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
       }
       if (isset($val['cost'])) {
-        if ('.' != $user->decimal_mark)
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+        if ('.' != $decimalMark)
+          $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
       }
       if (isset($val['expense'])) {
-        if ('.' != $user->decimal_mark)
-          $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
+        if ('.' != $decimalMark)
+          $val['expense'] = str_replace('.', $decimalMark, $val['expense']);
       }
 
       if ($grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a7e4b134a..95df44bc7 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.30.4647 | 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.30.4648 | 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>

From 77dc69032fb4b318c4fb92c3fe54e0e1b03dae4e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 20:46:30 +0000
Subject: [PATCH 0574/1848] Removed group selector from tasks.php to keep
 things simple.

---
 WEB-INF/lib/ttUser.class.php |  5 ++++-
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/tasks.tpl  | 10 ----------
 tasks.php                    | 32 --------------------------------
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index c00bd9f42..2d7f1c985 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -294,8 +294,11 @@ function getAssignedTasks()
     $mdb2 = getConnection();
     $tasks = implode(',', $task_ids); // This is a comma-separated list of task ids.
 
+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+
     $sql = "select id, name, description from tt_tasks".
-      " where group_id = $this->group_id and status = 1 and id in ($tasks) order by name";
+      " where group_id = $group_id and org_id = $org_id and status = 1 and id in ($tasks) order by name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 95df44bc7..ce84ca07f 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.30.4648 | 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.30.4649 | 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/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 9db99069c..647a6a787 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -6,16 +6,6 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_tasks')}
-  {if $group_dropdown}
-{$forms.tasksForm.open} {* tasksForm consists only of one dropdown group control *}
-      <table width="100%">
-        <tr>
-          <td align="center">{$i18n.label.group}: {$forms.tasksForm.group.control}</td>
-        </tr>
-      </table>
-{$forms.tasksForm.close}
-  {/if}
-
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_tasks}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
diff --git a/tasks.php b/tasks.php
index ba91ed01c..7b5f99790 100644
--- a/tasks.php
+++ b/tasks.php
@@ -39,46 +39,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
-if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
-}
 // End of access checks.
 
-if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-  // Tasks feature may not be available in new group, check and redirect.
-  if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-    header('Location: feature_disabled.php');
-    exit();
-  }
-} else {
-  $group_id = $user->getGroup();
-}
-
-$form = new Form('tasksForm');
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
-
 if($user->can('manage_tasks')) {
   $active_tasks = ttGroupHelper::getActiveTasks();
   $inactive_tasks = ttGroupHelper::getInactiveTasks();
 } else
   $active_tasks = $user->getAssignedTasks();
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_tasks', $active_tasks);
 $smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));

From a079c840acbc147af950bff07ba7b7dac0de6131 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 21:06:08 +0000
Subject: [PATCH 0575/1848] Removed group selector from time.php to keep things
 simple.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/time.tpl   |  8 +-------
 time.php                     | 31 +++----------------------------
 3 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ce84ca07f..f550c35f5 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.30.4649 | 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.30.4650 | 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/time.tpl b/WEB-INF/templates/time.tpl
index bb8628713..76338706d 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -18,12 +18,6 @@
   <tr>
     <td valign="top">
       <table>
-{if $group_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.group}:</td>
-          <td>{$forms.timeRecordForm.group.control}</td>
-        </tr>
-{/if}
 {if $user_dropdown}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
@@ -72,7 +66,7 @@
 {if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
         <tr>
           <td align="right">{$i18n.label.duration}:</td>
-          <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
+          <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
         </tr>
 {/if}
       </table>
diff --git a/time.php b/time.php
index 7e4e8adce..013f15ca6 100644
--- a/time.php
+++ b/time.php
@@ -48,11 +48,6 @@
   exit();
 }
 if ($request->isPost()) {
-  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
-  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
-    exit();
-  }
   $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
   if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
     header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
@@ -61,13 +56,6 @@
 }
 // End of access checks.
 
-// Determine group for which we display this page.
-if ($request->isPost() && $groupChanged) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-} else {
-  $group_id = $user->getGroup();
-}
 // Determine user for which we display this page.
 if ($request->isPost() && $userChanged) {
   $user_id = $request->getParameter('user');
@@ -76,6 +64,8 @@
   $user_id = $user->getUser();
 }
 
+$group_id = $user->getGroup();
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -132,21 +122,6 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
-// Group dropdown.
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.timeRecordForm.group_changed.value=1;document.timeRecordForm.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
@@ -405,7 +380,7 @@
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('timestring', $selected_date->toString($user->date_format));
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'time.tpl');
 $smarty->display('index.tpl');

From fb37b1b49aedfe40651dcc57883ddbe9c605374d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 13 Dec 2018 21:14:03 +0000
Subject: [PATCH 0576/1848] Initial release of subgroups for testing. Some
 issues remain, but the functionality is there.

---
 WEB-INF/config.php.dist          | 3 ---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 2 --
 WEB-INF/templates/header.tpl     | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 17b4d087d..d8bfe0c10 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -197,6 +197,3 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
-
-// A temporary config option while development of subgroup support is ongoing. To be removed later.
-// define('SUBGROUP_DEBUG', false);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f550c35f5..627a23317 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.30.4650 | 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.31.4651 | 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 bb83d3a3e..0565d763e 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -26,14 +26,12 @@ function handleTaskRequiredCheckbox() {
     <tr>
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
-{if isTrue($smarty.const.SUBGROUP_DEBUG)}
 {if $user->can('manage_subgroups') && $group_dropdown}
           <tr>
             <td align="right" nowrap>{$i18n.label.group}:</td>
             <td>{$forms.groupForm.group.control}</td>
           </tr>
 {/if}
-{/if}
 {if $user->can('manage_basic_settings')}
           <tr>
             <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 546fffaa1..8555447b5 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -89,11 +89,9 @@
     {if $user->can('manage_basic_settings')}
             <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> &middot;
     {/if}
-{if isTrue($smarty.const.SUBGROUP_DEBUG)}
     {if $user->can('manage_subgroups')}
             <a class="systemMenu" href="groups.php">{$i18n.menu.subgroups}</a> &middot;
     {/if}
-{/if}
     {if $user->can('manage_features')}
             <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a> &middot;
     {/if}

From 7dc611a9564d114fd401c19f72c2525bc0e7494a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 14 Dec 2018 16:09:51 +0000
Subject: [PATCH 0577/1848] Wrote ttUser::getConfigInt and started to use it.

---
 WEB-INF/lib/ttReportHelper.class.php | 7 +++++--
 WEB-INF/lib/ttUser.class.php         | 6 ++++++
 WEB-INF/templates/footer.tpl         | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d3c7b7ce3..90a4a98c3 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -190,8 +190,11 @@ static function getItems($options) {
     if ($options['show_work_units']) {
       if ($user->getConfigOption('unit_totals_only'))
         array_push($fields, "null as units");
-      else
-        array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+      else {
+        $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+        $minutesInUnit = $user->getConfigInt('minutes_in_unit');
+        array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit)) as units");
+      }
     }
     // Add note.
     if ($options['show_note'])
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2d7f1c985..a95fa72ef 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -235,6 +235,12 @@ function getConfigOption($name) {
     return $config->getDefinedValue($name);
   }
 
+  // getConfigInt retruns an integer value defined in a group, or false.
+  function getConfigInt($name) {
+    $config = new ttConfigHelper($this->getConfig());
+    return $config->getIntValue($name);
+  }
+
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 627a23317..98ba14a61 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.31.4651 | 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.31.4652 | 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>

From b0bb9205ed7aeeee700ab27ee4c76d196406e5fc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 14 Dec 2018 17:36:55 +0000
Subject: [PATCH 0578/1848] Fixed work units config for subgroups.

---
 WEB-INF/templates/footer.tpl |  2 +-
 work_units.php               | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98ba14a61..e94e90fa3 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.31.4652 | 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.31.4653 | 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/work_units.php b/work_units.php
index b2373adab..84ef37e0d 100644
--- a/work_units.php
+++ b/work_units.php
@@ -39,17 +39,18 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// End of access checks.
 
-$config = new ttConfigHelper($user->config);
+$config = new ttConfigHelper($user->getConfig());
 
 if ($request->isPost()) {
   $cl_minutes_in_unit = $request->getParameter('minutes_in_unit');
   $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold');
   $cl_totals_only = $request->getParameter('totals_only');
 } else {
-  $cl_minutes_in_unit = $user->minutes_in_unit;
-  $cl_1st_unit_threshold = $user->first_unit_threshold;
-  $cl_totals_only = $user->unit_totals_only;
+  $cl_minutes_in_unit = $user->getConfigInt('minutes_in_unit');
+  $cl_1st_unit_threshold = $user->getConfigInt('1st_unit_threshold');
+  $cl_totals_only = $user->getConfigOption('unit_totals_only');
 }
 
 $form = new Form('workUnitsForm');
@@ -60,7 +61,7 @@
 
 if ($request->isPost()){
   // Validate user input.
-  if (!ttValidInteger($cl_minutes_in_unit)) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.minutes_in_unit'));
+  if (!ttValidInteger($cl_minutes_in_unit) || $cl_minutes_in_unit == 0) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.minutes_in_unit'));
   if (!ttValidInteger($cl_1st_unit_threshold, true) ||($cl_minutes_in_unit && $cl_1st_unit_threshold > $cl_minutes_in_unit)) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.1st_unit_threshold'));
   // Finished validating user input.
 

From d0c39073f009db09baa980ef6e1c2f1e71500a58 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 Dec 2018 13:41:44 +0000
Subject: [PATCH 0579/1848] Some refactoring of work units for subgroups.

---
 WEB-INF/lib/ttConfigHelper.class.php |  4 +--
 WEB-INF/lib/ttGroup.class.php        |  2 --
 WEB-INF/lib/ttReportHelper.class.php | 42 +++++++++++++++++-----------
 WEB-INF/lib/ttUser.class.php         |  6 ++--
 WEB-INF/templates/footer.tpl         |  2 +-
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
index 6790e2140..33e94e513 100644
--- a/WEB-INF/lib/ttConfigHelper.class.php
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -73,7 +73,7 @@ function setDefinedValue($name, $set = true) {
   }
 
   // The getIntValue parses an integer value from the source config array.
-  function getIntValue($name) {
+  function getIntValue($name, $defaultVal = 0) {
     $name_with_colon = $name.':';
     $len = strlen($name_with_colon);
 
@@ -87,7 +87,7 @@ function getIntValue($name) {
         }
       }
     }
-    return false;
+    return $defaultVal;
   }
 
   // The setIntValue sets an integer value into config array.
diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index f85f90971..f450a4ec4 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -116,8 +116,6 @@ function __construct($id, $org_id) {
       if ($this->isPluginEnabled('wu')) {
         $minutes_in_unit = $config->getIntValue('minutes_in_unit');
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
-        $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
-        if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
         $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
       }
       */
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 90a4a98c3..8e8b312e4 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -407,7 +407,6 @@ static function getFromSession() {
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
   static function getSubtotals($options) {
     global $user;
-
     $mdb2 = getConnection();
 
     $concat_part = ttReportHelper::makeConcatPart($options);
@@ -415,15 +414,23 @@ static function getSubtotals($options) {
     $where = ttReportHelper::getWhere($options);
     $group_by_part = ttReportHelper::makeGroupByPart($options);
     if ($options['show_cost']) {
-      if (MODE_TIME == $user->tracking_mode) {
+
+      $workUnits = $options['show_work_units'];
+      if ($workUnits) {
+        $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
+        $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+        $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
+      }
+
+      if (MODE_TIME == $user->getTrackingMode()) {
         if (!ttReportHelper::groupingBy('user', $options))
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
         $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
-        if ($options['show_work_units']) {
-          if ($user->unit_totals_only)
-            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        if ($workUnits) {
+          if ($unitTotalsOnly)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
           else
-            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
         }
         $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
@@ -431,11 +438,11 @@ static function getSubtotals($options) {
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
         $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
-        if ($options['show_work_units']) {
-          if ($user->unit_totals_only)
-            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        if ($workUnits) {
+          if ($unitTotalsOnly)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
           else
-            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
         }
         $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l 
@@ -445,11 +452,11 @@ static function getSubtotals($options) {
     }  else {
       // $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
       $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
-      if ($options['show_work_units']) {
-        if ($user->unit_totals_only)
-          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+      if ($workUnits) {
+        if ($unitTotalsOnly)
+          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
         else
-          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
       }
       $sql .= ", null as expenses from tt_log l 
         $join_part $where $group_by_part";
@@ -482,9 +489,10 @@ static function getSubtotals($options) {
       $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
       $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
       if ($options['show_cost']) {
-        if ('.' != $user->decimal_mark) {
-          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-          $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
+        $decimalMark = $user->getDecimalMark();
+        if ('.' != $decimalMark) {
+          $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
+          $val['expenses'] = str_replace('.', $decimalMark, $val['expenses']);
         }
         $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
       } else
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a95fa72ef..9de260b84 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -144,7 +144,7 @@ function __construct($login, $id = null) {
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
       if ($this->isPluginEnabled('wu')) {
-        $minutes_in_unit = $config->getIntValue('minutes_in_unit');
+        $minutes_in_unit = $config->getIntValue('minutes_in_unit', 15);
         if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
         $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
         if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
@@ -236,9 +236,9 @@ function getConfigOption($name) {
   }
 
   // getConfigInt retruns an integer value defined in a group, or false.
-  function getConfigInt($name) {
+  function getConfigInt($name, $defaultVal) {
     $config = new ttConfigHelper($this->getConfig());
-    return $config->getIntValue($name);
+    return $config->getIntValue($name, $defaultVal);
   }
 
   // can - determines whether user has a right to do something.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e94e90fa3..63b1c9ccd 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.31.4653 | 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.31.4654 | 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>

From ccaee9cc6abdbf1684b25e771b0dca35659e4a55 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 Dec 2018 14:17:03 +0000
Subject: [PATCH 0580/1848] Some more refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 47 ++++++++++------------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 8e8b312e4..068ae9db6 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -411,53 +411,40 @@ static function getSubtotals($options) {
 
     $concat_part = ttReportHelper::makeConcatPart($options);
     $join_part = ttReportHelper::makeJoinPart($options);
+
+    // TODO: Consider moving this block out into a separate function.
+    $workUnits = $options['show_work_units'];
+    if ($workUnits) {
+      $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
+      $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+      $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
+      if ($unitTotalsOnly)
+        $work_unit_part = ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
+      else
+        $work_unit_part = ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
+    }
+    // End of TODO.
+
     $where = ttReportHelper::getWhere($options);
     $group_by_part = ttReportHelper::makeGroupByPart($options);
     if ($options['show_cost']) {
-
-      $workUnits = $options['show_work_units'];
-      if ($workUnits) {
-        $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
-        $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
-        $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
-      }
-
       if (MODE_TIME == $user->getTrackingMode()) {
         if (!ttReportHelper::groupingBy('user', $options))
           $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
-        if ($workUnits) {
-          if ($unitTotalsOnly)
-            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-          else
-            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-        }
+        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time".$work_unit_part;
         $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
           null as expenses from tt_log l
           $join_part $left_join $where $group_by_part";
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
-        if ($workUnits) {
-          if ($unitTotalsOnly)
-            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-          else
-            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-        }
+        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time".$work_unit_part;
         $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
           null as expenses from tt_log l 
           $join_part
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where $group_by_part";
       }
     }  else {
-      // $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
-      $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
-      if ($workUnits) {
-        if ($unitTotalsOnly)
-          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-        else
-          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-      }
+      $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time".$work_unit_part;
       $sql .= ", null as expenses from tt_log l 
         $join_part $where $group_by_part";
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 63b1c9ccd..ae8c6333c 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.31.4654 | 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.31.4655 | 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>

From a97edb0f5cfcf62419cd98eb3cc0fc415eaab319 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 Dec 2018 15:28:07 +0000
Subject: [PATCH 0581/1848] Simplified conditional logic in
 ttReportHelper::getSubtotals.

---
 WEB-INF/lib/ttReportHelper.class.php | 76 +++++++++++++++-------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 068ae9db6..2265f0dac 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -410,44 +410,14 @@ static function getSubtotals($options) {
     $mdb2 = getConnection();
 
     $concat_part = ttReportHelper::makeConcatPart($options);
+    $work_unit_part = ttReportHelper::makeWorkUnitPart($options);
     $join_part = ttReportHelper::makeJoinPart($options);
-
-    // TODO: Consider moving this block out into a separate function.
-    $workUnits = $options['show_work_units'];
-    if ($workUnits) {
-      $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
-      $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
-      $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
-      if ($unitTotalsOnly)
-        $work_unit_part = ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-      else
-        $work_unit_part = ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
-    }
-    // End of TODO.
-
+    $cost_part = ttReportHelper::makeCostPart($options);
     $where = ttReportHelper::getWhere($options);
     $group_by_part = ttReportHelper::makeGroupByPart($options);
-    if ($options['show_cost']) {
-      if (MODE_TIME == $user->getTrackingMode()) {
-        if (!ttReportHelper::groupingBy('user', $options))
-          $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time".$work_unit_part;
-        $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
-          null as expenses from tt_log l
-          $join_part $left_join $where $group_by_part";
-      } else {
-        // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
-        $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time".$work_unit_part;
-        $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses from tt_log l 
-          $join_part
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where $group_by_part";
-      }
-    }  else {
-      $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time".$work_unit_part;
-      $sql .= ", null as expenses from tt_log l 
-        $join_part $where $group_by_part";
-    }
+
+    $parts = "$concat_part, sum(time_to_sec(l.duration)) as time, null as expenses".$work_unit_part.$cost_part;
+    $sql = "select $parts from tt_log l $join_part $where $group_by_part";
     // By now we have sql for time items.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
@@ -1465,7 +1435,8 @@ static function makeCombinedSelectPart($options) {
   static function makeJoinPart($options) {
     global $user;
 
-    if (ttReportHelper::groupingBy('user', $options)) {
+    $trackingMode = $user->getTrackingMode();
+    if (ttReportHelper::groupingBy('user', $options) || MODE_TIME == $trackingMode) {
       $join .= ' left join tt_users u on (l.user_id = u.id)';
     }
     if (ttReportHelper::groupingBy('client', $options)) {
@@ -1484,9 +1455,42 @@ static function makeJoinPart($options) {
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
         $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)';
     }
+    if ($options['show_cost'] && $trackingMode != MODE_TIME) {
+      $join .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
+    }
     return $join;
   }
 
+  // makeWorkUnitPart builds an sql part for work units for time items.
+  static function makeWorkUnitPart($options) {
+    global $user;
+
+    $workUnits = $options['show_work_units'];
+    if ($workUnits) {
+      $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
+      $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+      $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
+      if ($unitTotalsOnly)
+        $work_unit_part = ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
+      else
+        $work_unit_part = ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
+    }
+    return $work_unit_part;
+  }
+
+  // makeCostPart builds a cost part for time items.
+  static function makeCostPart($options) {
+    global $user;
+
+    if ($options['show_cost']) {
+      if (MODE_TIME == $user->getTrackingMode())
+        $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost";
+      else
+        $cost_part .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost";
+    }
+    return $cost_part;
+  }
+
   // makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
   static function makeJoinExpensesPart($options) {
     if (ttReportHelper::groupingBy('user', $options)) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ae8c6333c..84526cfb4 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.31.4655 | 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.31.4656 | 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>

From 9763bf0359b70369021d6f9b12b6e6cc9c0939f5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 Dec 2018 16:12:59 +0000
Subject: [PATCH 0582/1848] Fixed work unit config.

---
 WEB-INF/lib/ttReportHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl         | 2 +-
 work_units.php                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 2265f0dac..d46319dbe 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -191,8 +191,8 @@ static function getItems($options) {
       if ($user->getConfigOption('unit_totals_only'))
         array_push($fields, "null as units");
       else {
-        $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
-        $minutesInUnit = $user->getConfigInt('minutes_in_unit');
+        $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
+        $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
         array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit)) as units");
       }
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 84526cfb4..de22892ff 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.31.4656 | 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.31.4658 | 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/work_units.php b/work_units.php
index 84ef37e0d..e4d198d5c 100644
--- a/work_units.php
+++ b/work_units.php
@@ -48,8 +48,8 @@
   $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold');
   $cl_totals_only = $request->getParameter('totals_only');
 } else {
-  $cl_minutes_in_unit = $user->getConfigInt('minutes_in_unit');
-  $cl_1st_unit_threshold = $user->getConfigInt('1st_unit_threshold');
+  $cl_minutes_in_unit = $user->getConfigInt('minutes_in_unit', 15);
+  $cl_1st_unit_threshold = $user->getConfigInt('1st_unit_threshold', 0);
   $cl_totals_only = $user->getConfigOption('unit_totals_only');
 }
 

From 58057bc7a8634917640cc660971bfc3c8440a687 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Dec 2018 14:03:24 +0000
Subject: [PATCH 0583/1848] Fixed quota output for week view.

---
 WEB-INF/templates/footer.tpl | 2 +-
 week.php                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index de22892ff..55c2266b6 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.31.4658 | 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.32.4659 | 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/week.php b/week.php
index c1c76f9de..1dd6e56a5 100644
--- a/week.php
+++ b/week.php
@@ -91,9 +91,9 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota = $quota->get($selected_date->mYear, $selected_date->mMonth);
+  $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
   $month_total = ttTimeHelper::getTimeForMonth($selected_date);
-  $minutes_left = round(60*$month_quota) - ttTimeHelper::toMinutes($month_total);
+  $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);
   $smarty->assign('over_quota', $minutes_left < 0);

From 8cfd24a3f3529a3a8eabe0d7cb53f4331d9dec6f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Dec 2018 14:22:22 +0000
Subject: [PATCH 0584/1848] Holidays adjusted for German language.

---
 WEB-INF/resources/de.lang.php | 2 +-
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 80c78537b..3775315ca 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -34,7 +34,7 @@
 $i18n_weekdays = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag');
 $i18n_weekdays_short = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
 // format mm/dd
-$i18n_holidays = array('01/01', '04/02', '05/01', '05/10', '05/21', '10/03', '12/25', '12/26');
+$i18n_holidays = array('01/01', '03/30', '04/02', '05/01', '05/21', '05/31', '10/03', '11/01', '12/24','12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 55c2266b6..bbb21ee9e 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.32.4659 | 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.32.4660 | 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>

From 1dc4d7237116ebf149921a5988be96ab2cf40f3c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Dec 2018 19:25:30 +0000
Subject: [PATCH 0585/1848] A small fix for export.

---
 WEB-INF/lib/ttTeamHelper.class.php | 4 +++-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6c058c5d1..b94f6434c 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -260,7 +260,9 @@ static function getUserToProjectBinds($group_id) {
     $mdb2 = getConnection();
 
     $result = array();
-    $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where group_id = $group_id) order by user_id, status, project_id";
+    $sql = "select * from tt_user_project_binds".
+      " where user_id in (select id from tt_users where group_id = $group_id)".
+      " and group_id = $group_id order by user_id, status, project_id";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bbb21ee9e..86ae44cbc 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.32.4660 | 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.32.4661 | 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>

From f64edab52483034571128ed287ce10996498f0dc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 Dec 2018 19:21:30 +0000
Subject: [PATCH 0586/1848] Added a TODO comment about RAM issue.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 4 ++++
 WEB-INF/templates/footer.tpl              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index d2ee6413d..c5600fd8b 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -335,6 +335,10 @@ function writeData() {
     }
 
     // Write time log entries and build logMap at the same time.
+    // TODO: big data sets get us out of memory error.
+    // We need to optimize this by working on smaller result sets at a time.
+    // tt_log is one potentially large table, but so may be others.
+    // Refactor this during next round of work here.
     $records = $this->getRecordsFromTable('tt_log');
     if (count($records) > 0) {
       fwrite($this->file, $this->indentation."  <log>\n");
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 86ae44cbc..38267b688 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.32.4661 | 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.32.4662 | 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>

From 6fc6c28b9eed8a9316a630185e327a53bb0d9e0c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 Dec 2018 20:14:23 +0000
Subject: [PATCH 0587/1848] Improved import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ff3376d32..626408f28 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -551,11 +551,11 @@ function importXml() {
     $this->firstPass = false; // We are done with 1st pass.
     xml_parser_free($parser);
     if ($file) fclose($file);
-    if (!$this->canImport) {
+    if ($this->errors->yes()) {
+      // Remove the file and exit if we have errors.
       unlink($filename);
       return;
     }
-    if ($this->errors->yes()) return; // Exit if we have errors.
 
     // Now we can do a second pass, where real work is done.
     $parser = xml_parser_create();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 38267b688..176d71420 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.32.4662 | 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.32.4663 | 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>

From 19e9b9abac0144d500df9fe1d4ce555a30b4c676 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Dec 2018 15:00:15 +0000
Subject: [PATCH 0588/1848] Improved handlng of import.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 5 +++++
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 626408f28..e95b836de 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -499,6 +499,11 @@ function endElement($parser, $name) {
   function importXml() {
     global $i18n;
 
+    if (!$_FILES['xmlfile']['name']) {
+      $this->errors->add($i18n->get('error.upload'));
+      return; // There is nothing to do if we don't have a file.
+    }
+
     // Do we have a compressed file?
     $compressed = false;
     $file_ext = substr($_FILES['xmlfile']['name'], strrpos($_FILES['xmlfile']['name'], '.') + 1);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 176d71420..c8933865c 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.32.4663 | 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.32.4664 | 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>

From 323f03bd2d9179fbb923e4518853324d8bda1b95 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Dec 2018 16:11:23 +0000
Subject: [PATCH 0589/1848] Added a comment about vertical tab problem.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 22 +++++++++++++++++++---
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index e95b836de..099cb58f9 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -493,9 +493,25 @@ function endElement($parser, $name) {
     }
   }
 
-  // importXml - uncompresses the file, reads and parses its content. During parsing,
-  // startElement, endElement, and dataElement functions are called as many times as necessary.
-  // Actual import occurs in the endElement handler.
+  // importXml - uncompresses the file, reads and parses its content.
+  // It goes through the file 2 times.
+  //
+  // During 1st pass, it determines whether we can import data.
+  // In 1st pass, startElement function is called as many times as necessary.
+  //
+  // Actual import occurs during 2nd pass.
+  // In 2nd pass, startElement and endElement are called many times.
+  // We only use endElement to finish current group processing.
+  //
+  // The above allows us to export/import complex orgs with nested groups,
+  // while by design all data are in attributes of the elements (no CDATA).
+  //
+  // There is currently at least one problem with keeping all data in attributes:
+  // a vertical tab character 0xB anywhere breaks parsing, making import impossible.
+  // See https://github.com/sparklemotion/nokogiri/issues/1581 - looks like
+  // an XML standard thing. Apparently, other invalid characters break parsing too.
+  // This problem needs to be addressed at some point but how exactly without
+  // complicating export-import too much with CDATA and dataElement processing?
   function importXml() {
     global $i18n;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c8933865c..ee01f47fe 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.32.4664 | 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.32.4665 | 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>

From e489a39d1dd1ad0293c45d887433d47b7734979f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Dec 2018 18:53:27 +0000
Subject: [PATCH 0590/1848] A fix for work units in totals only report.

---
 WEB-INF/lib/ttReportHelper.class.php | 7 +++++--
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d46319dbe..237e39e9d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -471,7 +471,10 @@ static function getTotals($options)
     // Prepare parts.
     $time_part = "sum(time_to_sec(l.duration)) as time";
     if ($options['show_work_units']) {
-      $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+      $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
+      $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
+      $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
+      $units_part = $unitTotalsOnly ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
     }
     if ($options['show_cost']) {
       if (MODE_TIME == $user->tracking_mode)
@@ -1468,7 +1471,7 @@ static function makeWorkUnitPart($options) {
     $workUnits = $options['show_work_units'];
     if ($workUnits) {
       $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
-      $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+      $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
       $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
       if ($unitTotalsOnly)
         $work_unit_part = ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ee01f47fe..295fc064d 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.32.4665 | 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.33.4666 | 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>

From 76afe042736b2e08bf3d5b8a4112d15a93073e0b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Dec 2018 19:13:00 +0000
Subject: [PATCH 0591/1848] Fixed date format for a subgroup report.

---
 WEB-INF/lib/ttReportHelper.class.php | 24 +++++++++++++-----------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 237e39e9d..686283bcf 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -463,9 +463,10 @@ static function getSubtotals($options) {
   static function getTotals($options)
   {
     global $user;
-
     $mdb2 = getConnection();
 
+    $trackingMode = $user->getTrackingMode();
+    $decimalMark = $user->getDecimalMark();
     $where = ttReportHelper::getWhere($options);
 
     // Prepare parts.
@@ -477,7 +478,7 @@ static function getTotals($options)
       $units_part = $unitTotalsOnly ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
     }
     if ($options['show_cost']) {
-      if (MODE_TIME == $user->tracking_mode)
+      if (MODE_TIME == $trackingMode)
         $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
       else
         $cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
@@ -485,7 +486,7 @@ static function getTotals($options)
       $cost_part = ", null as cost, null as expenses";
     }
     if ($options['show_cost']) {
-      if (MODE_TIME == $user->tracking_mode) {
+      if (MODE_TIME == $trackingMode) {
         $left_joins = "left join tt_users u on (l.user_id = u.id)";
       } else {
         $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
@@ -517,21 +518,22 @@ static function getTotals($options)
     if ($options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
-      if ('.' != $user->decimal_mark)
-        $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
+      if ('.' != $decimalMark)
+        $total_cost = str_replace('.', $decimalMark, $total_cost);
       $total_expenses = $val['expenses'];
       if (!$total_expenses) $total_expenses = '0.00';
-      if ('.' != $user->decimal_mark)
-        $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
+      if ('.' != $decimalMark)
+        $total_expenses = str_replace('.', $decimalMark, $total_expenses);
     }
 
+    $dateFormat = $user->getDateFormat();
     if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($user->date_format));
+      $period = new Period($options['period'], new DateAndTime($dateFormat));
     else {
       $period = new Period();
       $period->setPeriod(
-        new DateAndTime($user->date_format, $options['period_start']),
-        new DateAndTime($user->date_format, $options['period_end']));
+        new DateAndTime($dateFormat, $options['period_start']),
+        new DateAndTime($dateFormat, $options['period_end']));
     }
 
     $totals['start_date'] = $period->getStartDate();
@@ -1596,7 +1598,7 @@ static function makeGroupByLabel($key, $options) {
       return $key; // No need to format.
 
     global $user;
-    if ($user->date_format == DB_DATEFORMAT)
+    if ($user->getDateFormat() == DB_DATEFORMAT)
       return $key; // No need to format.
 
     $label = $key;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 295fc064d..920d241ba 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.33.4666 | 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.33.4668 | 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>

From 5d1a946b7e54074b7a9ae0b85b73bd573ffe236b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Dec 2018 19:19:27 +0000
Subject: [PATCH 0592/1848] A bit of cleanup.

---
 WEB-INF/lib/ttGroup.class.php | 10 ----------
 WEB-INF/lib/ttUser.class.php  | 10 ----------
 WEB-INF/templates/footer.tpl  |  2 +-
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index f450a4ec4..5ef258cae 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -58,9 +58,6 @@ class ttGroup {
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
-  var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
-  var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
-  var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
 
   var $active_users = 0;        // Count of active users in group.
                                 // We need a non-zero count to display some menus.
@@ -112,13 +109,6 @@ function __construct($id, $org_id) {
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
-      /*
-      if ($this->isPluginEnabled('wu')) {
-        $minutes_in_unit = $config->getIntValue('minutes_in_unit');
-        if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
-        $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
-      }
-      */
     }
 
     // Determine active user count in a separate query.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 9de260b84..ab2b4bcee 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -72,9 +72,6 @@ class ttUser {
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
-  var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
-  var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
-  var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
 
   var $behalfGroup = null;      // A ttGroup instance with on behalf group attributes.
 
@@ -143,13 +140,6 @@ function __construct($login, $id = null) {
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
-      if ($this->isPluginEnabled('wu')) {
-        $minutes_in_unit = $config->getIntValue('minutes_in_unit', 15);
-        if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
-        $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
-        if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
-        $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
-      }
       
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 920d241ba..c2f3151aa 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.33.4668 | 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.33.4669 | 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>

From 906338007f1d45fe1ec40b19b1ff3106898a98fb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Dec 2018 20:34:49 +0000
Subject: [PATCH 0593/1848] Introduced quota_percent field in tt_users table
 for quota work.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c2f3151aa..496a9fb29 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.33.4669 | 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.34.4670 | 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/dbinstall.php b/dbinstall.php
index 197c43b0b..ea177e978 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11826"]) {
+  if ($_POST["convert11797to11834"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1040,6 +1040,8 @@ function ttExecute($sql) {
     ttExecute("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
     ttExecute("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
+    ttExecute("ALTER TABLE `tt_users` ADD COLUMN `quota_percent` float(6,2) default NULL after `rate`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.34', modified = now() where param_name = 'version_db' and param_value = '1.18.26'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1087,7 +1089,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.26)</b>
+    <td width="80%"><b>Create database structure (v1.18.34)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1132,8 +1134,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.26)</td>
-    <td><input type="submit" name="convert11797to11826" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.34)</td>
+    <td><input type="submit" name="convert11797to11834" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 0f3f00c9b..fb2ebe174 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -91,6 +91,7 @@ CREATE TABLE `tt_users` (
   `role_id` int(11) default NULL,                  # role id
   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
+  `quota_percent` float(6,2) default NULL,         # percent of time quota
   `email` varchar(100) default NULL,               # user email
   `created` datetime default NULL,                 # creation timestamp
   `created_ip` varchar(45) default NULL,           # creator ip
@@ -488,4 +489,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.26', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.34', now()); # TODO: change when structure changes.

From d74142948db5d27a3bf144a8ee485318cc1330c3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 20 Dec 2018 17:43:55 +0000
Subject: [PATCH 0594/1848] Introduced ttBehalfUser class for quote percent
 work.

---
 WEB-INF/lib/ttBehalfUser.class.php | 61 ++++++++++++++++++++++++++++++
 WEB-INF/lib/ttGroup.class.php      |  2 +
 WEB-INF/lib/ttUser.class.php       | 19 +++++++---
 WEB-INF/templates/footer.tpl       |  2 +-
 4 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 WEB-INF/lib/ttBehalfUser.class.php

diff --git a/WEB-INF/lib/ttBehalfUser.class.php b/WEB-INF/lib/ttBehalfUser.class.php
new file mode 100644
index 000000000..7f7a5ffa9
--- /dev/null
+++ b/WEB-INF/lib/ttBehalfUser.class.php
@@ -0,0 +1,61 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttConfigHelper');
+import('ttGroupHelper');
+
+// ttBehalfUser class stores a set of "on behalf user" attributes.
+// An instance in kept in ttUser class when user is working on behalf of someone.
+class ttBehalfUser {
+  // Work in progress, build on when need arises.
+  // Currently, we need it for quota_percent work (and perhaps in profile_edit.php).
+  var $name = null;             // User name.
+  var $id = null;               // User id.
+  var $quota_percent = 100.0;   // Time quota percent for quotas plugin.
+
+  // Constructor.
+  // Note: org_id isneeded because we may construct an object in
+  // ttUser constructor, when global $user object does not yet exist.
+  function __construct($id, $org_id) {
+    $mdb2 = getConnection();
+
+    $sql = "select u.name, u.id, u.quota_percent".
+      " from tt_users u".
+      " where u.id = $id and u.org_id = $org_id and u.status = 1";
+
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return;
+
+    $val = $res->fetchRow();
+    if ($val['id'] > 0) {
+      $this->name = $val['name'];
+      $this->id = $val['id'];
+      if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
+    }
+  }
+}
diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 5ef258cae..9c12e95b6 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -63,6 +63,8 @@ class ttGroup {
                                 // We need a non-zero count to display some menus.
 
   // Constructor.
+  // Note: org_id is needed because we construct an object in ttUser constructor,
+  // when global $user object does not yet exist.
   function __construct($id, $org_id) {
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ab2b4bcee..4145f6030 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -28,6 +28,7 @@
 
 import('ttConfigHelper');
 import('ttGroupHelper');
+import('ttBehalfUser');
 import('ttGroup');
 import('form.Form');
 import('form.ActionForm');
@@ -42,6 +43,7 @@ class ttUser {
   var $role_name = null;        // Role name.
   var $rank = null;             // User role rank.
   var $client_id = null;        // Client id for client user role.
+  var $quota_percent = 100.0;   // Time quota percent for quotas plugin.
   var $behalf_id = null;        // User id, on behalf of whom we are working.
   var $behalf_group_id = null;  // Group id, on behalf of which we are working.
   var $behalf_name = null;      // User name, on behalf of whom we are working.
@@ -73,6 +75,7 @@ class ttUser {
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
 
+  var $behalfUser = null;       // A ttBehalfUser instance with on behalf user attributes.
   var $behalfGroup = null;      // A ttGroup instance with on behalf group attributes.
 
   // Constructor.
@@ -84,11 +87,11 @@ function __construct($login, $id = null) {
 
     $mdb2 = getConnection();
 
-    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email,
-      g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start,
-      g.tracking_mode, g.project_required, g.task_required, g.record_type,
-      g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo
-      FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
+      " u.quota_percent, u.email, g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
+      " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type,".
+      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo".
+      " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
     else
@@ -113,6 +116,7 @@ function __construct($login, $id = null) {
       $this->rank = $val['rank'];
       $this->client_id = $val['client_id'];
       $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
+      if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
       $this->email = $val['email'];
       $this->lang = $val['lang'];
       $this->decimal_mark = $val['decimal_mark'];
@@ -145,6 +149,8 @@ function __construct($login, $id = null) {
       if (isset($_SESSION['behalf_id'])) {
         $this->behalf_id = $_SESSION['behalf_id'];
         $this->behalf_name = $_SESSION['behalf_name'];
+
+        $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);
       }
       // Set "on behalf" id and name (group).
       if (isset($_SESSION['behalf_group_id'])) {
@@ -824,6 +830,7 @@ function setOnBehalfUser($user_id) {
     // Unset things first.
     $this->behalf_id = null;
     $this->behalf_name = null;
+    unset($this->behalfUser);
     unset($_SESSION['behalf_id']);
     unset($_SESSION['behalf_name']);
 
@@ -839,6 +846,8 @@ function setOnBehalfUser($user_id) {
     $_SESSION['behalf_name'] = $onBehalfUserName;
     $this->behalf_id = $user_id;
     $this->behalf_name = $onBehalfUserName;
+
+    $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);
     return;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 496a9fb29..7d3abc65b 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.34.4670 | 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.34.4671 | 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>

From 0f6454bb20d223018d0f969ab5e1d46f4ce14b96 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 20 Dec 2018 19:13:18 +0000
Subject: [PATCH 0595/1848] Started using quota percent for users if defined.

---
 WEB-INF/lib/ttUser.class.php   |  9 +++++++--
 WEB-INF/templates/footer.tpl   |  2 +-
 plugins/MonthlyQuota.class.php | 10 ++++++++++
 time.php                       |  2 +-
 week.php                       |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4145f6030..7d6ee6dee 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -162,9 +162,14 @@ function __construct($login, $id = null) {
     }
   }
 
-  // The getUser returns user id on behalf of whom the current user is operating.
+  // getUser returns user id on behalf of whom the current user is operating.
   function getUser() {
-    return ($this->behalf_id ? $this->behalf_id : $this->id);
+    return ($this->behalfUser ? $this->behalfUser->id : $this->id);
+  }
+
+  // getQuotaPercent returns quota percent for active user.
+  function getQuotaPercent() {
+    return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);
   }
 
   // The getGroup returns group id on behalf of which the current user is operating.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7d3abc65b..a0c889c83 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.34.4671 | 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.34.4672 | 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/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 29d8cfb7b..a1c1b5d09 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -84,6 +84,16 @@ private function getSingle($year, $month) {
     return $numWorkdays * $user->getWorkdayMinutes();
   }
 
+  // getUserQuota - obtains a quota for user for a single month.
+  // This quota is adjusted by quota_percent value for user.
+  public function getUserQuota($year, $month) {
+    global $user;
+
+    $minutes = $this->getSingle($year, $month);
+    $userMinutes = (int) $minutes * $user->getQuotaPercent() / 100;
+    return $userMinutes;
+  }
+
   // getMany - returns an array of quotas for a given year for group.
   private function getMany($year){
     $sql = "select month, minutes from tt_monthly_quotas".
diff --git a/time.php b/time.php
index 013f15ca6..ac6b69b5f 100644
--- a/time.php
+++ b/time.php
@@ -85,7 +85,7 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
+  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
   $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
   
diff --git a/week.php b/week.php
index 1dd6e56a5..f18817d7d 100644
--- a/week.php
+++ b/week.php
@@ -91,7 +91,7 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
+  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
   $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
 

From 448c3e07930dbf902c97c93f252a474cb0931e23 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 20 Dec 2018 22:09:50 +0000
Subject: [PATCH 0596/1848] Initial attempt to implement quota percent for
 users.

---
 WEB-INF/lib/ttUser.class.php       |  2 +-
 WEB-INF/lib/ttUserHelper.class.php | 12 +++++++++---
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/user_add.tpl     |  8 +++++++-
 WEB-INF/templates/user_edit.tpl    |  8 +++++++-
 user_add.php                       | 15 +++++++++++++--
 user_edit.php                      | 16 ++++++++++++++--
 7 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7d6ee6dee..f163e5814 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -542,7 +542,7 @@ function getUserDetails($user_id) {
     // then rank restriction does not apply.
     $max_rank = $this->behalfGroup ? MAX_RANK : $this->rank;
 
-    $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
+    $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.quota_percent, u.email from tt_users u".
       " left join tt_roles r on (u.role_id = r.id)".
       " where u.id = $user_id and u.group_id = $group_id and u.org_id = $org_id and u.status is not null".
       " and (r.rank < $max_rank or (r.rank = $max_rank and u.id = $this->id))"; // Users with lesser roles or self.
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index f91128e7e..26ced938a 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -104,6 +104,7 @@ static function insert($fields, $hash = true) {
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
     $rate = str_replace(',', '.', isset($fields['rate']) ? $fields['rate'] : 0);
+    $quota_percent = str_replace(',', '.', isset($fields['quota_percent']) ? $fields['quota_percent'] : 100);
     if($rate == '')
       $rate = 0;
     if (array_key_exists('status', $fields)) { // Key exists and may be NULL during migration of deleted acounts.
@@ -113,9 +114,9 @@ static function insert($fields, $hash = true) {
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by_v = ', '.$user->id;
 
-    $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
+    $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, quota_percent, email, created, created_ip, created_by $status_f) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
-      ", $password, $group_id, $org_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
+      ", $password, $group_id, $org_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, $quota_percent, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
@@ -178,6 +179,11 @@ static function update($user_id, $fields) {
       $rate_part = ", rate = ".$mdb2->quote($rate); 
     }
 
+    if (array_key_exists('quota_percent', $fields)) {
+      $quota_percent = str_replace(',', '.', isset($fields['quota_percent']) ? $fields['quota_percent'] : 100);
+      $quota_percent_part = ", quota_percent = ".$mdb2->quote($quota_percent);
+    }
+
     if (isset($fields['email']))
       $email_part = ', email = '.$mdb2->quote($fields['email']);
 
@@ -187,7 +193,7 @@ static function update($user_id, $fields) {
     }
 
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
-    $parts = ltrim($login_part.$pass_part.$name_part.$role_part.$client_part.$rate_part.$email_part.$modified_part.$status_part, ',');
+    $parts = ltrim($login_part.$pass_part.$name_part.$role_part.$client_part.$rate_part.$quota_percent_part.$email_part.$modified_part.$status_part, ',');
 
     $sql = "update tt_users set $parts".
       " where id = $user_id and group_id = $group_id and org_id = $org_id";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a0c889c83..b1c606f4f 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.34.4672 | 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.34.4673 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 29218d866..ea4809f1f 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -81,7 +81,13 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && $show_projects}
+{if $show_quota}
+    <tr>
+      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td>{$forms.userForm.quota_percent.control}</td>
+    </tr>
+{/if}
+{if $show_projects}
     <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 0c24a0113..b1026f2c1 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -115,7 +115,13 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && $show_projects}
+{if $show_quota}
+    <tr>
+      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td>{$forms.userForm.quota_percent.control}</td>
+    </tr>
+{/if}
+{if $show_projects}
     <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
diff --git a/user_add.php b/user_add.php
index 28baa2cf5..6f1e02c11 100644
--- a/user_add.php
+++ b/user_add.php
@@ -46,6 +46,7 @@
 // The "limit" plugin is not required for normal operation of Time Tracker.
 @include('plugins/limit/user_add.php');
 
+$show_quota = $user->isPluginEnabled('mq');
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
@@ -61,6 +62,7 @@
   $cl_role_id = $request->getParameter('role');
   $cl_client_id = $request->getParameter('client');
   $cl_rate = $request->getParameter('rate');
+  $cl_quota_percent = $request->getParameter('quota_percent');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
@@ -90,8 +92,14 @@
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
 
-$projects = ttGroupHelper::getActiveProjects();
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -143,6 +151,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   // Require selection of a client for a client role.
   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('form.quota.quota'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
@@ -151,6 +160,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
+        'quota_percent' => $cl_quota_percent,
         'group_id' => $user->getGroup(),
         'org_id' => $user->org_id,
         'role_id' => $cl_role_id,
@@ -176,7 +186,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', count($projects) > 0);
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'user_add.tpl');
diff --git a/user_edit.php b/user_edit.php
index 531d2efec..c3910db3e 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -49,10 +49,15 @@
 }
 // End of access checks.
 
+$show_quota = $user->isPluginEnabled('mq');
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
-$projects = ttGroupHelper::getActiveProjects();
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}
 $assigned_projects = array();
 
 if ($request->isPost()) {
@@ -67,6 +72,7 @@
   $cl_client_id = $request->getParameter('client');
   $cl_status = $request->getParameter('status');
   $cl_rate = $request->getParameter('rate');
+  $cl_quota_percent = $request->getParameter('quota_percent');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
@@ -84,6 +90,7 @@
   $cl_login = $user_details['login'];
   $cl_email = $user_details['email'];
   $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
+  $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
   $cl_role_id = $user_details['role_id'];
   $cl_client_id = $user_details['client_id'];
   $cl_status = $user_details['status'];
@@ -111,6 +118,8 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -164,6 +173,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   // Require selection of a client for a client role.
   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('form.quota.quota'));
 
   if ($err->no()) {
     $existing_user = ttUserHelper::getUserByLogin($cl_login);
@@ -176,6 +186,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'email' => $cl_email,
         'status' => $cl_status,
         'rate' => $cl_rate,
+        'quota_percent' => $cl_quota_percent,
         'projects' => $assigned_projects);
       if (in_array('manage_users', $user->rights) && $cl_role_id) {
         $fields['role_id'] = $cl_role_id;
@@ -228,7 +239,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('can_swap', $can_swap);
-$smarty->assign('show_projects', count($projects) > 0);
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('user_id', $user_id);

From d4834198f5649729ae58b220ba2fce6e11734607 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Dec 2018 14:56:58 +0000
Subject: [PATCH 0597/1848] Added what is it links explaining quota percent.

---
 WEB-INF/templates/footer.tpl    | 2 +-
 WEB-INF/templates/user_add.tpl  | 2 +-
 WEB-INF/templates/user_edit.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b1c606f4f..157422404 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.34.4673 | 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.34.4674 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index ea4809f1f..0398749cb 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -84,7 +84,7 @@ function handleClientControl() {
 {if $show_quota}
     <tr>
       <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
-      <td>{$forms.userForm.quota_percent.control}</td>
+      <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
 {if $show_projects}
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index b1026f2c1..d7e7b54c8 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -118,7 +118,7 @@ function handleClientControl() {
 {if $show_quota}
     <tr>
       <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
-      <td>{$forms.userForm.quota_percent.control}</td>
+      <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
 {if $show_projects}

From fec361583dcdb716abd921ca19f68c9d6e98b9f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Dec 2018 15:31:47 +0000
Subject: [PATCH 0598/1848] Added quota percent on mobile user add page.

---
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/mobile/user_add.tpl |  8 +++++++-
 mobile/user_add.php                   | 16 ++++++++++++++--
 user_add.php                          |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 157422404..637457139 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.34.4674 | 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.34.4675 | 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/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl
index e1a053502..9fe22314c 100644
--- a/WEB-INF/templates/mobile/user_add.tpl
+++ b/WEB-INF/templates/mobile/user_add.tpl
@@ -81,7 +81,13 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_quota}
+    <tr>
+      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td>{$forms.userForm.quota_percent.control}</td>
+    </tr>
+{/if}
+{if $show_projects}
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
diff --git a/mobile/user_add.php b/mobile/user_add.php
index ab6f5e2da..3ffaa01a3 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -45,6 +45,7 @@
 // The "limit" plugin is not required for normal operation of Time Tracker.
 @include('../plugins/limit/user_add.php');
 
+$show_quota = $user->isPluginEnabled('mq');
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
@@ -60,6 +61,7 @@
   $cl_role_id = $request->getParameter('role');
   $cl_client_id = $request->getParameter('client');
   $cl_rate = $request->getParameter('rate');
+  $cl_quota_percent = $request->getParameter('quota_percent');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
@@ -89,8 +91,14 @@
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
 
-$projects = ttGroupHelper::getActiveProjects();
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -140,6 +148,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
   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('form.quota.quota'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
@@ -148,7 +157,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'group_id' => $user->group_id,
+        'quota_percent' => $cl_quota_percent,
+        'group_id' => $user->getGroup(),
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
@@ -167,6 +177,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'mobile/user_add.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/user_add.php b/user_add.php
index 6f1e02c11..afe0a846c 100644
--- a/user_add.php
+++ b/user_add.php
@@ -186,9 +186,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('show_quota', $show_quota);
 $smarty->assign('show_projects', $show_projects);
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'user_add.tpl');
 $smarty->display('index.tpl');

From 55c33b542216912d3a3f05b5c9c90528eb768cbe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Dec 2018 15:59:43 +0000
Subject: [PATCH 0599/1848] Fixed mobile user add.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/user_add.php          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 637457139..17042163c 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.34.4675 | 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.34.4676 | 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 3ffaa01a3..ce11ecc2d 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -159,6 +159,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'rate' => $cl_rate,
         'quota_percent' => $cl_quota_percent,
         'group_id' => $user->getGroup(),
+        'org_id' => $user->org_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,

From a4ecfaf39d301762cb6332da5d72978b60846092 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Dec 2018 16:27:20 +0000
Subject: [PATCH 0600/1848] Added quota percent on mobile user edit page.

---
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/mobile/user_edit.tpl |  8 +++++++-
 mobile/user_edit.php                   | 19 ++++++++++++++++---
 user_edit.php                          |  4 ++--
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 17042163c..d68b7cb62 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.34.4676 | 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.34.4677 | 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/mobile/user_edit.tpl b/WEB-INF/templates/mobile/user_edit.tpl
index ecbff5993..6c5e12e7c 100644
--- a/WEB-INF/templates/mobile/user_edit.tpl
+++ b/WEB-INF/templates/mobile/user_edit.tpl
@@ -109,7 +109,13 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
       <td>{$forms.userForm.rate.control}</td>
     </tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_quota}
+    <tr>
+      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td>{$forms.userForm.quota_percent.control}</td>
+    </tr>
+{/if}
+{if $show_projects}
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index df184fcfb..d79a1f270 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -48,10 +48,15 @@
 }
 // End of access checks.
 
+$show_quota = $user->isPluginEnabled('mq');
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
-$projects = ttGroupHelper::getActiveProjects();
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}
 $assigned_projects = array();
 
 if ($request->isPost()) {
@@ -66,6 +71,7 @@
   $cl_client_id = $request->getParameter('client');
   $cl_status = $request->getParameter('status');
   $cl_rate = $request->getParameter('rate');
+  $cl_quota_percent = $request->getParameter('quota_percent');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
@@ -82,7 +88,8 @@
   $cl_name = $user_details['name'];
   $cl_login = $user_details['login'];
   $cl_email = $user_details['email'];
-  $cl_rate = str_replace('.', $user->decimal_mark, $user_details['rate']);
+  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
+  $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
   $cl_role_id = $user_details['role_id'];
   $cl_client_id = $user_details['client_id'];
   $cl_status = $user_details['status'];
@@ -110,6 +117,8 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -162,7 +171,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
     }
     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('form.quota.quota'));
+
     if ($err->no()) {
       $existing_user = ttUserHelper::getUserByLogin($cl_login);
       if (!$existing_user || ($user_id == $existing_user['id'])) {
@@ -174,6 +184,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
           'email' => $cl_email,
           'status' => $cl_status,
           'rate' => $cl_rate,
+          'quota_percent' => $cl_quota_percent,
           'projects' => $assigned_projects);
         if (in_array('manage_users', $user->rights)) {
           $fields['role_id'] = $cl_role_id;
@@ -226,6 +237,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('user_id', $user_id);
 $smarty->assign('title', $i18n->get('title.edit_user'));
 $smarty->assign('content_page_name', 'mobile/user_edit.tpl');
diff --git a/user_edit.php b/user_edit.php
index c3910db3e..af6180a3b 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -239,10 +239,10 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('can_swap', $can_swap);
-$smarty->assign('show_quota', $show_quota);
-$smarty->assign('show_projects', $show_projects);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('user_id', $user_id);
 $smarty->assign('title', $i18n->get('title.edit_user'));
 $smarty->assign('content_page_name', 'user_edit.tpl');

From 1567369ac1fb744b704cacbe77542f55e410d61b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Dec 2018 17:08:57 +0000
Subject: [PATCH 0601/1848] A bit of refactoring in translation files.

---
 WEB-INF/resources/ca.lang.php          | 3 ++-
 WEB-INF/resources/cs.lang.php          | 3 ++-
 WEB-INF/resources/da.lang.php          | 2 +-
 WEB-INF/resources/de.lang.php          | 2 +-
 WEB-INF/resources/en.lang.php          | 2 +-
 WEB-INF/resources/es.lang.php          | 3 ++-
 WEB-INF/resources/et.lang.php          | 3 ++-
 WEB-INF/resources/fa.lang.php          | 2 +-
 WEB-INF/resources/fi.lang.php          | 3 ++-
 WEB-INF/resources/fr.lang.php          | 2 +-
 WEB-INF/resources/gr.lang.php          | 2 +-
 WEB-INF/resources/he.lang.php          | 3 ++-
 WEB-INF/resources/hu.lang.php          | 2 +-
 WEB-INF/resources/it.lang.php          | 2 +-
 WEB-INF/resources/ja.lang.php          | 3 ++-
 WEB-INF/resources/ko.lang.php          | 3 ++-
 WEB-INF/resources/nl.lang.php          | 2 +-
 WEB-INF/resources/no.lang.php          | 2 +-
 WEB-INF/resources/pl.lang.php          | 3 ++-
 WEB-INF/resources/pt-br.lang.php       | 3 ++-
 WEB-INF/resources/pt.lang.php          | 2 +-
 WEB-INF/resources/ro.lang.php          | 3 ++-
 WEB-INF/resources/ru.lang.php          | 2 +-
 WEB-INF/resources/sk.lang.php          | 3 ++-
 WEB-INF/resources/sl.lang.php          | 2 +-
 WEB-INF/resources/sr.lang.php          | 3 ++-
 WEB-INF/resources/sv.lang.php          | 2 +-
 WEB-INF/resources/tr.lang.php          | 3 ++-
 WEB-INF/resources/zh-cn.lang.php       | 2 +-
 WEB-INF/resources/zh-tw.lang.php       | 2 +-
 WEB-INF/templates/footer.tpl           | 2 +-
 WEB-INF/templates/mobile/user_add.tpl  | 2 +-
 WEB-INF/templates/mobile/user_edit.tpl | 2 +-
 WEB-INF/templates/quotas.tpl           | 2 +-
 WEB-INF/templates/user_add.tpl         | 2 +-
 WEB-INF/templates/user_edit.tpl        | 2 +-
 mobile/user_add.php                    | 2 +-
 mobile/user_edit.php                   | 2 +-
 user_add.php                           | 2 +-
 user_edit.php                          | 2 +-
 40 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 68c6e6a96..549241b06 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -258,6 +258,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Només totals',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -552,7 +554,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index bcda74010..d66af403e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -268,6 +268,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Pouze součty',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -566,7 +568,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 45cf377ee..061b1fb61 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -243,6 +243,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Kun Total',
+'label.quota' => 'Kvota',
 
 // Form titles.
 'title.error' => 'Fejl',
@@ -514,7 +515,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'År',
 'form.quota.month' => 'Måned',
-'form.quota.quota' => 'Kvota',
 'form.quota.workday_hours' => 'Timer på en arbejdsdag',
 'form.quota.hint' => 'Hvis værdierne er tomme, beregnes kvoter automatisk baseret på arbejdsdage og helligdage.',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 3775315ca..82599a628 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -231,6 +231,7 @@
 'label.work_units' => 'Arbeitseinheiten',
 'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
+'label.quota' => 'Quote',
 
 // Form titles.
 'title.error' => 'Fehler',
@@ -485,7 +486,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Jahr',
 'form.quota.month' => 'Monat',
-'form.quota.quota' => 'Quote',
 'form.quota.workday_hours' => 'Arbeitsstunden pro Tag',
 'form.quota.hint' => 'Wenn leergelassen wird die Quote automatisch berechnet (Basierend auf Arbeitsstunden pro Tag und Feiertagen)',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index fee9fdbf0..5d2acd565 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -225,6 +225,7 @@
 'label.work_units' => 'Work units',
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
+'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'Error',
@@ -482,7 +483,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Year',
 'form.quota.month' => 'Month',
-'form.quota.quota' => 'Quota',
 'form.quota.workday_hours' => 'Hours in work day',
 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index aa6425547..684d60a35 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -261,6 +261,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo totales',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -567,7 +569,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a61a13056..97b92fc73 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -265,6 +265,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Ainult summad',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -563,7 +565,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 86f3930de..4e298f3b8 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -254,6 +254,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'خطا',
@@ -538,7 +539,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4687e6f53..7322bf90e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -247,6 +247,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Vain yhteissummat',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'Virhe',
@@ -522,7 +524,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ad77095c2..7584f9c6e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -241,6 +241,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totaux uniquement',
+'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'Erreur',
@@ -510,7 +511,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Année',
 'form.quota.month' => 'Mois',
-'form.quota.quota' => 'Quota',
 'form.quota.workday_hours' => 'Heures journée de travail',
 'form.quota.hint' => 'Si les valeurs sont vides, les quotas sont calculés automatiquement selon les heures des journées de travail et des congés.',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f4859df7f..c354b28a6 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -234,6 +234,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Σύνολα μόνο',
+'label.quota' => 'Ποσοστό',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
@@ -495,7 +496,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Χρόνος',
 'form.quota.month' => 'Μήνας',
-'form.quota.quota' => 'Ποσοστό',
 'form.quota.workday_hours' => 'Ώρες ανά ημέρα εργασίας',
 'form.quota.hint' => 'Εάν οι τιμές είναι κενές, οι ποσοστώσεις υπολογίζονται αυτόματα με βάση τις ώρες της εργάσιμης ημέρας και τις αργίες.',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d7abe002d..d81832cce 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -264,6 +264,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'labl.totals_only' => 'סיכומים בלבד',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'שגיאה',
@@ -546,7 +548,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 0e0e4522f..2097f9908 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -263,6 +263,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -557,7 +558,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ce1ab88cc..77581731a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -238,6 +238,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo i totali',
+'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -510,7 +511,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Anno',
 'form.quota.month' => 'Mese',
-'form.quota.quota' => 'Quota',
 'form.quota.workday_hours' => 'Ore lavorative in un giorno',
 'form.quota.hint' => 'Se i valori sono vuoti, le quote vengono calcolate automaticamente basandosi su ore giornaliere e vacanze.',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 431915fd8..3cb26d69c 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -268,6 +268,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => '全体だけ',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -560,7 +562,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 7ac2dd4ef..dc5a1a415 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -268,6 +268,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => '오직 전체만',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -558,7 +560,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 3cad307be..99cab30c4 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -228,6 +228,7 @@
 'label.work_units' => 'Werk eenheid',
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
+'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'Fout',
@@ -486,7 +487,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Jaar',
 'form.quota.month' => 'Maand',
-'form.quota.quota' => 'Quota',
 'form.quota.workday_hours' => 'Werkuren per dag',
 'form.quota.hint' => 'Als de velden leeg worden gelaten, dan zullen de doelen worden berekend op bassis van het aantal werkuren per dag en vakantiedagen.',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d7847c153..e3273ca07 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -265,6 +265,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota'
 
 // Form titles.
 // TODO: Translate the following.
@@ -556,7 +557,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index a36b06c14..461e65611 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -248,6 +248,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Tylko sumy',
+// TODO: translate the following.
+// 'label.quota' => 'Quota'
 
 // Form titles.
 'title.error' => 'Błąd',
@@ -524,7 +526,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7bfb95529..241f4544b 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -245,6 +245,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Somente totais',
+// TODO: translate the following.
+// 'label.quota' => 'Quota'
 
 // Form titles.
 'title.error' => 'Erro',
@@ -519,7 +521,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index bdb1c3753..dad9124a4 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -254,6 +254,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota'
 
 // Form titles.
 // TODO: Translate the following.
@@ -540,7 +541,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e1c24e2de..c3a6077ba 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -265,6 +265,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Numai totaluri',
+// TODO: translate the following.
+// 'label.quota' => 'Quota'
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -561,7 +563,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5710cbb36..727ff51ee 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -224,6 +224,7 @@
 'label.work_units' => 'Единицы работы',
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
+'label.quota' => 'Квота',
 
 // Form titles.
 'title.error' => 'Ошибка',
@@ -479,7 +480,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Год',
 'form.quota.month' => 'Месяц',
-'form.quota.quota' => 'Квота',
 'form.quota.workday_hours' => 'Количество часов в рабочем дне',
 'form.quota.hint' => 'При пустых значениях квоты автоматически определяются из длительности рабочего дня и праздников.',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 0097e09b7..1a87dd808 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -254,6 +254,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Iba celkové',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'Chyba',
@@ -537,7 +539,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index dfc9fd32a..5b036edd6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -249,6 +249,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -536,7 +537,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1c59de37e..a8d2bf8f4 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -246,6 +246,8 @@
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
 'label.totals_only' => 'Samo zbirno',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 'title.error' => 'Greška',
@@ -522,7 +524,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in a work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a20aed921..e009c0c57 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -242,6 +242,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Visa endast summeringar',
+'label.quota' => 'Kvot',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
@@ -518,7 +519,6 @@
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'År',
 'form.quota.month' => 'Månad',
-'form.quota.quota' => 'Kvot',
 'form.quota.workday_hours' => 'Arbetstimmar per dag',
 'form.quota.hint' => 'Om fälten lämnas tomma räknas kvoterna automatiskt ut baserat på arbetstimmar per dag och helgdagar.',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 771ccb904..48359a941 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -272,6 +272,8 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Sadece toplamlar',
+// TODO: translate the following.
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // Form titles.
@@ -574,7 +576,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 190cf5a48..e753c32c3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -256,6 +256,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -543,7 +544,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 7b1bcdba0..b9951b1ce 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -264,6 +264,7 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
+// 'label.quota' => 'Quota',
 
 // Form titles.
 // TODO: Translate the following.
@@ -552,7 +553,6 @@
 // TODO: translate the following.
 // 'form.quota.year' => 'Year',
 // 'form.quota.month' => 'Month',
-// 'form.quota.quota' => 'Quota',
 // 'form.quota.workday_hours' => 'Hours in work day',
 // 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d68b7cb62..aaf04fa05 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.34.4677 | 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.34.4678 | 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/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl
index 9fe22314c..71901fb05 100644
--- a/WEB-INF/templates/mobile/user_add.tpl
+++ b/WEB-INF/templates/mobile/user_add.tpl
@@ -83,7 +83,7 @@ function handleClientControl() {
     </tr>
 {if $show_quota}
     <tr>
-      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control}</td>
     </tr>
 {/if}
diff --git a/WEB-INF/templates/mobile/user_edit.tpl b/WEB-INF/templates/mobile/user_edit.tpl
index 6c5e12e7c..0d7f47e6c 100644
--- a/WEB-INF/templates/mobile/user_edit.tpl
+++ b/WEB-INF/templates/mobile/user_edit.tpl
@@ -111,7 +111,7 @@ function handleClientControl() {
     </tr>
 {if $show_quota}
     <tr>
-      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control}</td>
     </tr>
 {/if}
diff --git a/WEB-INF/templates/quotas.tpl b/WEB-INF/templates/quotas.tpl
index 67707d38a..1dba4f239 100644
--- a/WEB-INF/templates/quotas.tpl
+++ b/WEB-INF/templates/quotas.tpl
@@ -28,7 +28,7 @@
       <table>
         <tr>
           <td class="tableHeaderCentered">{$i18n.form.quota.month}</td>
-          <td class="tableHeaderCentered">{$i18n.form.quota.quota}</td>
+          <td class="tableHeaderCentered">{$i18n.label.quota}</td>
         </tr>
 {foreach $months as $month}
         <tr>
diff --git a/WEB-INF/templates/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 0398749cb..39575db0c 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -83,7 +83,7 @@ function handleClientControl() {
     </tr>
 {if $show_quota}
     <tr>
-      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index d7e7b54c8..7475c6efb 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -117,7 +117,7 @@ function handleClientControl() {
     </tr>
 {if $show_quota}
     <tr>
-      <td align="right">{$i18n.form.quota.quota}&nbsp;(%):</td>
+      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
diff --git a/mobile/user_add.php b/mobile/user_add.php
index ce11ecc2d..b1d155aa0 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -148,7 +148,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
   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('form.quota.quota'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index d79a1f270..1e0845e1a 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -171,7 +171,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     }
     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('form.quota.quota'));
+    if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
 
     if ($err->no()) {
       $existing_user = ttUserHelper::getUserByLogin($cl_login);
diff --git a/user_add.php b/user_add.php
index afe0a846c..a99951912 100644
--- a/user_add.php
+++ b/user_add.php
@@ -151,7 +151,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   // Require selection of a client for a client role.
   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('form.quota.quota'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
diff --git a/user_edit.php b/user_edit.php
index af6180a3b..582452d9a 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -173,7 +173,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   // Require selection of a client for a client role.
   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('form.quota.quota'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
 
   if ($err->no()) {
     $existing_user = ttUserHelper::getUserByLogin($cl_login);

From 30634c0b3869d459552df1da06ec264fb1e6b086 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Dec 2018 22:09:59 +0000
Subject: [PATCH 0602/1848] Added quota column on the users page.

---
 WEB-INF/lib/common.lib.php   |  8 ++++++++
 WEB-INF/lib/ttUser.class.php | 21 ++++++++++++++++++++-
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/users.tpl  | 20 ++++++++++++++++----
 users.php                    |  1 +
 5 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 0e9ff9e49..f483b3d4c 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -391,6 +391,14 @@ function ttStartsWith($string, $startString)
     return (substr($string, 0, $len) === $startString);
 }
 
+// ttEndsWith functions checks if a string ends with a given substring.
+function ttEndsWith($string, $endString)
+{
+    $len = strlen($endString);
+    if ($len == 0) return true;
+    return (substr($string, -$len) === $endString);
+}
+
 // ttDateToUserFormat converts a date from database format to user format.
 function ttDateToUserFormat($date)
 {
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index f163e5814..73ec7a1e9 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -395,7 +395,16 @@ function getUsers($options) {
     $includeSelf = isset($options['include_self']);
 
     $select_part = 'select u.id, u.group_id, u.name';
-    if (isset($options['include_login'])) $select_part .= ', u.login';
+    if (isset($options['include_login'])) {
+      $select_part .= ', u.login';
+      // Piggy-back on include_login to see if we must also include quota_percent.
+      $include_quota = $this->isPluginEnabled('mq');
+      if ($include_quota) {
+        $decimal_mark = $this->getDecimalMark();
+        $replaceDecimalMark = ('.' != $decimal_mark);
+        $select_part .= ', u.quota_percent';
+      }
+    }
     if (!isset($options['include_clients'])) $select_part .= ', r.rights';
     if (isset($options['include_role'])) $select_part .= ', r.name as role_name, r.rank';
 
@@ -430,6 +439,16 @@ function getUsers($options) {
         if ($isClient)
           continue; // Skip adding clients.
       }
+      if ($include_quota) {
+        $quota = $val['quota_percent'];
+        if (null == $quota)
+          $quota = '100'; // Null means 100%. Perhaps enforce not NULLs in db and eliminate this check.
+        elseif (ttEndsWith($quota, '.00'))
+          $quota = substr($quota, 0, strlen($quota)-3); // Trim trailing ".00";
+        elseif ($replaceDecimalMark)
+          $quota = str_replace('.', $decimal_mark, $quota);
+        $val['quota_percent'] = $quota.'%';
+      }
       $user_list[] = $val;
     }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aaf04fa05..19832de86 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.34.4678 | 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.34.4679 | 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/users.tpl b/WEB-INF/templates/users.tpl
index 236475c19..d3fadad93 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -14,8 +14,11 @@
           <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="30%" class="tableHeader">{$i18n.label.login}</td>
           <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
-          <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
-          <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
+  {if $show_quota}
+          <td class="tableHeader">{$i18n.label.quota}</td>
+  {/if}
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
   {if $active_users}
     {foreach $active_users as $u}
@@ -28,6 +31,9 @@
           </td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
+      {if $show_quota}
+          <td class="cellRightAligned">{$u.quota_percent}</td>
+      {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
          {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>{else}<td></td>{/if}
@@ -55,14 +61,20 @@
           <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="30%" class="tableHeader">{$i18n.label.login}</td>
           <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
-          <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
-          <td width="10%" class="tableHeader">{$i18n.label.delete}</td>
+    {if $show_quota}
+          <td class="tableHeader">{$i18n.label.quota}</td>
+    {/if}
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
+      {if $show_quota}
+          <td class="cellRightAligned">{$u.quota_percent}</td>
+      {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank}
           <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
           <td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>
diff --git a/users.php b/users.php
index fd9e7593f..aa7f44402 100644
--- a/users.php
+++ b/users.php
@@ -63,6 +63,7 @@
 
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
+$smarty->assign('show_quota', $user->isPluginEnabled('mq'));
 $smarty->assign('title', $i18n->get('title.users'));
 $smarty->assign('content_page_name', 'users.tpl');
 $smarty->display('index.tpl');

From da39950fb8192f48ad40f6777ff3c5cd52459bcd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Dec 2018 14:58:30 +0000
Subject: [PATCH 0603/1848] Introduced balance output for monthly quotas.

---
 WEB-INF/resources/ca.lang.php    |  2 ++
 WEB-INF/resources/cs.lang.php    |  2 ++
 WEB-INF/resources/da.lang.php    |  3 +++
 WEB-INF/resources/de.lang.php    |  3 +++
 WEB-INF/resources/en.lang.php    |  2 ++
 WEB-INF/resources/es.lang.php    |  2 ++
 WEB-INF/resources/et.lang.php    |  2 ++
 WEB-INF/resources/fa.lang.php    |  2 ++
 WEB-INF/resources/fi.lang.php    |  2 ++
 WEB-INF/resources/fr.lang.php    |  3 +++
 WEB-INF/resources/gr.lang.php    |  3 +++
 WEB-INF/resources/he.lang.php    |  2 ++
 WEB-INF/resources/hu.lang.php    |  2 ++
 WEB-INF/resources/it.lang.php    |  3 +++
 WEB-INF/resources/ja.lang.php    |  2 ++
 WEB-INF/resources/ko.lang.php    |  2 ++
 WEB-INF/resources/nl.lang.php    |  3 +++
 WEB-INF/resources/no.lang.php    |  2 ++
 WEB-INF/resources/pl.lang.php    |  2 ++
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  2 ++
 WEB-INF/resources/ro.lang.php    |  2 ++
 WEB-INF/resources/ru.lang.php    |  2 ++
 WEB-INF/resources/sk.lang.php    |  2 ++
 WEB-INF/resources/sl.lang.php    |  2 ++
 WEB-INF/resources/sr.lang.php    |  2 ++
 WEB-INF/resources/sv.lang.php    |  3 +++
 WEB-INF/resources/tr.lang.php    |  2 ++
 WEB-INF/resources/zh-cn.lang.php |  2 ++
 WEB-INF/resources/zh-tw.lang.php |  2 ++
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/time.tpl       | 12 ++++++++++--
 plugins/MonthlyQuota.class.php   | 19 +++++++++++++++++++
 time.php                         |  7 ++++++-
 34 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 549241b06..b4d869930 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -405,6 +405,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Aquest historial s\\\'ha guardat únicament amb l\\\'hora d\\\'inici. Aixó no és un error.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d66af403e..d12be155e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -415,6 +415,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Záznam byl uložen pouze s časem zahájení. Není to chyba.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 061b1fb61..c49745130 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -376,6 +376,9 @@
 'form.time.uncompleted' => 'Uafsluttet',
 'form.time.remaining_quota' => 'Resterende kvota',
 'form.time.over_quota' => 'Over kvota',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Denne post blev kun gemt med starttidspunkt. Det er ikke en fejl.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 82599a628..eab807e85 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -357,6 +357,9 @@
 'form.time.uncompleted' => 'Unvollständig',
 'form.time.remaining_quota' => 'Verbleibende Quote',
 'form.time.over_quota' => 'Über der Quote',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dieser Eintrag wurde ohne Startzeit gespeichert. Dies ist kein Fehler.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5d2acd565..aadf6f5ac 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -355,6 +355,8 @@
 'form.time.uncompleted' => 'Uncompleted',
 'form.time.remaining_quota' => 'Remaining quota',
 'form.time.over_quota' => 'Over quota',
+'form.time.remaining_balance' => 'Remaining balance',
+'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'This record was saved with only start time. It is not an error.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 684d60a35..cc4fe0347 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -418,6 +418,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Este historial fue guardado solamente con la hora de Inicio. Esto no es un error.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 97b92fc73..a29929afd 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -414,6 +414,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Kanne salvestati ainult alguse ajaga. See ei ole viga.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 4e298f3b8..f1a37b4f5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -398,6 +398,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 // TODO: translate form.time_edit.uncompleted. 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 7322bf90e..065f71c1c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -384,6 +384,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Vain aloitusaika tallennettiin tietueeseen. Kyseessä ei ole virhe.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 7584f9c6e..4c6d76749 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -373,6 +373,9 @@
 'form.time.uncompleted' => 'Non terminée',
 'form.time.remaining_quota' => 'Quota restant',
 'form.time.over_quota' => 'Quota dépassé',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Cet enregistrement a été sauvegardé avec une heure de début seulement. Il ne s\\\'agit pas d\\\'une erreur.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c354b28a6..6be29a04b 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -365,6 +365,9 @@
 'form.time.uncompleted' => 'Μη ολοκληρωμένο',
 'form.time.remaining_quota' => 'Υπολειπόμενη ποσόστωση',
 'form.time.over_quota' => 'Πάνω από το όριο',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Η καταχώρηση αποθηκεύτηκε μόνο με ώρα έναρξης. Δεν είναι λάθος.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d81832cce..d27edb8c7 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -405,6 +405,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'רישום זה נשמר עם שעת התחלה בלבד. זאת איננה טעות.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 2097f9908..27642b478 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -407,6 +407,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 77581731a..8f35a78ec 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -378,6 +378,9 @@
 'form.time.uncompleted' => 'Incompleti',
 'form.time.remaining_quota' => 'Quota rimanente',
 'form.time.over_quota' => 'Sopra quota',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Questo record è stato salvato con la sola ora di inzio attività. Non è un errore.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3cb26d69c..ea158793a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -414,6 +414,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'このレコードは開始時間だけで保存されました。これはエラーではありません。',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dc5a1a415..27cbe6692 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -413,6 +413,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => '이 기록은 시작 시간으로만 저장되었습니다. 이것은 오류는 아닙니다.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 99cab30c4..b0ada311d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -358,6 +358,9 @@
 'form.time.uncompleted' => 'Onvolledig',
 'form.time.remaining_quota' => 'Te werken uren voor de doelstelling',
 'form.time.over_quota' => 'Meer gewerkte uren dan de doelstelling',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dit tijdrecord is opgeslagen met alleen een starttijd. Dit is geen fout.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e3273ca07..34f4f6d30 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -410,6 +410,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Denne oppføringen ble lagret kun med starttid. Det er ikke en feil.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 461e65611..a9220c4eb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -386,6 +386,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Ten wpis ma określony jedynie czas rozpoczęcia. To nie jest błąd.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 241f4544b..ee699e11b 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -381,6 +381,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Eesta entrada foi salva somente com hora de início. Não é um erro.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index dad9124a4..8a96bc882 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -392,6 +392,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c3a6077ba..4f027f6b0 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -415,6 +415,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Aceasta inregistrare a fost salvata numei cu timpul de inceput. Nu este o eroare.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 727ff51ee..466f7cd1e 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -352,6 +352,8 @@
 'form.time.uncompleted' => 'Не завершено',
 'form.time.remaining_quota' => 'Доступная квота',
 'form.time.over_quota' => 'Превышение квоты',
+'form.time.remaining_balance' => 'Доступный баланс',
+'form.time.over_balance' => 'Превышение баланса',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Эта запись сохранена только со временем начала. Это не ошибка.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1a87dd808..0077e713d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -396,6 +396,8 @@
 // TODO: translate the folllowing.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Tento záznam bol uložený iba s časom začiatku. Nie je to chyba.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5b036edd6..9be563c42 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -388,6 +388,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a8d2bf8f4..270984d45 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -384,6 +384,8 @@
 // TODO: translate the folllowing.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Izmena vremenske forme. Pogledajte primer na https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Ovaj zapis je sačuvan sa početnim vremenom i nije greška.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index e009c0c57..815ad80e1 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -380,6 +380,9 @@
 'form.time.uncompleted' => 'Oavslutad',
 'form.time.remaining_quota' => 'Återstående kvot',
 'form.time.over_quota' => 'Kvoten överstigen',
+// TODO: translate the following.
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Den här tidsregistreringen har sparats utan sluttid. Fyll i en sluttid och klicka på Spara för att avsluta.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 48359a941..720475be6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -425,6 +425,8 @@
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Bu kayıt sadece başlangıç zamanıyla silindi. Bu hata değildir.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e753c32c3..aa9e7dea8 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -397,6 +397,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => '该记录只保存了开始时间。这不是错误。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index b9951b1ce..7346c9ad1 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -406,6 +406,8 @@
 // TODO: translate the following.
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
+// 'form.time.remaining_balance' => 'Remaining balance',
+// 'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => '該記錄只保存了開始時間。這不是錯誤。',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 19832de86..44b5b1800 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.34.4679 | 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.35.4680 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 76338706d..7a360800b 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -149,7 +149,7 @@
   </td>
 </tr>
 </table>
-{if $time_records}
+
 <table cellpadding="3" cellspacing="1" width="720">
   <tr>
     <td align="left">{$i18n.label.week_total}: {$week_total}</td>
@@ -158,6 +158,14 @@
   {if $user->isPluginEnabled('mq')}
   <tr>
     <td align="left">{$i18n.label.month_total}: {$month_total}</td>
+    {if $over_balance}
+    <td align="right">{$i18n.form.time.over_balance}: <span style="color: green;">{$balance_remaining}</span></td>
+    {else}
+    <td align="right">{$i18n.form.time.remaining_balance}: <span style="color: red;">{$balance_remaining}</span></td>
+    {/if}
+  </tr>
+  <tr>
+    <td></td>
     {if $over_quota}
     <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
     {else}
@@ -166,5 +174,5 @@
   </tr>
   {/if}
 </table>
-{/if}
+
 {$forms.timeRecordForm.close}
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index a1c1b5d09..21854672b 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -94,6 +94,25 @@ public function getUserQuota($year, $month) {
     return $userMinutes;
   }
 
+  // getUserQuotaFrom1st - obtains a quota for user
+  // from 1st of the month up to and inclusive of $selected_date.
+  public function getUserQuotaFrom1st($selected_date) {
+    // TODO: we may need a better algorithm here. Review.
+    $monthQuotaMinutes = $this->getUserQuota($selected_date->mYear, $selected_date->mMonth);
+    $workdaysInMonth = $this->getNumWorkdays($selected_date->mMonth, $selected_date->mYear);
+
+    // Iterate from 1st up to selected date.
+    $workdaysFrom1st = 0;
+    for ($i = 1; $i <= $selected_date->mDate; $i++) {
+      $date = "$selected_date->mYear-$selected_date->mMonth-$i";
+      if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) {
+        $workdaysFrom1st++;
+      }
+    }
+    $quotaMinutesFrom1st = (int) ($monthQuotaMinutes * $workdaysFrom1st / $workdaysInMonth);
+    return $quotaMinutesFrom1st;
+  }
+
   // getMany - returns an array of quotas for a given year for group.
   private function getMany($year){
     $sql = "select month, minutes from tt_monthly_quotas".
diff --git a/time.php b/time.php
index ac6b69b5f..8dbffecfb 100644
--- a/time.php
+++ b/time.php
@@ -86,10 +86,15 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
+  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
   $month_total = ttTimeHelper::getTimeForMonth($selected_date);
-  $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
+  $month_total_minutes = ttTimeHelper::toMinutes($month_total);
+  $balance_left = $quota_minutes_from_1st - $month_total_minutes;
+  $minutes_left = $month_quota_minutes - $month_total_minutes;
   
   $smarty->assign('month_total', $month_total);
+  $smarty->assign('over_balance', $balance_left < 0);
+  $smarty->assign('balance_remaining', ttTimeHelper::toAbsDuration($balance_left));
   $smarty->assign('over_quota', $minutes_left < 0);
   $smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
 }

From 1c962161585180f8a9f963d05a2a87b78a5a37a5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Dec 2018 15:24:19 +0000
Subject: [PATCH 0604/1848] Added quota output on time.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/time.tpl   | 2 +-
 time.php                     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 44b5b1800..e9a9414d3 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.35.4680 | 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.35.4681 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 7a360800b..bf28c5091 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -165,7 +165,7 @@
     {/if}
   </tr>
   <tr>
-    <td></td>
+    <td align="left">{$i18n.label.quota}: {$month_quota}</td>
     {if $over_quota}
     <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
     {else}
diff --git a/time.php b/time.php
index 8dbffecfb..7252f476f 100644
--- a/time.php
+++ b/time.php
@@ -93,6 +93,7 @@
   $minutes_left = $month_quota_minutes - $month_total_minutes;
   
   $smarty->assign('month_total', $month_total);
+  $smarty->assign('month_quota', ttTimeHelper::toAbsDuration($month_quota_minutes));
   $smarty->assign('over_balance', $balance_left < 0);
   $smarty->assign('balance_remaining', ttTimeHelper::toAbsDuration($balance_left));
   $smarty->assign('over_quota', $minutes_left < 0);

From 32acd0caf0385a9fb7014af70d1a0ad438191dd7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Dec 2018 15:35:25 +0000
Subject: [PATCH 0605/1848] Made quota_percent not null and default to 100 in
 db.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e9a9414d3..3246cac22 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.35.4681 | 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.4682 | 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/dbinstall.php b/dbinstall.php
index ea177e978..74d566cc7 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11834"]) {
+  if ($_POST["convert11797to11836"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1042,6 +1042,8 @@ function ttExecute($sql) {
     ttExecute("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
     ttExecute("ALTER TABLE `tt_users` ADD COLUMN `quota_percent` float(6,2) default NULL after `rate`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.34', modified = now() where param_name = 'version_db' and param_value = '1.18.26'");
+    ttExecute("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.34') set u.quota_percent = 100.00 where u.quota_percent is null");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.36', modified = now() where param_name = 'version_db' and param_value = '1.18.34'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1089,7 +1091,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.34)</b>
+    <td width="80%"><b>Create database structure (v1.18.36)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1134,8 +1136,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.34)</td>
-    <td><input type="submit" name="convert11797to11834" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.36)</td>
+    <td><input type="submit" name="convert11797to11836" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index fb2ebe174..5dd41e061 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -91,7 +91,7 @@ CREATE TABLE `tt_users` (
   `role_id` int(11) default NULL,                  # role id
   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
-  `quota_percent` float(6,2) default NULL,         # percent of time quota
+  `quota_percent` float(6,2) NOT NULL default '100.00', # percent of time quota
   `email` varchar(100) default NULL,               # user email
   `created` datetime default NULL,                 # creation timestamp
   `created_ip` varchar(45) default NULL,           # creator ip
@@ -489,4 +489,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.34', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.36', now()); # TODO: change when structure changes.

From dff61baa6b8f972c0a74119258b81e6884a9191f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Dec 2018 15:56:01 +0000
Subject: [PATCH 0606/1848] Simplified ttUser::getUsers a bit.

---
 WEB-INF/lib/ttUser.class.php | 4 +---
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 73ec7a1e9..1bfd6f440 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -441,9 +441,7 @@ function getUsers($options) {
       }
       if ($include_quota) {
         $quota = $val['quota_percent'];
-        if (null == $quota)
-          $quota = '100'; // Null means 100%. Perhaps enforce not NULLs in db and eliminate this check.
-        elseif (ttEndsWith($quota, '.00'))
+        if (ttEndsWith($quota, '.00'))
           $quota = substr($quota, 0, strlen($quota)-3); // Trim trailing ".00";
         elseif ($replaceDecimalMark)
           $quota = str_replace('.', $decimal_mark, $quota);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3246cac22..91370d82c 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.36.4682 | 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.4683 | 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>

From bd631018a913ebc4ecce9f9ded7c2d2e85482b5b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Dec 2018 16:19:06 +0000
Subject: [PATCH 0607/1848] Fixed users.php for uncompleted indicators and
 monthly quotas situation.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/users.php             | 4 ++--
 users.php                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 91370d82c..83eb9084d 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.36.4683 | 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.4684 | 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/users.php b/mobile/users.php
index d6d08457a..d51cafcab 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -56,8 +56,8 @@
 $uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
-  foreach ($active_users as $key => $user) {
-    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
+  foreach ($active_users as $key => $active_user) {
+    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
   }
   $smarty->assign('uncompleted_indicators', true);
 }
diff --git a/users.php b/users.php
index aa7f44402..2fbcb5d20 100644
--- a/users.php
+++ b/users.php
@@ -55,8 +55,8 @@
 $uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
-  foreach ($active_users as $key => $user) {
-    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
+  foreach ($active_users as $key => $active_user) {
+    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
   }
   $smarty->assign('uncompleted_indicators', true);
 }

From d91fe5d8b53fe26e8b6c5bdadb27a5178652813d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Dec 2018 14:22:44 +0000
Subject: [PATCH 0608/1848] Fixed export-import for quota percent.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 4 +++-
 WEB-INF/templates/footer.tpl              | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index c5600fd8b..1ab501eab 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -288,6 +288,7 @@ function writeData() {
         $user_part .= " role_id=\"".$role_id."\"";
         $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
         $user_part .= " rate=\"".$user_item['rate']."\"";
+        $user_part .= " quota_percent=\"".$user_item['quota_percent']."\"";
         $user_part .= " email=\"".$user_item['email']."\"";
         $user_part .= " status=\"".$user_item['status']."\"";
         $user_part .= "></user>\n";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 099cb58f9..b33901b2e 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -247,6 +247,7 @@ function startElement($parser, $name, $attrs) {
           'login' => $attrs['LOGIN'],
           'password' => $attrs['PASSWORD'],
           'rate' => $attrs['RATE'],
+          'quota_percent' => $attrs['QUOTA_PERCENT'],
           'email' => $attrs['EMAIL'],
           'status' => $attrs['STATUS']), false);
         if ($user_id) {
@@ -775,7 +776,7 @@ private function insertUser($fields) {
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
 
-    $columns = '(login, password, name, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by, status)';
+    $columns = '(login, password, name, group_id, org_id, role_id, client_id, rate, quota_percent, email, created, created_ip, created_by, status)';
 
     $values = 'values (';
     $values .= $mdb2->quote($fields['login']);
@@ -786,6 +787,7 @@ private function insertUser($fields) {
     $values .= ', '.(int)$fields['role_id'];
     $values .= ', '.$mdb2->quote($fields['client_id']);
     $values .= ', '.$mdb2->quote($fields['rate']);
+    $values .= ', '.$mdb2->quote($fields['quota_percent']);
     $values .= ', '.$mdb2->quote($fields['email']);
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ', '.$mdb2->quote($fields['status']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 83eb9084d..0290a9f77 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.36.4684 | 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.4685 | 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>

From 11cef71c5608efdf93d400622140ef48f08b18f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Dec 2018 14:42:04 +0000
Subject: [PATCH 0609/1848] Fixed dbinstall.php for not null quota_percent.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0290a9f77..57e94258b 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.36.4685 | 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.4686 | 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/dbinstall.php b/dbinstall.php
index 74d566cc7..76a257cab 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1044,6 +1044,8 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.34', modified = now() where param_name = 'version_db' and param_value = '1.18.26'");
     ttExecute("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.34') set u.quota_percent = 100.00 where u.quota_percent is null");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.36', modified = now() where param_name = 'version_db' and param_value = '1.18.34'");
+    ttExecute("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.36') set u.quota_percent = 100.00 where u.quota_percent is null");
+    ttExecute("ALTER TABLE `tt_users` modify `quota_percent` float(6,2) NOT NULL default '100.00'");
   }
 
   if ($_POST["cleanup"]) {

From 367baa10353d5f679e6e3c795ae9d35a275a24d9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 24 Dec 2018 15:01:49 +0000
Subject: [PATCH 0610/1848] Introduced handling of max user count.

---
 WEB-INF/lib/ttUserHelper.class.php | 18 ++++++++++++++++++
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  1 +
 WEB-INF/resources/de.lang.php      |  1 +
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/resources/es.lang.php      |  1 +
 WEB-INF/resources/et.lang.php      |  1 +
 WEB-INF/resources/fa.lang.php      |  1 +
 WEB-INF/resources/fi.lang.php      |  1 +
 WEB-INF/resources/fr.lang.php      |  1 +
 WEB-INF/resources/gr.lang.php      |  1 +
 WEB-INF/resources/he.lang.php      |  1 +
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  1 +
 WEB-INF/resources/ja.lang.php      |  1 +
 WEB-INF/resources/ko.lang.php      |  1 +
 WEB-INF/resources/nl.lang.php      |  2 ++
 WEB-INF/resources/no.lang.php      |  1 +
 WEB-INF/resources/pl.lang.php      |  1 +
 WEB-INF/resources/pt-br.lang.php   |  1 +
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  1 +
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  1 +
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  1 +
 WEB-INF/resources/sv.lang.php      |  1 +
 WEB-INF/resources/tr.lang.php      |  1 +
 WEB-INF/resources/zh-cn.lang.php   |  1 +
 WEB-INF/resources/zh-tw.lang.php   |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/user_add.php                |  1 +
 user_add.php                       |  1 +
 34 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 26ced938a..b3a5e3603 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -386,4 +386,22 @@ static function updateLastAccess() {
     $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 b4d869930..f38bcabd2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -116,6 +116,7 @@
 // '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 d12be155e..baf085b51 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -118,6 +118,7 @@
 // '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 c49745130..051b6f8c2 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -110,6 +110,7 @@
 // '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 eab807e85..6c75c7e31 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -104,6 +104,7 @@
 // '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 aadf6f5ac..687f19daf 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -101,6 +101,7 @@
 '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 cc4fe0347..fbf7076aa 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -114,6 +114,7 @@
 // '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 a29929afd..860b8cd93 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -119,6 +119,7 @@
 // '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 f1a37b4f5..3ec01e23e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -117,6 +117,7 @@
 // '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 065f71c1c..4895713b5 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -112,6 +112,7 @@
 // '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 4c6d76749..5e0036654 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -110,6 +110,7 @@
 // '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 6be29a04b..6e7b32ef0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -105,6 +105,7 @@
 // '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 d27edb8c7..daedb00be 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -127,6 +127,7 @@
 // '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 27642b478..fcd4c2566 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -116,6 +116,7 @@
 // '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 8f35a78ec..36f8ab3da 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -109,6 +109,7 @@
 // '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 ea158793a..4cb224fb5 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -120,6 +120,7 @@
 // '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 27cbe6692..2c0a898e0 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -119,6 +119,7 @@
 // '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 b0ada311d..d98188f48 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -101,6 +101,8 @@
 '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 34f4f6d30..650957eda 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -119,6 +119,7 @@
 // '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 a9220c4eb..11b6c4b42 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -114,6 +114,7 @@
 // '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 ee699e11b..3e36200ea 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -111,6 +111,7 @@
 // '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 8a96bc882..c3ef6c5c3 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -113,6 +113,7 @@
 // '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 4f027f6b0..01ecded5d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -120,6 +120,7 @@
 // '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 466f7cd1e..f68e0631c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -100,6 +100,7 @@
 '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 0077e713d..33622c990 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -116,6 +116,7 @@
 // '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 9be563c42..6b3881a13 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -110,6 +110,7 @@
 // '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 270984d45..3b12961d6 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -111,6 +111,7 @@
 // '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 815ad80e1..5ddd55d1f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -109,6 +109,7 @@
 // '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 720475be6..fafeeaaf2 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -123,6 +123,7 @@
 // '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 aa9e7dea8..656eb4516 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -111,6 +111,7 @@
 // '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 7346c9ad1..0bdb2e05d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -117,6 +117,7 @@
 // '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 57e94258b..d163b71dc 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.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 b1d155aa0..c821c7d4f 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -149,6 +149,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   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 a99951912..cf233d5b5 100644
--- a/user_add.php
+++ b/user_add.php
@@ -152,6 +152,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   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)) {

From a468ccc781de1988967194b2bf89e6b7a404e716 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 24 Dec 2018 15:24:05 +0000
Subject: [PATCH 0611/1848] Fixed ttRegistrator class.

---
 WEB-INF/lib/ttRegistrator.class.php | 8 ++++++--
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 77ffb6b57..1664461b8 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -26,6 +26,9 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
+import('ttUserHelper');
+import('ttRoleHelper');
+
 // ttRegistrator class is used to register a user in Time Tracker.
 class ttRegistrator {
   var $user_name = null;  // User name.
@@ -83,6 +86,8 @@ function validate() {
       $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
     if (!ttValidEmail($this->email, true))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
+    if (!ttUserHelper::canAdd())
+      $this->err->add($i18n->get('error.user_count'));
   }
 
   // The register function registers a user in Time Tracker.
@@ -115,7 +120,6 @@ function register() {
       return false;
     }
 
-    import('ttRoleHelper');
     if (!ttRoleHelper::createPredefinedRoles($this->group_id, $this->lang)) {
       $err->add($i18n->get('error.db'));
       return false;
@@ -124,7 +128,7 @@ function register() {
     $this->user_id = $this->createUser();
 
     if (!$this->user_id) {
-      $err->add($i18n->get('error.db'));
+      $this->err->add($i18n->get('error.db'));
       return false;
     }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d163b71dc..6cac932b4 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.36.4687 | 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.4688 | 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>

From 87dff6fdf1e60ff60fb429290488cb1c9bf778d9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 24 Dec 2018 16:02:43 +0000
Subject: [PATCH 0612/1848] Fixed handling user limit for admin.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 6 ++++++
 WEB-INF/lib/ttUserHelper.class.php      | 4 ++--
 WEB-INF/templates/footer.tpl            | 2 +-
 admin_group_add.php                     | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index b33901b2e..251cb3ea6 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -31,6 +31,7 @@
 class ttOrgImportHelper {
   var $errors               = null; // Errors go here. Set in constructor by reference.
   var $schema_version       = null; // Database schema version from XML file we import from.
+  var $num_users            = 0;    // A number of active and inactive users we are importing.
   var $conflicting_logins   = null; // A comma-separated list of logins we cannot import.
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
@@ -81,6 +82,7 @@ function startElement($parser, $name, $attrs) {
       // In first pass we check user logins for potential collisions with existing.
       if ($name == 'USER' && $this->canImport) {
         $login = $attrs['LOGIN'];
+        if ('' != $attrs['STATUS']) $this->num_users++;
         if ('' != $attrs['STATUS'] && $this->loginExists($login)) {
           // We have a login collision. Append colliding login to a list of things we cannot import.
           $this->conflicting_logins .= ($this->conflicting_logins ? ", $login" : $login);
@@ -569,6 +571,10 @@ function importXml() {
       $this->errors->add($i18n->get('error.user_exists'));
       $this->errors->add(sprintf($i18n->get('error.cannot_import'), $this->conflicting_logins));
     }
+    if (!ttUserHelper::canAdd($this->num_users)) {
+      $this->canImport = false;
+      $this->errors->add($i18n->get('error.user_count'));
+    }
 
     $this->firstPass = false; // We are done with 1st pass.
     xml_parser_free($parser);
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index b3a5e3603..538a2fc40 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -388,7 +388,7 @@ static function updateLastAccess() {
   }
 
   // canAdd determines if we can add a user in case there is a limit.
-  static function canAdd() {
+  static function canAdd($num_users = 1) {
     $mdb2 = getConnection();
     $sql = "select param_value from tt_site_config where param_name = 'max_users'";
     $res = $mdb2->query($sql);
@@ -399,7 +399,7 @@ static function canAdd() {
     $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)
+    if ($val['user_count'] < $max_count - $num_users) // TODO: test this.
       return true; // Limit not reached.
 
     return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6cac932b4..f33967268 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.36.4688 | 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.4689 | 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/admin_group_add.php b/admin_group_add.php
index 52b4134f1..c42644f09 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -99,6 +99,8 @@
     $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
   if (!ttValidEmail($cl_manager_email, true))
     $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+  if (!ttUserHelper::canAdd())
+    $err->add($i18n->get('error.user_count'));
 
   if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 

From c819d80227f056f8b98e6a5e27884db1e40c930a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Dec 2018 13:12:55 +0000
Subject: [PATCH 0613/1848] Improved user count check.

---
 WEB-INF/lib/ttUserHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 538a2fc40..d0a09ced8 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -396,10 +396,10 @@ static function canAdd($num_users = 1) {
     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";
+    $sql = "select count(*) as user_count from tt_users where group_id > 0 and status is not null";
     $res = $mdb2->query($sql);
     $val = $res->fetchRow();
-    if ($val['user_count'] < $max_count - $num_users) // TODO: test this.
+    if ($val['user_count'] <= $max_count - $num_users)
       return true; // Limit not reached.
 
     return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f33967268..3c38d4335 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.36.4689 | 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.4690 | 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>

From be392a30bbf092816a39b59d11d38b10b9353d0b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Dec 2018 13:11:47 +0000
Subject: [PATCH 0614/1848] Added December 31 as a holiday to German file.

---
 WEB-INF/resources/de.lang.php | 2 +-
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6c75c7e31..469ef0563 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -34,7 +34,7 @@
 $i18n_weekdays = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag');
 $i18n_weekdays_short = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
 // format mm/dd
-$i18n_holidays = array('01/01', '03/30', '04/02', '05/01', '05/21', '05/31', '10/03', '11/01', '12/24','12/25', '12/26');
+$i18n_holidays = array('01/01', '03/30', '04/02', '05/01', '05/21', '05/31', '10/03', '11/01', '12/24','12/25', '12/26', '12/31');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3c38d4335..5ace796ff 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.36.4690 | 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.4691 | 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>

From f3467d6ea5f38cd295dd4b2bdfe201b792b1a224 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Dec 2018 13:37:16 +0000
Subject: [PATCH 0615/1848] An improvement in German translation.

---
 WEB-INF/resources/de.lang.php | 5 ++---
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 469ef0563..39e472154 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -358,9 +358,8 @@
 'form.time.uncompleted' => 'Unvollständig',
 'form.time.remaining_quota' => 'Verbleibende Quote',
 'form.time.over_quota' => 'Über der Quote',
-// TODO: translate the following.
-// 'form.time.remaining_balance' => 'Remaining balance',
-// 'form.time.over_balance' => 'Over balance',
+'form.time.remaining_balance' => 'Minusstunden',
+'form.time.over_balance' => 'Mehrstunden',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dieser Eintrag wurde ohne Startzeit gespeichert. Dies ist kein Fehler.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5ace796ff..585152881 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.36.4691 | 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.4692 | 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>

From 3262206d3cda17048d2010de8dec165c8f5bf052 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Dec 2018 16:22:15 +0000
Subject: [PATCH 0616/1848] Added an environment check for enabled libxml to
 address issue #67.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 585152881..fd999f83f 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.36.4692 | 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.4693 | 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/dbinstall.php b/dbinstall.php
index 76a257cab..a3cdd9cc5 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -131,6 +131,11 @@ function ttExecute($sql) {
     }
   }
 
+  // Check is libxml is enabled (which is a PHP default).
+  if (!function_exists('libxml_clear_errors')) {
+    echo('<font color="red">Error: libxml is not enabled. It is required for import group operation (to parse XML).</font><br>');
+  }
+
   // Check database access.
   require_once('MDB2.php');
   $conn = MDB2::connect(DSN);

From cb09c742b72be7025fc5e6640d89966de30bc14f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Dec 2018 18:00:52 +0000
Subject: [PATCH 0617/1848] Added a Dockerfile for app only as first step to
 containerization. See also PR#68.

---
 Dockerfile                   | 29 +++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..37cf6bfe0
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,29 @@
+FROM php:7.2-apache
+
+# Use the default production configuration.
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+# Override with custom settings.
+# COPY config/php_tt.ini $PHP_INI_DIR/conf.d/
+
+# Install mysqli extension.
+RUN docker-php-ext-install mysqli
+
+# Install gd extension.
+RUN apt-get update && apt-get install libpng-dev -y \
+ && docker-php-ext-install gd
+
+# Install ldap extension.
+RUN apt-get install libldap2-dev -y \
+  && docker-php-ext-install ldap
+# TODO: check if ldap works, as the above is missing this step:
+# && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
+
+# Cleanup. The intention was to keep image size down.
+# RUN rm -rf /var/lib/apt/lists/*
+#
+# The above does not work. Files are removed, but
+# image files (zipped or not) are not getting smaller. Why?
+
+COPY . /var/www/html/
+
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fd999f83f..9a62b1453 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.36.4693 | 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.4694 | 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>

From 2f28666efaac80c4cd7e9f6d879dc4c20803e9a6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 29 Dec 2018 18:22:42 +0000
Subject: [PATCH 0618/1848] Initial work done on Docker composition of TT and
 MariaDB together.

---
 Dockerfile                   |  8 +++++++-
 WEB-INF/templates/footer.tpl |  2 +-
 docker-compose.yml           | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 37cf6bfe0..1cbf6afc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,5 +25,11 @@ RUN apt-get install libldap2-dev -y \
 # The above does not work. Files are removed, but
 # image files (zipped or not) are not getting smaller. Why?
 
+# Copy application source code to /var/www/html/.
 COPY . /var/www/html/
-
+# Create configuration file.
+RUN cp /var/www/html/WEB-INF/config.php.dist /var/www/html/WEB-INF/config.php
+# Replace DSN value to something connectable to a Docker container running mariadb.
+RUN sed -i "s|mysqli://root:no@localhost/dbname|mysqli://anuko_user:anuko_pw@anuko_sql/timetracker|g" /var/www/html/WEB-INF/config.php
+# Note that db is defined as anuko_sql/timetracker where anuko_sql is service name and timetracker is db name.
+# See docker-compose.yml for details.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9a62b1453..f2ab255e2 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.36.4694 | 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.4695 | 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/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..b5ecef924
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3.7'
+
+services:
+  # anuko_tt is a web application built as per Dockerfile specification.
+  anuko_tt:
+    build: .
+    image: anuko_timetracker:dev
+    container_name: anuko-timetracker
+    # Use localhost:8080 to connect to timetracker via browser.
+    ports:
+     - "8080:80"
+
+  # anuko_sql is a mariadb instance to which timetracker connects.
+  # Connect parameters are also specified in timetracker Dockerfile after
+  # creation of its configuration file. Specifically, we replace
+  # user name, password, service name (aka resolvable to IP server name
+  # where mariadb runs), and database name there from the defaults.
+  # Apparently, these two sets of credentials must match for successful connect.
+  anuko_sql:
+    image: "mariadb:latest"
+    container_name: anuko-sql
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: timetracker
+      MYSQL_USER: anuko_user
+      MYSQL_PASSWORD: anuko_pw

From f317cf23f526833481163a2d3130e37beac11d54 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 29 Dec 2018 20:50:46 +0000
Subject: [PATCH 0619/1848] Added a volume to persist db data in Docker.

---
 WEB-INF/templates/footer.tpl | 2 +-
 docker-compose.yml           | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f2ab255e2..5d77a19aa 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.36.4695 | 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.4696 | 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/docker-compose.yml b/docker-compose.yml
index b5ecef924..e516fada7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
   # creation of its configuration file. Specifically, we replace
   # user name, password, service name (aka resolvable to IP server name
   # where mariadb runs), and database name there from the defaults.
-  # Apparently, these two sets of credentials must match for successful connect.
+  # These two sets of credentials must match for a successful connect.
   anuko_sql:
     image: "mariadb:latest"
     container_name: anuko-sql
@@ -24,3 +24,8 @@ services:
       MYSQL_DATABASE: timetracker
       MYSQL_USER: anuko_user
       MYSQL_PASSWORD: anuko_pw
+    volumes:
+      - db-data:/var/lib/mysql
+
+volumes:
+   db-data:
\ No newline at end of file

From 6b81cfb401a9ca7fa3e963c5e71ff3f5a0c1b01a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Dec 2018 14:00:53 +0000
Subject: [PATCH 0620/1848] Added comments to docker files.

---
 Dockerfile                   | 1 +
 WEB-INF/templates/footer.tpl | 2 +-
 docker-compose.yml           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1cbf6afc2..4b86f2a21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+# This file is for development work. Not suitable for production.
 FROM php:7.2-apache
 
 # Use the default production configuration.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5d77a19aa..645a8c469 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.36.4696 | 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.4697 | 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/docker-compose.yml b/docker-compose.yml
index e516fada7..0182a95ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+# This file is for development work. Not suitable for production.
 version: '3.7'
 
 services:

From c3feccfa60f8970ea2c2891d22549b2913a9561f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Dec 2018 17:29:05 +0000
Subject: [PATCH 0621/1848] Added database creation step to docker composition.

---
 .gitignore                  |  1 +
 docker-compose.yml          | 19 ++++++++++++-------
 dockerfile-db               |  9 +++++++++
 Dockerfile => dockerfile-tt |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 dockerfile-db
 rename Dockerfile => dockerfile-tt (87%)

diff --git a/.gitignore b/.gitignore
index d73d85537..e346fd3a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 config.php
+populate.sql
 WEB-INF/templates_c/*.*
 WEB-INF/templates_c/import_*
 WEB-INF/templates_c/tt*
diff --git a/docker-compose.yml b/docker-compose.yml
index 0182a95ad..b4f3b4b67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,29 +4,34 @@ version: '3.7'
 services:
   # anuko_tt is a web application built as per Dockerfile specification.
   anuko_tt:
-    build: .
+    build:
+      context: .
+      dockerfile: dockerfile-tt
     image: anuko_timetracker:dev
     container_name: anuko-timetracker
     # Use localhost:8080 to connect to timetracker via browser.
     ports:
      - "8080:80"
 
-  # anuko_sql is a mariadb instance to which timetracker connects.
+  # anuko_db is a mariadb instance to which timetracker connects.
   # Connect parameters are also specified in timetracker Dockerfile after
   # creation of its configuration file. Specifically, we replace
   # user name, password, service name (aka resolvable to IP server name
   # where mariadb runs), and database name there from the defaults.
   # These two sets of credentials must match for a successful connect.
-  anuko_sql:
-    image: "mariadb:latest"
-    container_name: anuko-sql
+  anuko_db:
+    build:
+      context: .
+      dockerfile: dockerfile-db
+    image: "anuko_database:dev"
+    container_name: anuko-database
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "yes"
       MYSQL_DATABASE: timetracker
       MYSQL_USER: anuko_user
       MYSQL_PASSWORD: anuko_pw
     volumes:
-      - db-data:/var/lib/mysql
+      - database:/var/lib/mysql
 
 volumes:
-   db-data:
\ No newline at end of file
+   database:
\ No newline at end of file
diff --git a/dockerfile-db b/dockerfile-db
new file mode 100644
index 000000000..b13673952
--- /dev/null
+++ b/dockerfile-db
@@ -0,0 +1,9 @@
+# This file is for development work. Not suitable for production.
+FROM mariadb:latest
+
+# Copy database creation script.
+COPY mysql.sql /docker-entrypoint-initdb.d/
+
+# Copy database population script, if available.
+# TODO: design a better directory structure.
+COPY populate.sql /docker-entrypoint-initdb.d/
diff --git a/Dockerfile b/dockerfile-tt
similarity index 87%
rename from Dockerfile
rename to dockerfile-tt
index 4b86f2a21..8902cbf7e 100644
--- a/Dockerfile
+++ b/dockerfile-tt
@@ -31,6 +31,6 @@ COPY . /var/www/html/
 # Create configuration file.
 RUN cp /var/www/html/WEB-INF/config.php.dist /var/www/html/WEB-INF/config.php
 # Replace DSN value to something connectable to a Docker container running mariadb.
-RUN sed -i "s|mysqli://root:no@localhost/dbname|mysqli://anuko_user:anuko_pw@anuko_sql/timetracker|g" /var/www/html/WEB-INF/config.php
-# Note that db is defined as anuko_sql/timetracker where anuko_sql is service name and timetracker is db name.
+RUN sed -i "s|mysqli://root:no@localhost/dbname|mysqli://anuko_user:anuko_pw@anuko_db/timetracker|g" /var/www/html/WEB-INF/config.php
+# Note that db is defined as anuko_db/timetracker where anuko_db is service name and timetracker is db name.
 # See docker-compose.yml for details.

From 646bcbf30417f95252d8b36c009dbb040af62b66 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Dec 2018 19:47:44 +0000
Subject: [PATCH 0622/1848] Cosmetic.

---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b4f3b4b67..e621c4105 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '3.7'
 
 services:
-  # anuko_tt is a web application built as per Dockerfile specification.
+  # anuko_tt is a web application built as per dockerfile specification.
   anuko_tt:
     build:
       context: .
@@ -14,7 +14,7 @@ services:
      - "8080:80"
 
   # anuko_db is a mariadb instance to which timetracker connects.
-  # Connect parameters are also specified in timetracker Dockerfile after
+  # Connect parameters are also specified in timetracker dockerfile after
   # creation of its configuration file. Specifically, we replace
   # user name, password, service name (aka resolvable to IP server name
   # where mariadb runs), and database name there from the defaults.
@@ -31,7 +31,7 @@ services:
       MYSQL_USER: anuko_user
       MYSQL_PASSWORD: anuko_pw
     volumes:
-      - database:/var/lib/mysql
+      - anuko_db:/var/lib/mysql
 
 volumes:
-   database:
\ No newline at end of file
+   anuko_db:
\ No newline at end of file

From 41bb577927a2b54d6a2cbc97ccc63e2935f7604b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Dec 2018 21:50:21 +0000
Subject: [PATCH 0623/1848] Added user selector on mobile time.php.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/mobile/time.tpl | 10 +++--
 mobile/time.php                   | 66 +++++++++++++++++++++++++------
 time.php                          |  8 ++--
 4 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 645a8c469..1354a1e3d 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.36.4697 | 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.4698 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 3b8b0f8b4..35242e2f3 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -48,12 +48,16 @@
   <tr>
     <td valign="top">
     <table border="0">
+{if $user_dropdown}
+      <tr><td>{$i18n.label.user}:</td></tr>
+      <tr><td>{$forms.timeRecordForm.user.control}</td></tr>
+{/if}
 {if $user->isPluginEnabled('cl')}
-    <tr><td>{$i18n.label.client}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
+      <tr><td>{$i18n.label.client}:</td></tr>
+      <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
 {/if}
 {if $user->isPluginEnabled('iv')}
-    <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
+      <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}
       <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>
diff --git a/mobile/time.php b/mobile/time.php
index 80049a9cb..107a72c7f 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -39,9 +39,32 @@
   header('Location: access_denied.php');
   exit();
 }
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
+if ($request->isPost()) {
+  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
+    exit();
+  }
+}
 // End of access checks.
 
-$user_id = $user->getUser();
+// Determine user for which we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+$group_id = $user->getGroup();
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -89,9 +112,28 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
+if ($user->can('track_time')) {
+  $rank = $user->getMaxRankForGroup($group_id);
+  if ($user->can('track_own_time'))
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
+      'name'=>'user',
+      'style'=>'width: 250px;',
+      'value'=>$user_id,
+      'data'=>$user_list,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
+  }
+}
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -104,7 +146,7 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -145,7 +187,7 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -155,7 +197,7 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
   if ($user->punch_mode && !$user->canOverridePunchMode()) {
@@ -164,7 +206,7 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 60px;','value'=>$cl_note));
 if ($user->isPluginEnabled('iv'))
@@ -196,10 +238,10 @@
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
     }
-    if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+    if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+    if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
@@ -213,11 +255,11 @@
             $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
-        if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+        if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
           $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
           $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
-        if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+        if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
           $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {
@@ -254,7 +296,7 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user_id,
-        'group_id' => $user->getGroup(),
+        'group_id' => $group_id,
         'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
@@ -292,7 +334,7 @@
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('timestring', $selected_date->toString($user->date_format));
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'mobile/time.tpl');
 $smarty->display('mobile/index.tpl');
diff --git a/time.php b/time.php
index 7252f476f..0431c2bec 100644
--- a/time.php
+++ b/time.php
@@ -259,10 +259,10 @@
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
     }
-    if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+    if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+    if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
@@ -276,11 +276,11 @@
             $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
-        if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+        if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
           $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
           $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
-        if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+        if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
           $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {

From 624d2811d204264914442a71c560adce8ca97d20 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 31 Dec 2018 15:42:12 +0000
Subject: [PATCH 0624/1848] Improved .gitignore.

---
 .gitignore                   | 1 +
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e346fd3a3..0dba767f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ upload/
 Thumbs.db
 *.DS_Store
 *~
+.idea/
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1354a1e3d..6217c35c6 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.36.4698 | 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.4699 | 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>

From c0f70b9c3c416d20ac3a5528d756e4783c88927c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 2 Jan 2019 15:04:31 +0000
Subject: [PATCH 0625/1848] Added audit info on user delete.

---
 WEB-INF/lib/ttUser.class.php | 3 ++-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 1bfd6f440..36f9163f1 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -695,7 +695,8 @@ function markUserDeleted($user_id) {
       return false;
 
     // Mark user as deleted.
-    $sql = "update tt_users set status = NULL where id = $user_id".
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
+    $sql = "update tt_users set status = null $modified_part where id = $user_id".
       " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6217c35c6..b1acfc012 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.36.4699 | 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.4700 | 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>

From d528413f57480455efce71f40082eb682f2d8d48 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 3 Jan 2019 13:37:06 +0000
Subject: [PATCH 0626/1848] German holidays corrected.

---
 WEB-INF/resources/de.lang.php | 2 +-
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 39e472154..6eaa77f70 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -34,7 +34,7 @@
 $i18n_weekdays = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag');
 $i18n_weekdays_short = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
 // format mm/dd
-$i18n_holidays = array('01/01', '03/30', '04/02', '05/01', '05/21', '05/31', '10/03', '11/01', '12/24','12/25', '12/26', '12/31');
+$i18n_holidays = array('01/01', '04/19', '04/22', '05/01', '05/30', '06/10', '06/20', '10/03', '11/01', '12/24','12/25', '12/26', '12/31');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b1acfc012..bf9a81c0c 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.36.4700 | 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.4701 | 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>

From 903dae76e54a4e0c081532a8113c00ef1b56a1b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Jan 2019 18:12:48 +0000
Subject: [PATCH 0627/1848] Added handling of expiration dates.

---
 WEB-INF/lib/ttTimeHelper.class.php | 14 ++++++++++++++
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  1 +
 WEB-INF/resources/de.lang.php      |  1 +
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/resources/es.lang.php      |  1 +
 WEB-INF/resources/et.lang.php      |  1 +
 WEB-INF/resources/fa.lang.php      |  1 +
 WEB-INF/resources/fi.lang.php      |  1 +
 WEB-INF/resources/fr.lang.php      |  1 +
 WEB-INF/resources/gr.lang.php      |  1 +
 WEB-INF/resources/he.lang.php      |  1 +
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  1 +
 WEB-INF/resources/ja.lang.php      |  1 +
 WEB-INF/resources/ko.lang.php      |  1 +
 WEB-INF/resources/nl.lang.php      |  1 +
 WEB-INF/resources/no.lang.php      |  1 +
 WEB-INF/resources/pl.lang.php      |  1 +
 WEB-INF/resources/pt-br.lang.php   |  1 +
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  1 +
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  1 +
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  1 +
 WEB-INF/resources/sv.lang.php      |  1 +
 WEB-INF/resources/tr.lang.php      |  1 +
 WEB-INF/resources/zh-cn.lang.php   |  1 +
 WEB-INF/resources/zh-tw.lang.php   |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 expense_edit.php                   |  3 +++
 expenses.php                       |  2 ++
 mobile/expense_edit.php            |  3 +++
 mobile/expenses.php                |  2 ++
 mobile/time.php                    |  1 +
 mobile/time_edit.php               |  1 +
 time.php                           |  1 +
 time_edit.php                      |  1 +
 40 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 4e10f4ed7..a66652b70 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -748,4 +748,18 @@ static function getRecords($user_id, $date) {
 
     return $result;
   }
+
+  // canAdd determines if we can add a record in case there is a limit.
+  static function canAdd() {
+    $mdb2 = getConnection();
+    $sql = "select param_value from tt_site_config where param_name = 'exp_date'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if (!$val) return true; // No expiration date.
+
+    if (strtotime($val['param_value']) > time())
+      return true; // Expiration date exists but not reached.
+
+    return false;
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f38bcabd2..7b5a5d62f 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -117,6 +117,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index baf085b51..8c875b92b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -119,6 +119,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 051b6f8c2..7b9faf3b7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -111,6 +111,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6eaa77f70..2c21205d7 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -105,6 +105,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 687f19daf..2db7e2d90 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -102,6 +102,7 @@
 'error.cannot_import' => 'Cannot import: %s.',
 'error.format' => 'Invalid file format.',
 'error.user_count' => 'Limit on user count.',
+'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index fbf7076aa..0f8bc123c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -115,6 +115,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 860b8cd93..1387bea36 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -120,6 +120,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3ec01e23e..dfb010500 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -118,6 +118,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4895713b5..1bd098221 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -113,6 +113,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5e0036654..430c5b1c6 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -111,6 +111,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 6e7b32ef0..88dad80f7 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -106,6 +106,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index daedb00be..1420500bb 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -128,6 +128,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index fcd4c2566..6d4698e68 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -117,6 +117,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 36f8ab3da..c14d770e5 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -110,6 +110,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 4cb224fb5..d7e2dcf9a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -121,6 +121,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2c0a898e0..1866dd54b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -120,6 +120,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index d98188f48..823035ce0 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -103,6 +103,7 @@
 'error.format' => 'Bestandsformaat niet valide.',
 // TODO: translate the following.
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 650957eda..8a698d1de 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -120,6 +120,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 11b6c4b42..2922a3421 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -115,6 +115,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // 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 3e36200ea..8691f9383 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -112,6 +112,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c3ef6c5c3..bc5d8386b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -114,6 +114,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 01ecded5d..6eb221121 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -121,6 +121,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f68e0631c..4b524b82d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -101,6 +101,7 @@
 'error.cannot_import' => 'Невозможно импортировать: %s.',
 'error.format' => 'Неверный формат файла.',
 'error.user_count' => 'Ограничение на количество пользователей.',
+'error.expired' => 'Достигнута дата экспирации.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 33622c990..726c78e80 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -117,6 +117,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 6b3881a13..18ddd37f9 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -111,6 +111,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 3b12961d6..c20cc43fc 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -112,6 +112,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 5ddd55d1f..d1a106483 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -110,6 +110,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index fafeeaaf2..38b4a4b29 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -124,6 +124,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // 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 656eb4516..fd4e2b88c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -112,6 +112,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // 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 0bdb2e05d..4112fa159 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -118,6 +118,7 @@
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
+// 'error.expired' => 'Expiration date reached.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bf9a81c0c..35fc2a5d3 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.36.4701 | 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.4702 | 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/expense_edit.php b/expense_edit.php
index 8eb7d4fe0..b1115f1e3 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttGroupHelper');
 import('DateAndTime');
+import('ttTimeHelper');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -176,6 +177,8 @@
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
   }
+  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
+  // Finished validating user input.
 
   // Save record.
   if ($request->getParameter('btn_save')) {
diff --git a/expenses.php b/expenses.php
index 9a3454221..e1eaeddae 100644
--- a/expenses.php
+++ b/expenses.php
@@ -31,6 +31,7 @@
 import('ttUserHelper');
 import('ttGroupHelper');
 import('DateAndTime');
+import('ttTimeHelper');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -202,6 +203,7 @@
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 4c183afd9..e9e1ca63a 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttGroupHelper');
 import('DateAndTime');
+import('ttTimeHelper');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -171,6 +172,8 @@
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
   }
+  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
+  // Finished validating input data.
 
   // Save record.
   if ($request->getParameter('btn_save')) {
diff --git a/mobile/expenses.php b/mobile/expenses.php
index ac565207b..1b8f7cda9 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -31,6 +31,7 @@
 import('ttUserHelper');
 import('ttGroupHelper');
 import('DateAndTime');
+import('ttTimeHelper');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -207,6 +208,7 @@
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.
diff --git a/mobile/time.php b/mobile/time.php
index 107a72c7f..364379f4f 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -267,6 +267,7 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index cdd507077..803ca4e4f 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -252,6 +252,7 @@
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 
   // This is a new date for the time record.
diff --git a/time.php b/time.php
index 0431c2bec..5a9b5210d 100644
--- a/time.php
+++ b/time.php
@@ -288,6 +288,7 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
diff --git a/time_edit.php b/time_edit.php
index 16f69d2ab..3bd52e6f5 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -257,6 +257,7 @@
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 
   // This is a new date for the time record.

From 47a80e5f3693888437a7a75721334c726b62af9e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Jan 2019 23:47:25 +0000
Subject: [PATCH 0628/1848] Improved JavaScript for better handling of
 non-client users.

---
 WEB-INF/templates/footer.tpl           | 2 +-
 WEB-INF/templates/mobile/user_add.tpl  | 4 +++-
 WEB-INF/templates/mobile/user_edit.tpl | 4 +++-
 WEB-INF/templates/user_add.tpl         | 4 +++-
 WEB-INF/templates/user_edit.tpl        | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 35fc2a5d3..27b17d576 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.36.4702 | 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.4703 | 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/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl
index 71901fb05..d23dcf932 100644
--- a/WEB-INF/templates/mobile/user_add.tpl
+++ b/WEB-INF/templates/mobile/user_add.tpl
@@ -40,8 +40,10 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1)
         clientControl.style.visibility = "visible";
-      else
+      else {
+        clientControl.value = '';
         clientControl.style.visibility = "hidden";
+      }
       break;
     }
   }
diff --git a/WEB-INF/templates/mobile/user_edit.tpl b/WEB-INF/templates/mobile/user_edit.tpl
index 0d7f47e6c..9929e7272 100644
--- a/WEB-INF/templates/mobile/user_edit.tpl
+++ b/WEB-INF/templates/mobile/user_edit.tpl
@@ -62,8 +62,10 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1)
         clientControl.style.visibility = "visible";
-      else
+      else {
+        clientControl.value = '';
         clientControl.style.visibility = "hidden";
+      }
       break;
     }
   }
diff --git a/WEB-INF/templates/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 39575db0c..0741dc3e9 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -40,8 +40,10 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1)
         clientControl.style.visibility = "visible";
-      else
+      else {
+        clientControl.value = '';
         clientControl.style.visibility = "hidden";
+      }
       break;
     }
   }
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 7475c6efb..32947545d 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -62,8 +62,10 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1)
         clientControl.style.visibility = "visible";
-      else
+      else {
+        clientControl.value = '';
         clientControl.style.visibility = "hidden";
+      }
       break;
     }
   }

From 8f04c2f5411caf7a0d940f465bc5eb9c061764fe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Jan 2019 22:44:18 +0000
Subject: [PATCH 0629/1848] Added a comment explaining balance labels.

---
 WEB-INF/resources/en.lang.php | 6 ++++++
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2db7e2d90..3ef26b89d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -357,6 +357,12 @@
 'form.time.uncompleted' => 'Uncompleted',
 'form.time.remaining_quota' => 'Remaining quota',
 'form.time.over_quota' => 'Over quota',
+// Note for translators. "Balance" below means accumulated quota for user since 1st of the month
+// until and icluding a selected day. If a quota is 8 hours a day, then the balance
+// is 8 hours multiplied by a number of work days. "Remaining balance" and "Over balance" are
+// balance differences with logged hours.
+// The term looks confusing, if you have a better idea how to name these things, let us know.
+// For example, a German could use: Minusstunden and Mehrstunden.
 'form.time.remaining_balance' => 'Remaining balance',
 'form.time.over_balance' => 'Over balance',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 27b17d576..4b4fc4465 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.36.4703 | 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.4704 | 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>

From 5bf1b81030c3ce115f01fcbfeffbbe6defe93d45 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Jan 2019 22:48:05 +0000
Subject: [PATCH 0630/1848] Improved a comment.

---
 WEB-INF/resources/en.lang.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 3ef26b89d..c5ce3dc26 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -362,7 +362,6 @@
 // is 8 hours multiplied by a number of work days. "Remaining balance" and "Over balance" are
 // balance differences with logged hours.
 // The term looks confusing, if you have a better idea how to name these things, let us know.
-// For example, a German could use: Minusstunden and Mehrstunden.
 'form.time.remaining_balance' => 'Remaining balance',
 'form.time.over_balance' => 'Over balance',
 

From 84ebf6e6d0d84b21a7b4be11c60d16c84d4dd3ef Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Jan 2019 22:53:01 +0000
Subject: [PATCH 0631/1848] Cosmetic typo fix.

---
 WEB-INF/resources/en.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index c5ce3dc26..101a5b71e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -358,7 +358,7 @@
 'form.time.remaining_quota' => 'Remaining quota',
 'form.time.over_quota' => 'Over quota',
 // Note for translators. "Balance" below means accumulated quota for user since 1st of the month
-// until and icluding a selected day. If a quota is 8 hours a day, then the balance
+// until and including a selected day. If a quota is 8 hours a day, then the balance
 // is 8 hours multiplied by a number of work days. "Remaining balance" and "Over balance" are
 // balance differences with logged hours.
 // The term looks confusing, if you have a better idea how to name these things, let us know.

From eff9ca439795bffd16af8a9e339879d5704e5875 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Jan 2019 14:49:18 +0000
Subject: [PATCH 0632/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 42 ++++++++++++++---------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 823035ce0..ed304b5ab 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -56,8 +56,7 @@
 'menu.tasks' => 'Taken',
 'menu.users' => 'Medewerkers',
 'menu.groups' => 'Groepen',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
+'menu.subgroups' => 'Subgroepen',
 'menu.export' => 'Exporteren',
 'menu.clients' => 'Klanten',
 'menu.options' => 'Opties',
@@ -101,18 +100,15 @@
 '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.',
-// 'error.expired' => 'Expiration date reached.',
+'error.user_count' => 'Limiet op aantal gebruikers.',
+'error.expired' => 'Verloop datum is bereikt.',
 
 // Warning messages.
-// TODO: translate the following.
-// 'warn.sure' => 'Are you sure?',
-// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
+'warn.sure' => 'Ben je er zeker van?',
+'warn.confirm_save' => 'De datum is veranderd. Bevestig dat je dit item wilt opslaan en niet wilt kopiëren.',
 
 // Success messages.
-// TODO: translate the following.
-// 'msg.success' => 'Operation completed successfully.',
+'msg.success' => 'De bewerking is succesvol uitgevoerd.',
 
 // Labels for buttons.
 'button.login' => 'Aanmelden',
@@ -154,8 +150,7 @@
 'label.user' => 'Medewerker',
 'label.users' => 'Medewerkers',
 'label.group' => 'Groep',
-// TODO: translate the following.
-// 'label.subgroups' => 'Subgroups',
+'label.subgroups' => 'Subgroepen',
 'label.roles' => 'Rollen',
 'label.client' => 'Klant',
 'label.clients' => 'Klanten',
@@ -231,17 +226,15 @@
 'label.work_units' => 'Werk eenheid',
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
-'label.quota' => 'Quota',
+'label.quota' => 'Maanddoel',
 
 // Form titles.
 'title.error' => 'Fout',
-// TODO: Translate the following.
-// 'title.success' => 'Success',
+'title.success' => 'Succes',
 'title.login' => 'Aanmelden',
 'title.groups' => 'Groepen',
-// TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
-// 'title.add_group' => 'Adding Group',
+'title.subgroups' => 'Subgroepen',
+'title.add_group' => 'Groep toevoegen',
 'title.edit_group' => 'Groep bewerken',
 'title.delete_group' => 'Groep aan het verwijderen',
 'title.reset_password' => 'Wachtwoord herstellen',
@@ -359,11 +352,11 @@
 'form.time.duration_format' => '(uu:mm of 0.0u)',
 'form.time.billable' => 'Factureerbaar',
 'form.time.uncompleted' => 'Onvolledig',
-'form.time.remaining_quota' => 'Te werken uren voor de doelstelling',
-'form.time.over_quota' => 'Meer gewerkte uren dan de doelstelling',
-// TODO: translate the following.
-// 'form.time.remaining_balance' => 'Remaining balance',
-// 'form.time.over_balance' => 'Over balance',
+// TODO: The following 4 strings may need to be shorter for mobile apps.
+'form.time.remaining_quota' => 'Nog te werken uren voor de doelstelling deze maand',
+'form.time.over_quota' => 'Meer gewerkte uren dan de doelstelling deze maand',
+'form.time.remaining_balance' => 'Minder gewerkte uren dan de doelstelling in ratio met de verstreken dagen',
+'form.time.over_balance' => 'Meer gewerkte uren dan de doelstelling in ratio met de verstreken dagen',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dit tijdrecord is opgeslagen met alleen een starttijd. Dit is geen fout.',
@@ -475,8 +468,7 @@
 'form.group_edit.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
-// TODO: translate the following.
-// 'form.group_edit.confirm_save' => 'Confirm saving',
+'form.group_edit.confirm_save' => 'Bevestig dat je wilt opslaan',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4b4fc4465..d7ec5d2b7 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.36.4704 | 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.4705 | 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>

From e40a312eb20155b967a0ffdd1b3f6b36398a5944 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Jan 2019 00:40:16 +0000
Subject: [PATCH 0633/1848] Removed populate.sql from dockerfile.

---
 .gitignore                   | 1 -
 WEB-INF/templates/footer.tpl | 2 +-
 dockerfile-db                | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0dba767f9..92e2728c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 config.php
-populate.sql
 WEB-INF/templates_c/*.*
 WEB-INF/templates_c/import_*
 WEB-INF/templates_c/tt*
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d7ec5d2b7..d49ca6d73 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.36.4705 | 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.4706 | 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/dockerfile-db b/dockerfile-db
index b13673952..757aa0b30 100644
--- a/dockerfile-db
+++ b/dockerfile-db
@@ -3,7 +3,3 @@ FROM mariadb:latest
 
 # Copy database creation script.
 COPY mysql.sql /docker-entrypoint-initdb.d/
-
-# Copy database population script, if available.
-# TODO: design a better directory structure.
-COPY populate.sql /docker-entrypoint-initdb.d/

From 6079edfe4444d2d0bc2f220f8823d6fcc57f2dd5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Jan 2019 10:22:32 +0000
Subject: [PATCH 0634/1848] Imporoved isTrue function to get rid of PHP
 warnings.

---
 WEB-INF/lib/Auth.class.php           |  6 +++---
 WEB-INF/lib/auth/Auth_db.class.php   |  2 +-
 WEB-INF/lib/auth/Auth_ldap.class.php | 24 ++++++++++++------------
 WEB-INF/lib/common.lib.php           |  2 +-
 WEB-INF/lib/mail/Mailer.class.php    |  6 +++---
 WEB-INF/templates/footer.tpl         |  2 +-
 login.php                            |  2 +-
 mobile/login.php                     |  2 +-
 register.php                         |  2 +-
 tofile.php                           |  8 ++++----
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/Auth.class.php b/WEB-INF/lib/Auth.class.php
index d57a0c4a3..96ea86926 100644
--- a/WEB-INF/lib/Auth.class.php
+++ b/WEB-INF/lib/Auth.class.php
@@ -64,7 +64,7 @@ function isPasswordExternal()
   function doLogin($login, $password) {
     $auth = $this->authenticate($login, $password);
 
-    if (isTrue(AUTH_DEBUG)) {
+    if (isTrue('AUTH_DEBUG')) {
       echo '<br>'; var_dump($auth); echo '<br />';
     }
 
@@ -77,13 +77,13 @@ function doLogin($login, $password) {
     $sql = "SELECT id FROM tt_users WHERE login = ".$mdb2->quote($login)." AND status = 1";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
-      if (isTrue(AUTH_DEBUG))
+      if (isTrue('AUTH_DEBUG'))
         echo 'db error!<br />';
       return false;
     }
     $val = $res->fetchRow();
     if (!$val['id']) {
-      if (isTrue(AUTH_DEBUG))
+      if (isTrue('AUTH_DEBUG'))
         echo 'login "'.$login.'" does not exist in Time Tracker database.<br />';
       return false;
     }
diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index bdde007a9..a7ae0d3fa 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -57,7 +57,7 @@ function authenticate($login, $password)
       return array('login'=>$login,'id'=>$val['id']);
     } else {
       // If the OLD_PASSWORDS option is defined - set it.
-      if (isTrue(OLD_PASSWORDS)) {
+      if (isTrue('OLD_PASSWORDS')) {
         $sql = "SET SESSION old_passwords = 1";
         $res = $mdb2->query($sql);
         if (is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 23ea127e6..52d4fabe3 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -96,7 +96,7 @@ function authenticate($login, $password)
 
     $lc = ldap_connect($this->params['server']);
 
-    if (isTrue(AUTH_DEBUG)) {
+    if (isTrue('AUTH_DEBUG')) {
       echo '<br />';
       echo '$lc='; var_dump($lc); echo '<br />';
       echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
@@ -106,7 +106,7 @@ function authenticate($login, $password)
 
     ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, 3);
     ldap_set_option($lc, LDAP_OPT_REFERRALS, 0);
-    if (isTrue(AUTH_DEBUG)) {
+    if (isTrue('AUTH_DEBUG')) {
       ldap_set_option($lc, LDAP_OPT_DEBUG_LEVEL, 7);
     }
 
@@ -119,13 +119,13 @@ function authenticate($login, $password)
         $login .= '@' . $this->params['default_domain'];
       }
 
-      if (isTrue(AUTH_DEBUG)) {
+      if (isTrue('AUTH_DEBUG')) {
         echo '$login='; var_dump($login); echo '<br />';
       }
 
       $lb = @ldap_bind($lc, $login, $password);
 
-      if (isTrue(AUTH_DEBUG)) {
+      if (isTrue('AUTH_DEBUG')) {
         echo '$lb='; var_dump($lb); echo '<br />';
         echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
       }
@@ -142,7 +142,7 @@ function authenticate($login, $password)
         $fields = array('memberof');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
-        if (isTrue(AUTH_DEBUG)) {
+        if (isTrue('AUTH_DEBUG')) {
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -154,7 +154,7 @@ function authenticate($login, $password)
 
         $entries = @ldap_get_entries($lc, $sr);
 
-        if (isTrue(AUTH_DEBUG)) {
+        if (isTrue('AUTH_DEBUG')) {
           echo '$entries='; var_dump($entries); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -173,7 +173,7 @@ function authenticate($login, $password)
           $groups[] = substr($grp_fields[0], 3);
         }
 
-        if (isTrue(AUTH_DEBUG)) {
+        if (isTrue('AUTH_DEBUG')) {
           echo '$member_of'; var_dump($member_of); echo '<br />';
         };
 
@@ -195,7 +195,7 @@ function authenticate($login, $password)
       // Assuming OpenLDAP server.
       $login_oldap = 'uid='.$login.','.$this->params['base_dn'];
 
-      if (isTrue(AUTH_DEBUG)) {
+      if (isTrue('AUTH_DEBUG')) {
         echo '$login_oldap='; var_dump($login_oldap); echo '<br />';
       }
 
@@ -207,7 +207,7 @@ function authenticate($login, $password)
 
       $lb = @ldap_bind($lc, $login_oldap, $password);
 
-      if (isTrue(AUTH_DEBUG)) {
+      if (isTrue('AUTH_DEBUG')) {
         echo '$lb='; var_dump($lb); echo '<br />';
         echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
       }
@@ -225,7 +225,7 @@ function authenticate($login, $password)
         $fields = array('samaccountname', 'mail', 'memberof', 'department', 'displayname', 'telephonenumber', 'primarygroupid');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
-        if (isTrue(AUTH_DEBUG)) {
+        if (isTrue('AUTH_DEBUG')) {
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -238,7 +238,7 @@ function authenticate($login, $password)
 
         $entries = @ldap_get_entries($lc, $sr);
 
-        if (isTrue(AUTH_DEBUG)) {
+        if (isTrue('AUTH_DEBUG')) {
           echo '$entries='; var_dump($entries); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -258,7 +258,7 @@ function authenticate($login, $password)
           $groups[] = substr($grp_fields[0], 3);
         }
 
-        if (isTrue(AUTH_DEBUG)) {
+        if (isTrue('AUTH_DEBUG')) {
           echo '$member_of'; var_dump($member_of); echo '<br />';
         }
 
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index f483b3d4c..6526d730c 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -165,7 +165,7 @@ function check_extension($ext)
 // isTrue is a helper function to return correct false for older config.php values defined as a string 'false'.
 function isTrue($val)
 {
-  return ($val === true);
+  return (defined($val) && constant($val) === true);
 }
 
 // ttValidString is used to check user input to validate a string.
diff --git a/WEB-INF/lib/mail/Mailer.class.php b/WEB-INF/lib/mail/Mailer.class.php
index 68142028e..30f0ffb64 100644
--- a/WEB-INF/lib/mail/Mailer.class.php
+++ b/WEB-INF/lib/mail/Mailer.class.php
@@ -104,8 +104,8 @@ function send($subject, $data) {
         $port = defined('MAIL_SMTP_PORT') ? MAIL_SMTP_PORT : '25';
         $username = defined('MAIL_SMTP_USER') ? MAIL_SMTP_USER : null;
         $password = defined('MAIL_SMTP_PASSWORD') ? MAIL_SMTP_PASSWORD : null;
-        $auth = isTrue(MAIL_SMTP_AUTH);
-        $debug = isTrue(MAIL_SMTP_DEBUG);
+        $auth = isTrue('MAIL_SMTP_AUTH');
+        $debug = isTrue('MAIL_SMTP_DEBUG');
 
         $mail = Mail::factory('smtp', array ('host' => $host,
           'port' => $port,
@@ -116,7 +116,7 @@ function send($subject, $data) {
         break;
     }
 
-    if (isTrue(MAIL_SMTP_DEBUG))
+    if (isTrue('MAIL_SMTP_DEBUG'))
       PEAR::setErrorHandling(PEAR_ERROR_PRINT);
 
     $res = $mail->send($recipients, $headers, $data);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d49ca6d73..013c87a7e 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.36.4706 | 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.4707 | 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/login.php b/login.php
index e7254152c..68a80678f 100644
--- a/login.php
+++ b/login.php
@@ -75,7 +75,7 @@
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttOrgHelper::getOrgs())
+if(!isTrue('MULTITEAM_MODE') && !ttOrgHelper::getOrgs())
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
diff --git a/mobile/login.php b/mobile/login.php
index 59fc6000f..26b75db46 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -80,7 +80,7 @@
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttOrgHelper::getOrgs())
+if(!isTrue('MULTITEAM_MODE') && !ttOrgHelper::getOrgs())
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
diff --git a/register.php b/register.php
index 0a8e6d156..4c923c730 100644
--- a/register.php
+++ b/register.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 
-if (!isTrue(MULTITEAM_MODE) || $auth->isPasswordExternal()) {
+if (!isTrue('MULTITEAM_MODE') || $auth->isPasswordExternal()) {
   header('Location: login.php');
   exit();
 }
diff --git a/tofile.php b/tofile.php
index 990b8a555..3934471de 100644
--- a/tofile.php
+++ b/tofile.php
@@ -94,7 +94,7 @@
       print "\t<".$group_by_tag."><![CDATA[".$subtotal['name']."]]></".$group_by_tag.">\n";
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
-        if($val && isTrue(EXPORT_DECIMAL_DURATION))
+        if($val && isTrue('EXPORT_DECIMAL_DURATION'))
           $val = time_to_decimal($val);
         print "\t<duration><![CDATA[".$val."]]></duration>\n";
       }
@@ -126,7 +126,7 @@
       if ($bean->getAttribute('chfinish')) print "\t<finish><![CDATA[".$item['finish']."]]></finish>\n";
       if ($bean->getAttribute('chduration')) {
         $duration = $item['duration'];
-        if($duration && isTrue(EXPORT_DECIMAL_DURATION))
+        if($duration && isTrue('EXPORT_DECIMAL_DURATION'))
           $duration = time_to_decimal($duration);
           print "\t<duration><![CDATA[".$duration."]]></duration>\n";
       }
@@ -179,7 +179,7 @@
       print '"'.$subtotal['name'].'"';
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
-        if($val && isTrue(EXPORT_DECIMAL_DURATION))
+        if($val && isTrue('EXPORT_DECIMAL_DURATION'))
           $val = time_to_decimal($val);
         print ',"'.$val.'"';
       }
@@ -223,7 +223,7 @@
       if ($bean->getAttribute('chfinish')) print ',"'.$item['finish'].'"';
       if ($bean->getAttribute('chduration')) {
         $val = $item['duration'];
-        if($val && isTrue(EXPORT_DECIMAL_DURATION))
+        if($val && isTrue('EXPORT_DECIMAL_DURATION'))
           $val = time_to_decimal($val);
         print ',"'.$val.'"';
       }

From 25ca552776a80fedd587231f56c8bc13c1836390 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Jan 2019 10:38:34 +0000
Subject: [PATCH 0635/1848] Fixed header.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 013c87a7e..62e2c4fdb 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.36.4707 | 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.4708 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 8555447b5..a30669f2c 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -149,7 +149,7 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a> &middot;
-  {if isTrue($smarty.const.MULTITEAM_MODE) && $smarty.const.AUTH_MODULE == 'db'}
+  {if $smarty.const.MULTITEAM_MODE && $smarty.const.AUTH_MODULE == 'db'}
             <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a> &middot;
   {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;

From 78fd633e9c800e3f9b53b0dcff2ac47c8bfbad4a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Jan 2019 22:46:52 +0000
Subject: [PATCH 0636/1848] A better fix for header.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 62e2c4fdb..01e40bce1 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.36.4708 | 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.4709 | 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/header.tpl b/WEB-INF/templates/header.tpl
index a30669f2c..86bc619ce 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -149,7 +149,7 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a> &middot;
-  {if $smarty.const.MULTITEAM_MODE && $smarty.const.AUTH_MODULE == 'db'}
+  {if isTrue('MULTITEAM_MODE') && $smarty.const.AUTH_MODULE == 'db'}
             <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a> &middot;
   {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;

From 57539cbc8f8094151cbf9a042635f11962968435 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Jan 2019 17:08:13 +0000
Subject: [PATCH 0637/1848] Work in progress integrating Estonian translation
 as per PR#71.

---
 WEB-INF/resources/et.lang.php | 272 ++++++++++++++++------------------
 WEB-INF/templates/footer.tpl  |   2 +-
 2 files changed, 130 insertions(+), 144 deletions(-)

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1387bea36..38d2e3a7d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -36,226 +36,212 @@
 $i18n_weekdays = array('Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev');
 $i18n_weekdays_short = array('P', 'E', 'T', 'K', 'N', 'R', 'L');
 // format mm/dd
-$i18n_holidays = array('01/01', '02/24', '04/10', '04/12', '05/01', '05/31', '06/23', '06/24', '08/20', '12/24', '12/25', '12/26');
+$i18n_holidays = array('01/01', '02/24', '04/19', '04/21', '05/01', '06/09', '06/23', '06/24', '08/20', '12/24', '12/25', '12/26');
 
 $i18n_key_words = array(
 
 // Menus - short selection strings that are displayed on top of application web pages.
 // Example: https://timetracker.anuko.com (black menu on top).
-'menu.login' => 'Login',
-'menu.logout' => 'Logout',
-// TODO: translate the following.
-// 'menu.forum' => 'Forum',
+'menu.login' => 'Sisene',
+'menu.logout' => 'Välju',
+'menu.forum' => 'Foorum',
 'menu.help' => 'Abiinfo',
-// TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
-'menu.profile' => 'Profiili',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
-// 'menu.plugins' => 'Plugins',
-'menu.time' => 'Aeg',
-// TODO: translate the following.
-// 'menu.expenses' => 'Expenses',
+'menu.create_group' => 'Loo grupp',
+'menu.profile' => 'Profiil',
+'menu.group' => 'Grupp',
+'menu.plugins' => 'Lisad',
+'menu.time' => 'Ajaarvestus',
+'menu.expenses' => 'Kulud',
 'menu.reports' => 'Raportid',
-// TODO: translate the following.
-// 'menu.charts' => 'Charts',
+'menu.charts' => 'Diagrammid',
 'menu.projects' => 'Projektid',
-// TODO: translate the following.
-// 'menu.tasks' => 'Tasks',
+'menu.tasks' => 'Tööülesanded',
 'menu.users' => 'Kasutajad',
-// TODO: translate the following.
-// 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
-// 'menu.export' => 'Export',
+'menu.groups' => 'Grupid',
+'menu.subgroups' => 'Alamgrupid',
+'menu.export' => 'Eksport', // TODO: is this a correct term as an opposite of "Import"?
 'menu.clients' => 'Kliendid',
 'menu.options' => 'Suvandid',
 
 // Footer - strings on the bottom of most pages.
-// TODO: translate the following.
-// 'footer.contribute_msg' => 'You can contribute to Time Tracker in different ways.',
-// 'footer.credits' => 'Credits',
-// 'footer.license' => 'License',
-// 'footer.improve' => 'Contribute', // Translators: this could mean "Improve", if it makes better sense in your language.
-                                     // This is a link to a webpage that describes how to contribute to the project.
+'footer.contribute_msg' => 'Sul on võimalik mitmeti panustada Time Tracker\\\'i arendamisse.',
+'footer.credits' => 'Tunnustused',
+'footer.license' => 'Litsents',
+'footer.improve' => 'Panusta',
 
 // Error messages.
-// TODO: translate the following.
-// 'error.access_denied' => 'Access denied.',
-// 'error.sys' => 'System error.',
+'error.access_denied' => 'Puudub ligipääs.',
+'error.sys' => 'Rakenduse viga.',
 'error.db' => 'Andmebaasi viga.',
-// TODO: translate the following.
-// 'error.feature_disabled' => 'Feature is disabled.',
-'error.field' => 'Valed "{0}" andmed.',
+'error.feature_disabled' => 'Rakenduse funktsionaalsus on välja lülitatud.',
+'error.field' => 'Välja "{0}" andmed ei vasta nõutele.',
 'error.empty' => 'Väli "{0}" on tühi.',
 'error.not_equal' => 'Väli "{0}" ei ole väljaga "{1}" võrdne.',
-// TODO: translate the following.
-// 'error.interval' => 'Field "{0}" must be greater than "{1}".',
+'error.interval' => 'Välja "{0}" väärtus peab olema suurem kui välja "{1}" väärtus.',
 'error.project' => 'Vali projekt.',
-// TODO: translate the following.
-// 'error.task' => 'Select task.',
+'error.task' => 'Vali tööülesanne.',
 'error.client' => 'Vali klient.',
-// TODO: translate the following.
-// 'error.report' => 'Select report.',
-// 'error.record' => 'Select record.',
-'error.auth' => 'Vale login või salasõna.',
-// TODO: translate the following.
-// 'error.user_exists' => 'User with this login already exists.',
-// 'error.object_exists' => 'Object with this name already exists.',
-// 'error.invoice_exists' => 'Invoice with this number already exists.',
+'error.report' => 'Vali raport.',
+'error.record' => 'Vali kirje.',
+'error.auth' => 'Autentimine ebaõnnestus.',
+'error.user_exists' => 'Selle nimega kasutaja on juba kasutusel.',
+'error.object_exists' => 'Sellise nimega objekt on juba olemas.',
+'error.invoice_exists' => 'Arve number on juba kasutusel.',
+
+// TODO: Improve translation of error.role_exists.
 // 'error.role_exists' => 'Role with this rank already exists.',
+// It is displayed when user tries to add a role with an already existing RANK.
+// There is no indication of RANK collision in this translation.
+// 'error.role_exists' => 'Kasutaja roll on juba kasutusel.',
+
+// TODO: Improve translation of error.no_invoiceable_items.
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
-// 'error.no_login' => 'No user with this login.',
-'error.no_groups' => 'Sinu andmebaas on tühi. Logi adminina sisse ja loo uus meeskond.',  // TODO: replace "team" with "group".
+// This error shows up when user tries to ctreate a new invoice,
+// but there are no billable records such time or expenses to include.
+// Google auto-translates below as "No billable invoices found." which seems wrong.
+// 'error.no_invoiceable_items' => 'Arveldatavaid arveid ei leitud.',
+
+'error.no_login' => 'Sellise tunnusega kasutajat ei ole.',
+
+// TODO: Improve translation of error.no_groups. Replace meeskond with grupp?
+// Why? Before supporting subgroups, Time Tracker organized users in "teams".
+// Now we have "groups" with "subgroups", renamed from original "team".
+// Meeskond below is a glimpse from earlier versions, before renaming occurred.
+'error.no_groups' => 'Sinu andmebaas on tühi. Logi administraatorina sisse ja loo uus meeskond.',
+
 'error.upload' => 'Viga faili vastuvõtmisel.',
-// TODO: translate the following.
-// 'error.range_locked' => 'Date range is locked.',
-// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
-// 'error.no_email' => 'No email associated with this login.',
-// 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
-// 'error.goto_uncompleted' => 'Go to uncompleted entry.',
-// 'error.overlap' => 'Time interval overlaps with existing records.',
-// 'error.future_date' => 'Date is in future.',
-// TODO: translate the following.
-// '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.',
-// 'error.expired' => 'Expiration date reached.',
+'error.range_locked' => 'Kuupäevavahemik on lukus.',
+'error.mail_send' => 'E-posti saatmisel tekkis viga. Vea tuvastamiseks kasuta MAIL_SMTP_DEBUG muutujat.',
+'error.no_email' => 'Kasutajaga pole ühtegi e-posti seotud.',
+'error.uncompleted_exists' => 'Leiti varasemalt lõpetamata kirje. Sulge või kustuta see.',
+'error.goto_uncompleted' => 'Ava lõpetamata kirje.',
+'error.overlap' => 'Ajavahemik kattub varasema kirjega.',
+'error.future_date' => 'Kuupäev on tulevikus.',
+'error.xml' => 'Viga XML failis, real %d: %s.',
+'error.cannot_import' => 'Ebaõnnestunud import: %s.',
+'error.format' => 'Faili formaat on vale.',
+'error.user_count' => 'Kasutajate arvu piirang.',
+'error.expired' => 'Kehtivusaeg on lõppenud.',
 
 // Warning messages.
-// TODO: translate the following.
-// 'warn.sure' => 'Are you sure?',
-// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
+'warn.sure' => 'Oled kindel?',
+'warn.confirm_save' => 'Kuupäeva on muudetud. Muudatuse kinnitamisel ei varundata esialgset kirjet, vaid muudetakse seda. Kinnitad muudatuse?',
 
 // Success messages.
-// TODO: translate the following.
-// 'msg.success' => 'Operation completed successfully.',
+'msg.success' => 'Tegevus oli edukas.',
 
 // Labels for buttons.
-'button.login' => 'Login',
-'button.now' => 'Kohe',
+'button.login' => 'Sisene',
+'button.now' => 'Nüüd',
 'button.save' => 'Salvesta',
-// TODO: translate the following.
-// 'button.copy' => 'Copy',
+'button.copy' => 'Kopeeri',
 'button.cancel' => 'Tühista',
 'button.submit' => 'Postita',
 'button.add' => 'Lisa',
 'button.delete' => 'Kustuta',
 'button.generate' => 'Loo',
-'button.reset_password' => 'Tühjenda salasõna',
+'button.reset_password' => 'Lähtesta salasõna',
 'button.send' => 'Saada',
-'button.send_by_email' => 'Saada e-mailiga',
-'button.create_group' => 'Loo meeskond', // TODO: replace "team" with "group".
-'button.export' => 'Ekspordi meeskond', // TODO: replace "team" with "group".
-'button.import' => 'Impordi meeskond', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.close' => 'Close',
-// 'button.stop' => 'Stop',
+'button.send_by_email' => 'Saada e-postiga',
+'button.create_group' => 'Loo grupp',
+'button.export' => 'Ekspordi grupp',
+'button.import' => 'Impordi grupp',
+'button.close' => 'Sulge',
+'button.stop' => 'Stopp',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-// TODO: translate the following.
-// 'label.group_name' => 'Group name',
-// 'label.address' => 'Address',
+'label.group_name' => 'Grupi nimi',
+'label.address' => 'Aadress',
 'label.currency' => 'Valuuta',
-// TODO: translate the following.
-// 'label.manager_name' => 'Manager name',
-// 'label.manager_login' => 'Manager login',
+'label.manager_name' => 'Halduri nimi',
+'label.manager_login' => 'Halduri sisenemine',
 'label.person_name' => 'Nimi',
 'label.thing_name' => 'Nimi',
-'label.login' => 'Login',
+'label.login' => 'Kasutajanimi',
 'label.password' => 'Salasõna',
 'label.confirm_password' => 'Kinnita salasõna',
-// TODO: translate the following.
-// 'label.email' => 'Email',
+'label.email' => 'E-post',
 'label.cc' => 'Cc',
-// TODO: translate the following.
-// 'label.bcc' => 'Bcc',
+'label.bcc' => 'Bcc',
 'label.subject' => 'Teema',
 'label.date' => 'Kuupäev',
-'label.start_date' => 'Algab kuupäevast',
-'label.end_date' => 'Lõpeb kuupäeval',
+'label.start_date' => 'Algus kuupäev',
+'label.end_date' => 'Lõpu kuupäev',
 'label.user' => 'Kasutaja',
 'label.users' => 'Kasutajad',
-// TODO: translate the following.
-// 'label.group' => 'Group',
-// 'label.subgroups' => 'Subgroups',
-// 'label.roles' => 'Roles',
+'label.group' => 'Grupp',
+'label.subgroups' => 'Alamgrupid',
+'label.roles' => 'Rollid',
 'label.client' => 'Klient',
 'label.clients' => 'Kliendid',
-// TODO: translate the following.
-// 'label.option' => 'Option',
+'label.option' => 'Valik',
 'label.invoice' => 'Arve',
 'label.project' => 'Projekt',
 'label.projects' => 'Projektid',
-// TODO: translate the following.
-// 'label.task' => 'Task',
-// 'label.tasks' => 'Tasks',
-// 'label.description' => 'Description',
+'label.task' => 'Tööülesanne',
+'label.tasks' => 'Tööülesanded',
+'label.description' => 'Kirjeldus',
 'label.start' => 'Algus',
 'label.finish' => 'Lõpp',
 'label.duration' => 'Kestus',
 'label.note' => 'Märkus',
 'label.notes' => 'Märkused',
-// TODO: translate the following.
-// 'label.item' => 'Item',
-// 'label.cost' => 'Cost',
-// 'label.ip' => 'IP',
-// 'label.day_total' => 'Day total',
-'label.week_total' => 'Nädalane summa',
-// TODO: translate the following.
-// 'label.month_total' => 'Month total',
+'label.item' => 'Ese',
+'label.cost' => 'Hind',
+'label.ip' => 'IP',
+'label.day_total' => 'Päeva summa',
+'label.week_total' => 'Nädala summa',
+'label.month_total' => 'Kuu summa',
 'label.today' => 'Täna',
-// TODO: translate the following.
-// 'label.view' => 'View',
+'label.view' => 'Vaata',
 'label.edit' => 'Muuda',
 'label.delete' => 'Kustuta',
-'label.configure' => 'Konfigureeri',
+'label.configure' => 'Seadista',
 'label.select_all' => 'Vali kõik',
 'label.select_none' => 'Märgi kõik mittevalituks',
-// TODO: translate the following.
-// 'label.day_view' => 'Day view',
-// 'label.week_view' => 'Week view',
+'label.day_view' => 'Päeva vaade',
+'label.week_view' => 'Nädala vaade',
 'label.id' => 'ID',
-// TODO: translate the following.
-// 'label.language' => 'Language',
-// 'label.decimal_mark' => 'Decimal mark',
-// 'label.date_format' => 'Date format',
-// 'label.time_format' => 'Time format',
-// 'label.week_start' => 'First day of week',
+'label.language' => 'Keel',
+'label.decimal_mark' => 'Koma märk',
+'label.date_format' => 'Kuupäeva formaat',
+'label.time_format' => 'Kella formaat',
+'label.week_start' => 'Nädala alguspäev',
 'label.comment' => 'Kommentaar',
 'label.status' => 'Seisund',
-'label.tax' => 'Maks',
+'label.tax' => 'Maksud',
 'label.subtotal' => 'Vahesumma',
 'label.total' => 'Kokku',
-// TODO: translate the following.
-// 'label.client_name' => 'Client name',
-// 'label.client_address' => 'Client address',
+'label.client_name' => 'Kliendi nimi',
+'label.client_address' => 'Kliendi aadress',
 'label.or' => 'või',
-// TODO: translate the following.
-// 'label.error' => 'Error',
-// 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
+'label.error' => 'Viga',
+'label.ldap_hint' => 'Kasuta allolevas tabelis oma Windows\\\'i kasutajatunnuseid.',
 'label.required_fields' => '* nõutud väljad',
-// TODO: translate the following.
+// TODO: Translate label.on_behalf, perhaps trying as "instead of".
 // 'label.on_behalf' => 'on behalf of',
 'label.role_manager' => '(haldur)',
 'label.role_comanager' => '(kaashaldur)',
 'label.role_admin' => '(administraator)',
-// TODO: translate the following.
-// 'label.page' => 'Page',
-// 'label.condition' => 'Condition',
-// 'label.yes' => 'yes',
-// 'label.no' => 'no',
+'label.page' => 'Lehekülg',
+'label.condition' => 'Tingimus',
+'label.yes' => 'jah',
+'label.no' => 'ei',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
-// TODO: translate the following.
-// 'label.custom_fields' => 'Custom fields',
-// 'label.monthly_quotas' => 'Monthly quotas',
-// 'label.type' => 'Type',
-// 'label.type_dropdown' => 'dropdown',
-// 'label.type_text' => 'text',
-// 'label.required' => 'Required',
+'label.custom_fields' => 'Eriväljad',
+'label.monthly_quotas' => 'Kuu kvoot',
+'label.type' => 'Tüüp',
+'label.type_dropdown' => 'rippmenüü',
+'label.type_text' => 'tekst',
+'label.required' => 'Kohustuslik',
 'label.fav_report' => 'Lemmikraport',
-// TODO: translate the following.
+
+// TODO: translate label.schedule.
+// The meaning of this is "cron schedule" - or a spec for Unix "cron" program.
+// See config pages for Locking and Notifications plugin, where it is used.
 // 'label.schedule' => 'Schedule',
+
+// TODO: translate the following.
 // 'label.what_is_it' => 'What is it?',
 // 'label.expense' => 'Expense',
 // 'label.quantity' => 'Quantity',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 01e40bce1..090111b5e 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.36.4709 | 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.4710 | 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>

From e58cee63708a69bf369c7ade35b015e2ba6e8dfd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Jan 2019 18:54:11 +0000
Subject: [PATCH 0638/1848] A bit more work in progress integrating Estonian
 translation improvements as per PR#71.

---
 WEB-INF/resources/et.lang.php | 151 +++++++++++++++-------------------
 WEB-INF/templates/footer.tpl  |   2 +-
 2 files changed, 67 insertions(+), 86 deletions(-)

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 38d2e3a7d..b34ec1230 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -235,116 +235,97 @@
 'label.type_text' => 'tekst',
 'label.required' => 'Kohustuslik',
 'label.fav_report' => 'Lemmikraport',
-
-// TODO: translate label.schedule.
-// The meaning of this is "cron schedule" - or a spec for Unix "cron" program.
-// See config pages for Locking and Notifications plugin, where it is used.
-// 'label.schedule' => 'Schedule',
-
-// TODO: translate the following.
-// 'label.what_is_it' => 'What is it?',
-// 'label.expense' => 'Expense',
-// 'label.quantity' => 'Quantity',
-// 'label.paid_status' => 'Paid status',
-// 'label.paid' => 'Paid',
-// 'label.mark_paid' => 'Mark paid',
-// 'label.week_note' => 'Week note',
-// 'label.week_list' => 'Week list',
-// 'label.work_units' => 'Work units',
-// 'label.work_units_short' => 'Units',
+'label.schedule' => 'Ajakava',
+'label.what_is_it' => 'Mis see on?',
+'label.expense' => 'Kulu',
+'label.quantity' => 'Kogus',
+'label.paid_status' => 'Makse olek',
+'label.paid' => 'Makstud',
+'label.mark_paid' => 'Märgi makstuks',
+'label.week_note' => 'Nädala märge',
+'label.week_list' => 'Nädala nimekiri',
+'label.work_units' => 'Töö ühikud',
+'label.work_units_short' => 'Ühikud',
 'label.totals_only' => 'Ainult summad',
-// TODO: translate the following.
-// 'label.quota' => 'Quota',
+'label.quota' => 'Kvoot',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
 // Compare with English file to see how it is done there and do Estonian titles similarly.
 // Specifically: lisamine vs lisa, etc.
-// TODO: Translate the following.
-// 'title.error' => 'Error',
-// 'title.success' => 'Success',
-'title.login' => 'Login',
-'title.groups' => 'Meeskonnad', // TODO: change "teams" to "groups".
-// TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
-// 'title.add_group' => 'Adding Group',
-// 'title.edit_group' => 'Editing Group',
-'title.delete_group' => 'Kustuta meeskond',  // TODO: change "team" to "group".
+'title.error' => 'Viga',
+'title.success' => 'Õnnestumine',
+'title.login' => 'Sisene',
+'title.groups' => 'Grupid',
+'title.subgroups' => 'Alamgrupid',
+'title.add_group' => 'Lisa grupp',
+'title.edit_group' => 'Muuda gruppi',
+'title.delete_group' => 'Kustuta grupp',
 'title.reset_password' => 'Tühjenda salasõna',
-// TODO: translate the following.
-// 'title.change_password' => 'Changing Password',
-'title.time' => 'Aeg',
+'title.change_password' => 'Muuda salasõna',
+'title.time' => 'Ajaarvestus',
 'title.edit_time_record' => 'Ajakande muutmine',
 'title.delete_time_record' => 'Ajakande kustutamine',
-// TODO: translate the following.
-// 'title.expenses' => 'Expenses',
-// 'title.edit_expense' => 'Editing Expense Item',
-// 'title.delete_expense' => 'Deleting Expense Item',
-// 'title.predefined_expenses' => 'Predefined Expenses',
-// 'title.add_predefined_expense' => 'Adding Predefined Expense',
-// 'title.edit_predefined_expense' => 'Editing Predefined Expense',
-// 'title.delete_predefined_expense' => 'Deleting Predefined Expense',
+'title.expenses' => 'Kulud',
+'title.edit_expense' => 'Kulukirje muutmine',
+'title.delete_expense' => 'Kulukirje kustutamine',
+'title.predefined_expenses' => 'Eelmääratud kulukirje',
+'title.add_predefined_expense' => 'Lisa eelmääratud kulukirje',
+'title.edit_predefined_expense' => 'Muuda eelmääratut kulukirjet',
+'title.delete_predefined_expense' => 'Kustuta eelmääratud kulukirje',
 'title.reports' => 'Raportid',
-// TODO: translate the following.
-// 'title.report' => 'Report',
-// 'title.send_report' => 'Sending Report',
+'title.report' => 'Raport',
+'title.send_report' => 'Saadan raportit',
 'title.invoice' => 'Arve',
-// TODO: translate the following.
-// 'title.send_invoice' => 'Sending Invoice',
-// 'title.charts' => 'Charts',
+'title.send_invoice' => 'Saada arve',
+'title.charts' => 'Diagrammid',
 'title.projects' => 'Projektid',
 'title.add_project' => 'Projekti lisamine',
 'title.edit_project' => 'Projekti muutmine',
 'title.delete_project' => 'Projekti kustutamine',
-// TODO: translate the following.
-// 'title.tasks' => 'Tasks',
-// 'title.add_task' => 'Adding Task',
-// 'title.edit_task' => 'Editing Task',
-// 'title.delete_task' => 'Deleting Task',
+'title.tasks' => 'Tööülesanded',
+'title.add_task' => 'Lisa tööülesanne',
+'title.edit_task' => 'Muuda tööülesannet',
+'title.delete_task' => 'Kustuta tööülesanne',
 'title.users' => 'Kasutajad',
-'title.add_user' => 'Kasutaja lisamine', // TODO: is this correct?
+'title.add_user' => 'Kasutaja lisamine',
 'title.edit_user' => 'Kasutaja muutmine',
 'title.delete_user' => 'Kasutaja kustutamine',
-// TODO: translate the following.
-// 'title.roles' => 'Roles',
-// 'title.add_role' => 'Adding Role',
-// 'title.edit_role' => 'Editing Role',
-// 'title.delete_role' => 'Deleting Role',
+'title.roles' => 'Rollid',
+'title.add_role' => 'Rolli lisamine',
+'title.edit_role' => 'Rolli muutmine',
+'title.delete_role' => 'Rolli kustutamine',
 'title.clients' => 'Kliendid',
 'title.add_client' => 'Lisa klient',
 'title.edit_client' => 'Muuda klienti',
 'title.delete_client' => 'Kustuta klient',
 'title.invoices' => 'Arved',
-// TODO: translate the following.
-// 'title.add_invoice' => 'Adding Invoice',
-// 'title.view_invoice' => 'Viewing Invoice',
-// 'title.delete_invoice' => 'Deleting Invoice',
-// 'title.notifications' => 'Notifications',
-// 'title.add_notification' => 'Adding Notification',
-// 'title.edit_notification' => 'Editing Notification',
-// 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quotas' => 'Monthly Quotas',
-// 'title.export' => 'Exporting Group Data',
-// 'title.import' => 'Importing Group Data',
+'title.add_invoice' => 'Arve lisamine',
+'title.view_invoice' => 'Arve vaatamine',
+'title.delete_invoice' => 'Arve kustutamine',
+'title.notifications' => 'Teated',
+'title.add_notification' => 'Teate lisamine',
+'title.edit_notification' => 'Teate muutmine',
+'title.delete_notification' => 'Teate kustutamine',
+'title.monthly_quotas' => 'Kuu kvoot',
+'title.export' => 'Grupi andmete alla laadimine',
+'title.import' => 'Grupi andmete üles laadimine',
 'title.options' => 'Suvandid',
-'title.profile' => 'Profiili',
-// TODO: translate the following.
-// 'title.plugins' => 'Plugins',
-// 'title.cf_custom_fields' => 'Custom Fields',
-// 'title.cf_add_custom_field' => 'Adding Custom Field',
-// 'title.cf_edit_custom_field' => 'Editing Custom Field',
-// 'title.cf_delete_custom_field' => 'Deleting Custom Field',
-// 'title.cf_dropdown_options' => 'Dropdown Options',
-// 'title.cf_add_dropdown_option' => 'Adding Option',
-// 'title.cf_edit_dropdown_option' => 'Editing Option',
-// 'title.cf_delete_dropdown_option' => 'Deleting Option',
-// NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
-// It is also a name for the Locking plugin on the group settings page.
-// 'title.locking' => 'Locking',
-// 'title.week_view' => 'Week View',
-// 'title.swap_roles' => 'Swapping Roles',
-// 'title.work_units' => 'Work Units',
+'title.profile' => 'Profiil',
+'title.plugins' => 'Lisad',
+'title.cf_custom_fields' => 'Eriväljad',
+'title.cf_add_custom_field' => 'Lisa eriväli',
+'title.cf_edit_custom_field' => 'Muuda erivälja',
+'title.cf_delete_custom_field' => 'Kustuta eriväli',
+'title.cf_dropdown_options' => 'Rippmenüü valikud',
+'title.cf_add_dropdown_option' => 'Lisa valik',
+'title.cf_edit_dropdown_option' => 'Muuda valikut',
+'title.cf_delete_dropdown_option' => 'Kustuta valik',
+'title.locking' => 'Lukustamine',
+'title.week_view' => 'Nädala vaade',
+'title.swap_roles' => 'Rollivahetus',
+'title.work_units' => 'Töö ühikud',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 090111b5e..c4390a2df 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.36.4710 | 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.4711 | 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>

From cb50b63fc48f417f17c88cd104c41942f02d2080 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Jan 2019 20:06:53 +0000
Subject: [PATCH 0639/1848] A bit more work in progress on the Estonian file.

---
 WEB-INF/resources/et.lang.php | 157 ++++++++++++++++------------------
 WEB-INF/templates/footer.tpl  |   2 +-
 2 files changed, 73 insertions(+), 86 deletions(-)

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b34ec1230..b68296826 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -340,88 +340,82 @@
 'dropdown.current_month' => 'käesolev kuu',
 'dropdown.previous_month' => 'eelmine kuu',
 'dropdown.selected_month' => 'kuu',
-// TODO: translate the following.
-// 'dropdown.current_year' => 'this year',
-// 'dropdown.previous_year' => 'previous year',
-// 'dropdown.selected_year' => 'year',
-'dropdown.all_time' => 'kõik ajad',
+'dropdown.current_year' => 'käesolev aasta',
+'dropdown.previous_year' => 'eelmine aasta',
+'dropdown.selected_year' => 'aasta',
+'dropdown.all_time' => 'kõik ajavahemikud',
 'dropdown.projects' => 'projektid',
-// TODO: translate the following.
-// 'dropdown.tasks' => 'tasks',
+'dropdown.tasks' => 'tööülesanded',
 'dropdown.clients' => 'kliendid',
-// TODO: translate the following.
-// 'dropdown.select' => '--- select ---',
-// 'dropdown.select_invoice' => '--- select invoice ---',
+'dropdown.select' => '--- vali ---',
+'dropdown.select_invoice' => '--- vali arve ---',
 'dropdown.status_active' => 'aktiivne',
-// TODO: translate the following.
-// 'dropdown.status_inactive' => 'inactive',
-// 'dropdown.delete' => 'delete',
-// 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.paid' => 'paid',
-// 'dropdown.not_paid' => 'not paid',
+'dropdown.status_inactive' => 'mitte aktiivne',
+'dropdown.delete' => 'kustuta',
+'dropdown.do_not_delete' => 'ära kustuta',
+'dropdown.paid' => 'makstud',
+'dropdown.not_paid' => 'mitte makstud',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Unustasid salasõna?',
-// TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga ajaarvestussüsteem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
-'form.reset_password.message' => 'Salasõna tühjendamise käsk edastatud.', // TODO: add "by email" to match the English string.
-// TODO: translate the following.
-// 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.message' => 'Salasõna tühistamise teade on saadetud e-postile.',
+'form.reset_password.email_subject' => 'Anuko Time Tracker, parooli tühistamise nõue',
+'form.reset_password.email_body' => "Lugupeetud Kasutaja,\n\nIP-lt %s on nõutud Teie salasõna lähtestamist. Palun avage allolev link, kui soovite oma parooli lähtestada.\n\n%s\n\nAnuko Time Tracker on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga ajaarvestussüsteem. Lisainfo saamiseks külastage https://www.anuko.com lehekülge.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
-// TODO: translate the following.
-// 'form.change_password.tip' => 'Type new password and click on Save.',
+'form.change_password.tip' => 'Kirjuta siia oma uus parool ja salvesta.',
 
 // Time form. See example at https://timetracker.anuko.com/time.php.
-// TODO: translate the following.
-// 'form.time.duration_format' => '(hh:mm or 0.0h)',
-'form.time.billable' => 'Arvestatav',
-// TODO: translate the following.
-// 'form.time.uncompleted' => 'Uncompleted',
-// 'form.time.remaining_quota' => 'Remaining quota',
-// 'form.time.over_quota' => 'Over quota',
-// 'form.time.remaining_balance' => 'Remaining balance',
-// 'form.time.over_balance' => 'Over balance',
+'form.time.duration_format' => '(hh:mm or 0.0h)',
+'form.time.billable' => 'Arveldatav',
+'form.time.uncompleted' => 'Lõpetamata',
+'form.time.remaining_quota' => 'Allesolev kvoot',
+'form.time.over_quota' => 'Üle kvoodi',
+// Note for translators. "Balance" below means accumulated quota for user since 1st of the month
+// until and including a selected day. If a quota is 8 hours a day, then the balance
+// is 8 hours multiplied by a number of work days. "Remaining balance" and "Over balance" are
+// balance differences with logged hours.
+// The term looks confusing, if you have a better idea how to name these things, let us know.
+'form.time.remaining_balance' => 'Järelejäänud kontoseis',  // TODO: check as per above comment.
+'form.time.over_balance' => 'Üle piirmäära', // // TODO: check as per above comment.
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Kanne salvestati ainult alguse ajaga. See ei ole viga.',
 
 // Week view form. See example at https://timetracker.anuko.com/week.php.
-// TODO: translate the following.
-// 'form.week.new_entry' => 'New entry',
+'form.week.new_entry' => 'Uus kirje',
 
 // Reports form. See example at https://timetracker.anuko.com/reports.php
 'form.reports.save_as_favorite' => 'Salvesta lemmikuna',
-// TODO: translate the following.
-// 'form.reports.confirm_delete' => 'Are you sure you want to delete this favorite report?',
-'form.reports.include_billable' => 'arvestatav',
-'form.reports.include_not_billable' => 'mittearvestatav',
-// TODO: translate the following.
-// 'form.reports.include_invoiced' => 'invoiced',
-// 'form.reports.include_not_invoiced' => 'not invoiced',
+'form.reports.confirm_delete' => 'Oled kindel, et soovid kustutada oma lemmik raportid?',
+'form.reports.include_billable' => 'arveldatav',
+'form.reports.include_not_billable' => 'mittearveldatav',
+
+// TODO: Check if translation of form.reports.include_invoiced and form.reports.include_not_invoiced is correct.
+// "Invoiced" means that an invoice was issued to client, but may not be necessarily "paid" (yet).
+// For paid status there is a plugin called "Paid status", that allows you to mark invoice items as "paid".
+// Our concern is that Google auto-translates "arveldamata" as unpaid. Therefore, we may need a fix here.
+// 'form.reports.include_invoiced' => 'arveldatud', // TODO: fix as per the above comment, if needed.
+// 'form.reports.include_not_invoiced' => 'arveldamata', // TODO: fix as per the above comment, if needed.
+
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
 'form.reports.show_fields' => 'Näita välju',
 'form.reports.group_by' => 'Grupeeri',
-'form.reports.group_by_no' => '--- ilma grupeerimata ---',
+'form.reports.group_by_no' => '--- grupeerimata ---',
 'form.reports.group_by_date' => 'kuupäev',
 'form.reports.group_by_user' => 'kasutaja',
-// TODO: translate the following.
-// 'form.reports.group_by_client' => 'client',
+'form.reports.group_by_client' => 'klient',
 'form.reports.group_by_project' => 'projekt',
-// TODO: translate the following.
-// 'form.reports.group_by_task' => 'task',
+'form.reports.group_by_task' => 'tööülesanne',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
-'form.report.export' => 'Eksportimine', // TODO: is this correct? We want a verb as in "Export XML" - see report export options.
-                                        // The current combined English string is "Export PDF, XML or CSV".
-                                        // Meaning: user can have a displayed report in these formats.
-// TODO: translate the following.
-// 'form.report.assign_to_invoice' => 'Assign to invoice',
+'form.report.export' => 'Eksport',
+'form.report.assign_to_invoice' => 'Lisa arvele',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
@@ -429,30 +423,26 @@
 'form.invoice.person' => 'Isik',
 
 // Deleting Invoice form. See example at https://timetracker.anuko.com/invoice_delete.php
-// 'form.invoice.invoice_to_delete' => 'Invoice to delete',
-// 'form.invoice.invoice_entries' => 'Invoice entries',
-// 'form.invoice.confirm_deleting_entries' => 'Please confirm deleting invoice entries from Time Tracker.',
+'form.invoice.invoice_to_delete' => 'Kustutatav arve',
+'form.invoice.invoice_entries' => 'Arve kirjed',
+'form.invoice.confirm_deleting_entries' => 'Palun kinnita oma Time Tracker\\\'i arve kirjete kustutamise soovi.',
 
 // Charts form. See example at https://timetracker.anuko.com/charts.php
-// TODO: translate the following.
-// 'form.charts.interval' => 'Interval',
-// 'form.charts.chart' => 'Chart',
+'form.charts.interval' => 'Ajavahemik',
+'form.charts.chart' => 'Diagramm',
 
 // Projects form. See example at https://timetracker.anuko.com/projects.php
-// TODO: translate the following.
-// 'form.projects.active_projects' => 'Active Projects',
-// 'form.projects.inactive_projects' => 'Inactive Projects',
+'form.projects.active_projects' => 'Aktiivsed projektid',
+'form.projects.inactive_projects' => 'Mitteaktiivsed projektid',
 
 // Tasks form. See example at https://timetracker.anuko.com/tasks.php
-// TODO: translate the following.
-// 'form.tasks.active_tasks' => 'Active Tasks',
-// 'form.tasks.inactive_tasks' => 'Inactive Tasks',
+'form.tasks.active_tasks' => 'Aktiivsed tööülesanded',
+'form.tasks.inactive_tasks' => 'Mitteaktiivsed tööülesanded',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-// TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
-// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
+'form.users.active_users' => 'Aktiivsed kasutajad',
+'form.users.inactive_users' => 'Mitteaktiivsed kasutajad',
+'form.users.uncompleted_entry' => 'Kasutajal on lõpetamata aja kanne',
 'form.users.role' => 'Roll',
 'form.users.manager' => 'Haldur',
 'form.users.comanager' => 'Kaashaldur',
@@ -460,34 +450,31 @@
 'form.users.default_rate' => 'Vaikimisi tunni hind',
 
 // Editing User form. See example at https://timetracker.anuko.com/user_edit.php
-// TODO: translate the following.
-// 'form.user_edit.swap_roles' => 'Swap roles',
+'form.user_edit.swap_roles' => 'Rollivahetus',
 
 // Roles form. See example at https://timetracker.anuko.com/roles.php
-// TODO: translate the following.
+// TODO: translate the following. Proposed 'Aktiivne roll' and 'Mitteaktiivne roll' seem problematic,
+// as they apper to refer to a singulr role (while we need multiple roles, similar to form.projects.active_projects).
 // 'form.roles.active_roles' => 'Active Roles',
 // 'form.roles.inactive_roles' => 'Inactive Roles',
-// 'form.roles.rank' => 'Rank',
-// 'form.roles.rights' => 'Rights',
-// 'form.roles.assigned' => 'Assigned',
-// 'form.roles.not_assigned' => 'Not assigned',
+'form.roles.rank' => 'Seisus',
+'form.roles.rights' => 'Õigused',
+'form.roles.assigned' => 'Määratud',
+'form.roles.not_assigned' => 'Määramata',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
-// TODO: translate the following.
-// 'form.clients.active_clients' => 'Active Clients',
-// 'form.clients.inactive_clients' => 'Inactive Clients',
+'form.clients.active_clients' => 'Aktiivsed kliendid',
+'form.clients.inactive_clients' => 'Mitteaktiivsed kliendid',
 
 // Deleting Client form. See example at https://timetracker.anuko.com/client_delete.php
-// TODO: translate the following.
-// 'form.client.client_to_delete' => 'Client to delete',
-// 'form.client.client_entries' => 'Client entries',
+'form.client.client_to_delete' => 'Kustutatav klient',
+'form.client.client_entries' => 'Kliendi kirjed',
 
 // Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
-// TODO: replace "team" with "group" in the string below.
-'form.export.hint' => 'Võid kogu meeskonna andmed eksportida xml-faili. Sellest võib olla kasu kui vahetad serverit.',
+// TODO: replace "meeskonna" with "grupp" in the string below.
+'form.export.hint' => 'Võid kogu meeskonna andmed eksportida XML faili. Sellest võib olla kasu, kui vahetad serverit.',
 'form.export.compression' => 'Pakkimine',
-// TODO: translate the following.
-// 'form.export.compression_none' => 'none',
+'form.export.compression_none' => 'puudub',
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c4390a2df..091683449 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.36.4711 | 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.4712 | 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>

From 52d3501fd52f4d655efb72ee843828feaaba60fa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Jan 2019 21:34:33 +0000
Subject: [PATCH 0640/1848] Initial work done intergating Estonian language
 imporvement as per PR#71.

---
 WEB-INF/resources/et.lang.php | 115 ++++++++++++++++------------------
 WEB-INF/templates/footer.tpl  |   2 +-
 2 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b68296826..74be760ee 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -478,85 +478,78 @@
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
-'form.import.hint' => 'Impordi meeskonna andmed xml-failist.', // TODO: replace "team" with "group".
+'form.import.hint' => 'Impordi grupi andmed XML failist.',
 'form.import.file' => 'Vali fail',
-'form.import.success' => 'Andmed imporditud.',
+'form.import.success' => 'Andmete importimine õnnestus.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-// TODO: translate the following.
-// 'form.groups.hint' => 'Create a new group by creating a new group manager account.<br>You can also import group data from an xml file from another Anuko Time Tracker server (no login collisions are allowed).',
+'form.groups.hint' => 'Uue grupi lisamiseks loo esmalt grupi haldur.<br>Lisaks on võimalik importida grupi andmed XML failist (kasutaja tunnused ei tohi korduda).',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
-// TODO: translate the following.
-// 'form.group_edit.12_hours' => '12 hours',
-// 'form.group_edit.24_hours' => '24 hours',
-// 'form.group_edit.show_holidays' => 'Show holidays',
-// 'form.group_edit.tracking_mode' => 'Tracking mode',
-// 'form.group_edit.mode_time' => 'time',
-// 'form.group_edit.mode_projects' => 'projects',
-// 'form.group_edit.mode_projects_and_tasks' => 'projects and tasks',
-// 'form.group_edit.record_type' => 'Record type',
-// 'form.group_edit.type_all' => 'all',
-// 'form.group_edit.type_start_finish' => 'start and finish',
-// 'form.group_edit.type_duration' => 'duration',
-// 'form.group_edit.punch_mode' => 'Punch mode',
-// 'form.group_edit.allow_overlap' => 'Allow overlap',
-// 'form.group_edit.future_entries' => 'Future entries',
-// 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
-// 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.12_hours' => '12 tundi',
+'form.group_edit.24_hours' => '24 tundi',
+'form.group_edit.show_holidays' => 'Näita pühi',
+'form.group_edit.tracking_mode' => 'Jälgimise režiim',
+'form.group_edit.mode_time' => 'ajaarvestus',
+'form.group_edit.mode_projects' => 'projektid',
+'form.group_edit.mode_projects_and_tasks' => 'projektid ja tööülesanded',
+'form.group_edit.record_type' => 'Kirje tüüp',
+'form.group_edit.type_all' => 'kõik',
+'form.group_edit.type_start_finish' => 'algus ja lõpp',
+'form.group_edit.type_duration' => 'vahemik',
+'form.group_edit.punch_mode' => 'Kellast-kellani režiim',
+'form.group_edit.allow_overlap' => 'Luba ajaline ülekate',
+'form.group_edit.future_entries' => 'Tuleviku kirjed',
+'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',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
-// TODO: translate the following.
-// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+'form.group_delete.hint' => 'Oled kindel, et soovid kogu gruppi kustutada?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Kellelt',
 'form.mail.to' => 'Kellele',
-// TODO: translate the following.
-// 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
-// 'form.mail.report_sent' => 'Report sent.',
-'form.mail.invoice_sent' => 'Arve saadetud.',
+'form.mail.report_subject' => 'Time Tracker raport',
+'form.mail.footer' => 'Anuko Time Tracker on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga <br>ajaarvestussüsteem. Lisainfo saamiseks külastage <a href="https://www.anuko.com">www.anuko.com</a> lehekülge.',
+'form.mail.report_sent' => 'Raport on saadetud.',
+'form.mail.invoice_sent' => 'Arve on saadetud.',
 
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
-// TODO: translate the following.
-// 'form.quota.year' => 'Year',
-// 'form.quota.month' => 'Month',
-// 'form.quota.workday_hours' => 'Hours in work day',
-// 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
+'form.quota.year' => 'Aasta',
+'form.quota.month' => 'Kuu',
+'form.quota.workday_hours' => 'Töötunde päevas',
+'form.quota.hint' => 'Tühjade väljade korral arvutatakse töötamise kvoodid tööpäevade ja pühade põhjal.',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
-// TODO: translate the following.
-// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
-// 'form.swap.swap_with' => 'Swap roles with',
+'form.swap.hint' => 'Rolli muutmiseks muuda oma kasutajat. Rollivahetust ei saa tagasi võtta.',
+'form.swap.swap_with' => 'Vaheta kasutajaga roll',
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
-// TODO: translate the following.
-// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
-// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+'form.work_units.minutes_in_unit' => 'Minuteid ühikus',
+'form.work_units.1st_unit_threshold' => 'Esimese ühiku piirmäär',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
-// TODO: translate the following.
-// 'role.user.label' => 'User',
-// 'role.user.low_case_label' => 'user',
+'role.user.label' => 'Tavakasutaja',
+'role.user.low_case_label' => 'tavakasutaja',
+// TODO: Translate role.user.description. "Haldusõigustega tavakasutaja." auto-translates with an opposite meaning.
 // 'role.user.description' => 'A regular member without management rights.',
-// 'role.client.label' => 'Client',
-// 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
-// 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.low_case_label' => 'supervisor',
-// 'role.supervisor.description' => 'A person with a small set of management rights.',
-// 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.low_case_label' => 'co-manager',
-// 'role.comanager.description' => 'A person with a big set of management functions.',
-// 'role.manager.label' => 'Manager',
-// 'role.manager.low_case_label' => 'manager',
-// 'role.manager.description' => 'Group manager. Can do most of things for a group.',
-// 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.low_case_label' => 'top manager',
-// 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
-// 'role.admin.label' => 'Administrator',
-// 'role.admin.low_case_label' => 'administrator',
-// 'role.admin.description' => 'Site adminsitrator.',
+'role.client.label' => 'Klient',
+'role.client.low_case_label' => 'klient',
+'role.client.description' => 'Kliendil on lubatud vaadata oma raporteid, diagramme ja arveid.',
+'role.supervisor.label' => 'Ülevaataja',
+'role.supervisor.low_case_label' => 'ülevaataja',
+'role.supervisor.description' => 'Mõningate lisaõigustega kasutaja.',
+'role.comanager.label' => 'Kaashaldur',
+'role.comanager.low_case_label' => 'kaashaldur',
+'role.comanager.description' => 'Mitmete halduri õigustega kasutja.',
+'role.manager.label' => 'Haldur',
+'role.manager.low_case_label' => 'haldur',
+'role.manager.description' => 'Grupihaldur, kellel on lubatud enamik grupiga soetud tegevusi.',
+'role.top_manager.label' => 'Juht',
+'role.top_manager.low_case_label' => 'juht',
+'role.top_manager.description' => 'Ettevõtte juht, kellel on lubatud hallata mitut gruppi.',
+'role.admin.label' => 'Administraator',
+'role.admin.low_case_label' => 'administraator',
+'role.admin.description' => 'Rakenduse administraator.',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 091683449..56a207c68 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.36.4712 | 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.4713 | 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>

From 5c2ac5c8736e763fd878d619e6283b57b2d2aab0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Jan 2019 21:51:29 +0000
Subject: [PATCH 0641/1848] A small impovement to the Estonian translation.

---
 WEB-INF/resources/et.lang.php | 4 ++--
 WEB-INF/templates/footer.tpl  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 74be760ee..0d07da392 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -154,7 +154,7 @@
 'label.address' => 'Aadress',
 'label.currency' => 'Valuuta',
 'label.manager_name' => 'Halduri nimi',
-'label.manager_login' => 'Halduri sisenemine',
+'label.manager_login' => 'Halduri kasutajanimi',
 'label.person_name' => 'Nimi',
 'label.thing_name' => 'Nimi',
 'label.login' => 'Kasutajanimi',
@@ -483,7 +483,7 @@
 'form.import.success' => 'Andmete importimine õnnestus.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-'form.groups.hint' => 'Uue grupi lisamiseks loo esmalt grupi haldur.<br>Lisaks on võimalik importida grupi andmed XML failist (kasutaja tunnused ei tohi korduda).',
+'form.groups.hint' => 'Uue grupi lisamiseks loo esmalt grupi haldur.<br>Lisaks on võimalik importida grupi andmed XML failist (kasutajatunnused ei tohi korduda).',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 tundi',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 56a207c68..f6ad5a368 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.36.4713 | 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.4714 | 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>

From 2303cf628260b28f67190b164ba2894c328f4a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anti=20R=C3=A4is?= <antirais@gmail.com>
Date: Fri, 25 Jan 2019 00:05:34 +0200
Subject: [PATCH 0642/1848] fix invalid label target element in plugin page
 (#72)

---
 WEB-INF/templates/plugins.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/templates/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 11514d16a..c064d18bb 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -132,7 +132,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
-            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td colspan="2">&nbsp;</td>

From 7d33cc17bc343f43f81756a1008d6658a9ebb714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anti=20R=C3=A4is?= <antirais@gmail.com>
Date: Sun, 27 Jan 2019 14:57:25 +0200
Subject: [PATCH 0643/1848] Create CONTRIBUTING.md (#73)

---
 CONTRIBUTING.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..66920189e
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+# Short Links to Important Resources
+
+* [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project can be found here
+* [bugs](https://github.com/anuko/timetracker/issues) - report bugs and issues here
+* [forum](https://www.anuko.com/forum/viewforum.php?f=4) - for general discussion
+
+# Reporting Bugs
+
+Create a [new issue](https://github.com/anuko/timetracker/issues). 
+
+# Reporting Security Issues
+
+**#TODO**
+
+# Setting up a dev environment
+
+Use docker to run dev instance:
+```bash
+docker-compose up
+```
+
+and then navigate to: http://localhost:8080. Default credentials for initial login are: 
+```
+usr: admin
+psw: secret
+```
+
+Full installation and setup guide can be found [here](https://www.anuko.com/time_tracker/install_guide/index.htm).

From 57c9a22d01acebf278f818d1882f3b0dbad84845 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Jan 2019 18:33:53 +0000
Subject: [PATCH 0644/1848] Updated CONTRIBUTING.md.

---
 CONTRIBUTING.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66920189e..64e6259a9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,28 +1,34 @@
-# Short Links to Important Resources
+# Resources
+
+* [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project can be found here (needs updating).
+* [forum](https://www.anuko.com/forum/viewforum.php?f=4) - for general discussion.
 
-* [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project can be found here
-* [bugs](https://github.com/anuko/timetracker/issues) - report bugs and issues here
-* [forum](https://www.anuko.com/forum/viewforum.php?f=4) - for general discussion
 
 # Reporting Bugs
 
-Create a [new issue](https://github.com/anuko/timetracker/issues). 
+* GitHub users: create a [new issue](https://github.com/anuko/timetracker/issues).
+* Forum users: use [forum](https://www.anuko.com/forum/viewforum.php?f=4).
+* Or, [send a message](https://www.anuko.com/contact.htm).
+
 
 # Reporting Security Issues
 
-**#TODO**
+* Use the [contact form](https://www.anuko.com/contact.htm) to report a vulnerability.
+* Or send encrypted email to security_at_anuko_dot_com. Public key to be published soon.
+
+
+# Setting up a Dev Environment
 
-# Setting up a dev environment
+Docker users: install both docker and docker-compose, then run a dev instance:
 
-Use docker to run dev instance:
 ```bash
 docker-compose up
 ```
 
-and then navigate to: http://localhost:8080. Default credentials for initial login are: 
+To use Time Tracker, navigate to: http://localhost:8080. Default credentials for initial login are:
 ```
 usr: admin
 psw: secret
 ```
 
-Full installation and setup guide can be found [here](https://www.anuko.com/time_tracker/install_guide/index.htm).
+Without docker, perform a manual install of a web server, php, database server, and Time Tracker. Full installation and setup guide can be found [here](https://www.anuko.com/time_tracker/install_guide/index.htm).

From 33fa22f70db177ed8193cebecbdc5fc7e408c8bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Jan 2019 18:44:33 +0000
Subject: [PATCH 0645/1848] Cosmetic text improvements.

---
 CONTRIBUTING.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 64e6259a9..3cd91185c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,31 +1,29 @@
 # Resources
 
 * [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project can be found here (needs updating).
-* [forum](https://www.anuko.com/forum/viewforum.php?f=4) - for general discussion.
+* [forum](https://www.anuko.com/forum/viewforum.php?f=4) - general discussion.
 
 
 # Reporting Bugs
 
-* GitHub users: create a [new issue](https://github.com/anuko/timetracker/issues).
-* Forum users: use [forum](https://www.anuko.com/forum/viewforum.php?f=4).
-* Or, [send a message](https://www.anuko.com/contact.htm).
+* GitHub users: create a [new issue](https://github.com/anuko/timetracker/issues) here.
+* Forum users: post a new topic [here](https://www.anuko.com/forum/viewforum.php?f=4).
+* Or, send us a [message](https://www.anuko.com/contact.htm).
 
 
 # Reporting Security Issues
 
 * Use the [contact form](https://www.anuko.com/contact.htm) to report a vulnerability.
-* Or send encrypted email to security_at_anuko_dot_com. Public key to be published soon.
+* Or send an encrypted email to security_at_anuko_dot_com. Public key to be published soon.
 
 
 # Setting up a Dev Environment
 
 Docker users: install both docker and docker-compose, then run a dev instance:
-
 ```bash
 docker-compose up
 ```
-
-To use Time Tracker, navigate to: http://localhost:8080. Default credentials for initial login are:
+Navigate to: http://localhost:8080 to use Time Tracker. Default credentials for initial login are:
 ```
 usr: admin
 psw: secret

From 781ff98c576d8738d162d0d59ef3c3bc197b09bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Jan 2019 18:54:06 +0000
Subject: [PATCH 0646/1848] Cosmetic.

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3cd91185c..5354bd044 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,13 @@
 # Resources
 
-* [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project can be found here (needs updating).
+* [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project (needs updating).
 * [forum](https://www.anuko.com/forum/viewforum.php?f=4) - general discussion.
 
 
 # Reporting Bugs
 
 * GitHub users: create a [new issue](https://github.com/anuko/timetracker/issues) here.
-* Forum users: post a new topic [here](https://www.anuko.com/forum/viewforum.php?f=4).
+* Forum users: post a [new topic](https://www.anuko.com/forum/viewforum.php?f=4 here.
 * Or, send us a [message](https://www.anuko.com/contact.htm).
 
 

From a115da22ff8284a961e5853333f65f5768db1de1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Jan 2019 18:55:30 +0000
Subject: [PATCH 0647/1848] Fixed broken link.

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5354bd044..b7311238a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@
 # Reporting Bugs
 
 * GitHub users: create a [new issue](https://github.com/anuko/timetracker/issues) here.
-* Forum users: post a [new topic](https://www.anuko.com/forum/viewforum.php?f=4 here.
+* Forum users: post a [new topic](https://www.anuko.com/forum/viewforum.php?f=4) here.
 * Or, send us a [message](https://www.anuko.com/contact.htm).
 
 

From 7c9f391d66e4e984a1d23632811ca885d7266676 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Feb 2019 18:20:28 +0000
Subject: [PATCH 0648/1848] Added a check for a writable PHP session path.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f6ad5a368..693dc292c 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.36.4714 | 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.4715 | 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/dbinstall.php b/dbinstall.php
index a3cdd9cc5..d39871f88 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -92,6 +92,11 @@ function ttExecute($sql) {
     echo('<font color="red">Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'.</font><br>');
   }
 
+  // Check is PHP session path is writeable.
+  if (!is_writable(session_save_path())) {
+    echo('<font color="red">Error: PHP session path '.session_save_path().' is not writable.</font><br>');
+  }
+
   // Depending on DSN, require either mysqli or mysql extensions.
   if (strrpos(DSN, 'mysqli://', -strlen(DSN)) !== FALSE) {
     if (extension_loaded('mysqli')) {

From 2a76f4497cf158ca7e81b6b3ae1998ea28e45044 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Feb 2019 18:22:27 +0000
Subject: [PATCH 0649/1848] Fixed a typo.

---
 dbinstall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbinstall.php b/dbinstall.php
index d39871f88..e32df0ed0 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -92,7 +92,7 @@ function ttExecute($sql) {
     echo('<font color="red">Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'.</font><br>');
   }
 
-  // Check is PHP session path is writeable.
+  // Check if PHP session path is writeable.
   if (!is_writable(session_save_path())) {
     echo('<font color="red">Error: PHP session path '.session_save_path().' is not writable.</font><br>');
   }

From 45d4d5858d47fd71a65bf642c0eddd31ddf9a83f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 13 Feb 2019 17:29:19 +0000
Subject: [PATCH 0650/1848] Work started on timesheet approval workflow.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 13 +++++++++----
 mysql.sql                    | 31 ++++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 693dc292c..d1dfd5c23 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.36.4715 | 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.37.4716 | 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/dbinstall.php b/dbinstall.php
index e32df0ed0..64e4cac04 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -967,7 +967,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11836"]) {
+  if ($_POST["convert11797to11837"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1056,6 +1056,11 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.36', modified = now() where param_name = 'version_db' and param_value = '1.18.34'");
     ttExecute("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.36') set u.quota_percent = 100.00 where u.quota_percent is null");
     ttExecute("ALTER TABLE `tt_users` modify `quota_percent` float(6,2) NOT NULL default '100.00'");
+    ttExecute("CREATE TABLE `tt_timesheets` (`id` int(11) NOT NULL auto_increment, `user_id` int(11) NOT NULL, `group_id` int(11) default NULL, `org_id` int(11) default NULL, `client_id` int(11) default NULL, `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, `submit_status` tinyint(4) default NULL, `submitter_comment` text, `approval_status` tinyint(4) default NULL, `manager_comment` text, `created` datetime default NULL, `created_ip` varchar(45) default NULL, `created_by` int(11) default NULL, `modified` datetime default NULL, `modified_ip` varchar(45) default NULL, `modified_by` int(11) default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
+    ttExecute("ALTER TABLE `tt_log` ADD `timesheet_id` int(11) default NULL AFTER `task_id`");
+    ttExecute("create index timesheet_idx on tt_log(timesheet_id)");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `timesheet_id` int(11) default NULL AFTER `project_id`");
+    ttExecute("create index timesheet_idx on tt_expense_items(timesheet_id)");
   }
 
   if ($_POST["cleanup"]) {
@@ -1103,7 +1108,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.36)</b>
+    <td width="80%"><b>Create database structure (v1.18.37)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1148,8 +1153,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.36)</td>
-    <td><input type="submit" name="convert11797to11836" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.37)</td>
+    <td><input type="submit" name="convert11797to11837" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 5dd41e061..113f5dfb1 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -197,6 +197,7 @@ CREATE TABLE `tt_log` (
   `client_id` int(11) default NULL,                # client id
   `project_id` int(11) default NULL,               # project id
   `task_id` int(11) default NULL,                  # task id
+  `timesheet_id` int(11) default NULL,             # timesheet id
   `invoice_id` int(11) default NULL,               # invoice id
   `comment` text,                                  # user provided comment for time record
   `billable` tinyint(4) default 0,                 # whether the record is billable or not
@@ -219,6 +220,7 @@ create index client_idx on tt_log(client_id);
 create index invoice_idx on tt_log(invoice_id);
 create index project_idx on tt_log(project_id);
 create index task_idx on tt_log(task_id);
+create index timesheet_idx on tt_log(timesheet_id);
 
 
 #
@@ -425,6 +427,7 @@ CREATE TABLE `tt_expense_items` (
   `org_id` int(11) default NULL,          # organization id
   `client_id` int(11) default NULL,       # client id
   `project_id` int(11) default NULL,      # project id
+  `timesheet_id` int(11) default NULL,    # timesheet id
   `name` text NOT NULL,                   # expense item name (what is an expense for)
   `cost` decimal(10,2) default '0.00',    # item cost (including taxes, etc.)
   `invoice_id` int(11) default NULL,      # invoice id
@@ -445,6 +448,7 @@ create index user_idx on tt_expense_items(user_id);
 create index group_idx on tt_expense_items(group_id);
 create index client_idx on tt_expense_items(client_id);
 create index project_idx on tt_expense_items(project_id);
+create index timesheet_idx on tt_expense_items(timesheet_id);
 create index invoice_idx on tt_expense_items(invoice_id);
 
 
@@ -476,6 +480,31 @@ CREATE TABLE `tt_monthly_quotas` (
 );
 
 
+#
+# Structure for table tt_timesheets. This table keeps timesheet related information.
+#
+CREATE TABLE `tt_timesheets` (
+  `id` int(11) NOT NULL auto_increment,            # timesheet id
+  `user_id` int(11) NOT NULL,                      # user id
+  `group_id` int(11) default NULL,                 # group id
+  `org_id` int(11) default NULL,                   # organization id
+  `client_id` int(11) default NULL,                # client id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # timesheet name
+  `submit_status` tinyint(4) default NULL,         # submit status
+  `submitter_comment` text,                        # submitter comment
+  `approval_status` tinyint(4) default NULL,       # approval status
+  `manager_comment` text,                          # manager comment
+  `created` datetime default NULL,                 # creation timestamp
+  `created_ip` varchar(45) default NULL,           # creator ip
+  `created_by` int(11) default NULL,               # creator user_id
+  `modified` datetime default NULL,                # modification timestamp
+  `modified_ip` varchar(45) default NULL,          # modifier ip
+  `modified_by` int(11) default NULL,              # modifier user_id
+  `status` tinyint(4) default 1,                   # timesheet status
+  PRIMARY KEY (`id`)
+);
+
+
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
@@ -489,4 +518,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.36', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.37', now()); # TODO: change when structure changes.

From 2995ff2439adb92ded267c1fb15c24f6001db648 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 13 Feb 2019 17:39:49 +0000
Subject: [PATCH 0651/1848] Fixed db version update.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d1dfd5c23..090e872b4 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.37.4716 | 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.37.4717 | 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/dbinstall.php b/dbinstall.php
index 64e4cac04..d1b67d89d 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1061,6 +1061,7 @@ function ttExecute($sql) {
     ttExecute("create index timesheet_idx on tt_log(timesheet_id)");
     ttExecute("ALTER TABLE `tt_expense_items` ADD `timesheet_id` int(11) default NULL AFTER `project_id`");
     ttExecute("create index timesheet_idx on tt_expense_items(timesheet_id)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.37', modified = now() where param_name = 'version_db' and param_value = '1.18.36'");
   }
 
   if ($_POST["cleanup"]) {

From 16e71d9c6e94475534579b79a53f7c2ee0de4192 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 13 Feb 2019 22:59:26 +0000
Subject: [PATCH 0652/1848] Removed unreliable PHP session path check, added
 cookies check instead.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 090e872b4..d99e7789b 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.37.4717 | 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.37.4718 | 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/dbinstall.php b/dbinstall.php
index d1b67d89d..a8c0d0b23 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -50,6 +50,16 @@ function ttExecute($sql) {
 if ($request->isGet()) {
   echo('<h2>Environment Checks</h2>');
 
+  // Determine if cookies are enabled in browser.
+  // session_start(); // already called in initialize.php.
+  $session_id1 = session_id();
+  session_destroy();
+  session_start();
+  $session_id2 = session_id();
+  if ($session_id1 != $session_id2) {
+    echo('<font color="red">Error: browser cookies are off.</font><br>');
+  }
+
   // Check if WEB-INF/templates_c dir is writable.
   if (is_writable(APP_DIR.'/WEB-INF/templates_c/')) {
     echo('WEB-INF/templates_c/ directory is writable.<br>');
@@ -92,11 +102,6 @@ function ttExecute($sql) {
     echo('<font color="red">Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'.</font><br>');
   }
 
-  // Check if PHP session path is writeable.
-  if (!is_writable(session_save_path())) {
-    echo('<font color="red">Error: PHP session path '.session_save_path().' is not writable.</font><br>');
-  }
-
   // Depending on DSN, require either mysqli or mysql extensions.
   if (strrpos(DSN, 'mysqli://', -strlen(DSN)) !== FALSE) {
     if (extension_loaded('mysqli')) {

From 51bfb0ed88ef0656437b306486bfc56d4f88fa2b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 14 Feb 2019 14:37:56 +0000
Subject: [PATCH 0653/1848] Resuming work on timesheets.

---
 WEB-INF/lib/ttOrgHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl      | 2 +-
 dbinstall.php                     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index f77d1eb6e..beb523378 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -101,6 +101,7 @@ static function deleteOrg($org_id) {
       'tt_custom_field_options',
       'tt_custom_fields',
       'tt_log',
+      'tt_timesheets', // TODO: check if order is correct. After doing export.
       'tt_invoices',
       'tt_user_project_binds',
       'tt_users',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d99e7789b..de0c021a0 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.37.4718 | 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.37.4719 | 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/dbinstall.php b/dbinstall.php
index a8c0d0b23..407a290f6 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1085,6 +1085,7 @@ function ttExecute($sql) {
     ttExecute("OPTIMIZE TABLE tt_clients");
     ttExecute("OPTIMIZE TABLE tt_config");
     ttExecute("OPTIMIZE TABLE tt_cron");
+    ttExecute("OPTIMIZE TABLE tt_timesheets");
     ttExecute("OPTIMIZE TABLE tt_custom_field_log");
     ttExecute("OPTIMIZE TABLE tt_custom_field_options");
     ttExecute("OPTIMIZE TABLE tt_custom_fields");

From bbf886e62dc4746fdbae813cfb80536228f77626 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 14 Feb 2019 15:07:12 +0000
Subject: [PATCH 0654/1848] Added Timeheets plugin checkbox.

---
 WEB-INF/resources/en.lang.php | 1 +
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 6 ++++++
 plugins.php                   | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 101a5b71e..ef63eb635 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -52,6 +52,7 @@
 'menu.time' => 'Time',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
+'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Charts',
 'menu.projects' => 'Projects',
 'menu.tasks' => 'Tasks',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index de0c021a0..8ed3563b0 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.37.4719 | 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.37.4720 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index c064d18bb..9ab38ab91 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -134,6 +134,12 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
             <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
+{if isTrue('TIMESHEET_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
+            <td><label for="charts">{$i18n.menu.timesheets}</label></td>
+          </tr>
+{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/plugins.php b/plugins.php
index 5027420e0..64615aa25 100644
--- a/plugins.php
+++ b/plugins.php
@@ -51,6 +51,7 @@
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
   $cl_work_units = $request->getParameter('work_units');
+  $cl_timesheets = $request->getParameter('timesheets');
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
@@ -68,6 +69,7 @@
   $cl_quotas = in_array('mq', $plugins);
   $cl_week_view = in_array('wv', $plugins);
   $cl_work_units = in_array('wu', $plugins);
+  $cl_timesheets = in_array('ts', $plugins);
 }
 
 $form = new Form('pluginsForm');
@@ -86,6 +88,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -120,6 +123,8 @@
     $plugins .= ',wv';
   if ($cl_work_units)
     $plugins .= ',wu';
+  if ($cl_timesheets)
+    $plugins .= ',ts';
 
   // Recycle week view plugin options as they are not configured on this page.
   $existing_plugins = explode(',', $user->getPlugins());

From 45091225a5cbc958f96c38e99228eee98f0b7ca8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 14 Feb 2019 15:19:25 +0000
Subject: [PATCH 0655/1848] Added menu.timesheets to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 3 ++-
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 3 ++-
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 7b5a5d62f..ba4f4c881 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -56,6 +56,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Informes',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'Projectes',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8c875b92b..22788ed76 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -57,6 +57,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Sestavy',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'Projekty',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7b9faf3b7..bd65501d4 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Tid',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Diagrammer',
 'menu.projects' => 'Projekter',
 'menu.tasks' => 'Opgaver',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 2c21205d7..7ca42cb58 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -51,6 +51,8 @@
 'menu.time' => 'Zeiten',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Diagramme',
 'menu.projects' => 'Projekte',
 'menu.tasks' => 'Aufgaben',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0f8bc123c..0af7a3cc0 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -55,6 +55,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reportes',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'Proyectos',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0d07da392..cfd075af6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Ajaarvestus',
 'menu.expenses' => 'Kulud',
 'menu.reports' => 'Raportid',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Diagrammid',
 'menu.projects' => 'Projektid',
 'menu.tasks' => 'Tööülesanded',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index dfb010500..a515e0494 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -54,6 +54,8 @@
 'menu.time' => 'زمان',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'نمودارها',
 'menu.projects' => 'پروژه ها',
 'menu.tasks' => 'وظايف',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1bd098221..03810cb8c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Tunnit',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Kaaviot',
 'menu.projects' => 'Projektit',
 'menu.tasks' => 'Tehtävät',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 430c5b1c6..25d2c8235 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Temps',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Graphiques',
 'menu.projects' => 'Projets',
 'menu.tasks' => 'Tâches',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 88dad80f7..c35ca9717 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -51,6 +51,8 @@
 'menu.time' => 'Χρόνος',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Διαγράμματα',
 'menu.projects' => 'Έργα',
 'menu.tasks' => 'Εργασίες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 1420500bb..45f25bf91 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -55,6 +55,8 @@
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'דוחות',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'תרשימים',
 'menu.projects' => 'פרוייקטים',
 'menu.tasks' => 'משימות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 6d4698e68..d54483496 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -56,6 +56,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Riportok',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'Projektek',
 // 'menu.tasks' => 'Tasks',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index c14d770e5..abb63ffaa 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Grafici',
 'menu.projects' => 'Progetti',
 'menu.tasks' => 'Compiti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index d7e2dcf9a..4e46adacb 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -56,6 +56,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'レポート',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'プロジェクト',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1866dd54b..fbeae2836 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -56,6 +56,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '보고서',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => '프로젝트',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ed304b5ab..643dc2c1a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -51,6 +51,8 @@
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Grafieken',
 'menu.projects' => 'Projecten',
 'menu.tasks' => 'Taken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8a698d1de..885da7006 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -56,6 +56,8 @@
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapporter',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Diagrammer',
 'menu.projects' => 'Prosjekter',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2922a3421..6366b3120 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Czas',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Statystyki', // TODO: is this correct translation for Charts?
 'menu.projects' => 'Projekty',
 'menu.tasks' => 'Zadania',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 8691f9383..b9b83b6cf 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Gastos',
 'menu.reports' => 'Relatórios',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Gráficos',
 'menu.projects' => 'Projetos',
 'menu.tasks' => 'Tarefas',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index bc5d8386b..cf61597b6 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -58,7 +58,8 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Relatórios',
 // TODO: translate the following.
-'menu.charts' => 'Charts',
+// 'menu.timesheets' => 'Timesheets',
+// 'menu.charts' => 'Charts',
 'menu.projects' => 'Projetos',
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 6eb221121..83c50b719 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -58,6 +58,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapoarte',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'Proiecte',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4b524b82d..75c6c08ec 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -51,6 +51,7 @@
 'menu.time' => 'Время',
 'menu.expenses' => 'Расходы',
 'menu.reports' => 'Отчёты',
+'menu.timesheets' => 'Табели',
 'menu.charts' => 'Диаграммы',
 'menu.projects' => 'Проекты',
 'menu.tasks' => 'Задачи',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 726c78e80..9eef14259 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -54,6 +54,8 @@
 // TODO: translate the following.
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Zostavy',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Grafy',
 'menu.projects' => 'Projekty',
 'menu.tasks' => 'Úlohy',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 18ddd37f9..2c0274ae0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -57,7 +57,8 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Poročila',
 // TODO: translate the following.
-'menu.charts' => 'Charts',
+// 'menu.timesheets' => 'Timesheets',
+// 'menu.charts' => 'Charts',
 'menu.projects' => 'Projekti',
 // TODO: translate the following.
 // 'menu.tasks' => 'Tasks',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c20cc43fc..453020856 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => 'Vreme',
 'menu.expenses' => 'Troškovi',
 'menu.reports' => 'Izveštaji',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Grafikoni',
 'menu.projects' => 'Projekti',
 'menu.tasks' => 'Zadaci',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d1a106483..c3af8af77 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -51,6 +51,8 @@
 'menu.time' => 'Tider',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Diagram',
 'menu.projects' => 'Projekt',
 'menu.tasks' => 'Arbetsuppgifter',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 38b4a4b29..af40dd4bb 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -58,6 +58,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Raporlar',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => 'Projeler',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index fd4e2b88c..844b4aac7 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -53,6 +53,8 @@
 'menu.time' => '时间记录',
 'menu.expenses' => '费用',
 'menu.reports' => '报告',
+// TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 'menu.charts' => '图表',
 'menu.projects' => '项目',
 'menu.tasks' => '任务',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 4112fa159..ac838daaa 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -54,6 +54,7 @@
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '報告',
 // TODO: translate the following.
+// 'menu.timesheets' => 'Timesheets',
 // 'menu.charts' => 'Charts',
 'menu.projects' => '項目',
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8ed3563b0..c38efe91b 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.37.4720 | 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.37.4721 | 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>

From 74992a9fa9cdac627ba3c672b5799812ac974268 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 14 Feb 2019 15:46:13 +0000
Subject: [PATCH 0656/1848] Added 2 more strings in translation files for
 timesheets.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 3 +++
 WEB-INF/resources/de.lang.php    | 3 +++
 WEB-INF/resources/en.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 3 +++
 WEB-INF/resources/fa.lang.php    | 3 +++
 WEB-INF/resources/fi.lang.php    | 3 +++
 WEB-INF/resources/fr.lang.php    | 3 +++
 WEB-INF/resources/gr.lang.php    | 3 +++
 WEB-INF/resources/he.lang.php    | 3 +++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 3 +++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 3 +++
 WEB-INF/resources/pl.lang.php    | 3 +++
 WEB-INF/resources/pt-br.lang.php | 3 +++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 3 +++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 3 +++
 WEB-INF/resources/sv.lang.php    | 3 +++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/plugins.tpl    | 2 +-
 32 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ba4f4c881..2ae15aa5b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -297,6 +297,8 @@
 'title.report' => 'Informe',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Factura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 22788ed76..8a698dbe6 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -307,6 +307,8 @@
 // TODO: translate the following.
 // 'title.report' => 'Report',
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Faktura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index bd65501d4..37a33e909 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -275,6 +275,9 @@
 'title.reports' => 'Rapporter',
 'title.report' => 'Rapport',
 'title.send_report' => 'Sender Rapport',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Faktura',
 'title.send_invoice' => 'Sender Faktura',
 'title.charts' => 'Diagrammer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 7ca42cb58..fd73ad7e3 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -259,6 +259,9 @@
 'title.reports' => 'Berichte',
 'title.report' => 'Bericht',
 'title.send_report' => 'Bericht senden',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Rechnung',
 'title.send_invoice' => 'Rechnung senden',
 'title.charts' => 'Diagramme',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ef63eb635..7b2ee3950 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -254,6 +254,8 @@
 'title.reports' => 'Reports',
 'title.report' => 'Report',
 'title.send_report' => 'Sending Report',
+'title.timesheets' => 'Timesheets',
+'title.timesheet' => 'Timesheet',  
 'title.invoice' => 'Invoice',
 'title.send_invoice' => 'Sending Invoice',
 'title.charts' => 'Charts',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0af7a3cc0..6f6c82fca 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -296,6 +296,8 @@
 // TODO: translate the following.
 // 'title.report' => 'Report',
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Factura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index cfd075af6..3aeaef4d4 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -279,6 +279,9 @@
 'title.reports' => 'Raportid',
 'title.report' => 'Raport',
 'title.send_report' => 'Saadan raportit',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Arve',
 'title.send_invoice' => 'Saada arve',
 'title.charts' => 'Diagrammid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a515e0494..ef0f326b8 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -282,6 +282,9 @@
 'title.reports' => 'گزارشات',
 'title.report' => 'گزارش',
 'title.send_report' => 'ارسال گزارش',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'فاکتور',
 'title.send_invoice' => 'ارسال فاکتور',
 'title.charts' => 'نمودارها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 03810cb8c..06e618959 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -276,6 +276,9 @@
 'title.reports' => 'Raportit',
 'title.report' => 'Raportti',
 'title.send_report' => 'Raportin lähetys',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Lasku',
 'title.send_invoice' => 'Laskun lähetys',
 'title.charts' => 'Kaaviot',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 25d2c8235..53dbd941a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -269,6 +269,9 @@
 'title.reports' => 'Rapports',
 'title.report' => 'Rapport',
 'title.send_report' => 'Envoi du rapport',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Facture',
 'title.send_invoice' => 'Envoi de la facture',
 'title.charts' => 'Graphiques',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c35ca9717..167bbda8f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -266,6 +266,9 @@
 'title.reports' => 'Αναφορές',
 'title.report' => 'Αναφορά',
 'title.send_report' => 'Αποστολή αναφοράς',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Τιμολόγιο',
 'title.send_invoice' => 'Αποστολή τιμολόγιου',
 'title.charts' => 'Γραφήματα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 45f25bf91..eb3402727 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -294,6 +294,9 @@
 'title.reports' => 'דוחות',
 'title.report' => 'דוח',
 'title.send_report' => 'שליחת דוח',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'חשבונית',
 'title.send_invoice' => 'שליחת חשבונית',
 'title.charts' => 'תרשימים',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d54483496..ff1e21113 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -296,6 +296,8 @@
 // TODO: translate the following.
 // 'title.report' => 'Report',
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Számla',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index abb63ffaa..236044c0d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -274,6 +274,9 @@
 'title.reports' => 'Rapporti',
 'title.report' => 'Rapporto',
 'title.send_report' => 'Invio Rapporto',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Fattura',
 'title.send_invoice' => 'Invia fattura',
 'title.charts' => 'Grafici',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 4e46adacb..35fb7859e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -303,6 +303,8 @@
 'title.report' => 'レポート',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => '送り状',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index fbeae2836..c74aec927 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -303,6 +303,8 @@
 'title.report' => '보고서',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => '송장',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 643dc2c1a..a461192b8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -254,6 +254,9 @@
 'title.reports' => 'Rapporten',
 'title.report' => 'Rapport',
 'title.send_report' => 'Rapport aan het versturen',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Factuur',
 'title.send_invoice' => 'Factuur verzenden',
 'title.charts' => 'Grafieken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 885da7006..45156f8e6 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -298,7 +298,10 @@
 // 'title.delete_predefined_expense' => 'Deleting Predefined Expense',
 'title.reports' => 'Rapporter',
 'title.report' => 'Rapport',
+// TODO: Translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Faktura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 6366b3120..55176d19c 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -277,6 +277,9 @@
 'title.reports' => 'Raporty',
 'title.report' => 'Raport',
 'title.send_report' => 'Wysyłanie raportu',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Faktura',
 'title.send_invoice' => 'Wysyłanie faktury',
 'title.charts' => 'Statystyki',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b9b83b6cf..e6b569786 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -274,6 +274,9 @@
 'title.reports' => 'Relatórios',
 'title.report' => 'Report',
 'title.send_report' => 'Enviando relatório',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Fatura',
 'title.send_invoice' => 'Enviando fatura',
 'title.charts' => 'Gráficos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index cf61597b6..7a794ce2a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -286,6 +286,8 @@
 'title.report' => 'Relatório',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 // 'title.invoice' => 'Invoice',
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 83c50b719..cf4556595 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -303,6 +303,8 @@
 'title.report' => 'Raport',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Factura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 75c6c08ec..0202eb203 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -253,6 +253,8 @@
 'title.reports' => 'Отчёты',
 'title.report' => 'Отчёт',
 'title.send_report' => 'Отсылка отчёта',
+'title.timesheets' => 'Табели учёта',
+'title.timesheet' => 'Табель учёта',
 'title.invoice' => 'Счёт',
 'title.send_invoice' => 'Отсылка счёта',
 'title.charts' => 'Диаграммы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 9eef14259..66695484b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -284,6 +284,9 @@
 'title.reports' => 'Zostavy',
 'title.report' => 'Zostava',
 'title.send_report' => 'Odosielanie zostavy',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Faktúra',
 'title.send_invoice' => 'Odosielanie faktúry',
 'title.charts' => 'Grafy',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2c0274ae0..deba2e667 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -281,6 +281,8 @@
 // 'title.reports' => 'Reports',
 // 'title.report' => 'Report',
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 // 'title.invoice' => 'Invoice',
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 453020856..4c40077cc 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -275,6 +275,9 @@
 'title.reports' => 'Izveštaji',
 'title.report' => 'Izveštaj',
 'title.send_report' => 'Slanje izveštaja',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Račun',
 'title.send_invoice' => 'Slanje računa',
 'title.charts' => 'Grafikoni',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c3af8af77..ed6a0ac80 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -274,6 +274,9 @@
 'title.reports' => 'Rapporter',
 'title.report' => 'Rapport',
 'title.send_report' => 'Skicka rapport',
+// TODO: Translate the following.
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Faktura',
 'title.send_invoice' => 'Skicka faktura',
 'title.charts' => 'Diagram',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index af40dd4bb..df6f464ae 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -312,6 +312,8 @@
 'title.report' => 'Rapor',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Fatura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 844b4aac7..72d0ed58a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -291,6 +291,8 @@
 'title.report' => '报告',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => '发票',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index ac838daaa..2be5446f7 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -298,6 +298,8 @@
 'title.report' => '報告',
 // TODO: translate the following.
 // 'title.send_report' => 'Sending Report',
+// 'title.timesheets' => 'Timesheets',
+// 'title.timesheet' => 'Timesheet',
 'title.invoice' => '發票',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c38efe91b..bde1df99d 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.37.4721 | 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.37.4722 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 9ab38ab91..e252e32a9 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -137,7 +137,7 @@ function handlePluginCheckboxes() {
 {if isTrue('TIMESHEET_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
-            <td><label for="charts">{$i18n.menu.timesheets}</label></td>
+            <td><label for="charts">{$i18n.title.timesheets}</label></td>
           </tr>
 {/if}
           <tr>

From ca3b5fef452a65d3c4f134676c8d960d10f3ab05 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 15:09:15 +0000
Subject: [PATCH 0657/1848] Adjusting rights for timesheets plugin.

---
 WEB-INF/lib/ttRoleHelper.class.php |  6 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      |  6 ++++
 mysql.sql                          |  4 +--
 timesheets.php                     | 54 ++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 timesheets.php

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index c324d6805..02b22cdf9 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -189,9 +189,9 @@ static function createPredefinedRoles($group_id, $lang)
 
     $mdb2 = getConnection();
 
-    $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
+    $rights_client = 'view_own_reports,view_own_timesheets,view_own_charts,view_own_invoices,manage_own_settings';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bde1df99d..4ad2ae4b1 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.37.4722 | 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.37.4723 | 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/dbinstall.php b/dbinstall.php
index 407a290f6..69a09ec59 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1067,6 +1067,12 @@ function ttExecute($sql) {
     ttExecute("ALTER TABLE `tt_expense_items` ADD `timesheet_id` int(11) default NULL AFTER `project_id`");
     ttExecute("create index timesheet_idx on tt_expense_items(timesheet_id)");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.37', modified = now() where param_name = 'version_db' and param_value = '1.18.36'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group' where rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_own_reports,view_own_charts', 'view_own_reports,view_own_timesheets,view_own_charts') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_own_reports,view_own_charts', 'view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts') where rank = 4 or rank = 12 or rank = 68 or rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_reports,view_charts', 'view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts') where rank = 12 or rank = 68 or rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'swap_roles,approve_timesheets', 'swap_roles') where rank = 12 or rank = 68 or rank = 324");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.38', modified = now() where param_name = 'version_db' and param_value = '1.18.37'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/mysql.sql b/mysql.sql
index 113f5dfb1..1ff8a7daa 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group');
 
 
 #
@@ -518,4 +518,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.37', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.38', now()); # TODO: change when structure changes.
diff --git a/timesheets.php b/timesheets.php
new file mode 100644
index 000000000..fb513bee8
--- /dev/null
+++ b/timesheets.php
@@ -0,0 +1,54 @@
+<?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('ttGroupHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_timesheets') ||
+  ttAccessAllowed('manage_own_timesheets') ||
+  ttAccessAllowed('view_timesheets') ||
+  ttAccessAllowed('manage_timesheets') ||
+  ttAccessAllowed('approve_timesheets'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+
+if (!$user->isPluginEnabled('ts_NEVER_ENABLED')) { // Work in progress...
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+//$invoices = ttGroupHelper::getActiveInvoices();
+
+//$smarty->assign('invoices', $invoices);
+$smarty->assign('title', $i18n->get('title.timesheets'));
+$smarty->assign('content_page_name', 'invoices.tpl'); // TODO: fix this, too.
+$smarty->display('index.tpl');

From cc12768e670e4a553593a6c41bec7ccc568102d4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 15:36:32 +0000
Subject: [PATCH 0658/1848] Added timesheets menu.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4ad2ae4b1..5ac739bfc 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.37.4723 | 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.37.4724 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 86bc619ce..b5f122dbe 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -114,7 +114,11 @@
     {/if}
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports'))}
             &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
-    {/if}        
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
+      $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'))}
+            &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
+    {/if}
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}

From 710003ecf2838c254c075fd9898034e267915e46 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 16:26:23 +0000
Subject: [PATCH 0659/1848] A bit more work in progress on timesheets.

---
 WEB-INF/lib/ttUser.class.php     |  5 ++++
 WEB-INF/resources/ca.lang.php    |  4 +++
 WEB-INF/resources/cs.lang.php    |  4 +++
 WEB-INF/resources/da.lang.php    |  4 +++
 WEB-INF/resources/de.lang.php    |  4 +++
 WEB-INF/resources/en.lang.php    |  3 ++
 WEB-INF/resources/es.lang.php    |  4 +++
 WEB-INF/resources/et.lang.php    |  4 +++
 WEB-INF/resources/fa.lang.php    |  4 +++
 WEB-INF/resources/fi.lang.php    |  4 +++
 WEB-INF/resources/fr.lang.php    |  4 +++
 WEB-INF/resources/gr.lang.php    |  4 +++
 WEB-INF/resources/he.lang.php    |  4 +++
 WEB-INF/resources/hu.lang.php    |  4 +++
 WEB-INF/resources/it.lang.php    |  4 +++
 WEB-INF/resources/ja.lang.php    |  4 +++
 WEB-INF/resources/ko.lang.php    |  4 +++
 WEB-INF/resources/nl.lang.php    |  4 +++
 WEB-INF/resources/no.lang.php    |  4 +++
 WEB-INF/resources/pl.lang.php    |  4 +++
 WEB-INF/resources/pt-br.lang.php |  4 +++
 WEB-INF/resources/pt.lang.php    |  4 +++
 WEB-INF/resources/ro.lang.php    |  4 +++
 WEB-INF/resources/ru.lang.php    |  3 ++
 WEB-INF/resources/sk.lang.php    |  4 +++
 WEB-INF/resources/sl.lang.php    |  4 +++
 WEB-INF/resources/sr.lang.php    |  4 +++
 WEB-INF/resources/sv.lang.php    |  4 +++
 WEB-INF/resources/tr.lang.php    |  4 +++
 WEB-INF/resources/zh-cn.lang.php |  4 +++
 WEB-INF/resources/zh-tw.lang.php |  4 +++
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/timesheets.tpl | 47 ++++++++++++++++++++++++++++++++
 timesheets.php                   |  8 +++---
 34 files changed, 175 insertions(+), 5 deletions(-)
 create mode 100644 WEB-INF/templates/timesheets.tpl

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 36f9163f1..5309dd8ad 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -886,4 +886,9 @@ function exists() {
 
     return false;
   }
+
+  // getTimesheets obtains timesheets for user.
+  function getTimesheets() {
+    return null; // Not implemented.
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2ae15aa5b..1e4b299e2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -448,6 +448,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Número de factura',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8a698dbe6..08480f525 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -458,6 +458,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Faktura číslo',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 37a33e909..560126347 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -418,6 +418,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fakturanummer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index fd73ad7e3..8c6318477 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -396,6 +396,10 @@
 'form.report.export' => 'Exportiere',
 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Rechnungsnummer',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7b2ee3950..ce580485e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -397,6 +397,9 @@
 'form.report.export' => 'Export',
 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+ // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+'form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Invoice number',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 6f6c82fca..53b429131 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -461,6 +461,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Número de factura',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 3aeaef4d4..70d6d441c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -422,6 +422,10 @@
 'form.report.export' => 'Eksport',
 'form.report.assign_to_invoice' => 'Lisa arvele',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Arve number',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ef0f326b8..75db18011 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -438,6 +438,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'شماره فاکتور',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 06e618959..9aee3a260 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -425,6 +425,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Laskun numero',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 53dbd941a..17d43b091 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -415,6 +415,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numéro de facture',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 167bbda8f..4e82d825e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -405,6 +405,10 @@
 'form.report.export' => 'Εξαγωγή',
 'form.report.assign_to_invoice' => 'Ανάθεση στο τιμολόγιο',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Αριθμός τιμολογίου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index eb3402727..2c4cbc066 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -448,6 +448,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'מספר חשבונית',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index ff1e21113..5dafe96d7 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -451,6 +451,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Számla azonosító száma',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 236044c0d..32e3b84a0 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -418,6 +418,10 @@
 'form.report.export' => 'Esporta',
 'form.report.assign_to_invoice' => 'Assegna alla fattura',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numero fattura',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 35fb7859e..2574d3154 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -457,6 +457,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '送り状の番号',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c74aec927..4403f9f17 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -455,6 +455,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '송장 번호',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a461192b8..9c88ca063 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -392,6 +392,10 @@
 'form.report.export' => 'Exporteer',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Factuur nummer',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 45156f8e6..a08aeffe0 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -453,6 +453,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fakturanummer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 55176d19c..a1f4bfa76 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -427,6 +427,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numer faktury',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index e6b569786..639092d83 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -422,6 +422,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Número da fatura',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 7a794ce2a..fcd31a447 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -433,6 +433,10 @@
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cf4556595..1747b81f4 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -456,6 +456,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numar factura',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 0202eb203..42dfc9c9f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -389,6 +389,9 @@
 'form.report.export' => 'Экспортировать',
 'form.report.assign_to_invoice' => 'Включить в счёт',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+'form.timesheets.hint' => 'Используйте отчёты для добавления новых табелей.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Номер счёта',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 66695484b..587575f37 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -439,6 +439,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Číslo faktúry',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index deba2e667..b0b23677d 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -430,6 +430,10 @@
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 4c40077cc..d5c4fff70 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -425,6 +425,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Broj računa',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ed6a0ac80..b3fc0929d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -422,6 +422,10 @@
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fakturanummer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index df6f464ae..b85773744 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -468,6 +468,10 @@
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fatura numarası',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 72d0ed58a..5820ab3a2 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -440,6 +440,10 @@
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '发票号码',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2be5446f7..59ce3716e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -448,6 +448,10 @@
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// TODO: translate the following.
+// form.timesheets.hint' => 'Use reports to add new timesheets.',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '發票號碼',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5ac739bfc..0594b17b4 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.37.4724 | 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.37.4725 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
new file mode 100644
index 000000000..2b7990a88
--- /dev/null
+++ b/WEB-INF/templates/timesheets.tpl
@@ -0,0 +1,47 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+{if $user->can('manage_invoices') || $user->can('view_own_invoices')}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td colspan="2">{$i18n.form.timesheets.hint}<br></td></tr>
+        <tr>
+          <td class="tableHeader">{$i18n.label.invoice}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.date}</td>
+  {if $user->isPluginEnabled('ps')}
+          <td class="tableHeader">{$i18n.label.paid}</td>
+  {/if}
+          <td class="tableHeader">{$i18n.label.view}</td>
+  {if !$user->isClient()}
+          <td class="tableHeader">{$i18n.label.delete}</td>
+  {/if}
+        </tr>
+        {foreach $invoices as $invoice}
+        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$invoice.name|escape}</td>
+          <td>{$invoice.client_name|escape}</td>
+          <td>{$invoice.date}</td>
+  {if $user->isPluginEnabled('ps')}
+          <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+          <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
+  {if !$user->isClient()}
+          <td><a href="invoice_delete.php?id={$invoice.id}">{$i18n.label.delete}</a></td>
+  {/if}
+        </tr>
+        {/foreach}
+      </table>
+
+  {if !$user->isClient()}
+      <table width="100%">
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('invoice_add.php');" value="{$i18n.button.add}"></form></td></tr>
+      </table>
+  {/if}
+{/if}
+    </td>
+  </tr>
+</table>
diff --git a/timesheets.php b/timesheets.php
index fb513bee8..b2c64e636 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -40,15 +40,15 @@
   exit();
 }
 
-if (!$user->isPluginEnabled('ts_NEVER_ENABLED')) { // Work in progress...
+if (!$user->isPluginEnabled('ts')) {
   header('Location: feature_disabled.php');
   exit();
 }
 // End of access checks.
 
-//$invoices = ttGroupHelper::getActiveInvoices();
+$timesheets = $user->getTimesheets();
 
-//$smarty->assign('invoices', $invoices);
+$smarty->assign('timesheets', $timesheets);
 $smarty->assign('title', $i18n->get('title.timesheets'));
-$smarty->assign('content_page_name', 'invoices.tpl'); // TODO: fix this, too.
+$smarty->assign('content_page_name', 'timesheets.tpl');
 $smarty->display('index.tpl');

From 53dd9ed078fdb70af2f24564145873e2346e5f28 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 17:14:50 +0000
Subject: [PATCH 0660/1848] Added 2 labels for timesheets in translation files.

---
 WEB-INF/resources/ca.lang.php    |  2 ++
 WEB-INF/resources/cs.lang.php    |  2 ++
 WEB-INF/resources/da.lang.php    |  3 +++
 WEB-INF/resources/de.lang.php    |  3 +++
 WEB-INF/resources/en.lang.php    |  2 ++
 WEB-INF/resources/es.lang.php    |  2 ++
 WEB-INF/resources/et.lang.php    |  3 +++
 WEB-INF/resources/fa.lang.php    |  2 ++
 WEB-INF/resources/fi.lang.php    |  2 ++
 WEB-INF/resources/fr.lang.php    |  3 +++
 WEB-INF/resources/gr.lang.php    |  3 +++
 WEB-INF/resources/he.lang.php    |  2 ++
 WEB-INF/resources/hu.lang.php    |  2 ++
 WEB-INF/resources/it.lang.php    |  3 +++
 WEB-INF/resources/ja.lang.php    |  2 ++
 WEB-INF/resources/ko.lang.php    |  2 ++
 WEB-INF/resources/nl.lang.php    |  3 +++
 WEB-INF/resources/no.lang.php    |  2 ++
 WEB-INF/resources/pl.lang.php    |  4 +++-
 WEB-INF/resources/pt-br.lang.php |  4 +++-
 WEB-INF/resources/pt.lang.php    |  4 +++-
 WEB-INF/resources/ro.lang.php    |  4 +++-
 WEB-INF/resources/ru.lang.php    |  2 ++
 WEB-INF/resources/sk.lang.php    |  2 ++
 WEB-INF/resources/sl.lang.php    |  2 ++
 WEB-INF/resources/sr.lang.php    |  2 ++
 WEB-INF/resources/sv.lang.php    |  3 +++
 WEB-INF/resources/tr.lang.php    |  2 ++
 WEB-INF/resources/zh-cn.lang.php |  2 ++
 WEB-INF/resources/zh-tw.lang.php |  2 ++
 WEB-INF/templates/timesheets.tpl | 15 ++++++---------
 31 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1e4b299e2..c4822d38b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -263,6 +263,8 @@
 'label.totals_only' => 'Només totals',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 08480f525..3ec87f3c5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -273,6 +273,8 @@
 'label.totals_only' => 'Pouze součty',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 560126347..d5087b8df 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -248,6 +248,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Kun Total',
 'label.quota' => 'Kvota',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8c6318477..076bfae1a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -236,6 +236,9 @@
 'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
 'label.quota' => 'Quote',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ce580485e..7797a8d8e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -229,6 +229,8 @@
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
 'label.quota' => 'Quota',
+'label.submitted' => 'Submitted',
+'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 53b429131..1b3073007 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -266,6 +266,8 @@
 'label.totals_only' => 'Solo totales',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 70d6d441c..10beccf82 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -250,6 +250,9 @@
 'label.work_units_short' => 'Ühikud',
 'label.totals_only' => 'Ainult summad',
 'label.quota' => 'Kvoot',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 75db18011..9c6ef591c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -259,6 +259,8 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9aee3a260..71515dfff 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -253,6 +253,8 @@
 'label.totals_only' => 'Vain yhteissummat',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 17d43b091..5132326fe 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -246,6 +246,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totaux uniquement',
 'label.quota' => 'Quota',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4e82d825e..77a7833ab 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -239,6 +239,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Σύνολα μόνο',
 'label.quota' => 'Ποσοστό',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2c4cbc066..ac4bbfd2e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -270,6 +270,8 @@
 'labl.totals_only' => 'סיכומים בלבד',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5dafe96d7..8549700d9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -267,6 +267,8 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 32e3b84a0..87f899ffd 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -243,6 +243,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo i totali',
 'label.quota' => 'Quota',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 2574d3154..a54f25f78 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -273,6 +273,8 @@
 'label.totals_only' => '全体だけ',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4403f9f17..4d0e0f292 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -273,6 +273,8 @@
 'label.totals_only' => '오직 전체만',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9c88ca063..336bed5a9 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -229,6 +229,9 @@
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a08aeffe0..5cb49d345 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -270,6 +270,8 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota'
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index a1f4bfa76..3e2e97c54 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -253,7 +253,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Tylko sumy',
 // TODO: translate the following.
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 639092d83..db9ef805e 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -250,7 +250,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Somente totais',
 // TODO: translate the following.
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fcd31a447..1d7a99563 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -257,7 +257,9 @@
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1747b81f4..3fa54ace8 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -269,7 +269,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Numai totaluri',
 // TODO: translate the following.
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 42dfc9c9f..1c046857e 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -228,6 +228,8 @@
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
 'label.quota' => 'Квота',
+'label.submitted' => 'Подано',
+'label.approved' => 'Одобрено',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 587575f37..c8eede8af 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -260,6 +260,8 @@
 'label.totals_only' => 'Iba celkové',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b0b23677d..3adbda815 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -253,6 +253,8 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d5c4fff70..3dae77abe 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -252,6 +252,8 @@
 'label.totals_only' => 'Samo zbirno',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b3fc0929d..0f4faac3f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -247,6 +247,9 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Visa endast summeringar',
 'label.quota' => 'Kvot',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b85773744..8c6f2154f 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -277,6 +277,8 @@
 'label.totals_only' => 'Sadece toplamlar',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5820ab3a2..f4912f1d9 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -261,6 +261,8 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 59ce3716e..5b04d348b 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -268,6 +268,8 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 2b7990a88..626065846 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -9,18 +9,15 @@
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td colspan="2">{$i18n.form.timesheets.hint}<br></td></tr>
         <tr>
-          <td class="tableHeader">{$i18n.label.invoice}</td>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+  {if $user->isPluginEnabled('cl')}
           <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.date}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td class="tableHeader">{$i18n.label.paid}</td>
   {/if}
+  <td class="tableHeader">{$i18n.label.submitted}</td>
+  <td class="tableHeader">{$i18n.label.approved}</td>
           <td class="tableHeader">{$i18n.label.view}</td>
-  {if !$user->isClient()}
-          <td class="tableHeader">{$i18n.label.delete}</td>
-  {/if}
         </tr>
-        {foreach $invoices as $invoice}
+        {foreach $timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$invoice.name|escape}</td>
           <td>{$invoice.client_name|escape}</td>
@@ -38,7 +35,7 @@
 
   {if !$user->isClient()}
       <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('invoice_add.php');" value="{$i18n.button.add}"></form></td></tr>
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
 {/if}

From e447782c5838a9715a7443a028d403aadf52a479 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 21:58:24 +0000
Subject: [PATCH 0661/1848] A bit more work in progress on timesheets.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  1 +
 WEB-INF/resources/en.lang.php    |  3 +++
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  1 +
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  1 +
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  1 +
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  1 +
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/reports.tpl    |  8 ++++++++
 reports.php                      | 10 ++++++++++
 33 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c4822d38b..2ecfb0b06 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -263,6 +263,7 @@
 'label.totals_only' => 'Només totals',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 3ec87f3c5..8e8f3c021 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -273,6 +273,7 @@
 'label.totals_only' => 'Pouze součty',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d5087b8df..bde6d33d0 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -249,6 +249,7 @@
 'label.totals_only' => 'Kun Total',
 'label.quota' => 'Kvota',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 076bfae1a..0ef54dcaa 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -237,6 +237,7 @@
 'label.totals_only' => 'Nur Gesamtstunden',
 'label.quota' => 'Quote',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7797a8d8e..a6be48642 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -229,6 +229,7 @@
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
 'label.quota' => 'Quota',
+'label.timesheet' => 'Timesheet',
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
 
@@ -383,6 +384,8 @@
 'form.reports.include_not_billable' => 'not billable',
 'form.reports.include_invoiced' => 'invoiced',
 'form.reports.include_not_invoiced' => 'not invoiced',
+'form.reports.include_assigned' => 'assigned',
+'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1b3073007..bd5594126 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -266,6 +266,7 @@
 'label.totals_only' => 'Solo totales',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 10beccf82..4410d9c44 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -251,6 +251,7 @@
 'label.totals_only' => 'Ainult summad',
 'label.quota' => 'Kvoot',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9c6ef591c..2637158b0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -259,6 +259,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 71515dfff..1e8c7df4d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -253,6 +253,7 @@
 'label.totals_only' => 'Vain yhteissummat',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5132326fe..4dc045c9a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -247,6 +247,7 @@
 'label.totals_only' => 'Totaux uniquement',
 'label.quota' => 'Quota',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 77a7833ab..5dbac6163 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -240,6 +240,7 @@
 'label.totals_only' => 'Σύνολα μόνο',
 'label.quota' => 'Ποσοστό',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ac4bbfd2e..a9f45b3b1 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -270,6 +270,7 @@
 'labl.totals_only' => 'סיכומים בלבד',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8549700d9..ee04db57e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -267,6 +267,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 87f899ffd..b64c7d5e1 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -244,6 +244,7 @@
 'label.totals_only' => 'Solo i totali',
 'label.quota' => 'Quota',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a54f25f78..c4da31e87 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -273,6 +273,7 @@
 'label.totals_only' => '全体だけ',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4d0e0f292..f954100c7 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -273,6 +273,7 @@
 'label.totals_only' => '오직 전체만',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 336bed5a9..621db3b38 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -230,6 +230,7 @@
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5cb49d345..40d229547 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -270,6 +270,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota'
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3e2e97c54..c4218e4be 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -254,6 +254,7 @@
 'label.totals_only' => 'Tylko sumy',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index db9ef805e..1f1d6ccf0 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -251,6 +251,7 @@
 'label.totals_only' => 'Somente totais',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 1d7a99563..e325d8050 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -258,6 +258,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3fa54ace8..09c220e8b 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -270,6 +270,7 @@
 'label.totals_only' => 'Numai totaluri',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1c046857e..a2a9009c2 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -228,6 +228,7 @@
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
 'label.quota' => 'Квота',
+'label.timesheet' => 'Табель учёта',
 'label.submitted' => 'Подано',
 'label.approved' => 'Одобрено',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c8eede8af..8e847d732 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -259,6 +259,7 @@
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Iba celkové',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.quota' => 'Quota',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 3adbda815..6e353c280 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -253,6 +253,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 3dae77abe..bd2415dd2 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -252,6 +252,7 @@
 'label.totals_only' => 'Samo zbirno',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0f4faac3f..2634c6847 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -248,6 +248,7 @@
 'label.totals_only' => 'Visa endast summeringar',
 'label.quota' => 'Kvot',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 8c6f2154f..cfdadbba4 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -277,6 +277,7 @@
 'label.totals_only' => 'Sadece toplamlar',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f4912f1d9..c4efbbf9e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -261,6 +261,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5b04d348b..2b6357fb9 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -268,6 +268,7 @@
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0594b17b4..fc40cb207 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.37.4725 | 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.37.4726 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 95b4a4364..08cc2edb2 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -229,9 +229,17 @@ function handleCheckboxes() {
 {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
         <tr>
           <td><b>{$i18n.label.paid_status}</b></td>
+          <td>&nbsp;</td>
+  {if $user->isPluginEnabled('ts')}
+          <td><b>{$i18n.label.timesheet}</b></td>
+  {/if}
         </tr>
         <tr>
           <td>{$forms.reportForm.paid_status.control}</td>
+          <td>&nbsp;</td>
+  {if $user->isPluginEnabled('ts')}
+          <td>{$forms.reportForm.timesheet.control}</td>
+  {/if}
         </tr>
 {/if}
 {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}
diff --git a/reports.php b/reports.php
index ee82a64f3..1e7b4b994 100644
--- a/reports.php
+++ b/reports.php
@@ -151,6 +151,16 @@
  ));
 }
 
+// TODO: check rights.
+if ($user->isPluginEnabled('ts')) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'timesheet',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('form.reports.include_assigned'),'2'=>$i18n->get('form.reports.include_not_assigned')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+
 $user_list = array();
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.

From 7a53b9001847ebb7a1fa1fb118d25b9329c44d42 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 22:18:32 +0000
Subject: [PATCH 0662/1848] Added a couple more strings to translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 3 +++
 WEB-INF/resources/de.lang.php    | 3 +++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 5 +++++
 WEB-INF/resources/fi.lang.php    | 3 +++
 WEB-INF/resources/fr.lang.php    | 3 +++
 WEB-INF/resources/gr.lang.php    | 3 +++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 3 +++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 3 +++
 WEB-INF/resources/pt-br.lang.php | 3 +++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 3 +++
 WEB-INF/resources/sv.lang.php    | 3 +++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2ecfb0b06..cc9e1a345 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -432,6 +432,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Seleccionar període de temps',
 'form.reports.set_period' => 'o establir dates',
 'form.reports.show_fields' => 'Mostrar camps',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8e8f3c021..017960967 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -442,6 +442,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Výberte období',
 'form.reports.set_period' => 'nebo určete dny',
 'form.reports.show_fields' => 'Zobrazit pole',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index bde6d33d0..def9e45f9 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -405,6 +405,9 @@
 'form.reports.include_not_billable' => 'Ikke fakturerbar',
 'form.reports.include_invoiced' => 'Faktureret',
 'form.reports.include_not_invoiced' => 'Ikke faktureret',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Vælg en periode',
 'form.reports.set_period' => 'eller sæt datoer',
 'form.reports.show_fields' => 'Vis felter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0ef54dcaa..bb9d0cf4b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -384,6 +384,9 @@
 'form.reports.include_not_billable' => 'nicht in Rechnung stellen',
 'form.reports.include_invoiced' => 'berechnet',
 'form.reports.include_not_invoiced' => 'nicht berechnet',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
 'form.reports.show_fields' => 'Felder anzeigen',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bd5594126..6ed57b724 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -445,6 +445,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Seleccionar período de tiempo',
 'form.reports.set_period' => 'o establecer fechas',
 'form.reports.show_fields' => 'Mostrar campos',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 4410d9c44..c65e3b212 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -409,6 +409,8 @@
 // Our concern is that Google auto-translates "arveldamata" as unpaid. Therefore, we may need a fix here.
 // 'form.reports.include_invoiced' => 'arveldatud', // TODO: fix as per the above comment, if needed.
 // 'form.reports.include_not_invoiced' => 'arveldamata', // TODO: fix as per the above comment, if needed.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2637158b0..78e173225 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -424,6 +424,11 @@
 'form.reports.confirm_delete' => 'آیا می خواهید گزارش برگزیده حذف شود؟',
 'form.reports.include_billable' => 'قابل پرداخت',
 'form.reports.include_not_billable' => 'غیرقابل پرداخت',
+// TODO: translate the following.
+// 'form.reports.include_invoiced' => 'invoiced',
+// 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'انتخاب بازه زمانی',
 'form.reports.set_period' => 'یا تعیین تاریخ',
 'form.reports.show_fields' => 'نمایش فیلدها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1e8c7df4d..3b8e34d4d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -411,6 +411,9 @@
 'form.reports.include_not_billable' => 'ei-laskutettavat',
 'form.reports.include_invoiced' => 'laskutettu',
 'form.reports.include_not_invoiced' => 'laskuttamatta',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Valitse ajanjakso',
 'form.reports.set_period' => 'tai aseta päivät',
 'form.reports.show_fields' => 'Näytä kentät',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 4dc045c9a..de4cb46c6 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -402,6 +402,9 @@
 'form.reports.include_not_billable' => 'non facturables',
 'form.reports.include_invoiced' => 'facturé',
 'form.reports.include_not_invoiced' => 'non facturé',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Sélectionner la période de temps',
 'form.reports.set_period' => 'ou dates indiquées',
 'form.reports.show_fields' => 'Afficher les champs',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5dbac6163..1396d5f51 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -393,6 +393,9 @@
 'form.reports.include_not_billable' => 'μη χρεώσιμο',
 'form.reports.include_invoiced' => 'τιμολόγηση',
 'form.reports.include_not_invoiced' => 'χωρίς τιμολόγηση',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a9f45b3b1..829260333 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -433,6 +433,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'בחר תקופת זמן',
 'form.reports.set_period' => 'או הגדר תאריכים',
 'form.reports.show_fields' => 'הראה שדות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index ee04db57e..ca9f2bb13 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -434,6 +434,8 @@
 // 'form.reports.include_not_billable' => 'not billable',
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Jelölj meg egy időszakot',
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index b64c7d5e1..e3ceb037d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -406,6 +406,9 @@
 'form.reports.include_not_billable' => 'non fatturabile',
 'form.reports.include_invoiced' => 'fatturato',
 'form.reports.include_not_invoiced' => 'non fatturato',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
 'form.reports.set_period' => 'oppure setta le date',
 'form.reports.show_fields' => 'Mostra i campi',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c4da31e87..646739c5f 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -441,6 +441,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => '時間期間の選択',
 'form.reports.set_period' => 'あるいは日付を設定',
 'form.reports.show_fields' => 'フィールドの表示',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f954100c7..f34bb9c26 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -439,6 +439,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => '시간 기간을 선택',
 'form.reports.set_period' => '혹은 날짜를 설정',
 'form.reports.show_fields' => '필드들을 보기',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 621db3b38..d08150cca 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -380,6 +380,9 @@
 'form.reports.include_not_billable' => 'niet factureerbaar',
 'form.reports.include_invoiced' => 'gefactureerd',
 'form.reports.include_not_invoiced' => 'niet gefactureerd',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 40d229547..829e75a3e 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -438,6 +438,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Velg tidsperiode',
 'form.reports.set_period' => 'eller sett dato',
 'form.reports.show_fields' => 'Vis feltene',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c4218e4be..f615a792e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -413,6 +413,9 @@
 'form.reports.include_not_billable' => 'bezpłatne',
 'form.reports.include_invoiced' => 'fakturowane',
 'form.reports.include_not_invoiced' => 'nie fakturowane',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Wybierz okres',
 'form.reports.set_period' => 'lub ustaw daty',
 'form.reports.show_fields' => 'Pokaż pola',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 1f1d6ccf0..d50deaf39 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -408,6 +408,9 @@
 'form.reports.include_not_billable' => 'não faturável',
 'form.reports.include_invoiced' => 'faturado',
 'form.reports.include_not_invoiced' => 'não faturado',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e325d8050..923870875 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -419,6 +419,8 @@
 // 'form.reports.include_not_billable' => 'not billable',
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 09c220e8b..57e75a5c6 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -441,6 +441,8 @@
 // 'form.reports.include_not_billable' => 'not billable',
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Alege perioada',
 'form.reports.set_period' => 'sau introdu intervalul de date',
 'form.reports.show_fields' => 'Arata campuri',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index a2a9009c2..aa3e03d8b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -376,6 +376,8 @@
 'form.reports.include_not_billable' => 'не включаемые в счёт',
 'form.reports.include_invoiced' => 'внесённые в счёт',
 'form.reports.include_not_invoiced' => 'не внесённые в счёт',
+'form.reports.include_assigned' => 'присвоена',
+'form.reports.include_not_assigned' => 'не присвоена',
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8e847d732..45afda9cc 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -424,6 +424,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Vyberte časový rozsah',
 'form.reports.set_period' => 'alebo nastavte dátumy',
 'form.reports.show_fields' => 'Zobraziť polia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 6e353c280..c0acbf08d 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -415,6 +415,8 @@
 // 'form.reports.include_not_billable' => 'not billable',
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
 // 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index bd2415dd2..ccfd332ed 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -411,6 +411,9 @@
 'form.reports.include_not_billable' => 'ne naplativo',
 'form.reports.include_invoiced' => 'obračunato',
 'form.reports.include_not_invoiced' => 'nije obračunato',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Odaberi vremenski raspon',
 'form.reports.set_period' => 'ili podesi datum',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 2634c6847..4b0883902 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -409,6 +409,9 @@
 'form.reports.include_not_billable' => 'Icke debiterbar tid',
 'form.reports.include_invoiced' => 'Fakturerad tid',
 'form.reports.include_not_invoiced' => 'Icke fakturerad tid',
+// TODO: translate the following.
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Välj intervall',
 'form.reports.set_period' => 'eller ställ in datum',
 'form.reports.show_fields' => 'Visa fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cfdadbba4..7340c3c49 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -452,6 +452,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Zaman aralığını seç',
 'form.reports.set_period' => 'ya da tarihleri belirle',
 'form.reports.show_fields' => 'Alanları göster',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index c4efbbf9e..5822b7b44 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -424,6 +424,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => '选择时间段',
 'form.reports.set_period' => '或设定日期',
 'form.reports.show_fields' => '显示栏目',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2b6357fb9..5a0f3d21a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -432,6 +432,8 @@
 // TODO: translate the following.
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
+// 'form.reports.include_assigned' => 'assigned',
+// 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => '選擇時間段',
 'form.reports.set_period' => '或設定日期',
 'form.reports.show_fields' => '顯示欄目',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fc40cb207..9cb2a052c 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.37.4726 | 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.37.4727 | 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>

From e35084bc1a01504480461fef87e6a6e4eff6880d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Feb 2019 14:00:21 +0000
Subject: [PATCH 0663/1848] Started refactoring reports.php for timesheets.

---
 WEB-INF/templates/footer.tpl |  2 +-
 reports.php                  | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9cb2a052c..03db7b7cc 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.37.4727 | 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.37.4728 | 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/reports.php b/reports.php
index 1e7b4b994..f938872b6 100644
--- a/reports.php
+++ b/reports.php
@@ -49,12 +49,15 @@
 // End of access checks.
 
 $trackingMode = $user->getTrackingMode();
+$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
+  $showCustomFieldCheckbox = $custom_fields->fields[0];
+  $showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
 }
 
 $form = new Form('reportForm');
@@ -74,7 +77,7 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
 
 // Dropdown for clients if the clients plugin is enabled.
-if ($user->isPluginEnabled('cl') && !$user->isClient()) {
+if ($showClient) {
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
                                                  // by filtering out not relevant clients.
@@ -88,13 +91,13 @@
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
-// If we have a TYPE_DROPDOWN custom field - add control to select an option.
-if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox','name'=>'option',
-      'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
-      'empty'=>array(''=>$i18n->get('dropdown.all'))));
+// If we have a TYPE_DROPDOWN custom field - add a control to select an option.
+if ($showCustomFieldDropdown) {
+  $form->addInput(array('type'=>'combobox','name'=>'option',
+    'style'=>'width: 250px;',
+    'value'=>$cl_cf_1,
+    'data'=>$custom_fields->options,
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
 // Add controls for projects and tasks.
@@ -210,7 +213,7 @@
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
 // Add checkboxes for fields.
-if ($user->isPluginEnabled('cl'))
+if ($showClient)
   $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
 if (($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
@@ -372,6 +375,7 @@
   }
 } // isPost
 
+$smarty->assign('show_client', $showClient);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('assigned_projects', $assigned_projects);

From 93dc9c1832b4035167d53796db9fac88bf90a2b6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Feb 2019 18:25:30 +0000
Subject: [PATCH 0664/1848] Refactored reports.php for timesheets.

---
 WEB-INF/templates/footer.tpl  |   2 +-
 WEB-INF/templates/reports.tpl | 188 ++++++++++++++++------------------
 reports.php                   | 138 +++++++++++++++++--------
 3 files changed, 184 insertions(+), 144 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 03db7b7cc..cc092d175 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.37.4728 | 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.37.4729 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 08cc2edb2..821352782 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -180,69 +180,50 @@ function handleCheckboxes() {
   <tr>
     <td valign="top" colspan="2" align="center">
       <table border="0" cellpadding="3">
-{if (($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) || ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN))}
         <tr>
-  {if $user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)}<td><b>{$i18n.label.client}</b></td>{else}<td>&nbsp;</td>{/if}
-          <td>&nbsp;</td>
-  {if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)}<td><b>{$i18n.label.option}</b></td>{else}<td>&nbsp;</td>{/if}
-        </tr>
-        <tr>
-          <td>{$forms.reportForm.client.control}</td>
-          <td>&nbsp;</td>
-          <td>{$forms.reportForm.option.control}</td>
-        </tr>
+          <td valign="top">
+            <table border="0" cellpadding="3">
+{if $show_client}
+              <tr><td><b>{$i18n.label.client}</b></td></tr>
+              <tr><td>{$forms.reportForm.client.control}</td></tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <tr>
-          <td><b>{$i18n.label.project}</b></td>
-          <td>&nbsp;</td>
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-          <td><b>{$i18n.label.task}</b></td>
-  {/if}
-        </tr>
+{if $show_project}
+              <tr><td><b>{$i18n.label.project}</b></td></tr>
+              <tr><td>{$forms.reportForm.project.control}</td></tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <tr>
-          <td>{$forms.reportForm.project.control}</td>
-          <td>&nbsp;</td>
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-          <td>{$forms.reportForm.task.control}</td>
-  {/if}
-        </tr>
+{if $show_billable}
+              <tr><td><b>{$i18n.form.time.billable}</b></td></tr>
+              <tr><td>{$forms.reportForm.include_records.control}</td></tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
-        <tr>
-          <td><b>{$i18n.form.time.billable}</b></td>
-          <td>&nbsp;</td>
-  {if $user->can('manage_invoices')}
-          <td><b>{$i18n.label.invoice}</b></td>
-  {/if}
-        </tr>
-        <tr valign="top">
-          <td>{$forms.reportForm.include_records.control}</td>
-          <td>&nbsp;</td>
-  {if $user->can('manage_invoices')}
-          <td>{$forms.reportForm.invoice.control}</td>
-        </tr>
-  {/if}
+{if $show_paid_status}
+              <tr><td><b>{$i18n.label.paid_status}</b></td></tr>
+              <tr><td>{$forms.reportForm.paid_status.control}</td></tr>
 {/if}
-{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
-        <tr>
-          <td><b>{$i18n.label.paid_status}</b></td>
-          <td>&nbsp;</td>
-  {if $user->isPluginEnabled('ts')}
-          <td><b>{$i18n.label.timesheet}</b></td>
-  {/if}
-        </tr>
-        <tr>
-          <td>{$forms.reportForm.paid_status.control}</td>
-          <td>&nbsp;</td>
-  {if $user->isPluginEnabled('ts')}
-          <td>{$forms.reportForm.timesheet.control}</td>
-  {/if}
-        </tr>
+            </table>
+          </td>
+          <td></td>
+          <td valign="top">
+            <table border="0" cellpadding="3">
+{if $show_cf_1_dropdown}
+              <tr><td><b>{$i18n.label.option}</b></td></tr>
+              <tr><td>{$forms.reportForm.option.control}</td></tr>
+{/if}
+{if $show_task}
+              <tr><td><b>{$i18n.label.task}</b></td></tr>
+              <tr><td>{$forms.reportForm.task.control}</td></tr>
+{/if}
+{if $show_invoice_dropdown}
+              <tr><td><b>{$i18n.label.invoice}</b></td></tr>
+              <tr><td>{$forms.reportForm.invoice.control}</td></tr>
+{/if}
+{if $show_timesheet}
+              <tr><td><b>{$i18n.label.timesheet}</b></td></tr>
+              <tr><td>{$forms.reportForm.timesheet.control}</td></tr>
 {/if}
-{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}
+            </table>
+          </td>
+        </tr>
+{if $show_users}
         <tr>
           <td colspan="3"><b>{$i18n.label.users}</b></td>
         </tr>
@@ -269,56 +250,65 @@ function handleCheckboxes() {
         <tr>
           <td colspan="3">
             <table border="0" width="100%">
-{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isPluginEnabled('cl') || $user->isPluginEnabled('iv') || $user->isPluginEnabled('ps')}
               <tr>
-  {if $user->isPluginEnabled('cl')}
-                <td width="25%"><label>{$forms.reportForm.chclient.control}&nbsp;{$i18n.label.client}</label></td>
-  {/if}
-  {if ($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv')}
-                <td width="25%"><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td>
-  {/if}
-  {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
-                <td width="25%"><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td>
-  {/if}
-  {if $user->can('view_reports') || $user->can('view_all_reports')}
-                <td width="25%"><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</label></td>
-  {/if}
-              </tr>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+{if $show_client}
+                    <tr><td><label>{$forms.reportForm.chclient.control}&nbsp;{$i18n.label.client}</label></td></tr>
 {/if}
-              <tr>
-                <td width="25%">{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}<label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label>{/if}</td>
-                <td width="25%">{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chstart.control}&nbsp;{$i18n.label.start}</label>{/if}</td>
-                <td width="25%"><label>{$forms.reportForm.chduration.control}&nbsp;{$i18n.label.duration}</label></td>
-{if ($user->can('manage_invoices') || $user->isClient()) || $user->isPluginEnabled('ex')}
-                  <td width="25%"><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td>
-{else}
-                  <td></td>
+{if $show_project}
+                    <tr><td><label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label></td></tr>
 {/if}
-              </tr>
-              <tr>
-                <td>{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}<label>{$forms.reportForm.chtask.control}&nbsp;{$i18n.label.task}</label>{/if}</td>
-                <td>{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label>{/if}</td>
-                <td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td>
-{if ($custom_fields && $custom_fields->fields[0])}
-                <td><label>{$forms.reportForm.chcf_1.control}&nbsp;{$custom_fields->fields[0]['label']|escape}</label></td>
-{else}
-                <td></td>
+{if $show_timesheet}
+                    <tr><td><label>{$forms.reportForm.chtimesheet.control}&nbsp;{$i18n.label.timesheet}</label></td></tr>
 {/if}
-              </tr>
-{if $user->isPluginEnabled('wu')}
-              <tr>
-                <td></td>
-                <td></td>
-                <td width="25%"><label>{$forms.reportForm.chunits.control}&nbsp;{$i18n.label.work_units}</label></td>
-                <td></td>
-              </tr>
+{if $show_cf_1_checkbox}
+                    <tr><td><label>{$forms.reportForm.chcf_1.control}&nbsp;{$custom_fields->fields[0]['label']|escape}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+{if $show_start}
+                    <tr><td><label>{$forms.reportForm.chstart.control}&nbsp;{$i18n.label.start}</label></td></tr>
+{/if}
+{if $show_task}
+                    <tr><td><label>{$forms.reportForm.chtask.control}&nbsp;{$i18n.label.task}</label></td></tr>
+{/if}
+{if $show_ip}
+                    <tr><td><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</label></td></tr>
+{/if}
+{if $show_work_units}
+                    <tr><td><label>{$forms.reportForm.chunits.control}&nbsp;{$i18n.label.work_units}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+{if $show_finish}
+                    <tr><td><label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label></td></tr>
 {/if}
+                    <tr><td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td></tr>
+{if $show_invoice_checkbox}
+                    <tr><td><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+                    <tr><td><label>{$forms.reportForm.chduration.control}&nbsp;{$i18n.label.duration}</label></td></tr>
+                    <tr><td><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td></tr>
+{if $show_paid_status}
+                    <tr><td><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+              </tr>
             </table>
           </td>
         </tr>
-        <tr>
-            <td><b>{$i18n.form.reports.group_by}</b></td>
-        </tr>
+
+        <tr><td><b>{$i18n.form.reports.group_by}</b></td></tr>
         <tr valign="top">
           <td>{$forms.reportForm.group_by1.control}</td>
           <td>{$forms.reportForm.group_by2.control}</td>
diff --git a/reports.php b/reports.php
index f938872b6..10df36483 100644
--- a/reports.php
+++ b/reports.php
@@ -49,7 +49,6 @@
 // End of access checks.
 
 $trackingMode = $user->getTrackingMode();
-$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -58,6 +57,8 @@
   $smarty->assign('custom_fields', $custom_fields);
   $showCustomFieldCheckbox = $custom_fields->fields[0];
   $showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
+  if ($showCustomFieldDropdown)
+    $showCustomFieldDropdown &= count($custom_fields->options) > 0;
 }
 
 $form = new Form('reportForm');
@@ -77,12 +78,16 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
 
 // Dropdown for clients if the clients plugin is enabled.
+$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
 if ($showClient) {
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
                                                  // by filtering out not relevant clients.
   } else
     $client_list = ttClientHelper::getClientsForUser();
+  if (count($client_list) == 0) $showClient = false;
+}
+if ($showClient) {
   $form->addInput(array('type'=>'combobox',
     'name'=>'client',
     'style'=>'width: 250px;',
@@ -100,23 +105,35 @@
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
-// Add controls for projects and tasks.
-if ($user->can('view_reports') || $user->can('view_all_reports')) {
-  $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
-} elseif ($user->isClient()) {
-  $project_list = ttProjectHelper::getProjectsForClient();
-} else {
-  $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
+// Add project dropdown.
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showProject) {
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
+  } elseif ($user->isClient()) {
+    $project_list = ttProjectHelper::getProjectsForClient();
+  } else {
+    $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
+  }
+  if (count($project_list) == 0) $showProject = false;
 }
-$form->addInput(array('type'=>'combobox',
-  'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
-  'name'=>'project',
-  'style'=>'width: 250px;',
-  'data'=>$project_list,
-  'datakeys'=>array('id','name'),
-  'empty'=>array(''=>$i18n->get('dropdown.all'))));
-if (MODE_PROJECTS_AND_TASKS == $trackingMode) {
+if ($showProject) {
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
+    'name'=>'project',
+    'style'=>'width: 250px;',
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add task dropdown.
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
+  if (count($task_list) == 0) $showTask = false;
+}
+if ($showTask) {
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
@@ -125,17 +142,21 @@
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
-// Add include records control.
-$include_options = array('1'=>$i18n->get('form.reports.include_billable'),
-  '2'=>$i18n->get('form.reports.include_not_billable'));
-$form->addInput(array('type'=>'combobox',
-  'name'=>'include_records',
-  'style'=>'width: 250px;',
-  'data'=>$include_options,
-  'empty'=>array(''=>$i18n->get('dropdown.all'))));
+// Add billable dropdown.
+$showBillable = $user->isPluginEnabled('iv');
+if ($showBillable) {
+  $include_options = array('1'=>$i18n->get('form.reports.include_billable'),
+    '2'=>$i18n->get('form.reports.include_not_billable'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'include_records', // TODO: how about a better name here?
+    'style'=>'width: 250px;',
+    'data'=>$include_options,
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
 
 // Add invoiced / not invoiced selector.
-if ($user->can('manage_invoices')) {
+$showInvoiceDropdown = $user->isPluginEnabled('iv') && $user->can('manage_invoices');
+if ($showInvoiceDropdown) {
   $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
     '2'=>$i18n->get('form.reports.include_not_invoiced'));
   $form->addInput(array('type'=>'combobox',
@@ -144,8 +165,11 @@
     'data'=>$invoice_options,
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
+$showInvoiceCheckbox = $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->isClient());
 
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
+// Add paid status selector.
+$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
+if ($showPaidStatus) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'paid_status',
    'style'=>'width: 250px;',
@@ -154,18 +178,23 @@
  ));
 }
 
-// TODO: check rights.
-if ($user->isPluginEnabled('ts')) {
+// Add timesheet assignment selector.
+$showTimesheet = $user->isPluginEnabled('ts') &&
+  ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
+  $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'));
+if ($showTimesheet) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
    'style'=>'width: 250px;',
    'data'=>array('1'=>$i18n->get('form.reports.include_assigned'),'2'=>$i18n->get('form.reports.include_not_assigned')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
- ));
+  ));
 }
 
+// Add user table.
+$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
 $user_list = array();
-if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
+if ($showUsers) {
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $rank = $user->getMaxRankForGroup($user->getGroup());
@@ -212,31 +241,37 @@
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
-// Add checkboxes for fields.
+// Add checkboxes for "Show fields" block.
 if ($showClient)
   $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
-if (($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv'))
+if ($showProject)
+  $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
+if ($showTask)
+  $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
+if ($showCustomFieldCheckbox)
+  $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
+if ($showInvoiceCheckbox)
   $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
+if ($showPaidStatus)
   $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
-if ($user->can('view_reports') || $user->can('view_all_reports'))
+$showIP = $user->can('view_reports') || $user->can('view_all_reports');
+if ($showIP)
   $form->addInput(array('type'=>'checkbox','name'=>'chip'));
-if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
-  $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
-if (MODE_PROJECTS_AND_TASKS == $trackingMode)
-  $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+if ($showStart)
   $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
+if ($showFinish)
   $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
-}
 $form->addInput(array('type'=>'checkbox','name'=>'chduration'));
 $form->addInput(array('type'=>'checkbox','name'=>'chnote'));
 $form->addInput(array('type'=>'checkbox','name'=>'chcost'));
-// If we have a custom field - add a checkbox for it.
-if ($custom_fields && $custom_fields->fields[0])
-  $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
-if ($user->isPluginEnabled('wu'))
+$showWorkUnits = $user->isPluginEnabled('wu');
+if ($showWorkUnits)
   $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
+if ($showTimesheet)
+  $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
 
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
@@ -288,6 +323,7 @@
   $form->setValueByElement('chnote', '1');
   $form->setValueByElement('chcf_1', '0');
   $form->setValueByElement('chunits', '0');
+  $form->setValueByElement('chtimesheet', '0');
   $form->setValueByElement('chtotalsonly', '0');
 }
 
@@ -376,6 +412,20 @@
 } // isPost
 
 $smarty->assign('show_client', $showClient);
+$smarty->assign('show_cf_1_dropdown', $showCustomFieldDropdown);
+$smarty->assign('show_cf_1_checkbox', $showCustomFieldCheckbox);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
+$smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
+$smarty->assign('show_paid_status', $showPaidStatus);
+$smarty->assign('show_timesheet', $showTimesheet);
+$smarty->assign('show_users', $showUsers);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_work_units', $showWorkUnits);
+$smarty->assign('show_ip', $showIP);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('assigned_projects', $assigned_projects);

From 1ed162514b774ef5d2f9858efa2436b19d99d484 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Feb 2019 22:11:19 +0000
Subject: [PATCH 0665/1848] Added button.create_timesheet to translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 report.php                       | 3 +++
 32 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index cc9e1a345..7526cdbaa 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -144,6 +144,8 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar per correu',
 'button.create_group' => 'Crear grup',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportar grup',
 'button.import' => 'Importar grup',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 017960967..e1dae902a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -146,6 +146,8 @@
 'button.send' => 'Poslat',
 'button.send_by_email' => 'Poslat e-mailem',
 'button.create_group' => 'Vytvořit tým', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportovat tým', // TODO: replace "team" with "group".
 'button.import' => 'Importovat tým', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index def9e45f9..ba4068c9b 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -138,6 +138,8 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-mail',
 'button.create_group' => 'Lav et team', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Eksporter team', // TODO: replace "team" with "group".
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Luk',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index bb9d0cf4b..eead92b03 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -132,6 +132,8 @@
 'button.send' => 'Senden',
 'button.send_by_email' => 'Als E-Mail senden',
 'button.create_group' => 'Gruppe erstellen',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Gruppe exportieren',
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index a6be48642..ef776cdf8 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -126,6 +126,7 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send by e-mail',
 'button.create_group' => 'Create group',
+'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Export group',
 'button.import' => 'Import group',
 'button.close' => 'Close',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 6ed57b724..74fc90361 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -143,6 +143,8 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por correo',
 'button.create_group' => 'Crear grupo',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportar grupo',
 'button.import' => 'Importar grupo',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c65e3b212..60cf19afb 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -146,6 +146,8 @@
 'button.send' => 'Saada',
 'button.send_by_email' => 'Saada e-postiga',
 'button.create_group' => 'Loo grupp',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Ekspordi grupp',
 'button.import' => 'Impordi grupp',
 'button.close' => 'Sulge',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 78e173225..e47538221 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -145,6 +145,8 @@
 'button.send' => 'ارسال',
 'button.send_by_email' => 'ارسال به ایمیل',
 'button.create_group' => 'ایجاد تیم', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'ایجاد پشتیبان از تیم', // TODO: replace "team" with "group".
 'button.import' => 'وارد کردن تیم', // TODO: replace "team" with "group".
 'button.close' => 'بستن',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3b8e34d4d..2c1af6a56 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -140,6 +140,8 @@
 'button.send' => 'Lähetä',
 'button.send_by_email' => 'Lähetä sähköpostilla',
 'button.create_group' => 'Luo tiimi', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Vie tiimi', // TODO: replace "team" with "group".
 'button.import' => 'Tuo tiimi', // TODO: replace "team" with "group".
 'button.close' => 'Sulje',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index de4cb46c6..e02ccbe72 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -138,6 +138,8 @@
 'button.send' => 'Envoyer',
 'button.send_by_email' => 'Envoyer par courriel',
 'button.create_group' => 'Créer une équipe', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exporter l\\\'équipe', // TODO: replace "team" with "group".
 'button.import' => 'Importer une équipe', // TODO: replace "team" with "group".
 'button.close' => 'Fermer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1396d5f51..12b31464d 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -133,6 +133,8 @@
 'button.send' => 'Αποστολή',
 'button.send_by_email' => 'Αποστολή μέσω email',
 'button.create_group' => 'Δημιουργία ομάδας',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Εξαγωγη ομάδας',
 'button.import' => 'Εισαγωγή ομάδας',
 'button.close' => 'Κλείσιμο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 829260333..5dce3e0bc 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -155,6 +155,8 @@
 'button.send' => 'שלח',
 'button.send_by_email' => 'שלח בדואר אלקטרוני',
 'button.create_group' => 'צור צוות', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'ייצא צוות', // TODO: replace "team" with "group".
 'button.import' => 'ייבא צוות', // TODO: replace "team" with "group".
 'button.close' => 'סגור',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index ca9f2bb13..3d29edce1 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -145,6 +145,8 @@
 'button.send' => 'Küld',
 'button.send_by_email' => 'Küldés e-mail-ben',
 'button.create_group' => 'Csoport létrehozása',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Csoport exportálása',
 'button.import' => 'Csoport importálása',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e3ceb037d..97c14e0c1 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -137,6 +137,8 @@
 'button.send' => 'Invia',
 'button.send_by_email' => 'Invia tramite e-mail',
 'button.create_group' => 'Crea gruppo',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Esporta gruppo',
 'button.import' => 'Importa gruppo',
 'button.close' => 'Chiudi',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 646739c5f..b7764ba33 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -150,6 +150,7 @@
 'button.send_by_email' => 'Eメールの送信',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'チームのエクスポート', // TODO: replace "team" with "group".
 'button.import' => 'チームのインポート', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f34bb9c26..f2efa455f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -149,6 +149,7 @@
 'button.send_by_email' => '이메일로 송신',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => '팀 익스포트', // TODO: replace "team" with "group".
 'button.import' => '팀 임포트', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index d08150cca..564b79a4c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -126,6 +126,8 @@
 'button.send' => 'Verzenden',
 'button.send_by_email' => 'Verzend per e-mail',
 'button.create_group' => 'Maak groep',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Groep exporteren',
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 829e75a3e..35b9dc05c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -149,6 +149,8 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-post',
 'button.create_group' => 'Opprett team', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Eksport team', // TODO: replace "team" with "group".
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Lukk',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f615a792e..dedbd1fb8 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -142,6 +142,8 @@
 'button.send' => 'Wyślij',
 'button.send_by_email' => 'Wyślij e-mail',
 'button.create_group' => 'Stwórz zespół', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Eksportuj zespół', // TODO: replace "team" with "group".
 'button.import' => 'Importuj zespół', // TODO: replace "team" with "group".
 'button.close' => 'Zamknij',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d50deaf39..af3661403 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -139,6 +139,8 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
 'button.create_group' => 'Criar equipe', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportar equipe', // TODO: replace "team" with "group".
 'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
 'button.close' => 'Fechar',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 923870875..f55e42263 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -143,6 +143,7 @@
 'button.send_by_email' => 'Enviar por e-mail',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
+// 'button.create_timesheet' => 'Create timesheet',
 // 'button.export' => 'Export group',
 // 'button.import' => 'Import group',
 // 'button.close' => 'Close',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 57e75a5c6..9cc731f95 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -149,6 +149,8 @@
 'button.send' => 'Trimite',
 'button.send_by_email' => 'Trimite pe e-mail',
 'button.create_group' => 'Adauga echipa', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exporta echipa', // TODO: replace "team" with "group".
 'button.import' => 'Importa echipa', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index aa3e03d8b..e184ed66a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -125,6 +125,7 @@
 'button.send' => 'Отправить',
 'button.send_by_email' => 'Отправить по e-mail',
 'button.create_group' => 'Создать группу',
+'button.create_timesheet' => 'Создать табель',
 'button.export' => 'Экспортировать группу',
 'button.import' => 'Импортировать группу',
 'button.close' => 'Закрыть',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 45afda9cc..dac0f5cab 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -145,6 +145,8 @@
 'button.send' => 'Odoslať',
 'button.send_by_email' => 'Odoslať na e-mail',
 'button.create_group' => 'Vytvoriť tím', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportovať tím', // TODO: replace "team" with "group".
 'button.import' => 'Importovať tím', // TODO: replace "team" with "group".
 'button.close' => 'Zatvoriť',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c0acbf08d..4c3ba08b9 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -139,6 +139,8 @@
 'button.send' => 'Pošlji',
 'button.send_by_email' => 'Pošlji preko elektronske pošte',
 'button.create_group' => 'Ustvari tim', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Izvozi tim', // TODO: replace "team" with "group".
 'button.import' => 'Uvozi tim', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ccfd332ed..a10d95df6 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -139,6 +139,8 @@
 'button.send' => 'Pošalji',
 'button.send_by_email' => 'Pošalji mejlom',
 'button.create_group' => 'Napravi tim', // TODO: replace "team" with "group".
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Izvezi tim', // TODO: replace "team" with "group".
 'button.import' => 'Uvezi tim', // TODO: replace "team" with "group".
 'button.close' => 'Zatvori',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4b0883902..bfa5e8dd2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -137,6 +137,8 @@
 'button.send' => 'Skicka',
 'button.send_by_email' => 'Skicka som e-post',
 'button.create_group' => 'Skapa grupp',
+// TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportera grupp',
 'button.import' => 'Importera grupp',
 'button.close' => 'Stäng',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7340c3c49..73b8774a6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -153,6 +153,7 @@
 'button.send_by_email' => 'E-posta ile gönder',
 'button.create_group' => 'Ekip yarat', // TODO: replace "team" with "group".
 // TODO: translate the following.
+// 'button.create_timesheet' => 'Create timesheet',
 // 'button.export' => 'Export group',
 'button.import' => 'Ekibi içeri aktar', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5822b7b44..b0e63cfe2 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -141,6 +141,7 @@
 'button.send_by_email' => '通过邮件发送',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => '导出团队信息', // TODO: replace "team" with "group".
 'button.import' => '导入团队信息', // TODO: replace "team" with "group".
 'button.close' => '关闭',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5a0f3d21a..067b515fb 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -146,6 +146,7 @@
 'button.send_by_email' => '通過郵件發送',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
+// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => '輸出團隊資訊', // TODO: replace "team" with "group".
 'button.import' => '輸入團隊資訊', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cc092d175..b252d6f85 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.37.4729 | 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.37.4730 | 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/report.php b/report.php
index cb563b9b0..d094df86e 100644
--- a/report.php
+++ b/report.php
@@ -183,6 +183,9 @@
 }
 $totals = ttReportHelper::getTotals($options);
 
+// TODO: Determine if we can create a timesheet out of this report.
+// There must be only one user, and nothing assigned to existing timesheets.
+
 // Assign variables that are used to print subtotals.
 if ($report_items) {
   $smarty->assign('print_subtotals', true);

From 90437750e88c95b0412c3f171617d96d4ce87bb8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Feb 2019 13:05:55 +0000
Subject: [PATCH 0666/1848] Refactoring ttReportHelper for timesheets.

---
 WEB-INF/lib/ttReportHelper.class.php | 26 ++++++++++++++------------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 686283bcf..1b5fc6f10 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -150,9 +150,10 @@ static function getItems($options) {
 
     // Prepare a query for time items in tt_log table.
     $fields = array(); // An array of fields for database query.
-    array_push($fields, 'l.id as id');
+    array_push($fields, 'l.id');
+    array_push($fields, 'l.user_id');
     array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
-    array_push($fields, 'l.date as date');
+    array_push($fields, 'l.date');
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
@@ -210,13 +211,13 @@ static function getItems($options) {
     }
     // Add paid status.
     if ($canViewReports && $options['show_paid'])
-      array_push($fields, 'l.paid as paid');
+      array_push($fields, 'l.paid');
     // Add IP address.
     if ($canViewReports && $options['show_ip']) {
-      array_push($fields, 'l.created as created');
-      array_push($fields, 'l.created_ip as created_ip');
-      array_push($fields, 'l.modified as modified');
-      array_push($fields, 'l.modified_ip as modified_ip');
+      array_push($fields, 'l.created');
+      array_push($fields, 'l.created_ip');
+      array_push($fields, 'l.modified');
+      array_push($fields, 'l.modified_ip');
     }
     // Add invoice name if it is selected.
     if (($canViewReports || $isClient) && $options['show_invoice'])
@@ -257,6 +258,7 @@ static function getItems($options) {
 
       $fields = array(); // An array of fields for database query.
       array_push($fields, 'ei.id');
+      array_push($fields, 'ei.user_id');
       array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
       array_push($fields, 'ei.date');
       if($canViewReports || $isClient)
@@ -288,13 +290,13 @@ static function getItems($options) {
       array_push($fields, 'ei.cost as expense');
       // Add paid status.
       if ($canViewReports && $options['show_paid'])
-        array_push($fields, 'ei.paid as paid');
+        array_push($fields, 'ei.paid');
       // Add IP address.
       if ($canViewReports && $options['show_ip']) {
-        array_push($fields, 'ei.created as created');
-        array_push($fields, 'ei.created_ip as created_ip');
-        array_push($fields, 'ei.modified as modified');
-        array_push($fields, 'ei.modified_ip as modified_ip');
+        array_push($fields, 'ei.created');
+        array_push($fields, 'ei.created_ip');
+        array_push($fields, 'ei.modified');
+        array_push($fields, 'ei.modified_ip');
       }
       // Add invoice name if it is selected.
       if (($canViewReports || $isClient) && $options['show_invoice'])
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b252d6f85..8ef58558c 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.37.4730 | 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.37.4731 | 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>

From 0ae87b2b2eeb7710e1d169f63708c6c5dc2e2452 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Feb 2019 14:17:06 +0000
Subject: [PATCH 0667/1848] Added Create timesheet button on report.php.

---
 WEB-INF/lib/ttReportHelper.class.php |  2 ++
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         |  3 +++
 report.php                           | 29 ++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1b5fc6f10..c3656ad6f 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -154,6 +154,7 @@ static function getItems($options) {
     array_push($fields, 'l.user_id');
     array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
     array_push($fields, 'l.date');
+    array_push($fields, 'l.timesheet_id');
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
@@ -261,6 +262,7 @@ static function getItems($options) {
       array_push($fields, 'ei.user_id');
       array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
       array_push($fields, 'ei.date');
+      array_push($fields, 'ei.timesheet_id');
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
       // Add client name if it is selected.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8ef58558c..e3d319ac9 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.37.4731 | 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.37.4732 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 0c98951f7..4212431b0 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -186,6 +186,9 @@
   <table>
   <tr>
     <td><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></td>
+{if $can_create_timesheet}
+    <td><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.create_timesheet}"></td>
+{/if}
   </tr>
   </table>
   </td>
diff --git a/report.php b/report.php
index d094df86e..7ecabcc57 100644
--- a/report.php
+++ b/report.php
@@ -185,6 +185,34 @@
 
 // TODO: Determine if we can create a timesheet out of this report.
 // There must be only one user, and nothing assigned to existing timesheets.
+$canCreateTimesheet = false;
+if ($user->isPluginEnabled('ts') && count($report_items) > 0 &&
+  ($user->can('manage_own_timesheets') || $user->can('manage_timesheets'))) {
+
+  $canCreateTimesheet = true; // Start with true and reset if we can't.
+  $first_user_id = null;
+  foreach ($report_items as $report_item) {
+    // Check user id.
+    if (!$first_user_id)
+      $first_user_id = $report_item['user_id'];
+    else {
+      if ($report_item['user_id'] != $first_user_id) {
+        // We have items for multiple users.
+        $canCreateTimesheet = false;
+        break;
+      }
+    }
+    // Check timesheet id.
+    if ($report_item['timesheet_id']) {
+      // We have an item already assigned to a timesheet.
+      $canCreateTimesheet = false;
+      break;
+    }
+  }
+
+  // TODO: Improve this for "view_all_reports" situation.
+  // We may need to add "manage_all_timesheets" right.
+}
 
 // Assign variables that are used to print subtotals.
 if ($report_items) {
@@ -202,6 +230,7 @@
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('can_create_timesheet', $canCreateTimesheet);
 $smarty->assign('bean', $bean);
 $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
 $smarty->assign('content_page_name', 'report.tpl');

From e9a0449fe594cca8fa7645f02ae5365402d96259 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Feb 2019 14:58:45 +0000
Subject: [PATCH 0668/1848] Work in progress on adding timesheets.

---
 WEB-INF/resources/ca.lang.php       |  3 ++
 WEB-INF/resources/cs.lang.php       |  3 ++
 WEB-INF/resources/da.lang.php       |  4 ++
 WEB-INF/resources/de.lang.php       |  4 ++
 WEB-INF/resources/en.lang.php       |  3 ++
 WEB-INF/resources/es.lang.php       |  3 ++
 WEB-INF/resources/et.lang.php       |  4 ++
 WEB-INF/resources/fa.lang.php       |  3 ++
 WEB-INF/resources/fi.lang.php       |  3 ++
 WEB-INF/resources/fr.lang.php       |  4 ++
 WEB-INF/resources/gr.lang.php       |  4 ++
 WEB-INF/resources/he.lang.php       |  3 ++
 WEB-INF/resources/hu.lang.php       |  3 ++
 WEB-INF/resources/it.lang.php       |  4 ++
 WEB-INF/resources/ja.lang.php       |  3 ++
 WEB-INF/resources/ko.lang.php       |  3 ++
 WEB-INF/resources/nl.lang.php       |  4 ++
 WEB-INF/resources/no.lang.php       |  3 ++
 WEB-INF/resources/pl.lang.php       |  4 ++
 WEB-INF/resources/pt-br.lang.php    |  4 ++
 WEB-INF/resources/pt.lang.php       |  3 ++
 WEB-INF/resources/ro.lang.php       |  3 ++
 WEB-INF/resources/ru.lang.php       |  3 ++
 WEB-INF/resources/sk.lang.php       |  3 ++
 WEB-INF/resources/sl.lang.php       |  3 ++
 WEB-INF/resources/sr.lang.php       |  4 ++
 WEB-INF/resources/sv.lang.php       |  4 ++
 WEB-INF/resources/tr.lang.php       |  3 ++
 WEB-INF/resources/zh-cn.lang.php    |  3 ++
 WEB-INF/resources/zh-tw.lang.php    |  3 ++
 WEB-INF/templates/timesheet_add.tpl | 29 +++++++++++
 timesheet_add.php                   | 80 +++++++++++++++++++++++++++++
 32 files changed, 210 insertions(+)
 create mode 100644 WEB-INF/templates/timesheet_add.tpl
 create mode 100644 timesheet_add.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 7526cdbaa..f129c9b3b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -339,6 +339,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e1dae902a..d722cb92a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -350,6 +350,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index ba4068c9b..976d9f3fc 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -316,6 +316,10 @@
 'title.add_notification' => 'Tilføj Meddelelse',
 'title.edit_notification' => 'Redigér Meddelelse',
 'title.delete_notification' => 'Slet Meddelelse',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Månedlig Kvota',
 'title.export' => 'Eksporter Team Data', // TODO: replace "team" with "group".
 'title.import' => 'Importer Team Data', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index eead92b03..6ac1c0345 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -299,6 +299,10 @@
 'title.add_notification' => 'Benachrichtigung hinzufügen',
 'title.edit_notification' => 'Benachrichtigung bearbeiten',
 'title.delete_notification' => 'Benachrichtigung löschen',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Monatliche Quoten',
 'title.export' => 'Daten exportieren',
 'title.import' => 'Daten importieren',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ef776cdf8..5da77cb21 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -291,6 +291,9 @@
 'title.add_notification' => 'Adding Notification',
 'title.edit_notification' => 'Editing Notification',
 'title.delete_notification' => 'Deleting Notification',
+'title.add_timesheet' => 'Adding Timesheet',
+'title.edit_timesheet' => 'Editing Timesheet',
+'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exporting Group Data',
 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 74fc90361..124bfed7b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -338,6 +338,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exportar datos', // TODO: Consider changing to exportando for consistency with other titles.
 'title.import' => 'Importar datos', // TODO: Consider changing to importando for consistency with other titles.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 60cf19afb..864fb91eb 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -319,6 +319,10 @@
 'title.add_notification' => 'Teate lisamine',
 'title.edit_notification' => 'Teate muutmine',
 'title.delete_notification' => 'Teate kustutamine',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Kuu kvoot',
 'title.export' => 'Grupi andmete alla laadimine',
 'title.import' => 'Grupi andmete üles laadimine',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e47538221..501d9572a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -323,6 +323,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'پشتیانی گرفتن از اطلاعات تیم', // TODO: replace "team" with "group".
 'title.import' => 'وارد کردن اطلاعات تیم', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 2c1af6a56..e400a9418 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -317,6 +317,9 @@
 'title.edit_notification' => 'Ilmoituksen muokkaus',
 'title.delete_notification' => 'Ilmoituksen poisto',
 // TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Tiimitietojen vienti', // TODO: replace "team" with "group".
 'title.import' => 'Tiimitietojen tunti', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e02ccbe72..3f411e9fd 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -310,6 +310,10 @@
 'title.add_notification' => 'Ajout d\\\'une notification',
 'title.edit_notification' => 'Modification d\\\'une notification',
 'title.delete_notification' => 'Suppression d\\\'une notification',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Quotas mensuels',
 'title.export' => 'Exportation des données',
 'title.import' => 'Importation des données',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 12b31464d..60b312a02 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -306,6 +306,10 @@
 'title.add_notification' => 'Προσθήκη ειδοποίησης',
 'title.edit_notification' => 'Επεξεργασία ειδοποίησης',
 'title.delete_notification' => 'Διαγραφή ειδοποίησης',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Μηνιαίες ποσοστώσεις',
 'title.export' => 'Εξαγωγή δεδομένων ομάδας',
 'title.import' => 'Εισαγωγή δεδομένων ομάδας',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5dce3e0bc..5cfe3f202 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -335,6 +335,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'ייצוא נתוני צוות', // TODO: replace "team" with "group".
 'title.import' => 'ייבוא נתוני צוות', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3d29edce1..46d0bd6c4 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -337,6 +337,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 97c14e0c1..5215f7f6b 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -315,6 +315,10 @@
 'title.add_notification' => 'Aggiunta notifica',
 'title.edit_notification' => 'Modifica notifica',
 'title.delete_notification' => 'Eliminazione notifica',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Quote mensili',
 'title.export' => 'Esporta i dati del gruppo',
 'title.import' => 'Importa i dati del gruppo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b7764ba33..9c01727b0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -344,6 +344,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f2efa455f..8d5aa443a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -345,6 +345,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 564b79a4c..1e7146f6a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -294,6 +294,10 @@
 'title.add_notification' => 'Notificatie toevoegen',
 'title.edit_notification' => 'Notificatie bewerken',
 'title.delete_notification' => 'Notificatie verwijderen',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Doelen per maand',
 'title.export' => 'Exporteer groepsgegevens',
 'title.import' => 'Importeer groepsgegevens',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 35b9dc05c..6a38cb2a6 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -342,6 +342,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index dedbd1fb8..40167912e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -317,6 +317,10 @@
 'title.add_notification' => 'Dodawanie powiadomienia',
 'title.edit_notification' => 'Edytowanie powiadomienia',
 'title.delete_notification' => 'Usuwanie powiadomienia',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Eksport danych zespołu', // TODO: replace "team" with "group".
 'title.import' => 'Import danych zespołu', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index af3661403..61f06f35a 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -314,6 +314,10 @@
 'title.add_notification' => 'Adicionando notificação',
 'title.edit_notification' => 'Editando notificação',
 'title.delete_notification' => 'Apagando notificação',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exportando dados de equipe', // TODO: replace "team" with "group".
 'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f55e42263..09aa8b52e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -325,6 +325,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9cc731f95..f8d711f35 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -345,6 +345,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e184ed66a..6c172c338 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -290,6 +290,9 @@
 'title.add_notification' => 'Добавление уведомления',
 'title.edit_notification' => 'Редактирование уведомления',
 'title.delete_notification' => 'Удаление уведомления',
+'title.add_timesheet' => 'Добавление табеля',
+'title.edit_timesheet' => 'Редактирование табеля',
+'title.delete_timesheet' => 'Удаление табеля',
 'title.monthly_quotas' => 'Месячные квоты',
 'title.export' => 'Экспортирование данных группы',
 'title.import' => 'Импортирование данных группы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index dac0f5cab..d79db8431 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -325,6 +325,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exportovanie údajov o tíme', // TODO: replace "team" with "group".
 'title.import' => 'Importovanie údajov o tíme', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 4c3ba08b9..d720907db 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -320,6 +320,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a10d95df6..e5be1d816 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -315,6 +315,10 @@
 'title.add_notification' => 'Dodavanje napomene',
 'title.edit_notification' => 'Izmena napomene',
 'title.delete_notification' => 'Brisanje napomene',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Izvoz podataka tim-a', // TODO: replace "team" with "group".
 'title.import' => 'Uvoz podataka tim-a', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bfa5e8dd2..75a258ddd 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -315,6 +315,10 @@
 'title.add_notification' => 'Lägg till avisering',
 'title.edit_notification' => 'Redigera avisering',
 'title.delete_notification' => 'Ta bort avisering',
+// TODO: translate the following.
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Månadskvoter',
 'title.export' => 'Exportera grupp',
 'title.import' => 'Importera grupp',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 73b8774a6..b6b3aeb6a 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -353,6 +353,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b0e63cfe2..5eb65a7fe 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -332,6 +332,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 067b515fb..68e505620 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -339,6 +339,9 @@
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
+// 'title.add_timesheet' => 'Adding Timesheet',
+// 'title.edit_timesheet' => 'Editing Timesheet',
+// 'title.delete_timesheet' => 'Deleting Timesheet',
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
diff --git a/WEB-INF/templates/timesheet_add.tpl b/WEB-INF/templates/timesheet_add.tpl
new file mode 100644
index 000000000..b475af0ea
--- /dev/null
+++ b/WEB-INF/templates/timesheet_add.tpl
@@ -0,0 +1,29 @@
+{$forms.timesheetForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.timesheetForm.timesheet_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.comment}:</td>
+          <td>{$forms.timesheetForm.submitter_comment.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.timesheetForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.timesheetForm.close}
diff --git a/timesheet_add.php b/timesheet_add.php
new file mode 100644
index 000000000..c52fea6a8
--- /dev/null
+++ b/timesheet_add.php
@@ -0,0 +1,80 @@
+<?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');
+
+// Access checks.
+if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ts')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('timesheet_name'));
+  $cl_comment = trim($request->getParameter('submitter_comment'));
+}
+
+$form = new Form('timesheetForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'submitter_comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+
+  if ($err->no()) {
+    /*
+    if (!ttProjectHelper::getProjectByName($cl_name)) {
+      if (ttProjectHelper::insert(array('name' => $cl_name,
+        'description' => $cl_description,
+        'users' => $cl_users,
+        'tasks' => $cl_tasks,
+        'status' => ACTIVE))) {
+          header('Location: projects.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.object_exists'));
+    */
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.timesheetForm.timmesheet_name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_timesheet'));
+$smarty->assign('content_page_name', 'timesheet_add.tpl');
+$smarty->display('index.tpl');

From eb300930267977a1caac0355200467e4bdf8b655 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Feb 2019 18:45:40 +0000
Subject: [PATCH 0669/1848] More progress on creating a new timesheet.

---
 WEB-INF/lib/form/ActionForm.class.php   | 14 +++++
 WEB-INF/lib/ttTimesheetHelper.class.php | 81 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/report.tpl            |  8 +--
 report.php                              |  6 +-
 reports.php                             |  4 ++
 timesheet_add.php                       | 23 ++++---
 7 files changed, 121 insertions(+), 17 deletions(-)
 create mode 100644 WEB-INF/lib/ttTimesheetHelper.class.php

diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index 97c9219c0..8e2ad8af4 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -166,6 +166,20 @@ function saveBean() {
     	}
     	//print_r($_SESSION);
     }
+
+  // saveDetachedAttribute saves a "detached" from form named attributed in session.
+  // There is no element in the form for it.
+  // Intended use is to add something to the session, when a form bean created on one page
+  // is used on other pages (ex.: reportForm).
+  // For example, to generate a timesheet we need a user_id, which is determined when a report
+  // is generated on report.php, using a bean created in reports.php.
+  function saveDetachedAttribute($name, $value) {
+    $_SESSION[$this->mSessionCell .'_'.$name] = $value;
+  }
+
+  function getDetachedAttribute($name) {
+    return $_SESSION[$this->mSessionCell.'_'.$name];
+  }
     
     function loadBean() {
     	$el_list = @$_SESSION[$this->mSessionCell . "session_store_elements"];
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
new file mode 100644
index 000000000..a8276b55a
--- /dev/null
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -0,0 +1,81 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttUserHelper');
+import('ttGroupHelper');
+
+// Class ttTimesheetHelper is used to help with project related tasks.
+class ttTimesheetHelper {
+
+  // The getTimesheetByName looks up a project by name.
+  static function getTimesheetByName($name, $user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_timesheets".
+      " where group_id = $group_id and org_id = $org_id and user_id = $user_id and name = ".$mdb2->quote($name).
+      " and (status = 1 or status = 0)";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val && $val['id'])
+        return $val;
+    }
+    return false;
+  }
+
+  // insert function inserts a new timesheet into database.
+  static function insert($fields)
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $user_id = $fields['user_id'];
+    $client_id = $fields['client_id'];
+    $name = $fields['name'];
+    $submitter_comment = $fields['comment'];
+
+    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name, submitter_comment)".
+      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).", ".$mdb2->quote($submitter_comment).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
+
+    // TODO: Associate report items with new timesheet.
+
+    return $last_id;
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e3d319ac9..8b988eaf2 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.37.4732 | 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.37.4733 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 4212431b0..3cd8e40ec 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -2,7 +2,7 @@
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
-{$forms.reportForm.open}
+{$forms.reportViewForm.open}
 <table width="720">
   <td valign="top">
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
@@ -162,7 +162,7 @@
   <tr>
     <td align="right">
       <table>
-        <tr><td>{$i18n.label.mark_paid}: {$forms.reportForm.mark_paid_select_options.control} {$forms.reportForm.mark_paid_action_options.control} {$forms.reportForm.btn_mark_paid.control}</td></tr>
+        <tr><td>{$i18n.label.mark_paid}: {$forms.reportViewForm.mark_paid_select_options.control} {$forms.reportViewForm.mark_paid_action_options.control} {$forms.reportViewForm.btn_mark_paid.control}</td></tr>
       </table>
     </td>
   </tr>
@@ -171,14 +171,14 @@
   <tr>
     <td align="right">
       <table>
-        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportForm.assign_invoice_select_options.control} {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_assign.control}</td></tr>
+        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign.control}</td></tr>
       </table>
     </td>
   </tr>
   {/if}
 </table>
 {/if}
-{$forms.reportForm.close}
+{$forms.reportViewForm.close}
 
 <table width="720" cellspacing="4" cellpadding="4" border="0">
 <tr>
diff --git a/report.php b/report.php
index 7ecabcc57..65d98e4e6 100644
--- a/report.php
+++ b/report.php
@@ -58,10 +58,10 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-$form = new Form('reportForm');
+$form = new Form('reportViewForm');
 
 // Report settings are stored in session bean before we get here from reports.php.
-$bean = new ActionForm('reportBean', $form, $request);
+$bean = new ActionForm('reportBean', new Form('reportForm'), $request);
 // If we are in post, load the bean from session, as the constructor does it only in get.
 if ($request->isPost()) $bean->loadBean();
 
@@ -209,6 +209,8 @@
       break;
     }
   }
+  // Save user_id in session.
+  $bean->saveDetachedAttribute('timesheet_user_id', $first_user_id);
 
   // TODO: Improve this for "view_all_reports" situation.
   // We may need to add "manage_all_timesheets" right.
diff --git a/reports.php b/reports.php
index 10df36483..892b117ea 100644
--- a/reports.php
+++ b/reports.php
@@ -273,6 +273,10 @@
 if ($showTimesheet)
   $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
 
+// Add a hidden control for timesheet_user_id (who to generate a timesheet for).
+if ($showTimesheet)
+  $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
+
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->get('form.reports.group_by_date');
diff --git a/timesheet_add.php b/timesheet_add.php
index c52fea6a8..fa32ca7ff 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
+import('ttTimesheetHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
@@ -43,6 +44,10 @@
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('timesheet_name'));
   $cl_comment = trim($request->getParameter('submitter_comment'));
+
+  // Report settings are stored in session bean before we get here.
+  $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
+  $bean->loadBean();
 }
 
 $form = new Form('timesheetForm');
@@ -56,25 +61,23 @@
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   if ($err->no()) {
-    /*
-    if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array('name' => $cl_name,
-        'description' => $cl_description,
-        'users' => $cl_users,
-        'tasks' => $cl_tasks,
-        'status' => ACTIVE))) {
-          header('Location: projects.php');
+    $user_id = $bean->getDetachedAttribute('timesheet_user_id');
+    if (!ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) {
+      if (ttTimesheetHelper::insert(array('user_id' => $user_id,
+        // 'client_id' => ?
+        'name' => $cl_name,
+        'comment' => $cl_comment))) {
+          header('Location: timesheets.php');
           exit();
         } else
           $err->add($i18n->get('error.db'));
     } else
       $err->add($i18n->get('error.object_exists'));
-    */
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.timesheetForm.timmesheet_name.focus()"');
+$smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_timesheet'));
 $smarty->assign('content_page_name', 'timesheet_add.tpl');
 $smarty->display('index.tpl');

From 8e930ac814c5ac5946d0a6c1124c61d7e2883cd1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Feb 2019 22:13:38 +0000
Subject: [PATCH 0670/1848] Added client_id to timesheet insert.

---
 WEB-INF/templates/footer.tpl | 2 +-
 timesheet_add.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b988eaf2..8e33a4874 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.37.4733 | 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.37.4734 | 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/timesheet_add.php b/timesheet_add.php
index fa32ca7ff..fa8ec4f89 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -64,7 +64,7 @@
     $user_id = $bean->getDetachedAttribute('timesheet_user_id');
     if (!ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) {
       if (ttTimesheetHelper::insert(array('user_id' => $user_id,
-        // 'client_id' => ?
+        'client_id' => $bean->getAttribute('client'),
         'name' => $cl_name,
         'comment' => $cl_comment))) {
           header('Location: timesheets.php');

From b33cf8ebaf54882a2238b660ba07936301077695 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Feb 2019 14:19:48 +0000
Subject: [PATCH 0671/1848] More progress on timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 32 +++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php            |  5 ----
 WEB-INF/resources/ca.lang.php           |  2 ++
 WEB-INF/resources/cs.lang.php           |  2 ++
 WEB-INF/resources/da.lang.php           |  2 ++
 WEB-INF/resources/de.lang.php           |  2 ++
 WEB-INF/resources/en.lang.php           |  2 ++
 WEB-INF/resources/es.lang.php           |  2 ++
 WEB-INF/resources/et.lang.php           |  2 ++
 WEB-INF/resources/fa.lang.php           |  2 ++
 WEB-INF/resources/fi.lang.php           |  2 ++
 WEB-INF/resources/fr.lang.php           |  2 ++
 WEB-INF/resources/gr.lang.php           |  2 ++
 WEB-INF/resources/he.lang.php           |  2 ++
 WEB-INF/resources/hu.lang.php           |  2 ++
 WEB-INF/resources/it.lang.php           |  2 ++
 WEB-INF/resources/ja.lang.php           |  2 ++
 WEB-INF/resources/ko.lang.php           |  2 ++
 WEB-INF/resources/nl.lang.php           |  2 ++
 WEB-INF/resources/no.lang.php           |  2 ++
 WEB-INF/resources/pl.lang.php           |  2 ++
 WEB-INF/resources/pt-br.lang.php        |  2 ++
 WEB-INF/resources/pt.lang.php           |  2 ++
 WEB-INF/resources/ro.lang.php           |  2 ++
 WEB-INF/resources/ru.lang.php           |  2 ++
 WEB-INF/resources/sk.lang.php           |  2 ++
 WEB-INF/resources/sl.lang.php           |  2 ++
 WEB-INF/resources/sr.lang.php           |  2 ++
 WEB-INF/resources/sv.lang.php           |  2 ++
 WEB-INF/resources/tr.lang.php           |  2 ++
 WEB-INF/resources/zh-cn.lang.php        |  2 ++
 WEB-INF/resources/zh-tw.lang.php        |  2 ++
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheets.tpl        |  4 ++--
 timesheets.php                          |  4 ++--
 35 files changed, 97 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index a8276b55a..f7cae6765 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -78,4 +78,36 @@ static function insert($fields)
 
     return $last_id;
   }
+
+  // The getTimesheets obtains timesheets for user.
+  static function getTimesheets($user_id)
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // $addPaidStatus = $user->isPluginEnabled('ps');
+    $result = array();
+
+    if ($user->isClient())
+      $client_part = "and ts.client_id = $user->client_id";
+
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name from tt_timesheets ts".
+      " left join tt_clients c on (c.id = ts.client_id)".
+      " where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
+      " $client_part order by ts.name";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      $dt = new DateAndTime(DB_DATEFORMAT);
+      while ($val = $res->fetchRow()) {
+        //if ($addPaidStatus)
+        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5309dd8ad..36f9163f1 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -886,9 +886,4 @@ function exists() {
 
     return false;
   }
-
-  // getTimesheets obtains timesheets for user.
-  function getTimesheets() {
-    return null; // Not implemented.
-  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f129c9b3b..2faa0a105 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -461,6 +461,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d722cb92a..b5a5cdc2d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -471,6 +471,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 976d9f3fc..ba43617cb 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -434,6 +434,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6ac1c0345..fc8f262d0 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -412,6 +412,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5da77cb21..f65f93238 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -408,6 +408,8 @@
 
  // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.hint' => 'Use reports to add new timesheets.',
+'form.timesheets.active_timesheets' => 'Active Timesheets',
+'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 124bfed7b..3cb20b86a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -474,6 +474,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 864fb91eb..c489a56a1 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -437,6 +437,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 501d9572a..8c3907cea 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -454,6 +454,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e400a9418..647b8f583 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -439,6 +439,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3f411e9fd..d6ee165ef 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -431,6 +431,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 60b312a02..1d048d2ba 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -421,6 +421,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5cfe3f202..291425ef8 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -461,6 +461,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 46d0bd6c4..ea0d73630 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -464,6 +464,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5215f7f6b..b5faa5a8c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -434,6 +434,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9c01727b0..5b4aad614 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -469,6 +469,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 8d5aa443a..74d3a8dd7 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -467,6 +467,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 1e7146f6a..e4b775047 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -408,6 +408,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6a38cb2a6..b1c315e99 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -466,6 +466,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 40167912e..a41c703be 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -442,6 +442,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 61f06f35a..62676f99c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -437,6 +437,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 09aa8b52e..f305c28c3 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -445,6 +445,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f8d711f35..1cbc40911 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -469,6 +469,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 6c172c338..02042912b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -400,6 +400,8 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.hint' => 'Используйте отчёты для добавления новых табелей.',
+'form.timesheets.active_timesheets' => 'Активные табели',
+'form.timesheets.inactive_timesheets' => 'Неактивные табели',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d79db8431..1ae854c2e 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -452,6 +452,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d720907db..5e92e7164 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -443,6 +443,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e5be1d816..c2b9033bb 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -440,6 +440,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 75a258ddd..bce576ae6 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -438,6 +438,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b6b3aeb6a..4c8c2ad81 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -480,6 +480,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5eb65a7fe..1840f7b30 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -452,6 +452,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 68e505620..f78a36fd8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -460,6 +460,8 @@
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8e33a4874..a91fdab4a 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.37.4734 | 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.37.4735 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 626065846..796f27207 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -19,8 +19,8 @@
         </tr>
         {foreach $timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$invoice.name|escape}</td>
-          <td>{$invoice.client_name|escape}</td>
+          <td>{$timesheet.name|escape}</td>
+          <td>{$timesheet.client_name|escape}</td>
           <td>{$invoice.date}</td>
   {if $user->isPluginEnabled('ps')}
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
diff --git a/timesheets.php b/timesheets.php
index b2c64e636..4a4eb66fe 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttGroupHelper');
+import('ttTimesheetHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_timesheets') ||
@@ -46,7 +46,7 @@
 }
 // End of access checks.
 
-$timesheets = $user->getTimesheets();
+$timesheets = ttTimesheetHelper::getTimesheets($user->getUser());
 
 $smarty->assign('timesheets', $timesheets);
 $smarty->assign('title', $i18n->get('title.timesheets'));

From a64a8d017c37bec34585e0c345a0c139ac3b43a0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Feb 2019 16:23:41 +0000
Subject: [PATCH 0672/1848] Implemented deleting a timesheet.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 85 ++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_delete.tpl  | 18 ++++++
 WEB-INF/templates/timesheets.tpl        | 38 +++++++----
 invoice_delete.php                      |  9 +--
 timesheet_delete.php                    | 75 ++++++++++++++++++++++
 timesheets.php                          | 15 ++++-
 7 files changed, 219 insertions(+), 23 deletions(-)
 create mode 100644 WEB-INF/templates/timesheet_delete.tpl
 create mode 100644 timesheet_delete.php

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index f7cae6765..df654e074 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -79,8 +79,8 @@ static function insert($fields)
     return $last_id;
   }
 
-  // The getTimesheets obtains timesheets for user.
-  static function getTimesheets($user_id)
+  // The getActiveTimesheets obtains active timesheets for a user.
+  static function getActiveTimesheets($user_id)
   {
     global $user;
     $mdb2 = getConnection();
@@ -94,7 +94,7 @@ static function getTimesheets($user_id)
     if ($user->isClient())
       $client_part = "and ts.client_id = $user->client_id";
 
-    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name from tt_timesheets ts".
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approval_status from tt_timesheets ts".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
       " $client_part order by ts.name";
@@ -110,4 +110,83 @@ static function getTimesheets($user_id)
     }
     return $result;
   }
+
+  // The getInactiveTimesheets obtains inactive timesheets for a user.
+  static function getInactiveTimesheets($user_id)
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // $addPaidStatus = $user->isPluginEnabled('ps');
+    $result = array();
+
+    if ($user->isClient())
+      $client_part = "and ts.client_id = $user->client_id";
+
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approval_status from tt_timesheets ts".
+      " left join tt_clients c on (c.id = ts.client_id)".
+      " where ts.status = 0 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
+      " $client_part order by ts.name";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      $dt = new DateAndTime(DB_DATEFORMAT);
+      while ($val = $res->fetchRow()) {
+        //if ($addPaidStatus)
+        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // getTimesheet - obtains timesheet data from the database.
+  static function getTimesheet($timesheet_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    if ($user->isClient()) $client_part = "and client_id = $user->client_id";
+
+    $sql = "select * from tt_timesheets".
+      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if ($val = $res->fetchRow())
+        return $val;
+    }
+    return false;
+  }
+
+  // delete - deletes timesheet from the database.
+  static function delete($timesheet_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // Handle time records.
+    $sql = "update tt_log set timesheet_id = null".
+      " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Handle expense items.
+    $sql = "update tt_expense_items set timesheet_id = null".
+      " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete timesheet.
+    $sql = "update tt_timesheets set status = null".
+      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a91fdab4a..5e19420d1 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.37.4735 | 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.37.4736 | 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/timesheet_delete.tpl b/WEB-INF/templates/timesheet_delete.tpl
new file mode 100644
index 000000000..87928052e
--- /dev/null
+++ b/WEB-INF/templates/timesheet_delete.tpl
@@ -0,0 +1,18 @@
+{$forms.timesheetDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="2" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$timesheet_to_delete|escape}</b></td>
+        </tr>
+        <tr><td colspan="2" align="center">&nbsp;</td></tr>
+        <tr>
+          <td align="right">{$forms.timesheetDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.timesheetDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.timesheetDeleteForm.close}
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 796f27207..0ba8fd7cf 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -5,29 +5,46 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->can('manage_invoices') || $user->can('view_own_invoices')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td colspan="2">{$i18n.form.timesheets.hint}<br></td></tr>
+        <tr><td>&nbsp;</td></tr>
+  {if $inactive_timesheets}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.active_timesheets}</td></tr>
+  {/if}
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
-  {if $user->isPluginEnabled('cl')}
+  {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  <td class="tableHeader">{$i18n.label.submitted}</td>
-  <td class="tableHeader">{$i18n.label.approved}</td>
+  {if $show_submit_status}
+          <td class="tableHeader">{$i18n.label.submitted}</td>
+  {/if}
+  {if $show_approval_status}
+          <td class="tableHeader">{$i18n.label.approved}</td>
+  {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
-        {foreach $timesheets as $timesheet}
+        {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$timesheet.name|escape}</td>
+  {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
-          <td>{$invoice.date}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
-          <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
+  {if $show_submit_status}
+          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+  {if $show_approval_status}
+          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+
+
+
+          <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
-          <td><a href="invoice_delete.php?id={$invoice.id}">{$i18n.label.delete}</a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}">{$i18n.label.delete}</a></td>
   {/if}
         </tr>
         {/foreach}
@@ -38,7 +55,6 @@
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
-{/if}
     </td>
   </tr>
 </table>
diff --git a/invoice_delete.php b/invoice_delete.php
index ffdcf2c17..89ea372a3 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -60,12 +60,9 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if (ttInvoiceHelper::getInvoice($cl_invoice_id)) {
-      if (ttInvoiceHelper::delete($cl_invoice_id, $request->getParameter('delete_invoice_entries'))) {
-        header('Location: invoices.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
+    if (ttInvoiceHelper::delete($cl_invoice_id, $request->getParameter('delete_invoice_entries'))) {
+      header('Location: invoices.php');
+      exit();
     } else
       $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
diff --git a/timesheet_delete.php b/timesheet_delete.php
new file mode 100644
index 000000000..e4bf453c5
--- /dev/null
+++ b/timesheet_delete.php
@@ -0,0 +1,75 @@
+<?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('ttTimesheetHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ts')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_timesheet_id = (int)$request->getParameter('id');
+$timesheet = ttTimesheetHelper::getTimesheet($cl_timesheet_id);
+if (!$timesheet) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$timesheet_to_delete = $timesheet['name'];
+
+$form = new Form('timesheetDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_timesheet_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if (ttTimesheetHelper::delete($cl_timesheet_id)) {
+      header('Location: timesheets.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: timesheets.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('timesheet_to_delete', $timesheet_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_timesheet'));
+$smarty->assign('content_page_name', 'timesheet_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheets.php b/timesheets.php
index 4a4eb66fe..191f7492b 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -46,9 +46,20 @@
 }
 // End of access checks.
 
-$timesheets = ttTimesheetHelper::getTimesheets($user->getUser());
+// TODO: determine user properly, using a dropdown.
+$user_id = $user->getUser();
+
+// TODO: fix this for client access.
+$active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
+$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+$show_client = $user->isPluginEnabled('cl') && !$user->isClient();
+
+$smarty->assign('active_timesheets', $active_timesheets);
+$smarty->assign('inactive_timesheets', $inactive_timesheets);
+$smarty->assign('show_client', $show_client);
+$smarty->assign('show_submit_status', !$user->isClient());
+$smarty->assign('show_approval_status', !$user->isClient());
 
-$smarty->assign('timesheets', $timesheets);
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');
 $smarty->display('index.tpl');

From 5d4953bb5ec09e6e79a114c71f53f410c6064f2e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Feb 2019 17:04:48 +0000
Subject: [PATCH 0673/1848] Work in progress on timesheet edit.

---
 WEB-INF/templates/timesheet_edit.tpl |  33 +++++++++
 project_edit.php                     |   2 +-
 timesheet_edit.php                   | 103 +++++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/timesheet_edit.tpl
 create mode 100644 timesheet_edit.php

diff --git a/WEB-INF/templates/timesheet_edit.tpl b/WEB-INF/templates/timesheet_edit.tpl
new file mode 100644
index 000000000..500bb55b4
--- /dev/null
+++ b/WEB-INF/templates/timesheet_edit.tpl
@@ -0,0 +1,33 @@
+{$forms.timesheetForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align = "right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.timesheetForm.timesheet_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.comment}:</td>
+          <td>{$forms.timesheetForm.comment.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.status}:</td>
+          <td>{$forms.timesheetForm.status.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.timesheetForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.timesheetForm.close}
diff --git a/project_edit.php b/project_edit.php
index 1402eb112..a2b27925e 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -128,7 +128,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
+$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.edit_project'));
diff --git a/timesheet_edit.php b/timesheet_edit.php
new file mode 100644
index 000000000..844615466
--- /dev/null
+++ b/timesheet_edit.php
@@ -0,0 +1,103 @@
+<?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('ttTimesheetHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ts')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_timesheet_id = (int)$request->getParameter('id');
+$timesheet = ttTimesheetHelper::getTimesheet($cl_timesheet_id);
+if (!$timesheet) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('timesheet_name'));
+  $cl_comment = trim($request->getParameter('comment'));
+  $cl_status = $request->getParameter('status');
+} else {
+  $cl_name = $timesheet['name'];
+  $cl_comment = $timesheet['submitter_comment'];
+  $cl_status = $timesheet['status'];
+}
+
+$form = new Form('timesheetForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_timesheet_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+
+  if ($err->no()) {
+    /*
+    // TODO: coding ongoing down from here.
+    if ($request->getParameter('btn_save')) {
+      $existing_project = ttProjectHelper::getProjectByName($cl_name);
+      if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
+         // Update project information.
+         if (ttProjectHelper::update(array(
+           'id' => $cl_project_id,
+           'name' => $cl_name,
+           'description' => $cl_description,
+           'status' => $cl_status,
+           'users' => $cl_users,
+           'tasks' => $cl_tasks))) {
+           header('Location: projects.php');
+           exit();
+        } else
+           $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }*/
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
+$smarty->assign('title', $i18n->get('title.edit_timesheet'));
+$smarty->assign('content_page_name', 'timesheet_edit.tpl');
+$smarty->display('index.tpl');

From fc8a4455218bc71e17697f33c111b9dbc55f8047 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Feb 2019 19:56:29 +0000
Subject: [PATCH 0674/1848] Added rights to view, manage, and approve all
 timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 20 ++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           | 12 ++++++++----
 mysql.sql                               |  4 ++--
 timesheet_edit.php                      | 20 ++++++++------------
 5 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index df654e074..64c73741c 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -189,4 +189,24 @@ static function delete($timesheet_id) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // update function - updates the timesheet in database.
+  static function update($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $timesheet_id = $fields['id']; // Timesheet we are updating.
+    $name = $fields['name']; // Timesheet name.
+    $submitter_comment = $fields['submitter_comment'];
+    $status = $fields['status']; // Project status.
+
+    $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", submitter_comment = ".$mdb2->quote($submitter_comment).
+      ", status = ".$mdb2->quote($status).
+      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e19420d1..8a1626961 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.37.4736 | 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.37.4737 | 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/dbinstall.php b/dbinstall.php
index 69a09ec59..994509636 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11837"]) {
+  if ($_POST["convert11797to11839"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1073,6 +1073,10 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_reports,view_charts', 'view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts') where rank = 12 or rank = 68 or rank = 324");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'swap_roles,approve_timesheets', 'swap_roles') where rank = 12 or rank = 68 or rank = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.38', modified = now() where param_name = 'version_db' and param_value = '1.18.37'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group' where rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'view_all_reports', 'view_all_reports,view_all_timesheets,manage_all_timesheets') where rank = 68 or rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'export_data,manage_subgroups', 'export_data,approve_all_timesheets,manage_subgroups') where rank = 324");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.39', modified = now() where param_name = 'version_db' and param_value = '1.18.38'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1121,7 +1125,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.37)</b>
+    <td width="80%"><b>Create database structure (v1.18.39)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1166,8 +1170,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.37)</td>
-    <td><input type="submit" name="convert11797to11837" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.39)</td>
+    <td><input type="submit" name="convert11797to11839" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 1ff8a7daa..bd8a67e7d 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group');
 
 
 #
@@ -518,4 +518,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.38', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.39', now()); # TODO: change when structure changes.
diff --git a/timesheet_edit.php b/timesheet_edit.php
index 844615466..e98d824f3 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -71,26 +71,22 @@
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   if ($err->no()) {
-    /*
-    // TODO: coding ongoing down from here.
     if ($request->getParameter('btn_save')) {
-      $existing_project = ttProjectHelper::getProjectByName($cl_name);
-      if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
+      $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name);
+      if (!$existing_timesheet || ($cl_timesheet_id == $existing_timesheet['id'])) {
          // Update project information.
-         if (ttProjectHelper::update(array(
-           'id' => $cl_project_id,
+         if (ttTimesheetHelper::update(array(
+           'id' => $cl_timesheet_id,
            'name' => $cl_name,
-           'description' => $cl_description,
-           'status' => $cl_status,
-           'users' => $cl_users,
-           'tasks' => $cl_tasks))) {
-           header('Location: projects.php');
+           'submitter_comment' => $cl_comment,
+           'status' => $cl_status))) {
+           header('Location: timesheets.php');
            exit();
         } else
            $err->add($i18n->get('error.db'));
       } else
         $err->add($i18n->get('error.object_exists'));
-    }*/
+    }
   }
 } // isPost
 

From f490a9f5e080c426f54502d1004f8ab444d26469 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Feb 2019 21:38:27 +0000
Subject: [PATCH 0675/1848] A bit more progress with timesheets.

---
 WEB-INF/templates/timesheets.tpl |  8 ++++--
 timesheet_edit.php               |  2 +-
 timesheets.php                   | 46 +++++++++++++++++++++++++++++---
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 0ba8fd7cf..8c3acc95e 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -2,12 +2,15 @@
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
+{$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
+{if $user_dropdown}
+  <tr><td align="center">{$i18n.label.user}: {$forms.timesheetsForm.user.control}</td></tr>
+{/if}
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td colspan="2">{$i18n.form.timesheets.hint}<br></td></tr>
-        <tr><td>&nbsp;</td></tr>
   {if $inactive_timesheets}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.active_timesheets}</td></tr>
   {/if}
@@ -58,3 +61,4 @@
     </td>
   </tr>
 </table>
+{$forms.timesheetsForm.close}
diff --git a/timesheet_edit.php b/timesheet_edit.php
index e98d824f3..50d2a44d4 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -72,7 +72,7 @@
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
-      $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name);
+      $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name, $timesheet['user_id']);
       if (!$existing_timesheet || ($cl_timesheet_id == $existing_timesheet['id'])) {
          // Update project information.
          if (ttTimesheetHelper::update(array(
diff --git a/timesheets.php b/timesheets.php
index 191f7492b..fcdd401bb 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -39,15 +39,53 @@
   header('Location: access_denied.php');
   exit();
 }
-
 if (!$user->isPluginEnabled('ts')) {
   header('Location: feature_disabled.php');
   exit();
 }
+if ($request->isPost()) {
+  $userChanged = $request->getParameter('user_changed');
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
+    exit();
+  }
+}
 // End of access checks.
 
-// TODO: determine user properly, using a dropdown.
-$user_id = $user->getUser();
+// Determine user for whom we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+} else {
+  $user_id = $user->getUser();
+}
+
+$group_id = $user->getGroup();
+
+// Elements of timesheetsForm.
+$form = new Form('timesheetsForm');
+
+if ($user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('manage_timesheets') || $user->can('manage_all_timesheets')) {
+  $rank = $user->getMaxRankForGroup($group_id);
+  if ($user->can('track_own_time'))
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.timesheetsForm.user_changed.value=1;document.timesheetsForm.submit();',
+      'name'=>'user',
+      'style'=>'width: 250px;',
+      'value'=>$user_id,
+      'data'=>$user_list,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
+  }
+}
+
+
+
 
 // TODO: fix this for client access.
 $active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
@@ -59,7 +97,7 @@
 $smarty->assign('show_client', $show_client);
 $smarty->assign('show_submit_status', !$user->isClient());
 $smarty->assign('show_approval_status', !$user->isClient());
-
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');
 $smarty->display('index.tpl');

From 46f39c48caaac4dcc65266c3ca12acfd5706360d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Feb 2019 12:51:00 +0000
Subject: [PATCH 0676/1848] Added inactive timesheets to timesheets.php
 display.

---
 WEB-INF/lib/ttTimesheetHelper.class.php |  2 +-
 WEB-INF/templates/timesheets.tpl        | 46 +++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 64c73741c..1d43f1527 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -154,7 +154,7 @@ static function getTimesheet($timesheet_id) {
     if ($user->isClient()) $client_part = "and client_id = $user->client_id";
 
     $sql = "select * from tt_timesheets".
-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status = 1";
+      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 8c3acc95e..6a5269b58 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -40,10 +40,52 @@
   {/if}
   {if $show_approval_status}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+          <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
+  {if !$user->isClient()}
+          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}">{$i18n.label.delete}</a></td>
+  {/if}
+        </tr>
+        {/foreach}
+      </table>
+  {if !$user->isClient()}
+      <table width="100%">
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
+      </table>
   {/if}
 
+{if $inactive_timesheets}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
 
-
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.inactive_timesheets}</td></tr>
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+  {if $show_client}
+          <td class="tableHeader">{$i18n.label.client}</td>
+  {/if}
+  {if $show_submit_status}
+          <td class="tableHeader">{$i18n.label.submitted}</td>
+  {/if}
+  {if $show_approval_status}
+          <td class="tableHeader">{$i18n.label.approved}</td>
+  {/if}
+          <td class="tableHeader">{$i18n.label.view}</td>
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
+        </tr>
+        {foreach $inactive_timesheets as $timesheet}
+        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$timesheet.name|escape}</td>
+  {if $show_client}
+          <td>{$timesheet.client_name|escape}</td>
+  {/if}
+  {if $show_submit_status}
+          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+  {if $show_approval_status}
+          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
@@ -52,12 +94,12 @@
         </tr>
         {/foreach}
       </table>
-
   {if !$user->isClient()}
       <table width="100%">
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
+{/if}
     </td>
   </tr>
 </table>

From 351514c0823db572768c8f4d7f9dbb4fad81447c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Feb 2019 13:12:17 +0000
Subject: [PATCH 0677/1848] Moved Delete to timesheet_edit.php to have room for
 paid status column.

---
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/timesheet_edit.tpl |  3 ++-
 WEB-INF/templates/timesheets.tpl     |  4 ----
 timesheet_edit.php                   | 12 +++++++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8a1626961..d8ce9770c 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.37.4737 | 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.37.4738 | 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/timesheet_edit.tpl b/WEB-INF/templates/timesheet_edit.tpl
index 500bb55b4..5848c5710 100644
--- a/WEB-INF/templates/timesheet_edit.tpl
+++ b/WEB-INF/templates/timesheet_edit.tpl
@@ -24,7 +24,8 @@
           <td>&nbsp;</td>
         </tr>
         <tr>
-          <td colspan="2" align="center" height="50">{$forms.timesheetForm.btn_save.control}</td>
+          <td></td>
+          <td align="left" height="50">{$forms.timesheetForm.btn_save.control} {$forms.timesheetForm.btn_delete.control}</td>
         </tr>
       </table>
     </td>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 6a5269b58..45a67645d 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -27,7 +27,6 @@
   {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
           <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
         {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -44,7 +43,6 @@
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}">{$i18n.label.delete}</a></td>
   {/if}
         </tr>
         {/foreach}
@@ -72,7 +70,6 @@
   {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
           <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
         {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -89,7 +86,6 @@
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}">{$i18n.label.delete}</a></td>
   {/if}
         </tr>
         {/foreach}
diff --git a/timesheet_edit.php b/timesheet_edit.php
index 50d2a44d4..1708bdf7c 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -64,17 +64,18 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
+  if ($request->getParameter('btn_save')) {
+    if ($err->no()) {
       $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name, $timesheet['user_id']);
       if (!$existing_timesheet || ($cl_timesheet_id == $existing_timesheet['id'])) {
-         // Update project information.
+         // Update timesheet information.
          if (ttTimesheetHelper::update(array(
            'id' => $cl_timesheet_id,
            'name' => $cl_name,
@@ -88,6 +89,11 @@
         $err->add($i18n->get('error.object_exists'));
     }
   }
+
+  if ($request->getParameter('btn_delete')) {
+    header("Location: timesheet_delete.php?id=$cl_timesheet_id");
+    exit();
+  }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From 6d72b9b2a73391e8e6b2a3586b4972c1a2e8160d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Feb 2019 15:28:59 +0000
Subject: [PATCH 0678/1848] Renamed client access rights for clarity.

---
 WEB-INF/lib/ttRoleHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/header.tpl       |  4 ++--
 WEB-INF/templates/invoices.tpl     |  2 +-
 dbinstall.php                      | 14 ++++++++++----
 invoice_send.php                   |  2 +-
 invoice_view.php                   |  2 +-
 invoices.php                       |  2 +-
 mysql.sql                          |  4 ++--
 report.php                         |  2 +-
 reports.php                        |  2 +-
 tofile.php                         |  2 +-
 topdf.php                          |  2 +-
 13 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 02b22cdf9..000f7cebe 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -189,7 +189,7 @@ static function createPredefinedRoles($group_id, $lang)
 
     $mdb2 = getConnection();
 
-    $rights_client = 'view_own_reports,view_own_timesheets,view_own_charts,view_own_invoices,manage_own_settings';
+    $rights_client = 'view_client_reports,view_client_timesheets,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d8ce9770c..6ed36219d 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.37.4738 | 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.37.4739 | 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/header.tpl b/WEB-INF/templates/header.tpl
index b5f122dbe..aab851bf2 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -112,14 +112,14 @@
     {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports'))}
+    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
             &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
       $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'))}
             &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
     {/if}
-    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('view_own_invoices') || $user->can('manage_invoices'))}
+    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
             &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index b966f9e24..86e7e5255 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -5,7 +5,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->can('manage_invoices') || $user->can('view_own_invoices')}
+{if $user->can('manage_invoices') || $user->can('view_client_invoices')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.invoice}</td>
diff --git a/dbinstall.php b/dbinstall.php
index 994509636..e40d4be67 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11839"]) {
+  if ($_POST["convert11797to11840"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1077,6 +1077,12 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'view_all_reports', 'view_all_reports,view_all_timesheets,manage_all_timesheets') where rank = 68 or rank = 324");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'export_data,manage_subgroups', 'export_data,approve_all_timesheets,manage_subgroups') where rank = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.39', modified = now() where param_name = 'version_db' and param_value = '1.18.38'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group' where rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_reports', 'view_client_reports') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_charts,', '') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_timesheets', 'view_client_timesheets') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_invoices', 'view_client_invoices') where rank = 16");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.40', modified = now() where param_name = 'version_db' and param_value = '1.18.39'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1125,7 +1131,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.39)</b>
+    <td width="80%"><b>Create database structure (v1.18.40)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1170,8 +1176,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.39)</td>
-    <td><input type="submit" name="convert11797to11839" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.40)</td>
+    <td><input type="submit" name="convert11797to11840" value="Update"></td>
   </tr>
 </table>
 
diff --git a/invoice_send.php b/invoice_send.php
index c86cebb53..e94e8050f 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -32,7 +32,7 @@
 import('ttUserConfig');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
+if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_client_invoices'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/invoice_view.php b/invoice_view.php
index 772500ef5..64831798b 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -33,7 +33,7 @@
 import('form.Form');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
+if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_client_invoices'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/invoices.php b/invoices.php
index ba1cad462..de51b5366 100644
--- a/invoices.php
+++ b/invoices.php
@@ -31,7 +31,7 @@
 import('ttGroupHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_own_invoices'))) {
+if (!(ttAccessAllowed('manage_invoices') || ttAccessAllowed('view_client_invoices'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/mysql.sql b/mysql.sql
index bd8a67e7d..0218cf750 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group');
 
 
 #
@@ -518,4 +518,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.39', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.40', now()); # TODO: change when structure changes.
diff --git a/report.php b/report.php
index 65d98e4e6..93720cb27 100644
--- a/report.php
+++ b/report.php
@@ -33,7 +33,7 @@
 import('ttGroupHelper');
 
 // Access check.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/reports.php b/reports.php
index 892b117ea..05d7e5f26 100644
--- a/reports.php
+++ b/reports.php
@@ -38,7 +38,7 @@
 import('ttReportHelper');
 
 // Access check.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/tofile.php b/tofile.php
index 3934471de..3ddce979c 100644
--- a/tofile.php
+++ b/tofile.php
@@ -32,7 +32,7 @@
 import('ttReportHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/topdf.php b/topdf.php
index fd3016e55..181dec692 100644
--- a/topdf.php
+++ b/topdf.php
@@ -36,7 +36,7 @@
 import('ttReportHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
   header('Location: access_denied.php');
   exit();
 }

From e6c2803587988e0d14c78b739dda47bbcf8670a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Feb 2019 15:56:44 +0000
Subject: [PATCH 0679/1848] Fixes to translations.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 4 +++-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 4 +++-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 4 +++-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 4 +++-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 2 +-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2faa0a105..6dd031c23 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -597,7 +597,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index b5a5cdc2d..771a0f297 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -611,7 +611,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index ba43617cb..702958d41 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -564,7 +564,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index fc8f262d0..257ab7e91 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -531,7 +531,9 @@
 'role.user.description' => 'Ein normaler Benutzer ohne Administrationsrechte.',
 'role.client.label' => 'Kunde',
 'role.client.low_case_label' => 'Kunde',
-'role.client.description' => 'Ein Kunde kann zu ihm gehörende Berichte, Diagramme und Rechnungen ansehen.',
+// TODO: translate the following.
+// 'role.client.description' => 'A client can view its own data.',
+'role.client.description' => 'Ein Kunde kann zu ihm gehörende Berichte und Rechnungen ansehen.',
 'role.supervisor.label' => 'Dienstvorgesetzter',
 'role.supervisor.low_case_label' => 'Dienstvorgesetzter',
 'role.supervisor.description' => 'Eine Person mit ein paar Administrationsrechten.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f65f93238..7621a83d5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -526,7 +526,7 @@
 'role.user.description' => 'A regular member without management rights.',
 'role.client.label' => 'Client',
 'role.client.low_case_label' => 'client',
-'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+'role.client.description' => 'A client can view its own data.',
 'role.supervisor.label' => 'Supervisor',
 'role.supervisor.low_case_label' => 'supervisor',
 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3cb20b86a..19a8ed515 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -612,7 +612,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c489a56a1..170c447a8 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -559,7 +559,9 @@
 // 'role.user.description' => 'A regular member without management rights.',
 'role.client.label' => 'Klient',
 'role.client.low_case_label' => 'klient',
-'role.client.description' => 'Kliendil on lubatud vaadata oma raporteid, diagramme ja arveid.',
+// TODO: translate the following.
+// 'role.client.description' => 'A client can view its own data.',
+'role.client.description' => 'Kliendil on lubatud vaadata oma raporteid ja arveid.',
 'role.supervisor.label' => 'Ülevaataja',
 'role.supervisor.low_case_label' => 'ülevaataja',
 'role.supervisor.description' => 'Mõningate lisaõigustega kasutaja.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8c3907cea..783a1b5a3 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -587,7 +587,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 647b8f583..175c993e4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -570,7 +570,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d6ee165ef..9d7a7c7e4 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -560,7 +560,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1d048d2ba..9e22079e2 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -544,7 +544,9 @@
 'role.user.description' => 'Μέλος χωρίς δικαιώματα διαχείρισης.',
 'role.client.label' => 'Πελάτης',
 'role.client.low_case_label' => 'πελάτης',
-'role.client.description' => 'Ο πελάτης μπορεί να δει τις δικές του αναφορές, διαγράμματα και τιμολόγια.',
+// TODO: translate the following.
+// 'role.client.description' => 'A client can view its own data.',
+'role.client.description' => 'Ο πελάτης μπορεί να δει τις δικές του αναφορές και τιμολόγια.',
 'role.supervisor.label' => 'Επόπτης',
 'role.supervisor.low_case_label' => 'επόπτης',
 'role.supervisor.description' => 'Άτομο με μικρό σύνολο δικαιωμάτων διαχείρισης.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 291425ef8..3418d106d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -593,7 +593,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index ea0d73630..9157dd68b 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -601,7 +601,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index b5faa5a8c..51768b0d3 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -560,7 +560,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 5b4aad614..e19c4a4ba 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -604,7 +604,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 74d3a8dd7..3999a097b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -602,7 +602,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e4b775047..58fdd7205 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -526,7 +526,9 @@
 'role.user.description' => 'Een gebruiker zonder beheer rechten.',
 'role.client.label' => 'Klant',
 'role.client.low_case_label' => 'klant',
-'role.client.description' => 'Een klant kan zijn eigen rapporten, grafieken en facturen inzien.',
+// TODO: translate the following.
+// 'role.client.description' => 'A client can view its own data.',
+'role.client.description' => 'Een klant kan zijn eigen rapporten en facturen inzien.',
 'role.supervisor.label' => 'Supervisor',
 'role.supervisor.low_case_label' => 'supervisor',
 'role.supervisor.description' => 'Een persoon met beperkte beheer rechten.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b1c315e99..1a88ce308 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -602,7 +602,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index a41c703be..8af61cf8b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -573,7 +573,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 62676f99c..018c7717c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -568,7 +568,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f305c28c3..d8f1611c4 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -583,7 +583,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1cbc40911..47ae568c5 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -606,7 +606,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 02042912b..97cab56c5 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -518,7 +518,7 @@
 'role.user.description' => 'Обычный член группы, не имеющий прав управления.',
 'role.client.label' => 'Клиент',
 'role.client.low_case_label' => 'клиент',
-'role.client.description' => 'Клиент может смотреть свои отчёты, диаграммы и счета.',
+'role.client.description' => 'Клиент может смотреть свои данные.',
 'role.supervisor.label' => 'Руководитель',
 'role.supervisor.low_case_label' => 'руководитель',
 'role.supervisor.description' => 'Член группы, имеющий небольшие полномочия по управлению.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1ae854c2e..fa0df1d5d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -584,7 +584,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5e92e7164..620a8b840 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -580,7 +580,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c2b9033bb..8163a8087 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -571,7 +571,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bce576ae6..8ddf01adc 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -568,7 +568,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4c8c2ad81..4f82410f6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -618,7 +618,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 1840f7b30..41e4acdfc 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -587,7 +587,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f78a36fd8..5e582399c 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -595,7 +595,7 @@
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
 // 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+// 'role.client.description' => 'A client can view its own data.',
 // 'role.supervisor.label' => 'Supervisor',
 // 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6ed36219d..175c87c7b 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.37.4739 | 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.37.4740 | 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>

From 069fad4865cadc18340589bc2d2d681d2e0616a6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Feb 2019 16:12:47 +0000
Subject: [PATCH 0680/1848] A bit more timesheet work.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 3 +--
 timesheets.php               | 6 +-----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 175c87c7b..252e32273 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.37.4740 | 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.37.4741 | 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/header.tpl b/WEB-INF/templates/header.tpl
index aab851bf2..0b9e290a1 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -115,8 +115,7 @@
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
             &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
     {/if}
-    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
-      $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'))}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('view_client_timesheets'))}
             &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
diff --git a/timesheets.php b/timesheets.php
index fcdd401bb..9dc0d2c89 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -31,11 +31,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_timesheets') ||
-  ttAccessAllowed('manage_own_timesheets') ||
-  ttAccessAllowed('view_timesheets') ||
-  ttAccessAllowed('manage_timesheets') ||
-  ttAccessAllowed('approve_timesheets'))) {
+if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets') || ttAccessAllowed('view_client_timesheets'))) {
   header('Location: access_denied.php');
   exit();
 }

From 3ad837214ca361fdaac5363d9e702d3d40d04b17 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 15:37:47 +0000
Subject: [PATCH 0681/1848] Fixed user edit to hide projects for client roles.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 24 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheets.tpl        |  2 ++
 WEB-INF/templates/user_edit.tpl         | 23 +++++++++++++++++-----
 timesheets.php                          | 26 +++++++++++++++++++------
 user_edit.php                           |  2 +-
 6 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 1d43f1527..3e44c8c34 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -209,4 +209,28 @@ static function update($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // isUserValid function is used during access checks and determines whether user id, passed in post, is valid
+  // in current context.
+  static function isUserValid($user_id) {
+    // We have to cover several situations.
+    //
+    // 1) User is a client.
+    // 2) User with view_all_timesheets rights.
+    // 3) User with view_timesheets rights.
+
+    global $user;
+
+    // Step 1.
+    // A client must have view_client_timesheets and
+    // aser must be assigned to one of client projects.
+    if ($user->isClient()) {
+      if (!$user->can('view_client_timesheets'))
+        return false;
+      $valid_users = ttGroupHelper::getUsersForClient($user->client_id);
+      $v = 2;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 252e32273..8b2787ff2 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.37.4741 | 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.37.4742 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 45a67645d..dc5c81557 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,7 +4,9 @@
 
 {$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $show_hint}
   <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
+{/if}
 {if $user_dropdown}
   <tr><td align="center">{$i18n.label.user}: {$forms.timesheetsForm.user.control}</td></tr>
 {/if}
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 32947545d..f9ec23347 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -51,20 +51,31 @@ function setRate(element) {
   }
 }
 
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role.
-// We need to show it only when the "Client" user role is selected.
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var projectsControl = document.getElementById("projects_control");
+
   var len = roles.length;
   for (var i = 0; i < len; i++) {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
-      if (isClient == 1)
+      if (isClient == 1) {
         clientControl.style.visibility = "visible";
-      else {
-        clientControl.value = '';
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        projectsControl.style.display = "";
       }
       break;
     }
@@ -125,10 +136,12 @@ function handleClientControl() {
 {/if}
 {if $show_projects}
     <tr><td>&nbsp;</td></tr>
+<tbody id="projects_control">
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>
+</tbody>
 {/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
diff --git a/timesheets.php b/timesheets.php
index 9dc0d2c89..82a830745 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
+import('ttGroupHelper');
 import('ttTimesheetHelper');
 
 // Access checks.
@@ -39,22 +40,34 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($user->isClient()) {
+  $users_for_client = ttGroupHelper::getUsersForClient($user->client_id);
+  if (count($users_for_client) == 0) {
+    header('Location: access_denied.php'); // There are no users for client.
+    exit();
+  }
+}
 if ($request->isPost()) {
   $userChanged = $request->getParameter('user_changed');
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
+  if ($userChanged && !(ttTimesheetHelper::isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // Wrong user id.
     exit();
   }
 }
 // End of access checks.
 
 // Determine user for whom we display this page.
+$notClient = !$user->isClient();
 if ($request->isPost() && $userChanged) {
   $user_id = $request->getParameter('user');
 } else {
-  $user_id = $user->getUser();
+  if ($notClient)
+    $user_id = $user->getUser();
+  else
+    $user_id = $users_for_client[0]['id']; // First found user for a client.
 }
 
+
 $group_id = $user->getGroup();
 
 // Elements of timesheetsForm.
@@ -86,13 +99,14 @@
 // TODO: fix this for client access.
 $active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
 $inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
-$show_client = $user->isPluginEnabled('cl') && !$user->isClient();
+$show_client = $user->isPluginEnabled('cl') && $notClient;
 
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);
 $smarty->assign('show_client', $show_client);
-$smarty->assign('show_submit_status', !$user->isClient());
-$smarty->assign('show_approval_status', !$user->isClient());
+$smarty->assign('show_hint', $notClient);
+$smarty->assign('show_submit_status', $notClient);
+$smarty->assign('show_approval_status', $notClient);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');
diff --git a/user_edit.php b/user_edit.php
index 582452d9a..cda9ab2d0 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -147,7 +147,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setRate');
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');

From 768cd79f51628c223a55a8d8e85269bad4d8a105 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 15:53:01 +0000
Subject: [PATCH 0682/1848] Fixed user add to hide projects for client role.

---
 WEB-INF/templates/footer.tpl    |  2 +-
 WEB-INF/templates/user_add.tpl  | 23 ++++++++++++++++++-----
 WEB-INF/templates/user_edit.tpl |  2 +-
 user_add.php                    |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b2787ff2..5d4037a57 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.37.4742 | 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.37.4743 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 0741dc3e9..c6dbaa7bb 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -29,20 +29,31 @@ function setDefaultRate(element) {
   }
 }
 
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role.
-// We need to show it only when the "Client" user role is selected.
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var projectsControl = document.getElementById("projects_control");
+
   var len = roles.length;
   for (var i = 0; i < len; i++) {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
-      if (isClient == 1)
+      if (isClient == 1) {
         clientControl.style.visibility = "visible";
-      else {
-        clientControl.value = '';
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        projectsControl.style.display = "";
       }
       break;
     }
@@ -90,11 +101,13 @@ function handleClientControl() {
     </tr>
 {/if}
 {if $show_projects}
+<tbody id="projects_control">
     <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>
+</tbody>
 {/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index f9ec23347..2bba1842d 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -135,8 +135,8 @@ function handleClientControl() {
     </tr>
 {/if}
 {if $show_projects}
-    <tr><td>&nbsp;</td></tr>
 <tbody id="projects_control">
+    <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
diff --git a/user_add.php b/user_add.php
index cf233d5b5..5696d28fa 100644
--- a/user_add.php
+++ b/user_add.php
@@ -126,7 +126,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');

From 2c7be66d72e7f745903e08f49f8d9ab12def1c2d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 16:09:57 +0000
Subject: [PATCH 0683/1848] Fixed mobile user pages for client role.

---
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/mobile/user_add.tpl  | 23 ++++++++++++++++++-----
 WEB-INF/templates/mobile/user_edit.tpl | 23 ++++++++++++++++++-----
 mobile/user_add.php                    |  2 +-
 mobile/user_edit.php                   |  2 +-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5d4037a57..751fe2e23 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.37.4743 | 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.37.4744 | 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/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl
index d23dcf932..1bde81b18 100644
--- a/WEB-INF/templates/mobile/user_add.tpl
+++ b/WEB-INF/templates/mobile/user_add.tpl
@@ -29,20 +29,31 @@ function setDefaultRate(element) {
   }
 }
 
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role.
-// We need to show it only when the "Client" user role is selected.
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var projectsControl = document.getElementById("projects_control");
+
   var len = roles.length;
   for (var i = 0; i < len; i++) {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
-      if (isClient == 1)
+      if (isClient == 1) {
         clientControl.style.visibility = "visible";
-      else {
-        clientControl.value = '';
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        projectsControl.style.display = "";
       }
       break;
     }
@@ -90,6 +101,7 @@ function handleClientControl() {
     </tr>
 {/if}
 {if $show_projects}
+<tbody id="projects_control">
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
@@ -97,6 +109,7 @@ function handleClientControl() {
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
     </tr>
+</tbody>
 {/if}
     <tr>
       <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
diff --git a/WEB-INF/templates/mobile/user_edit.tpl b/WEB-INF/templates/mobile/user_edit.tpl
index 9929e7272..6bddbb99f 100644
--- a/WEB-INF/templates/mobile/user_edit.tpl
+++ b/WEB-INF/templates/mobile/user_edit.tpl
@@ -51,20 +51,31 @@ function setRate(element) {
   }
 }
 
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role.
-// We need to show it only when the "Client" user role is selected.
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var projectsControl = document.getElementById("projects_control");
+
   var len = roles.length;
   for (var i = 0; i < len; i++) {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
-      if (isClient == 1)
+      if (isClient == 1) {
         clientControl.style.visibility = "visible";
-      else {
-        clientControl.value = '';
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        projectsControl.style.display = "";
       }
       break;
     }
@@ -118,10 +129,12 @@ function handleClientControl() {
     </tr>
 {/if}
 {if $show_projects}
+<tbody id="projects_control">
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>
+</tbody>
 {/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
diff --git a/mobile/user_add.php b/mobile/user_add.php
index c821c7d4f..ed017de8a 100644
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -125,7 +125,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'250','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 1e0845e1a..411586bda 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -145,7 +145,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setRate');
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'250','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');

From a3ec528f0b31400a9cdda44211ae495a6512c648 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 17:00:53 +0000
Subject: [PATCH 0684/1848] Some fixes to timesheets.php page.

---
 WEB-INF/templates/footer.tpl |  2 +-
 timesheets.php               | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 751fe2e23..ae33f1578 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.37.4744 | 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.37.4745 | 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/timesheets.php b/timesheets.php
index 82a830745..0a926d916 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -66,20 +66,23 @@
   else
     $user_id = $users_for_client[0]['id']; // First found user for a client.
 }
-
-
 $group_id = $user->getGroup();
 
 // Elements of timesheetsForm.
 $form = new Form('timesheetsForm');
 
-if ($user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('manage_timesheets') || $user->can('manage_all_timesheets')) {
-  $rank = $user->getMaxRankForGroup($group_id);
-  if ($user->can('track_own_time'))
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
+if ($user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('view_client_timesheets')) {
+  // Prepare user list for dropdown.
+  if ($notClient) {
+    $rank = $user->can('view_all_timesheets') ? MAX_RANK : $user->getMaxRankForGroup($group_id);
+    if ($user->can('view_own_timesheets'))
+      $options = array('max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+    else
+      $options = array('max_rank'=>$rank);
+    $user_list = $user->getUsers($options);
+  } else
+    $user_list = $users_for_client; // Obtained above.
+
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.timesheetsForm.user_changed.value=1;document.timesheetsForm.submit();',

From f935dc9ad6911207122e22003f23ade7b62f8167 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 17:05:54 +0000
Subject: [PATCH 0685/1848] Another fix for timesheets.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 timesheets.php               | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ae33f1578..ae04c10aa 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.37.4745 | 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.37.4746 | 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/timesheets.php b/timesheets.php
index 0a926d916..63a1bb348 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -96,12 +96,10 @@
   }
 }
 
-
-
-
-// TODO: fix this for client access.
 $active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
-$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+if ($notClient)
+  $inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+
 $show_client = $user->isPluginEnabled('cl') && $notClient;
 
 $smarty->assign('active_timesheets', $active_timesheets);

From decf7058c3d2cc57fa2f814f33e7c09b264ff854 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 17:11:12 +0000
Subject: [PATCH 0686/1848] Remove unused parameter.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/time.php              | 4 ++--
 time.php                     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ae04c10aa..5fb91bf7b 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.37.4746 | 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.37.4747 | 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/time.php b/mobile/time.php
index 364379f4f..fe723da58 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -115,9 +115,9 @@
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
diff --git a/time.php b/time.php
index 5a9b5210d..e4547a949 100644
--- a/time.php
+++ b/time.php
@@ -131,9 +131,9 @@
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',

From a3d07d9fe0c01738c69c6ea37220f3feb4395912 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Feb 2019 18:29:34 +0000
Subject: [PATCH 0687/1848] Added associating items with a timesheet upon its
 creation.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 63 ++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_add.php                       |  2 +-
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 3e44c8c34..056fc6859 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -28,6 +28,8 @@
 
 import('ttUserHelper');
 import('ttGroupHelper');
+import('form.ActionForm');
+import('ttReportHelper');
 
 // Class ttTimesheetHelper is used to help with project related tasks.
 class ttTimesheetHelper {
@@ -55,6 +57,49 @@ static function getTimesheetByName($name, $user_id) {
   // insert function inserts a new timesheet into database.
   static function insert($fields)
   {
+    // First, we obtain report items.
+
+    // Obtain session bean with report attributes.
+    $bean = new ActionForm('reportBean', new Form('reportForm'));
+    $options = ttReportHelper::getReportOptions($bean);
+    $report_items = ttReportHelper::getItems($options);
+
+    // Prepare ids for time and expense items, at the same time checking
+    // if we can proceed with creating a timesheet.
+    $canCreateTimesheet = true;
+    $first_user_id = null;
+
+    foreach ($report_items as $report_item) {
+      // Check user id.
+      if (!$first_user_id)
+        $first_user_id = $report_item['user_id'];
+      else {
+        if ($report_item['user_id'] != $first_user_id) {
+          // We have items for multiple users.
+          $canCreateTimesheet = false;
+          break;
+        }
+      }
+      // Check timesheet id.
+      if ($report_item['timesheet_id']) {
+        // We have an item already assigned to a timesheet.
+        $canCreateTimesheet = false;
+        break;
+      }
+      if ($report_item['type'] == 1)
+        $time_ids[] = $report_item['id'];
+      elseif ($report_item['type'] == 2)
+        $expense_ids[] = $report_item['id'];
+    }
+    if (!$canCreateTimesheet) return false;
+
+    // Make comma-seperated lists of ids for sql.
+    if ($time_ids)
+      $comma_separated_time_ids = implode(',', $time_ids);
+    if ($expense_ids)
+      $comma_separated_expense_ids = implode(',', $expense_ids);
+
+    // Create a new timesheet entry.
     global $user;
     $mdb2 = getConnection();
 
@@ -74,7 +119,23 @@ static function insert($fields)
 
     $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
 
-    // TODO: Associate report items with new timesheet.
+    // Associate time items with timesheet.
+    if ($comma_separated_time_ids) {
+      $sql = "update tt_log set timesheet_id = $last_id".
+        " where id in ($comma_separated_time_ids) and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+    }
+
+    // Associate expense items with timesheet.
+    if ($comma_separated_expense_ids) {
+      $sql = "update tt_expense_items set timesheet_id = $last_id".
+        " where id in ($comma_separated_expense_ids) and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+    }
 
     return $last_id;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5fb91bf7b..7d43e77d1 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.37.4747 | 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.37.4748 | 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/timesheet_add.php b/timesheet_add.php
index fa8ec4f89..9e6b9acd0 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -31,7 +31,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets') || ttAccessAllowed('manage_all_timesheets'))) {
   header('Location: access_denied.php');
   exit();
 }

From 1b984b0c5f3ac0977c993d5bcff456bbd372f5bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Feb 2019 13:32:57 +0000
Subject: [PATCH 0688/1848] Starting work on timesheet view.

---
 WEB-INF/templates/report.tpl         |   5 +
 WEB-INF/templates/timesheet_view.tpl |  90 ++++++++++++++++++
 invoice_view.php                     |   2 +-
 timesheet_view.php                   | 131 +++++++++++++++++++++++++++
 4 files changed, 227 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/timesheet_view.tpl
 create mode 100644 timesheet_view.php

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 3cd8e40ec..b603dd27c 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -53,6 +53,7 @@
   {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
   {if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
   {if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
+  {if $bean->getAttribute('chtimesheet')}<td class="tableHeader">{$i18n.label.timesheet}</td>{/if}
       </tr>
   {foreach $report_items as $item}
     <!-- print subtotal for a block of grouped values -->
@@ -76,6 +77,7 @@
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chip')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+        {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
         {if $use_checkboxes}<td></td>{/if}
       </tr>
       <tr><td>&nbsp;</td></tr>
@@ -102,6 +104,7 @@
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
     {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_id|escape}</td>{/if}
     {if $use_checkboxes}
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
@@ -128,6 +131,7 @@
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
       </tr>
   {/if}
@@ -149,6 +153,7 @@
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
       </tr>
 {/if}
diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
new file mode 100644
index 000000000..736d65b0c
--- /dev/null
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -0,0 +1,90 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$timesheet_name|escape} </b></td></tr>
+        <tr><td align="left"><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$client_name|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client_address}:</b> {$client_address|escape}</td></tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top">
+{if $invoice_items}
+      <table border="0" cellpadding="3" cellspacing="1" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.date}</td>
+          <td class="tableHeader">{$i18n.form.invoice.person}</td>
+  {if $show_project}
+          <td class="tableHeader">{$i18n.label.project}</td>
+  {/if}
+  {if $show_task}
+          <td class="tableHeader">{$i18n.label.task}</td>
+  {/if}
+          <td class="tableHeader">{$i18n.label.note}</td>
+          <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
+          <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
+  {if $user->isPluginEnabled('ps')}
+          <td class="tableHeader">{$i18n.label.paid}</td>
+  {/if}
+        </tr>
+  {foreach $invoice_items as $invoice_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td valign="top">{$invoice_item.date}</td>
+          <td valign="top">{$invoice_item.user_name|escape}</td>
+    {if $show_project}
+          <td valign="top">{$invoice_item.project_name|escape}</td>
+    {/if}
+    {if $show_task}
+          <td valign="top">{$invoice_item.task_name|escape}</td>
+    {/if}
+          <td valign="top">{$invoice_item.note|escape}</td>
+          <td align="right" valign="top">{$invoice_item.duration}</td>
+          <td align="right" valign="top">{$invoice_item.cost}</td>
+    {if $user->isPluginEnabled('ps')}
+          <td align="right" valign="top">{if $invoice_item.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {/if}
+        </tr>
+  {/foreach}
+        <tr><td>&nbsp;</td></tr>
+  {if $tax}
+        <tr>
+          <td align="right" colspan="{$colspan}"><b>{$i18n.label.subtotal}:</b></td>
+          <td align="right"><nobr>{$subtotal|escape}</nobr></td>
+        </tr>
+        <tr>
+          <td align="right" colspan="{$colspan}"><b>{$i18n.label.tax}:</b></td>
+          <td align="right"><nobr>{$tax|escape}</nobr></td>
+        </tr>
+   {/if}
+        <tr>
+          <td align="right" colspan="{$colspan}"><b>{$i18n.label.total}:</b></td>
+          <td align="right"><nobr>{$total|escape}</nobr></td>
+        </tr>
+      </table>
+
+  {$forms.invoiceForm.open}
+  {if $user->isPluginEnabled('ps')}
+  <table width="720" cellspacing="0" cellpadding="0" border="0">
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.label.mark_paid}: {$forms.invoiceForm.mark_paid_action_options.control} {$forms.invoiceForm.btn_mark_paid.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  </table>
+  {/if}
+  {$forms.invoiceForm.close}
+{/if}
+    </td>
+  </tr>
+  <tr><td align="center"><br><form>
+    <input type="button" onclick="chLocation('invoice_send.php?id={$invoice_id}');" value="{$i18n.button.send_by_email}">
+  </form></td></tr>
+</table>
diff --git a/invoice_view.php b/invoice_view.php
index 64831798b..605a53020 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -69,7 +69,7 @@
     $tax += round($item['cost'] * $tax_percent / 100, 2);
   }
 }
-$total = $subtotal + $tax; 
+$total = $subtotal + $tax;
 
 $currency = $user->getCurrency();
 $decimalMark = $user->getDecimalMark();
diff --git a/timesheet_view.php b/timesheet_view.php
new file mode 100644
index 000000000..136c7f118
--- /dev/null
+++ b/timesheet_view.php
@@ -0,0 +1,131 @@
+<?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('ttTimesheetHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets') || ttAccessAllowed('view_client_timesheets'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ts')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$timesheet_id = (int)$request->getParameter('id');
+$timesheet = ttTimesheetHelper::getTimesheet($timesheet_id);
+if (!$timesheet) {
+  header('Location: access_denied.php');
+  exit();
+}
+// TODO: add other checks here for timesheet being appropriate for user role.
+// End of access checks.
+
+$invoice_date = new DateAndTime(DB_DATEFORMAT, $invoice['date']);
+$client = ttClientHelper::getClient($invoice['client_id'], true);
+if (!$client) // In case client was deleted.
+  $client = ttClientHelper::getDeletedClient($invoice['client_id']);
+
+$invoice_items = ttInvoiceHelper::getInvoiceItems($cl_invoice_id);
+$tax_percent = $client['tax'];
+
+$subtotal = 0;
+$tax = 0;
+foreach($invoice_items as $item)
+  $subtotal += $item['cost'];
+if ($tax_percent > 0) {
+  $tax_expenses = $user->isPluginEnabled('et');
+  foreach($invoice_items as $item) {
+    if ($item['type'] == 2 && !$tax_expenses)
+      continue;
+    $tax += round($item['cost'] * $tax_percent / 100, 2);
+  }
+}
+$total = $subtotal + $tax;
+
+$currency = $user->getCurrency();
+$decimalMark = $user->getDecimalMark();
+
+$smarty->assign('subtotal', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($subtotal, 2))));
+if ($tax) $smarty->assign('tax', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($tax, 2))));
+$smarty->assign('total', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($total, 2))));
+
+if ('.' != $decimalMark) {
+  foreach ($invoice_items as &$item)
+    $item['cost'] = str_replace('.', $decimalMark, $item['cost']);
+}
+
+// Calculate colspan for invoice summary.
+$colspan = 4;
+$trackingMode = $user->getTrackingMode();
+if (MODE_PROJECTS == $trackingMode)
+  $colspan++;
+elseif (MODE_PROJECTS_AND_TASKS == $trackingMode)
+  $colspan += 2;
+
+$form = new Form('invoiceForm');
+// Hidden control for invoice id.
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
+// invoiceForm only contains controls for "Mark paid" block below invoice table.
+if ($user->isPluginEnabled('ps')) {
+  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_paid_action_options',
+    'data'=>$mark_paid_action_options,
+    'value'=>$cl_mark_paid_action_option));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
+}
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_mark_paid')) {
+    // User clicked the "Mark paid" button to mark all invoice items either paid or not paid.
+
+    // Determine user action.
+    $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
+    ttInvoiceHelper::markPaid($cl_invoice_id, $mark_paid);
+
+    // Re-display this form.
+    header('Location: invoice_view.php?id='.$cl_invoice_id);
+    exit();
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('invoice_id', $cl_invoice_id);
+$smarty->assign('timesheet_name', $timesheet['name']);
+$smarty->assign('invoice_date', $invoice_date->toString($user->getDateFormat()));
+$smarty->assign('client_name', $client['name']);
+$smarty->assign('client_address', $client['address']);
+$smarty->assign('show_project', MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode);
+$smarty->assign('show_task', MODE_PROJECTS_AND_TASKS == $trackingMode);
+$smarty->assign('invoice_items', $invoice_items);
+$smarty->assign('colspan', $colspan);
+$smarty->assign('title', $i18n->get('title.timesheet'));
+$smarty->assign('content_page_name', 'timesheet_view.tpl');
+$smarty->display('index.tpl');

From bc06bc6aacd3a6ecde7d55980a2702809fc26c49 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Feb 2019 14:13:34 +0000
Subject: [PATCH 0689/1848] A bit more work in progress on timesheet view.

---
 WEB-INF/lib/ttTimesheetHelper.class.php |  8 +++++---
 WEB-INF/templates/timesheet_view.tpl    |  9 +++++----
 WEB-INF/templates/timesheets.tpl        |  4 ++++
 timesheet_view.php                      | 25 ++-----------------------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 056fc6859..49808359a 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -212,10 +212,12 @@ static function getTimesheet($timesheet_id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    if ($user->isClient()) $client_part = "and client_id = $user->client_id";
+    if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
 
-    $sql = "select * from tt_timesheets".
-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status is not null";
+    $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name, ts.name from tt_timesheets ts".
+      " left join tt_users u on (u.id = ts.user_id)".
+      " left join tt_clients c on (c.id = ts.client_id)".
+      " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 736d65b0c..79ce95a37 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -6,10 +6,11 @@
   <tr>
     <td>
       <table border=0 width=100%>
-        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$timesheet_name|escape} </b></td></tr>
-        <tr><td align="left"><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$client_name|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client_address}:</b> {$client_address|escape}</td></tr>
+        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$timesheet['name']|escape} </b></td></tr>
+        <tr><td align="left"><b>{$i18n.label.user}:</b> {$timesheet['user_name']|escape}</td></tr>
+{if $timesheet['client_id']}
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
+{/if}
       </table>
     </td>
   </tr>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index dc5c81557..845a94f27 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -40,7 +40,11 @@
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
   {if $show_approval_status}
+     {if $timesheet.approval_status == null}
+          <td></td>
+     {else}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+     {/if}
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
diff --git a/timesheet_view.php b/timesheet_view.php
index 136c7f118..5cbd3cfcf 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -47,27 +47,7 @@
 // TODO: add other checks here for timesheet being appropriate for user role.
 // End of access checks.
 
-$invoice_date = new DateAndTime(DB_DATEFORMAT, $invoice['date']);
-$client = ttClientHelper::getClient($invoice['client_id'], true);
-if (!$client) // In case client was deleted.
-  $client = ttClientHelper::getDeletedClient($invoice['client_id']);
-
-$invoice_items = ttInvoiceHelper::getInvoiceItems($cl_invoice_id);
-$tax_percent = $client['tax'];
-
-$subtotal = 0;
-$tax = 0;
-foreach($invoice_items as $item)
-  $subtotal += $item['cost'];
-if ($tax_percent > 0) {
-  $tax_expenses = $user->isPluginEnabled('et');
-  foreach($invoice_items as $item) {
-    if ($item['type'] == 2 && !$tax_expenses)
-      continue;
-    $tax += round($item['cost'] * $tax_percent / 100, 2);
-  }
-}
-$total = $subtotal + $tax;
+// $timesheet_items = ttTimesheetHelper::getTimesheetItems($timesheet_id);
 
 $currency = $user->getCurrency();
 $decimalMark = $user->getDecimalMark();
@@ -118,8 +98,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('invoice_id', $cl_invoice_id);
-$smarty->assign('timesheet_name', $timesheet['name']);
-$smarty->assign('invoice_date', $invoice_date->toString($user->getDateFormat()));
+$smarty->assign('timesheet', $timesheet);
 $smarty->assign('client_name', $client['name']);
 $smarty->assign('client_address', $client['address']);
 $smarty->assign('show_project', MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode);

From bc7836c64252d104495878af3c005210cb977072 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Feb 2019 17:11:44 +0000
Subject: [PATCH 0690/1848] Implemented timesheet view.

---
 WEB-INF/lib/ttReportHelper.class.php    | 12 ++++
 WEB-INF/lib/ttTimesheetHelper.class.php | 27 +++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    | 87 ++++++-------------------
 timesheet_view.php                      | 62 ++----------------
 5 files changed, 65 insertions(+), 125 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c3656ad6f..1f537bbb0 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -43,6 +43,12 @@ static function getWhere($options) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    // A shortcut for timesheets.
+    if ($options['timesheet_id']) {
+      $where = " where l.timesheet_id = ".$options['timesheet_id']." and l.group_id = $group_id and l.org_id = $org_id";
+      return $where;
+    }
+
     // Prepare dropdown parts.
     $dropdown_parts = '';
     if ($options['client_id'])
@@ -89,6 +95,12 @@ static function getExpenseWhere($options) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    // A shortcut for timesheets.
+    if ($options['timesheet_id']) {
+      $where = " where ei.timesheet_id = ".$options['timesheet_id']." and ei.group_id = $group_id and ei.org_id = $org_id";
+      return $where;
+    }
+
     // Prepare dropdown parts.
     $dropdown_parts = '';
     if ($options['client_id'])
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 49808359a..94b9beff2 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -214,7 +214,8 @@ static function getTimesheet($timesheet_id) {
 
     if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
 
-    $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name, ts.name from tt_timesheets ts".
+    $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name,".
+      " ts.name, ts.submitter_comment from tt_timesheets ts".
       " left join tt_users u on (u.id = ts.user_id)".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
@@ -296,4 +297,28 @@ static function isUserValid($user_id) {
 
     return true;
   }
+
+  // getReportOptions prepares $options array to be used with ttReportHelper
+  // to obtain items for timesheet view.
+  static function getReportOptions($timesheet) {
+    global $user;
+    $group_by_client = $user->isPluginEnabled('cl') && !$timesheet['client_id'];
+    $trackingMode = $user->getTrackingMode();
+    $group_by_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+
+    $options['timesheet_id'] = $timesheet['id'];
+    $options['client_id'] = $timesheet['client_id'];
+    $options['users'] = $timesheet['user_id'];
+    $options['show_durarion'] = 1;
+    $options['show_cost'] = 1; // To include expenses.
+    $options['show_totals_only'] = 1;
+    $options['group_by1'] = 'date';
+    if ($group_by_client || $group_by_project) {
+      $options['group_by2'] = $group_by_client ? 'client' : 'project';
+    }
+    if ($options['group_by2'] && $options['group_by2'] != 'project' && $group_by_project) {
+      $options['group_by3'] = 'project';
+    }
+    return $options;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7d43e77d1..df96c6a12 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.37.4748 | 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.37.4749 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 79ce95a37..dbdd42de7 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -10,82 +10,35 @@
         <tr><td align="left"><b>{$i18n.label.user}:</b> {$timesheet['user_name']|escape}</td></tr>
 {if $timesheet['client_id']}
         <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
+{/if}
+{if $timesheet['submitter_comment']}
+        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
 {/if}
       </table>
     </td>
   </tr>
   <tr>
     <td valign="top">
-{if $invoice_items}
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.date}</td>
-          <td class="tableHeader">{$i18n.form.invoice.person}</td>
-  {if $show_project}
-          <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-  {if $show_task}
-          <td class="tableHeader">{$i18n.label.task}</td>
-  {/if}
-          <td class="tableHeader">{$i18n.label.note}</td>
-          <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
-          <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td class="tableHeader">{$i18n.label.paid}</td>
-  {/if}
-        </tr>
-  {foreach $invoice_items as $invoice_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td valign="top">{$invoice_item.date}</td>
-          <td valign="top">{$invoice_item.user_name|escape}</td>
-    {if $show_project}
-          <td valign="top">{$invoice_item.project_name|escape}</td>
-    {/if}
-    {if $show_task}
-          <td valign="top">{$invoice_item.task_name|escape}</td>
-    {/if}
-          <td valign="top">{$invoice_item.note|escape}</td>
-          <td align="right" valign="top">{$invoice_item.duration}</td>
-          <td align="right" valign="top">{$invoice_item.cost}</td>
-    {if $user->isPluginEnabled('ps')}
-          <td align="right" valign="top">{if $invoice_item.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-    {/if}
-        </tr>
+      <tr>
+        <td class="tableHeader">{$group_by_header|escape}</td>
+        <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
+        <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
+      </tr>
+  {foreach $subtotals as $subtotal}
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
+        <td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>
+        <td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>
+      </tr>
   {/foreach}
-        <tr><td>&nbsp;</td></tr>
-  {if $tax}
-        <tr>
-          <td align="right" colspan="{$colspan}"><b>{$i18n.label.subtotal}:</b></td>
-          <td align="right"><nobr>{$subtotal|escape}</nobr></td>
-        </tr>
-        <tr>
-          <td align="right" colspan="{$colspan}"><b>{$i18n.label.tax}:</b></td>
-          <td align="right"><nobr>{$tax|escape}</nobr></td>
-        </tr>
-   {/if}
-        <tr>
-          <td align="right" colspan="{$colspan}"><b>{$i18n.label.total}:</b></td>
-          <td align="right"><nobr>{$total|escape}</nobr></td>
-        </tr>
-      </table>
-
-  {$forms.invoiceForm.open}
-  {if $user->isPluginEnabled('ps')}
-  <table width="720" cellspacing="0" cellpadding="0" border="0">
-  <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.label.mark_paid}: {$forms.invoiceForm.mark_paid_action_options.control} {$forms.invoiceForm.btn_mark_paid.control}</td></tr>
+      <tr><td>&nbsp;</td></tr>
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
+        <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>
+        <td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>
+      </tr>
       </table>
     </td>
   </tr>
-  </table>
-  {/if}
-  {$forms.invoiceForm.close}
-{/if}
-    </td>
-  </tr>
-  <tr><td align="center"><br><form>
-    <input type="button" onclick="chLocation('invoice_send.php?id={$invoice_id}');" value="{$i18n.button.send_by_email}">
-  </form></td></tr>
 </table>
diff --git a/timesheet_view.php b/timesheet_view.php
index 5cbd3cfcf..bbac161ca 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -47,64 +47,14 @@
 // TODO: add other checks here for timesheet being appropriate for user role.
 // End of access checks.
 
-// $timesheet_items = ttTimesheetHelper::getTimesheetItems($timesheet_id);
+$options = ttTimesheetHelper::getReportOptions($timesheet);
+$subtotals = ttReportHelper::getSubtotals($options);
+$totals = ttReportHelper::getTotals($options);
 
-$currency = $user->getCurrency();
-$decimalMark = $user->getDecimalMark();
-
-$smarty->assign('subtotal', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($subtotal, 2))));
-if ($tax) $smarty->assign('tax', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($tax, 2))));
-$smarty->assign('total', $currency.' '.str_replace('.', $decimalMark, sprintf('%8.2f', round($total, 2))));
-
-if ('.' != $decimalMark) {
-  foreach ($invoice_items as &$item)
-    $item['cost'] = str_replace('.', $decimalMark, $item['cost']);
-}
-
-// Calculate colspan for invoice summary.
-$colspan = 4;
-$trackingMode = $user->getTrackingMode();
-if (MODE_PROJECTS == $trackingMode)
-  $colspan++;
-elseif (MODE_PROJECTS_AND_TASKS == $trackingMode)
-  $colspan += 2;
-
-$form = new Form('invoiceForm');
-// Hidden control for invoice id.
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
-// invoiceForm only contains controls for "Mark paid" block below invoice table.
-if ($user->isPluginEnabled('ps')) {
-  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'mark_paid_action_options',
-    'data'=>$mark_paid_action_options,
-    'value'=>$cl_mark_paid_action_option));
-  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
-}
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_mark_paid')) {
-    // User clicked the "Mark paid" button to mark all invoice items either paid or not paid.
-
-    // Determine user action.
-    $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
-    ttInvoiceHelper::markPaid($cl_invoice_id, $mark_paid);
-
-    // Re-display this form.
-    header('Location: invoice_view.php?id='.$cl_invoice_id);
-    exit();
-  }
-}
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('invoice_id', $cl_invoice_id);
+$smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
-$smarty->assign('client_name', $client['name']);
-$smarty->assign('client_address', $client['address']);
-$smarty->assign('show_project', MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode);
-$smarty->assign('show_task', MODE_PROJECTS_AND_TASKS == $trackingMode);
-$smarty->assign('invoice_items', $invoice_items);
-$smarty->assign('colspan', $colspan);
+$smarty->assign('subtotals', $subtotals);
+$smarty->assign('totals', $totals);
 $smarty->assign('title', $i18n->get('title.timesheet'));
 $smarty->assign('content_page_name', 'timesheet_view.tpl');
 $smarty->display('index.tpl');

From 73f1ed8b4fb4888b8251b3575ba1d94cf1a68a4e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Feb 2019 22:44:01 +0000
Subject: [PATCH 0691/1848] Some fixes on timesheets.php for clients.

---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/timesheets.tpl | 62 ++++++++++++++++----------------
 timesheets.php                   | 11 +++---
 3 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index df96c6a12..37f3de1ec 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.37.4749 | 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.37.4750 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 845a94f27..f9b89d792 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,7 +4,7 @@
 
 {$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $show_hint}
+{if $not_client}
   <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
 {/if}
 {if $user_dropdown}
@@ -13,33 +13,31 @@
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_timesheets}
+{if $inactive_timesheets}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.active_timesheets}</td></tr>
-  {/if}
+{/if}
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
-  {if $show_client}
+{if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_submit_status}
+{/if}
+{if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
-  {/if}
-  {if $show_approval_status}
           <td class="tableHeader">{$i18n.label.approved}</td>
-  {/if}
+{/if}
           <td class="tableHeader">{$i18n.label.view}</td>
+{if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
+{/if}
         </tr>
-        {foreach $active_timesheets as $timesheet}
+{foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$timesheet.name|escape}</td>
   {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
   {/if}
-  {if $show_submit_status}
+  {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
-  {if $show_approval_status}
      {if $timesheet.approval_status == null}
           <td></td>
      {else}
@@ -47,17 +45,17 @@
      {/if}
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-  {if !$user->isClient()}
+  {if $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
   {/if}
         </tr>
-        {/foreach}
+{/foreach}
       </table>
-  {if !$user->isClient()}
+{if $not_client}
       <table width="100%">
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
-  {/if}
+{/if}
 
 {if $inactive_timesheets}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
@@ -68,35 +66,37 @@
   {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if $show_submit_status}
+  {if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
-  {/if}
-  {if $show_approval_status}
           <td class="tableHeader">{$i18n.label.approved}</td>
   {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
+  {if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
+  {/if}
         </tr>
-        {foreach $inactive_timesheets as $timesheet}
+  {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$timesheet.name|escape}</td>
-  {if $show_client}
+    {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
-  {/if}
-  {if $show_submit_status}
+    {/if}
+    {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
-  {if $show_approval_status}
+      {if $timesheet.approval_status == null}
+          <td></td>
+      {else}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
+      {/if}
+    {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-  {if !$user->isClient()}
+    {if $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-  {/if}
+    {/if}
         </tr>
-        {/foreach}
+  {/foreach}
       </table>
-  {if !$user->isClient()}
+  {if $not_client}
       <table width="100%">
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
diff --git a/timesheets.php b/timesheets.php
index 63a1bb348..672e85974 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -100,14 +100,15 @@
 if ($notClient)
   $inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
 
-$show_client = $user->isPluginEnabled('cl') && $notClient;
+$showClient = $user->isPluginEnabled('cl') && $notClient;
+$canEdit = $notClient && ($user->can('manage_own_timesheets') ||
+  $user->can('manage_timesheets') || $user->can('manage_all_timesheets'));
 
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);
-$smarty->assign('show_client', $show_client);
-$smarty->assign('show_hint', $notClient);
-$smarty->assign('show_submit_status', $notClient);
-$smarty->assign('show_approval_status', $notClient);
+$smarty->assign('show_client', $showClient);
+$smarty->assign('not_client', $notClient);
+$smarty->assign('can_edit', $canEdit);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');

From 887a005ea99f044d266f489632b0a94a4acc99b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Feb 2019 23:16:53 +0000
Subject: [PATCH 0692/1848] Some more work in progress on timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl            | 2 +-
 WEB-INF/templates/timesheet_view.tpl    | 5 ++++-
 timesheet_view.php                      | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 94b9beff2..07f02f861 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -215,7 +215,7 @@ static function getTimesheet($timesheet_id) {
     if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
 
     $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name,".
-      " ts.name, ts.submitter_comment from tt_timesheets ts".
+      " ts.name, ts.submitter_comment, ts.submit_status from tt_timesheets ts".
       " left join tt_users u on (u.id = ts.user_id)".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 37f3de1ec..86ccb33ff 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.37.4750 | 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.37.4751 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index dbdd42de7..c22df7ac8 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -11,8 +11,11 @@
 {if $timesheet['client_id']}
         <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
 {/if}
-{if $timesheet['submitter_comment']}
+{if $not_client}
+        <tr><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
+  {if $timesheet['submitter_comment']}
         <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
+  {/if}
 {/if}
       </table>
     </td>
diff --git a/timesheet_view.php b/timesheet_view.php
index bbac161ca..80b3b77ac 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -50,7 +50,9 @@
 $options = ttTimesheetHelper::getReportOptions($timesheet);
 $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
+$notClient = !$user->isClient();
 
+$smarty->assign('not_client', $notClient);
 $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);

From c7d73ed8f6e2deade801bedaeb3af934ba69bf88 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 22 Feb 2019 16:16:25 +0000
Subject: [PATCH 0693/1848] Started to work on timesheet approval workflow.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 25 +++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php            |  2 +-
 WEB-INF/lib/ttUserHelper.class.php      | 17 +++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_view.php                      |  3 +++
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 07f02f861..0d4556bc7 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -321,4 +321,29 @@ static function getReportOptions($timesheet) {
     }
     return $options;
   }
+
+  // getApprovers obtains a list of users who can approve a timesheet for a given user
+  // and also have an email to receive a notification about it.
+  static function getApprovers($user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $approvers = array();
+    $rank = ttUserHelper::getUserRank($user_id);
+    $sql = "select u.id, u.name, u.email".
+      " from tt_users u".
+      " left join tt_roles r on (r.id = u.role_id)".
+      " where u.status = 1 and u.email is not null".
+      " and (r.rights like '%approve_all_timesheets%' or (r.rank > $rank and r.rights like '%approve_timesheets%'))";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $approvers[] = $val;
+      }
+    }
+    return $approvers;
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 36f9163f1..28eeebcfd 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -592,7 +592,7 @@ function checkBehalfId() {
         return false;
 
       // So far, so good. Check user now.
-      $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>MAX_RANK);
+      $options = array('status'=>ACTIVE,'max_rank'=>MAX_RANK);
       $users = $this->getUsers($options);
       foreach($users as $one_user) {
         if ($one_user['id'] == $this->behalf_id)
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index d0a09ced8..17ef08c23 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -404,4 +404,21 @@ static function canAdd($num_users = 1) {
 
     return false;
   }
+
+  // getUserRank - obtains a rank for a given user.
+  static function getUserRank($user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select r.rank from tt_users u".
+      " left join tt_roles r on (u.role_id = r.id)".
+      " where u.id = $user_id and u.group_id = $group_id and u.org_id = $org_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return 0;
+    $val = $res->fetchRow();
+    return $val['rank'];
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 86ccb33ff..a84e3246e 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.37.4751 | 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.37.4752 | 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/timesheet_view.php b/timesheet_view.php
index 80b3b77ac..bd97a52a5 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -52,6 +52,9 @@
 $totals = ttReportHelper::getTotals($options);
 $notClient = !$user->isClient();
 
+// Determine managers we can submit this timesheet for approval to.
+$approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+
 $smarty->assign('not_client', $notClient);
 $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);

From 8fd871c1242b3309b8a374a97969ab74d5375069 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 22 Feb 2019 21:38:50 +0000
Subject: [PATCH 0694/1848] More progress on timesheet approval workflow.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 25 +++++++++++++-
 WEB-INF/resources/ca.lang.php           |  2 ++
 WEB-INF/resources/cs.lang.php           |  2 ++
 WEB-INF/resources/da.lang.php           |  3 ++
 WEB-INF/resources/de.lang.php           |  3 ++
 WEB-INF/resources/en.lang.php           |  2 ++
 WEB-INF/resources/es.lang.php           |  2 ++
 WEB-INF/resources/et.lang.php           |  4 +++
 WEB-INF/resources/fa.lang.php           |  3 ++
 WEB-INF/resources/fi.lang.php           |  3 ++
 WEB-INF/resources/fr.lang.php           |  3 ++
 WEB-INF/resources/gr.lang.php           |  3 ++
 WEB-INF/resources/he.lang.php           |  3 ++
 WEB-INF/resources/hu.lang.php           |  2 ++
 WEB-INF/resources/it.lang.php           |  3 ++
 WEB-INF/resources/ja.lang.php           |  2 ++
 WEB-INF/resources/ko.lang.php           |  2 ++
 WEB-INF/resources/nl.lang.php           |  3 ++
 WEB-INF/resources/no.lang.php           |  2 ++
 WEB-INF/resources/pl.lang.php           |  3 ++
 WEB-INF/resources/pt-br.lang.php        |  3 ++
 WEB-INF/resources/pt.lang.php           |  2 ++
 WEB-INF/resources/ro.lang.php           |  2 ++
 WEB-INF/resources/ru.lang.php           |  2 ++
 WEB-INF/resources/sk.lang.php           |  2 ++
 WEB-INF/resources/sl.lang.php           |  2 ++
 WEB-INF/resources/sr.lang.php           |  3 ++
 WEB-INF/resources/sv.lang.php           |  3 ++
 WEB-INF/resources/tr.lang.php           |  2 ++
 WEB-INF/resources/zh-cn.lang.php        |  2 ++
 WEB-INF/resources/zh-tw.lang.php        |  2 ++
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    | 32 ++++++++++++++++++
 timesheet_view.php                      | 45 +++++++++++++++++++++++--
 34 files changed, 175 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 0d4556bc7..df1e4e484 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -215,7 +215,7 @@ static function getTimesheet($timesheet_id) {
     if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
 
     $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name,".
-      " ts.name, ts.submitter_comment, ts.submit_status from tt_timesheets ts".
+      " ts.name, ts.submitter_comment, ts.submit_status, ts.approval_status, ts.manager_comment from tt_timesheets ts".
       " left join tt_users u on (u.id = ts.user_id)".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
@@ -346,4 +346,27 @@ static function getApprovers($user_id) {
     }
     return $approvers;
   }
+
+  // submitTimesheet marks a timesheet as submitted and sends an email to an approver.
+  static function submitTimesheet($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // First, mark a timesheet as submitted.
+    // Even if mail part below does not work, this will get us a functioning workflow
+    // (without email notifications).
+    $timesheet_id = $fields['timesheet_id'];
+    $sql = "update tt_timesheets set submit_status = 1".
+      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // TODO: send email to approver here...
+    // $approver_id = $fields['approver_id'];
+
+    return true;
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6dd031c23..4830b0e72 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -151,6 +151,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 771a0f297..9cbdba5eb 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -153,6 +153,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 702958d41..1d39ffbf5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -144,6 +144,9 @@
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Luk',
 'button.stop' => 'Stop',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Team navn', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 257ab7e91..6a967bd4b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -138,6 +138,9 @@
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
 'button.stop' => 'Stop',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Gruppenname',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7621a83d5..0534e60b0 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -131,6 +131,8 @@
 'button.import' => 'Import group',
 'button.close' => 'Close',
 'button.stop' => 'Stop',
+'button.approve' => 'Approve',
+'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Group name',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 19a8ed515..02d621541 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -150,6 +150,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 170c447a8..a5b4319c2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -152,6 +152,10 @@
 'button.import' => 'Impordi grupp',
 'button.close' => 'Sulge',
 'button.stop' => 'Stopp',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
+
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Grupi nimi',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 783a1b5a3..e4983f402 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -151,6 +151,9 @@
 'button.import' => 'وارد کردن تیم', // TODO: replace "team" with "group".
 'button.close' => 'بستن',
 'button.stop' => 'توقف',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'نام تیم', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 175c993e4..2dc50b616 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -146,6 +146,9 @@
 'button.import' => 'Tuo tiimi', // TODO: replace "team" with "group".
 'button.close' => 'Sulje',
 'button.stop' => 'Lopeta',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Tiimin nimi', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9d7a7c7e4..a26bba753 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -144,6 +144,9 @@
 'button.import' => 'Importer une équipe', // TODO: replace "team" with "group".
 'button.close' => 'Fermer',
 'button.stop' => 'Arrêter',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Nom équipe', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9e22079e2..0159ff293 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -139,6 +139,9 @@
 'button.import' => 'Εισαγωγή ομάδας',
 'button.close' => 'Κλείσιμο',
 'button.stop' => 'Τέλος',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Όνομα ομάδας',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3418d106d..ab5d1b023 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -161,6 +161,9 @@
 'button.import' => 'ייבא צוות', // TODO: replace "team" with "group".
 'button.close' => 'סגור',
 'button.stop' => 'עצור',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'שם הצוות', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9157dd68b..521b42e5f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -152,6 +152,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 51768b0d3..ca39ee64e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -143,6 +143,9 @@
 'button.import' => 'Importa gruppo',
 'button.close' => 'Chiudi',
 'button.stop' => 'Stop',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Nome del gruppo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index e19c4a4ba..f85d3ef14 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -156,6 +156,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 3999a097b..ba9b4e021 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -155,6 +155,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 58fdd7205..a416da5e3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -132,6 +132,9 @@
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
 'button.stop' => 'Stop',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Groepsnaam',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1a88ce308..3973be838 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -156,6 +156,8 @@
 'button.close' => 'Lukk',
 // TODO: translate the following.
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8af61cf8b..0b867ff34 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -148,6 +148,9 @@
 'button.import' => 'Importuj zespół', // TODO: replace "team" with "group".
 'button.close' => 'Zamknij',
 'button.stop' => 'Zatrzymaj',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Nazwa zespołu',  // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 018c7717c..3a48deccf 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -145,6 +145,9 @@
 'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
 'button.close' => 'Fechar',
 'button.stop' => 'Parar',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Nome da equipe',  // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d8f1611c4..6ee9363b2 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -148,6 +148,8 @@
 // 'button.import' => 'Import group',
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 47ae568c5..f2bd2e956 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -156,6 +156,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 97cab56c5..b30765a01 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -130,6 +130,8 @@
 'button.import' => 'Импортировать группу',
 'button.close' => 'Закрыть',
 'button.stop' => 'Завершить',
+'button.approve' => 'Одобрить',
+'button.disapprove' => 'Не одобрить',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Название группы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index fa0df1d5d..f6a0a0687 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -152,6 +152,8 @@
 'button.close' => 'Zatvoriť',
 // TODO: translate the following.
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Názov tímu', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 620a8b840..0e602e426 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -146,6 +146,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8163a8087..cfc2dac50 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -145,6 +145,9 @@
 'button.import' => 'Uvezi tim', // TODO: replace "team" with "group".
 'button.close' => 'Zatvori',
 'button.stop' => 'Stani',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Naziv tim-a', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 8ddf01adc..24072b0e8 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -143,6 +143,9 @@
 'button.import' => 'Importera grupp',
 'button.close' => 'Stäng',
 'button.stop' => 'Avsluta',
+// TODO: translate the following.
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Namn på grupp',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4f82410f6..cccf336c2 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -159,6 +159,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 41e4acdfc..6f4f6389f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -147,6 +147,8 @@
 'button.close' => '关闭',
 // TODO: translate the following.
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => '团队名称', // TODO: replace "team" with "group".
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5e582399c..49bfb85da 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -152,6 +152,8 @@
 // TODO: translate the following.
 // 'button.close' => 'Close',
 // 'button.stop' => 'Stop',
+// 'button.approve' => 'Approve',
+// 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a84e3246e..71d49f2e4 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.37.4752 | 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.37.4753 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index c22df7ac8..171144394 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -16,6 +16,12 @@
   {if $timesheet['submitter_comment']}
         <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
   {/if}
+  {if $timesheet['submit_status']}
+        <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approval_status != null}{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>{/if}
+  {/if}
+  {if $timesheet['manager_comment']}
+        <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['manager_comment']|escape}</td></tr>
+  {/if}
 {/if}
       </table>
     </td>
@@ -42,6 +48,32 @@
         <td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>
       </tr>
       </table>
+
+{$forms.timesheetForm.open}
+  {if $show_submit}
+  <table width="720" cellspacing="0" cellpadding="0" border="0">
+  <tr>
+    <td align="center">
+      <table>
+        <tr><td>{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control} {$forms.timesheetForm.btn_submit.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  </table>
+  {/if}
+  {if $show_approve}
+  <table width="720" cellspacing="0" cellpadding="0" border="0">
+  <tr>
+    <td align="center">
+      <table>
+        <tr><td>{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  </table>
+  {/if}
+{$forms.timesheetForm.close}
+
     </td>
   </tr>
 </table>
diff --git a/timesheet_view.php b/timesheet_view.php
index bd97a52a5..0e9a7ea96 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -45,6 +45,7 @@
   exit();
 }
 // TODO: add other checks here for timesheet being appropriate for user role.
+// TODO: if this is a timeheet submit, validate approver id, too.
 // End of access checks.
 
 $options = ttTimesheetHelper::getReportOptions($timesheet);
@@ -52,14 +53,54 @@
 $totals = ttReportHelper::getTotals($options);
 $notClient = !$user->isClient();
 
-// Determine managers we can submit this timesheet for approval to.
-$approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+// Determine which controls to show and obtain date for them.
+$showSubmit = $notClient && !$timesheet['submit_status'];
+if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+$canApprove = $user->can('approve_timesheets') || $user_>can('approve_all_timesheets');
+$showApprove = $notClient && $timesheet['submit_status'] && !$timesheet['approval_status'];
+
+// Add a form with controls.
+$form = new Form('timesheetForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$timesheet['id']));
+
+if ($showSubmit) {
+  if (count($approvers) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'name'=>'approver',
+      'style'=>'width: 200px;',
+      'data'=>$approvers,
+      'datakeys'=>array('id','name')));
+  }
+  $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
+}
+
+if ($showApprove) {
+  $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
+}
+
+// Submit.
+if ($request->isPost()) {
+  if ($request->getParameter('btn_submit')) {
+    $fields = array('timesheet_id' => $timesheet['id'],
+      'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.
+    if (ttTimesheetHelper::submitTimesheet($fields)) {
+      // Redirect to self.
+      header('Location: timesheet_view.php?id='.$timesheet['id']);
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+}
 
 $smarty->assign('not_client', $notClient);
 $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('show_submit', $showSubmit);
+$smarty->assign('show_approve', $showApprove);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheet'));
 $smarty->assign('content_page_name', 'timesheet_view.tpl');
 $smarty->display('index.tpl');

From e5486346ac0574517a4fd118f03616ec455df9a9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 22 Feb 2019 22:13:15 +0000
Subject: [PATCH 0695/1848] Implemented timesheet approval in initial form.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 46 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    |  4 ++-
 timesheet_view.php                      | 29 +++++++++++++++-
 4 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index df1e4e484..21e75a96d 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -369,4 +369,50 @@ static function submitTimesheet($fields) {
 
     return true;
   }
+
+  // approveTimesheet marks a timesheet as approved and sends an email to submitter.
+  static function approveTimesheet($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // First, mark a timesheet as approved.
+    // Even if mail part below does not work, this will get us a functioning workflow
+    // (without email notifications).
+    $timesheet_id = $fields['timesheet_id'];
+    $manager_comment = $fields['comment'];
+
+    $sql = "update tt_timesheets set approval_status = 1, manager_comment = ".$mdb2->quote($manager_comment).
+      " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // TODO: send email to submitter here...
+    return true;
+  }
+
+  // disapproveTimesheet marks a timesheet as approved and sends an email to submitter.
+  static function disapproveTimesheet($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // First, mark a timesheet as disapproved.
+    // Even if mail part below does not work, this will get us a functioning workflow
+    // (without email notifications).
+    $timesheet_id = $fields['timesheet_id'];
+    $manager_comment = $fields['comment'];
+
+    $sql = "update tt_timesheets set approval_status = 0, manager_comment = ".$mdb2->quote($manager_comment).
+      " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // TODO: send email to submitter here...
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 71d49f2e4..024e05d38 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.37.4753 | 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.37.4754 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 171144394..97591fe0b 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -66,7 +66,9 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</td></tr>
+        <tr><td align="center">{$i18n.label.comment}:</td></tr>
+        <tr><td align="center">{$forms.timesheetForm.comment.control}</td></tr>
+        <tr><td align="center">{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</td></tr>
       </table>
     </td>
   </tr>
diff --git a/timesheet_view.php b/timesheet_view.php
index 0e9a7ea96..70ab3357d 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -48,6 +48,10 @@
 // TODO: if this is a timeheet submit, validate approver id, too.
 // End of access checks.
 
+if ($request->isPost()) {
+  $cl_comment = trim($request->getParameter('comment'));
+}
+
 $options = ttTimesheetHelper::getReportOptions($timesheet);
 $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
@@ -57,7 +61,7 @@
 $showSubmit = $notClient && !$timesheet['submit_status'];
 if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
 $canApprove = $user->can('approve_timesheets') || $user_>can('approve_all_timesheets');
-$showApprove = $notClient && $timesheet['submit_status'] && !$timesheet['approval_status'];
+$showApprove = $notClient && $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
 // Add a form with controls.
 $form = new Form('timesheetForm');
@@ -75,6 +79,7 @@
 }
 
 if ($showApprove) {
+  $form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;'));
   $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
   $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
 }
@@ -91,6 +96,28 @@
     } else
       $err->add($i18n->get('error.db'));
   }
+
+  if ($request->getParameter('btn_approve')) {
+    $fields = array('timesheet_id' => $timesheet['id'],
+      'comment' => $cl_comment);
+    if (ttTimesheetHelper::approveTimesheet($fields)) {
+      // Redirect to self.
+      header('Location: timesheet_view.php?id='.$timesheet['id']);
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+
+  if ($request->getParameter('btn_disapprove')) {
+    $fields = array('timesheet_id' => $timesheet['id'],
+      'comment' => $cl_comment);
+    if (ttTimesheetHelper::disapproveTimesheet($fields)) {
+      // Redirect to self.
+      header('Location: timesheet_view.php?id='.$timesheet['id']);
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
 }
 
 $smarty->assign('not_client', $notClient);

From db55bdb7b1dd2bcfa793437fe97a6777eb9d93a6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 13:58:42 +0000
Subject: [PATCH 0696/1848] Fixed menu display for client role.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 timesheet_view.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 024e05d38..8ee0d3825 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.37.4754 | 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.37.4755 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 0b9e290a1..385f8a85b 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -113,7 +113,7 @@
             &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
-            &middot; <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a> 
+      {if !$user->isClient()}&middot;{/if} <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('view_client_timesheets'))}
             &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
diff --git a/timesheet_view.php b/timesheet_view.php
index 70ab3357d..5079fe7b7 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -45,7 +45,7 @@
   exit();
 }
 // TODO: add other checks here for timesheet being appropriate for user role.
-// TODO: if this is a timeheet submit, validate approver id, too.
+// TODO: if this is a timesheet submit, validate approver id, too.
 // End of access checks.
 
 if ($request->isPost()) {

From 4453de30f591a32c3de8fd71f5b5ad9558d3878e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 14:44:39 +0000
Subject: [PATCH 0697/1848] Added timesheet name to report output.

---
 WEB-INF/lib/ttReportHelper.class.php | 12 ++++++++++--
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1f537bbb0..6b84f4c71 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -166,7 +166,6 @@ static function getItems($options) {
     array_push($fields, 'l.user_id');
     array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
     array_push($fields, 'l.date');
-    array_push($fields, 'l.timesheet_id');
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
@@ -235,6 +234,9 @@ static function getItems($options) {
     // Add invoice name if it is selected.
     if (($canViewReports || $isClient) && $options['show_invoice'])
       array_push($fields, 'i.name as invoice');
+    // Add timesheet name if it is selected.
+    if ($options['show_timesheet'])
+      array_push($fields, 'ts.name as timesheet_name');
 
     // Prepare sql query part for left joins.
     $left_joins = null;
@@ -258,6 +260,8 @@ static function getItems($options) {
     }
     if ($includeCost && MODE_TIME != $trackingMode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
+    if ($options['show_timesheet'])
+      $left_joins .= " left join tt_timesheets ts on (l.timesheet_id = ts.id)";
 
     $where = ttReportHelper::getWhere($options);
 
@@ -274,7 +278,6 @@ static function getItems($options) {
       array_push($fields, 'ei.user_id');
       array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
       array_push($fields, 'ei.date');
-      array_push($fields, 'ei.timesheet_id');
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
       // Add client name if it is selected.
@@ -315,6 +318,8 @@ static function getItems($options) {
       // Add invoice name if it is selected.
       if (($canViewReports || $isClient) && $options['show_invoice'])
         array_push($fields, 'i.name as invoice');
+      if ($options['show_timesheet'])
+        array_push($fields, 'ts.name as timesheet_name');
 
       // Prepare sql query part for left joins.
       $left_joins = null;
@@ -326,6 +331,8 @@ static function getItems($options) {
         $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
       if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
+      if ($options['show_timesheet'])
+        $left_joins .= " left join tt_timesheets ts on (ei.timesheet_id = ts.id)";
 
       $where = ttReportHelper::getExpenseWhere($options);
 
@@ -1005,6 +1012,7 @@ static function getReportOptions($bean) {
     $options['show_note'] = $bean->getAttribute('chnote');
     $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
     $options['show_work_units'] = $bean->getAttribute('chunits');
+    $options['show_timesheet'] = $bean->getAttribute('chtimesheet');
     $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
     $options['group_by1'] = $bean->getAttribute('group_by1');
     $options['group_by2'] = $bean->getAttribute('group_by2');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8ee0d3825..049d1f37f 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.37.4755 | 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.37.4756 | 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/report.tpl b/WEB-INF/templates/report.tpl
index b603dd27c..f62929f9f 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -104,7 +104,7 @@
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
     {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_id|escape}</td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
     {if $use_checkboxes}
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}

From eba5280c22e659f7144ccb5129424f645bada9ab Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 14:57:01 +0000
Subject: [PATCH 0698/1848] Fixed display of Timesheet checkbox for clients.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 049d1f37f..951bba177 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.37.4756 | 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.37.4757 | 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/reports.php b/reports.php
index 05d7e5f26..264e5645c 100644
--- a/reports.php
+++ b/reports.php
@@ -180,8 +180,8 @@
 
 // Add timesheet assignment selector.
 $showTimesheet = $user->isPluginEnabled('ts') &&
-  ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
-  $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'));
+  ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
+   $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
 if ($showTimesheet) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',

From 0f3dceb9c5fd515d2e1bd39a480345d71ad6a113 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 15:10:00 +0000
Subject: [PATCH 0699/1848] Fixed report filter by timesheet assignment.

---
 WEB-INF/lib/ttReportHelper.class.php | 13 +++++++++----
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 6b84f4c71..c96f0f4dc 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -60,8 +60,10 @@ static function getWhere($options) {
     if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
     if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
     if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
-    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not null';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is null';
+    if ($options['timesheet']=='1') $dropdown_parts .= ' and l.timesheet_id is not null';
+    if ($options['timesheet']=='2') $dropdown_parts .= ' and l.timesheet_id is null';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
@@ -108,8 +110,10 @@ static function getExpenseWhere($options) {
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
     if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
-    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
-    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not null';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
+    if ($options['timesheet']=='1') $dropdown_parts .= ' and ei.timesheet_id is not null';
+    if ($options['timesheet']=='2') $dropdown_parts .= ' and ei.timesheet_id is null';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
@@ -995,6 +999,7 @@ static function getReportOptions($bean) {
     $options['billable'] = $bean->getAttribute('include_records');
     $options['invoice'] = $bean->getAttribute('invoice');
     $options['paid_status'] = $bean->getAttribute('paid_status');
+    $options['timesheet'] = $bean->getAttribute('timesheet');
     if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
     $options['period'] = $bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 951bba177..22f28353c 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.37.4757 | 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.37.4758 | 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>

From 18ecb507a76c7960dd3d8d2c64264e1f4f4b8952 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 15:30:54 +0000
Subject: [PATCH 0700/1848] Added timesheet output to CSV, XML, and PDF
 reports.

---
 WEB-INF/templates/footer.tpl | 2 +-
 tofile.php                   | 3 +++
 topdf.php                    | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 22f28353c..494d7e182 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.37.4758 | 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.37.4759 | 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/tofile.php b/tofile.php
index 3ddce979c..f4d5b29e8 100644
--- a/tofile.php
+++ b/tofile.php
@@ -146,6 +146,7 @@
         print "\t<ip><![CDATA[".$ip."]]></ip>\n";
       }
       if ($bean->getAttribute('chinvoice')) print "\t<invoice><![CDATA[".$item['invoice']."]]></invoice>\n";
+      if ($bean->getAttribute('chtimesheet')) print "\t<timesheet><![CDATA[".$item['timesheet_name']."]]></timesheet>\n";
 
       print "</row>\n";
     }
@@ -209,6 +210,7 @@
     if ($bean->getAttribute('chpaid')) print ',"'.$i18n->get('label.paid').'"';
     if ($bean->getAttribute('chip')) print ',"'.$i18n->get('label.ip').'"';
     if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->get('label.invoice').'"';
+    if ($bean->getAttribute('chtimesheet')) print ',"'.$i18n->get('label.timesheet').'"';
     print "\n";
 
     // Print items.
@@ -241,6 +243,7 @@
         print ',"'.$ip.'"';
       }
       if ($bean->getAttribute('chinvoice')) print ',"'.str_replace('"','""',$item['invoice']).'"';
+      if ($bean->getAttribute('chtimesheet')) print ',"'.str_replace('"','""',$item['timesheet_name']).'"';
       print "\n";
     }
   }
diff --git a/topdf.php b/topdf.php
index 181dec692..a0be19ec4 100644
--- a/topdf.php
+++ b/topdf.php
@@ -159,6 +159,7 @@
   if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
   if ($bean->getAttribute('chip')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.ip').'</td>'; }
   if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '<td>'.$i18n->get('label.invoice').'</td>'; }
+  if ($bean->getAttribute('chtimesheet')) { $colspan++; $html .= '<td>'.$i18n->get('label.timesheet').'</td>'; }
   $html .= '</tr>';
   $html .= '</thead>';
 
@@ -211,6 +212,7 @@
         if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
         if ($bean->getAttribute('chip')) $html .= '<td></td>';
         if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
+        if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
         $html .= '</tr>';
         $html .= '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
       }
@@ -249,6 +251,7 @@
         $html .= '</td>';
     }
     if ($bean->getAttribute('chinvoice')) $html .= '<td>'.htmlspecialchars($item['invoice']).'</td>';
+    if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
     $html .= '</tr>';
 
     $prev_date = $item['date'];
@@ -300,6 +303,7 @@
     if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
     if ($bean->getAttribute('chip')) $html .= '<td></td>';
     if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
+    if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
     $html .= '</tr>';
   }
 
@@ -328,6 +332,7 @@
   if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
   if ($bean->getAttribute('chip')) $html .= '<td></td>';
   if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
+  if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
   $html .= '</tr>';
   $html .= '</table>';
 }

From 140a791657742bcc0f1692a11e1e8e25caac1620 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 15:51:48 +0000
Subject: [PATCH 0701/1848] Added 2 strings to translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 4 +++-
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 4830b0e72..e303805ea 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -441,6 +441,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar període de temps',
 'form.reports.set_period' => 'o establir dates',
 'form.reports.show_fields' => 'Mostrar camps',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9cbdba5eb..e85a73971 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -451,6 +451,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Výberte období',
 'form.reports.set_period' => 'nebo určete dny',
 'form.reports.show_fields' => 'Zobrazit pole',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 1d39ffbf5..3946cd5cf 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -417,6 +417,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vælg en periode',
 'form.reports.set_period' => 'eller sæt datoer',
 'form.reports.show_fields' => 'Vis felter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6a967bd4b..3a10a7070 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -396,6 +396,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
 'form.reports.show_fields' => 'Felder anzeigen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0534e60b0..4e6a8efa5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -234,7 +234,7 @@
 'label.quota' => 'Quota',
 'label.timesheet' => 'Timesheet',
 'label.submitted' => 'Submitted',
-'label.approved' => 'Approved',
+'label.form' => 'Approved',
 
 // Form titles.
 'title.error' => 'Error',
@@ -392,6 +392,8 @@
 'form.reports.include_not_invoiced' => 'not invoiced',
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
+'form.reports.include_approved' => 'approved',
+'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 02d621541..87aff87cb 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -454,6 +454,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar período de tiempo',
 'form.reports.set_period' => 'o establecer fechas',
 'form.reports.show_fields' => 'Mostrar campos',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a5b4319c2..cf2151af7 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -421,6 +421,8 @@
 // 'form.reports.include_not_invoiced' => 'arveldamata', // TODO: fix as per the above comment, if needed.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e4983f402..1f4fd0ed4 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -437,6 +437,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'انتخاب بازه زمانی',
 'form.reports.set_period' => 'یا تعیین تاریخ',
 'form.reports.show_fields' => 'نمایش فیلدها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 2dc50b616..442ce1570 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -422,6 +422,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Valitse ajanjakso',
 'form.reports.set_period' => 'tai aseta päivät',
 'form.reports.show_fields' => 'Näytä kentät',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a26bba753..37d0a0f45 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -414,6 +414,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Sélectionner la période de temps',
 'form.reports.set_period' => 'ou dates indiquées',
 'form.reports.show_fields' => 'Afficher les champs',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 0159ff293..ecaea1c15 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -405,6 +405,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ab5d1b023..4c24586df 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -443,6 +443,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'בחר תקופת זמן',
 'form.reports.set_period' => 'או הגדר תאריכים',
 'form.reports.show_fields' => 'הראה שדות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 521b42e5f..50ba1b3e2 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -443,6 +443,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Jelölj meg egy időszakot',
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ca39ee64e..3a4777422 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -418,6 +418,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
 'form.reports.set_period' => 'oppure setta le date',
 'form.reports.show_fields' => 'Mostra i campi',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f85d3ef14..55b8ee09d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -449,6 +449,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '時間期間の選択',
 'form.reports.set_period' => 'あるいは日付を設定',
 'form.reports.show_fields' => 'フィールドの表示',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ba9b4e021..d50f8170e 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -447,6 +447,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '시간 기간을 선택',
 'form.reports.set_period' => '혹은 날짜를 설정',
 'form.reports.show_fields' => '필드들을 보기',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a416da5e3..8f4954052 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -392,6 +392,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 3973be838..95bf5e2bf 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -447,6 +447,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Velg tidsperiode',
 'form.reports.set_period' => 'eller sett dato',
 'form.reports.show_fields' => 'Vis feltene',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 0b867ff34..2b63f06bd 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -425,6 +425,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Wybierz okres',
 'form.reports.set_period' => 'lub ustaw daty',
 'form.reports.show_fields' => 'Pokaż pola',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3a48deccf..964c55d9b 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -420,6 +420,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 6ee9363b2..c51af296a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -427,6 +427,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f2bd2e956..2e1d2f273 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -450,6 +450,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Alege perioada',
 'form.reports.set_period' => 'sau introdu intervalul de date',
 'form.reports.show_fields' => 'Arata campuri',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index b30765a01..77c90653f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -384,6 +384,8 @@
 'form.reports.include_not_invoiced' => 'не внесённые в счёт',
 'form.reports.include_assigned' => 'присвоена',
 'form.reports.include_not_assigned' => 'не присвоена',
+'form.reports.include_approved' => 'одобрена',
+'form.reports.include_not_approved' => 'не одобрена',
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f6a0a0687..bd6202002 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -433,6 +433,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vyberte časový rozsah',
 'form.reports.set_period' => 'alebo nastavte dátumy',
 'form.reports.show_fields' => 'Zobraziť polia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 0e602e426..66992c49b 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -424,6 +424,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
 // 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index cfc2dac50..73966ca86 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -423,6 +423,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Odaberi vremenski raspon',
 'form.reports.set_period' => 'ili podesi datum',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 24072b0e8..410a64f5c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -421,6 +421,8 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Välj intervall',
 'form.reports.set_period' => 'eller ställ in datum',
 'form.reports.show_fields' => 'Visa fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cccf336c2..e5387283e 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -460,6 +460,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zaman aralığını seç',
 'form.reports.set_period' => 'ya da tarihleri belirle',
 'form.reports.show_fields' => 'Alanları göster',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 6f4f6389f..4406831d8 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -432,6 +432,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '选择时间段',
 'form.reports.set_period' => '或设定日期',
 'form.reports.show_fields' => '显示栏目',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 49bfb85da..47d2cfbc6 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -440,6 +440,8 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_approved' => 'approved',
+// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '選擇時間段',
 'form.reports.set_period' => '或設定日期',
 'form.reports.show_fields' => '顯示欄目',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 494d7e182..7bd156421 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.37.4759 | 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.37.4760 | 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>

From a4a45a19de0987b40ea0452fea3cd50647756a22 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 18:45:44 +0000
Subject: [PATCH 0702/1848] Some more work in progress on timesheet reporting.

---
 WEB-INF/lib/ttReportHelper.class.php | 78 +++++++++++++++++++++++-----
 WEB-INF/resources/ca.lang.php        |  1 +
 WEB-INF/resources/cs.lang.php        |  1 +
 WEB-INF/resources/da.lang.php        |  1 +
 WEB-INF/resources/de.lang.php        |  1 +
 WEB-INF/resources/en.lang.php        |  3 +-
 WEB-INF/resources/es.lang.php        |  1 +
 WEB-INF/resources/et.lang.php        |  1 +
 WEB-INF/resources/fa.lang.php        |  1 +
 WEB-INF/resources/fi.lang.php        |  1 +
 WEB-INF/resources/fr.lang.php        |  1 +
 WEB-INF/resources/gr.lang.php        |  1 +
 WEB-INF/resources/he.lang.php        |  1 +
 WEB-INF/resources/hu.lang.php        |  1 +
 WEB-INF/resources/it.lang.php        |  1 +
 WEB-INF/resources/ja.lang.php        |  1 +
 WEB-INF/resources/ko.lang.php        |  1 +
 WEB-INF/resources/nl.lang.php        |  1 +
 WEB-INF/resources/no.lang.php        |  1 +
 WEB-INF/resources/pl.lang.php        |  1 +
 WEB-INF/resources/pt-br.lang.php     |  1 +
 WEB-INF/resources/pt.lang.php        |  1 +
 WEB-INF/resources/ro.lang.php        |  1 +
 WEB-INF/resources/ru.lang.php        |  1 +
 WEB-INF/resources/sk.lang.php        |  1 +
 WEB-INF/resources/sl.lang.php        |  1 +
 WEB-INF/resources/sr.lang.php        |  1 +
 WEB-INF/resources/sv.lang.php        |  1 +
 WEB-INF/resources/tr.lang.php        |  1 +
 WEB-INF/resources/zh-cn.lang.php     |  1 +
 WEB-INF/resources/zh-tw.lang.php     |  1 +
 WEB-INF/templates/footer.tpl         |  2 +-
 reports.php                          |  6 ++-
 33 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c96f0f4dc..a14313b35 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -33,6 +33,14 @@
 
 require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php');
 
+// Definitions of types for timesheet dropdown.
+define('TIMESHEET_ALL', 0); // Include all records.
+define('TIMESHEET_NOT_ASSIGNED', 1); // Include records not assigned to timesheets.
+define('TIMESHEET_ASSIGNED', 2); // Include records assigned to timesheets.
+define('TIMESHEET_PENDING', 3); // Include records in submitted timesheets that are pending manager approval.
+define('TIMESHEET_APPROVED', 4); // Include records in approved timesheets.
+define('TIMESHEET_NOT_APPROVED', 5); // Include records in disapproved timesheets.
+
 // Class ttReportHelper is used for help with reports.
 class ttReportHelper {
 
@@ -62,8 +70,8 @@ static function getWhere($options) {
     if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
     if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not null';
     if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is null';
-    if ($options['timesheet']=='1') $dropdown_parts .= ' and l.timesheet_id is not null';
-    if ($options['timesheet']=='2') $dropdown_parts .= ' and l.timesheet_id is null';
+    if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is null';
+    if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is not null';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
@@ -112,8 +120,8 @@ static function getExpenseWhere($options) {
     if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
     if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not null';
     if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
-    if ($options['timesheet']=='1') $dropdown_parts .= ' and ei.timesheet_id is not null';
-    if ($options['timesheet']=='2') $dropdown_parts .= ' and ei.timesheet_id is null';
+    if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is null';
+    if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is not null';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
@@ -264,13 +272,25 @@ static function getItems($options) {
     }
     if ($includeCost && MODE_TIME != $trackingMode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
-    if ($options['show_timesheet'])
-      $left_joins .= " left join tt_timesheets ts on (l.timesheet_id = ts.id)";
+
+    // Prepare sql query part for inner joins.
+    $inner_joins = null;
+    if ($user->isPluginEnabled('ts')) {
+      $timesheet_option = $options['timesheet'];
+      if ($timesheet_option == TIMESHEET_PENDING)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+      else if ($timesheet_option == TIMESHEET_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+      else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+      else if ($options['show_timesheet'])
+        $inner_joins .= " left join tt_timesheets ts on (l.timesheet_id = ts.id)"; // Left join for timesheet nme.
+    }
 
     $where = ttReportHelper::getWhere($options);
 
     // Construct sql query for tt_log items.
-    $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
+    $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $inner_joins $where";
     // If we don't have expense items (such as when the Expenses plugin is disabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
@@ -335,13 +355,25 @@ static function getItems($options) {
         $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
       if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
-      if ($options['show_timesheet'])
-        $left_joins .= " left join tt_timesheets ts on (ei.timesheet_id = ts.id)";
+
+      // Prepare sql query part for inner joins.
+      $inner_joins = null;
+      if ($user->isPluginEnabled('ts')) {
+        $timesheet_option = $options['timesheet'];
+        if ($timesheet_option == TIMESHEET_PENDING)
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+        else if ($timesheet_option == TIMESHEET_APPROVED)
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+        else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+        else if ($options['show_timesheet'])
+          $inner_joins .= " left join tt_timesheets ts on (ei.timesheet_id = ts.id)"; // Left join for timesheet name.
+      }
 
       $where = ttReportHelper::getExpenseWhere($options);
 
       // Construct sql query for expense items.
-      $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
+      $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $inner_joins $where";
 
       // Construct a union.
       $sql = "($sql) union all ($sql_for_expense_items)";
@@ -519,15 +551,37 @@ static function getTotals($options)
         $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
       }
     }
+    // Prepare sql query part for inner joins.
+    $inner_joins = null;
+    if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+      $timesheet_option = $options['timesheet'];
+      if ($timesheet_option == TIMESHEET_PENDING)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+      else if ($timesheet_option == TIMESHEET_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+      else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+    }
     // Prepare a query for time items.
-    $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
+    $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $inner_joins $where";
 
     // If we have expenses, query becomes a bit more complex.
     if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
+      // Prepare sql query part for inner joins.
+      $inner_joins = null;
+      if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+        $timesheet_option = $options['timesheet'];
+        if ($timesheet_option == TIMESHEET_PENDING)
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+        else if ($timesheet_option == TIMESHEET_APPROVED)
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+        else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+      }
       $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $inner_joins $where";
 
       // Create a combined query.
       $combined = "select sum(time) as time";
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e303805ea..8b3d5d6f7 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -441,6 +441,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar període de temps',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e85a73971..17ea3e261 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -451,6 +451,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Výberte období',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3946cd5cf..2a786b143 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -417,6 +417,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vælg en periode',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 3a10a7070..5e72116ba 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -396,6 +396,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zeitraum auswählen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4e6a8efa5..1fdd6111a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -234,7 +234,7 @@
 'label.quota' => 'Quota',
 'label.timesheet' => 'Timesheet',
 'label.submitted' => 'Submitted',
-'label.form' => 'Approved',
+'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Error',
@@ -392,6 +392,7 @@
 'form.reports.include_not_invoiced' => 'not invoiced',
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
+'form.reports.include_pending' => 'pending',
 'form.reports.include_approved' => 'approved',
 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Select time period',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 87aff87cb..559e3286c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -454,6 +454,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar período de tiempo',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index cf2151af7..71a1288c5 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -421,6 +421,7 @@
 // 'form.reports.include_not_invoiced' => 'arveldamata', // TODO: fix as per the above comment, if needed.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 1f4fd0ed4..b5bed52c6 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -437,6 +437,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'انتخاب بازه زمانی',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 442ce1570..c10ca5ea1 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -422,6 +422,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Valitse ajanjakso',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 37d0a0f45..b937b771b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -414,6 +414,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Sélectionner la période de temps',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ecaea1c15..c5e8d5e86 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -405,6 +405,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 4c24586df..b2a7dfd1c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -443,6 +443,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'בחר תקופת זמן',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 50ba1b3e2..f6bceaeeb 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -443,6 +443,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Jelölj meg egy időszakot',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 3a4777422..fc8a08157 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -418,6 +418,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 55b8ee09d..7f83a7677 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -449,6 +449,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '時間期間の選択',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d50f8170e..aa40a0945 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -447,6 +447,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '시간 기간을 선택',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8f4954052..ee170ceed 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -392,6 +392,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Kies periode',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 95bf5e2bf..e43dad9b4 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -447,6 +447,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Velg tidsperiode',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2b63f06bd..9b243eefa 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -425,6 +425,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Wybierz okres',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 964c55d9b..71fcef6f9 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -420,6 +420,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c51af296a..0723acffa 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -427,6 +427,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 2e1d2f273..b94bcd988 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -450,6 +450,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Alege perioada',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 77c90653f..19bedf9b4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -384,6 +384,7 @@
 'form.reports.include_not_invoiced' => 'не внесённые в счёт',
 'form.reports.include_assigned' => 'присвоена',
 'form.reports.include_not_assigned' => 'не присвоена',
+'form.reports.include_pending' => 'в ожидании',
 'form.reports.include_approved' => 'одобрена',
 'form.reports.include_not_approved' => 'не одобрена',
 'form.reports.select_period' => 'Выберите интервал времени',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index bd6202002..d3525c0d6 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -433,6 +433,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vyberte časový rozsah',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 66992c49b..fedc796ab 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -424,6 +424,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 // 'form.reports.select_period' => 'Select time period',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 73966ca86..229100788 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -423,6 +423,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Odaberi vremenski raspon',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 410a64f5c..480650e4a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -421,6 +421,7 @@
 // TODO: translate the following.
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Välj intervall',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e5387283e..87b44ca09 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -460,6 +460,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zaman aralığını seç',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4406831d8..9d03e7b0f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -432,6 +432,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '选择时间段',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 47d2cfbc6..e488dbd68 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -440,6 +440,7 @@
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
+// 'form.reports.include_pending' => 'pending',
 // 'form.reports.include_approved' => 'approved',
 // 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '選擇時間段',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7bd156421..b8f56833c 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.37.4760 | 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.37.4761 | 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/reports.php b/reports.php
index 264e5645c..f652027b1 100644
--- a/reports.php
+++ b/reports.php
@@ -186,7 +186,11 @@
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
    'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('form.reports.include_assigned'),'2'=>$i18n->get('form.reports.include_not_assigned')),
+   'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
+     TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
+     TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
+     TIMESHEET_APPROVED=>$i18n->get('form.reports.include_approved'),
+     TIMESHEET_NOT_APPROVED=>$i18n->get('form.reports.include_not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }

From da69449d0d9100e8603a88e36f0882d6798215e9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 19:23:47 +0000
Subject: [PATCH 0703/1848] Fixed subtotals for timesheet options.

---
 WEB-INF/lib/ttReportHelper.class.php | 26 ++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a14313b35..441cbec9b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1546,6 +1546,18 @@ static function makeJoinPart($options) {
     if ($options['show_cost'] && $trackingMode != MODE_TIME) {
       $join .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
     }
+    // Prepare inner joins.
+    $inner_joins = null;
+    if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+      $timesheet_option = $options['timesheet'];
+      if ($timesheet_option == TIMESHEET_PENDING)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+      else if ($timesheet_option == TIMESHEET_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+      else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+    }
+    $join .= $inner_joins;
     return $join;
   }
 
@@ -1581,6 +1593,8 @@ static function makeCostPart($options) {
 
   // makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
   static function makeJoinExpensesPart($options) {
+    global $user;
+
     if (ttReportHelper::groupingBy('user', $options)) {
       $join .= ' left join tt_users u on (ei.user_id = u.id)';
     }
@@ -1590,6 +1604,18 @@ static function makeJoinExpensesPart($options) {
     if (ttReportHelper::groupingBy('project', $options)) {
       $join .= ' left join tt_projects p on (ei.project_id = p.id)';
     }
+    // Prepare inner joins.
+    $inner_joins = null;
+    if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+      $timesheet_option = $options['timesheet'];
+      if ($timesheet_option == TIMESHEET_PENDING)
+        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+      else if ($timesheet_option == TIMESHEET_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+      else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+    }
+    $join .= $inner_joins;
     return $join;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b8f56833c..9677eea8a 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.37.4761 | 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.37.4762 | 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>

From c71ac60a3c6913ad64b22f367b994983ff77ca22 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 21:47:45 +0000
Subject: [PATCH 0704/1848] Introduced view_client_unapproved access right.

---
 WEB-INF/lib/ttRoleHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/reports.tpl      |  4 ++--
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          |  4 ++--
 reports.php                        | 16 ++++++++++------
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 000f7cebe..92f6bec32 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -189,7 +189,7 @@ static function createPredefinedRoles($group_id, $lang)
 
     $mdb2 = getConnection();
 
-    $rights_client = 'view_client_reports,view_client_timesheets,view_client_invoices,manage_own_settings';
+    $rights_client = 'view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9677eea8a..d0cc37fdd 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.37.4762 | 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.41.4763 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 821352782..07c398346 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -216,7 +216,7 @@ function handleCheckboxes() {
               <tr><td><b>{$i18n.label.invoice}</b></td></tr>
               <tr><td>{$forms.reportForm.invoice.control}</td></tr>
 {/if}
-{if $show_timesheet}
+{if $show_timesheet_dropdown}
               <tr><td><b>{$i18n.label.timesheet}</b></td></tr>
               <tr><td>{$forms.reportForm.timesheet.control}</td></tr>
 {/if}
@@ -259,7 +259,7 @@ function handleCheckboxes() {
 {if $show_project}
                     <tr><td><label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label></td></tr>
 {/if}
-{if $show_timesheet}
+{if $show_timesheet_checkbox}
                     <tr><td><label>{$forms.reportForm.chtimesheet.control}&nbsp;{$i18n.label.timesheet}</label></td></tr>
 {/if}
 {if $show_cf_1_checkbox}
diff --git a/dbinstall.php b/dbinstall.php
index e40d4be67..f700d99ee 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11840"]) {
+  if ($_POST["convert11797to11841"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1083,6 +1083,8 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_timesheets', 'view_client_timesheets') where rank = 16");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_invoices', 'view_client_invoices') where rank = 16");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.40', modified = now() where param_name = 'version_db' and param_value = '1.18.39'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.40') set rights = replace(rights, 'view_client_timesheets,view_client_invoices', 'view_client_timesheets,view_client_unapproved,view_client_invoices') where rank = 16");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.41', modified = now() where param_name = 'version_db' and param_value = '1.18.40'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1131,7 +1133,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.40)</b>
+    <td width="80%"><b>Create database structure (v1.18.41)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1176,8 +1178,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.40)</td>
-    <td><input type="submit" name="convert11797to11840" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.41)</td>
+    <td><input type="submit" name="convert11797to11841" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 0218cf750..2a507ee21 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group');
 
 
 #
@@ -518,4 +518,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.40', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.41', now()); # TODO: change when structure changes.
diff --git a/reports.php b/reports.php
index f652027b1..fdb2d2ed3 100644
--- a/reports.php
+++ b/reports.php
@@ -179,10 +179,10 @@
 }
 
 // Add timesheet assignment selector.
-$showTimesheet = $user->isPluginEnabled('ts') &&
+$showTimesheetDropdown = $user->isPluginEnabled('ts') &&
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
-   $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
-if ($showTimesheet) {
+   $user->can('view_all_timesheets') || ($user->can('view_client_timesheets') && $user->can('view_client_unapproved')));
+if ($showTimesheetDropdown) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
    'style'=>'width: 250px;',
@@ -194,6 +194,9 @@
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }
+$showTimesheetCheckbox = $user->isPluginEnabled('ts') &&
+  ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
+   $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
 
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
@@ -274,11 +277,11 @@
 $showWorkUnits = $user->isPluginEnabled('wu');
 if ($showWorkUnits)
   $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
-if ($showTimesheet)
+if ($showTimesheetCheckbox)
   $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
 
 // Add a hidden control for timesheet_user_id (who to generate a timesheet for).
-if ($showTimesheet)
+if ($showTimesheetCheckbox)
   $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
 
 // Add group by control.
@@ -428,7 +431,8 @@
 $smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
 $smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
 $smarty->assign('show_paid_status', $showPaidStatus);
-$smarty->assign('show_timesheet', $showTimesheet);
+$smarty->assign('show_timesheet_dropdown', $showTimesheetDropdown);
+$smarty->assign('show_timesheet_checkbox', $showTimesheetCheckbox);
 $smarty->assign('show_users', $showUsers);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_finish', $showFinish);

From a6f6687b468a81a0f96c108faefbfc69dd607acf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 22:02:58 +0000
Subject: [PATCH 0705/1848] Adjusted client access to unapproved records.

---
 WEB-INF/lib/ttReportHelper.class.php | 2 ++
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 441cbec9b..ac3582e68 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1054,6 +1054,8 @@ static function getReportOptions($bean) {
     $options['invoice'] = $bean->getAttribute('invoice');
     $options['paid_status'] = $bean->getAttribute('paid_status');
     $options['timesheet'] = $bean->getAttribute('timesheet');
+    if ($user->isPluginEnabled('ts') && $user->isClient() && !$user->can('view_client_unapproved'))
+      $options['timesheet'] = TIMESHEET_APPROVED; // Restrict clients to approved timesheet records only.
     if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
     $options['period'] = $bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d0cc37fdd..a0366229d 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.41.4763 | 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.41.4764 | 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>

From b14cf15f563feabc7015e3af99ea8cb7a1903dc1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 22:21:48 +0000
Subject: [PATCH 0706/1848] Fixed ttTimesheetHelper::getApprovers function.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 21e75a96d..058326574 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -336,7 +336,7 @@ static function getApprovers($user_id) {
     $sql = "select u.id, u.name, u.email".
       " from tt_users u".
       " left join tt_roles r on (r.id = u.role_id)".
-      " where u.status = 1 and u.email is not null".
+      " where u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id".
       " and (r.rights like '%approve_all_timesheets%' or (r.rank > $rank and r.rights like '%approve_timesheets%'))";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a0366229d..63d61ef93 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.41.4764 | 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.41.4765 | 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>

From 6754f969082857965dc10f96e9a83fac3e9a3559 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Feb 2019 22:30:31 +0000
Subject: [PATCH 0707/1848] Fixed timesheet_view.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 timesheet_view.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 63d61ef93..35edfc1ea 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.41.4765 | 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.41.4766 | 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/timesheet_view.php b/timesheet_view.php
index 5079fe7b7..27956c9d7 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -60,7 +60,7 @@
 // Determine which controls to show and obtain date for them.
 $showSubmit = $notClient && !$timesheet['submit_status'];
 if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
-$canApprove = $user->can('approve_timesheets') || $user_>can('approve_all_timesheets');
+$canApprove = $user->can('approve_timesheets') || $user->can('approve_all_timesheets');
 $showApprove = $notClient && $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
 // Add a form with controls.

From 8b5e58e72a7d6ec9728f6890261f1ece2cfa7cc8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 14:51:10 +0000
Subject: [PATCH 0708/1848] Improved usability by hiding not relevant controls
 for client users.

---
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/mobile/user_add.tpl  | 17 +++++++++++------
 WEB-INF/templates/mobile/user_edit.tpl | 14 ++++++++++----
 WEB-INF/templates/user_add.tpl         | 14 +++++++++-----
 WEB-INF/templates/user_edit.tpl        | 13 +++++++++----
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 35edfc1ea..c99fe708f 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.41.4766 | 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.41.4767 | 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/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl
index 1bde81b18..9df99ff00 100644
--- a/WEB-INF/templates/mobile/user_add.tpl
+++ b/WEB-INF/templates/mobile/user_add.tpl
@@ -34,6 +34,7 @@ function setDefaultRate(element) {
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var nonClientBlock = document.getElementById("non_client_block");
   var projectsControl = document.getElementById("projects_control");
 
   var len = roles.length;
@@ -42,6 +43,7 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1) {
         clientControl.style.visibility = "visible";
+        nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
 
         // Uncheck all project checkboxes.
@@ -53,6 +55,7 @@ function handleClientControl() {
       } else {
         clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
       break;
@@ -90,27 +93,29 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.role}:</td>
       <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
     </tr>
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
+<tbody id="non_client_block">
 {if $show_quota}
     <tr>
       <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control}</td>
     </tr>
 {/if}
+    <tr>
+      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
+      <td>{$forms.userForm.rate.control}</td>
+    </tr>
+</tbody>
 {if $show_projects}
 <tbody id="projects_control">
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>
+</tbody>
+{/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
     </tr>
-</tbody>
-{/if}
     <tr>
       <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
     </tr>
diff --git a/WEB-INF/templates/mobile/user_edit.tpl b/WEB-INF/templates/mobile/user_edit.tpl
index 6bddbb99f..03c5db2ef 100644
--- a/WEB-INF/templates/mobile/user_edit.tpl
+++ b/WEB-INF/templates/mobile/user_edit.tpl
@@ -56,6 +56,7 @@ function setRate(element) {
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var nonClientBlock = document.getElementById("non_client_block");
   var projectsControl = document.getElementById("projects_control");
 
   var len = roles.length;
@@ -64,6 +65,7 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1) {
         clientControl.style.visibility = "visible";
+        nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
 
         // Uncheck all project checkboxes.
@@ -75,6 +77,7 @@ function handleClientControl() {
       } else {
         clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
       break;
@@ -83,6 +86,7 @@ function handleClientControl() {
 }
 </script>
 
+
 {$forms.userForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
   <table cellspacing="1" cellpadding="2" border="0">
@@ -118,16 +122,18 @@ function handleClientControl() {
       <td>{$forms.userForm.status.control}</td>
     </tr>
 {/if}
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
+<tbody id="non_client_block">
 {if $show_quota}
     <tr>
       <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control}</td>
     </tr>
 {/if}
+    <tr>
+      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
+      <td>{$forms.userForm.rate.control}</td>
+    </tr>
+</tbody>
 {if $show_projects}
 <tbody id="projects_control">
     <tr valign="top">
diff --git a/WEB-INF/templates/user_add.tpl b/WEB-INF/templates/user_add.tpl
index c6dbaa7bb..155bf11cc 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -34,6 +34,7 @@ function setDefaultRate(element) {
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var nonClientBlock = document.getElementById("non_client_block");
   var projectsControl = document.getElementById("projects_control");
 
   var len = roles.length;
@@ -42,6 +43,7 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1) {
         clientControl.style.visibility = "visible";
+        nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
 
         // Uncheck all project checkboxes.
@@ -53,6 +55,7 @@ function handleClientControl() {
       } else {
         clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
       break;
@@ -90,16 +93,18 @@ function handleClientControl() {
       <td align="right">{$i18n.form.users.role}:</td>
       <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
     </tr>
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
+<tbody id="non_client_block">
 {if $show_quota}
     <tr>
       <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
+    <tr>
+      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
+      <td>{$forms.userForm.rate.control}</td>
+    </tr>
+</tbody>
 {if $show_projects}
 <tbody id="projects_control">
     <tr><td>&nbsp;</td></tr>
@@ -112,7 +117,6 @@ function handleClientControl() {
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
     </tr>
-
     <tr>
       <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
     </tr>
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 2bba1842d..e17651b21 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -56,6 +56,7 @@ function setRate(element) {
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var nonClientBlock = document.getElementById("non_client_block");
   var projectsControl = document.getElementById("projects_control");
 
   var len = roles.length;
@@ -64,6 +65,7 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1) {
         clientControl.style.visibility = "visible";
+        nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
 
         // Uncheck all project checkboxes.
@@ -75,6 +77,7 @@ function handleClientControl() {
       } else {
         clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
       break;
@@ -124,16 +127,18 @@ function handleClientControl() {
       <td>{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.user_edit.swap_roles}</a>{/if}</td>
     </tr>
 {/if}
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
+<tbody id="non_client_block">
 {if $show_quota}
     <tr>
       <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
+    <tr>
+      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
+      <td>{$forms.userForm.rate.control}</td>
+    </tr>
+</tbody>
 {if $show_projects}
 <tbody id="projects_control">
     <tr><td>&nbsp;</td></tr>

From ce36d3475dd1ad6e38f95ac410e27c7c19d03ca1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 15:52:47 +0000
Subject: [PATCH 0709/1848] Added approved field to tt_log and tt_expense_items
 tables.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c99fe708f..3594a9f4b 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.41.4767 | 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.41.4768 | 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/dbinstall.php b/dbinstall.php
index f700d99ee..8babd31e0 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11841"]) {
+  if ($_POST["convert11797to11842"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1085,6 +1085,9 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.40', modified = now() where param_name = 'version_db' and param_value = '1.18.39'");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.40') set rights = replace(rights, 'view_client_timesheets,view_client_invoices', 'view_client_timesheets,view_client_unapproved,view_client_invoices') where rank = 16");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.41', modified = now() where param_name = 'version_db' and param_value = '1.18.40'");
+    ttExecute("ALTER TABLE `tt_log` ADD `approved` tinyint(4) default 0 AFTER `billable`");
+    ttExecute("ALTER TABLE `tt_expense_items` ADD `approved` tinyint(4) default 0 AFTER `invoice_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.42', modified = now() where param_name = 'version_db' and param_value = '1.18.41'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1133,7 +1136,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.41)</b>
+    <td width="80%"><b>Create database structure (v1.18.42)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1178,8 +1181,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.41)</td>
-    <td><input type="submit" name="convert11797to11841" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.42)</td>
+    <td><input type="submit" name="convert11797to11842" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 2a507ee21..d79e9d7bf 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -201,6 +201,7 @@ CREATE TABLE `tt_log` (
   `invoice_id` int(11) default NULL,               # invoice id
   `comment` text,                                  # user provided comment for time record
   `billable` tinyint(4) default 0,                 # whether the record is billable or not
+  `approved` tinyint(4) default 0,                 # whether the record is approved
   `paid` tinyint(4) default 0,                     # whether the record is paid
   `created` datetime default NULL,                 # creation timestamp
   `created_ip` varchar(45) default NULL,           # creator ip
@@ -431,6 +432,7 @@ CREATE TABLE `tt_expense_items` (
   `name` text NOT NULL,                   # expense item name (what is an expense for)
   `cost` decimal(10,2) default '0.00',    # item cost (including taxes, etc.)
   `invoice_id` int(11) default NULL,      # invoice id
+  `approved` tinyint(4) default 0,        # whether the item is approved
   `paid` tinyint(4) default 0,            # whether the item is paid
   `created` datetime default NULL,        # creation timestamp
   `created_ip` varchar(45) default NULL,  # creator ip

From 1e2a1839bd4b4530a43dfcdc3f0582623edd5486 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 16:35:18 +0000
Subject: [PATCH 0710/1848] Introduced approve_reports and approve_all_reports
 rights.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 12 ++++++++----
 mysql.sql                          |  4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 92f6bec32..0be33d55a 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -191,7 +191,7 @@ static function createPredefinedRoles($group_id, $lang)
 
     $rights_client = 'view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
@@ -254,7 +254,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3594a9f4b..2ed9b3f0e 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.41.4768 | 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.43.4769 | 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/dbinstall.php b/dbinstall.php
index 8babd31e0..6124857b1 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11842"]) {
+  if ($_POST["convert11797to11843"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1088,6 +1088,10 @@ function ttExecute($sql) {
     ttExecute("ALTER TABLE `tt_log` ADD `approved` tinyint(4) default 0 AFTER `billable`");
     ttExecute("ALTER TABLE `tt_expense_items` ADD `approved` tinyint(4) default 0 AFTER `invoice_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.42', modified = now() where param_name = 'version_db' and param_value = '1.18.41'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,delete_group' where rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'view_reports,view_timesheets', 'view_reports,approve_reports,view_timesheets') where rank = 12 or rank = 68 or rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'export_data,approve_all_timesheets', 'export_data,approve_all_reports,approve_all_timesheets') where rank = 324");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.43', modified = now() where param_name = 'version_db' and param_value = '1.18.42'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1136,7 +1140,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.42)</b>
+    <td width="80%"><b>Create database structure (v1.18.43)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1181,8 +1185,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.42)</td>
-    <td><input type="submit" name="convert11797to11842" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.43)</td>
+    <td><input type="submit" name="convert11797to11843" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index d79e9d7bf..8b1859190 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,delete_group');
 
 
 #
@@ -520,4 +520,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.41', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.43', now()); # TODO: change when structure changes.

From af80607509fae805aae37ba966f24aa50986fe9d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 17:33:22 +0000
Subject: [PATCH 0711/1848] Work on progress on report approval plugin.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/plugins.tpl    | 8 +++++++-
 plugins.php                      | 5 +++++
 33 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 8b3d5d6f7..692fc3573 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -270,6 +270,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 17ea3e261..55845055c 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -280,6 +280,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2a786b143..11295b152 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -257,6 +257,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 5e72116ba..99ec90867 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -245,6 +245,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1fdd6111a..361b9d819 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -235,6 +235,7 @@
 'label.timesheet' => 'Timesheet',
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
+'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 559e3286c..37ba0d2da 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -273,6 +273,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 71a1288c5..0d514ba16 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -260,6 +260,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index b5bed52c6..f30109a04 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -267,6 +267,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index c10ca5ea1..97065c45e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -261,6 +261,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b937b771b..150e018f1 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -255,6 +255,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c5e8d5e86..28ebbe445 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -248,6 +248,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index b2a7dfd1c..7dbb615c6 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -278,6 +278,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f6bceaeeb..57cec891b 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -274,6 +274,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index fc8a08157..92b17f592 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -252,6 +252,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7f83a7677..680cd280e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -279,6 +279,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index aa40a0945..af3099ce4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -279,6 +279,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ee170ceed..ce08d7585 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -238,6 +238,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e43dad9b4..3b6925d06 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -277,6 +277,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9b243eefa..27985c62d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -262,6 +262,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 71fcef6f9..7afd6f8b4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -259,6 +259,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 0723acffa..681731839 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -264,6 +264,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index b94bcd988..e279672de 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -277,6 +277,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 19bedf9b4..6edbfbedf 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -234,6 +234,7 @@
 'label.timesheet' => 'Табель учёта',
 'label.submitted' => 'Подано',
 'label.approved' => 'Одобрено',
+'label.approval' => 'Одобрение отчётов',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d3525c0d6..f593a8ab0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -267,6 +267,7 @@
 // 'label.quota' => 'Quota',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index fedc796ab..86695a4ad 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -260,6 +260,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 229100788..3c8df9237 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -260,6 +260,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 480650e4a..516ab1300 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -256,6 +256,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 87b44ca09..7b926fd73 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -283,6 +283,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 9d03e7b0f..57fc9ebe3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -267,6 +267,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index e488dbd68..130683d2c 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -274,6 +274,7 @@
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
+// 'label.approval' => 'Report approval',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2ed9b3f0e..2358030be 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.43.4769 | 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.43.4770 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index e252e32a9..ce0cd52ab 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -134,10 +134,16 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
             <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
+{if isTrue('APPROVAL_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
+            <td><label for="approval">{$i18n.label.approval}</label></td>
+          </tr>
+{/if}
 {if isTrue('TIMESHEET_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
-            <td><label for="charts">{$i18n.title.timesheets}</label></td>
+            <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
           </tr>
 {/if}
           <tr>
diff --git a/plugins.php b/plugins.php
index 64615aa25..0981cb77a 100644
--- a/plugins.php
+++ b/plugins.php
@@ -51,6 +51,7 @@
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
   $cl_work_units = $request->getParameter('work_units');
+  $cl_approval = $request->getParameter('approval');
   $cl_timesheets = $request->getParameter('timesheets');
 } else {
   // Note: we get here in get, and also in post when group changes.
@@ -69,6 +70,7 @@
   $cl_quotas = in_array('mq', $plugins);
   $cl_week_view = in_array('wv', $plugins);
   $cl_work_units = in_array('wu', $plugins);
+  $cl_approval = in_array('ap', $plugins);
   $cl_timesheets = in_array('ts', $plugins);
 }
 
@@ -88,6 +90,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'approval','value'=>$cl_approval));
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
@@ -123,6 +126,8 @@
     $plugins .= ',wv';
   if ($cl_work_units)
     $plugins .= ',wu';
+  if ($cl_approval)
+    $plugins .= ',ap';
   if ($cl_timesheets)
     $plugins .= ',ts';
 

From 0eec39b28e4c408f92f9f99ede99e68640ef94d0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 17:36:43 +0000
Subject: [PATCH 0712/1848] Cosmetic maintenance tune-up.

---
 WEB-INF/lib/ttOrgHelper.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index beb523378..461c751de 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -63,7 +63,7 @@ static function getName($org_id) {
     return false;
   }
 
-  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 5 for now).
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 10 for now).
   static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
@@ -72,7 +72,7 @@ static function getInactiveOrgs() {
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
       " (select max(accessed) as last_access, org_id from tt_users where org_id > 0 group by org_id order by last_access, org_id) as t".
-      " where last_access is null or last_access < $cutoff_timestamp limit 5"; // Max 5 orgs at a time for now...
+      " where last_access is null or last_access < $cutoff_timestamp limit 10"; // Max 10 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {

From 707afc287a1593f86b392f9146346060c7e95957 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 18:07:06 +0000
Subject: [PATCH 0713/1848] Added controls for report approval options on
 reports.php.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/reports.tpl |  7 +++++++
 reports.php                   | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2358030be..a20299b98 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.43.4770 | 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.43.4771 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 07c398346..1358d29de 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -212,6 +212,10 @@ function handleCheckboxes() {
               <tr><td><b>{$i18n.label.task}</b></td></tr>
               <tr><td>{$forms.reportForm.task.control}</td></tr>
 {/if}
+{if $show_approved}
+              <tr><td><b>{$i18n.label.approved}</b></td></tr>
+              <tr><td>{$forms.reportForm.approved.control}</td></tr>
+{/if}
 {if $show_invoice_dropdown}
               <tr><td><b>{$i18n.label.invoice}</b></td></tr>
               <tr><td>{$forms.reportForm.invoice.control}</td></tr>
@@ -289,6 +293,9 @@ function handleCheckboxes() {
                     <tr><td><label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label></td></tr>
 {/if}
                     <tr><td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td></tr>
+{if $show_approved}
+                    <tr><td><label>{$forms.reportForm.chapproved.control}&nbsp;{$i18n.label.approved}</label></td></tr>
+{/if}
 {if $show_invoice_checkbox}
                     <tr><td><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td></tr>
 {/if}
diff --git a/reports.php b/reports.php
index fdb2d2ed3..d8bf40995 100644
--- a/reports.php
+++ b/reports.php
@@ -198,6 +198,19 @@
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
    $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
 
+// Add approved / not approved selector.
+$showApproved = $user->isPluginEnabled('ap') &&
+  ($user->can('view_own_reports') || $user->can('view_reports') ||
+   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
+if ($showApproved) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'approved',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+  ));
+}
+
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
 $user_list = array();
@@ -279,6 +292,8 @@
   $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
 if ($showTimesheetCheckbox)
   $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
+if ($showApproved)
+  $form->addInput(array('type'=>'checkbox','name'=>'chapproved'));
 
 // Add a hidden control for timesheet_user_id (who to generate a timesheet for).
 if ($showTimesheetCheckbox)
@@ -428,6 +443,7 @@
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_approved', $showApproved);
 $smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
 $smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
 $smarty->assign('show_paid_status', $showPaidStatus);

From a001599f5d6f1a803a279e602d3333cc036b69cc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 19:05:46 +0000
Subject: [PATCH 0714/1848] Made approval control filtering work on reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 12 ++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ac3582e68..5d9de074e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -72,6 +72,8 @@ static function getWhere($options) {
     if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is null';
     if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is null';
     if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is not null';
+    if ($options['approved']=='1') $dropdown_parts .= ' and l.approved = 1';
+    if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
@@ -122,6 +124,8 @@ static function getExpenseWhere($options) {
     if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
     if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is null';
     if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is not null';
+    if ($options['approved']=='1') $dropdown_parts .= ' and ei.approved = 1';
+    if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
 
@@ -233,6 +237,9 @@ static function getItems($options) {
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
       array_push($fields, "null as expense"); 
     }
+    // Add approved.
+    if ($options['show_approved'])
+      array_push($fields, 'l.approved');
     // Add paid status.
     if ($canViewReports && $options['show_paid'])
       array_push($fields, 'l.paid');
@@ -329,6 +336,9 @@ static function getItems($options) {
         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
+      // Add approved.
+      if ($options['show_approved'])
+        array_push($fields, 'ei.approved');
       // Add paid status.
       if ($canViewReports && $options['show_paid'])
         array_push($fields, 'ei.paid');
@@ -1053,6 +1063,7 @@ static function getReportOptions($bean) {
     $options['billable'] = $bean->getAttribute('include_records');
     $options['invoice'] = $bean->getAttribute('invoice');
     $options['paid_status'] = $bean->getAttribute('paid_status');
+    $options['approved'] = $bean->getAttribute('approved');
     $options['timesheet'] = $bean->getAttribute('timesheet');
     if ($user->isPluginEnabled('ts') && $user->isClient() && !$user->can('view_client_unapproved'))
       $options['timesheet'] = TIMESHEET_APPROVED; // Restrict clients to approved timesheet records only.
@@ -1062,6 +1073,7 @@ static function getReportOptions($bean) {
     $options['period_end'] = $bean->getAttribute('end_date');
     $options['show_client'] = $bean->getAttribute('chclient');
     $options['show_invoice'] = $bean->getAttribute('chinvoice');
+    $options['show_approved'] = $bean->getAttribute('chapproved');
     $options['show_paid'] = $bean->getAttribute('chpaid');
     $options['show_ip'] = $bean->getAttribute('chip');
     $options['show_project'] = $bean->getAttribute('chproject');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a20299b98..a06110665 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.43.4771 | 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.43.4772 | 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/report.tpl b/WEB-INF/templates/report.tpl
index f62929f9f..0de892ee6 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -50,6 +50,7 @@
   {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
   {if $bean->getAttribute('chnote')}<td class="tableHeader">{$i18n.label.note}</td>{/if}
   {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
+  {if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
   {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
   {if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
   {if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
@@ -74,6 +75,7 @@
         {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
         {if $bean->getAttribute('chnote')}<td></td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chapproved')}<td></td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chip')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}
@@ -101,6 +103,7 @@
     {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
     {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
     {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
@@ -128,6 +131,7 @@
     {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
@@ -150,6 +154,7 @@
     {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}

From 72c8ed85c06c6808aff2e967f35f5db45f9ba750 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 22:02:23 +0000
Subject: [PATCH 0715/1848] Fixed export to files and PDF with approved column.

---
 WEB-INF/templates/footer.tpl | 2 +-
 tofile.php                   | 3 +++
 topdf.php                    | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a06110665..6cb7a8068 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.43.4772 | 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.43.4773 | 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/tofile.php b/tofile.php
index f4d5b29e8..9399c787c 100644
--- a/tofile.php
+++ b/tofile.php
@@ -140,6 +140,7 @@
           print $item['expense'];
         print "]]></cost>\n";
       }
+      if ($bean->getAttribute('chapproved')) print "\t<approved><![CDATA[".$item['approved']."]]></approved>\n";
       if ($bean->getAttribute('chpaid')) print "\t<paid><![CDATA[".$item['paid']."]]></paid>\n";
       if ($bean->getAttribute('chip')) {
         $ip = $item['modified'] ? $item['modified_ip'].' '.$item['modified'] : $item['created_ip'].' '.$item['created'];
@@ -207,6 +208,7 @@
     if ($bean->getAttribute('chunits')) print ',"'.$i18n->get('label.work_units_short').'"';
     if ($bean->getAttribute('chnote')) print ',"'.$i18n->get('label.note').'"';
     if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
+    if ($bean->getAttribute('chapproved')) print ',"'.$i18n->get('label.approved').'"';
     if ($bean->getAttribute('chpaid')) print ',"'.$i18n->get('label.paid').'"';
     if ($bean->getAttribute('chip')) print ',"'.$i18n->get('label.ip').'"';
     if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->get('label.invoice').'"';
@@ -237,6 +239,7 @@
         else
           print ',"'.$item['expense'].'"';
       }
+      if ($bean->getAttribute('chapproved')) print ',"'.$item['approved'].'"';
       if ($bean->getAttribute('chpaid')) print ',"'.$item['paid'].'"';
       if ($bean->getAttribute('chip')) {
         $ip = $item['modified'] ? $item['modified_ip'].' '.$item['modified'] : $item['created_ip'].' '.$item['created'];
diff --git a/topdf.php b/topdf.php
index a0be19ec4..8e0738d4c 100644
--- a/topdf.php
+++ b/topdf.php
@@ -156,6 +156,7 @@
   if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
   if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
   if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
+  if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
   if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
   if ($bean->getAttribute('chip')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.ip').'</td>'; }
   if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '<td>'.$i18n->get('label.invoice').'</td>'; }
@@ -209,6 +210,7 @@
             $html .= $subtotals[$prev_grouped_by]['expenses'];
           $html .= '</td>';
         }
+        if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
         if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
         if ($bean->getAttribute('chip')) $html .= '<td></td>';
         if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
@@ -240,6 +242,11 @@
         $html .= $item['expense'];
       $html .= '</td>';
     }
+    if ($bean->getAttribute('chapproved')) {
+        $html .= '<td>';
+        $html .= $item['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+        $html .= '</td>';
+    }
     if ($bean->getAttribute('chpaid')) {
         $html .= '<td>';
         $html .= $item['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
@@ -300,6 +307,7 @@
         $html .= $subtotals[$prev_grouped_by]['expenses'];
       $html .= '</td>';
     }
+    if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
     if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
     if ($bean->getAttribute('chip')) $html .= '<td></td>';
     if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
@@ -329,6 +337,7 @@
       $html .= $totals['expenses'];
     $html .= '</td>';
   }
+  if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
   if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
   if ($bean->getAttribute('chip')) $html .= '<td></td>';
   if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';

From 2ad495c118de835e3c6902a328b153d30bc3b0fa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Feb 2019 23:26:25 +0000
Subject: [PATCH 0716/1848] Fixed creating invoices by excluding uncompleted
 records.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index becea87bc..4c1bd2b06 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -351,7 +351,7 @@ static function createInvoice($fields) {
         " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
         " and l.group_id = $group_id and l.org_id = $org_id".
         " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
-        " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; // See explanation below.
+        " and l.duration > 0 and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0"; // See explanation below.
     } else {
        // sql part for project id.
       if ($project_id) $project_part = " and l.project_id = $project_id";
@@ -363,7 +363,7 @@ static function createInvoice($fields) {
         " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
         " and l.group_id = $group_id and l.org_id = $org_id".
         " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
-        " and l.billable = 1"; //  l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0";
+        " and l.duration > 0 and l.billable = 1"; //  l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0";
         // Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
         // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
         // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6cb7a8068..62960af62 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.43.4773 | 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.43.4774 | 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>

From 407329801a481ea008b8c5fb21ce41bb7559c678 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 15:04:16 +0000
Subject: [PATCH 0717/1848] Added label.mark_approved to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 692fc3573..0b8e648ea 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -271,6 +271,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 55845055c..502484354 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -281,6 +281,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 11295b152..fe00d5489 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -258,6 +258,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 99ec90867..0de74a3e5 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -246,6 +246,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 361b9d819..91f3e09d7 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -236,6 +236,7 @@
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
 'label.approval' => 'Report approval',
+'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 37ba0d2da..d5341b9cd 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -274,6 +274,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0d514ba16..7696e9186 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -261,6 +261,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f30109a04..ac87cc8b0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -268,6 +268,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 97065c45e..9e194dc8e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -262,6 +262,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 150e018f1..d4ef90608 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -256,6 +256,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 28ebbe445..6b22ef584 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -249,6 +249,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7dbb615c6..545ef28cb 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -279,6 +279,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 57cec891b..05672d1dc 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -275,6 +275,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 92b17f592..60c7141f9 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -253,6 +253,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 680cd280e..6ba9449aa 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -280,6 +280,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index af3099ce4..5a69aa16a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -280,6 +280,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ce08d7585..917c33800 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -239,6 +239,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 3b6925d06..77b3435ec 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -278,6 +278,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 27985c62d..4e08986cf 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -263,6 +263,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7afd6f8b4..0ca9ea669 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -260,6 +260,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 681731839..35ac6bdab 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -265,6 +265,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e279672de..cb2f5d87b 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -278,6 +278,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 6edbfbedf..9254e12d9 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -235,6 +235,7 @@
 'label.submitted' => 'Подано',
 'label.approved' => 'Одобрено',
 'label.approval' => 'Одобрение отчётов',
+'label.mark_approved' => 'Отметить одобрение',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f593a8ab0..dcb86e2cc 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -268,6 +268,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 86695a4ad..548606a4b 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -261,6 +261,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 3c8df9237..90b8da509 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -261,6 +261,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 516ab1300..6499dd080 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -257,6 +257,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7b926fd73..56da8f166 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -284,6 +284,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 57fc9ebe3..76ef7f740 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -268,6 +268,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 130683d2c..88af0624a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -275,6 +275,7 @@
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
+// 'label.mark_approved' => 'Mark approved',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 62960af62..87bda8d17 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.43.4774 | 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.43.4775 | 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>

From a93a92b4959bf35c5c6b41adaea5a666b876bf2d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 15:55:05 +0000
Subject: [PATCH 0718/1848] More work in progress on report approval.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/report.tpl | 11 ++++++++++-
 report.php                   | 31 +++++++++++++++++++++++++++++--
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 87bda8d17..0fb5ca50b 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.43.4775 | 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.43.4776 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 0de892ee6..294582dc4 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -166,8 +166,17 @@
   </td>
 </tr>
 </table>
-{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice)}
 <table width="720" cellspacing="0" cellpadding="0" border="0">
+  {if $use_mark_approved}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control} {$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
   {if $use_mark_paid}
   <tr>
     <td align="right">
diff --git a/report.php b/report.php
index 93720cb27..135c8f272 100644
--- a/report.php
+++ b/report.php
@@ -38,6 +38,12 @@
   exit();
 }
 
+if ($user->isPluginEnabled('ap')) {
+  $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
+  $_SESSION['mark_approved_select_option'] = $cl_mark_approved_select_option;
+  $cl_mark_approved_action_option = $request->getParameter('mark_approved_action_options', ($request->isPost() ? null : @$_SESSION['mark_approved_action_option']));
+  $_SESSION['mark_aproved_action_option'] = $cl_mark_approved_action_option;
+}
 if ($user->isPluginEnabled('ps')) {
   $cl_mark_paid_select_option = $request->getParameter('mark_paid_select_options', ($request->isPost() ? null : @$_SESSION['mark_paid_select_option']));
   $_SESSION['mark_paid_select_option'] = $cl_mark_paid_select_option;
@@ -67,11 +73,32 @@
 
 $client_id = $bean->getAttribute('client');
 
-// Do we need to show checkboxes?
+// Do we need to show checkboxes? We show them if we allow setting approved or paid status,
+// and also when we can assign / deassign records to invoces.
+if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_eports')))
+  $showForApproved = true;
 if ($bean->getAttribute('chpaid') ||
    ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
   if ($user->can('manage_invoices'))
-    $smarty->assign('use_checkboxes', true);
+    $showForInvoicesOrPaid = true;
+}
+if ($showForApproved || $showForInvoicesOrPaid)
+  $smarty->assign('use_checkboxes', true);
+
+// Controls for "Mark approved" block.
+if ($showForApproved) {
+  $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_approved_select_options',
+    'data'=>$mark_approved_select_options,
+    'value'=>$cl_mark_approved_select_option));
+  $mark_approved_action_options = array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_approved_action_options',
+    'data'=>$mark_approved_action_options,
+    'value'=>$cl_mark_approved_action_option));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_approved','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_mark_approved', true);
 }
 
 // Controls for "Mark paid" block.

From 8bee920461b35df9041cce507b043841d203e3e3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 16:17:40 +0000
Subject: [PATCH 0719/1848] Some refactoring in translations.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 3 +++
 WEB-INF/resources/en.lang.php    | 3 +++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 3 +++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 3 +++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 3 +++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 30 files changed, 66 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0b8e648ea..c0a693134 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -398,6 +398,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 502484354..d48497cf2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -407,6 +407,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index fe00d5489..2a639b2ad 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -374,6 +374,8 @@
 'dropdown.delete' => 'Slet',
 'dropdown.do_not_delete' => 'Slet ikke',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0de74a3e5..016ec8558 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -353,6 +353,9 @@
 'dropdown.status_inactive' => 'inaktiv',
 'dropdown.delete' => 'löschen',
 'dropdown.do_not_delete' => 'nicht löschen',
+// TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'bezahlt',
 'dropdown.not_paid' => 'nicht bezahlt',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 91f3e09d7..4ec12f82d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -345,9 +345,12 @@
 'dropdown.status_inactive' => 'inactive',
 'dropdown.delete' => 'delete',
 'dropdown.do_not_delete' => 'do not delete',
+'dropdown.approved' => 'approved',
+'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'paid',
 'dropdown.not_paid' => 'not paid',
 
+
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
 // a string can be defined on the main form and used on related forms. The reasoning for this is to make translation effort easier.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d5341b9cd..3c6c44c85 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -397,6 +397,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7696e9186..cccc548b8 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -374,6 +374,9 @@
 'dropdown.status_inactive' => 'mitte aktiivne',
 'dropdown.delete' => 'kustuta',
 'dropdown.do_not_delete' => 'ära kustuta',
+// TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'makstud',
 'dropdown.not_paid' => 'mitte makstud',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ac87cc8b0..95a157391 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -385,6 +385,8 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9e194dc8e..c06af3dec 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -374,6 +374,8 @@
 'dropdown.delete' => 'poista',
 'dropdown.do_not_delete' => 'älä poista',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d4ef90608..f95325d6c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -366,6 +366,8 @@
 'dropdown.delete' => 'supprimer',
 'dropdown.do_not_delete' => 'ne pas supprimer',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 6b22ef584..8079b6f8f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -361,6 +361,9 @@
 'dropdown.status_inactive' => 'ανένεργος',
 'dropdown.delete' => 'διαγραφή',
 'dropdown.do_not_delete' => 'μη το διαγράψετε',
+// TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'εξοφλημένο',
 'dropdown.not_paid' => 'δεν έχει εξοφληθεί',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 545ef28cb..c2f66657a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -395,6 +395,8 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 05672d1dc..245275ab9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -398,6 +398,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 60c7141f9..da1f2ff99 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -371,6 +371,9 @@
 'dropdown.status_inactive' => 'inattivo',
 'dropdown.delete' => 'elimina',
 'dropdown.do_not_delete' => 'non eliminare',
+// TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'pagato',
 'dropdown.not_paid' => 'non pagato',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 6ba9449aa..faa497971 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -400,6 +400,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5a69aa16a..89c01a34f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -404,6 +404,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 917c33800..191e8aeea 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -348,6 +348,9 @@
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
 'dropdown.do_not_delete' => 'niet verwijderen',
+// TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'betaald',
 'dropdown.not_paid' => 'niet betaald',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 77b3435ec..1f4cd35c8 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -401,6 +401,8 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4e08986cf..53cb7e4bf 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -377,6 +377,8 @@
 'dropdown.delete' => 'usuń',
 'dropdown.do_not_delete' => 'nie usuwaj',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 0ca9ea669..8189bdb48 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -372,6 +372,8 @@
 'dropdown.delete' => 'apagar',
 'dropdown.do_not_delete' => 'não apagar',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 35ac6bdab..9ec2d495b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -383,6 +383,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cb2f5d87b..902ca04ba 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -405,6 +405,8 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 9254e12d9..588b737a7 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -342,6 +342,8 @@
 'dropdown.status_inactive' => 'неактивный',
 'dropdown.delete' => 'удалить',
 'dropdown.do_not_delete' => 'не удалять',
+'dropdown.approved' => 'одобрено',
+'dropdown.not_approved' => 'не одобрено',
 'dropdown.paid' => 'оплачено',
 'dropdown.not_paid' => 'не оплачено',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index dcb86e2cc..d08d06bc5 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -385,6 +385,8 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 548606a4b..c3ee36cbe 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -377,6 +377,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 90b8da509..6c2f926fb 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -375,6 +375,8 @@
 'dropdown.delete' => 'obriši',
 'dropdown.do_not_delete' => 'nemoj obrisati',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 6499dd080..380958784 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -373,6 +373,8 @@
 'dropdown.delete' => 'Ta bort',
 'dropdown.do_not_delete' => 'Ta inte bort',
 // TODO: translate the following.
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 56da8f166..1c2ce69f3 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -412,6 +412,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 76ef7f740..91ae2e993 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -390,6 +390,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 88af0624a..2888d5365 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -397,6 +397,8 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.approved' => 'approved',
+// 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
 

From eb1332ec4a8cc403d3531bd472e9060dfe5e5d94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 16:27:57 +0000
Subject: [PATCH 0720/1848] More refactoring in translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 --
 WEB-INF/resources/cs.lang.php    | 2 --
 WEB-INF/resources/da.lang.php    | 2 --
 WEB-INF/resources/de.lang.php    | 2 --
 WEB-INF/resources/en.lang.php    | 2 --
 WEB-INF/resources/es.lang.php    | 2 --
 WEB-INF/resources/et.lang.php    | 3 ---
 WEB-INF/resources/fa.lang.php    | 2 --
 WEB-INF/resources/fi.lang.php    | 2 --
 WEB-INF/resources/fr.lang.php    | 2 --
 WEB-INF/resources/gr.lang.php    | 2 --
 WEB-INF/resources/he.lang.php    | 2 --
 WEB-INF/resources/hu.lang.php    | 2 --
 WEB-INF/resources/it.lang.php    | 2 --
 WEB-INF/resources/ja.lang.php    | 2 --
 WEB-INF/resources/ko.lang.php    | 2 --
 WEB-INF/resources/nl.lang.php    | 2 --
 WEB-INF/resources/no.lang.php    | 2 --
 WEB-INF/resources/pl.lang.php    | 2 --
 WEB-INF/resources/pt-br.lang.php | 2 --
 WEB-INF/resources/pt.lang.php    | 2 --
 WEB-INF/resources/ro.lang.php    | 2 --
 WEB-INF/resources/ru.lang.php    | 2 --
 WEB-INF/resources/sk.lang.php    | 2 --
 WEB-INF/resources/sl.lang.php    | 2 --
 WEB-INF/resources/sr.lang.php    | 2 --
 WEB-INF/resources/sv.lang.php    | 2 --
 WEB-INF/resources/tr.lang.php    | 2 --
 WEB-INF/resources/zh-cn.lang.php | 2 --
 WEB-INF/resources/zh-tw.lang.php | 2 --
 WEB-INF/templates/footer.tpl     | 2 +-
 report.php                       | 2 +-
 reports.php                      | 6 +++---
 33 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c0a693134..293471700 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -446,8 +446,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar període de temps',
 'form.reports.set_period' => 'o establir dates',
 'form.reports.show_fields' => 'Mostrar camps',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d48497cf2..c85cb6867 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -456,8 +456,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Výberte období',
 'form.reports.set_period' => 'nebo určete dny',
 'form.reports.show_fields' => 'Zobrazit pole',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2a639b2ad..3dfb41c87 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -422,8 +422,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vælg en periode',
 'form.reports.set_period' => 'eller sæt datoer',
 'form.reports.show_fields' => 'Vis felter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 016ec8558..c787f6d87 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -402,8 +402,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
 'form.reports.show_fields' => 'Felder anzeigen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4ec12f82d..5c91c3ee4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -398,8 +398,6 @@
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.include_pending' => 'pending',
-'form.reports.include_approved' => 'approved',
-'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3c6c44c85..c86741762 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -459,8 +459,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar período de tiempo',
 'form.reports.set_period' => 'o establecer fechas',
 'form.reports.show_fields' => 'Mostrar campos',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index cccc548b8..7f2fe8eb0 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -427,9 +427,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
-
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
 'form.reports.show_fields' => 'Näita välju',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 95a157391..fdbcdba5f 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -442,8 +442,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'انتخاب بازه زمانی',
 'form.reports.set_period' => 'یا تعیین تاریخ',
 'form.reports.show_fields' => 'نمایش فیلدها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index c06af3dec..bc66a2264 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -427,8 +427,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Valitse ajanjakso',
 'form.reports.set_period' => 'tai aseta päivät',
 'form.reports.show_fields' => 'Näytä kentät',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f95325d6c..840f85590 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -419,8 +419,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Sélectionner la période de temps',
 'form.reports.set_period' => 'ou dates indiquées',
 'form.reports.show_fields' => 'Afficher les champs',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 8079b6f8f..2ebdaa8f3 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -411,8 +411,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index c2f66657a..cac16e9c5 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -448,8 +448,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'בחר תקופת זמן',
 'form.reports.set_period' => 'או הגדר תאריכים',
 'form.reports.show_fields' => 'הראה שדות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 245275ab9..f4d5dd139 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -448,8 +448,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Jelölj meg egy időszakot',
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index da1f2ff99..3d898e2f2 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -424,8 +424,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
 'form.reports.set_period' => 'oppure setta le date',
 'form.reports.show_fields' => 'Mostra i campi',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index faa497971..7f1a84119 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -454,8 +454,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '時間期間の選択',
 'form.reports.set_period' => 'あるいは日付を設定',
 'form.reports.show_fields' => 'フィールドの表示',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 89c01a34f..c5b7e0a21 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -452,8 +452,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '시간 기간을 선택',
 'form.reports.set_period' => '혹은 날짜를 설정',
 'form.reports.show_fields' => '필드들을 보기',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 191e8aeea..7307ec4a9 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -398,8 +398,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1f4cd35c8..a05071167 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -452,8 +452,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Velg tidsperiode',
 'form.reports.set_period' => 'eller sett dato',
 'form.reports.show_fields' => 'Vis feltene',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 53cb7e4bf..28e8a0ace 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -430,8 +430,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Wybierz okres',
 'form.reports.set_period' => 'lub ustaw daty',
 'form.reports.show_fields' => 'Pokaż pola',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 8189bdb48..74e5822f0 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -425,8 +425,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9ec2d495b..e1e6b29d8 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -432,8 +432,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 902ca04ba..cf701cf63 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -455,8 +455,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Alege perioada',
 'form.reports.set_period' => 'sau introdu intervalul de date',
 'form.reports.show_fields' => 'Arata campuri',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 588b737a7..2fec5db79 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -389,8 +389,6 @@
 'form.reports.include_assigned' => 'присвоена',
 'form.reports.include_not_assigned' => 'не присвоена',
 'form.reports.include_pending' => 'в ожидании',
-'form.reports.include_approved' => 'одобрена',
-'form.reports.include_not_approved' => 'не одобрена',
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d08d06bc5..08999f1de 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -438,8 +438,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vyberte časový rozsah',
 'form.reports.set_period' => 'alebo nastavte dátumy',
 'form.reports.show_fields' => 'Zobraziť polia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c3ee36cbe..95d3f8587 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -429,8 +429,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
 // 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6c2f926fb..170e5409f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -428,8 +428,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Odaberi vremenski raspon',
 'form.reports.set_period' => 'ili podesi datum',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 380958784..be3f4f280 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -426,8 +426,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Välj intervall',
 'form.reports.set_period' => 'eller ställ in datum',
 'form.reports.show_fields' => 'Visa fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1c2ce69f3..e30ddf06a 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -465,8 +465,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zaman aralığını seç',
 'form.reports.set_period' => 'ya da tarihleri belirle',
 'form.reports.show_fields' => 'Alanları göster',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 91ae2e993..05fa7a88e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -437,8 +437,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '选择时间段',
 'form.reports.set_period' => '或设定日期',
 'form.reports.show_fields' => '显示栏目',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2888d5365..760e9acfa 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -445,8 +445,6 @@
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '選擇時間段',
 'form.reports.set_period' => '或設定日期',
 'form.reports.show_fields' => '顯示欄目',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0fb5ca50b..4f4adc75a 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.43.4776 | 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.43.4777 | 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/report.php b/report.php
index 135c8f272..6b26fe1ca 100644
--- a/report.php
+++ b/report.php
@@ -92,7 +92,7 @@
     'name'=>'mark_approved_select_options',
     'data'=>$mark_approved_select_options,
     'value'=>$cl_mark_approved_select_option));
-  $mark_approved_action_options = array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved'));
+  $mark_approved_action_options = array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_action_options',
     'data'=>$mark_approved_action_options,
diff --git a/reports.php b/reports.php
index d8bf40995..107f8cee6 100644
--- a/reports.php
+++ b/reports.php
@@ -189,8 +189,8 @@
    'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
      TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
      TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
-     TIMESHEET_APPROVED=>$i18n->get('form.reports.include_approved'),
-     TIMESHEET_NOT_APPROVED=>$i18n->get('form.reports.include_not_approved')),
+     TIMESHEET_APPROVED=>$i18n->get('dropdown.approved'),
+     TIMESHEET_NOT_APPROVED=>$i18n->get('dropdown.not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }
@@ -206,7 +206,7 @@
   $form->addInput(array('type'=>'combobox',
    'name'=>'approved',
    'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved')),
+   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }

From cb0478b58a3e34cfffcf41e4e89de5a75685460d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 16:54:38 +0000
Subject: [PATCH 0721/1848] Added approval handling to reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 23 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 report.php                           | 19 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5d9de074e..57d004728 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -659,6 +659,29 @@ static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids) {
     }
   }
 
+  // The markApproved marks a set of records as either approved or unapproved.
+  static function markApproved($time_log_ids, $expense_item_ids, $approved = true) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $approved_val = (int) $approved;
+    if ($time_log_ids) {
+      $sql = "update tt_log set approved = $approved_val".
+        " where id in(".join(', ', $time_log_ids).") and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }
+    if ($expense_item_ids) {
+      $sql = "update tt_expense_items set approved = $approved_val".
+        " where id in(".join(', ', $expense_item_ids).") and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }
+  }
+
   // The markPaid marks a set of records as either paid or unpaid.
   static function markPaid($time_log_ids, $expense_item_ids, $paid = true) {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4f4adc75a..57554741f 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.43.4777 | 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.43.4778 | 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/report.php b/report.php
index 6b26fe1ca..aacb889ac 100644
--- a/report.php
+++ b/report.php
@@ -142,7 +142,8 @@
 if ($request->isPost()) {
 
   // Validate parameters and at the same time build arrays of record ids.
-  if (($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
+  if (($request->getParameter('btn_mark_approved') && 2 == $request->getParameter('mark_approved_select_options'))
+       || ($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
        || ($request->getParameter('btn_assign') && 2 == $request->getParameter('assign_invoice_select_options'))) {
     // We act on selected records. Are there any?
     foreach($_POST as $key => $val) {
@@ -164,6 +165,22 @@
   }
 
   if ($err->no()) {
+    if ($request->getParameter('btn_mark_approved')) {
+      // User clicked the "Mark approved" button to mark some or all items either approved or not approved.
+
+      // Determine user action.
+      $mark_approved = $request->getParameter('mark_approved_action_options') == 1 ? true : false;
+
+      // Mark as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::markApproved($time_log_ids, $expense_item_ids, $mark_approved);
+      }
+
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
+
     if ($request->getParameter('btn_mark_paid')) {
       // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
 

From c14bc01ae221ece2c5b78c9c39b4902cb25154d6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 17:40:15 +0000
Subject: [PATCH 0722/1848] Releasing Approval plugin for testing.

---
 WEB-INF/lib/ttReportHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/plugins.tpl        |  2 --
 reports.php                          | 26 +++++++++++++-------------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 57d004728..80ead68ed 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1087,9 +1087,9 @@ static function getReportOptions($bean) {
     $options['invoice'] = $bean->getAttribute('invoice');
     $options['paid_status'] = $bean->getAttribute('paid_status');
     $options['approved'] = $bean->getAttribute('approved');
+    if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
+      $options['approved'] = 1; // Restrict clients to approved records only.
     $options['timesheet'] = $bean->getAttribute('timesheet');
-    if ($user->isPluginEnabled('ts') && $user->isClient() && !$user->can('view_client_unapproved'))
-      $options['timesheet'] = TIMESHEET_APPROVED; // Restrict clients to approved timesheet records only.
     if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
     $options['period'] = $bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 57554741f..32d68a094 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.43.4778 | 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.44.4779 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index ce0cd52ab..5c5941c3e 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -134,12 +134,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
             <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
-{if isTrue('APPROVAL_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
             <td><label for="approval">{$i18n.label.approval}</label></td>
           </tr>
-{/if}
 {if isTrue('TIMESHEET_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
diff --git a/reports.php b/reports.php
index 107f8cee6..febfad794 100644
--- a/reports.php
+++ b/reports.php
@@ -178,6 +178,19 @@
  ));
 }
 
+// Add approved / not approved selector.
+$showApproved = $user->isPluginEnabled('ap') &&
+  ($user->can('view_own_reports') || $user->can('view_reports') ||
+   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
+if ($showApproved) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'approved',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+  ));
+}
+
 // Add timesheet assignment selector.
 $showTimesheetDropdown = $user->isPluginEnabled('ts') &&
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
@@ -198,19 +211,6 @@
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
    $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
 
-// Add approved / not approved selector.
-$showApproved = $user->isPluginEnabled('ap') &&
-  ($user->can('view_own_reports') || $user->can('view_reports') ||
-   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
-if ($showApproved) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'approved',
-   'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
-  ));
-}
-
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
 $user_list = array();

From 9fa13d0babab9e51a19824ec7ef64830cf530fb2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 19:54:48 +0000
Subject: [PATCH 0723/1848] Fixed export by adding approved status and
 timesheets to output.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 29 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 1ab501eab..aa9ec8cfb 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -42,6 +42,7 @@ class ttGroupExportHelper {
   var $taskMap    = array();
   var $projectMap = array();
   var $clientMap  = array();
+  var $timesheetMap = array();
   var $invoiceMap = array();
   var $logMap     = array();
   var $customFieldMap = array();
@@ -174,6 +175,11 @@ function writeData() {
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
+    // Prepare timesheet map.
+    $timesheets = $this->getRecordsFromTable('tt_timesheets');
+    foreach ($timesheets as $key=>$timesheet_item)
+      $this->timesheetMap[$timesheet_item['id']] = $key + 1;
+
     // Prepare invoice map.
     $invoices = ttTeamHelper::getAllInvoices();
     foreach ($invoices as $key=>$invoice_item)
@@ -318,6 +324,27 @@ function writeData() {
       unset($bind_part);
     }
 
+    // Write timesheets.
+    if (count($timesheets) > 0) {
+      fwrite($this->file, $this->indentation."  <timesheets>\n");
+      foreach ($timesheets as $timesheet_item) {
+        $timesheet_part = $this->indentation.'    '."<timesheet id=\"".$this->timesheetMap[$timesheet_item['id']]."\"";
+        $timesheet_part .= " user_id=\"".$this->userMap[$timesheet_item['user_id']]."\"";
+        $timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
+        $timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
+        $timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
+        $timesheet_part .= " submitter_comment=\"".htmlspecialchars($timesheet_item['submitter_name'])."\"";
+        $timesheet_part .= " approval_status=\"".$timesheet_item['approval_status']."\"";
+        $timesheet_part .= " manager_comment=\"".htmlspecialchars($timesheet_item['manager_comment'])."\"";
+        $timesheet_part .= " status=\"".$timesheet_item['status']."\"";
+        $timesheet_part .= "></timesheet>\n";
+        fwrite($this->file, $timesheet_part);
+      }
+      fwrite($this->file, $this->indentation."  </timesheets>\n");
+      unset($timesheets);
+      unset($timesheet_part);
+    }
+
     // Write invoices.
     if (count($invoices) > 0) {
       fwrite($this->file, $this->indentation."  <invoices>\n");
@@ -355,9 +382,11 @@ function writeData() {
         $log_part .= " client_id=\"".$this->clientMap[$record['client_id']]."\"";
         $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\"";
         $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
+        $log_part .= " timesheet_id=\"".$this->timesheetMap[$record['timesheet_id']]."\"";
         $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
         $log_part .= " comment=\"".htmlspecialchars($record['comment'])."\"";
         $log_part .= " billable=\"".$record['billable']."\"";
+        $log_part .= " approved=\"".$record['approved']."\"";
         $log_part .= " paid=\"".$record['paid']."\"";
         $log_part .= " status=\"".$record['status']."\"";
         $log_part .= "></log_item>\n";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 32d68a094..f61c6cfbf 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.44.4779 | 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.44.4780 | 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>

From ecb94422f83654dd371f751a30112a80833748dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 22:00:22 +0000
Subject: [PATCH 0724/1848] Fixes to import/export for timesheets and approval
 status.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  2 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 76 +++++++++++++++++++++--
 WEB-INF/templates/footer.tpl              |  2 +-
 report.php                                |  5 +-
 4 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index aa9ec8cfb..11104a5ff 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -456,9 +456,11 @@ function writeData() {
         $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
         $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
         $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
+        $expense_item_part .= " timesheet_id=\"".$this->timesheetMap[$expense_item['timesheet_id']]."\"";
         $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
         $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
         $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
+        $expense_item_part .= " approved=\"".$expense_item['approved']."\"";
         $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
         $expense_item_part .= " status=\"".$expense_item['status']."\"";
         $expense_item_part .= "></expense_item>\n";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 251cb3ea6..d7161d90a 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -36,7 +36,7 @@ class ttOrgImportHelper {
   var $canImport      = true;    // False if we cannot import data due to a conflict such as login collision.
   var $firstPass      = true;    // True during first pass through the file.
   var $org_id         = null;    // Organization id (same as top group_id).
-  var $current_group_id        = null; // Current group id during parsing.
+  var $current_group_id     = null; // Current group id during parsing.
   var $parents        = array(); // A stack of parent group ids for current group all the way to the root including self.
   var $top_role_id    = 0;       // Top role id.
 
@@ -46,6 +46,7 @@ class ttOrgImportHelper {
   var $currentGroupProjectMap = array();
   var $currentGroupClientMap  = array();
   var $currentGroupUserMap    = array();
+  var $currentGroupTimesheetMap = array();
   var $currentGroupInvoiceMap = array();
   var $currentGroupLogMap     = array();
   var $currentGroupCustomFieldMap = array();
@@ -138,6 +139,7 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupProjectMap); $this->currentGroupProjectMap = array();
         unset($this->currentGroupClientMap); $this->currentGroupClientMap = array();
         unset($this->currentGroupUserMap); $this->currentGroupUserMap = array();
+        unset($this->currentGroupTimesheetMap); $this->currentGroupTimesheetMap = array();
         unset($this->currentGroupInvoiceMap); $this->currentGroupInvoiceMap = array();
         unset($this->currentGroupLogMap); $this->currentGroupLogMap = array();
         unset($this->currentGroupCustomFieldMap); $this->currentGroupCustomFieldMap = array();
@@ -274,6 +276,28 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
+      if ($name == 'TIMESHEET') {
+        // We get here when processing <timesheet> tags for the current group.
+        $timesheet_id = $this->insertTimesheet(array(
+          'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'name' => $attrs['NAME'],
+          'submit_status' => $attrs['SUBMIT_STATUS'],
+          'submitter_comment' => $attrs['SUBMITTER_COMMENT'],
+          'approval_status' => $attrs['APPROVAL_STATUS'],
+          'manager_comment' => $attrs['MANAGER_COMMENT'],
+          'status' => $attrs['STATUS']));
+        if ($timesheet_id) {
+          // Add a mapping.
+          $this->currentGroupTimesheetMap[$attrs['ID']] = $timesheet_id;
+        } else {
+          $this->errors->add($i18n->get('error.db'));
+        }
+        return;
+      }
+
       if ($name == 'INVOICE') {
         // We get here when processing <invoice> tags for the current group.
         $invoice_id = $this->insertInvoice(array(
@@ -305,9 +329,11 @@ function startElement($parser, $name, $attrs) {
           'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'task_id' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
+          'timesheet_id' => $this->currentGroupTimesheetMap[$attrs['TIMESHEET_ID']],
           'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
           'comment' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
           'billable' => $attrs['BILLABLE'],
+          'approved' => $attrs['APPROVED'],
           'paid' => $attrs['PAID'],
           'status' => $attrs['STATUS']));
         if ($log_item_id) {
@@ -371,9 +397,11 @@ function startElement($parser, $name, $attrs) {
           'org_id' => $this->org_id,
           'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'timesheet_id' => $this->currentGroupTimesheetMap[$attrs['TIMESHEET_ID']],
           'name' => $attrs['NAME'],
           'cost' => $attrs['COST'],
           'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+          'approved' => $attrs['APPROVED'],
           'paid' => $attrs['PAID'],
           'status' => $attrs['STATUS']));
         if (!$expense_item_id) $this->errors->add($i18n->get('error.db'));
@@ -719,17 +747,21 @@ private function insertExpense($fields) {
     $user_id = (int) $fields['user_id'];
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
+    $timesheet_id = $fields['timesheet_id'];
     $name = $fields['name'];
     $cost = str_replace(',', '.', $fields['cost']);
     $invoice_id = $fields['invoice_id'];
     $status = $fields['status'];
+    $approved = (int) $fields['approved'];
     $paid = (int) $fields['paid'];
     $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     $sql = "insert into tt_expense_items".
-      " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
+      " (date, user_id, group_id, org_id, client_id, project_id, timesheet_id, name,".
+      " cost, invoice_id, approved, paid, created, created_ip, created_by, status)".
       " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
-      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
+      ", ".$mdb2->quote($timesheet_id).", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).
+      ", $approved, $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -865,6 +897,35 @@ private function insertRole($fields)
     return $last_id;
   }
 
+  // insertTimesheet - inserts a timesheet in database.
+  private function insertTimesheet($fields)
+  {
+    $mdb2 = getConnection();
+
+    $user_id = (int) $fields['user_id'];
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $client_id = $fields['client_id'];
+    $name = $fields['name'];
+    $submit_status = $fields['submit_status'];
+    $submitter_comment = $fields['submitter_comment'];
+    $approval_status = $fields['approval_status'];
+    $manager_comment = $fields['manager_comment'];
+    $status = $fields['status'];
+
+    // Insert a new timesheet record.
+    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name,".
+      " submit_status, submitter_comment, approval_status, manager_comment, status)".
+      " values($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).", ".
+      $mdb2->quote($fields['submit_status']).", ".$mdb2->quote($fields['submiter_comment']).", ".
+      $mdb2->quote($fields['approval_status']).", ".$mdb2->quote($fields['manager_comment']).", ".$mdb2->quote($fields['status']).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
+    return $last_id;
+  }
+
   // insertInvoice - inserts an invoice in database.
   private function insertInvoice($fields)
   {
@@ -1056,15 +1117,17 @@ private function insertLogEntry($fields) {
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
     $task_id = $fields['task_id'];
+    $timesheet_id = $fields['timesheet_id'];
     $invoice_id = $fields['invoice_id'];
     $comment = $fields['comment'];
     $billable = (int) $fields['billable'];
+    $approved = (int) $fields['approved'];
     $paid = (int) $fields['paid'];
     $status = $fields['status'];
 
     $sql = "insert into tt_log".
-      " (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment".
-      ", billable, paid, created, created_ip, created_by, status)".
+      " (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, timesheet_id, invoice_id, comment".
+      ", billable, approved, paid, created, created_ip, created_by, status)".
       " values ($user_id, $group_id, $org_id".
       ", ".$mdb2->quote($date).
       ", ".$mdb2->quote($start).
@@ -1072,9 +1135,10 @@ private function insertLogEntry($fields) {
       ", ".$mdb2->quote($client_id).
       ", ".$mdb2->quote($project_id).
       ", ".$mdb2->quote($task_id).
+      ", ".$mdb2->quote($timesheet_id).
       ", ".$mdb2->quote($invoice_id).
       ", ".$mdb2->quote($comment).
-      ", $billable, $paid".
+      ", $billable, $approved, $paid".
       ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$user->id.
       ", ". $mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f61c6cfbf..36ff12c7c 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.44.4780 | 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.44.4781 | 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/report.php b/report.php
index aacb889ac..ed7928c7f 100644
--- a/report.php
+++ b/report.php
@@ -82,7 +82,8 @@
   if ($user->can('manage_invoices'))
     $showForInvoicesOrPaid = true;
 }
-if ($showForApproved || $showForInvoicesOrPaid)
+$use_checkboxes = $showForApproved || $showForInvoicesOrPaid;
+if ($use_checkboxes)
   $smarty->assign('use_checkboxes', true);
 
 // Controls for "Mark approved" block.
@@ -218,7 +219,7 @@
 
 $report_items = ttReportHelper::getItems($options);
 // Store record ids in session in case user wants to act on records such as marking them all paid.
-if ($request->isGet() && $user->isPluginEnabled('ps'))
+if ($request->isGet() && $use_checkboxes)
   ttReportHelper::putInSession($report_items);
 
 if (ttReportHelper::grouping($options)) {

From bcd76a04871724775c3b648bffa56e6d4ea4551c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Feb 2019 16:01:34 +0000
Subject: [PATCH 0725/1848] Removed view_client_unapproved right from default
 client role.

---
 WEB-INF/lib/ttRoleHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 13 ++++++++-----
 mysql.sql                          |  2 +-
 reports.php                        |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 0be33d55a..c45d4d3f9 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -189,7 +189,7 @@ static function createPredefinedRoles($group_id, $lang)
 
     $mdb2 = getConnection();
 
-    $rights_client = 'view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,manage_own_settings';
+    $rights_client = 'view_client_reports,view_client_timesheets,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 36ff12c7c..0ecaee021 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.44.4781 | 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.44.4782 | 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/dbinstall.php b/dbinstall.php
index 6124857b1..0503760f6 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11843"]) {
+  if ($_POST["convert11797to11844"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1092,7 +1092,10 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'view_reports,view_timesheets', 'view_reports,approve_reports,view_timesheets') where rank = 12 or rank = 68 or rank = 324");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'export_data,approve_all_timesheets', 'export_data,approve_all_reports,approve_all_timesheets') where rank = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.43', modified = now() where param_name = 'version_db' and param_value = '1.18.42'");
-  }
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group' where rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = replace(rights, 'view_client_timesheets,view_client_unapproved,view_client_invoices', 'view_client_timesheets,view_client_invoices') where rank = 16");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.44', modified = now() where param_name = 'version_db' and param_value = '1.18.43'");
+}
 
   if ($_POST["cleanup"]) {
 
@@ -1140,7 +1143,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.43)</b>
+    <td width="80%"><b>Create database structure (v1.18.44)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1185,8 +1188,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.43)</td>
-    <td><input type="submit" name="convert11797to11843" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.44)</td>
+    <td><input type="submit" name="convert11797to11844" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 8b1859190..9958fbd24 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
diff --git a/reports.php b/reports.php
index febfad794..d6a9a7074 100644
--- a/reports.php
+++ b/reports.php
@@ -194,7 +194,7 @@
 // Add timesheet assignment selector.
 $showTimesheetDropdown = $user->isPluginEnabled('ts') &&
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
-   $user->can('view_all_timesheets') || ($user->can('view_client_timesheets') && $user->can('view_client_unapproved')));
+   $user->can('view_all_timesheets') || ($user->can('view_client_timesheets')));
 if ($showTimesheetDropdown) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',

From 09cb0a1a3c772c618ff58b339cd40cbdb59f7492 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Feb 2019 17:09:27 +0000
Subject: [PATCH 0726/1848] Extended tt_fav_reports table for approved and
 timesheet options.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 13 +++++++++----
 mysql.sql                    |  6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0ecaee021..90c81e1a5 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.44.4782 | 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.45.4783 | 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/dbinstall.php b/dbinstall.php
index 0503760f6..d7f90cb82 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11844"]) {
+  if ($_POST["convert11797to11845"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1095,6 +1095,11 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group' where rank = 512");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = replace(rights, 'view_client_timesheets,view_client_unapproved,view_client_invoices', 'view_client_timesheets,view_client_invoices') where rank = 16");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.44', modified = now() where param_name = 'version_db' and param_value = '1.18.43'");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `approved` tinyint(4) default NULL AFTER `billable`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `timesheet` tinyint(4) default NULL AFTER `invoice`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_timesheet` tinyint(4) NOT NULL default 0 AFTER `show_project`");
+    ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_approved` tinyint(4) NOT NULL default 0 AFTER `show_note`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.45', modified = now() where param_name = 'version_db' and param_value = '1.18.44'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1143,7 +1148,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.44)</b>
+    <td width="80%"><b>Create database structure (v1.18.45)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1188,8 +1193,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.44)</td>
-    <td><input type="submit" name="convert11797to11844" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.45)</td>
+    <td><input type="submit" name="convert11797to11845" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 9958fbd24..1747b590a 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -267,7 +267,9 @@ CREATE TABLE `tt_fav_reports` (
   `project_id` int(11) default NULL,                     # project id (if selected)
   `task_id` int(11) default NULL,                        # task id (if selected)
   `billable` tinyint(4) default NULL,                    # whether to include billable, not billable, or all records
+  `approved` tinyint(4) default NULL,                    # whether to include approved, unapproved, or all records
   `invoice` tinyint(4) default NULL,                     # whether to include invoiced, not invoiced, or all records
+  `timesheet` tinyint(4) default NULL,                   # include records with a specific timesheet status, or all records
   `paid_status` tinyint(4) default NULL,                 # whether to include paid, not paid, or all records
   `users` text default NULL,                             # Comma-separated list of user ids. Nothing here means "all" users.
   `period` tinyint(4) default NULL,                      # selected period type for report
@@ -278,12 +280,14 @@ CREATE TABLE `tt_fav_reports` (
   `show_paid` tinyint(4) NOT NULL default 0,             # whether to show paid column
   `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
   `show_project` tinyint(4) NOT NULL default 0,          # whether to show project column
+  `show_timesheet` tinyint(4) NOT NULL default 0,        # whether to show timesheet column
   `show_start` tinyint(4) NOT NULL default 0,            # whether to show start field
   `show_duration` tinyint(4) NOT NULL default 0,         # whether to show duration field
   `show_cost` tinyint(4) NOT NULL default 0,             # whether to show cost field
   `show_task` tinyint(4) NOT NULL default 0,             # whether to show task column
   `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
   `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
+  `show_approved` tinyint(4) NOT NULL default 0,         # whether to show approved column
   `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
   `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
@@ -520,4 +524,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.43', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.45', now()); # TODO: change when structure changes.

From da31afab09f45aa188f4a6a8c939715a80216992 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Feb 2019 19:25:31 +0000
Subject: [PATCH 0727/1848] Made fav reports to remember approved and timesheet
 options.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 74 +++++++++++++++++--------
 WEB-INF/templates/footer.tpl            |  2 +-
 reports.php                             | 20 ++++---
 3 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 30bfc235f..97f7e47ae 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -120,22 +120,23 @@ static function insertReport($fields) {
 
     $sql = "insert into tt_fav_reports".
       " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
-      " billable, invoice, paid_status, users, period, period_start, period_end,".
-      " show_client, show_invoice, show_paid, show_ip,".
-      " show_project, show_start, show_duration, show_cost,".
-      " show_task, show_end, show_note, show_custom_field_1, show_work_units,".
+      " billable, approved, invoice, timesheet, paid_status, users, period, period_start,".
+      " period_end, show_client, show_invoice, show_paid, show_ip,".
+      " show_project, show_timesheet, show_start, show_duration, show_cost,".
+      " show_task, show_end, show_note, show_approved, show_custom_field_1, show_work_units,".
       " group_by1, group_by2, group_by3, show_totals_only)".
       " values(".
       $mdb2->quote($fields['name']).", $user_id, $group_id, $org_id, ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
-      $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
+      $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
+      $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
       $mdb2->quote($fields['paid_status']).", ".
       $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
-      $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
-      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
+      $fields['chproject'].", ".$fields['chtimesheet'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
+      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chapproved'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
       $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
       $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
@@ -162,7 +163,9 @@ static function updateReport($fields) {
       "project_id = ".$mdb2->quote($fields['project']).", ".
       "task_id = ".$mdb2->quote($fields['task']).", ".
       "billable = ".$mdb2->quote($fields['billable']).", ".
+      "approved = ".$mdb2->quote($fields['approved']).", ".
       "invoice = ".$mdb2->quote($fields['invoice']).", ".
+      "timesheet = ".$mdb2->quote($fields['timesheet']).", ".
       "paid_status = ".$mdb2->quote($fields['paid_status']).", ".
       "users = ".$mdb2->quote($fields['users']).", ".
       "period = ".$mdb2->quote($fields['period']).", ".
@@ -173,12 +176,14 @@ static function updateReport($fields) {
       "show_paid = ".$fields['chpaid'].", ".
       "show_ip = ".$fields['chip'].", ".
       "show_project = ".$fields['chproject'].", ".
+      "show_timesheet = ".$fields['chtimesheet'].", ".
       "show_start = ".$fields['chstart'].", ".
       "show_duration = ".$fields['chduration'].", ".
       "show_cost = ".$fields['chcost'].", ".
       "show_task = ".$fields['chtask'].", ".
       "show_end = ".$fields['chfinish'].", ".
       "show_note = ".$fields['chnote'].", ".
+      "show_approved = ".$fields['chapproved'].", ".
       "show_custom_field_1 = ".$fields['chcf_1'].", ".
       "show_work_units = ".$fields['chunits'].", ".
       "group_by1 = ".$mdb2->quote($fields['group_by1']).", ".
@@ -200,18 +205,24 @@ static function saveReport($bean) {
     //  Set default value of 0 for not set checkboxes (in bean).
     //  Later in this function we use it to construct $fields array to update database.
     if (!$bean->getAttribute('chclient')) $bean->setAttribute('chclient', 0);
-    if (!$bean->getAttribute('chinvoice')) $bean->setAttribute('chinvoice', 0);
-    if (!$bean->getAttribute('chpaid')) $bean->setAttribute('chpaid', 0);
-    if (!$bean->getAttribute('chip')) $bean->setAttribute('chip', 0);
-    if (!$bean->getAttribute('chproject')) $bean->setAttribute('chproject', 0);
     if (!$bean->getAttribute('chstart')) $bean->setAttribute('chstart', 0);
+    if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
     if (!$bean->getAttribute('chduration')) $bean->setAttribute('chduration', 0);
-    if (!$bean->getAttribute('chcost')) $bean->setAttribute('chcost', 0);
+ 
+    if (!$bean->getAttribute('chproject')) $bean->setAttribute('chproject', 0);
     if (!$bean->getAttribute('chtask')) $bean->setAttribute('chtask', 0);
-    if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
     if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0);
+    if (!$bean->getAttribute('chcost')) $bean->setAttribute('chcost', 0);
+
+    if (!$bean->getAttribute('chtimesheet')) $bean->setAttribute('chtimesheet', 0);
+    if (!$bean->getAttribute('chip')) $bean->setAttribute('chip', 0);
+    if (!$bean->getAttribute('chapproved')) $bean->setAttribute('chapproved', 0);
+    if (!$bean->getAttribute('chpaid')) $bean->setAttribute('chpaid', 0);
+
     if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
     if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0);
+    if (!$bean->getAttribute('chinvoice')) $bean->setAttribute('chinvoice', 0);
+
     if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
 
     $users_in_bean = $bean->getAttribute('users');
@@ -234,25 +245,29 @@ static function saveReport($bean) {
       'project'=>$bean->getAttribute('project'),
       'task'=>$bean->getAttribute('task'),
       'billable'=>$bean->getAttribute('include_records'),
-      'invoice'=>$bean->getAttribute('invoice'),
+      'approved'=>$bean->getAttribute('approved'),
       'paid_status'=>$bean->getAttribute('paid_status'),
+      'invoice'=>$bean->getAttribute('invoice'),
+      'timesheet'=>$bean->getAttribute('timesheet'),
       'users'=>$users,
       'period'=>$bean->getAttribute('period'),
       'from'=>$from,
       'to'=>$to,
       'chclient'=>$bean->getAttribute('chclient'),
-      'chinvoice'=>$bean->getAttribute('chinvoice'),
-      'chpaid'=>$bean->getAttribute('chpaid'),
-      'chip'=>$bean->getAttribute('chip'),
-      'chproject'=>$bean->getAttribute('chproject'),
       'chstart'=>$bean->getAttribute('chstart'),
+      'chfinish'=>$bean->getAttribute('chfinish'),
       'chduration'=>$bean->getAttribute('chduration'),
-      'chcost'=>$bean->getAttribute('chcost'),
+      'chproject'=>$bean->getAttribute('chproject'),
       'chtask'=>$bean->getAttribute('chtask'),
-      'chfinish'=>$bean->getAttribute('chfinish'),
       'chnote'=>$bean->getAttribute('chnote'),
+      'chcost'=>$bean->getAttribute('chcost'),
+      'chtimesheet'=>$bean->getAttribute('chtimesheet'),
+      'chip'=>$bean->getAttribute('chip'),
+      'chapproved'=>$bean->getAttribute('chapproved'),
+      'chpaid'=>$bean->getAttribute('chpaid'),
       'chcf_1'=>$bean->getAttribute('chcf_1'),
       'chunits'=>$bean->getAttribute('chunits'),
+      'chinvoice'=>$bean->getAttribute('chinvoice'),
       'group_by1'=>$bean->getAttribute('group_by1'),
       'group_by2'=>$bean->getAttribute('group_by2'),
       'group_by3'=>$bean->getAttribute('group_by3'),
@@ -303,8 +318,10 @@ static function loadReport(&$bean) {
       $bean->setAttribute('project', $val['project_id']);
       $bean->setAttribute('task', $val['task_id']);
       $bean->setAttribute('include_records', $val['billable']);
+      $bean->setAttribute('approved', $val['approved']);
       $bean->setAttribute('invoice', $val['invoice']);
       $bean->setAttribute('paid_status', $val['paid_status']);
+      $bean->setAttribute('timesheet', $val['timesheet']);
       $bean->setAttribute('users', explode(',', $val['users']));
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
@@ -320,12 +337,14 @@ static function loadReport(&$bean) {
       $bean->setAttribute('chpaid', $val['show_paid']);
       $bean->setAttribute('chip', $val['show_ip']);
       $bean->setAttribute('chproject', $val['show_project']);
+      $bean->setAttribute('chtimesheet', $val['show_timesheet']);
       $bean->setAttribute('chstart', $val['show_start']);
       $bean->setAttribute('chduration', $val['show_duration']);
       $bean->setAttribute('chcost', $val['show_cost']);
       $bean->setAttribute('chtask', $val['show_task']);
       $bean->setAttribute('chfinish', $val['show_end']);
       $bean->setAttribute('chnote', $val['show_note']);
+      $bean->setAttribute('chapproved', $val['show_approved']);
       $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
       $bean->setAttribute('chunits', $val['show_work_units']);
       $bean->setAttribute('group_by1', $val['group_by1']);
@@ -341,20 +360,27 @@ static function loadReport(&$bean) {
         'project'=>'',
         'task'=>'',
         'include_records'=>'',
+        'approved'=>'',
+        'paid_status'=>'',
         'invoice'=>'',
+        'timesheet'=>'',
         'users'=>$user_id,
         'period'=>'',
         'chclient'=>'1',
-        'chinvoice'=>'',
-        'chproject'=>'1',
         'chstart'=>'1',
+        'chfinish'=>'1',
         'chduration'=>'1',
-        'chcost'=>'',
+        'chproject'=>'1',
         'chtask'=>'1',
-        'chfinish'=>'1',
         'chnote'=>'1',
+        'chcost'=>'',
+        'chtimesheet'=>'',
+        'chip'=>'',
+        'chapproved'=>'',
+        'chpaid'=>'',
         'chcf_1'=>'',
         'chunits'=>'',
+        'chinvoice'=>'',
         'group_by1'=>'',
         'group_by2'=>'',
         'group_by3'=>'',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90c81e1a5..80072db49 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.45.4783 | 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.45.4784 | 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/reports.php b/reports.php
index d6a9a7074..5700025c7 100644
--- a/reports.php
+++ b/reports.php
@@ -336,20 +336,26 @@
   $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
   $form->setValueByElement('start_date', $period->getStartDate());
   $form->setValueByElement('end_date', $period->getEndDate());
+
   $form->setValueByElement('chclient', '1');
-  $form->setValueByElement('chinvoice', '0');
-  $form->setValueByElement('chpaid', '0');
-  $form->setValueByElement('chip', '0');
-  $form->setValueByElement('chproject', '1');
   $form->setValueByElement('chstart', '1');
+  $form->setValueByElement('chfinish', '1');
   $form->setValueByElement('chduration', '1');
-  $form->setValueByElement('chcost', '0');
+
+  $form->setValueByElement('chproject', '1');
   $form->setValueByElement('chtask', '1');
-  $form->setValueByElement('chfinish', '1');
   $form->setValueByElement('chnote', '1');
+  $form->setValueByElement('chcost', '0');
+
+  $form->setValueByElement('chtimesheet', '0');
+  $form->setValueByElement('chip', '0');
+  $form->setValueByElement('chapproved', '0');
+  $form->setValueByElement('chpaid', '0');
+
   $form->setValueByElement('chcf_1', '0');
   $form->setValueByElement('chunits', '0');
-  $form->setValueByElement('chtimesheet', '0');
+  $form->setValueByElement('chinvoice', '0');
+
   $form->setValueByElement('chtotalsonly', '0');
 }
 

From 7dff008c1343e02229a5607df059a7db4774f975 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Feb 2019 21:16:58 +0000
Subject: [PATCH 0728/1848] A fix for fav reports sent to clients.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 5 ++++-
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 97f7e47ae..694bb5947 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -414,7 +414,7 @@ static function getReportOptions($id) {
     return $options;
   }
 
-  // adjustOptions takes and array or report options and adjusts them for current user
+  // adjustOptions takes an array or report options and adjusts them for current user
   // (and group) settings. This is needed in situations when a fav report is stored in db
   // long ago, but user or group attributes are now changed, so we have to adjust.
   static function adjustOptions($options) {
@@ -457,6 +457,9 @@ static function adjustOptions($options) {
       // TODO: add checking the existing user list for potentially changed access rights for user.
     }
 
+    if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
+      $options['approved'] = 1; // Restrict clients to approved records only.
+
     return $options;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 80072db49..39d8eb771 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.45.4784 | 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.45.4785 | 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>

From 9857411f4fd9eb9275d0df54565db6aa7edcd029 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Feb 2019 23:34:09 +0000
Subject: [PATCH 0729/1848] Fixed emailed reports for approved and timesheet
 columns.

---
 WEB-INF/lib/ttReportHelper.class.php | 17 +++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 80ead68ed..c45548610 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -834,12 +834,16 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
+      if ($options['show_approved'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.approved').'</td>';
       if ($options['show_paid'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
       if ($options['show_ip'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
       if ($options['show_invoice'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
+      if ($options['show_timesheet'])
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.timesheet').'</td>';
       $body .= '</tr>';
 
       // Initialize variables to print subtotals.
@@ -880,9 +884,11 @@ static function prepareReportBody($options, $comment = null)
                 $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
                 $body .= '</td>';
               }
+              if ($options['show_approved']) $body .= '<td></td>';
               if ($options['show_paid']) $body .= '<td></td>';
               if ($options['show_ip']) $body .= '<td></td>';
               if ($options['show_invoice']) $body .= '<td></td>';
+              if ($options['show_timesheet']) $body .= '<td></td>';
               $body .= '</tr>';
               $body .= '<tr><td>&nbsp;</td></tr>';
             }
@@ -916,6 +922,11 @@ static function prepareReportBody($options, $comment = null)
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($options['show_cost'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
+          if ($options['show_approved']) {
+            $body .= '<td style="'.$cellRightAligned.'">';
+            $body .= $record['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+            $body .= '</td>';
+          }
           if ($options['show_paid']) {
             $body .= '<td style="'.$cellRightAligned.'">';
             $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
@@ -928,6 +939,8 @@ static function prepareReportBody($options, $comment = null)
           }
           if ($options['show_invoice'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
+          if ($options['show_timesheet'])
+            $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
           $body .= '</tr>';
 
           $prev_date = $record['date'];
@@ -956,9 +969,11 @@ static function prepareReportBody($options, $comment = null)
           $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
           $body .= '</td>';
         }
+        if ($options['show_approved']) $body .= '<td></td>';
         if ($options['show_paid']) $body .= '<td></td>';
         if ($options['show_ip']) $body .= '<td></td>';
         if ($options['show_invoice']) $body .= '<td></td>';
+        if ($options['show_timesheet']) $body .= '<td></td>';
         $body .= '</tr>';
       }
 
@@ -981,9 +996,11 @@ static function prepareReportBody($options, $comment = null)
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
         $body .= '</td>';
       }
+      if ($options['show_approved']) $body .= '<td></td>';
       if ($options['show_paid']) $body .= '<td></td>';
       if ($options['show_ip']) $body .= '<td></td>';
       if ($options['show_invoice']) $body .= '<td></td>';
+      if ($options['show_timesheet']) $body .= '<td></td>';
       $body .= '</tr>';
 
       $body .= '</table>';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 39d8eb771..1bb542f21 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.45.4785 | 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.45.4786 | 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>

From f42e768a0b39f5c375814bf9e3f36fb53563ecfd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Feb 2019 00:59:55 +0000
Subject: [PATCH 0730/1848] Fixed adjusting users for clients in fav report
 emails.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 694bb5947..8b9f4052e 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -448,8 +448,8 @@ static function adjustOptions($options) {
           $user_ids[] = $single_user['id'];
         }
         foreach ($users_to_adjust as $user_to_adjust) {
-          if (in_array($user_to_adjust['id'], $user_ids)) {
-            $adjusted_user_ids[] = $user_to_adjust['id'];
+          if (in_array($user_to_adjust, $user_ids)) {
+            $adjusted_user_ids[] = $user_to_adjust;
           }
         }
         $options['users'] = implode(',', $adjusted_user_ids);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1bb542f21..647512385 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.45.4786 | 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.45.4787 | 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>

From d4760fcf826cf3e528bd7a8f5301896d16da0266 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Feb 2019 14:50:20 +0000
Subject: [PATCH 0731/1848] Fixed fav report export by adding missing fields.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 8 +++++++-
 WEB-INF/templates/footer.tpl              | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 11104a5ff..06a3697d0 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -522,6 +522,10 @@ function writeData() {
         $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
         $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
         $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
+        $fav_report_part .= " approved=\"".$fav_report['approved']."\"";
+        $fav_report_part .= " invoice=\"".$fav_report['invoice']."\"";
+        $fav_report_part .= " timesheet=\"".$fav_report['timesheet']."\"";
+        $fav_report_part .= " paid_status=\"".$fav_report['paid_status']."\"";
         $fav_report_part .= " users=\"".$user_list."\"";
         $fav_report_part .= " period=\"".$fav_report['period']."\"";
         $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
@@ -531,18 +535,20 @@ function writeData() {
         $fav_report_part .= " show_paid=\"".$fav_report['show_paid']."\"";
         $fav_report_part .= " show_ip=\"".$fav_report['show_ip']."\"";
         $fav_report_part .= " show_project=\"".$fav_report['show_project']."\"";
+        $fav_report_part .= " show_timesheet=\"".$fav_report['show_timesheet']."\"";
         $fav_report_part .= " show_start=\"".$fav_report['show_start']."\"";
         $fav_report_part .= " show_duration=\"".$fav_report['show_duration']."\"";
         $fav_report_part .= " show_cost=\"".$fav_report['show_cost']."\"";
         $fav_report_part .= " show_task=\"".$fav_report['show_task']."\"";
         $fav_report_part .= " show_end=\"".$fav_report['show_end']."\"";
         $fav_report_part .= " show_note=\"".$fav_report['show_note']."\"";
+        $fav_report_part .= " show_approved=\"".$fav_report['show_approved']."\"";
+        $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
         $fav_report_part .= " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"";
         $fav_report_part .= " show_work_units=\"".$fav_report['show_work_units']."\"";
         $fav_report_part .= " group_by1=\"".$fav_report['group_by1']."\"";
         $fav_report_part .= " group_by2=\"".$fav_report['group_by2']."\"";
         $fav_report_part .= " group_by3=\"".$fav_report['group_by3']."\"";
-        $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
         $fav_report_part .= "></fav_report>\n";
         fwrite($this->file, $fav_report_part);
       }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 647512385..e8eb58ebc 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.45.4787 | 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.45.4788 | 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>

From 0b379eb7277555af8e7363bbe66b9e39c7b1d0e8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Feb 2019 15:34:55 +0000
Subject: [PATCH 0732/1848] Fixed fav report import by including missing
 fields.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 20 ++++++++++++++------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index d7161d90a..43056bdfc 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -448,6 +448,10 @@ function startElement($parser, $name, $attrs) {
           'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
           'billable' => $attrs['BILLABLE'],
+          'approved' => $attrs['APPROVED'],
+          'invoice' => $attrs['INVOICE'],
+          'timesheet' => $attrs['TIMESHEET'],
+          'paid_status' => $attrs['PAID_STATUS'],
           'users' => $user_list,
           'period' => $attrs['PERIOD'],
           'from' => $attrs['PERIOD_START'],
@@ -457,12 +461,14 @@ function startElement($parser, $name, $attrs) {
           'chpaid' => (int) $attrs['SHOW_PAID'],
           'chip' => (int) $attrs['SHOW_IP'],
           'chproject' => (int) $attrs['SHOW_PROJECT'],
+          'chtimesheet' => (int) $attrs['SHOW_TIMESHEET'],
           'chstart' => (int) $attrs['SHOW_START'],
           'chduration' => (int) $attrs['SHOW_DURATION'],
           'chcost' => (int) $attrs['SHOW_COST'],
           'chtask' => (int) $attrs['SHOW_TASK'],
           'chfinish' => (int) $attrs['SHOW_END'],
           'chnote' => (int) $attrs['SHOW_NOTE'],
+          'chapproved' => (int) $attrs['SHOW_APPROVED'],
           'chcf_1' => (int) $attrs['SHOW_CUSTOM_FIELD_1'],
           'chunits' => (int) $attrs['SHOW_WORK_UNITS'],
           'group_by1' => $attrs['GROUP_BY1'],
@@ -995,22 +1001,24 @@ private function insertFavReport($fields) {
 
     $sql = "insert into tt_fav_reports".
       " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
-      " billable, invoice, paid_status, users, period, period_start, period_end,".
+      " billable, approved, invoice, timesheet, paid_status, users, period, period_start, period_end,".
       " show_client, show_invoice, show_paid, show_ip,".
-      " show_project, show_start, show_duration, show_cost,".
-      " show_task, show_end, show_note, show_custom_field_1, show_work_units,".
+      " show_project, show_timesheet, show_start, show_duration, show_cost,".
+      " show_task, show_end, show_note, show_approved, show_custom_field_1, show_work_units,".
       " group_by1, group_by2, group_by3, show_totals_only)".
       " values(".
       $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
-      $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
+      $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
+      $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
       $mdb2->quote($fields['paid_status']).", ".
       $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
-      $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
-      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
+      $fields['chproject'].", ".$fields['chtimesheet'].", ".$fields['chstart'].", ".$fields['chduration'].", ".
+      $fields['chcost'].", ".$fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".
+      $fields['chapproved'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
       $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
       $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e8eb58ebc..a9861f6ab 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.45.4788 | 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.45.4789 | 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>

From 14a6ab5e563acb66d090c6c291b5d51b1a31fae7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Feb 2019 19:42:10 +0000
Subject: [PATCH 0733/1848] Started redesign of timesheets feature.

---
 WEB-INF/lib/ttRoleHelper.class.php      |  2 +-
 WEB-INF/lib/ttTimesheetHelper.class.php | 15 ++++-----------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/header.tpl            |  2 +-
 WEB-INF/templates/timesheet_add.tpl     |  8 ++++++++
 dbinstall.php                           | 10 ++++++----
 mysql.sql                               |  4 ++--
 reports.php                             |  6 ++----
 timesheet_add.php                       |  4 ++++
 timesheet_view.php                      |  2 +-
 timesheets.php                          |  4 ++--
 11 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index c45d4d3f9..c03368f9b 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -189,7 +189,7 @@ static function createPredefinedRoles($group_id, $lang)
 
     $mdb2 = getConnection();
 
-    $rights_client = 'view_client_reports,view_client_timesheets,view_client_invoices,manage_own_settings';
+    $rights_client = 'view_client_reports,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 058326574..636504e30 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -285,17 +285,10 @@ static function isUserValid($user_id) {
 
     global $user;
 
-    // Step 1.
-    // A client must have view_client_timesheets and
-    // aser must be assigned to one of client projects.
-    if ($user->isClient()) {
-      if (!$user->can('view_client_timesheets'))
-        return false;
-      $valid_users = ttGroupHelper::getUsersForClient($user->client_id);
-      $v = 2;
-    }
-
-    return true;
+    // TODO: we are currently re-designing timesheets.
+    // Clients are not supposed to view them at all.
+    // And the post will change on_behalf user, to keep things consistent.
+    return false;
   }
 
   // getReportOptions prepares $options array to be used with ttReportHelper
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a9861f6ab..25f41decf 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.45.4789 | 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.46.4790 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 385f8a85b..a89d60f81 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -115,7 +115,7 @@
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
       {if !$user->isClient()}&middot;{/if} <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
     {/if}
-    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('view_client_timesheets'))}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'))}
             &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
diff --git a/WEB-INF/templates/timesheet_add.tpl b/WEB-INF/templates/timesheet_add.tpl
index b475af0ea..e24a36b36 100644
--- a/WEB-INF/templates/timesheet_add.tpl
+++ b/WEB-INF/templates/timesheet_add.tpl
@@ -7,6 +7,14 @@
           <td align="right">{$i18n.label.thing_name} (*):</td>
           <td>{$forms.timesheetForm.timesheet_name.control}</td>
         </tr>
+        <tr>
+          <td align="right">{$i18n.label.start_date} (*):</td>
+          <td>{$forms.timesheetForm.start.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.end_date} (*):</td>
+          <td>{$forms.timesheetForm.finish.control}</td>
+        </tr>
         <tr>
           <td align = "right">{$i18n.label.comment}:</td>
           <td>{$forms.timesheetForm.submitter_comment.control}</td>
diff --git a/dbinstall.php b/dbinstall.php
index d7f90cb82..09d552920 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11845"]) {
+  if ($_POST["convert11797to11846"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1100,6 +1100,8 @@ function ttExecute($sql) {
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_timesheet` tinyint(4) NOT NULL default 0 AFTER `show_project`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_approved` tinyint(4) NOT NULL default 0 AFTER `show_note`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.45', modified = now() where param_name = 'version_db' and param_value = '1.18.44'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.45') set rights = replace(rights, 'view_client_timesheets,', '')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.46', modified = now() where param_name = 'version_db' and param_value = '1.18.45'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1148,7 +1150,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.45)</b>
+    <td width="80%"><b>Create database structure (v1.18.46)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1193,8 +1195,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.45)</td>
-    <td><input type="submit" name="convert11797to11845" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.46)</td>
+    <td><input type="submit" name="convert11797to11846" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 1747b590a..d6cb375ff 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -524,4 +524,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.45', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.46', now()); # TODO: change when structure changes.
diff --git a/reports.php b/reports.php
index 5700025c7..fc77e0910 100644
--- a/reports.php
+++ b/reports.php
@@ -193,8 +193,7 @@
 
 // Add timesheet assignment selector.
 $showTimesheetDropdown = $user->isPluginEnabled('ts') &&
-  ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
-   $user->can('view_all_timesheets') || ($user->can('view_client_timesheets')));
+  ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'));
 if ($showTimesheetDropdown) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
@@ -208,8 +207,7 @@
   ));
 }
 $showTimesheetCheckbox = $user->isPluginEnabled('ts') &&
-  ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
-   $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
+  ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'));
 
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
diff --git a/timesheet_add.php b/timesheet_add.php
index 9e6b9acd0..1ab4b704c 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -52,6 +52,10 @@
 
 $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
+
+$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start','value'=>$cl_start));
+$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'finish','value'=>$cl_finish));
+
 $form->addInput(array('type'=>'textarea','name'=>'submitter_comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
diff --git a/timesheet_view.php b/timesheet_view.php
index 27956c9d7..e86b2df77 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -30,7 +30,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets') || ttAccessAllowed('view_client_timesheets'))) {
+if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/timesheets.php b/timesheets.php
index 672e85974..546a7b638 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -32,7 +32,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets') || ttAccessAllowed('view_client_timesheets'))) {
+if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -71,7 +71,7 @@
 // Elements of timesheetsForm.
 $form = new Form('timesheetsForm');
 
-if ($user->can('view_timesheets') || $user->can('view_all_timesheets') || $user->can('view_client_timesheets')) {
+if ($user->can('view_timesheets') || $user->can('view_all_timesheets')) {
   // Prepare user list for dropdown.
   if ($notClient) {
     $rank = $user->can('view_all_timesheets') ? MAX_RANK : $user->getMaxRankForGroup($group_id);

From 88bd95ec82e6b715f84b6bd09c04aebbdb4b5e4d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Feb 2019 21:02:28 +0000
Subject: [PATCH 0734/1848] A bit of cleanup with ongoing timesheet redesign.

---
 WEB-INF/resources/ca.lang.php    |  1 -
 WEB-INF/resources/cs.lang.php    |  1 -
 WEB-INF/resources/da.lang.php    |  1 -
 WEB-INF/resources/de.lang.php    |  1 -
 WEB-INF/resources/en.lang.php    |  1 -
 WEB-INF/resources/es.lang.php    |  1 -
 WEB-INF/resources/et.lang.php    |  1 -
 WEB-INF/resources/fa.lang.php    |  1 -
 WEB-INF/resources/fi.lang.php    |  1 -
 WEB-INF/resources/fr.lang.php    |  1 -
 WEB-INF/resources/gr.lang.php    |  1 -
 WEB-INF/resources/he.lang.php    |  1 -
 WEB-INF/resources/hu.lang.php    |  1 -
 WEB-INF/resources/it.lang.php    |  1 -
 WEB-INF/resources/ja.lang.php    |  1 -
 WEB-INF/resources/ko.lang.php    |  1 -
 WEB-INF/resources/nl.lang.php    |  1 -
 WEB-INF/resources/no.lang.php    |  1 -
 WEB-INF/resources/pl.lang.php    |  1 -
 WEB-INF/resources/pt-br.lang.php |  1 -
 WEB-INF/resources/pt.lang.php    |  1 -
 WEB-INF/resources/ro.lang.php    |  1 -
 WEB-INF/resources/ru.lang.php    |  1 -
 WEB-INF/resources/sk.lang.php    |  1 -
 WEB-INF/resources/sl.lang.php    |  1 -
 WEB-INF/resources/sr.lang.php    |  1 -
 WEB-INF/resources/sv.lang.php    |  1 -
 WEB-INF/resources/tr.lang.php    |  1 -
 WEB-INF/resources/zh-cn.lang.php |  1 -
 WEB-INF/resources/zh-tw.lang.php |  1 -
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/timesheets.tpl |  3 --
 timesheets.php                   | 49 ++++++++++++--------------------
 33 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 293471700..d4d24c728 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -467,7 +467,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index c85cb6867..2ca15cc9a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -477,7 +477,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3dfb41c87..de4813f65 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -441,7 +441,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index c787f6d87..a14e34527 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -420,7 +420,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5c91c3ee4..b6f0054b5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -415,7 +415,6 @@
 'form.report.assign_to_invoice' => 'Assign to invoice',
 
  // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-'form.timesheets.hint' => 'Use reports to add new timesheets.',
 'form.timesheets.active_timesheets' => 'Active Timesheets',
 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c86741762..99c4431da 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -480,7 +480,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7f2fe8eb0..4f40c7e77 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -445,7 +445,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index fdbcdba5f..566b50811 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -461,7 +461,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index bc66a2264..226e8496d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -446,7 +446,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 840f85590..a90cc042b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -438,7 +438,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 2ebdaa8f3..7257a33f9 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -429,7 +429,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index cac16e9c5..47c06c859 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -468,7 +468,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f4d5dd139..bd699aca0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -470,7 +470,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 3d898e2f2..351c1cd66 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -442,7 +442,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7f1a84119..53f1c5066 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -475,7 +475,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c5b7e0a21..d8da0d813 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -473,7 +473,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 7307ec4a9..848e0f349 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -416,7 +416,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a05071167..1474cac31 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -472,7 +472,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 28e8a0ace..94a094e8f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -449,7 +449,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 74e5822f0..a10fe4c63 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -444,7 +444,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e1e6b29d8..9da1e3588 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -451,7 +451,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cf701cf63..70fc0ac19 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -475,7 +475,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 2fec5db79..6c1daa246 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -406,7 +406,6 @@
 'form.report.assign_to_invoice' => 'Включить в счёт',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-'form.timesheets.hint' => 'Используйте отчёты для добавления новых табелей.',
 'form.timesheets.active_timesheets' => 'Активные табели',
 'form.timesheets.inactive_timesheets' => 'Неактивные табели',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 08999f1de..a1253d9b3 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -458,7 +458,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 95d3f8587..68e2df6a8 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -449,7 +449,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 170e5409f..8976bda59 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -447,7 +447,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index be3f4f280..715481d3a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -445,7 +445,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e30ddf06a..eb92614a9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -486,7 +486,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 05fa7a88e..d31db3259 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -458,7 +458,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 760e9acfa..ca0dad53a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -466,7 +466,6 @@
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
-// form.timesheets.hint' => 'Use reports to add new timesheets.',
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 25f41decf..5b3b25e20 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.46.4790 | 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.46.4791 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index f9b89d792..af65d14b5 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,9 +4,6 @@
 
 {$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $not_client}
-  <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
-{/if}
 {if $user_dropdown}
   <tr><td align="center">{$i18n.label.user}: {$forms.timesheetsForm.user.control}</td></tr>
 {/if}
diff --git a/timesheets.php b/timesheets.php
index 546a7b638..cc43f0dd3 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -41,48 +41,38 @@
   exit();
 }
 if ($user->isClient()) {
-  $users_for_client = ttGroupHelper::getUsersForClient($user->client_id);
-  if (count($users_for_client) == 0) {
-    header('Location: access_denied.php'); // There are no users for client.
-    exit();
-  }
+  header('Location: access_denied.php'); // No timesheets for clients.
+  exit();
 }
 if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed');
-  if ($userChanged && !(ttTimesheetHelper::isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Wrong user id.
+  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('view_timesheets') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id. TODO: research relevance of this...
     exit();
   }
 }
 // End of access checks.
 
-// Determine user for whom we display this page.
-$notClient = !$user->isClient();
+// Determine user for which we display this page.
 if ($request->isPost() && $userChanged) {
   $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
 } else {
-  if ($notClient)
-    $user_id = $user->getUser();
-  else
-    $user_id = $users_for_client[0]['id']; // First found user for a client.
+  $user_id = $user->getUser();
 }
+
 $group_id = $user->getGroup();
 
 // Elements of timesheetsForm.
 $form = new Form('timesheetsForm');
 
 if ($user->can('view_timesheets') || $user->can('view_all_timesheets')) {
-  // Prepare user list for dropdown.
-  if ($notClient) {
-    $rank = $user->can('view_all_timesheets') ? MAX_RANK : $user->getMaxRankForGroup($group_id);
-    if ($user->can('view_own_timesheets'))
-      $options = array('max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-    else
-      $options = array('max_rank'=>$rank);
-    $user_list = $user->getUsers($options);
-  } else
-    $user_list = $users_for_client; // Obtained above.
-
+  $rank = $user->getMaxRankForGroup($group_id);
+  if ($user->can('view_own_timesheets'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.timesheetsForm.user_changed.value=1;document.timesheetsForm.submit();',
@@ -97,17 +87,14 @@
 }
 
 $active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
-if ($notClient)
-  $inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
 
-$showClient = $user->isPluginEnabled('cl') && $notClient;
-$canEdit = $notClient && ($user->can('manage_own_timesheets') ||
-  $user->can('manage_timesheets') || $user->can('manage_all_timesheets'));
+$showClient = $user->isPluginEnabled('cl');
+$canEdit = $user->can('manage_own_timesheets') || $user->can('manage_timesheets') || $user->can('manage_all_timesheets');
 
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);
 $smarty->assign('show_client', $showClient);
-$smarty->assign('not_client', $notClient);
 $smarty->assign('can_edit', $canEdit);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));

From c6aa77a9e6299cf3103f97274e573cc9938c1215 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Feb 2019 16:04:17 +0000
Subject: [PATCH 0735/1848] A bit more progress on timesheet coding.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 74 +++++++++++++++++++++++++
 WEB-INF/resources/ca.lang.php           |  1 +
 WEB-INF/resources/cs.lang.php           |  1 +
 WEB-INF/resources/da.lang.php           |  2 +
 WEB-INF/resources/de.lang.php           |  2 +
 WEB-INF/resources/en.lang.php           |  1 +
 WEB-INF/resources/es.lang.php           |  1 +
 WEB-INF/resources/et.lang.php           |  2 +
 WEB-INF/resources/fa.lang.php           |  2 +
 WEB-INF/resources/fi.lang.php           |  2 +
 WEB-INF/resources/fr.lang.php           |  2 +
 WEB-INF/resources/gr.lang.php           |  2 +
 WEB-INF/resources/he.lang.php           |  2 +
 WEB-INF/resources/hu.lang.php           |  2 +
 WEB-INF/resources/it.lang.php           |  2 +
 WEB-INF/resources/ja.lang.php           |  1 +
 WEB-INF/resources/ko.lang.php           |  1 +
 WEB-INF/resources/nl.lang.php           |  2 +
 WEB-INF/resources/no.lang.php           |  1 +
 WEB-INF/resources/pl.lang.php           |  2 +
 WEB-INF/resources/pt-br.lang.php        |  2 +
 WEB-INF/resources/pt.lang.php           |  1 +
 WEB-INF/resources/ro.lang.php           |  1 +
 WEB-INF/resources/ru.lang.php           |  1 +
 WEB-INF/resources/sk.lang.php           |  2 +
 WEB-INF/resources/sl.lang.php           |  1 +
 WEB-INF/resources/sr.lang.php           |  2 +
 WEB-INF/resources/sv.lang.php           |  2 +
 WEB-INF/resources/tr.lang.php           |  1 +
 WEB-INF/resources/zh-cn.lang.php        |  1 +
 WEB-INF/resources/zh-tw.lang.php        |  1 +
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_add.tpl     | 14 ++++-
 WEB-INF/templates/timesheets.tpl        | 24 +++-----
 timesheet_add.php                       | 51 ++++++++++++-----
 35 files changed, 179 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 636504e30..e14bbd7bf 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -408,4 +408,78 @@ static function disapproveTimesheet($fields) {
     // TODO: send email to submitter here...
     return true;
   }
+
+  // The timesheetItemsExist determines whether tt_log records exist in the specified period
+  // for inclusion in a new timesheet.
+  static function timesheetItemsExist($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $client_id = (int) $fields['client_id'];
+
+    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
+    $start = $start_date->toString(DB_DATEFORMAT);
+
+    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
+    $end = $end_date->toString(DB_DATEFORMAT);
+
+    if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+
+    // Our query is different depending on tracking mode.
+    if (MODE_TIME == $user->getTrackingMode()) {
+      // In "time only" tracking mode there is a single user rate.
+      $sql = "select count(*) as num from tt_log l, tt_users u".
+        " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
+        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+        " and l.user_id = u.id and l.group_id = $group_id and l.org_id = $org_id".
+        " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
+    } else {
+      // sql part for project id.
+      if ($project_id) $project_part = " and l.project_id = $project_id";
+
+      // When we have projects, rates are defined for each project in tt_user_project_binds table.
+      $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb".
+        " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
+        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
+        " and l.group_id = $group_id and l.org_id = $org_id".
+        " and upb.user_id = l.user_id and upb.project_id = l.project_id".
+        " and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
+        // Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
+        // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
+        // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
+        // the problem becomes obvious.
+
+        // TODO: If the above turns out useful, rework the query to simplify it by removing left join.
+    }
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val['num']) {
+        return true;
+      }
+    }
+
+    if ($user->isPluginEnabled('ex')) {
+      // sql part for project id.
+      if ($project_id) $project_part = " and ei.project_id = $project_id";
+
+      $sql = "select count(*) as num from tt_expense_items ei".
+        " where ei.client_id = $client_id $project_part and ei.invoice_id is null".
+        " and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end).
+        " and ei.group_id = $group_id and ei.org_id = $org_id".
+        " and ei.cost <> 0 and ei.status = 1";
+      $res = $mdb2->query($sql);
+      if (!is_a($res, 'PEAR_Error')) {
+        $val = $res->fetchRow();
+        if ($val['num']) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index d4d24c728..34ba35f6e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -103,6 +103,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'La seva base de dades està buida. Iniciï sessió com a administrador i creï un nou grup.',
 'error.upload' => 'Error pujant l\\\'arxiu.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2ca15cc9a..e43d2cc0d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -105,6 +105,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'Vaše databáze je prázdná. Přihlašte se jako admin a vytvořte nový tým.', // TODO: replace "team" with "group".
 'error.upload' => 'Chyba přenosu souboru.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index de4813f65..1247264e7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -96,6 +96,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Der er ingen fakturerbar emner.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Der finde ingen bruger med dette brugernavn.',
 'error.no_groups' => 'Din database er tom, log ind som administrator og lav et nyt team.', // TODO: replace "team" with "group".
 'error.upload' => 'Fil upload problem.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a14e34527..72f4b5cb1 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -90,6 +90,8 @@
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
 'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
 'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Gruppe erzeugen.',
 'error.upload' => 'Fehler beim hochladen einer Datei.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b6f0054b5..6701a4c34 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -89,6 +89,7 @@
 'error.invoice_exists' => 'Invoice with this number already exists.',
 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+'error.no_records' => 'There are no records.',
 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 'error.upload' => 'File upload error.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 99c4431da..7a2bf9a90 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -101,6 +101,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'Su base de datos esta vacía. Inicie sesión como administrador y cree un nuevo grupo.',
 'error.upload' => 'Error subiendo el archivo.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 4f40c7e77..6f37883ee 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -103,6 +103,8 @@
 // Google auto-translates below as "No billable invoices found." which seems wrong.
 // 'error.no_invoiceable_items' => 'Arveldatavaid arveid ei leitud.',
 
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Sellise tunnusega kasutajat ei ole.',
 
 // TODO: Improve translation of error.no_groups. Replace meeskond with grupp?
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 566b50811..5a6c6aa8c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -101,6 +101,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'آیتمی جهت فاکتور کردن وجود ندارد.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'کاربری با این نام کاربری موجود نیست.',
 'error.no_groups' => 'پایگاه داده شما خالی است با کاربر admin وارد شوید و تیم ایجاد کنید.',  // TODO: replace "team" with "group".
 'error.upload' => 'خطا در آپلود فایل.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 226e8496d..9f577f3dc 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -98,6 +98,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Ei laskutettavia syötteitä.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Tuntematon käyttäjänimi.',
 'error.no_groups' => 'Tietokanta on tyhjä. Kirjaudu ylläpitäjänä ja luo uusi tiimi.',  // TODO: replace "team" with "group".
 'error.upload' => 'Virhe tiedoston lataus.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a90cc042b..be5c9d22b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -96,6 +96,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Il n\\\'y a pas d\\\'éléments à facturer.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Aucun utilisateur avec cet identifiant.',
 'error.no_groups' => 'Votre base de données est vide. Connectez-vous comme administrateur et créez une nouvelle équipe.',  // TODO: replace "team" with "group".
 'error.upload' => 'Erreur de chargement du fichier.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 7257a33f9..288982735 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -91,6 +91,8 @@
 'error.invoice_exists' => 'Το τιμολόγιο με αυτόν τον αριθμό υπάρχει ήδη.',
 'error.role_exists' => 'Ο ρόλος σε αυτή τη σειρά υπάρχει ήδη.',
 'error.no_invoiceable_items' => 'Δεν υπάρχουν στοιχεία προς τιμολόγηση.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Δεν υπάρχει χρήστης με αυτά τα στοιχεία.',
 'error.no_groups' => 'Η βάση δεδομένων σας είναι κενή. Συνδεθείτε ως διαχειριστής και δημιουργήστε μια νέα ομάδα.',
 'error.upload' => 'Σφάλμα φόρτωσης αρχείου.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 47c06c859..d9ab0d1c6 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -112,6 +112,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'אין פריטים לחיוב',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'משתמש זה אינו קיים',
 'error.no_groups' => 'בסיס הנתונים שלך ריק. התחבר כמנהל וצור צוות חדש', // TODO: replace "team" with "group".
 'error.upload' => 'שגיאה בהעלת קובץ',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index bd699aca0..38ec28cb7 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -103,6 +103,8 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 // 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 'error.upload' => 'File feltöltési hiba.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 351c1cd66..e4d328e61 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -95,6 +95,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Non ci sono voci fatturabili.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Non esiste un utente con questo username.',
 'error.no_groups' => 'Il database è vuoto. Loggati come amministratore e crea un nuovo gruppo.',
 'error.upload' => 'Errore di caricamento file.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 53f1c5066..3f0db6e0e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -104,6 +104,7 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'このログインと関連されたユーザーはいません。',
 'error.no_groups' => 'あなたのデータベースは空いています。管理者にログインして新規チームを作成してください。', // TODO: replace "team" with "group".
 'error.upload' => 'ファイルのアップロードのエラー。',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d8da0d813..d59c16347 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -103,6 +103,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => '본 로그인과 연계된 사용자가 없습니다.',
 'error.no_groups' => '당신의 데이터베이스는 비어있습니다. 관리자로 로그인하여 새로운 팀을 생성하십시오.', // TODO: replace "team" with "group".
 'error.upload' => '파일 업로드 오류.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 848e0f349..8aa557e67 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -89,6 +89,8 @@
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
 'error.role_exists' => 'Een rol met deze rangorde bestaat al.',
 'error.no_invoiceable_items' => 'Er zijn geen factuureerbare onderdelen.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.',
 'error.no_groups' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw groep.',
 'error.upload' => 'Fout bij het uploaden van het bestand.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1474cac31..cdcc05de1 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -104,6 +104,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Det er ingen bruker med dette brukernavnet.',
 'error.no_groups' => 'Databasen din er tom. Logg inn som admin og opprett et nytt team.', // TODO: replace "team" with "group".
 'error.upload' => 'Feil med lasting av fil.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 94a094e8f..11166236b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -99,6 +99,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Brak przedmiotów do faktury.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Użytkownik o takiej nazwie nie istnieje.',
 'error.no_groups' => 'Twoja baza danych jest pusta. Zaloguj się jako administrator i stwórz nowy zespół.', // TODO: replace "team" with "group".
 'error.upload' => 'Błąd podczas wysyłania pliku.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index a10fe4c63..bfeb7e720 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -97,6 +97,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Não há items faturáveis.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Não há usuário com este login.',
 'error.no_groups' => 'Sua base de dados está vazia. Entre como admin e crie uma equipe nova.', // TODO: replace "team" with "group".
 'error.upload' => 'Erro no envio do arquivo.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9da1e3588..b9b746c9d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -101,6 +101,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 // 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 // 'error.upload' => 'File upload error.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 70fc0ac19..050bddef1 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -107,6 +107,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'Baza de date este goala. Intra ca admin si adauga o noua echipa.', // TODO: replace "team" with "group".
 'error.upload' => 'Eroare la upload-ul fisierului.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 6c1daa246..2d04e8f93 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -88,6 +88,7 @@
 'error.invoice_exists' => 'Счёт с таким номером уже есть.',
 'error.role_exists' => 'Роль с таким рангом уже есть.',
 'error.no_invoiceable_items' => 'Нет записей для включения в счёт.',
+'error.no_records' => 'Нет записей.',
 'error.no_login' => 'Нет пользователя с таким логином.',
 'error.no_groups' => 'Ваша база данных пуста. Войдите в систему как администратор и создайте новую группу.',
 'error.upload' => 'Ошибка загрузки файла.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a1253d9b3..0ed070293 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -101,6 +101,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Neexistujú položky, ktoré by bolo možné fakturovať.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Neexistuje používateľ s týmto prihlasovacím menom.',
 'error.no_groups' => 'Vaša databáza je prázdna. Prihláste sa ako admin a vytvorte nový tím.', // TODO: replace "team" with "group".
 'error.upload' => 'Prenos súboru bol neúspešný.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 68e2df6a8..e93884505 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -98,6 +98,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 // 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 // 'error.upload' => 'File upload error.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8976bda59..5d2b9f88a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -96,6 +96,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Nema stavke za naplatu.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Nema korisnika pod ovom prijavom',
 'error.no_groups' => 'Vaša baza podataka je prazna. Prijavite se kao administrator i napravite novi tim.', // TODO: replace "team" with "group".
 'error.upload' => 'Greška pri otpremanju podatka.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 715481d3a..ba2f6665f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -95,6 +95,8 @@
 // TODO: translate the following.
 // 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'Det finns inga debiterbara tidsregistreringar.',
+// TODO: translate the following.
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => 'Det finns ingen användare med det här användarnamnet.',
 'error.no_groups' => 'Databasen är tom. Logga in som administratör och skapa en ny grupp.',
 'error.upload' => 'Ett fel uppstod när filen laddades upp.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index eb92614a9..22e872374 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -110,6 +110,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 // 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'Veritabanınız boş. Yeni bir ekip yaratmak için yönetici olarak giriş yapın.', // TODO: replace "team" with "group".
 'error.upload' => 'Dosya yükleme hatası.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index d31db3259..a1583eb4a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -97,6 +97,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => '没有该登录信息的用户。',
 'error.no_groups' => '您的数据库没有任何记录。请以管理员身份登录并创建一个新团队。', // TODO: replace "team" with "group".
 'error.upload' => '上传文件出错。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index ca0dad53a..42f152029 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -101,6 +101,7 @@
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
 // 'error.role_exists' => 'Role with this rank already exists.',
 // 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+// 'error.no_records' => 'There are no records.',
 'error.no_login' => '沒有該登錄資訊的使用者。',
 'error.no_groups' => '您的資料庫沒有任何記錄。請以管理員身份登錄並創建一個新團隊。', // TODO: replace "team" with "group".
 'error.upload' => '上傳文件出錯。',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5b3b25e20..a3dbfb192 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.46.4791 | 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.46.4792 | 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/timesheet_add.tpl b/WEB-INF/templates/timesheet_add.tpl
index e24a36b36..f4becf7f5 100644
--- a/WEB-INF/templates/timesheet_add.tpl
+++ b/WEB-INF/templates/timesheet_add.tpl
@@ -7,6 +7,18 @@
           <td align="right">{$i18n.label.thing_name} (*):</td>
           <td>{$forms.timesheetForm.timesheet_name.control}</td>
         </tr>
+{if $show_client}
+        <tr>
+          <td align="right">{$i18n.label.client}:</td>
+          <td>{$forms.timesheetForm.client.control}</td>
+        </tr>
+{/if}
+{if $show_project}
+        <tr>
+          <td align="right">{$i18n.label.project}:</td>
+          <td>{$forms.timesheetForm.project.control}</td>
+        </tr>
+{/if}
         <tr>
           <td align="right">{$i18n.label.start_date} (*):</td>
           <td>{$forms.timesheetForm.start.control}</td>
@@ -17,7 +29,7 @@
         </tr>
         <tr>
           <td align = "right">{$i18n.label.comment}:</td>
-          <td>{$forms.timesheetForm.submitter_comment.control}</td>
+          <td>{$forms.timesheetForm.comment.control}</td>
         </tr>
         <tr>
           <td></td>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index af65d14b5..df4782b64 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -18,10 +18,8 @@
 {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
 {/if}
-{if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
-{/if}
           <td class="tableHeader">{$i18n.label.view}</td>
 {if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
@@ -33,13 +31,11 @@
   {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
   {/if}
-  {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-     {if $timesheet.approval_status == null}
+  {if $timesheet.approval_status == null}
           <td></td>
-     {else}
+  {else}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-     {/if}
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if $can_edit}
@@ -48,11 +44,10 @@
         </tr>
 {/foreach}
       </table>
-{if $not_client}
+
       <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
-{/if}
 
 {if $inactive_timesheets}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
@@ -63,10 +58,8 @@
   {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
-  {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
   {if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
@@ -78,13 +71,11 @@
     {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
     {/if}
-    {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-      {if $timesheet.approval_status == null}
+    {if $timesheet.approval_status == null}
           <td></td>
-      {else}
+    {else}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-      {/if}
     {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
     {if $can_edit}
@@ -93,11 +84,10 @@
         </tr>
   {/foreach}
       </table>
-  {if $not_client}
+
       <table width="100%">
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
-  {/if}
 {/if}
     </td>
   </tr>
diff --git a/timesheet_add.php b/timesheet_add.php
index 1ab4b704c..e8eb56591 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -43,31 +43,56 @@
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('timesheet_name'));
-  $cl_comment = trim($request->getParameter('submitter_comment'));
-
-  // Report settings are stored in session bean before we get here.
-  $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
-  $bean->loadBean();
+  $cl_client = $request->getParameter('client');
+  $cl_project = $request->getParameter('project');
+  $cl_start = $request->getParameter('start');
+  $cl_finish = $request->getParameter('finish');
+  $cl_comment = trim($request->getParameter('comment'));
 }
 
+$user_id = $user->getUser();
+
 $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
 
+// Dropdown for clients if the clients plugin is enabled.
+$showClient = $user->isPluginEnabled('cl');
+if ($showClient) {
+  $clients = ttGroupHelper::getActiveClients();
+  $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
+}
+// Dropdown for projects.
+$showProject = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($showProject) {
+  $projects = $user->getAssignedProjects();
+  $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start','value'=>$cl_start));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'finish','value'=>$cl_finish));
-
-$form->addInput(array('type'=>'textarea','name'=>'submitter_comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
+$form->addInput(array('type'=>'textarea','name'=>'comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidDate($cl_start)) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
+  if (!ttValidDate($cl_finish)) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+  if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) $err->add($i18n->get('error.object_exists'));
+  $fields = array('user_id' => $user_id,
+    'name' => $cl_name,
+    'client_id' => $cl_client,
+    'project_id' => $cl_project,
+    'start_date' => $cl_start,
+    'end_date' => $cl_finish,
+    'comment' => $cl_comment);
+  if ($err->no() && !ttTimesheetHelper::timesheetItemsExist($fields)) $err->add($i18n->get('error.no_records'));
+  // Finished validating user input.
 
+  /*
   if ($err->no()) {
-    $user_id = $bean->getDetachedAttribute('timesheet_user_id');
-    if (!ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) {
-      if (ttTimesheetHelper::insert(array('user_id' => $user_id,
+    // TODO: use $fields.
+    if (ttTimesheetHelper::insert(array('user_id' => $user_id,
         'client_id' => $bean->getAttribute('client'),
         'name' => $cl_name,
         'comment' => $cl_comment))) {
@@ -75,13 +100,13 @@
           exit();
         } else
           $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.object_exists'));
-  }
+    } */
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_project', $showProject);
 $smarty->assign('title', $i18n->get('title.add_timesheet'));
 $smarty->assign('content_page_name', 'timesheet_add.tpl');
 $smarty->display('index.tpl');

From 343dfea2506d317ae99b965667e1b62ea4d83480 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Feb 2019 16:33:04 +0000
Subject: [PATCH 0736/1848] Coded ttTimesheetHelper::timesheetItemsExist().

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 56 +++++--------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_add.php                       | 18 ++++----
 3 files changed, 18 insertions(+), 58 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index e14bbd7bf..2ba87abce 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -415,10 +415,12 @@ static function timesheetItemsExist($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $client_id = (int) $fields['client_id'];
+    if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
+    if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     $start_date = new DateAndTime($user->date_format, $fields['start_date']);
     $start = $start_date->toString(DB_DATEFORMAT);
@@ -426,34 +428,14 @@ static function timesheetItemsExist($fields) {
     $end_date = new DateAndTime($user->date_format, $fields['end_date']);
     $end = $end_date->toString(DB_DATEFORMAT);
 
-    if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+    // sql parts.
+    if ($client_id) $client_part = " and client_id = $client_id";
+    if ($project_id) $project_part = " and project_id = $project_id";
 
-    // Our query is different depending on tracking mode.
-    if (MODE_TIME == $user->getTrackingMode()) {
-      // In "time only" tracking mode there is a single user rate.
-      $sql = "select count(*) as num from tt_log l, tt_users u".
-        " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
-        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
-        " and l.user_id = u.id and l.group_id = $group_id and l.org_id = $org_id".
-        " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
-    } else {
-      // sql part for project id.
-      if ($project_id) $project_part = " and l.project_id = $project_id";
-
-      // When we have projects, rates are defined for each project in tt_user_project_binds table.
-      $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb".
-        " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
-        " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
-        " and l.group_id = $group_id and l.org_id = $org_id".
-        " and upb.user_id = l.user_id and upb.project_id = l.project_id".
-        " and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
-        // Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
-        // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
-        // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
-        // the problem becomes obvious.
-
-        // TODO: If the above turns out useful, rework the query to simplify it by removing left join.
-    }
+    $sql = "select count(*) as num from tt_log".
+      " where status = 1 $client_part $project_part and timesheet_id is null".
+      " and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end).
+      " and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -462,24 +444,6 @@ static function timesheetItemsExist($fields) {
       }
     }
 
-    if ($user->isPluginEnabled('ex')) {
-      // sql part for project id.
-      if ($project_id) $project_part = " and ei.project_id = $project_id";
-
-      $sql = "select count(*) as num from tt_expense_items ei".
-        " where ei.client_id = $client_id $project_part and ei.invoice_id is null".
-        " and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end).
-        " and ei.group_id = $group_id and ei.org_id = $org_id".
-        " and ei.cost <> 0 and ei.status = 1";
-      $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        $val = $res->fetchRow();
-        if ($val['num']) {
-          return true;
-        }
-      }
-    }
-
     return false;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a3dbfb192..ec180725a 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.46.4792 | 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.46.4793 | 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/timesheet_add.php b/timesheet_add.php
index e8eb56591..4dd1afaea 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -89,18 +89,14 @@
   if ($err->no() && !ttTimesheetHelper::timesheetItemsExist($fields)) $err->add($i18n->get('error.no_records'));
   // Finished validating user input.
 
-  /*
   if ($err->no()) {
-    // TODO: use $fields.
-    if (ttTimesheetHelper::insert(array('user_id' => $user_id,
-        'client_id' => $bean->getAttribute('client'),
-        'name' => $cl_name,
-        'comment' => $cl_comment))) {
-          header('Location: timesheets.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-    } */
+    /*
+    if (ttTimesheetHelper::insert($fields)) {
+      header('Location: timesheets.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));*/
+  }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From 8260fa56e1cd984cd433d890c0a3316714b8b059 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Feb 2019 17:07:09 +0000
Subject: [PATCH 0737/1848] Wrote createTimesheet function.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 81 +++++++------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_add.php                       |  5 +-
 3 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 2ba87abce..e65a6216e 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -54,59 +54,17 @@ static function getTimesheetByName($name, $user_id) {
     return false;
   }
 
-  // insert function inserts a new timesheet into database.
-  static function insert($fields)
+  // createTimesheet function creates a new timesheet.
+  static function createTimesheet($fields)
   {
-    // First, we obtain report items.
-
-    // Obtain session bean with report attributes.
-    $bean = new ActionForm('reportBean', new Form('reportForm'));
-    $options = ttReportHelper::getReportOptions($bean);
-    $report_items = ttReportHelper::getItems($options);
-
-    // Prepare ids for time and expense items, at the same time checking
-    // if we can proceed with creating a timesheet.
-    $canCreateTimesheet = true;
-    $first_user_id = null;
-
-    foreach ($report_items as $report_item) {
-      // Check user id.
-      if (!$first_user_id)
-        $first_user_id = $report_item['user_id'];
-      else {
-        if ($report_item['user_id'] != $first_user_id) {
-          // We have items for multiple users.
-          $canCreateTimesheet = false;
-          break;
-        }
-      }
-      // Check timesheet id.
-      if ($report_item['timesheet_id']) {
-        // We have an item already assigned to a timesheet.
-        $canCreateTimesheet = false;
-        break;
-      }
-      if ($report_item['type'] == 1)
-        $time_ids[] = $report_item['id'];
-      elseif ($report_item['type'] == 2)
-        $expense_ids[] = $report_item['id'];
-    }
-    if (!$canCreateTimesheet) return false;
-
-    // Make comma-seperated lists of ids for sql.
-    if ($time_ids)
-      $comma_separated_time_ids = implode(',', $time_ids);
-    if ($expense_ids)
-      $comma_separated_expense_ids = implode(',', $expense_ids);
-
     // Create a new timesheet entry.
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $user_id = $fields['user_id'];
     $client_id = $fields['client_id'];
     $name = $fields['name'];
     $submitter_comment = $fields['comment'];
@@ -120,22 +78,25 @@ static function insert($fields)
     $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
 
     // Associate time items with timesheet.
-    if ($comma_separated_time_ids) {
-      $sql = "update tt_log set timesheet_id = $last_id".
-        " where id in ($comma_separated_time_ids) and group_id = $group_id and org_id = $org_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-    }
+    if (isset($fields['client'])) $client_id = (int) $fields['client_id'];
+    if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+    // sql parts.
+    if ($client_id) $client_part = " and client_id = $client_id";
+    if ($project_id) $project_part = " and project_id = $project_id";
 
-    // Associate expense items with timesheet.
-    if ($comma_separated_expense_ids) {
-      $sql = "update tt_expense_items set timesheet_id = $last_id".
-        " where id in ($comma_separated_expense_ids) and group_id = $group_id and org_id = $org_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-    }
+    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
+    $start = $start_date->toString(DB_DATEFORMAT);
+
+    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
+    $end = $end_date->toString(DB_DATEFORMAT);
+
+    $sql = "update tt_log set timesheet_id = $last_id".
+      " where status = 1 $client_part $project_part and timesheet_id is null".
+      " and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end).
+      " and user_id = $user_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
 
     return $last_id;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ec180725a..5499b12eb 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.46.4793 | 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.46.4794 | 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/timesheet_add.php b/timesheet_add.php
index 4dd1afaea..c450695ef 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -90,12 +90,11 @@
   // Finished validating user input.
 
   if ($err->no()) {
-    /*
-    if (ttTimesheetHelper::insert($fields)) {
+    if (ttTimesheetHelper::createTimesheet($fields)) {
       header('Location: timesheets.php');
       exit();
     } else
-      $err->add($i18n->get('error.db'));*/
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 

From bfbd5b318b37a66ece219e719734a60249781b6d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Feb 2019 22:00:25 +0000
Subject: [PATCH 0738/1848] More work in progress on timesheets, simplifying
 access rights.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 10 +++-------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    | 12 +++++-------
 WEB-INF/templates/timesheets.tpl        |  8 --------
 timesheet_add.php                       |  2 +-
 timesheet_delete.php                    |  2 +-
 timesheet_edit.php                      |  2 +-
 timesheet_view.php                      | 11 +++++------
 timesheets.php                          | 24 +++++++++++++-----------
 9 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index e65a6216e..25685483b 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -170,16 +170,12 @@ static function getTimesheet($timesheet_id) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
-
-    $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name,".
-      " ts.name, ts.submitter_comment, ts.submit_status, ts.approval_status, ts.manager_comment from tt_timesheets ts".
-      " left join tt_users u on (u.id = ts.user_id)".
-      " left join tt_clients c on (c.id = ts.client_id)".
-      " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
+    $sql = "select * from tt_timesheets".
+      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id and status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5499b12eb..e23882ac8 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.46.4794 | 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.46.4795 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 97591fe0b..e69882530 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -11,17 +11,15 @@
 {if $timesheet['client_id']}
         <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
 {/if}
-{if $not_client}
         <tr><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
-  {if $timesheet['submitter_comment']}
+{if $timesheet['submitter_comment']}
         <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
-  {/if}
-  {if $timesheet['submit_status']}
+{/if}
+{if $timesheet['submit_status']}
         <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approval_status != null}{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>{/if}
-  {/if}
-  {if $timesheet['manager_comment']}
+{/if}
+{if $timesheet['manager_comment']}
         <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['manager_comment']|escape}</td></tr>
-  {/if}
 {/if}
       </table>
     </td>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index df4782b64..907f41557 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -21,9 +21,7 @@
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
           <td class="tableHeader">{$i18n.label.view}</td>
-{if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
-{/if}
         </tr>
 {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -38,9 +36,7 @@
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-  {if $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-  {/if}
         </tr>
 {/foreach}
       </table>
@@ -61,9 +57,7 @@
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
           <td class="tableHeader">{$i18n.label.view}</td>
-  {if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
-  {/if}
         </tr>
   {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -78,9 +72,7 @@
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
     {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-    {if $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-    {/if}
         </tr>
   {/foreach}
       </table>
diff --git a/timesheet_add.php b/timesheet_add.php
index c450695ef..294886be7 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -31,7 +31,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets') || ttAccessAllowed('manage_all_timesheets'))) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/timesheet_delete.php b/timesheet_delete.php
index e4bf453c5..5e98a6cc9 100644
--- a/timesheet_delete.php
+++ b/timesheet_delete.php
@@ -31,7 +31,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/timesheet_edit.php b/timesheet_edit.php
index 1708bdf7c..d275ce5f8 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -31,7 +31,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/timesheet_view.php b/timesheet_view.php
index e86b2df77..df28e3061 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -30,7 +30,7 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets'))) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -38,8 +38,8 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$timesheet_id = (int)$request->getParameter('id');
-$timesheet = ttTimesheetHelper::getTimesheet($timesheet_id);
+$cl_timesheet_id = (int)$request->getParameter('id');
+$timesheet = ttTimesheetHelper::getTimesheet($cl_timesheet_id);
 if (!$timesheet) {
   header('Location: access_denied.php');
   exit();
@@ -55,13 +55,12 @@
 $options = ttTimesheetHelper::getReportOptions($timesheet);
 $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
-$notClient = !$user->isClient();
 
 // Determine which controls to show and obtain date for them.
-$showSubmit = $notClient && !$timesheet['submit_status'];
+$showSubmit = !$timesheet['submit_status'];
 if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_all_timesheets');
-$showApprove = $notClient && $timesheet['submit_status'] && $timesheet['approval_status'] == null;
+$showApprove = $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
 // Add a form with controls.
 $form = new Form('timesheetForm');
diff --git a/timesheets.php b/timesheets.php
index cc43f0dd3..650575e69 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -32,22 +32,26 @@
 import('ttTimesheetHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets'))) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
-if (!$user->isPluginEnabled('ts')) {
-  header('Location: feature_disabled.php');
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
-if ($user->isClient()) {
-  header('Location: access_denied.php'); // No timesheets for clients.
+if (!$user->isPluginEnabled('ts')) {
+  header('Location: feature_disabled.php');
   exit();
 }
 if ($request->isPost()) {
   $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('view_timesheets') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id. TODO: research relevance of this...
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
     exit();
   }
 }
@@ -66,9 +70,9 @@
 // Elements of timesheetsForm.
 $form = new Form('timesheetsForm');
 
-if ($user->can('view_timesheets') || $user->can('view_all_timesheets')) {
+if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
-  if ($user->can('view_own_timesheets'))
+  if ($user->can('track_own_time'))
     $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
     $options = array('status'=>ACTIVE,'max_rank'=>$rank);
@@ -90,12 +94,10 @@
 $inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
 
 $showClient = $user->isPluginEnabled('cl');
-$canEdit = $user->can('manage_own_timesheets') || $user->can('manage_timesheets') || $user->can('manage_all_timesheets');
 
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);
 $smarty->assign('show_client', $showClient);
-$smarty->assign('can_edit', $canEdit);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');

From 66d86939b62dc5ae3d5f16088b61822e611cf58f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Feb 2019 22:23:59 +0000
Subject: [PATCH 0739/1848] Disallowed editing records assigned to timesheets.

---
 WEB-INF/lib/ttTimeHelper.class.php | 29 ++++++++++++++---------------
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/mobile/time.tpl  |  2 +-
 WEB-INF/templates/time.tpl         |  2 +-
 mobile/time_delete.php             |  4 ++--
 mobile/time_edit.php               |  4 ++--
 time_delete.php                    |  4 ++--
 time_edit.php                      |  4 ++--
 8 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index a66652b70..bdec1a5f7 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -667,14 +667,14 @@ static function getRecord($id, $user_id) {
 
     $mdb2 = getConnection();
 
-    $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,
-      TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,
-      TIME_FORMAT(l.duration, '%k:%i') as duration,
-      p.name as project_name, t.name as task_name, l.comment, l.client_id, l.project_id, l.task_id, l.invoice_id, l.billable, l.paid, l.date
-      from tt_log l
-      left join tt_projects p on (p.id = l.project_id)
-      left join tt_tasks t on (t.id = l.task_id)
-      where l.id = $id and l.user_id = $user_id and l.status = 1";
+    $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
+      " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
+      " TIME_FORMAT(l.duration, '%k:%i') as duration,".
+      " p.name as project_name, t.name as task_name, l.comment, l.client_id, l.project_id, l.task_id,".
+      " l.timesheet_id, l.invoice_id, l.billable, l.paid, l.date from tt_log l".
+      " left join tt_projects p on (p.id = l.project_id)".
+      " left join tt_tasks t on (t.id = l.task_id)".
+      " where l.id = $id and l.user_id = $user_id and l.status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
@@ -730,13 +730,12 @@ static function getRecords($user_id, $date) {
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
 
     $result = array();
-    $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,
-      TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,
-      TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment, l.billable, l.invoice_id $client_field
-      from tt_log l
-      $left_joins
-      where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1
-      order by l.start, l.id";
+    $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
+      " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
+      " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
+      " l.billable, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
+      " order by l.start, l.id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e23882ac8..b5578c431 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.46.4795 | 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.46.4796 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 35242e2f3..cde0b5ef1 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -25,7 +25,7 @@
         <td valign="top">{$record.project|escape}</td>
 {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-        <td align="center">{if $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>{/if}</td>
+        <td align="center">{if $record.timesheet_id|| $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>{/if}</td>
       </tr>
       {/foreach}
     </table>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index bf28c5091..f82897d2a 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -130,7 +130,7 @@
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
         <td valign="top" align="center">
-    {if $record.invoice_id}
+    {if $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
           <a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 104732601..8ebb98a88 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -40,8 +40,8 @@
 $cl_id = (int)$request->getParameter('id');
 $user_id = $user->getUser();
 $time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
-if (!$time_rec || $time_rec['invoice_id']) {
-  // Prohibit deleting not ours or invoiced records.
+if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 803ca4e4f..0b5b090e3 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -42,8 +42,8 @@
 $cl_id = (int)$request->getParameter('id');
 $user_id = $user->getUser();
 $time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
-if (!$time_rec || $time_rec['invoice_id']) {
-  // Prohibit editing not ours or invoiced records.
+if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/time_delete.php b/time_delete.php
index 5d6e57298..1b6f5c298 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -40,8 +40,8 @@
 $cl_id = (int)$request->getParameter('id');
 $user_id = $user->getUser();
 $time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
-if (!$time_rec || $time_rec['invoice_id']) {
-  // Prohibit deleting not ours or invoiced records.
+if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/time_edit.php b/time_edit.php
index 3bd52e6f5..48db27ea7 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -42,8 +42,8 @@
 $cl_id = (int)$request->getParameter('id');
 $user_id = $user->getUser();
 $time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
-if (!$time_rec || $time_rec['invoice_id']) {
-  // Prohibit editing not ours or invoiced records.
+if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }

From 086b93bd5a71b4c68ae3fa3e37d97182ee2a5b73 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Feb 2019 22:47:13 +0000
Subject: [PATCH 0740/1848] A bit of refactoring.

---
 WEB-INF/lib/ttTimeHelper.class.php | 9 +++++++--
 WEB-INF/templates/footer.tpl       | 2 +-
 mobile/time_delete.php             | 3 +--
 mobile/time_edit.php               | 5 +++--
 mobile/timer.php                   | 2 +-
 time.php                           | 4 ++--
 time_delete.php                    | 3 +--
 time_edit.php                      | 5 +++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index bdec1a5f7..d2a356476 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -659,8 +659,13 @@ static function overlaps($user_id, $date, $start, $finish, $record_id = null) {
   }
 
   // getRecord - retrieves a time record identified by its id.
-  static function getRecord($id, $user_id) {
+  static function getRecord($id) {
     global $user;
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $sql_time_format = "'%k:%i'"; //  24 hour format.
     if ('%I:%M %p' == $user->time_format)
       $sql_time_format = "'%h:%i %p'"; // 12 hour format for MySQL TIME_FORMAT function.
@@ -674,7 +679,7 @@ static function getRecord($id, $user_id) {
       " l.timesheet_id, l.invoice_id, l.billable, l.paid, l.date from tt_log l".
       " left join tt_projects p on (p.id = l.project_id)".
       " left join tt_tasks t on (t.id = l.task_id)".
-      " where l.id = $id and l.user_id = $user_id and l.status = 1";
+      " where l.id = $id and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b5578c431..eb0fd5927 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.46.4796 | 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.46.4797 | 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/time_delete.php b/mobile/time_delete.php
index 8ebb98a88..1b122fb9e 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -38,8 +38,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$user_id = $user->getUser();
-$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
+$time_rec = ttTimeHelper::getRecord($cl_id);
 if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
   // Prohibit deleting not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 0b5b090e3..1f8f7de91 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -40,8 +40,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$user_id = $user->getUser();
-$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
+$time_rec = ttTimeHelper::getRecord($cl_id);
 if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
   // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
@@ -49,6 +48,8 @@
 }
 // End of access checks.
 
+$user_id = $user->getUser();
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
diff --git a/mobile/timer.php b/mobile/timer.php
index c754740a6..d3a0d0fb6 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -254,7 +254,7 @@
   }
   if ($request->getParameter('btn_stop')) {
     // Stop button clicked. We need to finish an uncompleted record in progress.
-    $record = ttTimeHelper::getRecord($uncompleted['id'], $user->getUser());
+    $record = ttTimeHelper::getRecord($uncompleted['id']);
 
     // Can we complete this record?
     if (ttTimeHelper::isValidInterval($record['start'], $cl_finish) // finish time is greater than start time
diff --git a/time.php b/time.php
index e4547a949..f7b1c12e7 100644
--- a/time.php
+++ b/time.php
@@ -56,7 +56,7 @@
 }
 // End of access checks.
 
-// Determine user for which we display this page.
+// Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
   $user_id = $request->getParameter('user');
   $user->setOnBehalfUser($user_id);
@@ -347,7 +347,7 @@
   } elseif ($request->getParameter('btn_stop')) {
     // Stop button pressed to finish an uncompleted record.
     $record_id = $request->getParameter('record_id');
-    $record = ttTimeHelper::getRecord($record_id, $user_id);
+    $record = ttTimeHelper::getRecord($record_id);
     $browser_date = $request->getParameter('browser_date');
     $browser_time = $request->getParameter('browser_time');
 
diff --git a/time_delete.php b/time_delete.php
index 1b6f5c298..e83630edf 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -38,8 +38,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$user_id = $user->getUser();
-$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
+$time_rec = ttTimeHelper::getRecord($cl_id);
 if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
   // Prohibit deleting not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
diff --git a/time_edit.php b/time_edit.php
index 48db27ea7..23cc63d5a 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -40,8 +40,7 @@
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$user_id = $user->getUser();
-$time_rec = ttTimeHelper::getRecord($cl_id, $user_id);
+$time_rec = ttTimeHelper::getRecord($cl_id);
 if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
   // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
@@ -49,6 +48,8 @@
 }
 // End of access checks.
 
+$user_id = $user->getUser();
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');

From fa647157935f37f999ae81377b19f5ea72e7bbbb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 15:49:45 +0000
Subject: [PATCH 0741/1848] Changed structure of tt_timesheets table as part of
 redesign work.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 15 +++++++++++----
 mysql.sql                    | 10 ++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eb0fd5927..ed56fe1fa 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.46.4797 | 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.47.4798 | 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/dbinstall.php b/dbinstall.php
index 09d552920..c6a724158 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11846"]) {
+  if ($_POST["convert11797to11847"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1102,6 +1102,13 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.45', modified = now() where param_name = 'version_db' and param_value = '1.18.44'");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.45') set rights = replace(rights, 'view_client_timesheets,', '')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.46', modified = now() where param_name = 'version_db' and param_value = '1.18.45'");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `comment` text AFTER `name`");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `start_date` date NOT NULL AFTER `comment`");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `end_date` date NOT NULL AFTER `start_date`");
+    ttExecute("ALTER TABLE `tt_timesheets` DROP `submitter_comment`");
+    ttExecute("ALTER TABLE `tt_timesheets` CHANGE `approval_status` `approve_status` tinyint(4) default NULL");
+    ttExecute("ALTER TABLE `tt_timesheets` CHANGE `manager_comment` `approve_comment` text");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.47', modified = now() where param_name = 'version_db' and param_value = '1.18.46'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1150,7 +1157,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.46)</b>
+    <td width="80%"><b>Create database structure (v1.18.47)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1195,8 +1202,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.46)</td>
-    <td><input type="submit" name="convert11797to11846" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.47)</td>
+    <td><input type="submit" name="convert11797to11847" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index d6cb375ff..126902d1a 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -496,10 +496,12 @@ CREATE TABLE `tt_timesheets` (
   `org_id` int(11) default NULL,                   # organization id
   `client_id` int(11) default NULL,                # client id
   `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # timesheet name
+  `comment` text,                                  # timesheet comment
+  `start_date` date NOT NULL,                      # timesheet start date
+  `end_date` date NOT NULL,                        # timesheet end date
   `submit_status` tinyint(4) default NULL,         # submit status
-  `submitter_comment` text,                        # submitter comment
-  `approval_status` tinyint(4) default NULL,       # approval status
-  `manager_comment` text,                          # manager comment
+  `approve_status` tinyint(4) default NULL,        # approve status
+  `approve_comment` text,                          # approve comment
   `created` datetime default NULL,                 # creation timestamp
   `created_ip` varchar(45) default NULL,           # creator ip
   `created_by` int(11) default NULL,               # creator user_id
@@ -524,4 +526,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.46', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.47', now()); # TODO: change when structure changes.

From b7e0a81d78007c097e7860c752f445263683b42b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 17:30:17 +0000
Subject: [PATCH 0742/1848] Some more work in progress on timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 21 +++++++++++----------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 25685483b..9ab86f0f6 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -67,10 +67,17 @@ static function createTimesheet($fields)
 
     $client_id = $fields['client_id'];
     $name = $fields['name'];
-    $submitter_comment = $fields['comment'];
+    $comment = $fields['comment'];
 
-    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name, submitter_comment)".
-      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).", ".$mdb2->quote($submitter_comment).")";
+    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
+    $start = $start_date->toString(DB_DATEFORMAT);
+
+    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
+    $end = $end_date->toString(DB_DATEFORMAT);
+
+    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name, comment, start_date, end_date)".
+      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).
+      ", ".$mdb2->quote($comment).", ".$mdb2->quote($start).", ".$mdb2->quote($end).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -84,12 +91,6 @@ static function createTimesheet($fields)
     if ($client_id) $client_part = " and client_id = $client_id";
     if ($project_id) $project_part = " and project_id = $project_id";
 
-    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
-    $start = $start_date->toString(DB_DATEFORMAT);
-
-    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
-    $end = $end_date->toString(DB_DATEFORMAT);
-
     $sql = "update tt_log set timesheet_id = $last_id".
       " where status = 1 $client_part $project_part and timesheet_id is null".
       " and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end).
@@ -116,7 +117,7 @@ static function getActiveTimesheets($user_id)
     if ($user->isClient())
       $client_part = "and ts.client_id = $user->client_id";
 
-    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approval_status from tt_timesheets ts".
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approve_status from tt_timesheets ts".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
       " $client_part order by ts.name";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ed56fe1fa..2afec4f9e 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.47.4798 | 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.47.4799 | 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>

From 5897ea0d3efe16a50706bcf1bde8d33044b5cf5f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 17:49:49 +0000
Subject: [PATCH 0743/1848] Cleaning up no longer needed access rights.

---
 WEB-INF/lib/ttRoleHelper.class.php      |  4 ++--
 WEB-INF/lib/ttTimesheetHelper.class.php |  4 ----
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/header.tpl            |  2 +-
 dbinstall.php                           | 11 +++++++----
 mysql.sql                               |  4 ++--
 reports.php                             |  6 ++----
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index c03368f9b..966c409bb 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -190,8 +190,8 @@ static function createPredefinedRoles($group_id, $lang)
     $mdb2 = getConnection();
 
     $rights_client = 'view_client_reports,view_client_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 9ab86f0f6..6b13ae537 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -236,10 +236,6 @@ static function update($fields) {
   // in current context.
   static function isUserValid($user_id) {
     // We have to cover several situations.
-    //
-    // 1) User is a client.
-    // 2) User with view_all_timesheets rights.
-    // 3) User with view_timesheets rights.
 
     global $user;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2afec4f9e..7db679914 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.47.4799 | 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.47.4800 | 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/header.tpl b/WEB-INF/templates/header.tpl
index a89d60f81..d00000a70 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -115,7 +115,7 @@
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
       {if !$user->isClient()}&middot;{/if} <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
     {/if}
-    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'))}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
             &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
diff --git a/dbinstall.php b/dbinstall.php
index c6a724158..5a239b25f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11847"]) {
+  if ($_POST["convert11797to11848"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1109,6 +1109,9 @@ function ttExecute($sql) {
     ttExecute("ALTER TABLE `tt_timesheets` CHANGE `approval_status` `approve_status` tinyint(4) default NULL");
     ttExecute("ALTER TABLE `tt_timesheets` CHANGE `manager_comment` `approve_comment` text");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.47', modified = now() where param_name = 'version_db' and param_value = '1.18.46'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.47') set rights = replace(rights, 'view_own_timesheets,', '')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.47') set rights = replace(rights, 'view_timesheets,', '')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.48', modified = now() where param_name = 'version_db' and param_value = '1.18.47'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1157,7 +1160,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.47)</b>
+    <td width="80%"><b>Create database structure (v1.18.48)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1202,8 +1205,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.47)</td>
-    <td><input type="submit" name="convert11797to11847" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.48)</td>
+    <td><input type="submit" name="convert11797to11848" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 126902d1a..8f3242483 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -526,4 +526,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.47', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.48', now()); # TODO: change when structure changes.
diff --git a/reports.php b/reports.php
index fc77e0910..fb74e16cc 100644
--- a/reports.php
+++ b/reports.php
@@ -192,8 +192,7 @@
 }
 
 // Add timesheet assignment selector.
-$showTimesheetDropdown = $user->isPluginEnabled('ts') &&
-  ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'));
+$showTimesheetDropdown = $user->isPluginEnabled('ts');
 if ($showTimesheetDropdown) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
@@ -206,8 +205,7 @@
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }
-$showTimesheetCheckbox = $user->isPluginEnabled('ts') &&
-  ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'));
+$showTimesheetCheckbox = $user->isPluginEnabled('ts');
 
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();

From 30bec134aac46efe3cdd5371de46598a68138c46 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 18:07:36 +0000
Subject: [PATCH 0744/1848] A bit of cleanup for timesheet redesign.

---
 WEB-INF/resources/ca.lang.php    |  2 --
 WEB-INF/resources/cs.lang.php    |  2 --
 WEB-INF/resources/da.lang.php    |  2 --
 WEB-INF/resources/de.lang.php    |  2 --
 WEB-INF/resources/en.lang.php    |  1 -
 WEB-INF/resources/es.lang.php    |  2 --
 WEB-INF/resources/et.lang.php    |  2 --
 WEB-INF/resources/fa.lang.php    |  2 --
 WEB-INF/resources/fi.lang.php    |  2 --
 WEB-INF/resources/fr.lang.php    |  2 --
 WEB-INF/resources/gr.lang.php    |  2 --
 WEB-INF/resources/he.lang.php    |  2 --
 WEB-INF/resources/hu.lang.php    |  2 --
 WEB-INF/resources/it.lang.php    |  2 --
 WEB-INF/resources/ja.lang.php    |  1 -
 WEB-INF/resources/ko.lang.php    |  1 -
 WEB-INF/resources/nl.lang.php    |  2 --
 WEB-INF/resources/no.lang.php    |  2 --
 WEB-INF/resources/pl.lang.php    |  2 --
 WEB-INF/resources/pt-br.lang.php |  2 --
 WEB-INF/resources/pt.lang.php    |  1 -
 WEB-INF/resources/ro.lang.php    |  2 --
 WEB-INF/resources/ru.lang.php    |  1 -
 WEB-INF/resources/sk.lang.php    |  2 --
 WEB-INF/resources/sl.lang.php    |  2 --
 WEB-INF/resources/sr.lang.php    |  2 --
 WEB-INF/resources/sv.lang.php    |  2 --
 WEB-INF/resources/tr.lang.php    |  1 -
 WEB-INF/resources/zh-cn.lang.php |  1 -
 WEB-INF/resources/zh-tw.lang.php |  1 -
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/report.tpl     |  3 ---
 report.php                       | 34 --------------------------------
 33 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 34ba35f6e..f2ec9cf3a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -145,8 +145,6 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar per correu',
 'button.create_group' => 'Crear grup',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportar grup',
 'button.import' => 'Importar grup',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e43d2cc0d..edc7d3ecb 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -147,8 +147,6 @@
 'button.send' => 'Poslat',
 'button.send_by_email' => 'Poslat e-mailem',
 'button.create_group' => 'Vytvořit tým', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportovat tým', // TODO: replace "team" with "group".
 'button.import' => 'Importovat tým', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 1247264e7..7bb213802 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -140,8 +140,6 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-mail',
 'button.create_group' => 'Lav et team', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Eksporter team', // TODO: replace "team" with "group".
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Luk',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 72f4b5cb1..02ab0484e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -134,8 +134,6 @@
 'button.send' => 'Senden',
 'button.send_by_email' => 'Als E-Mail senden',
 'button.create_group' => 'Gruppe erstellen',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Gruppe exportieren',
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 6701a4c34..6740c556a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -127,7 +127,6 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send by e-mail',
 'button.create_group' => 'Create group',
-'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Export group',
 'button.import' => 'Import group',
 'button.close' => 'Close',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 7a2bf9a90..5bb6eefe4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -144,8 +144,6 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por correo',
 'button.create_group' => 'Crear grupo',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportar grupo',
 'button.import' => 'Importar grupo',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 6f37883ee..e0b512e6c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -148,8 +148,6 @@
 'button.send' => 'Saada',
 'button.send_by_email' => 'Saada e-postiga',
 'button.create_group' => 'Loo grupp',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Ekspordi grupp',
 'button.import' => 'Impordi grupp',
 'button.close' => 'Sulge',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 5a6c6aa8c..97610c3a6 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -147,8 +147,6 @@
 'button.send' => 'ارسال',
 'button.send_by_email' => 'ارسال به ایمیل',
 'button.create_group' => 'ایجاد تیم', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'ایجاد پشتیبان از تیم', // TODO: replace "team" with "group".
 'button.import' => 'وارد کردن تیم', // TODO: replace "team" with "group".
 'button.close' => 'بستن',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9f577f3dc..91bcd40dd 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -142,8 +142,6 @@
 'button.send' => 'Lähetä',
 'button.send_by_email' => 'Lähetä sähköpostilla',
 'button.create_group' => 'Luo tiimi', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Vie tiimi', // TODO: replace "team" with "group".
 'button.import' => 'Tuo tiimi', // TODO: replace "team" with "group".
 'button.close' => 'Sulje',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index be5c9d22b..0cb6764a4 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -140,8 +140,6 @@
 'button.send' => 'Envoyer',
 'button.send_by_email' => 'Envoyer par courriel',
 'button.create_group' => 'Créer une équipe', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exporter l\\\'équipe', // TODO: replace "team" with "group".
 'button.import' => 'Importer une équipe', // TODO: replace "team" with "group".
 'button.close' => 'Fermer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 288982735..e34554651 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -135,8 +135,6 @@
 'button.send' => 'Αποστολή',
 'button.send_by_email' => 'Αποστολή μέσω email',
 'button.create_group' => 'Δημιουργία ομάδας',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Εξαγωγη ομάδας',
 'button.import' => 'Εισαγωγή ομάδας',
 'button.close' => 'Κλείσιμο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d9ab0d1c6..2d65957bf 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -157,8 +157,6 @@
 'button.send' => 'שלח',
 'button.send_by_email' => 'שלח בדואר אלקטרוני',
 'button.create_group' => 'צור צוות', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'ייצא צוות', // TODO: replace "team" with "group".
 'button.import' => 'ייבא צוות', // TODO: replace "team" with "group".
 'button.close' => 'סגור',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 38ec28cb7..c9e59f476 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -147,8 +147,6 @@
 'button.send' => 'Küld',
 'button.send_by_email' => 'Küldés e-mail-ben',
 'button.create_group' => 'Csoport létrehozása',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Csoport exportálása',
 'button.import' => 'Csoport importálása',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e4d328e61..7402e033e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -139,8 +139,6 @@
 'button.send' => 'Invia',
 'button.send_by_email' => 'Invia tramite e-mail',
 'button.create_group' => 'Crea gruppo',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Esporta gruppo',
 'button.import' => 'Importa gruppo',
 'button.close' => 'Chiudi',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3f0db6e0e..5cb5305e6 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -151,7 +151,6 @@
 'button.send_by_email' => 'Eメールの送信',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'チームのエクスポート', // TODO: replace "team" with "group".
 'button.import' => 'チームのインポート', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d59c16347..df1311708 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -150,7 +150,6 @@
 'button.send_by_email' => '이메일로 송신',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => '팀 익스포트', // TODO: replace "team" with "group".
 'button.import' => '팀 임포트', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8aa557e67..e6425badd 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -128,8 +128,6 @@
 'button.send' => 'Verzenden',
 'button.send_by_email' => 'Verzend per e-mail',
 'button.create_group' => 'Maak groep',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Groep exporteren',
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index cdcc05de1..09fdec8e2 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -150,8 +150,6 @@
 'button.send' => 'Send',
 'button.send_by_email' => 'Send som e-post',
 'button.create_group' => 'Opprett team', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Eksport team', // TODO: replace "team" with "group".
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Lukk',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 11166236b..678f38e9a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -144,8 +144,6 @@
 'button.send' => 'Wyślij',
 'button.send_by_email' => 'Wyślij e-mail',
 'button.create_group' => 'Stwórz zespół', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Eksportuj zespół', // TODO: replace "team" with "group".
 'button.import' => 'Importuj zespół', // TODO: replace "team" with "group".
 'button.close' => 'Zamknij',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bfeb7e720..967bfabd2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -141,8 +141,6 @@
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
 'button.create_group' => 'Criar equipe', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportar equipe', // TODO: replace "team" with "group".
 'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
 'button.close' => 'Fechar',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b9b746c9d..9ce23328b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -144,7 +144,6 @@
 'button.send_by_email' => 'Enviar por e-mail',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-// 'button.create_timesheet' => 'Create timesheet',
 // 'button.export' => 'Export group',
 // 'button.import' => 'Import group',
 // 'button.close' => 'Close',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 050bddef1..7472f0b5f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -150,8 +150,6 @@
 'button.send' => 'Trimite',
 'button.send_by_email' => 'Trimite pe e-mail',
 'button.create_group' => 'Adauga echipa', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exporta echipa', // TODO: replace "team" with "group".
 'button.import' => 'Importa echipa', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 2d04e8f93..ac9d0d146 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -126,7 +126,6 @@
 'button.send' => 'Отправить',
 'button.send_by_email' => 'Отправить по e-mail',
 'button.create_group' => 'Создать группу',
-'button.create_timesheet' => 'Создать табель',
 'button.export' => 'Экспортировать группу',
 'button.import' => 'Импортировать группу',
 'button.close' => 'Закрыть',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 0ed070293..f1e0c894b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -147,8 +147,6 @@
 'button.send' => 'Odoslať',
 'button.send_by_email' => 'Odoslať na e-mail',
 'button.create_group' => 'Vytvoriť tím', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportovať tím', // TODO: replace "team" with "group".
 'button.import' => 'Importovať tím', // TODO: replace "team" with "group".
 'button.close' => 'Zatvoriť',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e93884505..17e8ca7f7 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -140,8 +140,6 @@
 'button.send' => 'Pošlji',
 'button.send_by_email' => 'Pošlji preko elektronske pošte',
 'button.create_group' => 'Ustvari tim', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Izvozi tim', // TODO: replace "team" with "group".
 'button.import' => 'Uvozi tim', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5d2b9f88a..ee49bd17f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -141,8 +141,6 @@
 'button.send' => 'Pošalji',
 'button.send_by_email' => 'Pošalji mejlom',
 'button.create_group' => 'Napravi tim', // TODO: replace "team" with "group".
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Izvezi tim', // TODO: replace "team" with "group".
 'button.import' => 'Uvezi tim', // TODO: replace "team" with "group".
 'button.close' => 'Zatvori',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ba2f6665f..6acbcc0d8 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -139,8 +139,6 @@
 'button.send' => 'Skicka',
 'button.send_by_email' => 'Skicka som e-post',
 'button.create_group' => 'Skapa grupp',
-// TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Exportera grupp',
 'button.import' => 'Importera grupp',
 'button.close' => 'Stäng',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 22e872374..614ce9426 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -154,7 +154,6 @@
 'button.send_by_email' => 'E-posta ile gönder',
 'button.create_group' => 'Ekip yarat', // TODO: replace "team" with "group".
 // TODO: translate the following.
-// 'button.create_timesheet' => 'Create timesheet',
 // 'button.export' => 'Export group',
 'button.import' => 'Ekibi içeri aktar', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a1583eb4a..9239d7edf 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -142,7 +142,6 @@
 'button.send_by_email' => '通过邮件发送',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => '导出团队信息', // TODO: replace "team" with "group".
 'button.import' => '导入团队信息', // TODO: replace "team" with "group".
 'button.close' => '关闭',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 42f152029..fdbf657c8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -147,7 +147,6 @@
 'button.send_by_email' => '通過郵件發送',
 // TODO: translate the following.
 // 'button.create_group' => 'Create group',
-// 'button.create_timesheet' => 'Create timesheet',
 'button.export' => '輸出團隊資訊', // TODO: replace "team" with "group".
 'button.import' => '輸入團隊資訊', // TODO: replace "team" with "group".
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7db679914..90fe1c064 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.47.4800 | 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.47.4801 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 294582dc4..44a6e3376 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -205,9 +205,6 @@
   <table>
   <tr>
     <td><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></td>
-{if $can_create_timesheet}
-    <td><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.create_timesheet}"></td>
-{/if}
   </tr>
   </table>
   </td>
diff --git a/report.php b/report.php
index ed7928c7f..84b18b66c 100644
--- a/report.php
+++ b/report.php
@@ -228,39 +228,6 @@
 }
 $totals = ttReportHelper::getTotals($options);
 
-// TODO: Determine if we can create a timesheet out of this report.
-// There must be only one user, and nothing assigned to existing timesheets.
-$canCreateTimesheet = false;
-if ($user->isPluginEnabled('ts') && count($report_items) > 0 &&
-  ($user->can('manage_own_timesheets') || $user->can('manage_timesheets'))) {
-
-  $canCreateTimesheet = true; // Start with true and reset if we can't.
-  $first_user_id = null;
-  foreach ($report_items as $report_item) {
-    // Check user id.
-    if (!$first_user_id)
-      $first_user_id = $report_item['user_id'];
-    else {
-      if ($report_item['user_id'] != $first_user_id) {
-        // We have items for multiple users.
-        $canCreateTimesheet = false;
-        break;
-      }
-    }
-    // Check timesheet id.
-    if ($report_item['timesheet_id']) {
-      // We have an item already assigned to a timesheet.
-      $canCreateTimesheet = false;
-      break;
-    }
-  }
-  // Save user_id in session.
-  $bean->saveDetachedAttribute('timesheet_user_id', $first_user_id);
-
-  // TODO: Improve this for "view_all_reports" situation.
-  // We may need to add "manage_all_timesheets" right.
-}
-
 // Assign variables that are used to print subtotals.
 if ($report_items) {
   $smarty->assign('print_subtotals', true);
@@ -277,7 +244,6 @@
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
-$smarty->assign('can_create_timesheet', $canCreateTimesheet);
 $smarty->assign('bean', $bean);
 $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
 $smarty->assign('content_page_name', 'report.tpl');

From a4697cccdffc187c38d6560c5824fe344e59f5be Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 18:29:55 +0000
Subject: [PATCH 0745/1848] Further streamlining of access rights.

---
 WEB-INF/lib/ttRoleHelper.class.php      |  6 +++---
 WEB-INF/lib/ttTimesheetHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           | 14 ++++++++++----
 mysql.sql                               |  4 ++--
 timesheet_view.php                      |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 966c409bb..d12fcd442 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -190,8 +190,8 @@ static function createPredefinedRoles($group_id, $lang)
     $mdb2 = getConnection();
 
     $rights_client = 'view_client_reports,view_client_invoices,manage_own_settings';
-    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
+    $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
@@ -254,7 +254,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 6b13ae537..636b1fcf2 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -284,7 +284,7 @@ static function getApprovers($user_id) {
       " from tt_users u".
       " left join tt_roles r on (r.id = u.role_id)".
       " where u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id".
-      " and (r.rights like '%approve_all_timesheets%' or (r.rank > $rank and r.rights like '%approve_timesheets%'))";
+      " and (r.rank > $rank and r.rights like '%approve_timesheets%')";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90fe1c064..f81320ad6 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.47.4801 | 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.47.4802 | 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/dbinstall.php b/dbinstall.php
index 5a239b25f..90b5669a4 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11848"]) {
+  if ($_POST["convert11797to11849"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1112,6 +1112,12 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.47') set rights = replace(rights, 'view_own_timesheets,', '')");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.47') set rights = replace(rights, 'view_timesheets,', '')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.48', modified = now() where param_name = 'version_db' and param_value = '1.18.47'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'manage_own_timesheets,', '')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'manage_timesheets,', '')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'view_all_timesheets,', '')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'manage_all_timesheets,', '')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'approve_all_timesheets,', 'approve_own_timesheets,')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.49', modified = now() where param_name = 'version_db' and param_value = '1.18.48'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1160,7 +1166,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.48)</b>
+    <td width="80%"><b>Create database structure (v1.18.49)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1205,8 +1211,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.48)</td>
-    <td><input type="submit" name="convert11797to11848" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.49)</td>
+    <td><input type="submit" name="convert11797to11849" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 8f3242483..3378fc0b6 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -75,7 +75,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -526,4 +526,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.48', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.49', now()); # TODO: change when structure changes.
diff --git a/timesheet_view.php b/timesheet_view.php
index df28e3061..9b5b4cdfe 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -59,7 +59,7 @@
 // Determine which controls to show and obtain date for them.
 $showSubmit = !$timesheet['submit_status'];
 if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
-$canApprove = $user->can('approve_timesheets') || $user->can('approve_all_timesheets');
+$canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
 $showApprove = $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
 // Add a form with controls.

From 88c67a664a63623a83ed241054525aa112f9c70c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 18:55:38 +0000
Subject: [PATCH 0746/1848] Added conditional display of show approvers.

---
 WEB-INF/templates/footer.tpl         | 2 +-
 WEB-INF/templates/timesheet_view.tpl | 2 +-
 timesheet_view.php                   | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f81320ad6..246dfca29 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.47.4802 | 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.47.4803 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index e69882530..bce187e74 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -53,7 +53,7 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control} {$forms.timesheetForm.btn_submit.control}</td></tr>
+        <tr><td>  {if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
       </table>
     </td>
   </tr>
diff --git a/timesheet_view.php b/timesheet_view.php
index 9b5b4cdfe..813edffb8 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -58,7 +58,10 @@
 
 // Determine which controls to show and obtain date for them.
 $showSubmit = !$timesheet['submit_status'];
-if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+if ($showSubmit) {
+  $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+  $showApprovers = count($approvers) >= 1;
+}
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
 $showApprove = $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
@@ -67,7 +70,7 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$timesheet['id']));
 
 if ($showSubmit) {
-  if (count($approvers) >= 1) {
+  if ($showApprovers) {
     $form->addInput(array('type'=>'combobox',
       'name'=>'approver',
       'style'=>'width: 200px;',
@@ -124,6 +127,7 @@
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('show_approvers', $showApprovers);
 $smarty->assign('show_submit', $showSubmit);
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

From a8084d2e767dd2ea7e57f2348a27d4fc2da42a6f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 23:49:49 +0000
Subject: [PATCH 0747/1848] Added project_id to tt_timesheets table.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 21 +++++++++++++--------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    | 21 ++++++++++++++-------
 dbinstall.php                           | 10 ++++++----
 mysql.sql                               |  3 ++-
 timesheet_view.php                      |  2 +-
 6 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 636b1fcf2..78e790165 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -66,6 +66,7 @@ static function createTimesheet($fields)
     $org_id = $user->org_id;
 
     $client_id = $fields['client_id'];
+    $project_id = $fields['project_id'];
     $name = $fields['name'];
     $comment = $fields['comment'];
 
@@ -75,8 +76,8 @@ static function createTimesheet($fields)
     $end_date = new DateAndTime($user->date_format, $fields['end_date']);
     $end = $end_date->toString(DB_DATEFORMAT);
 
-    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name, comment, start_date, end_date)".
-      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).
+    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, project_id, name, comment, start_date, end_date)".
+      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).", ".$mdb2->quote($name).
       ", ".$mdb2->quote($comment).", ".$mdb2->quote($start).", ".$mdb2->quote($end).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -175,8 +176,12 @@ static function getTimesheet($timesheet_id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select * from tt_timesheets".
-      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id and status is not null";
+    $sql = "select ts.*, u.name as user_name, c.name as client_name,".
+      " p.name as project_name from tt_timesheets ts".
+      " left join tt_users u on (ts.user_id = u.id)".
+      " left join tt_clients c on (ts.client_id = c.id)".
+      " left join tt_projects p on (ts.project_id = p.id)".
+      " where ts.id = $timesheet_id and ts.user_id = $user_id and ts.group_id = $group_id and ts.org_id = $org_id and ts.status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow())
@@ -329,9 +334,9 @@ static function approveTimesheet($fields) {
     // Even if mail part below does not work, this will get us a functioning workflow
     // (without email notifications).
     $timesheet_id = $fields['timesheet_id'];
-    $manager_comment = $fields['comment'];
+    $comment = $fields['comment'];
 
-    $sql = "update tt_timesheets set approval_status = 1, manager_comment = ".$mdb2->quote($manager_comment).
+    $sql = "update tt_timesheets set approve_status = 1, approve_comment = ".$mdb2->quote($comment).
       " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
@@ -352,9 +357,9 @@ static function disapproveTimesheet($fields) {
     // Even if mail part below does not work, this will get us a functioning workflow
     // (without email notifications).
     $timesheet_id = $fields['timesheet_id'];
-    $manager_comment = $fields['comment'];
+    $comment = $fields['comment'];
 
-    $sql = "update tt_timesheets set approval_status = 0, manager_comment = ".$mdb2->quote($manager_comment).
+    $sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).
       " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 246dfca29..bd0a554dc 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.47.4803 | 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.50.4804 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index bce187e74..76481eed9 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -7,19 +7,26 @@
     <td>
       <table border=0 width=100%>
         <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$timesheet['name']|escape} </b></td></tr>
+{if $user->behalfUser}
         <tr><td align="left"><b>{$i18n.label.user}:</b> {$timesheet['user_name']|escape}</td></tr>
+{/if}
 {if $timesheet['client_id']}
         <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
 {/if}
+{if $timesheet['project_id']}
+        <tr><td align="left"><b>{$i18n.label.project}:</b> {$timesheet['project_name']|escape}</td></tr>
+{/if}
+{if $timesheet['comment']}
+        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['comment']|escape}</td></tr>
+{/if}
+{if $timesheet['approve_status'] == null}
         <tr><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
-{if $timesheet['submitter_comment']}
-        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
 {/if}
-{if $timesheet['submit_status']}
-        <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approval_status != null}{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>{/if}
+{if $timesheet['approve_status'] != null}
+        <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
 {/if}
-{if $timesheet['manager_comment']}
-        <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['manager_comment']|escape}</td></tr>
+{if $timesheet['approve_comment']}
+        <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['approve_comment']|escape}</td></tr>
 {/if}
       </table>
     </td>
@@ -53,7 +60,7 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>  {if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
+        <tr><td>{if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
       </table>
     </td>
   </tr>
diff --git a/dbinstall.php b/dbinstall.php
index 90b5669a4..e33635aaf 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11849"]) {
+  if ($_POST["convert11797to11850"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1118,6 +1118,8 @@ function ttExecute($sql) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'manage_all_timesheets,', '')");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.48') set rights = replace(rights, 'approve_all_timesheets,', 'approve_own_timesheets,')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.49', modified = now() where param_name = 'version_db' and param_value = '1.18.48'");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `project_id` int(11) default NULL AFTER `client_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.50', modified = now() where param_name = 'version_db' and param_value = '1.18.49'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1166,7 +1168,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.49)</b>
+    <td width="80%"><b>Create database structure (v1.18.50)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1211,8 +1213,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.49)</td>
-    <td><input type="submit" name="convert11797to11849" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.50)</td>
+    <td><input type="submit" name="convert11797to11850" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 3378fc0b6..525a4769a 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -495,6 +495,7 @@ CREATE TABLE `tt_timesheets` (
   `group_id` int(11) default NULL,                 # group id
   `org_id` int(11) default NULL,                   # organization id
   `client_id` int(11) default NULL,                # client id
+  `project_id` int(11) default NULL,               # project id
   `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # timesheet name
   `comment` text,                                  # timesheet comment
   `start_date` date NOT NULL,                      # timesheet start date
@@ -526,4 +527,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.49', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.50', now()); # TODO: change when structure changes.
diff --git a/timesheet_view.php b/timesheet_view.php
index 813edffb8..bde974e67 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -131,6 +131,6 @@
 $smarty->assign('show_submit', $showSubmit);
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.timesheet'));
+$smarty->assign('title', $i18n->get('title.timesheet').": ".$timesheet['start_date']." - ".$timesheet['end_date']);
 $smarty->assign('content_page_name', 'timesheet_view.tpl');
 $smarty->display('index.tpl');

From f8112c585d6ba4dac203e9082b2229fd027f985c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 14:46:01 +0000
Subject: [PATCH 0748/1848] A few fixes related to tt_timesheets fields
 renaming.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  7 ++++---
 WEB-INF/lib/ttOrgImportHelper.class.php   | 10 +++++++---
 WEB-INF/templates/footer.tpl              |  2 +-
 timesheet_view.php                        |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 06a3697d0..ac35cd87d 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -331,11 +331,12 @@ function writeData() {
         $timesheet_part = $this->indentation.'    '."<timesheet id=\"".$this->timesheetMap[$timesheet_item['id']]."\"";
         $timesheet_part .= " user_id=\"".$this->userMap[$timesheet_item['user_id']]."\"";
         $timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
+        $timesheet_part .= " project_id=\"".$this->projectMap[$timesheet_item['project_id']]."\"";
         $timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
         $timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
-        $timesheet_part .= " submitter_comment=\"".htmlspecialchars($timesheet_item['submitter_name'])."\"";
-        $timesheet_part .= " approval_status=\"".$timesheet_item['approval_status']."\"";
-        $timesheet_part .= " manager_comment=\"".htmlspecialchars($timesheet_item['manager_comment'])."\"";
+        $timesheet_part .= " comment=\"".htmlspecialchars($timesheet_item['comment'])."\"";
+        $timesheet_part .= " approve_status=\"".$timesheet_item['approve_status']."\"";
+        $timesheet_part .= " approve_comment=\"".htmlspecialchars($timesheet_item['approve_comment'])."\"";
         $timesheet_part .= " status=\"".$timesheet_item['status']."\"";
         $timesheet_part .= "></timesheet>\n";
         fwrite($this->file, $timesheet_part);
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 43056bdfc..edd59b6b8 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -283,11 +283,15 @@ function startElement($parser, $name, $attrs) {
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'name' => $attrs['NAME'],
+          'comment' => $attrs['COMMENT'],
+  // TODO: add handling of these.
+  //`start_date` date NOT NULL,                      # timesheet start date
+  //`end_date` date NOT NULL,                        # timesheet end date
           'submit_status' => $attrs['SUBMIT_STATUS'],
-          'submitter_comment' => $attrs['SUBMITTER_COMMENT'],
-          'approval_status' => $attrs['APPROVAL_STATUS'],
-          'manager_comment' => $attrs['MANAGER_COMMENT'],
+          'approve_status' => $attrs['APPROVE_STATUS'],
+          'approve_comment' => $attrs['APPROVE_COMMENT'],
           'status' => $attrs['STATUS']));
         if ($timesheet_id) {
           // Add a mapping.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bd0a554dc..02b5b048b 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.50.4804 | 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.50.4805 | 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/timesheet_view.php b/timesheet_view.php
index bde974e67..57eff61c7 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -63,7 +63,7 @@
   $showApprovers = count($approvers) >= 1;
 }
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
-$showApprove = $timesheet['submit_status'] && $timesheet['approval_status'] == null;
+$showApprove = $timesheet['submit_status'] && $timesheet['approve_status'] == null;
 
 // Add a form with controls.
 $form = new Form('timesheetForm');

From 179facbe37379829ddffc9ee2e29ca6c3d969ce8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 15:16:55 +0000
Subject: [PATCH 0749/1848] Some fixes to export/import of timesheets.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  4 +++-
 WEB-INF/lib/ttOrgImportHelper.class.php   | 25 +++++++++++++----------
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index ac35cd87d..59bdc8c8d 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -333,8 +333,10 @@ function writeData() {
         $timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
         $timesheet_part .= " project_id=\"".$this->projectMap[$timesheet_item['project_id']]."\"";
         $timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
-        $timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
         $timesheet_part .= " comment=\"".htmlspecialchars($timesheet_item['comment'])."\"";
+        $timesheet_part .= " start_date=\"".$timesheet_item['start_date']."\"";
+        $timesheet_part .= " end_date=\"".$timesheet_item['end_date']."\"";
+        $timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
         $timesheet_part .= " approve_status=\"".$timesheet_item['approve_status']."\"";
         $timesheet_part .= " approve_comment=\"".htmlspecialchars($timesheet_item['approve_comment'])."\"";
         $timesheet_part .= " status=\"".$timesheet_item['status']."\"";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index edd59b6b8..0efb6b031 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -286,9 +286,8 @@ function startElement($parser, $name, $attrs) {
           'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'name' => $attrs['NAME'],
           'comment' => $attrs['COMMENT'],
-  // TODO: add handling of these.
-  //`start_date` date NOT NULL,                      # timesheet start date
-  //`end_date` date NOT NULL,                        # timesheet end date
+          'start_date' => $attrs['START_DATE'],
+          'end_date' => $attrs['END_DATE'],
           'submit_status' => $attrs['SUBMIT_STATUS'],
           'approve_status' => $attrs['APPROVE_STATUS'],
           'approve_comment' => $attrs['APPROVE_COMMENT'],
@@ -916,19 +915,23 @@ private function insertTimesheet($fields)
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
     $client_id = $fields['client_id'];
+    $project_id = $fields['project_id'];
     $name = $fields['name'];
+    $comment = $fields['comment'];
+    $start_date = $fields['start_date'];
+    $end_date = $fields['end_date'];
     $submit_status = $fields['submit_status'];
-    $submitter_comment = $fields['submitter_comment'];
-    $approval_status = $fields['approval_status'];
-    $manager_comment = $fields['manager_comment'];
+    $approve_status = $fields['approve_status'];
+    $approve_comment = $fields['approve_comment'];
     $status = $fields['status'];
 
     // Insert a new timesheet record.
-    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name,".
-      " submit_status, submitter_comment, approval_status, manager_comment, status)".
-      " values($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).", ".
-      $mdb2->quote($fields['submit_status']).", ".$mdb2->quote($fields['submiter_comment']).", ".
-      $mdb2->quote($fields['approval_status']).", ".$mdb2->quote($fields['manager_comment']).", ".$mdb2->quote($fields['status']).")";
+    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, project_id, name,".
+      " comment, start_date, end_date, submit_status, approve_status, approve_comment, status)".
+      " values($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).", ".$mdb2->quote($name).", ".
+      $mdb2->quote($comment).", ".$mdb2->quote($start_date).", ".$mdb2->quote($end_date).", ".
+      $mdb2->quote($submit_status).", ".$mdb2->quote($approve_status).", ".
+      $mdb2->quote($approve_comment).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 02b5b048b..ac521a4b4 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.50.4805 | 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.50.4806 | 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>

From 49814b0298d01a1e9efd2add26ea31cb79530f5a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 15:50:33 +0000
Subject: [PATCH 0750/1848] Refactoring timesheet related code.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 16 +++++++---------
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_add.php                       |  2 +-
 timesheet_edit.php                      |  6 +++---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 78e790165..e2af4e72e 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -27,24 +27,22 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
-import('ttGroupHelper');
-import('form.ActionForm');
-import('ttReportHelper');
 
 // Class ttTimesheetHelper is used to help with project related tasks.
 class ttTimesheetHelper {
 
   // The getTimesheetByName looks up a project by name.
-  static function getTimesheetByName($name, $user_id) {
+  static function getTimesheetByName($name) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $sql = "select id from tt_timesheets".
       " where group_id = $group_id and org_id = $org_id and user_id = $user_id and name = ".$mdb2->quote($name).
-      " and (status = 1 or status = 0)";
+      " and status is not null";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -150,7 +148,7 @@ static function getInactiveTimesheets($user_id)
     if ($user->isClient())
       $client_part = "and ts.client_id = $user->client_id";
 
-    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approval_status from tt_timesheets ts".
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approve_status from tt_timesheets ts".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.status = 0 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
       " $client_part order by ts.name";
@@ -227,10 +225,10 @@ static function update($fields) {
 
     $timesheet_id = $fields['id']; // Timesheet we are updating.
     $name = $fields['name']; // Timesheet name.
-    $submitter_comment = $fields['submitter_comment'];
-    $status = $fields['status']; // Project status.
+    $comment = $fields['comment'];
+    $status = $fields['status']; // Timesheet status.
 
-    $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", submitter_comment = ".$mdb2->quote($submitter_comment).
+    $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", comment = ".$mdb2->quote($comment).
       ", status = ".$mdb2->quote($status).
       " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ac521a4b4..c801c7659 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.50.4806 | 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.50.4807 | 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/timesheet_add.php b/timesheet_add.php
index 294886be7..09a2d3848 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -78,7 +78,7 @@
   if (!ttValidDate($cl_start)) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
   if (!ttValidDate($cl_finish)) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
-  if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) $err->add($i18n->get('error.object_exists'));
+  if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name)) $err->add($i18n->get('error.object_exists'));
   $fields = array('user_id' => $user_id,
     'name' => $cl_name,
     'client_id' => $cl_client,
diff --git a/timesheet_edit.php b/timesheet_edit.php
index d275ce5f8..7919125a9 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -53,7 +53,7 @@
   $cl_status = $request->getParameter('status');
 } else {
   $cl_name = $timesheet['name'];
-  $cl_comment = $timesheet['submitter_comment'];
+  $cl_comment = $timesheet['comment'];
   $cl_status = $timesheet['status'];
 }
 
@@ -73,13 +73,13 @@
 
   if ($request->getParameter('btn_save')) {
     if ($err->no()) {
-      $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name, $timesheet['user_id']);
+      $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name);
       if (!$existing_timesheet || ($cl_timesheet_id == $existing_timesheet['id'])) {
          // Update timesheet information.
          if (ttTimesheetHelper::update(array(
            'id' => $cl_timesheet_id,
            'name' => $cl_name,
-           'submitter_comment' => $cl_comment,
+           'comment' => $cl_comment,
            'status' => $cl_status))) {
            header('Location: timesheets.php');
            exit();

From d40f3b7898583d430d651cc5210994cf55dd5b13 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 16:05:40 +0000
Subject: [PATCH 0751/1848] More refactoring on timesheet code.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 34 ++++++++-----------------
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_view.php                      |  1 +
 timesheets.php                          |  4 +--
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index e2af4e72e..743477b2c 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -83,7 +83,7 @@ static function createTimesheet($fields)
 
     $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
 
-    // Associate time items with timesheet.
+    // Associate tt_log items with timesheet.
     if (isset($fields['client'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
     // sql parts.
@@ -102,31 +102,25 @@ static function createTimesheet($fields)
   }
 
   // The getActiveTimesheets obtains active timesheets for a user.
-  static function getActiveTimesheets($user_id)
+  static function getActiveTimesheets()
   {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // $addPaidStatus = $user->isPluginEnabled('ps');
     $result = array();
-
-    if ($user->isClient())
-      $client_part = "and ts.client_id = $user->client_id";
-
-    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approve_status from tt_timesheets ts".
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name,".
+      " ts.submit_status, ts.approve_status from tt_timesheets ts".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
-      " $client_part order by ts.name";
+      " order by ts.name";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
-        //if ($addPaidStatus)
-        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
         $result[] = $val;
       }
     }
@@ -134,31 +128,25 @@ static function getActiveTimesheets($user_id)
   }
 
   // The getInactiveTimesheets obtains inactive timesheets for a user.
-  static function getInactiveTimesheets($user_id)
+  static function getInactiveTimesheets()
   {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // $addPaidStatus = $user->isPluginEnabled('ps');
     $result = array();
-
-    if ($user->isClient())
-      $client_part = "and ts.client_id = $user->client_id";
-
-    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approve_status from tt_timesheets ts".
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name,".
+      " ts.submit_status, ts.approve_status from tt_timesheets ts".
       " left join tt_clients c on (c.id = ts.client_id)".
       " where ts.status = 0 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
-      " $client_part order by ts.name";
+      " order by ts.name";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
-        //if ($addPaidStatus)
-        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
         $result[] = $val;
       }
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c801c7659..e98faf235 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.50.4807 | 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.50.4808 | 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/timesheet_view.php b/timesheet_view.php
index 57eff61c7..e6368a396 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('ttTimesheetHelper');
+import('ttReportHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
diff --git a/timesheets.php b/timesheets.php
index 650575e69..b3b47772f 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -90,8 +90,8 @@
   }
 }
 
-$active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
-$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+$active_timesheets = ttTimesheetHelper::getActiveTimesheets();
+$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets();
 
 $showClient = $user->isPluginEnabled('cl');
 

From b55f038f3aa3d23376a9a68d22109f7be5ba1f09 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 16:41:44 +0000
Subject: [PATCH 0752/1848] More timesheet related refactoring.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 34 +++++--------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    |  3 ---
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 743477b2c..d03f8010a 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -181,24 +181,19 @@ static function delete($timesheet_id) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // Handle time records.
+    // Handle tt_log records.
     $sql = "update tt_log set timesheet_id = null".
-      " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Handle expense items.
-    $sql = "update tt_expense_items set timesheet_id = null".
-      " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+      " where timesheet_id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete timesheet.
     $sql = "update tt_timesheets set status = null".
-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
@@ -208,6 +203,7 @@ static function update($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
@@ -218,24 +214,11 @@ static function update($fields) {
 
     $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", comment = ".$mdb2->quote($comment).
       ", status = ".$mdb2->quote($status).
-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // isUserValid function is used during access checks and determines whether user id, passed in post, is valid
-  // in current context.
-  static function isUserValid($user_id) {
-    // We have to cover several situations.
-
-    global $user;
-
-    // TODO: we are currently re-designing timesheets.
-    // Clients are not supposed to view them at all.
-    // And the post will change on_behalf user, to keep things consistent.
-    return false;
-  }
-
   // getReportOptions prepares $options array to be used with ttReportHelper
   // to obtain items for timesheet view.
   static function getReportOptions($timesheet) {
@@ -245,11 +228,6 @@ static function getReportOptions($timesheet) {
     $group_by_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
     $options['timesheet_id'] = $timesheet['id'];
-    $options['client_id'] = $timesheet['client_id'];
-    $options['users'] = $timesheet['user_id'];
-    $options['show_durarion'] = 1;
-    $options['show_cost'] = 1; // To include expenses.
-    $options['show_totals_only'] = 1;
     $options['group_by1'] = 'date';
     if ($group_by_client || $group_by_project) {
       $options['group_by2'] = $group_by_client ? 'client' : 'project';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e98faf235..c9463c886 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.50.4808 | 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.50.4809 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 76481eed9..3bd8ddd20 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -37,20 +37,17 @@
       <tr>
         <td class="tableHeader">{$group_by_header|escape}</td>
         <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
-        <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
         <td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>
-        <td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>
       </tr>
   {/foreach}
       <tr><td>&nbsp;</td></tr>
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>
-        <td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>
       </tr>
       </table>
 

From b25ffbdc86bf97657cbca486aaa1aa068fb16288 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 17:11:08 +0000
Subject: [PATCH 0753/1848] Some more work on timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 27 +++++++++++++++----------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheet_view.tpl    |  1 +
 timesheet_view.php                      |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index d03f8010a..1fff19554 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -240,10 +240,11 @@ static function getReportOptions($timesheet) {
 
   // getApprovers obtains a list of users who can approve a timesheet for a given user
   // and also have an email to receive a notification about it.
-  static function getApprovers($user_id) {
+  static function getApprovers() {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
@@ -263,20 +264,22 @@ static function getApprovers($user_id) {
     return $approvers;
   }
 
-  // submitTimesheet marks a timesheet as submitted and sends an email to an approver.
+  // submitTimesheet marks a timesheet as submitted and also sends an email
+  // to a selected approver.
   static function submitTimesheet($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // First, mark a timesheet as submitted.
+    // First, mark timesheet as submitted.
     // Even if mail part below does not work, this will get us a functioning workflow
-    // (without email notifications).
+    // without email notification.
     $timesheet_id = $fields['timesheet_id'];
     $sql = "update tt_timesheets set submit_status = 1".
-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -291,17 +294,18 @@ static function approveTimesheet($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // First, mark a timesheet as approved.
+    // First, mark timesheet as approved.
     // Even if mail part below does not work, this will get us a functioning workflow
-    // (without email notifications).
+    // without email notification.
     $timesheet_id = $fields['timesheet_id'];
     $comment = $fields['comment'];
 
     $sql = "update tt_timesheets set approve_status = 1, approve_comment = ".$mdb2->quote($comment).
-      " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
+      " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -314,17 +318,18 @@ static function disapproveTimesheet($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // First, mark a timesheet as disapproved.
+    // First, mark timesheet as disapproved.
     // Even if mail part below does not work, this will get us a functioning workflow
-    // (without email notifications).
+    // without email notification.
     $timesheet_id = $fields['timesheet_id'];
     $comment = $fields['comment'];
 
     $sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).
-      " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
+      " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c9463c886..e32cca999 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.50.4809 | 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.50.4810 | 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/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 3bd8ddd20..77cc78bd5 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -49,6 +49,7 @@
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>
       </tr>
+      <tr><td>&nbsp;</td></tr>
       </table>
 
 {$forms.timesheetForm.open}
diff --git a/timesheet_view.php b/timesheet_view.php
index e6368a396..d0198c780 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -60,7 +60,7 @@
 // Determine which controls to show and obtain date for them.
 $showSubmit = !$timesheet['submit_status'];
 if ($showSubmit) {
-  $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+  $approvers = ttTimesheetHelper::getApprovers();
   $showApprovers = count($approvers) >= 1;
 }
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');

From 9f37cea35130359a3fe915c63a59cbfcdc75663f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 17:22:56 +0000
Subject: [PATCH 0754/1848] Fixed reports for renamed timesheet field.

---
 WEB-INF/lib/ttReportHelper.class.php | 36 ++++++++++++++--------------
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/timesheets.tpl     |  8 +++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c45548610..7d2e40c56 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -285,11 +285,11 @@ static function getItems($options) {
     if ($user->isPluginEnabled('ts')) {
       $timesheet_option = $options['timesheet'];
       if ($timesheet_option == TIMESHEET_PENDING)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
       else if ($timesheet_option == TIMESHEET_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 1)";
       else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
       else if ($options['show_timesheet'])
         $inner_joins .= " left join tt_timesheets ts on (l.timesheet_id = ts.id)"; // Left join for timesheet nme.
     }
@@ -371,11 +371,11 @@ static function getItems($options) {
       if ($user->isPluginEnabled('ts')) {
         $timesheet_option = $options['timesheet'];
         if ($timesheet_option == TIMESHEET_PENDING)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
         else if ($timesheet_option == TIMESHEET_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 1)";
         else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 0)";
         else if ($options['show_timesheet'])
           $inner_joins .= " left join tt_timesheets ts on (ei.timesheet_id = ts.id)"; // Left join for timesheet name.
       }
@@ -566,11 +566,11 @@ static function getTotals($options)
     if ($user->isPluginEnabled('ts') && $options['timesheet']) {
       $timesheet_option = $options['timesheet'];
       if ($timesheet_option == TIMESHEET_PENDING)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
       else if ($timesheet_option == TIMESHEET_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 1)";
       else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
     }
     // Prepare a query for time items.
     $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $inner_joins $where";
@@ -582,11 +582,11 @@ static function getTotals($options)
       if ($user->isPluginEnabled('ts') && $options['timesheet']) {
         $timesheet_option = $options['timesheet'];
         if ($timesheet_option == TIMESHEET_PENDING)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
         else if ($timesheet_option == TIMESHEET_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 1)";
         else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 0)";
       }
       $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
@@ -1605,11 +1605,11 @@ static function makeJoinPart($options) {
     if ($user->isPluginEnabled('ts') && $options['timesheet']) {
       $timesheet_option = $options['timesheet'];
       if ($timesheet_option == TIMESHEET_PENDING)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
       else if ($timesheet_option == TIMESHEET_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 1)";
       else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+        $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
     }
     $join .= $inner_joins;
     return $join;
@@ -1663,11 +1663,11 @@ static function makeJoinExpensesPart($options) {
     if ($user->isPluginEnabled('ts') && $options['timesheet']) {
       $timesheet_option = $options['timesheet'];
       if ($timesheet_option == TIMESHEET_PENDING)
-        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
       else if ($timesheet_option == TIMESHEET_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 1)";
       else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 0)";
     }
     $join .= $inner_joins;
     return $join;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e32cca999..f5c550ced 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.50.4810 | 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.50.4811 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 907f41557..91c626df0 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -30,10 +30,10 @@
           <td>{$timesheet.client_name|escape}</td>
   {/if}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {if $timesheet.approval_status == null}
+  {if $timesheet.approve_status == null}
           <td></td>
   {else}
-          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+          <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
@@ -66,10 +66,10 @@
           <td>{$timesheet.client_name|escape}</td>
     {/if}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-    {if $timesheet.approval_status == null}
+    {if $timesheet.approve_status == null}
           <td></td>
     {else}
-          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+          <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
     {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>

From 7aced3f6210fcd9bad8db0f6ff7d12d1f9daf62e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 18:44:23 +0000
Subject: [PATCH 0755/1848] Dropped timesheet_id from tt_expense_items and
 simplified sql.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  1 -
 WEB-INF/lib/ttOrgImportHelper.class.php   |  5 +--
 WEB-INF/lib/ttReportHelper.class.php      | 54 +++--------------------
 WEB-INF/templates/footer.tpl              |  2 +-
 dbinstall.php                             | 11 +++--
 mysql.sql                                 |  4 +-
 6 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 59bdc8c8d..7810c79e8 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -459,7 +459,6 @@ function writeData() {
         $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
         $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
         $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
-        $expense_item_part .= " timesheet_id=\"".$this->timesheetMap[$expense_item['timesheet_id']]."\"";
         $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
         $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
         $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 0efb6b031..c29c01cca 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -756,7 +756,6 @@ private function insertExpense($fields) {
     $user_id = (int) $fields['user_id'];
     $client_id = $fields['client_id'];
     $project_id = $fields['project_id'];
-    $timesheet_id = $fields['timesheet_id'];
     $name = $fields['name'];
     $cost = str_replace(',', '.', $fields['cost']);
     $invoice_id = $fields['invoice_id'];
@@ -766,10 +765,10 @@ private function insertExpense($fields) {
     $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     $sql = "insert into tt_expense_items".
-      " (date, user_id, group_id, org_id, client_id, project_id, timesheet_id, name,".
+      " (date, user_id, group_id, org_id, client_id, project_id, name,".
       " cost, invoice_id, approved, paid, created, created_ip, created_by, status)".
       " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
-      ", ".$mdb2->quote($timesheet_id).", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).
+      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).
       ", $approved, $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 7d2e40c56..abb5ab9e6 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -107,12 +107,6 @@ static function getExpenseWhere($options) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // A shortcut for timesheets.
-    if ($options['timesheet_id']) {
-      $where = " where ei.timesheet_id = ".$options['timesheet_id']." and ei.group_id = $group_id and ei.org_id = $org_id";
-      return $where;
-    }
-
     // Prepare dropdown parts.
     $dropdown_parts = '';
     if ($options['client_id'])
@@ -122,8 +116,9 @@ static function getExpenseWhere($options) {
     if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
     if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not null';
     if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
-    if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is null';
-    if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is not null';
+    if (isset($options['timesheet']) && ($options['timesheet']!=TIMESHEET_ALL && $options['timesheet']!=TIMESHEET_NOT_ASSIGNED)) {
+        $dropdown_parts .= ' and 0 = 1'; // Expense items do not have a timesheet_id.
+    }
     if ($options['approved']=='1') $dropdown_parts .= ' and ei.approved = 1';
     if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
@@ -353,7 +348,7 @@ static function getItems($options) {
       if (($canViewReports || $isClient) && $options['show_invoice'])
         array_push($fields, 'i.name as invoice');
       if ($options['show_timesheet'])
-        array_push($fields, 'ts.name as timesheet_name');
+        array_push($fields, 'null as timesheet_name');
 
       // Prepare sql query part for left joins.
       $left_joins = null;
@@ -366,24 +361,10 @@ static function getItems($options) {
       if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
-      // Prepare sql query part for inner joins.
-      $inner_joins = null;
-      if ($user->isPluginEnabled('ts')) {
-        $timesheet_option = $options['timesheet'];
-        if ($timesheet_option == TIMESHEET_PENDING)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
-        else if ($timesheet_option == TIMESHEET_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 1)";
-        else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 0)";
-        else if ($options['show_timesheet'])
-          $inner_joins .= " left join tt_timesheets ts on (ei.timesheet_id = ts.id)"; // Left join for timesheet name.
-      }
-
       $where = ttReportHelper::getExpenseWhere($options);
 
       // Construct sql query for expense items.
-      $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $inner_joins $where";
+      $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
 
       // Construct a union.
       $sql = "($sql) union all ($sql_for_expense_items)";
@@ -577,21 +558,10 @@ static function getTotals($options)
 
     // If we have expenses, query becomes a bit more complex.
     if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
-      // Prepare sql query part for inner joins.
-      $inner_joins = null;
-      if ($user->isPluginEnabled('ts') && $options['timesheet']) {
-        $timesheet_option = $options['timesheet'];
-        if ($timesheet_option == TIMESHEET_PENDING)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
-        else if ($timesheet_option == TIMESHEET_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 1)";
-        else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-          $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 0)";
-      }
       $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $inner_joins $where";
+      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
 
       // Create a combined query.
       $combined = "select sum(time) as time";
@@ -1658,18 +1628,6 @@ static function makeJoinExpensesPart($options) {
     if (ttReportHelper::groupingBy('project', $options)) {
       $join .= ' left join tt_projects p on (ei.project_id = p.id)';
     }
-    // Prepare inner joins.
-    $inner_joins = null;
-    if ($user->isPluginEnabled('ts') && $options['timesheet']) {
-      $timesheet_option = $options['timesheet'];
-      if ($timesheet_option == TIMESHEET_PENDING)
-        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
-      else if ($timesheet_option == TIMESHEET_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 1)";
-      else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
-        $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approve_status = 0)";
-    }
-    $join .= $inner_joins;
     return $join;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f5c550ced..c7af2f278 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.50.4811 | 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.51.4812 | 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/dbinstall.php b/dbinstall.php
index e33635aaf..65a6776da 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11850"]) {
+  if ($_POST["convert11797to11851"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1120,6 +1120,9 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.49', modified = now() where param_name = 'version_db' and param_value = '1.18.48'");
     ttExecute("ALTER TABLE `tt_timesheets` ADD `project_id` int(11) default NULL AFTER `client_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.50', modified = now() where param_name = 'version_db' and param_value = '1.18.49'");
+    ttExecute("drop index timesheet_idx on tt_expense_items");
+    ttExecute("ALTER TABLE `tt_expense_items` DROP `timesheet_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.51', modified = now() where param_name = 'version_db' and param_value = '1.18.50'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1168,7 +1171,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.50)</b>
+    <td width="80%"><b>Create database structure (v1.18.51)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1213,8 +1216,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.50)</td>
-    <td><input type="submit" name="convert11797to11850" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.51)</td>
+    <td><input type="submit" name="convert11797to11851" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 525a4769a..bec26520c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -432,7 +432,6 @@ CREATE TABLE `tt_expense_items` (
   `org_id` int(11) default NULL,          # organization id
   `client_id` int(11) default NULL,       # client id
   `project_id` int(11) default NULL,      # project id
-  `timesheet_id` int(11) default NULL,    # timesheet id
   `name` text NOT NULL,                   # expense item name (what is an expense for)
   `cost` decimal(10,2) default '0.00',    # item cost (including taxes, etc.)
   `invoice_id` int(11) default NULL,      # invoice id
@@ -454,7 +453,6 @@ create index user_idx on tt_expense_items(user_id);
 create index group_idx on tt_expense_items(group_id);
 create index client_idx on tt_expense_items(client_id);
 create index project_idx on tt_expense_items(project_id);
-create index timesheet_idx on tt_expense_items(timesheet_id);
 create index invoice_idx on tt_expense_items(invoice_id);
 
 
@@ -527,4 +525,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.50', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.51', now()); # TODO: change when structure changes.

From 6385f0cb8f380c6dea36f8c2905aaa578d54d17f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Mar 2019 18:58:24 +0000
Subject: [PATCH 0756/1848] Realeasing timesheets feature for user testing.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c7af2f278..66e0203bd 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.51.4812 | 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.52.4813 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 5c5941c3e..a6436bf27 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -138,12 +138,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
             <td><label for="approval">{$i18n.label.approval}</label></td>
           </tr>
-{if isTrue('TIMESHEET_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
             <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
           </tr>
-{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>

From a6eb3d4378c5eb969eb3bd29abf0f2b4eb53feb9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 3 Mar 2019 15:11:20 +0000
Subject: [PATCH 0757/1848] Prohibited adding overlapping timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 40 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_add.php                       |  1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 1fff19554..f214963b2 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -374,4 +374,44 @@ static function timesheetItemsExist($fields) {
 
     return false;
   }
+
+  // The overlaps function determines if a new timesheet overlaps with
+  // an already existing timesheet.
+  static function overlaps($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
+    if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+
+    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
+    $start = $start_date->toString(DB_DATEFORMAT);
+    $quoted_start = $mdb2->quote($start);
+
+    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
+    $end = $end_date->toString(DB_DATEFORMAT);
+    $quoted_end = $mdb2->quote($end);
+
+    // sql parts.
+    if ($client_id) $client_part = " and client_id = $client_id";
+    if ($project_id) $project_part = " and project_id = $project_id";
+
+    $sql = "select id from tt_timesheets".
+      " where status is not null $client_part $project_part".
+      " and (($quoted_start >= start_date and $quoted_start <= end_date)".
+      "   or ($quoted_end >= start_date and $quoted_end <= end_date))".
+      " and user_id = $user_id and group_id = $group_id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val['id']) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 66e0203bd..1a9296dc9 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.52.4813 | 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.52.4814 | 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/timesheet_add.php b/timesheet_add.php
index 09a2d3848..7c7633c6c 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -87,6 +87,7 @@
     'end_date' => $cl_finish,
     'comment' => $cl_comment);
   if ($err->no() && !ttTimesheetHelper::timesheetItemsExist($fields)) $err->add($i18n->get('error.no_records'));
+  if ($err->no() && ttTimesheetHelper::overlaps($fields)) $err->add($i18n->get('error.overlap'));
   // Finished validating user input.
 
   if ($err->no()) {

From ef5c9ae2d3e3a31f054470020b9539794e64b9d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 3 Mar 2019 15:40:39 +0000
Subject: [PATCH 0758/1848] Added a string to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f2ec9cf3a..b26a67041 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -463,6 +463,7 @@
 'form.report.export' => 'Exportar',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index edc7d3ecb..125dc9c50 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -473,6 +473,7 @@
 'form.report.export' => 'Exportovat',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7bb213802..1cf78282a 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -438,6 +438,7 @@
 'form.report.export' => 'Eksport',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 02ab0484e..828d1e564 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -417,6 +417,8 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportiere',
 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
+// TODO: translate the following.
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 6740c556a..60daeedee 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -413,6 +413,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Export',
 'form.report.assign_to_invoice' => 'Assign to invoice',
+'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
  // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.active_timesheets' => 'Active Timesheets',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5bb6eefe4..f87a44db9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -476,6 +476,7 @@
 'form.report.export' => 'Exportar',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e0b512e6c..9ddd0acaf 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -442,6 +442,8 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Eksport',
 'form.report.assign_to_invoice' => 'Lisa arvele',
+// TODO: translate the following.
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 97610c3a6..0c9ad727a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -458,6 +458,7 @@
 'form.report.export' => 'پشتیبانی',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 91bcd40dd..84f0ab4c7 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -443,6 +443,7 @@
 'form.report.export' => 'Vie',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 0cb6764a4..1ba1d5d79 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -435,6 +435,7 @@
 'form.report.export' => 'Exporter',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e34554651..c3072e2ae 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -426,6 +426,8 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Εξαγωγή',
 'form.report.assign_to_invoice' => 'Ανάθεση στο τιμολόγιο',
+// TODO: translate the following.
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2d65957bf..e037389f4 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -465,6 +465,7 @@
 'form.report.export' => 'ייצא נתונים בתבנית',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c9e59f476..4112e3d93 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -467,6 +467,7 @@
 'form.report.export' => 'Exportálása', // TODO: is this correct?
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7402e033e..7b61b0496 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -439,6 +439,8 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Esporta',
 'form.report.assign_to_invoice' => 'Assegna alla fattura',
+// TODO: translate the following.
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 5cb5305e6..09f89ea8f 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -472,6 +472,7 @@
 'form.report.export' => '輸出する', // TODO: is this correct?
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index df1311708..4e31b75f5 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -470,6 +470,7 @@
 'form.report.export' => '익스포트', // TODO: is this correct?
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e6425badd..461dbdaf2 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -413,6 +413,8 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporteer',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
+// TODO: translate the following.
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 09fdec8e2..8e5219cf6 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -468,6 +468,7 @@
 'form.report.export' => 'Eksporter',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 678f38e9a..e46c282d3 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -446,6 +446,7 @@
 'form.report.export' => 'Eksport',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 967bfabd2..d5a382e8c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -441,6 +441,7 @@
 'form.report.export' => 'Exportar',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9ce23328b..f337dbc0f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -448,6 +448,7 @@
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 7472f0b5f..a782c0789 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -471,6 +471,7 @@
 'form.report.export' => 'Exporta',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ac9d0d146..1664d3e4a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -404,6 +404,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Экспортировать',
 'form.report.assign_to_invoice' => 'Включить в счёт',
+'form.report.assign_to_timesheet' => 'Включить в табель',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.active_timesheets' => 'Активные табели',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f1e0c894b..f0204668e 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -455,6 +455,7 @@
 'form.report.export' => 'Exportovať',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 17e8ca7f7..fd76109d3 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -445,6 +445,7 @@
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ee49bd17f..704e2799b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -444,6 +444,7 @@
 'form.report.export' => 'Izvoz',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 6acbcc0d8..1eaaf5f7d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -442,6 +442,7 @@
 'form.report.export' => 'Exportera som',
 // TODO: translate the following.
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 614ce9426..bc6538079 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -483,6 +483,7 @@
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 9239d7edf..37ebf9cf6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -455,6 +455,7 @@
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index fdbf657c8..c065668d0 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -463,6 +463,7 @@
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
+// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a9296dc9..10008cf79 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.52.4814 | 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.52.4815 | 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>

From 9c8422b2c186feac1b572f09ab27d4c754d5e492 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 3 Mar 2019 16:00:50 +0000
Subject: [PATCH 0759/1848] Added a string to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b26a67041..29c293a13 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -392,6 +392,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'actiu',
 // TODO: translate the following.
 // 'dropdown.status_inactive' => 'inactive',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 125dc9c50..a1ea87123 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -402,6 +402,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 1cf78282a..e1179c620 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -369,6 +369,8 @@
 'dropdown.clients' => 'Klienter',
 'dropdown.select' => '--- Vælg ---',
 'dropdown.select_invoice' => '--- Vælg faktura ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'Aktive',
 'dropdown.status_inactive' => 'Inaktive',
 'dropdown.delete' => 'Slet',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 828d1e564..0cc35fcf2 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -349,6 +349,8 @@
 'dropdown.clients' => 'Kunden',
 'dropdown.select' => '--- auswählen ---',
 'dropdown.select_invoice' => '--- Rechnung auswählen ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktiv',
 'dropdown.status_inactive' => 'inaktiv',
 'dropdown.delete' => 'löschen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 60daeedee..0784ed5f2 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -341,6 +341,7 @@
 'dropdown.clients' => 'clients',
 'dropdown.select' => '--- select ---',
 'dropdown.select_invoice' => '--- select invoice ---',
+'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'active',
 'dropdown.status_inactive' => 'inactive',
 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f87a44db9..58028ba52 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -392,6 +392,7 @@
 'dropdown.select' => '--- seleccionar ---',
 // TODO: translate the following.
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 9ddd0acaf..78971e76d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -370,6 +370,8 @@
 'dropdown.clients' => 'kliendid',
 'dropdown.select' => '--- vali ---',
 'dropdown.select_invoice' => '--- vali arve ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktiivne',
 'dropdown.status_inactive' => 'mitte aktiivne',
 'dropdown.delete' => 'kustuta',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0c9ad727a..789a64b94 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -380,6 +380,8 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 'dropdown.select_invoice' => '--- انتخاب فاکتور ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'فعال',
 'dropdown.status_inactive' => 'غیرفعال',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 84f0ab4c7..5fb4f2baf 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -369,6 +369,8 @@
 'dropdown.clients' => 'asiakkaat',
 'dropdown.select' => '--- valitse ---',
 'dropdown.select_invoice' => '--- valitse lasku ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktiivinen',
 'dropdown.status_inactive' => 'inaktiivinen',
 'dropdown.delete' => 'poista',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1ba1d5d79..9911721ad 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -361,6 +361,8 @@
 'dropdown.clients' => 'Clients',
 'dropdown.select' => '--- sélectionnez ---',
 'dropdown.select_invoice' => '--- selectionnez facture ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'actif',
 'dropdown.status_inactive' => 'inactif',
 'dropdown.delete' => 'supprimer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c3072e2ae..eacfa1791 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -357,6 +357,8 @@
 'dropdown.clients' => 'πελάτες',
 'dropdown.select' => '--- επιλογή ---',
 'dropdown.select_invoice' => '--- επιλογή τιμολόγιου ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'ενεργός',
 'dropdown.status_inactive' => 'ανένεργος',
 'dropdown.delete' => 'διαγραφή',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e037389f4..d6bd794b8 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -390,6 +390,8 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 'dropdown.select_invoice' => '--- בחר חשבונית ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'פעיל',
 'dropdown.status_inactive' => 'לא פעיל',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 4112e3d93..2f0e2d5d0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -393,6 +393,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktív',
 // TODO: translate the following.
 // 'dropdown.status_inactive' => 'inactive',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7b61b0496..a92ddd832 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -367,6 +367,8 @@
 'dropdown.clients' => 'clienti',
 'dropdown.select' => '--- seleziona ---',
 'dropdown.select_invoice' => '--- seleziona la fattura ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'attivo',
 'dropdown.status_inactive' => 'inattivo',
 'dropdown.delete' => 'elimina',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 09f89ea8f..80373c038 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -396,6 +396,7 @@
 // 'dropdown.clients' => 'clients',
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4e31b75f5..98c017e8e 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -400,6 +400,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 461dbdaf2..b6094b16c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -344,6 +344,8 @@
 'dropdown.clients' => 'klanten',
 'dropdown.select' => '--- kies ---',
 'dropdown.select_invoice' => '--- kies factuur ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'actief',
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8e5219cf6..bf2ff64d7 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -395,6 +395,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktiv',
 'dropdown.status_inactive' => 'inaktiv',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e46c282d3..c471a0c0c 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -372,6 +372,8 @@
 'dropdown.clients' => 'klienci',
 'dropdown.select' => '--- wybierz ---',
 'dropdown.select_invoice' => '--- wybierz fakturę ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktywny',
 'dropdown.status_inactive' => 'nieaktywny',
 'dropdown.delete' => 'usuń',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d5a382e8c..741e87fde 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -367,6 +367,8 @@
 'dropdown.clients' => 'clientes',
 'dropdown.select' => '--- selecione ---',
 'dropdown.select_invoice' => '--- selecione fatura ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'ativo',
 'dropdown.status_inactive' => 'inativo',
 'dropdown.delete' => 'apagar',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f337dbc0f..bda088ea0 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -379,6 +379,7 @@
 // 'dropdown.clients' => 'clients',
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a782c0789..12c2a6818 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -399,6 +399,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'activ',
 'dropdown.status_inactive' => 'inactiv',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1664d3e4a..d43ae31c7 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -338,6 +338,7 @@
 'dropdown.clients' => 'клиенты',
 'dropdown.select' => '--- выберите ---',
 'dropdown.select_invoice' => '--- выберите счёт ---',
+'dropdown.select_timesheet' => '--- выберите табель ---',
 'dropdown.status_active' => 'активный',
 'dropdown.status_inactive' => 'неактивный',
 'dropdown.delete' => 'удалить',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f0204668e..d3c847910 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -380,6 +380,7 @@
 'dropdown.select' => '--- vyberte ---',
 // TODO: translate the following.
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktívny',
 'dropdown.status_inactive' => 'neaktívny',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index fd76109d3..88b5e8b71 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -372,6 +372,7 @@
 // 'dropdown.clients' => 'clients',
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 704e2799b..e49e1d080 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -370,6 +370,8 @@
 'dropdown.clients' => 'klijenti',
 'dropdown.select' => '--- odaberi ---',
 'dropdown.select_invoice' => '--- odaberi račun ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktivan',
 'dropdown.status_inactive' => 'neaktivan',
 'dropdown.delete' => 'obriši',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1eaaf5f7d..bcf5ee258 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -368,6 +368,8 @@
 'dropdown.clients' => 'Kunder',
 'dropdown.select' => '--- Välj ---',
 'dropdown.select_invoice' => '--- Välj faktura ---',
+// TODO: translate the following.
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'Aktiv',
 'dropdown.status_inactive' => 'Inaktiv',
 'dropdown.delete' => 'Ta bort',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index bc6538079..62f59f629 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -407,6 +407,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'aktif',
 // TODO: translate the following.
 // 'dropdown.status_inactive' => 'inactive',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 37ebf9cf6..d3a3d9810 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -386,6 +386,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c065668d0..6c8f6c0e8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -393,6 +393,7 @@
 // TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
+// 'dropdown.select_timesheet' => '--- select timesheet ---',
 // 'dropdown.status_active' => 'active',
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 10008cf79..6732e72eb 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.52.4815 | 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.52.4816 | 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>

From a7b601e885915db17770998a3ef366f64ccad8c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 3 Mar 2019 17:40:36 +0000
Subject: [PATCH 0760/1848] A bit of refactoring in report.php for timesheet
 assignment.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 12 ++++++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 report.php                              | 33 +++++++++++++++----------
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index f214963b2..22f129275 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -414,4 +414,14 @@ static function overlaps($fields) {
     }
     return false;
   }
-}
+
+  // The canAssign function determines if we can show controls on a report page
+  // for timesheet assignment.
+  //
+  // Conditions:
+  // - Report date range, client_id, and project_id match an existing timesheet
+  //   with approved_status null.
+  static function canAssign($options) {
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6732e72eb..f7a521961 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.52.4816 | 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.52.4817 | 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/report.php b/report.php
index 84b18b66c..b31394e27 100644
--- a/report.php
+++ b/report.php
@@ -73,21 +73,29 @@
 
 $client_id = $bean->getAttribute('client');
 
-// Do we need to show checkboxes? We show them if we allow setting approved or paid status,
-// and also when we can assign / deassign records to invoces.
+// Do we need to show checkboxes? We show them in the following 4 situations:
+// - We can approve items.
+// - We can mark items as paid.
+// - We can sssign items to invoices.
+// - We can assign items to a timesheet.
+// Determine these conditions separately.
 if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_eports')))
-  $showForApproved = true;
-if ($bean->getAttribute('chpaid') ||
-   ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
-  if ($user->can('manage_invoices'))
-    $showForInvoicesOrPaid = true;
-}
-$use_checkboxes = $showForApproved || $showForInvoicesOrPaid;
+  $useMarkApproved = true;
+if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
+  $useMarkPaid = true;
+if ($bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
+  $useAssignToInvoice = true;
+//if ($bean->getAttribute('chtimesheet') && ($user->can('track_own_time') || $user->can('track_time')))
+//  $useAssignToTimesheet = true; // TODO: add a check for timesheet capability.
+//if (ttTimesheetHelper::canAssign($options))
+//  $useAssignToTimesheet = true;
+
+$use_checkboxes = $useMarkApproved || $useMarkPaid || $useAssignToInvoice || $useAssignToTimesheet;
 if ($use_checkboxes)
   $smarty->assign('use_checkboxes', true);
 
 // Controls for "Mark approved" block.
-if ($showForApproved) {
+if ($useMarkApproved) {
   $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_select_options',
@@ -103,7 +111,7 @@
 }
 
 // Controls for "Mark paid" block.
-if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
+if ($useMarkPaid) {
   $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',
@@ -119,8 +127,7 @@
 }
 
 // Controls for "Assign to invoice" block.
-if ($user->can('manage_invoices') &&
-  ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
+if ($useAssignToInvoice) {
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
   if ($recent_invoices) {

From d5923832a32b1f43cbc6c5d74bbd064888761c80 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 3 Mar 2019 21:56:31 +0000
Subject: [PATCH 0761/1848] Added a mechanism to assign report items to
 timesheets.

---
 WEB-INF/lib/ttReportHelper.class.php    | 20 ++++++++
 WEB-INF/lib/ttTimesheetHelper.class.php | 62 +++++++++++++++++++++----
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/report.tpl            | 13 +++++-
 report.php                              | 57 +++++++++++++++++++----
 5 files changed, 134 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index abb5ab9e6..ceaee4b01 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -629,6 +629,26 @@ static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids) {
     }
   }
 
+  // The assignToTimesheet assigns a set of tt_log records to a specific timesheet.
+  static function assignToTimesheet($timesheet_id, $time_log_ids) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    if ($time_log_ids) {
+      $sql = "update tt_log l".
+        // TODO: inner join does not work properly for de-assignment. Improve.
+        // " inner join tt_timesheets ts on (ts.id = $timesheet_id and ts.approve_status is null)".
+        " set l.timesheet_id = ".$mdb2->quote($timesheet_id).
+        " where l.id in(".join(', ', $time_log_ids).") and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }
+  }
+
   // The markApproved marks a set of records as either approved or unapproved.
   static function markApproved($time_log_ids, $expense_item_ids, $approved = true) {
     global $user;
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 22f129275..895715108 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -415,13 +415,59 @@ static function overlaps($fields) {
     return false;
   }
 
-  // The canAssign function determines if we can show controls on a report page
-  // for timesheet assignment.
+  // The getMatchingTimesheets function retrieves a timesheet that "matches"
+  // a report for an option to assign report items to it.
   //
-  // Conditions:
-  // - Report date range, client_id, and project_id match an existing timesheet
-  //   with approved_status null.
-  static function canAssign($options) {
-    return false;
+  // Condition: report range is fully enclosed in an existing timesheet with
+  // matching client_id and project_id and null approved_status.
+  static function getMatchingTimesheets($options) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // Check users.
+    if (isset($options['users'])) {
+      $comma_separated = $options['users'];
+      $users = explode(',', $comma_separated);
+      if (count($users) > 1 || $users[0] != $user->getUser())
+        return false;
+    }
+
+    // No timesheets for expenses.
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) return false;
+    
+    // Parts for client and project.
+    if ($options['client_id']) $client_part = ' and client_id = '.(int)$options['client_id'];
+    if ($options['project_id']) $project_part = ' and project_id = '.(int)$options['project_id'];
+
+    // Determine start and end dates.
+    $dateFormat = $user->getDateFormat();
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($dateFormat));
+    else {
+      $period = new Period();
+      $period->setPeriod(
+        new DateAndTime($dateFormat, $options['period_start']),
+        new DateAndTime($dateFormat, $options['period_end']));
+    }
+    $start = $period->getStartDate(DB_DATEFORMAT);
+    $end = $period->getEndDate(DB_DATEFORMAT);
+
+    $result = false;
+    $sql = "select id, name from tt_timesheets".
+      " where ".$mdb2->quote($start)." >= start_date and ".$mdb2->quote($end)." <= end_date".
+      "$client_part $project_part".
+      " and user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and approve_status is null and status is not null";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
   }
-}
\ No newline at end of file
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f7a521961..da170551e 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.52.4817 | 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.52.4818 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 44a6e3376..9e215c4df 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -166,7 +166,7 @@
   </td>
 </tr>
 </table>
-{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice)}
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice || $use_assign_to_timesheet)}
 <table width="720" cellspacing="0" cellpadding="0" border="0">
   {if $use_mark_approved}
   <tr>
@@ -190,7 +190,16 @@
   <tr>
     <td align="right">
       <table>
-        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign.control}</td></tr>
+        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign_invoice.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
+  {if $use_assign_to_timesheet}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control} {$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control}</td></tr>
       </table>
     </td>
   </tr>
diff --git a/report.php b/report.php
index b31394e27..4a29c320b 100644
--- a/report.php
+++ b/report.php
@@ -31,6 +31,7 @@
 import('form.ActionForm');
 import('ttReportHelper');
 import('ttGroupHelper');
+import('ttTimesheetHelper');
 
 // Access check.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
@@ -56,6 +57,12 @@
   $cl_recent_invoice_option = $request->getParameter('recent_invoice', ($request->isPost() ? null : @$_SESSION['recent_invoice_option']));
   $_SESSION['recent_invoice_option'] = $cl_recent_invoice_option;
 }
+if ($user->isPluginEnabled('ts')) {
+  $cl_assign_timesheet_select_option = $request->getParameter('assign_timesheet_select_options', ($request->isPost() ? null : @$_SESSION['assign_timesheet_select_option']));
+  $_SESSION['assign_timesheet_select_option'] = $cl_assign_timesheet_select_option;
+  $cl_timesheet_option = $request->getParameter('timesheet', ($request->isPost() ? null : @$_SESSION['timesheet_option']));
+  $_SESSION['timesheet_option'] = $cl_timesheet_option;
+}
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -72,6 +79,7 @@
 if ($request->isPost()) $bean->loadBean();
 
 $client_id = $bean->getAttribute('client');
+$options = ttReportHelper::getReportOptions($bean);
 
 // Do we need to show checkboxes? We show them in the following 4 situations:
 // - We can approve items.
@@ -85,10 +93,10 @@
   $useMarkPaid = true;
 if ($bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
   $useAssignToInvoice = true;
-//if ($bean->getAttribute('chtimesheet') && ($user->can('track_own_time') || $user->can('track_time')))
-//  $useAssignToTimesheet = true; // TODO: add a check for timesheet capability.
-//if (ttTimesheetHelper::canAssign($options))
-//  $useAssignToTimesheet = true;
+if ($bean->getAttribute('chtimesheet')) {
+  $timesheets = ttTimesheetHelper::getMatchingTimesheets($options);
+  if ($timesheets) $useAssignToTimesheet = true;
+}
 
 $use_checkboxes = $useMarkApproved || $useMarkPaid || $useAssignToInvoice || $useAssignToTimesheet;
 if ($use_checkboxes)
@@ -142,17 +150,35 @@
       'datakeys'=>array('id','name'),
       'value'=>$cl_recent_invoice_option,
       'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
-    $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->get('button.submit')));
+    $form->addInput(array('type'=>'submit','name'=>'btn_assign_invoice','value'=>$i18n->get('button.submit')));
     $smarty->assign('use_assign_to_invoice', true);
   }
 }
 
+// Controls for "Assign to timesheet" block.
+if ($useAssignToTimesheet) {
+  $assign_timesheet_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+  $form->addInput(array('type'=>'combobox',
+      'name'=>'assign_timesheet_select_options',
+      'data'=>$assign_timesheet_select_options,
+      'value'=>$cl_assign_timesheet_select_option));
+  $form->addInput(array('type'=>'combobox',
+      'name'=>'timesheet',
+      'data'=>$timesheets,
+      'datakeys'=>array('id','name'),
+      'value'=>$cl_timesheet_option,
+      'empty'=>array(''=>$i18n->get('dropdown.select_timesheet'))));
+  $form->addInput(array('type'=>'submit','name'=>'btn_assign_timesheet','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_assign_to_timesheet', true);
+}
+
 if ($request->isPost()) {
 
   // Validate parameters and at the same time build arrays of record ids.
   if (($request->getParameter('btn_mark_approved') && 2 == $request->getParameter('mark_approved_select_options'))
        || ($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
-       || ($request->getParameter('btn_assign') && 2 == $request->getParameter('assign_invoice_select_options'))) {
+       || ($request->getParameter('btn_assign_invoice') && 2 == $request->getParameter('assign_invoice_select_options'))
+       || ($request->getParameter('btn_assign_timesheet') && 2 == $request->getParameter('assign_timesheet_select_options'))) {
     // We act on selected records. Are there any?
     foreach($_POST as $key => $val) {
       if ('log_id_' == substr($key, 0, 7))
@@ -205,7 +231,7 @@
       exit();
     }
 
-    if ($request->getParameter('btn_assign')) {
+    if ($request->getParameter('btn_assign_invoice')) {
       // User clicked the Submit button to assign all or some items to a recent invoice.
 
       // Determine invoice id.
@@ -219,11 +245,24 @@
       header('Location: report.php');
       exit();
     }
+
+    if ($request->getParameter('btn_assign_timesheet')) {
+      // User clicked the Submit button to assign all or some items to a timesheet.
+
+      // Determine invoice id.
+      $timesheet_id = $request->getParameter('timesheet');
+
+      // Assign as requested.
+      if ($time_log_ids) {
+        ttReportHelper::assignToTimesheet($timesheet_id, $time_log_ids);
+      }
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
   }
 } // isPost
 
-$options = ttReportHelper::getReportOptions($bean);
-
 $report_items = ttReportHelper::getItems($options);
 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $use_checkboxes)

From 75345c7086761ea68d7e75fbffeaef64a3642fdd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 3 Mar 2019 23:57:49 +0000
Subject: [PATCH 0762/1848] Improved safety of timesheet assignment by adding
 an inner join.

---
 WEB-INF/lib/ttReportHelper.class.php    | 7 ++++---
 WEB-INF/lib/ttTimesheetHelper.class.php | 1 +
 WEB-INF/templates/footer.tpl            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ceaee4b01..a64bb8700 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -639,9 +639,10 @@ static function assignToTimesheet($timesheet_id, $time_log_ids) {
     $org_id = $user->org_id;
 
     if ($time_log_ids) {
-      $sql = "update tt_log l".
-        // TODO: inner join does not work properly for de-assignment. Improve.
-        // " inner join tt_timesheets ts on (ts.id = $timesheet_id and ts.approve_status is null)".
+      if ($timesheet_id)
+        $inner_join = " inner join tt_timesheets ts on (ts.id = $timesheet_id and ts.approve_status is null)";
+
+      $sql = "update tt_log l $inner_join".
         " set l.timesheet_id = ".$mdb2->quote($timesheet_id).
         " where l.id in(".join(', ', $time_log_ids).") and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id";
       $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 895715108..a348cb57b 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -442,6 +442,7 @@ static function getMatchingTimesheets($options) {
     // Parts for client and project.
     if ($options['client_id']) $client_part = ' and client_id = '.(int)$options['client_id'];
     if ($options['project_id']) $project_part = ' and project_id = '.(int)$options['project_id'];
+    // TODO: test and fix the above for NULL client and project ids...
 
     // Determine start and end dates.
     $dateFormat = $user->getDateFormat();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index da170551e..3f1664439 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.52.4818 | 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.52.4819 | 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>

From 840056890d9b574fcc62fdf386db346f133baa91 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 4 Mar 2019 15:30:40 +0000
Subject: [PATCH 0763/1848] Improved sfety of inner join for timesheet
 assignment.

---
 WEB-INF/lib/ttReportHelper.class.php | 3 ++-
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a64bb8700..0fa00d130 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -640,7 +640,8 @@ static function assignToTimesheet($timesheet_id, $time_log_ids) {
 
     if ($time_log_ids) {
       if ($timesheet_id)
-        $inner_join = " inner join tt_timesheets ts on (ts.id = $timesheet_id and ts.approve_status is null)";
+        $inner_join = " inner join tt_timesheets ts on (ts.id = $timesheet_id".
+          " and ts.user_id = $user_id and ts.approve_status is null)";
 
       $sql = "update tt_log l $inner_join".
         " set l.timesheet_id = ".$mdb2->quote($timesheet_id).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f1664439..9ce9723f4 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.52.4819 | 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.52.4820 | 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>

From f2b99f6c76ea5684968ac22300c98eae0777f540 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 4 Mar 2019 17:13:44 +0000
Subject: [PATCH 0764/1848] Improvements to timesheet assignment algorithm.

---
 WEB-INF/lib/ttReportHelper.class.php    | 13 +++++++++++--
 WEB-INF/lib/ttTimesheetHelper.class.php |  5 ++---
 WEB-INF/templates/footer.tpl            |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 0fa00d130..0cc2702cb 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -639,9 +639,18 @@ static function assignToTimesheet($timesheet_id, $time_log_ids) {
     $org_id = $user->org_id;
 
     if ($time_log_ids) {
-      if ($timesheet_id)
+      // Use inner join as a protection mechanism not to do anything with "acted upon" timesheets.
+      // Allow oprations only with pending timesheets.
+      if ($timesheet_id) {
+        // Assigning a timesheet to records.
         $inner_join = " inner join tt_timesheets ts on (ts.id = $timesheet_id".
-          " and ts.user_id = $user_id and ts.approve_status is null)";
+          " and ts.user_id = $user_id and ts.approve_status is null". // Timesheet to assign to is pending.
+          // Part below: existing timesheet either not exists or is also pending.
+          " and (l.timesheet_id is null or (l.timesheet_id = ts.id and ts.approve_status is null)))";
+      } else {
+        $inner_join = " inner join tt_timesheets ts on (ts.id = l.timesheet_id".
+          " and ts.user_id = $user_id and ts.approve_status is null)"; // Do not deassign from acted-upon timesheets.
+      }
 
       $sql = "update tt_log l $inner_join".
         " set l.timesheet_id = ".$mdb2->quote($timesheet_id).
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index a348cb57b..c2841c88d 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -440,9 +440,8 @@ static function getMatchingTimesheets($options) {
     if ($options['show_cost'] && $user->isPluginEnabled('ex')) return false;
     
     // Parts for client and project.
-    if ($options['client_id']) $client_part = ' and client_id = '.(int)$options['client_id'];
-    if ($options['project_id']) $project_part = ' and project_id = '.(int)$options['project_id'];
-    // TODO: test and fix the above for NULL client and project ids...
+    if ($options['client_id']) $client_part = ' and (client_id is null or client_id = '.(int)$options['client_id'].')';
+    if ($options['project_id']) $project_part = ' and (project_id is null or project_id = '.(int)$options['project_id'].')';
 
     // Determine start and end dates.
     $dateFormat = $user->getDateFormat();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9ce9723f4..fea07f597 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.52.4820 | 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.52.4821 | 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>

From d013f6f24164f5476cd270ceee3d5b7edf74ce79 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 4 Mar 2019 18:41:53 +0000
Subject: [PATCH 0765/1848] Added a check for timesheet delete operation
 possibility.

---
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/timesheet_edit.tpl |  2 +-
 timesheet_edit.php                   | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fea07f597..b1be81d21 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.52.4821 | 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.52.4822 | 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/timesheet_edit.tpl b/WEB-INF/templates/timesheet_edit.tpl
index 5848c5710..ec1123608 100644
--- a/WEB-INF/templates/timesheet_edit.tpl
+++ b/WEB-INF/templates/timesheet_edit.tpl
@@ -25,7 +25,7 @@
         </tr>
         <tr>
           <td></td>
-          <td align="left" height="50">{$forms.timesheetForm.btn_save.control} {$forms.timesheetForm.btn_delete.control}</td>
+          <td align="center" height="50">{$forms.timesheetForm.btn_save.control} {if $can_delete}{$forms.timesheetForm.btn_delete.control}{/if}</td>
         </tr>
       </table>
     </td>
diff --git a/timesheet_edit.php b/timesheet_edit.php
index 7919125a9..b883b20e9 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -57,6 +57,11 @@
   $cl_status = $timesheet['status'];
 }
 
+// Can we delete this timesheet?
+$canDelete = $timesheet['approve_status'] != 1
+  || (($user->id == $timesheet['user_id'] && $user->can('approve_own_timesheets'))
+  || ($user->id != $timesheet['user_id'] && $user->can('approve_timesheets')));
+
 $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_timesheet_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
@@ -64,7 +69,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+if ($canDelete) $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
   // Validate user input.
@@ -90,7 +95,7 @@
     }
   }
 
-  if ($request->getParameter('btn_delete')) {
+  if ($request->getParameter('btn_delete') && $canDelete) {
     header("Location: timesheet_delete.php?id=$cl_timesheet_id");
     exit();
   }
@@ -98,8 +103,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', $show_tasks);
+$smarty->assign('can_delete', $canDelete);
 $smarty->assign('title', $i18n->get('title.edit_timesheet'));
 $smarty->assign('content_page_name', 'timesheet_edit.tpl');
 $smarty->display('index.tpl');

From 566ab32f690c6e281a85c79345af95dca9a97898 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 15:43:17 +0000
Subject: [PATCH 0766/1848] Implemented sending email to timesheet approver.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 65 +++++++++++++++++++++++--
 WEB-INF/lib/ttUser.class.php            |  5 ++
 WEB-INF/resources/en.lang.php           | 10 ++++
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_view.php                      | 13 +++--
 5 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index c2841c88d..391e93275 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -264,6 +264,29 @@ static function getApprovers() {
     return $approvers;
   }
 
+  // getApprover obtains approver properties such as name and email.
+  static function getApprover($user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $rank = ttUserHelper::getUserRank($user->getUser());
+    $sql = "select u.name, u.email".
+      " from tt_users u".
+      " left join tt_roles r on (r.id = u.role_id)".
+      " where u.id = $user_id and u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id".
+      " and (r.rank > $rank and r.rights like '%approve_timesheets%')";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if ($val = $res->fetchRow()) {
+        return $val;
+      }
+    }
+    return false;
+  }
+
   // submitTimesheet marks a timesheet as submitted and also sends an email
   // to a selected approver.
   static function submitTimesheet($fields) {
@@ -281,10 +304,46 @@ static function submitTimesheet($fields) {
     $sql = "update tt_timesheets set submit_status = 1".
       " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // sendSubmitEmail sends a notification to an approver about a timesheet submit.
+  static function sendSubmitEmail($fields) {
+    global $i18n;
+    global $user;
+
+    // Send email to a selected approver.
+    if (!$fields['approver_id']) return true; // No approver, nothing to do.
 
-    // TODO: send email to approver here...
-    // $approver_id = $fields['approver_id'];
+    $approver = ttTimesheetHelper::getApprover($fields['approver_id']);
+    if (!$approver) return false; // Invalid approver id.
+
+    $fields['to'] = $approver['email'];
+    $fields['subject'] = $i18n->get('form.timesheet_view.submit_subject');
+    $fields['body'] = sprintf($i18n->get('form.timesheet_view.submit_body'), $user->getName());
+
+    return ttTimesheetHelper::sendEmail($fields);
+  }
+
+  // sendEmail is a generic finction that sends a timesheet related email.
+  // TODO: perhaps make it even more generic for the entire application.
+  static function sendEmail($fields, $html = true) {
+    global $i18n;
+    global $user;
+
+    // Send email.
+    import('mail.Mailer');
+    $mailer = new Mailer();
+    $mailer->setCharSet(CHARSET);
+    if ($html)
+      $mailer->setContentType('text/html');
+    $mailer->setSender(SENDER);
+    $mailer->setReceiver($fields['to']);
+    if (!empty($user->bcc_email))
+      $mailer->setReceiverBCC($user->bcc_email);
+    $mailer->setMailMode(MAIL_MODE);
+    if (!$mailer->send($fields['subject'], $fields['body']))
+      return false;
 
     return true;
   }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 28eeebcfd..4a2320b40 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -167,6 +167,11 @@ function getUser() {
     return ($this->behalfUser ? $this->behalfUser->id : $this->id);
   }
 
+  // getName returns user name on behalf of whom the current user is operating.
+  function getName() {
+    return ($this->behalfUser ? $this->behalfUser->name : $this->name);
+  }
+
   // getQuotaPercent returns quota percent for active user.
   function getQuotaPercent() {
     return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0784ed5f2..9e2a364c5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -551,4 +551,14 @@
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: improve wording, then fill in other translation files.
+'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+'form.timesheet_view.approve_subject' => 'Timesheet approved',
+'form.timesheet_view.approve_body' => "Dear User,\n\nYour timesheet %s was approved.",
+'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+'form.timesheet_view.disapprove_subject' => "Dear User,\n\nYour timesheet %s was not approved.\n\n%s",
+'form.timesheet_view.success_message' => 'Notification sent by email.',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b1be81d21..fe8ac9ff1 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.52.4822 | 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.52.4823 | 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/timesheet_view.php b/timesheet_view.php
index d0198c780..0a3cc7201 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -51,6 +51,7 @@
 
 if ($request->isPost()) {
   $cl_comment = trim($request->getParameter('comment'));
+  $approver_id = $request->getParameter('approver');
 }
 
 $options = ttTimesheetHelper::getReportOptions($timesheet);
@@ -76,7 +77,7 @@
       'name'=>'approver',
       'style'=>'width: 200px;',
       'data'=>$approvers,
-      'datakeys'=>array('id','name')));
+      'datakeys'=>array('id','name','email')));
   }
   $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 }
@@ -92,12 +93,16 @@
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],
       'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.
-    if (ttTimesheetHelper::submitTimesheet($fields)) {
+    if (!ttTimesheetHelper::submitTimesheet($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendSubmitEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
-    } else
-      $err->add($i18n->get('error.db'));
+    }
   }
 
   if ($request->getParameter('btn_approve')) {

From f3fe1f260bbb449253c86a6e08dae62957df468a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 15:57:11 +0000
Subject: [PATCH 0767/1848] Renamed a function for clarity.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 8 ++------
 WEB-INF/templates/footer.tpl            | 2 +-
 timesheet_view.php                      | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 391e93275..9d4919dcc 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -287,9 +287,8 @@ static function getApprover($user_id) {
     return false;
   }
 
-  // submitTimesheet marks a timesheet as submitted and also sends an email
-  // to a selected approver.
-  static function submitTimesheet($fields) {
+  // markSubmitted marks a timesheet as submitted.
+  static function markSubmitted($fields) {
     global $user;
     $mdb2 = getConnection();
 
@@ -297,9 +296,6 @@ static function submitTimesheet($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // First, mark timesheet as submitted.
-    // Even if mail part below does not work, this will get us a functioning workflow
-    // without email notification.
     $timesheet_id = $fields['timesheet_id'];
     $sql = "update tt_timesheets set submit_status = 1".
       " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fe8ac9ff1..06ab61412 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.52.4823 | 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.52.4824 | 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/timesheet_view.php b/timesheet_view.php
index 0a3cc7201..3dc80253d 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -93,7 +93,7 @@
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],
       'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.
-    if (!ttTimesheetHelper::submitTimesheet($fields))
+    if (!ttTimesheetHelper::markSubmitted($fields))
       $err->add($i18n->get('error.db'));
     if ($err->no() && !ttTimesheetHelper::sendSubmitEmail($fields)) {
       $err->add($i18n->get('error.mail_send'));

From bac0563d910ee1c055db5e2ad9ec4c6d08846f7f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 16:29:17 +0000
Subject: [PATCH 0768/1848] Added timesheet approval email notification.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 29 +++++++++++++++++--------
 WEB-INF/resources/en.lang.php           |  5 ++---
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_view.php                      | 14 ++++++++----
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 9d4919dcc..ca837fe7f 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -321,6 +321,23 @@ static function sendSubmitEmail($fields) {
     return ttTimesheetHelper::sendEmail($fields);
   }
 
+  // sendApprovedEmail sends a notification to user about a timesheet approval.
+  static function sendApprovedEmail($fields) {
+    global $i18n;
+    global $user;
+
+    // Obtain user email.
+    $user_details = $user->getUserDetails($fields['user_id']);
+    $email = $user_details['email'];
+    if (!$email) return true; // No email to send to, nothing to do.
+
+    $fields['to'] = $email;
+    $fields['subject'] = $i18n->get('form.timesheet_view.approve_subject');
+    $fields['body'] = sprintf($i18n->get('form.timesheet_view.approve_body'), htmlspecialchars($fields['name']));
+
+    return ttTimesheetHelper::sendEmail($fields);
+  }
+
   // sendEmail is a generic finction that sends a timesheet related email.
   // TODO: perhaps make it even more generic for the entire application.
   static function sendEmail($fields, $html = true) {
@@ -344,8 +361,8 @@ static function sendEmail($fields, $html = true) {
     return true;
   }
 
-  // approveTimesheet marks a timesheet as approved and sends an email to submitter.
-  static function approveTimesheet($fields) {
+  // markApproved marks a timesheet as approved.
+  static function markApproved($fields) {
     global $user;
     $mdb2 = getConnection();
 
@@ -353,19 +370,13 @@ static function approveTimesheet($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // First, mark timesheet as approved.
-    // Even if mail part below does not work, this will get us a functioning workflow
-    // without email notification.
     $timesheet_id = $fields['timesheet_id'];
     $comment = $fields['comment'];
 
     $sql = "update tt_timesheets set approve_status = 1, approve_comment = ".$mdb2->quote($comment).
       " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // TODO: send email to submitter here...
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
 
   // disapproveTimesheet marks a timesheet as approved and sends an email to submitter.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 9e2a364c5..fdf72ae68 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -557,8 +557,7 @@
 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
 'form.timesheet_view.approve_subject' => 'Timesheet approved',
-'form.timesheet_view.approve_body' => "Dear User,\n\nYour timesheet %s was approved.",
+'form.timesheet_view.approve_body' => "Your timesheet %s was approved.",
 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
-'form.timesheet_view.disapprove_subject' => "Dear User,\n\nYour timesheet %s was not approved.\n\n%s",
-'form.timesheet_view.success_message' => 'Notification sent by email.',
+'form.timesheet_view.disapprove_subject' => "Your timesheet %s was not approved.",
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 06ab61412..1a85ccfc2 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.52.4824 | 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.52.4825 | 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/timesheet_view.php b/timesheet_view.php
index 3dc80253d..f6e8aac71 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -92,7 +92,7 @@
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],
-      'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.
+      'approver_id' => $approver_id);
     if (!ttTimesheetHelper::markSubmitted($fields))
       $err->add($i18n->get('error.db'));
     if ($err->no() && !ttTimesheetHelper::sendSubmitEmail($fields)) {
@@ -107,13 +107,19 @@
 
   if ($request->getParameter('btn_approve')) {
     $fields = array('timesheet_id' => $timesheet['id'],
+      'name' => $timesheet['name'],
+      'user_id' => $timesheet['user_id'],
       'comment' => $cl_comment);
-    if (ttTimesheetHelper::approveTimesheet($fields)) {
+    if (!ttTimesheetHelper::markApproved($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendApprovedEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
-    } else
-      $err->add($i18n->get('error.db'));
+    }
   }
 
   if ($request->getParameter('btn_disapprove')) {

From 53c471451a8cb9e0fefd6d5907220bafdd77b53e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 17:03:41 +0000
Subject: [PATCH 0769/1848] Timesheet email workflow done.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 31 +++++++++++++++++--------
 WEB-INF/resources/en.lang.php           |  4 ++--
 WEB-INF/templates/footer.tpl            |  2 +-
 timesheet_view.php                      | 12 +++++++---
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index ca837fe7f..240d91312 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -333,7 +333,24 @@ static function sendApprovedEmail($fields) {
 
     $fields['to'] = $email;
     $fields['subject'] = $i18n->get('form.timesheet_view.approve_subject');
-    $fields['body'] = sprintf($i18n->get('form.timesheet_view.approve_body'), htmlspecialchars($fields['name']));
+    $fields['body'] = sprintf($i18n->get('form.timesheet_view.approve_body'), htmlspecialchars($fields['name']), htmlspecialchars($fields['comment']));
+
+    return ttTimesheetHelper::sendEmail($fields);
+  }
+
+  // sendDisapprovedEmail sends a notification to user about a timesheet disapproval.
+  static function sendDisapprovedEmail($fields) {
+    global $i18n;
+    global $user;
+
+    // Obtain user email.
+    $user_details = $user->getUserDetails($fields['user_id']);
+    $email = $user_details['email'];
+    if (!$email) return true; // No email to send to, nothing to do.
+
+    $fields['to'] = $email;
+    $fields['subject'] = $i18n->get('form.timesheet_view.disapprove_subject');
+    $fields['body'] = sprintf($i18n->get('form.timesheet_view.disapprove_body'), htmlspecialchars($fields['name']), htmlspecialchars($fields['comment']));
 
     return ttTimesheetHelper::sendEmail($fields);
   }
@@ -379,8 +396,8 @@ static function markApproved($fields) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // disapproveTimesheet marks a timesheet as approved and sends an email to submitter.
-  static function disapproveTimesheet($fields) {
+  // markDisapproved marks a timesheet as not approved.
+  static function markDisapproved($fields) {
     global $user;
     $mdb2 = getConnection();
 
@@ -388,19 +405,13 @@ static function disapproveTimesheet($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // First, mark timesheet as disapproved.
-    // Even if mail part below does not work, this will get us a functioning workflow
-    // without email notification.
     $timesheet_id = $fields['timesheet_id'];
     $comment = $fields['comment'];
 
     $sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).
       " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // TODO: send email to submitter here...
-    return true;
+    return (!is_a($affected, 'PEAR_Error'));
   }
 
   // The timesheetItemsExist determines whether tt_log records exist in the specified period
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index fdf72ae68..18d87eecf 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -557,7 +557,7 @@
 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
 'form.timesheet_view.approve_subject' => 'Timesheet approved',
-'form.timesheet_view.approve_body' => "Your timesheet %s was approved.",
+'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
-'form.timesheet_view.disapprove_subject' => "Your timesheet %s was not approved.",
+'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a85ccfc2..e4384ddb3 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.52.4825 | 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.53.4826 | 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/timesheet_view.php b/timesheet_view.php
index f6e8aac71..c8d7048a4 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -124,13 +124,19 @@
 
   if ($request->getParameter('btn_disapprove')) {
     $fields = array('timesheet_id' => $timesheet['id'],
+      'name' => $timesheet['name'],
+      'user_id' => $timesheet['user_id'],
       'comment' => $cl_comment);
-    if (ttTimesheetHelper::disapproveTimesheet($fields)) {
+    if (!ttTimesheetHelper::markDisapproved($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendDisapprovedEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
-    } else
-      $err->add($i18n->get('error.db'));
+    }
   }
 }
 

From d71e36acc9393f7657dd3ab1fbb148c4bbf466c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 18:42:59 +0000
Subject: [PATCH 0770/1848] Added project filter on reports depending on
 selected client.

---
 WEB-INF/lib/ttClientHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/reports.tpl        | 77 +++++++++++++++++++++++++++-
 reports.php                          |  2 +
 4 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 02014f1f5..64eedb0a7 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -63,7 +63,7 @@ static function getClients() {
 
     $result = array();
 
-    $sql = "select id, name from tt_clients where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by upper(name)";
+    $sql = "select id, name, projects from tt_clients where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e4384ddb3..a83f58e3b 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.53.4826 | 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.53.4827 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 1358d29de..3b66c71f9 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -1,4 +1,28 @@
 <script>
+// We need a few arrays to populate project dropdown.
+// When client selection changes, the project dropdown must be re-populated with only relevant projects.
+// Format:
+// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
+// project_names[325] = "Time Tracker";   // Project name.
+
+// Prepare an array of project ids for clients.
+var project_ids = new Array();
+{foreach $client_list as $client}
+  project_ids[{$client.id}] = "{$client.projects}";
+{/foreach}
+// Prepare an array of project names.
+var project_names = new Array();
+{foreach $project_list as $project}
+  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
+{/foreach}
+// We'll use this array to populate project dropdown when client is not selected.
+var idx = 0;
+var projects = new Array();
+{foreach $project_list as $project}
+  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
+  idx++;
+{/foreach}
+
 // We need a couple of array-like objects, one for associated task ids, another for task names.
 // For performance, and because associated arrays are frowned upon in JavaScript, we'll use a simple object
 // with properties for project tasks. Format:
@@ -27,8 +51,7 @@ var idx = 0;
   idx++;
 {/foreach}
 
-
-// empty_label is the mandatory top option in the tasks dropdown.
+// empty_label is the mandatory top option in dropdowns.
 empty_label = '{$i18n.dropdown.all|escape:'javascript'}';
 
 // inArray - determines whether needle is in haystack array.
@@ -40,6 +63,56 @@ function inArray(needle, haystack) {
   return false;
 }
 
+// The fillProjectDropdown function populates the project combo box with
+// projects associated with a selected client (client id is passed here as id).
+function fillProjectDropdown(id) {
+  var str_ids = project_ids[id];
+  var dropdown = document.getElementById("project");
+
+  // Determine previously selected item.
+  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+
+  // Remove existing content.
+  dropdown.length = 0;
+  var project_reset = true;
+  // Add mandatory top option.
+  dropdown.options[0] = new Option(empty_label, '', true);
+
+  // Populate project dropdown.
+  if (!id) {
+    // If we are here, client is not selected.
+    var len = projects.length;
+    for (var i = 0; i < len; i++) {
+      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
+      if (dropdown.options[i+1].value == selected_item)  {
+        dropdown.options[i+1].selected = true;
+        project_reset = false;
+      }
+    }
+  } else if (str_ids) {
+    var ids = new Array();
+    ids = str_ids.split(",");
+    var len = ids.length;
+
+    for (var i = 0; i < len; i++) {
+      var p_id = ids[i];
+      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
+      if (dropdown.options[i+1].value == selected_item)  {
+        dropdown.options[i+1].selected = true;
+        project_reset = false;
+      }
+    }
+  }
+
+  // If project selection was reset - clear the tasks dropdown.
+  if (project_reset) {
+    dropdown = document.getElementById("task");
+    dropdown.length = 0;
+    dropdown.options[0] = new Option(empty_label, '', true);
+  }
+}
+
+
 // The fillTaskDropdown function populates the task combo box with
 // tasks associated with a selected project_id.
 function fillTaskDropdown(project_id) {
diff --git a/reports.php b/reports.php
index fb74e16cc..958d88bc9 100644
--- a/reports.php
+++ b/reports.php
@@ -89,6 +89,7 @@
 }
 if ($showClient) {
   $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
     'style'=>'width: 250px;',
     'data'=>$client_list,
@@ -439,6 +440,7 @@
   }
 } // isPost
 
+$smarty->assign('client_list', $client_list);
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_cf_1_dropdown', $showCustomFieldDropdown);
 $smarty->assign('show_cf_1_checkbox', $showCustomFieldCheckbox);

From fff7786bd4be1a6de9b200a8b546493b9bb739e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 21:24:56 +0000
Subject: [PATCH 0771/1848] Added code to handle projects field in tt_clients
 on project deletion.

---
 WEB-INF/lib/ttClientHelper.class.php  | 47 +++++++++++++++++++++++++++
 WEB-INF/lib/ttProjectHelper.class.php |  5 ++-
 WEB-INF/templates/footer.tpl          |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 64eedb0a7..1974401cf 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -316,4 +316,51 @@ static function getClientsForUser()
     }
     return $result;
   }
+
+  // deleteProject - deletes a project from the projects field it tt_clients table
+  // for all clients in a group.
+  static function deleteProject($project_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_clients".
+      " where projects like '%$project_id%'".
+      " and group_id = $group_id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        if (!ttClientHelper::deleteProjectFromClient($project_id, $val['id']))
+          return false;
+      }
+    }
+    return true;
+  }
+
+  // deleteProject - deletes a project from the projects field in tt_clients table
+  // for a single client in a group.
+  static function deleteProjectFromClient($project_id, $client_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select projects from tt_clients".
+      " where id = $client_id and group_id = $group_id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    $val = $res->fetchRow();
+    $projects = explode(',', $val['projects']);
+    if (($key = array_search($project_id, $projects)) !== false) {
+      unset($projects[$key]);
+    }
+    $comma_separated = implode(',', $projects);
+    $sql = "update tt_clients set projects = ".$mdb2->quote($comma_separated).
+      " where id = $client_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 31a88ccc4..1bd363f97 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -28,6 +28,7 @@
 
 import('ttUserHelper');
 import('ttGroupHelper');
+import('ttClientHelper');
 
 // Class ttProjectHelper is used to help with project related tasks.
 class ttProjectHelper {
@@ -194,7 +195,9 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    return true;
+    // Finally, delete the project from the projects field in tt_clients table.
+    $result = ttClientHelper::deleteProject($id);
+    return $result;
   }
   
   // insert function inserts a new project into database.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a83f58e3b..4dd6c1721 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.53.4827 | 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.53.4828 | 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>

From c86692ad2fdb0bb7c1c0624eda8ed20054493d1d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Mar 2019 21:26:56 +0000
Subject: [PATCH 0772/1848] Cosmetic comment fix.

---
 WEB-INF/lib/ttClientHelper.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 1974401cf..7105595d8 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -339,7 +339,7 @@ static function deleteProject($project_id) {
     return true;
   }
 
-  // deleteProject - deletes a project from the projects field in tt_clients table
+  // deleteProjectFromClient - deletes a project from the projects field in tt_clients table
   // for a single client in a group.
   static function deleteProjectFromClient($project_id, $client_id) {
     global $user;

From 784c0088fb7f9892fdaf22374cd9ef98144afe12 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 6 Mar 2019 14:19:01 +0000
Subject: [PATCH 0773/1848] Translation files work.

---
 WEB-INF/resources/ca.lang.php    | 9 +++++++++
 WEB-INF/resources/cs.lang.php    | 9 +++++++++
 WEB-INF/resources/da.lang.php    | 9 +++++++++
 WEB-INF/resources/de.lang.php    | 9 +++++++++
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 9 +++++++++
 WEB-INF/resources/et.lang.php    | 9 +++++++++
 WEB-INF/resources/fa.lang.php    | 9 +++++++++
 WEB-INF/resources/fi.lang.php    | 9 +++++++++
 WEB-INF/resources/fr.lang.php    | 9 +++++++++
 WEB-INF/resources/gr.lang.php    | 9 +++++++++
 WEB-INF/resources/he.lang.php    | 9 +++++++++
 WEB-INF/resources/hu.lang.php    | 9 +++++++++
 WEB-INF/resources/it.lang.php    | 9 +++++++++
 WEB-INF/resources/ja.lang.php    | 9 +++++++++
 WEB-INF/resources/ko.lang.php    | 9 +++++++++
 WEB-INF/resources/nl.lang.php    | 9 +++++++++
 WEB-INF/resources/no.lang.php    | 9 +++++++++
 WEB-INF/resources/pl.lang.php    | 9 +++++++++
 WEB-INF/resources/pt-br.lang.php | 9 +++++++++
 WEB-INF/resources/pt.lang.php    | 9 +++++++++
 WEB-INF/resources/ro.lang.php    | 9 +++++++++
 WEB-INF/resources/ru.lang.php    | 8 ++++++++
 WEB-INF/resources/sk.lang.php    | 9 +++++++++
 WEB-INF/resources/sl.lang.php    | 9 +++++++++
 WEB-INF/resources/sr.lang.php    | 9 +++++++++
 WEB-INF/resources/sv.lang.php    | 9 +++++++++
 WEB-INF/resources/tr.lang.php    | 9 +++++++++
 WEB-INF/resources/zh-cn.lang.php | 9 +++++++++
 WEB-INF/resources/zh-tw.lang.php | 9 +++++++++
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 261 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 29c293a13..a8d551941 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -620,4 +620,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a1ea87123..b9f562da0 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -634,4 +634,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index e1179c620..e49710667 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -590,5 +590,14 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0cc35fcf2..76c85fda3 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -561,4 +561,13 @@
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'Administrator',
 'role.admin.description' => 'Aadminsitrator der Seite.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 18d87eecf..13be9f645 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -553,7 +553,6 @@
 'role.admin.description' => 'Site adminsitrator.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
-// TODO: improve wording, then fill in other translation files.
 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
 'form.timesheet_view.approve_subject' => 'Timesheet approved',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 58028ba52..ef92a0fa4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -635,4 +635,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 78971e76d..cc68eca36 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -589,4 +589,13 @@
 'role.admin.label' => 'Administraator',
 'role.admin.low_case_label' => 'administraator',
 'role.admin.description' => 'Rakenduse administraator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 789a64b94..f9af23aa9 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -613,4 +613,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 5fb4f2baf..3bfda4892 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -596,4 +596,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9911721ad..6a8268408 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -586,4 +586,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index eacfa1791..f208a8358 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -574,4 +574,13 @@
 'role.admin.label' => 'Διαχειριστής',
 'role.admin.low_case_label' => 'διαχειριστής',
 'role.admin.description' => 'Διαχειριστής δικτυακού τόπου.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d6bd794b8..d6a70b5d8 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -619,4 +619,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 2f0e2d5d0..b22abe5cd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -625,4 +625,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index a92ddd832..cb81e4232 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -588,4 +588,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 80373c038..606ddb8d5 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -628,4 +628,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 98c017e8e..97aae8d17 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -626,4 +626,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b6094b16c..beb93815a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -556,4 +556,13 @@
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
 'role.admin.description' => 'Time Tracker beheerder.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index bf2ff64d7..52eadf7bb 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -625,4 +625,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c471a0c0c..757487c4f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -599,4 +599,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 741e87fde..1307494a0 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -594,4 +594,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index bda088ea0..8a41ce200 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -607,4 +607,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 12c2a6818..ad3864c48 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -629,4 +629,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d43ae31c7..914524fd9 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -542,4 +542,12 @@
 'role.admin.label' => 'Администратор',
 'role.admin.low_case_label' => 'администратор',
 'role.admin.description' => 'Администратор сайта.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+'form.timesheet_view.submit_subject' => 'Запрос на одобрение табеля',
+'form.timesheet_view.submit_body' => "Появился новый табель для одобрения.<p>Пользователь: %s.",
+'form.timesheet_view.approve_subject' => 'Табель одобрен',
+'form.timesheet_view.approve_body' => "Ваш табель %s одобрен.<p>%s",
+'form.timesheet_view.disapprove_subject' => 'Табель не одобрен',
+'form.timesheet_view.disapprove_body' => "Ваш табель %s не одобрен.<p>%s",
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d3c847910..abe16abba 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -608,4 +608,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 88b5e8b71..8469366d6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -603,4 +603,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e49e1d080..7bcd41426 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -597,4 +597,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bcf5ee258..476ec4c50 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -594,4 +594,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 62f59f629..2f845d8db 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -642,4 +642,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index d3a3d9810..184b98a0e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -611,4 +611,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6c8f6c0e8..03e7cacc8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -619,4 +619,13 @@
 // 'role.admin.label' => 'Administrator',
 // 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+// TODO: translate the following.
+// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
+// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4dd6c1721..9da5ebd99 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.53.4828 | 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.53.4829 | 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>

From 2d7329ba9ee02d996db189a87d79a02a877dd924 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 6 Mar 2019 19:43:34 +0000
Subject: [PATCH 0774/1848] Prohibiting editing approved records.

---
 WEB-INF/lib/ttTimeHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/mobile/time.tpl  | 2 +-
 WEB-INF/templates/time.tpl         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index d2a356476..2a47c741e 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -738,7 +738,7 @@ static function getRecords($user_id, $date) {
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " l.billable, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9da5ebd99..ff57292b4 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.53.4829 | 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.53.4830 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index cde0b5ef1..a342c7641 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -25,7 +25,7 @@
         <td valign="top">{$record.project|escape}</td>
 {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-        <td align="center">{if $record.timesheet_id|| $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>{/if}</td>
+        <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>{/if}</td>
       </tr>
       {/foreach}
     </table>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index f82897d2a..a181b912e 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -130,7 +130,7 @@
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
         <td valign="top" align="center">
-    {if $record.timesheet_id || $record.invoice_id}
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
           <a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>

From 75f8d0ae1ade35bbe0b0efec6932cd55725ab152 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 6 Mar 2019 22:12:43 +0000
Subject: [PATCH 0775/1848] Better protection against editing and deleting
 approved records.

---
 WEB-INF/lib/ttTimeHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 mobile/time_delete.php             | 4 ++--
 mobile/time_edit.php               | 4 ++--
 time_delete.php                    | 4 ++--
 time_edit.php                      | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 2a47c741e..b2bb2c076 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -676,7 +676,7 @@ static function getRecord($id) {
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration,".
       " p.name as project_name, t.name as task_name, l.comment, l.client_id, l.project_id, l.task_id,".
-      " l.timesheet_id, l.invoice_id, l.billable, l.paid, l.date from tt_log l".
+      " l.timesheet_id, l.invoice_id, l.billable, l.approved, l.paid, l.date from tt_log l".
       " left join tt_projects p on (p.id = l.project_id)".
       " left join tt_tasks t on (t.id = l.task_id)".
       " where l.id = $id and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ff57292b4..08935c6d8 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.53.4830 | 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.53.4831 | 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/time_delete.php b/mobile/time_delete.php
index 1b122fb9e..a68da767a 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -39,8 +39,8 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id);
-if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
-  // Prohibit deleting not ours, or assigned to timesheet, or invoiced records.
+if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours, approved, assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 1f8f7de91..e81f693ca 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -41,8 +41,8 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id);
-if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
-  // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
+if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit editing not ours, approved, assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/time_delete.php b/time_delete.php
index e83630edf..a7b802b60 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -39,8 +39,8 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id);
-if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
-  // Prohibit deleting not ours, or assigned to timesheet, or invoiced records.
+if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours, approved, assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/time_edit.php b/time_edit.php
index 23cc63d5a..ef45226b8 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -41,8 +41,8 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id);
-if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
-  // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
+if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit editing not ours, approved, assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }

From a9b8fe4baec922f724f188e25d98f9e964e9ef26 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 02:25:15 +0000
Subject: [PATCH 0776/1848] Added what is it link explaining report approval.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 08935c6d8..180b9a8cd 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.53.4831 | 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.53.4832 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index a6436bf27..c686eaaf0 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -136,7 +136,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
-            <td><label for="approval">{$i18n.label.approval}</label></td>
+            <td><label for="approval">{$i18n.label.approval}</label> <a href="https://www.anuko.com/lp/tt_28.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>

From bf5a15e178435b96ea646ca7c3d7ca56a4f4be45 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 16:50:07 +0000
Subject: [PATCH 0777/1848] Prohibited editing approved expense items.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 5 +++--
 WEB-INF/templates/expenses.tpl        | 8 +++++++-
 WEB-INF/templates/footer.tpl          | 2 +-
 WEB-INF/templates/mobile/expenses.tpl | 8 +++++++-
 expense_delete.php                    | 4 ++--
 expense_edit.php                      | 4 ++--
 mobile/expense_delete.php             | 4 ++--
 mobile/expense_edit.php               | 4 ++--
 8 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 40a3e88f0..e7da92cbb 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -140,7 +140,8 @@ static function getItem($id) {
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
 
-    $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.paid $client_field, p.name as project_name".
+    $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.approved,".
+      " ei.paid $client_field, p.name as project_name".
       " from tt_expense_items ei $left_joins".
       " where ei.id = $id and ei.group_id = $group_id and ei.org_id = $org_id and ei.user_id = $user_id and ei.status = 1";
     $res = $mdb2->query($sql);
@@ -177,7 +178,7 @@ static function getItems($date) {
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
 
     $sql = "select ei.id as id $client_field, p.name as project, ei.name as item, ei.cost as cost,".
-      " ei.invoice_id from tt_expense_items ei $left_joins".
+      " ei.invoice_id, ei.approved from tt_expense_items ei $left_joins".
       " where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id".
       " and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1 order by ei.id";
 
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 45a8ef274..11b4fb85a 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -195,7 +195,13 @@ function recalculateCost() {
     {/if}
         <td valign="top">{$item.item|escape}</td>
         <td valign="top" align="right">{$item.cost}</td>
-        <td valign="top" align="center">{if $item.invoice_id}&nbsp;{else}<a href='expense_edit.php?id={$item.id}'>{$i18n.label.edit}</a>{/if}</td>
+        <td valign="top" align="center">
+    {if $item.approved || $item.invoice_id}
+          &nbsp;
+    {else}
+          <a href='expense_edit.php?id={$item.id}'>{$i18n.label.edit}</a>
+    {/if}
+        </td>
       </tr>
   {/foreach}
     </table>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 180b9a8cd..2c3676284 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.53.4832 | 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.53.4833 | 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/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
index a6aa66d99..7afde73d2 100644
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ b/WEB-INF/templates/mobile/expenses.tpl
@@ -203,7 +203,13 @@ function recalculateCost() {
     {if $show_project}
         <td valign="top">{$item.project|escape}</td>
     {/if}
-        <td valign="top">{if $item.invoice_id} {$item.item|escape} {else}<a href="expense_edit.php?id={$item.id}">{$item.item|escape}</a>{/if}</td>
+        <td valign="top">
+    {if $item.approved || $item.invoice_id}
+          {$item.item|escape}
+    {else}
+          <a href="expense_edit.php?id={$item.id}">{$item.item|escape}</a>
+    {/if}
+        </td>
         <td valign="top" align="right">{$item.cost}</td>
       </tr>
   {/foreach}
diff --git a/expense_delete.php b/expense_delete.php
index c7031769b..788fb59fa 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -43,8 +43,8 @@
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are deleting.
 $expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['invoice_id']) {
-  // Prohibit deleting not ours or invoiced items.
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit deleting not ours, approved, or invoiced items.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/expense_edit.php b/expense_edit.php
index b1115f1e3..877ec6638 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -45,8 +45,8 @@
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
 $expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['invoice_id']) {
-  // Prohibit editing not ours or invoiced items.
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit editing not ours, approved, or invoiced items.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index 3bdc179d4..48e74dc0e 100644
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -43,8 +43,8 @@
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are deleting.
 $expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['invoice_id']) {
-  // Prohibit deleting not ours or invoiced items.
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit deleting not ours, approved, or invoiced items.
   header('Location: access_denied.php');
   exit();
 }
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index e9e1ca63a..10035a9b4 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -45,8 +45,8 @@
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
 $expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['invoice_id']) {
-  // Prohibit editing not ours or invoiced items.
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit editing not ours, approved, or invoiced items.
   header('Location: access_denied.php');
   exit();
 }

From 89a5c1982ce74075e74a814c170e3d87563d5c47 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 17:54:49 +0000
Subject: [PATCH 0778/1848] Starting work on Templates plugin.

---
 WEB-INF/resources/en.lang.php | 1 +
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 6 ++++++
 plugins.php                   | 7 +++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 13be9f645..660e84486 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -318,6 +318,7 @@
 'title.week_view' => 'Week View',
 'title.swap_roles' => 'Swapping Roles',
 'title.work_units' => 'Work Units',
+'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2c3676284..2b35dcd45 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.53.4833 | 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.53.4834 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index c686eaaf0..34e7ab2b2 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -142,6 +142,12 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
             <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
           </tr>
+{if isTrue('TEMPLATES_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
+            <td><label for="templates">{$i18n.title.templates}</label></td>
+          </tr>
+{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/plugins.php b/plugins.php
index 0981cb77a..bf0e527f8 100644
--- a/plugins.php
+++ b/plugins.php
@@ -53,6 +53,7 @@
   $cl_work_units = $request->getParameter('work_units');
   $cl_approval = $request->getParameter('approval');
   $cl_timesheets = $request->getParameter('timesheets');
+  $cl_templates = $request->getParameter('templates');
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
@@ -72,6 +73,7 @@
   $cl_work_units = in_array('wu', $plugins);
   $cl_approval = in_array('ap', $plugins);
   $cl_timesheets = in_array('ts', $plugins);
+  $cl_templates = in_array('tp', $plugins);
 }
 
 $form = new Form('pluginsForm');
@@ -92,6 +94,9 @@
 $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'approval','value'=>$cl_approval));
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
+if (isTrue('TEMPLATES_DEBUG')) {
+  $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates));
+}
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -130,6 +135,8 @@
     $plugins .= ',ap';
   if ($cl_timesheets)
     $plugins .= ',ts';
+  if ($cl_templates)
+    $plugins .= ',tp';
 
   // Recycle week view plugin options as they are not configured on this page.
   $existing_plugins = explode(',', $user->getPlugins());

From fb0a15c54cf53b1ba342342e93502d0a2e814498 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 18:07:33 +0000
Subject: [PATCH 0779/1848] Added title.templates to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a8d551941..04de03b62 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -366,6 +366,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index b9f562da0..a9389a30e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -377,6 +377,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index e49710667..981982ce9 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -344,6 +344,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 76c85fda3..dbace500a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -326,6 +326,8 @@
 'title.week_view' => 'Wochenansicht',
 'title.swap_roles' => 'Tausche Rollen',
 'title.work_units' => 'Arbeitseinheiten',
+// TODO: translate the following.
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index ef92a0fa4..6b331febe 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -365,6 +365,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index cc68eca36..722844640 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -347,6 +347,8 @@
 'title.week_view' => 'Nädala vaade',
 'title.swap_roles' => 'Rollivahetus',
 'title.work_units' => 'Töö ühikud',
+// TODO: translate the following.
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f9af23aa9..27fcf6842 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -352,6 +352,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3bfda4892..f8892dd4f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -344,6 +344,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6a8268408..791e7bc23 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -338,6 +338,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f208a8358..802014493 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -334,6 +334,7 @@
 // TODO: translate the following.
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d6a70b5d8..568b78b22 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -364,6 +364,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b22abe5cd..98e9d5f10 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -365,6 +365,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index cb81e4232..1a15690fd 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -344,6 +344,7 @@
 'title.week_view' => 'Vista settimanale',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 606ddb8d5..b53cc6c0a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -372,6 +372,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 97aae8d17..f8b788587 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -373,6 +373,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index beb93815a..b8fb07434 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -321,6 +321,8 @@
 'title.week_view' => 'Week overzicht',
 'title.swap_roles' => 'Rollen verruilen',
 'title.work_units' => 'Werk eenheid',
+// TODO: translate the following.
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 52eadf7bb..2d60abf14 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -369,6 +369,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 757487c4f..040eed5ff 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -347,6 +347,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 1307494a0..c921471ac 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -342,6 +342,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8a41ce200..a0efbf042 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -353,6 +353,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index ad3864c48..f634d9435 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -372,6 +372,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 914524fd9..084d92274 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -315,6 +315,7 @@
 'title.week_view' => 'Неделя',
 'title.swap_roles' => 'Обмен ролей',
 'title.work_units' => 'Единицы работы',
+'title.templates' => 'Шаблоны',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index abe16abba..68aef000c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -353,6 +353,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8469366d6..16fa0cbbb 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -347,6 +347,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7bcd41426..07bb86e8b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -345,6 +345,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 476ec4c50..0f173e0b6 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -345,6 +345,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2f845d8db..33d451af0 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -381,6 +381,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 184b98a0e..5f7dbb8e4 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -360,6 +360,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 03e7cacc8..efd1596b5 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -367,6 +367,7 @@
 // 'title.week_view' => 'Week View',
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
+// 'title.templates' => 'Templates',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2b35dcd45..ec50618ea 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.53.4834 | 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.53.4835 | 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>

From 46e0b3a5bccdccb8301c99b6ba21697e186d4ea9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 18:48:27 +0000
Subject: [PATCH 0780/1848] Added a what is it link explaining templates.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ec50618ea..16f1bea80 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.53.4835 | 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.53.4836 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 34e7ab2b2..005c2e5f8 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -145,7 +145,7 @@ function handlePluginCheckboxes() {
 {if isTrue('TEMPLATES_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
-            <td><label for="templates">{$i18n.title.templates}</label></td>
+            <td><label for="templates">{$i18n.title.templates}</label> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
 {/if}
           <tr>

From 265754c2f6e9d016e7f58591f08fe4e97f96b05d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 19:21:27 +0000
Subject: [PATCH 0781/1848] Introduced tt_templates database table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    | 23 ++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 16f1bea80..7d6e22005 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.53.4836 | 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.54.4837 | 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/dbinstall.php b/dbinstall.php
index 65a6776da..c4eb1becf 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11851"]) {
+  if ($_POST["convert11797to11854"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1123,6 +1123,8 @@ function ttExecute($sql) {
     ttExecute("drop index timesheet_idx on tt_expense_items");
     ttExecute("ALTER TABLE `tt_expense_items` DROP `timesheet_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.51', modified = now() where param_name = 'version_db' and param_value = '1.18.50'");
+    ttExecute("CREATE TABLE `tt_templates` (`id` int(11) NOT NULL auto_increment,`group_id` int(11) default NULL,`org_id` int(11) default NULL,`name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`content` text,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(11) default NULL,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(11) default NULL,`status` tinyint(4) default 1,PRIMARY KEY  (`id`))");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.54', modified = now() where param_name = 'version_db' and param_value = '1.18.51'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1171,7 +1173,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.51)</b>
+    <td width="80%"><b>Create database structure (v1.18.54)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1216,8 +1218,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.51)</td>
-    <td><input type="submit" name="convert11797to11851" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.54)</td>
+    <td><input type="submit" name="convert11797to11854" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index bec26520c..8c38425c2 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -512,6 +512,27 @@ CREATE TABLE `tt_timesheets` (
 );
 
 
+#
+# Structure for table tt_templates.
+# This table keeps templates used in groups.
+#
+CREATE TABLE `tt_templates` (
+  `id` int(11) NOT NULL auto_increment,   # template id
+  `group_id` int(11) default NULL,        # group id
+  `org_id` int(11) default NULL,          # organization id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # template name
+  `content` text,                         # template content
+  `created` datetime default NULL,        # creation timestamp
+  `created_ip` varchar(45) default NULL,  # creator ip
+  `created_by` int(11) default NULL,      # creator user_id
+  `modified` datetime default NULL,       # modification timestamp
+  `modified_ip` varchar(45) default NULL, # modifier ip
+  `modified_by` int(11) default NULL,     # modifier user_id
+  `status` tinyint(4) default 1,          # template status
+  PRIMARY KEY  (`id`)
+);
+
+
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
@@ -525,4 +546,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.51', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.54', now()); # TODO: change when structure changes.

From 98f5feaaf9bbf59fcf6e797c6c05978ef13074f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Mar 2019 22:34:56 +0000
Subject: [PATCH 0782/1848] Work in progress on templates plugin.

---
 WEB-INF/lib/ttOrgHelper.class.php         |  1 +
 WEB-INF/templates/footer.tpl              |  2 +-
 WEB-INF/templates/plugins.tpl             | 12 ++++-
 WEB-INF/templates/predefined_expenses.tpl |  2 -
 WEB-INF/templates/templates.tpl           | 28 +++++++++++
 dbinstall.php                             |  1 +
 plugins.php                               |  2 +-
 templates.php                             | 61 +++++++++++++++++++++++
 8 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 WEB-INF/templates/templates.tpl
 create mode 100644 templates.php

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 461c751de..3145d1d7e 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -94,6 +94,7 @@ static function deleteOrg($org_id) {
       'tt_config',
       'tt_cron',
       'tt_fav_reports',
+      'tt_templates',
       'tt_monthly_quotas',
       'tt_predefined_expenses',
       'tt_expense_items',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7d6e22005..c60717662 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.54.4837 | 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.54.4838 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 005c2e5f8..affbcc192 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -82,6 +82,16 @@ function handlePluginCheckboxes() {
   } else {
     configureLabel.style.visibility = "hidden";
   }
+
+  var templatesCheckbox = document.getElementById("templates");
+  configureLabel = document.getElementById("templates_config");
+  if (templatesCheckbox.checked){
+    configureLabel.style.display = "";
+    //configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.display = "none";
+    //configureLabel.style.visibility = "hidden";
+  }
 }
 </script>
 
@@ -145,7 +155,7 @@ function handlePluginCheckboxes() {
 {if isTrue('TEMPLATES_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
-            <td><label for="templates">{$i18n.title.templates}</label> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
 {/if}
           <tr>
diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
index 147230dc5..9c8625c77 100644
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -2,7 +2,6 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->can('manage_advanced_settings')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
@@ -25,7 +24,6 @@
       <table width="100%">
         <tr><td align="center"><br>{$forms.predefinedExpensesForm.btn_add.control}</td></tr>
       </table>
-{/if}
     </td>
   </tr>
 </table>
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
new file mode 100644
index 000000000..a1ea3496e
--- /dev/null
+++ b/WEB-INF/templates/templates.tpl
@@ -0,0 +1,28 @@
+{$forms.templatesForm.open}
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
+        </tr>
+  {if $templates}
+    {foreach $templates as $template}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$template_expense['name']|escape}</td>
+          <td><a href="template_edit.php?id={$template['id']}">{$i18n.label.edit}</a></td>
+          <td><a href="template_delete.php?id={$template['id']}">{$i18n.label.delete}</a></td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+
+      <table width="100%">
+        <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.templatesForm.close}
diff --git a/dbinstall.php b/dbinstall.php
index c4eb1becf..358f6f025 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1152,6 +1152,7 @@ function ttExecute($sql) {
     ttExecute("OPTIMIZE TABLE tt_invoices");
     ttExecute("OPTIMIZE TABLE tt_log");
     ttExecute("OPTIMIZE TABLE tt_monthly_quotas");
+    ttExecute("OPTIMIZE TABLE tt_templates");
     ttExecute("OPTIMIZE TABLE tt_predefined_expenses");
     ttExecute("OPTIMIZE TABLE tt_project_task_binds");
     ttExecute("OPTIMIZE TABLE tt_projects");
diff --git a/plugins.php b/plugins.php
index bf0e527f8..e20bb9617 100644
--- a/plugins.php
+++ b/plugins.php
@@ -95,7 +95,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'approval','value'=>$cl_approval));
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
 if (isTrue('TEMPLATES_DEBUG')) {
-  $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates));
+  $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
 }
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
diff --git a/templates.php b/templates.php
new file mode 100644
index 000000000..e2d0e7791
--- /dev/null
+++ b/templates.php
@@ -0,0 +1,61 @@
+<?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('ttGroupHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('tp')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$form = new Form('templatesForm');
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_add')) {
+    // The Add button clicked. Redirect to template_add.php page.
+    header('Location: template_add.php');
+    exit();
+  }
+} else {
+  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+  $predefinedExpenses = ttGroupHelper::getPredefinedExpenses();
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('predefined_expenses', $predefinedExpenses);
+$smarty->assign('title', $i18n->get('title.templates'));
+$smarty->assign('content_page_name', 'templates.tpl');
+$smarty->display('index.tpl');

From 295a9e2e600768af193e7b199dd86bd1f2d1fecb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 14:50:14 +0000
Subject: [PATCH 0783/1848] Added description field to tt_templates.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c60717662..180c7671a 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.54.4838 | 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.55.4839 | 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/dbinstall.php b/dbinstall.php
index 358f6f025..7ecf75c4e 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11854"]) {
+  if ($_POST["convert11797to11855"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1125,6 +1125,8 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.51', modified = now() where param_name = 'version_db' and param_value = '1.18.50'");
     ttExecute("CREATE TABLE `tt_templates` (`id` int(11) NOT NULL auto_increment,`group_id` int(11) default NULL,`org_id` int(11) default NULL,`name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`content` text,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(11) default NULL,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(11) default NULL,`status` tinyint(4) default 1,PRIMARY KEY  (`id`))");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.54', modified = now() where param_name = 'version_db' and param_value = '1.18.51'");
+    ttExecute("ALTER TABLE `tt_templates` ADD `description` varchar(255) default NULL AFTER `name`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.55', modified = now() where param_name = 'version_db' and param_value = '1.18.54'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1174,7 +1176,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.54)</b>
+    <td width="80%"><b>Create database structure (v1.18.55)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1219,8 +1221,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.54)</td>
-    <td><input type="submit" name="convert11797to11854" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.55)</td>
+    <td><input type="submit" name="convert11797to11855" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 8c38425c2..eea348c03 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -521,6 +521,7 @@ CREATE TABLE `tt_templates` (
   `group_id` int(11) default NULL,        # group id
   `org_id` int(11) default NULL,          # organization id
   `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # template name
+  `description` varchar(255) default NULL,         # template description
   `content` text,                         # template content
   `created` datetime default NULL,        # creation timestamp
   `created_ip` varchar(45) default NULL,  # creator ip
@@ -546,4 +547,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.54', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.55', now()); # TODO: change when structure changes.

From fc92f9cd36dcaeb96da37c699a61331805d9e2fc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 15:13:42 +0000
Subject: [PATCH 0784/1848] Work in progress on templates plugin.

---
 WEB-INF/resources/ca.lang.php      |  3 ++
 WEB-INF/resources/cs.lang.php      |  3 ++
 WEB-INF/resources/da.lang.php      |  3 ++
 WEB-INF/resources/de.lang.php      |  3 ++
 WEB-INF/resources/en.lang.php      |  3 ++
 WEB-INF/resources/es.lang.php      |  3 ++
 WEB-INF/resources/et.lang.php      |  3 ++
 WEB-INF/resources/fa.lang.php      |  3 ++
 WEB-INF/resources/fi.lang.php      |  3 ++
 WEB-INF/resources/fr.lang.php      |  3 ++
 WEB-INF/resources/gr.lang.php      |  3 ++
 WEB-INF/resources/he.lang.php      |  3 ++
 WEB-INF/resources/hu.lang.php      |  3 ++
 WEB-INF/resources/it.lang.php      |  3 ++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/template_add.tpl | 26 +++++++++++
 WEB-INF/templates/templates.tpl    |  4 +-
 template_add.php                   | 72 ++++++++++++++++++++++++++++++
 18 files changed, 144 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/template_add.tpl
 create mode 100644 template_add.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 04de03b62..07d4e8152 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -367,6 +367,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a9389a30e..27494aec7 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -378,6 +378,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 981982ce9..f4fd9c537 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -345,6 +345,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index dbace500a..dcd666a4a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -328,6 +328,9 @@
 'title.work_units' => 'Arbeitseinheiten',
 // TODO: translate the following.
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 660e84486..7fb968f9e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -319,6 +319,9 @@
 'title.swap_roles' => 'Swapping Roles',
 'title.work_units' => 'Work Units',
 'title.templates' => 'Templates',
+'title.add_template' => 'Adding Template',
+'title.edit_template' => 'Editing Template',
+'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 6b331febe..b31ec28eb 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -366,6 +366,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 722844640..c4c4cebd6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -349,6 +349,9 @@
 'title.work_units' => 'Töö ühikud',
 // TODO: translate the following.
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 27fcf6842..6632b7ebf 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -353,6 +353,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f8892dd4f..68d167fa3 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -345,6 +345,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 791e7bc23..807006f00 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -339,6 +339,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 802014493..d5dde2900 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -335,6 +335,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 568b78b22..bd4f06b63 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -365,6 +365,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 98e9d5f10..c35fb70ad 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -366,6 +366,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1a15690fd..bb28e972f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -345,6 +345,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 180c7671a..72f5079bf 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.55.4839 | 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.55.4840 | 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/template_add.tpl b/WEB-INF/templates/template_add.tpl
new file mode 100644
index 000000000..fd2983a70
--- /dev/null
+++ b/WEB-INF/templates/template_add.tpl
@@ -0,0 +1,26 @@
+{$forms.predefinedExpenseForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.predefinedExpenseForm.name.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.cost} (*):</td>
+          <td>{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
+        </tr>
+        <tr>
+          <td height="40"></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.predefinedExpenseForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.predefinedExpenseForm.close}
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index a1ea3496e..177f32cf3 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -5,13 +5,15 @@
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
   {if $templates}
     {foreach $templates as $template}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$template_expense['name']|escape}</td>
+          <td>{$template['name']|escape}</td>
+          <td>{$template['description']|escape}</td>
           <td><a href="template_edit.php?id={$template['id']}">{$i18n.label.edit}</a></td>
           <td><a href="template_delete.php?id={$template['id']}">{$i18n.label.delete}</a></td>
         </tr>
diff --git a/template_add.php b/template_add.php
new file mode 100644
index 000000000..606ea9f71
--- /dev/null
+++ b/template_add.php
@@ -0,0 +1,72 @@
+<?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('ttTemplateHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('tp')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_cost = trim($request->getParameter('cost'));
+}
+
+$form = new Form('predefinedExpenseForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
+  if ($err->no()) {
+    if (ttPredefinedExpenseHelper::insert(array(
+        'name' => $cl_name,
+        'cost' => $cl_cost))) {
+        header('Location: predefined_expenses.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.add_template'));
+$smarty->assign('content_page_name', 'predefined_expense_add.tpl');
+$smarty->display('index.tpl');

From 5bbe544e3d2db9b79e5ea413e7994dcf0859f5f4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 15:28:24 +0000
Subject: [PATCH 0785/1848] Added strings to translation files for templates
 plugin.

---
 WEB-INF/resources/ja.lang.php    | 3 +++
 WEB-INF/resources/ko.lang.php    | 3 +++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 3 +++
 WEB-INF/resources/pl.lang.php    | 3 +++
 WEB-INF/resources/pt-br.lang.php | 3 +++
 WEB-INF/resources/pt.lang.php    | 3 +++
 WEB-INF/resources/ro.lang.php    | 3 +++
 WEB-INF/resources/ru.lang.php    | 3 +++
 WEB-INF/resources/sk.lang.php    | 3 +++
 WEB-INF/resources/sl.lang.php    | 3 +++
 WEB-INF/resources/sr.lang.php    | 3 +++
 WEB-INF/resources/sv.lang.php    | 3 +++
 WEB-INF/resources/tr.lang.php    | 3 +++
 WEB-INF/resources/zh-cn.lang.php | 3 +++
 WEB-INF/resources/zh-tw.lang.php | 3 +++
 WEB-INF/templates/footer.tpl     | 2 +-
 17 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b53cc6c0a..7ea3b8be2 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -373,6 +373,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f8b788587..efae79032 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -374,6 +374,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b8fb07434..6c2135015 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -323,6 +323,9 @@
 'title.work_units' => 'Werk eenheid',
 // TODO: translate the following.
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2d60abf14..6a2c41b97 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -370,6 +370,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 040eed5ff..7668e51e4 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -348,6 +348,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index c921471ac..0294451fc 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -343,6 +343,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a0efbf042..d13822d9e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -354,6 +354,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f634d9435..db8ba288c 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -373,6 +373,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 084d92274..61d033e24 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -316,6 +316,9 @@
 'title.swap_roles' => 'Обмен ролей',
 'title.work_units' => 'Единицы работы',
 'title.templates' => 'Шаблоны',
+'title.add_template' => 'Добавление шаблона',
+'title.edit_template' => 'Редактирование шаблона',
+'title.delete_template' => 'Удаление шаблона',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 68aef000c..9254908c7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -354,6 +354,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 16fa0cbbb..8f29d0e6c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -348,6 +348,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 07bb86e8b..867491b1b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -346,6 +346,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0f173e0b6..b4c40c9db 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -346,6 +346,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 33d451af0..a7d1e1540 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -382,6 +382,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5f7dbb8e4..58ba2c44c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -361,6 +361,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index efd1596b5..79b719d0a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -368,6 +368,9 @@
 // 'title.swap_roles' => 'Swapping Roles',
 // 'title.work_units' => 'Work Units',
 // 'title.templates' => 'Templates',
+// 'title.add_template' => 'Adding Template',
+// 'title.edit_template' => 'Editing Template',
+// 'title.delete_template' => 'Deleting Template',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 72f5079bf..0d65482e6 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.55.4840 | 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.55.4841 | 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>

From 4a3754f39ede85db41f93f31bd82c516ce23e01a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 15:50:21 +0000
Subject: [PATCH 0786/1848] Work in progress on template_add.php.

---
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/template_add.tpl | 16 ++++++++++------
 template_add.php                   | 22 ++++++++++++++--------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7fb968f9e..eddafc936 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -237,6 +237,7 @@
 'label.approved' => 'Approved',
 'label.approval' => 'Report approval',
 'label.mark_approved' => 'Mark approved',
+'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0d65482e6..cb6766ddd 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.55.4841 | 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.55.4842 | 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/template_add.tpl b/WEB-INF/templates/template_add.tpl
index fd2983a70..2a52cec32 100644
--- a/WEB-INF/templates/template_add.tpl
+++ b/WEB-INF/templates/template_add.tpl
@@ -1,15 +1,19 @@
-{$forms.predefinedExpenseForm.open}
+{$forms.templateForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.predefinedExpenseForm.name.control}</td>
+          <td>{$forms.templateForm.name.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
+          <td align="right">{$i18n.label.description}:</td>
+          <td>{$forms.templateForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.template} (*):</td>
+          <td>{$forms.templateForm.content.control}</td>
         </tr>
         <tr>
           <td height="40"></td>
@@ -17,10 +21,10 @@
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
-          <td colspan="2" align="center" height="50">{$forms.predefinedExpenseForm.btn_add.control}</td>
+          <td colspan="2" align="center" height="50">{$forms.templateForm.btn_add.control}</td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
-{$forms.predefinedExpenseForm.close}
+{$forms.templateForm.close}
diff --git a/template_add.php b/template_add.php
index 606ea9f71..4fed72d55 100644
--- a/template_add.php
+++ b/template_add.php
@@ -43,23 +43,29 @@
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
-  $cl_cost = trim($request->getParameter('cost'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_content = trim($request->getParameter('content'));
 }
 
-$form = new Form('predefinedExpenseForm');
+$form = new Form('templateForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'content','style'=>'width: 250px; height: 80px;','value'=>$cl_content));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_content)) $err->add($i18n->get('error.field'), $i18n->get('label.template'));
+  // Finished validating user input.
+
   if ($err->no()) {
-    if (ttPredefinedExpenseHelper::insert(array(
+    if (ttTemplateHelper::insert(array(
         'name' => $cl_name,
-        'cost' => $cl_cost))) {
-        header('Location: predefined_expenses.php');
+        'description' => $cl_description,
+        'coontent' => $cl_content))) {
+        header('Location: templates.php');
         exit();
       } else
         $err->add($i18n->get('error.db'));
@@ -68,5 +74,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_template'));
-$smarty->assign('content_page_name', 'predefined_expense_add.tpl');
+$smarty->assign('content_page_name', 'template_add.tpl');
 $smarty->display('index.tpl');

From 163beaf9eb740a868fc08e0d8361ac72c932185c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 16:05:24 +0000
Subject: [PATCH 0787/1848] Added label.template to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 07d4e8152..56c6afec6 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -271,6 +271,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 27494aec7..9d28b7865 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -281,6 +281,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f4fd9c537..1cc5e12a7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -259,6 +259,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index dcd666a4a..bf076ba11 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -247,6 +247,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b31ec28eb..75236792d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -274,6 +274,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c4c4cebd6..f80c9033f 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -262,6 +262,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 6632b7ebf..9c63333a8 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -269,6 +269,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 68d167fa3..0ea4e7575 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -263,6 +263,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 807006f00..d189cea80 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -257,6 +257,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d5dde2900..202da58cc 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -250,6 +250,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index bd4f06b63..ad3fab930 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -280,6 +280,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c35fb70ad..5d90ea16d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -276,6 +276,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index bb28e972f..ca031b8c0 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -254,6 +254,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7ea3b8be2..1d2d12cc6 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -281,6 +281,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index efae79032..42213851e 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -281,6 +281,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 6c2135015..d0be88edc 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -240,6 +240,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6a2c41b97..a9354bfc8 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -278,6 +278,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 7668e51e4..4500070b1 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -264,6 +264,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 0294451fc..b10533506 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -261,6 +261,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d13822d9e..0466b3290 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -266,6 +266,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index db8ba288c..4d6504bba 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -278,6 +278,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 61d033e24..e21252eb0 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -236,6 +236,7 @@
 'label.approved' => 'Одобрено',
 'label.approval' => 'Одобрение отчётов',
 'label.mark_approved' => 'Отметить одобрение',
+'label.template' => 'Шаблон',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 9254908c7..e1ccbc4d7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -269,6 +269,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8f29d0e6c..769c22ed1 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -261,6 +261,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 867491b1b..66479467d 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -262,6 +262,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b4c40c9db..42ef84524 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -258,6 +258,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a7d1e1540..1d6ed7020 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -285,6 +285,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 58ba2c44c..e5ede5ddc 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -269,6 +269,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 79b719d0a..58ad8fd0a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -276,6 +276,7 @@
 // 'label.approved' => 'Approved',
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
+// 'label.template' => 'Template',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cb6766ddd..11597100c 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.55.4842 | 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.55.4843 | 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>

From 18ad12139f489cfc5a0721e68b2b3e6aa0175b89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 16:30:13 +0000
Subject: [PATCH 0788/1848] Implemented template add.

---
 WEB-INF/lib/ttTemplateHelper.class.php | 113 +++++++++++++++++++++++++
 template_add.php                       |   4 +-
 2 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/lib/ttTemplateHelper.class.php

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
new file mode 100644
index 000000000..e2e565a39
--- /dev/null
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -0,0 +1,113 @@
+<?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
+// +----------------------------------------------------------------------+
+
+
+// Class ttTemplateHelper is used to help with template related tasks.
+class ttTemplateHelper {
+
+  // get - gets template details.
+  static function get($id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description, content from tt_templates".
+      " where id = $id and group_id = $group_id and org_id = $org_id".
+      " and status is not null";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val) {
+        return $val;
+      }
+    }
+    return false;
+  }
+
+  // delete - marks a template as deleted in tt_templates table in database.
+  static function delete($id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "update from tt_templates set status = null".
+      " where id = $id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    return true;
+  }
+
+  // insert function inserts a new template into database.
+  static function insert($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $name = $fields['name'];
+    $description = $fields['description'];
+    $content = $fields['content'];
+
+    $sql = "insert into tt_templates (group_id, org_id, name, description, content)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).
+      ", ".$mdb2->quote($description).", ".$mdb2->quote($content).")";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    return true;
+  }
+
+  // update function - updates a template in database.
+  static function update($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $template_id = (int) $fields['id'];
+    $name = $fields['name'];
+    $description = $fields['description'];
+    $content = $fields['content'];
+
+    $sql = "update tt_templates set name = ".$mdb2->quote($name).
+      ", description = ".$mdb2->quote($description).
+      ", content = ".$mdb2->quote($content).
+      " where id = $template_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+}
diff --git a/template_add.php b/template_add.php
index 4fed72d55..6fb0238e4 100644
--- a/template_add.php
+++ b/template_add.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-// import('ttTemplateHelper');
+import('ttTemplateHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_advanced_settings')) {
@@ -64,7 +64,7 @@
     if (ttTemplateHelper::insert(array(
         'name' => $cl_name,
         'description' => $cl_description,
-        'coontent' => $cl_content))) {
+        'content' => $cl_content))) {
         header('Location: templates.php');
         exit();
       } else

From acd436b6c7d3bc585bb3841d4d69dbe15cd8d140 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 16:54:19 +0000
Subject: [PATCH 0789/1848] Work in progress on templates.php.

---
 WEB-INF/lib/ttGroupHelper.class.php | 42 +++++++++++++++++++++++++++++
 WEB-INF/resources/en.lang.php       |  4 +++
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/templates.tpl     |  7 +++--
 templates.php                       |  6 +++--
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 762fffb69..251fb9e71 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -518,6 +518,48 @@ static function getInactiveTasks()
     return $result;
   }
 
+  // getActiveTemplates - returns an array of active templates for a group.
+  static function getActiveTemplates()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description from tt_templates".
+      " where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // getInactiveTemplates - returns an array of active templates for a group.
+  static function getInactiveTemplates()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description from tt_templates".
+      " where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // validateCheckboxGroupInput - validates user input in a group of checkboxes
   // in context of a specific database table.
   //
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index eddafc936..db04f8181 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -425,6 +425,10 @@
 'form.timesheets.active_timesheets' => 'Active Timesheets',
 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+ // Templates form. See example at https://timetracker.anuko.com/templates.php
+'form.templates.active_templates' => 'Active Templates',
+'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Invoice number',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 11597100c..e693b467f 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.55.4843 | 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.55.4844 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index 177f32cf3..0e8f220a9 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -3,14 +3,17 @@
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
+{if $inactive_templates}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
+{/if}
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
-  {if $templates}
-    {foreach $templates as $template}
+  {if $active_templates}
+    {foreach $active_templates as $template}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
diff --git a/templates.php b/templates.php
index e2d0e7791..6bf6ae393 100644
--- a/templates.php
+++ b/templates.php
@@ -51,11 +51,13 @@
   }
 } else {
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $predefinedExpenses = ttGroupHelper::getPredefinedExpenses();
+  $activeTemplates = ttGroupHelper::getActiveTemplates();
+  $inactiveTemplates = ttGroupHelper::getInactiveTemplates();
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('predefined_expenses', $predefinedExpenses);
+$smarty->assign('active_templates', $activeTemplates);
+$smarty->assign('inactive_templates', $inactiveTemplates);
 $smarty->assign('title', $i18n->get('title.templates'));
 $smarty->assign('content_page_name', 'templates.tpl');
 $smarty->display('index.tpl');

From 124f501c2f54e9480401ed46bd1986e10cc3afc3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 17:26:59 +0000
Subject: [PATCH 0790/1848] Added 2 more template strings in translation files.

---
 WEB-INF/resources/ca.lang.php    | 5 +++++
 WEB-INF/resources/cs.lang.php    | 5 +++++
 WEB-INF/resources/da.lang.php    | 5 +++++
 WEB-INF/resources/de.lang.php    | 5 +++++
 WEB-INF/resources/es.lang.php    | 5 +++++
 WEB-INF/resources/et.lang.php    | 5 +++++
 WEB-INF/resources/fa.lang.php    | 5 +++++
 WEB-INF/resources/fi.lang.php    | 5 +++++
 WEB-INF/resources/fr.lang.php    | 5 +++++
 WEB-INF/resources/gr.lang.php    | 5 +++++
 WEB-INF/resources/he.lang.php    | 5 +++++
 WEB-INF/resources/hu.lang.php    | 5 +++++
 WEB-INF/resources/it.lang.php    | 5 +++++
 WEB-INF/resources/ja.lang.php    | 5 +++++
 WEB-INF/resources/ko.lang.php    | 5 +++++
 WEB-INF/resources/nl.lang.php    | 5 +++++
 WEB-INF/resources/no.lang.php    | 5 +++++
 WEB-INF/resources/pl.lang.php    | 5 +++++
 WEB-INF/resources/pt-br.lang.php | 5 +++++
 WEB-INF/resources/pt.lang.php    | 5 +++++
 WEB-INF/resources/ro.lang.php    | 5 +++++
 WEB-INF/resources/ru.lang.php    | 4 ++++
 WEB-INF/resources/sk.lang.php    | 5 +++++
 WEB-INF/resources/sl.lang.php    | 5 +++++
 WEB-INF/resources/sr.lang.php    | 5 +++++
 WEB-INF/resources/sv.lang.php    | 5 +++++
 WEB-INF/resources/tr.lang.php    | 5 +++++
 WEB-INF/resources/zh-cn.lang.php | 5 +++++
 WEB-INF/resources/zh-tw.lang.php | 5 +++++
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 56c6afec6..df7dda5e9 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -476,6 +476,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Número de factura',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9d28b7865..1d71ad365 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -486,6 +486,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Faktura číslo',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 1cc5e12a7..87e34ae71 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -452,6 +452,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fakturanummer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index bf076ba11..1366c546f 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -433,6 +433,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Rechnungsnummer',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 75236792d..d880f13b0 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -489,6 +489,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Número de factura',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f80c9033f..c3b956939 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -458,6 +458,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Arve number',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9c63333a8..7bd1d9cfe 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -472,6 +472,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'شماره فاکتور',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 0ea4e7575..9117f62ac 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -457,6 +457,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Laskun numero',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d189cea80..595b448d2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -449,6 +449,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numéro de facture',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 202da58cc..9ef0b9778 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -441,6 +441,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Αριθμός τιμολογίου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ad3fab930..bbe807887 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -479,6 +479,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'מספר חשבונית',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5d90ea16d..2286ddfff 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -480,6 +480,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Számla azonosító száma',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ca031b8c0..691dc8b7b 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -454,6 +454,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numero fattura',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 1d2d12cc6..ed89e4f0f 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -485,6 +485,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '送り状の番号',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 42213851e..505c152d2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -483,6 +483,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '송장 번호',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index d0be88edc..fdd291ecb 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -429,6 +429,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Factuur nummer',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a9354bfc8..4bef367f9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -481,6 +481,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fakturanummer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4500070b1..8e80c7536 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -460,6 +460,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numer faktury',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b10533506..b556bed71 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -455,6 +455,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Número da fatura',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 0466b3290..85478953b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -461,6 +461,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 4d6504bba..24230219a 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -484,6 +484,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Numar factura',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e21252eb0..929e2b2e2 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -416,6 +416,10 @@
 'form.timesheets.active_timesheets' => 'Активные табели',
 'form.timesheets.inactive_timesheets' => 'Неактивные табели',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+'form.templates.active_templates' => 'Активные шаблоны',
+'form.templates.inactive_templates' => 'Неактивные шаблоны',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Номер счёта',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e1ccbc4d7..dde834a24 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -468,6 +468,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Číslo faktúry',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 769c22ed1..1e742abcb 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -458,6 +458,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 66479467d..9cc76d70a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -458,6 +458,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Broj računa',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 42ef84524..0c5fbb4b1 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -456,6 +456,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fakturanummer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1d6ed7020..c7a3191c9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -496,6 +496,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Fatura numarası',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e5ede5ddc..1fdd32d06 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -468,6 +468,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '发票号码',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 58ad8fd0a..5ca967e4e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -476,6 +476,11 @@
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+// Templates form. See example at https://timetracker.anuko.com/templates.php
+// TODO: translate the following.
+// 'form.templates.active_templates' => 'Active Templates',
+// 'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => '發票號碼',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e693b467f..6a9ecb567 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.55.4844 | 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.55.4845 | 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>

From a6cc5ba9a2fb7a945f9754e9d07a8c0ac52698c3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 17:54:42 +0000
Subject: [PATCH 0791/1848] Work in progress on template edit.

---
 WEB-INF/templates/template_edit.tpl | 34 +++++++++++
 template_edit.php                   | 95 +++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 WEB-INF/templates/template_edit.tpl
 create mode 100644 template_edit.php

diff --git a/WEB-INF/templates/template_edit.tpl b/WEB-INF/templates/template_edit.tpl
new file mode 100644
index 000000000..6f3e406f8
--- /dev/null
+++ b/WEB-INF/templates/template_edit.tpl
@@ -0,0 +1,34 @@
+{$forms.templateForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.templateForm.name.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.description}:</td>
+          <td>{$forms.templateForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.template} (*):</td>
+          <td>{$forms.templateForm.content.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.templateForm.status.control}</td>
+        </tr>
+        <tr>
+          <td height="40"></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.templateForm.btn_submit.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.templateForm.close}
diff --git a/template_edit.php b/template_edit.php
new file mode 100644
index 000000000..90e5f5655
--- /dev/null
+++ b/template_edit.php
@@ -0,0 +1,95 @@
+<?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('ttTemplateHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('tp')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_template_id = (int) $request->getParameter('id');
+$template = ttTemplateHelper::get($cl_template_id);
+if (!$template) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_content = trim($request->getParameter('content'));
+  $cl_status = $request->getParameter('status');
+} else {
+  $cl_name = $template['name'];
+  $cl_description = $template['description'];
+  $cl_content = $template['content'];
+  $cl_status = $template['status'];
+}
+
+$form = new Form('templateForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_template_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'content','style'=>'width: 250px; height: 80px;','value'=>$cl_content));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_content)) $err->add($i18n->get('error.field'), $i18n->get('label.template'));
+  // Finished validating user input.
+
+  if ($err->no()) {
+    if (ttTemplateHelper::update(array(
+        'id' => $cl_template_id,
+        'name' => $cl_name,
+        'description' => $cl_description,
+        'content' => $cl_content,
+        'status' => $cl_status))) {
+        header('Location: templates.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_template'));
+$smarty->assign('content_page_name', 'template_edit.tpl');
+$smarty->display('index.tpl');

From 6e2b1ec1880cebedef5a1ca380820ad0d40d06a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 19:46:07 +0000
Subject: [PATCH 0792/1848] Some fixes to templates.php.

---
 WEB-INF/lib/ttTemplateHelper.class.php |  4 +++-
 WEB-INF/templates/templates.tpl        | 33 ++++++++++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index e2e565a39..d6eefcde8 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -38,7 +38,7 @@ static function get($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, content from tt_templates".
+    $sql = "select id, name, description, content, status from tt_templates".
       " where id = $id and group_id = $group_id and org_id = $org_id".
       " and status is not null";
     $res = $mdb2->query($sql);
@@ -102,10 +102,12 @@ static function update($fields) {
     $name = $fields['name'];
     $description = $fields['description'];
     $content = $fields['content'];
+    $status = (int) $fields['status'];
 
     $sql = "update tt_templates set name = ".$mdb2->quote($name).
       ", description = ".$mdb2->quote($description).
       ", content = ".$mdb2->quote($content).
+      ", status = ".$status.
       " where id = $template_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index 0e8f220a9..c1a8d5b4b 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -7,12 +7,11 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
 {/if}
         <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
+          <td class="tableHeader" width="45%">{$i18n.label.description}</td>
+          <td class="tableHeader" width="5%">{$i18n.label.edit}</td>
+          <td class="tableHeader" width="5%">{$i18n.label.delete}</td>
         </tr>
-  {if $active_templates}
     {foreach $active_templates as $template}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
@@ -21,12 +20,32 @@
           <td><a href="template_delete.php?id={$template['id']}">{$i18n.label.delete}</a></td>
         </tr>
     {/foreach}
-  {/if}
       </table>
-
       <table width="100%">
         <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
       </table>
+{if $inactive_templates}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.inactive_tasks}</td></tr>
+        <tr>
+          <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
+          <td class="tableHeader" width="45%">{$i18n.label.description}</td>
+          <td class="tableHeader" width="5%">{$i18n.label.edit}</td>
+          <td class="tableHeader" width="5%">{$i18n.label.delete}</td>
+        </tr>
+    {foreach $inactive_templates as $template}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$template['name']|escape}</td>
+          <td>{$template['description']|escape}</td>
+          <td><a href="template_edit.php?id={$template['id']}">{$i18n.label.edit}</a></td>
+          <td><a href="template_delete.php?id={$template['id']}">{$i18n.label.delete}</a></td>
+        </tr>
+    {/foreach}
+      </table>
+      <table width="100%">
+        <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
+      </table>
+{/if}
     </td>
   </tr>
 </table>

From 3b3e56c2f4e2a9624f0e25b1d5b0892a421a00bd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 19:56:41 +0000
Subject: [PATCH 0793/1848] Template editor done.

---
 WEB-INF/lib/ttTemplateHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/template_delete.tpl  | 18 +++++++
 template_delete.php                    | 75 ++++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/template_delete.tpl
 create mode 100644 template_delete.php

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index d6eefcde8..cc1818d29 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -59,7 +59,7 @@ static function delete($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "update from tt_templates set status = null".
+    $sql = "update tt_templates set status = null".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6a9ecb567..8b3fb0516 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.55.4845 | 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.55.4846 | 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/template_delete.tpl b/WEB-INF/templates/template_delete.tpl
new file mode 100644
index 000000000..2dc4114aa
--- /dev/null
+++ b/WEB-INF/templates/template_delete.tpl
@@ -0,0 +1,18 @@
+{$forms.templateDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$template_to_delete|escape}</b></td>
+        </tr>
+        <tr><td colspan="2" align="center">&nbsp;</td></tr>
+        <tr>
+          <td align="right">{$forms.templateDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.templateDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.templateDeleteForm.close}
diff --git a/template_delete.php b/template_delete.php
new file mode 100644
index 000000000..3eb34876e
--- /dev/null
+++ b/template_delete.php
@@ -0,0 +1,75 @@
+<?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('ttTemplateHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('tp')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_template_id = (int) $request->getParameter('id');
+$template = ttTemplateHelper::get($cl_template_id);
+if (!$template) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$template_to_delete = $template['name'];
+
+$form = new Form('templateDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_template_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if (ttTemplateHelper::delete($cl_template_id)) {
+      header('Location: templates.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: templates.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('template_to_delete', $template_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.templateDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_template'));
+$smarty->assign('content_page_name', 'template_delete.tpl');
+$smarty->display('index.tpl');

From 3d2723cd9a817f59b26a40f5b34281e0586ba1ca Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 22:09:00 +0000
Subject: [PATCH 0794/1848] Added a template selector on time.php.

---
 WEB-INF/lib/ttGroupHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/time.tpl          | 23 +++++++++++++++++++++++
 time.php                            | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 251fb9e71..b77edf21a 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -527,7 +527,7 @@ static function getActiveTemplates()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description from tt_templates".
+    $sql = "select id, name, description, content from tt_templates".
       " where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b3fb0516..26443eea7 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.55.4846 | 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.55.4847 | 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/time.tpl b/WEB-INF/templates/time.tpl
index a181b912e..fe9c294dc 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -1,5 +1,22 @@
 {include file="time_script.tpl"}
 
+{if $template_dropdown}
+<script>
+var templates = new Array();
+{foreach $templates as $template}
+  templates[{$template.id}] = "{$template.content|escape:'javascript'}";
+{/foreach}
+
+// The fillNote function populates the Note field with a selected template body.
+function fillNote(id) {
+  if (!id) return; // Do nothing.
+  var template_body = templates[id];
+  var note = document.getElementById("note");
+  note.value = template_body;
+}
+</script>
+{/if}
+
 <style>
 .not_billable td {
   color: #ff6666;
@@ -68,6 +85,12 @@
           <td align="right">{$i18n.label.duration}:</td>
           <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
         </tr>
+{/if}
+{if $template_dropdown}
+        <tr>
+          <td align="right">{$i18n.label.template}:</td>
+          <td>{$forms.timeRecordForm.template.control}</td>
+        </tr>
 {/if}
       </table>
     </td>
diff --git a/time.php b/time.php
index f7b1c12e7..dd219e8e7 100644
--- a/time.php
+++ b/time.php
@@ -249,6 +249,22 @@
   }
 }
 
+// If we have templates, add a dropdown to select one.
+if ($user->isPluginEnabled('tp')){
+  $templates = ttGroupHelper::getActiveTemplates();
+  if (count($templates) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillNote(this.value);',
+      'name'=>'template',
+      'style'=>'width: 250px;',
+      'data'=>$templates,
+      'datakeys'=>array('id','name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $smarty->assign('template_dropdown', 1);
+    $smarty->assign('templates', $templates);
+  }
+}
+
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {

From fe8af9a04f7170a0623915f31610c6c4c3df4058 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 22:42:28 +0000
Subject: [PATCH 0795/1848] Releasing templates plugin for testing.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 --
 time.php                      | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 26443eea7..b7c02c714 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.55.4847 | 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.56.4848 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index affbcc192..34c6fc22b 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -152,12 +152,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
             <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
           </tr>
-{if isTrue('TEMPLATES_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
             <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/time.php b/time.php
index dd219e8e7..4f0d5918b 100644
--- a/time.php
+++ b/time.php
@@ -304,6 +304,10 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
+      // A %req% element is found in note. They have to be replaced by user.
+      $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.
 

From eac99bcd2c6aa2da61f72151dc35fd418fb6cb89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 22:45:34 +0000
Subject: [PATCH 0796/1848] Removing use of TEMPLATES_DEBUG.

---
 WEB-INF/templates/footer.tpl | 2 +-
 plugins.php                  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b7c02c714..9647e858e 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.56.4848 | 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.56.4849 | 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/plugins.php b/plugins.php
index e20bb9617..5880aa377 100644
--- a/plugins.php
+++ b/plugins.php
@@ -94,9 +94,8 @@
 $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'approval','value'=>$cl_approval));
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
-if (isTrue('TEMPLATES_DEBUG')) {
-  $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
-}
+$form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
+
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 

From dac7b3b59c56d265e7ee630c10d8d5fe3614d399 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Mar 2019 15:37:52 +0000
Subject: [PATCH 0797/1848] Added template selector on time_edit.php.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/time.tpl        | 17 -----------------
 WEB-INF/templates/time_edit.tpl   |  6 ++++++
 WEB-INF/templates/time_script.tpl | 15 +++++++++++++++
 time_edit.php                     | 22 ++++++++++++++++++++++
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9647e858e..29660bf96 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.56.4849 | 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.56.4850 | 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/time.tpl b/WEB-INF/templates/time.tpl
index fe9c294dc..e0418eeb6 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -1,22 +1,5 @@
 {include file="time_script.tpl"}
 
-{if $template_dropdown}
-<script>
-var templates = new Array();
-{foreach $templates as $template}
-  templates[{$template.id}] = "{$template.content|escape:'javascript'}";
-{/foreach}
-
-// The fillNote function populates the Note field with a selected template body.
-function fillNote(id) {
-  if (!id) return; // Do nothing.
-  var template_body = templates[id];
-  var note = document.getElementById("note");
-  note.value = template_body;
-}
-</script>
-{/if}
-
 <style>
 .not_billable td {
   color: #ff6666;
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index bc563e9ea..66778e17d 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -77,6 +77,12 @@ function confirmSave() {
       <td align="right">{$i18n.label.date}:</td>
       <td>{$forms.timeRecordForm.date.control}</td>
     </tr>
+{if $template_dropdown}
+    <tr>
+      <td align="right">{$i18n.label.template}:</td>
+      <td>{$forms.timeRecordForm.template.control}</td>
+    </tr>
+{/if}
     <tr>
       <td align="right">{$i18n.label.note}:</td>
       <td>{$forms.timeRecordForm.note.control}</td>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 109f67ee8..3e8a02024 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -43,6 +43,21 @@ var task_names = new Array();
   task_names[{$task.id}] = "{$task.name|escape:'javascript'}";
 {/foreach}
 
+{if $template_dropdown}
+var templates = new Array();
+{foreach $templates as $template}
+  templates[{$template.id}] = "{$template.content|escape:'javascript'}";
+{/foreach}
+
+// The fillNote function populates the Note field with a selected template body.
+function fillNote(id) {
+  if (!id) return; // Do nothing.
+  var template_body = templates[id];
+  var note = document.getElementById("note");
+  note.value = template_body;
+}
+{/if}
+
 // Mandatory top options for project and task dropdowns.
 var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}";
 var empty_label_task = "{$i18n.dropdown.select|escape:'javascript'}";
diff --git a/time_edit.php b/time_edit.php
index ef45226b8..e6ca12ad4 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -191,6 +191,7 @@
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 200px;','value'=>$cl_note));
+
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
   // Only one custom field is supported at this time.
@@ -205,6 +206,23 @@
       'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }
+
+// If we have templates, add a dropdown to select one.
+if ($user->isPluginEnabled('tp')){
+  $templates = ttGroupHelper::getActiveTemplates();
+  if (count($templates) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillNote(this.value);',
+      'name'=>'template',
+      'style'=>'width: 250px;',
+      'data'=>$templates,
+      'datakeys'=>array('id','name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $smarty->assign('template_dropdown', 1);
+    $smarty->assign('templates', $templates);
+  }
+}
+
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 if ($user->isPluginEnabled('iv'))
@@ -258,6 +276,10 @@
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
+    // A %req% element is found in note. They have to be replaced by user.
+    $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 

From bf5e56bc4052b478cca323386c7a71845a91989d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Mar 2019 16:01:12 +0000
Subject: [PATCH 0798/1848] Added template selector on mobile pages.

---
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/mobile/time.tpl      |  4 ++++
 WEB-INF/templates/mobile/time_edit.tpl |  4 ++++
 mobile/time.php                        | 20 ++++++++++++++++++++
 mobile/time_edit.php                   | 22 ++++++++++++++++++++++
 5 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 29660bf96..5c320f1c5 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.56.4850 | 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.56.4851 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index a342c7641..7fea17775 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -82,6 +82,10 @@
     <tr><td>{$i18n.label.duration}:</td></tr>
     <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
 {/if}
+{if $template_dropdown}
+    <tr><td>{$i18n.label.template}:</td></tr>
+    <tr><td>{$forms.timeRecordForm.template.control}</td></tr>
+{/if}
 
     <tr><td>{$i18n.label.note}:</td></tr>
     <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
index 79c5c03c4..472d0dd30 100644
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ b/WEB-INF/templates/mobile/time_edit.tpl
@@ -53,6 +53,10 @@ function confirmSave() {
 {/if}
     <tr><td>{$i18n.label.date}:</td></tr>
     <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
+{if $template_dropdown}
+    <tr><td>{$i18n.label.template}:</td></tr>
+    <tr><td>{$forms.timeRecordForm.template.control}</td></tr>
+{/if}
     <tr><td>{$i18n.label.note}:</td></tr>
     <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
     <tr><td align="center">{$forms.timeRecordForm.btn_save.control} {$forms.timeRecordForm.btn_copy.control} {$forms.timeRecordForm.btn_delete.control}</td></tr>
diff --git a/mobile/time.php b/mobile/time.php
index fe723da58..b9ee3bce3 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -228,6 +228,22 @@
   }
 }
 
+// If we have templates, add a dropdown to select one.
+if ($user->isPluginEnabled('tp')){
+  $templates = ttGroupHelper::getActiveTemplates();
+  if (count($templates) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillNote(this.value);',
+      'name'=>'template',
+      'style'=>'width: 250px;',
+      'data'=>$templates,
+      'datakeys'=>array('id','name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $smarty->assign('template_dropdown', 1);
+    $smarty->assign('templates', $templates);
+  }
+}
+
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
@@ -267,6 +283,10 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
+      // A %req% element is found in note. They have to be replaced by user.
+      $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.
 
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index e81f693ca..c3699d539 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -188,6 +188,7 @@
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 $form->addInput(array('type'=>'textarea','name'=>'note','class'=>'mobile-textarea','value'=>$cl_note));
+
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->fields[0]) {
   // Only one custom field is supported at this time.
@@ -202,6 +203,23 @@
       'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }
+
+// If we have templates, add a dropdown to select one.
+if ($user->isPluginEnabled('tp')){
+  $templates = ttGroupHelper::getActiveTemplates();
+  if (count($templates) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillNote(this.value);',
+      'name'=>'template',
+      'style'=>'width: 250px;',
+      'data'=>$templates,
+      'datakeys'=>array('id','name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $smarty->assign('template_dropdown', 1);
+    $smarty->assign('templates', $templates);
+  }
+}
+
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 if ($user->isPluginEnabled('iv'))
@@ -253,6 +271,10 @@
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
+    // A %req% element is found in note. They have to be replaced by user.
+    $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 

From ec33bd432725a9e49d1efe8094804e4fdbc4faac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Mar 2019 16:57:56 +0000
Subject: [PATCH 0799/1848] Added audit info for timesheet create and modify
 events.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 28 ++++++++++++++++++-------
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 240d91312..a00b4b7a8 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -74,9 +74,12 @@ static function createTimesheet($fields)
     $end_date = new DateAndTime($user->date_format, $fields['end_date']);
     $end = $end_date->toString(DB_DATEFORMAT);
 
-    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, project_id, name, comment, start_date, end_date)".
+    $created_part = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
+
+    $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, project_id, name, comment,".
+      " start_date, end_date, created, created_ip, created_by)".
       " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).", ".$mdb2->quote($name).
-      ", ".$mdb2->quote($comment).", ".$mdb2->quote($start).", ".$mdb2->quote($end).")";
+      ", ".$mdb2->quote($comment).", ".$mdb2->quote($start).", ".$mdb2->quote($end).$created_part.")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -191,8 +194,10 @@ static function delete($timesheet_id) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
     // Delete timesheet.
-    $sql = "update tt_timesheets set status = null".
+    $sql = "update tt_timesheets set status = null".$modified_part.
       " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
@@ -212,7 +217,10 @@ static function update($fields) {
     $comment = $fields['comment'];
     $status = $fields['status']; // Timesheet status.
 
-    $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", comment = ".$mdb2->quote($comment).
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "update tt_timesheets set name = ".$mdb2->quote($name).
+      ", comment = ".$mdb2->quote($comment).$modified_part.
       ", status = ".$mdb2->quote($status).
       " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
@@ -296,8 +304,10 @@ static function markSubmitted($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
     $timesheet_id = $fields['timesheet_id'];
-    $sql = "update tt_timesheets set submit_status = 1".
+    $sql = "update tt_timesheets set submit_status = 1".$modified_part.
       " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
@@ -390,7 +400,9 @@ static function markApproved($fields) {
     $timesheet_id = $fields['timesheet_id'];
     $comment = $fields['comment'];
 
-    $sql = "update tt_timesheets set approve_status = 1, approve_comment = ".$mdb2->quote($comment).
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "update tt_timesheets set approve_status = 1, approve_comment = ".$mdb2->quote($comment).$modified_part.
       " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
@@ -408,7 +420,9 @@ static function markDisapproved($fields) {
     $timesheet_id = $fields['timesheet_id'];
     $comment = $fields['comment'];
 
-    $sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).$modified_part.
       " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5c320f1c5..27f180614 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.56.4851 | 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.56.4852 | 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>

From 8b38ee999b1ac4bf055c359080a3d82c2e272b1e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Mar 2019 18:00:09 +0000
Subject: [PATCH 0800/1848] Added audit info for template create and modify
 events.

---
 WEB-INF/lib/ttTemplateHelper.class.php | 14 ++++++++++----
 WEB-INF/templates/footer.tpl           |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index cc1818d29..e3a935646 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -59,7 +59,9 @@ static function delete($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "update tt_templates set status = null".
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "update tt_templates set status = null".$modified_part.
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -80,9 +82,12 @@ static function insert($fields) {
     $description = $fields['description'];
     $content = $fields['content'];
 
-    $sql = "insert into tt_templates (group_id, org_id, name, description, content)".
+    $created_part = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
+
+    $sql = "insert into tt_templates (group_id, org_id, name, description, content,".
+      " created, created_ip, created_by)".
       " values ($group_id, $org_id, ".$mdb2->quote($name).
-      ", ".$mdb2->quote($description).", ".$mdb2->quote($content).")";
+      ", ".$mdb2->quote($description).", ".$mdb2->quote($content).$created_part.")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -102,11 +107,12 @@ static function update($fields) {
     $name = $fields['name'];
     $description = $fields['description'];
     $content = $fields['content'];
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     $status = (int) $fields['status'];
 
     $sql = "update tt_templates set name = ".$mdb2->quote($name).
       ", description = ".$mdb2->quote($description).
-      ", content = ".$mdb2->quote($content).
+      ", content = ".$mdb2->quote($content).$modified_part.
       ", status = ".$status.
       " where id = $template_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 27f180614..dcc75949a 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.56.4852 | 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.56.4853 | 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>

From a99eed64c692add1b423ea89d0972f6698e4e6fa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Mar 2019 18:15:04 +0000
Subject: [PATCH 0801/1848] Added templates to group export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 17 +++++++++++++++++
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 7810c79e8..f2290fbad 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -488,6 +488,23 @@ function writeData() {
       unset($predefined_expense_part);
     }
 
+    // Write templates.
+    $templates = $this->getRecordsFromTable('tt_templates');
+    if (count($templates) > 0) {
+      fwrite($this->file, $this->indentation."  <templates>\n");
+      foreach ($templates as $template) {
+        $template_part = $this->indentation.'    '."<template name=\"".htmlspecialchars($template['name'])."\"";
+        $template_part .= " description=\"".htmlspecialchars($template['description'])."\"";
+        $template_part .= " content=\"".htmlspecialchars($template['content'])."\"";
+        $template_part .= " status=\"".$template['status']."\"";
+        $template_part .= "></template>\n";
+        fwrite($this->file, $template_part);
+      }
+      fwrite($this->file, $this->indentation."  </templates>\n");
+      unset($templates);
+      unset($template_part);
+    }
+
     // Write monthly quotas.
     $quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
     if (count($quotas) > 0) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dcc75949a..10c67acd9 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.56.4853 | 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.56.4854 | 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>

From bb2dc72d5b08a2e04244a372ed58edc0384f1cdd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Mar 2019 21:57:43 +0000
Subject: [PATCH 0802/1848] Added import of templates.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 30 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index c29c01cca..2a544738e 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -422,6 +422,19 @@ function startElement($parser, $name, $attrs) {
         return;
       }
 
+      if ($name == 'TEMPLATE') {
+        if (!$this->insertTemplate(array(
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id,
+          'name' => $attrs['NAME'],
+          'description' => $attrs['DESCRIPTION'],
+          'content' => $attrs['CONTENT'],
+          'status' => $attrs['STATUS']))) {
+          $this->errors->add($i18n->get('error.db'));
+        }
+        return;
+      }
+
       if ($name == 'MONTHLY_QUOTA') {
         if (!$this->insertMonthlyQuota(array(
           'group_id' => $this->current_group_id,
@@ -745,6 +758,23 @@ private function insertPredefinedExpense($fields) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
+  // insertTemplate - a helper function to insert a template.
+  private function insertTemplate($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $name = $mdb2->quote($fields['name']);
+    $description = $mdb2->quote($fields['description']);
+    $content = $mdb2->quote($fields['content']);
+    $status = $mdb2->quote($fields['status']);
+
+    $sql = "INSERT INTO tt_templates (group_id, org_id, name, description, content, status)".
+      " values ($group_id, $org_id, $name, $description, $content, $status)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
   // insertExpense - a helper function to insert an expense item.
   private function insertExpense($fields) {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 10c67acd9..a6bbd6393 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.56.4854 | 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.56.4855 | 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>

From d79981a845ee5c1e6dd404ee221d97a539f0aac8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 16:40:30 +0000
Subject: [PATCH 0803/1848] Fixed export-import of line breaks.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 20 +++++++++++++++++---
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index f2290fbad..9f0465d90 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -387,7 +387,7 @@ function writeData() {
         $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
         $log_part .= " timesheet_id=\"".$this->timesheetMap[$record['timesheet_id']]."\"";
         $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
-        $log_part .= " comment=\"".htmlspecialchars($record['comment'])."\"";
+        $log_part .= " comment=\"".$this->encodeLineBreaks($record['comment'])."\"";
         $log_part .= " billable=\"".$record['billable']."\"";
         $log_part .= " approved=\"".$record['approved']."\"";
         $log_part .= " paid=\"".$record['paid']."\"";
@@ -459,7 +459,7 @@ function writeData() {
         $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
         $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
         $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
-        $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
+        $expense_item_part .= " name=\"".$this->encodeLineBreaks($expense_item['name'])."\"";
         $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
         $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
         $expense_item_part .= " approved=\"".$expense_item['approved']."\"";
@@ -495,7 +495,7 @@ function writeData() {
       foreach ($templates as $template) {
         $template_part = $this->indentation.'    '."<template name=\"".htmlspecialchars($template['name'])."\"";
         $template_part .= " description=\"".htmlspecialchars($template['description'])."\"";
-        $template_part .= " content=\"".htmlspecialchars($template['content'])."\"";
+        $template_part .= " content=\"".$this->encodeLineBreaks($template['content'])."\"";
         $template_part .= " status=\"".$template['status']."\"";
         $template_part .= "></template>\n";
         fwrite($this->file, $template_part);
@@ -634,4 +634,18 @@ function writeData() {
 
     fwrite($this->file, $this->indentation."</group>\n");
   }
+
+  // encodeLineBreaks encodes line breaks with an escape sequence.
+  // We do this, because our strings are attribute values inside XML tags.
+  //
+  // If we don't, we lose line breaks after importing data because
+  // XML parser converts line breaks into a single white character.
+  //
+  // TODO: investigate whether we need to encode \t, etc.
+  private function encodeLineBreaks($source) {
+    $result = htmlspecialchars($source);
+    $result = str_replace ("\n", '&#10;', $result);
+    $result = str_replace ("\r", '&#13;', $result);
+    return $result;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a6bbd6393..a624fe1bc 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.56.4855 | 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.57.4856 | 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>

From c1dab04d6ff59c3c8ced5d95b84090dd3bef03e1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 17:48:44 +0000
Subject: [PATCH 0804/1848] Work in progress improving report formatting by
 placing note on a separate row.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/report.tpl | 11 ++++++-----
 report.php                   | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a624fe1bc..30e8b2efa 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.57.4856 | 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.57.4857 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 9e215c4df..51afd6caa 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -48,7 +48,6 @@
   {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
   {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
   {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
-  {if $bean->getAttribute('chnote')}<td class="tableHeader">{$i18n.label.note}</td>{/if}
   {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
   {if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
   {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
@@ -73,7 +72,6 @@
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
         {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
-        {if $bean->getAttribute('chnote')}<td></td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chapproved')}<td></td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
@@ -101,7 +99,6 @@
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
-    {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
@@ -113,6 +110,12 @@
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
       </tr>
+    {if $bean->getAttribute('chnote')}
+      <tr>
+        <td class="cellRightAligned">{$i18n.label.note}:</td>
+        <td colspan="{$colspan}">{$item.note|escape}</td>
+      </tr>
+    {/if}
     {$prev_date = $item.date}
     {if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
   {/foreach}
@@ -129,7 +132,6 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
-    {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
@@ -152,7 +154,6 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
-    {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
diff --git a/report.php b/report.php
index 4a29c320b..9f29069d3 100644
--- a/report.php
+++ b/report.php
@@ -282,6 +282,24 @@
   $smarty->assign('cur_grouped_by', '');
 }
 
+// Determine column span for note field.
+$colspan = 1;
+if ($bean->getAttribute('chuser')) $colspan++;
+if ($bean->getAttribute('chclient')) $colspan++;
+if ($bean->getAttribute('chproject')) $colspan++;
+if ($bean->getAttribute('chtask')) $colspan++;
+if ($bean->getAttribute('chcf_1')) $colspan++;
+if ($bean->getAttribute('chstart')) $colspan++;
+if ($bean->getAttribute('chfinish')) $colspan++;
+if ($bean->getAttribute('chduration')) $colspan++;
+if ($bean->getAttribute('chunits')) $colspan++;
+if ($bean->getAttribute('chcost')) $colspan++;
+if ($bean->getAttribute('chapproved')) $colspan++;
+if ($bean->getAttribute('chpaid')) $colspan++;
+if ($bean->getAttribute('chip')) $colspan++;
+if ($bean->getAttribute('chinvoice')) $colspan++;
+if ($bean->getAttribute('chtimesheet')) $colspan++;
+
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
 $smarty->assign('cur_date', '');
@@ -290,6 +308,7 @@
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('colspan', $colspan);
 $smarty->assign('bean', $bean);
 $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
 $smarty->assign('content_page_name', 'report.tpl');

From 1e825770a4defc5eb8d2032c35dc90e8bc8684da Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 18:16:30 +0000
Subject: [PATCH 0805/1848] A fix for column span for user reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 18 ++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 report.php                           |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 0cc2702cb..4de5a4839 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -738,6 +738,24 @@ static function prepareReportBody($options, $comment = null)
     $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
     $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';
 
+    // Determine column span for note field.
+    $colspan = 1;
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
+    if ($options['show_client']) $colspan++;
+    if ($options['show_project']) $colspan++;
+    if ($options['show_task']) $colspan++;
+    if ($options['show_custom_field_1']) $colspan++;
+    if ($options['show_start']) $colspan++;
+    if ($options['show_end']) $colspan++;
+    if ($options['show_duration']) $colspan++;
+    if ($options['show_work_units']) $colspan++;
+    if ($options['show_cost']) $colspan++;
+    if ($options['show_approved']) $colspan++;
+    if ($options['show_paid']) $colspan++;
+    if ($options['show_ip']) $colspan++;
+    if ($options['show_invoice']) $colspan++;
+    if ($options['show_timesheet']) $colspan++;
+
     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 30e8b2efa..2fb330673 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.57.4857 | 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.57.4858 | 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/report.php b/report.php
index 9f29069d3..620064afb 100644
--- a/report.php
+++ b/report.php
@@ -284,7 +284,7 @@
 
 // Determine column span for note field.
 $colspan = 1;
-if ($bean->getAttribute('chuser')) $colspan++;
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
 if ($bean->getAttribute('chclient')) $colspan++;
 if ($bean->getAttribute('chproject')) $colspan++;
 if ($bean->getAttribute('chtask')) $colspan++;

From a1f560292f6ce8999022da19b9d487636bf93769 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 18:32:26 +0000
Subject: [PATCH 0806/1848] Fixed emailed reports to have note on separate row.

---
 WEB-INF/lib/ttReportHelper.class.php | 14 ++++++--------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4de5a4839..545fcc465 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -849,8 +849,6 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
       if ($options['show_work_units'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
-      if ($options['show_note'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       if ($options['show_approved'])
@@ -897,7 +895,6 @@ static function prepareReportBody($options, $comment = null)
               if ($options['show_end']) $body .= '<td></td>';
               if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
               if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
-              if ($options['show_note']) $body .= '<td></td>';
               if ($options['show_cost']) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
                 $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
@@ -937,8 +934,6 @@ static function prepareReportBody($options, $comment = null)
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
           if ($options['show_work_units'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
-          if ($options['show_note'])
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($options['show_cost'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
           if ($options['show_approved']) {
@@ -961,7 +956,12 @@ static function prepareReportBody($options, $comment = null)
           if ($options['show_timesheet'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
           $body .= '</tr>';
-
+          if ($options['show_note']) {
+            $body .= '<tr style="'.$row_style.'">';
+            $body .= '<td style="'.$cellRightAligned.'">'.$i18n->get('label.note').':</td>';
+            $body .= '<td colspan="'.$colspan.'">'.$record['note'].'</td>';
+            $body .= '</tr>';
+          }
           $prev_date = $record['date'];
           if ($print_subtotals)
             $prev_grouped_by = $record['grouped_by'];
@@ -982,7 +982,6 @@ static function prepareReportBody($options, $comment = null)
         if ($options['show_end']) $body .= '<td></td>';
         if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
         if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
-        if ($options['show_note']) $body .= '<td></td>';
         if ($options['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
@@ -1009,7 +1008,6 @@ static function prepareReportBody($options, $comment = null)
       if ($options['show_end']) $body .= '<td></td>';
       if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
       if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
-      if ($options['show_note']) $body .= '<td></td>';
       if ($options['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2fb330673..6fe11c1f3 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.57.4858 | 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.57.4859 | 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>

From 2940db88b0c3e90b9e4937daf295522c44e94030 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 18:48:45 +0000
Subject: [PATCH 0807/1848] Conditional printing of only not null note rows.

---
 WEB-INF/lib/ttReportHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl         | 2 +-
 WEB-INF/templates/report.tpl         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 545fcc465..5e8f799f0 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -956,7 +956,7 @@ static function prepareReportBody($options, $comment = null)
           if ($options['show_timesheet'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
           $body .= '</tr>';
-          if ($options['show_note']) {
+          if ($options['show_note'] && $record['note']) {
             $body .= '<tr style="'.$row_style.'">';
             $body .= '<td style="'.$cellRightAligned.'">'.$i18n->get('label.note').':</td>';
             $body .= '<td colspan="'.$colspan.'">'.$record['note'].'</td>';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6fe11c1f3..64cc8dc14 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.57.4859 | 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.57.4860 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 51afd6caa..df1224865 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -110,7 +110,7 @@
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
       </tr>
-    {if $bean->getAttribute('chnote')}
+    {if $bean->getAttribute('chnote') && $item.note}
       <tr>
         <td class="cellRightAligned">{$i18n.label.note}:</td>
         <td colspan="{$colspan}">{$item.note|escape}</td>

From 46863f8e2310c275ec6d3b933d53717da711b05a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 19:11:12 +0000
Subject: [PATCH 0808/1848] Adjusted PDF reports to print notes on separate
 lines.

---
 topdf.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/topdf.php b/topdf.php
index 8e0738d4c..4ede4cddd 100644
--- a/topdf.php
+++ b/topdf.php
@@ -154,7 +154,6 @@
   if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
   if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
   if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
-  if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
   if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
   if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
   if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
@@ -201,7 +200,6 @@
         if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
         if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
         if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
-        if ($bean->getAttribute('chnote')) $html .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $html .= "<td $styleRightAligned>";
           if ($user->can('manage_invoices') || $user->isClient())
@@ -233,7 +231,6 @@
     if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
     if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
-    if ($bean->getAttribute('chnote')) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())
@@ -261,6 +258,14 @@
     if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
     $html .= '</tr>';
 
+    if ($bean->getAttribute('chnote') && $item['note']) {
+      $html .= '<tr>';
+      $html .= "<td $styleRightAligned>".$i18n->get('label.note').'</td>';
+      $noteSpan = $colspan-1;
+      $html .= '<td colspan="'.$noteSpan.'">'.htmlspecialchars($item['note']).'</td>';
+      $html .= '</tr>';
+    }
+
     $prev_date = $item['date'];
     if ($print_subtotals) $prev_grouped_by = $item['grouped_by'];
   }
@@ -298,7 +303,6 @@
     if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
     if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
-    if ($bean->getAttribute('chnote')) $html .= '<td></td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())
@@ -328,7 +332,6 @@
   if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
   if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
-  if ($bean->getAttribute('chnote')) $html .= '<td></td>';
   if ($bean->getAttribute('chcost')) {
     $html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
     if ($user->can('manage_invoices') || $user->isClient())

From 0c4f2c49ae759b4f4f9b5002d0a413f89b6498e6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 21:27:44 +0000
Subject: [PATCH 0809/1848] Added an option to use page breaks on PDF reports
 after grouped by blocks.

---
 WEB-INF/lib/ttUserConfig.class.php |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 topdf.php                          | 11 ++++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUserConfig.class.php b/WEB-INF/lib/ttUserConfig.class.php
index b92699440..d0907bb6d 100644
--- a/WEB-INF/lib/ttUserConfig.class.php
+++ b/WEB-INF/lib/ttUserConfig.class.php
@@ -32,6 +32,7 @@
 define('SYSC_LAST_REPORT_CC', 'last_report_cc');
 define('SYSC_LAST_INVOICE_EMAIL', 'last_invoice_email');
 define('SYSC_LAST_INVOICE_CC', 'last_invoice_cc');
+define('SYSC_PDF_REPORT_PAGE_BREAKS', 'pdf_report_page_breaks');
 
 // Class ttUserConfig is used for storing and retrieving named values associated with users.
 // When user is working on behalf of someone else, this class is still associated with a user.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 64cc8dc14..47f396550 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.57.4860 | 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.58.4861 | 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/topdf.php b/topdf.php
index 4ede4cddd..f68be29c5 100644
--- a/topdf.php
+++ b/topdf.php
@@ -215,8 +215,17 @@
         if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
         $html .= '</tr>';
         $html .= '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
+        // TODO: page breaks on PDF reports is a rarely used feature.
+        // Currently without configuration capability.
+        // Consider adding an option to user profile instead.
+        if (isTrue('PDF_REPORT_PAGE_BREAKS')) {
+          import('ttUserConfig');
+          $uc = new ttUserConfig();
+          $use_breaks = $uc->getValue(PDF_REPORT_PAGE_BREAKS);
+          if ($use_breaks) $html .= '<br pagebreak="true"/>';
+        }
       }
-      $first_pass = false; 
+      $first_pass = false;
     }
 
     // Print a regular row.

From 6264e86f9344d8f74aacaea0c4ccc6f26de3ae52 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Mar 2019 21:35:45 +0000
Subject: [PATCH 0810/1848] A fix for pdf report page breaks option.

---
 WEB-INF/templates/footer.tpl | 2 +-
 topdf.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 47f396550..e01ea4388 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.58.4861 | 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.58.4862 | 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/topdf.php b/topdf.php
index f68be29c5..7d7a7f9d0 100644
--- a/topdf.php
+++ b/topdf.php
@@ -221,7 +221,7 @@
         if (isTrue('PDF_REPORT_PAGE_BREAKS')) {
           import('ttUserConfig');
           $uc = new ttUserConfig();
-          $use_breaks = $uc->getValue(PDF_REPORT_PAGE_BREAKS);
+          $use_breaks = $uc->getValue(SYSC_PDF_REPORT_PAGE_BREAKS);
           if ($use_breaks) $html .= '<br pagebreak="true"/>';
         }
       }

From a93b3e0a364e30edb06c4923700aa680b4de91f1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Mar 2019 17:31:43 +0000
Subject: [PATCH 0811/1848] Cosmetic.

---
 WEB-INF/lib/ttOrgHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 3145d1d7e..07b70b5fd 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -102,8 +102,8 @@ static function deleteOrg($org_id) {
       'tt_custom_field_options',
       'tt_custom_fields',
       'tt_log',
-      'tt_timesheets', // TODO: check if order is correct. After doing export.
       'tt_invoices',
+      'tt_timesheets',
       'tt_user_project_binds',
       'tt_users',
       'tt_client_project_binds',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e01ea4388..90c62d2a7 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.58.4862 | 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.58.4863 | 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>

From 6aeed0ef52969ccf9be174e8a732f98be0301796 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Mar 2019 17:41:19 +0000
Subject: [PATCH 0812/1848] Improved plugins.tpl to hide unnecessary label.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 90c62d2a7..c2cdd155b 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.58.4863 | 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.58.4864 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 34c6fc22b..2a7b08d91 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -29,6 +29,7 @@ function handlePluginCheckboxes() {
     taxLabel.style.visibility = "hidden";
   }
   var configureLabel = document.getElementById("expenses_config");
+  var docLabel = null;
   if (expensesCheckbox.checked) {
     configureLabel.style.visibility = "visible";
   } else {
@@ -85,12 +86,13 @@ function handlePluginCheckboxes() {
 
   var templatesCheckbox = document.getElementById("templates");
   configureLabel = document.getElementById("templates_config");
+  docLabel = document.getElementById("templates_doc");
   if (templatesCheckbox.checked){
     configureLabel.style.display = "";
-    //configureLabel.style.visibility = "visible";
+    docLabel.style.display = "none";
   } else {
     configureLabel.style.display = "none";
-    //configureLabel.style.visibility = "hidden";
+    docLabel.style.display = "";
   }
 }
 </script>
@@ -154,7 +156,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
-            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
           <tr>
             <td colspan="2">&nbsp;</td>

From dda0cf3dc9763aca45c0a6cd53715db11941aa94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 12 Mar 2019 21:15:21 +0000
Subject: [PATCH 0813/1848] Added a link explaining timesheets plugin.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c2cdd155b..6e09e9fdd 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.58.4864 | 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.58.4865 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 2a7b08d91..d3f908653 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -152,7 +152,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
-            <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
+            <td><label for="timesheets">{$i18n.title.timesheets}</label> <a href="https://www.anuko.com/lp/tt_30.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>

From 08852813ce717908cc1c37b7bfbc768cdec2376c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 13 Mar 2019 19:16:01 +0000
Subject: [PATCH 0814/1848] A fix for access rights for manager.

---
 WEB-INF/lib/ttRoleHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index d12fcd442..85cdbc7bd 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -193,7 +193,7 @@ static function createPredefinedRoles($group_id, $lang)
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_own_timesheets,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
@@ -254,7 +254,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6e09e9fdd..1ecc05903 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.58.4865 | 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.58.4866 | 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>

From b1102de865ed3f8a3d1d9cd62152e03febbfdcfc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 13 Mar 2019 20:39:52 +0000
Subject: [PATCH 0815/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 71 +++++++++++++++--------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index fdd291ecb..c9e69249d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -51,7 +51,7 @@
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'menu.timesheets' => 'Timesheets',
 'menu.charts' => 'Grafieken',
 'menu.projects' => 'Projecten',
@@ -89,8 +89,7 @@
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
 'error.role_exists' => 'Een rol met deze rangorde bestaat al.',
 'error.no_invoiceable_items' => 'Er zijn geen factuureerbare onderdelen.',
-// TODO: translate the following.
-// 'error.no_records' => 'There are no records.',
+'error.no_records' => 'Er zijn geen records.',
 'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.',
 'error.no_groups' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw groep.',
 'error.upload' => 'Fout bij het uploaden van het bestand.',
@@ -132,9 +131,8 @@
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
 'button.stop' => 'Stop',
-// TODO: translate the following.
-// 'button.approve' => 'Approve',
-// 'button.disapprove' => 'Disapprove',
+'button.approve' => 'Goedkeuren',
+'button.disapprove' => 'Afkeuren',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Groepsnaam',
@@ -234,13 +232,13 @@
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
-// 'label.approved' => 'Approved',
-// 'label.approval' => 'Report approval',
-// 'label.mark_approved' => 'Mark approved',
-// 'label.template' => 'Template',
+'label.approved' => 'Goedgekeurd',
+'label.approval' => 'Rapport goedkeuring',
+'label.mark_approved' => 'Markeer goegkeuring',
+'label.template' => 'Sjabloon',
 
 // Form titles.
 'title.error' => 'Fout',
@@ -266,7 +264,7 @@
 'title.reports' => 'Rapporten',
 'title.report' => 'Rapport',
 'title.send_report' => 'Rapport aan het versturen',
-// TODO: Translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
 'title.invoice' => 'Factuur',
@@ -300,7 +298,7 @@
 'title.add_notification' => 'Notificatie toevoegen',
 'title.edit_notification' => 'Notificatie bewerken',
 'title.delete_notification' => 'Notificatie verwijderen',
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'title.add_timesheet' => 'Adding Timesheet',
 // 'title.edit_timesheet' => 'Editing Timesheet',
 // 'title.delete_timesheet' => 'Deleting Timesheet',
@@ -322,11 +320,10 @@
 'title.week_view' => 'Week overzicht',
 'title.swap_roles' => 'Rollen verruilen',
 'title.work_units' => 'Werk eenheid',
-// TODO: translate the following.
-// 'title.templates' => 'Templates',
-// 'title.add_template' => 'Adding Template',
-// 'title.edit_template' => 'Editing Template',
-// 'title.delete_template' => 'Deleting Template',
+'title.templates' => 'Sjablonen',
+'title.add_template' => 'Sjabloon toevoegen',
+'title.edit_template' => 'Sjabloon bewerken',
+'title.delete_template' => 'Sjabloon verwijderen',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -350,15 +347,14 @@
 'dropdown.clients' => 'klanten',
 'dropdown.select' => '--- kies ---',
 'dropdown.select_invoice' => '--- kies factuur ---',
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'actief',
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
 'dropdown.do_not_delete' => 'niet verwijderen',
-// TODO: translate the following.
-// 'dropdown.approved' => 'approved',
-// 'dropdown.not_approved' => 'not approved',
+'dropdown.approved' => 'goedgekeurd',
+'dropdown.not_approved' => 'afgekeurd',
 'dropdown.paid' => 'betaald',
 'dropdown.not_paid' => 'niet betaald',
 
@@ -383,11 +379,10 @@
 'form.time.duration_format' => '(uu:mm of 0.0u)',
 'form.time.billable' => 'Factureerbaar',
 'form.time.uncompleted' => 'Onvolledig',
-// TODO: The following 4 strings may need to be shorter for mobile apps.
-'form.time.remaining_quota' => 'Nog te werken uren voor de doelstelling deze maand',
-'form.time.over_quota' => 'Meer gewerkte uren dan de doelstelling deze maand',
-'form.time.remaining_balance' => 'Minder gewerkte uren dan de doelstelling in ratio met de verstreken dagen',
-'form.time.over_balance' => 'Meer gewerkte uren dan de doelstelling in ratio met de verstreken dagen',
+'form.time.remaining_quota' => 'Nog te werken uren deze maand',
+'form.time.over_quota' => 'Meer gewerkte uren deze maand',
+'form.time.remaining_balance' => 'Minder gewerkte uren naar ratio',
+'form.time.over_balance' => 'Meer gewerkte uren naar ratio',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dit tijdrecord is opgeslagen met alleen een starttijd. Dit is geen fout.',
@@ -402,10 +397,9 @@
 'form.reports.include_not_billable' => 'niet factureerbaar',
 'form.reports.include_invoiced' => 'gefactureerd',
 'form.reports.include_not_invoiced' => 'niet gefactureerd',
-// TODO: translate the following.
-// 'form.reports.include_assigned' => 'assigned',
-// 'form.reports.include_not_assigned' => 'not assigned',
-// 'form.reports.include_pending' => 'pending',
+'form.reports.include_assigned' => 'toegewezen',
+'form.reports.include_not_assigned' => 'niet toegewezen',
+'form.reports.include_pending' => 'in afwachting',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
@@ -421,18 +415,17 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporteer',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'form.timesheets.active_timesheets' => 'Active Timesheets',
 // 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
 // Templates form. See example at https://timetracker.anuko.com/templates.php
-// TODO: translate the following.
-// 'form.templates.active_templates' => 'Active Templates',
-// 'form.templates.inactive_templates' => 'Inactive Templates',
+'form.templates.active_templates' => 'Actieve sjablonen',
+'form.templates.inactive_templates' => 'Inactieve sjablonen',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
@@ -549,9 +542,7 @@
 'role.user.description' => 'Een gebruiker zonder beheer rechten.',
 'role.client.label' => 'Klant',
 'role.client.low_case_label' => 'klant',
-// TODO: translate the following.
-// 'role.client.description' => 'A client can view its own data.',
-'role.client.description' => 'Een klant kan zijn eigen rapporten en facturen inzien.',
+'role.client.description' => 'Een klant kan zijn eigen data inzien.',
 'role.supervisor.label' => 'Supervisor',
 'role.supervisor.low_case_label' => 'supervisor',
 'role.supervisor.description' => 'Een persoon met beperkte beheer rechten.',
@@ -569,7 +560,7 @@
 'role.admin.description' => 'Time Tracker beheerder.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
-// TODO: translate the following.
+// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
 // 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
 // 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
 // 'form.timesheet_view.approve_subject' => 'Timesheet approved',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1ecc05903..ed336fd06 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.58.4866 | 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.58.4867 | 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>

From 4b58058b15b14c81cb8d7dae99c9ebe0462afe62 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 14 Mar 2019 15:26:13 +0000
Subject: [PATCH 0816/1848] Cosmetic refactoring in plugins.tpl.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/plugins.tpl | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ed336fd06..951880084 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.58.4867 | 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.58.4868 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index d3f908653..183522522 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -28,7 +28,7 @@ function handlePluginCheckboxes() {
     taxCheckbox.style.visibility = "hidden";
     taxLabel.style.visibility = "hidden";
   }
-  var configureLabel = document.getElementById("expenses_config");
+  var configureLabel = document.getElementById("expenses_conf");
   var docLabel = null;
   if (expensesCheckbox.checked) {
     configureLabel.style.visibility = "visible";
@@ -37,7 +37,7 @@ function handlePluginCheckboxes() {
   }
 
   var customFieldsCheckbox = document.getElementById("custom_fields");
-  configureLabel = document.getElementById("cf_config");
+  configureLabel = document.getElementById("cf_conf");
   if (customFieldsCheckbox.checked) {
     configureLabel.style.visibility = "visible";
   } else {
@@ -45,7 +45,7 @@ function handlePluginCheckboxes() {
   }
 
   var notificationsCheckbox = document.getElementById("notifications");
-  configureLabel = document.getElementById("notifications_config");
+  configureLabel = document.getElementById("notifications_conf");
   if (notificationsCheckbox.checked) {
     configureLabel.style.visibility = "visible";
   } else {
@@ -53,7 +53,7 @@ function handlePluginCheckboxes() {
   }
 
   var lockingCheckbox = document.getElementById("locking");
-  configureLabel = document.getElementById("locking_config");
+  configureLabel = document.getElementById("locking_conf");
   if (lockingCheckbox.checked) {
     configureLabel.style.visibility = "visible";
   } else {
@@ -61,7 +61,7 @@ function handlePluginCheckboxes() {
   }
 
   var quotasCheckbox = document.getElementById("quotas");
-  configureLabel = document.getElementById("quotas_config");
+  configureLabel = document.getElementById("quotas_conf");
   if (quotasCheckbox.checked){
     configureLabel.style.visibility = "visible";
   } else {
@@ -69,7 +69,7 @@ function handlePluginCheckboxes() {
   }
 
   var weekViewCheckbox = document.getElementById("week_view");
-  configureLabel = document.getElementById("week_view_config");
+  configureLabel = document.getElementById("week_view_conf");
   if (weekViewCheckbox.checked){
     configureLabel.style.visibility = "visible";
   } else {
@@ -77,7 +77,7 @@ function handlePluginCheckboxes() {
   }
 
   var workUnitsCheckbox = document.getElementById("work_units");
-  configureLabel = document.getElementById("work_units_config");
+  configureLabel = document.getElementById("work_units_conf");
   if (workUnitsCheckbox.checked){
     configureLabel.style.visibility = "visible";
   } else {
@@ -85,7 +85,7 @@ function handlePluginCheckboxes() {
   }
 
   var templatesCheckbox = document.getElementById("templates");
-  configureLabel = document.getElementById("templates_config");
+  configureLabel = document.getElementById("templates_conf");
   docLabel = document.getElementById("templates_doc");
   if (templatesCheckbox.checked){
     configureLabel.style.display = "";
@@ -120,31 +120,31 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.custom_fields.control}</td>
-            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_config"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_conf"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.expenses.control}</td>
-            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_config"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_conf"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_config">{if $user_exists}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
+            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_conf">{if $user_exists}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.locking.control}</td>
-            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_config"><a href="locking.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_conf"><a href="locking.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.quotas.control}</td>
-            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_config"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_conf"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.week_view.control}</td>
-            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_conf"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
-            <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_conf"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
@@ -156,7 +156,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
-            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_conf"><a href="templates.php">{$i18n.label.configure}</a></span> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
           <tr>
             <td colspan="2">&nbsp;</td>

From 91625ebaee1dcc6ca4af8aef0df4156817ac411b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Mar 2019 17:59:18 +0000
Subject: [PATCH 0817/1848] Starting to work on attachments plugin.

---
 WEB-INF/resources/en.lang.php | 1 +
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 6 ++++++
 plugins.php                   | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index db04f8181..9fd6995b7 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -238,6 +238,7 @@
 'label.approval' => 'Report approval',
 'label.mark_approved' => 'Mark approved',
 'label.template' => 'Template',
+'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 951880084..62ae7a5c7 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.58.4868 | 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.58.4869 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 183522522..6dfd9d240 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -158,6 +158,12 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
             <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_conf"><a href="templates.php">{$i18n.label.configure}</a></span> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
+{if isTrue('FILES_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
+            <td><label for="attachments">{$i18n.label.attachments}</label> <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+          </tr>
+{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/plugins.php b/plugins.php
index 5880aa377..1c0a076bb 100644
--- a/plugins.php
+++ b/plugins.php
@@ -54,6 +54,7 @@
   $cl_approval = $request->getParameter('approval');
   $cl_timesheets = $request->getParameter('timesheets');
   $cl_templates = $request->getParameter('templates');
+  $cl_attachments = $request->getParameter('attachments');
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
@@ -74,6 +75,7 @@
   $cl_approval = in_array('ap', $plugins);
   $cl_timesheets = in_array('ts', $plugins);
   $cl_templates = in_array('tp', $plugins);
+  $cl_attachments = in_array('at', $plugins);
 }
 
 $form = new Form('pluginsForm');
@@ -95,6 +97,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'approval','value'=>$cl_approval));
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
 $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'attachments','value'=>$cl_attachments,'onchange'=>'handlePluginCheckboxes()'));
 
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
@@ -136,6 +139,8 @@
     $plugins .= ',ts';
   if ($cl_templates)
     $plugins .= ',tp';
+  if ($cl_attachments)
+    $plugins .= ',at';
 
   // Recycle week view plugin options as they are not configured on this page.
   $existing_plugins = explode(',', $user->getPlugins());

From db7e28f1cc7a61a4685e5426cc0c647105b6f9c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Mar 2019 18:05:57 +0000
Subject: [PATCH 0818/1848] Added label.attachments to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 29 files changed, 30 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index df7dda5e9..4be255a9b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -272,6 +272,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1d71ad365..f64cc1849 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -282,6 +282,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 87e34ae71..7c9211bdf 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -260,6 +260,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 1366c546f..24909b23c 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -248,6 +248,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d880f13b0..bd1de5509 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -275,6 +275,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c3b956939..f9d41b346 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -263,6 +263,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 7bd1d9cfe..49fcd3c8b 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -270,6 +270,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9117f62ac..723801c8b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -264,6 +264,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 595b448d2..873d58dd7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -258,6 +258,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9ef0b9778..145d0efda 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -251,6 +251,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index bbe807887..698bb25c9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -281,6 +281,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 2286ddfff..0b9d66f9c 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -277,6 +277,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 691dc8b7b..763fd0115 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -255,6 +255,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ed89e4f0f..d441ad415 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -282,6 +282,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 505c152d2..6ff04d74c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -282,6 +282,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c9e69249d..b0fc9ec96 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -239,6 +239,8 @@
 'label.approval' => 'Rapport goedkeuring',
 'label.mark_approved' => 'Markeer goegkeuring',
 'label.template' => 'Sjabloon',
+// TODO: translate the following.
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 4bef367f9..cede9d2b4 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -279,6 +279,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8e80c7536..fb053d978 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -265,6 +265,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b556bed71..f2dd50604 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -262,6 +262,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 85478953b..12789a2d3 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -267,6 +267,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 24230219a..fc59db992 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -279,6 +279,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 929e2b2e2..fc95a3070 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -237,6 +237,7 @@
 'label.approval' => 'Одобрение отчётов',
 'label.mark_approved' => 'Отметить одобрение',
 'label.template' => 'Шаблон',
+'label.attachments' => 'Приложения',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index dde834a24..bd3f00e8e 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -270,6 +270,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 1e742abcb..33788ed3a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -262,6 +262,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 9cc76d70a..2b5b731b4 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -263,6 +263,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0c5fbb4b1..76f238aa4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -259,6 +259,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c7a3191c9..be7c42064 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -286,6 +286,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 1fdd32d06..54810075f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -270,6 +270,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5ca967e4e..6ab288640 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -277,6 +277,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.attachments' => 'Attachments',
 
 // Form titles.
 // TODO: Translate the following.

From 00a2c4c840e745a734cd7eb6e58f897192fc2ca6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Mar 2019 18:57:28 +0000
Subject: [PATCH 0819/1848] Added label.files to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 30 files changed, 30 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 4be255a9b..e63a616a8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -273,6 +273,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index f64cc1849..6c5b0f755 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -283,6 +283,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7c9211bdf..7a978b702 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -261,6 +261,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 24909b23c..ec3a5337e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -249,6 +249,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 9fd6995b7..652277419 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -239,6 +239,7 @@
 'label.mark_approved' => 'Mark approved',
 'label.template' => 'Template',
 'label.attachments' => 'Attachments',
+'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bd1de5509..cf23a1339 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -276,6 +276,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f9d41b346..c8ba34da9 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -264,6 +264,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 49fcd3c8b..8991802c4 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -271,6 +271,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 723801c8b..3dd804c85 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -265,6 +265,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 873d58dd7..051cc75b8 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -259,6 +259,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 145d0efda..0de289b67 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -252,6 +252,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 698bb25c9..7df92de1e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -282,6 +282,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 0b9d66f9c..7f299b7da 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -278,6 +278,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 763fd0115..a009aca42 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -256,6 +256,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index d441ad415..dd780dc8c 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -283,6 +283,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6ff04d74c..15057c29b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -283,6 +283,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b0fc9ec96..cdd48526e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -241,6 +241,7 @@
 'label.template' => 'Sjabloon',
 // TODO: translate the following.
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index cede9d2b4..b734bbb9c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -280,6 +280,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index fb053d978..8c5533c3b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -266,6 +266,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f2dd50604..55346d9e7 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -263,6 +263,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 12789a2d3..0b85a5b52 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -268,6 +268,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fc59db992..a66de4d18 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -280,6 +280,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index fc95a3070..0f866d08c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -238,6 +238,7 @@
 'label.mark_approved' => 'Отметить одобрение',
 'label.template' => 'Шаблон',
 'label.attachments' => 'Приложения',
+'label.files' => 'Файлы',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index bd3f00e8e..e0ac29792 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -271,6 +271,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 33788ed3a..d1e484875 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -263,6 +263,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 2b5b731b4..32267f8cb 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -264,6 +264,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 76f238aa4..d4c902c47 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -260,6 +260,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index be7c42064..c618c4ed9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -287,6 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 54810075f..de9d3165b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -271,6 +271,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6ab288640..3b02371a3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -278,6 +278,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
+// 'label.files' => 'Files',
 
 // Form titles.
 // TODO: Translate the following.

From cec2e1b0941c16302bedad01bfb8455baf13e0f8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Mar 2019 19:55:24 +0000
Subject: [PATCH 0820/1848] Work in progress on project attachments.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/projects.tpl | 18 ++++++++++++++++++
 projects.php                   |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 62ae7a5c7..a476e8057 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.58.4869 | 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.58.4870 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 589993652..0b400b119 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -13,6 +13,9 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+  {if $show_files}
+          <td class="tableHeader">{$i18n.label.files}</td>
+  {/if}
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
@@ -21,6 +24,9 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
+      {if $show_files}
+          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+      {/if}
           <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
           <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>
@@ -42,6 +48,9 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+    {if $show_files}
+          <td class="tableHeader">{$i18n.label.files}</td>
+    {/if}
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
@@ -49,6 +58,9 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
+      {if $show_files}
+          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+      {/if}
           <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
           <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>
@@ -68,12 +80,18 @@
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.label.description}</td>
+    {if $show_files}
+          <td class="tableHeader">{$i18n.label.files}</td>
+    {/if}
         </tr>
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
+      {if $show_files}
+          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+      {/if}
         </tr>
     {/foreach}
   {/if}
diff --git a/projects.php b/projects.php
index 5b562366e..97a86ba63 100644
--- a/projects.php
+++ b/projects.php
@@ -49,6 +49,7 @@
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
+$smarty->assign('show_files', $user->isPluginEnabled('at'));
 $smarty->assign('title', $i18n->get('title.projects'));
 $smarty->assign('content_page_name', 'projects.tpl');
 $smarty->display('index.tpl');

From b5b2801290794632bba7af2cdddf9d4a8a96c29c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Mar 2019 21:28:37 +0000
Subject: [PATCH 0821/1848] Work in progress on project attachments.

---
 WEB-INF/resources/ca.lang.php    |  2 ++
 WEB-INF/resources/cs.lang.php    |  2 ++
 WEB-INF/resources/da.lang.php    |  2 ++
 WEB-INF/resources/de.lang.php    |  2 ++
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  2 ++
 WEB-INF/resources/et.lang.php    |  2 ++
 WEB-INF/resources/fa.lang.php    |  2 ++
 WEB-INF/resources/fi.lang.php    |  2 ++
 WEB-INF/resources/fr.lang.php    |  2 ++
 WEB-INF/resources/gr.lang.php    |  2 ++
 WEB-INF/resources/he.lang.php    |  2 ++
 WEB-INF/resources/hu.lang.php    |  2 ++
 WEB-INF/resources/it.lang.php    |  2 ++
 WEB-INF/resources/ja.lang.php    |  2 ++
 WEB-INF/resources/ko.lang.php    |  2 ++
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  2 ++
 WEB-INF/resources/pl.lang.php    |  2 ++
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  2 ++
 WEB-INF/resources/ro.lang.php    |  2 ++
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  2 ++
 WEB-INF/resources/sl.lang.php    |  2 ++
 WEB-INF/resources/sr.lang.php    |  2 ++
 WEB-INF/resources/sv.lang.php    |  2 ++
 WEB-INF/resources/tr.lang.php    |  2 ++
 WEB-INF/resources/zh-cn.lang.php |  2 ++
 WEB-INF/resources/zh-tw.lang.php |  2 ++
 WEB-INF/templates/footer.tpl     |  2 +-
 project_files.php                | 55 ++++++++++++++++++++++++++++++++
 32 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 project_files.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e63a616a8..e524613aa 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -315,6 +315,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Projectes',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Agregant projecte',
 'title.edit_project' => 'Modificant projecte',
 'title.delete_project' => 'Eliminant projecte',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 6c5b0f755..2d7b36ff9 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -325,6 +325,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Projekty',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Pridat projekt',
 'title.edit_project' => 'Upravit projekt',
 'title.delete_project' => 'Smazat projekt',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7a978b702..662b21bd5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -296,6 +296,8 @@
 'title.send_invoice' => 'Sender Faktura',
 'title.charts' => 'Diagrammer',
 'title.projects' => 'Projekter',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Tilføj Projekt',
 'title.edit_project' => 'Redigér Projekt',
 'title.delete_project' => 'Slet Projekt',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ec3a5337e..7d0dda046 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -280,6 +280,8 @@
 'title.send_invoice' => 'Rechnung senden',
 'title.charts' => 'Diagramme',
 'title.projects' => 'Projekte',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Projekt anlegen',
 'title.edit_project' => 'Projekt bearbeiten',
 'title.delete_project' => 'Projekt löschen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 652277419..3e855d053 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -271,6 +271,7 @@
 'title.send_invoice' => 'Sending Invoice',
 'title.charts' => 'Charts',
 'title.projects' => 'Projects',
+'title.project_files' => 'Project Files',
 'title.add_project' => 'Adding Project',
 'title.edit_project' => 'Editing Project',
 'title.delete_project' => 'Deleting Project',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index cf23a1339..b314181e7 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -314,6 +314,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Proyectos',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Agregando proyecto',
 'title.edit_project' => 'Modificando proyecto',
 'title.delete_project' => 'Eliminando proyecto',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c8ba34da9..7ffb16569 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -301,6 +301,8 @@
 'title.send_invoice' => 'Saada arve',
 'title.charts' => 'Diagrammid',
 'title.projects' => 'Projektid',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Projekti lisamine',
 'title.edit_project' => 'Projekti muutmine',
 'title.delete_project' => 'Projekti kustutamine',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8991802c4..e404d79c9 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -302,6 +302,8 @@
 'title.send_invoice' => 'ارسال فاکتور',
 'title.charts' => 'نمودارها',
 'title.projects' => 'پروژه ها',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'درج پروژه',
 'title.edit_project' => 'ویرایش پروژه',
 'title.delete_project' => 'حذف پروژه',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3dd804c85..ac6e438f8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -296,6 +296,8 @@
 'title.send_invoice' => 'Laskun lähetys',
 'title.charts' => 'Kaaviot',
 'title.projects' => 'Projektit',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Projektin lisäys',
 'title.edit_project' => 'Projektin muokkaus',
 'title.delete_project' => 'Projektin poisto',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 051cc75b8..5a38ee3fe 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -290,6 +290,8 @@
 'title.send_invoice' => 'Envoi de la facture',
 'title.charts' => 'Graphiques',
 'title.projects' => 'Projets',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Ajout d\\\'un projet',
 'title.edit_project' => 'Modification d\\\'un projet',
 'title.delete_project' => 'Suppression d\\\'un projet',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 0de289b67..608b38783 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -287,6 +287,8 @@
 'title.send_invoice' => 'Αποστολή τιμολόγιου',
 'title.charts' => 'Γραφήματα',
 'title.projects' => 'Έργο',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Προσθήκη έργου',
 'title.edit_project' => 'Επεξεργασία έργου',
 'title.delete_project' => 'Διαγραφή έργου',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7df92de1e..f0a31aa2b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -314,6 +314,8 @@
 'title.send_invoice' => 'שליחת חשבונית',
 'title.charts' => 'תרשימים',
 'title.projects' => 'פרוייקטים',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'הוסף פרוייקט',
 'title.edit_project' => 'עריכת פרוייקט',
 'title.delete_project' => 'מחיקת פרוייקט',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 7f299b7da..0bc245f6f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -315,6 +315,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Projektek',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Projekt hozzáadása',
 'title.edit_project' => 'Projekt szerkesztése',
 'title.delete_project' => 'Projekt törlése',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index a009aca42..54cf7e734 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -295,6 +295,8 @@
 'title.send_invoice' => 'Invia fattura',
 'title.charts' => 'Grafici',
 'title.projects' => 'Progetti',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Aggiungi progetto',
 'title.edit_project' => 'Modifica progetto',
 'title.delete_project' => 'Elimina progetto',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index dd780dc8c..0a443f956 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -321,6 +321,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'プロジェクト',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'プロジェクトの追加',
 'title.edit_project' => 'プロジェクトの編集',
 'title.delete_project' => 'プロジェクトの削除',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 15057c29b..c4988fa35 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -321,6 +321,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => '프로젝트',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => '프로젝트를 추가하기',
 'title.edit_project' => '프로젝트를 편집하기',
 'title.delete_project' => '프로젝트를 편집하기',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index cdd48526e..c5a3b509b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -274,6 +274,8 @@
 'title.send_invoice' => 'Factuur verzenden',
 'title.charts' => 'Grafieken',
 'title.projects' => 'Projecten',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Project toevoegen',
 'title.edit_project' => 'Project wijzigen',
 'title.delete_project' => 'Project verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b734bbb9c..55cb9d86d 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -318,6 +318,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Prosjekter',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Legg til prosjekt',
 'title.edit_project' => 'Endre prosjekt',
 'title.delete_project' => 'Slett prosjekt',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8c5533c3b..5a6ea8a9a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -297,6 +297,8 @@
 'title.send_invoice' => 'Wysyłanie faktury',
 'title.charts' => 'Statystyki',
 'title.projects' => 'Projekty',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'dodawanie projektu',
 'title.edit_project' => 'Edytowanie projektu',
 'title.delete_project' => 'Usuwanie projektu',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 55346d9e7..843258fbe 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -294,6 +294,8 @@
 'title.send_invoice' => 'Enviando fatura',
 'title.charts' => 'Gráficos',
 'title.projects' => 'Projetos',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Adicionando projeto',
 'title.edit_project' => 'Editando projeto',
 'title.delete_project' => 'Apagando projeto',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 0b85a5b52..538ec9887 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -303,6 +303,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Projetos',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Adicionando projeto',
 'title.edit_project' => 'Editando projeto',
 'title.delete_project' => 'Apagando projeto',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a66de4d18..10803e21f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -321,6 +321,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Proiecte',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Adaugare proiect',
 'title.edit_project' => 'Editare proiect',
 'title.delete_project' => 'Stergere proiect',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 0f866d08c..751d3a75c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -270,6 +270,7 @@
 'title.send_invoice' => 'Отсылка счёта',
 'title.charts' => 'Диаграммы',
 'title.projects' => 'Проекты',
+'title.project_files' => 'Файлы проекта',
 'title.add_project' => 'Добавление проекта',
 'title.edit_project' => 'Редактирование проекта',
 'title.delete_project' => 'Удаление проекта',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e0ac29792..81409771b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -303,6 +303,8 @@
 'title.send_invoice' => 'Odosielanie faktúry',
 'title.charts' => 'Grafy',
 'title.projects' => 'Projekty',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Pridávanie projektu',
 'title.edit_project' => 'Upravovanie projektu',
 'title.delete_project' => 'Vymazávanie projektu',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d1e484875..712b3ee5c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -298,6 +298,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Projekti',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Dodajanje projekta',
 'title.edit_project' => 'Urejanje projekta',
 'title.delete_project' => 'Brisanje projekta',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 32267f8cb..a45414549 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -295,6 +295,8 @@
 'title.send_invoice' => 'Slanje računa',
 'title.charts' => 'Grafikoni',
 'title.projects' => 'Projekti',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Dodavanje projekta',
 'title.edit_project' => 'Izmena projekta',
 'title.delete_project' => 'Brisanje projekta',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d4c902c47..105b25f00 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -295,6 +295,8 @@
 'title.send_invoice' => 'Skicka faktura',
 'title.charts' => 'Diagram',
 'title.projects' => 'Projekt',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Lägg till projekt',
 'title.edit_project' => 'Redigera projekt',
 'title.delete_project' => 'Ta bort projekt',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c618c4ed9..a02ed68ae 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -330,6 +330,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => 'Projeler',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => 'Proje ekleniyor',
 'title.edit_project' => 'Proje düzenleniyor',
 'title.delete_project' => 'Proje siliniyor',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index de9d3165b..33cd0898d 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -309,6 +309,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => '项目',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => '添加项目',
 'title.edit_project' => '编辑项目',
 'title.delete_project' => '删除项目',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 3b02371a3..12a328e20 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -316,6 +316,8 @@
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
 'title.projects' => '項目',
+// TODO: translate the following.
+// 'title.project_files' => 'Project Files',
 'title.add_project' => '添加項目',
 'title.edit_project' => '編輯專案', // TODO: is this correct? I do not see 項目 here.
 'title.delete_project' => '刪除項目',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a476e8057..22eeb9bb6 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.58.4870 | 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.58.4871 | 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/project_files.php b/project_files.php
new file mode 100644
index 000000000..baec9aa23
--- /dev/null
+++ b/project_files.php
@@ -0,0 +1,55 @@
+<?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('ttGroupHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if($user->can('manage_projects')) {
+  $active_projects = ttGroupHelper::getActiveProjects();
+  $inactive_projects = ttGroupHelper::getInactiveProjects();
+} else
+  $active_projects = $user->getAssignedProjects();
+
+$smarty->assign('active_projects', $active_projects);
+$smarty->assign('inactive_projects', $inactive_projects);
+$smarty->assign('show_files', $user->isPluginEnabled('at'));
+$smarty->assign('title', $i18n->get('title.project_files'));
+$smarty->assign('content_page_name', 'projects.tpl');
+$smarty->display('index.tpl');

From 26dd5629ee5f2c3de36ff44e65529e4ca491cab1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Mar 2019 21:56:01 +0000
Subject: [PATCH 0822/1848] A bit more work in progress on project attachments.

---
 WEB-INF/resources/ca.lang.php       |   1 +
 WEB-INF/resources/cs.lang.php       |   1 +
 WEB-INF/resources/da.lang.php       |   1 +
 WEB-INF/resources/de.lang.php       |   1 +
 WEB-INF/resources/en.lang.php       |   1 +
 WEB-INF/resources/es.lang.php       |   1 +
 WEB-INF/resources/et.lang.php       |   1 +
 WEB-INF/resources/fa.lang.php       |   1 +
 WEB-INF/resources/fi.lang.php       |   1 +
 WEB-INF/resources/fr.lang.php       |   1 +
 WEB-INF/resources/gr.lang.php       |   1 +
 WEB-INF/resources/he.lang.php       |   1 +
 WEB-INF/resources/hu.lang.php       |   1 +
 WEB-INF/resources/it.lang.php       |   1 +
 WEB-INF/resources/ja.lang.php       |   1 +
 WEB-INF/resources/ko.lang.php       |   1 +
 WEB-INF/resources/nl.lang.php       |   1 +
 WEB-INF/resources/no.lang.php       |   1 +
 WEB-INF/resources/pl.lang.php       |   1 +
 WEB-INF/resources/pt-br.lang.php    |   1 +
 WEB-INF/resources/pt.lang.php       |   1 +
 WEB-INF/resources/ro.lang.php       |   1 +
 WEB-INF/resources/ru.lang.php       |   1 +
 WEB-INF/resources/sk.lang.php       |   1 +
 WEB-INF/resources/sl.lang.php       |   1 +
 WEB-INF/resources/sr.lang.php       |   1 +
 WEB-INF/resources/sv.lang.php       |   1 +
 WEB-INF/resources/tr.lang.php       |   1 +
 WEB-INF/resources/zh-cn.lang.php    |   1 +
 WEB-INF/resources/zh-tw.lang.php    |   1 +
 WEB-INF/templates/project_files.tpl | 102 ++++++++++++++++++++++++++++
 project_files.php                   |  22 +++---
 projects.php                        |   1 -
 33 files changed, 143 insertions(+), 12 deletions(-)
 create mode 100644 WEB-INF/templates/project_files.tpl

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e524613aa..59ea97eff 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -274,6 +274,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2d7b36ff9..96f17769f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -284,6 +284,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 662b21bd5..7a6ef8135 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -262,6 +262,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 7d0dda046..bc7ba0c3a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -250,6 +250,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 3e855d053..8dc20118d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -240,6 +240,7 @@
 'label.template' => 'Template',
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
+'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b314181e7..7978ff557 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -277,6 +277,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7ffb16569..94fb496e4 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -265,6 +265,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e404d79c9..17a76172e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -272,6 +272,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index ac6e438f8..661edd86c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -266,6 +266,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5a38ee3fe..b797b6ff1 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -260,6 +260,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 608b38783..a69e6aa8c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -253,6 +253,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f0a31aa2b..8cc4d0227 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -283,6 +283,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 0bc245f6f..8c2e730c6 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -279,6 +279,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 54cf7e734..c1a87b731 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -257,6 +257,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0a443f956..3b48408c6 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -284,6 +284,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c4988fa35..1a77cde76 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -284,6 +284,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c5a3b509b..426a14285 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -242,6 +242,7 @@
 // TODO: translate the following.
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 55cb9d86d..a37e8881b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -281,6 +281,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 5a6ea8a9a..9258b8512 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -267,6 +267,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 843258fbe..99d4d1c73 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -264,6 +264,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 538ec9887..8969cdcdd 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -269,6 +269,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 10803e21f..74b843e98 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -281,6 +281,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 751d3a75c..c8dee6fc4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -239,6 +239,7 @@
 'label.template' => 'Шаблон',
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
+'label.image' => 'Изображение',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 81409771b..34d92dd59 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -272,6 +272,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 712b3ee5c..a4cc8fef9 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -264,6 +264,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a45414549..7178d548c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -265,6 +265,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 105b25f00..818a7db5e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -261,6 +261,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a02ed68ae..7608d155f 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -288,6 +288,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 33cd0898d..ef133c967 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -272,6 +272,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 12a328e20..9aa124518 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -279,6 +279,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.image' => 'Image',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/templates/project_files.tpl b/WEB-INF/templates/project_files.tpl
new file mode 100644
index 000000000..0313e030a
--- /dev/null
+++ b/WEB-INF/templates/project_files.tpl
@@ -0,0 +1,102 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+{if $user->can('manage_projects')}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+  {if $inactive_projects}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
+  {/if}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.image}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+  {if $show_files}
+          <td class="tableHeader">{$i18n.label.files}</td>
+  {/if}
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
+        </tr>
+  {if $active_projects}
+    {foreach $active_projects as $project}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>
+      {if $show_files}
+          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+      {/if}
+          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
+          <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
+  {if $inactive_projects}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.inactive_projects}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+    {if $show_files}
+          <td class="tableHeader">{$i18n.label.files}</td>
+    {/if}
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
+        </tr>
+    {foreach $inactive_projects as $project}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>
+      {if $show_files}
+          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+      {/if}
+          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
+          <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
+        </tr>
+    {/foreach}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+  {/if}
+{else}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.description}</td>
+    {if $show_files}
+          <td class="tableHeader">{$i18n.label.files}</td>
+    {/if}
+        </tr>
+  {if $active_projects}
+    {foreach $active_projects as $project}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>
+      {if $show_files}
+          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+      {/if}
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+{/if}
+    </td>
+  </tr>
+</table>
diff --git a/project_files.php b/project_files.php
index baec9aa23..b069acb7f 100644
--- a/project_files.php
+++ b/project_files.php
@@ -27,8 +27,7 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('form.Form');
-import('ttGroupHelper');
+import('ttProjectHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
@@ -39,17 +38,18 @@
   header('Location: feature_disabled.php');
   exit();
 }
+$cl_project_id = (int)$request->getParameter('id');
+$project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
 // End of access checks.
 
-if($user->can('manage_projects')) {
-  $active_projects = ttGroupHelper::getActiveProjects();
-  $inactive_projects = ttGroupHelper::getInactiveProjects();
-} else
-  $active_projects = $user->getAssignedProjects();
+$files = null;
+// $files = ttAttachmentHelper::getProjectFiles();
 
-$smarty->assign('active_projects', $active_projects);
-$smarty->assign('inactive_projects', $inactive_projects);
-$smarty->assign('show_files', $user->isPluginEnabled('at'));
+$smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.project_files'));
-$smarty->assign('content_page_name', 'projects.tpl');
+$smarty->assign('content_page_name', 'project_files.tpl');
 $smarty->display('index.tpl');
diff --git a/projects.php b/projects.php
index 97a86ba63..236291cdb 100644
--- a/projects.php
+++ b/projects.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('form.Form');
 import('ttGroupHelper');
 
 // Access checks.

From 801da0e379cfd72ee9b3f9d6e2718989bb5a1d80 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Mar 2019 16:04:19 +0000
Subject: [PATCH 0823/1848] Work in progress on project attachments.

---
 WEB-INF/lib/ttFileHelper.class.php  |  62 ++++++++++++++++
 WEB-INF/templates/project_files.tpl | 107 +++++++---------------------
 project_files.php                   |  28 ++++++++
 3 files changed, 116 insertions(+), 81 deletions(-)
 create mode 100644 WEB-INF/lib/ttFileHelper.class.php

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
new file mode 100644
index 000000000..7273d8080
--- /dev/null
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -0,0 +1,62 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// ttFileHelper class is used for attachment handling.
+class ttFileHelper {
+  var $errors               = null; // Errors go here. Set in constructor by reference.
+
+  // Constructor.
+  function __construct(&$errors) {
+    $this->errors = &$errors;
+  }
+
+  // putFile - puts uploaded file in storage.
+  function putFile() {
+
+    unlink($_FILES['newfile']['tmp_name']);
+    return false; // Not implemented.
+/*
+    // Create a temporary file.
+    $dirName = dirname(TEMPLATE_DIR . '_c/.');
+    $filename = tempnam($dirName, 'import_');
+
+    // If the file is compressed - uncompress it.
+    if ($compressed) {
+      if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
+        $this->errors->add($i18n->get('error.sys'));
+        return;
+      }
+      unlink($_FILES['newfile']['tmp_name']);
+    } else {
+      if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
+        $this->errors->add($i18n->get('error.upload'));
+        return;
+      }
+    }*/
+  }
+}
diff --git a/WEB-INF/templates/project_files.tpl b/WEB-INF/templates/project_files.tpl
index 0313e030a..d092e3cb3 100644
--- a/WEB-INF/templates/project_files.tpl
+++ b/WEB-INF/templates/project_files.tpl
@@ -1,102 +1,47 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->can('manage_projects')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_projects}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
-  {/if}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.image}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-  {if $show_files}
-          <td class="tableHeader">{$i18n.label.files}</td>
-  {/if}
+{if $can_manage}
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
+{/if}
         </tr>
-  {if $active_projects}
-    {foreach $active_projects as $project}
+{if $files}
+  {foreach $files as $file}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
-      {/if}
-          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
-          <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_projects}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.inactive_projects}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td class="tableHeader">{$i18n.label.files}</td>
+          <td>{$file.name|escape}</td>
+          <td>{$file.description|escape}</td>
+    {if $can_manage}
+          <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
+          <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>
     {/if}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
-        </tr>
-    {foreach $inactive_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
-      {/if}
-          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
-          <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>
-    {/foreach}
+  {/foreach}
+{/if}
       </table>
+    </td>
+  </tr>
+</table>
 
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+{if $can_manage}
+{$forms.fileUploadForm.open}
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td align="center">
+      <table border="0" width="60%">
         <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td class="tableHeader">{$i18n.label.files}</td>
-    {/if}
+            <td align="right">{$i18n.label.description}:</td>
+            <td>{$forms.fileUploadForm.description.control}</td>
+            <td align="left">{$forms.fileUploadForm.newfile.control}</td>
         </tr>
-  {if $active_projects}
-    {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
-      {/if}
-        </tr>
-    {/foreach}
-  {/if}
+        <tr><td height="50" align="center" colspan="3">{$forms.fileUploadForm.btn_submit.control}</td></tr>
       </table>
-{/if}
     </td>
   </tr>
 </table>
+{$forms.fileUploadForm.close}
+{/if}
diff --git a/project_files.php b/project_files.php
index b069acb7f..08e9b5f21 100644
--- a/project_files.php
+++ b/project_files.php
@@ -27,7 +27,9 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
+import('form.Form');
 import('ttProjectHelper');
+import('ttFileHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
@@ -46,9 +48,35 @@
 }
 // End of access checks.
 
+if ($request->isPost()) {
+  $cl_description = trim($request->getParameter('description'));
+}
+
 $files = null;
 // $files = ttAttachmentHelper::getProjectFiles();
 
+$form = new Form('fileUploadForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
+$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit'),'maxsize'=>67108864)); // 64 MB file upload limit.
+// Note: for the above limit to work make sure to set upload_max_filesize and post_max_size in php.ini to at least 64M.
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // We are adding a new file.
+
+  // Validate user input.
+  if (!$_FILES['newfile']['name']) $err->add($i18n->get('error.upload'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Finished validating user input.
+
+  $fileHelper = new ttFileHelper($err);
+  $fileHelper->putFile();
+//  if ($err->no()) $msg->add($i18n->get('form.import.success'));
+} // isPost
+
+$smarty->assign('can_manage', $user->can('manage_projects'));
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.project_files'));
 $smarty->assign('content_page_name', 'project_files.tpl');

From 480abba5e6b6395dd8314392274e041f4f018fa7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Mar 2019 17:57:46 +0000
Subject: [PATCH 0824/1848] Introduced tt_files table.

---
 WEB-INF/lib/ttFileHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          | 26 +++++++++++++++++++++++++-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 7273d8080..611df39e1 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -35,7 +35,7 @@ function __construct(&$errors) {
     $this->errors = &$errors;
   }
 
-  // putFile - puts uploaded file in storage.
+  // putFile - puts uploaded file in remote storage.
   function putFile() {
 
     unlink($_FILES['newfile']['tmp_name']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 22eeb9bb6..c1d42357c 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.58.4871 | 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.59.4872 | 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/dbinstall.php b/dbinstall.php
index 7ecf75c4e..11cd7e95f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11855"]) {
+  if ($_POST["convert11797to11859"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1127,6 +1127,8 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.54', modified = now() where param_name = 'version_db' and param_value = '1.18.51'");
     ttExecute("ALTER TABLE `tt_templates` ADD `description` varchar(255) default NULL AFTER `name`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.55', modified = now() where param_name = 'version_db' and param_value = '1.18.54'");
+    ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY  (`id`))");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.59', modified = now() where param_name = 'version_db' and param_value = '1.18.55'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1176,7 +1178,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.55)</b>
+    <td width="80%"><b>Create database structure (v1.18.59)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1221,8 +1223,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.55)</td>
-    <td><input type="submit" name="convert11797to11855" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.59)</td>
+    <td><input type="submit" name="convert11797to11859" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index eea348c03..fcc4371eb 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -534,6 +534,30 @@ CREATE TABLE `tt_templates` (
 );
 
 
+#
+# Structure for table tt_files.
+# This table keeps file attachment information.
+#
+CREATE TABLE `tt_files` (
+  `id` int(10) unsigned NOT NULL auto_increment, # file id
+  `group_id` int(10) unsigned,                   # group id
+  `org_id` int(10) unsigned,                     # organization id
+  `remote_id` bigint(20) unsigned,               # file id in storage facility
+  `entity_type` varchar(32),                     # type of entity file is associated with (project, task, etc.)
+  `entity_id` int(10) unsigned,                  # entity id
+  `file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # file name
+  `description` varchar(255) default NULL,       # file description
+  `created` datetime default NULL,               # creation timestamp
+  `created_ip` varchar(45) default NULL,         # creator ip
+  `created_by` int(10) unsigned,                 # creator user_id
+  `modified` datetime default NULL,              # modification timestamp
+  `modified_ip` varchar(45) default NULL,        # modifier ip
+  `modified_by` int(10) unsigned,                # modifier user_id
+  `status` tinyint(1) default 1,                 # file status
+  PRIMARY KEY  (`id`)
+);
+
+
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
@@ -547,4 +571,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.55', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.59', now()); # TODO: change when structure changes.

From 53e04060039f7c488fa5ca6bc018103763b901c5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Mar 2019 14:17:23 +0000
Subject: [PATCH 0825/1848] Work in progress on project attachments.

---
 WEB-INF/config.php.dist            |  5 ++++
 WEB-INF/lib/ttFileHelper.class.php | 48 ++++++++++++++++++++++++++++--
 WEB-INF/lib/ttOrgHelper.class.php  |  4 +--
 WEB-INF/templates/footer.tpl       |  2 +-
 project_files.php                  |  6 ++--
 5 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index d8bfe0c10..b9ae7bd02 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -197,3 +197,8 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
+
+// $GLOBALS['FILE_STORAGE_PARAMS'] = array(
+//  'uri' => 'localhost',               // File storage uri.
+//  'site_id' => '1',                   // This site id for file storage facility.
+//  'site_key' => 'debug_key');         // This site key for file storage facility.
diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 611df39e1..26a286779 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -28,15 +28,59 @@
 
 // ttFileHelper class is used for attachment handling.
 class ttFileHelper {
-  var $errors               = null; // Errors go here. Set in constructor by reference.
+  var $errors = null; // Errors go here. Set in constructor by reference.
+  var $storage_uri = null;
+  var $site_id = null;
+  var $site_key = null;
 
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
+
+    if (isset($GLOBALS['FILE_STORAGE_PARAMS']) && is_array($GLOBALS['FILE_STORAGE_PARAMS'])) {
+       $params = $GLOBALS['FILE_STORAGE_PARAMS'];
+       $this->storage_uri = $params['uri'];
+       $this->site_id = $params['site_id'];
+       $this->site_key = $params['site_key'];
+    }
   }
 
   // putFile - puts uploaded file in remote storage.
-  function putFile() {
+  function putFile($description) {
+
+    $url = $this->storage_uri;
+    $fields = array('description' => urlencode($description),
+//	'fname' => urlencode($_POST['first_name']),
+//	'title' => urlencode($_POST['title']),
+//	'company' => urlencode($_POST['institution']),
+//	'age' => urlencode($_POST['age']),
+//	'email' => urlencode($_POST['email']),
+//	'phone' => urlencode($_POST['phone'])
+    );
+
+    // url-ify the data for the POST.
+    foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post rewuest.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if ($result) {
+      $result_array = json_decode($result, true);
+      $file_id = $mdb2->quote($result_array['id']);
+    }
 
     unlink($_FILES['newfile']['tmp_name']);
     return false; // Not implemented.
diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 07b70b5fd..346ea5d1c 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -63,7 +63,7 @@ static function getName($org_id) {
     return false;
   }
 
-  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 10 for now).
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 25 for now).
   static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
@@ -72,7 +72,7 @@ static function getInactiveOrgs() {
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
       " (select max(accessed) as last_access, org_id from tt_users where org_id > 0 group by org_id order by last_access, org_id) as t".
-      " where last_access is null or last_access < $cutoff_timestamp limit 10"; // Max 10 orgs at a time for now...
+      " where last_access is null or last_access < $cutoff_timestamp limit 25"; // Max 25 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c1d42357c..d8614a7a0 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.59.4872 | 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.59.4873 | 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/project_files.php b/project_files.php
index 08e9b5f21..affc6d72a 100644
--- a/project_files.php
+++ b/project_files.php
@@ -70,8 +70,10 @@
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   // Finished validating user input.
 
-  $fileHelper = new ttFileHelper($err);
-  $fileHelper->putFile();
+  if ($err->no()) {
+    $fileHelper = new ttFileHelper($err);
+    $fileHelper->putFile($cl_description);
+  }
 //  if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost
 

From d47f034f5d1b5e70185507046dc09df7c1299d81 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Mar 2019 16:04:31 +0000
Subject: [PATCH 0826/1848] A bit more work in progress on attachment handling.

---
 WEB-INF/config.php.dist            |  8 +--
 WEB-INF/lib/ttFileHelper.class.php | 81 ++++++++++++++++++++++++++----
 WEB-INF/templates/footer.tpl       |  2 +-
 3 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index b9ae7bd02..b9b292b64 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -198,7 +198,7 @@ define('AUTH_MODULE', 'db');
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
 
-// $GLOBALS['FILE_STORAGE_PARAMS'] = array(
-//  'uri' => 'localhost',               // File storage uri.
-//  'site_id' => '1',                   // This site id for file storage facility.
-//  'site_key' => 'debug_key');         // This site key for file storage facility.
+// File storage facility location for attachments.
+// This feature requires a subscription or a locally installed appliance.
+// define('FILE_STORAGE_URI', 'localhost');
+define('FILE_STORAGE_URI', 'https://www.anuko.com/files/');
diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 26a286779..aad91e9fd 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -28,20 +28,83 @@
 
 // ttFileHelper class is used for attachment handling.
 class ttFileHelper {
-  var $errors = null; // Errors go here. Set in constructor by reference.
-  var $storage_uri = null;
-  var $site_id = null;
-  var $site_key = null;
+  var $errors = null;       // Errors go here. Set in constructor by reference.
+  var $storage_uri = null;  // Location of file storage facility.
+  var $register_uri = null; // URI to register with file storage facility.
+  var $putfile_uri = null;  // URI to put file in file storage.
+  var $getfile_uri = null;  // URI to get file from file storage.
+  var $site_id = null;      // Site id for file storage.
+  var $site_key = null;     // Site key for file storage.
 
   // Constructor.
   function __construct(&$errors) {
     $this->errors = &$errors;
 
-    if (isset($GLOBALS['FILE_STORAGE_PARAMS']) && is_array($GLOBALS['FILE_STORAGE_PARAMS'])) {
-       $params = $GLOBALS['FILE_STORAGE_PARAMS'];
-       $this->storage_uri = $params['uri'];
-       $this->site_id = $params['site_id'];
-       $this->site_key = $params['site_key'];
+    if (defined('FILE_STORAGE_URI')) {
+      $this->storage_uri = FILE_STORAGE_URI;
+      $this->register_uri = $this->storage_uri.'register';
+      $this->putfile_uri = $this->storage_uri.'putfile';
+      $this->getfile_uri = $this->storage_uri.'getfile';
+      $this->checkSiteRegistration();
+    }
+  }
+
+  // checkSiteRegistration - obtains site id and key from local database.
+  // If not found, it tries to register with file stroage facility.
+  function checkSiteRegistration() {
+    $mdb2 = getConnection();
+
+    // Obtain site id.
+    $sql = "select param_value as id from tt_site_config where param_name = 'locker_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if (!$val) {
+      // No site id found, need to register.
+      $fields = array('name' => urlencode('time tracker'),
+        'origin' => urlencode('time tracker source'));
+
+      // Urlify the data for the POST.
+      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+      $fields_string = rtrim($fields_string, '&');
+
+      // Open connection.
+      $ch = curl_init();
+
+      // Set the url, number of POST vars, POST data.
+      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
+      curl_setopt($ch, CURLOPT_POST, count($fields));
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+      // Execute a post request.
+      $result = curl_exec($ch);
+
+      // Close connection.
+      curl_close($ch);
+
+      if ($result) {
+        $result_array = json_decode($result, true);
+        if ($result_array && $result_array['id'] && $result_array['key']) {
+
+          $this->site_id = $mdb2->quote($result_array['id']);
+          $this->site_key = $mdb2->quote($result_array['key']);
+
+          // Registration successful. Store id and key locally for future use.
+          $sql = "insert into tt_site_config values('locker_id', $site_id, now(), null)";
+          $mdb2->exec($sql);
+          $sql = "insert into tt_site_config values('locker_key', $key, now(), null)";
+          $mdb2->exec($sql);
+        }
+      }
+    } else {
+      // Site id found, need to update site attributes.
+      $this->site_id = $val['id'];
+
+      // Obtain site key.
+      $sql = "select param_value as site_key from tt_site_config where param_name = 'locker_key'";
+      $res = $mdb2->query($sql);
+      $val = $res->fetchRow();
+      $this->site_key = $val['site_key'];
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d8614a7a0..1dcec8020 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.59.4873 | 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.59.4874 | 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>

From 0e6900be0bcfc882505ec4c8b8730a798985bc80 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Mar 2019 17:43:17 +0000
Subject: [PATCH 0827/1848] More progress with attachments.

---
 WEB-INF/lib/ttFileHelper.class.php | 34 +++++++++++++++++++-----------
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  1 +
 WEB-INF/resources/de.lang.php      |  1 +
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/resources/es.lang.php      |  1 +
 WEB-INF/resources/et.lang.php      |  2 ++
 WEB-INF/resources/fa.lang.php      |  2 ++
 WEB-INF/resources/fi.lang.php      |  1 +
 WEB-INF/resources/fr.lang.php      |  1 +
 WEB-INF/resources/gr.lang.php      |  1 +
 WEB-INF/resources/he.lang.php      |  1 +
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  1 +
 WEB-INF/resources/ja.lang.php      |  1 +
 WEB-INF/resources/ko.lang.php      |  1 +
 WEB-INF/resources/nl.lang.php      |  2 ++
 WEB-INF/resources/no.lang.php      |  1 +
 WEB-INF/resources/pl.lang.php      |  1 +
 WEB-INF/resources/pt-br.lang.php   |  1 +
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  1 +
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  1 +
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  1 +
 WEB-INF/resources/sv.lang.php      |  1 +
 WEB-INF/resources/tr.lang.php      |  1 +
 WEB-INF/resources/zh-cn.lang.php   |  1 +
 WEB-INF/resources/zh-tw.lang.php   |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 project_files.php                  |  5 ++++-
 33 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index aad91e9fd..af470c711 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -52,6 +52,8 @@ function __construct(&$errors) {
   // checkSiteRegistration - obtains site id and key from local database.
   // If not found, it tries to register with file stroage facility.
   function checkSiteRegistration() {
+
+    global $i18n;
     $mdb2 = getConnection();
 
     // Obtain site id.
@@ -94,6 +96,8 @@ function checkSiteRegistration() {
           $mdb2->exec($sql);
           $sql = "insert into tt_site_config values('locker_key', $key, now(), null)";
           $mdb2->exec($sql);
+        } else {
+          $this->errors->add($i18n->get('error.file_storage'));
         }
       }
     } else {
@@ -109,16 +113,21 @@ function checkSiteRegistration() {
   }
 
   // putFile - puts uploaded file in remote storage.
-  function putFile($description) {
-
-    $url = $this->storage_uri;
-    $fields = array('description' => urlencode($description),
-//	'fname' => urlencode($_POST['first_name']),
-//	'title' => urlencode($_POST['title']),
-//	'company' => urlencode($_POST['institution']),
-//	'age' => urlencode($_POST['age']),
-//	'email' => urlencode($_POST['email']),
-//	'phone' => urlencode($_POST['phone'])
+  function putFile($fields) {
+    $mdb2 = getConnection();
+
+    $fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      //'org_id' => urlencode($this->org_id),       // TODO: obtain this properly.
+      //'org_key' => urlencode($this->org_key),     // TODO: obtain this properly.
+      //'group_id' => urlencode($this->group_id),   // TODO: obtain this properly.
+      //'group_key' => urlencode($this->group_key), // TODO: obtain this properly.
+      //'user_id' => urlencode($this->user_id),     // TODO: obtain this properly.
+      //'user_key' => urlencode($this->user_key),   // TODO: obtain this properly.
+      'file_name' => urlencode($fields['file_name']),
+      'description' => urlencode($fields['description']),
+      // TODO: add file content here, too. Will this work for large files?
+      //
     );
 
     // url-ify the data for the POST.
@@ -129,7 +138,7 @@ function putFile($description) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
     curl_setopt($ch, CURLOPT_POST, count($fields));
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -142,7 +151,8 @@ function putFile($description) {
 
     if ($result) {
       $result_array = json_decode($result, true);
-      $file_id = $mdb2->quote($result_array['id']);
+      $file_id = $result_array['file_id'];
+      $file_key = $result_array['file_key'];
     }
 
     unlink($_FILES['newfile']['tmp_name']);
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 59ea97eff..06a28c88a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -120,6 +120,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 96f17769f..97ab7e676 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -122,6 +122,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7a6ef8135..403289ba1 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -116,6 +116,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index bc7ba0c3a..980706d28 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -110,6 +110,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 8dc20118d..f1fc72aa1 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -105,6 +105,7 @@
 'error.format' => 'Invalid file format.',
 'error.user_count' => 'Limit on user count.',
 'error.expired' => 'Expiration date reached.',
+'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 7978ff557..4f33f6d9f 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -118,6 +118,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 94fb496e4..f46db014a 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -126,6 +126,8 @@
 'error.format' => 'Faili formaat on vale.',
 'error.user_count' => 'Kasutajate arvu piirang.',
 'error.expired' => 'Kehtivusaeg on lõppenud.',
+// TODO: translate the following.
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Oled kindel?',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 17a76172e..8111b3d36 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -123,6 +123,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// TODO: translate the following.
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 661edd86c..2f3a40923 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -118,6 +118,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b797b6ff1..1bb5f680f 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -116,6 +116,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a69e6aa8c..bb2a334b2 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -111,6 +111,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8cc4d0227..19ace043b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -133,6 +133,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8c2e730c6..349c224c1 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -121,6 +121,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index c1a87b731..c19f9f3d6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -115,6 +115,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3b48408c6..c53b8aede 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -124,6 +124,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1a77cde76..cf3f608ed 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -123,6 +123,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 426a14285..e56846c79 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -105,6 +105,8 @@
 'error.format' => 'Bestandsformaat niet valide.',
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
+// TODO: translate the following.
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a37e8881b..e6816351c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -124,6 +124,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9258b8512..e81fc254d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -120,6 +120,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // 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 99d4d1c73..f5d923906 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -117,6 +117,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8969cdcdd..a0ac39b24 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -117,6 +117,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 74b843e98..83218b041 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -124,6 +124,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c8dee6fc4..36815e9fb 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -104,6 +104,7 @@
 'error.format' => 'Неверный формат файла.',
 'error.user_count' => 'Ограничение на количество пользователей.',
 'error.expired' => 'Достигнута дата экспирации.',
+'error.file_storage' => 'Ошибка файлохранилища.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 34d92dd59..1a53dc8f2 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -122,6 +122,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index a4cc8fef9..c9144c8cf 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -114,6 +114,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7178d548c..6365d1c09 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -117,6 +117,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 818a7db5e..c89dd6488 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -115,6 +115,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7608d155f..fd96a2af7 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -127,6 +127,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // 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 ef133c967..8d561837a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -116,6 +116,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // 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 9aa124518..dc590fec5 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -121,6 +121,7 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1dcec8020..9f0efd99a 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.59.4874 | 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.59.4875 | 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/project_files.php b/project_files.php
index affc6d72a..fec090b21 100644
--- a/project_files.php
+++ b/project_files.php
@@ -72,7 +72,10 @@
 
   if ($err->no()) {
     $fileHelper = new ttFileHelper($err);
-    $fileHelper->putFile($cl_description);
+    $fields = array('description'=>$cl_description); // TODO: add other fields here if required.
+    if (!$fileHelper->putFile($fields)) {
+      $err->add($i18n->get('error.expired'));
+    }
   }
 //  if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost

From 632603b4ab876cc0fa641402a16c824888deae7a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Mar 2019 19:18:27 +0000
Subject: [PATCH 0828/1848] More progress on attachment handling.

---
 WEB-INF/lib/ttFileHelper.class.php | 67 +++++++++++++++++-------------
 WEB-INF/templates/footer.tpl       |  2 +-
 project_files.php                  |  8 ++--
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index af470c711..f41fa8463 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -96,8 +96,6 @@ function checkSiteRegistration() {
           $mdb2->exec($sql);
           $sql = "insert into tt_site_config values('locker_key', $key, now(), null)";
           $mdb2->exec($sql);
-        } else {
-          $this->errors->add($i18n->get('error.file_storage'));
         }
       }
     } else {
@@ -114,13 +112,20 @@ function checkSiteRegistration() {
 
   // putFile - puts uploaded file in remote storage.
   function putFile($fields) {
+    // if (!$this->site_id || !$this->site_key) return false;
+
+    global $i18n;
+    global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
-      //'org_id' => urlencode($this->org_id),       // TODO: obtain this properly.
+      'org_id' => urlencode($org_id),
       //'org_key' => urlencode($this->org_key),     // TODO: obtain this properly.
-      //'group_id' => urlencode($this->group_id),   // TODO: obtain this properly.
+      'group_id' => urlencode($group_id),
       //'group_key' => urlencode($this->group_key), // TODO: obtain this properly.
       //'user_id' => urlencode($this->user_id),     // TODO: obtain this properly.
       //'user_key' => urlencode($this->user_key),   // TODO: obtain this properly.
@@ -149,31 +154,37 @@ function putFile($fields) {
     // Close connection.
     curl_close($ch);
 
-    if ($result) {
-      $result_array = json_decode($result, true);
-      $file_id = $result_array['file_id'];
-      $file_key = $result_array['file_key'];
-    }
-
+    // Delete uploaded file.
     unlink($_FILES['newfile']['tmp_name']);
-    return false; // Not implemented.
-/*
-    // Create a temporary file.
-    $dirName = dirname(TEMPLATE_DIR . '_c/.');
-    $filename = tempnam($dirName, 'import_');
-
-    // If the file is compressed - uncompress it.
-    if ($compressed) {
-      if (!$this->uncompress($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->get('error.sys'));
-        return;
-      }
-      unlink($_FILES['newfile']['tmp_name']);
-    } else {
-      if (!move_uploaded_file($_FILES['xmlfile']['tmp_name'], $filename)) {
-        $this->errors->add($i18n->get('error.upload'));
-        return;
+
+    if (!$result) return false;
+
+    $result_array = json_decode($result, true);
+    $file_id = (int) $result_array['file_id'];
+    $file_key = $result_array['file_key'];
+    $file_error = $result_array['file_error'];
+
+    if (!$file_id || !$file_key) {
+      if ($file_error) {
+        // Add an error message from file storage facility if we have it.
+        $this->errors->add($file_error);
       }
-    }*/
+      return false;
+    }
+
+    // File put was successful. Store file attributes locally.
+    $entity_type = $mdb2->quote($fields['entity_type']);
+    $entity_id = (int) $fields['entity_id'];
+    $file_name = $mdb2->quote($fields['file_name']);
+    $description = $mdb2->quote($fields['description']);
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $created_by = $user->id;
+
+    $columns = '(group_id, org_id, remote_id, entity_type, entity_id, file_name, description, created, created_ip, created_by)';
+    $values = "values($group_id, $org_id, $file_id, $entity_type, $entity_id, $file_name, $description, $created, $created_ip, $created_by)";
+    $sql = "insert into tt_files $columns $values";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9f0efd99a..96e99fc8a 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.59.4875 | 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.59.4876 | 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/project_files.php b/project_files.php
index fec090b21..cc917466b 100644
--- a/project_files.php
+++ b/project_files.php
@@ -72,12 +72,14 @@
 
   if ($err->no()) {
     $fileHelper = new ttFileHelper($err);
-    $fields = array('description'=>$cl_description); // TODO: add other fields here if required.
+    $fields = array('entity_type'=>'project',
+      'entity_id' => $cl_project_id,
+      'file_name' => $_FILES['newfile']['name'],
+      'description'=>$cl_description);
     if (!$fileHelper->putFile($fields)) {
-      $err->add($i18n->get('error.expired'));
+      $err->add($i18n->get('error.file_storage'));
     }
   }
-//  if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost
 
 $smarty->assign('can_manage', $user->can('manage_projects'));

From b445bc863566fd9708781242786400273dd0c8a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 17 Mar 2019 20:26:23 +0000
Subject: [PATCH 0829/1848] Added file_key field to tt_files table.

---
 WEB-INF/lib/ttFileHelper.class.php |  2 +-
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index f41fa8463..22f2d0a54 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -166,7 +166,7 @@ function putFile($fields) {
 
     if (!$file_id || !$file_key) {
       if ($file_error) {
-        // Add an error message from file storage facility if we have it.
+        // Add an error from file storage facility if we have it.
         $this->errors->add($file_error);
       }
       return false;
diff --git a/dbinstall.php b/dbinstall.php
index 11cd7e95f..37b1d09dd 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11859"]) {
+  if ($_POST["convert11797to11860"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1129,6 +1129,8 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.55', modified = now() where param_name = 'version_db' and param_value = '1.18.54'");
     ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY  (`id`))");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.59', modified = now() where param_name = 'version_db' and param_value = '1.18.55'");
+    ttExecute("ALTER TABLE `tt_files` ADD `file_key` varchar(32) AFTER `remote_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1178,7 +1180,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.59)</b>
+    <td width="80%"><b>Create database structure (v1.18.60)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1223,8 +1225,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.59)</td>
-    <td><input type="submit" name="convert11797to11859" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.60)</td>
+    <td><input type="submit" name="convert11797to11860" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index fcc4371eb..d52882ccc 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -543,6 +543,7 @@ CREATE TABLE `tt_files` (
   `group_id` int(10) unsigned,                   # group id
   `org_id` int(10) unsigned,                     # organization id
   `remote_id` bigint(20) unsigned,               # file id in storage facility
+  `file_key` varchar(32),                        # file key
   `entity_type` varchar(32),                     # type of entity file is associated with (project, task, etc.)
   `entity_id` int(10) unsigned,                  # entity id
   `file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # file name
@@ -571,4 +572,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.59', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.60', now()); # TODO: change when structure changes.

From 54d64e3d8f517e65577aa47fb6e38114e42f4970 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Mar 2019 14:07:38 +0000
Subject: [PATCH 0830/1848] Resuming work on attachments handling.

---
 WEB-INF/lib/ttFileHelper.class.php | 24 ++++++++++++------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 22f2d0a54..68bb38a57 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -50,7 +50,7 @@ function __construct(&$errors) {
   }
 
   // checkSiteRegistration - obtains site id and key from local database.
-  // If not found, it tries to register with file stroage facility.
+  // If not found, it tries to register with file storage facility.
   function checkSiteRegistration() {
 
     global $i18n;
@@ -84,19 +84,19 @@ function checkSiteRegistration() {
       // Close connection.
       curl_close($ch);
 
-      if ($result) {
-        $result_array = json_decode($result, true);
-        if ($result_array && $result_array['id'] && $result_array['key']) {
+      $result_array = json_decode($result, true);
+      if ($result_array && $result_array['id'] && $result_array['key']) {
 
-          $this->site_id = $mdb2->quote($result_array['id']);
-          $this->site_key = $mdb2->quote($result_array['key']);
+        $this->site_id = $result_array['id'];
+        $this->site_key = $result_array['key'];
 
-          // Registration successful. Store id and key locally for future use.
-          $sql = "insert into tt_site_config values('locker_id', $site_id, now(), null)";
-          $mdb2->exec($sql);
-          $sql = "insert into tt_site_config values('locker_key', $key, now(), null)";
-          $mdb2->exec($sql);
-        }
+        // Registration successful. Store id and key locally for future use.
+        $sql = "insert into tt_site_config values('locker_id', $this->site_id, now(), null)";
+        $mdb2->exec($sql);
+        $sql = "insert into tt_site_config values('locker_key', ".$mdb2->quote($this->site_key).", now(), null)";
+        $mdb2->exec($sql);
+      } else {
+        $this->errors->add($i18n->get('error.file_storage'));
       }
     } else {
       // Site id found, need to update site attributes.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 96e99fc8a..64d841019 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.59.4876 | 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.59.4877 | 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>

From 3cd816de20457c5224d72db358833b234571be70 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Mar 2019 14:58:32 +0000
Subject: [PATCH 0831/1848] Added group_key field to tt_groups.

---
 WEB-INF/lib/common.lib.php         | 11 +++++++++++
 WEB-INF/lib/ttFileHelper.class.php |  4 +---
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 10 ++++++----
 mysql.sql                          |  3 ++-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 6526d730c..e09a943f0 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -406,3 +406,14 @@ function ttDateToUserFormat($date)
   $o_date = new DateAndTime(DB_DATEFORMAT, $date);
   return $o_date->toString($user->date_format);
 }
+
+// ttRandomString generates a random alphanumeric string.
+function ttRandomString($length = 32) {
+  $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  $charactersLength = strlen($characters);
+  $randomString = '';
+  for ($i = 0; $i < $length; $i++) {
+    $randomString .= $characters[rand(0, $charactersLength - 1)];
+  }
+  return $randomString;
+}
diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 68bb38a57..80f07166a 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -99,7 +99,7 @@ function checkSiteRegistration() {
         $this->errors->add($i18n->get('error.file_storage'));
       }
     } else {
-      // Site id found, need to update site attributes.
+      // Site id found.
       $this->site_id = $val['id'];
 
       // Obtain site key.
@@ -112,8 +112,6 @@ function checkSiteRegistration() {
 
   // putFile - puts uploaded file in remote storage.
   function putFile($fields) {
-    // if (!$this->site_id || !$this->site_key) return false;
-
     global $i18n;
     global $user;
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 64d841019..d6be8733d 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.59.4877 | 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.61.4878 | 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/dbinstall.php b/dbinstall.php
index 37b1d09dd..063f20223 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ function ttExecute($sql) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11860"]) {
+  if ($_POST["convert11797to11861"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1131,6 +1131,8 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.59', modified = now() where param_name = 'version_db' and param_value = '1.18.55'");
     ttExecute("ALTER TABLE `tt_files` ADD `file_key` varchar(32) AFTER `remote_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `group_key` varchar(32) AFTER `org_id`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.61', modified = now() where param_name = 'version_db' and param_value = '1.18.60'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1180,7 +1182,7 @@ function ttExecute($sql) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.60)</b>
+    <td width="80%"><b>Create database structure (v1.18.61)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1225,8 +1227,8 @@ function ttExecute($sql) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.60)</td>
-    <td><input type="submit" name="convert11797to11860" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.61)</td>
+    <td><input type="submit" name="convert11797to11861" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index d52882ccc..e526e614e 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -16,6 +16,7 @@ CREATE TABLE `tt_groups` (
   `id` int(11) NOT NULL auto_increment,                  # group id
   `parent_id` int(11) default NULL,                      # parent group id
   `org_id` int(11) default NULL,                         # organization id (id of top group)
+  `group_key` varchar(32) default NULL,                  # group key
   `name` varchar(80) default NULL,                       # group name
   `description` varchar(255) default NULL,               # group description
   `currency` varchar(7) default NULL,                    # currency symbol
@@ -572,4 +573,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.60', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.61', now()); # TODO: change when structure changes.

From c5461f26c2b9b04044747c9f78fd710627067c83 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Mar 2019 15:28:02 +0000
Subject: [PATCH 0832/1848] Started to create group keys upon group creation.

---
 WEB-INF/lib/ttAdmin.class.php       | 5 +++--
 WEB-INF/lib/ttRegistrator.class.php | 4 +++-
 WEB-INF/templates/footer.tpl        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 383eb44c1..f5323322e 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -245,6 +245,7 @@ static function createGroup($fields) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_key = $mdb2->quote(ttRandomString());
     $name = $mdb2->quote($fields['group_name']);
     $currency = $mdb2->quote($fields['currency']);
     $lang = $mdb2->quote($fields['lang']);
@@ -252,8 +253,8 @@ static function createGroup($fields) {
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by = $user->id;
 
-    $sql = "insert into tt_groups (name, currency, lang, created, created_ip, created_by)".
-      " values($name, $currency, $lang, $created, $created_ip, $created_by)";
+    $sql = "insert into tt_groups (group_key, name, currency, lang, created, created_ip, created_by)".
+      " values($group_key, $name, $currency, $lang, $created, $created_ip, $created_by)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 1664461b8..b122d015f 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -145,13 +145,15 @@ function register() {
   function createGroup() {
     $mdb2 = getConnection();
 
+    $group_key = $mdb2->quote(ttRandomString());
     $name = $mdb2->quote($this->group_name);
     $currency = $mdb2->quote($this->currency);
     $lang = $mdb2->quote($this->lang);
     $created = 'now()';
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
 
-    $sql = "insert into tt_groups (name, currency, lang, created, created_ip) values($name, $currency, $lang, $created, $created_ip)";
+    $sql = "insert into tt_groups (group_key, name, currency, lang, created, created_ip)".
+      " values($group_key, $name, $currency, $lang, $created, $created_ip)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d6be8733d..b15c49d34 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.61.4878 | 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.61.4879 | 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>

From 0548833c334a8a16f6573c7d0da6413504e4d457 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Mar 2019 15:53:41 +0000
Subject: [PATCH 0833/1848] Added group key to creating subgroups.

---
 WEB-INF/lib/ttGroupHelper.class.php | 10 ++++++----
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index b77edf21a..ffa1e0480 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -88,18 +88,20 @@ static function insertSubgroup($fields) {
     $mdb2 = getConnection();
     $parent_id = $user->getGroup();
     $org_id = $user->org_id;
+    $group_key = ttRandomString();
     $name = $fields['name'];
     $description = $fields['description'];
 
     // We need to inherit attributes from the parent group.
     $attrs = ttGroupHelper::getGroupAttrs($parent_id);
 
-    $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.
-      ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
-      ', allow_ip, password_complexity, plugins, lock_spec'.
-      ', workday_minutes, config, created, created_ip, created_by)';
+    $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format,'.
+      ' time_format, week_start, tracking_mode, project_required, task_required, record_type, bcc_email,'.
+      ' allow_ip, password_complexity, plugins, lock_spec,'.
+      ' workday_minutes, config, created, created_ip, created_by)';
 
     $values = " values ($parent_id, $org_id";
+    $values .= ', '.$mdb2->quote($group_key);
     $values .= ', '.$mdb2->quote($name);
     $values .= ', '.$mdb2->quote($description);
     $values .= ', '.$mdb2->quote($attrs['currency']);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b15c49d34..4054a4a53 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.61.4879 | 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.61.4880 | 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>

From 957db67a316e7ab82eee99fb0698186bf4b4c589 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Mar 2019 16:02:38 +0000
Subject: [PATCH 0834/1848] Adjusted export-import to work with groups keys.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  3 ++-
 WEB-INF/lib/ttOrgImportHelper.class.php   | 10 ++++++----
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 9f0465d90..8a7b7e770 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -123,7 +123,8 @@ function writeData() {
 
     // Write group info.
     $group = $this->getGroupAttrs();
-    $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
+    $group_part = "<group group_key=\"".htmlspecialchars($group['group_key'])."\"";
+    $group_part .= " name=\"".htmlspecialchars($group['name'])."\"";
     $group_part .= " description=\"".htmlspecialchars($group['description'])."\"";
     $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 2a544738e..b9c76620f 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -102,6 +102,7 @@ function startElement($parser, $name, $attrs) {
         $this->current_group_id = $this->createGroup(array(
           'parent_id' => $this->current_group_id, // Note: after insert current_group_id changes.
           'org_id' => $this->org_id,
+          'group_key' => $attrs['GROUP_KEY'],
           'name' => $attrs['NAME'],
           'description' => $attrs['DESCRIPTION'],
           'currency' => $attrs['CURRENCY'],
@@ -686,14 +687,15 @@ private function createGroup($fields) {
     global $i18n;
     $mdb2 = getConnection();
 
-    $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.
-      ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
-      ', allow_ip, password_complexity, plugins, lock_spec'.
-      ', workday_minutes, config, created, created_ip, created_by)';
+    $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format, time_format,'.
+      ' week_start, tracking_mode, project_required, task_required, record_type, bcc_email,'.
+      ' allow_ip, password_complexity, plugins, lock_spec,'.
+      ' workday_minutes, config, created, created_ip, created_by)';
 
     $values = ' values (';
     $values .= $mdb2->quote($fields['parent_id']);
     $values .= ', '.$mdb2->quote($fields['org_id']);
+    $values .= ', '.$mdb2->quote(trim($fields['group_key']));
     $values .= ', '.$mdb2->quote(trim($fields['name']));
     $values .= ', '.$mdb2->quote(trim($fields['description']));
     $values .= ', '.$mdb2->quote(trim($fields['currency']));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4054a4a53..060b8e025 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.61.4880 | 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.61.4881 | 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>

From 137822b2c8874dd8a5b56b58774d50f09c122220 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Mar 2019 17:24:33 +0000
Subject: [PATCH 0835/1848] Some more work in progress on attachments.

---
 WEB-INF/lib/ttFileHelper.class.php | 34 ++++++++++++++++++++++++++----
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 80f07166a..441b8f40a 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -122,11 +122,11 @@ function putFile($fields) {
     $fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      //'org_key' => urlencode($this->org_key),     // TODO: obtain this properly.
+      'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      //'group_key' => urlencode($this->group_key), // TODO: obtain this properly.
-      //'user_id' => urlencode($this->user_id),     // TODO: obtain this properly.
-      //'user_key' => urlencode($this->user_key),   // TODO: obtain this properly.
+      'group_key' => urlencode($this->getGroupKey()),
+      'user_id' => urlencode($fields['user_id']),   // May be null.
+      'user_key' => urlencode($fields['user_key']), // May be null.
       'file_name' => urlencode($fields['file_name']),
       'description' => urlencode($fields['description']),
       // TODO: add file content here, too. Will this work for large files?
@@ -185,4 +185,30 @@ function putFile($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getOrgKey obtains organization key from the database.
+  private function getOrgKey() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $org_id = $user->org_id;
+    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['group_key'];
+  }
+
+  // getGrtoupKey obtains group key from the database.
+  private function getGroupKey() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select group_key from tt_groups where id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['group_key'];
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 060b8e025..8814c7bb0 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.61.4881 | 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.61.4882 | 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>

From 699d174c8cd3dd88265826a6b69c7fae3b62e0a8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Mar 2019 16:07:03 +0000
Subject: [PATCH 0836/1848] Dutch translation improved.

---
 WEB-INF/lib/ttFileHelper.class.php |  1 -
 WEB-INF/resources/nl.lang.php      | 48 ++++++++++++++----------------
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 21 +++++++++++++
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 441b8f40a..a45326cbc 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -130,7 +130,6 @@ function putFile($fields) {
       'file_name' => urlencode($fields['file_name']),
       'description' => urlencode($fields['description']),
       // TODO: add file content here, too. Will this work for large files?
-      //
     );
 
     // url-ify the data for the POST.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e56846c79..a56ee3fc7 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -51,8 +51,7 @@
 'menu.time' => 'Tijden',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'menu.timesheets' => 'Timesheets',
+'menu.timesheets' => 'Tijdenoverzichten',
 'menu.charts' => 'Grafieken',
 'menu.projects' => 'Projecten',
 'menu.tasks' => 'Taken',
@@ -234,9 +233,12 @@
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'label.timesheet' => 'Timesheet',
-// 'label.submitted' => 'Submitted',
+'label.timesheet' => 'Tijdenoverzicht',
+// TODO: translate the following. "Submitted" here means that a timesheet was submitted (sent)
+// to manager(s) for an approval. It is also a column name on the timesheets.php page,
+// so it needs to be short. A problem with "Reactie ontvangen" is that Google auto-translates
+// it as "Response received", which seems wrong, and is alsoo too long.
+// 'label.submitted' => 'Reactie ontvangen',
 'label.approved' => 'Goedgekeurd',
 'label.approval' => 'Rapport goedkeuring',
 'label.mark_approved' => 'Markeer goegkeuring',
@@ -270,9 +272,8 @@
 'title.reports' => 'Rapporten',
 'title.report' => 'Rapport',
 'title.send_report' => 'Rapport aan het versturen',
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'title.timesheets' => 'Timesheets',
-// 'title.timesheet' => 'Timesheet',
+'title.timesheets' => 'Tijdenoverzichten',
+'title.timesheet' => 'Tijdenoverzicht',
 'title.invoice' => 'Factuur',
 'title.send_invoice' => 'Factuur verzenden',
 'title.charts' => 'Grafieken',
@@ -306,10 +307,9 @@
 'title.add_notification' => 'Notificatie toevoegen',
 'title.edit_notification' => 'Notificatie bewerken',
 'title.delete_notification' => 'Notificatie verwijderen',
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'title.add_timesheet' => 'Adding Timesheet',
-// 'title.edit_timesheet' => 'Editing Timesheet',
-// 'title.delete_timesheet' => 'Deleting Timesheet',
+'title.add_timesheet' => 'Tijdenoverzicht toevoegen',
+'title.edit_timesheet' => 'Tijdenoverzicht bewerken',
+'title.delete_timesheet' => 'Tijdenoverzicht verwijderen',
 'title.monthly_quotas' => 'Doelen per maand',
 'title.export' => 'Exporteer groepsgegevens',
 'title.import' => 'Importeer groepsgegevens',
@@ -355,8 +355,7 @@
 'dropdown.clients' => 'klanten',
 'dropdown.select' => '--- kies ---',
 'dropdown.select_invoice' => '--- kies factuur ---',
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'dropdown.select_timesheet' => '--- select timesheet ---',
+'dropdown.select_timesheet' => '--- kies tijdenoverzicht ---',
 'dropdown.status_active' => 'actief',
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
@@ -423,13 +422,11 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporteer',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
+'form.report.assign_to_timesheet' => 'Wijs toe aan tijdenoverzicht',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'form.timesheets.active_timesheets' => 'Active Timesheets',
-// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
+'form.timesheets.active_timesheets' => 'Actieve tijdenoverzichten',
+'form.timesheets.inactive_timesheets' => 'Inactieve tijdenoverzichten',
 
 // Templates form. See example at https://timetracker.anuko.com/templates.php
 'form.templates.active_templates' => 'Actieve sjablonen',
@@ -568,11 +565,10 @@
 'role.admin.description' => 'Time Tracker beheerder.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
-// TODO: translate the following. See https://www.anuko.com/time_tracker/what_is/timesheets.htm
-// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
-// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
-// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
-// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
-// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
-// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+'form.timesheet_view.submit_subject' => 'Verzoek goedkeuring tijdenoverzicht',
+'form.timesheet_view.submit_body' => "Een nieuw tijdenoverzicht vereist goedkeuring.<p>User: %s.",
+'form.timesheet_view.approve_subject' => 'Tijdenoverzicht goedgekeurd',
+'form.timesheet_view.approve_body' => "Jouw tijdenoverzicht %s is goedgekeurd.<p>%s",
+'form.timesheet_view.disapprove_subject' => 'Tijdenoverzicht afgekeurd',
+'form.timesheet_view.disapprove_body' => "Jouw tijdenoverzicht %s is afgekeurd.<p>%s",
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8814c7bb0..19de9b60e 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.61.4882 | 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.61.4884 | 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/dbinstall.php b/dbinstall.php
index 063f20223..007e51608 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -47,6 +47,25 @@ function ttExecute($sql) {
     print "Successful update.<br>\n";
 }
 
+// ttGenerateKeys - generates keys for groups that do not have them.
+function ttGenerateKeys() {
+  $mdb2 = getConnection();
+  $sql = "select id from tt_groups where group_key is null and status = 1";
+  $res = $mdb2->query($sql);
+  if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+  $numGroups = 0;
+  while ($val = $res->fetchRow()) {
+    $group_id = $val['id'];
+    $group_key = $mdb2->quote(ttRandomString());
+    $sql = "update tt_groups set group_key = $group_key where id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    $numGroups++;
+  }
+  print "<br>Generated keys for $numGroups groups.<br>\n";
+}
+
 if ($request->isGet()) {
   echo('<h2>Environment Checks</h2>');
 
@@ -1133,6 +1152,8 @@ function ttExecute($sql) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'");
     ttExecute("ALTER TABLE `tt_groups` ADD `group_key` varchar(32) AFTER `org_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.61', modified = now() where param_name = 'version_db' and param_value = '1.18.60'");
+
+    ttGenerateKeys();
 }
 
   if ($_POST["cleanup"]) {

From c9635e26bfce35b8009e8a760d9aec8de89ec3f5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 23 Mar 2019 14:18:42 +0000
Subject: [PATCH 0837/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 19 ++++++-------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a56ee3fc7..ef22efcb8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -104,8 +104,7 @@
 'error.format' => 'Bestandsformaat niet valide.',
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
-// TODO: translate the following.
-// 'error.file_storage' => 'File storage error.',
+'error.file_storage' => 'Fout bij het opslaan van het bestand.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
@@ -234,19 +233,14 @@
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
 'label.timesheet' => 'Tijdenoverzicht',
-// TODO: translate the following. "Submitted" here means that a timesheet was submitted (sent)
-// to manager(s) for an approval. It is also a column name on the timesheets.php page,
-// so it needs to be short. A problem with "Reactie ontvangen" is that Google auto-translates
-// it as "Response received", which seems wrong, and is alsoo too long.
-// 'label.submitted' => 'Reactie ontvangen',
+'label.submitted' => 'Verzonden',
 'label.approved' => 'Goedgekeurd',
 'label.approval' => 'Rapport goedkeuring',
 'label.mark_approved' => 'Markeer goegkeuring',
 'label.template' => 'Sjabloon',
-// TODO: translate the following.
-// 'label.attachments' => 'Attachments',
-// 'label.files' => 'Files',
-// 'label.image' => 'Image',
+'label.attachments' => 'Bijlagen',
+'label.files' => 'Bestanden',
+'label.image' => 'Afbeelding',
 
 // Form titles.
 'title.error' => 'Fout',
@@ -278,8 +272,7 @@
 'title.send_invoice' => 'Factuur verzenden',
 'title.charts' => 'Grafieken',
 'title.projects' => 'Projecten',
-// TODO: translate the following.
-// 'title.project_files' => 'Project Files',
+'title.project_files' => 'Project bestanden',
 'title.add_project' => 'Project toevoegen',
 'title.edit_project' => 'Project wijzigen',
 'title.delete_project' => 'Project verwijderen',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 19de9b60e..ae385b3b8 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.61.4884 | 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.61.4885 | 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>

From 7420fa50ea7e810db85bcb7ced55dc01d21fafcd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Mar 2019 16:03:40 +0000
Subject: [PATCH 0838/1848] Resuming work on attachments.

---
 WEB-INF/lib/ttFileHelper.class.php | 16 +++++++++++-----
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index a45326cbc..5c9b385b7 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -85,8 +85,14 @@ function checkSiteRegistration() {
       curl_close($ch);
 
       $result_array = json_decode($result, true);
-      if ($result_array && $result_array['id'] && $result_array['key']) {
-
+      if (!$result_array) {
+        $this->errors->add($i18n->get('error.file_storage'));
+      }
+      else if ($result_array['error']) {
+        // Add an error from file storage facility if we have it.
+        $this->errors->add($result_array['error']);
+      }
+      else if ($result_array['id'] && $result_array['key']) {
         $this->site_id = $result_array['id'];
         $this->site_key = $result_array['key'];
 
@@ -159,12 +165,12 @@ function putFile($fields) {
     $result_array = json_decode($result, true);
     $file_id = (int) $result_array['file_id'];
     $file_key = $result_array['file_key'];
-    $file_error = $result_array['file_error'];
+    $error = $result_array['error'];
 
     if (!$file_id || !$file_key) {
-      if ($file_error) {
+      if ($error) {
         // Add an error from file storage facility if we have it.
-        $this->errors->add($file_error);
+        $this->errors->add($error);
       }
       return false;
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ae385b3b8..eef37602a 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.61.4885 | 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.61.4886 | 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>

From 024e938728d2b436f1f048531d8fd00a246920c6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Mar 2019 15:20:16 +0000
Subject: [PATCH 0839/1848] Added file content to attachment put.

---
 WEB-INF/lib/ttFileHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 5c9b385b7..b976ba14a 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -135,7 +135,7 @@ function putFile($fields) {
       'user_key' => urlencode($fields['user_key']), // May be null.
       'file_name' => urlencode($fields['file_name']),
       'description' => urlencode($fields['description']),
-      // TODO: add file content here, too. Will this work for large files?
+      'content' => urlencode(file_get_contents($_FILES['newfile']['tmp_name']))
     );
 
     // url-ify the data for the POST.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eef37602a..d30bc6c95 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.61.4886 | 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.61.4887 | 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>

From c45c90dc951017a163a3ee72bd6e26d291ceb642 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Mar 2019 19:43:49 +0000
Subject: [PATCH 0840/1848] Fixed a condition for error return on file put.

---
 WEB-INF/lib/ttFileHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index b976ba14a..7c8324b6f 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -167,7 +167,7 @@ function putFile($fields) {
     $file_key = $result_array['file_key'];
     $error = $result_array['error'];
 
-    if (!$file_id || !$file_key) {
+    if ($error || !$file_id || !$file_key) {
       if ($error) {
         // Add an error from file storage facility if we have it.
         $this->errors->add($error);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d30bc6c95..f73aa0552 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.61.4887 | 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.61.4888 | 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>

From ebadc5e4019929d4e1686516160ee01a114d9b8a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 27 Mar 2019 20:18:33 +0000
Subject: [PATCH 0841/1848] Work in progress on project attachment list view.

---
 WEB-INF/lib/ttFileHelper.class.php  | 25 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/project_files.tpl |  2 +-
 project_files.php                   | 11 ++++++-----
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 7c8324b6f..f74e77a33 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -125,7 +125,7 @@ function putFile($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $fields = array('site_id' => urlencode($this->site_id),
+    $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
@@ -139,7 +139,7 @@ function putFile($fields) {
     );
 
     // url-ify the data for the POST.
-    foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
 
     // Open connection.
@@ -216,4 +216,25 @@ private function getGroupKey() {
     $val = $res->fetchRow();
     return $val['group_key'];
   }
+
+  // getProjectFiles obtains a list of files for a project.
+  function getProjectFiles($project_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
+    $sql = "select id, remote_id, file_name as name, description from tt_files".
+      " where entity_type = 'project' and entity_id = $project_id".
+      " and group_id = $group_id and org_id = $org_id and status = 1 order by id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f73aa0552..d5c62e907 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.61.4888 | 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.61.4889 | 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/project_files.tpl b/WEB-INF/templates/project_files.tpl
index d092e3cb3..a542c6bb4 100644
--- a/WEB-INF/templates/project_files.tpl
+++ b/WEB-INF/templates/project_files.tpl
@@ -3,7 +3,7 @@
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.image}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
 {if $can_manage}
           <td class="tableHeader">{$i18n.label.edit}</td>
diff --git a/project_files.php b/project_files.php
index cc917466b..6abd0afa4 100644
--- a/project_files.php
+++ b/project_files.php
@@ -52,8 +52,8 @@
   $cl_description = trim($request->getParameter('description'));
 }
 
-$files = null;
-// $files = ttAttachmentHelper::getProjectFiles();
+$fileHelper = new ttFileHelper($err);
+$files = $fileHelper::getProjectFiles($cl_project_id);
 
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
@@ -71,14 +71,15 @@
   // Finished validating user input.
 
   if ($err->no()) {
-    $fileHelper = new ttFileHelper($err);
     $fields = array('entity_type'=>'project',
       'entity_id' => $cl_project_id,
       'file_name' => $_FILES['newfile']['name'],
       'description'=>$cl_description);
-    if (!$fileHelper->putFile($fields)) {
+    if ($fileHelper->putFile($fields)) {
+      header('Location: project_files.php?id='.$cl_project_id);
+      exit();
+    } else
       $err->add($i18n->get('error.file_storage'));
-    }
   }
 } // isPost
 

From 434a81099f4456d0679755335e31aaf74ad29ecd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Mar 2019 13:34:46 +0000
Subject: [PATCH 0842/1848] Work in progress on attachment delete.

---
 WEB-INF/lib/ttFileHelper.class.php | 19 +++++++
 WEB-INF/resources/en.lang.php      |  2 +
 WEB-INF/templates/file_delete.tpl  | 18 +++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 file_delete.php                    | 82 ++++++++++++++++++++++++++++++
 5 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/file_delete.tpl
 create mode 100644 file_delete.php

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index f74e77a33..80c9fd314 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -237,4 +237,23 @@ function getProjectFiles($project_id) {
     }
     return $result;
   }
+
+  // get - obtains file details from local database. 
+  static function get($id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, remote_id, file_key, entity_type, entity_id, file_name, description, status from tt_files".
+      " where id = $id and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val && $val['id'])
+        return $val;
+    }
+    return false;
+  }
 }
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f1fc72aa1..ad92ce9c0 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -328,6 +328,8 @@
 'title.add_template' => 'Adding Template',
 'title.edit_template' => 'Editing Template',
 'title.delete_template' => 'Deleting Template',
+'title.edit_file' => 'Editing File',
+'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/file_delete.tpl b/WEB-INF/templates/file_delete.tpl
new file mode 100644
index 000000000..81107daa5
--- /dev/null
+++ b/WEB-INF/templates/file_delete.tpl
@@ -0,0 +1,18 @@
+{$forms.fileDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$file_to_delete|escape}</b></td>
+        </tr>
+        <tr><td colspan="2" align="center">&nbsp;</td></tr>
+        <tr>
+          <td align="right">{$forms.fileDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.fileDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.fileDeleteForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d5c62e907..1df6b86b3 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.61.4889 | 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.61.4890 | 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/file_delete.php b/file_delete.php
new file mode 100644
index 000000000..50b3e0e9a
--- /dev/null
+++ b/file_delete.php
@@ -0,0 +1,82 @@
+<?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('ttFileHelper');
+import('ttProjectHelper');
+
+// Access checks.
+$cl_file_id = (int)$request->getParameter('id');
+$file = ttFileHelper::get($cl_file_id);
+if (!$file) {
+  header('Location: access_denied.php');
+  exit();
+}
+// Entity-specific checks.
+if ($file['entity_type'] == 'project') {
+  if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($file['entity_type'] != 'project') {
+  // Currently, files are only associated with projects.
+  // Improve access checks when the feature evolves.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$file_to_delete = $file['file_name'];
+
+$form = new Form('fileDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_file_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+// TODO: design redirects properly...
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if (ttProjectHelper::delete($cl_project_id)) {
+      header('Location: projects.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: projects.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('file_to_delete', $file_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.fileDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_file'));
+$smarty->assign('content_page_name', 'file_delete.tpl');
+$smarty->display('index.tpl');

From 6966f48816a53d2653bf02b537190d015407952e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Mar 2019 13:42:48 +0000
Subject: [PATCH 0843/1848] Added attachment titles to translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 06a28c88a..c321d7239 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -377,6 +377,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 97ab7e676..6e64cc408 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -388,6 +388,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 403289ba1..91b6fe52a 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -355,6 +355,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 980706d28..beac9128d 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -338,6 +338,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 4f33f6d9f..94f5e8366 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -376,6 +376,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f46db014a..5ba5afaac 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -360,6 +360,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8111b3d36..55dab1002 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -364,6 +364,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 2f3a40923..517309b18 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -355,6 +355,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1bb5f680f..a22113e0c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -349,6 +349,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index bb2a334b2..9ed98f891 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -345,6 +345,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 19ace043b..500df34a8 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -375,6 +375,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 349c224c1..ccdc6ad7d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -376,6 +376,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index c19f9f3d6..68cab8358 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -355,6 +355,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c53b8aede..62cef1b78 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -383,6 +383,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index cf3f608ed..5d65e431a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -384,6 +384,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ef22efcb8..dda81c9ec 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -325,6 +325,9 @@
 'title.add_template' => 'Sjabloon toevoegen',
 'title.edit_template' => 'Sjabloon bewerken',
 'title.delete_template' => 'Sjabloon verwijderen',
+// TODO: translate the following.
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e6816351c..8b9f0cc0a 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -380,6 +380,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e81fc254d..c472a8c9b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -358,6 +358,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f5d923906..f81f3b3e4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -353,6 +353,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a0ac39b24..37dcf0a7d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -364,6 +364,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 83218b041..c7bd4fa5d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -383,6 +383,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 36815e9fb..d932f155c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -325,6 +325,8 @@
 'title.add_template' => 'Добавление шаблона',
 'title.edit_template' => 'Редактирование шаблона',
 'title.delete_template' => 'Удаление шаблона',
+'title.edit_file' => 'Редактирование файла',
+'title.delete_file' => 'Удаление файла',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1a53dc8f2..de436c597 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -364,6 +364,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c9144c8cf..9ee5b7535 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -358,6 +358,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6365d1c09..a8e72fb35 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -356,6 +356,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c89dd6488..aacf3a7c4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -356,6 +356,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index fd96a2af7..2b13fcdaf 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -392,6 +392,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 8d561837a..19bafb84a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -371,6 +371,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index dc590fec5..5ef7e03f0 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -378,6 +378,8 @@
 // 'title.add_template' => 'Adding Template',
 // 'title.edit_template' => 'Editing Template',
 // 'title.delete_template' => 'Deleting Template',
+// 'title.edit_file' => 'Editing File',
+// 'title.delete_file' => 'Deleting File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1df6b86b3..38aeb35c5 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.61.4890 | 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.61.4891 | 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>

From cf018545bf61420782271261bdea7d2c3dd235a0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Mar 2019 15:06:19 +0000
Subject: [PATCH 0844/1848] More work in progress on attachment delete.

---
 WEB-INF/lib/ttFileHelper.class.php | 75 +++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl       |  2 +-
 file_delete.php                    | 14 +++---
 3 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 80c9fd314..d44fa5661 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -151,7 +151,7 @@ function putFile($fields) {
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
-    // Execute a post rewuest.
+    // Execute a post request.
     $result = curl_exec($ch);
 
     // Close connection.
@@ -160,7 +160,10 @@ function putFile($fields) {
     // Delete uploaded file.
     unlink($_FILES['newfile']['tmp_name']);
 
-    if (!$result) return false;
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
 
     $result_array = json_decode($result, true);
     $file_id = (int) $result_array['file_id'];
@@ -191,6 +194,74 @@ function putFile($fields) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
+  // deleteFile - deletes a file from remote storage and its details from local database.
+  function deleteFile($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'user_id' => urlencode($fields['user_id']),   // May be null.
+      'user_key' => urlencode($fields['user_key']), // May be null.
+      'file_id' => urlencode($fields['remote_id']),
+      'file_key' => urlencode($fields['file_key'])
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
+    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    // $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+      return false;
+    }
+
+    // Delete file reference from database.
+    $file_id = $file['id'];
+    $sql = "delete from tt_files".
+      " where id = $file_id and org_id = $org_id and group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $err->add($i18n->get('error.db'));
+      return false;
+    }
+
+    return true;
+  }
+
   // getOrgKey obtains organization key from the database.
   private function getOrgKey() {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 38aeb35c5..2df7cbf35 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.61.4891 | 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.61.4892 | 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/file_delete.php b/file_delete.php
index 50b3e0e9a..d98259d64 100644
--- a/file_delete.php
+++ b/file_delete.php
@@ -60,16 +60,18 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
-// TODO: design redirects properly...
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if (ttProjectHelper::delete($cl_project_id)) {
-      header('Location: projects.php');
+    $fileHelper = new ttFileHelper($err);
+    $deleted = $fileHelper->deleteFile($file);
+    if ($deleted && $file['entity_type'] == 'project') {
+      header('Location: project_files.php?id='.$file['entity_id']);
       exit();
-    } else
-      $err->add($i18n->get('error.db'));
+    }
   } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: projects.php');
+    if ($file['entity_type'] == 'project') {
+      header('Location: project_files.php?id='.$file['entity_id']);
+    }
     exit();
   }
 } // isPost

From a4093ac103388ffae1275c1c5937c4163901917d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Mar 2019 15:49:50 +0000
Subject: [PATCH 0845/1848] More progress on attachment delete.

---
 WEB-INF/lib/ttFileHelper.class.php | 19 +++++++++++++------
 WEB-INF/templates/footer.tpl       |  2 +-
 project_files.php                  |  3 +--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index d44fa5661..d5815f4c4 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -179,6 +179,7 @@ function putFile($fields) {
     }
 
     // File put was successful. Store file attributes locally.
+    $file_key = $mdb2->quote($file_key);
     $entity_type = $mdb2->quote($fields['entity_type']);
     $entity_id = (int) $fields['entity_id'];
     $file_name = $mdb2->quote($fields['file_name']);
@@ -187,8 +188,8 @@ function putFile($fields) {
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by = $user->id;
 
-    $columns = '(group_id, org_id, remote_id, entity_type, entity_id, file_name, description, created, created_ip, created_by)';
-    $values = "values($group_id, $org_id, $file_id, $entity_type, $entity_id, $file_name, $description, $created, $created_ip, $created_by)";
+    $columns = '(group_id, org_id, remote_id, file_key, entity_type, entity_id, file_name, description, created, created_ip, created_by)';
+    $values = "values($group_id, $org_id, $file_id, $file_key, $entity_type, $entity_id, $file_name, $description, $created, $created_ip, $created_by)";
     $sql = "insert into tt_files $columns $values";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
@@ -240,7 +241,7 @@ function deleteFile($fields) {
     }
 
     $result_array = json_decode($result, true);
-    // $status = (int) $result_array['status'];
+    $status = (int) $result_array['status'];
     $error = $result_array['error'];
 
     if ($error) {
@@ -248,17 +249,23 @@ function deleteFile($fields) {
       $this->errors->add($error);
       return false;
     }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
 
     // Delete file reference from database.
-    $file_id = $file['id'];
+    $file_id = $fields['id'];
     $sql = "delete from tt_files".
       " where id = $file_id and org_id = $org_id and group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
-      $err->add($i18n->get('error.db'));
+      $this->errors->add($i18n->get('error.db'));
       return false;
     }
 
+    // File successfully deleted from both file storage and database.
     return true;
   }
 
@@ -289,7 +296,7 @@ private function getGroupKey() {
   }
 
   // getProjectFiles obtains a list of files for a project.
-  function getProjectFiles($project_id) {
+  static function getProjectFiles($project_id) {
     global $user;
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2df7cbf35..7e19867aa 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.61.4892 | 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.61.4893 | 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/project_files.php b/project_files.php
index 6abd0afa4..860ba0745 100644
--- a/project_files.php
+++ b/project_files.php
@@ -78,8 +78,7 @@
     if ($fileHelper->putFile($fields)) {
       header('Location: project_files.php?id='.$cl_project_id);
       exit();
-    } else
-      $err->add($i18n->get('error.file_storage'));
+    }
   }
 } // isPost
 

From 1cf228c258ba8a8950b1a55bc25b93768bf50184 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Mar 2019 21:00:23 +0000
Subject: [PATCH 0846/1848] A bit more progress on delete attachment.

---
 WEB-INF/lib/ttFileHelper.class.php | 7 ++++---
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index d5815f4c4..6a799ad87 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -44,6 +44,7 @@ function __construct(&$errors) {
       $this->storage_uri = FILE_STORAGE_URI;
       $this->register_uri = $this->storage_uri.'register';
       $this->putfile_uri = $this->storage_uri.'putfile';
+      $this->deletefile_uri = $this->storage_uri.'deletefile';
       $this->getfile_uri = $this->storage_uri.'getfile';
       $this->checkSiteRegistration();
     }
@@ -213,8 +214,8 @@ function deleteFile($fields) {
       'user_id' => urlencode($fields['user_id']),   // May be null.
       'user_key' => urlencode($fields['user_key']), // May be null.
       'file_id' => urlencode($fields['remote_id']),
-      'file_key' => urlencode($fields['file_key'])
-    );
+      'file_key' => urlencode($fields['file_key']),
+      'file_name' => urlencode($fields['file_name']));
 
     // url-ify the data for the POST.
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
@@ -224,7 +225,7 @@ function deleteFile($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->deletefile_uri);
     curl_setopt($ch, CURLOPT_POST, count($fields));
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7e19867aa..c62240bd5 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.61.4893 | 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.61.4894 | 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>

From 6152f4bd9a8f960c79ae025b775b719930574cc9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Mar 2019 14:37:28 +0000
Subject: [PATCH 0847/1848] Implemented attachment edit.

---
 WEB-INF/lib/ttFileHelper.class.php | 17 ++++++
 WEB-INF/templates/file_edit.tpl    | 29 ++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 file_edit.php                      | 91 ++++++++++++++++++++++++++++++
 project_edit.php                   | 22 ++++----
 5 files changed, 149 insertions(+), 12 deletions(-)
 create mode 100644 WEB-INF/templates/file_edit.tpl
 create mode 100644 file_edit.php

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 6a799ad87..ce24cd795 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -335,4 +335,21 @@ static function get($id) {
     }
     return false;
   }
+
+  // update - updates file details in local database.
+  static function update($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $file_id = (int) $fields['id'];
+    $description = $mdb2->quote($fields['description']);
+
+    $sql = "update tt_files set description = $description where id = $file_id".
+      " and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
+    $affected = $mdb2->exec($sql);
+    return !is_a($affected, 'PEAR_Error');
+  }
 }
diff --git a/WEB-INF/templates/file_edit.tpl b/WEB-INF/templates/file_edit.tpl
new file mode 100644
index 000000000..697a650ce
--- /dev/null
+++ b/WEB-INF/templates/file_edit.tpl
@@ -0,0 +1,29 @@
+{$forms.fileForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align = "right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.fileForm.file_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.fileForm.description.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.fileForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.fileForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c62240bd5..3c4bb39da 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.61.4894 | 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.61.4895 | 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/file_edit.php b/file_edit.php
new file mode 100644
index 000000000..381508d1c
--- /dev/null
+++ b/file_edit.php
@@ -0,0 +1,91 @@
+<?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('ttFileHelper');
+import('ttProjectHelper');
+
+// Access checks.
+$cl_file_id = (int)$request->getParameter('id');
+$file = ttFileHelper::get($cl_file_id);
+if (!$file) {
+  header('Location: access_denied.php');
+  exit();
+}
+// Entity-specific checks.
+if ($file['entity_type'] == 'project') {
+  if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($file['entity_type'] != 'project') {
+  // Currently, files are only associated with projects.
+  // Improve access checks when the feature evolves.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_description = trim($request->getParameter('description'));
+} else {
+  $cl_description = $file['description'];
+}
+$cl_name = $file['file_name'];
+
+$form = new Form('fileForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_file_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'file_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->getElement('file_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update file information.
+      $updated = ttFileHelper::update(array('id' => $cl_file_id,'description' => $cl_description));
+      if ($updated && $file['entity_type'] == 'project') {
+        header('Location: project_files.php?id='.$file['entity_id']);
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.fileForm.description.focus()"');
+$smarty->assign('title', $i18n->get('title.edit_file'));
+$smarty->assign('content_page_name', 'file_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/project_edit.php b/project_edit.php
index a2b27925e..e1792e48c 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -94,18 +94,18 @@
     if ($request->getParameter('btn_save')) {
       $existing_project = ttProjectHelper::getProjectByName($cl_name);
       if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
-         // Update project information.
-         if (ttProjectHelper::update(array(
-           'id' => $cl_project_id,
-           'name' => $cl_name,
-           'description' => $cl_description,
-           'status' => $cl_status,
-           'users' => $cl_users,
-           'tasks' => $cl_tasks))) {
-           header('Location: projects.php');
-           exit();
+        // Update project information.
+        if (ttProjectHelper::update(array(
+          'id' => $cl_project_id,
+          'name' => $cl_name,
+          'description' => $cl_description,
+          'status' => $cl_status,
+          'users' => $cl_users,
+          'tasks' => $cl_tasks))) {
+          header('Location: projects.php');
+          exit();
         } else
-           $err->add($i18n->get('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
         $err->add($i18n->get('error.object_exists'));
     }

From 1abe3082f89208f5457129215a4283c4209b05f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Mar 2019 14:48:49 +0000
Subject: [PATCH 0848/1848] Added label.download to resource files.

---
 WEB-INF/resources/ca.lang.php       | 1 +
 WEB-INF/resources/cs.lang.php       | 1 +
 WEB-INF/resources/da.lang.php       | 1 +
 WEB-INF/resources/de.lang.php       | 1 +
 WEB-INF/resources/en.lang.php       | 1 +
 WEB-INF/resources/es.lang.php       | 1 +
 WEB-INF/resources/et.lang.php       | 1 +
 WEB-INF/resources/fa.lang.php       | 1 +
 WEB-INF/resources/fi.lang.php       | 1 +
 WEB-INF/resources/fr.lang.php       | 1 +
 WEB-INF/resources/gr.lang.php       | 1 +
 WEB-INF/resources/he.lang.php       | 1 +
 WEB-INF/resources/hu.lang.php       | 1 +
 WEB-INF/resources/it.lang.php       | 1 +
 WEB-INF/resources/ja.lang.php       | 1 +
 WEB-INF/resources/ko.lang.php       | 1 +
 WEB-INF/resources/nl.lang.php       | 2 ++
 WEB-INF/resources/no.lang.php       | 1 +
 WEB-INF/resources/pl.lang.php       | 1 +
 WEB-INF/resources/pt-br.lang.php    | 1 +
 WEB-INF/resources/pt.lang.php       | 1 +
 WEB-INF/resources/ro.lang.php       | 1 +
 WEB-INF/resources/ru.lang.php       | 1 +
 WEB-INF/resources/sk.lang.php       | 1 +
 WEB-INF/resources/sl.lang.php       | 1 +
 WEB-INF/resources/sr.lang.php       | 1 +
 WEB-INF/resources/sv.lang.php       | 1 +
 WEB-INF/resources/tr.lang.php       | 1 +
 WEB-INF/resources/zh-cn.lang.php    | 1 +
 WEB-INF/resources/zh-tw.lang.php    | 1 +
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/project_files.tpl | 2 ++
 32 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c321d7239..4a8b1bbe8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -276,6 +276,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 6e64cc408..f76e0bb6e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -286,6 +286,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 91b6fe52a..222b6cb25 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -264,6 +264,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Fejl',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index beac9128d..8416cda08 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -252,6 +252,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ad92ce9c0..0c4d7e0ad 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -242,6 +242,7 @@
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
 'label.image' => 'Image',
+'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Error',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 94f5e8366..8d1f837f1 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -279,6 +279,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5ba5afaac..faf45cb06 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -268,6 +268,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 55dab1002..64902e530 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -275,6 +275,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'خطا',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 517309b18..735724cfb 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -268,6 +268,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Virhe',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a22113e0c..ee6481010 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -262,6 +262,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Erreur',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9ed98f891..5155254eb 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -255,6 +255,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 500df34a8..3f2232d7c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -285,6 +285,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'שגיאה',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index ccdc6ad7d..a14445c42 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -281,6 +281,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 68cab8358..870b1e93d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -259,6 +259,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 62cef1b78..b020a04e5 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -286,6 +286,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5d65e431a..dff995ff6 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -286,6 +286,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index dda81c9ec..c95e15029 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -241,6 +241,8 @@
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
 'label.image' => 'Afbeelding',
+// TODO: translate the following.
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Fout',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8b9f0cc0a..96a5f135b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -283,6 +283,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c472a8c9b..6813fe26f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -269,6 +269,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Błąd',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f81f3b3e4..712a28929 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -266,6 +266,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Erro',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 37dcf0a7d..d66ffaf52 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -271,6 +271,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c7bd4fa5d..eab1c21a9 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -283,6 +283,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d932f155c..126844e8a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -241,6 +241,7 @@
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
 'label.image' => 'Изображение',
+'label.download' => 'Скачать',
 
 // Form titles.
 'title.error' => 'Ошибка',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index de436c597..b8bcbef05 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -274,6 +274,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Chyba',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9ee5b7535..efdd2c14b 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -266,6 +266,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a8e72fb35..c47cc41e3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -267,6 +267,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 'title.error' => 'Greška',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index aacf3a7c4..f21cd4f6c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -263,6 +263,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2b13fcdaf..82ba90ec3 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -290,6 +290,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // Form titles.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 19bafb84a..f5dab87f6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -274,6 +274,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5ef7e03f0..eba42ab9d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -281,6 +281,7 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.image' => 'Image',
+// 'label.download' => 'Download',
 
 // Form titles.
 // TODO: Translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3c4bb39da..b63e0692c 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.61.4895 | 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.61.4896 | 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/project_files.tpl b/WEB-INF/templates/project_files.tpl
index a542c6bb4..d745f557f 100644
--- a/WEB-INF/templates/project_files.tpl
+++ b/WEB-INF/templates/project_files.tpl
@@ -5,6 +5,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.download}</td>
 {if $can_manage}
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
@@ -15,6 +16,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$file.name|escape}</td>
           <td>{$file.description|escape}</td>
+          <td><a href="file_edit.php?id={$file.id}">{$i18n.label.download}</a></td>
     {if $can_manage}
           <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
           <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>

From 2a43d526f93570b4aebc325aae96a484943b0c39 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Mar 2019 20:19:48 +0000
Subject: [PATCH 0849/1848] Work in progress on attachment download.

---
 WEB-INF/lib/ttFileHelper.class.php  |  77 ++++++++++++++++++++-
 WEB-INF/templates/footer.tpl        |   2 +-
 WEB-INF/templates/project_files.tpl |   2 +-
 file_download.php                   | 102 ++++++++++++++++++++++++++++
 4 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 file_download.php

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index ce24cd795..f3c36e56b 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -35,6 +35,7 @@ class ttFileHelper {
   var $getfile_uri = null;  // URI to get file from file storage.
   var $site_id = null;      // Site id for file storage.
   var $site_key = null;     // Site key for file storage.
+  var $file_data = null;     // Downloaded file data.
 
   // Constructor.
   function __construct(&$errors) {
@@ -136,7 +137,7 @@ function putFile($fields) {
       'user_key' => urlencode($fields['user_key']), // May be null.
       'file_name' => urlencode($fields['file_name']),
       'description' => urlencode($fields['description']),
-      'content' => urlencode(file_get_contents($_FILES['newfile']['tmp_name']))
+      'content' => urlencode(base64_encode(file_get_contents($_FILES['newfile']['tmp_name'])))
     );
 
     // url-ify the data for the POST.
@@ -352,4 +353,78 @@ static function update($fields) {
     $affected = $mdb2->exec($sql);
     return !is_a($affected, 'PEAR_Error');
   }
+
+
+  // getFile - downloads file from remote storage to memory.
+  function getFile($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'user_id' => urlencode($fields['user_id']),   // May be null.
+      'user_key' => urlencode($fields['user_key']), // May be null.
+      'file_id' => urlencode($fields['remote_id']),
+      'file_key' => urlencode($fields['file_key']),
+      'file_name' => urlencode($fields['file_name']));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->getfile_uri);
+    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    $error = curl_error();
+    $result_array2 = json_decode($result, true);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+      return false;
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $this->file_data = $result_array['content'];
+    return true;
+  }
+
+
+  // getFileData - returns file data from memory.
+  function getFileData() {
+    return base64_decode($this->file_data);
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b63e0692c..b36f3d07e 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.61.4896 | 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.61.4897 | 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/project_files.tpl b/WEB-INF/templates/project_files.tpl
index d745f557f..52e14f9a2 100644
--- a/WEB-INF/templates/project_files.tpl
+++ b/WEB-INF/templates/project_files.tpl
@@ -16,7 +16,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$file.name|escape}</td>
           <td>{$file.description|escape}</td>
-          <td><a href="file_edit.php?id={$file.id}">{$i18n.label.download}</a></td>
+          <td><a href="file_download.php?id={$file.id}">{$i18n.label.download}</a></td>
     {if $can_manage}
           <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
           <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>
diff --git a/file_download.php b/file_download.php
new file mode 100644
index 000000000..83ff703a5
--- /dev/null
+++ b/file_download.php
@@ -0,0 +1,102 @@
+<?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('ttFileHelper');
+import('ttProjectHelper');
+
+// Access checks.
+$cl_file_id = (int)$request->getParameter('id');
+$file = ttFileHelper::get($cl_file_id);
+if (!$file) {
+  header('Location: access_denied.php');
+  exit();
+}
+// Entity-specific checks.
+if ($file['entity_type'] == 'project') {
+  if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($file['entity_type'] != 'project') {
+  // Currently, files are only associated with projects.
+  // Improve access checks when the feature evolves.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$fileHelper = new ttFileHelper($err);
+
+$filename = $file['file_name'];
+$mime_type = 'image/jpeg'; // Hardcoded type for now. TODO: fix this.
+
+if ($fileHelper->getFile($file)) {
+  header('Pragma: public'); // This is needed for IE8 to download files over https.
+  header('Content-Type: '.$mime_type);
+  header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
+  header('Content-Disposition: attachment; filename="'.$filename.'"');
+  header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+  header('Cache-Control: private', false);
+
+  echo $fileHelper->getFileData();
+  exit;
+} else
+  $err->add($i18n->get('error.sys'));
+
+$form = new Form('fileForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_file_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'file_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->getElement('file_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update file information.
+      $updated = ttFileHelper::update(array('id' => $cl_file_id,'description' => $cl_description));
+      if ($updated && $file['entity_type'] == 'project') {
+        header('Location: project_files.php?id='.$file['entity_id']);
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.fileForm.description.focus()"');
+$smarty->assign('title', $i18n->get('title.edit_file'));
+$smarty->assign('content_page_name', 'file_edit.tpl');
+$smarty->display('index.tpl');

From b3c9cd1820158293d52c6cc1bb7244fee06104ed Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Mar 2019 20:31:09 +0000
Subject: [PATCH 0850/1848] Added title.download_file to translation files.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  1 +
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  1 +
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  1 +
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  1 +
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  1 +
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/footer.tpl     |  2 +-
 file_download.php                | 33 +++-----------------------------
 32 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 4a8b1bbe8..f6a535745 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -380,6 +380,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index f76e0bb6e..fc976878f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -391,6 +391,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 222b6cb25..6c748c8f4 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -358,6 +358,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8416cda08..e162f3989 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -341,6 +341,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0c4d7e0ad..54da108c0 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -331,6 +331,7 @@
 'title.delete_template' => 'Deleting Template',
 'title.edit_file' => 'Editing File',
 'title.delete_file' => 'Deleting File',
+'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8d1f837f1..aee71b4c0 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -379,6 +379,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index faf45cb06..4963cc592 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -363,6 +363,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 64902e530..d6ed945c8 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -367,6 +367,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 735724cfb..5aaf7f971 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -358,6 +358,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ee6481010..f95bf7424 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -352,6 +352,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5155254eb..ee10172a4 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -348,6 +348,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3f2232d7c..90056902c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -378,6 +378,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a14445c42..58fcf50ac 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -379,6 +379,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 870b1e93d..4b6cf98d2 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -358,6 +358,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b020a04e5..b4fd746f0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -386,6 +386,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dff995ff6..b7c4a6952 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -387,6 +387,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c95e15029..f06047151 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -330,6 +330,7 @@
 // TODO: translate the following.
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 96a5f135b..d8848cd0c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -383,6 +383,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 6813fe26f..b62c3b613 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -361,6 +361,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 712a28929..7662b98d6 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -356,6 +356,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d66ffaf52..b76b0dcdb 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -367,6 +367,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index eab1c21a9..908c7d38a 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -386,6 +386,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 126844e8a..cb7c0925d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -328,6 +328,7 @@
 'title.delete_template' => 'Удаление шаблона',
 'title.edit_file' => 'Редактирование файла',
 'title.delete_file' => 'Удаление файла',
+'title.download_file' => 'Скачивание файла',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b8bcbef05..2024b49ff 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -367,6 +367,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index efdd2c14b..bd7615dc8 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -361,6 +361,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c47cc41e3..89875af5f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -359,6 +359,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index f21cd4f6c..ff2dda343 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -359,6 +359,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 82ba90ec3..c0411a646 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -395,6 +395,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f5dab87f6..208bd684f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -374,6 +374,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index eba42ab9d..0dcd0e8c4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -381,6 +381,7 @@
 // 'title.delete_template' => 'Deleting Template',
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
+// 'title.download_file' => 'Downloading File',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b36f3d07e..381ae4fd7 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.61.4897 | 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.61.4898 | 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/file_download.php b/file_download.php
index 83ff703a5..fb9239ab8 100644
--- a/file_download.php
+++ b/file_download.php
@@ -68,35 +68,8 @@
 
   echo $fileHelper->getFileData();
   exit;
-} else
-  $err->add($i18n->get('error.sys'));
-
-$form = new Form('fileForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_file_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'file_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->getElement('file_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      // Update file information.
-      $updated = ttFileHelper::update(array('id' => $cl_file_id,'description' => $cl_description));
-      if ($updated && $file['entity_type'] == 'project') {
-        header('Location: project_files.php?id='.$file['entity_id']);
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  }
-} // isPost
+}
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.fileForm.description.focus()"');
-$smarty->assign('title', $i18n->get('title.edit_file'));
-$smarty->assign('content_page_name', 'file_edit.tpl');
+$smarty->assign('title', $i18n->get('title.download_file'));
+$smarty->assign('content_page_name', 'file_download.tpl');
 $smarty->display('index.tpl');

From 1d84a6f6f6e8928d1d4adf0487786bd1cd487d19 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Mar 2019 20:36:26 +0000
Subject: [PATCH 0851/1848] Added file_download.tpl.

---
 WEB-INF/templates/file_download.tpl | 1 +
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/file_download.tpl

diff --git a/WEB-INF/templates/file_download.tpl b/WEB-INF/templates/file_download.tpl
new file mode 100644
index 000000000..c341a4039
--- /dev/null
+++ b/WEB-INF/templates/file_download.tpl
@@ -0,0 +1 @@
+<!-- empty -->
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 381ae4fd7..32e6e264a 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.61.4898 | 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.61.4899 | 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>

From 0b4060bf33c9316f79a07f870c5b1584b785e6dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Mar 2019 20:59:41 +0000
Subject: [PATCH 0852/1848] Initial release of attachment plugin for projects.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 --
 file_download.php             | 7 ++-----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 32e6e264a..3f192b301 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.61.4899 | 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.61.4900 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 6dfd9d240..a88d3e8d6 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -158,12 +158,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
             <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_conf"><a href="templates.php">{$i18n.label.configure}</a></span> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
-{if isTrue('FILES_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
             <td><label for="attachments">{$i18n.label.attachments}</label> <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
-{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/file_download.php b/file_download.php
index fb9239ab8..049003bac 100644
--- a/file_download.php
+++ b/file_download.php
@@ -55,14 +55,11 @@
 
 $fileHelper = new ttFileHelper($err);
 
-$filename = $file['file_name'];
-$mime_type = 'image/jpeg'; // Hardcoded type for now. TODO: fix this.
-
 if ($fileHelper->getFile($file)) {
   header('Pragma: public'); // This is needed for IE8 to download files over https.
-  header('Content-Type: '.$mime_type);
+  header('Content-Type: application/octet-stream');
   header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
-  header('Content-Disposition: attachment; filename="'.$filename.'"');
+  header('Content-Disposition: attachment; filename="'.$file['file_name'].'"');
   header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
   header('Cache-Control: private', false);
 

From 0825270a9b1a47a73e08f00ecd9191c227fbdd8c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 31 Mar 2019 13:36:49 +0000
Subject: [PATCH 0853/1848] Changed required template elements to 3 stop sign
 emojis for visibility.

---
 WEB-INF/lib/common.lib.php   | 9 +++++++++
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/time.php              | 3 +--
 mobile/time_edit.php         | 3 +--
 time.php                     | 3 +--
 time_edit.php                | 3 +--
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index e09a943f0..e2950753e 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -182,6 +182,15 @@ function ttValidString($val, $emptyValid = false)
   return true;    
 }
 
+// ttValidTemplateText is used to check template-based user input.
+// When templates are used, required input parts must be filled by user.
+// We identify these parts by 3 "stop sign" emojis (aka "octagonal sign" U+1F6D1).
+function ttValidTemplateText($val)
+{
+  $valid = strpos($val, '🛑🛑🛑') === false; // no 3 "stop sign" emojis in a row.
+  return $valid;
+}
+
 // ttValidEmail is used to check user input to validate an email string.
 function ttValidEmail($val, $emptyValid = false)
 {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f192b301..52aa91c58 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.61.4900 | 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.62.4901 | 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/time.php b/mobile/time.php
index b9ee3bce3..15069db2e 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -283,8 +283,7 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
-      // A %req% element is found in note. They have to be replaced by user.
+    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index c3699d539..b33b09914 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -271,8 +271,7 @@
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-  if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
-    // A %req% element is found in note. They have to be replaced by user.
+  if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
     $err->add($i18n->get('error.field'), $i18n->get('label.note'));
   }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
diff --git a/time.php b/time.php
index 4f0d5918b..9b76587bb 100644
--- a/time.php
+++ b/time.php
@@ -304,8 +304,7 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
-      // A %req% element is found in note. They have to be replaced by user.
+    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
diff --git a/time_edit.php b/time_edit.php
index e6ca12ad4..bbc95eade 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -276,8 +276,7 @@
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-  if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
-    // A %req% element is found in note. They have to be replaced by user.
+  if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
     $err->add($i18n->get('error.field'), $i18n->get('label.note'));
   }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));

From 69d107963f15b0fcfc46908063c0ae7c33af7d80 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 31 Mar 2019 14:41:14 +0000
Subject: [PATCH 0854/1848] Removed download column on projects_files.php to
 keep things simple.

---
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/project_files.tpl | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 52aa91c58..3bec2a8d2 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.62.4901 | 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.62.4902 | 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/project_files.tpl b/WEB-INF/templates/project_files.tpl
index 52e14f9a2..6579f34fe 100644
--- a/WEB-INF/templates/project_files.tpl
+++ b/WEB-INF/templates/project_files.tpl
@@ -5,7 +5,6 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.download}</td>
 {if $can_manage}
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
@@ -14,9 +13,8 @@
 {if $files}
   {foreach $files as $file}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$file.name|escape}</td>
+          <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
           <td>{$file.description|escape}</td>
-          <td><a href="file_download.php?id={$file.id}">{$i18n.label.download}</a></td>
     {if $can_manage}
           <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
           <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>

From bbdb5228ab00dfeb9d91217ce0e990842ab6da80 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 31 Mar 2019 14:53:11 +0000
Subject: [PATCH 0855/1848] Added project name to project_files.php page title.

---
 WEB-INF/templates/footer.tpl | 2 +-
 project_files.php            | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3bec2a8d2..9196e067e 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.62.4902 | 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.62.4903 | 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/project_files.php b/project_files.php
index 860ba0745..d8ef98842 100644
--- a/project_files.php
+++ b/project_files.php
@@ -86,5 +86,11 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.project_files'));
+
+
+$smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
+
+
+
 $smarty->assign('content_page_name', 'project_files.tpl');
 $smarty->display('index.tpl');

From bc4fe9902b43859db0c8f78f4fd4a5ceda6f2b00 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 31 Mar 2019 14:55:08 +0000
Subject: [PATCH 0856/1848] Removed duplicate assignment.

---
 project_files.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/project_files.php b/project_files.php
index d8ef98842..3af70d5eb 100644
--- a/project_files.php
+++ b/project_files.php
@@ -85,12 +85,6 @@
 $smarty->assign('can_manage', $user->can('manage_projects'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
-$smarty->assign('title', $i18n->get('title.project_files'));
-
-
 $smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
-
-
-
 $smarty->assign('content_page_name', 'project_files.tpl');
 $smarty->display('index.tpl');

From b01b40bf411268d98c57adb97d111166698eadb8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 4 Apr 2019 00:16:46 +0000
Subject: [PATCH 0857/1848] Added table ids as per issue #58.

---
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/header.tpl        | 18 +++++++++---------
 WEB-INF/templates/mobile/header.tpl | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9196e067e..687d38eed 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.62.4903 | 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.63.4904 | 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/header.tpl b/WEB-INF/templates/header.tpl
index d00000a70..75ae437ce 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -35,7 +35,7 @@
             <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
               <tr>
                 <td valign="top">
-                  <table cellspacing="0" cellpadding="0" width="100%" border="0">
+                  <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
                     <tr><td height="6" colspan="2"><img width="1" height="6" src="images/1x1.gif" border="0"></td></tr>
                     <tr valign="top">
 {if $user->custom_logo}
@@ -56,7 +56,7 @@
 {if $authenticated}
   {if $user->can('administer_site')}
       <!-- top menu for admin -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="top_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
@@ -68,7 +68,7 @@
       <!-- end of top menu for admin -->
 
       <!-- sub menu for admin -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a> &middot;
@@ -79,7 +79,7 @@
       <!-- end of sub menu for admin -->
   {else}
       <!-- top menu for authorized user -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="top_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
@@ -103,7 +103,7 @@
       <!-- end of top menu for authorized user -->
 
       <!-- sub menu for authorized user -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
@@ -148,7 +148,7 @@
   {/if}
 {else}
       <!-- top menu for non authorized user -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="top_menu_non_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a> &middot;
@@ -165,7 +165,7 @@
 
       <!-- page title and user details -->
 {if $title}
-      <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
+      <table id="page_title" cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
         <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
       </table>
@@ -174,7 +174,7 @@
 
       <!-- output errors -->
 {if $err->yes()}
-      <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
+      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="error">
   {foreach $err->getErrors() as $error}
@@ -188,7 +188,7 @@
 
       <!-- output messages -->
 {if $msg->yes()}
-      <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
+      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">
   {foreach $msg->getErrors() as $message}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 9e1c452da..806bd4853 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -36,7 +36,7 @@
             <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
               <tr>
                 <td valign="top">
-                  <table cellspacing="0" cellpadding="0" width="100%" border="0">
+                  <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
                     <tr><td height="6" colspan="2"><img width="1" height="6" src="../images/1x1.gif" border="0"></td></tr>
                     <tr valign="top">
 {if $user->custom_logo}
@@ -58,7 +58,7 @@
   {if $user->can('administer_site')}
   
       <!-- sub menu for admin -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a> &middot;
@@ -70,7 +70,7 @@
   {else}
 
       <!-- sub menu for authorized user -->
-      <table cellspacing="0" cellpadding="3" width="100%" border="0">
+      <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
@@ -100,7 +100,7 @@
       
       <!-- output errors -->
 {if $err->yes()}
-      <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
+      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="error">
   {foreach $err->getErrors() as $error}
@@ -114,7 +114,7 @@
 
       <!-- output messages -->
 {if $msg->yes()}
-      <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
+      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">
   {foreach $msg->getErrors() as $message}

From 34b3357dfc1ca05c99308f0dab5f7a6f59ea8aa4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 4 Apr 2019 01:10:08 +0000
Subject: [PATCH 0858/1848] Removed not needed closing tag.

---
 WEB-INF/templates/footer.tpl |   2 +-
 WEB-INF/templates/header.tpl |   2 +-
 images/icon_edit.png         | Bin 0 -> 1594 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 images/icon_edit.png

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 687d38eed..51d0368be 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.63.4904 | 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.63.4905 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 75ae437ce..d25f12812 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -39,7 +39,7 @@
                     <tr><td height="6" colspan="2"><img width="1" height="6" src="images/1x1.gif" border="0"></td></tr>
                     <tr valign="top">
 {if $user->custom_logo}
-                      <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$custom_logo}" border="0"></a></td>
+                      <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$custom_logo}" border="0"></td>
 {else}
                       <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="images/tt_logo.png" border="0"></a></td>
 {/if}
diff --git a/images/icon_edit.png b/images/icon_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7b92fb95a3bd1c367231d7dcc79a064899eda8a
GIT binary patch
literal 1594
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGgL4$(K9qL
zur#sMQ7|$vG|)FR(l;>IH8ij?HMcS_RDc2{plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wta&rsl~}fnFS@8`FRQ;6BCp2
zOG|8(fG&l2A-4c-Y+f-mn1BJMUy)d#Z>VPg@)As;uP=V3xw&xF#U(+h2=`(&xHzP;
zAXPsowK%`DC>a=WY04n03ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As%NO+o0y!L
z2ND76@b$Iw%quQQ%u7!7bg@+enxU7OnPTN=XkY>ia7z<cOH)HbS4#^sCj(1EBR2~J
zLnmirS4)^)m;B_?+|;}hnBEkGUPqjIL5U%^0BEyIYEfocYKmJ?ey#%8(^i?d-C~Z@
zJgD9j+-|YJsaGH97=2LGB1JV!2$+6AOnAZta^OinH4m8Hi+~BcZIUi9TQIHhba4!+
zxHV@=tVeL7#PR>>#h3qhJ)d*)(`FOLlRCdeI^Q&ZIyS*W!+CLRnQ+Nf-$3zL*3zjL
z*d?ZXX^j0MJ4>iz@d>6(DXldjHr#KMcikzmUjD!OR#L{Um(2U$&M80t+y4B#=l|tA
zLqq4(UhMZiFXJ$WG0?^Krn^+<ul&%!iRpe0Jk!KxpAenY)*!^a_uR49D?hN@6*^LM
zQrS00t--c++OA1GOQv(Ixb~D|oyuC3=#Jdz*=>iuxbW1>zIAdd-@m(;mU47$+cLrE
zjFv{!+@7u&;k;XOKm7c2!rx!##@2Ip*!FKSk2;wBM8W*PtX)i|sxx=w{cn;C%ku0z
zJdt<i4;}wm3n$Mre($1ku=vO^J4Mxd9lt*5nCzE6wj`a+b5H)ANzK-_$`kI!O;h_h
z(|X^G2cAW8TS9Ys__n>Z%y=u?{O7SbkDG0db<u|-ipdp+4lm0v;(hYbsfpcVa>2|c
z4!7?ZTJ$v<nlG5HF|RxCdAWsKJtN!R6ZX#U^sgNDD)N_R`+aSLsr27<ntPTrs642s
zG;52PTARUSkd+jE^6AlKF+P)8ZL?0VDJY)wwpQ<L`>Y`CJvAp*`xkk<QM8mj+3vgM
zO@^!Euack~o+$gCEcTr8iLA>inB@vM95=43Jf7c|pc}b9_GPJVv+%rEw{4X-owz?I
z-Ra}16qEgbrKAopSo+u$ujUlDal3WW?V|Sd+qYM;P0?Ddc`$J1{5I*kei};Nhb-**
z1%K9G<`Fj$EY!PwqV8AM?4|qW+tr6ozI*c}ug0Nl6PZ^X$%^Y+S$G`{Gur3Z39S>K
zT2)gwy*zB?vKz7M<|?gMo*OK<@`%v3JeBPyq`Kmsd@tFcDySTi*p@c+XQAQ?!`dzH
zcLcOXM(zIJW^Zv+@9kBVnmO6M87ya?@K#E_3Dp0XDEZO7fssK?<i_Mp%sa1xN^?(F
KKbLh*2~7ZsP+Zag

literal 0
HcmV?d00001


From 336dbb39dfa588646615c461e3f16b785998ea67 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Apr 2019 16:42:16 +0000
Subject: [PATCH 0859/1848] Introduced icons for files, edit, and delete
 operations.

---
 WEB-INF/templates/footer.tpl   |   2 +-
 WEB-INF/templates/projects.tpl |  24 ++++++++++++------------
 images/icon_delete.png         | Bin 0 -> 1632 bytes
 images/icon_edit.png           | Bin 1594 -> 1433 bytes
 images/icon_files.png          | Bin 0 -> 1635 bytes
 5 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 images/icon_delete.png
 create mode 100644 images/icon_files.png

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 51d0368be..e741649cc 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.63.4905 | 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.63.4906 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 0b400b119..dafe1d8d5 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -14,10 +14,10 @@
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
   {if $show_files}
-          <td class="tableHeader">{$i18n.label.files}</td>
+          <td></td>
   {/if}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $active_projects}
     {foreach $active_projects as $project}
@@ -25,10 +25,10 @@
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
       {if $show_files}
-          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
       {/if}
-          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
-          <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -49,20 +49,20 @@
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
     {if $show_files}
-          <td class="tableHeader">{$i18n.label.files}</td>
+          <td></td>
     {/if}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
       {if $show_files}
-          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
       {/if}
-          <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
-          <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/images/icon_delete.png b/images/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..997779f772b566a4ef9928dd6db60a325977ed33
GIT binary patch
literal 1632
zcmaJ>dr%a09KUSDQa}lEv`n`}88z<qaSwJkPUBv3#KVD8Z^X)F_jkCm_i%5oI}n_P
z(bUo`K`=FvNgEmQiBi5sEqqWu##9o4vBcB~l}SacQ2Xr($RCY6v-|u0e!tJ>`~L3o
z>6z1_hQ2mbrBX%NQ!UwW9ihB0MZoX4drw%njFzoVImhdggRBHpDZDoiAa*yK53&Kv
z7cOW7$tu;0?SjK8J2TQ5&g<5&3Puxh`ygATN}d|>v0MR=kvxzuc#LT0fx{>w@J4i&
zJ_FD2nZZ0EwMYUvMVSt+sDPt+bm|l&ImAE(ZXmNr$Sr#OOvs3a^)gUajxiJoL*xP@
z`qU|B#&pE&l>nmG;A##x5QssiA#^ycqZ1JlCvc1)F+534;EX<r!3m`IL7_E?cQM%(
zTdys+Gotfk*~eg5Fc{PXwHmLKj}bIYV>pSCq#7dB{z8w;hSVN^e4hpj@N<&jlLfB_
zQ8co7-hgaGp{GwnaQiYc`W1Wpy@`S;!$PbNBQ!YXb}Mm((SA7_JaglJ(SApv4`A8A
z?+r*CtcNSUj|_A7d_#Rep6kc?0+JYxljkrX0ypr;e&`et_6T~;WJv-nAS+tDTtK<C
zTa0KRAn=UdLgExn>S(RWW-$>2P3Tf6J&jwmgdV5NlwwR#FpvmOG(6<$Xsh0;wNW}N
zok9>+nlhMhnjmcyPMFMEE8WMnd;Bu%;ecXP;R?^VNzdgnW(lyeS8{m0VqdG+MKR!)
zCFK|~=jb(rQo&vyfh2qgc$?&PBjFM-!T`(Ra19)wIntn4a|V}QjZ->YP4l!?%~2eI
zlP<!bW%JNpGCv?!eIXmn1Ysg!H<2W6pa_DZ%m%9#W<U>b=p-A8L2r1Dkp)=<z0H{-
z%Ds{(C=J4htS294Ld^pg8xUo53J+^0gJeu;JW+t)u=JFN4bT=o9?+?MNZ9_0*gto0
z(?7Yu1IJZ@bLn`Tc3Pzx6l=GnI6{|;bIumTro>e>H;=D-<;RatSGaeglS+}&AuTuC
z>Xz2m7mdt%)e-ray1y|raZhQg+8T3kv?HzM{*Z0IS$lHIKRa~s)~3CUD>}E;v2~lG
zPo24Yec_dZoh91EYj-&(8!ttcG83MR`)K`;R@3l1)g76E$!jXcj%|8(^DjTQr&fJ`
zr{u__h8NDoHxLhNjvmjO){&S_{z+A4HP>JHT+)7-+`fPBjjHZJc-(>+C-xO-%IKrt
z4qI{{zpi=Ms0%8`&iAht$Jv`A8`F0=7hW&)yEiW*7q7^^n_FXkP~F@!2A|nbHsh0q
z?`nIF&AF3YwITh??2*kCQrEf>v0u#TIoS1RN$!##?#HP1E(bRcd&Z2uO8xz5`AXu=
zg!O4}>~zM@Kfe2~Yn}<Ngt8z~SR4%QuIWk{KcRWzg<IN+9nzw~tG8s{V)ZNWp3r;C
z)>k(zUC^4A+f~>0_}p1j+`X;mW3oG@HiohWU%I`8ox3J8W@CBGiJIumi7xxs+}8c;
zs>O)?=kiwXrV`leAGdYnUz|N^(LYV|OOBPDA6e;c$*q)zd9U_xzm^OI-Q&NR5o>C7
zR!AiiZ%5b0Z<zIa!pvH2{ppv>FQ2_pAzZqB=+N7p54u0dpSvnSG`d^%os1|R_3#~^
zCn|dTwMl<GniFdOcSl~UZA9W%dlE0V)eet5wFs*WA}3cZ{3)V)tS@lHy6f<uNENv@
VD)IHV=oQL8-)_ycY&Xp<{SPbAWVrwU

literal 0
HcmV?d00001

diff --git a/images/icon_edit.png b/images/icon_edit.png
index c7b92fb95a3bd1c367231d7dcc79a064899eda8a..83f8371668f4a6367bd6db732684baae20d84ed2 100644
GIT binary patch
delta 674
zcmdnRGm~4fGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qoO(!kF%STg|nlZnTe~V
z<KzcSVw1C&q+o*PV8IDYE<7fduBNWWZkAA01~36fs0z`^hRlxjcI78J85o$jJzX3_
zDsHs|dwYZgO8h%_Ms{wySn}c010T|KYnCYJDv64U^DgV=xaF1?wJns(_07hdr-xhx
zxAbywF)1HyZEn5f<l%9YJuu6-x5>Ega?JZV`;4v3e2PCe_n-bLfB*mg=l0<qnhOo~
zOCG;_{d2?NMx_h|X<g0udaG88Ee5$?+=REp967hI^W{>F2Y=ihj`k=j-?rU1>Dk{a
z2Mv~(Ol>%2*;l5Kcs8)7U%{n4Fj8-q9?Lt!%BF2mPlGL8f1h>M*XFJ8Hr*2P+wkXC
z^`3_HkAtqhG+1*+_gCzHVGD1&<kuWmUvaEIdZWXkJFs!7hth%FQj6~AsxPR2b3QSx
zY3=j#3CZTI?<cbCl5XNypRYX8=(50$vom(gJ)odd`E^cQTf=&m&8GvmTz&atVM|i=
zt3~gPpCzvgQe0R3PEh{&zC$~Yi*E}Mwqf0Wyw$Sr;OXkaGt_^s6>}=*T;jaOVy{&5
zv8{1te|~J35&O~n*L#t3vzoiVZ2A>kzVcfA&s6Pw8#YdM`F`}&nhW`tH(8X+Cod{v
ziYuDqc>U4JX8+T(cdu=W`<C=HT*!;V&(P_A$j0z#{b`?MUE6j(Y=3?Gq}{rY#?Rj^
z`MdG%uA+j;l0kb<vOlTb)OS92%Kh2y`-E9-DxVA7tWVi~^drZg%cmx8W0_Ml?RfZ;
z=%R~e!D+?X|G2LF*gNsyykC0TY>HplF&fQowrApD2=G{5Ch?-?7%<r}c)I$ztaD0e
F0suU;GO_>w

delta 836
zcmbQqy^BY&Gr-TCmrII^fq{Y7)59eQNQ;0l2OE&=?Ud!+sHo1w<7jALVqj)yY2s>W
zI{5*U*yJoGDVU%mSa1T93rxTqs>%Q+U;$MjI@yrfvA%7RZUF-W(;80~$B>F!bEd?4
z1Sd)y|DRrb`H$E0IX6FTHgP<u^IN3zP4lN?6FfAW7sr+fmt6G?6pv*soqB;?V#=4s
z*e|lPggO?VV9J!zS`%W!{Wf{mof7Ni|Eq5$W$b#%y#MW-^7Fs#&(C}QU(Pc$bWZKX
ze(&=#4s#d-U2JdGyGwQc$`1{knC|DmGfiyv3DHSy4MN;|&mDWc@&n6Vp(8~nm3?#6
z8f;sq?V8lHWID%+Yfm}WsjO9r?#PXv-FE1U3s24LTPL^j{kwZ<DM#0~Efb8+XlX>v
z?dggU&bu}D!_Pk_{QY%qY&~~}ZT}|osDs&06wD9I+Qnq5I&(+f|0c=$uq@Bc!xMRD
z{?PHCwQ%x0<M%Eq2aAs!vr|;P*YWF<j>&%MV@uN6Jon_^nbd4;t32Uu+%&bHGp+Z{
zc;Hziw<R>Ehi}_k%Z#_O&3_)7^SIgOSQmXbqL^H9=<u=(Bi<(;otoG^CKt?H;&A(p
zp+#S#q4|R88uPmIo|jv=)ibi~JyCD({7(PMVXq>8X|~_jHkeBPU8lKcIfKfBib}J#
zh^e(1Oa@s=;U}LST^8drsns^?^qPX=NpEZQ-nP#Q(%w^ZVzqyf#~VdU*^}+QYu;qI
zI{qpN%HfH!@5y4%DWAx?tb$ptfWvX)y2|7EeF?ge>tkP*>NX3{dv)7ZdDDsebJCsa
zKdwqK+5cBc>HveKk4^DvPH`KzTPNKvYEQp?dnMZxt<{<b182@}lfLVxq2ztY!k%C7
zXZ>X!aTCEpz1t`1es#@Wx^KQ+edy%7H(&B<9LhG4dDW4uxW1Kz*U>PeeSV$LI`OGh
zHFeX=!&WZ45xZ`#(t72&!GbG~2yM$#*?vN*E6(@H_mT~&g32L@ZD~_~7An3ltljc{
zM?h<2)b9Un_7+F=-d<&?nUmd{!E*KqZ>7|mK>d%2k{{h07#Y+=ZcN_9yz@FRV=#ES
L`njxgN@xNA!2)gS

diff --git a/images/icon_files.png b/images/icon_files.png
new file mode 100644
index 0000000000000000000000000000000000000000..264ab6eb9d8b07bfd4e92076567e4ace961162e3
GIT binary patch
literal 1635
zcmaJ>dr%a096v;XDCNorTB+MIjAh*I?s2bOIq05o>Ya3)K<0zJ-5;>tV~@Q(?jUv4
zq=`|}CKZ$%Q*?$JbtrWhhQLQY(9x_+8zFnZC`^tqDrQY8{q}goAJxw6{=WO&&*%I8
zZcU!^^@+*PC(C5AiS}HJ3!ZZ6PD+5!+4l!&c+3#3MPfc*B1UKd$c!xS0f^mCmjV}{
z*~;?sAWJ5T@8;Y^Vv%DZ#qfS5En$>Ve-N@|vaFnFkY>C<L_DCB3mDM;*5fF`u?DnI
z<G>w3GbrP7s|1i=<#aPuUWR1RoNOd3N<jmDAks+G?+b*er~!@HrJyXSF%*eGM6UrI
z3aZGFhnRT*AQ~mEU~nygXw^zWjgx9J15x1wju9#h*C_~`(&#9hK!z_AdK1_Z%4M+)
z`+{!<v`iF(6oy425oIJ($qS_zL6Rhft1y*H0TGH&Wk95(ia;oB#DWEc7=a6l93Ma=
zi?oLiiv|=%I+TJx=x~f04upma1xtoS=^#cZam??R@`|BDq6_>J#=oLN?#dv*Tp+}U
z1qSw`ByEHYYxn<-Mu03ciVKDXUo20S!GI6=K|l<_pomyRFmh^<z`+L6J`2x;rLT62
z0S$*ameN>MxSmw0$xM^YVj>8VP#g6c61QX$8eDJIOU@(%V~J3sWFc2gS~b>88?LsJ
zMuM=CdaVg336)Kc6DD(}l^o&P10j(PFhFuDaXHAf;n0QJWQJVre{w0a0BDgH+&u3a
z85O(F7Y>Pnq(;p78YLlha5zRFa20^H3A`VPwSeNrcpgfZ1%%2&dlaln>rvo3HL1`8
zvP8jXNVP|;qdg3xLx;)im|BgbthEw^Nd>1#rNXs(g3#;DT5G0WZPjSa1gW#37>tHx
zD3KF=V0bu<K5<y`angWLJ~~heE1_UP2_5!{Xm*~!1;i{&nmZo{u`y|ghK(^6Q;!+c
z5hR>`NgQ1}_%gb<AON>jfNMGHf@zLSHZIj}F}kCj`}2=`r@SG5a;xq7p47>0X~FFd
zxw9vwNnTUE`{zAK+|zcZlw)eMuNCa;Tk)|rA!Gc+IdKy-xt0yl#$Uc#Dnwqbz0rL6
zdUMP4Jb6ns9jPd3@2{`C-?3z4`7H3nHJG#Y(ZI<|3wr0&H)mZgJd<*09k%;m__4FM
z)9Lvut>eIfuDbeGyjwB<M(VNIiY&XX0GpiH{cK~>f=7?Hu&cM;T0Qp)KJV>uS641}
zO?mkav*zxlRc+<vn~!{wIdG_bEwW2qk$$%LgKv_)U}kxHy}uW4GAdtNE;sXSXMVlV
z@<-W{_yxyzv?bA5={22Gy~N@HSKT?}@nmD1yRNa}g8kx02E)v=*LqAxr_~`Z&d;k^
z^-6)eeL_)lEnWEAOAWG}bGr)H3xg{k(EPpcmc3hOJbL5w-oh<(xbM05mUf+5*z}I_
z-r=}%l(^m9QslUub|{<w%v0TTe@0n2E=RN%Y?s|^vR)nEpE_@X$4;HzxTPL@Ge7xQ
z>r<z*8};YcS8hA_aBT;*IFKXs?yD_s{m|w;=u4Siv0>T!=dkJNJMZ)tOv?DaBi(!A
z%7aC^!x?M9?lp;@&+PkBb*E$7#erVsx9g@ps4iZeRvGyrf%IOP<Uf#jGjZ@oy7Pt2
zdm8@S`>?7+7oT$K?2*Q4Hrw5HRu{j?+0ggXj^w3p6*y0xa3@^u`8s|^%jT7vx^jD#
d_pTWCjBMAnPpSO_J517V-)?nU4x5VC{|!*ARt^9F

literal 0
HcmV?d00001


From e25cf11c520c4e86bfd7d4f0944a146f0a21cf91 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Apr 2019 16:54:18 +0000
Subject: [PATCH 0860/1848] Replaced edit text links with icon on time pages.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/mobile/time.tpl | 2 +-
 WEB-INF/templates/time.tpl        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e741649cc..6f48e05b3 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.63.4906 | 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.63.4907 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 7fea17775..06d2775da 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -25,7 +25,7 @@
         <td valign="top">{$record.project|escape}</td>
 {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-        <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>{/if}</td>
+        <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a>{/if}</td>
       </tr>
       {/foreach}
     </table>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index e0418eeb6..c03297a56 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -116,7 +116,7 @@
   {/if}
         <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
         <td class="tableHeader">{$i18n.label.note}</td>
-        <td width="5%" class="tableHeader">{$i18n.label.edit}</td>
+        <td></td>
       </tr>
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
@@ -139,7 +139,7 @@
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>
+          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
       {if ($record.duration == '0:00' && $record.start <> '')}
           <input type="hidden" name="record_id" value="{$record.id}">
           <input type="hidden" name="browser_date" value="">

From 352243fe0b205fa6371299c47be1bb91a7a377bb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Apr 2019 19:09:02 +0000
Subject: [PATCH 0861/1848] Added delete option on time.php pages.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/mobile/time.tpl | 1 +
 WEB-INF/templates/time.tpl        | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6f48e05b3..6d0c07e9a 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.63.4907 | 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.63.4908 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 06d2775da..38ec1914c 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -26,6 +26,7 @@
 {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
         <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a>{/if}</td>
+        <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a>{/if}</td>
       </tr>
       {/foreach}
     </table>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index c03297a56..0b5a77ca5 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -117,6 +117,7 @@
         <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
         <td class="tableHeader">{$i18n.label.note}</td>
         <td></td>
+        <td></td>
       </tr>
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
@@ -146,6 +147,13 @@
           <input type="hidden" name="browser_time" value="">
           <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
       {/if}
+    {/if}
+        </td>
+        <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
     {/if}
         </td>
       </tr>

From 841e890b68ec699bf5291c43b4527bf748b5265c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 12:20:04 +0000
Subject: [PATCH 0862/1848] Work in progress on attachments for time entries.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/time.tpl   |  6 +++
 time.php                     |  1 +
 time_files.php               | 98 ++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 time_files.php

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6d0c07e9a..dee093f7b 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.63.4908 | 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.63.4909 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 0b5a77ca5..1f1c7adc1 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -118,6 +118,9 @@
         <td class="tableHeader">{$i18n.label.note}</td>
         <td></td>
         <td></td>
+  {if $show_files}
+        <td></td>
+  {/if}
       </tr>
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
@@ -136,6 +139,9 @@
     {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {if $show_files}
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+    {/if}
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
diff --git a/time.php b/time.php
index 9b76587bb..5cec8a7e6 100644
--- a/time.php
+++ b/time.php
@@ -401,6 +401,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
+if (isTrue('FILES_DEBUG')) $smarty->assign('show_files', $user->isPluginEnabled('at'));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/time_files.php b/time_files.php
new file mode 100644
index 000000000..fc8099250
--- /dev/null
+++ b/time_files.php
@@ -0,0 +1,98 @@
+<?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('ttTimeHelper');
+import('ttFileHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_id = (int)$request->getParameter('id');
+$time_rec = ttTimeHelper::getRecord($cl_id);
+if (!$time_rec) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('at')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// TODO: review access checks, specifically for on behalf operations.
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_description = trim($request->getParameter('description'));
+}
+
+$fileHelper = new ttFileHelper($err);
+
+
+
+
+die("coding ongoing sown from here...");
+$files = $fileHelper::getEntityFiles($cl_id, 'time');
+
+
+
+$form = new Form('fileUploadForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
+$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit'),'maxsize'=>67108864)); // 64 MB file upload limit.
+// Note: for the above limit to work make sure to set upload_max_filesize and post_max_size in php.ini to at least 64M.
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // We are adding a new file.
+
+  // Validate user input.
+  if (!$_FILES['newfile']['name']) $err->add($i18n->get('error.upload'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Finished validating user input.
+
+  if ($err->no()) {
+    $fields = array('entity_type'=>'project',
+      'entity_id' => $cl_project_id,
+      'file_name' => $_FILES['newfile']['name'],
+      'description'=>$cl_description);
+    if ($fileHelper->putFile($fields)) {
+      header('Location: project_files.php?id='.$cl_project_id);
+      exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('can_manage', $user->can('manage_projects'));
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('files', $files);
+$smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
+$smarty->assign('content_page_name', 'project_files.tpl');
+$smarty->display('index.tpl');

From ccad5f6b0a1739455bf3b53dfcbcffd6692ffd5e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 13:21:29 +0000
Subject: [PATCH 0863/1848] More work in progress on time record attachments.

---
 WEB-INF/lib/ttFileHelper.class.php |  7 +++--
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  2 ++
 WEB-INF/resources/de.lang.php      |  2 ++
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/resources/es.lang.php      |  3 +-
 WEB-INF/resources/et.lang.php      |  2 ++
 WEB-INF/resources/fa.lang.php      |  2 ++
 WEB-INF/resources/fi.lang.php      |  2 ++
 WEB-INF/resources/fr.lang.php      |  2 ++
 WEB-INF/resources/gr.lang.php      |  2 ++
 WEB-INF/resources/he.lang.php      |  3 +-
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  2 ++
 WEB-INF/resources/ja.lang.php      |  3 +-
 WEB-INF/resources/ko.lang.php      |  3 +-
 WEB-INF/resources/nl.lang.php      |  2 ++
 WEB-INF/resources/no.lang.php      |  3 +-
 WEB-INF/resources/pl.lang.php      |  2 ++
 WEB-INF/resources/pt-br.lang.php   |  2 ++
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  3 +-
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  3 +-
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  2 ++
 WEB-INF/resources/sv.lang.php      |  2 ++
 WEB-INF/resources/tr.lang.php      |  3 +-
 WEB-INF/resources/zh-cn.lang.php   |  3 +-
 WEB-INF/resources/zh-tw.lang.php   |  3 +-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/time_files.tpl   | 47 ++++++++++++++++++++++++++++++
 project_files.php                  |  2 +-
 time_files.php                     | 22 +++++---------
 35 files changed, 114 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/time_files.tpl

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index f3c36e56b..9d18022b8 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -297,8 +297,8 @@ private function getGroupKey() {
     return $val['group_key'];
   }
 
-  // getProjectFiles obtains a list of files for a project.
-  static function getProjectFiles($project_id) {
+  // getEntityFiles obtains a list of files for an entity.
+  static function getEntityFiles($id, $type) {
     global $user;
     $mdb2 = getConnection();
 
@@ -306,8 +306,9 @@ static function getProjectFiles($project_id) {
     $org_id = $user->org_id;
 
     $result = array();
+    $entity_type = $mdb2->quote($type);
     $sql = "select id, remote_id, file_name as name, description from tt_files".
-      " where entity_type = 'project' and entity_id = $project_id".
+      " where entity_type = $entity_type and entity_id = $id".
       " and group_id = $group_id and org_id = $org_id and status = 1 order by id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f6a535745..4454d3482 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -300,6 +300,7 @@
 'title.edit_time_record' => 'Modificant l\\\'historial de temps',
 'title.delete_time_record' => 'Eliminant l\\\'historial de temps',
 // TODO: translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index fc976878f..aa590549e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -310,6 +310,7 @@
 'title.edit_time_record' => 'Upravit časový záznam',
 'title.delete_time_record' => 'Smazat časový záznam',
 // TODO: translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6c748c8f4..0248b8d79 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -282,6 +282,8 @@
 'title.time' => 'Tid',
 'title.edit_time_record' => 'Redigér Tidsregistrering',
 'title.delete_time_record' => 'Slet Tidsregistrering',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Udgifter',
 'title.edit_expense' => 'Redigér Udgift',
 'title.delete_expense' => 'Slet Udgift',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e162f3989..18bfc2e9c 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -270,6 +270,8 @@
 'title.time' => 'Zeiten',
 'title.edit_time_record' => 'Bearbeiten des Stundeneintrags',
 'title.delete_time_record' => 'Eintrag löschen',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Kostenposition ändern',
 'title.delete_expense' => 'Kostenposition löschen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 54da108c0..98c6f915d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -258,6 +258,7 @@
 'title.time' => 'Time',
 'title.edit_time_record' => 'Editing Time Record',
 'title.delete_time_record' => 'Deleting Time Record',
+'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Expenses',
 'title.edit_expense' => 'Editing Expense Item',
 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index aee71b4c0..8e7ce8c97 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -298,7 +298,8 @@
 'title.time' => 'Tiempo',
 'title.edit_time_record' => 'Modificando el historial de tiempo',
 'title.delete_time_record' => 'Eliminando el historial de tiempo',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 4963cc592..65beb3ee2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -288,6 +288,8 @@
 'title.time' => 'Ajaarvestus',
 'title.edit_time_record' => 'Ajakande muutmine',
 'title.delete_time_record' => 'Ajakande kustutamine',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Kulud',
 'title.edit_expense' => 'Kulukirje muutmine',
 'title.delete_expense' => 'Kulukirje kustutamine',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index d6ed945c8..6a74f0ed7 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -293,6 +293,8 @@
 'title.time' => 'زمان',
 'title.edit_time_record' => 'ویرایش رکورد زمان',
 'title.delete_time_record' => 'حذف رکورد زمان',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'هزینه ها',
 'title.edit_expense' => 'ویرایش آیتم هزینه ها',
 'title.delete_expense' => 'حذف آیتم هزینه ها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 5aaf7f971..d02a010c6 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -286,6 +286,8 @@
 'title.time' => 'Tuntien kirjaus',
 'title.edit_time_record' => 'Tuntikirjausten muokkaus',
 'title.delete_time_record' => 'Tuntikirjausten poisto',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Kulut',
 'title.edit_expense' => 'Kulutietojen muokkaus',
 'title.delete_expense' => 'Kulutiedon poisto',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f95bf7424..45447d7d7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -280,6 +280,8 @@
 'title.time' => 'Temps',
 'title.edit_time_record' => 'Modification de l\\\'entrée de temps',
 'title.delete_time_record' => 'Suppression de l\\\'entrée de temps',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Dépenses',
 'title.edit_expense' => 'Modification d\\\'une dépense',
 'title.delete_expense' => 'Suppression d\\\'une dépense',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ee10172a4..68208ee63 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -273,6 +273,8 @@
 'title.time' => 'Χρόνος',
 'title.edit_time_record' => 'Επεξεργασία χρόνου',
 'title.delete_time_record' => 'Διαγραφή χρόνου',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Δαπάνες',
 'title.edit_expense' => 'Επεξεργασία δαπάνης',
 'title.delete_expense' => 'Διαγραφή δαπάνης',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 90056902c..5c199ec69 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -303,7 +303,8 @@
 'title.time' => 'זמן',
 'title.edit_time_record' => 'עריכת רשומה',
 'title.delete_time_record' => 'מחיקת רשומה',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 58fcf50ac..5f7b40cfd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -300,6 +300,7 @@
 // 'title.time' => 'Time',
 // 'title.edit_time_record' => 'Editing Time Record',
 // 'title.delete_time_record' => 'Deleting Time Record',
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 4b6cf98d2..678b1b088 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -281,6 +281,8 @@
 'title.time' => 'Tempo',
 'title.edit_time_record' => 'Modifica record temporale',
 'title.delete_time_record' => 'Eliminazione record temporale',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Spese',
 'title.edit_expense' => 'Modifica voce di spesa',
 'title.delete_expense' => 'Eliminezione voce di spesa',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b4fd746f0..8b68a1b00 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -305,7 +305,8 @@
 'title.time' => '時間',
 'title.edit_time_record' => '時間レコードの編集',
 'title.delete_time_record' => '時間レコードの削除',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b7c4a6952..181e07079 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -305,7 +305,8 @@
 'title.time' => '시간',
 'title.edit_time_record' => '시간기록을 편집하기',
 'title.delete_time_record' => '시간기록을 삭제하기',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index f06047151..e444f2140 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -258,6 +258,8 @@
 'title.time' => 'Tijdsregistraties',
 'title.edit_time_record' => 'Wijzigen tijdrecord',
 'title.delete_time_record' => 'Verwijder tijdrecord',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Bewerk kosten artikel',
 'title.delete_expense' => 'Verwijder kosten artikel',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d8848cd0c..0f91855e9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -302,7 +302,8 @@
 'title.time' => 'Tid',
 'title.edit_time_record' => 'Endre tids oppføringen',
 'title.delete_time_record' => 'Slett tids oppføringen',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b62c3b613..4d457d61d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -287,6 +287,8 @@
 'title.time' => 'Wybrana data',
 'title.edit_time_record' => 'Edytowanie wpisu',
 'title.delete_time_record' => 'Usuwanie wpisu',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Wydatki',
 'title.edit_expense' => 'Edytowanie wpisu',
 'title.delete_expense' => 'Usuwanie wpisu',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7662b98d6..88344d823 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -284,6 +284,8 @@
 'title.time' => 'Tempo',
 'title.edit_time_record' => 'Editando entrada de hora',
 'title.delete_time_record' => 'Apagando entrada de hora',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Gastos',
 'title.edit_expense' => 'Editando item de gasto',
 'title.delete_expense' => 'Apagando item de gasto',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b76b0dcdb..c388f0954 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -289,6 +289,7 @@
 // 'title.time' => 'Time',
 // 'title.edit_time_record' => 'Editing Time Record',
 // 'title.delete_time_record' => 'Deleting Time Record',
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 908c7d38a..7800b2b91 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -305,7 +305,8 @@
 'title.time' => 'Timpul',
 'title.edit_time_record' => 'Editarea inregistrarii timpului',
 'title.delete_time_record' => 'Ștergerea inregistrarii timpului',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index cb7c0925d..d1b74e0d3 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -257,6 +257,7 @@
 'title.time' => 'Время',
 'title.edit_time_record' => 'Редактирование записи о времени',
 'title.delete_time_record' => 'Удаление записи о времени',
+'title.time_files' => 'Файлы записи о времени',
 'title.expenses' => 'Расходы',
 'title.edit_expense' => 'Редактирование предмета расхода',
 'title.delete_expense' => 'Удаление предмета расхода',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2024b49ff..7073ac5f0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -292,7 +292,8 @@
 'title.time' => 'Časový záznam',
 'title.edit_time_record' => 'Upravovanie časového záznamu',
 'title.delete_time_record' => 'Vymazávanie časového záznamu',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index bd7615dc8..2b609003c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -285,6 +285,7 @@
 // 'title.time' => 'Time',
 // 'title.edit_time_record' => 'Editing Time Record',
 // 'title.delete_time_record' => 'Deleting Time Record',
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 89875af5f..a6b4b74b9 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -285,6 +285,8 @@
 'title.time' => 'Vreme',
 'title.edit_time_record' => 'Izmeni unos vremena',
 'title.delete_time_record' => 'Obriši unos vremena',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Troškovi',
 'title.edit_expense' => 'Izmeni stavke troškova',
 'title.delete_expense' => 'Obriši stavke troškova',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ff2dda343..b2837ccd0 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -281,6 +281,8 @@
 'title.time' => 'Tider',
 'title.edit_time_record' => 'Redigera tidsregistrering',
 'title.delete_time_record' => 'Ta bort tidsregistrering',
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Kostnader',
 'title.edit_expense' => 'Redigera kostnad',
 'title.delete_expense' => 'Ta bort kostnad',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c0411a646..cef0d9eb8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -314,7 +314,8 @@
 'title.time' => 'Zaman',
 'title.edit_time_record' => 'Zaman kaydını düzenliyor',
 'title.delete_time_record' => 'Zaman kaydını siliyor',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 208bd684f..551ef564d 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -293,7 +293,8 @@
 // 'title.time' => 'Time',
 'title.edit_time_record' => '编辑时间记录',
 'title.delete_time_record' => '删除时间记录',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 0dcd0e8c4..eef917947 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -300,7 +300,8 @@
 // 'title.time' => 'Time',
 'title.edit_time_record' => '編輯時間記錄',
 'title.delete_time_record' => '刪除時間記錄',
-// TODO: translate the following.
+// TODO: Translate the following.
+// 'title.time_files' => 'Time Record Files',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dee093f7b..17d7a68c1 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.63.4909 | 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.63.4910 | 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/time_files.tpl b/WEB-INF/templates/time_files.tpl
new file mode 100644
index 000000000..f373815f7
--- /dev/null
+++ b/WEB-INF/templates/time_files.tpl
@@ -0,0 +1,47 @@
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+{if $can_edit}
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
+{/if}
+        </tr>
+{if $files}
+  {foreach $files as $file}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
+          <td>{$file.description|escape}</td>
+    {if $can_edit}
+          <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
+          <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>
+    {/if}
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+    </td>
+  </tr>
+</table>
+
+{if $can_edit}
+{$forms.fileUploadForm.open}
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td align="center">
+      <table border="0" width="60%">
+        <tr>
+            <td align="right">{$i18n.label.description}:</td>
+            <td>{$forms.fileUploadForm.description.control}</td>
+            <td align="left">{$forms.fileUploadForm.newfile.control}</td>
+        </tr>
+        <tr><td height="50" align="center" colspan="3">{$forms.fileUploadForm.btn_submit.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.fileUploadForm.close}
+{/if}
diff --git a/project_files.php b/project_files.php
index 3af70d5eb..f797cc6b8 100644
--- a/project_files.php
+++ b/project_files.php
@@ -53,7 +53,7 @@
 }
 
 $fileHelper = new ttFileHelper($err);
-$files = $fileHelper::getProjectFiles($cl_project_id);
+$files = $fileHelper::getEntityFiles($cl_project_id, 'project');
 
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
diff --git a/time_files.php b/time_files.php
index fc8099250..6b76b23de 100644
--- a/time_files.php
+++ b/time_files.php
@@ -54,17 +54,10 @@
 }
 
 $fileHelper = new ttFileHelper($err);
-
-
-
-
-die("coding ongoing sown from here...");
 $files = $fileHelper::getEntityFiles($cl_id, 'time');
 
-
-
 $form = new Form('fileUploadForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit'),'maxsize'=>67108864)); // 64 MB file upload limit.
 // Note: for the above limit to work make sure to set upload_max_filesize and post_max_size in php.ini to at least 64M.
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
@@ -79,20 +72,21 @@
   // Finished validating user input.
 
   if ($err->no()) {
-    $fields = array('entity_type'=>'project',
-      'entity_id' => $cl_project_id,
+    $fields = array('entity_type'=>'time',
+      'entity_id' => $cl_id,
       'file_name' => $_FILES['newfile']['name'],
       'description'=>$cl_description);
     if ($fileHelper->putFile($fields)) {
-      header('Location: project_files.php?id='.$cl_project_id);
+      header('Location: time_files.php?id='.$cl_id);
       exit();
     }
   }
 } // isPost
 
-$smarty->assign('can_manage', $user->can('manage_projects'));
+$canEdit = !($time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']);
+$smarty->assign('can_edit', $canEdit);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
-$smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
-$smarty->assign('content_page_name', 'project_files.tpl');
+$smarty->assign('title', $i18n->get('title.time_files'));
+$smarty->assign('content_page_name', 'time_files.tpl');
 $smarty->display('index.tpl');

From f30b876933acf131cbdfbf89ae7717faffa85f2d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 13:34:42 +0000
Subject: [PATCH 0864/1848] Merged to templates into one to keep things simple.

---
 .../{time_files.tpl => entity_files.tpl}      |  0
 WEB-INF/templates/footer.tpl                  |  2 +-
 WEB-INF/templates/project_files.tpl           | 47 -------------------
 project_files.php                             |  4 +-
 time_files.php                                |  2 +-
 5 files changed, 4 insertions(+), 51 deletions(-)
 rename WEB-INF/templates/{time_files.tpl => entity_files.tpl} (100%)
 delete mode 100644 WEB-INF/templates/project_files.tpl

diff --git a/WEB-INF/templates/time_files.tpl b/WEB-INF/templates/entity_files.tpl
similarity index 100%
rename from WEB-INF/templates/time_files.tpl
rename to WEB-INF/templates/entity_files.tpl
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 17d7a68c1..adf3c05cf 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.63.4910 | 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.63.4911 | 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/project_files.tpl b/WEB-INF/templates/project_files.tpl
deleted file mode 100644
index 6579f34fe..000000000
--- a/WEB-INF/templates/project_files.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-{if $can_manage}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
-{/if}
-        </tr>
-{if $files}
-  {foreach $files as $file}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
-          <td>{$file.description|escape}</td>
-    {if $can_manage}
-          <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
-          <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>
-    {/if}
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-    </td>
-  </tr>
-</table>
-
-{if $can_manage}
-{$forms.fileUploadForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td align="center">
-      <table border="0" width="60%">
-        <tr>
-            <td align="right">{$i18n.label.description}:</td>
-            <td>{$forms.fileUploadForm.description.control}</td>
-            <td align="left">{$forms.fileUploadForm.newfile.control}</td>
-        </tr>
-        <tr><td height="50" align="center" colspan="3">{$forms.fileUploadForm.btn_submit.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.fileUploadForm.close}
-{/if}
diff --git a/project_files.php b/project_files.php
index f797cc6b8..9ca15e39b 100644
--- a/project_files.php
+++ b/project_files.php
@@ -82,9 +82,9 @@
   }
 } // isPost
 
-$smarty->assign('can_manage', $user->can('manage_projects'));
+$smarty->assign('can_edit', $user->can('manage_projects'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
-$smarty->assign('content_page_name', 'project_files.tpl');
+$smarty->assign('content_page_name', 'entity_files.tpl');
 $smarty->display('index.tpl');
diff --git a/time_files.php b/time_files.php
index 6b76b23de..2ba0efcea 100644
--- a/time_files.php
+++ b/time_files.php
@@ -88,5 +88,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.time_files'));
-$smarty->assign('content_page_name', 'time_files.tpl');
+$smarty->assign('content_page_name', 'entity_files.tpl');
 $smarty->display('index.tpl');

From 26478b50a04a985f87dd308838f07548ce0c37b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 13:41:10 +0000
Subject: [PATCH 0865/1848] Switched to using icons on entity_files.tpl.

---
 WEB-INF/templates/entity_files.tpl | 12 ++++++------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/entity_files.tpl b/WEB-INF/templates/entity_files.tpl
index f373815f7..fc552b24b 100644
--- a/WEB-INF/templates/entity_files.tpl
+++ b/WEB-INF/templates/entity_files.tpl
@@ -3,11 +3,11 @@
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="40%" class="tableHeader">{$i18n.label.description}</td>
 {if $can_edit}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
 {/if}
         </tr>
 {if $files}
@@ -16,8 +16,8 @@
           <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
           <td>{$file.description|escape}</td>
     {if $can_edit}
-          <td><a href="file_edit.php?id={$file.id}">{$i18n.label.edit}</a></td>
-          <td><a href="file_delete.php?id={$file.id}">{$i18n.label.delete}</a></td>
+          <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
     {/if}
         </tr>
   {/foreach}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index adf3c05cf..f66e8357b 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.63.4911 | 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.63.4912 | 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>

From 0cb4a15ec1079fc325845640357dfc75aba0ae23 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 14:39:35 +0000
Subject: [PATCH 0866/1848] Added attachment capability to time records.

---
 WEB-INF/templates/projects.tpl |  4 ++--
 file_delete.php                | 28 ++++++++++++++++++++++------
 file_download.php              | 15 +++++++++++----
 file_edit.php                  | 23 ++++++++++++++++++-----
 time.php                       |  2 +-
 5 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index dafe1d8d5..0d5eae580 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -81,7 +81,7 @@
           <td class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.label.description}</td>
     {if $show_files}
-          <td class="tableHeader">{$i18n.label.files}</td>
+          <td></td>
     {/if}
         </tr>
   {if $active_projects}
@@ -90,7 +90,7 @@
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
       {if $show_files}
-          <td><a href="project_files.php?id={$project.id}">{$i18n.label.view}</a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
       {/if}
         </tr>
     {/foreach}
diff --git a/file_delete.php b/file_delete.php
index d98259d64..3ef22aead 100644
--- a/file_delete.php
+++ b/file_delete.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttFileHelper');
+import('ttTimeHelper');
 import('ttProjectHelper');
 
 // Access checks.
@@ -39,14 +40,21 @@
   exit();
 }
 // Entity-specific checks.
-if ($file['entity_type'] == 'project') {
+$entity_type = $file['entity_type'];
+if ($entity_type == 'time') {
+  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimeHelper::getRecord($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($entity_type == 'project') {
   if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }
 }
-if ($file['entity_type'] != 'project') {
-  // Currently, files are only associated with projects.
+if ($entity_type != 'project' && $entity_type != 'time') {
+  // Currently, files are only associated with time records and projects.
   // Improve access checks when the feature evolves.
   header('Location: access_denied.php');
   exit();
@@ -64,12 +72,20 @@
   if ($request->getParameter('btn_delete')) {
     $fileHelper = new ttFileHelper($err);
     $deleted = $fileHelper->deleteFile($file);
-    if ($deleted && $file['entity_type'] == 'project') {
-      header('Location: project_files.php?id='.$file['entity_id']);
+    if ($deleted) {
+      if ($entity_type == 'time') {
+        header('Location: time_files.php?id='.$file['entity_id']);
+      }
+      if ($entity_type == 'project') {
+        header('Location: project_files.php?id='.$file['entity_id']);
+      }
       exit();
     }
   } elseif ($request->getParameter('btn_cancel')) {
-    if ($file['entity_type'] == 'project') {
+    if ($entity_type == 'time') {
+      header('Location: time_files.php?id='.$file['entity_id']);
+    }
+    if ($entity_type == 'project') {
       header('Location: project_files.php?id='.$file['entity_id']);
     }
     exit();
diff --git a/file_download.php b/file_download.php
index 049003bac..8a17b4d7b 100644
--- a/file_download.php
+++ b/file_download.php
@@ -39,14 +39,21 @@
   exit();
 }
 // Entity-specific checks.
-if ($file['entity_type'] == 'project') {
-  if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
+$entity_type = $file['entity_type'];
+if ($entity_type == 'time') {
+  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimeHelper::getRecord($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }
 }
-if ($file['entity_type'] != 'project') {
-  // Currently, files are only associated with projects.
+if ($entity_type == 'project') {
+  if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects')) || !ttProjectHelper::get($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($entity_type != 'project' && $entity_type != 'time') {
+  // Currently, files are only associated with time records and projects.
   // Improve access checks when the feature evolves.
   header('Location: access_denied.php');
   exit();
diff --git a/file_edit.php b/file_edit.php
index 381508d1c..4a675a502 100644
--- a/file_edit.php
+++ b/file_edit.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttFileHelper');
+import('ttTimeHelper');
 import('ttProjectHelper');
 
 // Access checks.
@@ -39,14 +40,21 @@
   exit();
 }
 // Entity-specific checks.
-if ($file['entity_type'] == 'project') {
+$entity_type = $file['entity_type'];
+if ($entity_type == 'time') {
+  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimeHelper::getRecord($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($entity_type == 'project') {
   if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }
 }
-if ($file['entity_type'] != 'project') {
-  // Currently, files are only associated with projects.
+if ($entity_type != 'project' && $entity_type != 'time') {
+  // Currently, files are only associated with time records and projects.
   // Improve access checks when the feature evolves.
   header('Location: access_denied.php');
   exit();
@@ -75,8 +83,13 @@
     if ($request->getParameter('btn_save')) {
       // Update file information.
       $updated = ttFileHelper::update(array('id' => $cl_file_id,'description' => $cl_description));
-      if ($updated && $file['entity_type'] == 'project') {
-        header('Location: project_files.php?id='.$file['entity_id']);
+      if ($updated) {
+        if ($entity_type == 'time') {
+          header('Location: time_files.php?id='.$file['entity_id']);
+        }
+        if ($entity_type == 'project') {
+          header('Location: project_files.php?id='.$file['entity_id']);
+        }
         exit();
       } else
         $err->add($i18n->get('error.db'));
diff --git a/time.php b/time.php
index 5cec8a7e6..e31c98ac3 100644
--- a/time.php
+++ b/time.php
@@ -401,7 +401,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
-if (isTrue('FILES_DEBUG')) $smarty->assign('show_files', $user->isPluginEnabled('at'));
+$smarty->assign('show_files', $user->isPluginEnabled('at'));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 848ddc88b0f5e7a8eddf77b6187f1ba39f002b7b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 14:50:11 +0000
Subject: [PATCH 0867/1848] Added table_icon class attributes to defauilt.css.

---
 WEB-INF/templates/footer.tpl | 2 +-
 default.css                  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f66e8357b..39cbf6da7 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.63.4912 | 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.64.4914 | 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/default.css b/default.css
index 47dc81e44..0fe360519 100644
--- a/default.css
+++ b/default.css
@@ -157,6 +157,11 @@ div#LoginAboutText { width: 400px; }
 }
 .uncompleted-entry.active { background-color: red; }
 
+.table_icon {
+  height: 16px;
+  width: 16px;
+}
+
 /* Mobile styles */
 .mobile-table {
   border: 0;

From 7905a1bf102ca6b3cef20dad2d249f415c614eeb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 17:24:03 +0000
Subject: [PATCH 0868/1848] Started to use different icons depending on whether
 a project has attached files.

---
 WEB-INF/lib/ttGroupHelper.class.php |  52 ++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |   2 +-
 WEB-INF/templates/projects.tpl      |   8 +++++
 images/icon_file.png                | Bin 0 -> 1635 bytes
 images/icon_files.png               | Bin 1635 -> 1539 bytes
 projects.php                        |   6 ++--
 6 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 images/icon_file.png

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index ffa1e0480..83f607a19 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -344,6 +344,32 @@ static function getActiveProjects()
     return $result;
   }
 
+  // getActiveProjectsWithFiles - returns an array of active projects for a group
+  // with information whether they have attached files (has_files property).
+  // A separate fiunction from getActiveProjects because sql here is more complex.
+  static function getActiveProjectsWithFiles()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
+      " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // getInactiveProjects - returns an array of inactive projects for a group.
   static function getInactiveProjects()
   {
@@ -365,6 +391,32 @@ static function getInactiveProjects()
     return $result;
   }
 
+  // getInactiveProjectsWithFiles - returns an array of inactive projects for a group
+  // with information whether they have attached files (has_files property).
+  // A separate fiunction from getInactiveProjects because sql here is more complex.
+  static function getInactiveProjectsWithFiles()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
+      " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 0 order by upper(p.name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // getPredefinedExpenses - obtains predefined expenses for a group.
   static function getPredefinedExpenses() {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 39cbf6da7..da88e0718 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.64.4914 | 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.64.4915 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 0d5eae580..e21a8f223 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -25,7 +25,11 @@
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
       {if $show_files}
+        {if $project.has_files}
           <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        {else}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        {/if}
       {/if}
           <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
@@ -59,7 +63,11 @@
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
       {if $show_files}
+        {if $project.has_files}
           <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        {else}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        {/if}
       {/if}
           <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
diff --git a/images/icon_file.png b/images/icon_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..264ab6eb9d8b07bfd4e92076567e4ace961162e3
GIT binary patch
literal 1635
zcmaJ>dr%a096v;XDCNorTB+MIjAh*I?s2bOIq05o>Ya3)K<0zJ-5;>tV~@Q(?jUv4
zq=`|}CKZ$%Q*?$JbtrWhhQLQY(9x_+8zFnZC`^tqDrQY8{q}goAJxw6{=WO&&*%I8
zZcU!^^@+*PC(C5AiS}HJ3!ZZ6PD+5!+4l!&c+3#3MPfc*B1UKd$c!xS0f^mCmjV}{
z*~;?sAWJ5T@8;Y^Vv%DZ#qfS5En$>Ve-N@|vaFnFkY>C<L_DCB3mDM;*5fF`u?DnI
z<G>w3GbrP7s|1i=<#aPuUWR1RoNOd3N<jmDAks+G?+b*er~!@HrJyXSF%*eGM6UrI
z3aZGFhnRT*AQ~mEU~nygXw^zWjgx9J15x1wju9#h*C_~`(&#9hK!z_AdK1_Z%4M+)
z`+{!<v`iF(6oy425oIJ($qS_zL6Rhft1y*H0TGH&Wk95(ia;oB#DWEc7=a6l93Ma=
zi?oLiiv|=%I+TJx=x~f04upma1xtoS=^#cZam??R@`|BDq6_>J#=oLN?#dv*Tp+}U
z1qSw`ByEHYYxn<-Mu03ciVKDXUo20S!GI6=K|l<_pomyRFmh^<z`+L6J`2x;rLT62
z0S$*ameN>MxSmw0$xM^YVj>8VP#g6c61QX$8eDJIOU@(%V~J3sWFc2gS~b>88?LsJ
zMuM=CdaVg336)Kc6DD(}l^o&P10j(PFhFuDaXHAf;n0QJWQJVre{w0a0BDgH+&u3a
z85O(F7Y>Pnq(;p78YLlha5zRFa20^H3A`VPwSeNrcpgfZ1%%2&dlaln>rvo3HL1`8
zvP8jXNVP|;qdg3xLx;)im|BgbthEw^Nd>1#rNXs(g3#;DT5G0WZPjSa1gW#37>tHx
zD3KF=V0bu<K5<y`angWLJ~~heE1_UP2_5!{Xm*~!1;i{&nmZo{u`y|ghK(^6Q;!+c
z5hR>`NgQ1}_%gb<AON>jfNMGHf@zLSHZIj}F}kCj`}2=`r@SG5a;xq7p47>0X~FFd
zxw9vwNnTUE`{zAK+|zcZlw)eMuNCa;Tk)|rA!Gc+IdKy-xt0yl#$Uc#Dnwqbz0rL6
zdUMP4Jb6ns9jPd3@2{`C-?3z4`7H3nHJG#Y(ZI<|3wr0&H)mZgJd<*09k%;m__4FM
z)9Lvut>eIfuDbeGyjwB<M(VNIiY&XX0GpiH{cK~>f=7?Hu&cM;T0Qp)KJV>uS641}
zO?mkav*zxlRc+<vn~!{wIdG_bEwW2qk$$%LgKv_)U}kxHy}uW4GAdtNE;sXSXMVlV
z@<-W{_yxyzv?bA5={22Gy~N@HSKT?}@nmD1yRNa}g8kx02E)v=*LqAxr_~`Z&d;k^
z^-6)eeL_)lEnWEAOAWG}bGr)H3xg{k(EPpcmc3hOJbL5w-oh<(xbM05mUf+5*z}I_
z-r=}%l(^m9QslUub|{<w%v0TTe@0n2E=RN%Y?s|^vR)nEpE_@X$4;HzxTPL@Ge7xQ
z>r<z*8};YcS8hA_aBT;*IFKXs?yD_s{m|w;=u4Siv0>T!=dkJNJMZ)tOv?DaBi(!A
z%7aC^!x?M9?lp;@&+PkBb*E$7#erVsx9g@ps4iZeRvGyrf%IOP<Uf#jGjZ@oy7Pt2
zdm8@S`>?7+7oT$K?2*Q4Hrw5HRu{j?+0ggXj^w3p6*y0xa3@^u`8s|^%jT7vx^jD#
d_pTWCjBMAnPpSO_J517V-)?nU4x5VC{|!*ARt^9F

literal 0
HcmV?d00001

diff --git a/images/icon_files.png b/images/icon_files.png
index 264ab6eb9d8b07bfd4e92076567e4ace961162e3..2ee53ec5c1f2070480146d11e955449d9fb328bb 100644
GIT binary patch
delta 811
zcmV+`1JwNE41)}iNdY9WN+$u6+yN$&ZUJYL;{p{uP-t&-Z*ypGa3DidH7+qAO<`kc
zZgg*RXd)nZZE#IZI!SJGbYX5|Wl2OmB6w|ZE@^3GIy5;&HAOQ<Gn0z~Ad_zb8v!(v
zivk&w3Iit)cx`YlX=!9SG&w~zMKeY*lZyfxlUxHD2sAlGHAOQ<GLwq}838Yo@B=`9
z@>lRb0007YNkl<Zc-o{>J#W-N5PiFzwb%CD<pKerD2k8(A<;lV$zMQJNYp719e;p^
z4t@Y74N@vfBq%9C2t|+r5=Hrtq5u~N`4D%$+Yc|Zc2XedSZloN_0F3&^JZlT0smtX
z|2b&s$KxAoyMsH<*Bt={1q34}S7y(DJvrO!zV&s@yMH@MnQ(LovG9C$b7%kHe57+S
zT<yUCYuD!IUdDBRh}aO#-{vjqP(u+dQg?KH=HBJoL90SYDUc)*38Q=95`ws&kZhwJ
z?^BW>OH(|1_Xuw`UVWq~HDfPKT@BrGS`Z}+&>l(>f@Ejnxkz(J6%#%o0Nkp7?qYfS
z^%m8_A;^HDC=nS*DI1V>CN_cPy%#vB1`v|qnL1~M{oy_?&duE<r8F!Kv3|7L)GE?#
zwBbm^VUOG{7C$`1-tYkM37qk;lK^LdB;*U!%lp_oe2=F~51=!RRC5Yxv<T3uEcxSf
zZwA(R2B=|Ek4Y6^jNM`e33i5mn=rmcK^Y$wNK=J8C1j+y28~#-Ea%u-jL9Br!jBq%
zA;!Yj;YJf(Yj)BS9i5?*Wek!wEaGA7Jv0$U(WHSO!>QN}I<y0PA8jL598C#ybB$AF
zi5`Pwia44;T{B(hP?3WaZCbIIM-%s%c7`kX<$t2zEpVpa!E{-mt2Il1r;tS{SsCX8
z##}XN3<9SToyXP$U)vQLRO@+}XL7n%qR0p-=bW;1nrjn5h$9-N55d*<+-R~jUr#37
zjjL4Za!D&O@4TnVI8N7c!32gTKuO!sHQqJ_9GNlC6I8~KarV<x-v1`XcF6q|j(be}
pabdzgR_$lJa>5A+`&)n(0RS~^J`oO_OkV&1002ovPDHLkV1m*bRuKRI

delta 953
zcmZqXdCW7xlkw3;FLlPrvlvq*XEExgrX<@cWt5Z@Sn2B*losXa<rk&vrzGpA=A`DP
z=9Lud8|oSAD=Adu7Wn#F`4?rTXXYj5xa237f@D2iY?Vq&GgGWgU5pGYER9Sojh)<F
zoD2;u4NV*^Of3yuj15f<ESxPSXD}%<8cYsgQkZPQB*Non0F*ItayD_bG@JZ@NlXK1
zyp?lNYGO%#QAmD%j;)eoN`6wRf@e-nX>myrNLax+*i_GO@)9NuBZ!SDsfI>LiAlOC
zMrKL62IeM~x)!OHX}Za#mL^Fi=7~wk$>vH5#U(+hX;vwd3z>xL&0Gx)os0}EEscx}
z%q$EIEi9bPT#YSETusfK4K2;xl=STsY*Lb~N-|4wQi05(lr$^HoDwK2CleS3IaWD|
zdFi%F6}l;@X^EvdB}#SyMVWaeHu@mNIhjDUU=~ChFc{&6=@(5lXSS}FJLRO#z`!K#
z>EaktacfEN{%nyzfq&2T-kdKkyjQtks;_|GWBv^Sovm{p%vWIK_DoLCOrCCcEo{+?
z_yuNcIxM{EjI5>}E-e)+9-fOSD%YNVcl-I9+jmL?2<&W4EH6vj_kMQe=Mz!gg>tF?
zg8ti2`19r9S?}lSv$xxv4?oJkw!Tq+?wZoSe$Q|DCH+=Dv2^L}8MAjAJks^LE521;
z*T&O4OkbG&k>Cmr?>~S0Q)(wXtJS(}U|r30H7hhoMB{C8-N&;vdkYJDH?K7QvUXpC
z!YqL@)nf@0FLLZjmdk#g{Vk!#QO_Yxz&U^K(O0K-{>X@8_TE2jFGr${YUeG{Y{Ss{
zFF`YoEBqC9WDJ?HV(}@@GjnWhWshBZ?6gH}hJuV&Kxd6+Sjaxsi0#u8!`~?`W|*mU
zJG`mrf7aK;{7+Y6+rk~U+&!`|yg#w@g-}P#?L$5rn)N=dV=PoMeEn!=gzszRwRZU%
zlUg@?mdq$+v@h`to67KXgX>k6_u|&9NuE|my6gLA>qiE2ZQadz#BPPf$)?IFYrZ#}
zunNtyFM7Ucdcy9>ZrN*c_$A6(V*8HkOQ_C#`#y|M=lTiN>;sp-`kSxQsY{(($G%DS
z#bKkjC#IbF@?7syqv+Sxgj(gw@;hvn*_Zipm$E-)|9>y>mUQp@#XlE*uSzp#=09|7
z^9nIHw~zZ$%*~m5{1(5sKaDFUI?V6jfe^Oyk1sGw?(EI#x$W^d?s+^D55uf$tE`rM
RndZa*1fH&bF6*2UngG%ef=U1Y

diff --git a/projects.php b/projects.php
index 236291cdb..49a59a64d 100644
--- a/projects.php
+++ b/projects.php
@@ -40,9 +40,11 @@
 }
 // End of access checks.
 
+$showFiles = $user->isPluginEnabled('at');
+
 if($user->can('manage_projects')) {
-  $active_projects = ttGroupHelper::getActiveProjects();
-  $inactive_projects = ttGroupHelper::getInactiveProjects();
+  $active_projects = $showFiles ? ttGroupHelper::getActiveProjectsWithFiles() : ttGroupHelper::getActiveProjects();
+  $inactive_projects = $showFiles ? ttGroupHelper::getInactiveProjectsWithFiles() : ttGroupHelper::getInactiveProjects();
 } else
   $active_projects = $user->getAssignedProjects();
 

From f6c2f33e3183019686f07aa93ff880f3a009d6eb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 17:48:07 +0000
Subject: [PATCH 0869/1848] Started to use different icons on time.php page for
 records with attached files.

---
 WEB-INF/lib/ttTimeHelper.class.php | 47 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/time.tpl         |  6 +++-
 time.php                           |  6 ++--
 4 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index b2bb2c076..a51520712 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -753,6 +753,53 @@ static function getRecords($user_id, $date) {
     return $result;
   }
 
+  // getRecordsWithFiles - returns time records for a user for a given date
+  // with information whether they have attached files (has_files property).
+  // A separate fiunction from getRecords because sql here is more complex.
+  static function getRecordsWithFiles($user_id, $date) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql_time_format = "'%k:%i'"; //  24 hour format.
+    if ('%I:%M %p' == $user->getTimeFormat())
+      $sql_time_format = "'%h:%i %p'"; // 12 hour format for MySQL TIME_FORMAT function.
+
+    $client_field = null;
+    if ($user->isPluginEnabled('cl'))
+      $client_field = ", c.name as client";
+
+    $left_joins = " left join tt_projects p on (l.project_id = p.id)".
+      " left join tt_tasks t on (l.task_id = t.id)";
+    if ($user->isPluginEnabled('cl'))
+      $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
+
+    $left_joins .= " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (l.id = Sub1.entity_id)";
+
+    $result = array();
+    $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
+      " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
+      " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
+      " if(Sub1.entity_id is null, 0, 1) as has_files,".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
+      " order by l.start, l.id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        if($val['duration']=='0:00')
+          $val['finish'] = '';
+        $result[] = $val;
+      }
+    } else return false;
+
+    return $result;
+  }
+
   // canAdd determines if we can add a record in case there is a limit.
   static function canAdd() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index da88e0718..3f7bfb70a 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.64.4915 | 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.64.4916 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 1f1c7adc1..e531d2b6e 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -140,7 +140,11 @@
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
     {if $show_files}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {if $record.has_files}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {else}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+      {/if}
     {/if}
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
diff --git a/time.php b/time.php
index e31c98ac3..63f5b8cf3 100644
--- a/time.php
+++ b/time.php
@@ -396,12 +396,14 @@
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
+$showFiles = $user->isPluginEnabled('at');
+$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
-$smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
-$smarty->assign('show_files', $user->isPluginEnabled('at'));
+$smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 02b2922eba6a62ba515d8a4a5e400349f0ca688f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Apr 2019 20:04:18 +0000
Subject: [PATCH 0870/1848] Switched to using icons on tasks page.

---
 WEB-INF/templates/tasks.tpl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 647a6a787..24fd04380 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -11,18 +11,18 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
   {/if}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="40%" class="tableHeader">{$i18n.label.description}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
-          <td><a href="task_delete.php?id={$task.id}">{$i18n.label.delete}</a></td>
+          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -40,17 +40,17 @@
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.inactive_tasks}</td></tr>
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="40%" class="tableHeader">{$i18n.label.description}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
-          <td><a href="task_delete.php?id={$task.id}">{$i18n.label.delete}</a></td>
+          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>

From 9c5d423a2225aefe185f426088e9d19818bca011 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 13:10:52 +0000
Subject: [PATCH 0871/1848] Work in progress adding attachments to reports.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/reports.tpl | 3 +++
 reports.php                   | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f7bfb70a..45e4aecda 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.64.4916 | 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.64.4917 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 3b66c71f9..3f1dea048 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -380,6 +380,9 @@ function handleCheckboxes() {
                     <tr><td><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td></tr>
 {if $show_paid_status}
                     <tr><td><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td></tr>
+{/if}
+{if $show_files}
+                    <tr><td><label>{$forms.reportForm.chfiles.control}&nbsp;{$i18n.label.files}</label></td></tr>
 {/if}
                   </table>
                 </td>
diff --git a/reports.php b/reports.php
index 958d88bc9..d94ee7574 100644
--- a/reports.php
+++ b/reports.php
@@ -291,6 +291,9 @@
   $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
 if ($showApproved)
   $form->addInput(array('type'=>'checkbox','name'=>'chapproved'));
+if (isTrue('FILES_DEBUG')) $showFiles = $user->isPluginEnabled('at');
+if ($showFiles)
+  $form->addInput(array('type'=>'checkbox','name'=>'chfiles'));
 
 // Add a hidden control for timesheet_user_id (who to generate a timesheet for).
 if ($showTimesheetCheckbox)
@@ -352,6 +355,7 @@
   $form->setValueByElement('chcf_1', '0');
   $form->setValueByElement('chunits', '0');
   $form->setValueByElement('chinvoice', '0');
+  $form->setValueByElement('chfiles', '1');
 
   $form->setValueByElement('chtotalsonly', '0');
 }
@@ -458,6 +462,7 @@
 $smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_work_units', $showWorkUnits);
 $smarty->assign('show_ip', $showIP);
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('assigned_projects', $assigned_projects);

From c3e6cb49a67ee660c2eaeef53e15c85c19d805dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 15:03:34 +0000
Subject: [PATCH 0872/1848] More work in progress integrating attachments in
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 12 +++++++++++
 WEB-INF/lib/ttTimeHelper.class.php   | 31 ++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         |  5 +++++
 report.php                           |  1 +
 time_files.php                       | 11 +++++-----
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5e8f799f0..74f2537f5 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -154,6 +154,9 @@ static function getItems($options) {
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     // Determine these once as they are used in multiple places in this function.
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
@@ -251,6 +254,9 @@ static function getItems($options) {
     // Add timesheet name if it is selected.
     if ($options['show_timesheet'])
       array_push($fields, 'ts.name as timesheet_name');
+    // Add has_files.
+    if ($options['show_files'])
+      array_push($fields, 'if(Sub1.entity_id is null, 0, 1) as has_files');
 
     // Prepare sql query part for left joins.
     $left_joins = null;
@@ -274,6 +280,11 @@ static function getItems($options) {
     }
     if ($includeCost && MODE_TIME != $trackingMode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
+    if ($options['show_files']) {
+      $left_joins .= " left join (select distinct entity_id from tt_files".
+        " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+        " on (l.id = Sub1.entity_id)";
+    }
 
     // Prepare sql query part for inner joins.
     $inner_joins = null;
@@ -1143,6 +1154,7 @@ static function getReportOptions($bean) {
     $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
     $options['show_work_units'] = $bean->getAttribute('chunits');
     $options['show_timesheet'] = $bean->getAttribute('chtimesheet');
+    $options['show_files'] = $bean->getAttribute('chfiles');
     $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
     $options['group_by1'] = $bean->getAttribute('group_by1');
     $options['group_by2'] = $bean->getAttribute('group_by2');
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index a51520712..9b570ae22 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -692,6 +692,37 @@ static function getRecord($id) {
     return false;
   }
 
+  // getRecordForFileView - retrieves a time record identified by its id for
+  // attachment view operation.
+  //
+  // It is different from getRecord, as we want users with appropriate rights
+  // to be able to see other users files, without changing "on behalf" user.
+  // For example, viewing reports for all users and their attached files
+  // from report links.
+  static function getRecordForFileView($id) {
+    // TODO: code this function properly. There are no security checks now.
+    global $user;
+
+    // $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $mdb2 = getConnection();
+
+    $sql = "select l.id, l.timesheet_id, l.invoice_id, l.approved from tt_log l".
+      " where l.id = $id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if (!$res->numRows()) {
+        return false;
+      }
+      if ($val = $res->fetchRow()) {
+        return $val;
+      }
+    }
+    return false;
+  }
+
   // getAllRecords - returns all time records for a certain user.
   static function getAllRecords($user_id) {
     $result = array();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 45e4aecda..96f2ae3e3 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.64.4917 | 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.64.4918 | 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/report.tpl b/WEB-INF/templates/report.tpl
index df1224865..d0304a9fc 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -54,6 +54,7 @@
   {if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
   {if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
   {if $bean->getAttribute('chtimesheet')}<td class="tableHeader">{$i18n.label.timesheet}</td>{/if}
+  {if $bean->getAttribute('chfiles')}<td></td>{/if}
       </tr>
   {foreach $report_items as $item}
     <!-- print subtotal for a block of grouped values -->
@@ -78,6 +79,7 @@
         {if $bean->getAttribute('chip')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}
         {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+        {if $bean->getAttribute('chfiles')}<td></td>{/if}
         {if $use_checkboxes}<td></td>{/if}
       </tr>
       <tr><td>&nbsp;</td></tr>
@@ -105,6 +107,7 @@
     {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
+    {if $bean->getAttribute('chfiles')}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
     {if $use_checkboxes}
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
@@ -138,6 +141,7 @@
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+    {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
       </tr>
   {/if}
@@ -160,6 +164,7 @@
     {if $bean->getAttribute('chip')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+    {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
       </tr>
 {/if}
diff --git a/report.php b/report.php
index 620064afb..3bd410a46 100644
--- a/report.php
+++ b/report.php
@@ -299,6 +299,7 @@
 if ($bean->getAttribute('chip')) $colspan++;
 if ($bean->getAttribute('chinvoice')) $colspan++;
 if ($bean->getAttribute('chtimesheet')) $colspan++;
+if ($bean->getAttribute('chfiles')) $colspan++;
 
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
diff --git a/time_files.php b/time_files.php
index 2ba0efcea..40a0c5063 100644
--- a/time_files.php
+++ b/time_files.php
@@ -36,17 +36,16 @@
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('at')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id);
+$time_rec = ttTimeHelper::getRecordForFileView($cl_id);
 if (!$time_rec) {
   header('Location: access_denied.php');
   exit();
 }
-if (!$user->isPluginEnabled('at')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// TODO: review access checks, specifically for on behalf operations.
 // End of access checks.
 
 if ($request->isPost()) {

From 808a0138db74b0012c4ce139ed6d5cc9d657028c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 15:54:38 +0000
Subject: [PATCH 0873/1848] Fixed file_download.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 file_download.php            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 96f2ae3e3..fdfaf89af 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.64.4918 | 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.64.4919 | 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/file_download.php b/file_download.php
index 8a17b4d7b..e4d35c705 100644
--- a/file_download.php
+++ b/file_download.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttFileHelper');
+import('ttTimeHelper');
 import('ttProjectHelper');
 
 // Access checks.
@@ -41,7 +42,7 @@
 // Entity-specific checks.
 $entity_type = $file['entity_type'];
 if ($entity_type == 'time') {
-  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimeHelper::getRecord($file['entity_id'])) {
+  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimeHelper::getRecordForFileView($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }

From ce4c2506404d648ba6e97552aa4ae17a58ea2fbd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 16:14:17 +0000
Subject: [PATCH 0874/1848] Replaced text links with icons on users.php page.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/users.tpl  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fdfaf89af..effecb9fb 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.64.4919 | 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.64.4920 | 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/users.tpl b/WEB-INF/templates/users.tpl
index d3fadad93..f03dfd0cf 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -17,8 +17,8 @@
   {if $show_quota}
           <td class="tableHeader">{$i18n.label.quota}</td>
   {/if}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $active_users}
     {foreach $active_users as $u}
@@ -35,8 +35,8 @@
           <td class="cellRightAligned">{$u.quota_percent}</td>
       {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
-          <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
-         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>{else}<td></td>{/if}
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>{else}<td></td>{/if}
       {else}
           <td></td>
           <td></td>
@@ -64,8 +64,8 @@
     {if $show_quota}
           <td class="tableHeader">{$i18n.label.quota}</td>
     {/if}
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -76,8 +76,8 @@
           <td class="cellRightAligned">{$u.quota_percent}</td>
       {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank}
-          <td><a href="user_edit.php?id={$u.id}">{$i18n.label.edit}</a></td>
-          <td><a href="user_delete.php?id={$u.id}">{$i18n.label.delete}</a></td>
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
       {else}
           <td></td>
           <td></td>

From 080effdbcc0dad497f20c8d720a93e9413887ffe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 17:28:57 +0000
Subject: [PATCH 0875/1848] Replaced text links with icons on admin_groups.php.

---
 WEB-INF/templates/admin_groups.tpl | 8 ++++----
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
index e0a8aa2c6..218fe77cd 100644
--- a/WEB-INF/templates/admin_groups.tpl
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -12,8 +12,8 @@
     <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
     <td class="tableHeader">{$i18n.label.date}</td>
     <td class="tableHeader">{$i18n.label.language}</td>
-    <td class="tableHeader">{$i18n.label.edit}</td>
-    <td class="tableHeader">{$i18n.label.delete}</td>
+    <td></td>
+    <td></td>
   </tr>
 {if $groups}
   {foreach $groups as $group}
@@ -22,8 +22,8 @@
     <td>{$group.name|escape}</td>
     <td nowrap>{$group.date}</td>
     <td align="center">{$group.lang}</td>
-    <td><a href="admin_group_edit.php?id={$group.id}">{$i18n.label.edit}</a></td>
-    <td><a href="admin_group_delete.php?id={$group.id}">{$i18n.label.delete}</a></td>
+    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
   </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index effecb9fb..ce56e43e2 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.64.4920 | 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.64.4921 | 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>

From c0ea44b2e8a3fde385982b580a0f924be4b711cf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 18:30:30 +0000
Subject: [PATCH 0876/1848] Work in progress replacing text links with icons.

---
 WEB-INF/templates/cf_custom_fields.tpl    |  8 ++++----
 WEB-INF/templates/cf_dropdown_options.tpl | 10 +++++-----
 WEB-INF/templates/clients.tpl             | 16 ++++++++--------
 WEB-INF/templates/footer.tpl              |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 7a1b156b2..5d254e9cc 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -8,8 +8,8 @@
           <td width="50%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.label.type}</td>
           <td class="tableHeader">{$i18n.menu.options}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $custom_fields}
     {foreach $custom_fields as $field}
@@ -22,8 +22,8 @@
           <td>{$i18n.label.type_dropdown}</td>
           <td><a href="cf_dropdown_options.php?field_id={$field['id']}">{$i18n.label.configure}</a></td>
       {/if}
-          <td><a href="cf_custom_field_edit.php?id={$field['id']}">{$i18n.label.edit}</a></td>
-          <td><a href="cf_custom_field_delete.php?id={$field['id']}">{$i18n.label.delete}</a></td>
+          <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index f9dfcd0d7..b920d733e 100644
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -8,16 +8,16 @@
 {if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
-          <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td width="80%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $options}
     {foreach $options as $key=>$val}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$val|escape}</td>
-          <td><a href="cf_dropdown_option_edit.php?id={$key}">{$i18n.label.edit}</a></td>
-          <td><a href="cf_dropdown_option_delete.php?id={$key}">{$i18n.label.delete}</a></td>
+          <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index a31a8cd05..ca93b92f5 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -13,15 +13,15 @@
         <tr>
           <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {foreach $active_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$client.name|escape}</td>
           <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
-          <td><a href="client_delete.php?id={$client.id}">{$i18n.label.delete}</a></td>
+          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
@@ -36,15 +36,15 @@
         <tr>
           <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$client.name|escape}</td>
           <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
-          <td><a href="client_delete.php?id={$client.id}">{$i18n.label.delete}</a></td>
+          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ce56e43e2..83b05f0a0 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.64.4921 | 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.64.4922 | 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>

From 6471018977a3852a0c940ff5703fc075cbae3f64 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 20:03:02 +0000
Subject: [PATCH 0877/1848] Work in progress replacing text links with icons.

---
 WEB-INF/templates/expenses.tpl | 14 +++++++++++---
 WEB-INF/templates/footer.tpl   |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 11b4fb85a..df0eb4d12 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -176,14 +176,15 @@ function recalculateCost() {
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
   {if $user->isPluginEnabled('cl')}
-        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
+        <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
   {if $show_project}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
         <td class="tableHeader">{$i18n.label.item}</td>
         <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
-        <td width="5%" class="tableHeader">{$i18n.label.edit}</td>
+        <td></td>
+        <td></td>
       </tr>
   {foreach $expense_items as $item}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -199,7 +200,14 @@ function recalculateCost() {
     {if $item.approved || $item.invoice_id}
           &nbsp;
     {else}
-          <a href='expense_edit.php?id={$item.id}'>{$i18n.label.edit}</a>
+          <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
+    {/if}
+        </td>
+        <td valign="top" align="center">
+    {if $item.approved || $item.invoice_id}
+          &nbsp;
+    {else}
+          <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
     {/if}
         </td>
       </tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 83b05f0a0..4bea5d52d 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.64.4922 | 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.64.4923 | 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>

From adf05628f5388349f692bbadd5beca05f792600d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 20:25:51 +0000
Subject: [PATCH 0878/1848] More work in progress replacing text links with
 icons.

---
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/groups.tpl        | 12 ++++++------
 WEB-INF/templates/notifications.tpl |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4bea5d52d..ad1e463a5 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.64.4923 | 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.64.4924 | 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/groups.tpl b/WEB-INF/templates/groups.tpl
index d1f174fa5..3cd4f51d3 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -11,18 +11,18 @@
   <tr><td colspan="2">&nbsp;</td></tr>
 {/if}
   <tr>
-    <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-    <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-    <td class="tableHeader">{$i18n.label.edit}</td>
-    <td class="tableHeader">{$i18n.label.delete}</td>
+    <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td width="40%" class="tableHeader">{$i18n.label.description}</td>
+    <td></td>
+    <td></td>
   </tr>
 {if $subgroups}
   {foreach $subgroups as $subgroup}
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$subgroup.name|escape}</td>
     <td>{$subgroup.description|escape}</td>
-    <td><a href="group_edit.php?id={$subgroup.id}">{$i18n.label.edit}</a></td>
-    <td><a href="group_delete.php?id={$subgroup.id}">{$i18n.label.delete}</a></td>
+    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
   </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index 72854190b..3a62e8cb2 100644
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -9,8 +9,8 @@
           <td class="tableHeader">{$i18n.label.schedule}</td>
           <td class="tableHeader">{$i18n.label.email}</td>
           <td class="tableHeader">{$i18n.label.condition}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $notifications}
     {foreach $notifications as $notification}
@@ -19,8 +19,8 @@
           <td>{$notification['cron_spec']|escape}</td>
           <td>{$notification['email']|escape}</td>
           <td>{$notification['report_condition']|escape}</td>
-          <td><a href="notification_edit.php?id={$notification['id']}">{$i18n.label.edit}</a></td>
-          <td><a href="notification_delete.php?id={$notification['id']}">{$i18n.label.delete}</a></td>
+          <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}

From c45356bc5437c3428b7f533aa96cb52c76e1cd77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 20:32:18 +0000
Subject: [PATCH 0879/1848] Replaced some more text links with icons.

---
 WEB-INF/templates/footer.tpl              |  2 +-
 WEB-INF/templates/predefined_expenses.tpl |  8 ++++----
 WEB-INF/templates/roles.tpl               | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ad1e463a5..fc3d4b6eb 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.64.4924 | 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.64.4925 | 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/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
index 9c8625c77..4f138becf 100644
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -6,16 +6,16 @@
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.label.cost}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $predefined_expenses}
     {foreach $predefined_expenses as $predefined_expense}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$predefined_expense['name']|escape}</td>
           <td>{$predefined_expense['cost']|escape}</td>
-          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}">{$i18n.label.edit}</a></td>
-          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}">{$i18n.label.delete}</a></td>
+          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/roles.tpl b/WEB-INF/templates/roles.tpl
index ba3328c5b..85efc66bd 100644
--- a/WEB-INF/templates/roles.tpl
+++ b/WEB-INF/templates/roles.tpl
@@ -13,8 +13,8 @@
           <td width="25%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.form.roles.rank}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
   {if $active_roles}
     {foreach $active_roles as $role}
@@ -22,8 +22,8 @@
           <td>{$role.name|escape}</td>
           <td>{$role.rank}</td>
           <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}">{$i18n.label.edit}</a></td>
-          <td><a href="role_delete.php?id={$role.id}">{$i18n.label.delete}</a></td>
+          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -44,16 +44,16 @@
           <td width="25%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.form.roles.rank}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_roles as $role}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$role.name|escape}</td>
           <td>{$role.rank}</td>
           <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}">{$i18n.label.edit}</a></td>
-          <td><a href="role_delete.php?id={$role.id}">{$i18n.label.delete}</a></td>
+          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>

From 3c96bcaf6046242b9af54af454e2782ece8baa66 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 22:49:08 +0000
Subject: [PATCH 0880/1848] Finished replacing edit and delete text links with
 icons.

---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/invoices.tpl   |  4 ++--
 WEB-INF/templates/templates.tpl  | 16 ++++++++--------
 WEB-INF/templates/timesheets.tpl | 12 ++++++++----
 WEB-INF/templates/week.tpl       | 14 +++++++++++---
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fc3d4b6eb..1a0e0ad10 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.64.4925 | 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.64.4926 | 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/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 86e7e5255..7301ce2c2 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -16,7 +16,7 @@
   {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
   {if !$user->isClient()}
-          <td class="tableHeader">{$i18n.label.delete}</td>
+          <td></td>
   {/if}
         </tr>
         {foreach $invoices as $invoice}
@@ -29,7 +29,7 @@
   {/if}
           <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
-          <td><a href="invoice_delete.php?id={$invoice.id}">{$i18n.label.delete}</a></td>
+          <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
   {/if}
         </tr>
         {/foreach}
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index c1a8d5b4b..2e388b491 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -9,15 +9,15 @@
         <tr>
           <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
           <td class="tableHeader" width="45%">{$i18n.label.description}</td>
-          <td class="tableHeader" width="5%">{$i18n.label.edit}</td>
-          <td class="tableHeader" width="5%">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $active_templates as $template}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}">{$i18n.label.edit}</a></td>
-          <td><a href="template_delete.php?id={$template['id']}">{$i18n.label.delete}</a></td>
+          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
@@ -30,15 +30,15 @@
         <tr>
           <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
           <td class="tableHeader" width="45%">{$i18n.label.description}</td>
-          <td class="tableHeader" width="5%">{$i18n.label.edit}</td>
-          <td class="tableHeader" width="5%">{$i18n.label.delete}</td>
+          <td></td>
+          <td></td>
         </tr>
     {foreach $inactive_templates as $template}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}">{$i18n.label.edit}</a></td>
-          <td><a href="template_delete.php?id={$template['id']}">{$i18n.label.delete}</a></td>
+          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 91c626df0..c38e2d442 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -21,7 +21,8 @@
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
           <td class="tableHeader">{$i18n.label.view}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td></td>
+          <td></td>
         </tr>
 {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -36,7 +37,8 @@
           <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
 {/foreach}
       </table>
@@ -57,7 +59,8 @@
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
           <td class="tableHeader">{$i18n.label.view}</td>
-          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td></td>
+          <td></td>
         </tr>
   {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -72,7 +75,8 @@
           <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
     {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 8eaa5fa88..6fc08b8a9 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -117,7 +117,8 @@ function fillDropdowns() {
   {/if}
         <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
         <td class="tableHeader">{$i18n.label.note}</td>
-        <td width="5%" class="tableHeader">{$i18n.label.edit}</td>
+        <td></td>
+        <td></td>
       </tr>
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
@@ -138,16 +139,23 @@ function fillDropdowns() {
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
         <td valign="top" align="center">
-    {if $record.invoice_id}
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_edit.php?id={$record.id}">{$i18n.label.edit}</a>
+          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
       {if ($record.duration == '0:00' && $record.start <> '')}
           <input type="hidden" name="record_id" value="{$record.id}">
           <input type="hidden" name="browser_date" value="">
           <input type="hidden" name="browser_time" value="">
           <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
       {/if}
+    {/if}
+        </td>
+        <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
     {/if}
         </td>
       </tr>

From 95f7d444530d754b716612ee52af991acbe40dc1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Apr 2019 22:55:05 +0000
Subject: [PATCH 0881/1848] Added missing closing tags.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/report.tpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a0e0ad10..65f8389ef 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.64.4926 | 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.64.4927 | 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/report.tpl b/WEB-INF/templates/report.tpl
index d0304a9fc..2f3a7a39f 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -102,9 +102,9 @@
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
-    {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
-    {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
+    {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+    {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+    {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
     {if $bean->getAttribute('chfiles')}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}

From 3b73ad719677dcb639befd1788f8f9d1ee6485cf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 8 Apr 2019 14:02:01 +0000
Subject: [PATCH 0882/1848] Fixed union sql for reports with attachments.

---
 WEB-INF/lib/ttReportHelper.class.php | 8 ++++++++
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 74f2537f5..40b6a0476 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -360,6 +360,9 @@ static function getItems($options) {
         array_push($fields, 'i.name as invoice');
       if ($options['show_timesheet'])
         array_push($fields, 'null as timesheet_name');
+      // Add has_files.
+      if ($options['show_files'])
+        array_push($fields, 'if(Sub1.entity_id is null, 0, 1) as has_files');
 
       // Prepare sql query part for left joins.
       $left_joins = null;
@@ -371,6 +374,11 @@ static function getItems($options) {
         $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
       if (($canViewReports || $isClient) && $options['show_invoice'])
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
+      if ($options['show_files']) {
+        $left_joins .= " left join (select distinct entity_id from tt_files".
+          " where entity_type = 'expense' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+          " on (ei.id = Sub1.entity_id)";
+      }
 
       $where = ttReportHelper::getExpenseWhere($options);
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 65f8389ef..9e50a8526 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.64.4927 | 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.64.4928 | 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>

From bf41795a3a00db3d11615fc317dd982a8cfaec0c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 8 Apr 2019 16:11:15 +0000
Subject: [PATCH 0883/1848] Improved security of getRecordForFileView().

---
 WEB-INF/lib/ttTimeHelper.class.php | 51 ++++++++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 time_files.php                     |  3 +-
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 9b570ae22..baa1a144c 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -700,23 +700,68 @@ static function getRecord($id) {
   // For example, viewing reports for all users and their attached files
   // from report links.
   static function getRecordForFileView($id) {
-    // TODO: code this function properly. There are no security checks now.
+    // There are several possible situations:
+    //
+    // Record is ours. Check "view_own_reports" or "view_all_reports".
+    // Record is for the current on behalf user. Check "view_reports" or "view_all_reports".
+    // Record is for someone else. Check "view_reports" or "view_all_reports" and rank.
+    //
+    // It looks like the best way is to use 2 queries, obtain user_id first, then check rank.
+
     global $user;
 
-    // $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $mdb2 = getConnection();
 
-    $sql = "select l.id, l.timesheet_id, l.invoice_id, l.approved from tt_log l".
+    // Obtain user_id for the time record.
+    $sql = "select l.id, l.user_id, l.timesheet_id, l.invoice_id, l.approved from tt_log l ".
       " where l.id = $id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1";
     $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    if (!$res->numRows()) return false;
+
+    $val = $res->fetchRow();
+    $user_id = $val['user_id'];
+
+    // If record is ours.
+    if ($user_id == $user->id) {
+      if ($user->can('view_own_reports') || $user->can('view_all_reports')) {
+        $val['can_edit'] = !($val['timesheet_id'] || $val['invoice_id'] || $val['approved']);
+        return $val;
+      }
+      return false; // No rights.
+    }
+
+    // If record belongs to a user we impersonate.
+    if ($user->behalfUser && $user_id == $user->behalfUser->id) {
+      if ($user->can('view_reports') || $user->can('view_all_reports')) {
+        $val['can_edit'] = !($val['timesheet_id'] || $val['invoice_id'] || $val['approved']);
+        return $val;
+      }
+      return false; // No rights.
+    }
+
+    // Record belongs to someone else. We need to check user rank.
+    if (!($user->can('view_reports') || $user->can('view_all_reports'))) return false;
+    $max_rank = $user->can('view_all_reports') ? MAX_RANK : $user->getMaxRankForGroup($group_id);
+
+    $left_joins = ' left join tt_users u on (l.user_id = u.id)';
+    $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
+
+    $where_part = " where l.id = $id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
+    $where_part .= " and r.rank <= $max_rank";
+
+    $sql = "select l.id, l.user_id, l.timesheet_id, l.invoice_id, l.approved".
+      " from tt_log l $left_joins $where_part";
+    $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
         return false;
       }
       if ($val = $res->fetchRow()) {
+        $val['can_edit'] = false;
         return $val;
       }
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9e50a8526..8a8beaf13 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.64.4928 | 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.64.4929 | 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/time_files.php b/time_files.php
index 40a0c5063..c499b25c9 100644
--- a/time_files.php
+++ b/time_files.php
@@ -82,8 +82,7 @@
   }
 } // isPost
 
-$canEdit = !($time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']);
-$smarty->assign('can_edit', $canEdit);
+$smarty->assign('can_edit', $time_rec['can_edit']);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.time_files'));

From 2303d22b8916c5e9aef58f5350967f31b8313b74 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 8 Apr 2019 22:55:24 +0000
Subject: [PATCH 0884/1848] Improved delete icon.

---
 WEB-INF/templates/footer.tpl |   2 +-
 images/icon_delete.png       | Bin 1632 -> 1467 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8a8beaf13..1db38f07d 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.64.4929 | 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.64.4930 | 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/images/icon_delete.png b/images/icon_delete.png
index 997779f772b566a4ef9928dd6db60a325977ed33..046a7e3d6c395661d23e7c402ec0835f1dab4ce5 100644
GIT binary patch
delta 436
zcmV;l0Zabi47&@kg8~RcMnX74K}JTCivlzVLq<Y4LqSGGlZyf!v*ZFz0e@Ys-f92<
z0d7e|K~#9!q?64`12GhZ?@X-&VzpTRC{-7tZf2$8LZPKpkP$>5p)b;BDp;&os$ikk
zh2X*gr3l)UE)<-NFpd~crU`_QSvBwtxtV)TLhg;l7^6|f82_-rfLO0bluj=ooCf`b
z{CSY2DC%3TOPrwr#J|;Qj(;+lCc*-!0ACZ&fHSZ{K~PE6Y7Z%CfSvOYH^8Py=0=B#
zNe-NX?KonrMUHcX*_|yC#>EbDEP->d0VaibSNT5$Cip}eyn-@#Qj!Yd$d{V<3wWTT
z8b}jQGg$>YN*sU_Db@|7$v(I@RNx&PfNOQpHYD<0z76X?;8S0;4S%J&0DA_5WpD-D
zBm*vPXczVYp0(;URTF8D2Q9;G^I8|dqh`W$w^RcM%xU6da0}iH)yazf5S<uBFKEv)
zI;@RoQHVQ=U?5D|@o9s=qcDuCVe!|<e4qa6b)3Ul$J#8oNq9_a@q-G(u3apWRVob)
eMj8JC3;<=5V#XWomkrzi0000<MNUMnLSTYg&b#XX

delta 602
zcmV-g0;T=C3*Zc}g8~RNIYl)^Ge$U*ivlzVG&w~zMKeY>lZyf!v*ZFz0e@8fO3eTO
z0uxC@K~#9!d{fVB6G0T7+1Vts62pegmTj;iDS{w^2ixe~vxl~}dKOO=R1E$&^q_bs
zw1P-2MG?FiR7%_Q2d&^m{8N;Uz18fbwaJX{t+QdXqz=r^^5%QryzhN8gqX2dDm~Z?
zf;uJtAAp+&+(HlTq3cd{Du0!h9v;?9rP9meNS?UveZVQi0nsDGG5D#$#$re7EKD-$
zIG0b^w%?F)GnqW&y0zz?_X02!aaG5;dM=YW!KMp^yJxf63mDV@RIpy+d=yF649QHf
zSbOGqb8V%FGK7p$@>{7x_MzGQ957bIlU0hux2*idT<$!coJ`JI7Ju26a`l=J6Oml}
zy!HKsTZO{(5dgJ`W$3?d92w#``HPf|F(D?KN*%CRBWlL7@#JnLW+sz&AbEUuce1JV
zK_n&FDAepTmalSt1(K*v>|r&HF#LF3h?}9-hjH9WTlKTu{?X4u6!WXo5mM_v$#_o%
z*zKrcV3kf0pp+5EsecZoEM`fcW2?HFp=<`a(PEOaI3{7{hTZFD)mj*S`qpZF#go$(
zmu=fymvRel;{0RReF|mwB%@UmLflxEa(yW64y+@bSK%gBtTVRF36$E;=ay;M?Y+G_
z@Amg!XJC&eY&~t;xyS~582CVNZVe8u<SFI-TzKRAuVUOr5Hl>Dv@F`)tPc##elM4I
oAjpq<$_DoyaCN{%vA+Tg05X^jEE_91i~s-t07*qoM6N<$f*KJf?EnA(


From 70e77a95ac584db9d220b8f6d791baa0de084734 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 12 Apr 2019 12:35:50 +0000
Subject: [PATCH 0885/1848] Added attachments to reports.

---
 WEB-INF/lib/ttFileHelper.class.php    | 102 +++++++++++++++++++++++---
 WEB-INF/lib/ttProjectHelper.class.php |   9 +++
 WEB-INF/lib/ttTimeHelper.class.php    |   9 +++
 WEB-INF/templates/footer.tpl          |   2 +-
 reports.php                           |   2 +-
 5 files changed, 111 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 9d18022b8..997634fea 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -32,6 +32,8 @@ class ttFileHelper {
   var $storage_uri = null;  // Location of file storage facility.
   var $register_uri = null; // URI to register with file storage facility.
   var $putfile_uri = null;  // URI to put file in file storage.
+  var $deletefile_uri = null;  // URI to delete file from file storage.
+  var $deletefiles_uri = null; // URI to delete multiple files from file storage.
   var $getfile_uri = null;  // URI to get file from file storage.
   var $site_id = null;      // Site id for file storage.
   var $site_key = null;     // Site key for file storage.
@@ -46,6 +48,7 @@ function __construct(&$errors) {
       $this->register_uri = $this->storage_uri.'register';
       $this->putfile_uri = $this->storage_uri.'putfile';
       $this->deletefile_uri = $this->storage_uri.'deletefile';
+      $this->deletefiles_uri = $this->storage_uri.'deletefiles';
       $this->getfile_uri = $this->storage_uri.'getfile';
       $this->checkSiteRegistration();
     }
@@ -133,8 +136,8 @@ function putFile($fields) {
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($this->getGroupKey()),
-      'user_id' => urlencode($fields['user_id']),   // May be null.
-      'user_key' => urlencode($fields['user_key']), // May be null.
+      'entity_type' => urlencode($fields['entity_type']),
+      'entity_id' => urlencode($fields['entity_id']),
       'file_name' => urlencode($fields['file_name']),
       'description' => urlencode($fields['description']),
       'content' => urlencode(base64_encode(file_get_contents($_FILES['newfile']['tmp_name'])))
@@ -212,8 +215,8 @@ function deleteFile($fields) {
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($this->getGroupKey()),
-      'user_id' => urlencode($fields['user_id']),   // May be null.
-      'user_key' => urlencode($fields['user_key']), // May be null.
+      'entity_type' => urlencode($fields['entity_type']),
+      'entity_id' => urlencode($fields['entity_id']),
       'file_id' => urlencode($fields['remote_id']),
       'file_key' => urlencode($fields['file_key']),
       'file_name' => urlencode($fields['file_name']));
@@ -249,25 +252,102 @@ function deleteFile($fields) {
     if ($error) {
       // Add an error from file storage facility if we have it.
       $this->errors->add($error);
-      return false;
     }
     if ($status != 1) {
       // There is no explicit error message, but still something not right.
       $this->errors->add($i18n->get('error.file_storage'));
+    }
+
+    // Delete file reference from database even when remote file storage call fails.
+    // This is by design to keep things simple.
+    $file_id = (int) $fields['id'];
+    $entity_id = (int) $fields['entity_id'];
+    $sql = "delete from tt_files".
+      " where id = $file_id and org_id = $org_id and group_id = $group_id and entity_id = $entity_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->errors->add($i18n->get('error.db'));
+      return false;
+    }
+
+    // File successfully deleted from both file storage and database.
+    return true;
+  }
+
+  // deleteEntityFiles - deletes all files associated with an entity.
+  // TODO: decide whether deleteGroupFiles and deleteOrgFiles should be
+  // separate functions.
+  function deleteEntityFiles($entity_id, $entity_type) {
+
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'entity_type' => urlencode($entity_type),
+      'entity_id' => urlencode($entity_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->deletefiles_uri);
+    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
       return false;
     }
 
-    // Delete file reference from database.
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.file_storage'));
+    }
+
+    // Many things can go wrong with a remote call to file storage facility.
+    // By design, we ignore such errors, and proceed with removal of entity
+    // records from the database.
+
+    // Delete all entity records from the database.
     $file_id = $fields['id'];
     $sql = "delete from tt_files".
-      " where id = $file_id and org_id = $org_id and group_id = $group_id";
+      " where entity_id = $entity_id".
+      " and entity_type = ".$mdb2->quote($entity_type).
+      " and org_id = $org_id and group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) {
       $this->errors->add($i18n->get('error.db'));
       return false;
     }
 
-    // File successfully deleted from both file storage and database.
     return true;
   }
 
@@ -307,7 +387,7 @@ static function getEntityFiles($id, $type) {
 
     $result = array();
     $entity_type = $mdb2->quote($type);
-    $sql = "select id, remote_id, file_name as name, description from tt_files".
+    $sql = "select id, remote_id, file_key, file_name as name, description from tt_files".
       " where entity_type = $entity_type and entity_id = $id".
       " and group_id = $group_id and org_id = $org_id and status = 1 order by id";
     $res = $mdb2->query($sql);
@@ -371,8 +451,8 @@ function getFile($fields) {
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($this->getGroupKey()),
-      'user_id' => urlencode($fields['user_id']),   // May be null.
-      'user_key' => urlencode($fields['user_key']), // May be null.
+      'entity_type' => urlencode($fields['entity_type']),
+      'entity_id' => urlencode($fields['entity_id']),
       'file_id' => urlencode($fields['remote_id']),
       'file_key' => urlencode($fields['file_key']),
       'file_name' => urlencode($fields['file_name']));
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 1bd363f97..22ef58a23 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -165,6 +165,15 @@ static function delete($id) {
     global $user;
     $mdb2 = getConnection();
 
+    // Delete associated files.
+    if ($user->isPluginEnabled('at')) {
+      import('ttFileHelper');
+      global $err;
+      $fileHelper = new ttFileHelper($err);
+      if (!$fileHelper->deleteEntityFiles($id, 'project'))
+        return false;
+    }
+
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index baa1a144c..c3ae8d6dc 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -510,6 +510,15 @@ static function delete($id) {
     global $user;
     $mdb2 = getConnection();
 
+    // Delete associated files.
+    if ($user->isPluginEnabled('at')) {
+      import('ttFileHelper');
+      global $err;
+      $fileHelper = new ttFileHelper($err);
+      if (!$fileHelper->deleteEntityFiles($id, 'time'))
+        return false;
+    }
+
     $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1db38f07d..e2b18404b 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.64.4930 | 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.64.4931 | 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/reports.php b/reports.php
index d94ee7574..c191de9aa 100644
--- a/reports.php
+++ b/reports.php
@@ -291,7 +291,7 @@
   $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
 if ($showApproved)
   $form->addInput(array('type'=>'checkbox','name'=>'chapproved'));
-if (isTrue('FILES_DEBUG')) $showFiles = $user->isPluginEnabled('at');
+$showFiles = $user->isPluginEnabled('at');
 if ($showFiles)
   $form->addInput(array('type'=>'checkbox','name'=>'chfiles'));
 

From 37da1bee2ce91703f964ae58c580240bd3798011 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 Apr 2019 17:49:10 +0000
Subject: [PATCH 0886/1848] Improved db cleanup code to also include attachment
 cleanup.

---
 WEB-INF/lib/ttFileHelper.class.php | 10 ++---
 WEB-INF/lib/ttOrgHelper.class.php  | 68 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      |  2 +-
 4 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 997634fea..c69439d60 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -79,7 +79,7 @@ function checkSiteRegistration() {
 
       // Set the url, number of POST vars, POST data.
       curl_setopt($ch, CURLOPT_URL, $this->register_uri);
-      curl_setopt($ch, CURLOPT_POST, count($fields));
+      curl_setopt($ch, CURLOPT_POST, true);
       curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
       curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -152,7 +152,7 @@ function putFile($fields) {
 
     // Set the url, number of POST vars, POST data.
     curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
-    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -230,7 +230,7 @@ function deleteFile($fields) {
 
     // Set the url, number of POST vars, POST data.
     curl_setopt($ch, CURLOPT_URL, $this->deletefile_uri);
-    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -304,7 +304,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
 
     // Set the url, number of POST vars, POST data.
     curl_setopt($ch, CURLOPT_URL, $this->deletefiles_uri);
-    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -466,7 +466,7 @@ function getFile($fields) {
 
     // Set the url, number of POST vars, POST data.
     curl_setopt($ch, CURLOPT_URL, $this->getfile_uri);
-    curl_setopt($ch, CURLOPT_POST, count($fields));
+    curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 346ea5d1c..a4be2e962 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -85,6 +85,10 @@ static function getInactiveOrgs() {
 
   // deleteOrg deletes data for the entire organization from database permanently.
   static function deleteOrg($org_id) {
+
+    // Delete all org files.
+    ttOrgHelper::deleteOrgFiles($org_id);
+
     // Go one table at a time and remove all records with matching org_id.
     // The order is backwards to import (see ttOrgImportHelper). Remove groups last.
     // This leaves us with something partially working if an error occurs.
@@ -119,6 +123,70 @@ static function deleteOrg($org_id) {
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }
+    return true;  }
+
+  // deleteOrgFiles deletes files attached to all entities in the entire organization.
+  static function deleteOrgFiles($org_id) {
+
+    // Delete all org files from the database.
+    $mdb2 = getConnection();
+    $sql = "delete from tt_files where org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Try to make a call to file storage facility.
+    if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
+
+    $deleteorgfiles_uri = FILE_STORAGE_URI.'deleteorgfiles';
+
+    // Obtain site id.
+    $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $site_id = $val['site_id'];
+    if (!$site_id) return true; // Nothing to do.
+
+    // Obtain site key.
+    $sql = "select param_value as site_key from tt_site_config where param_name = 'locker_key'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $site_key = $val['site_key'];
+    if (!$site_key) return true; // Can't continue without site key.
+
+    // Obtain org key.
+    $sql = "select group_key as org_key from tt_groups where id = $org_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $org_key = $val['org_key'];
+    if (!$site_key) return true; // Can't continue without org key.
+
+    $curl_fields = array('site_id' => $site_id,
+      'site_key' => $site_key,
+      'org_id' => $org_id,
+      'org_key' => $org_key);
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $deleteorgfiles_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    // Many things can go wrong with a remote call to file storage facility.
+    // By design, we ignore such errors.
     return true;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e2b18404b..80f684b62 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.64.4931 | 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.64.4932 | 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/dbinstall.php b/dbinstall.php
index 007e51608..6e5b1b25f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1157,7 +1157,6 @@ function ttGenerateKeys() {
 }
 
   if ($_POST["cleanup"]) {
-
     $mdb2 = getConnection();
     $inactive_orgs = ttOrgHelper::getInactiveOrgs();
 
@@ -1191,6 +1190,7 @@ function ttGenerateKeys() {
     ttExecute("OPTIMIZE TABLE tt_user_project_binds");
     ttExecute("OPTIMIZE TABLE tt_users");
     ttExecute("OPTIMIZE TABLE tt_roles");
+    ttExecute("OPTIMIZE TABLE tt_files");
   }
 
   print "Done.<br>\n";

From 181d072f27ced2ed2e350dc66ee6aaeafce9f4bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 Apr 2019 18:59:51 +0000
Subject: [PATCH 0887/1848] Improved cleanup code.

---
 WEB-INF/lib/ttOrgHelper.class.php | 2 ++
 WEB-INF/templates/footer.tpl      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index a4be2e962..9bf1ad783 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -135,6 +135,8 @@ static function deleteOrgFiles($org_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    if ($affected == 0) return true; // Do not call file storage utility.
+
     // Try to make a call to file storage facility.
     if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 80f684b62..167779d10 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.64.4932 | 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.64.4933 | 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>

From 870ef02e00ccf3c54edd893bfa84cfb4d692ac0a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 Apr 2019 21:13:08 +0000
Subject: [PATCH 0888/1848] Added custom field output on time.php as a rewrite
 of PR#76."

---
 WEB-INF/lib/ttTimeHelper.class.php | 43 ++++++++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/time.tpl         |  6 +++++
 time.php                           |  1 +
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index c3ae8d6dc..5745128fb 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -800,6 +800,7 @@ static function getAllRecords($user_id) {
 
   // getRecords - returns time records for a user for a given date.
   static function getRecords($user_id, $date) {
+    // TODO: merge getRecords and getRecordsWithFiles into one function.
     global $user;
     $mdb2 = getConnection();
 
@@ -814,16 +815,35 @@ static function getRecords($user_id, $date) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    $include_cf_1 = $user->isPluginEnabled('cf');
+    if ($include_cf_1) {
+      $custom_fields = new CustomFields();
+      $cf_1_type = $custom_fields->fields[0]['type'];
+      if ($cf_1_type == CustomFields::TYPE_TEXT) {
+        $custom_field = ", cfl.value as cf_1";
+      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $custom_field = ", cfo.value as cf_1";
+      }
+    }
+
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
+    if ($include_cf_1) {
+      if ($cf_1_type == CustomFields::TYPE_TEXT)
+        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
+      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
+          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
+      }
+    }
 
     $result = array();
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
     $res = $mdb2->query($sql);
@@ -856,10 +876,29 @@ static function getRecordsWithFiles($user_id, $date) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    $include_cf_1 = $user->isPluginEnabled('cf');
+    if ($include_cf_1) {
+      $custom_fields = new CustomFields();
+      $cf_1_type = $custom_fields->fields[0]['type'];
+      if ($cf_1_type == CustomFields::TYPE_TEXT) {
+        $custom_field = ", cfl.value as cf_1";
+      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $custom_field = ", cfo.value as cf_1";
+      }
+    }
+
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
+    if ($include_cf_1) {
+      if ($cf_1_type == CustomFields::TYPE_TEXT)
+        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
+      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
+          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
+      }
+    }
 
     $left_joins .= " left join (select distinct entity_id from tt_files".
       " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
@@ -870,7 +909,7 @@ static function getRecordsWithFiles($user_id, $date) {
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
       " if(Sub1.entity_id is null, 0, 1) as has_files,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 167779d10..c1c5bd535 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.64.4933 | 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.65.4934 | 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/time.tpl b/WEB-INF/templates/time.tpl
index e531d2b6e..049979cac 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -104,6 +104,9 @@
   {if $user->isPluginEnabled('cl')}
         <td width="20%" class="tableHeader">{$i18n.label.client}</td>
   {/if}
+  {if $show_cf_1}
+        <td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>
+  {/if}
   {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
@@ -127,6 +130,9 @@
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$record.client|escape}</td>
     {/if}
+    {if $show_cf_1}
+        <td valign="top">{$record.cf_1|escape}</td>
+    {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         <td valign="top">{$record.project|escape}</td>
     {/if}
diff --git a/time.php b/time.php
index 63f5b8cf3..615f2ef90 100644
--- a/time.php
+++ b/time.php
@@ -403,6 +403,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From 11f9bb4aceb54d0965f5eb2a5329acc6400428e2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 Apr 2019 21:13:08 +0000
Subject: [PATCH 0889/1848] Added custom field output on time.php as a rewrite
 of PR#76."

---
 WEB-INF/lib/ttTimeHelper.class.php | 43 ++++++++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/time.tpl         |  6 +++++
 time.php                           |  1 +
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index c3ae8d6dc..5745128fb 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -800,6 +800,7 @@ static function getAllRecords($user_id) {
 
   // getRecords - returns time records for a user for a given date.
   static function getRecords($user_id, $date) {
+    // TODO: merge getRecords and getRecordsWithFiles into one function.
     global $user;
     $mdb2 = getConnection();
 
@@ -814,16 +815,35 @@ static function getRecords($user_id, $date) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    $include_cf_1 = $user->isPluginEnabled('cf');
+    if ($include_cf_1) {
+      $custom_fields = new CustomFields();
+      $cf_1_type = $custom_fields->fields[0]['type'];
+      if ($cf_1_type == CustomFields::TYPE_TEXT) {
+        $custom_field = ", cfl.value as cf_1";
+      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $custom_field = ", cfo.value as cf_1";
+      }
+    }
+
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
+    if ($include_cf_1) {
+      if ($cf_1_type == CustomFields::TYPE_TEXT)
+        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
+      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
+          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
+      }
+    }
 
     $result = array();
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
     $res = $mdb2->query($sql);
@@ -856,10 +876,29 @@ static function getRecordsWithFiles($user_id, $date) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    $include_cf_1 = $user->isPluginEnabled('cf');
+    if ($include_cf_1) {
+      $custom_fields = new CustomFields();
+      $cf_1_type = $custom_fields->fields[0]['type'];
+      if ($cf_1_type == CustomFields::TYPE_TEXT) {
+        $custom_field = ", cfl.value as cf_1";
+      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $custom_field = ", cfo.value as cf_1";
+      }
+    }
+
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
+    if ($include_cf_1) {
+      if ($cf_1_type == CustomFields::TYPE_TEXT)
+        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
+      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
+          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
+      }
+    }
 
     $left_joins .= " left join (select distinct entity_id from tt_files".
       " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
@@ -870,7 +909,7 @@ static function getRecordsWithFiles($user_id, $date) {
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
       " if(Sub1.entity_id is null, 0, 1) as has_files,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 167779d10..c1c5bd535 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.64.4933 | 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.65.4934 | 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/time.tpl b/WEB-INF/templates/time.tpl
index e531d2b6e..049979cac 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -104,6 +104,9 @@
   {if $user->isPluginEnabled('cl')}
         <td width="20%" class="tableHeader">{$i18n.label.client}</td>
   {/if}
+  {if $show_cf_1}
+        <td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>
+  {/if}
   {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
@@ -127,6 +130,9 @@
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$record.client|escape}</td>
     {/if}
+    {if $show_cf_1}
+        <td valign="top">{$record.cf_1|escape}</td>
+    {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         <td valign="top">{$record.project|escape}</td>
     {/if}
diff --git a/time.php b/time.php
index 63f5b8cf3..615f2ef90 100644
--- a/time.php
+++ b/time.php
@@ -403,6 +403,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From 5396105fc7f67ee7e7a4fe06c388e19716cf623a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 12:49:54 +0000
Subject: [PATCH 0890/1848] Removed view column on timesheets.php and
 invoices.php.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/invoices.tpl   | 4 +---
 WEB-INF/templates/timesheets.tpl | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c1c5bd535..d1ebbd4c9 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.65.4934 | 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.65.4935 | 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/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 7301ce2c2..5960790c1 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -14,20 +14,18 @@
   {if $user->isPluginEnabled('ps')}
           <td class="tableHeader">{$i18n.label.paid}</td>
   {/if}
-          <td class="tableHeader">{$i18n.label.view}</td>
   {if !$user->isClient()}
           <td></td>
   {/if}
         </tr>
         {foreach $invoices as $invoice}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$invoice.name|escape}</td>
+          <td><a href="invoice_view.php?id={$invoice.id}">{$invoice.name|escape}</a></td>
           <td>{$invoice.client_name|escape}</td>
           <td>{$invoice.date}</td>
   {if $user->isPluginEnabled('ps')}
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
-          <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
           <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
   {/if}
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index c38e2d442..fd26588d7 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -20,13 +20,12 @@
 {/if}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
-          <td class="tableHeader">{$i18n.label.view}</td>
           <td></td>
           <td></td>
         </tr>
 {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$timesheet.name|escape}</td>
+          <td><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
   {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
   {/if}
@@ -36,7 +35,6 @@
   {else}
           <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
-          <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
           <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>

From 331afa6cc2e76915cbe7fce163803cbe5a93f9da Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 13:40:16 +0000
Subject: [PATCH 0891/1848] Introduced tile.display_options in translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 4454d3482..8cf71c52b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -358,6 +358,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => 'Opcions',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index aa590549e..004666c76 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -369,6 +369,7 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 0248b8d79..c53d33df7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -339,6 +339,8 @@
 'title.export' => 'Eksporter Team Data', // TODO: replace "team" with "group".
 'title.import' => 'Importer Team Data', // TODO: replace "team" with "group".
 'title.options' => 'Indstillinger',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Brugerdefineret Felt',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 18bfc2e9c..d5969a70f 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -322,6 +322,8 @@
 'title.export' => 'Daten exportieren',
 'title.import' => 'Daten importieren',
 'title.options' => 'Optionen',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Erweiterungen',
 'title.cf_custom_fields' => 'Benutzerfelder',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 98c6f915d..a4db5945b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -310,6 +310,7 @@
 'title.export' => 'Exporting Group Data',
 'title.import' => 'Importing Group Data',
 'title.options' => 'Options',
+'title.display_options' => 'Display Options',
 'title.profile' => 'Profile',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Custom Fields',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8e7ce8c97..26a2fa5b8 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -357,6 +357,8 @@
 'title.export' => 'Exportar datos', // TODO: Consider changing to exportando for consistency with other titles.
 'title.import' => 'Importar datos', // TODO: Consider changing to importando for consistency with other titles.
 'title.options' => 'Opciones',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 65beb3ee2..7b76db2e6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -344,6 +344,8 @@
 'title.export' => 'Grupi andmete alla laadimine',
 'title.import' => 'Grupi andmete üles laadimine',
 'title.options' => 'Suvandid',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profiil',
 'title.plugins' => 'Lisad',
 'title.cf_custom_fields' => 'Eriväljad',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 6a74f0ed7..79e96aaad 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -346,6 +346,8 @@
 'title.export' => 'پشتیانی گرفتن از اطلاعات تیم', // TODO: replace "team" with "group".
 'title.import' => 'وارد کردن اطلاعات تیم', // TODO: replace "team" with "group".
 'title.options' => 'گزینه ها',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'پروفایل',
 'title.plugins' => 'پلاگین ها',
 'title.cf_custom_fields' => 'فیلدهای سفارشی',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d02a010c6..45a3b1a43 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -339,6 +339,8 @@
 'title.export' => 'Tiimitietojen vienti', // TODO: replace "team" with "group".
 'title.import' => 'Tiimitietojen tunti', // TODO: replace "team" with "group".
 'title.options' => 'Optiot',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profiili',
 'title.plugins' => 'Lisäosat',
 'title.cf_custom_fields' => 'Omat kentät',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 45447d7d7..5b3958726 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -333,6 +333,8 @@
 'title.export' => 'Exportation des données',
 'title.import' => 'Importation des données',
 'title.options' => 'Options',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Champs personalisés',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 68208ee63..5b18358f3 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -329,6 +329,8 @@
 'title.export' => 'Εξαγωγή δεδομένων ομάδας',
 'title.import' => 'Εισαγωγή δεδομένων ομάδας',
 'title.options' => 'Επιλογές',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Προφίλ',
 'title.plugins' => 'Πρόσθετα',
 'title.cf_custom_fields' => 'Προσαρμοσμένα πεδία',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5c199ec69..02c24d6de 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -356,6 +356,8 @@
 'title.export' => 'ייצוא נתוני צוות', // TODO: replace "team" with "group".
 'title.import' => 'ייבוא נתוני צוות', // TODO: replace "team" with "group".
 'title.options' => 'אפשרויות',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'פרופיל',
 'title.plugins' => 'תוספים',
 'title.cf_custom_fields' => 'שדות אישיים',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5f7b40cfd..a7b899fa3 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -357,6 +357,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => 'Opciók',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 678b1b088..464a9978b 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -338,6 +338,8 @@
 'title.export' => 'Esporta i dati del gruppo',
 'title.import' => 'Importa i dati del gruppo',
 'title.options' => 'Opzioni',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profilo',
 'title.plugins' => 'Plugin',
 'title.cf_custom_fields' => 'Campi personalizzati',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8b68a1b00..223581c67 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -364,6 +364,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => 'オプション',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'プロファイル',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 181e07079..ed85c0fd3 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -365,6 +365,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => '옵션',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => '프로필',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e444f2140..ce42aa218 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -311,6 +311,8 @@
 'title.export' => 'Exporteer groepsgegevens',
 'title.import' => 'Importeer groepsgegevens',
 'title.options' => 'Opties',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profiel',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Eigen velden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 0f91855e9..5b747949c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -361,6 +361,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => 'Opsjoner',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4d457d61d..f8b6d171a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -340,6 +340,8 @@
 'title.export' => 'Eksport danych zespołu', // TODO: replace "team" with "group".
 'title.import' => 'Import danych zespołu', // TODO: replace "team" with "group".
 'title.options' => 'Opcje',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Dodatkowe moduły',
 'title.cf_custom_fields' => 'Pola niestandardowe',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 88344d823..3aac39c6d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -337,6 +337,8 @@
 'title.export' => 'Exportando dados de equipe', // TODO: replace "team" with "group".
 'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
 'title.options' => 'Opções',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Perfil',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Campos personalizados',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c388f0954..bd2bddf44 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -345,6 +345,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => 'Opções',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Perfil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 7800b2b91..fced1beff 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -364,6 +364,7 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d1b74e0d3..bc86bbac0 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -309,6 +309,7 @@
 'title.export' => 'Экспортирование данных группы',
 'title.import' => 'Импортирование данных группы',
 'title.options' => 'Опции',
+'title.display_options' => 'Опции отображения',
 'title.profile' => 'Профиль',
 'title.plugins' => 'Плагины',
 'title.cf_custom_fields' => 'Дополнительные поля',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 7073ac5f0..ca952a6cc 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -345,6 +345,8 @@
 'title.export' => 'Exportovanie údajov o tíme', // TODO: replace "team" with "group".
 'title.import' => 'Importovanie údajov o tíme', // TODO: replace "team" with "group".
 'title.options' => 'Nastavenia',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Doplnkové moduly',
 'title.cf_custom_fields' => 'Vlastné polia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2b609003c..9a8e59e10 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -339,6 +339,7 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a6b4b74b9..f7ca03f77 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -338,6 +338,8 @@
 'title.export' => 'Izvoz podataka tim-a', // TODO: replace "team" with "group".
 'title.import' => 'Uvoz podataka tim-a', // TODO: replace "team" with "group".
 'title.options' => 'Opcije',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Dodaci',
 'title.cf_custom_fields' => 'Dodatna polja',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b2837ccd0..ebdbd5a6d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -338,6 +338,8 @@
 'title.export' => 'Exportera grupp',
 'title.import' => 'Importera grupp',
 'title.options' => 'Alternativ',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profil',
 'title.plugins' => 'Tillägg',
 'title.cf_custom_fields' => 'Egna fält',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cef0d9eb8..1f27d4bf1 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -373,6 +373,7 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 // 'title.options' => 'Options',
+// 'title.display_options' => 'Display Options',
 'title.profile' => 'Profili',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 551ef564d..4246cae04 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -352,6 +352,8 @@
 // 'title.export' => 'Exporting Group Data',
 // 'title.import' => 'Importing Group Data',
 'title.options' => '选项',
+// TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 'title.profile' => '简介',
 // TODO: translate the following.
 // 'title.plugins' => 'Plugins',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index eef917947..fc3efcc5a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -360,6 +360,7 @@
 // 'title.import' => 'Importing Group Data',
 'title.options' => '選項',
 // TODO: translate the following.
+// 'title.display_options' => 'Display Options',
 // 'title.profile' => 'Profile',
 // 'title.plugins' => 'Plugins',
 // 'title.cf_custom_fields' => 'Custom Fields',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d1ebbd4c9..8b7badc64 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.65.4935 | 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.65.4936 | 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>

From b6546c4547eb47a06f80b6d0ffa474d3929602f9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 17:07:13 +0000
Subject: [PATCH 0892/1848] Work in progress on configurable display options.

---
 WEB-INF/resources/ca.lang.php         |  5 ++
 WEB-INF/resources/cs.lang.php         |  5 ++
 WEB-INF/resources/da.lang.php         |  5 ++
 WEB-INF/resources/de.lang.php         |  6 ++
 WEB-INF/resources/en.lang.php         |  4 ++
 WEB-INF/resources/es.lang.php         |  5 ++
 WEB-INF/resources/et.lang.php         |  6 ++
 WEB-INF/resources/fa.lang.php         |  5 ++
 WEB-INF/resources/fi.lang.php         |  5 ++
 WEB-INF/resources/fr.lang.php         |  5 ++
 WEB-INF/resources/gr.lang.php         |  6 ++
 WEB-INF/resources/he.lang.php         |  5 ++
 WEB-INF/resources/hu.lang.php         |  5 ++
 WEB-INF/resources/it.lang.php         |  6 ++
 WEB-INF/resources/ja.lang.php         |  5 ++
 WEB-INF/resources/ko.lang.php         |  5 ++
 WEB-INF/resources/nl.lang.php         |  6 ++
 WEB-INF/resources/no.lang.php         |  5 ++
 WEB-INF/resources/pl.lang.php         |  5 ++
 WEB-INF/resources/pt-br.lang.php      |  5 ++
 WEB-INF/resources/pt.lang.php         |  5 ++
 WEB-INF/resources/ro.lang.php         |  5 ++
 WEB-INF/resources/ru.lang.php         |  4 ++
 WEB-INF/resources/sk.lang.php         |  5 ++
 WEB-INF/resources/sl.lang.php         |  5 ++
 WEB-INF/resources/sr.lang.php         |  5 ++
 WEB-INF/resources/sv.lang.php         |  5 ++
 WEB-INF/resources/tr.lang.php         |  5 ++
 WEB-INF/resources/zh-cn.lang.php      |  5 ++
 WEB-INF/resources/zh-tw.lang.php      |  5 ++
 WEB-INF/templates/display_options.tpl | 22 +++++++
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/group_edit.tpl      |  6 +-
 display_options.php                   | 84 +++++++++++++++++++++++++++
 roles.php                             | 11 ----
 week_view.php                         |  4 --
 36 files changed, 265 insertions(+), 17 deletions(-)
 create mode 100644 WEB-INF/templates/display_options.tpl
 create mode 100644 display_options.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 8cf71c52b..b0b66f122 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -574,6 +574,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -652,4 +653,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 004666c76..8689ee122 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -587,6 +587,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -665,4 +666,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index c53d33df7..6c9b4b903 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -545,6 +545,7 @@
 'form.group_edit.12_hours' => '12 timers',
 'form.group_edit.24_hours' => '24 timers',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Registrerings tilstand',
 'form.group_edit.mode_time' => 'Tid',
@@ -623,5 +624,9 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index d5969a70f..c7e2225b3 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -520,6 +520,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 Stunden',
 'form.group_edit.24_hours' => '24 Stunden',
+// TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Zeige Feiertage',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',
@@ -595,4 +597,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index a4db5945b..001b6387b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -508,6 +508,7 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 hours',
 'form.group_edit.24_hours' => '24 hours',
+'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',
@@ -579,4 +580,7 @@
 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 26a2fa5b8..b22caf234 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -588,6 +588,7 @@
 'form.group_edit.12_hours' => '12 horas',
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -667,4 +668,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7b76db2e6..684d1799d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -549,6 +549,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 tundi',
 'form.group_edit.24_hours' => '24 tundi',
+// TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Näita pühi',
 'form.group_edit.tracking_mode' => 'Jälgimise režiim',
 'form.group_edit.mode_time' => 'ajaarvestus',
@@ -624,4 +626,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 79e96aaad..f1beb392e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -568,6 +568,7 @@
 'form.group_edit.12_hours' => '12 ساعت',
 'form.group_edit.24_hours' => '24 ساعت',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'حالت رهگیری',
 'form.group_edit.mode_time' => 'زمان',
@@ -647,4 +648,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 45a3b1a43..6c2a539d8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -551,6 +551,7 @@
 'form.group_edit.12_hours' => '12-tuntinen',
 'form.group_edit.24_hours' => '24-tuntinen',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Seurantamuoto',
 'form.group_edit.mode_time' => 'aika',
@@ -629,4 +630,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5b3958726..ea8e8973d 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -542,6 +542,7 @@
 'form.group_edit.12_hours' => '12 heures',
 'form.group_edit.24_hours' => '24 heures',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Mode suivi',
 'form.group_edit.mode_time' => 'Heures',
@@ -619,4 +620,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5b18358f3..745f054e5 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -529,6 +529,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 ώρες',
 'form.group_edit.24_hours' => '24 ώρες',
+// TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Προβολή διακοπών',
 'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
 'form.group_edit.mode_time' => 'χρόνος',
@@ -607,4 +609,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 02c24d6de..670fe0a7c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -573,6 +573,7 @@
 'form.group_edit.12_hours' => '12 שעות',
 'form.group_edit.24_hours' => '24 שעות',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'סוג מעקב',
 'form.group_edit.mode_time' => 'זמן',
@@ -651,4 +652,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a7b899fa3..527b59a6c 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -579,6 +579,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -657,4 +658,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 464a9978b..55ef72b42 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -543,6 +543,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 ore',
 'form.group_edit.24_hours' => '24 ore',
+// TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Mostra vacanze',
 'form.group_edit.tracking_mode' => 'Modalità di registrazione',
 'form.group_edit.mode_time' => 'tempo',
@@ -621,4 +623,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 223581c67..a9325f5b6 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -582,6 +582,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -660,4 +661,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ed85c0fd3..feb023fcf 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -580,6 +580,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -658,4 +659,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ce42aa218..d368422fe 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -503,6 +503,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 uurs',
 'form.group_edit.24_hours' => '24 uurs',
+// TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Toon vakantiedagen',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',
@@ -574,4 +576,8 @@
 'form.timesheet_view.approve_body' => "Jouw tijdenoverzicht %s is goedgekeurd.<p>%s",
 'form.timesheet_view.disapprove_subject' => 'Tijdenoverzicht afgekeurd',
 'form.timesheet_view.disapprove_body' => "Jouw tijdenoverzicht %s is afgekeurd.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5b747949c..21fa63160 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -579,6 +579,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -657,4 +658,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f8b6d171a..9fe7ba99b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -554,6 +554,7 @@
 'form.group_edit.12_hours' => '12 godzin',
 'form.group_edit.24_hours' => '24 godziny',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Tryb śledzenia',
 'form.group_edit.mode_time' => 'czas',
@@ -632,4 +633,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3aac39c6d..81e46da12 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -549,6 +549,7 @@
 'form.group_edit.12_hours' => '12 horas',
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',
@@ -627,4 +628,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index bd2bddf44..ee882f20c 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -561,6 +561,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -639,4 +640,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fced1beff..a8d12d4fe 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -582,6 +582,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -660,4 +661,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index bc86bbac0..c0a65ed39 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -499,6 +499,7 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 часов',
 'form.group_edit.24_hours' => '24 часа',
+'form.group_edit.display_options' => 'Опции отображения',
 'form.group_edit.show_holidays' => 'Показывать праздники',
 'form.group_edit.tracking_mode' => 'Режим работы',
 'form.group_edit.mode_time' => 'время',
@@ -570,4 +571,7 @@
 'form.timesheet_view.approve_body' => "Ваш табель %s одобрен.<p>%s",
 'form.timesheet_view.disapprove_subject' => 'Табель не одобрен',
 'form.timesheet_view.disapprove_body' => "Ваш табель %s не одобрен.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ca952a6cc..8fbf03a8c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -562,6 +562,7 @@
 'form.group_edit.12_hours' => '12-hodinový',
 'form.group_edit.24_hours' => '24-hodinový',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Režim sledovania',
 'form.group_edit.mode_time' => 'čas',
@@ -640,4 +641,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9a8e59e10..9224b8894 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -556,6 +556,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -634,4 +635,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f7ca03f77..d4b250d67 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -552,6 +552,7 @@
 'form.group_edit.12_hours' => '12 časova',
 'form.group_edit.24_hours' => '24 časova',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Način evidencije',
 'form.group_edit.mode_time' => 'vreme',
@@ -630,4 +631,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ebdbd5a6d..fd0fdf490 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -549,6 +549,7 @@
 'form.group_edit.12_hours' => '12-timmars',
 'form.group_edit.24_hours' => '24-timmars',
 // TODO: translate the following.
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.tracking_mode' => 'Spårningsmetod',
 'form.group_edit.mode_time' => 'Endast tid',
@@ -627,4 +628,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1f27d4bf1..2865e9aa2 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -595,6 +595,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -673,4 +674,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4246cae04..e9a8f487b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -565,6 +565,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -643,4 +644,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index fc3efcc5a..952b46a70 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -572,6 +572,7 @@
 // TODO: translate the following.
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
+// 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
@@ -650,4 +651,8 @@
 // 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
 // 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: translate the following.
+// 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
new file mode 100644
index 000000000..a4fe69e38
--- /dev/null
+++ b/WEB-INF/templates/display_options.tpl
@@ -0,0 +1,22 @@
+{$forms.displayOptionsForm.open}
+<table cellspacing="1" cellpadding="2" border="0">
+  <tr><td class="sectionHeaderNoBorder">{$i18n.title.time}</td></tr>
+  <tr>
+    <td><label for="time_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
+    <td nowrap>{$forms.displayOptionsForm.time_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+  <tr>
+
+  <tr><td>&nbsp;</td></tr>
+  <tr><td class="sectionHeaderNoBorder">{$i18n.title.reports}</td></tr>
+  <tr>
+    <td><label for="report_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
+    <td nowrap>{$forms.displayOptionsForm.report_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+
+  <tr><td>&nbsp;</td></tr>
+  <tr>
+    <td colspan="2" height="50" align="center">{$forms.displayOptionsForm.btn_save.control}</td>
+  </tr>
+</table>
+{$forms.displayOptionsForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b7badc64..7bcd23594 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.65.4936 | 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.65.4937 | 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 0565d763e..906227898 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -48,7 +48,7 @@ function handleTaskRequiredCheckbox() {
   {if $user->can('manage_roles')}
           <tr>
             <td align="right" nowrap>{$i18n.label.roles}:</td>
-            <td><a href="roles.php?group_id={$group_id}">{$i18n.label.configure}</a></td>
+            <td><a href="roles.php">{$i18n.label.configure}</a></td>
           </tr>
   {/if}
           <tr>
@@ -70,6 +70,10 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.label.week_start}:</td>
             <td>{$forms.groupForm.start_week.control}</td>
           </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
+            <td><a href="display_options.php">{$i18n.label.configure}</a></td>
+          </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
             <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
diff --git a/display_options.php b/display_options.php
new file mode 100644
index 000000000..222cc25da
--- /dev/null
+++ b/display_options.php
@@ -0,0 +1,84 @@
+<?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('ttConfigHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('manage_basic_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$config = new ttConfigHelper($user->getConfig());
+
+if ($request->isPost()) {
+  $cl_time_note_on_separate_row = trim($request->getParameter('time_note_on_separate_row'));
+  $cl_report_note_on_separate_row = trim($request->getParameter('report_note_on_separate_row'));
+} else {
+  $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
+  $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
+}
+
+$form = new Form('displayOptionsForm');
+// $form->addInput(array('type'=>'checkbox','name'=>'time_client','value'=>$cl_time_client));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_cf_1','value'=>$cl_time_cf_1));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_project','value'=>$cl_time_project));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_task','value'=>$cl_time_task));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_start','value'=>$cl_time_start));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_finish','value'=>$cl_time_finish));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_duration','value'=>$cl_time_duration));
+// $form->addInput(array('type'=>'checkbox','name'=>'time_note','value'=>$cl_time_note));
+$form->addInput(array('type'=>'checkbox','name'=>'time_note_on_separate_row','value'=>$cl_time_note_on_separate_row));
+// TODO: consider adding other fields (timesheet, work_units, invoice, approved, cost, paid)?
+
+// Reports.
+$form->addInput(array('type'=>'checkbox','name'=>'report_note_on_separate_row','value'=>$cl_report_note_on_separate_row));
+// TODO: add PDF break controller here.
+
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()){
+  if ($err->no()) {
+    // Update config.
+    $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);
+    $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
+    if ($user->updateGroup(array('config' => $config->getConfig()))) {
+      header('Location: success.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.display_options'));
+$smarty->assign('content_page_name', 'display_options.tpl');
+$smarty->display('index.tpl');
diff --git a/roles.php b/roles.php
index fe68329d3..cd17da3c4 100644
--- a/roles.php
+++ b/roles.php
@@ -36,19 +36,8 @@
   header('Location: access_denied.php');
   exit();
 }
-$group_id = (int)$request->getParameter('group_id');
-if ($group_id && !$user->isGroupValid($group_id)) {
-  header('Location: access_denied.php');
-  exit();
-}
 // End of access checks.
 
-if ($group_id) {
-  // We are passed a valid group_id (most likely from group_edit.php).
-  // Set on behalf group accordingly.
-  $user->setOnBehalfGroup($group_id);
-}
-
 $smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
 $smarty->assign('title', $i18n->get('title.roles'));
diff --git a/week_view.php b/week_view.php
index 9f809af3c..0d369bf9b 100644
--- a/week_view.php
+++ b/week_view.php
@@ -34,10 +34,6 @@
   header('Location: access_denied.php');
   exit();
 }
-if (!$user->isPluginEnabled('wv')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
 
 if ($request->isPost()) {
   $cl_week_note = $request->getParameter('week_note');

From 957007719ca06e990ad29d9be24126decca8cac9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 17:31:13 +0000
Subject: [PATCH 0893/1848] Work in progress on configurable display options.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/report.tpl | 7 ++++++-
 report.php                   | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7bcd23594..d67cd7b42 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.65.4937 | 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.65.4938 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 2f3a7a39f..a98d71aa0 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -48,6 +48,7 @@
   {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
   {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
   {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
+  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="tableHeader">{$i18n.label.note}</td>{/if}
   {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
   {if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
   {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
@@ -73,6 +74,7 @@
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
         {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
+        {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chapproved')}<td></td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
@@ -101,6 +103,7 @@
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
@@ -113,7 +116,7 @@
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
       </tr>
-    {if $bean->getAttribute('chnote') && $item.note}
+    {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
       <tr>
         <td class="cellRightAligned">{$i18n.label.note}:</td>
         <td colspan="{$colspan}">{$item.note|escape}</td>
@@ -135,6 +138,7 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
@@ -158,6 +162,7 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
diff --git a/report.php b/report.php
index 3bd410a46..b82380d7a 100644
--- a/report.php
+++ b/report.php
@@ -27,17 +27,21 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
+import('ttConfigHelper');
 import('form.Form');
 import('form.ActionForm');
 import('ttReportHelper');
 import('ttGroupHelper');
 import('ttTimesheetHelper');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
+
+$config = new ttConfigHelper($user->getConfig());
 
 if ($user->isPluginEnabled('ap')) {
   $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
@@ -309,6 +313,7 @@
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('note_on_separate_row', $user->getConfigOption('report_note_on_separate_row'));
 $smarty->assign('colspan', $colspan);
 $smarty->assign('bean', $bean);
 $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);

From a2d35bc3c1d0dbdd5e802bd51b134e1756eec9f5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 18:46:48 +0000
Subject: [PATCH 0894/1848] Adjusted PDF reports to honor note on separate row
 option.

---
 WEB-INF/templates/footer.tpl |  2 +-
 topdf.php                    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d67cd7b42..62e02560c 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.65.4938 | 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.65.4939 | 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/topdf.php b/topdf.php
index 7d7a7f9d0..e50a89f97 100644
--- a/topdf.php
+++ b/topdf.php
@@ -31,6 +31,7 @@
  * If installed, it is expected to be in WEB-INF/lib/tcpdf/ folder.
  */
 require_once('initialize.php');
+import('ttReportHelper');
 import('form.Form');
 import('form.ActionForm');
 import('ttReportHelper');
@@ -58,6 +59,10 @@
 // Report settings are stored in session bean before we get here.
 $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
 
+$config = new ttConfigHelper($user->getConfig());
+$show_note_column = $bean->getAttribute('chnote') && !$config->getDefinedValue('report_note_on_separate_row');
+$show_note_row = $bean->getAttribute('chnote') && $config->getDefinedValue('report_note_on_separate_row');
+
 // There are 2 variations of report: totals only, or normal. Totals only means that the report
 // is grouped by either date, user, client, project, task or cf_1 and user only needs to see subtotals by group.
 $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
@@ -154,6 +159,7 @@
   if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
   if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
   if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
+  if ($show_note_column) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
   if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
   if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
   if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
@@ -200,6 +206,7 @@
         if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
         if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
         if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
+        if ($show_note_column) $html .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $html .= "<td $styleRightAligned>";
           if ($user->can('manage_invoices') || $user->isClient())
@@ -240,6 +247,7 @@
     if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
     if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
+    if ($show_note_column) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())
@@ -267,7 +275,7 @@
     if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
     $html .= '</tr>';
 
-    if ($bean->getAttribute('chnote') && $item['note']) {
+    if ($show_note_row && $item['note']) {
       $html .= '<tr>';
       $html .= "<td $styleRightAligned>".$i18n->get('label.note').'</td>';
       $noteSpan = $colspan-1;
@@ -312,6 +320,7 @@
     if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
     if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
+    if ($show_note_column) $html .= '<td></td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())
@@ -341,6 +350,7 @@
   if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
   if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
+  if ($show_note_column) $html .= '<td></td>';
   if ($bean->getAttribute('chcost')) {
     $html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
     if ($user->can('manage_invoices') || $user->isClient())

From 15361df3d667c9bfe0d0818eeb12c22170a77f73 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 19:05:52 +0000
Subject: [PATCH 0895/1848] Adjusted emailed reports to honor note on separate
 row option.

---
 WEB-INF/lib/ttReportHelper.class.php | 14 +++++++++++++-
 WEB-INF/templates/footer.tpl         |  2 +-
 topdf.php                            |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 40b6a0476..1688abde3 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -30,6 +30,7 @@
 import('DateAndTime');
 import('Period');
 import('ttTimeHelper');
+import('ttConfigHelper');
 
 require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php');
 
@@ -735,6 +736,10 @@ static function prepareReportBody($options, $comment = null)
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
+    $config = new ttConfigHelper($user->getConfig());
+    $show_note_column = $bean->getAttribute('chnote') && !$config->getDefinedValue('report_note_on_separate_row');
+    $show_note_row = $bean->getAttribute('chnote') && $config->getDefinedValue('report_note_on_separate_row');
+
     $items = ttReportHelper::getItems($options);
     $grouping = ttReportHelper::grouping($options);
     if ($grouping)
@@ -868,6 +873,8 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
       if ($options['show_work_units'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
+      if ($show_note_column)
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
       if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       if ($options['show_approved'])
@@ -914,6 +921,7 @@ static function prepareReportBody($options, $comment = null)
               if ($options['show_end']) $body .= '<td></td>';
               if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
               if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
+              if ($show_note_column) $body .= '<td></td>';
               if ($options['show_cost']) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
                 $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
@@ -953,6 +961,8 @@ static function prepareReportBody($options, $comment = null)
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
           if ($options['show_work_units'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
+          if ($show_note_column)
+            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($options['show_cost'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
           if ($options['show_approved']) {
@@ -975,7 +985,7 @@ static function prepareReportBody($options, $comment = null)
           if ($options['show_timesheet'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
           $body .= '</tr>';
-          if ($options['show_note'] && $record['note']) {
+          if ($show_note_row && $record['note']) {
             $body .= '<tr style="'.$row_style.'">';
             $body .= '<td style="'.$cellRightAligned.'">'.$i18n->get('label.note').':</td>';
             $body .= '<td colspan="'.$colspan.'">'.$record['note'].'</td>';
@@ -1001,6 +1011,7 @@ static function prepareReportBody($options, $comment = null)
         if ($options['show_end']) $body .= '<td></td>';
         if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
         if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
+        if ($show_note_column) $body .= '<td></td>';
         if ($options['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
@@ -1027,6 +1038,7 @@ static function prepareReportBody($options, $comment = null)
       if ($options['show_end']) $body .= '<td></td>';
       if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
       if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
+      if ($show_note_column) $body .= '<td></td>';
       if ($options['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 62e02560c..af947bccf 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.65.4939 | 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.65.4940 | 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/topdf.php b/topdf.php
index e50a89f97..c9120fcf7 100644
--- a/topdf.php
+++ b/topdf.php
@@ -31,7 +31,7 @@
  * If installed, it is expected to be in WEB-INF/lib/tcpdf/ folder.
  */
 require_once('initialize.php');
-import('ttReportHelper');
+import('ttConfigHelper');
 import('form.Form');
 import('form.ActionForm');
 import('ttReportHelper');

From 148dd13e6cf7978bcb2103fe0bc75387b61b3b86 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 19:07:56 +0000
Subject: [PATCH 0896/1848] Forgot to check in one file.

---
 WEB-INF/lib/ttReportHelper.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1688abde3..088280ca0 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -737,8 +737,8 @@ static function prepareReportBody($options, $comment = null)
     $isClient = $user->isClient();
 
     $config = new ttConfigHelper($user->getConfig());
-    $show_note_column = $bean->getAttribute('chnote') && !$config->getDefinedValue('report_note_on_separate_row');
-    $show_note_row = $bean->getAttribute('chnote') && $config->getDefinedValue('report_note_on_separate_row');
+    $show_note_column = $options['show_note'] && !$config->getDefinedValue('report_note_on_separate_row');
+    $show_note_row = $options['show_note'] && $config->getDefinedValue('report_note_on_separate_row');
 
     $items = ttReportHelper::getItems($options);
     $grouping = ttReportHelper::grouping($options);

From 75a1eedb8977b8f2db459128bab9aaf367e3b58b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Apr 2019 20:49:46 +0000
Subject: [PATCH 0897/1848] Adjusted time.php to honor note on separate row
 option.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/time.tpl   | 48 ++++++++++++++++++++++++------------
 time.php                     | 48 +++++++++++++++++++++++++++++++++---
 3 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index af947bccf..0372c8dc5 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.65.4940 | 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.65.4941 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 049979cac..2b67e1cbc 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -24,7 +24,7 @@
           <td>{$forms.timeRecordForm.user.control}</td>
         </tr>
 {/if}
-{if $user->isPluginEnabled('cl')}
+{if $show_client}
         <tr>
           <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
           <td>{$forms.timeRecordForm.client.control}</td>
@@ -41,29 +41,31 @@
           <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>
         </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
         <tr>
           <td align="right">{$i18n.label.project} (*):</td>
           <td>{$forms.timeRecordForm.project.control}</td>
         </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
         <tr>
           <td align="right">{$i18n.label.task}{if $user->task_required} (*){/if}:</td>
           <td>{$forms.timeRecordForm.task.control}</td>
         </tr>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_start}
         <tr>
           <td align="right">{$i18n.label.start}:</td>
           <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
         </tr>
+{/if}
+{if $show_finish}
         <tr>
           <td align="right">{$i18n.label.finish}:</td>
           <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
         </tr>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_duration}
         <tr>
           <td align="right">{$i18n.label.duration}:</td>
           <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
@@ -101,50 +103,58 @@
 {if $time_records}
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
-  {if $user->isPluginEnabled('cl')}
-        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
+  {if $show_client}
+        <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
   {if $show_cf_1}
         <td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_task}
         <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
-  {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+  {if $show_start}
         <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
+  {/if}
+  {if $show_finish}
         <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
   {/if}
         <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
+  {if $show_note_column}
         <td class="tableHeader">{$i18n.label.note}</td>
-        <td></td>
-        <td></td>
+  {/if}
   {if $show_files}
         <td></td>
   {/if}
+        <td></td>
+        <td></td>
       </tr>
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {if $user->isPluginEnabled('cl')}
+    {if $show_client}
         <td valign="top">{$record.client|escape}</td>
     {/if}
     {if $show_cf_1}
         <td valign="top">{$record.cf_1|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}
         <td valign="top">{$record.project|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_task}
         <td valign="top">{$record.task|escape}</td>
     {/if}
-    {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+    {if $show_start}
         <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+    {/if}
+    {if $show_finish}
         <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+    {if $show_note_column}
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {/if}
     {if $show_files}
       {if $record.has_files}
         <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
@@ -173,6 +183,12 @@
     {/if}
         </td>
       </tr>
+    {if $show_note_row && $record.comment}
+      <tr>
+        <td align="right" valign="top">{$i18n.label.note}:</td>
+        <td colspan="{$colspan}" align="left" valign="top">{$record.comment|escape}</td>
+      </tr>
+    {/if}
   {/foreach}
     </table>
 {/if}
diff --git a/time.php b/time.php
index 615f2ef90..7450679b6 100644
--- a/time.php
+++ b/time.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
+import('ttConfigHelper');
 import('ttUserHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
@@ -66,6 +67,16 @@
 
 $group_id = $user->getGroup();
 
+$showClient = $user->isPluginEnabled('cl');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+$showFiles = $user->isPluginEnabled('at');
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -82,6 +93,26 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
+$config = new ttConfigHelper($user->getConfig());
+$showNoteColumn = !$config->getDefinedValue('time_note_on_separate_row');
+$showNoteRow = $config->getDefinedValue('time_note_on_separate_row');
+if ($showNoteRow) {
+  // Determine column span for note field.
+  $colspan = 0;
+  if ($showClient) $colspan++;
+  if ($user->isPluginEnabled('cf')) $colspan++;
+  if ($showProject) $colspan++;
+  if ($showTask) $colspan++;
+  if ($showStart) $colspan++;
+  if ($showFinish) $colspan++;
+  $colspan++; // There is always a duration.
+  if ($showFiles) $colspan++;
+  $colspan++; // There is always an edit column.
+  $colspan++; // There is always a delete column.
+  $colspan--; // Remove one column for label.
+  $smarty->assign('colspan', $colspan);
+}
+
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
@@ -149,7 +180,7 @@
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $user->getTrackingMode() && $showClient) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -175,7 +206,7 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
+  if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
@@ -270,7 +301,7 @@
   if ($request->getParameter('btn_submit')) {
 
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($showClient && $user->isPluginEnabled('cm') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
@@ -396,14 +427,23 @@
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
-$showFiles = $user->isPluginEnabled('at');
 $timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_client', $showClient);
 $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_duration', $showDuration);
+
+
+$smarty->assign('show_note_column', $showNoteColumn);
+$smarty->assign('show_note_row', $showNoteRow);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From 45ca7d2258832cb0d2465eb16dd646d925458106 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 15 Apr 2019 14:03:52 +0000
Subject: [PATCH 0898/1848] Created ttDebugTracer class to hopefully help to
 address blank screen issues.

---
 WEB-INF/config.php.dist              |  2 +-
 WEB-INF/lib/Auth.class.php           |  6 ++--
 WEB-INF/lib/auth/Auth_ldap.class.php | 24 ++++++-------
 WEB-INF/lib/ttDebugTracer.class.php  | 50 ++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl         |  2 +-
 time.php                             | 11 ++++--
 6 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 WEB-INF/lib/ttDebugTracer.class.php

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index b9b292b64..66527ec89 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -188,7 +188,7 @@ define('AUTH_MODULE', 'db');
                                         // array('Ldap Testers') means that the user must be a member Ldap Testers group.
                                         // array('Ldap Testers', 'Ldap Users') means the user must be a member of both Ldap Testers and Ldap Users groups.
 
-// define('AUTH_DEBUG', false); // Note: enabling AUTH_DEBUG breaks redirects as debug output is printed before setting redirect header. Do not enable on production systems.
+// define('DEBUG', false); // Note: enabling DEBUG breaks redirects as debug output is printed before setting redirect header. Do not enable on production systems.
 
 
 // Team managers can set monthly work hour quota for years between the following  values.
diff --git a/WEB-INF/lib/Auth.class.php b/WEB-INF/lib/Auth.class.php
index 96ea86926..ecb48340b 100644
--- a/WEB-INF/lib/Auth.class.php
+++ b/WEB-INF/lib/Auth.class.php
@@ -64,7 +64,7 @@ function isPasswordExternal()
   function doLogin($login, $password) {
     $auth = $this->authenticate($login, $password);
 
-    if (isTrue('AUTH_DEBUG')) {
+    if (isTrue('DEBUG')) {
       echo '<br>'; var_dump($auth); echo '<br />';
     }
 
@@ -77,13 +77,13 @@ function doLogin($login, $password) {
     $sql = "SELECT id FROM tt_users WHERE login = ".$mdb2->quote($login)." AND status = 1";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
-      if (isTrue('AUTH_DEBUG'))
+      if (isTrue('DEBUG'))
         echo 'db error!<br />';
       return false;
     }
     $val = $res->fetchRow();
     if (!$val['id']) {
-      if (isTrue('AUTH_DEBUG'))
+      if (isTrue('DEBUG'))
         echo 'login "'.$login.'" does not exist in Time Tracker database.<br />';
       return false;
     }
diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 52d4fabe3..5fb3dcf3d 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -96,7 +96,7 @@ function authenticate($login, $password)
 
     $lc = ldap_connect($this->params['server']);
 
-    if (isTrue('AUTH_DEBUG')) {
+    if (isTrue('DEBUG')) {
       echo '<br />';
       echo '$lc='; var_dump($lc); echo '<br />';
       echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
@@ -106,7 +106,7 @@ function authenticate($login, $password)
 
     ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, 3);
     ldap_set_option($lc, LDAP_OPT_REFERRALS, 0);
-    if (isTrue('AUTH_DEBUG')) {
+    if (isTrue('DEBUG')) {
       ldap_set_option($lc, LDAP_OPT_DEBUG_LEVEL, 7);
     }
 
@@ -119,13 +119,13 @@ function authenticate($login, $password)
         $login .= '@' . $this->params['default_domain'];
       }
 
-      if (isTrue('AUTH_DEBUG')) {
+      if (isTrue('DEBUG')) {
         echo '$login='; var_dump($login); echo '<br />';
       }
 
       $lb = @ldap_bind($lc, $login, $password);
 
-      if (isTrue('AUTH_DEBUG')) {
+      if (isTrue('DEBUG')) {
         echo '$lb='; var_dump($lb); echo '<br />';
         echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
       }
@@ -142,7 +142,7 @@ function authenticate($login, $password)
         $fields = array('memberof');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
-        if (isTrue('AUTH_DEBUG')) {
+        if (isTrue('DEBUG')) {
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -154,7 +154,7 @@ function authenticate($login, $password)
 
         $entries = @ldap_get_entries($lc, $sr);
 
-        if (isTrue('AUTH_DEBUG')) {
+        if (isTrue('DEBUG')) {
           echo '$entries='; var_dump($entries); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -173,7 +173,7 @@ function authenticate($login, $password)
           $groups[] = substr($grp_fields[0], 3);
         }
 
-        if (isTrue('AUTH_DEBUG')) {
+        if (isTrue('DEBUG')) {
           echo '$member_of'; var_dump($member_of); echo '<br />';
         };
 
@@ -195,7 +195,7 @@ function authenticate($login, $password)
       // Assuming OpenLDAP server.
       $login_oldap = 'uid='.$login.','.$this->params['base_dn'];
 
-      if (isTrue('AUTH_DEBUG')) {
+      if (isTrue('DEBUG')) {
         echo '$login_oldap='; var_dump($login_oldap); echo '<br />';
       }
 
@@ -207,7 +207,7 @@ function authenticate($login, $password)
 
       $lb = @ldap_bind($lc, $login_oldap, $password);
 
-      if (isTrue('AUTH_DEBUG')) {
+      if (isTrue('DEBUG')) {
         echo '$lb='; var_dump($lb); echo '<br />';
         echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
       }
@@ -225,7 +225,7 @@ function authenticate($login, $password)
         $fields = array('samaccountname', 'mail', 'memberof', 'department', 'displayname', 'telephonenumber', 'primarygroupid');
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
-        if (isTrue('AUTH_DEBUG')) {
+        if (isTrue('DEBUG')) {
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -238,7 +238,7 @@ function authenticate($login, $password)
 
         $entries = @ldap_get_entries($lc, $sr);
 
-        if (isTrue('AUTH_DEBUG')) {
+        if (isTrue('DEBUG')) {
           echo '$entries='; var_dump($entries); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -258,7 +258,7 @@ function authenticate($login, $password)
           $groups[] = substr($grp_fields[0], 3);
         }
 
-        if (isTrue('AUTH_DEBUG')) {
+        if (isTrue('DEBUG')) {
           echo '$member_of'; var_dump($member_of); echo '<br />';
         }
 
diff --git a/WEB-INF/lib/ttDebugTracer.class.php b/WEB-INF/lib/ttDebugTracer.class.php
new file mode 100644
index 000000000..46469a908
--- /dev/null
+++ b/WEB-INF/lib/ttDebugTracer.class.php
@@ -0,0 +1,50 @@
+<?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
+// +----------------------------------------------------------------------+
+
+import('ttConfigHelper');
+import('ttGroupHelper');
+
+// ttDebugTracer class is used to print debug messages when DEBUG constant is true.
+// It does nothing otherwise.
+class ttDebugTracer {
+  var $debug = false;    // Do work only if true.
+  var $file_name = null; // Source file name to print.
+
+  // Constructor.
+  function __construct($file_name = null) {
+    if (isTrue('DEBUG')) $this->debug = true;
+    $this->file_name = $file_name;
+  }
+
+  // prinln - prints a line.
+  public function println($msg) {
+    if ($this->debug) {
+      echo "$this->file_name: $msg<br />";
+    }
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0372c8dc5..a314a1813 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.65.4941 | 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.65.4942 | 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/time.php b/time.php
index 7450679b6..293c574a1 100644
--- a/time.php
+++ b/time.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
+import('ttDebugTracer');
 import('form.Form');
 import('ttConfigHelper');
 import('ttUserHelper');
@@ -35,6 +36,10 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
+// Initialize ttDebugTracer to print diagnostic messages.
+$debug = new ttDebugTracer(__FILE__);
+$debug->println('page entry after imports');
+
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
@@ -55,6 +60,7 @@
     exit();
   }
 }
+$debug->println('after all access checks');
 // End of access checks.
 
 // Determine user for whom we display this page.
@@ -66,6 +72,7 @@
 }
 
 $group_id = $user->getGroup();
+$debug->println("user_id: $user_id group_id: $group_id");
 
 $showClient = $user->isPluginEnabled('cl');
 $trackingMode = $user->getTrackingMode();
@@ -429,6 +436,8 @@
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
 
+$debug->println('smarty assignments');
+
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
@@ -440,8 +449,6 @@
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
-
-
 $smarty->assign('show_note_column', $showNoteColumn);
 $smarty->assign('show_note_row', $showNoteRow);
 $smarty->assign('show_files', $showFiles);

From e7d32433a6be7d06b742203ed36a4c93905a9813 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 15 Apr 2019 15:16:00 +0000
Subject: [PATCH 0899/1848] Cosmetic maintenance fix.

---
 WEB-INF/lib/ttOrgHelper.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 9bf1ad783..b79b1bb29 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -63,7 +63,7 @@ static function getName($org_id) {
     return false;
   }
 
-  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 25 for now).
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 50 for now).
   static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
@@ -72,7 +72,7 @@ static function getInactiveOrgs() {
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
       " (select max(accessed) as last_access, org_id from tt_users where org_id > 0 group by org_id order by last_access, org_id) as t".
-      " where last_access is null or last_access < $cutoff_timestamp limit 25"; // Max 25 orgs at a time for now...
+      " where last_access is null or last_access < $cutoff_timestamp limit 50"; // Max 50 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {

From 96e8b431e4b1dadd919b831e4ae184d29ebf1235 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 15 Apr 2019 15:52:27 +0000
Subject: [PATCH 0900/1848] Wrote ttGroupHelper::deleteGroupFiles() function.

---
 WEB-INF/lib/ttFileHelper.class.php  |  2 -
 WEB-INF/lib/ttGroupHelper.class.php | 83 +++++++++++++++++++++++++++++
 WEB-INF/lib/ttOrgHelper.class.php   |  2 +-
 WEB-INF/templates/footer.tpl        |  2 +-
 4 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index c69439d60..45b5b2371 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -275,8 +275,6 @@ function deleteFile($fields) {
   }
 
   // deleteEntityFiles - deletes all files associated with an entity.
-  // TODO: decide whether deleteGroupFiles and deleteOrgFiles should be
-  // separate functions.
   function deleteEntityFiles($entity_id, $entity_type) {
 
     global $i18n;
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 83f607a19..92d85a6e0 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -164,6 +164,9 @@ static function markGroupDeleted($group_id) {
 
     // Now do actual work with all entities.
 
+    // Delete group files.
+    ttGroupHelper::deleteGroupFiles($group_id);
+
     // Some things cannot be marked deleted as we don't have the status field for them.
     // Just delete such things (until we have a better way to deal with them).
     $tables_to_delete_from = array(
@@ -717,4 +720,84 @@ static function getRecentInvoices($client_id) {
     }
     return $result;
   }
+
+  // deleteGroupFiles deletes files attached to all entities in the entire group.
+  // Note that it is a permanent delete, not "mark deleted" by design.
+  static function deleteGroupFiles($group_id) {
+
+    global $user;
+    $org_id = $user->org_id;
+
+    // Delete all group files from the database.
+    $mdb2 = getConnection();
+    $sql = "delete from tt_files where org_id = $org_id and group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    if ($affected == 0) return true; // Do not call file storage utility.
+
+    // Try to make a call to file storage facility.
+    if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
+
+    $deletegroupfiles_uri = FILE_STORAGE_URI.'deletegroupfiles';
+
+    // Obtain site id.
+    $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $site_id = $val['site_id'];
+    if (!$site_id) return true; // Nothing to do.
+
+    // Obtain site key.
+    $sql = "select param_value as site_key from tt_site_config where param_name = 'locker_key'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $site_key = $val['site_key'];
+    if (!$site_key) return true; // Can't continue without site key.
+
+    // Obtain org key.
+    $sql = "select group_key as org_key from tt_groups where id = $org_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $org_key = $val['org_key'];
+    if (!$org_key) return true; // Can't continue without org key.
+
+    // Obtain group key.
+    $sql = "select group_key as group_key from tt_groups where id = $group_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $group_key = $val['group_key'];
+    if (!$group_key) return true; // Can't continue without group key.
+
+    $curl_fields = array('site_id' => $site_id,
+      'site_key' => $site_key,
+      'org_id' => $org_id,
+      'org_key' => $org_key,
+      'group_id' => $group_id,
+      'group_key' => $group_key);
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $deletegroupfiles_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    // Many things can go wrong with a remote call to file storage facility.
+    // By design, we ignore such errors.
+    return true;
+  }
 }
diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index b79b1bb29..1893379d3 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -161,7 +161,7 @@ static function deleteOrgFiles($org_id) {
     $res = $mdb2->query($sql);
     $val = $res->fetchRow();
     $org_key = $val['org_key'];
-    if (!$site_key) return true; // Can't continue without org key.
+    if (!$org_key) return true; // Can't continue without org key.
 
     $curl_fields = array('site_id' => $site_id,
       'site_key' => $site_key,
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a314a1813..5cc755070 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.65.4942 | 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.65.4943 | 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>

From bbea8c35f79ef9699e4b6deab0be3c1108628ef0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 15 Apr 2019 20:53:12 +0000
Subject: [PATCH 0901/1848] Introduced DEFAULT_PLUGINS config constant.

---
 WEB-INF/config.php.dist             |  4 ++
 WEB-INF/lib/ttAdmin.class.php       | 98 ++++++++++++++++++++++++++++-
 WEB-INF/lib/ttRegistrator.class.php |  5 +-
 WEB-INF/templates/footer.tpl        |  2 +-
 4 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 66527ec89..577baeafb 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -202,3 +202,7 @@ define('AUTH_MODULE', 'db');
 // This feature requires a subscription or a locally installed appliance.
 // define('FILE_STORAGE_URI', 'localhost');
 define('FILE_STORAGE_URI', 'https://www.anuko.com/files/');
+
+// A comma-separated list of default plugins for new group registrations.
+// Example below enables charts and attachments.
+// define('DEFAULT_PLUGINS', 'ch,at');
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index f5323322e..16ff3b599 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -65,6 +65,9 @@ static function markGroupDeleted($group_id) {
 
     // Now do actual work with all entities.
 
+    // Delete group files.
+    ttAdmin::deleteGroupFiles($group_id);
+
     // Some things cannot be marked deleted as we don't have the status field for them.
     // Just delete such things (until we have a better way to deal with them).
     $tables_to_delete_from = array(
@@ -186,7 +189,6 @@ static function getGroupName($group_id) {
 
   // getOrgDetails obtains group name and its top manager details.
   static function getOrgDetails($group_id) {
-    $result = array();
     $mdb2 = getConnection();
 
     // Note: current code works with properly set top manager (rank 512).
@@ -213,6 +215,20 @@ static function getOrgDetails($group_id) {
     return false;
   }
 
+ // getOrg obtains org_id for group.
+  static function getOrg($group_id) {
+    $mdb2 = getConnection();
+
+    $sql = "select org_id from tt_groups where id = $group_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return $val;
+    }
+
+    return false;
+  }
+
   // deleteGroupEntriesFromTable is a generic helper function for markGroupDeleted.
   // It deletes entries in ONE table belonging to a given group.
   static function deleteGroupEntriesFromTable($group_id, $table_name) {
@@ -315,4 +331,84 @@ static function createOrg($fields) {
 
     return true;
   }
+
+  // deleteGroupFiles deletes files attached to all entities in the entire group.
+  // Note that it is a permanent delete, not "mark deleted" by design.
+  static function deleteGroupFiles($group_id) {
+
+    $org = ttAdmin::getOrg($group_id);
+    $org_id = $org['org_id'];
+
+    // Delete all group files from the database.
+    $mdb2 = getConnection();
+    $sql = "delete from tt_files where org_id = $org_id and group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    if ($affected == 0) return true; // Do not call file storage utility.
+
+    // Try to make a call to file storage facility.
+    if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
+
+    $deletegroupfiles_uri = FILE_STORAGE_URI.'deletegroupfiles';
+
+    // Obtain site id.
+    $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $site_id = $val['site_id'];
+    if (!$site_id) return true; // Nothing to do.
+
+    // Obtain site key.
+    $sql = "select param_value as site_key from tt_site_config where param_name = 'locker_key'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $site_key = $val['site_key'];
+    if (!$site_key) return true; // Can't continue without site key.
+
+    // Obtain org key.
+    $sql = "select group_key as org_key from tt_groups where id = $org_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $org_key = $val['org_key'];
+    if (!$org_key) return true; // Can't continue without org key.
+
+    // Obtain group key.
+    $sql = "select group_key as group_key from tt_groups where id = $group_id";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $group_key = $val['group_key'];
+    if (!$group_key) return true; // Can't continue without group key.
+
+    $curl_fields = array('site_id' => $site_id,
+      'site_key' => $site_key,
+      'org_id' => $org_id,
+      'org_key' => $org_key,
+      'group_id' => $group_id,
+      'group_key' => $group_key);
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $deletegroupfiles_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    // Many things can go wrong with a remote call to file storage facility.
+    // By design, we ignore such errors.
+    return true;
+  }
 }
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index b122d015f..33d325971 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -149,11 +149,12 @@ function createGroup() {
     $name = $mdb2->quote($this->group_name);
     $currency = $mdb2->quote($this->currency);
     $lang = $mdb2->quote($this->lang);
+    $plugins = $mdb2->quote(defined('DEFAULT_PLUGINS') ? DEFAULT_PLUGINS : null);
     $created = 'now()';
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
 
-    $sql = "insert into tt_groups (group_key, name, currency, lang, created, created_ip)".
-      " values($group_key, $name, $currency, $lang, $created, $created_ip)";
+    $sql = "insert into tt_groups (group_key, name, currency, lang, plugins, created, created_ip)".
+      " values($group_key, $name, $currency, $lang, $plugins, $created, $created_ip)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5cc755070..03bf93301 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.65.4943 | 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.65.4944 | 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>

From ccf6c015e1f48d747ae697944c3d50e8fccf8080 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 15 Apr 2019 21:35:16 +0000
Subject: [PATCH 0902/1848] A bit of refactoring to simplify time.php.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/time.tpl   |  6 ++++++
 time.php                     | 20 +++++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 03bf93301..676597019 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.65.4944 | 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.65.4945 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 2b67e1cbc..dd583ee31 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -71,6 +71,12 @@
           <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
         </tr>
 {/if}
+{if $show_files && false}
+        <tr>
+          <td align="right">{$i18n.label.files}:</td>
+          <td>{$forms.timeRecordForm.newfile.control}</td>
+        </tr>
+{/if}
 {if $template_dropdown}
         <tr>
           <td align="right">{$i18n.label.template}:</td>
diff --git a/time.php b/time.php
index 293c574a1..10b38f886 100644
--- a/time.php
+++ b/time.php
@@ -115,8 +115,8 @@
   $colspan++; // There is always a duration.
   if ($showFiles) $colspan++;
   $colspan++; // There is always an edit column.
-  $colspan++; // There is always a delete column.
-  $colspan--; // Remove one column for label.
+  // $colspan++; // There is always a delete column.
+  // $colspan--; // Remove one column for label.
   $smarty->assign('colspan', $colspan);
 }
 
@@ -155,8 +155,6 @@
     if (isset($_SESSION['billable']))
       $cl_billable = $_SESSION['billable'];
 }
-//$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
-//$on_behalf_group_id = $request->getParameter('onBehalfGroup', (isset($_SESSION['behalf_group_id'])? $_SESSION['behalf_group_id'] : $user->group_id));
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -187,7 +185,7 @@
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->getTrackingMode() && $showClient) {
+if (MODE_TIME == $trackingMode && $showClient) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -200,7 +198,7 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+if ($showProject) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -241,7 +239,7 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -253,7 +251,7 @@
 }
 
 // Add other controls.
-if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+if ($showStart) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
   if ($user->punch_mode && !$user->canOverridePunchMode()) {
@@ -262,12 +260,16 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
+if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 if (!defined('NOTE_INPUT_HEIGHT'))
   define('NOTE_INPUT_HEIGHT', 40);
 $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+
+
+
+// TODO: refactoring ongoing down from here. Use $showBillable, perhaps?
 if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.

From ab53f7a7b9b0e0ca43b6950c3389cd3889e74d82 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 15 Apr 2019 23:37:28 +0000
Subject: [PATCH 0903/1848] Added label.file to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b0b66f122..c858ed087 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -275,6 +275,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8689ee122..b0057d582 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -285,6 +285,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6c9b4b903..d7049a918 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -263,6 +263,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index c7e2225b3..a8ac7fab5 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -251,6 +251,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 001b6387b..ff5405f27 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -241,6 +241,7 @@
 'label.template' => 'Template',
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
+'label.file' => 'File',
 'label.image' => 'Image',
 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b22caf234..758603098 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -278,6 +278,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 684d1799d..1a408cebd 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -267,6 +267,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f1beb392e..a002915fa 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -274,6 +274,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 6c2a539d8..9758fe7f1 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -267,6 +267,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ea8e8973d..6832973c2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -261,6 +261,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 745f054e5..b15c2813d 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -254,6 +254,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 670fe0a7c..7fe7b7086 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -284,6 +284,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 527b59a6c..f4ae20472 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -280,6 +280,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 55ef72b42..58c305005 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -258,6 +258,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a9325f5b6..9055afeca 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -285,6 +285,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index feb023fcf..31e674e31 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -285,6 +285,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index d368422fe..ac2312369 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -240,6 +240,8 @@
 'label.template' => 'Sjabloon',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
+// TODO: translate the following.
+// 'label.file' => 'File',
 'label.image' => 'Afbeelding',
 // TODO: translate the following.
 // 'label.download' => 'Download',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 21fa63160..e657ea755 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -282,6 +282,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9fe7ba99b..e1573f731 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -268,6 +268,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 81e46da12..30e3c5230 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -265,6 +265,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ee882f20c..0fbca55ed 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -270,6 +270,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a8d12d4fe..dc77d1d17 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -282,6 +282,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c0a65ed39..ee928deed 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -240,6 +240,7 @@
 'label.template' => 'Шаблон',
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
+'label.file' => 'Файл',
 'label.image' => 'Изображение',
 'label.download' => 'Скачать',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8fbf03a8c..8ef405928 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -273,6 +273,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9224b8894..bf56127d0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -265,6 +265,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d4b250d67..7981682ee 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -266,6 +266,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index fd0fdf490..c1ca4de3f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -262,6 +262,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2865e9aa2..a3b2fc9b6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -289,6 +289,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e9a8f487b..bbeab4192 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -273,6 +273,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 952b46a70..9f8bbd4a4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -280,6 +280,7 @@
 // 'label.template' => 'Template',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
+// 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 676597019..8a94de697 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.65.4945 | 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.65.4946 | 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>

From 1e3383a77ff48e718b9571d323acc3e90170784d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 16 Apr 2019 14:09:30 +0000
Subject: [PATCH 0904/1848] Improved explanation of PHP opening tag error.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8a94de697..7a92bb55b 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.65.4946 | 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.65.4947 | 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/dbinstall.php b/dbinstall.php
index 6e5b1b25f..20819aeeb 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -91,12 +91,15 @@ function ttGenerateKeys() {
     echo('WEB-INF/config.php file exists.<br>');
 
     // Config file must start with the PHP opening tag. We are checking this because
-    // a Unicode editor may insert a byte order mark (BOM) before it. This is not good as it will
-    // spit white space before output in some situations such as in PDF reports.
+    // a Unicode editor may insert a byte order mark (BOM) before it.
+    // This is not good as it is printed as unintentional white space in output.
+    // Consequences:
+    //   1) PHP redirects may stop working, depending on server settings.
+    //   2) PDF reports will become unusable (cannot open files).
     $file = fopen(APP_DIR.'/WEB-INF/config.php', 'r');
     $line = fgets($file);
     if (strcmp("<?php\n", $line) !== 0 && strcmp("<?php\r\n", $line) !== 0) {
-      echo('<font color="red">Error: WEB-INF/config.php file does not start with PHP opening tag.</font><br>');
+      echo('<font color="red">Error: WEB-INF/config.php file does not start with a PHP opening tag.</font>  See <a href="https://www.anuko.com/lp/tt_33.htm" target="_blank">explanation</a>.<br>');
     }
     fclose($file);
   } else {

From 48ba99d8257be57e5e43a03e80ab5d8c782b5295 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 16 Apr 2019 14:44:12 +0000
Subject: [PATCH 0905/1848] Removed debug tracing from time.php to keep it
 simple.

---
 WEB-INF/templates/footer.tpl | 2 +-
 time.php                     | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7a92bb55b..f584e2d5e 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.65.4947 | 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.65.4948 | 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/time.php b/time.php
index 10b38f886..a08e343f2 100644
--- a/time.php
+++ b/time.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttDebugTracer');
 import('form.Form');
 import('ttConfigHelper');
 import('ttUserHelper');
@@ -36,10 +35,6 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Initialize ttDebugTracer to print diagnostic messages.
-$debug = new ttDebugTracer(__FILE__);
-$debug->println('page entry after imports');
-
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
@@ -60,7 +55,6 @@
     exit();
   }
 }
-$debug->println('after all access checks');
 // End of access checks.
 
 // Determine user for whom we display this page.
@@ -72,7 +66,6 @@
 }
 
 $group_id = $user->getGroup();
-$debug->println("user_id: $user_id group_id: $group_id");
 
 $showClient = $user->isPluginEnabled('cl');
 $trackingMode = $user->getTrackingMode();
@@ -438,8 +431,6 @@
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
 
-$debug->println('smarty assignments');
-
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));

From 6e47f5d25d117dda1c66e82476165d9abce91fc5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 16 Apr 2019 16:59:17 +0000
Subject: [PATCH 0906/1848] Refactoring in UploadFile.class.php to simplify
 things.

---
 WEB-INF/lib/form/Form.class.php       | 12 ++++++------
 WEB-INF/lib/form/UploadFile.class.php | 26 ++++++++++----------------
 WEB-INF/templates/footer.tpl          |  2 +-
 project_files.php                     |  3 +--
 time_files.php                        |  3 +--
 5 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 19dd0111f..1f77414b1 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -95,6 +95,12 @@ function addInput($params) {
         $el = new Submit($params['name']);
         break;
 
+      case 'upload':
+        import('form.UploadFile');
+        $el = new UploadFile($params['name']);
+        if (isset($params['maxsize'])) $el->setMaxSize($params['maxsize']);
+        break;
+
 // TODO: refactoring ongoing down from here.
 			case "checkboxgroup":
 			    import('form.CheckboxGroup');
@@ -129,12 +135,6 @@ function addInput($params) {
 			    $el->setData(@$params["data"]);
 			    $el->setWidth(@$params["width"]);
 			    break;
-			    
-			case "upload":
-			    import('form.UploadFile');
-			    $el = new UploadFile($params["name"]);
-			    if (isset($params["maxsize"])) $el->setMaxSize($params["maxsize"]);
-			    break;
 		}
 		if ($el!=null) {
 			$el->setFormName($this->name);
diff --git a/WEB-INF/lib/form/UploadFile.class.php b/WEB-INF/lib/form/UploadFile.class.php
index e46f29d31..50e8aad56 100644
--- a/WEB-INF/lib/form/UploadFile.class.php
+++ b/WEB-INF/lib/form/UploadFile.class.php
@@ -29,7 +29,8 @@
 import('form.FormElement');
 	
 class UploadFile extends FormElement {
-    var $mMaxSize		= 100000;	// 100kb // TODO: refactor this.
+
+  var $maxSize = 8388608; // 8MB default max size.
 
   function __construct($name)
   {
@@ -37,21 +38,14 @@ function __construct($name)
     $this->name = $name;
   }
 
-// TODO: refactoring ongoing down from here.
-	function setMaxSize($value)	{ $this->mMaxSize = $value;	}
-	function getMaxSize()	{ return $this->mMaxSize; }
-	
-	function getHtml() {
+  function setMaxSize($value) { $this->maxSize = $value; }
 
-            if ($this->id=="") $this->id = $this->name;
-	    
-		$html = "\n\t<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"".$this->mMaxSize."\"/>";
-		$html .= "\n\t<input";
-		$html .= " name=\"$this->name\" id=\"$this->id\"";
-		
-		$html .= " type=\"file\"";
-		$html .= ">";
+  function getHtml() {
 
-                return $html;
-	}
+    if ($this->id == '') $this->id = $this->name;
+
+    $html = "\n\t<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"$this->maxSize\">";
+    $html .= "\n\t<input type=\"file\" id=\"$this->id\" name=\"$this->name\">";
+    return $html;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f584e2d5e..0cd9a3d18 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.65.4948 | 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.65.4949 | 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/project_files.php b/project_files.php
index 9ca15e39b..6ffe123f1 100644
--- a/project_files.php
+++ b/project_files.php
@@ -57,8 +57,7 @@
 
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit'),'maxsize'=>67108864)); // 64 MB file upload limit.
-// Note: for the above limit to work make sure to set upload_max_filesize and post_max_size in php.ini to at least 64M.
+$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
diff --git a/time_files.php b/time_files.php
index c499b25c9..33273da45 100644
--- a/time_files.php
+++ b/time_files.php
@@ -57,8 +57,7 @@
 
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit'),'maxsize'=>67108864)); // 64 MB file upload limit.
-// Note: for the above limit to work make sure to set upload_max_filesize and post_max_size in php.ini to at least 64M.
+$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 

From 5c582eb5bacc8b3d9d2775ade454590c71b113ec Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 16 Apr 2019 18:30:30 +0000
Subject: [PATCH 0907/1848] Added capability to add an attachment to time.php
 on first submit.

---
 WEB-INF/lib/ttFileHelper.class.php | 18 ++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/time.tpl         |  4 ++--
 time.php                           | 15 ++++++++++++++-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 45b5b2371..61dd60285 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -277,6 +277,9 @@ function deleteFile($fields) {
   // deleteEntityFiles - deletes all files associated with an entity.
   function deleteEntityFiles($entity_id, $entity_type) {
 
+    if (!$this->entityHasFiles($entity_id, $entity_type))
+      return true; // No files to delete.
+    
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -349,6 +352,21 @@ function deleteEntityFiles($entity_id, $entity_type) {
     return true;
   }
 
+  // entityHasFiles determines if an entity has any files referenced in database.
+  private function entityHasFiles($entity_id, $entity_type) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_files where org_id = $org_id and group_id = $group_id".
+      " and entity_type = ".$mdb2->quote($entity_type)." and entity_id = $entity_id limit 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['id'] > 0;
+  }
+
   // getOrgKey obtains organization key from the database.
   private function getOrgKey() {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0cd9a3d18..108c2b4f6 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.65.4949 | 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.65.4950 | 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/time.tpl b/WEB-INF/templates/time.tpl
index dd583ee31..e32140a92 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -71,9 +71,9 @@
           <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
         </tr>
 {/if}
-{if $show_files && false}
+{if $show_files}
         <tr>
-          <td align="right">{$i18n.label.files}:</td>
+          <td align="right">{$i18n.label.file}:</td>
           <td>{$forms.timeRecordForm.newfile.control}</td>
         </tr>
 {/if}
diff --git a/time.php b/time.php
index a08e343f2..7b6376c8e 100644
--- a/time.php
+++ b/time.php
@@ -33,6 +33,7 @@
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
+import('ttFileHelper');
 import('DateAndTime');
 
 // Access checks.
@@ -255,6 +256,8 @@
 }
 if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 if (!defined('NOTE_INPUT_HEIGHT'))
   define('NOTE_INPUT_HEIGHT', 40);
 $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
@@ -390,7 +393,17 @@
         elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
           $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
-      if ($id && $result) {
+
+      // Put a new file in storage if we have it.
+      if ($showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'time',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+
+      if ($id && $result && $err->no()) {
         header('Location: time.php');
         exit();
       }

From 920b5bff2bf2fb1caa10715ed8d40175e4798019 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 16 Apr 2019 20:32:29 +0000
Subject: [PATCH 0908/1848] Added a capability to add attachment on
 project_add.php.

---
 WEB-INF/lib/ttGroupHelper.class.php |  2 +-
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/project_add.tpl   |  6 ++++++
 project_add.php                     | 27 +++++++++++++++++++++------
 time.php                            |  2 +-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 92d85a6e0..8419a1a38 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -358,7 +358,7 @@ static function getActiveProjectsWithFiles()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
+    $sql = "select p.id, p.name, p.description, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
       " left join (select distinct entity_id from tt_files".
       " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
       " on (p.id = Sub1.entity_id)".
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 108c2b4f6..4338c51c1 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.65.4950 | 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.65.4951 | 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/project_add.tpl b/WEB-INF/templates/project_add.tpl
index d49b9a33e..309b13788 100644
--- a/WEB-INF/templates/project_add.tpl
+++ b/WEB-INF/templates/project_add.tpl
@@ -11,6 +11,12 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.projectForm.description.control}</td>
         </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.projectForm.newfile.control}</td>
+        </tr>
+{/if}
 {if $show_users}
         <tr><td>&nbsp;</td></tr>
         <tr>
diff --git a/project_add.php b/project_add.php
index 004168045..5768d5fb5 100644
--- a/project_add.php
+++ b/project_add.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttProjectHelper');
 import('ttGroupHelper');
+import('ttFileHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
@@ -42,6 +43,7 @@
 }
 // End of access checks.
 
+$showFiles = $user->isPluginEnabled('at');
 $users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
@@ -66,6 +68,8 @@
 $form = new Form('projectForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
 if ($show_tasks)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
@@ -80,15 +84,25 @@
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array('name' => $cl_name,
+      $id = ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
-        'status' => ACTIVE))) {
-          header('Location: projects.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
+        'status' => ACTIVE));
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'project',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+      if ($id) {
+        header('Location: projects.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
     } else
       $err->add($i18n->get('error.object_exists'));
   }
@@ -96,6 +110,7 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_project'));
diff --git a/time.php b/time.php
index 7b6376c8e..f6c84759f 100644
--- a/time.php
+++ b/time.php
@@ -395,7 +395,7 @@
       }
 
       // Put a new file in storage if we have it.
-      if ($showFiles && $_FILES['newfile']['name']) {
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
         $fileHelper = new ttFileHelper($err);
         $fields = array('entity_type'=>'time',
           'entity_id' => $id,

From b53f880dcd61797fd2e6609477add03ca757d813 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 14:01:04 +0000
Subject: [PATCH 0909/1848] Added capability to attach files to timesheets.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 34 ++++++++--
 WEB-INF/resources/ca.lang.php           |  1 +
 WEB-INF/resources/cs.lang.php           |  1 +
 WEB-INF/resources/da.lang.php           |  1 +
 WEB-INF/resources/de.lang.php           |  1 +
 WEB-INF/resources/en.lang.php           |  3 +-
 WEB-INF/resources/es.lang.php           |  1 +
 WEB-INF/resources/et.lang.php           |  1 +
 WEB-INF/resources/fa.lang.php           |  1 +
 WEB-INF/resources/fi.lang.php           |  1 +
 WEB-INF/resources/fr.lang.php           |  1 +
 WEB-INF/resources/gr.lang.php           |  1 +
 WEB-INF/resources/he.lang.php           |  1 +
 WEB-INF/resources/hu.lang.php           |  1 +
 WEB-INF/resources/it.lang.php           |  1 +
 WEB-INF/resources/ja.lang.php           |  1 +
 WEB-INF/resources/ko.lang.php           |  1 +
 WEB-INF/resources/nl.lang.php           |  2 +
 WEB-INF/resources/no.lang.php           |  1 +
 WEB-INF/resources/pl.lang.php           |  1 +
 WEB-INF/resources/pt-br.lang.php        |  1 +
 WEB-INF/resources/pt.lang.php           |  1 +
 WEB-INF/resources/ro.lang.php           |  1 +
 WEB-INF/resources/ru.lang.php           |  1 +
 WEB-INF/resources/sk.lang.php           |  1 +
 WEB-INF/resources/sl.lang.php           |  1 +
 WEB-INF/resources/sr.lang.php           |  1 +
 WEB-INF/resources/sv.lang.php           |  1 +
 WEB-INF/resources/tr.lang.php           |  1 +
 WEB-INF/resources/zh-cn.lang.php        |  1 +
 WEB-INF/resources/zh-tw.lang.php        |  1 +
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/timesheets.tpl        | 24 ++++++-
 projects.php                            |  2 +-
 timesheet_files.php                     | 89 +++++++++++++++++++++++++
 timesheets.php                          |  5 +-
 36 files changed, 178 insertions(+), 11 deletions(-)
 create mode 100644 timesheet_files.php

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index a00b4b7a8..0afefa804 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
+import('ttFileHelper');
 
 // Class ttTimesheetHelper is used to help with project related tasks.
 class ttTimesheetHelper {
@@ -114,10 +115,18 @@ static function getActiveTimesheets()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $includeFiles = $user->isPluginEnabled('at');
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'timesheet' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (ts.id = Sub1.entity_id)";
+    }
+
     $result = array();
     $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name,".
-      " ts.submit_status, ts.approve_status from tt_timesheets ts".
-      " left join tt_clients c on (c.id = ts.client_id)".
+      " ts.submit_status, ts.approve_status $filePart from tt_timesheets ts".
+      " left join tt_clients c on (c.id = ts.client_id) $fileJoin".
       " where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
       " order by ts.name";
     $res = $mdb2->query($sql);
@@ -140,10 +149,18 @@ static function getInactiveTimesheets()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $includeFiles = $user->isPluginEnabled('at');
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'timesheet' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (ts.id = Sub1.entity_id)";
+    }
+
     $result = array();
     $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name,".
-      " ts.submit_status, ts.approve_status from tt_timesheets ts".
-      " left join tt_clients c on (c.id = ts.client_id)".
+      " ts.submit_status, ts.approve_status $filePart from tt_timesheets ts".
+      " left join tt_clients c on (c.id = ts.client_id) $fileJoin".
       " where ts.status = 0 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
       " order by ts.name";
     $res = $mdb2->query($sql);
@@ -184,6 +201,15 @@ static function delete($timesheet_id) {
     global $user;
     $mdb2 = getConnection();
 
+    // Delete associated files.
+    if ($user->isPluginEnabled('at')) {
+      import('ttFileHelper');
+      global $err;
+      $fileHelper = new ttFileHelper($err);
+      if (!$fileHelper->deleteEntityFiles($timesheet_id, 'timesheet'))
+        return false;
+    }
+
     $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c858ed087..25b094a27 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -315,6 +315,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Factura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index b0057d582..eb2465b59 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -325,6 +325,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Faktura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d7049a918..98ef4d0a3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -298,6 +298,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Faktura',
 'title.send_invoice' => 'Sender Faktura',
 'title.charts' => 'Diagrammer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a8ac7fab5..a6269e649 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -282,6 +282,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Rechnung',
 'title.send_invoice' => 'Rechnung senden',
 'title.charts' => 'Diagramme',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ff5405f27..08aea1a35 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -271,7 +271,8 @@
 'title.report' => 'Report',
 'title.send_report' => 'Sending Report',
 'title.timesheets' => 'Timesheets',
-'title.timesheet' => 'Timesheet',  
+'title.timesheet' => 'Timesheet',
+'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Invoice',
 'title.send_invoice' => 'Sending Invoice',
 'title.charts' => 'Charts',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 758603098..46ed38b21 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -314,6 +314,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Factura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1a408cebd..1da5dcd10 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -304,6 +304,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Arve',
 'title.send_invoice' => 'Saada arve',
 'title.charts' => 'Diagrammid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a002915fa..5c53fd80e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -305,6 +305,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'فاکتور',
 'title.send_invoice' => 'ارسال فاکتور',
 'title.charts' => 'نمودارها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9758fe7f1..d6bcfdc6a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -298,6 +298,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Lasku',
 'title.send_invoice' => 'Laskun lähetys',
 'title.charts' => 'Kaaviot',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6832973c2..836c755cf 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -292,6 +292,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Facture',
 'title.send_invoice' => 'Envoi de la facture',
 'title.charts' => 'Graphiques',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index b15c2813d..ecd69abb0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -289,6 +289,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Τιμολόγιο',
 'title.send_invoice' => 'Αποστολή τιμολόγιου',
 'title.charts' => 'Γραφήματα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7fe7b7086..4acb1d9bd 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -315,6 +315,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'חשבונית',
 'title.send_invoice' => 'שליחת חשבונית',
 'title.charts' => 'תרשימים',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f4ae20472..14598f1ee 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -315,6 +315,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Számla',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 58c305005..d69206bf7 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -297,6 +297,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Fattura',
 'title.send_invoice' => 'Invia fattura',
 'title.charts' => 'Grafici',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9055afeca..231d2cddd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -321,6 +321,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => '送り状',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 31e674e31..5ae002145 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -321,6 +321,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => '송장',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ac2312369..c2806f40f 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -274,6 +274,8 @@
 'title.send_report' => 'Rapport aan het versturen',
 'title.timesheets' => 'Tijdenoverzichten',
 'title.timesheet' => 'Tijdenoverzicht',
+// TODO: Translate the following.
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Factuur',
 'title.send_invoice' => 'Factuur verzenden',
 'title.charts' => 'Grafieken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e657ea755..a9f7a3ed5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -318,6 +318,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Faktura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e1573f731..e1a654e83 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -299,6 +299,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Faktura',
 'title.send_invoice' => 'Wysyłanie faktury',
 'title.charts' => 'Statystyki',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 30e3c5230..6f754888a 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -296,6 +296,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Fatura',
 'title.send_invoice' => 'Enviando fatura',
 'title.charts' => 'Gráficos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 0fbca55ed..f52558753 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -304,6 +304,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 // 'title.invoice' => 'Invoice',
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index dc77d1d17..01d017b83 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -321,6 +321,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Factura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ee928deed..c418e40ae 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -271,6 +271,7 @@
 'title.send_report' => 'Отсылка отчёта',
 'title.timesheets' => 'Табели учёта',
 'title.timesheet' => 'Табель учёта',
+'title.timesheet_files' => 'Файлы табеля учёта',
 'title.invoice' => 'Счёт',
 'title.send_invoice' => 'Отсылка счёта',
 'title.charts' => 'Диаграммы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8ef405928..3caead322 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -304,6 +304,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Faktúra',
 'title.send_invoice' => 'Odosielanie faktúry',
 'title.charts' => 'Grafy',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index bf56127d0..15cf69456 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -299,6 +299,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 // 'title.invoice' => 'Invoice',
 // 'title.send_invoice' => 'Sending Invoice',
 // 'title.charts' => 'Charts',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7981682ee..293756c86 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -297,6 +297,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Račun',
 'title.send_invoice' => 'Slanje računa',
 'title.charts' => 'Grafikoni',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c1ca4de3f..53e3cbf19 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -297,6 +297,7 @@
 // TODO: Translate the following.
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Faktura',
 'title.send_invoice' => 'Skicka faktura',
 'title.charts' => 'Diagram',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a3b2fc9b6..f909c77ac 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -330,6 +330,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Fatura',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index bbeab4192..40f03773c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -309,6 +309,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => '发票',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 9f8bbd4a4..a507336c2 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -316,6 +316,7 @@
 // 'title.send_report' => 'Sending Report',
 // 'title.timesheets' => 'Timesheets',
 // 'title.timesheet' => 'Timesheet',
+// 'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => '發票',
 // TODO: translate the following.
 // 'title.send_invoice' => 'Sending Invoice',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4338c51c1..a1159b3c9 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.65.4951 | 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.65.4952 | 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/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index fd26588d7..a5e893e59 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -20,6 +20,9 @@
 {/if}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
+{if $show_files}
+          <td></td>
+{/if}
           <td></td>
           <td></td>
         </tr>
@@ -34,6 +37,13 @@
           <td></td>
   {else}
           <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+  {if $show_files}
+        {if $timesheet.has_files}
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        {else}
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        {/if}
   {/if}
           <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
@@ -56,13 +66,15 @@
   {/if}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
-          <td class="tableHeader">{$i18n.label.view}</td>
+  {if $show_files}
+          <td></td>
+  {/if}
           <td></td>
           <td></td>
         </tr>
   {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$timesheet.name|escape}</td>
+            <td><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
     {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
     {/if}
@@ -72,7 +84,13 @@
     {else}
           <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
     {/if}
-          <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
+    {if $show_files}
+      {if $timesheet.has_files}
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {else}
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+      {/if}
+    {/if}
           <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
diff --git a/projects.php b/projects.php
index 49a59a64d..6088af495 100644
--- a/projects.php
+++ b/projects.php
@@ -50,7 +50,7 @@
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
-$smarty->assign('show_files', $user->isPluginEnabled('at'));
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('title.projects'));
 $smarty->assign('content_page_name', 'projects.tpl');
 $smarty->display('index.tpl');
diff --git a/timesheet_files.php b/timesheet_files.php
new file mode 100644
index 000000000..d32b2c99f
--- /dev/null
+++ b/timesheet_files.php
@@ -0,0 +1,89 @@
+<?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('ttTimesheetHelper');
+import('ttFileHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ts')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_timesheet_id = (int)$request->getParameter('id');
+$timesheet = ttTimesheetHelper::getTimesheet($cl_timesheet_id);
+if (!$timesheet) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_description = trim($request->getParameter('description'));
+}
+
+$fileHelper = new ttFileHelper($err);
+$files = $fileHelper::getEntityFiles($cl_timesheet_id, 'timesheet');
+
+$form = new Form('fileUploadForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_timesheet_id));
+$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // We are adding a new file.
+
+  // Validate user input.
+  if (!$_FILES['newfile']['name']) $err->add($i18n->get('error.upload'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Finished validating user input.
+
+  if ($err->no()) {
+    $fields = array('entity_type'=>'timesheet',
+      'entity_id' => $cl_timesheet_id,
+      'file_name' => $_FILES['newfile']['name'],
+      'description'=>$cl_description);
+    if ($fileHelper->putFile($fields)) {
+      header('Location: timesheet_files.php?id='.$cl_timesheet_id);
+      exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('can_edit', true); // Relying on access checks above.
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('files', $files);
+$smarty->assign('title', $i18n->get('title.timesheet_files').': '.$timesheet['name']);
+$smarty->assign('content_page_name', 'entity_files.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheets.php b/timesheets.php
index b3b47772f..b7ce44b84 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -57,7 +57,7 @@
 }
 // End of access checks.
 
-// Determine user for which we display this page.
+// Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
   $user_id = $request->getParameter('user');
   $user->setOnBehalfUser($user_id);
@@ -67,6 +67,8 @@
 
 $group_id = $user->getGroup();
 
+$showFiles = $user->isPluginEnabled('at');
+
 // Elements of timesheetsForm.
 $form = new Form('timesheetsForm');
 
@@ -98,6 +100,7 @@
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);
 $smarty->assign('show_client', $showClient);
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');

From 237f5fae68a9410971ce1c4895a07fe2fa0fbd52 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 14:50:17 +0000
Subject: [PATCH 0910/1848] Merged some functions to help keeping things
 compact.

---
 WEB-INF/lib/ttGroupHelper.class.php     | 68 ++++++-------------------
 WEB-INF/lib/ttTimesheetHelper.class.php |  6 +--
 WEB-INF/lib/ttUser.class.php            | 11 +++-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/projects.tpl          |  2 +-
 projects.php                            |  6 +--
 6 files changed, 31 insertions(+), 64 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 8419a1a38..4bc71648a 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -327,7 +327,7 @@ static function getInactiveClients($all_fields = false)
   }
 
   // getActiveProjects - returns an array of active projects for a group.
-  static function getActiveProjects()
+  static function getActiveProjects($includeFiles = false)
   {
     global $user;
     $mdb2 = getConnection();
@@ -335,33 +335,14 @@ static function getActiveProjects()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, tasks from tt_projects".
-      " where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)";
     }
-    return $result;
-  }
-
-  // getActiveProjectsWithFiles - returns an array of active projects for a group
-  // with information whether they have attached files (has_files property).
-  // A separate fiunction from getActiveProjects because sql here is more complex.
-  static function getActiveProjectsWithFiles()
-  {
-    global $user;
-    $mdb2 = getConnection();
 
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select p.id, p.name, p.description, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
-      " left join (select distinct entity_id from tt_files".
-      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
-      " on (p.id = Sub1.entity_id)".
+    $sql = "select p.id, p.name, p.description, p.tasks $filePart from tt_projects p $fileJoin".
       " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
     $res = $mdb2->query($sql);
     $result = array();
@@ -374,7 +355,7 @@ static function getActiveProjectsWithFiles()
   }
 
   // getInactiveProjects - returns an array of inactive projects for a group.
-  static function getInactiveProjects()
+  static function getInactiveProjects($includeFiles = false)
   {
     global $user;
     $mdb2 = getConnection();
@@ -382,34 +363,15 @@ static function getInactiveProjects()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, tasks from tt_projects".
-      "  where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)";
     }
-    return $result;
-  }
 
-  // getInactiveProjectsWithFiles - returns an array of inactive projects for a group
-  // with information whether they have attached files (has_files property).
-  // A separate fiunction from getInactiveProjects because sql here is more complex.
-  static function getInactiveProjectsWithFiles()
-  {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
-      " left join (select distinct entity_id from tt_files".
-      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
-      " on (p.id = Sub1.entity_id)".
-      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 0 order by upper(p.name)";
+    $sql = "select p.id, p.name, p.description, p.tasks $filePart from tt_projects p $fileJoin".
+      "  where p.group_id = $group_id and p.org_id = $org_id and p.status = 0 order by upper(p.name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 0afefa804..17119edac 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -115,8 +115,7 @@ static function getActiveTimesheets()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $includeFiles = $user->isPluginEnabled('at');
-    if ($includeFiles) {
+    if ($user->isPluginEnabled('at')) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'timesheet' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
@@ -149,8 +148,7 @@ static function getInactiveTimesheets()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $includeFiles = $user->isPluginEnabled('at');
-    if ($includeFiles) {
+    if ($user->isPluginEnabled('at')) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'timesheet' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4a2320b40..33a32dc2a 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -264,7 +264,7 @@ function isPluginEnabled($plugin)
   }
 
   // getAssignedProjects - returns an array of assigned projects.
-  function getAssignedProjects()
+  function getAssignedProjects($includeFiles = false)
   {
     $result = array();
     $mdb2 = getConnection();
@@ -273,8 +273,15 @@ function getAssignedProjects()
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)";
+    }
+
     // Do a query with inner join to get assigned projects.
-    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p".
+    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate $filePart from tt_projects p $fileJoin".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
       " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a1159b3c9..a99f05ab5 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.65.4952 | 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.65.4953 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index e21a8f223..81ef96b89 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -97,7 +97,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
-      {if $show_files}
+      {if $show_files && $project.has_files}
           <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
       {/if}
         </tr>
diff --git a/projects.php b/projects.php
index 6088af495..1b137895e 100644
--- a/projects.php
+++ b/projects.php
@@ -43,10 +43,10 @@
 $showFiles = $user->isPluginEnabled('at');
 
 if($user->can('manage_projects')) {
-  $active_projects = $showFiles ? ttGroupHelper::getActiveProjectsWithFiles() : ttGroupHelper::getActiveProjects();
-  $inactive_projects = $showFiles ? ttGroupHelper::getInactiveProjectsWithFiles() : ttGroupHelper::getInactiveProjects();
+  $active_projects = ttGroupHelper::getActiveProjects($showFiles);
+  $inactive_projects = ttGroupHelper::getInactiveProjects($showFiles);
 } else
-  $active_projects = $user->getAssignedProjects();
+  $active_projects = $user->getAssignedProjects($showFiles);
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);

From 43eb48ca4e8f40bd43280a9e8df2f5e750f71804 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 16:09:01 +0000
Subject: [PATCH 0911/1848] Cosmetic comment improvement.

---
 dbinstall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbinstall.php b/dbinstall.php
index 20819aeeb..4e93ec36f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -95,7 +95,7 @@ function ttGenerateKeys() {
     // This is not good as it is printed as unintentional white space in output.
     // Consequences:
     //   1) PHP redirects may stop working, depending on server settings.
-    //   2) PDF reports will become unusable (cannot open files).
+    //   2) PDF reports and attachment downloads will become unusable (cannot open files).
     $file = fopen(APP_DIR.'/WEB-INF/config.php', 'r');
     $line = fgets($file);
     if (strcmp("<?php\n", $line) !== 0 && strcmp("<?php\r\n", $line) !== 0) {

From 56fd29cc5a2b6a67ed24b19d0d4213a6458a9723 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 17:15:30 +0000
Subject: [PATCH 0912/1848] Starting writing the Work plugin.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 25b094a27..d5f4fbb24 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -386,6 +386,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index eb2465b59..26fc89c08 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -396,6 +396,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 98ef4d0a3..f3a29fe4c 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -365,6 +365,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a6269e649..7153361ec 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -348,6 +348,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 08aea1a35..0d09af03b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -336,6 +336,7 @@
 'title.edit_file' => 'Editing File',
 'title.delete_file' => 'Deleting File',
 'title.download_file' => 'Downloading File',
+'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 46ed38b21..bfd0dcdc4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -385,6 +385,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1da5dcd10..20255da3e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -370,6 +370,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 5c53fd80e..8190779e5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -374,6 +374,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d6bcfdc6a..366990dbc 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -365,6 +365,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 836c755cf..dc5d350ec 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -359,6 +359,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ecd69abb0..fbdf6d386 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -355,6 +355,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 4acb1d9bd..e943ed6cc 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -384,6 +384,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 14598f1ee..bcf597d51 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -385,6 +385,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d69206bf7..d931d5f57 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -365,6 +365,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 231d2cddd..46eb8f132 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -392,6 +392,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 5ae002145..46d69536b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -393,6 +393,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c2806f40f..336304d60 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -339,6 +339,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a9f7a3ed5..debf1f927 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -389,6 +389,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e1a654e83..f676a7be2 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -368,6 +368,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 6f754888a..9bb3a47cc 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -363,6 +363,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f52558753..913e89165 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -373,6 +373,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 01d017b83..630d1711a 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -391,6 +391,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c418e40ae..c9c325cee 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -333,6 +333,7 @@
 'title.edit_file' => 'Редактирование файла',
 'title.delete_file' => 'Удаление файла',
 'title.download_file' => 'Скачивание файла',
+'title.work' => 'Работа',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3caead322..57d652ab2 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -373,6 +373,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 15cf69456..e6ee24477 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -366,6 +366,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 293756c86..c1dfd1db0 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -366,6 +366,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 53e3cbf19..8eb1baba9 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -366,6 +366,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index f909c77ac..67d2ad63f 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -400,6 +400,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 40f03773c..9cfe56471 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -380,6 +380,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a507336c2..a204a7339 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -386,6 +386,7 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
+// 'title.work' => 'Work',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a99f05ab5..10f788ba5 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.65.4953 | 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.65.4954 | 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>

From 4fb3e6fdb5dff1a08126d53fb4e8baec64074da7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 18:13:25 +0000
Subject: [PATCH 0913/1848] Added Work plugin option on the Plugins page.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 4 ++++
 plugins.php                   | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 10f788ba5..6e2e202d7 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.65.4954 | 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.65.4955 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index a88d3e8d6..97f7cdb95 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -162,6 +162,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
             <td><label for="attachments">{$i18n.label.attachments}</label> <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
+          <tr>
+            <td align="right" nowrap>{$forms.pluginsForm.work.control}</td>
+            <td><label for="work">{$i18n.title.work}</label> <span id="work_doc"><a href="https://www.anuko.com/lp/tt_34.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+          </tr>
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
diff --git a/plugins.php b/plugins.php
index 1c0a076bb..dc3b7a5d8 100644
--- a/plugins.php
+++ b/plugins.php
@@ -55,6 +55,7 @@
   $cl_timesheets = $request->getParameter('timesheets');
   $cl_templates = $request->getParameter('templates');
   $cl_attachments = $request->getParameter('attachments');
+  $cl_work = $request->getParameter('work');
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
@@ -76,6 +77,7 @@
   $cl_timesheets = in_array('ts', $plugins);
   $cl_templates = in_array('tp', $plugins);
   $cl_attachments = in_array('at', $plugins);
+  $cl_work = in_array('wk', $plugins);
 }
 
 $form = new Form('pluginsForm');
@@ -98,6 +100,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
 $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'attachments','value'=>$cl_attachments,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'work','value'=>$cl_work,'onchange'=>'handlePluginCheckboxes()'));
 
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
@@ -141,6 +144,8 @@
     $plugins .= ',tp';
   if ($cl_attachments)
     $plugins .= ',at';
+  if ($cl_work)
+    $plugins .= ',wk';
 
   // Recycle week view plugin options as they are not configured on this page.
   $existing_plugins = explode(',', $user->getPlugins());

From 0713fdfd6a8ab87277836b0586bb2ba9ab4b04ec Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 19:55:27 +0000
Subject: [PATCH 0914/1848] Conditionally showing Work plugin depending on
 WORK_DEBUG constant.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6e2e202d7..131e8c6ba 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.65.4955 | 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.65.4956 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 97f7cdb95..56868a6b7 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -162,10 +162,12 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
             <td><label for="attachments">{$i18n.label.attachments}</label> <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
+{if isTrue('WORK_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.work.control}</td>
             <td><label for="work">{$i18n.title.work}</label> <span id="work_doc"><a href="https://www.anuko.com/lp/tt_34.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
+{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>

From 817c14c6c2098d85ef912fb95898c857bf533b4f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 20:19:08 +0000
Subject: [PATCH 0915/1848] Adjusted header.tpl for Work plugin.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 131e8c6ba..2f05c21de 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.65.4956 | 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.65.4957 | 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/header.tpl b/WEB-INF/templates/header.tpl
index d25f12812..c830e9845 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -138,6 +138,9 @@
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
+    {if $user->exists() && $user->isPluginEnabled('wk') && ($user->can('do_work') || $user->can('bid_on_work') || $user->can('manage_work'))}
+            &middot; <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
+    {/if}
     {if $user->can('export_data')}
             &middot; <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
     {/if}

From 8b395c5fba556db8d595b67fa15c62596fd2f3b4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 Apr 2019 20:21:10 +0000
Subject: [PATCH 0916/1848] Cosmetic.

---
 WEB-INF/templates/header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index c830e9845..0fa5d70e9 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -138,7 +138,7 @@
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
-    {if $user->exists() && $user->isPluginEnabled('wk') && ($user->can('do_work') || $user->can('bid_on_work') || $user->can('manage_work'))}
+    {if $user->isPluginEnabled('wk') && ($user->can('do_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
             &middot; <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
     {/if}
     {if $user->can('export_data')}

From c75f863a12ab28d8f828c0cc367b581b396ee951 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 18 Apr 2019 13:19:21 +0000
Subject: [PATCH 0917/1848] Introduced rights for remote work plugin.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl       |  2 +-
 dbinstall.php                      | 12 +++++++-----
 mysql.sql                          |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 85cdbc7bd..fcffd9caa 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -191,8 +191,8 @@ static function createPredefinedRoles($group_id, $lang)
 
     $rights_client = 'view_client_reports,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,update_work';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_work,bid_on_work';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_own_timesheets,manage_subgroups';
 
     // Active roles.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2f05c21de..13e7cdfd3 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.65.4957 | 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.0.4958 | 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/dbinstall.php b/dbinstall.php
index 4e93ec36f..53d041101 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -994,7 +994,7 @@ function ttGenerateKeys() {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11861"]) {
+  if ($_POST["convert11797to11900"]) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1155,8 +1155,10 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'");
     ttExecute("ALTER TABLE `tt_groups` ADD `group_key` varchar(32) AFTER `org_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.61', modified = now() where param_name = 'version_db' and param_value = '1.18.60'");
-
     ttGenerateKeys();
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'swap_roles', 'swap_roles,update_work') where rank >= 12");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'view_all_reports', 'view_all_reports,manage_work,bid_on_work') where rank >= 68");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1206,7 +1208,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.61)</b>
+    <td width="80%"><b>Create database structure (v1.19.0)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1251,8 +1253,8 @@ function ttGenerateKeys() {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.61)</td>
-    <td><input type="submit" name="convert11797to11861" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.19)</td>
+    <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index e526e614e..0cd732629 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -76,7 +76,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,update_work,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_work,bid_on_work,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -573,4 +573,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.61', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.0', now()); # TODO: change when structure changes.

From 764eef2d0dd9c6561f88579dbb4e6323d1702d14 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Apr 2019 12:53:59 +0000
Subject: [PATCH 0918/1848] Work in progress on remote work plugin.

---
 WEB-INF/resources/en.lang.php |   2 +
 WEB-INF/templates/footer.tpl  |   2 +-
 WEB-INF/templates/header.tpl  |   2 +-
 WEB-INF/templates/work.tpl    | 107 ++++++++++++++++++++++++++++++++++
 work.php                      |  62 ++++++++++++++++++++
 5 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/work.tpl
 create mode 100644 work.php

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0d09af03b..780de306f 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -337,6 +337,8 @@
 'title.delete_file' => 'Deleting File',
 'title.download_file' => 'Downloading File',
 'title.work' => 'Work',
+'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 13e7cdfd3..99115a676 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.19.0.4958 | 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.0.4959 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 0fa5d70e9..9c46a7a87 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -138,7 +138,7 @@
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
             &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
-    {if $user->isPluginEnabled('wk') && ($user->can('do_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
+    {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
             &middot; <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
     {/if}
     {if $user->can('export_data')}
diff --git a/WEB-INF/templates/work.tpl b/WEB-INF/templates/work.tpl
new file mode 100644
index 000000000..359c385cb
--- /dev/null
+++ b/WEB-INF/templates/work.tpl
@@ -0,0 +1,107 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+{if $user->can('manage_work')}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+  {if $show_files}
+          <td></td>
+  {/if}
+          <td></td>
+          <td></td>
+        </tr>
+  {if $active_work}
+    {foreach $active_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.name|escape}</td>
+      {if $show_files}
+        {if $project.has_files}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        {else}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        {/if}
+      {/if}
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
+  {if $inactive_projects}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.inactive_projects}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+    {if $show_files}
+          <td></td>
+    {/if}
+          <td></td>
+          <td></td>
+        </tr>
+    {foreach $inactive_projects as $project}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>
+      {if $show_files}
+        {if $project.has_files}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        {else}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        {/if}
+      {/if}
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+        </tr>
+    {/foreach}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+  {/if}
+{else}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.description}</td>
+    {if $show_files}
+          <td></td>
+    {/if}
+        </tr>
+  {if $active_projects}
+    {foreach $active_projects as $project}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>
+      {if $show_files && $project.has_files}
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {/if}
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+{/if}
+    </td>
+  </tr>
+</table>
diff --git a/work.php b/work.php
new file mode 100644
index 000000000..60a8f7c8b
--- /dev/null
+++ b/work.php
@@ -0,0 +1,62 @@
+<?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('ttGroupHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('update_work') || ttAccessAllowed('bid_on_work')  || ttAccessAllowed('manage_work'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if($user->can('manage_work')) {
+  // $active_work = ttWorkHelper::getActiveWork(); // Active work items this group is outsourcing.
+  // $inactive_work = ttWorkHelper::getInactiveWork(); // Inactive work items this group was outsourcing.
+}
+if($user->can('bid_on_work')) {
+  // $available_work = ttWorkHelper::getAvailableWork(); // Currently available work items from other groups.
+}
+if($user->can('update_work')) {
+  // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
+  // $completed_work = ttWorkHelper::getCompletedWork(); // Completed work items for other groups.
+}
+
+$smarty->assign('active_work', $active_work);
+$smarty->assign('inactive_work', $inactive_work);
+$smarty->assign('available_work', $available_work);
+$smarty->assign('in_progress_work', $in_progress_work);
+$smarty->assign('completed_work', $completed_work);
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work.tpl');
+$smarty->display('index.tpl');

From 223ec69341da525ce2fce640ad5e62b00ec27360 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Apr 2019 15:36:25 +0000
Subject: [PATCH 0919/1848] Separated users section on reports in 2 for active
 and inactive users.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 16 +++++--
 WEB-INF/lib/ttGroupHelper.class.php     | 11 +++--
 WEB-INF/lib/ttReportHelper.class.php    | 25 +++++++++--
 WEB-INF/lib/ttUser.class.php            |  2 +-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/reports.tpl           | 14 ++++--
 reports.php                             | 60 ++++++++++++++++++-------
 7 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 8b9f4052e..a3e130c30 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -72,6 +72,7 @@ static function get($id) {
     }
     return false;
   }
+
   // getReport - returns a report identified by its id.
   // TODO: get rid of this function by encapsulating all cron related tasks in its own class.
   // Because cron works for all orgs and we want this class to always work in context of
@@ -225,10 +226,16 @@ static function saveReport($bean) {
 
     if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
 
-    $users_in_bean = $bean->getAttribute('users');
-    if ($users_in_bean && is_array($users_in_bean)) {
-      $users = join(',', $users_in_bean);
+    $active_users_in_bean = $bean->getAttribute('users_active');
+    if ($active_users_in_bean && is_array($active_users_in_bean)) {
+      $users = join(',', $active_users_in_bean);
+    }
+    $inactive_users_in_bean = $bean->getAttribute('users_inactive');
+    if ($inactive_users_in_bean && is_array($inactive_users_in_bean)) {
+      if ($users) $users .= ',';
+      $users .= join(',', $inactive_users_in_bean);
     }
+
     if ($bean->getAttribute('start_date')) {
       $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
       $from = $dt->toString(DB_DATEFORMAT);
@@ -322,7 +329,8 @@ static function loadReport(&$bean) {
       $bean->setAttribute('invoice', $val['invoice']);
       $bean->setAttribute('paid_status', $val['paid_status']);
       $bean->setAttribute('timesheet', $val['timesheet']);
-      $bean->setAttribute('users', explode(',', $val['users']));
+      $bean->setAttribute('users_active', explode(',', $val['users']));
+      $bean->setAttribute('users_inactive', explode(',', $val['users']));
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
         $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 4bc71648a..167c620cb 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -637,19 +637,22 @@ static function getUsers() {
   }
 
   // The getUsersForClient obtains all active and inactive users in a group that are relevant to a client.
-  static function getUsersForClient() {
+  static function getUsersForClient($options) {
     global $user;
     $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    if (isset($options['status']))
+      $where_part = 'where u.status = '.(int)$options['status'];
+    else
+      $where_part = 'where u.status is not null';
+
     $sql = "select u.id, u.name from tt_user_project_binds upb".
       " inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)".
       " inner join tt_users u on (u.id = upb.user_id and u.group_id = $group_id and u.org_id = $org_id)".
-      " where (u.status = 1 or u.status = 0)".
-      " group by u.id".
-      " order by upper(u.name)";
+      " $where_part group by u.id order by upper(u.name)";
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 088280ca0..9c6dfb0fe 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1155,7 +1155,18 @@ static function getReportOptions($bean) {
     if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
       $options['approved'] = 1; // Restrict clients to approved records only.
     $options['timesheet'] = $bean->getAttribute('timesheet');
-    if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
+
+    $active_users_in_bean = $bean->getAttribute('users_active');
+    if ($active_users_in_bean && is_array($active_users_in_bean)) {
+      $users = join(',', $active_users_in_bean);
+    }
+    $inactive_users_in_bean = $bean->getAttribute('users_inactive');
+    if ($inactive_users_in_bean && is_array($inactive_users_in_bean)) {
+      if ($users) $users .= ',';
+      $users .= join(',', $inactive_users_in_bean);
+    }
+    if ($users) $options['users'] = $users;
+
     $options['period'] = $bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
@@ -1187,13 +1198,19 @@ static function verifyBean($bean) {
     global $user;
 
     // Check users.
-    $users_in_bean = $bean->getAttribute('users');
-    if (is_array($users_in_bean)) {
+    $active_users_in_bean = $bean->getAttribute('users_active');
+    $inactive_users_in_bean = $bean->getAttribute('users_inactive');
+    if (is_array($active_users_in_bean) || is_array($inactive_users_in_bean)) {
       $users_in_group = ttGroupHelper::getUsers();
       foreach ($users_in_group as $user_in_group) {
         $valid_ids[] = $user_in_group['id'];
       }
-      foreach ($users_in_bean as $user_in_bean) {
+      foreach ($active_users_in_bean as $user_in_bean) {
+        if (!in_array($user_in_bean, $valid_ids)) {
+          return false;
+        }
+      }
+      foreach ($inactive_users_in_bean as $user_in_bean) {
         if (!in_array($user_in_bean, $valid_ids)) {
           return false;
         }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 33a32dc2a..2d45101cc 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -424,7 +424,7 @@ function getUsers($options) {
 
     $left_joins = null;
     if (isset($options['max_rank']) || $skipClients || isset($options['include_role']))
-        $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
+      $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
 
     $where_part = " where u.org_id = $org_id and u.group_id = $group_id";
     if (isset($options['status']))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 99115a676..eea5a85db 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.19.0.4959 | 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.1.4960 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 3f1dea048..c79425e64 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -300,12 +300,20 @@ function handleCheckboxes() {
             </table>
           </td>
         </tr>
-{if $show_users}
+{if $show_active_users}
         <tr>
-          <td colspan="3"><b>{$i18n.label.users}</b></td>
+          <td colspan="3"><b>{$i18n.form.users.active_users}</b></td>
         </tr>
         <tr>
-          <td colspan="3">{$forms.reportForm.users.control}</td>
+          <td colspan="3">{$forms.reportForm.users_active.control}</td>
+        </tr>
+{/if}
+{if $show_inactive_users}
+        <tr>
+          <td colspan="3"><b>{$i18n.form.users.inactive_users}</b></td>
+        </tr>
+        <tr>
+          <td colspan="3">{$forms.reportForm.users_inactive.control}</td>
         </tr>
 {/if}
         <tr>
diff --git a/reports.php b/reports.php
index c191de9aa..fe545b211 100644
--- a/reports.php
+++ b/reports.php
@@ -216,17 +216,25 @@
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $rank = $user->getMaxRankForGroup($user->getGroup());
     if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
-    if ($user->can('view_own_reports'))
-      $options = array('max_rank'=>$max_rank,'include_self'=>true);
-    else
-      $options = array('max_rank'=>$max_rank);
-    $users = $user->getUsers($options); // Active and inactive users.
+    if ($user->can('view_own_reports')) {
+      $options_active = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>ACTIVE);
+      $options_inactive = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>INACTIVE);
+    } else {
+      $options_active = array('max_rank'=>$max_rank,'status'=>ACTIVE);
+      $options_inactive = array('max_rank'=>$max_rank,'status'=>INACTIVE);
+    }
+    $active_users = $user->getUsers($options_active);
+    $inactive_users = $user->getUsers($options_inactive);
+  }
+  elseif ($user->isClient()) {
+    $options_active = array('status'=>ACTIVE);
+    $options_inactive = array('status'=>INACTIVE);
+    $active_users = ttGroupHelper::getUsersForClient($options_active);
+    $inactive_users = ttGroupHelper::getUsersForClient($options_inactive);
   }
-  elseif ($user->isClient())
-    $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
 
-  foreach ($users as $single_user) {
-    $user_list[$single_user['id']] = $single_user['name'];
+  foreach ($active_users as $single_user) {
+    $user_list_active[$single_user['id']] = $single_user['name'];
     $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
     if ($projects) {
       foreach ($projects as $single_project) {
@@ -234,10 +242,27 @@
       }
     }
   }
-  $row_count = ceil(count($user_list)/3);
+  $row_count = ceil(count($user_list_active)/3);
   $form->addInput(array('type'=>'checkboxgroup',
-    'name'=>'users',
-    'data'=>$user_list,
+    'name'=>'users_active',
+    'data'=>$user_list_active,
+    'layout'=>'V',
+    'groupin'=>$row_count,
+    'style'=>'width: 100%;'));
+
+    foreach ($inactive_users as $single_user) {
+    $user_list_inactive[$single_user['id']] = $single_user['name'];
+    $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
+    if ($projects) {
+      foreach ($projects as $single_project) {
+        $assigned_projects[$single_user['id']][] = $single_project['id'];
+      }
+    }
+  }
+  $row_count = ceil(count($user_list_inactive)/3);
+  $form->addInput(array('type'=>'checkboxgroup',
+    'name'=>'users_inactive',
+    'data'=>$user_list_inactive,
     'layout'=>'V',
     'groupin'=>$row_count,
     'style'=>'width: 100%;'));
@@ -332,7 +357,7 @@
 
 if ($request->isGet() && !$bean->isSaved()) {
   // No previous form data were found in session. Use the following default values.
-  $form->setValueByElement('users', array_keys($user_list));
+  $form->setValueByElement('users_active', array_keys($user_list_active));
   $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
   $form->setValueByElement('start_date', $period->getStartDate());
   $form->setValueByElement('end_date', $period->getEndDate());
@@ -374,8 +399,10 @@
       ttFavReportHelper::loadReport($bean);
 
       // If user selected no favorite report - mark all user checkboxes (most probable scenario).
-      if ($bean->getAttribute('favorite_report') == -1)
-        $form->setValueByElement('users', array_keys($user_list));
+      if ($bean->getAttribute('favorite_report') == -1) {
+        $form->setValueByElement('users_active', array_keys($user_list_active));
+        $form->setValueByElement('users_inactive', false);
+      }
 
       // Save form data in session for future use.
       $bean->saveBean();
@@ -457,7 +484,8 @@
 $smarty->assign('show_paid_status', $showPaidStatus);
 $smarty->assign('show_timesheet_dropdown', $showTimesheetDropdown);
 $smarty->assign('show_timesheet_checkbox', $showTimesheetCheckbox);
-$smarty->assign('show_users', $showUsers);
+$smarty->assign('show_active_users', $showUsers && $active_users);
+$smarty->assign('show_inactive_users', $showUsers && $inactive_users);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_work_units', $showWorkUnits);

From 4ebe6fd29283633e5ae7cdb399cc144c38af25fb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Apr 2019 16:50:01 +0000
Subject: [PATCH 0920/1848] Some rearrangements in translation files.

---
 WEB-INF/resources/ca.lang.php      | 4 ++--
 WEB-INF/resources/cs.lang.php      | 4 ++--
 WEB-INF/resources/da.lang.php      | 4 ++--
 WEB-INF/resources/de.lang.php      | 4 ++--
 WEB-INF/resources/en.lang.php      | 4 ++--
 WEB-INF/resources/es.lang.php      | 4 ++--
 WEB-INF/resources/et.lang.php      | 4 ++--
 WEB-INF/resources/fa.lang.php      | 4 ++--
 WEB-INF/resources/fi.lang.php      | 8 ++++----
 WEB-INF/resources/fr.lang.php      | 4 ++--
 WEB-INF/resources/gr.lang.php      | 4 ++--
 WEB-INF/resources/he.lang.php      | 4 ++--
 WEB-INF/resources/hu.lang.php      | 4 ++--
 WEB-INF/resources/it.lang.php      | 4 ++--
 WEB-INF/resources/ja.lang.php      | 4 ++--
 WEB-INF/resources/ko.lang.php      | 4 ++--
 WEB-INF/resources/nl.lang.php      | 4 ++--
 WEB-INF/resources/no.lang.php      | 4 ++--
 WEB-INF/resources/pl.lang.php      | 4 ++--
 WEB-INF/resources/pt-br.lang.php   | 4 ++--
 WEB-INF/resources/pt.lang.php      | 4 ++--
 WEB-INF/resources/ro.lang.php      | 4 ++--
 WEB-INF/resources/ru.lang.php      | 4 ++--
 WEB-INF/resources/sk.lang.php      | 4 ++--
 WEB-INF/resources/sl.lang.php      | 4 ++--
 WEB-INF/resources/sr.lang.php      | 4 ++--
 WEB-INF/resources/sv.lang.php      | 4 ++--
 WEB-INF/resources/tr.lang.php      | 4 ++--
 WEB-INF/resources/zh-cn.lang.php   | 4 ++--
 WEB-INF/resources/zh-tw.lang.php   | 4 ++--
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/mobile/users.tpl | 4 ++--
 WEB-INF/templates/reports.tpl      | 4 ++--
 WEB-INF/templates/users.tpl        | 4 ++--
 34 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index d5f4fbb24..ff7a3a35d 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -278,6 +278,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -525,8 +527,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manejador',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 26fc89c08..0143505b2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -288,6 +288,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -534,8 +536,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Role',
 'form.users.manager' => 'Manažer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f3a29fe4c..2d41a45e8 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -266,6 +266,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktive Brugere',
+'label.inactive_users' => 'Inaktive Brugere',
 
 // Form titles.
 'title.error' => 'Fejl',
@@ -498,8 +500,6 @@
 'form.tasks.inactive_tasks' => 'Inaktive Opgaver',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktive Brugere',
-'form.users.inactive_users' => 'Inaktive Brugere',
 'form.users.uncompleted_entry' => 'Bruger har en uafsluttet tidsregistrering',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 7153361ec..c050cfc9c 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -254,6 +254,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktive Nutzer',
+'label.inactive_users' => 'Inaktive Nutzer',
 
 // Form titles.
 'title.error' => 'Fehler',
@@ -478,8 +480,6 @@
 'form.tasks.inactive_tasks' => 'Inaktive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktive Nutzer',
-'form.users.inactive_users' => 'Inaktive Nutzer',
 'form.users.uncompleted_entry' => 'Nutzer hat einen unvollständigen Zeiteintrag',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 780de306f..dd18c560a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -244,6 +244,8 @@
 'label.file' => 'File',
 'label.image' => 'Image',
 'label.download' => 'Download',
+'label.active_users' => 'Active Users',
+'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 'title.error' => 'Error',
@@ -468,8 +470,6 @@
 'form.tasks.inactive_tasks' => 'Inactive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Active Users',
-'form.users.inactive_users' => 'Inactive Users',
 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Role',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bfd0dcdc4..9e9b4af9b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -281,6 +281,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -537,8 +539,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manejador',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 20255da3e..01b8702bf 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -270,6 +270,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktiivsed kasutajad',
+'label.inactive_users' => 'Mitteaktiivsed kasutajad',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -504,8 +506,6 @@
 'form.tasks.inactive_tasks' => 'Mitteaktiivsed tööülesanded',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktiivsed kasutajad',
-'form.users.inactive_users' => 'Mitteaktiivsed kasutajad',
 'form.users.uncompleted_entry' => 'Kasutajal on lõpetamata aja kanne',
 'form.users.role' => 'Roll',
 'form.users.manager' => 'Haldur',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8190779e5..7ec9e70de 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -277,6 +277,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'کاربران فعال',
+'label.inactive_users' => 'کاربران غیرفعال',
 
 // Form titles.
 'title.error' => 'خطا',
@@ -519,8 +521,6 @@
 'form.tasks.inactive_tasks' => 'وظایف غیرفعال',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'کاربران فعال',
-'form.users.inactive_users' => 'کاربران غیرفعال',
  // TODO: translate the following.
  // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'سمت',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 366990dbc..8f04168dc 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -270,6 +270,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktiiviset käyttäjät',
+'label.inactive_users' => 'Ei-aktiiviset käyttäjät',
 
 // Form titles.
 'title.error' => 'Virhe',
@@ -503,10 +505,8 @@
 'form.tasks.inactive_tasks' => 'Ei-aktiiviset tehtävät',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktiiviset käyttäjät',
-'form.users.inactive_users' => 'Ei-aktiiviset käyttäjät',
- // TODO: translate the following.
- // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
+// TODO: translate the following.
+// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rooli',
 'form.users.manager' => 'Esimies',
 'form.users.comanager' => 'Apuesimies',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index dc5d350ec..6d74a9975 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -264,6 +264,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Utilisateurs actifs',
+'label.inactive_users' => 'Utilisateurs inactifs',
 
 // Form titles.
 'title.error' => 'Erreur',
@@ -495,8 +497,6 @@
 'form.tasks.inactive_tasks' => 'Tâches inactives',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Utilisateurs actifs',
-'form.users.inactive_users' => 'Utilisateurs inactifs',
 'form.users.uncompleted_entry' => 'L\\\'utilisateur a une entrée incomplète',
 'form.users.role' => 'Rôle',
 'form.users.manager' => 'Responsable',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index fbdf6d386..71c875620 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -257,6 +257,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Ενεργοί χρήστες',
+'label.inactive_users' => 'Ανενεργοί χρήστες',
 
 // Form titles.
 'title.error' => 'Σφάλμα',
@@ -486,8 +488,6 @@
 'form.tasks.inactive_tasks' => 'Ανενεργές εργασίες',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Ενεργοί χρήστες',
-'form.users.inactive_users' => 'Ανενεργοί χρήστες',
 'form.users.uncompleted_entry' => 'Ο χρήστης έχει μια μη ολοκληρωμένη εισαγωγή χρόνου',
 'form.users.role' => 'Ρόλος',
 'form.users.manager' => 'Διευθυντής',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e943ed6cc..0b8bf119c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -287,6 +287,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'משתמשים פעילים',
+'label.inactive_users' => 'משתמשים לא פעילים',
 
 // Form titles.
 'title.error' => 'שגיאה',
@@ -524,8 +526,6 @@
 'form.tasks.inactive_tasks' => 'משימות לא פעילות',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'משתמשים פעילים',
-'form.users.inactive_users' => 'משתמשים לא פעילים',
 // TODO: translate the following.
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'תפקיד',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index bcf597d51..835ff96c3 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -283,6 +283,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -528,8 +530,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Szerepkör',
 'form.users.manager' => 'Vezető',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d931d5f57..e3cf96d21 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -261,6 +261,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Utenti attivi',
+'label.inactive_users' => 'Utenti inattivi',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -499,8 +501,6 @@
 'form.tasks.inactive_tasks' => 'Compiti inattivi',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Utenti attivi',
-'form.users.inactive_users' => 'Utenti inattivi',
 'form.users.uncompleted_entry' => 'Questo utente ha un record temporale incompleto',
 'form.users.role' => 'Ruolo',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 46eb8f132..eb5a2347b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -288,6 +288,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -533,8 +535,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '役割', // TODO: is this correct?
 'form.users.manager' => '管理者',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 46d69536b..2eb2f776c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -288,6 +288,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -531,8 +533,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '직위', // TODO: is this correct? The term "role" describes user function, as in "team manager role".
 'form.users.manager' => '관리자',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 336304d60..91958bf19 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -245,6 +245,8 @@
 'label.image' => 'Afbeelding',
 // TODO: translate the following.
 // 'label.download' => 'Download',
+'label.active_users' => 'Actieve medewerkers',
+'label.inactive_users' => 'Inactieve medewerkers',
 
 // Form titles.
 'title.error' => 'Fout',
@@ -463,8 +465,6 @@
 'form.tasks.inactive_tasks' => 'Inactieve taken',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Actieve medewerkers',
-'form.users.inactive_users' => 'Inactieve medewerkers',
 'form.users.uncompleted_entry' => 'Gebruiker heeft tijd ingevoerd die niet compleet is',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index debf1f927..a2f9cfac0 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -285,6 +285,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -529,8 +531,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rolle',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f676a7be2..4fd5af42c 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -271,6 +271,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktywni użytkownicy',
+'label.inactive_users' => 'Nieaktywni użytkownicy',
 
 // Form titles.
 'title.error' => 'Błąd',
@@ -506,8 +508,6 @@
 'form.tasks.inactive_tasks' => 'Nieaktywne zadania',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktywni użytkownicy',
-'form.users.inactive_users' => 'Nieaktywni użytkownicy',
  // TODO: translate the following.
  // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rola',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9bb3a47cc..2d85a5b75 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -268,6 +268,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Usuários ativos',
+'label.inactive_users' => 'Usuários inativos',
 
 // Form titles.
 'title.error' => 'Erro',
@@ -501,8 +503,6 @@
 'form.tasks.inactive_tasks' => 'Tarefas inativas',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Usuários ativos',
-'form.users.inactive_users' => 'Usuários inativos',
 // TODO: translate the following.
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Papel',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 913e89165..68f41f3ac 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -273,6 +273,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -510,8 +512,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 // 'form.users.role' => 'Role',
 'form.users.manager' => 'Gerente',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 630d1711a..5c56da222 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -285,6 +285,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -531,8 +533,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Functie', // TODO: is "Rol" a better term here?
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c9c325cee..9536114e8 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -243,6 +243,8 @@
 'label.file' => 'Файл',
 'label.image' => 'Изображение',
 'label.download' => 'Скачать',
+'label.active_users' => 'Активные пользователи',
+'label.inactive_users' => 'Неактивные пользователи',
 
 // Form titles.
 'title.error' => 'Ошибка',
@@ -457,8 +459,6 @@
 'form.tasks.inactive_tasks' => 'Неактивные задачи',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Активные пользователи',
-'form.users.inactive_users' => 'Неактивные пользователи',
 'form.users.uncompleted_entry' => 'Пользователь имеет неоконченную запись',
 'form.users.role' => 'Роль',
 'form.users.manager' => 'Менеджер',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 57d652ab2..59c9b5ab0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -276,6 +276,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktívny používatelia',
+'label.inactive_users' => 'Neaktívny používatelia',
 
 // Form titles.
 'title.error' => 'Chyba',
@@ -513,8 +515,6 @@
 'form.tasks.inactive_tasks' => 'Neaktívne úlohy',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktívny používatelia',
-'form.users.inactive_users' => 'Neaktívny používatelia',
 // TODO: translate the following.
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rola',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e6ee24477..da43e5047 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -268,6 +268,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -506,8 +508,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 // 'form.users.role' => 'Role',
 // 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c1dfd1db0..289c71cc1 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -269,6 +269,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktivni korisnik',
+'label.inactive_users' => 'Neaktivni korisnik',
 
 // Form titles.
 'title.error' => 'Greška',
@@ -504,8 +506,6 @@
 'form.tasks.inactive_tasks' => 'Neaktivni zadaci',
 
 // Korisnička forma. Pogledajte primer na https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktivni korisnik',
-'form.users.inactive_users' => 'Neaktivni korisnik',
 // TODO: translate the following.
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Funkcija',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 8eb1baba9..2a69ff3c2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -265,6 +265,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+'label.active_users' => 'Aktiva användare',
+'label.inactive_users' => 'Inaktiva användare',
 
 // Rubriker för formulär
 'title.error' => 'Fel',
@@ -502,8 +504,6 @@
 'form.tasks.inactive_tasks' => 'Inaktiva arbetsuppgifter',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Aktiva användare',
-'form.users.inactive_users' => 'Inaktiva användare',
 'form.users.uncompleted_entry' => 'Användaren har en oavslutad tidsregistrering',
 'form.users.role' => 'Roll',
 'form.users.manager' => 'Ansvarig',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 67d2ad63f..d50a39699 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -292,6 +292,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // Form titles.
@@ -543,8 +545,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 9cfe56471..d80d920a1 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -276,6 +276,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -516,8 +518,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '角色',
 'form.users.manager' => '经理',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a204a7339..c6e1bb4e4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -283,6 +283,8 @@
 // 'label.file' => 'File',
 // 'label.image' => 'Image',
 // 'label.download' => 'Download',
+// 'label.active_users' => 'Active Users',
+// 'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 // TODO: Translate the following.
@@ -523,8 +525,6 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
-// 'form.users.active_users' => 'Active Users',
-// 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '角色',
 'form.users.manager' => '經理',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eea5a85db..757996c47 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.19.1.4960 | 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.1.4961 | 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/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index b3af8e206..8841ea318 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -8,7 +8,7 @@
 {if $user->can('manage_users')}
       <table class="mobile-table-details">
   {if $inactive_users}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
   {/if}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
@@ -45,7 +45,7 @@
 
   {if $inactive_users}
       <table class="mobile-table-details">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.inactive_users}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.label.inactive_users}</td></tr>
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.login}</td>
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index c79425e64..58fe61dcd 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -302,7 +302,7 @@ function handleCheckboxes() {
         </tr>
 {if $show_active_users}
         <tr>
-          <td colspan="3"><b>{$i18n.form.users.active_users}</b></td>
+          <td colspan="3"><b>{$i18n.label.active_users}</b></td>
         </tr>
         <tr>
           <td colspan="3">{$forms.reportForm.users_active.control}</td>
@@ -310,7 +310,7 @@ function handleCheckboxes() {
 {/if}
 {if $show_inactive_users}
         <tr>
-          <td colspan="3"><b>{$i18n.form.users.inactive_users}</b></td>
+          <td colspan="3"><b>{$i18n.label.inactive_users}</b></td>
         </tr>
         <tr>
           <td colspan="3">{$forms.reportForm.users_inactive.control}</td>
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index f03dfd0cf..6067ce6f8 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -8,7 +8,7 @@
 {if $user->can('manage_users')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_users}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
   {/if}
         <tr>
           <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
@@ -56,7 +56,7 @@
 
   {if $inactive_users}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.inactive_users}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.label.inactive_users}</td></tr>
         <tr>
           <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="30%" class="tableHeader">{$i18n.label.login}</td>

From 189e8b9874d89f3d5be5b3dd2f32d4e2e5d7e1f5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Apr 2019 17:49:42 +0000
Subject: [PATCH 0921/1848] Conditional display of label.users if there are no
 inactive users.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/reports.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 757996c47..8a059ce3f 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.19.1.4961 | 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.1.4962 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 58fe61dcd..70f283780 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -302,7 +302,7 @@ function handleCheckboxes() {
         </tr>
 {if $show_active_users}
         <tr>
-          <td colspan="3"><b>{$i18n.label.active_users}</b></td>
+          <td colspan="3"><b>{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</b></td>
         </tr>
         <tr>
           <td colspan="3">{$forms.reportForm.users_active.control}</td>

From 87a40bf7dc910c008aa6aadf8882b070ad120c39 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Apr 2019 20:02:40 +0000
Subject: [PATCH 0922/1848] Initial work done to support negative durations,
 some issues remain.

---
 WEB-INF/lib/common.lib.php           |  5 -----
 WEB-INF/lib/ttChartHelper.class.php  |  3 ++-
 WEB-INF/lib/ttReportHelper.class.php |  4 ++--
 WEB-INF/lib/ttTimeHelper.class.php   | 25 +++++++++++++++----------
 WEB-INF/templates/footer.tpl         |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index e2950753e..747f3e016 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -143,11 +143,6 @@ function time_to_decimal($val) {
   return $decimalTime;
 }
 
-function sec_to_time_fmt_hm($sec)
-{
-  return sprintf("%d:%02d", $sec / 3600, $sec % 3600 / 60);
-}
-
 function magic_quotes_off()
 {
   $_POST = array_map('stripslashes_deep', $_POST);
diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 528fcdb0a..efb30c60f 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 import('Period');
+import('ttTimeHelper');
 
 // Definitions for chart types.
 define('CHART_PROJECTS', 1);
@@ -97,7 +98,7 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
     // Add a string representation of time + percentage to names. Example: "Time Tracker (1:15 - 6%)".
     foreach ($result as &$one_val) {
       $percent = round(100*$one_val['time']/$total).'%';
-      $one_val['name'] .= ' ('.sec_to_time_fmt_hm($one_val['time']).' - '.$percent.')';
+      $one_val['name'] .= ' ('.ttTimeHelper::minutesToDuration($one_val['time'] / 60).' - '.$percent.')';
     }
 
     // Note: the remaining code here is needed to display labels on the side of the diagram.
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 9c6dfb0fe..5fd225317 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -513,7 +513,7 @@ static function getSubtotals($options) {
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
     while ($val = $res->fetchRow()) {
-      $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+      $time = $val['time'] ? ttTimeHelper::minutesToDuration($val['time'] / 60) : null;
       $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
       if ($options['show_cost']) {
         $decimalMark = $user->getDecimalMark();
@@ -595,7 +595,7 @@ static function getTotals($options)
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
 
     $val = $res->fetchRow();
-    $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+    $total_time = $val['time'] ? ttTimeHelper::minutesToDuration($val['time'] / 60) : null;
     if ($options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 5745128fb..3cef8b449 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -132,17 +132,21 @@ static function postedDurationToMinutes($duration, $max = 1440) {
     if (!isset($duration) || strlen($duration) == 0)
       return null; // Value is not set. Caller decides whether it is valid or not.
 
+    // We allow negative durations, similar to negative expenses (installments).
+    $signMultiplier = ttStartsWith($duration, '-') ? -1 : 1;
+    if ($signMultiplier == -1) $duration = ltrim($duration, '-');
+
     // Handle whole hours.
     if (preg_match('/^\d{1,3}h?$/', $duration )) { // 0 - 999, 0h - 999h
       $minutes = 60 * trim($duration, 'h');
-      return $minutes > $max ? false : $minutes;
+      return $minutes > $max ? false : $signMultiplier * $minutes;
     }
 
     // Handle a normalized duration value.
     if (preg_match('/^\d{1,3}:[0-5][0-9]$/', $duration )) { // 0:00 - 999:59
       $time_array = explode(':', $duration);
       $minutes = (int)@$time_array[1] + ((int)@$time_array[0]) * 60;
-      return $minutes > $max ? false : $minutes;
+      return $minutes > $max ? false : $signMultiplier * $minutes;
     }
 
     // Handle localized fractional hours.
@@ -153,13 +157,13 @@ static function postedDurationToMinutes($duration, $max = 1440) {
           $duration = str_replace (',', '.', $duration);
 
         $minutes = (int)round(60 * floatval($duration));
-        return $minutes > $max ? false : $minutes;
+        return $minutes > $max ? false : $signMultiplier * $minutes;
     }
 
     // Handle minutes. Some users enter durations like 10m (meaning 10 minutes).
     if (preg_match('/^\d{1,5}m$/', $duration )) { // 0m - 99999m
       $minutes = (int) trim($duration, 'm');
-      return $minutes > $max ? false : $minutes;
+      return $minutes > $max ? false : $signMultiplier * $minutes;
     }
 
     // Everything else is not a valid duration.
@@ -169,16 +173,17 @@ static function postedDurationToMinutes($duration, $max = 1440) {
   // minutesToDuration converts an integer number of minutes into duration string.
   // Formats returned HH:MM, HHH:MM, HH, or HHH.
   static function minutesToDuration($minutes, $abbreviate = false) {
-    if ($minutes < 0) return false;
+    $sign = $minutes > 0 ? '' : '-';
+    $minutes = abs($minutes);
 
     $hours = (string) (int)($minutes / 60);
     $mins = (string) round(fmod($minutes, 60));
     if (strlen($mins) == 1)
       $mins = '0' . $mins;
     if ($abbreviate && $mins == '00')
-      return $hours;
+      return $sign.$hours;
 
-    return $hours.':'.$mins;
+    return $sign.$hours.':'.$mins;
   }
 
   // toMinutes - converts a time string in format 00:00 to a number of minutes.
@@ -552,7 +557,7 @@ static function getTimeForDay($date) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return sec_to_time_fmt_hm($val['sm']);
+      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
     }
     return false;
   }
@@ -574,7 +579,7 @@ static function getTimeForWeek($date) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return sec_to_time_fmt_hm($val['sm']);
+      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
     }
     return false;
   }
@@ -596,7 +601,7 @@ static function getTimeForMonth($date) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return sec_to_time_fmt_hm($val['sm']);
+      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
     }
     return false;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8a059ce3f..b41511a06 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.19.1.4962 | 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.1.4963 | 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>

From ed499fa49d8dad66119752b4cfe213d30da2bed6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Apr 2019 22:53:56 +0000
Subject: [PATCH 0923/1848] Fixed totals for 0 hours to not have minus sign.

---
 WEB-INF/lib/ttTimeHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 3cef8b449..8142a2663 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -173,7 +173,7 @@ static function postedDurationToMinutes($duration, $max = 1440) {
   // minutesToDuration converts an integer number of minutes into duration string.
   // Formats returned HH:MM, HHH:MM, HH, or HHH.
   static function minutesToDuration($minutes, $abbreviate = false) {
-    $sign = $minutes > 0 ? '' : '-';
+    $sign = $minutes >= 0 ? '' : '-';
     $minutes = abs($minutes);
 
     $hours = (string) (int)($minutes / 60);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b41511a06..e0684a679 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.19.1.4963 | 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.1.4964 | 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>

From 9b5a1834db24f25803fc0d461394e4a2bfcc44b7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Apr 2019 14:10:51 +0000
Subject: [PATCH 0924/1848] Removed unneeded subtotal row on reports, fixed
 printing of 0 subtotals.

---
 WEB-INF/lib/ttReportHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl         |  2 +-
 report.php                           | 15 +++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5fd225317..966865fbb 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -513,7 +513,7 @@ static function getSubtotals($options) {
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
     while ($val = $res->fetchRow()) {
-      $time = $val['time'] ? ttTimeHelper::minutesToDuration($val['time'] / 60) : null;
+      $time = ttTimeHelper::minutesToDuration($val['time'] / 60);
       $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
       if ($options['show_cost']) {
         $decimalMark = $user->getDecimalMark();
@@ -595,7 +595,7 @@ static function getTotals($options)
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
 
     $val = $res->fetchRow();
-    $total_time = $val['time'] ? ttTimeHelper::minutesToDuration($val['time'] / 60) : null;
+    $total_time = ttTimeHelper::minutesToDuration($val['time'] / 60);
     if ($options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e0684a679..4216000f2 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.19.1.4964 | 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.1.4965 | 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/report.php b/report.php
index b82380d7a..31cee67a3 100644
--- a/report.php
+++ b/report.php
@@ -275,17 +275,16 @@
 if (ttReportHelper::grouping($options)) {
   $subtotals = ttReportHelper::getSubtotals($options);
   $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
+  if ($report_items) {
+    // Assign variables that are used to print subtotals.
+    $smarty->assign('print_subtotals', true);
+    $smarty->assign('first_pass', true);
+    $smarty->assign('prev_grouped_by', '');
+    $smarty->assign('cur_grouped_by', '');
+  }
 }
 $totals = ttReportHelper::getTotals($options);
 
-// Assign variables that are used to print subtotals.
-if ($report_items) {
-  $smarty->assign('print_subtotals', true);
-  $smarty->assign('first_pass', true);
-  $smarty->assign('prev_grouped_by', '');
-  $smarty->assign('cur_grouped_by', '');
-}
-
 // Determine column span for note field.
 $colspan = 1;
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;

From 13cfff28242767287408e8fd13d992bc6c6e2086 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Apr 2019 14:53:44 +0000
Subject: [PATCH 0925/1848] Fixed charts for negative hours.

---
 WEB-INF/lib/ttChartHelper.class.php | 11 ++++++-----
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index efb30c60f..31d35e3fd 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -70,23 +70,24 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
       // Data for projects.
       $sql = "select p.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_projects p on (p.id = l.project_id)
-        where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.project_id";
+        where l.status = 1 and l.user_id = $user_id $q_period group by l.project_id";
     } elseif (CHART_TASKS == $chart_type) {
       // Data for tasks.
       $sql = "select t.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_tasks t on (t.id = l.task_id)
-        where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.task_id";
+        where l.status = 1 and l.user_id = $user_id $q_period group by l.task_id";
     } elseif (CHART_CLIENTS == $chart_type) {
       // Data for clients.
       $sql = "select c.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_clients c on (c.id = l.client_id)
-        where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.client_id";
+        where l.status = 1 and l.user_id = $user_id $q_period group by l.client_id";
     }
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $result[] = array('name'=>$val['name'],'time'=>$val['time']); // name  - project name, time - total for project in seconds.
+        if ($val['time'] >= 0) // Only positive totals make sense in pie charts. Skip negatives entirely.
+          $result[] = array('name'=>$val['name'],'time'=>$val['time']); // name - project name, time - total for project in seconds.
       }
     }
 
@@ -140,7 +141,7 @@ static function adjustType($requested_type) {
     $tracking_mode = $user->getTrackingMode();
     $client_option = $user->isPluginEnabled('cl');
 
-    // We have 3 possible options for chart tyep: projects, tasks, or clients.
+    // We have 3 possible options for chart type: projects, tasks, or clients.
     // Deal with each one individually.
 
     if ($requested_type == CHART_PROJECTS) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4216000f2..9afec79a7 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.19.1.4965 | 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.1.4966 | 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>

From d750614c66f49bf68fd660a67a7d3805578238fc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Apr 2019 16:09:34 +0000
Subject: [PATCH 0926/1848] Fixed monthly quotas for negative hours.

---
 WEB-INF/lib/ttTimeHelper.class.php | 5 ++++-
 WEB-INF/templates/footer.tpl       | 2 +-
 quotas.php                         | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 8142a2663..44d967859 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -188,8 +188,11 @@ static function minutesToDuration($minutes, $abbreviate = false) {
 
   // toMinutes - converts a time string in format 00:00 to a number of minutes.
   static function toMinutes($value) {
+    $signMultiplier = ttStartsWith($value, '-') ? -1 : 1;
+    if ($signMultiplier == -1) $duration = ltrim($duration, '-');
+
     $time_a = explode(':', $value);
-    return (int)@$time_a[1] + ((int)@$time_a[0]) * 60;
+    return $signMultiplier * ((int)@$time_a[1] + ((int)@$time_a[0]) * 60);
   }
 
   // toAbsDuration - converts a number of minutes to format 0:00
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9afec79a7..2524785ee 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.19.1.4966 | 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.1.4967 | 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/quotas.php b/quotas.php
index 1f376190e..b6d63fa3e 100644
--- a/quotas.php
+++ b/quotas.php
@@ -74,12 +74,14 @@
 
 if ($request->isPost()){
   // Validate user input.
-  if (false === ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours')))
+  $workdayMinutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
+  if (false === $workdayMinutes || $workdayMinutes <= 0 )
     $err->add($i18n->get('error.field'), $i18n->get('form.quota.workday_hours'));
 
   for ($i = 0; $i < count($months); $i++){
     $val = $request->getParameter($months[$i]);
-    if (false === ttTimeHelper::postedDurationToMinutes($val, 44640/*24*60*31*/))
+    $monthMinutes = ttTimeHelper::postedDurationToMinutes($val, 44640/*24*60*31*/);
+    if (false === $monthMinutes || $monthMinutes < 0)
       $err->add($i18n->get('error.field'), $months[$i]);
   }
   // Finished validating user input.

From 2b90ff7edde48b64097c1bb60cde036b995c4220 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Apr 2019 16:29:40 +0000
Subject: [PATCH 0927/1848] Resuming writing remote work plugin.

---
 WEB-INF/resources/ca.lang.php    |   5 ++
 WEB-INF/resources/cs.lang.php    |   5 ++
 WEB-INF/resources/da.lang.php    |   5 ++
 WEB-INF/resources/de.lang.php    |   5 ++
 WEB-INF/resources/en.lang.php    |   3 +
 WEB-INF/resources/es.lang.php    |   5 ++
 WEB-INF/resources/et.lang.php    |   5 ++
 WEB-INF/resources/fa.lang.php    |   5 ++
 WEB-INF/resources/fi.lang.php    |   5 ++
 WEB-INF/resources/fr.lang.php    |   5 ++
 WEB-INF/resources/gr.lang.php    |   5 ++
 WEB-INF/resources/he.lang.php    |   5 ++
 WEB-INF/resources/hu.lang.php    |   5 ++
 WEB-INF/resources/it.lang.php    |   5 ++
 WEB-INF/resources/ja.lang.php    |   5 ++
 WEB-INF/resources/ko.lang.php    |   5 ++
 WEB-INF/resources/nl.lang.php    |   5 ++
 WEB-INF/resources/no.lang.php    |   5 ++
 WEB-INF/resources/pl.lang.php    |   5 ++
 WEB-INF/resources/pt-br.lang.php |   5 ++
 WEB-INF/resources/pt.lang.php    |   5 ++
 WEB-INF/resources/ro.lang.php    |   5 ++
 WEB-INF/resources/ru.lang.php    |   5 ++
 WEB-INF/resources/sk.lang.php    |   5 ++
 WEB-INF/resources/sl.lang.php    |   5 ++
 WEB-INF/resources/sr.lang.php    |   5 ++
 WEB-INF/resources/sv.lang.php    |   5 ++
 WEB-INF/resources/tr.lang.php    |   5 ++
 WEB-INF/resources/zh-cn.lang.php |   5 ++
 WEB-INF/resources/zh-tw.lang.php |   5 ++
 WEB-INF/templates/footer.tpl     |   2 +-
 WEB-INF/templates/work.tpl       |   8 ++-
 work_add.php                     | 118 +++++++++++++++++++++++++++++++
 33 files changed, 272 insertions(+), 4 deletions(-)
 create mode 100644 work_add.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ff7a3a35d..a49aef797 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -389,6 +389,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0143505b2..662b382e0 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -399,6 +399,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2d41a45e8..45d1790a3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -368,6 +368,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index c050cfc9c..41ab5a6eb 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -351,6 +351,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index dd18c560a..49d502367 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -339,6 +339,9 @@
 'title.delete_file' => 'Deleting File',
 'title.download_file' => 'Downloading File',
 'title.work' => 'Work',
+'title.add_work' => 'Adding Work',
+'title.edit_work' => 'Editing Work',
+'title.delete_work' => 'Deleting Work',
 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9e9b4af9b..b29bf3245 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -388,6 +388,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 01b8702bf..5c69d6b7e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -373,6 +373,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 7ec9e70de..a77c13c63 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -377,6 +377,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 8f04168dc..e0b603491 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -368,6 +368,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 6d74a9975..2fa1a4aff 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -362,6 +362,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 71c875620..3094dabda 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -358,6 +358,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 0b8bf119c..820da0367 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -387,6 +387,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 835ff96c3..fdc0d0271 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -388,6 +388,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e3cf96d21..1340e251f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -368,6 +368,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index eb5a2347b..433642786 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -395,6 +395,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2eb2f776c..e34f25f5f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -396,6 +396,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 91958bf19..bf4f3d546 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -342,6 +342,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a2f9cfac0..91de93ed9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -392,6 +392,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4fd5af42c..3bfbf556c 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -371,6 +371,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 2d85a5b75..829b3ec10 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -366,6 +366,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 68f41f3ac..3985b216c 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -376,6 +376,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 5c56da222..79aa92a94 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -394,6 +394,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 9536114e8..4b240dbd9 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -336,6 +336,11 @@
 'title.delete_file' => 'Удаление файла',
 'title.download_file' => 'Скачивание файла',
 'title.work' => 'Работа',
+'title.add_work' => 'Добавление работы',
+'title.edit_work' => 'Редактирование работы',
+'title.delete_work' => 'Удаление работы',
+'title.active_work' => 'Активная работа',
+'title.inactive_work' => 'Неактивная работа',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 59c9b5ab0..b2dfe3524 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -376,6 +376,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index da43e5047..cd4a17dbd 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -369,6 +369,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 289c71cc1..05d32a685 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -369,6 +369,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 2a69ff3c2..9f1a09724 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -369,6 +369,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d50a39699..241c40d91 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -403,6 +403,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index d80d920a1..acda53b88 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -383,6 +383,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c6e1bb4e4..334551bc5 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -389,6 +389,11 @@
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
 // 'title.work' => 'Work',
+// 'title.add_work' => 'Adding Work',
+// 'title.edit_work' => 'Editing Work',
+// 'title.delete_work' => 'Deleting Work',
+// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2524785ee..bd10be9ec 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.19.1.4967 | 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.1.4968 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 359c385cb..af2a7c420 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -7,17 +7,19 @@
     <td valign="top">
 {if $user->can('manage_work')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
+  {if $inactive_work}
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
+  {/if}
+  {if $active_work}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-  {if $show_files}
+    {if $show_files}
           <td></td>
-  {/if}
+    {/if}
           <td></td>
           <td></td>
         </tr>
-  {if $active_work}
     {foreach $active_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.name|escape}</td>
diff --git a/work_add.php b/work_add.php
new file mode 100644
index 000000000..2abe84d51
--- /dev/null
+++ b/work_add.php
@@ -0,0 +1,118 @@
+<?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('ttProjectHelper');
+import('ttGroupHelper');
+import('ttFileHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$showFiles = $user->isPluginEnabled('at');
+$users = ttGroupHelper::getActiveUsers();
+foreach ($users as $user_item)
+  $all_users[$user_item['id']] = $user_item['name'];
+
+$tasks = ttGroupHelper::getActiveTasks();
+foreach ($tasks as $task_item)
+  $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('project_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_users = $request->getParameter('users', array());
+  $cl_tasks = $request->getParameter('tasks', array());
+} else {
+  foreach ($users as $user_item)
+    $cl_users[] = $user_item['id'];
+  foreach ($tasks as $task_item)
+    $cl_tasks[] = $task_item['id'];
+}
+
+$form = new Form('projectForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
+if ($show_tasks)
+  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
+
+  if ($err->no()) {
+    if (!ttProjectHelper::getProjectByName($cl_name)) {
+      $id = ttProjectHelper::insert(array('name' => $cl_name,
+        'description' => $cl_description,
+        'users' => $cl_users,
+        'tasks' => $cl_tasks,
+        'status' => ACTIVE));
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'project',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+      if ($id) {
+        header('Location: projects.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.object_exists'));
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
+$smarty->assign('title', $i18n->get('title.add_work'));
+$smarty->assign('content_page_name', 'project_add.tpl');
+$smarty->display('index.tpl');

From 8dade986970598d2c58e2484342e413bf30be4db Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Apr 2019 16:19:31 +0000
Subject: [PATCH 0928/1848] A bit more work in progress on remote work plugin.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/projects.tpl |  6 ++---
 WEB-INF/templates/work_add.tpl | 35 +++++++++++++++++++++++++++
 work_add.php                   | 43 ++++++++++++++--------------------
 4 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/work_add.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bd10be9ec..6e00cf347 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.19.1.4968 | 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.1.4969 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 81ef96b89..92348e7ab 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -10,16 +10,16 @@
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
   {/if}
+  {if $active_projects}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-  {if $show_files}
+    {if $show_files}
           <td></td>
-  {/if}
+    {/if}
           <td></td>
           <td></td>
         </tr>
-  {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl
new file mode 100644
index 000000000..74209f48e
--- /dev/null
+++ b/WEB-INF/templates/work_add.tpl
@@ -0,0 +1,35 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.workForm.project_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/work_add.php b/work_add.php
index 2abe84d51..20d0ac01f 100644
--- a/work_add.php
+++ b/work_add.php
@@ -33,47 +33,40 @@
 import('ttFileHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_projects')) {
+if (!ttAccessAllowed('manage_work')) {
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+if (!$user->isPluginEnabled('wk')) {
   header('Location: feature_disabled.php');
   exit();
 }
 // End of access checks.
 
 $showFiles = $user->isPluginEnabled('at');
-$users = ttGroupHelper::getActiveUsers();
-foreach ($users as $user_item)
-  $all_users[$user_item['id']] = $user_item['name'];
-
-$tasks = ttGroupHelper::getActiveTasks();
-foreach ($tasks as $task_item)
-  $all_tasks[$task_item['id']] = $task_item['name'];
-$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('project_name'));
+  $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
-  $cl_users = $request->getParameter('users', array());
-  $cl_tasks = $request->getParameter('tasks', array());
-} else {
-  foreach ($users as $user_item)
-    $cl_users[] = $user_item['id'];
-  foreach ($tasks as $task_item)
-    $cl_tasks[] = $task_item['id'];
 }
 
-$form = new Form('projectForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
+$form = new Form('workForm');
+
+
+
+
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if ($show_tasks)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+// Should not we get it from server?
+// $CURRENCY_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
+// $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
+//  'onchange'=>'adjustDecimalPreview()'));
+
+
+
 
 if ($request->isPost()) {
   // Validate user input.
@@ -114,5 +107,5 @@
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_work'));
-$smarty->assign('content_page_name', 'project_add.tpl');
+$smarty->assign('content_page_name', 'work_add.tpl');
 $smarty->display('index.tpl');

From cdd2e058776a3d0dc9b6f32a2d5d33e4f9388491 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Apr 2019 17:45:08 +0000
Subject: [PATCH 0929/1848] A bit of refactoring.

---
 WEB-INF/lib/ttTimeHelper.class.php |  6 ++++--
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/week.tpl         | 10 ++++++++++
 mobile/time.php                    |  2 +-
 mobile/timer.php                   |  2 +-
 time.php                           |  2 +-
 week.php                           |  3 +++
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 44d967859..0d5863ed3 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -807,11 +807,12 @@ static function getAllRecords($user_id) {
   }
 
   // getRecords - returns time records for a user for a given date.
-  static function getRecords($user_id, $date) {
+  static function getRecords($date) {
     // TODO: merge getRecords and getRecordsWithFiles into one function.
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
@@ -869,10 +870,11 @@ static function getRecords($user_id, $date) {
   // getRecordsWithFiles - returns time records for a user for a given date
   // with information whether they have attached files (has_files property).
   // A separate fiunction from getRecords because sql here is more complex.
-  static function getRecordsWithFiles($user_id, $date) {
+  static function getRecordsWithFiles($date) {
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6e00cf347..62a5cf424 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.19.1.4969 | 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.1.4970 | 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/week.tpl b/WEB-INF/templates/week.tpl
index 6fc08b8a9..33a218a3d 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -117,6 +117,9 @@ function fillDropdowns() {
   {/if}
         <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
         <td class="tableHeader">{$i18n.label.note}</td>
+  {if $show_files}
+        <td></td>
+  {/if}
         <td></td>
         <td></td>
       </tr>
@@ -138,6 +141,13 @@ function fillDropdowns() {
     {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {if $show_files}
+      {if $record.has_files}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {else}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+      {/if}
+    {/if}
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
diff --git a/mobile/time.php b/mobile/time.php
index 15069db2e..30c7a402e 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -347,7 +347,7 @@
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
-$smarty->assign('time_records', ttTimeHelper::getRecords($user_id, $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/mobile/timer.php b/mobile/timer.php
index d3a0d0fb6..a8f708a8a 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -290,7 +290,7 @@
 
 
 
-$smarty->assign('time_records', ttTimeHelper::getRecords($user->getUser(), $cl_date));
+$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/time.php b/time.php
index f6c84759f..2a2c616b5 100644
--- a/time.php
+++ b/time.php
@@ -442,7 +442,7 @@
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
-$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
+$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($cl_date) : ttTimeHelper::getRecords($cl_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
diff --git a/week.php b/week.php
index f18817d7d..b4a9176ed 100644
--- a/week.php
+++ b/week.php
@@ -507,6 +507,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
 
+//$showFiles = $user->isPluginEnabled('at');
+//$smarty->assign('show_files', $showFiles);
+
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'week.tpl');
 $smarty->display('index.tpl');

From 05f0dada8939fad19e44c9ff26bad6ae578e34cc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Apr 2019 17:56:17 +0000
Subject: [PATCH 0930/1848] Merged getRecords and getRecordsWithFiles into one
 function to keep things compact.

---
 WEB-INF/lib/ttTimeHelper.class.php | 76 ++++--------------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 time.php                           |  2 +-
 3 files changed, 10 insertions(+), 70 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 0d5863ed3..9ad64fc4c 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -807,8 +807,7 @@ static function getAllRecords($user_id) {
   }
 
   // getRecords - returns time records for a user for a given date.
-  static function getRecords($date) {
-    // TODO: merge getRecords and getRecordsWithFiles into one function.
+  static function getRecords($date, $includeFiles = false) {
     global $user;
     $mdb2 = getConnection();
 
@@ -835,66 +834,11 @@ static function getRecords($date) {
       }
     }
 
-    $left_joins = " left join tt_projects p on (l.project_id = p.id)".
-      " left join tt_tasks t on (l.task_id = t.id)";
-    if ($user->isPluginEnabled('cl'))
-      $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
-    if ($include_cf_1) {
-      if ($cf_1_type == CustomFields::TYPE_TEXT)
-        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
-      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
-          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
-      }
-    }
-
-    $result = array();
-    $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
-      " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
-      " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins".
-      " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
-      " order by l.start, l.id";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        if($val['duration']=='0:00')
-          $val['finish'] = '';
-        $result[] = $val;
-      }
-    } else return false;
-
-    return $result;
-  }
-
-  // getRecordsWithFiles - returns time records for a user for a given date
-  // with information whether they have attached files (has_files property).
-  // A separate fiunction from getRecords because sql here is more complex.
-  static function getRecordsWithFiles($date) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $user_id = $user->getUser();
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql_time_format = "'%k:%i'"; //  24 hour format.
-    if ('%I:%M %p' == $user->getTimeFormat())
-      $sql_time_format = "'%h:%i %p'"; // 12 hour format for MySQL TIME_FORMAT function.
-
-    $client_field = null;
-    if ($user->isPluginEnabled('cl'))
-      $client_field = ", c.name as client";
-
-    $include_cf_1 = $user->isPluginEnabled('cf');
-    if ($include_cf_1) {
-      $custom_fields = new CustomFields();
-      $cf_1_type = $custom_fields->fields[0]['type'];
-      if ($cf_1_type == CustomFields::TYPE_TEXT) {
-        $custom_field = ", cfl.value as cf_1";
-      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $custom_field = ", cfo.value as cf_1";
-      }
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (l.id = Sub1.entity_id)";
     }
 
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
@@ -909,17 +853,13 @@ static function getRecordsWithFiles($date) {
           " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
       }
     }
-
-    $left_joins .= " left join (select distinct entity_id from tt_files".
-      " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
-      " on (l.id = Sub1.entity_id)";
+    $left_joins .= $fileJoin;
 
     $result = array();
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " if(Sub1.entity_id is null, 0, 1) as has_files,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field $filePart from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 62a5cf424..5e6746212 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.19.1.4970 | 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.1.4971 | 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/time.php b/time.php
index 2a2c616b5..d05f0c599 100644
--- a/time.php
+++ b/time.php
@@ -442,7 +442,7 @@
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
-$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($cl_date) : ttTimeHelper::getRecords($cl_date);
+$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);

From 2646345bd9517aafb6b96bfe9cd795ee0f8c8e84 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Apr 2019 19:35:46 +0000
Subject: [PATCH 0931/1848] Added attachment output on week view.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 37 +++++++++++++++++---------
 WEB-INF/templates/footer.tpl           |  2 +-
 week.php                               |  9 +++----
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 782f309b4..08d219fb4 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -30,8 +30,13 @@
 class ttWeekViewHelper {
 
   // getRecordsForInterval - returns time records for a user for a given interval of dates.
-  static function getRecordsForInterval($user_id, $start_date, $end_date) {
+  static function getRecordsForInterval($start_date, $end_date, $includeFiles = false) {
     global $user;
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $sql_time_format = "'%k:%i'"; //  24 hour format.
     if ('%I:%M %p' == $user->time_format)
       $sql_time_format = "'%h:%i %p'"; // 12 hour format for MySQL TIME_FORMAT function.
@@ -54,6 +59,13 @@ static function getRecordsForInterval($user_id, $start_date, $end_date) {
       }
     }
 
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (l.id = Sub1.entity_id)";
+    }
+
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
@@ -64,15 +76,16 @@ static function getRecordsForInterval($user_id, $start_date, $end_date) {
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
         $left_joins .= 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
     }
-
-    $sql = "select l.id as id, l.date as date, TIME_FORMAT(l.start, $sql_time_format) as start,
-      TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,
-      TIME_FORMAT(l.duration, '%k:%i') as duration, p.id as project_id, p.name as project,
-      t.id as task_id, t.name as task, l.comment, l.billable, l.invoice_id $client_field $custom_field_1
-      from tt_log l
-      $left_joins
-      where l.date >= '$start_date' and l.date <= '$end_date' and l.user_id = $user_id and l.status = 1
-      order by l.date, p.name, t.name, l.start, l.id";
+    $left_joins .= $fileJoin;
+
+    $sql = "select l.id as id, l.date as date, TIME_FORMAT(l.start, $sql_time_format) as start,".
+      " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
+      " TIME_FORMAT(l.duration, '%k:%i') as duration, p.id as project_id, p.name as project,".
+      " t.id as task_id, t.name as task, l.comment, l.billable, l.invoice_id $client_field $custom_field_1 $filePart".
+      " from tt_log l $left_joins".
+      " where l.date >= '$start_date' and l.date <= '$end_date'".
+      " and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
+      " order by l.date, p.name, t.name, l.start, l.id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -236,7 +249,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
     unset($objDate);
 
     // Obtain past week(s) records.
-    $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
+    $records = ttWeekViewHelper::getRecordsForInterval($pastWeekStartDate, $pastWeekEndDate);
     // Handle potential situation of no records by re-trying for up to 4 more previous weeks (after a long vacation, etc.).
     if (!$records) {
       for ($i = 0; $i < 4; $i++) {
@@ -247,7 +260,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
         $pastWeekEndDate = $objDate->toString(DB_DATEFORMAT);
         unset($objDate);
 
-        $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
+        $records = ttWeekViewHelper::getRecordsForInterval($pastWeekStartDate, $pastWeekEndDate);
         // Break out of the loop if we found something.
         if ($records) break;
       }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e6746212..2f30bd7c1 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.19.1.4971 | 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.1.4972 | 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/week.php b/week.php
index b4a9176ed..879d960ea 100644
--- a/week.php
+++ b/week.php
@@ -57,6 +57,8 @@
 }
 // End of access checks.
 
+$showFiles = $user->isPluginEnabled('at');
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -128,7 +130,7 @@
 $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
 $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
 // Get already existing records.
-$records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
+$records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $showFiles);
 // Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function.
 if ($records)
   $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders);
@@ -506,10 +508,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
-
-//$showFiles = $user->isPluginEnabled('at');
-//$smarty->assign('show_files', $showFiles);
-
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'week.tpl');
 $smarty->display('index.tpl');

From 4a23c8efa5cd0af46cef4a602b5897f9b8e14636 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Apr 2019 20:44:04 +0000
Subject: [PATCH 0932/1848] Introduced tt_work_currencies table for remote work
 plugin.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/work_add.tpl |  2 +-
 dbinstall.php                  | 16 +++++++++++++---
 mysql.sql                      | 18 +++++++++++++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2f30bd7c1..b54e2baa2 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.19.1.4972 | 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.2.4973 | 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/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 74209f48e..3992fa15d 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -5,7 +5,7 @@
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.workForm.project_name.control}</td>
+          <td>{$forms.workForm.work_name.control}</td>
         </tr>
         <tr>
           <td align = "right">{$i18n.label.description}:</td>
diff --git a/dbinstall.php b/dbinstall.php
index 53d041101..e979e1b62 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1149,7 +1149,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.54', modified = now() where param_name = 'version_db' and param_value = '1.18.51'");
     ttExecute("ALTER TABLE `tt_templates` ADD `description` varchar(255) default NULL AFTER `name`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.55', modified = now() where param_name = 'version_db' and param_value = '1.18.54'");
-    ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY  (`id`))");
+    ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY (`id`))");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.59', modified = now() where param_name = 'version_db' and param_value = '1.18.55'");
     ttExecute("ALTER TABLE `tt_files` ADD `file_key` varchar(32) AFTER `remote_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'");
@@ -1159,7 +1159,13 @@ function ttGenerateKeys() {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'swap_roles', 'swap_roles,update_work') where rank >= 12");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'view_all_reports', 'view_all_reports,manage_work,bid_on_work') where rank >= 68");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
-}
+  }
+
+  if ($_POST["convert11900to11902"]) {
+    ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
+    ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
+    ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
+  }
 
   if ($_POST["cleanup"]) {
     $mdb2 = getConnection();
@@ -1208,7 +1214,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.0)</b>
+    <td width="80%"><b>Create database structure (v1.19.2)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1256,6 +1262,10 @@ function ttGenerateKeys() {
     <td>Update database structure (v1.17.97 to v1.19)</td>
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
+  <tr valign="top">
+    <td>Update database structure (v1.19 to v1.19.2)</td>
+    <td><input type="submit" name="convert11900to11902" value="Update"></td>
+  </tr>
 </table>
 
 <h2>DB Maintenance</h2>
diff --git a/mysql.sql b/mysql.sql
index 0cd732629..56c217a3a 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -560,6 +560,22 @@ CREATE TABLE `tt_files` (
 );
 
 
+#
+# Structure for table tt_work_currencies.
+# This table keeps currencies supported by remote work plugin.
+#
+CREATE TABLE `tt_work_currencies` (
+  `id` int(10) unsigned NOT NULL,    # currency id
+  `name` varchar(10) NOT NULL,       # currency name (USD, CAD, etc.)
+  PRIMARY KEY  (`id`)
+);
+
+# Create an index that guarantees unique work currencies.
+create unique index currency_idx on tt_work_currencies(`name`);
+
+INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD');
+
+
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
@@ -573,4 +589,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.0', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.2', now()); # TODO: change when structure changes.

From 2a2bb2cc8f9551d1e93de2d34e27b21201f9e44a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Apr 2019 21:32:16 +0000
Subject: [PATCH 0933/1848] More work in progress on remote work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 46 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work_add.tpl     |  4 +++
 mysql.sql                          | 19 ++++++++++++
 work_add.php                       | 20 +++++++------
 5 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 WEB-INF/lib/ttWorkHelper.class.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
new file mode 100644
index 000000000..b8d2fde8c
--- /dev/null
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -0,0 +1,46 @@
+<?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
+// +----------------------------------------------------------------------+
+
+
+// Class ttWorkHelper is used to help with operations with the Remote work plugin.
+class ttWorkHelper {
+
+  // getCurrencies - obtains a list of supported currencies.
+  static function getCurrencies() {
+    $mdb2 = getConnection();
+
+    $sql = "select id, name from tt_work_currencies order by id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+
+    while ($val = $res->fetchRow()) {
+      $result[] = $val;
+    }
+    return $result;
+  }
+}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b54e2baa2..675f20d66 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.19.2.4973 | 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.2.4974 | 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/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 3992fa15d..757a4e224 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -17,6 +17,10 @@
           <td>{$forms.workForm.newfile.control}</td>
         </tr>
 {/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.workForm.currency.control}</td>
+        </tr>
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/mysql.sql b/mysql.sql
index 56c217a3a..40065f062 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -576,6 +576,25 @@ create unique index currency_idx on tt_work_currencies(`name`);
 INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD');
 
 
+#
+# Structure for table tt_work_categories. WORK IN PROGRESS!
+# This table keeps work categories supported by remote work plugin.
+#
+# CREATE TABLE `tt_work_categories` (
+#  `id` int(10) unsigned NOT NULL,            # category id
+#  `parent_id` int(10) unsigned default NULL, # parent category id
+#  `level` tinyint(4) default 0,              # sub-category level
+#
+#  Localized name fields below for all supported languages?
+#  `name_en` varhar(64) NOT NULL,             # English.
+#  `name_de` varhar(64) default NULL,         # German.
+#  `name_fr` varhar(64) default NULL,         # French.
+#  `name_ru` varhar(64) default NULL,         # Russian.
+#
+# PRIMARY KEY  (`id`)
+# );
+
+
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
diff --git a/work_add.php b/work_add.php
index 20d0ac01f..452e515b3 100644
--- a/work_add.php
+++ b/work_add.php
@@ -31,6 +31,7 @@
 import('ttProjectHelper');
 import('ttGroupHelper');
 import('ttFileHelper');
+import('ttWorkHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
@@ -48,24 +49,27 @@
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
+  $cl_currency = $request->getParameter('currency');
 }
 
 $form = new Form('workForm');
-
-
-
-
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+// Add a dropdown for currency.
+$currencies = ttWorkHelper::getCurrencies();
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency));
 
-// Should not we get it from server?
-// $CURRENCY_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
-// $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
-//  'onchange'=>'adjustDecimalPreview()'));
+// TODO: design how to handle one-time vs ongoing work. Apparently, with a conditional display of relevant controls.
+// Ongoing work - rate per hour control.
+// One-time work - budget dropdown control.
+// When selection changes, we hide and show required controls.
 
+// TODO: design how to handle categories and sub-categories.
+// One major complication is localization of names.
 
+// Coding and design are currently ongoing.
 
 
 if ($request->isPost()) {

From 0f0438db0b69e54af6173e2a73f0434d243ecdf6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 12:10:36 +0000
Subject: [PATCH 0934/1848] Introduced tt_work_categories table for remote work
 plugin.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 14 ++++++++++----
 mysql.sql                    | 29 +++++++++++++++--------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 675f20d66..d0601709a 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.19.2.4974 | 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.3.4975 | 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/dbinstall.php b/dbinstall.php
index e979e1b62..d318f9be0 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,10 +1161,16 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11902"]) {
+  if ($_POST["convert11900to11903"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
+    ttExecute("CREATE TABLE `tt_work_categories` (`id` int(10) unsigned NOT NULL, `parents` text default NULL, `name` varchar(64) NOT NULL, `name_localized` text default NULL, PRIMARY KEY (`id`))");
+    ttExecute("INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('1', NULL, 'Coding', 'es:Codificación,ru:Кодирование')");
+    ttExecute("INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('2', NULL, 'Other', 'es:Otra,ru:Другое')");
+    ttExecute("INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('3', '1', 'PHP', NULL)");
+    ttExecute("INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('4', '1', 'C/C++', NULL)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.3', modified = now() where param_name = 'version_db' and param_value = '1.19.0'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1214,7 +1220,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.2)</b>
+    <td width="80%"><b>Create database structure (v1.19.3)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1263,8 +1269,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.2)</td>
-    <td><input type="submit" name="convert11900to11902" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.3)</td>
+    <td><input type="submit" name="convert11900to11903" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 40065f062..c14045c7d 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -577,22 +577,23 @@ INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'
 
 
 #
-# Structure for table tt_work_categories. WORK IN PROGRESS!
+# Structure for table tt_work_categories.
 # This table keeps work categories supported by remote work plugin.
 #
-# CREATE TABLE `tt_work_categories` (
-#  `id` int(10) unsigned NOT NULL,            # category id
-#  `parent_id` int(10) unsigned default NULL, # parent category id
-#  `level` tinyint(4) default 0,              # sub-category level
-#
-#  Localized name fields below for all supported languages?
-#  `name_en` varhar(64) NOT NULL,             # English.
-#  `name_de` varhar(64) default NULL,         # German.
-#  `name_fr` varhar(64) default NULL,         # French.
-#  `name_ru` varhar(64) default NULL,         # Russian.
-#
-# PRIMARY KEY  (`id`)
-# );
+CREATE TABLE `tt_work_categories` (
+  `id` int(10) unsigned NOT NULL,     # Category id.
+  `parents` text default NULL,        # Comma-separated list of parent ids associated with this category.
+  `name` varchar(64) NOT NULL,        # English category name.
+  `name_localized` text default NULL, # Comma-separated list of localized category names in other languages.
+                                      # Example: es:Codificación,ru:Кодирование.
+  PRIMARY KEY  (`id`)
+);
+
+# Insert some default categories. Table content to be updated at run time, though.
+INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('1', NULL, 'Coding', 'es:Codificación,ru:Кодирование');
+INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('2', NULL, 'Other', 'es:Otra,ru:Другое');
+INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('3', '1', 'PHP', NULL);
+INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('4', '1', 'C/C++', NULL);
 
 
 #

From ce2df23479c88d1bc9db04a68164af3feb6346e1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 14:45:16 +0000
Subject: [PATCH 0935/1848] Removed middots in menus to hopefully do better
 styling with css.

---
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/groups.tpl        | 13 ++++----
 WEB-INF/templates/header.tpl        | 46 ++++++++++++++---------------
 WEB-INF/templates/mobile/header.tpl | 12 ++++----
 default.css                         |  2 ++
 5 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d0601709a..64203f55d 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.19.3.4975 | 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.3.4976 | 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/groups.tpl b/WEB-INF/templates/groups.tpl
index 3cd4f51d3..0289ef9ee 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -2,21 +2,22 @@
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 {$forms.subgroupsForm.open}
-<table cellspacing="1" cellpadding="3" border="0" width="720">
 {if $group_dropdown}
+<table cellspacing="1" cellpadding="3" border="0" width="100%">
   <tr>
-    <td align="right">{$i18n.label.group}:</td>
-    <td>{$forms.subgroupsForm.group.control}</td>
+    <td align="center">{$i18n.label.group}: {$forms.subgroupsForm.group.control}</td>
   </tr>
-  <tr><td colspan="2">&nbsp;</td></tr>
+  <tr><td>&nbsp;</td></tr>
+</table>
 {/if}
+{if $subgroups}
+<table cellspacing="1" cellpadding="3" border="0" width="720">
   <tr>
     <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
     <td width="40%" class="tableHeader">{$i18n.label.description}</td>
     <td></td>
     <td></td>
   </tr>
-{if $subgroups}
   {foreach $subgroups as $subgroup}
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$subgroup.name|escape}</td>
@@ -25,8 +26,8 @@
     <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
   </tr>
   {/foreach}
-{/if}
 </table>
+{/if}
 {$forms.subgroupsForm.close}
 
 <table width="100%">
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 9c46a7a87..b420f1ae8 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -59,8 +59,8 @@
       <table id="top_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
+            <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a>
+            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
@@ -71,7 +71,7 @@
       <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a> &middot;
+            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
         </tr>
@@ -82,20 +82,20 @@
       <table id="top_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a> &middot;
+            <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a>
     {if $user->exists() && $user->can('manage_own_settings')}
-            <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a> &middot;
+            <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a>
     {/if}
     {if $user->can('manage_basic_settings')}
-            <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a> &middot;
+            <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a>
     {/if}
     {if $user->can('manage_subgroups')}
-            <a class="systemMenu" href="groups.php">{$i18n.menu.subgroups}</a> &middot;
+            <a class="systemMenu" href="groups.php">{$i18n.menu.subgroups}</a>
     {/if}
     {if $user->can('manage_features')}
-            <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a> &middot;
+            <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a>
     {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
+            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
@@ -110,39 +110,39 @@
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
-            &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
+           <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
-      {if !$user->isClient()}&middot;{/if} <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
+           <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
-            &middot; <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
+           <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
-            &middot; <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
+           <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
         ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
-            &middot; <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
+           <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
     {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
-            &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
+           <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
-            &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
+           <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
-            &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
+           <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
-            &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
+           <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
     {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
-            &middot; <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
+           <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
     {/if}
     {if $user->can('export_data')}
-            &middot; <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
+           <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
     {/if}
           </td>
         </tr>
@@ -154,11 +154,11 @@
       <table id="top_menu_non_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="login.php">{$i18n.menu.login}</a> &middot;
+            <a class="systemMenu" href="login.php">{$i18n.menu.login}</a>
   {if isTrue('MULTITEAM_MODE') && $smarty.const.AUTH_MODULE == 'db'}
-            <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a> &middot;
+            <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a>
   {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a> &middot;
+            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 806bd4853..ec0b05926 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -61,7 +61,7 @@
       <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a> &middot;
+            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
         </tr>
@@ -77,19 +77,19 @@
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
-            &middot; <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
+           <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
     {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
-            &middot; <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
+           <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
     {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()}
-            &middot; <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
+           <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
-            &middot; <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
+           <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
     {/if}
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
-            &middot; <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
+           <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
           </td>
         </tr>
diff --git a/default.css b/default.css
index 0fe360519..462b70edf 100644
--- a/default.css
+++ b/default.css
@@ -67,11 +67,13 @@ input[type=checkbox], label {
   font-weight: bold;
   color: white;
   background-color: black;
+  margin: 2px 3px 2px 3px;
 }
 
 .mainMenu {
   font-size: 11pt;
   color: #444444;
+  margin: 2px 3px 2px 3px;
 }
 
 .onBehalf {

From 983999db0dd78046ebf3090e379049cbd8bc0c5a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 16:00:44 +0000
Subject: [PATCH 0936/1848] Removed no longer relevant comment.

---
 WEB-INF/lib/ttUser.class.php | 15 ---------------
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2d45101cc..dd4a81d52 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -482,21 +482,6 @@ function getUsers($options) {
   //   - The entire stack of groups all the way down to current on behalf group.
   //   - All immediate children of the current on behalf group.
   // This allows user to navigate easily to home group, anything in between, and 1 level below.
-  //
-  // Note 1: group dropdown is, by design, to be placed on all pages where "relevant",
-  // such as users.php, projects.php, tasks.php, etc. But some features may be disabled
-  // in some groups. We should check for feature availability on group change
-  // in post and redirect to feature_disabled.php when this happens.
-  // This will allow us to keep dropdown content consistent on all pages.
-  // Filtering content of the dropdown does not seem right.
-  //
-  // Note 2: Menu should display according to $user home group settings.
-  //         Pages, should look according to $user->behalfGroup settings (if set).
-  //         For example, if home group allows tasks, menu should display Tasks,
-  //         even when we are on behalf of a subgroup without tasks.
-  //
-  // Note 3: Language of all pages should be as in $user home group even when
-  //         subgroups have a different language.
   function getGroupsForDropdown() {
     $mdb2 = getConnection();
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 64203f55d..ff17578b8 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.19.3.4976 | 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.3.4977 | 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>

From 9c1005341a3db52333fcb732960acbdf03fbe4e7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 16:13:57 +0000
Subject: [PATCH 0937/1848] Cosmetic presentation fixes.

---
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/mobile/projects.tpl |  2 +-
 WEB-INF/templates/mobile/users.tpl    |  4 ++--
 WEB-INF/templates/users.tpl           | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ff17578b8..70106851d 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.19.3.4977 | 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.3.4978 | 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/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl
index 96dcce100..96d27054f 100644
--- a/WEB-INF/templates/mobile/projects.tpl
+++ b/WEB-INF/templates/mobile/projects.tpl
@@ -10,11 +10,11 @@
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
   {/if}
+  {if $active_projects}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
         </tr>
-  {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index 8841ea318..eaeb4770f 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -10,13 +10,13 @@
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
   {/if}
+  {if $active_users}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.login}</td>
           <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
         </tr>
-  {if $active_users}
-    {foreach $active_users as $u}
+      {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
             {if $uncompleted_indicators}
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 6067ce6f8..c9f67503e 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -10,23 +10,23 @@
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
   {/if}
+  {if $active_users}
         <tr>
           <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
           <td width="30%" class="tableHeader">{$i18n.label.login}</td>
           <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
-  {if $show_quota}
+    {if $show_quota}
           <td class="tableHeader">{$i18n.label.quota}</td>
-  {/if}
+    {/if}
           <td></td>
           <td></td>
         </tr>
-  {if $active_users}
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
-          {if $uncompleted_indicators}
+      {if $uncompleted_indicators}
             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
-          {/if}
+      {/if}
             {$u.name|escape}
           </td>
           <td>{$u.login|escape}</td>

From 30c418be03195958811ceea5858072700b55b069 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 17:06:51 +0000
Subject: [PATCH 0938/1848] Fixed prePopulateFromPastWeeks for week view
 plugin.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 32 +++++++++++++++-----------
 WEB-INF/templates/footer.tpl           |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 08d219fb4..f7ad3f6c0 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -109,7 +109,7 @@ static function getRecordsForInterval($start_date, $end_date, $includeFiles = fa
   // "cl:546,bl:0,pr:23456,ts:27464,cf_1:7623"
   // The above means client 546, not billable, project 23456, task 27464, custom field option id 7623.
   //
-  // Daily comments are implemented as alternate rows following week durations.
+  // Daily comments are implemented as alternate rows following week durations (when enabled).
   // For example: row_0 - new entry durations, row_1 - new entry daily comments,
   //              row_2 - existing entry durations, row_3 - existing entry comments, etc.
   //
@@ -273,12 +273,14 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
       $control_id = '0_'. $dayHeaders[$i];
       $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
     }
-    // Construct the second row for daily comments for a brand new entry.
-    $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
-    // Insert empty cells with proper control ids.
-    for ($i = 0; $i < 7; $i++) {
-      $control_id = '1_'. $dayHeaders[$i];
-      $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+    if ($user->isPluginEnabled('wvns')) {
+      // Construct the second row for daily comments for a brand new entry.
+      $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
+      // Insert empty cells with proper control ids.
+      for ($i = 0; $i < 7; $i++) {
+        $control_id = '1_'. $dayHeaders[$i];
+        $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+      }
     }
 
     // Iterate through records and build an "empty" $dataArray.
@@ -297,14 +299,16 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
           $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
         }
         // Insert row for comments.
-        $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
-        $pos++;
-        // Insert empty cells with proper control ids.
-        for ($i = 0; $i < 7; $i++) {
-          $control_id = $pos.'_'. $dayHeaders[$i];
-          $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        if ($user->isPluginEnabled('wvns')) {
+          $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
+          $pos++;
+          // Insert empty cells with proper control ids.
+          for ($i = 0; $i < 7; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+          }
+          $pos--;
         }
-        $pos--;
       }
     }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 70106851d..ac41b7c67 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.19.3.4978 | 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.3.4979 | 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>

From cabf2460445f26eded09e7d2c9c8cda97e8db593 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 18:04:07 +0000
Subject: [PATCH 0939/1848] Another fix for negative hours.

---
 WEB-INF/lib/ttTimeHelper.class.php     | 2 +-
 WEB-INF/lib/ttWeekViewHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 9ad64fc4c..08ffc46d8 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -189,7 +189,7 @@ static function minutesToDuration($minutes, $abbreviate = false) {
   // toMinutes - converts a time string in format 00:00 to a number of minutes.
   static function toMinutes($value) {
     $signMultiplier = ttStartsWith($value, '-') ? -1 : 1;
-    if ($signMultiplier == -1) $duration = ltrim($duration, '-');
+    if ($signMultiplier == -1) $value = ltrim($value, '-');
 
     $time_a = explode(':', $value);
     return $signMultiplier * ((int)@$time_a[1] + ((int)@$time_a[0]) * 60);
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index f7ad3f6c0..a790268bb 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -354,7 +354,7 @@ static function getDayTotals($dataArray, $dayHeaders) {
     }
     // Convert minutes to hh:mm for display.
     foreach($dayHeaders as $dayHeader) {
-      $dayTotals[$dayHeader] = ttTimeHelper::toAbsDuration($dayTotals[$dayHeader]);
+      $dayTotals[$dayHeader] = ttTimeHelper::minutesToDuration($dayTotals[$dayHeader]); // This breaks for negative hours.
     }
     return $dayTotals;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ac41b7c67..5e5dd184a 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.19.3.4979 | 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.3.4980 | 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>

From f787edd7045299de3885c052d243b446f7324ea0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 23 Apr 2019 19:10:27 +0000
Subject: [PATCH 0940/1848] Another fix in week view for negative hours.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 10 ++++++++--
 WEB-INF/templates/footer.tpl           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index a790268bb..1144cea6b 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -354,7 +354,7 @@ static function getDayTotals($dataArray, $dayHeaders) {
     }
     // Convert minutes to hh:mm for display.
     foreach($dayHeaders as $dayHeader) {
-      $dayTotals[$dayHeader] = ttTimeHelper::minutesToDuration($dayTotals[$dayHeader]); // This breaks for negative hours.
+      $dayTotals[$dayHeader] = ttTimeHelper::minutesToDuration($dayTotals[$dayHeader]);
     }
     return $dayTotals;
   }
@@ -579,8 +579,14 @@ static function canModify($tt_log_id, $new_duration, $err) {
     }
 
     // We do have start time.
-    // Quick test if new duration is less then already existing.
     $newMinutes = ttTimeHelper::toMinutes($new_duration);
+    if ($newMinutes < 0) {
+      // Negative durations are not supported when start time is defined.
+      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
+      return false;
+    }
+
+    // Quick test if new duration is less than already existing.
     $oldMinutes = ttTimeHelper::toMinutes($oldDuration);
     if ($newMinutes < $oldMinutes)
       return true; // Safe to modify.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e5dd184a..3e0c4c8a3 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.19.3.4980 | 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.3.4981 | 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>

From 67e827dacf08d8a55dff9118c82dd964f5da12c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 24 Apr 2019 13:52:34 +0000
Subject: [PATCH 0941/1848] Fixed approve_all_reports right assignment and
 check.

---
 WEB-INF/lib/ttRoleHelper.class.php | 4 ++--
 WEB-INF/resources/en.lang.php      | 2 +-
 WEB-INF/templates/footer.tpl       | 2 +-
 report.php                         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index fcffd9caa..326d0faf5 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -193,7 +193,7 @@ static function createPredefinedRoles($group_id, $lang)
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,update_work';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_work,bid_on_work';
-    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_own_timesheets,manage_subgroups';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
@@ -254,7 +254,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
-    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,manage_subgroups';
+    $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
     // Active roles.
     $name = $mdb2->quote($i18n->get('role.user.label'));
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 49d502367..4d1a18284 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -579,7 +579,7 @@
 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
-'role.admin.description' => 'Site adminsitrator.',
+'role.admin.description' => 'Site administrator.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3e0c4c8a3..eafc12d4a 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.19.3.4981 | 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.3.4982 | 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/report.php b/report.php
index 31cee67a3..53c73ee1c 100644
--- a/report.php
+++ b/report.php
@@ -91,7 +91,7 @@
 // - We can sssign items to invoices.
 // - We can assign items to a timesheet.
 // Determine these conditions separately.
-if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_eports')))
+if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
   $useMarkApproved = true;
 if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
   $useMarkPaid = true;

From 44e4bbe10c7f66ab47ce298009009e6627432bc5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 24 Apr 2019 15:25:50 +0000
Subject: [PATCH 0942/1848] Renamed MULTITEAM_MODE to MULTIORG_MODE to better
 reflect the meaning of the constant.

---
 WEB-INF/config.php.dist      | 4 ++--
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/header.tpl | 2 +-
 login.php                    | 2 +-
 mobile/login.php             | 2 +-
 register.php                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 577baeafb..1785336fe 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -42,12 +42,12 @@ define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8mb4');
 // and now you see some corrupted characters. See http://dev.mysql.com/doc/refman/5.0/en/charset-mysql.html
 
 
-// MULTITEAM_MODE option defines whether users can create their own top groups (organizations).
+// MULTIORG_MODE option defines whether users can create their own top groups (organizations).
 // When false, a Time Tracker server is managed by admin, who creates top groups (one or many).
 //
 // Available values are true or false.
 //
-define('MULTITEAM_MODE', true);
+define('MULTIORG_MODE', true);
 
 
 // Application name.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eafc12d4a..1ad5a7212 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.19.3.4982 | 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.3.4983 | 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/header.tpl b/WEB-INF/templates/header.tpl
index b420f1ae8..2c5fa6170 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -155,7 +155,7 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a>
-  {if isTrue('MULTITEAM_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
             <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a>
   {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
diff --git a/login.php b/login.php
index 68a80678f..8185203a3 100644
--- a/login.php
+++ b/login.php
@@ -75,7 +75,7 @@
   }
 } // isPost
 
-if(!isTrue('MULTITEAM_MODE') && !ttOrgHelper::getOrgs())
+if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
diff --git a/mobile/login.php b/mobile/login.php
index 26b75db46..a432e5b60 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -80,7 +80,7 @@
   }
 } // isPost
 
-if(!isTrue('MULTITEAM_MODE') && !ttOrgHelper::getOrgs())
+if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
diff --git a/register.php b/register.php
index 4c923c730..0c0374b33 100644
--- a/register.php
+++ b/register.php
@@ -29,7 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 
-if (!isTrue('MULTITEAM_MODE') || $auth->isPasswordExternal()) {
+if (!isTrue('MULTIORG_MODE') || $auth->isPasswordExternal()) {
   header('Location: login.php');
   exit();
 }

From a26a0989ad93cce9de9f45312990da9610e53045 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 24 Apr 2019 19:59:30 +0000
Subject: [PATCH 0943/1848] Configirable option whether to show Week menu.

---
 WEB-INF/resources/ca.lang.php         |  2 ++
 WEB-INF/resources/cs.lang.php         |  2 ++
 WEB-INF/resources/da.lang.php         |  3 +++
 WEB-INF/resources/de.lang.php         |  3 +++
 WEB-INF/resources/en.lang.php         |  2 ++
 WEB-INF/resources/es.lang.php         |  2 ++
 WEB-INF/resources/et.lang.php         |  3 +++
 WEB-INF/resources/fa.lang.php         |  3 +++
 WEB-INF/resources/fi.lang.php         |  3 +++
 WEB-INF/resources/fr.lang.php         |  3 +++
 WEB-INF/resources/gr.lang.php         |  3 +++
 WEB-INF/resources/he.lang.php         |  2 ++
 WEB-INF/resources/hu.lang.php         |  2 ++
 WEB-INF/resources/it.lang.php         |  3 +++
 WEB-INF/resources/ja.lang.php         |  2 ++
 WEB-INF/resources/ko.lang.php         |  2 ++
 WEB-INF/resources/nl.lang.php         |  3 +++
 WEB-INF/resources/no.lang.php         |  2 ++
 WEB-INF/resources/pl.lang.php         |  3 +++
 WEB-INF/resources/pt-br.lang.php      |  3 +++
 WEB-INF/resources/pt.lang.php         |  2 ++
 WEB-INF/resources/ro.lang.php         |  2 ++
 WEB-INF/resources/ru.lang.php         |  2 ++
 WEB-INF/resources/sk.lang.php         |  2 ++
 WEB-INF/resources/sl.lang.php         |  2 ++
 WEB-INF/resources/sr.lang.php         |  3 +++
 WEB-INF/resources/sv.lang.php         |  3 +++
 WEB-INF/resources/tr.lang.php         |  2 ++
 WEB-INF/resources/zh-cn.lang.php      |  3 +++
 WEB-INF/resources/zh-tw.lang.php      |  2 ++
 WEB-INF/templates/display_options.tpl | 10 ++++++++++
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/header.tpl          |  3 +++
 WEB-INF/templates/time.tpl            |  2 +-
 WEB-INF/templates/week.tpl            |  2 ++
 display_options.php                   | 12 ++++++++++--
 time.php                              |  1 +
 week.php                              |  1 +
 38 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a49aef797..d7bccc80e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -53,6 +53,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Informes',
 // TODO: translate the following.
@@ -664,5 +665,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 662b382e0..941a0ca55 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -54,6 +54,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Sestavy',
 // TODO: translate the following.
@@ -677,5 +678,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 45d1790a3..07a6ecdbb 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
 // TODO: translate the following.
@@ -635,6 +637,7 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 41ab5a6eb..b79a52768 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -49,6 +49,8 @@
 'menu.group' => 'Gruppe',
 'menu.plugins' => 'Erweiterungen',
 'menu.time' => 'Zeiten',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
 // TODO: translate the following.
@@ -608,5 +610,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4d1a18284..5814f8113 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -50,6 +50,7 @@
 'menu.subgroups' => 'Subgroups',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
+'menu.week' => 'Week',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
 'menu.timesheets' => 'Timesheets',
@@ -590,5 +591,6 @@
 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b29bf3245..dd8cfa58b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -52,6 +52,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tiempo',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reportes',
 // TODO: translate the following.
@@ -679,5 +680,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5c69d6b7e..95e863f56 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -51,6 +51,8 @@
 'menu.group' => 'Grupp',
 'menu.plugins' => 'Lisad',
 'menu.time' => 'Ajaarvestus',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Kulud',
 'menu.reports' => 'Raportid',
 // TODO: translate the following.
@@ -637,5 +639,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a77c13c63..bf8e71893 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -52,6 +52,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'پلاگین ها',
 'menu.time' => 'زمان',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
 // TODO: translate the following.
@@ -659,5 +661,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e0b603491..2c4d08f69 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'Lisäosat',
 'menu.time' => 'Tunnit',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
 // TODO: translate the following.
@@ -641,5 +643,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 2fa1a4aff..fdb2ec309 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
 // TODO: translate the following.
@@ -631,5 +633,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 3094dabda..806241797 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -49,6 +49,8 @@
 'menu.group' => 'Ομάδα',
 'menu.plugins' => 'Πρόσθετα',
 'menu.time' => 'Χρόνος',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
 // TODO: translate the following.
@@ -620,5 +622,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 820da0367..e344a28b8 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -53,6 +53,7 @@
 'menu.plugins' => 'תוספים',
 'menu.time' => 'זמן',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'דוחות',
 // TODO: translate the following.
@@ -663,5 +664,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index fdc0d0271..aceb35241 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -53,6 +53,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Munkaidő',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Riportok',
 // TODO: translate the following.
@@ -669,5 +670,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1340e251f..55754834b 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -51,6 +51,8 @@
 'menu.group' => 'Gruppo',
 'menu.plugins' => 'Plugin',
 'menu.time' => 'Tempo',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
 // TODO: translate the following.
@@ -634,5 +636,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 433642786..4536cc59d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -53,6 +53,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '時間',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'レポート',
 // TODO: translate the following.
@@ -672,5 +673,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index e34f25f5f..693c86beb 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -53,6 +53,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '시간',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '보고서',
 // TODO: translate the following.
@@ -670,5 +671,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index bf4f3d546..4db86bc82 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -49,6 +49,8 @@
 'menu.group' => 'Groep',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
 'menu.timesheets' => 'Tijdenoverzichten',
@@ -589,5 +591,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 91de93ed9..9076c0f80 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -54,6 +54,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapporter',
 // TODO: translate the following.
@@ -669,5 +670,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3bfbf556c..ffa3ca324 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'Moduły',
 'menu.time' => 'Czas',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
 // TODO: translate the following.
@@ -644,5 +646,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 829b3ec10..b39801f25 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Gastos',
 'menu.reports' => 'Relatórios',
 // TODO: translate the following.
@@ -639,5 +641,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 3985b216c..2cc4f33dc 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -55,6 +55,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Relatórios',
 // TODO: translate the following.
@@ -651,5 +652,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 79aa92a94..9bdbdac7f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -55,6 +55,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Timpul',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapoarte',
 // TODO: translate the following.
@@ -672,5 +673,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4b240dbd9..191cab62b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -49,6 +49,7 @@
 'menu.group' => 'Группа',
 'menu.plugins' => 'Плагины',
 'menu.time' => 'Время',
+'menu.week' => 'Неделя',
 'menu.expenses' => 'Расходы',
 'menu.reports' => 'Отчёты',
 'menu.timesheets' => 'Табели',
@@ -581,5 +582,6 @@
 'form.timesheet_view.disapprove_body' => "Ваш табель %s не одобрен.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+'form.display_options.menu' => 'Меню',
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b2dfe3524..51b4bedba 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -52,6 +52,7 @@
 'menu.plugins' => 'Moduly',
 'menu.time' => 'Časový záznam',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Zostavy',
 // TODO: translate the following.
@@ -652,5 +653,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index cd4a17dbd..d275e10a6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -54,6 +54,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Poročila',
 // TODO: translate the following.
@@ -646,5 +647,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 05d32a685..be1acb9ec 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 'menu.plugins' => 'Dodaci',
 'menu.time' => 'Vreme',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Troškovi',
 'menu.reports' => 'Izveštaji',
 // TODO: translate the following.
@@ -642,5 +644,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 9f1a09724..701c62c70 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -49,6 +49,8 @@
 'menu.group' => 'Grupp',
 'menu.plugins' => 'Tillägg',
 'menu.time' => 'Tider',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
 // TODO: translate the following.
@@ -639,5 +641,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 241c40d91..d158ada98 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -55,6 +55,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Zaman',
 // TODO: translate the following.
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Raporlar',
 // TODO: translate the following.
@@ -685,5 +686,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index acda53b88..2c17bd65f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -51,6 +51,8 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '时间记录',
+// TODO: translate the following.
+// 'menu.week' => 'Week',
 'menu.expenses' => '费用',
 'menu.reports' => '报告',
 // TODO: translate the following.
@@ -655,5 +657,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 334551bc5..28cbddc44 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -51,6 +51,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '報告',
 // TODO: translate the following.
@@ -662,5 +663,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
+// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 );
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index a4fe69e38..d11b08886 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -1,5 +1,15 @@
 {$forms.displayOptionsForm.open}
 <table cellspacing="1" cellpadding="2" border="0">
+{if $show_week_menu}
+  <tr><td>&nbsp;</td></tr>
+  <tr><td class="sectionHeaderNoBorder">{$i18n.form.display_options.menu}</td></tr>
+  <tr>
+    <td><label for="menu_week">{$i18n.label.week_view}:</label></td>
+    <td nowrap>{$forms.displayOptionsForm.menu_week.control} <a href="https://www.anuko.com/lp/tt_35.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+{/if}
+
+  <tr><td>&nbsp;</td></tr>
   <tr><td class="sectionHeaderNoBorder">{$i18n.title.time}</td></tr>
   <tr>
     <td><label for="time_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1ad5a7212..c5d29d855 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.19.3.4983 | 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.3.4984 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 2c5fa6170..0862523af 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -108,6 +108,9 @@
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
+      {if $user->isPluginEnabled('wv') && $user->getConfigOption('menu_week')}
+           <a class="mainMenu" href="week.php">{$i18n.menu.week}</a>
+      {/if}
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
            <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index e32140a92..0dcfd1079 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -8,7 +8,7 @@
 
 {$forms.timeRecordForm.open}
 <table cellspacing="4" cellpadding="0" border="0">
-{if $user->isPluginEnabled('wv')}
+{if $show_navigation}
   <tr>
     <td align="center" colspan=2">
       <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 33a218a3d..cd45a3b17 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -23,11 +23,13 @@ function fillDropdowns() {
 
 {$forms.weekTimeForm.open}
 <table cellspacing="4" cellpadding="0" border="0">
+{if $show_navigation}
   <tr>
     <td align="center" colspan=2">
       <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
     </td>
   </tr>
+{/if}
   <tr>
     <td valign="top">
       <table>
diff --git a/display_options.php b/display_options.php
index 222cc25da..a7426aaaa 100644
--- a/display_options.php
+++ b/display_options.php
@@ -40,14 +40,20 @@
 $config = new ttConfigHelper($user->getConfig());
 
 if ($request->isPost()) {
-  $cl_time_note_on_separate_row = trim($request->getParameter('time_note_on_separate_row'));
-  $cl_report_note_on_separate_row = trim($request->getParameter('report_note_on_separate_row'));
+  $cl_menu_week = $request->getParameter('menu_week');
+  $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row');
+  $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row');
 } else {
+  $cl_menu_week = $config->getDefinedValue('menu_week');
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
 }
 
 $form = new Form('displayOptionsForm');
+// Menu.
+$form->addInput(array('type'=>'checkbox','name'=>'menu_week','value'=>$cl_menu_week));
+
+// Time page.
 // $form->addInput(array('type'=>'checkbox','name'=>'time_client','value'=>$cl_time_client));
 // $form->addInput(array('type'=>'checkbox','name'=>'time_cf_1','value'=>$cl_time_cf_1));
 // $form->addInput(array('type'=>'checkbox','name'=>'time_project','value'=>$cl_time_project));
@@ -68,6 +74,7 @@
 if ($request->isPost()){
   if ($err->no()) {
     // Update config.
+    $config->setDefinedValue('menu_week', $cl_menu_week);
     $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
     if ($user->updateGroup(array('config' => $config->getConfig()))) {
@@ -79,6 +86,7 @@
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_week_menu', $user->isPluginEnabled('wv'));
 $smarty->assign('title', $i18n->get('title.display_options'));
 $smarty->assign('content_page_name', 'display_options.tpl');
 $smarty->display('index.tpl');
diff --git a/time.php b/time.php
index d05f0c599..e7ff10ae8 100644
--- a/time.php
+++ b/time.php
@@ -448,6 +448,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->getConfigOption('menu_week'));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_project', $showProject);
diff --git a/week.php b/week.php
index 879d960ea..af5b9eb06 100644
--- a/week.php
+++ b/week.php
@@ -508,6 +508,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
+$smarty->assign('show_navigation', !$user->getConfigOption('menu_week'));
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'week.tpl');

From e23ea8f905bd9122e5c52a3457d05ebb20f6570b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 24 Apr 2019 21:25:19 +0000
Subject: [PATCH 0944/1848] Changed title on week view to Week from Time.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/week.tpl   | 2 +-
 week.php                     | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c5d29d855..a4372d0b3 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.19.3.4984 | 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.3.4985 | 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/week.tpl b/WEB-INF/templates/week.tpl
index cd45a3b17..e786ba856 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -39,7 +39,7 @@ function fillDropdowns() {
           <td>{$forms.weekTimeForm.onBehalfUser.control}</td>
         </tr>
 {/if}
-{if $user->isPluginEnabled('cl')}
+{if $show_client}
         <tr>
           <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
           <td>{$forms.weekTimeForm.client.control}</td>
diff --git a/week.php b/week.php
index af5b9eb06..e2aa2d9d8 100644
--- a/week.php
+++ b/week.php
@@ -57,6 +57,7 @@
 }
 // End of access checks.
 
+$showClient = $user->isPluginEnabled('cl');
 $showFiles = $user->isPluginEnabled('at');
 
 // Initialize and store date in session.
@@ -509,7 +510,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
 $smarty->assign('show_navigation', !$user->getConfigOption('menu_week'));
+$smarty->assign('show_client', $showClient);
 $smarty->assign('show_files', $showFiles);
-$smarty->assign('title', $i18n->get('title.time'));
+$smarty->assign('title', $i18n->get('menu.week'));
 $smarty->assign('content_page_name', 'week.tpl');
 $smarty->display('index.tpl');

From 2b39252b38f5bd1be462224fe781a40f5b0ddf95 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 25 Apr 2019 01:34:58 +0000
Subject: [PATCH 0945/1848] Version fix in mysql.sql.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mysql.sql                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4372d0b3..2edaa4b1e 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.19.3.4985 | 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.3.4986 | 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/mysql.sql b/mysql.sql
index c14045c7d..bc79445e9 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -609,4 +609,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.2', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.3', now()); # TODO: change when structure changes.

From 4334f16faa68ecaec5aceb5c16bb500d62a3688f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 26 Apr 2019 15:54:27 +0000
Subject: [PATCH 0946/1848] Refactoring, moving plugin config options into
 config field.

---
 WEB-INF/lib/ttGroup.class.php             | 15 +++++++----
 WEB-INF/lib/ttUser.class.php              | 31 ++++++++++++++++++-----
 WEB-INF/templates/expense_edit.tpl        |  2 +-
 WEB-INF/templates/expenses.tpl            |  2 +-
 WEB-INF/templates/footer.tpl              |  2 +-
 WEB-INF/templates/mobile/expense_edit.tpl |  2 +-
 WEB-INF/templates/mobile/expenses.tpl     |  2 +-
 WEB-INF/templates/time.tpl                |  2 +-
 WEB-INF/templates/time_edit.tpl           |  2 +-
 WEB-INF/templates/week.tpl                |  2 +-
 expense_edit.php                          |  2 +-
 expenses.php                              |  2 +-
 mobile/expense_edit.php                   |  2 +-
 mobile/expenses.php                       |  2 +-
 mobile/time.php                           |  2 +-
 mobile/time_edit.php                      |  2 +-
 mobile/timer.php                          |  2 +-
 plugins.php                               | 12 ++++++---
 time.php                                  |  2 +-
 time_edit.php                             |  2 +-
 week.php                                  |  2 +-
 21 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 9c12e95b6..c3a56e055 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -54,7 +54,10 @@ class ttGroup {
   var $password_complexity = null; // Password complexity example.
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
+
   var $config = null;           // Comma-separated list of miscellaneous config options.
+  var $configHelper = null;     // An instance of ttConfigHelper class.
+
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
@@ -104,13 +107,15 @@ function __construct($id, $org_id) {
       /*
       $this->custom_logo = $val['custom_logo'];
       */
+
+      // TODO: refactor this.
       $this->config = $val['config'];
-      $config = new ttConfigHelper($this->config);
+      $this->configHelper = new ttConfigHelper($val['config']);
       // Set user config options.
-      $this->show_holidays = $config->getDefinedValue('show_holidays');
-      $this->punch_mode = $config->getDefinedValue('punch_mode');
-      $this->allow_overlap = $config->getDefinedValue('allow_overlap');
-      $this->future_entries = $config->getDefinedValue('future_entries');
+      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
+      $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
+      $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
+      $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
     }
 
     // Determine active user count in a separate query.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index dd4a81d52..5ee67f594 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -68,7 +68,11 @@ class ttUser {
   var $password_complexity = null; // Password complexity example.
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
+
+  // Refactoring ongoing. Towards using helper instead of config string?
   var $config = null;           // Comma-separated list of miscellaneous config options.
+  var $configHelper = null;     // An instance of ttConfigHelper class.
+
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
@@ -137,13 +141,15 @@ function __construct($login, $id = null) {
       $this->workday_minutes = $val['workday_minutes'];
       $this->custom_logo = $val['custom_logo'];
 
+      // TODO: refactor this.
       $this->config = $val['config'];
-      $config = new ttConfigHelper($this->config);
+      $this->configHelper = new ttConfigHelper($val['config']);
+
       // Set user config options.
-      $this->show_holidays = $config->getDefinedValue('show_holidays');
-      $this->punch_mode = $config->getDefinedValue('punch_mode');
-      $this->allow_overlap = $config->getDefinedValue('allow_overlap');
-      $this->future_entries = $config->getDefinedValue('future_entries');
+      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
+      $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
+      $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
+      $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
       
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
@@ -229,7 +235,7 @@ function getWorkdayMinutes() {
 
   // getConfig returns config string for active group.
   function getConfig() {
-    return ($this->behalfGroup ? $this->behalfGroup->config : $this->config);
+    return ($this->behalfGroup ? $this->behalfGroup->configHelper->getConfig() : $this->configHelper->getConfig());
   }
 
   // getConfigOption returns true if an option is defined for group.
@@ -263,6 +269,19 @@ function isPluginEnabled($plugin)
     return in_array($plugin, explode(',', $this->getPlugins()));
   }
 
+  // isOptionEnabled checks whether a config option is enabled for user.
+  function isOptionEnabled($option)
+  {
+    return $this->behalfGroup ? $this->behalfGroup->configHelper->getDefinedValue($option) : $this->configHelper->getDefinedValue($option);
+  }
+
+  // setOption sets an option inside of ttConfigHelper instance.
+  // Note that it does not write to the database.
+  function setOption($option, $enable = true)
+  {
+    return $this->behalfGroup ? $this->behalfGroup->configHelper->setDefinedValue($option, $enable) : $this->configHelper->setDefinedValue($option, $enable);
+  }
+
   // getAssignedProjects - returns an array of assigned projects.
   function getAssignedProjects($includeFiles = false)
   {
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index 850e6442a..671e868cf 100644
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.tpl
@@ -134,7 +134,7 @@ function recalculateCost() {
     <table border="0">
 {if $user->isPluginEnabled('cl')}
     <tr>
-      <td align="right">{$i18n.label.client} {if $user->isPluginEnabled('cm')}(*){/if}:</td>
+      <td align="right">{$i18n.label.client} {if $user->isOptionEnabled('client_required')}(*){/if}:</td>
       <td>{$forms.expenseItemForm.client.control}</td>
     </tr>
 {/if}
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index df0eb4d12..7272f01fe 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -125,7 +125,7 @@ function recalculateCost() {
 {/if}
 {if $user->isPluginEnabled('cl')}
         <tr>
-          <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
           <td>{$forms.expensesForm.client.control}</td>
         </tr>
 {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2edaa4b1e..e806ad805 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.19.3.4986 | 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.3.4987 | 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/mobile/expense_edit.tpl b/WEB-INF/templates/mobile/expense_edit.tpl
index 708cc23c4..d4834ae1a 100644
--- a/WEB-INF/templates/mobile/expense_edit.tpl
+++ b/WEB-INF/templates/mobile/expense_edit.tpl
@@ -134,7 +134,7 @@ function recalculateCost() {
     <table border="0">
 {if $user->isPluginEnabled('cl')}
     <tr>
-      <td align="right">{$i18n.label.client} {if $user->isPluginEnabled('cm')}(*){/if}:</td>
+      <td align="right">{$i18n.label.client} {if $user->isOptionEnabled('client_required')}(*){/if}:</td>
       <td>{$forms.expenseItemForm.client.control}</td>
     </tr>
 {/if}
diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
index 7afde73d2..81d7a214a 100644
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ b/WEB-INF/templates/mobile/expenses.tpl
@@ -134,7 +134,7 @@ function recalculateCost() {
 {/if}
 {if $user->isPluginEnabled('cl')}
         <tr>
-          <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
           <td>{$forms.expensesForm.client.control}</td>
         </tr>
 {/if}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 0dcfd1079..e3266076b 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -26,7 +26,7 @@
 {/if}
 {if $show_client}
         <tr>
-          <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
           <td>{$forms.timeRecordForm.client.control}</td>
         </tr>
 {/if}
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index 66778e17d..42b1674d4 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -24,7 +24,7 @@ function confirmSave() {
     <table border="0">
 {if $user->isPluginEnabled('cl')}
     <tr>
-      <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+      <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
       <td>{$forms.timeRecordForm.client.control}</td>
     </tr>
 {/if}
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index e786ba856..366762cfc 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -41,7 +41,7 @@ function fillDropdowns() {
 {/if}
 {if $show_client}
         <tr>
-          <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
           <td>{$forms.weekTimeForm.client.control}</td>
         </tr>
 {/if}
diff --git a/expense_edit.php b/expense_edit.php
index 877ec6638..3cebac129 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -160,7 +160,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   if ($show_project && !$cl_project)
     $err->add($i18n->get('error.project'));
diff --git a/expenses.php b/expenses.php
index e1eaeddae..2c25bde66 100644
--- a/expenses.php
+++ b/expenses.php
@@ -190,7 +190,7 @@
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($show_project && !$cl_project)
       $err->add($i18n->get('error.project'));
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 10035a9b4..654d1698d 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -155,7 +155,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   if ($show_project && !$cl_project)
     $err->add($i18n->get('error.project'));
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 1b8f7cda9..3b229368e 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -195,7 +195,7 @@
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($show_project && !$cl_project)
       $err->add($i18n->get('error.project'));
diff --git a/mobile/time.php b/mobile/time.php
index 30c7a402e..5a5c054d6 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -249,7 +249,7 @@
   if ($request->getParameter('btn_submit')) {
 
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index b33b09914..364ebaf82 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -234,7 +234,7 @@
 if ($request->isPost()) {
 
   // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   if ($custom_fields) {
     if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
diff --git a/mobile/timer.php b/mobile/timer.php
index a8f708a8a..667536324 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -186,7 +186,7 @@
     $cl_finish = null;
 
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
diff --git a/plugins.php b/plugins.php
index dc3b7a5d8..4d2972bfd 100644
--- a/plugins.php
+++ b/plugins.php
@@ -62,7 +62,7 @@
   $plugins = explode(',', $user->getPlugins());
   $cl_charts = in_array('ch', $plugins);
   $cl_clients = in_array('cl', $plugins);
-  $cl_client_required = in_array('cm', $plugins);
+  $cl_client_required = $user->isOptionEnabled('client_required');
   $cl_invoices = in_array('iv', $plugins);
   $cl_paid_status = in_array('ps', $plugins);
   $cl_custom_fields = in_array('cf', $plugins);
@@ -114,8 +114,6 @@
     $plugins .= ',ch';
   if ($cl_clients)
      $plugins .= ',cl';
-  if ($cl_client_required)
-    $plugins .= ',cm';
   if ($cl_invoices)
     $plugins .= ',iv';
   if ($cl_paid_status)
@@ -158,8 +156,14 @@
 
   $plugins = trim($plugins, ',');
 
+  // Prepare a new config string.
+  $user->setOption('client_required', $cl_client_required);
+  $user->setOption('tax_expenses', $cl_tax_expenses);
+  $config = $user->getConfig();
+
   if ($user->updateGroup(array(
-    'plugins' => $plugins))) {
+    'plugins' => $plugins,
+    'config' => $config))) {
     header('Location: success.php');
     exit();
   } else
diff --git a/time.php b/time.php
index e7ff10ae8..ca48056a8 100644
--- a/time.php
+++ b/time.php
@@ -306,7 +306,7 @@
   if ($request->getParameter('btn_submit')) {
 
     // Validate user input.
-    if ($showClient && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
diff --git a/time_edit.php b/time_edit.php
index bbc95eade..bb0457384 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -239,7 +239,7 @@
 if ($request->isPost()) {
 
   // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   if ($custom_fields) {
     if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
diff --git a/week.php b/week.php
index e2aa2d9d8..05d399214 100644
--- a/week.php
+++ b/week.php
@@ -349,7 +349,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       }
     }
     if ($newEntryPosted) {
-      if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+      if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
         $err->add($i18n->get('error.client'));
       if ($custom_fields) {
         if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);

From 1078c4da84d79f93ef7f8bbffc5f0c8cb2a1a274 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 26 Apr 2019 16:51:30 +0000
Subject: [PATCH 0947/1848] Fixed holidays display for subgroups.

---
 WEB-INF/lib/form/Calendar.class.php | 3 +--
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 6c4a42231..a8455a873 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -172,9 +172,8 @@ function toString($date="") {
             }
 
               // holidays
-              //if ($this->showHolidays) {
               global $user;
-              if ($user->show_holidays) {
+              if ($user->isOptionEnabled('show_holidays')) {
               foreach ($this->holidays as $day) {
                 if($day == $date) {
                   $stl_cell = ' class="CalendarDayHoliday"';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e806ad805..c4dd47957 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.19.3.4987 | 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.3.4988 | 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>

From fb5b1697fdd701ada644b7e25f22a93a0893107c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 26 Apr 2019 20:12:03 +0000
Subject: [PATCH 0948/1848] Started to work on configurable holidays.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c4dd47957..c94bc7c01 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.19.3.4988 | 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.4989 | 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/dbinstall.php b/dbinstall.php
index d318f9be0..5dc943f28 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11903"]) {
+  if ($_POST["convert11900to11904"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1171,6 +1171,8 @@ function ttGenerateKeys() {
     ttExecute("INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('3', '1', 'PHP', NULL)");
     ttExecute("INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('4', '1', 'C/C++', NULL)");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.3', modified = now() where param_name = 'version_db' and param_value = '1.19.0'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `holidays` text default null AFTER `lock_spec`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.4', modified = now() where param_name = 'version_db' and param_value = '1.19.3'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1220,7 +1222,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.3)</b>
+    <td width="80%"><b>Create database structure (v1.19.4)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1269,8 +1271,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.3)</td>
-    <td><input type="submit" name="convert11900to11903" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.4)</td>
+    <td><input type="submit" name="convert11900to11904" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index bc79445e9..be0d7edf7 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -35,6 +35,7 @@ CREATE TABLE `tt_groups` (
   `plugins` varchar(255) default NULL,                   # a list of enabled plugins for group
   `lock_spec` varchar(255) default NULL,                 # Cron specification for record locking,
                                                          # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
+  `holidays` text default NULL,                          # holidays specification
   `workday_minutes` smallint(4) default 480,             # number of work minutes in a regular working day
   `custom_logo` tinyint(4) default 0,                    # whether to use a custom logo or not
   `config` text default NULL,                            # miscellaneous group configuration settings
@@ -609,4 +610,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.3', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.4', now()); # TODO: change when structure changes.

From ed41335d63e71a11d30e92f4367106e9398adf9d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 26 Apr 2019 20:34:30 +0000
Subject: [PATCH 0949/1848] Introduced a debug option and a localization string
 for holidays.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 6 ++++++
 group_edit.php                   | 1 +
 33 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index d7bccc80e..9c6619d3f 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -585,6 +585,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 941a0ca55..92c585e1a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -598,6 +598,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 07a6ecdbb..a0ab6ebf3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -557,6 +557,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Registrerings tilstand',
 'form.group_edit.mode_time' => 'Tid',
 'form.group_edit.mode_projects' => 'Projekter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b79a52768..1b3f2dbbb 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -533,6 +533,8 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Zeige Feiertage',
+// TODO: translate the following.
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',
 'form.group_edit.mode_projects' => 'Projekte',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5814f8113..74b959800 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -519,6 +519,7 @@
 'form.group_edit.24_hours' => '24 hours',
 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',
 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index dd8cfa58b..5582ddb47 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -599,6 +599,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 95e863f56..00d4067b6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -562,6 +562,8 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Näita pühi',
+// TODO: translate the following.
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Jälgimise režiim',
 'form.group_edit.mode_time' => 'ajaarvestus',
 'form.group_edit.mode_projects' => 'projektid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index bf8e71893..38326ebe0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -580,6 +580,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'حالت رهگیری',
 'form.group_edit.mode_time' => 'زمان',
 'form.group_edit.mode_projects' => 'پروژه ها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 2c4d08f69..50016dba3 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -563,6 +563,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Seurantamuoto',
 'form.group_edit.mode_time' => 'aika',
 'form.group_edit.mode_projects' => 'projektit',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index fdb2ec309..c53f01117 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -554,6 +554,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Mode suivi',
 'form.group_edit.mode_time' => 'Heures',
 'form.group_edit.mode_projects' => 'Projets',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 806241797..f80f8f257 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -542,6 +542,8 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Προβολή διακοπών',
+// TODO: translate the following.
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
 'form.group_edit.mode_time' => 'χρόνος',
 'form.group_edit.mode_projects' => 'έργα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e344a28b8..2da526be6 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -584,6 +584,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'סוג מעקב',
 'form.group_edit.mode_time' => 'זמן',
 'form.group_edit.mode_projects' => 'פרוייקטים',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index aceb35241..c3ae38649 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -590,6 +590,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 55754834b..40cf69c62 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -556,6 +556,8 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Mostra vacanze',
+// TODO: translate the following.
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modalità di registrazione',
 'form.group_edit.mode_time' => 'tempo',
 'form.group_edit.mode_projects' => 'progetti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 4536cc59d..ad23ad574 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -593,6 +593,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 693c86beb..61da3cb39 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -591,6 +591,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4db86bc82..b8a154352 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -518,6 +518,8 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 'form.group_edit.show_holidays' => 'Toon vakantiedagen',
+// TODO: translate the following.
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',
 'form.group_edit.mode_projects' => 'projecten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 9076c0f80..f7c2d8c9a 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -590,6 +590,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ffa3ca324..326ab86cd 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -566,6 +566,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tryb śledzenia',
 'form.group_edit.mode_time' => 'czas',
 'form.group_edit.mode_projects' => 'projekty',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b39801f25..72577385c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -561,6 +561,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',
 'form.group_edit.mode_projects' => 'projetos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2cc4f33dc..916af30c8 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -572,6 +572,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9bdbdac7f..55659e89a 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -593,6 +593,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 191cab62b..0d3e323e7 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -510,6 +510,7 @@
 'form.group_edit.24_hours' => '24 часа',
 'form.group_edit.display_options' => 'Опции отображения',
 'form.group_edit.show_holidays' => 'Показывать праздники',
+'form.group_edit.holidays' => 'Праздники',
 'form.group_edit.tracking_mode' => 'Режим работы',
 'form.group_edit.mode_time' => 'время',
 'form.group_edit.mode_projects' => 'проекты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 51b4bedba..b4230436d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -573,6 +573,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Režim sledovania',
 'form.group_edit.mode_time' => 'čas',
 'form.group_edit.mode_projects' => 'projekty',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d275e10a6..50bd7c143 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -567,6 +567,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index be1acb9ec..6ac9d2d7a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -564,6 +564,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Način evidencije',
 'form.group_edit.mode_time' => 'vreme',
 'form.group_edit.mode_projects' => 'projekti',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 701c62c70..23ca57c1c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -561,6 +561,7 @@
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Spårningsmetod',
 'form.group_edit.mode_time' => 'Endast tid',
 'form.group_edit.mode_projects' => 'Projekt',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d158ada98..29065535e 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -606,6 +606,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 2c17bd65f..f878f8558 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -577,6 +577,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 28cbddc44..3cee85481 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -583,6 +583,7 @@
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
 // 'form.group_edit.show_holidays' => 'Show holidays',
+// 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
 // 'form.group_edit.mode_projects' => 'projects',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c94bc7c01..b02e30e9a 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.19.4.4989 | 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.4990 | 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 906227898..00cd81693 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -78,6 +78,12 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
             <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
+{if isTrue('HOLIDAYS_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
+            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+{/if}
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
             <td>{$forms.groupForm.tracking_mode.control} {$forms.groupForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
diff --git a/group_edit.php b/group_edit.php
index b16a15f09..583c4424b 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -181,6 +181,7 @@
 
 // Show holidays checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
+$form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_holidays));
 
 // Prepare tracking mode choices.
 $tracking_mode_options = array();

From cdd27c2b163122cb6e2169851019721b3382abd7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 26 Apr 2019 21:17:51 +0000
Subject: [PATCH 0950/1848] Wrote a validation routine for holidays.

---
 WEB-INF/lib/common.lib.php   | 17 +++++++++++++++++
 WEB-INF/lib/ttUser.class.php |  3 ++-
 WEB-INF/templates/footer.tpl |  2 +-
 group_edit.php               |  4 ++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 747f3e016..b19feacdc 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -349,6 +349,23 @@ function ttValidIP($val, $emptyValid = false)
   return true;
 }
 
+// ttValidHolidays is used to check user input to validate holidays spec.
+// To keep things simple, the format is a comma-separated list of dates:
+// ****-01-01,****-12-31,2019-04-20
+// The above means Jan 1 and Dec 31 are holidays in all years, while Apr 20 is only in 2019.
+function ttValidHolidays($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0) return true;
+
+  $dates = explode(',', $val);
+  foreach ($dates as $date) {
+    if (!preg_match('/^[\d*]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/', $date))
+      return false;
+  }
+  return true;
+}
+
 // ttAccessAllowed checks whether user is allowed access to a particular page.
 // It is used as an initial check on all publicly available pages
 // (except login.php, register.php, and others where we don't have to check).
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5ee67f594..ab0affe4a 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -669,12 +669,13 @@ function updateGroup($fields) {
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
+    if (isset($fields['holidays'])) $holidays_part = ', holidays = '.$mdb2->quote($fields['holidays']);
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
 
     $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
       $time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
-      $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$workday_minutes_part.$modified_part, ',');
+      $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b02e30e9a..4d893815e 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.19.4.4990 | 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.4991 | 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/group_edit.php b/group_edit.php
index 583c4424b..2855de881 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -86,6 +86,7 @@
   $cl_time_format = $request->getParameter('time_format');
   $cl_start_week = $request->getParameter('start_week');
   $cl_show_holidays = $request->getParameter('show_holidays');
+  $cl_holidays = trim($request->getParameter('holidays'));
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');
   $cl_task_required = $request->getParameter('task_required');
@@ -107,6 +108,7 @@
   $cl_time_format = $group['time_format'];
   $cl_start_week = $group['week_start'];
   $cl_show_holidays = $config->getDefinedValue('show_holidays');
+  $cl_holidays = $group['holidays'];
   $cl_tracking_mode = $group['tracking_mode'];
   $cl_project_required = $group['project_required'];
   $cl_task_required = $group['task_required'];
@@ -238,6 +240,7 @@
     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'));
@@ -263,6 +266,7 @@
         'date_format' => $cl_date_format,
         'time_format' => $cl_time_format,
         'week_start' => $cl_start_week,
+        'holidays' => $cl_holidays,
         'tracking_mode' => $cl_tracking_mode,
         'project_required' => $cl_project_required,
         'task_required' => $cl_task_required,

From 9819bb63bec83c13dd40ebb2ffc24df5fcfeda33 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Apr 2019 14:47:02 +0000
Subject: [PATCH 0951/1848] Implemented configurable holidays.

---
 WEB-INF/lib/form/Calendar.class.php | 21 +++++++++--------
 WEB-INF/lib/ttGroup.class.php       |  2 ++
 WEB-INF/lib/ttTimeHelper.class.php  | 35 +++++++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php        |  9 +++++++-
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/group_edit.tpl    |  2 --
 6 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index a8455a873..f160cfa6c 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -171,15 +171,18 @@ function toString($date="") {
               $stl_cell = ' class="CalendarDay"';
             }
 
-              // holidays
-              global $user;
-              if ($user->isOptionEnabled('show_holidays')) {
-              foreach ($this->holidays as $day) {
-                if($day == $date) {
-                  $stl_cell = ' class="CalendarDayHoliday"';
-                  $stl_link = ' class="CalendarLinkHoliday"';
-                }
-              }
+            // Handle holidays.
+            // Prepare a date to check in DB_DATEFORMAT.
+            $date_to_check = "$thisyear-";
+            if (strlen($thismonth) == 1) $date_to_check .= '0';
+            $date_to_check .= "$thismonth-";
+            if (strlen($start_date+$j) == 1) $date_to_check .= '0';
+            $date_to_check .= $start_date+$j;
+
+            // Check if it falls on a holiday.
+            if (ttTimeHelper::isHoliday2($date_to_check)) {
+              $stl_cell = ' class="CalendarDayHoliday"';
+              $stl_link = ' class="CalendarLinkHoliday"';
             }
 
             // selected day
diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index c3a56e055..c6693bec3 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -60,6 +60,7 @@ class ttGroup {
 
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
+  var $holidays = null;         // Holidays specification.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
 
   var $active_users = 0;        // Count of active users in group.
@@ -103,6 +104,7 @@ function __construct($id, $org_id) {
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
+      $this->holidays = $val['holidays'];
       $this->workday_minutes = $val['workday_minutes'];
       /*
       $this->custom_logo = $val['custom_logo'];
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 08ffc46d8..2b5b39bca 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -53,6 +53,41 @@ static function isHoliday($date) {
     return false;
   }
 
+  // isHoliday determines if $date falls on a holiday.
+  static function isHoliday2($date) {
+    global $user;
+
+    $holidays = $user->getHolidays();
+    if (!$holidays)
+      return false;
+
+    $holiday_dates = explode(',', $holidays);
+    foreach ($holiday_dates as $holiDateSpec) {
+      if (ttTimeHelper::holidayMatch($date, $holiDateSpec))
+        return true;
+    }
+    return false;
+  }
+
+  // holidayMatch determines if $date matches a single $holiDateSpec.
+  static function holidayMatch($date, $holiDateSpec) {
+
+   $dateArray = explode('-', $date);
+   $holiDateSpecArray = explode('-', $holiDateSpec);
+
+   // Check year.
+   if ($dateArray[0] != $holiDateSpecArray[0] && $holiDateSpecArray[0] != '****') // **** means all years.
+     return false;
+   // Check month.
+   if ($dateArray[1] != $holiDateSpecArray[1])
+     return false;
+   // Check day.
+   if ($dateArray[2] != $holiDateSpecArray[2])
+     return false;
+
+    return true;
+  }
+
   // isValidTime validates a value as a time string.
   static function isValidTime($value) {
     if (strlen($value)==0 || !isset($value)) return false;
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ab0affe4a..16e2d2d16 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -75,6 +75,7 @@ class ttUser {
 
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
+  var $holidays = null;         // Holidays specification.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights = array();        // An array of user rights such as 'track_own_time', etc.
   var $is_client = false;       // Whether user is a client as determined by missing 'track_own_time' right.
@@ -94,7 +95,7 @@ function __construct($login, $id = null) {
     $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
       " u.quota_percent, u.email, g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
       " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type,".
-      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo".
+      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.holidays, g.workday_minutes, g.custom_logo".
       " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
@@ -138,6 +139,7 @@ function __construct($login, $id = null) {
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
+      $this->holidays = $val['holidays'];
       $this->workday_minutes = $val['workday_minutes'];
       $this->custom_logo = $val['custom_logo'];
 
@@ -228,6 +230,11 @@ function getLockSpec() {
     return ($this->behalfGroup ? $this->behalfGroup->lock_spec : $this->lock_spec);
   }
 
+  // getHolidays returns holidays specification for active group.
+  function getHolidays() {
+    return ($this->behalfGroup ? $this->behalfGroup->holidays : $this->holidays);
+  }
+
   // getWorkdayMinutes returns workday_minutes for active group.
   function getWorkdayMinutes() {
     return ($this->behalfGroup ? $this->behalfGroup->workday_minutes : $this->workday_minutes);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4d893815e..7efa4d66a 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.19.4.4991 | 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.4992 | 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 00cd81693..a68e28eb8 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -78,12 +78,10 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
             <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-{if isTrue('HOLIDAYS_DEBUG')}
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
             <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-{/if}
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
             <td>{$forms.groupForm.tracking_mode.control} {$forms.groupForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>

From 19f479eb795f39d331fbfe33ab20534112555630 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Apr 2019 15:16:45 +0000
Subject: [PATCH 0952/1848] Adjusted monthly quotas plugin to use configurable
 holidays.

---
 WEB-INF/lib/form/Calendar.class.php | 13 +++----------
 WEB-INF/lib/ttTimeHelper.class.php  | 26 ++++++++++----------------
 WEB-INF/templates/footer.tpl        |  2 +-
 plugins/MonthlyQuota.class.php      |  3 ++-
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index f160cfa6c..d3845e8b4 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -171,16 +171,9 @@ function toString($date="") {
               $stl_cell = ' class="CalendarDay"';
             }
 
-            // Handle holidays.
-            // Prepare a date to check in DB_DATEFORMAT.
-            $date_to_check = "$thisyear-";
-            if (strlen($thismonth) == 1) $date_to_check .= '0';
-            $date_to_check .= "$thismonth-";
-            if (strlen($start_date+$j) == 1) $date_to_check .= '0';
-            $date_to_check .= $start_date+$j;
-
-            // Check if it falls on a holiday.
-            if (ttTimeHelper::isHoliday2($date_to_check)) {
+            // holidays
+            $date_to_check = ttTimeHelper::dateInDatabaseFormat($thisyear, $thismonth, $start_date+$j);
+            if (ttTimeHelper::isHoliday($date_to_check)) {
               $stl_cell = ' class="CalendarDayHoliday"';
               $stl_link = ' class="CalendarLinkHoliday"';
             }
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 2b5b39bca..6fd816e0c 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -40,22 +40,6 @@ static function isWeekend($date) {
   // isHoliday determines if $date falls on a holiday.
   static function isHoliday($date) {
     global $user;
-    global $i18n;
-
-    if (!$user->show_holidays) return false;
-
-    // $date is expected as string in DB_DATEFORMAT.
-    $month = date('m', strtotime($date));
-    $day = date('d', strtotime($date));
-    if (in_array($month.'/'.$day, $i18n->holidays))
-      return true;
-
-    return false;
-  }
-
-  // isHoliday determines if $date falls on a holiday.
-  static function isHoliday2($date) {
-    global $user;
 
     $holidays = $user->getHolidays();
     if (!$holidays)
@@ -88,6 +72,16 @@ static function holidayMatch($date, $holiDateSpec) {
     return true;
   }
 
+  // dateInDatabaseFormat prepares a date string in DB_DATEFORMAT out of year, month, and day.
+  static function dateInDatabaseFormat($year, $month, $day) {
+    $date = "$year-";
+    if (strlen($month) == 1) $date .= '0';
+    $date .= "$month-";
+    if (strlen($day) == 1) $date .= '0';
+    $date .= $day;
+    return $date;
+  }
+
   // isValidTime validates a value as a time string.
   static function isValidTime($value) {
     if (strlen($value)==0 || !isset($value)) return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7efa4d66a..6710c5c86 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.19.4.4992 | 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.4993 | 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/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 21854672b..c8559ad46 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -104,7 +104,7 @@ public function getUserQuotaFrom1st($selected_date) {
     // Iterate from 1st up to selected date.
     $workdaysFrom1st = 0;
     for ($i = 1; $i <= $selected_date->mDate; $i++) {
-      $date = "$selected_date->mYear-$selected_date->mMonth-$i";
+      $date = ttTimeHelper::dateInDatabaseFormat($selected_date->mYear, $selected_date->mMonth, $i);
       if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) {
         $workdaysFrom1st++;
       }
@@ -139,6 +139,7 @@ private function getNumWorkdays($month, $year) {
     // Iterate through the entire month.
     for ($i = 1; $i <= $daysInMonth; $i++) {
       $date = "$year-$month-$i";
+      $date = ttTimeHelper::dateInDatabaseFormat($year, $month, $i);
       if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) {
         $workdaysInMonth++;
       }

From 61284ea9e69220c9fc6a537bf0437584b1525367 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Apr 2019 15:30:25 +0000
Subject: [PATCH 0953/1848] Removed holidays from translation files.

---
 WEB-INF/lib/I18n.class.php          | 1 -
 WEB-INF/lib/form/Calendar.class.php | 6 ------
 WEB-INF/resources/ca.lang.php       | 2 --
 WEB-INF/resources/cs.lang.php       | 2 --
 WEB-INF/resources/da.lang.php       | 2 --
 WEB-INF/resources/de.lang.php       | 2 --
 WEB-INF/resources/en.lang.php       | 2 --
 WEB-INF/resources/es.lang.php       | 2 --
 WEB-INF/resources/et.lang.php       | 2 --
 WEB-INF/resources/fa.lang.php       | 2 --
 WEB-INF/resources/fi.lang.php       | 2 --
 WEB-INF/resources/fr.lang.php       | 2 --
 WEB-INF/resources/gr.lang.php       | 2 --
 WEB-INF/resources/he.lang.php       | 2 --
 WEB-INF/resources/hu.lang.php       | 2 --
 WEB-INF/resources/it.lang.php       | 2 --
 WEB-INF/resources/ja.lang.php       | 2 --
 WEB-INF/resources/ko.lang.php       | 2 --
 WEB-INF/resources/nl.lang.php       | 2 --
 WEB-INF/resources/no.lang.php       | 2 --
 WEB-INF/resources/pl.lang.php       | 2 --
 WEB-INF/resources/pt-br.lang.php    | 2 --
 WEB-INF/resources/pt.lang.php       | 2 --
 WEB-INF/resources/ro.lang.php       | 2 --
 WEB-INF/resources/ru.lang.php       | 2 --
 WEB-INF/resources/sk.lang.php       | 2 --
 WEB-INF/resources/sl.lang.php       | 2 --
 WEB-INF/resources/sr.lang.php       | 2 --
 WEB-INF/resources/sv.lang.php       | 2 --
 WEB-INF/resources/tr.lang.php       | 2 --
 WEB-INF/resources/zh-cn.lang.php    | 2 --
 WEB-INF/resources/zh-tw.lang.php    | 2 --
 WEB-INF/templates/footer.tpl        | 2 +-
 33 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 15799c23e..7eb6228ff 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -70,7 +70,6 @@ function load($localName) {
       $this->weekdayNames = $i18n_weekdays;
 
         $this->weekdayShortNames = $i18n_weekdays_short;
-        $this->holidays = $i18n_holidays;
 
       foreach ($i18n_key_words as $kword=>$value) {
         $pos = strpos($kword, ".");
diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index d3845e8b4..72da0e42c 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -63,12 +63,6 @@ function localize() {
       
       $this->mMonthNames = $i18n->monthNames;
       $this->mWeekDayShortNames = $i18n->weekdayShortNames;
-      if (is_array($i18n->holidays)) {
-        foreach ($i18n->holidays as $fday) {
-          $date_a = explode("/",$fday); // format mm/dd
-          $this->holidays[] = mktime(0,0,0, $date_a[0], $date_a[1], date("Y"));// + 7200;
-        }
-      }
       $this->weekStartDay = $user->week_start;
     }
 
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9c6619d3f..435e3ebef 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Gener', 'Febrer', 'Març', 'Abril', 'Maig', 'Juny', 'Juliol', 'Agost', 'Setembre', 'Octubre', 'Novembre', 'Desembre');
 $i18n_weekdays = array('Diumenge', 'Dilluns', 'Dimarts', 'Dimecres', 'Dijous', 'Divendres', 'Dissabte');
 $i18n_weekdays_short = array('Dg', 'Dl', 'Dm', 'Dc', 'Dj', 'Dv', 'Ds');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/16', '02/20', '03/29', '07/04', '09/04', '10/09', '11/11', '11/23', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 92c585e1a..e8c032286 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
 $i18n_weekdays = array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota');
 $i18n_weekdays_short = array('Ne', 'Po', 'Út', 'St', 'Čt', 'Pá', 'So');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/13', '05/01', '05/08', '07/05', '07/06', '09/28', '10/28', '11/17', '12/24', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a0ab6ebf3..08109ba80 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December');
 $i18n_weekdays = array('Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag');
 $i18n_weekdays_short = array('Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/09', '04/10', '04/12', '04/13', '05/08', '05/21', '05/31', '06/01', '06/05', '12/24', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 1b3f2dbbb..57a755a92 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember');
 $i18n_weekdays = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag');
 $i18n_weekdays_short = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/19', '04/22', '05/01', '05/30', '06/10', '06/20', '10/03', '11/01', '12/24','12/25', '12/26', '12/31');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 74b959800..da27233c7 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 $i18n_weekdays = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 $i18n_weekdays_short = array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/16', '02/20', '05/28', '07/04', '09/03', '10/10', '11/11', '11/24', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5582ddb47..bbbc3f0e1 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre');
 $i18n_weekdays = array('Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado');
 $i18n_weekdays_short = array('Do', 'Lu', 'Ma', 'Mi', 'Ju', 'Vi', 'Sá');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/06', '04/05', '04/06', '05/01', '08/15', '10/12', '11/01', '12/06', '12/08', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 00d4067b6..5ea92117d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Jaanuar', 'Veebruar', 'Märts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'August', 'September', 'Oktoober', 'November', 'Detsember');
 $i18n_weekdays = array('Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev');
 $i18n_weekdays_short = array('P', 'E', 'T', 'K', 'N', 'R', 'L');
-// format mm/dd
-$i18n_holidays = array('01/01', '02/24', '04/19', '04/21', '05/01', '06/09', '06/23', '06/24', '08/20', '12/24', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 38326ebe0..823f1b7cd 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 $i18n_weekdays = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 $i18n_weekdays_short = array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/16', '02/20', '05/28', '07/04', '09/03', '10/10', '11/11', '11/24', '12/25');
 
 $i18n_key_words = array(
 'language.rtl' => 'true', // Right-to-left language. Do not remove this line from RTL language files. This is the only string that is not found in the master English file.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 50016dba3..74a8b64d4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Tammikuu', 'Helmikuu', 'Maaliskuu', 'Huhtikuu', 'Toukokuu', 'Kesäkuu', 'Heinäkuu', 'Elokuu', 'Syyskuu', 'Lokakuu', 'Marraskuu', 'Joulukuu');
 $i18n_weekdays = array('Sunnuntai', 'Maanantai', 'Tiistai', 'Keskiviikko', 'Torstai', 'Perjantai', 'Lauantai');
 $i18n_weekdays_short = array('Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/06', '05/01', '06/24', '12/06', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index c53f01117..d5067b58d 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'); 
 $i18n_weekdays = array('Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi');
 $i18n_weekdays_short = array('Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/06', '04/09', '05/01', '05/08', '05/17', '05/28', '07/14', '08/15', '11/01', '11/11', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f80f8f257..9960f1c09 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος');
 $i18n_weekdays = array('Κυριακή', 'Δευτέρα', 'Τρίτη', 'Τετάρτη', 'Πέμπτη', 'Παρασκευή', 'Σάββατο');
 $i18n_weekdays_short = array('Kυ', 'Δε', 'Τρ', 'Τε', 'Πε', 'Πα', 'Σα');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/06', '03/25', '08/15', '10/28', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2da526be6..8c9ba6a9c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר');
 $i18n_weekdays = array('ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת');
 $i18n_weekdays_short = array('א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז');
-// format mm/dd
-$i18n_holidays = array('02/10', '04/09', '04/15', '04/29', '05/29', '09/19', '09/20', '09/28', '10/03', '10/10');
 
 $i18n_key_words = array(
 'language.rtl' => 'true', // Right-to-left language. Do not remove this line from RTL language files. This is the only string that is not found in the master English file.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c3ae38649..f95621005 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Január', 'Február', 'Március', 'Április', 'Május', 'Június', 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December');
 $i18n_weekdays = array('Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat');
 $i18n_weekdays_short = array('V', 'H', 'K', 'Sz', 'Cs', 'P', 'Sz');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/02', '03/15', '04/12', '04/13', '05/01', '05/31', '06/01', '08/20', '08/21', '10/23', '11/01', '12/24', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 40cf69c62..dc339b8fb 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre');
 $i18n_weekdays = array('Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato');
 $i18n_weekdays_short = array('Do', 'Lu', 'Ma', 'Me', 'Gi', 'Ve', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/06', '04/12', '04/13', '04/25', '05/01', '06/02', '08/15', '11/01', '12/08', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ad23ad574..ba1abffaf 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月');
 $i18n_weekdays = array('日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日');
 $i18n_weekdays_short = array('日', '月', '火', '水', '木', '金', '土');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/12', '03/20', '05/03', '05/04', '05/05', '05/06', '09/21', '09/22', '09/23', '11/03', '11/23');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 61da3cb39..dc8ef51dc 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월');
 $i18n_weekdays = array('일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일');
 $i18n_weekdays_short = array('일', '월', '화', '수', '목', '금', '토');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/25', '01/26', '01/27', '03/02', '03/05', '08/15', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b8a154352..0a25f8b38 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Januari', 'Februari', 'Maart', 'April', 'Mei', 'Juni', 'Juli', 'Augustus', 'September', 'Oktober', 'November', 'December');
 $i18n_weekdays = array('Zondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrijdag', 'Zaterdag');
 $i18n_weekdays_short = array('Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/09', '04/30', '05/18', '05/28', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index f7c2d8c9a..b5fa206a4 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -34,8 +34,6 @@
 $i18n_weekdays = array('Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag');
 // TODO: check translation of $i18n_weekdays_short.
 $i18n_weekdays_short = array('Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/05', '04/09', '04/10', '04/12', '04/13', '05/01', '05/17', '05/21', '05/31', '06/01', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 326ab86cd..c6d1af1e1 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień');
 $i18n_weekdays = array('Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota');
 $i18n_weekdays_short = array('Nd', 'Pon', 'Wt', 'Śr', 'Czw', 'Pt', 'Sob');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/05', '04/05', '04/06', '05/01', '05/03', '05/24', '06/04', '08/15', '11/01', '11/11', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 72577385c..544a4958a 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro');
 $i18n_weekdays = array('Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado');
 $i18n_weekdays_short = array('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/21', '05/01', '09/07', '10/12', '11/15', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 916af30c8..2d8298ffe 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Augosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro');
 $i18n_weekdays = array('Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado');
 $i18n_weekdays_short = array('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab');
-// format mm/dd
-$i18n_holidays = array('01/01', '02/24', '04/10', '04/12', '04/25', '05/01', '06/10', '06/11', '08/15', '10/05', '01/11', '12/01', '12/08', '12/25');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 55659e89a..9a03b8431 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Ianuarie', 'Februarie', 'Martie', 'Aprilie', 'Mai', 'Iunie', 'Iulie', 'August', 'Septembrie', 'Octombrie', 'Noiembrie', 'Decembrie');
 $i18n_weekdays = array('Duminica', 'Luni', 'Marti', 'Miercuri', 'Joi', 'Vineri', 'Sambata');
 $i18n_weekdays_short = array('Du', 'Lu', 'Ma', 'Mi', 'Jo', 'Vi', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/02', '04/19', '04/20', '05/01', '06/07', '06/08', '08/15', '12/01', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 0d3e323e7..7caf38e7f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь');
 $i18n_weekdays = array('Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота');
 $i18n_weekdays_short = array('Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/07', '02/23', '03/08', '05/01', '05/09', '06/12', '11/04');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b4230436d..76bfaaaef 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Január', 'Február', 'Marec', 'Apríl', 'Máj', 'Jún', 'Júl', 'August', 'September', 'Október', 'November', 'December');
 $i18n_weekdays = array('Nedeľa', 'Pondelok', 'Utorok', 'Streda', 'Štvrtok', 'Piatok', 'Sobota');
 $i18n_weekdays_short = array('Ne', 'Po', 'Ut', 'St', 'Št', 'Pi', 'So');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/06', '03/29', '04/01', '05/01', '05/08', '06/05', '08/29', '09/01', '09/15', '11/01', '11/17', '12/24', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 50bd7c143..14ab00040 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Januar', 'Februar', 'Marec', 'April', 'Maj', 'Junij', 'Julij', 'Avgust', 'September', 'Oktober', 'November', 'December');
 $i18n_weekdays = array('Nedelja', 'Ponedeljek', 'Torek', 'Sreda', 'Četrtek', 'Petek', 'Sobota');
 $i18n_weekdays_short = array('Ned', 'Pon', 'Tor', 'Sre', 'Čet', 'Pet', 'Sob');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/02', '02/08', '04/12', '04/13', '04/27', '05/01', '05/02', '06/25', '10/31', '11/01', '12/25', '12/26');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6ac9d2d7a..f742c1c0b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Januar', 'Februar', 'Mart', 'April', 'Maj', 'Jun', 'Jul', 'Avgust', 'Septembar', 'Oktobar', 'Novembar', 'Decembar');
 $i18n_weekdays = array('Nedelja', 'Ponedeljak', 'Utorak', 'Sreda', 'Četvrtak', 'Petak', 'Subota');
 $i18n_weekdays_short = array('Ne', 'Po', 'Ut', 'Sr', 'Če', 'Pe', 'Su');
-// format dd/mm
-$i18n_holidays = array('01/01', '02/01', '07/01', '15/01', '16/02', '29/04', '30/04', '01/05', '02/05', '03/05', '22/04', '09/05', '28/06', '21/10', '11/11');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 23ca57c1c..d5007226f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('Januari', 'Februari', 'Mars', 'April', 'Maj', 'Juni', 'Juli', 'Augusti', 'September', 'Oktober', 'November', 'December');
 $i18n_weekdays = array('Söndag', 'Måndag', 'Tisdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lördag');
 $i18n_weekdays_short = array('Sö', 'Må', 'Ti', 'On', 'To', 'Fr', 'Lö');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/06', '05/01', '06/06', '12/25', '12/26'); // OBS! Endast fasta helgdagar, då rörliga datum måste uppdateras varje år.
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 29065535e..05b99c555 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -35,8 +35,6 @@
 $i18n_months = array('Ocak', 'Şubat', 'Mart', 'Nisan', 'Mayis', 'Haziran', 'Temmuz', 'Ağustos', 'Eylük', 'Ekim', 'Kasım', 'Aralık');
 $i18n_weekdays = array('Pazar', 'Pazartesi', 'Salı', 'Çarşamba', 'Perşembe', 'Cuma', 'Cumartesi');
 $i18n_weekdays_short = array('Pa', 'Pt', 'Sa', 'Ça', 'Pe', 'Cu', 'Ct');
-// format mm/dd
-$i18n_holidays = array('01/01', '04/23', '05/01', '05/19', '08/30', '09/20', '09/21', '09/22', '10/29', '11/27', '11/28', '11/29', '11/30');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f878f8558..795b49133 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 $i18n_weekdays = array('星期天', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六');
 $i18n_weekdays_short = array('周日', '周一', '周二', '周三', '周四', '周五', '周六');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/02', '01/25', '01/26', '01/27', '01/28', '01/29', '01/30', '01/31', '05/01', '05/28', '05/29');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 3cee85481..7d19a6e92 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -33,8 +33,6 @@
 $i18n_months = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 $i18n_weekdays = array('星期天', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六');
 $i18n_weekdays_short = array('周日', '週一', '週二', '週三', '週四', '週五', '週六');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/02', '01/25', '01/26', '01/27', '01/28', '01/29', '01/30', '04/04', '09/03');
 
 $i18n_key_words = array(
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6710c5c86..f5fa46901 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.19.4.4993 | 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.4994 | 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>

From 040c6516659e15f360159859b783e3722e86f370 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Apr 2019 15:55:42 +0000
Subject: [PATCH 0954/1848] Adjusted week start for subgroups.

---
 WEB-INF/lib/Period.class.php         | 2 +-
 WEB-INF/lib/form/Calendar.class.php  | 2 +-
 WEB-INF/lib/form/DateField.class.php | 2 +-
 WEB-INF/lib/ttUser.class.php         | 5 +++++
 WEB-INF/templates/footer.tpl         | 2 +-
 week.php                             | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/Period.class.php b/WEB-INF/lib/Period.class.php
index 0e901a8d6..2d2269e52 100644
--- a/WEB-INF/lib/Period.class.php
+++ b/WEB-INF/lib/Period.class.php
@@ -69,7 +69,7 @@ function __construct($period_type = 0, $date_point = null) {
       $date_point = new DateAndTime(); // Represents current date. TODO: verify this is needed, as this is server time, not browser today.
 
     // TODO: refactoring ongoing down from here. Make code nicer, etc.
-    $weekStartDay = $user->week_start;
+    $weekStartDay = $user->getWeekStart();
 
 		$this->startDate = new DateAndTime();
 		$this->startDate->setFormat($date_point->getFormat());
diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 72da0e42c..bd777ea94 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -63,7 +63,7 @@ function localize() {
       
       $this->mMonthNames = $i18n->monthNames;
       $this->mWeekDayShortNames = $i18n->weekdayShortNames;
-      $this->weekStartDay = $user->week_start;
+      $this->weekStartDay = $user->getWeekStart();
     }
 
     function setStyle($style) { $this->style = $style; }
diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index f1487d04b..a197126fb 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -57,7 +57,7 @@ function localize()  {
     $this->lCalendarButtons['close'] = $i18n->get('button.close');
 
     $this->mDateFormat = $user->getDateFormat();
-    $this->mWeekStartDay = $user->week_start;
+    $this->mWeekStartDay = $user->getWeekStart();
   }
 
   // set current value taken from session or database
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 16e2d2d16..a40a5fda1 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -205,6 +205,11 @@ function getTimeFormat() {
     return ($this->behalfGroup ? $this->behalfGroup->time_format : $this->time_format);
   }
 
+  // getWeekStart returns week start day for active group.
+  function getWeekStart() {
+    return ($this->behalfGroup ? $this->behalfGroup->week_start : $this->week_start);
+  }
+
   // getTrackingMode returns tracking mode for active group.
   function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f5fa46901..44dea7a72 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.19.4.4994 | 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.4995 | 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/week.php b/week.php
index 05d399214..6cb6f28a1 100644
--- a/week.php
+++ b/week.php
@@ -70,7 +70,7 @@
 $_SESSION['date'] = $cl_date;
 
 // Determine selected week start and end dates.
-$weekStartDay = $user->week_start;
+$weekStartDay = $user->getWeekStart();
 $t_arr = localtime($selected_date->getTimestamp());
 $t_arr[5] = $t_arr[5] + 1900;
 if ($t_arr[6] < $weekStartDay)

From 8a671525046655e057a15c6de9507834322b466d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Apr 2019 17:02:25 +0000
Subject: [PATCH 0955/1848] Added a couple of clarifying comments.

---
 WEB-INF/lib/form/Calendar.class.php | 2 ++
 WEB-INF/lib/ttTimeHelper.class.php  | 5 +++++
 WEB-INF/templates/footer.tpl        | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index bd777ea94..447a45e02 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -126,6 +126,8 @@ function toString($date="") {
 
       $str .= "<tr>";
 
+      // TODO: refactor this entire class, as $weekend_start and $weekend_end
+      // are not what their names suggest (debug with non zero week start to see it).
       $weekend_start = 6 - $this->weekStartDay;      // Saturday by default.
       $weekend_end = (7 - $this->weekStartDay) % 7;  // Sunday by default.
       if (defined('WEEKEND_START_DAY')) {
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 6fd816e0c..57790e22b 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -33,6 +33,11 @@ class ttTimeHelper {
 
   // isWeekend determines if $date falls on weekend.
   static function isWeekend($date) {
+    // NOTE: this does not work for subgroups with different WEEKEND_START_DAY
+    // as the setting is per server. Example: a parent group in USA, with a subgroup
+    // in Saudi Arabia. Their weekends are the same.
+    // Decided NOT to introduce a configurable WEEKEND_START_DAY for groups in UI
+    // to keep UI simple, for now. See also Calendar class with the same issue.
     $weekDay = date('w', strtotime($date));
     return ($weekDay == WEEKEND_START_DAY || $weekDay == (WEEKEND_START_DAY + 1) % 7);
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 44dea7a72..343a4d04a 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.19.4.4995 | 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.4996 | 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>

From 8bc57bab34ec45117348070eec17fb3d00f327fd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Apr 2019 17:26:57 +0000
Subject: [PATCH 0956/1848] Removed show holidays config option.

---
 WEB-INF/lib/ttGroup.class.php    | 2 --
 WEB-INF/lib/ttUser.class.php     | 2 --
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 2 --
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 2 --
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 2 --
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 2 --
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 2 --
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 6 +-----
 group_edit.php                   | 6 +-----
 35 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index c6693bec3..2a5eb1dcf 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -41,7 +41,6 @@ class ttGroup {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
-  var $show_holidays = 0;       // Whether to show holidays in calendar.
   var $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
@@ -114,7 +113,6 @@ function __construct($id, $org_id) {
       $this->config = $val['config'];
       $this->configHelper = new ttConfigHelper($val['config']);
       // Set user config options.
-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a40a5fda1..14e7007b8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -55,7 +55,6 @@ class ttUser {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
-  var $show_holidays = 0;       // Whether to show holidays in calendar.
   var $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
@@ -148,7 +147,6 @@ function __construct($login, $id = null) {
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.
-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 435e3ebef..e24a13d51 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -582,7 +582,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e8c032286..2aa9ebb37 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -595,7 +595,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 08109ba80..aa4e97bea 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -554,7 +554,6 @@
 'form.group_edit.24_hours' => '24 timers',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Registrerings tilstand',
 'form.group_edit.mode_time' => 'Tid',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 57a755a92..49837588d 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -530,8 +530,6 @@
 'form.group_edit.24_hours' => '24 Stunden',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Zeige Feiertage',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index da27233c7..f7d8ac4b6 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -516,7 +516,6 @@
 'form.group_edit.12_hours' => '12 hours',
 'form.group_edit.24_hours' => '24 hours',
 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bbbc3f0e1..97d3c50a8 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -596,7 +596,6 @@
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5ea92117d..41fe752c2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -559,8 +559,6 @@
 'form.group_edit.24_hours' => '24 tundi',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Näita pühi',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Jälgimise režiim',
 'form.group_edit.mode_time' => 'ajaarvestus',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 823f1b7cd..c3831228f 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -577,7 +577,6 @@
 'form.group_edit.24_hours' => '24 ساعت',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'حالت رهگیری',
 'form.group_edit.mode_time' => 'زمان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 74a8b64d4..05750331e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -560,7 +560,6 @@
 'form.group_edit.24_hours' => '24-tuntinen',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Seurantamuoto',
 'form.group_edit.mode_time' => 'aika',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d5067b58d..b8eb0d5bc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -551,7 +551,6 @@
 'form.group_edit.24_hours' => '24 heures',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Mode suivi',
 'form.group_edit.mode_time' => 'Heures',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9960f1c09..49ab0a12c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -539,8 +539,6 @@
 'form.group_edit.24_hours' => '24 ώρες',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Προβολή διακοπών',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
 'form.group_edit.mode_time' => 'χρόνος',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8c9ba6a9c..d8e99d695 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -581,7 +581,6 @@
 'form.group_edit.24_hours' => '24 שעות',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'סוג מעקב',
 'form.group_edit.mode_time' => 'זמן',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f95621005..441db3fe9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -587,7 +587,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index dc339b8fb..4b76fef3a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -553,8 +553,6 @@
 'form.group_edit.24_hours' => '24 ore',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Mostra vacanze',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modalità di registrazione',
 'form.group_edit.mode_time' => 'tempo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ba1abffaf..6db174108 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -590,7 +590,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dc8ef51dc..d8ed7b8c5 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -588,7 +588,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0a25f8b38..859741a2b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -515,8 +515,6 @@
 'form.group_edit.24_hours' => '24 uurs',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Toon vakantiedagen',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b5fa206a4..5a108fc55 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -587,7 +587,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c6d1af1e1..60f5e1af5 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -563,7 +563,6 @@
 'form.group_edit.24_hours' => '24 godziny',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tryb śledzenia',
 'form.group_edit.mode_time' => 'czas',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 544a4958a..5013cde5d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -558,7 +558,6 @@
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2d8298ffe..cc44e6f18 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -569,7 +569,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9a03b8431..94690cd51 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -590,7 +590,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 7caf38e7f..22d9a2bdb 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -507,7 +507,6 @@
 'form.group_edit.12_hours' => '12 часов',
 'form.group_edit.24_hours' => '24 часа',
 'form.group_edit.display_options' => 'Опции отображения',
-'form.group_edit.show_holidays' => 'Показывать праздники',
 'form.group_edit.holidays' => 'Праздники',
 'form.group_edit.tracking_mode' => 'Режим работы',
 'form.group_edit.mode_time' => 'время',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 76bfaaaef..664c26f5a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -570,7 +570,6 @@
 'form.group_edit.24_hours' => '24-hodinový',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Režim sledovania',
 'form.group_edit.mode_time' => 'čas',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 14ab00040..d9001b1ec 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -564,7 +564,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f742c1c0b..79769f9c9 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -561,7 +561,6 @@
 'form.group_edit.24_hours' => '24 časova',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Način evidencije',
 'form.group_edit.mode_time' => 'vreme',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d5007226f..a442a6e48 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -558,7 +558,6 @@
 'form.group_edit.24_hours' => '24-timmars',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Spårningsmetod',
 'form.group_edit.mode_time' => 'Endast tid',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 05b99c555..2ed0eef3c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -603,7 +603,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 795b49133..868bf16ab 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -574,7 +574,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 7d19a6e92..fa8d4a007 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -580,7 +580,6 @@
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 343a4d04a..b303ed998 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.19.4.4996 | 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.4997 | 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 a68e28eb8..0da797ffd 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -74,13 +74,9 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
             <td><a href="display_options.php">{$i18n.label.configure}</a></td>
           </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
-            <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
-            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_36.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
diff --git a/group_edit.php b/group_edit.php
index 2855de881..894546e5e 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -85,7 +85,6 @@
   $cl_date_format = $request->getParameter('date_format');
   $cl_time_format = $request->getParameter('time_format');
   $cl_start_week = $request->getParameter('start_week');
-  $cl_show_holidays = $request->getParameter('show_holidays');
   $cl_holidays = trim($request->getParameter('holidays'));
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');
@@ -107,7 +106,6 @@
   $cl_date_format = $group['date_format'];
   $cl_time_format = $group['time_format'];
   $cl_start_week = $group['week_start'];
-  $cl_show_holidays = $config->getDefinedValue('show_holidays');
   $cl_holidays = $group['holidays'];
   $cl_tracking_mode = $group['tracking_mode'];
   $cl_project_required = $group['project_required'];
@@ -181,8 +179,7 @@
 }
 $form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
 
-// Show holidays checkbox.
-$form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
+// Show holidays control.
 $form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_holidays));
 
 // Prepare tracking mode choices.
@@ -249,7 +246,6 @@
 
     if ($err->no()) {
       // Update config.
-      $config->setDefinedValue('show_holidays', $cl_show_holidays);
       $config->setDefinedValue('punch_mode', $cl_punch_mode);
       $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
       $config->setDefinedValue('future_entries', $cl_future_entries);

From 42fb0e1b78c91f0aacbc3d9d707181445e33caf9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Apr 2019 00:00:03 +0000
Subject: [PATCH 0957/1848] Improved ttTimeHelper::holidayMatch to allow
 partial wildcards in year.

---
 WEB-INF/lib/ttTimeHelper.class.php | 6 ++++--
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 57790e22b..f6d8b92df 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -65,8 +65,10 @@ static function holidayMatch($date, $holiDateSpec) {
    $holiDateSpecArray = explode('-', $holiDateSpec);
 
    // Check year.
-   if ($dateArray[0] != $holiDateSpecArray[0] && $holiDateSpecArray[0] != '****') // **** means all years.
-     return false;
+   for($i = 0; $i < 4; $i++) {
+     if ($dateArray[0][$i] != $holiDateSpecArray[0][$i] && $holiDateSpecArray[0][$i] != '*') // * means any digit matches
+       return false;
+   }
    // Check month.
    if ($dateArray[1] != $holiDateSpecArray[1])
      return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b303ed998..4b60ee5b8 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.19.4.4997 | 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.4998 | 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>

From 3d6637d9e14122d6998e0be59e9138d41733d5db Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Apr 2019 13:31:24 +0000
Subject: [PATCH 0958/1848] A bit of refactoring in week view.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/week.tpl   | 4 ++--
 week.php                     | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4b60ee5b8..0545cff50 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.19.4.4998 | 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.4999 | 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/week.tpl b/WEB-INF/templates/week.tpl
index 366762cfc..8d56707fc 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -56,13 +56,13 @@ function fillDropdowns() {
           <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.weekTimeForm.cf_1.control}</td>
         </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
         <tr>
           <td align="right">{$i18n.label.project} (*):</td>
           <td>{$forms.weekTimeForm.project.control}</td>
         </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
         <tr>
           <td align="right">{$i18n.label.task}:</td>
           <td>{$forms.weekTimeForm.task.control}</td>
diff --git a/week.php b/week.php
index 6cb6f28a1..2ef774477 100644
--- a/week.php
+++ b/week.php
@@ -58,6 +58,9 @@
 // End of access checks.
 
 $showClient = $user->isPluginEnabled('cl');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showFiles = $user->isPluginEnabled('at');
 
 // Initialize and store date in session.
@@ -511,6 +514,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('time_records', $records);
 $smarty->assign('show_navigation', !$user->getConfigOption('menu_week'));
 $smarty->assign('show_client', $showClient);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('menu.week'));
 $smarty->assign('content_page_name', 'week.tpl');

From f22a586b11af9c617fdc4241d3ffa0344d4d6a50 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Apr 2019 16:09:21 +0000
Subject: [PATCH 0959/1848] Refactoring. Moved week_menu config option to
 plugin config.

---
 WEB-INF/lib/ttUser.class.php           |  5 +++++
 WEB-INF/lib/ttWeekViewHelper.class.php | 12 +++++++-----
 WEB-INF/resources/ca.lang.php          |  1 +
 WEB-INF/resources/cs.lang.php          |  1 +
 WEB-INF/resources/da.lang.php          |  1 +
 WEB-INF/resources/de.lang.php          |  1 +
 WEB-INF/resources/en.lang.php          |  1 +
 WEB-INF/resources/es.lang.php          |  1 +
 WEB-INF/resources/et.lang.php          |  2 ++
 WEB-INF/resources/fa.lang.php          |  1 +
 WEB-INF/resources/fi.lang.php          |  1 +
 WEB-INF/resources/fr.lang.php          |  1 +
 WEB-INF/resources/gr.lang.php          |  2 ++
 WEB-INF/resources/he.lang.php          |  1 +
 WEB-INF/resources/hu.lang.php          |  1 +
 WEB-INF/resources/it.lang.php          |  2 ++
 WEB-INF/resources/ja.lang.php          |  1 +
 WEB-INF/resources/ko.lang.php          |  1 +
 WEB-INF/resources/nl.lang.php          |  2 ++
 WEB-INF/resources/no.lang.php          |  1 +
 WEB-INF/resources/pl.lang.php          |  1 +
 WEB-INF/resources/pt-br.lang.php       |  1 +
 WEB-INF/resources/pt.lang.php          |  1 +
 WEB-INF/resources/ro.lang.php          |  1 +
 WEB-INF/resources/ru.lang.php          |  1 +
 WEB-INF/resources/sk.lang.php          |  3 ++-
 WEB-INF/resources/sl.lang.php          |  1 +
 WEB-INF/resources/sr.lang.php          |  3 ++-
 WEB-INF/resources/sv.lang.php          |  1 +
 WEB-INF/resources/tr.lang.php          |  1 +
 WEB-INF/resources/zh-cn.lang.php       |  1 +
 WEB-INF/resources/zh-tw.lang.php       |  1 +
 WEB-INF/templates/display_options.tpl  |  9 ---------
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/header.tpl           |  2 +-
 WEB-INF/templates/week.tpl             |  6 +++---
 WEB-INF/templates/week_view.tpl        |  4 ++++
 display_options.php                    |  8 +-------
 group_edit.php                         |  2 +-
 plugins.php                            | 10 ----------
 week.php                               | 27 ++++++++++++++++----------
 week_view.php                          | 22 +++++++++++++--------
 42 files changed, 90 insertions(+), 57 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 14e7007b8..62c786ce5 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -248,6 +248,11 @@ function getConfig() {
     return ($this->behalfGroup ? $this->behalfGroup->configHelper->getConfig() : $this->configHelper->getConfig());
   }
 
+  // getConfigHelper returns ttConfigHelper instance for active group.
+  function getConfigHelper() {
+    return ($this->behalfGroup ? $this->behalfGroup->configHelper : $this->configHelper);
+  }
+
   // getConfigOption returns true if an option is defined for group.
   // This helps us keeping a set of user attributes smaller.
   // We determine whether the option is set only on pages that need to know.
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 1144cea6b..348648163 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -167,6 +167,7 @@ static function getDataForWeekView($records, $dayHeaders) {
     global $i18n;
 
     $dataArray = array();
+    $includeNotes = $user->isOptionEnabled('week_notes');
 
     // Construct the first row for a brand new entry.
     $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
@@ -175,7 +176,7 @@ static function getDataForWeekView($records, $dayHeaders) {
       $control_id = '0_'. $dayHeaders[$i];
       $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
     }
-    if ($user->isPluginEnabled('wvns')) {
+    if ($includeNotes) {
       // Construct the second row for daily comments for a brand new entry.
       $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
       // Insert empty cells with proper control ids.
@@ -209,7 +210,7 @@ static function getDataForWeekView($records, $dayHeaders) {
           $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
         }
         // Insert row for comments.
-        if ($user->isPluginEnabled('wvns')) {
+        if ($includeNotes) {
           $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
           $pos++;
           // Insert empty cells with proper control ids.
@@ -223,7 +224,7 @@ static function getDataForWeekView($records, $dayHeaders) {
       // Insert actual cell data from $record (one cell only).
       $dataArray[$pos][$day_header] = array('control_id' => $pos.'_'. $day_header, 'tt_log_id' => $record['id'],'duration' => $record['duration']);
       // Insert existing comment from $record into the comment cell.
-      if ($user->isPluginEnabled('wvns')) {
+      if ($includeNotes) {
         $pos++;
         $dataArray[$pos][$day_header] = array('control_id' => $pos.'_'. $day_header, 'tt_log_id' => $record['id'],'note' => $record['comment']);
       }
@@ -273,7 +274,8 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
       $control_id = '0_'. $dayHeaders[$i];
       $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
     }
-    if ($user->isPluginEnabled('wvns')) {
+    $includeNotes = $user->isOptionEnabled('week_notes');
+    if ($includeNotes) {
       // Construct the second row for daily comments for a brand new entry.
       $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
       // Insert empty cells with proper control ids.
@@ -299,7 +301,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
           $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
         }
         // Insert row for comments.
-        if ($user->isPluginEnabled('wvns')) {
+        if ($includeNotes) {
           $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
           $pos++;
           // Insert empty cells with proper control ids.
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e24a13d51..bd3af0488 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -259,6 +259,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2aa9ebb37..2d6f06ced 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -269,6 +269,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index aa4e97bea..70b55920d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -248,6 +248,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 49837588d..2863b31ac 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -236,6 +236,7 @@
 'label.paid_status' => 'Bezahlstatus',
 'label.paid' => 'Bezahlt',
 'label.mark_paid' => 'Als bezahlt setzen',
+// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
 'label.work_units' => 'Arbeitseinheiten',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f7d8ac4b6..9e5d4249b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -226,6 +226,7 @@
 'label.paid_status' => 'Paid status',
 'label.paid' => 'Paid',
 'label.mark_paid' => 'Mark paid',
+'label.week_menu' => 'Week menu',
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 97d3c50a8..e56faf989 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -262,6 +262,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 41fe752c2..81661146e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -252,6 +252,8 @@
 'label.paid_status' => 'Makse olek',
 'label.paid' => 'Makstud',
 'label.mark_paid' => 'Märgi makstuks',
+// TODO: translate the following.
+// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Nädala märge',
 'label.week_list' => 'Nädala nimekiri',
 'label.work_units' => 'Töö ühikud',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index c3831228f..f7bed3098 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -260,6 +260,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 05750331e..3db44e33b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -252,6 +252,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b8eb0d5bc..b037216ad 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -246,6 +246,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 49ab0a12c..0e504e037 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -238,6 +238,8 @@
 'label.paid_status' => 'Κατάσταση πληρωμής',
 'label.paid' => 'Πληρωμένο',
 'label.mark_paid' => 'Σήμανση πληρωμένα',
+// TODO: translate the following.
+// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Σημείωση εβδομάδας',
 'label.week_list' => 'Λίστα εβδομάδων',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d8e99d695..e3ffac91c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -268,6 +268,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 441db3fe9..8cd381717 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -265,6 +265,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 4b76fef3a..311e2c5db 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -242,6 +242,8 @@
 'label.paid_status' => 'Stato pagamento',
 'label.paid' => 'Pagato',
 'label.mark_paid' => 'Segna come pagato',
+// TODO: translate the following.
+// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Nota settimanale',
 'label.week_list' => 'Lista settimanale',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 6db174108..dbb6b32c0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -269,6 +269,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d8ed7b8c5..c39a44fd2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -269,6 +269,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 859741a2b..dbfaccb5c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -226,6 +226,8 @@
 'label.paid_status' => 'Status van betaling',
 'label.paid' => 'Betaald',
 'label.mark_paid' => 'Markeer als betaald',
+// TODO: translate the following.
+// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
 'label.work_units' => 'Werk eenheid',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5a108fc55..0ea49bbdb 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -267,6 +267,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 60f5e1af5..00ef9c000 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -253,6 +253,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5013cde5d..f45dab5b5 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -250,6 +250,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index cc44e6f18..27aed7b26 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -255,6 +255,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 94690cd51..a9bb3500b 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -266,6 +266,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 22d9a2bdb..c2022009c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -225,6 +225,7 @@
 'label.paid_status' => 'Статус оплаты',
 'label.paid' => 'Оплачено',
 'label.mark_paid' => 'Отметить оплату',
+'label.week_menu' => 'Меню недели',
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Список недели',
 'label.work_units' => 'Единицы работы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 664c26f5a..249f45613 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -256,7 +256,8 @@
 // 'label.quantity' => 'Quantity',
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
-// 'button.mark_paid' => 'Mark paid',
+// 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d9001b1ec..c56e11f43 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -250,6 +250,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 79769f9c9..cdb4eae46 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -251,7 +251,8 @@
 // 'label.quantity' => 'Quantity',
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
-// 'button.mark_paid' => 'Mark paid',
+// 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a442a6e48..ab34828b6 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -247,6 +247,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2ed0eef3c..fcebeebf4 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -273,6 +273,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 868bf16ab..62eff58df 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -259,6 +259,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index fa8d4a007..82b9bc635 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -265,6 +265,7 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
+// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index d11b08886..d7bbdd57d 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -1,14 +1,5 @@
 {$forms.displayOptionsForm.open}
 <table cellspacing="1" cellpadding="2" border="0">
-{if $show_week_menu}
-  <tr><td>&nbsp;</td></tr>
-  <tr><td class="sectionHeaderNoBorder">{$i18n.form.display_options.menu}</td></tr>
-  <tr>
-    <td><label for="menu_week">{$i18n.label.week_view}:</label></td>
-    <td nowrap>{$forms.displayOptionsForm.menu_week.control} <a href="https://www.anuko.com/lp/tt_35.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-{/if}
-
   <tr><td>&nbsp;</td></tr>
   <tr><td class="sectionHeaderNoBorder">{$i18n.title.time}</td></tr>
   <tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0545cff50..6a0364547 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.19.4.4999 | 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.5000 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 0862523af..8e3dd7632 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -108,7 +108,7 @@
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
-      {if $user->isPluginEnabled('wv') && $user->getConfigOption('menu_week')}
+      {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
            <a class="mainMenu" href="week.php">{$i18n.menu.week}</a>
       {/if}
     {/if}
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 8d56707fc..6f97c4d2a 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -68,7 +68,7 @@ function fillDropdowns() {
           <td>{$forms.weekTimeForm.task.control}</td>
         </tr>
 {/if}
-{if $user->isPluginEnabled('wvn')}
+{if $show_week_note}
         <tr>
           <td align="right">{$i18n.label.week_note}:</td>
           <td>{$forms.weekTimeForm.note.control}</td>
@@ -96,7 +96,7 @@ function fillDropdowns() {
   <tr><td>&nbsp;</td></tr>
 </table>
 
-{if $user->isPluginEnabled('wvl')}
+{if $show_week_list}
 <table width="720">
 <tr>
   <td valign="top">
@@ -181,7 +181,7 @@ function fillDropdowns() {
 
 {if $time_records}
 <table cellpadding="3" cellspacing="1" width="720">
-  {if $user->isPluginEnabled('wvl')}
+  {if $show_week_list}
   <tr>
     <td align="left">{$i18n.label.week_total}: {$week_total}</td>
     <td></td>
diff --git a/WEB-INF/templates/week_view.tpl b/WEB-INF/templates/week_view.tpl
index d3253e9dc..17b02cb4e 100644
--- a/WEB-INF/templates/week_view.tpl
+++ b/WEB-INF/templates/week_view.tpl
@@ -1,5 +1,9 @@
 {$forms.weekViewForm.open}
 <table cellspacing="1" cellpadding="2" border="0">
+  <tr>
+    <td align="right" nowrap>{$forms.weekViewForm.week_menu.control}</td>
+    <td><label for="week_note">{$i18n.label.week_menu}</label> <a href="https://www.anuko.com/lp/tt_35.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
   <tr>
     <td align="right" nowrap>{$forms.weekViewForm.week_note.control}</td>
     <td><label for="week_note">{$i18n.label.week_note}</label> <a href="https://www.anuko.com/lp/tt_11.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
diff --git a/display_options.php b/display_options.php
index a7426aaaa..ec4ddd95a 100644
--- a/display_options.php
+++ b/display_options.php
@@ -37,21 +37,17 @@
 }
 // End of access checks.
 
-$config = new ttConfigHelper($user->getConfig());
+$config = $user->getConfigHelper();
 
 if ($request->isPost()) {
-  $cl_menu_week = $request->getParameter('menu_week');
   $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row');
   $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row');
 } else {
-  $cl_menu_week = $config->getDefinedValue('menu_week');
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
 }
 
 $form = new Form('displayOptionsForm');
-// Menu.
-$form->addInput(array('type'=>'checkbox','name'=>'menu_week','value'=>$cl_menu_week));
 
 // Time page.
 // $form->addInput(array('type'=>'checkbox','name'=>'time_client','value'=>$cl_time_client));
@@ -74,7 +70,6 @@
 if ($request->isPost()){
   if ($err->no()) {
     // Update config.
-    $config->setDefinedValue('menu_week', $cl_menu_week);
     $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
     if ($user->updateGroup(array('config' => $config->getConfig()))) {
@@ -86,7 +81,6 @@
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_week_menu', $user->isPluginEnabled('wv'));
 $smarty->assign('title', $i18n->get('title.display_options'));
 $smarty->assign('content_page_name', 'display_options.tpl');
 $smarty->display('index.tpl');
diff --git a/group_edit.php b/group_edit.php
index 894546e5e..abc06b469 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -70,7 +70,7 @@
 
 $groups = $user->getGroupsForDropdown();
 $group = ttGroupHelper::getGroupAttrs($group_id);
-$config = new ttConfigHelper($group['config']);
+$config = $user->getConfigHelper();
 
 $advanced_settings = $home_group ? $user->can('manage_advanced_settings') : true;
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
diff --git a/plugins.php b/plugins.php
index 4d2972bfd..bc26e5869 100644
--- a/plugins.php
+++ b/plugins.php
@@ -144,16 +144,6 @@
     $plugins .= ',at';
   if ($cl_work)
     $plugins .= ',wk';
-
-  // Recycle week view plugin options as they are not configured on this page.
-  $existing_plugins = explode(',', $user->getPlugins());
-  if (in_array('wvn', $existing_plugins))
-    $plugins .= ',wvn';
-  if (in_array('wvl', $existing_plugins))
-    $plugins .= ',wvl';
-  if (in_array('wvns', $existing_plugins))
-    $plugins .= ',wvns';
-
   $plugins = trim($plugins, ',');
 
   // Prepare a new config string.
diff --git a/week.php b/week.php
index 2ef774477..a77e987f8 100644
--- a/week.php
+++ b/week.php
@@ -143,29 +143,33 @@
 
 // Build day totals (total durations for each day in week).
 $dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders);
+$showWeekNote = $user->isOptionEnabled('week_note');
+$showWeekNotes = $user->isOptionEnabled('week_notes');
+
 
 // Define rendering class for a label field to the left of durations.
 class LabelCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     global $user;
+    $showNotes = $user->isOptionEnabled('week_notes');
 
     $this->setOptions(array('width'=>200,'valign'=>'middle'));
 
     // Special handling for a new week entry (row 0, or 0 and 1 if we show notes).
     if (0 == $row) {
       $this->setOptions(array('style'=>'text-align: center; font-weight: bold; vertical-align: top;'));
-    } else if ($user->isPluginEnabled('wvns') && (1 == $row)) {
+    } else if ($showNotes && (1 == $row)) {
       $this->setOptions(array('style'=>'text-align: right; vertical-align: top;'));
-    } else if ($user->isPluginEnabled('wvns') && (0 != $row % 2)) {
+    } else if ($showNotes && (0 != $row % 2)) {
       $this->setOptions(array('style'=>'text-align: right;'));
     }
     // Special handling for not billable entries.
-    $ignoreRow = $user->isPluginEnabled('wvns') ? 1 : 0; 
+    $ignoreRow = $showNotes ? 1 : 0;
     if ($row > $ignoreRow) {
       $row_id = $table->getValueAtName($row,'row_id');
       $billable = ttWeekViewHelper::parseFromWeekViewRow($row_id, 'bl');
       if (!$billable) {
-        if (($user->isPluginEnabled('wvns') && (0 == $row % 2)) || !$user->isPluginEnabled('wvns')) {
+        if (($showNotes && (0 == $row % 2)) || !$showNotes) {
           $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS.
         }
       }
@@ -179,6 +183,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 class WeekViewCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     global $user;
+    $showNotes = $user->isOptionEnabled('week_notes');
 
     $field_name = $table->getValueAt($row,$column)['control_id']; // Our text field names (and ids) are like x_y (row_column).
     $field = new TextField($field_name);
@@ -189,11 +194,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $field->setFormName($table->getFormName());
     $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually.
     // Provide visual separation for new entry row.
-    $rowToSeparate = $user->isPluginEnabled('wvns') ? 1 : 0;
+    $rowToSeparate = $showNotes ? 1 : 0;
     if ($rowToSeparate == $row) {
       $field->setStyle('width: 60px; margin-bottom: 40px');
     }
-    if ($user->isPluginEnabled('wvns')) {
+    if ($showNotes) {
       if (0 == $row % 2) {
         $field->setValue($table->getValueAt($row,$column)['duration']); // Duration for even rows.
       } else {
@@ -383,7 +388,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
           $control_id = $rowNumber.'_'.$dayHeader;
 
           // Handle durations and comments in separate blocks of code.
-          if (!$user->isPluginEnabled('wvns') || (0 == $rowNumber % 2)) {
+          if (!$showWeekNotes || (0 == $rowNumber % 2)) {
             // Handle durations row here.
 
             // Obtain existing and posted durations.
@@ -422,7 +427,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 // Note: no need to check for a possible conflict with an already existing row
                 // because we are doing an insert that does not affect already existing data.
 
-                if ($user->isPluginEnabled('wvn')) {
+                if ($showWeekNote) {
                   $fields['note'] = $request->getParameter('note');
                 }
               }
@@ -430,7 +435,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
               $fields['start_date'] = $startDate->toString(DB_DATEFORMAT); // To be able to determine date for the entry using $dayHeader.
               $fields['duration'] = $postedDuration;
               $fields['browser_today'] = $request->getParameter('browser_today', null);
-              if ($user->isPluginEnabled('wvns')) {
+              if ($showWeekNotes) {
                 // Take note value from the control below duration.
                 $noteRowNumber = $rowNumber + 1;
                 $note_control_id =  $noteRowNumber.'_'.$dayHeader;
@@ -448,7 +453,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
             }
             if (!$result) break; // Break out of the loop in case of first error.
 
-          } else if ($user->isPluginEnabled('wvns')) {
+          } else if ($showWeekNotes) {
             // Handle commments row here.
 
             // Obtain existing and posted comments.
@@ -516,6 +521,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('show_week_note', $showWeekNote);
+$smarty->assign('show_week_list', $user->isOptionEnabled('week_list'));
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('menu.week'));
 $smarty->assign('content_page_name', 'week.tpl');
diff --git a/week_view.php b/week_view.php
index 0d369bf9b..149842e87 100644
--- a/week_view.php
+++ b/week_view.php
@@ -35,28 +35,34 @@
   exit();
 }
 
+$config = $user->getConfigHelper();
+
 if ($request->isPost()) {
+  $cl_week_menu = $request->getParameter('week_menu');
   $cl_week_note = $request->getParameter('week_note');
   $cl_week_list = $request->getParameter('week_list');
   $cl_notes = $request->getParameter('notes');
 } else {
-  $plugins = explode(',', $user->plugins);
-  $cl_week_note = in_array('wvn', $plugins);
-  $cl_week_list = in_array('wvl', $plugins);
-  $cl_notes = in_array('wvns', $plugins);
+  $cl_week_menu =  $config->getDefinedValue('week_menu');
+  $cl_week_note = $config->getDefinedValue('week_note');
+  $cl_week_list = $config->getDefinedValue('week_list');
+  $cl_notes = $config->getDefinedValue('week_notes');
 }
 
-
 $form = new Form('weekViewForm');
+$form->addInput(array('type'=>'checkbox','name'=>'week_menu','value'=>$cl_week_menu));
 $form->addInput(array('type'=>'checkbox','name'=>'week_note','value'=>$cl_week_note));
 $form->addInput(array('type'=>'checkbox','name'=>'week_list','value'=>$cl_week_list));
 $form->addInput(array('type'=>'checkbox','name'=>'notes','value'=>$cl_notes));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
-  if (!$user->enablePlugin('wvn', $cl_week_note) ||
-      !$user->enablePlugin('wvl', $cl_week_list) ||
-      !$user->enablePlugin('wvns', $cl_notes)) {
+  // Update config.
+  $config->setDefinedValue('week_menu', $cl_week_menu);
+  $config->setDefinedValue('week_note', $cl_week_note);
+  $config->setDefinedValue('week_list', $cl_week_list);
+  $config->setDefinedValue('week_notes', $cl_notes);
+  if (!$user->updateGroup(array('config' => $config->getConfig()))) {
     $err->add($i18n->get('error.db'));
   }
 }

From 63de9ce903678e68402aee625f516e3ee2608fbb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Apr 2019 12:23:22 +0000
Subject: [PATCH 0960/1848] Fixed nav links visibility between day and week
 views.

---
 WEB-INF/templates/footer.tpl | 2 +-
 time.php                     | 2 +-
 week.php                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6a0364547..81e0e5cc9 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.19.4.5000 | 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.5001 | 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/time.php b/time.php
index ca48056a8..2dc8606d0 100644
--- a/time.php
+++ b/time.php
@@ -448,7 +448,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
-$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->getConfigOption('menu_week'));
+$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_project', $showProject);
diff --git a/week.php b/week.php
index a77e987f8..1c8efe75a 100644
--- a/week.php
+++ b/week.php
@@ -517,7 +517,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
-$smarty->assign('show_navigation', !$user->getConfigOption('menu_week'));
+$smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);

From 30f8a1f84e62b9dc60f6fdd5682a382ed10a0583 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 17 May 2019 12:18:58 +0000
Subject: [PATCH 0961/1848] Changed Create group menu label to Register.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 3 ++-
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 3 ++-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 3 ++-
 WEB-INF/resources/he.lang.php    | 2 +-
 WEB-INF/resources/hu.lang.php    | 3 ++-
 WEB-INF/resources/it.lang.php    | 3 ++-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 +-
 WEB-INF/resources/sv.lang.php    | 3 ++-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/header.tpl     | 2 +-
 31 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index bd3af0488..30183878b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -44,7 +44,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajuda',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2d6f06ced..07adf4fae 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoc',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 70b55920d..f7ae2ff50 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Forum',
 'menu.help' => 'Hjælp',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 2863b31ac..97f497fcb 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -42,7 +42,8 @@
 'menu.logout' => 'Abmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hilfe',
-'menu.create_group' => 'Erstelle Gruppe',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 'menu.group' => 'Gruppe',
 'menu.plugins' => 'Erweiterungen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 9e5d4249b..fb4859322 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -42,7 +42,7 @@
 'menu.logout' => 'Logout',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-'menu.create_group' => 'Create Group',
+'menu.register' => 'Register',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
 'menu.subgroups' => 'Subgroups',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e56faf989..71989028a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Foro',
 'menu.help' => 'Ayuda',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 81661146e..e371fa9c4 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Välju',
 'menu.forum' => 'Foorum',
 'menu.help' => 'Abiinfo',
-'menu.create_group' => 'Loo grupp',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profiil',
 'menu.group' => 'Grupp',
 'menu.plugins' => 'Lisad',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f7bed3098..3daed57e0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -44,7 +44,7 @@
 'menu.forum' => 'فروم',
 'menu.help' => 'راهنما',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'پروفايل',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3db44e33b..6f3338ec7 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Keskustelupalsta',
 'menu.help' => 'Apua',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profiili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b037216ad..e8cc2f13d 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Forum',
 'menu.help' => 'Aide',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 0e504e037..52925c56f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -42,7 +42,8 @@
 'menu.logout' => 'Αποσύνδεση',
 'menu.forum' => 'Φόρουμ',
 'menu.help' => 'Βοήθεια',
-'menu.create_group' => 'Δημιουργία ομάδας',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Προφίλ',
 'menu.group' => 'Ομάδα',
 'menu.plugins' => 'Πρόσθετα',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e3ffac91c..14469568e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -44,7 +44,7 @@
 'menu.forum' => 'פורום',
 'menu.help' => 'עזרה',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'פרופיל',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8cd381717..3f194d1e0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Kijelentkezés',
 'menu.forum' => 'Fórum',
 'menu.help' => 'Segítség',
-'menu.create_group' => 'Csoport létrehozása',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 'menu.group' => 'Csoport',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 311e2c5db..058244454 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -44,7 +44,8 @@
 'menu.logout' => 'Logout',
 'menu.forum' => 'Forum',
 'menu.help' => 'Aiuto',
-'menu.create_group' => 'Crea gruppo',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profilo',
 'menu.group' => 'Gruppo',
 'menu.plugins' => 'Plugin',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index dbb6b32c0..39cc49c62 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -44,7 +44,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'ヘルプ',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'プロファイル',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c39a44fd2..f0156d0a1 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -44,7 +44,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => '도움말',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => '프로필',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 0ea49bbdb..5d826ce9c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -45,7 +45,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Hjelp',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 00ef9c000..7a34834bb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoc',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f45dab5b5..69e9dd069 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Fórum',
 'menu.help' => 'Ajuda',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 27aed7b26..5007d5858 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajuda',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Perfil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a9bb3500b..950ed7723 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajutor',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c2022009c..e502890a5 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -42,7 +42,7 @@
 'menu.logout' => 'Выйти',
 'menu.forum' => 'Форум',
 'menu.help' => 'Справка',
-'menu.create_group' => 'Создать группу',
+'menu.register' => 'Регистрация',
 'menu.profile' => 'Профиль',
 'menu.group' => 'Группа',
 'menu.plugins' => 'Плагины',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 249f45613..8e381c9bf 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Fórum',
 'menu.help' => 'Pomoc',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c56e11f43..6aab8d2c6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoč',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index cdb4eae46..c43570581 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => 'Forum',
 'menu.help' => 'Pomoć',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ab34828b6..89c1c7c61 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -42,7 +42,8 @@
 'menu.logout' => 'Logga ut',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hjälp',
-'menu.create_group' => 'Skapa grupp',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profil',
 'menu.group' => 'Grupp',
 'menu.plugins' => 'Tillägg',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index fcebeebf4..b7433d5dc 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -46,7 +46,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Yardım',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profili',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 62eff58df..f63b28853 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -43,7 +43,7 @@
 'menu.forum' => '论坛',
 'menu.help' => '帮助',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 'menu.profile' => '简介',
 // TODO: translate the following.
 // 'menu.group' => 'Group',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 82b9bc635..577663bd9 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -44,7 +44,7 @@
 // 'menu.forum' => 'Forum',
 'menu.help' => '幫助',
 // TODO: translate the following.
-// 'menu.create_group' => 'Create Group',
+// 'menu.register' => 'Register',
 // 'menu.profile' => 'Profile',
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 81e0e5cc9..ba8f2bbdb 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.19.4.5001 | 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.5002 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 8e3dd7632..30d804405 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -159,7 +159,7 @@
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a>
   {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
-            <a class="systemMenu" href="register.php">{$i18n.menu.create_group}</a>
+            <a class="systemMenu" href="register.php">{$i18n.menu.register}</a>
   {/if}
             <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
             <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>

From acf9b73aeba337d836b1cdf2c1bb19d4106aa967 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 17 May 2019 12:42:50 +0000
Subject: [PATCH 0962/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 52 +++++++++++++++--------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index dbfaccb5c..a288dac17 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -42,13 +42,13 @@
 'menu.logout' => 'Afmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-'menu.create_group' => 'Maak groep',
+// TODO: translate the following.
+// 'menu.register' => 'Register',
 'menu.profile' => 'Profiel',
 'menu.group' => 'Groep',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
-// TODO: translate the following.
-// 'menu.week' => 'Week',
+'menu.week' => 'Week',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
 'menu.timesheets' => 'Tijdenoverzichten',
@@ -242,11 +242,9 @@
 'label.template' => 'Sjabloon',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
-// TODO: translate the following.
-// 'label.file' => 'File',
+'label.file' => 'Bestand',
 'label.image' => 'Afbeelding',
-// TODO: translate the following.
-// 'label.download' => 'Download',
+'label.download' => 'Download',
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
 
@@ -264,8 +262,7 @@
 'title.time' => 'Tijdsregistraties',
 'title.edit_time_record' => 'Wijzigen tijdrecord',
 'title.delete_time_record' => 'Verwijder tijdrecord',
-// TODO: Translate the following.
-// 'title.time_files' => 'Time Record Files',
+'title.time_files' => 'Tijden bestanden',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Bewerk kosten artikel',
 'title.delete_expense' => 'Verwijder kosten artikel',
@@ -278,8 +275,7 @@
 'title.send_report' => 'Rapport aan het versturen',
 'title.timesheets' => 'Tijdenoverzichten',
 'title.timesheet' => 'Tijdenoverzicht',
-// TODO: Translate the following.
-// 'title.timesheet_files' => 'Timesheet Files',
+'title.timesheet_files' => 'Tijdenoverzichten bestanden',
 'title.invoice' => 'Factuur',
 'title.send_invoice' => 'Factuur verzenden',
 'title.charts' => 'Grafieken',
@@ -319,8 +315,7 @@
 'title.export' => 'Exporteer groepsgegevens',
 'title.import' => 'Importeer groepsgegevens',
 'title.options' => 'Opties',
-// TODO: translate the following.
-// 'title.display_options' => 'Display Options',
+'title.display_options' => 'Beeld opties',
 'title.profile' => 'Profiel',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Eigen velden',
@@ -339,16 +334,15 @@
 'title.add_template' => 'Sjabloon toevoegen',
 'title.edit_template' => 'Sjabloon bewerken',
 'title.delete_template' => 'Sjabloon verwijderen',
-// TODO: translate the following.
-// 'title.edit_file' => 'Editing File',
-// 'title.delete_file' => 'Deleting File',
-// 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+'title.edit_file' => 'Bestand bewerken',
+'title.delete_file' => 'Bestand verwijderen',
+'title.download_file' => ' Bestand downloaden',
+'title.work' => 'Werk',
+'title.add_work' => 'Werk toevoegen',
+'title.edit_work' => 'Werk bewerken',
+'title.delete_work' => 'Werk verwijderen',
+'title.active_work' => 'Actief werk',
+'title.inactive_work' => 'Inactief werk',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -515,9 +509,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 uurs',
 'form.group_edit.24_hours' => '24 uurs',
-// TODO: translate the following.
-// 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.holidays' => 'Holidays',
+'form.group_edit.display_options' => 'Beeld opties',
+'form.group_edit.holidays' => 'Vakanties',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',
 'form.group_edit.mode_projects' => 'projecten',
@@ -530,7 +523,7 @@
 'form.group_edit.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
-'form.group_edit.confirm_save' => 'Bevestig dat je wilt opslaan',
+'form.group_edit.confirm_save' => 'Bevestigen dat je wilt opslaan',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
@@ -590,7 +583,6 @@
 'form.timesheet_view.disapprove_body' => "Jouw tijdenoverzicht %s is afgekeurd.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-// TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
-// 'form.display_options.note_on_separate_row' => 'Note on separate row',
+'form.display_options.menu' => 'Menu',
+'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ba8f2bbdb..aa9e41dce 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.19.4.5002 | 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.5003 | 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>

From be5e813f87f627d207c8d2606da4c9fea1fe36a8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 17 May 2019 12:56:05 +0000
Subject: [PATCH 0963/1848] Increased margin for top menus.

---
 WEB-INF/templates/footer.tpl | 2 +-
 default.css                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aa9e41dce..fcdf00192 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.19.4.5003 | 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.5005 | 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/default.css b/default.css
index 462b70edf..d744c66e7 100644
--- a/default.css
+++ b/default.css
@@ -67,13 +67,13 @@ input[type=checkbox], label {
   font-weight: bold;
   color: white;
   background-color: black;
-  margin: 2px 3px 2px 3px;
+  margin: 2px 4px 2px 4px;
 }
 
 .mainMenu {
   font-size: 11pt;
   color: #444444;
-  margin: 2px 3px 2px 3px;
+  margin: 2px 4px 2px 4px;
 }
 
 .onBehalf {

From e60b2b28114cc788d3d4cb2108de859b14559c29 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 18 May 2019 13:08:38 +0000
Subject: [PATCH 0964/1848] Added an explanation link for group on the
 registration page.

---
 WEB-INF/templates/footer.tpl   | 2 +-
 WEB-INF/templates/register.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fcdf00192..a989f27c5 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.19.4.5005 | 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.5006 | 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/register.tpl b/WEB-INF/templates/register.tpl
index 3d7678af4..d751c9bfa 100644
--- a/WEB-INF/templates/register.tpl
+++ b/WEB-INF/templates/register.tpl
@@ -5,7 +5,7 @@
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
-          <td>{$forms.groupForm.group_name.control}</td>
+          <td>{$forms.groupForm.group_name.control} <a href="https://www.anuko.com/lp/tt_37.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td align="right">{$i18n.label.currency}:</td>

From 5bf42f1ee383f9be9707927f56b3c16753b81c45 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 May 2019 19:08:47 +0000
Subject: [PATCH 0965/1848] Introduced a separate page for advanced group
 settings.

---
 WEB-INF/resources/ca.lang.php             |  1 +
 WEB-INF/resources/cs.lang.php             |  1 +
 WEB-INF/resources/da.lang.php             |  1 +
 WEB-INF/resources/de.lang.php             |  2 +
 WEB-INF/resources/en.lang.php             |  1 +
 WEB-INF/resources/es.lang.php             |  1 +
 WEB-INF/resources/et.lang.php             |  2 +
 WEB-INF/resources/fa.lang.php             |  1 +
 WEB-INF/resources/fi.lang.php             |  1 +
 WEB-INF/resources/fr.lang.php             |  1 +
 WEB-INF/resources/gr.lang.php             |  1 +
 WEB-INF/resources/he.lang.php             |  1 +
 WEB-INF/resources/hu.lang.php             |  1 +
 WEB-INF/resources/it.lang.php             |  1 +
 WEB-INF/resources/ja.lang.php             |  1 +
 WEB-INF/resources/ko.lang.php             |  1 +
 WEB-INF/resources/nl.lang.php             |  2 +
 WEB-INF/resources/no.lang.php             |  1 +
 WEB-INF/resources/pl.lang.php             |  1 +
 WEB-INF/resources/pt-br.lang.php          |  1 +
 WEB-INF/resources/pt.lang.php             |  1 +
 WEB-INF/resources/ro.lang.php             |  1 +
 WEB-INF/resources/ru.lang.php             |  1 +
 WEB-INF/resources/sk.lang.php             |  1 +
 WEB-INF/resources/sl.lang.php             |  1 +
 WEB-INF/resources/sr.lang.php             |  1 +
 WEB-INF/resources/sv.lang.php             |  1 +
 WEB-INF/resources/tr.lang.php             |  1 +
 WEB-INF/resources/zh-cn.lang.php          |  1 +
 WEB-INF/resources/zh-tw.lang.php          |  1 +
 WEB-INF/templates/footer.tpl              |  2 +-
 WEB-INF/templates/group_advanced_edit.tpl | 37 ++++++++++
 WEB-INF/templates/group_edit.tpl          | 29 ++------
 group_advanced_edit.php                   | 90 +++++++++++++++++++++++
 group_edit.php                            | 31 +-------
 35 files changed, 168 insertions(+), 54 deletions(-)
 create mode 100644 WEB-INF/templates/group_advanced_edit.tpl
 create mode 100644 group_advanced_edit.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 30183878b..89172f674 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -598,6 +598,7 @@
 // '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.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 07adf4fae..4a3b90ac1 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -611,6 +611,7 @@
 // '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.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f7ae2ff50..cd7d54f45 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -572,6 +572,7 @@
 // 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.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 97f497fcb..5c9a7f064 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -548,6 +548,8 @@
 // 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?',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index fb4859322..add6c0b00 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -532,6 +532,7 @@
 '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?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 71989028a..60b1adba0 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -612,6 +612,7 @@
 // '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.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e371fa9c4..d18ce5820 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -577,6 +577,8 @@
 '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?',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3daed57e0..eaae09588 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -594,6 +594,7 @@
 // '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.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 6f3338ec7..8d1e44121 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -577,6 +577,7 @@
 // '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.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e8cc2f13d..49714745c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -568,6 +568,7 @@
 // '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.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 52925c56f..ad0dcd2e0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -558,6 +558,7 @@
 // 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.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 14469568e..aa9fafb28 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -598,6 +598,7 @@
 // '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.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3f194d1e0..9639f8fbc 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -604,6 +604,7 @@
 // '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.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 058244454..d895558ef 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -573,6 +573,7 @@
 // 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.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 39cc49c62..9a58c2d05 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -606,6 +606,7 @@
 // '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.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f0156d0a1..84e1cdf8a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -604,6 +604,7 @@
 // '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.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a288dac17..39cfaef59 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -525,6 +525,8 @@
 '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?',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5d826ce9c..bfeabdd32 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -603,6 +603,7 @@
 // '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.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 7a34834bb..828af7823 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -580,6 +580,7 @@
 // '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.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 69e9dd069..cb8d68f13 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -575,6 +575,7 @@
 // '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.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5007d5858..9b87642db 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -585,6 +585,7 @@
 // '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.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 950ed7723..057714eac 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -606,6 +606,7 @@
 // '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.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e502890a5..bc1963be1 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -523,6 +523,7 @@
 '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' => 'Вы уверены, что хотите удалить всю группу?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8e381c9bf..e68107077 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -587,6 +587,7 @@
 // '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.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 6aab8d2c6..2157ff512 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -580,6 +580,7 @@
 // '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.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c43570581..63ec33097 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -578,6 +578,7 @@
 // '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.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 89c1c7c61..7d756a516 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -577,6 +577,7 @@
 // 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.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b7433d5dc..479c8cd49 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -619,6 +619,7 @@
 // '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.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f63b28853..a1fc15d80 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -590,6 +590,7 @@
 // '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.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 577663bd9..9c97297d0 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -596,6 +596,7 @@
 // '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.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a989f27c5..a3ce24841 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.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
index 000000000..a9369787e
--- /dev/null
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -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}
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 0da797ffd..be8c46c10 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -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
index 000000000..03c7711a2
--- /dev/null
+++ b/group_advanced_edit.php
@@ -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');
diff --git a/group_edit.php b/group_edit.php
index abc06b469..1df99a1c5 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -45,7 +45,7 @@
 $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 @@
 $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 @@
   $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 @@
   $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 @@
   $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 @@
 // 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->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 ($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 @@
         '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 @@
   }
 } // 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();"');

From dc799619007c9eafdec69a70f89a2d08bb10864c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 May 2019 19:37:03 +0000
Subject: [PATCH 0966/1848] Rewrote group dropdown fill function to include the
 entire tree.

---
 WEB-INF/lib/ttUser.class.php | 32 ++++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 group_edit.php               |  2 +-
 groups.php                   |  2 +-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 62c786ce5..8f9578dd8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -560,6 +560,38 @@ function getGroupsForDropdown() {
     return $groups;
   }
 
+  // getGroupsForDropdown2 obtains an array of groups to populate the "Group" dropdown.
+  // It consists of the entire tree starting from user home group down.
+  // Group name is prefixed with additional characters to indicate subgroups level.
+  function getGroupsForDropdown2() {
+    global $user;
+
+    // Start with user home group.
+    $groups = array();
+    $subgroup_level = 0;
+    $group_id = $user->group_id;
+
+    $this->addGroup($groups, $group_id, $subgroup_level);
+    return $groups;
+  }
+
+  // addGroup is a recursive function to populate a tree of groups.
+  function addGroup(&$groups, $group_id, $subgroup_level) {
+    // Add indentation markup to indicate subdirectory level.
+    for ($i = 0; $i < $subgroup_level; $i++) {
+      $name .= '🛑'; // Unicode stop sign.
+    }
+    if ($subgroup_level) $name .= ' '; // Add an extra space.
+    $name .= ttGroupHelper::getGroupName($group_id);
+
+    $groups[] = array('id'=>$group_id, 'name'=>$name);
+
+    $subgroups = $this->getSubgroups($group_id);
+    foreach($subgroups as $subgroup) {
+      $this->addGroup($groups, $subgroup['id'], $subgroup_level+1);
+    }
+  }
+
   // getSubgroups obtains a list of immediate subgroups.
   function getSubgroups($group_id = null) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a3ce24841..14944213f 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.19.4.5007 | 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.5008 | 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/group_edit.php b/group_edit.php
index 1df99a1c5..77b464b90 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -68,7 +68,7 @@
  $user->setOnBehalfGroup($group_id);
 }
 
-$groups = $user->getGroupsForDropdown();
+$groups = $user->getGroupsForDropdown2();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = $user->getConfigHelper();
 
diff --git a/groups.php b/groups.php
index f335153ce..449bd6360 100644
--- a/groups.php
+++ b/groups.php
@@ -49,7 +49,7 @@
 }
 
 $form = new Form('subgroupsForm');
-$groups = $user->getGroupsForDropdown();
+$groups = $user->getGroupsForDropdown2();
 if (count($groups) > 1) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',

From 253b4bd9eea2c01fe72bd45dd12ad8568177672c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 May 2019 19:51:10 +0000
Subject: [PATCH 0967/1848] Moved Subgroups from top menu to group_edit.php.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 8 +++++++-
 WEB-INF/templates/header.tpl     | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 14944213f..54bf35ff6 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.19.4.5008 | 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.5009 | 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 be8c46c10..659e62472 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -23,11 +23,17 @@ function handleTaskRequiredCheckbox() {
     <tr>
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
-{if $user->can('manage_subgroups') && $group_dropdown}
+{if $user->can('manage_subgroups')}
+  {if $group_dropdown}
           <tr>
             <td align="right" nowrap>{$i18n.label.group}:</td>
             <td>{$forms.groupForm.group.control}</td>
           </tr>
+  {/if}
+          <tr>
+            <td align="right" nowrap>{$i18n.label.subgroups}:</td>
+            <td><a href="groups.php">{$i18n.label.configure}</a></td>
+          </tr>
 {/if}
           <tr>
             <td align="right">{$i18n.label.currency}:</td>
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 30d804405..d9ceab91d 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -89,9 +89,6 @@
     {if $user->can('manage_basic_settings')}
             <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a>
     {/if}
-    {if $user->can('manage_subgroups')}
-            <a class="systemMenu" href="groups.php">{$i18n.menu.subgroups}</a>
-    {/if}
     {if $user->can('manage_features')}
             <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a>
     {/if}

From e3cdaaf8e6b4e5433ec620396e562de1a5dcec10 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 May 2019 20:57:24 +0000
Subject: [PATCH 0968/1848] A bit of refactoring.

---
 WEB-INF/lib/ttGroupHelper.class.php |  3 +-
 WEB-INF/lib/ttUser.class.php        | 64 ++++-------------------------
 WEB-INF/templates/footer.tpl        |  2 +-
 group_edit.php                      |  2 +-
 groups.php                          |  2 +-
 5 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 167c620cb..05a31562a 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -34,9 +34,10 @@ class ttGroupHelper {
 
   // The getGroupName function returns group name.
   static function getGroupName($group_id) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "select name from tt_groups where id = $group_id and (status = 1 or status = 0)";
+    $sql = "select name from tt_groups where id = $group_id and org_id = $user->org_id and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 8f9578dd8..078d6eca8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -510,60 +510,10 @@ function getUsers($options) {
     return $user_list;
   }
 
-  // getGroupsForDropdown obtains an array of groups to populate "Group" dropdown.
-  // It consists of:
-  //   - User home group.
-  //   - The entire stack of groups all the way down to current on behalf group.
-  //   - All immediate children of the current on behalf group.
-  // This allows user to navigate easily to home group, anything in between, and 1 level below.
-  function getGroupsForDropdown() {
-    $mdb2 = getConnection();
-
-    // Start with subgroups.
-    $groups = array();
-    $group_id = $this->getGroup();
-    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $groups[] = $val;
-      }
-    }
-
-    // Add current on behalf group to the beginning of array.
-    $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
-    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
-    array_unshift($groups,  array('id'=>$selected_group_id,'name'=>$selected_group_name));
-
-    // Iterate all the way to the home group, starting with selected ("on behalf") group.
-    $current_group_id = $selected_group_id;
-    while ($current_group_id != $this->group_id) {
-      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $current_group_id and status = 1";
-      $res = $mdb2->query($sql);
-      if (is_a($res, 'PEAR_Error')) return false;
-
-      $val = $res->fetchRow();
-      $parent_id = $val['parent_id'];
-      if ($parent_id) {
-        // Get parent group name.
-        $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
-        $res = $mdb2->query($sql);
-        if (is_a($res, 'PEAR_Error')) return false;
-        $val = $res->fetchRow();
-        if (!$val) return false;
-        array_unshift($groups, array('id'=>$parent_id,'name'=>$val['name']));
-        $current_group_id = $parent_id;
-      } else {
-        return false;
-      }
-    }
-    return $groups;
-  }
-
-  // getGroupsForDropdown2 obtains an array of groups to populate the "Group" dropdown.
-  // It consists of the entire tree starting from user home group down.
+  // getGroupsForDropdown obtains an array of groups to populate the "Group" dropdown.
+  // It consists of the entire tree starting from user home group.
   // Group name is prefixed with additional characters to indicate subgroups level.
-  function getGroupsForDropdown2() {
+  function getGroupsForDropdown() {
     global $user;
 
     // Start with user home group.
@@ -571,12 +521,12 @@ function getGroupsForDropdown2() {
     $subgroup_level = 0;
     $group_id = $user->group_id;
 
-    $this->addGroup($groups, $group_id, $subgroup_level);
+    $this->addGroupToDropdown($groups, $group_id, $subgroup_level);
     return $groups;
   }
 
-  // addGroup is a recursive function to populate a tree of groups.
-  function addGroup(&$groups, $group_id, $subgroup_level) {
+  // addGroup is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
+  function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
     // Add indentation markup to indicate subdirectory level.
     for ($i = 0; $i < $subgroup_level; $i++) {
       $name .= '🛑'; // Unicode stop sign.
@@ -588,7 +538,7 @@ function addGroup(&$groups, $group_id, $subgroup_level) {
 
     $subgroups = $this->getSubgroups($group_id);
     foreach($subgroups as $subgroup) {
-      $this->addGroup($groups, $subgroup['id'], $subgroup_level+1);
+      $this->addGroupToDropdown($groups, $subgroup['id'], $subgroup_level+1);
     }
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 54bf35ff6..cbd5f9113 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.19.4.5009 | 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.5010 | 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/group_edit.php b/group_edit.php
index 77b464b90..1df99a1c5 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -68,7 +68,7 @@
  $user->setOnBehalfGroup($group_id);
 }
 
-$groups = $user->getGroupsForDropdown2();
+$groups = $user->getGroupsForDropdown();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = $user->getConfigHelper();
 
diff --git a/groups.php b/groups.php
index 449bd6360..f335153ce 100644
--- a/groups.php
+++ b/groups.php
@@ -49,7 +49,7 @@
 }
 
 $form = new Form('subgroupsForm');
-$groups = $user->getGroupsForDropdown2();
+$groups = $user->getGroupsForDropdown();
 if (count($groups) > 1) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',

From f504e16303445771d7f069ed49a5a29bbd7ef737 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 May 2019 21:00:49 +0000
Subject: [PATCH 0969/1848] Fixed a comment.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 078d6eca8..5498a996f 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -525,7 +525,7 @@ function getGroupsForDropdown() {
     return $groups;
   }
 
-  // addGroup is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
+  // addGroupToDropdown is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
   function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
     // Add indentation markup to indicate subdirectory level.
     for ($i = 0; $i < $subgroup_level; $i++) {

From 97bc3daf3d32a73d2b614eecacfe1abc0639a271 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 24 May 2019 14:54:37 +0000
Subject: [PATCH 0970/1848] Improved protection from mass bot registrations.

---
 WEB-INF/lib/ttRegistrator.class.php | 21 ++++++++++++++++++---
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 33d325971..e054fe001 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -215,13 +215,28 @@ private function setCreatedBy($user_id) {
     return true;
   }
 
-  // registeredRecently determines if we already have a successful recent registration from user IP.
-  // "recent" means "within the last minute" and is set in a query by the following condition:
-  // "and created > now() - interval 1 minute". Change if necessary.
+  // registeredRecently determines if we already have successful recent registration(s) from user IP.
+  // "recent" means the following:
+  // - 2 or more registrations during last 10 minutes, or
+  // - 1 registration during last minute.
+  //
+  // This offers some level of protection from bot registrations.
   function registeredRecently() {
     $mdb2 = getConnection();
 
     $ip_part = ' created_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $sql = 'select count(*) as cnt from tt_groups where '.$ip_part.' and created > now() - interval 10 minute';
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    $val = $res->fetchRow();
+    if ($val['cnt'] == 0)
+      return false; // No registrations in last 10 minutes.
+    if ($val['cnt'] >= 2)
+      return true;  // 2 or more registrations in last 10 mintes.
+
+    // If we are here, there was exactly one registration during last 10 minutes.
+    // Determine if it occurred within the last minute in a separate query.
     $sql = 'select created from tt_groups where '.$ip_part.' and created > now() - interval 1 minute';
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cbd5f9113..a51049ae2 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.19.4.5010 | 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.5011 | 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>

From d18d90a3f3050def6c646eef7d5420c2d2091393 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 24 May 2019 21:41:12 +0000
Subject: [PATCH 0971/1848] Added capability to see uncompleted indicators to
 users with view_users right.

---
 WEB-INF/lib/ttTimeHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/users.tpl        | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f6d8b92df..d7278c69e 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -649,8 +649,8 @@ static function getTimeForMonth($date) {
   static function getUncompleted($user_id) {
     $mdb2 = getConnection();
 
-    $sql = "select id, start from tt_log  
-      where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1";
+    $sql = "select id, start, date from tt_log".
+      " where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a51049ae2..49305b5ce 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.19.4.5011 | 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.5012 | 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/users.tpl b/WEB-INF/templates/users.tpl
index c9f67503e..401751fcb 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -104,7 +104,12 @@
         </tr>
   {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$u.name|escape}</td>
+          <td>
+    {if $uncompleted_indicators}
+            <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
+    {/if}
+            {$u.name|escape}
+          </td>
           <td>{$u.login|escape}</td>
           <td>{$u.role_name|escape}</td>
         </tr>

From dae63a256124376c8379a7d366d6ab885be22ac6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 29 May 2019 16:24:00 +0000
Subject: [PATCH 0972/1848] Fixed sorting of projects in dropdown on the
 reports.php page.

---
 WEB-INF/lib/ttProjectHelper.class.php | 6 +++---
 WEB-INF/templates/footer.tpl          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 22ef58a23..399cba2d2 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -45,7 +45,7 @@ static function getAssignedProjects($user_id) {
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.tasks, upb.rate from tt_projects p".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
-      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -87,7 +87,7 @@ static function getProjects() {
 
     $result = array();
     $sql = "select id, name, tasks from tt_projects".
-      " where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by name";
+      " where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -109,7 +109,7 @@ static function getProjectsForClient() {
     $sql = "select p.id, p.name, p.tasks from tt_projects p".
       " inner join tt_client_project_binds cpb on (cpb.client_id = $user->client_id and cpb.project_id = p.id)".
       " where p.group_id = $group_id and p.org_id = $org_id and (p.status = 0 or p.status = 1)".
-      " order by p.name";
+      " order by upper(p.name)";
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 49305b5ce..4c7e5cad9 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.19.4.5012 | 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.5013 | 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>

From ddbe45e8a1120c0a80032a0021613b9d1d9f3116 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 24 Jun 2019 13:38:52 +0000
Subject: [PATCH 0973/1848] Added a link explaining record type.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4c7e5cad9..b34e2e885 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.19.4.5013 | 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.5014 | 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 659e62472..67bddd9e5 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -78,7 +78,7 @@ function handleTaskRequiredCheckbox() {
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.record_type}:</td>
-            <td>{$forms.groupForm.record_type.control}</td>
+            <td>{$forms.groupForm.record_type.control} <a href="https://www.anuko.com/lp/tt_38.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.punch_mode}:</td>

From 9850e2eb4693a013ff10ba4b44c58c72e8501081 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Jun 2019 14:34:24 +0000
Subject: [PATCH 0974/1848] Starting working on extending custom fields.

---
 WEB-INF/templates/footer.tpl | 2 +-
 dbinstall.php                | 9 +++++----
 mysql.sql                    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b34e2e885..8860978db 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.19.4.5014 | 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.5.5015 | 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/dbinstall.php b/dbinstall.php
index 5dc943f28..035cffc38 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11904"]) {
+  if ($_POST["convert11900to11905"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1173,6 +1173,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.3', modified = now() where param_name = 'version_db' and param_value = '1.19.0'");
     ttExecute("ALTER TABLE `tt_groups` ADD `holidays` text default null AFTER `lock_spec`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.4', modified = now() where param_name = 'version_db' and param_value = '1.19.3'");
+    ttExecute("ALTER TABLE `tt_custom_fields` ADD `entity_type` varchar(32) NOT NULL default 'time' AFTER `org_id`");
   }
 
   if ($_POST["cleanup"]) {
@@ -1222,7 +1223,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.4)</b>
+    <td width="80%"><b>Create database structure (v1.19.5)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1271,8 +1272,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.4)</td>
-    <td><input type="submit" name="convert11900to11904" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.5)</td>
+    <td><input type="submit" name="convert11900to11905" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index be0d7edf7..14d9021be 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -381,6 +381,7 @@ CREATE TABLE `tt_custom_fields` (
   `id` int(11) NOT NULL auto_increment,    # custom field id
   `group_id` int(11) NOT NULL,             # group id
   `org_id` int(11) default NULL,           # organization id
+  `entity_type` varchar(32) NOT NULL default 'time', # type of entity custom field is associated with (time, user, project, task, etc.)
   `type` tinyint(4) NOT NULL default 0,    # custom field type (text or dropdown)
   `label` varchar(32) NOT NULL default '', # custom field label
   `required` tinyint(4) default 0,         # whether this custom field is mandatory for time records
@@ -610,4 +611,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.4', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.5', now()); # TODO: change when structure changes.

From 5629a1c360655d5a09dc965004946bf65e3725b9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Jun 2019 15:50:04 +0000
Subject: [PATCH 0975/1848] Introduced label.entity into localization files,

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 89172f674..20d6cd19b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -245,6 +245,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 4a3b90ac1..0bd49c6b4 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -255,6 +255,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index cd7d54f45..ad2da4c5d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -235,6 +235,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Brugerdefineret felt',
 'label.monthly_quotas' => 'Månedlig kvota',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Type',
 'label.type_dropdown' => 'Dropdown',
 'label.type_text' => 'Tekst',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 5c9a7f064..e15874d8e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -225,6 +225,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Benutzerfelder',
 'label.monthly_quotas' => 'Monatliche Quoten',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Typ',
 'label.type_dropdown' => 'Ausklappen',
 'label.type_text' => 'Text',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index add6c0b00..e7de74697 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -214,6 +214,7 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Custom fields',
 'label.monthly_quotas' => 'Monthly quotas',
+'label.entity' => 'Entity',
 'label.type' => 'Type',
 'label.type_dropdown' => 'dropdown',
 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 60b1adba0..d7abcdab5 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -249,6 +249,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d18ce5820..39a0a271c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -241,6 +241,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eriväljad',
 'label.monthly_quotas' => 'Kuu kvoot',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Tüüp',
 'label.type_dropdown' => 'rippmenüü',
 'label.type_text' => 'tekst',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index eaae09588..b2eaf91e3 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -247,6 +247,8 @@
 'label.custom_fields' => 'فیلدهای سفارشی',
 // Translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'نوع',
 'label.type_dropdown' => 'منو کشویی',
 'label.type_text' => 'متن',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 8d1e44121..626d2c9be 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -239,6 +239,8 @@
 'label.custom_fields' => 'Omat kentät',
 // TODO: translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Tyyppi',
 'label.type_dropdown' => 'pudotusvalikko',
 'label.type_text' => 'teksti',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 49714745c..005007e1b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -234,6 +234,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Champs personalisés',
 'label.monthly_quotas' => 'Quotas mensuels',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Type',
 'label.type_dropdown' => 'Liste déroulante',
 'label.type_text' => 'Texte',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ad0dcd2e0..4f9ec5723 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -227,6 +227,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Προσαρμοσμένα πεδία',
 'label.monthly_quotas' => 'Μηνιαίες ποσοστώσεις',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Τύπος',
 'label.type_dropdown' => 'Αναπτυσσόμενο',
 'label.type_text' => 'Κείμενο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index aa9fafb28..5ac9ec477 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -255,6 +255,7 @@
 'label.custom_fields' => 'שדות אישיים',
 // Translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 'label.type' => 'סוג',
 'label.type_dropdown' => 'רשימה',
 'label.type_text' => 'טקסט',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9639f8fbc..3abdb70b9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -253,6 +253,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d895558ef..94e059bf4 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -231,6 +231,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campi personalizzati',
 'label.monthly_quotas' => 'Quote mensili',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Tipo',
 'label.type_dropdown' => 'menu a tendina',
 'label.type_text' => 'testo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9a58c2d05..0c2b51cbd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -256,6 +256,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 84e1cdf8a..d30e51d88 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -255,6 +255,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 39cfaef59..ca96a0ccc 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -214,6 +214,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eigen velden',
 'label.monthly_quotas' => 'Doelen per maand',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Type',
 'label.type_dropdown' => 'uitklapbaar',
 'label.type_text' => 'tekst',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index bfeabdd32..c59d5086e 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -254,6 +254,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 828af7823..427b1e6ad 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -241,6 +241,8 @@
 'label.custom_fields' => 'Niestandardowe pola',
 // Translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Rodzaj',
 'label.type_dropdown' => 'lista rozwijana',
 'label.type_text' => 'tekst',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index cb8d68f13..b7f3c38eb 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -238,6 +238,8 @@
 'label.custom_fields' => 'Campos personalizados',
 // Translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Tipo',
 'label.type_dropdown' => 'lista suspensa',
 'label.type_text' => 'texto',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9b87642db..d9c51bd2b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -243,6 +243,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 057714eac..a747e5721 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -253,6 +253,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index bc1963be1..ff20fc5e6 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -213,6 +213,7 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Дополнительные поля',
 'label.monthly_quotas' => 'Месячные квоты',
+'label.entity' => 'Сущность',
 'label.type' => 'Тип',
 'label.type_dropdown' => 'комбо',
 'label.type_text' => 'текст',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e68107077..52a810c3a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -244,6 +244,8 @@
 'label.custom_fields' => 'Vlastné polia',
 // Translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Typ',
 'label.type_dropdown' => 'rozbaľovacie pole',
 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2157ff512..578b81650 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -238,6 +238,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 63ec33097..94b9512ef 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -238,6 +238,8 @@
 'label.custom_fields' => 'Dodatna polja',
 // Translate the following.
 // 'label.monthly_quotas' => 'Monthly quotas',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Tipovi',
 'label.type_dropdown' => 'odaberi',
 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 7d756a516..030806e85 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -234,6 +234,8 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Egna fält',
 'label.monthly_quotas' => 'Månadskvoter',
+// TODO: translate the following.
+// 'label.entity' => 'Entity',
 'label.type' => 'Typ',
 'label.type_dropdown' => 'Rullgardinsmeny',
 'label.type_text' => 'Text',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 479c8cd49..9a4693b81 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -260,6 +260,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a1fc15d80..a6dfa62ce 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -246,6 +246,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 9c97297d0..1b88e9eab 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -252,6 +252,7 @@
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
 // 'label.monthly_quotas' => 'Monthly quotas',
+// 'label.entity' => 'Entity',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8860978db..f01a172e6 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.19.5.5015 | 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.5.5016 | 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>

From a0ff02ec3fa7016404f3992710db57951e74e824 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Jun 2019 17:02:18 +0000
Subject: [PATCH 0976/1848] Introduced dropdown.time to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 cf_custom_field_add.php          | 5 +++++
 plugins/CustomFields.class.php   | 5 ++++-
 33 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 20d6cd19b..960ed0b23 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -414,6 +414,7 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projectes',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0bd49c6b4..1d1da5248 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -423,6 +423,8 @@
 'dropdown.previous_year' => 'minulý rok',
 'dropdown.selected_year' => 'rok',
 'dropdown.all_time' => 'od počátku',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projekty',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index ad2da4c5d..b1afacb7b 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -396,6 +396,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'år',
 'dropdown.all_time' => 'Alt',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'Projekter',
 'dropdown.tasks' => 'Opgaver',
 'dropdown.clients' => 'Klienter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e15874d8e..9524dad63 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -378,6 +378,8 @@
 'dropdown.previous_year' => 'vorheriges Jahr',
 'dropdown.selected_year' => 'Jahr',
 'dropdown.all_time' => 'Gesamtzeitraum',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'Projekte',
 'dropdown.tasks' => 'Aufgaben',
 'dropdown.clients' => 'Kunden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index e7de74697..ef89c364b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -363,6 +363,7 @@
 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'all time',
+'dropdown.time' => 'time',
 'dropdown.projects' => 'projects',
 'dropdown.tasks' => 'tasks',
 'dropdown.clients' => 'clients',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d7abcdab5..5fd0ac430 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -414,6 +414,7 @@
 'dropdown.selected_year' => 'año',
 // TODO: translate the following.
 // 'dropdown.all_time' => 'all time',
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'proyectos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 39a0a271c..3eea2d0ed 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -401,6 +401,8 @@
 'dropdown.previous_year' => 'eelmine aasta',
 'dropdown.selected_year' => 'aasta',
 'dropdown.all_time' => 'kõik ajavahemikud',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projektid',
 'dropdown.tasks' => 'tööülesanded',
 'dropdown.clients' => 'kliendid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index b2eaf91e3..3b6e9d81e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -407,6 +407,8 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'همه زمان ها',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'پروژه ها',
 'dropdown.tasks' => 'وظایف',
 'dropdown.clients' => 'مشتریان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 626d2c9be..1aa06d567 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -396,6 +396,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'vuosi',
 'dropdown.all_time' => 'kaikki tunnit',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projektit',
 'dropdown.tasks' => 'tehtävät',
 'dropdown.clients' => 'asiakkaat',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 005007e1b..cb4883726 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -388,6 +388,8 @@
 'dropdown.previous_year' => 'année dernière',
 'dropdown.selected_year' => 'année',
 'dropdown.all_time' => 'depuis toujours',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'Projets',
 'dropdown.tasks' => 'Tâches',
 'dropdown.clients' => 'Clients',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4f9ec5723..c8a8ab088 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -386,6 +386,8 @@
 'dropdown.previous_year' => 'προηγούμενο έτος',
 'dropdown.selected_year' => 'έτος',
 'dropdown.all_time' => 'όλη την περίοδο',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'έργα',
 'dropdown.tasks' => 'εργασίες',
 'dropdown.clients' => 'πελάτες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5ac9ec477..10a40edcf 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -413,6 +413,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'שנה',
 'dropdown.all_time' => 'הכל',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'פרוייקטים',
 'dropdown.tasks' => 'משימות',
 'dropdown.clients' => 'לקוחות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3abdb70b9..95d990466 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -416,6 +416,7 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projektek',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 94e059bf4..845b1d10f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -396,6 +396,8 @@
 'dropdown.previous_year' => 'anno precedente',
 'dropdown.selected_year' => 'anno',
 'dropdown.all_time' => 'tutto il tempo',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'progetti',
 'dropdown.tasks' => 'compiti',
 'dropdown.clients' => 'clienti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0c2b51cbd..3b9c091ec 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -419,6 +419,8 @@
 'dropdown.previous_year' => '昨年',
 'dropdown.selected_year' => '年',
 'dropdown.all_time' => 'すべての時間',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'プロジェクト',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d30e51d88..43d3f8ad1 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -422,6 +422,8 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => '전시간',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => '프로젝트',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ca96a0ccc..49125a648 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -363,6 +363,8 @@
 'dropdown.previous_year' => 'vorig jaar',
 'dropdown.selected_year' => 'jaar',
 'dropdown.all_time' => 'alles',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projecten',
 'dropdown.tasks' => 'taken',
 'dropdown.clients' => 'klanten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c59d5086e..04ccf3c64 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -417,6 +417,8 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'prosjekter',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 427b1e6ad..3f0d93bff 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -399,6 +399,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'rok',
 'dropdown.all_time' => 'od początku',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'zadania',
 'dropdown.clients' => 'klienci',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b7f3c38eb..ef6eacee2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -394,6 +394,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'ano',
 'dropdown.all_time' => 'todas as datas',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projetos',
 'dropdown.tasks' => 'tarefas',
 'dropdown.clients' => 'clientes',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d9c51bd2b..79bbae1ce 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -402,6 +402,8 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projetos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a747e5721..fc9f67e56 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -420,6 +420,7 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'proiecte',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ff20fc5e6..22c666fe2 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -360,6 +360,7 @@
 'dropdown.previous_year' => 'прошлый год',
 'dropdown.selected_year' => 'год',
 'dropdown.all_time' => 'всё время',
+'dropdown.time' => 'время',
 'dropdown.projects' => 'проекты',
 'dropdown.tasks' => 'задачи',
 'dropdown.clients' => 'клиенты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 52a810c3a..133f80f0c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -403,6 +403,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'rok',
 'dropdown.all_time' => 'celý čas',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'úlohy',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 578b81650..f02209963 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -394,6 +394,7 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projekti',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 94b9512ef..d8f8986e4 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -397,6 +397,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'godina',
 'dropdown.all_time' => 'svi datumi',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projekti',
 'dropdown.tasks' => 'zadaci',
 'dropdown.clients' => 'klijenti',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 030806e85..97392f9eb 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -396,6 +396,8 @@
 'dropdown.previous_year' => 'Föregående år',
 'dropdown.selected_year' => 'År',
 'dropdown.all_time' => 'Livstid',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'Projekt',
 'dropdown.tasks' => 'Arbetsuppgifter',
 'dropdown.clients' => 'Kunder',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9a4693b81..39c39e8f4 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -428,6 +428,8 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'tüm zamanlar',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => 'projeler',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a6dfa62ce..7493be7a0 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -409,6 +409,8 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => '全部时间',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => '项目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1b88e9eab..b8d923b8d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -414,6 +414,8 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => '年',
 'dropdown.all_time' => '全部時間',
+// TODO: translate the following.
+// 'dropdown.time' => 'time',
 'dropdown.projects' => '項目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f01a172e6..59b49cfe1 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.19.5.5016 | 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.5.5017 | 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/cf_custom_field_add.php b/cf_custom_field_add.php
index c0dc255f6..c22c10e5b 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -49,6 +49,7 @@
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));
+  $cl_field_entity = $request->getParameter('entity');
   $cl_field_type = $request->getParameter('type');
   $cl_required = $request->getParameter('required');
   if (!$cl_required)
@@ -57,6 +58,10 @@
 
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
+$form->addInput(array('type'=>'combobox','name'=>'entity',
+  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('label.type_text'),
+                CustomFields::ENTITY_USER=>$i18n->get('label.user'))
+));
 $form->addInput(array('type'=>'combobox','name'=>'type',
   'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
                 CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index d9762b58d..ce870a94d 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -29,7 +29,10 @@
 class CustomFields {
 
   // Definitions of custom field types.
-
+  const ENTITY_TIME = 1;    // Field is associated with time entries.
+  const ENTITY_USER = 2;    // Field is associated with users.
+  const ENTITY_PROJECT = 3; // Field is associated with projects.
+    
   const TYPE_TEXT = 1;     // A text field.
   const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
 

From e85347d56f89d7fcc5e68763038551687f291b5c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Jun 2019 20:10:14 +0000
Subject: [PATCH 0977/1848] More work in progress on custom fields extension.

---
 WEB-INF/resources/ca.lang.php             | 1 +
 WEB-INF/resources/cs.lang.php             | 1 +
 WEB-INF/resources/da.lang.php             | 1 +
 WEB-INF/resources/de.lang.php             | 1 +
 WEB-INF/resources/en.lang.php             | 1 +
 WEB-INF/resources/es.lang.php             | 1 +
 WEB-INF/resources/et.lang.php             | 1 +
 WEB-INF/resources/fa.lang.php             | 1 +
 WEB-INF/resources/fi.lang.php             | 1 +
 WEB-INF/resources/fr.lang.php             | 1 +
 WEB-INF/resources/gr.lang.php             | 1 +
 WEB-INF/resources/he.lang.php             | 1 +
 WEB-INF/resources/hu.lang.php             | 1 +
 WEB-INF/resources/it.lang.php             | 1 +
 WEB-INF/resources/ja.lang.php             | 1 +
 WEB-INF/resources/ko.lang.php             | 1 +
 WEB-INF/resources/nl.lang.php             | 1 +
 WEB-INF/resources/no.lang.php             | 1 +
 WEB-INF/resources/pl.lang.php             | 1 +
 WEB-INF/resources/pt-br.lang.php          | 1 +
 WEB-INF/resources/pt.lang.php             | 1 +
 WEB-INF/resources/ro.lang.php             | 1 +
 WEB-INF/resources/ru.lang.php             | 1 +
 WEB-INF/resources/sk.lang.php             | 1 +
 WEB-INF/resources/sl.lang.php             | 1 +
 WEB-INF/resources/sr.lang.php             | 1 +
 WEB-INF/resources/sv.lang.php             | 1 +
 WEB-INF/resources/tr.lang.php             | 1 +
 WEB-INF/resources/zh-cn.lang.php          | 1 +
 WEB-INF/resources/zh-tw.lang.php          | 1 +
 WEB-INF/templates/cf_custom_field_add.tpl | 6 ++++++
 WEB-INF/templates/footer.tpl              | 2 +-
 cf_custom_field_add.php                   | 8 ++++----
 plugins/CustomFields.class.php            | 4 ++--
 34 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 960ed0b23..0f0b4c7fc 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -415,6 +415,7 @@
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projectes',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1d1da5248..9000b3b19 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -425,6 +425,7 @@
 'dropdown.all_time' => 'od počátku',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index b1afacb7b..c17676318 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -398,6 +398,7 @@
 'dropdown.all_time' => 'Alt',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekter',
 'dropdown.tasks' => 'Opgaver',
 'dropdown.clients' => 'Klienter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9524dad63..9fe12dfca 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -380,6 +380,7 @@
 'dropdown.all_time' => 'Gesamtzeitraum',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekte',
 'dropdown.tasks' => 'Aufgaben',
 'dropdown.clients' => 'Kunden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ef89c364b..7d25fd690 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -364,6 +364,7 @@
 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'all time',
 'dropdown.time' => 'time',
+'dropdown.user' => 'user',
 'dropdown.projects' => 'projects',
 'dropdown.tasks' => 'tasks',
 'dropdown.clients' => 'clients',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5fd0ac430..44ed2567a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -415,6 +415,7 @@
 // TODO: translate the following.
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'proyectos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 3eea2d0ed..34a7239b1 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -403,6 +403,7 @@
 'dropdown.all_time' => 'kõik ajavahemikud',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektid',
 'dropdown.tasks' => 'tööülesanded',
 'dropdown.clients' => 'kliendid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3b6e9d81e..3095a87e4 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -409,6 +409,7 @@
 'dropdown.all_time' => 'همه زمان ها',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'پروژه ها',
 'dropdown.tasks' => 'وظایف',
 'dropdown.clients' => 'مشتریان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1aa06d567..752c6ffd4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -398,6 +398,7 @@
 'dropdown.all_time' => 'kaikki tunnit',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektit',
 'dropdown.tasks' => 'tehtävät',
 'dropdown.clients' => 'asiakkaat',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index cb4883726..ff7e4e6f7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -390,6 +390,7 @@
 'dropdown.all_time' => 'depuis toujours',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projets',
 'dropdown.tasks' => 'Tâches',
 'dropdown.clients' => 'Clients',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c8a8ab088..1e3c8be97 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -388,6 +388,7 @@
 'dropdown.all_time' => 'όλη την περίοδο',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'έργα',
 'dropdown.tasks' => 'εργασίες',
 'dropdown.clients' => 'πελάτες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 10a40edcf..2905e274a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -415,6 +415,7 @@
 'dropdown.all_time' => 'הכל',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'פרוייקטים',
 'dropdown.tasks' => 'משימות',
 'dropdown.clients' => 'לקוחות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 95d990466..d44c8d8a0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -417,6 +417,7 @@
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektek',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 845b1d10f..a1efcd521 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -398,6 +398,7 @@
 'dropdown.all_time' => 'tutto il tempo',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'progetti',
 'dropdown.tasks' => 'compiti',
 'dropdown.clients' => 'clienti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3b9c091ec..1fadd683e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -421,6 +421,7 @@
 'dropdown.all_time' => 'すべての時間',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'プロジェクト',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 43d3f8ad1..115a96a50 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -424,6 +424,7 @@
 'dropdown.all_time' => '전시간',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => '프로젝트',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 49125a648..58d3aaaa2 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -365,6 +365,7 @@
 'dropdown.all_time' => 'alles',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projecten',
 'dropdown.tasks' => 'taken',
 'dropdown.clients' => 'klanten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 04ccf3c64..27d6a91ba 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -419,6 +419,7 @@
 // 'dropdown.all_time' => 'all time',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'prosjekter',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3f0d93bff..aa6a2ceff 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -401,6 +401,7 @@
 'dropdown.all_time' => 'od początku',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'zadania',
 'dropdown.clients' => 'klienci',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ef6eacee2..3d1d0abe8 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -396,6 +396,7 @@
 'dropdown.all_time' => 'todas as datas',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projetos',
 'dropdown.tasks' => 'tarefas',
 'dropdown.clients' => 'clientes',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 79bbae1ce..2720464a2 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -404,6 +404,7 @@
 // 'dropdown.all_time' => 'all time',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projetos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fc9f67e56..64b4551cc 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -421,6 +421,7 @@
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'proiecte',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 22c666fe2..980aa466e 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -361,6 +361,7 @@
 'dropdown.selected_year' => 'год',
 'dropdown.all_time' => 'всё время',
 'dropdown.time' => 'время',
+'dropdown.user' => 'пользователь',
 'dropdown.projects' => 'проекты',
 'dropdown.tasks' => 'задачи',
 'dropdown.clients' => 'клиенты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 133f80f0c..56d14f665 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -405,6 +405,7 @@
 'dropdown.all_time' => 'celý čas',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'úlohy',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f02209963..db54f19e1 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -395,6 +395,7 @@
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekti',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d8f8986e4..eb8f3ebf0 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -399,6 +399,7 @@
 'dropdown.all_time' => 'svi datumi',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekti',
 'dropdown.tasks' => 'zadaci',
 'dropdown.clients' => 'klijenti',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 97392f9eb..c17662baa 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -398,6 +398,7 @@
 'dropdown.all_time' => 'Livstid',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekt',
 'dropdown.tasks' => 'Arbetsuppgifter',
 'dropdown.clients' => 'Kunder',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 39c39e8f4..5701f5621 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -430,6 +430,7 @@
 'dropdown.all_time' => 'tüm zamanlar',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projeler',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7493be7a0..dce6df857 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -411,6 +411,7 @@
 'dropdown.all_time' => '全部时间',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => '项目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index b8d923b8d..a18cb213b 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -416,6 +416,7 @@
 'dropdown.all_time' => '全部時間',
 // TODO: translate the following.
 // 'dropdown.time' => 'time',
+// 'dropdown.user' => 'user',
 'dropdown.projects' => '項目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
index 442f41bb8..4c343eec9 100644
--- a/WEB-INF/templates/cf_custom_field_add.tpl
+++ b/WEB-INF/templates/cf_custom_field_add.tpl
@@ -8,6 +8,12 @@
           <td align="right">{$i18n.label.thing_name} (*):</td>
           <td>{$forms.fieldForm.name.control}</td>
         </tr>
+{if isTrue('CF_DEBUG')}
+        <tr>
+          <td align="right">{$i18n.label.entity}:</td>
+          <td>{$forms.fieldForm.entity.control} <a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+{/if}
         <tr>
           <td align="right">{$i18n.label.type}:</td>
           <td>{$forms.fieldForm.type.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 59b49cfe1..265b35fe2 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.19.5.5017 | 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.5.5018 | 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/cf_custom_field_add.php b/cf_custom_field_add.php
index c22c10e5b..e4a919eb5 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -49,7 +49,7 @@
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));
-  $cl_field_entity = $request->getParameter('entity');
+  $cl_entity_type = $request->getParameter('entity');
   $cl_field_type = $request->getParameter('type');
   $cl_required = $request->getParameter('required');
   if (!$cl_required)
@@ -59,8 +59,8 @@
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
 $form->addInput(array('type'=>'combobox','name'=>'entity',
-  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('label.type_text'),
-                CustomFields::ENTITY_USER=>$i18n->get('label.user'))
+  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('dropdown.time'),
+                CustomFields::ENTITY_USER=>$i18n->get('dropdown.user'))
 ));
 $form->addInput(array('type'=>'combobox','name'=>'type',
   'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
@@ -74,7 +74,7 @@
   if (!ttValidString($cl_field_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
-    $res = CustomFields::insertField($cl_field_name, $cl_field_type, $cl_required);
+    $res = CustomFields::insertField($cl_field_name, $cl_entity_type, $cl_field_type, $cl_required);
     if ($res) {
       header('Location: cf_custom_fields.php');
       exit();
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index ce870a94d..a0c49ec56 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -32,7 +32,7 @@ class CustomFields {
   const ENTITY_TIME = 1;    // Field is associated with time entries.
   const ENTITY_USER = 2;    // Field is associated with users.
   const ENTITY_PROJECT = 3; // Field is associated with projects.
-    
+
   const TYPE_TEXT = 1;     // A text field.
   const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
 
@@ -301,7 +301,7 @@ static function getFieldIdForOption($option_id) {
   }
 
   // The insertField inserts a custom field for group.
-  static function insertField($field_name, $field_type, $required) {
+  static function insertField($field_name, $entity_type, $field_type, $required) {
     global $user;
     $mdb2 = getConnection();
 

From 691958794018beda9788e9bdb47d640a116af492 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Jun 2019 13:12:29 +0000
Subject: [PATCH 0978/1848] Changed entity_type datatype in db to optimize
 things.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 265b35fe2..11c4f8cbd 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.19.5.5018 | 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.6.5019 | 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/dbinstall.php b/dbinstall.php
index 035cffc38..6a65336ae 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11905"]) {
+  if ($_POST["convert11900to11906"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1174,6 +1174,9 @@ function ttGenerateKeys() {
     ttExecute("ALTER TABLE `tt_groups` ADD `holidays` text default null AFTER `lock_spec`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.4', modified = now() where param_name = 'version_db' and param_value = '1.19.3'");
     ttExecute("ALTER TABLE `tt_custom_fields` ADD `entity_type` varchar(32) NOT NULL default 'time' AFTER `org_id`");
+    ttExecute("update `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.19.4') set entity_type = 1 where entity_type = 'time'");
+    ttExecute("ALTER TABLE `tt_custom_fields` modify entity_type tinyint(4) NOT NULL default '1'");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.6', modified = now() where param_name = 'version_db' and param_value = '1.19.4'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1223,7 +1226,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.5)</b>
+    <td width="80%"><b>Create database structure (v1.19.6)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1272,8 +1275,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.5)</td>
-    <td><input type="submit" name="convert11900to11905" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.6)</td>
+    <td><input type="submit" name="convert11900to11906" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 14d9021be..fc67b19f4 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -381,7 +381,7 @@ CREATE TABLE `tt_custom_fields` (
   `id` int(11) NOT NULL auto_increment,    # custom field id
   `group_id` int(11) NOT NULL,             # group id
   `org_id` int(11) default NULL,           # organization id
-  `entity_type` varchar(32) NOT NULL default 'time', # type of entity custom field is associated with (time, user, project, task, etc.)
+  `entity_type` tinyint(4) default 1,      # type of entity custom field is associated with (time, user, project, task, etc.)
   `type` tinyint(4) NOT NULL default 0,    # custom field type (text or dropdown)
   `label` varchar(32) NOT NULL default '', # custom field label
   `required` tinyint(4) default 0,         # whether this custom field is mandatory for time records
@@ -611,4 +611,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.5', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.6', now()); # TODO: change when structure changes.

From 770d560338b34e0a869c78778d0cd838905fb192 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Jun 2019 13:35:10 +0000
Subject: [PATCH 0979/1848] Adjusted export-import to work with entity type in
 custom fields.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 6 ++++--
 WEB-INF/templates/footer.tpl              | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 8a7b7e770..cd38de9d7 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -406,6 +406,7 @@ function writeData() {
       fwrite($this->file, $this->indentation."  <custom_fields>\n");
       foreach ($custom_fields as $custom_field) {
         $custom_field_part = $this->indentation.'    '."<custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\"";
+        $custom_field_part .= " entity_type=\"".$custom_field['entity_type']."\"";
         $custom_field_part .= " type=\"".$custom_field['type']."\"";
         $custom_field_part .= " label=\"".htmlspecialchars($custom_field['label'])."\"";
         $custom_field_part .= " required=\"".$custom_field['required']."\"";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index b9c76620f..20dd41764 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -352,6 +352,7 @@ function startElement($parser, $name, $attrs) {
         $custom_field_id = $this->insertCustomField(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
+          'entity_type' => $attrs['ENTITY_TYPE'],
           'type' => $attrs['TYPE'],
           'label' => $attrs['LABEL'],
           'required' => $attrs['REQUIRED'],
@@ -1114,14 +1115,15 @@ private function insertCustomField($fields) {
 
     $group_id = (int) $fields['group_id'];
     $org_id = (int) $fields['org_id'];
+    $entity_type = (int) $fields['entity_type'];
     $type = (int) $fields['type'];
     $label = $fields['label'];
     $required = (int) $fields['required'];
     $status = $fields['status'];
 
     $sql = "insert into tt_custom_fields".
-      " (group_id, org_id, type, label, required, status)".
-      " values($group_id, $org_id, $type, ".$mdb2->quote($label).", $required, ".$mdb2->quote($status).")";
+      " (group_id, org_id, entity_type, type, label, required, status)".
+      " values($group_id, $org_id, $entity_type, $type, ".$mdb2->quote($label).", $required, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 11c4f8cbd..3beac6413 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.19.6.5019 | 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.6.5020 | 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>

From db25f950841ee874795d4b9605f8ae2347aaf4f1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Jun 2019 14:42:30 +0000
Subject: [PATCH 0980/1848] Added entity column on cf_custom_fields.php page.

---
 WEB-INF/resources/ca.lang.php          |  9 +++++++--
 WEB-INF/resources/cs.lang.php          | 10 +++++++---
 WEB-INF/resources/da.lang.php          | 10 +++++++---
 WEB-INF/resources/de.lang.php          | 10 +++++++---
 WEB-INF/resources/en.lang.php          |  8 ++++++--
 WEB-INF/resources/es.lang.php          |  9 +++++++--
 WEB-INF/resources/et.lang.php          | 10 +++++++---
 WEB-INF/resources/fa.lang.php          | 10 +++++++---
 WEB-INF/resources/fi.lang.php          | 10 +++++++---
 WEB-INF/resources/fr.lang.php          | 10 +++++++---
 WEB-INF/resources/gr.lang.php          | 10 +++++++---
 WEB-INF/resources/he.lang.php          | 10 +++++++---
 WEB-INF/resources/hu.lang.php          |  9 +++++++--
 WEB-INF/resources/it.lang.php          | 10 +++++++---
 WEB-INF/resources/ja.lang.php          | 10 +++++++---
 WEB-INF/resources/ko.lang.php          | 10 +++++++---
 WEB-INF/resources/nl.lang.php          | 10 +++++++---
 WEB-INF/resources/no.lang.php          | 10 +++++++---
 WEB-INF/resources/pl.lang.php          | 10 +++++++---
 WEB-INF/resources/pt-br.lang.php       | 10 +++++++---
 WEB-INF/resources/pt.lang.php          | 10 +++++++---
 WEB-INF/resources/ro.lang.php          |  9 +++++++--
 WEB-INF/resources/ru.lang.php          |  8 ++++++--
 WEB-INF/resources/sk.lang.php          | 10 +++++++---
 WEB-INF/resources/sl.lang.php          |  9 +++++++--
 WEB-INF/resources/sr.lang.php          | 10 +++++++---
 WEB-INF/resources/sv.lang.php          | 10 +++++++---
 WEB-INF/resources/tr.lang.php          | 10 +++++++---
 WEB-INF/resources/zh-cn.lang.php       | 10 +++++++---
 WEB-INF/resources/zh-tw.lang.php       | 10 +++++++---
 WEB-INF/templates/cf_custom_fields.tpl | 10 +++++++++-
 WEB-INF/templates/footer.tpl           |  2 +-
 cf_custom_field_add.php                |  6 +++---
 cf_custom_fields.php                   |  2 +-
 plugins/CustomFields.class.php         |  8 ++++----
 35 files changed, 226 insertions(+), 93 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0f0b4c7fc..42c637b1b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -282,6 +282,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
@@ -414,8 +421,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projectes',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9000b3b19..0f25aa666 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -292,6 +292,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
@@ -423,9 +430,6 @@
 'dropdown.previous_year' => 'minulý rok',
 'dropdown.selected_year' => 'rok',
 'dropdown.all_time' => 'od počátku',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index c17676318..0c59b52a3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -272,6 +272,13 @@
 'label.active_users' => 'Aktive Brugere',
 'label.inactive_users' => 'Inaktive Brugere',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Fejl',
 // TODO: Translate the following.
@@ -396,9 +403,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'år',
 'dropdown.all_time' => 'Alt',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekter',
 'dropdown.tasks' => 'Opgaver',
 'dropdown.clients' => 'Klienter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9fe12dfca..3b6c1a712 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -261,6 +261,13 @@
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Fehler',
 // TODO: Translate the following.
@@ -378,9 +385,6 @@
 'dropdown.previous_year' => 'vorheriges Jahr',
 'dropdown.selected_year' => 'Jahr',
 'dropdown.all_time' => 'Gesamtzeitraum',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekte',
 'dropdown.tasks' => 'Aufgaben',
 'dropdown.clients' => 'Kunden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7d25fd690..851c8f93c 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -248,6 +248,12 @@
 'label.active_users' => 'Active Users',
 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+'entity.time' => 'time',
+'entity.user' => 'user',
+'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Error',
 'title.success' => 'Success',
@@ -363,8 +369,6 @@
 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'all time',
-'dropdown.time' => 'time',
-'dropdown.user' => 'user',
 'dropdown.projects' => 'projects',
 'dropdown.tasks' => 'tasks',
 'dropdown.clients' => 'clients',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 44ed2567a..cae029431 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -285,6 +285,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -414,8 +421,6 @@
 'dropdown.selected_year' => 'año',
 // TODO: translate the following.
 // 'dropdown.all_time' => 'all time',
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'proyectos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 34a7239b1..fbe2e88ce 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -278,6 +278,13 @@
 'label.active_users' => 'Aktiivsed kasutajad',
 'label.inactive_users' => 'Mitteaktiivsed kasutajad',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
@@ -401,9 +408,6 @@
 'dropdown.previous_year' => 'eelmine aasta',
 'dropdown.selected_year' => 'aasta',
 'dropdown.all_time' => 'kõik ajavahemikud',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektid',
 'dropdown.tasks' => 'tööülesanded',
 'dropdown.clients' => 'kliendid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3095a87e4..13a2d5f4e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -283,6 +283,13 @@
 'label.active_users' => 'کاربران فعال',
 'label.inactive_users' => 'کاربران غیرفعال',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'خطا',
 // TODO: Translate the following.
@@ -407,9 +414,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'همه زمان ها',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'پروژه ها',
 'dropdown.tasks' => 'وظایف',
 'dropdown.clients' => 'مشتریان',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 752c6ffd4..4421b889c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -276,6 +276,13 @@
 'label.active_users' => 'Aktiiviset käyttäjät',
 'label.inactive_users' => 'Ei-aktiiviset käyttäjät',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Virhe',
 // TODO: Translate the following.
@@ -396,9 +403,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'vuosi',
 'dropdown.all_time' => 'kaikki tunnit',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektit',
 'dropdown.tasks' => 'tehtävät',
 'dropdown.clients' => 'asiakkaat',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ff7e4e6f7..3a5ce78a3 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -270,6 +270,13 @@
 'label.active_users' => 'Utilisateurs actifs',
 'label.inactive_users' => 'Utilisateurs inactifs',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Erreur',
 // TODO: Translate the following.
@@ -388,9 +395,6 @@
 'dropdown.previous_year' => 'année dernière',
 'dropdown.selected_year' => 'année',
 'dropdown.all_time' => 'depuis toujours',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projets',
 'dropdown.tasks' => 'Tâches',
 'dropdown.clients' => 'Clients',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1e3c8be97..65e731800 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -265,6 +265,13 @@
 'label.active_users' => 'Ενεργοί χρήστες',
 'label.inactive_users' => 'Ανενεργοί χρήστες',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Σφάλμα',
 // TODO: Translate the following.
@@ -386,9 +393,6 @@
 'dropdown.previous_year' => 'προηγούμενο έτος',
 'dropdown.selected_year' => 'έτος',
 'dropdown.all_time' => 'όλη την περίοδο',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'έργα',
 'dropdown.tasks' => 'εργασίες',
 'dropdown.clients' => 'πελάτες',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2905e274a..3aee8065a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -291,6 +291,13 @@
 'label.active_users' => 'משתמשים פעילים',
 'label.inactive_users' => 'משתמשים לא פעילים',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'שגיאה',
 // TODO: Translate the following.
@@ -413,9 +420,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'שנה',
 'dropdown.all_time' => 'הכל',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'פרוייקטים',
 'dropdown.tasks' => 'משימות',
 'dropdown.clients' => 'לקוחות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d44c8d8a0..a998dd869 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -288,6 +288,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -416,8 +423,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projektek',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index a1efcd521..4f6368bd5 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -269,6 +269,13 @@
 'label.active_users' => 'Utenti attivi',
 'label.inactive_users' => 'Utenti inattivi',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
@@ -396,9 +403,6 @@
 'dropdown.previous_year' => 'anno precedente',
 'dropdown.selected_year' => 'anno',
 'dropdown.all_time' => 'tutto il tempo',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'progetti',
 'dropdown.tasks' => 'compiti',
 'dropdown.clients' => 'clienti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 1fadd683e..8a723baef 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -292,6 +292,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -419,9 +426,6 @@
 'dropdown.previous_year' => '昨年',
 'dropdown.selected_year' => '年',
 'dropdown.all_time' => 'すべての時間',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'プロジェクト',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 115a96a50..c2957e163 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -292,6 +292,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -422,9 +429,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => '전시간',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => '프로젝트',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 58d3aaaa2..c8346553a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -250,6 +250,13 @@
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Fout',
 'title.success' => 'Succes',
@@ -363,9 +370,6 @@
 'dropdown.previous_year' => 'vorig jaar',
 'dropdown.selected_year' => 'jaar',
 'dropdown.all_time' => 'alles',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projecten',
 'dropdown.tasks' => 'taken',
 'dropdown.clients' => 'klanten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 27d6a91ba..8fb7bf64f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -289,6 +289,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -417,9 +424,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'prosjekter',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index aa6a2ceff..d77a7b4a0 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -277,6 +277,13 @@
 'label.active_users' => 'Aktywni użytkownicy',
 'label.inactive_users' => 'Nieaktywni użytkownicy',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Błąd',
 // TODO: Translate the following.
@@ -399,9 +406,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'rok',
 'dropdown.all_time' => 'od początku',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'zadania',
 'dropdown.clients' => 'klienci',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3d1d0abe8..7165cb51e 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -274,6 +274,13 @@
 'label.active_users' => 'Usuários ativos',
 'label.inactive_users' => 'Usuários inativos',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Erro',
 // TODO: Translate the following.
@@ -394,9 +401,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'ano',
 'dropdown.all_time' => 'todas as datas',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projetos',
 'dropdown.tasks' => 'tarefas',
 'dropdown.clients' => 'clientes',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2720464a2..6c002439d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -277,6 +277,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -402,9 +409,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projetos',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 64b4551cc..a66f5e4e6 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -289,6 +289,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
 // page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
@@ -420,8 +427,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'proiecte',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 980aa466e..93c88dd83 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -247,6 +247,12 @@
 'label.active_users' => 'Активные пользователи',
 'label.inactive_users' => 'Неактивные пользователи',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+'entity.time' => 'время',
+'entity.user' => 'пользователь',
+'entity.project' => 'проект',
+
 // Form titles.
 'title.error' => 'Ошибка',
 'title.success' => 'Успех',
@@ -360,8 +366,6 @@
 'dropdown.previous_year' => 'прошлый год',
 'dropdown.selected_year' => 'год',
 'dropdown.all_time' => 'всё время',
-'dropdown.time' => 'время',
-'dropdown.user' => 'пользователь',
 'dropdown.projects' => 'проекты',
 'dropdown.tasks' => 'задачи',
 'dropdown.clients' => 'клиенты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 56d14f665..a1ebcb555 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -281,6 +281,13 @@
 'label.active_users' => 'Aktívny používatelia',
 'label.inactive_users' => 'Neaktívny používatelia',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Chyba',
 // TODO: Translate the following.
@@ -403,9 +410,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'rok',
 'dropdown.all_time' => 'celý čas',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekty',
 'dropdown.tasks' => 'úlohy',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index db54f19e1..0dac806e9 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -272,6 +272,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -394,8 +401,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 // 'dropdown.all_time' => 'all time',
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekti',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index eb8f3ebf0..e73ae4648 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -275,6 +275,13 @@
 'label.active_users' => 'Aktivni korisnik',
 'label.inactive_users' => 'Neaktivni korisnik',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 'title.error' => 'Greška',
 // TODO: Translate the following.
@@ -397,9 +404,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'godina',
 'dropdown.all_time' => 'svi datumi',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projekti',
 'dropdown.tasks' => 'zadaci',
 'dropdown.clients' => 'klijenti',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c17662baa..c6bf2f413 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -272,6 +272,13 @@
 'label.active_users' => 'Aktiva användare',
 'label.inactive_users' => 'Inaktiva användare',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Rubriker för formulär
 'title.error' => 'Fel',
 // TODO: Translate the following.
@@ -396,9 +403,6 @@
 'dropdown.previous_year' => 'Föregående år',
 'dropdown.selected_year' => 'År',
 'dropdown.all_time' => 'Livstid',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'Projekt',
 'dropdown.tasks' => 'Arbetsuppgifter',
 'dropdown.clients' => 'Kunder',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 5701f5621..d07275ffc 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -296,6 +296,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each
@@ -428,9 +435,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'tüm zamanlar',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => 'projeler',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index dce6df857..e5244c073 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -281,6 +281,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -409,9 +416,6 @@
 // 'dropdown.previous_year' => 'previous year',
 // 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => '全部时间',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => '项目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a18cb213b..f5d9e9b30 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -287,6 +287,13 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 
+// Entity names. We use lower case (in English) because they are used in dropdowns, too.
+// They are used to associate a custom field with an entity type.
+// TODO: translate the following.
+// 'entity.time' => 'time',
+// 'entity.user' => 'user',
+// 'entity.project' => 'project',
+
 // Form titles.
 // TODO: Translate the following.
 // 'title.error' => 'Error',
@@ -414,9 +421,6 @@
 // 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => '年',
 'dropdown.all_time' => '全部時間',
-// TODO: translate the following.
-// 'dropdown.time' => 'time',
-// 'dropdown.user' => 'user',
 'dropdown.projects' => '項目',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 5d254e9cc..e64f18157 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -5,7 +5,8 @@
 {if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
-          <td width="50%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+          <td class="tableHeader">{$i18n.label.entity}</td>
           <td class="tableHeader">{$i18n.label.type}</td>
           <td class="tableHeader">{$i18n.menu.options}</td>
           <td></td>
@@ -15,6 +16,13 @@
     {foreach $custom_fields as $field}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$field['label']|escape}</td>
+      {if CustomFields::ENTITY_TIME == $field['entity_type']}
+          <td>{$i18n.entity.time}</td>
+      {elseif CustomFields::ENTITY_USER == $field['entity_type']}
+          <td>{$i18n.entity.user}</td>
+      {else}
+          <td></td>
+      {/if}
       {if CustomFields::TYPE_TEXT == $field['type']}
           <td>{$i18n.label.type_text}</td>
           <td></td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3beac6413..23519575d 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.19.6.5020 | 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.6.5021 | 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/cf_custom_field_add.php b/cf_custom_field_add.php
index e4a919eb5..e8de69e7e 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -41,7 +41,7 @@
 }
 $fields = CustomFields::getFields();
 // Deny access when max number of custom fields is already set.
-if (count($fields) >= 1) {
+if (count($fields) >= 1 && !isTrue('CF_DEBUG')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -59,8 +59,8 @@
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
 $form->addInput(array('type'=>'combobox','name'=>'entity',
-  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('dropdown.time'),
-                CustomFields::ENTITY_USER=>$i18n->get('dropdown.user'))
+  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
+                CustomFields::ENTITY_USER=>$i18n->get('entity.user'))
 ));
 $form->addInput(array('type'=>'combobox','name'=>'type',
   'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 6de626cc9..d877e7c46 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -54,7 +54,7 @@
 
   $fields = CustomFields::getFields();
   // At this time only one custom field is supported. Disable the Add button if we already have one or more custom fields.
-  if (count($fields) > 0)
+  if (count($fields) > 0 && !isTrue('CF_DEBUG'))
     $form->getElement('btn_add')->setEnabled(false);
 }
 
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index a0c49ec56..f36a42638 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -249,12 +249,12 @@ static function getFields() {
     $org_id = $user->org_id;
 
     $fields = array();
-    $sql = "select id, type, label from tt_custom_fields".
+    $sql = "select id, entity_type, type, label from tt_custom_fields".
       " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $fields[] = array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label']);
+        $fields[] = $val; // array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label']);
       }
       return $fields;
     }
@@ -308,8 +308,8 @@ static function insertField($field_name, $entity_type, $field_type, $required) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "insert into tt_custom_fields (group_id, org_id, type, label, required, status)".
-      " values($group_id, $org_id, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
+    $sql = "insert into tt_custom_fields (group_id, org_id, entity_type, type, label, required, status)".
+      " values($group_id, $org_id, $entity_type, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }

From 066efce7ef712710e229308b6099f5af410aecb8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Jun 2019 16:37:21 +0000
Subject: [PATCH 0981/1848] Introduced tt_entity_custom_fields table.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 cf_custom_field_edit.php       |  2 +-
 dbinstall.php                  | 11 +++++++----
 mysql.sql                      | 32 +++++++++++++++++++++++++++++++-
 plugins/CustomFields.class.php |  2 +-
 5 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 23519575d..9888b8675 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.19.6.5021 | 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.7.5022 | 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/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 0bf5818d8..c5dd09040 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -51,10 +51,10 @@
 if ($err->no()) {
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$field['label']));
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-  $form->addInput(array('type'=>'checkbox','name'=>'required','value'=>$field['required']));
   $form->addInput(array('type'=>'combobox','name'=>'type','value'=>$field['type'],
     'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
                   CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))));
+  $form->addInput(array('type'=>'checkbox','name'=>'required','value'=>$field['required']));
   $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 }
 
diff --git a/dbinstall.php b/dbinstall.php
index 6a65336ae..c2ce26180 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11906"]) {
+  if ($_POST["convert11900to11907"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1177,6 +1177,9 @@ function ttGenerateKeys() {
     ttExecute("update `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.19.4') set entity_type = 1 where entity_type = 'time'");
     ttExecute("ALTER TABLE `tt_custom_fields` modify entity_type tinyint(4) NOT NULL default '1'");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.6', modified = now() where param_name = 'version_db' and param_value = '1.19.4'");
+    ttExecute("CREATE TABLE `tt_entity_custom_fields` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned NOT NULL,`org_id` int(10) unsigned NOT NULL,`entity_type` tinyint(4) NOT NULL,`entity_id` int(10) unsigned NOT NULL,`field_id` int(10) unsigned NOT NULL,`option_id` int(10) unsigned default NULL,`value` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned default NULL,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned default NULL,`status` tinyint(4) default 1,PRIMARY KEY  (`id`))");
+    ttExecute("create unique index entity_idx on tt_entity_custom_fields(entity_type, entity_id, field_id)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.7', modified = now() where param_name = 'version_db' and param_value = '1.19.6'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1226,7 +1229,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.6)</b>
+    <td width="80%"><b>Create database structure (v1.19.7)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1275,8 +1278,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.6)</td>
-    <td><input type="submit" name="convert11900to11906" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.7)</td>
+    <td><input type="submit" name="convert11900to11907" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index fc67b19f4..b8d7e134c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -423,6 +423,36 @@ CREATE TABLE `tt_custom_field_log` (
 create index log_idx on tt_custom_field_log(log_id);
 
 
+#
+# Structure for table tt_entity_custom_fields.
+# This table stores custom field values for entities such as users and projects
+# except for "time" entity (and possibly "expense" in future).
+# "time" custom fields are kept separately in tt_custom_field_log
+# because tt_log (and tt_custom_field_log) can grow very large.
+#
+CREATE TABLE `tt_entity_custom_fields` (
+  `id` int(10) unsigned NOT NULL auto_increment, # record id in this table
+  `group_id` int(10) unsigned NOT NULL,          # group id
+  `org_id` int(10) unsigned NOT NULL,            # organization id
+  `entity_type` tinyint(4) NOT NULL,             # entity type
+  `entity_id` int(10) unsigned NOT NULL,         # entity id this record corresponds to
+  `field_id` int(10) unsigned NOT NULL,          # custom field id
+  `option_id` int(10) unsigned default NULL,     # Option id. Used for dropdown custom fields.
+  `value` varchar(255) default NULL,             # Text value. Used for text custom fields.
+  `created` datetime default NULL,               # creation timestamp
+  `created_ip` varchar(45) default NULL,         # creator ip
+  `created_by` int(10) unsigned default NULL,    # creator user_id
+  `modified` datetime default NULL,              # modification timestamp
+  `modified_ip` varchar(45) default NULL,        # modifier ip
+  `modified_by` int(10) unsigned default NULL,   # modifier user_id
+  `status` tinyint(4) default 1,                 # record status
+  PRIMARY KEY  (`id`)
+);
+
+# Create an index that guarantees unique custom fields per entity.
+create unique index entity_idx on tt_entity_custom_fields(entity_type, entity_id, field_id);
+
+
 #
 # Structure for table tt_expense_items.
 # This table lists expense items.
@@ -611,4 +641,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.6', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.7', now()); # TODO: change when structure changes.
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index f36a42638..125e100b4 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -254,7 +254,7 @@ static function getFields() {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        $fields[] = $val; // array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label']);
+        $fields[] = $val;
       }
       return $fields;
     }

From 19b674dca67d52e7ec2ea49046f31e68fc6facf4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 29 Jun 2019 14:08:59 +0000
Subject: [PATCH 0982/1848] Refactoring custom fields in progress.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 mobile/time.php                |  2 +-
 mobile/time_edit.php           |  2 +-
 mobile/timer.php               |  2 +-
 plugins/CustomFields.class.php | 32 +++++++++++++++-----------------
 reports.php                    |  4 ++--
 time.php                       |  2 +-
 time_edit.php                  |  2 +-
 user_add.php                   | 12 ++++++++++++
 week.php                       |  2 +-
 10 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9888b8675..47814a16b 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.19.7.5022 | 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.7.5023 | 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/time.php b/mobile/time.php
index 5a5c054d6..996521691 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -223,7 +223,7 @@
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 364ebaf82..c3a7ccd78 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -199,7 +199,7 @@
       'name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }
diff --git a/mobile/timer.php b/mobile/timer.php
index 667536324..d814637f6 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -173,7 +173,7 @@
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))
     ));
   }
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 125e100b4..4494d58e8 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -33,11 +33,16 @@ class CustomFields {
   const ENTITY_USER = 2;    // Field is associated with users.
   const ENTITY_PROJECT = 3; // Field is associated with projects.
 
-  const TYPE_TEXT = 1;     // A text field.
-  const TYPE_DROPDOWN = 2; // A dropdown field with pre-defined values.
+  const TYPE_TEXT = 1;      // A text field.
+  const TYPE_DROPDOWN = 2;  // A dropdown field with pre-defined values.
 
+  // TODO: replace $fields with entity-specific arrays: timeFields, userFields, etc.
   var $fields = array();  // Array of custom fields for group.
-  var $options = array(); // Array of options for a dropdown custom field.
+
+  // Refactoring ongoing...
+  var $timeFields = null;
+  var $userFields = null;
+  var $projectFields = null;
 
   // Constructor.
   function __construct() {
@@ -48,25 +53,18 @@ function __construct() {
     $org_id = $user->org_id;
 
     // Get fields.
-    $sql = "select id, type, label, required from tt_custom_fields".
+    $sql = "select id, entity_type, type, label, required from tt_custom_fields".
       " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
         $this->fields[] = array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label'],'required'=>$val['required'],'value'=>'');
-      }
-    }
-
-    // If we have a dropdown obtain options for it.
-    if ((count($this->fields) > 0) && ($this->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)) {
-
-      $sql = "select id, value from tt_custom_field_options".
-        " where field_id = ".$this->fields[0]['id']." and group_id = $group_id and org_id = $org_id and status = 1 order by value";
-      $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        while ($val = $res->fetchRow()) {
-          $this->options[$val['id']] = $val['value'];
-        }
+        if (CustomFields::ENTITY_TIME == $val['entity_type'])
+          $this->timeFields[] = $val;
+        else if (CustomFields::ENTITY_USER == $val['entity_type'])
+          $this->userFields[] = $val;
+        else if (CustomFields::ENTITY_PROJECT == $val['entity_type'])
+          $this->projectFields[] = $val;
       }
     }
   }
diff --git a/reports.php b/reports.php
index fe545b211..aa492061a 100644
--- a/reports.php
+++ b/reports.php
@@ -58,7 +58,7 @@
   $showCustomFieldCheckbox = $custom_fields->fields[0];
   $showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
   if ($showCustomFieldDropdown)
-    $showCustomFieldDropdown &= count($custom_fields->options) > 0;
+    $showCustomFieldDropdown &= CustomFields::getOptions($custom_fields->fields[0]['id']);
 }
 
 $form = new Form('reportForm');
@@ -102,7 +102,7 @@
   $form->addInput(array('type'=>'combobox','name'=>'option',
     'style'=>'width: 250px;',
     'value'=>$cl_cf_1,
-    'data'=>$custom_fields->options,
+    'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
diff --git a/time.php b/time.php
index 2dc8606d0..f058a21a5 100644
--- a/time.php
+++ b/time.php
@@ -280,7 +280,7 @@
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
diff --git a/time_edit.php b/time_edit.php
index bb0457384..aceff0243 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -202,7 +202,7 @@
       'name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty' => array('' => $i18n->get('dropdown.select'))));
   }
 }
diff --git a/user_add.php b/user_add.php
index 5696d28fa..56bd69b3c 100644
--- a/user_add.php
+++ b/user_add.php
@@ -50,6 +50,13 @@
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
 $assigned_projects = array();
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -91,6 +98,11 @@
 if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
+// If we have custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  // Coding in progress...
+}
+
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 if ($show_quota)
   $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
diff --git a/week.php b/week.php
index 1c8efe75a..9af356441 100644
--- a/week.php
+++ b/week.php
@@ -338,7 +338,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }

From 8b16d7c0b05921ad6d90c1e5342c02d62b093414 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 29 Jun 2019 15:58:39 +0000
Subject: [PATCH 0983/1848] Added entity type as read only field on custom
 field edit page.

---
 WEB-INF/templates/cf_custom_field_edit.tpl |  4 ++++
 WEB-INF/templates/footer.tpl               |  2 +-
 cf_custom_field_edit.php                   | 11 +++++++++++
 plugins/CustomFields.class.php             |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/cf_custom_field_edit.tpl b/WEB-INF/templates/cf_custom_field_edit.tpl
index beabbe7dd..62e2a267e 100644
--- a/WEB-INF/templates/cf_custom_field_edit.tpl
+++ b/WEB-INF/templates/cf_custom_field_edit.tpl
@@ -8,6 +8,10 @@
           <td align="right">{$i18n.label.thing_name} (*):</td>
           <td>{$forms.fieldForm.name.control}</td>
         </tr>
+        <tr>
+          <td align="right">{$i18n.label.entity}:</td>
+          <td>{$forms.fieldForm.entity.control} <a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
         <tr>
           <td align="right">{$i18n.label.type}:</td>
           <td>{$forms.fieldForm.type.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 47814a16b..46167ca4c 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.19.7.5023 | 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.7.5024 | 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/cf_custom_field_edit.php b/cf_custom_field_edit.php
index c5dd09040..79ce1310b 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -51,6 +51,17 @@
 if ($err->no()) {
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$field['label']));
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+
+  // TODO: consider encapsulating this block in a function.
+  $entity_type = $field['entity_type'];
+  if (CustomFields::ENTITY_TIME == $entity_type)
+    $entity = $i18n->get('entity.time');
+  else if (CustomFields::ENTITY_USER == $entity_type)
+    $entity = $i18n->get('entity.user');
+  else if (CustomFields::ENTITY_PROJECT == $entity_type)
+    $entity = $i18n->get('entity.project');
+  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'entity','value'=>$entity,'enable'=>false));
+
   $form->addInput(array('type'=>'combobox','name'=>'type','value'=>$field['type'],
     'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
                   CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))));
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 4494d58e8..d58cbe539 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -267,7 +267,7 @@ static function getField($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select label, type, required from tt_custom_fields".
+    $sql = "select label, entity_type, type, required from tt_custom_fields".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {

From e5129e06ab4547945e1ad3097e4193930465f93f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Jun 2019 12:57:20 +0000
Subject: [PATCH 0984/1848] Added custom field controls on user_add.php.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/user_add.tpl | 11 +++++++++++
 user_add.php                   | 12 +++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 46167ca4c..ab50afe50 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.19.7.5024 | 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.7.5025 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 155bf11cc..3f00c3591 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -100,6 +100,17 @@ function handleClientControl() {
       <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
 {/if}
+{if $custom_fields && $custom_fields->userFields}
+  {foreach $custom_fields->userFields as $userField}
+    <tr>
+      <td align="right">{$userField['label']|escape}{if $userField['required']} (*){/if}:</td>
+      {assign var="control_name" value='user_field_'|cat:$userField['id']}
+      <td>{$forms.userForm.$control_name.control}</td>
+    </tr>
+  {/foreach}
+{/if}
+
+
     <tr>
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
diff --git a/user_add.php b/user_add.php
index 56bd69b3c..a3d956ea6 100644
--- a/user_add.php
+++ b/user_add.php
@@ -100,7 +100,17 @@
 
 // If we have custom fields - add controls for them.
 if ($custom_fields && $custom_fields->userFields) {
-  // Coding in progress...
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
 }
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));

From e60cc9646c000aedf94c2845337532001fdb5520 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Jun 2019 13:55:11 +0000
Subject: [PATCH 0985/1848] Added user input validation for custom fields on
 user_add.php.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/user_add.tpl |  2 --
 user_add.php                   | 14 +++++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ab50afe50..8fe67f337 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.19.7.5025 | 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.7.5026 | 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/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 3f00c3591..35040f3c4 100644
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -109,8 +109,6 @@ function handleClientControl() {
     </tr>
   {/foreach}
 {/if}
-
-
     <tr>
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
       <td>{$forms.userForm.rate.control}</td>
diff --git a/user_add.php b/user_add.php
index a3d956ea6..d6a24e3aa 100644
--- a/user_add.php
+++ b/user_add.php
@@ -172,8 +172,20 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.
   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'));
+  // Validate input in user custom fields.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $field_label = htmlspecialchars($userField['label']);
+      $field_type = $userField['type'];
+      $required = $userField['required'];
+      $field_value = trim($request->getParameter($control_name));
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($field_value, !$required)) $err->add($i18n->get('error.field'), $field_label);
+    }
+  }
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
   if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));
 
   if ($err->no()) {

From 6ec11c42ae150bf58d54aa9b64600156e0a608f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 30 Jun 2019 15:40:54 +0000
Subject: [PATCH 0986/1848] A bit of refactoring in user_add.php.

---
 WEB-INF/templates/footer.tpl |  2 +-
 user_add.php                 | 39 +++++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8fe67f337..f03277b8a 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.19.7.5026 | 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.7.5027 | 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/user_add.php b/user_add.php
index d6a24e3aa..83f3bbcb2 100644
--- a/user_add.php
+++ b/user_add.php
@@ -68,8 +68,20 @@
   $cl_email = trim($request->getParameter('email'));
   $cl_role_id = $request->getParameter('role');
   $cl_client_id = $request->getParameter('client');
-  $cl_rate = $request->getParameter('rate');
   $cl_quota_percent = $request->getParameter('quota_percent');
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+  $cl_rate = $request->getParameter('rate');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
@@ -103,11 +115,12 @@
   foreach ($custom_fields->userFields as $userField) {
     $field_name = 'user_field_'.$userField['id'];
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($userField['id']),
+      'value'=>$userCustomFields[$userField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
   }
@@ -175,14 +188,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
   // Validate input in user custom fields.
   if ($custom_fields && $custom_fields->userFields) {
-    foreach ($custom_fields->userFields as $userField) {
-      $control_name = 'user_field_'.$userField['id'];
-      $field_label = htmlspecialchars($userField['label']);
-      $field_type = $userField['type'];
-      $required = $userField['required'];
-      $field_value = trim($request->getParameter($control_name));
+    foreach ($userCustomFields as $userField) {
       // Validation is the same for text and dropdown fields.
-      if (!ttValidString($field_value, !$required)) $err->add($i18n->get('error.field'), $field_label);
+      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
     }
   }
   if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
@@ -203,7 +211,18 @@ function render(&$table, $value, $row, $column, $selected = false) {
         'projects' => $assigned_projects,
         'email' => $cl_email);
       $user_id = ttUserHelper::insert($fields);
-      if ($user_id) {
+
+      // Insert user custom fields if we have them.
+      $result = true;
+      if ($user_id && $custom_fields && $custom_fields->userFields) {
+        foreach($userCustomFields as $userField) {
+          if (!$result) break;
+          $result = true; // TODO: replace this with a function call that inserts a field.
+          // Perhaps the entire block should be in the function call?
+        }
+      }
+
+      if ($user_id && $result) {
         if (!$user->exists()) {
           // We added a user to an empty subgroup. Set new user as on behalf user.
           // Needed for user-based things to work (such as notifications config).

From 392a83f0d6d4cc2a9296bb4175345412ebbc125a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 1 Jul 2019 14:03:44 +0000
Subject: [PATCH 0987/1848] Added code to insert user custom fields after user
 creation.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 plugins/CustomFields.class.php | 51 ++++++++++++++++++++++++++++++++++
 user_add.php                   |  6 +---
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f03277b8a..5f090d994 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.19.7.5027 | 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.7.5028 | 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/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index d58cbe539..0ab33c743 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -354,4 +354,55 @@ static function deleteField($field_id) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // insertEntityFields - inserts entity custom fields into tt_entity_custom_fields.
+  function insertEntityFields($entity_type, $entity_id, $entityFields) {
+    foreach ($entityFields as $entityField) {
+      if (!$this->insertEntityField($entity_type, $entity_id, $entityField))
+        return false;
+    }
+    return true;
+  }
+
+  // insertEntityField - inserts a single entity custom field into tt_entity_custom_fields.
+  function insertEntityField($entity_type, $entity_id, $entityField) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $created = 'now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
+
+    $field_id = (int) $entityField['field_id'];
+
+    $option_id = $entityField['type'] == CustomFields::TYPE_DROPDOWN ? (int) $entityField['value'] : null;
+    $value = $entityField['type'] == CustomFields::TYPE_TEXT ? $entityField['value'] : null;
+
+    // TODO: add a jon to protect from bogus option_ids in post.
+    $sql = "insert into tt_entity_custom_fields".
+      " (group_id, org_id, entity_type, entity_id, field_id, option_id, value, created, created_ip, created_by)".
+      " values($group_id, $org_id, $entity_type, $entity_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).", $created)";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // deleteEntityFields - deletes entity custom fields (permanently).
+  // Note: deleting, rather than marking fields deleted is on purpose
+  // because we want to keep the table small after multiple entity edits.
+  function deleteEntityFields($entity_type, $entity_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "delete from  tt_entity_custom_fields".
+      " where entity_type = $entity_type and entity_id = $entity_id".
+      " and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/user_add.php b/user_add.php
index 83f3bbcb2..0cd71b0a4 100644
--- a/user_add.php
+++ b/user_add.php
@@ -215,11 +215,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       // Insert user custom fields if we have them.
       $result = true;
       if ($user_id && $custom_fields && $custom_fields->userFields) {
-        foreach($userCustomFields as $userField) {
-          if (!$result) break;
-          $result = true; // TODO: replace this with a function call that inserts a field.
-          // Perhaps the entire block should be in the function call?
-        }
+        $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
       }
 
       if ($user_id && $result) {

From 9dab021e08d44f730564686bd9ef7856c7a3b4a0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 1 Jul 2019 14:42:45 +0000
Subject: [PATCH 0988/1848] Improved ttUser::markUserDeleted by marking user
 custom fields as deleted also.

---
 WEB-INF/lib/ttUser.class.php | 14 +++++++++++++-
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5498a996f..6db627884 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -708,14 +708,26 @@ function markUserDeleted($user_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Mark user as deleted.
+    // Mark user custom fields as deleted,
+    require_once('plugins/CustomFields.class.php');
+    $entity_type = CustomFields::ENTITY_USER;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
+    $sql = "update tt_entity_custom_fields set status = null $modified_part".
+      " where entity_type = $entity_type and entity_id = $user_id".
+      " and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark user as deleted.
     $sql = "update tt_users set status = null $modified_part where id = $user_id".
       " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+
+
     return true;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5f090d994..39edd60cf 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.19.7.5028 | 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.7.5029 | 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>

From c21d22cb9ed9674c218062770d520a327ece48cb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 1 Jul 2019 21:37:37 +0000
Subject: [PATCH 0989/1848] Added user custom fields on user_edit.php page.

---
 WEB-INF/templates/footer.tpl    |  2 +-
 WEB-INF/templates/user_edit.tpl |  9 +++++
 plugins/CustomFields.class.php  | 33 ++++++++++++++++
 user_edit.php                   | 67 +++++++++++++++++++++++++++++++--
 4 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 39edd60cf..580639bad 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.19.7.5029 | 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.7.5030 | 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/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index e17651b21..49fa4ae50 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -133,6 +133,15 @@ function handleClientControl() {
       <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
       <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
     </tr>
+{/if}
+{if $custom_fields && $custom_fields->userFields}
+  {foreach $custom_fields->userFields as $userField}
+    <tr>
+      <td align="right">{$userField['label']|escape}{if $userField['required']} (*){/if}:</td>
+      {assign var="control_name" value='user_field_'|cat:$userField['id']}
+      <td>{$forms.userForm.$control_name.control}</td>
+    </tr>
+  {/foreach}
 {/if}
     <tr>
       <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 0ab33c743..f0ff0a4db 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -387,6 +387,15 @@ function insertEntityField($entity_type, $entity_id, $entityField) {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
+  // updateEntityFields - updates entity custom fields in tt_entity_custom_fields table
+  // by doing a delete followed up by an insert.
+  function updateEntityFields($entity_type, $entity_id, $entityFields) {
+    $result =  $this->deleteEntityFields($entity_type, $entity_id);
+    if (!$result) return false;
+
+    return $this->insertEntityFields($entity_type, $entity_id, $entityFields);
+  }
+
   // deleteEntityFields - deletes entity custom fields (permanently).
   // Note: deleting, rather than marking fields deleted is on purpose
   // because we want to keep the table small after multiple entity edits.
@@ -405,4 +414,28 @@ function deleteEntityFields($entity_type, $entity_id) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getEntityFieldValue - obtains entity custom field value from the database.
+  function getEntityFieldValue($entity_type, $entity_id, $field_id, $type) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select option_id, value from tt_entity_custom_fields".
+      " where entity_type = $entity_type and entity_id = $entity_id".
+      " and field_id = $field_id".
+      " and group_id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if ($val = $res->fetchRow()) {
+        if (CustomFields::TYPE_DROPDOWN == $type)
+          return $val['option_id'];
+        if (CustomFields::TYPE_TEXT == $type)
+          return $val['value'];
+      }
+    }
+    return null;
+  }
 }
diff --git a/user_edit.php b/user_edit.php
index cda9ab2d0..843383f42 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -53,6 +53,13 @@
 if ($user->isPluginEnabled('cl'))
   $clients = ttGroupHelper::getActiveClients();
 
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
 $show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
 if ($show_projects) {
   $projects = ttGroupHelper::getActiveProjects();
@@ -71,8 +78,20 @@
   $cl_role_id = $request->getParameter('role');
   $cl_client_id = $request->getParameter('client');
   $cl_status = $request->getParameter('status');
-  $cl_rate = $request->getParameter('rate');
   $cl_quota_percent = $request->getParameter('quota_percent');
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+  $cl_rate = $request->getParameter('rate');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
@@ -89,8 +108,20 @@
   $cl_name = $user_details['name'];
   $cl_login = $user_details['login'];
   $cl_email = $user_details['email'];
-  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
   $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
+  // If we have user custom fields - collect vallues from database.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => $custom_fields->getEntityFieldValue(CustomFields::ENTITY_USER, $user_id, $userField['id'], $userField['type']));
+    }
+  }
+  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
   $cl_role_id = $user_details['role_id'];
   $cl_client_id = $user_details['client_id'];
   $cl_status = $user_details['status'];
@@ -115,6 +146,22 @@
 if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
+// If we have custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'value'=>$userCustomFields[$userField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
@@ -172,8 +219,15 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.
   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'));
+    // Validate input in user custom fields.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($userCustomFields as $userField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
+    }
+  }
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
 
   if ($err->no()) {
     $existing_user = ttUserHelper::getUserByLogin($cl_login);
@@ -193,8 +247,13 @@ function render(&$table, $value, $row, $column, $selected = false) {
         $fields['client_id'] = $cl_client_id;
       }
 
-      if (ttUserHelper::update($user_id, $fields)) {
+      $result = ttUserHelper::update($user_id, $fields);
+       // Update user custom fields if we have them.
+      if ($result && $custom_fields && $custom_fields->userFields) {
+        $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
+      }
 
+      if ($result) {
         // If our own login changed, set new one in cookie to remember it.
         if (($user_id == $user->id) && ($user->login != $cl_login)) {
           setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');

From 8f373c507a90899485609be5b5a81626806059d5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 2 Jul 2019 14:31:25 +0000
Subject: [PATCH 0990/1848] Work in progress adding user custom fields to
 reports.

---
 WEB-INF/resources/ca.lang.php    |  2 ++
 WEB-INF/resources/cs.lang.php    |  2 ++
 WEB-INF/resources/da.lang.php    |  2 ++
 WEB-INF/resources/de.lang.php    |  2 ++
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  2 ++
 WEB-INF/resources/et.lang.php    |  2 ++
 WEB-INF/resources/fa.lang.php    |  2 ++
 WEB-INF/resources/fi.lang.php    |  2 ++
 WEB-INF/resources/fr.lang.php    |  2 ++
 WEB-INF/resources/gr.lang.php    |  2 ++
 WEB-INF/resources/he.lang.php    |  2 ++
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  2 ++
 WEB-INF/resources/ja.lang.php    |  2 ++
 WEB-INF/resources/ko.lang.php    |  2 ++
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  2 ++
 WEB-INF/resources/pl.lang.php    |  2 ++
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  2 ++
 WEB-INF/resources/ro.lang.php    |  2 ++
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  2 ++
 WEB-INF/resources/sv.lang.php    |  2 ++
 WEB-INF/resources/tr.lang.php    |  2 ++
 WEB-INF/resources/zh-cn.lang.php |  2 ++
 WEB-INF/resources/zh-tw.lang.php |  2 ++
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/reports.tpl    | 13 ++++++++++++-
 reports.php                      | 19 +++++++++++++++++++
 33 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 42c637b1b..58ecdbe83 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -485,6 +485,8 @@
 'form.reports.select_period' => 'Seleccionar període de temps',
 'form.reports.set_period' => 'o establir dates',
 'form.reports.show_fields' => 'Mostrar camps',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Agrupar per',
 'form.reports.group_by_no' => '--- no agrupar ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0f25aa666..7043206d8 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -494,6 +494,8 @@
 'form.reports.select_period' => 'Výberte období',
 'form.reports.set_period' => 'nebo určete dny',
 'form.reports.show_fields' => 'Zobrazit pole',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Seskupit podle',
 // TODO: translate the following.
 // 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 0c59b52a3..863ffcf0c 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -466,6 +466,8 @@
 'form.reports.select_period' => 'Vælg en periode',
 'form.reports.set_period' => 'eller sæt datoer',
 'form.reports.show_fields' => 'Vis felter',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruppér ved',
 'form.reports.group_by_no' => '--- Ingen gruppereing ---',
 'form.reports.group_by_date' => 'Dato',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 3b6c1a712..1e23983a5 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -448,6 +448,8 @@
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
 'form.reports.show_fields' => 'Felder anzeigen',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruppieren nach',
 'form.reports.group_by_no' => '--- keine Gruppierung ---',
 'form.reports.group_by_date' => 'Datum',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 851c8f93c..0b48ae6ba 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -435,6 +435,7 @@
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
+'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Group by',
 'form.reports.group_by_no' => '--- no grouping ---',
 'form.reports.group_by_date' => 'date',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index cae029431..e46c5f30a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -498,6 +498,8 @@
 'form.reports.select_period' => 'Seleccionar período de tiempo',
 'form.reports.set_period' => 'o establecer fechas',
 'form.reports.show_fields' => 'Mostrar campos',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- no agrupar ---',
 'form.reports.group_by_date' => 'fecha',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index fbe2e88ce..07c2589b3 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -475,6 +475,8 @@
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
 'form.reports.show_fields' => 'Näita välju',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupeeri',
 'form.reports.group_by_no' => '--- grupeerimata ---',
 'form.reports.group_by_date' => 'kuupäev',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 13a2d5f4e..f81cef522 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -487,6 +487,8 @@
 'form.reports.select_period' => 'انتخاب بازه زمانی',
 'form.reports.set_period' => 'یا تعیین تاریخ',
 'form.reports.show_fields' => 'نمایش فیلدها',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'گروه بندی شده با',
 'form.reports.group_by_no' => '--- بدون گروه ---',
 'form.reports.group_by_date' => 'تاریخ',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4421b889c..020c34624 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -471,6 +471,8 @@
 'form.reports.select_period' => 'Valitse ajanjakso',
 'form.reports.set_period' => 'tai aseta päivät',
 'form.reports.show_fields' => 'Näytä kentät',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Ryhmittelyperuste',
 'form.reports.group_by_no' => '--- ei ryhmitystä ---',
 'form.reports.group_by_date' => 'päivä',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3a5ce78a3..04d092d2a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -463,6 +463,8 @@
 'form.reports.select_period' => 'Sélectionner la période de temps',
 'form.reports.set_period' => 'ou dates indiquées',
 'form.reports.show_fields' => 'Afficher les champs',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Regroupés par',
 'form.reports.group_by_no' => '--- Aucun regroupement ---',
 'form.reports.group_by_date' => 'Date',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 65e731800..66e349f0c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -457,6 +457,8 @@
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Ομαδοποίηση με βάση',
 'form.reports.group_by_no' => '--- χωρίς ομαδοποίηση ---',
 'form.reports.group_by_date' => 'ημερομηνία',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3aee8065a..5046f0b42 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -489,6 +489,8 @@
 'form.reports.select_period' => 'בחר תקופת זמן',
 'form.reports.set_period' => 'או הגדר תאריכים',
 'form.reports.show_fields' => 'הראה שדות',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'סדר לפי',
 'form.reports.group_by_no' => '--- ללא סדר ---',
 'form.reports.group_by_date' => 'תאריך',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a998dd869..dbdfc9334 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -490,6 +490,7 @@
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.
 // 'form.reports.show_fields' => 'Show fields',
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Csoportosítva',
 'form.reports.group_by_no' => '--- csoportosítás nélkül ---',
 'form.reports.group_by_date' => 'dátum',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 4f6368bd5..1423b52f2 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -470,6 +470,8 @@
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
 'form.reports.set_period' => 'oppure setta le date',
 'form.reports.show_fields' => 'Mostra i campi',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Raggruppa per',
 'form.reports.group_by_no' => '--- non raggruppare ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8a723baef..a0182a327 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -494,6 +494,8 @@
 'form.reports.select_period' => '時間期間の選択',
 'form.reports.set_period' => 'あるいは日付を設定',
 'form.reports.show_fields' => 'フィールドの表示',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '次のようにグループ化',
 'form.reports.group_by_no' => '--- グループの機能がありません ---',
 'form.reports.group_by_date' => '日付',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c2957e163..4d733a1ff 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -492,6 +492,8 @@
 'form.reports.select_period' => '시간 기간을 선택',
 'form.reports.set_period' => '혹은 날짜를 설정',
 'form.reports.show_fields' => '필드들을 보기',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '다음것에 의한 그룹화',
 'form.reports.group_by_no' => '--- 그룹화되지 않음 ---',
 'form.reports.group_by_date' => '날짜',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c8346553a..4d088c4c6 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -430,6 +430,8 @@
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Groeperen op',
 'form.reports.group_by_no' => '--- niet groeperen ---',
 'form.reports.group_by_date' => 'datum',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8fb7bf64f..fbf1f7c44 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -491,6 +491,8 @@
 'form.reports.select_period' => 'Velg tidsperiode',
 'form.reports.set_period' => 'eller sett dato',
 'form.reports.show_fields' => 'Vis feltene',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 'form.reports.group_by_date' => 'dato',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d77a7b4a0..215508768 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -474,6 +474,8 @@
 'form.reports.select_period' => 'Wybierz okres',
 'form.reports.set_period' => 'lub ustaw daty',
 'form.reports.show_fields' => 'Pokaż pola',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupowanie wg',
 'form.reports.group_by_no' => '--- bez grupowania ---',
 'form.reports.group_by_date' => 'daty',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7165cb51e..59ae7060b 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -469,6 +469,8 @@
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- sem agrupar ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 6c002439d..1ab616638 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -472,6 +472,8 @@
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 // 'form.reports.group_by_date' => 'date',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a66f5e4e6..aea10d080 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -493,6 +493,8 @@
 'form.reports.select_period' => 'Alege perioada',
 'form.reports.set_period' => 'sau introdu intervalul de date',
 'form.reports.show_fields' => 'Arata campuri',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupat dupa',
 'form.reports.group_by_no' => '--- fara grupare ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 93c88dd83..bf267018e 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -426,6 +426,7 @@
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',
+'form.reports.user_fields' => 'Поля пользователя',
 'form.reports.group_by' => 'Группировать по',
 'form.reports.group_by_no' => '--- без группировки ---',
 'form.reports.group_by_date' => 'дате',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a1ebcb555..c3d1dd247 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -480,6 +480,7 @@
 'form.reports.set_period' => 'alebo nastavte dátumy',
 'form.reports.show_fields' => 'Zobraziť polia',
 // TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 'form.reports.group_by_date' => 'dátum',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 0dac806e9..4b6aae579 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -467,6 +467,7 @@
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
 // 'form.reports.show_fields' => 'Show fields',
+// 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 // 'form.reports.group_by_date' => 'date',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e73ae4648..08a9460e9 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -472,6 +472,8 @@
 'form.reports.select_period' => 'Odaberi vremenski raspon',
 'form.reports.set_period' => 'ili podesi datum',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupiši po',
 'form.reports.group_by_no' => '--- nemoj grupisati ---',
 'form.reports.group_by_date' => 'datum',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c6bf2f413..adb883cb4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -471,6 +471,8 @@
 'form.reports.select_period' => 'Välj intervall',
 'form.reports.set_period' => 'eller ställ in datum',
 'form.reports.show_fields' => 'Visa fält',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruppera efter',
 'form.reports.group_by_no' => '--- Ingen gruppering ---',
 'form.reports.group_by_date' => 'Datum',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d07275ffc..abeb693e3 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -504,6 +504,8 @@
 'form.reports.select_period' => 'Zaman aralığını seç',
 'form.reports.set_period' => 'ya da tarihleri belirle',
 'form.reports.show_fields' => 'Alanları göster',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruplandırma kıstas',
 'form.reports.group_by_no' => '--- gruplama yok ---',
 'form.reports.group_by_date' => 'tarih',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e5244c073..92f9ecd1c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -478,6 +478,8 @@
 'form.reports.select_period' => '选择时间段',
 'form.reports.set_period' => '或设定日期',
 'form.reports.show_fields' => '显示栏目',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '分组方式',
 'form.reports.group_by_no' => '--- 没有分组 ---',
 'form.reports.group_by_date' => '日期',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f5d9e9b30..def3a0acf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -484,6 +484,8 @@
 'form.reports.select_period' => '選擇時間段',
 'form.reports.set_period' => '或設定日期',
 'form.reports.show_fields' => '顯示欄目',
+// TODO: translate the following.
+// 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '分組方式',
 'form.reports.group_by_no' => '--- 沒有分組 ---',
 'form.reports.group_by_date' => '日期',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 580639bad..bc06f6af9 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.19.7.5030 | 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.7.5031 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 70f283780..fd77c2842 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -398,7 +398,18 @@ function handleCheckboxes() {
             </table>
           </td>
         </tr>
-
+{if $custom_fields && $custom_fields->userFields}
+    <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
+  {foreach $custom_fields->userFields as $userField}
+    <tr>
+      <td align="right">{$userField['label']|escape}:</td>
+      {assign var="control_name" value='user_field_'|cat:$userField['id']}
+      {assign var="checkbox_control_name" value='ch_user_field_'|cat:$userField['id']}
+      <td>{$forms.reportForm.$control_name.control}</td>
+      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
+    </tr>
+  {/foreach}
+{/if}
         <tr><td><b>{$i18n.form.reports.group_by}</b></td></tr>
         <tr valign="top">
           <td>{$forms.reportForm.group_by1.control}</td>
diff --git a/reports.php b/reports.php
index aa492061a..9ad09c789 100644
--- a/reports.php
+++ b/reports.php
@@ -324,6 +324,25 @@
 if ($showTimesheetCheckbox)
   $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
 
+// If we have user custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    $checkbox_field_name = 'ch_'.$field_name;
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$userCustomFields[$userField['id']]['value']));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'value'=>$userCustomFields[$userField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.all'))));
+    }
+    // Also add a checkbox (to print the field or not).
+    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
+  }
+}
+
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->get('form.reports.group_by_date');

From 249df45db48a201776dc72018505c1615fc4ad38 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 4 Jul 2019 16:52:05 +0000
Subject: [PATCH 0991/1848] More progress on integratiung user custom fields in
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 68 +++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/report.tpl         | 46 +++++++++++++++++++
 WEB-INF/templates/reports.tpl        |  2 +-
 reports.php                          |  2 +-
 5 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 966865fbb..a725a39a2 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -162,6 +162,11 @@ static function getItems($options) {
     $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
     $isClient = $user->isClient();
 
+    if ($user->isPluginEnabled('cf')) {
+      require_once('plugins/CustomFields.class.php');
+      $custom_fields = new CustomFields();
+    }
+
     $grouping = ttReportHelper::grouping($options);
     if ($grouping) {
       $grouping_by_date = ttReportHelper::groupingBy('date', $options);
@@ -183,6 +188,24 @@ static function getItems($options) {
     array_push($fields, 'l.date');
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
+    // User custom fields. Note: 1 join required for each text field.
+    // 2 joins for each dropdown field. Query wil get messy with many fields.
+    // It is unclear how to optimize if we want flexibility with custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $checkbox_field_name = 'show_'.$field_name;
+        if ($options[$checkbox_field_name]) {
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            $ecfTableName = 'ecf'.$userField['id'];
+            array_push($fields, "$ecfTableName.value as $field_name");
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTableName = 'cfo'.$userField['id'];
+            array_push($fields, "$cfoTableName.value as $field_name");
+          }
+        }
+      }
+    }
     // Add client name if it is selected.
     if ($options['show_client'] || $grouping_by_client)
       array_push($fields, 'c.name as client');
@@ -261,6 +284,30 @@ static function getItems($options) {
 
     // Prepare sql query part for left joins.
     $left_joins = null;
+
+    // Left join block for custom fields.
+    // 1 join for each text field, 2 joins for each dropdown.
+    // How to optimize this mess and reduce query complexity?
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $checkbox_field_name = 'show_'.$field_name;
+        if ($options[$checkbox_field_name]) {
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            $ecfTable = 'ecf'.$userField['id'];
+            // One extra join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = 2 and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $ecfTable = 'ecf'.$userField['id'];
+            $cfoTable = 'cfo'.$userField['id'];
+            // Two extra joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = 2 and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
+
     if ($options['show_client'] || $grouping_by_client)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
     if (($canViewReports || $isClient) && $options['show_invoice'])
@@ -1186,10 +1233,29 @@ static function getReportOptions($bean) {
     $options['show_work_units'] = $bean->getAttribute('chunits');
     $options['show_timesheet'] = $bean->getAttribute('chtimesheet');
     $options['show_files'] = $bean->getAttribute('chfiles');
-    $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
+
+    // Prepare custom field options.
+    if ($user->isPluginEnabled('cf')) {
+      require_once('plugins/CustomFields.class.php');
+      $custom_fields = new CustomFields();
+
+      // TODO: add time fields here.
+
+      // User fields.
+      if ($custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $control_name = 'user_field_'.$userField['id'];
+          $checkbox_control_name = 'show_'.$control_name;
+          $options[$control_name] =  $bean->getAttribute($control_name);
+          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
+        }
+      }
+    }
+
     $options['group_by1'] = $bean->getAttribute('group_by1');
     $options['group_by2'] = $bean->getAttribute('group_by2');
     $options['group_by3'] = $bean->getAttribute('group_by3');
+    $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bc06f6af9..c690e3b61 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.19.7.5031 | 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.7.5032 | 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/report.tpl b/WEB-INF/templates/report.tpl
index a98d71aa0..64c69c6c2 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -40,6 +40,15 @@
       <tr>
         <td class="tableHeader">{$i18n.label.date}</td>
   {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
+
+  {* user custom fileds *}
+  {if $custom_fields && $custom_fields->userFields}
+    {foreach $custom_fields->userFields as $userField}
+      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$userField['label']|escape}}</td>{/if}
+    {/foreach}
+  {/if}
+
   {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
   {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
@@ -66,6 +75,15 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
         {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
+
+        {* user custom fileds *}
+        {if $custom_fields && $custom_fields->userFields}
+          {foreach $custom_fields->userFields as $userField}
+            {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
+
         {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
         {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
         {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
@@ -95,6 +113,16 @@
       <tr class="{$report_row_class}">
         <td class="cellLeftAligned">{$item.date}</td>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
+
+    {* user custom fileds *}
+    {if $custom_fields && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="control_name" value='user_field_'|cat:$userField['id']}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
+
     {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
@@ -130,6 +158,15 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
+
+    {* user custom fileds *}
+    {if $custom_fields && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
     {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
@@ -154,6 +191,15 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
+
+    {* user custom fileds *}
+    {if $custom_fields && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
     {if $bean->getAttribute('chclient')}<td></td>{/if}
     {if $bean->getAttribute('chproject')}<td></td>{/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index fd77c2842..5256dbb9a 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -404,7 +404,7 @@ function handleCheckboxes() {
     <tr>
       <td align="right">{$userField['label']|escape}:</td>
       {assign var="control_name" value='user_field_'|cat:$userField['id']}
-      {assign var="checkbox_control_name" value='ch_user_field_'|cat:$userField['id']}
+      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
       <td>{$forms.reportForm.$control_name.control}</td>
       <td>{$forms.reportForm.$checkbox_control_name.control}</td>
     </tr>
diff --git a/reports.php b/reports.php
index 9ad09c789..95e79c636 100644
--- a/reports.php
+++ b/reports.php
@@ -328,7 +328,7 @@
 if ($custom_fields && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {
     $field_name = 'user_field_'.$userField['id'];
-    $checkbox_field_name = 'ch_'.$field_name;
+    $checkbox_field_name = 'show_'.$field_name;
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
       $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$userCustomFields[$userField['id']]['value']));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {

From 99b6df5b35546aa7ee770384326133e1bc94110e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Jul 2019 13:54:38 +0000
Subject: [PATCH 0992/1848] Fixed reporting on user custom fields for expense
 items.

---
 WEB-INF/lib/ttReportHelper.class.php | 59 +++++++++++++++++++++-------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a725a39a2..c5f14228d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -188,9 +188,7 @@ static function getItems($options) {
     array_push($fields, 'l.date');
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
-    // User custom fields. Note: 1 join required for each text field.
-    // 2 joins for each dropdown field. Query wil get messy with many fields.
-    // It is unclear how to optimize if we want flexibility with custom fields.
+    // Add user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -284,30 +282,27 @@ static function getItems($options) {
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-
-    // Left join block for custom fields.
-    // 1 join for each text field, 2 joins for each dropdown.
-    // How to optimize this mess and reduce query complexity?
+    // Left joins for custom fields.
+    // 1 join is required for each text field, 2 joins for each dropdown.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_field_name = 'show_'.$field_name;
+        $entity_type = CustomFields::ENTITY_USER;
         if ($options[$checkbox_field_name]) {
+          $ecfTable = 'ecf'.$userField['id'];
           if ($userField['type'] == CustomFields::TYPE_TEXT) {
-            $ecfTable = 'ecf'.$userField['id'];
-            // One extra join for each text field.
-            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = 2 and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
           } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
-            $ecfTable = 'ecf'.$userField['id'];
             $cfoTable = 'cfo'.$userField['id'];
-            // Two extra joins for each dropdown field.
-            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = 2 and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
             $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
           }
         }
       }
     }
-
     if ($options['show_client'] || $grouping_by_client)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
     if (($canViewReports || $isClient) && $options['show_invoice'])
@@ -365,6 +360,22 @@ static function getItems($options) {
       array_push($fields, 'ei.date');
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
+      // Add user custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          if ($options[$checkbox_field_name]) {
+            if ($userField['type'] == CustomFields::TYPE_TEXT) {
+              $ecfTableName = 'ecf'.$userField['id'];
+              array_push($fields, "$ecfTableName.value as $field_name");
+            } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTableName = 'cfo'.$userField['id'];
+              array_push($fields, "$cfoTableName.value as $field_name");
+            }
+          }
+        }
+      }
       // Add client name if it is selected.
       if ($options['show_client'] || $grouping_by_client)
         array_push($fields, 'c.name as client');
@@ -414,6 +425,26 @@ static function getItems($options) {
 
       // Prepare sql query part for left joins.
       $left_joins = null;
+      // Left joins for custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $entity_type = CustomFields::ENTITY_USER;
+          if ($options[$checkbox_field_name]) {
+            $ecfTable = 'ecf'.$userField['id'];
+            if ($userField['type'] == CustomFields::TYPE_TEXT) {
+              // Add one join for each text field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTable = 'cfo'.$userField['id'];
+              // Add two joins for each dropdown field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.user_id and $ecfTable.field_id = ".$userField['id'].")";
+              $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+            }
+          }
+        }
+      }
       if ($canViewReports || $isClient)
         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
       if ($options['show_client'] || $grouping_by_client)
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c690e3b61..38d4596e9 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.19.7.5032 | 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.7.5033 | 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>

From 75b0c59010ec13db587fb240c5be3c2c1b89fa13 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Jul 2019 15:35:50 +0000
Subject: [PATCH 0993/1848] More progress on user custom fields in reports.
 Dropdown custom field selectors are now working.

---
 WEB-INF/lib/ttReportHelper.class.php | 202 ++++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl         |   2 +-
 2 files changed, 184 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c5f14228d..ea335cacf 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -52,6 +52,14 @@ static function getWhere($options) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }
+    } // TODO: reconsider the need for construction for fav report emailing (debug).
+
     // A shortcut for timesheets.
     if ($options['timesheet_id']) {
       $where = " where l.timesheet_id = ".$options['timesheet_id']." and l.group_id = $group_id and l.org_id = $org_id";
@@ -77,6 +85,17 @@ static function getWhere($options) {
     if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
+    // Add user custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $selected_option_id = $options[$field_name];
+        if ($userField['type'] == CustomFields::TYPE_DROPDOWN && $selected_option_id) {
+          $cfoTable = 'cfo'.$userField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $selected_option_id";
+        }
+      }
+    }
 
     // Prepare sql query part for user list.
     $userlist = $options['users'] ? $options['users'] : '-1';
@@ -108,6 +127,14 @@ static function getExpenseWhere($options) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }
+    } // TODO: reconsider the need for construction for fav report emailing (debug).
+
     // Prepare dropdown parts.
     $dropdown_parts = '';
     if ($options['client_id'])
@@ -124,6 +151,17 @@ static function getExpenseWhere($options) {
     if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
+    // Add user custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $selected_option_id = $options[$field_name];
+        if ($userField['type'] == CustomFields::TYPE_DROPDOWN && $selected_option_id) {
+          $cfoTable = 'cfo'.$userField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $selected_option_id";
+        }
+      }
+    }
 
     // Prepare sql query part for user list.
     $userlist = $options['users'] ? $options['users'] : '-1';
@@ -163,9 +201,12 @@ static function getItems($options) {
     $isClient = $user->isClient();
 
     if ($user->isPluginEnabled('cf')) {
-      require_once('plugins/CustomFields.class.php');
-      $custom_fields = new CustomFields();
-    }
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }
+    } // TODO: reconsider the need for construction for fav report emailing (debug).
 
     $grouping = ttReportHelper::grouping($options);
     if ($grouping) {
@@ -613,6 +654,15 @@ static function getTotals($options)
     global $user;
     $mdb2 = getConnection();
 
+    // Add user custom fields.
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }
+    } // TODO: reconsider the need for construction for fav report emailing (debug).
+
     $trackingMode = $user->getTrackingMode();
     $decimalMark = $user->getDecimalMark();
     $where = ttReportHelper::getWhere($options);
@@ -633,11 +683,35 @@ static function getTotals($options)
     } else {
       $cost_part = ", null as cost, null as expenses";
     }
+
+    // Prepare left joins.
+    $left_joins = null;
+    // Left joins for custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_USER;
+        if ($field_value) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$userField['id'];
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$userField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
     if ($options['show_cost']) {
       if (MODE_TIME == $trackingMode) {
-        $left_joins = "left join tt_users u on (l.user_id = u.id)";
+        $left_joins .= " left join tt_users u on (l.user_id = u.id)";
       } else {
-        $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
+        $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
       }
     }
     // Prepare sql query part for inner joins.
@@ -659,7 +733,32 @@ static function getTotals($options)
       $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+
+      // Prepate left joins.
+      $left_joins = null;
+      // Left joins for custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $field_value = $options[$field_name];
+          $entity_type = CustomFields::ENTITY_USER;
+          if ($field_value) {
+            // We need to add left joins when input is not null.
+            $ecfTable = 'ecf'.$userField['id'];
+            if ($userField['type'] == CustomFields::TYPE_TEXT) {
+              // Add one join for each text field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = eil.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTable = 'cfo'.$userField['id'];
+              // Add two joins for each dropdown field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.user_id and $ecfTable.field_id = ".$userField['id'].")";
+              $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+            }
+          }
+        }
+      }
+
+      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $left_joins $where";
 
       // Create a combined query.
       $combined = "select sum(time) as time";
@@ -1740,29 +1839,61 @@ static function makeCombinedSelectPart($options) {
   static function makeJoinPart($options) {
     global $user;
 
+    // Add user custom fields.
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }
+    } // TODO: reconsider the need for construction for fav report emailing (debug).
+
     $trackingMode = $user->getTrackingMode();
+    $left_joins = null;
     if (ttReportHelper::groupingBy('user', $options) || MODE_TIME == $trackingMode) {
-      $join .= ' left join tt_users u on (l.user_id = u.id)';
+      $left_joins .= ' left join tt_users u on (l.user_id = u.id)';
     }
     if (ttReportHelper::groupingBy('client', $options)) {
-      $join .= ' left join tt_clients c on (l.client_id = c.id)';
+      $left_joins .= ' left join tt_clients c on (l.client_id = c.id)';
     }
     if (ttReportHelper::groupingBy('project', $options)) {
-      $join .= ' left join tt_projects p on (l.project_id = p.id)';
+      $left_joins .= ' left join tt_projects p on (l.project_id = p.id)';
     }
     if (ttReportHelper::groupingBy('task', $options)) {
-      $join .= ' left join tt_tasks t on (l.task_id = t.id)';
+      $left_joins .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
     if (ttReportHelper::groupingBy('cf_1', $options)) {
       $custom_fields = new CustomFields();
       if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-        $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
+        $left_joins .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
       elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-        $join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)';
+        $left_joins .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)';
     }
     if ($options['show_cost'] && $trackingMode != MODE_TIME) {
-      $join .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
+      $left_joins .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
     }
+    // Left joins for custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_USER;
+        if ($field_value) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$userField['id'];
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$userField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
+
     // Prepare inner joins.
     $inner_joins = null;
     if ($user->isPluginEnabled('ts') && $options['timesheet']) {
@@ -1774,8 +1905,9 @@ static function makeJoinPart($options) {
       else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
         $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
     }
-    $join .= $inner_joins;
-    return $join;
+
+    $join_part = $left_joins.$inner_joins;
+    return $join_part;
   }
 
   // makeWorkUnitPart builds an sql part for work units for time items.
@@ -1812,16 +1944,48 @@ static function makeCostPart($options) {
   static function makeJoinExpensesPart($options) {
     global $user;
 
+    // Add user custom fields.
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }
+    } // TODO: reconsider the need for construction for fav report emailing (debug).
+
+    $left_joins = null;
     if (ttReportHelper::groupingBy('user', $options)) {
-      $join .= ' left join tt_users u on (ei.user_id = u.id)';
+      $left_joins .= ' left join tt_users u on (ei.user_id = u.id)';
     }
     if (ttReportHelper::groupingBy('client', $options)) {
-      $join .= ' left join tt_clients c on (ei.client_id = c.id)';
+      $left_joins .= ' left join tt_clients c on (ei.client_id = c.id)';
     }
     if (ttReportHelper::groupingBy('project', $options)) {
-      $join .= ' left join tt_projects p on (ei.project_id = p.id)';
+      $left_joins .= ' left join tt_projects p on (ei.project_id = p.id)';
+    }
+    // Left joins for custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_USER;
+        if ($field_value) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$userField['id'];
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.user_id and $ecfTable.field_id = ".$userField['id'].")";
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$userField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.user_id and $ecfTable.field_id = ".$userField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
     }
-    return $join;
+
+    return $left_joins;
   }
 
   // grouping determines if we are grouping the report by either group_by1,
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 38d4596e9..9ad4ba665 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.19.7.5033 | 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.7.5034 | 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>

From 28940b9d9c48a895cd6222760fcb4ad5ba67a3db Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Jul 2019 16:09:30 +0000
Subject: [PATCH 0994/1848] Added filtering for user custom fields of type text
 in reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 46 ++++++++++++++++++++++------
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ea335cacf..3b5b9cd3e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -48,6 +48,7 @@ class ttReportHelper {
   // getWhere prepares a WHERE clause for a report query.
   static function getWhere($options) {
     global $user;
+    $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
@@ -89,10 +90,23 @@ static function getWhere($options) {
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
-        $selected_option_id = $options[$field_name];
-        if ($userField['type'] == CustomFields::TYPE_DROPDOWN && $selected_option_id) {
+        $field_value = $options[$field_name];
+        if ($userField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
           $cfoTable = 'cfo'.$userField['id'];
-          $dropdown_parts .= " and $cfoTable.id = $selected_option_id";
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
+
+    // Prepare part for text custom fields using LIKE operator.
+    $cf_text_parts = null;
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $field_value = $options[$field_name];
+        if ($userField['type'] == CustomFields::TYPE_TEXT && $field_value) {
+          $ecfTableName = 'ecf'.$userField['id'];
+          $cf_text_parts .= " and $ecfTableName.value like ".$mdb2->quote("%$field_value%");
         }
       }
     }
@@ -116,13 +130,14 @@ static function getWhere($options) {
         new DateAndTime($dateFormat, $options['period_end']));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
-      " $user_list_part $dropdown_parts";
+      " $user_list_part $dropdown_parts $cf_text_parts";
     return $where;
   }
 
   // getExpenseWhere prepares WHERE clause for expenses query in a report.
   static function getExpenseWhere($options) {
     global $user;
+    $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
@@ -155,10 +170,23 @@ static function getExpenseWhere($options) {
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
-        $selected_option_id = $options[$field_name];
-        if ($userField['type'] == CustomFields::TYPE_DROPDOWN && $selected_option_id) {
+        $field_value = $options[$field_name];
+        if ($userField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
           $cfoTable = 'cfo'.$userField['id'];
-          $dropdown_parts .= " and $cfoTable.id = $selected_option_id";
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
+
+    // Prepare part for text custom fields using LIKE operator.
+    $cf_text_parts = null;
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $field_value = $options[$field_name];
+        if ($userField['type'] == CustomFields::TYPE_TEXT && $field_value) {
+          $ecfTableName = 'ecf'.$userField['id'];
+          $cf_text_parts .= " and $ecfTableName.value like ".$mdb2->quote("%$field_value%");
         }
       }
     }
@@ -182,7 +210,7 @@ static function getExpenseWhere($options) {
         new DateAndTime($dateFormat, $options['period_end']));
     }
     $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
-      " $user_list_part $dropdown_parts";
+      " $user_list_part $dropdown_parts $cf_text_parts";
     return $where;
   }
 
@@ -747,7 +775,7 @@ static function getTotals($options)
             $ecfTable = 'ecf'.$userField['id'];
             if ($userField['type'] == CustomFields::TYPE_TEXT) {
               // Add one join for each text field.
-              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = eil.user_id and $ecfTable.field_id = ".$userField['id'].")";
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.user_id and $ecfTable.field_id = ".$userField['id'].")";
             } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
               $cfoTable = 'cfo'.$userField['id'];
               // Add two joins for each dropdown field.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9ad4ba665..e32c1b4ec 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.19.7.5034 | 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.7.5035 | 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>

From 94c65ebc6d0ca1032675ba0ec9415bfdbe4527c1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Jul 2019 18:22:06 +0000
Subject: [PATCH 0995/1848] Starting to work on multiple time custom fields.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 3 ++-
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 58ecdbe83..d82477c93 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -486,6 +486,7 @@
 'form.reports.set_period' => 'o establir dates',
 'form.reports.show_fields' => 'Mostrar camps',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Agrupar per',
 'form.reports.group_by_no' => '--- no agrupar ---',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 7043206d8..08649ff02 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -495,6 +495,7 @@
 'form.reports.set_period' => 'nebo určete dny',
 'form.reports.show_fields' => 'Zobrazit pole',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Seskupit podle',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 863ffcf0c..c33097402 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -467,6 +467,7 @@
 'form.reports.set_period' => 'eller sæt datoer',
 'form.reports.show_fields' => 'Vis felter',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruppér ved',
 'form.reports.group_by_no' => '--- Ingen gruppereing ---',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 1e23983a5..8c9e47b73 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -449,6 +449,7 @@
 'form.reports.set_period' => 'oder Datum eingeben',
 'form.reports.show_fields' => 'Felder anzeigen',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruppieren nach',
 'form.reports.group_by_no' => '--- keine Gruppierung ---',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0b48ae6ba..b00abf288 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -435,6 +435,7 @@
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
+'form.reports.time_fields' => 'Time fields',
 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Group by',
 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e46c5f30a..7165bd7ba 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -499,6 +499,7 @@
 'form.reports.set_period' => 'o establecer fechas',
 'form.reports.show_fields' => 'Mostrar campos',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- no agrupar ---',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 07c2589b3..8584fc085 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -476,6 +476,7 @@
 'form.reports.set_period' => 'või märgi kuupäevad',
 'form.reports.show_fields' => 'Näita välju',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupeeri',
 'form.reports.group_by_no' => '--- grupeerimata ---',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f81cef522..4f6573105 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -488,6 +488,7 @@
 'form.reports.set_period' => 'یا تعیین تاریخ',
 'form.reports.show_fields' => 'نمایش فیلدها',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'گروه بندی شده با',
 'form.reports.group_by_no' => '--- بدون گروه ---',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 020c34624..c7d99e007 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -472,6 +472,7 @@
 'form.reports.set_period' => 'tai aseta päivät',
 'form.reports.show_fields' => 'Näytä kentät',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Ryhmittelyperuste',
 'form.reports.group_by_no' => '--- ei ryhmitystä ---',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 04d092d2a..870eb67bf 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -464,6 +464,7 @@
 'form.reports.set_period' => 'ou dates indiquées',
 'form.reports.show_fields' => 'Afficher les champs',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Regroupés par',
 'form.reports.group_by_no' => '--- Aucun regroupement ---',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 66e349f0c..d5a305c26 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -458,6 +458,7 @@
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Ομαδοποίηση με βάση',
 'form.reports.group_by_no' => '--- χωρίς ομαδοποίηση ---',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5046f0b42..2a8b16084 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -490,6 +490,7 @@
 'form.reports.set_period' => 'או הגדר תאריכים',
 'form.reports.show_fields' => 'הראה שדות',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'סדר לפי',
 'form.reports.group_by_no' => '--- ללא סדר ---',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index dbdfc9334..4bf29d59d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -490,6 +490,7 @@
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.
 // 'form.reports.show_fields' => 'Show fields',
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Csoportosítva',
 'form.reports.group_by_no' => '--- csoportosítás nélkül ---',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1423b52f2..50d9af909 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -471,6 +471,7 @@
 'form.reports.set_period' => 'oppure setta le date',
 'form.reports.show_fields' => 'Mostra i campi',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Raggruppa per',
 'form.reports.group_by_no' => '--- non raggruppare ---',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a0182a327..b57a92398 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -495,6 +495,7 @@
 'form.reports.set_period' => 'あるいは日付を設定',
 'form.reports.show_fields' => 'フィールドの表示',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '次のようにグループ化',
 'form.reports.group_by_no' => '--- グループの機能がありません ---',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4d733a1ff..db58959f5 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -493,6 +493,7 @@
 'form.reports.set_period' => '혹은 날짜를 설정',
 'form.reports.show_fields' => '필드들을 보기',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '다음것에 의한 그룹화',
 'form.reports.group_by_no' => '--- 그룹화되지 않음 ---',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4d088c4c6..8ede3f3f6 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -431,6 +431,7 @@
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Groeperen op',
 'form.reports.group_by_no' => '--- niet groeperen ---',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index fbf1f7c44..72812e4f3 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -492,6 +492,7 @@
 'form.reports.set_period' => 'eller sett dato',
 'form.reports.show_fields' => 'Vis feltene',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 215508768..8e7684f21 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -475,6 +475,7 @@
 'form.reports.set_period' => 'lub ustaw daty',
 'form.reports.show_fields' => 'Pokaż pola',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupowanie wg',
 'form.reports.group_by_no' => '--- bez grupowania ---',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 59ae7060b..9f31b6a57 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -470,6 +470,7 @@
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- sem agrupar ---',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 1ab616638..bfd153a25 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -473,6 +473,7 @@
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index aea10d080..0a8b16bcc 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -494,6 +494,7 @@
 'form.reports.set_period' => 'sau introdu intervalul de date',
 'form.reports.show_fields' => 'Arata campuri',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupat dupa',
 'form.reports.group_by_no' => '--- fara grupare ---',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index bf267018e..05d3693ac 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -426,7 +426,8 @@
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',
-'form.reports.user_fields' => 'Поля пользователя',
+'form.reports.time_fields' => 'Time fields',
+'form.reports.user_fields' => 'Поля времени',
 'form.reports.group_by' => 'Группировать по',
 'form.reports.group_by_no' => '--- без группировки ---',
 'form.reports.group_by_date' => 'дате',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c3d1dd247..834adf5b8 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -480,6 +480,7 @@
 'form.reports.set_period' => 'alebo nastavte dátumy',
 'form.reports.show_fields' => 'Zobraziť polia',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 4b6aae579..b8363b6ae 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -467,6 +467,7 @@
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
 // 'form.reports.show_fields' => 'Show fields',
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 08a9460e9..ff68be79a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -473,6 +473,7 @@
 'form.reports.set_period' => 'ili podesi datum',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Grupiši po',
 'form.reports.group_by_no' => '--- nemoj grupisati ---',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index adb883cb4..3c108e18f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -472,6 +472,7 @@
 'form.reports.set_period' => 'eller ställ in datum',
 'form.reports.show_fields' => 'Visa fält',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruppera efter',
 'form.reports.group_by_no' => '--- Ingen gruppering ---',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index abeb693e3..1f88bf79e 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -505,6 +505,7 @@
 'form.reports.set_period' => 'ya da tarihleri belirle',
 'form.reports.show_fields' => 'Alanları göster',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => 'Gruplandırma kıstas',
 'form.reports.group_by_no' => '--- gruplama yok ---',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 92f9ecd1c..0f6ac781e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -479,6 +479,7 @@
 'form.reports.set_period' => '或设定日期',
 'form.reports.show_fields' => '显示栏目',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '分组方式',
 'form.reports.group_by_no' => '--- 没有分组 ---',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index def3a0acf..6168289fc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -485,6 +485,7 @@
 'form.reports.set_period' => '或設定日期',
 'form.reports.show_fields' => '顯示欄目',
 // TODO: translate the following.
+// 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
 'form.reports.group_by' => '分組方式',
 'form.reports.group_by_no' => '--- 沒有分組 ---',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e32c1b4ec..c00ac59b2 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.19.7.5035 | 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.7.5036 | 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>

From 442e649d5fa5962447ce12df7b0a29cba4d77e9b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Jul 2019 19:39:34 +0000
Subject: [PATCH 0996/1848] Fixed left joins in reports for user custom fields.

---
 WEB-INF/lib/ttReportHelper.class.php |  4 ++--
 WEB-INF/templates/footer.tpl         |  2 +-
 reports.php                          | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 3b5b9cd3e..65d72d833 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -358,7 +358,7 @@ static function getItems($options) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_field_name = 'show_'.$field_name;
         $entity_type = CustomFields::ENTITY_USER;
-        if ($options[$checkbox_field_name]) {
+        if ($options[$field_name] || $options[$checkbox_field_name]) {
           $ecfTable = 'ecf'.$userField['id'];
           if ($userField['type'] == CustomFields::TYPE_TEXT) {
             // Add one join for each text field.
@@ -500,7 +500,7 @@ static function getItems($options) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
           $entity_type = CustomFields::ENTITY_USER;
-          if ($options[$checkbox_field_name]) {
+          if ($options[$field_name] || $options[$checkbox_field_name]) {
             $ecfTable = 'ecf'.$userField['id'];
             if ($userField['type'] == CustomFields::TYPE_TEXT) {
               // Add one join for each text field.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c00ac59b2..27af3ae2c 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.19.7.5036 | 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.7.5037 | 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/reports.php b/reports.php
index 95e79c636..b48ec0a9d 100644
--- a/reports.php
+++ b/reports.php
@@ -324,6 +324,25 @@
 if ($showTimesheetCheckbox)
   $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
 
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    $checkbox_field_name = 'show_'.$field_name;
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$userField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.all'))));
+    }
+    // Also add a checkbox (to print the field or not).
+    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
+  }
+}
+
 // If we have user custom fields - add controls for them.
 if ($custom_fields && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {

From 8cf6a7eb406f8603a6d88b4f038e84bcf996d271 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Jul 2019 20:04:52 +0000
Subject: [PATCH 0997/1848] Added controls on reports.php for multiple time
 custom fields.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/reports.tpl | 14 ++++++++++++++
 reports.php                   |  6 ++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 27af3ae2c..42b54855a 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.19.7.5037 | 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.7.5038 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index 5256dbb9a..616282e29 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -398,6 +398,20 @@ function handleCheckboxes() {
             </table>
           </td>
         </tr>
+{if isTrue('CF_DEBUG')}
+{if $custom_fields && $custom_fields->timeFields}
+    <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
+  {foreach $custom_fields->timeFields as $timeField}
+    <tr>
+      <td align="right">{$timeField['label']|escape}:</td>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+      <td>{$forms.reportForm.$control_name.control}</td>
+      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
+    </tr>
+  {/foreach}
+{/if}
+{/if}
 {if $custom_fields && $custom_fields->userFields}
     <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
   {foreach $custom_fields->userFields as $userField}
diff --git a/reports.php b/reports.php
index b48ec0a9d..d3a70dc64 100644
--- a/reports.php
+++ b/reports.php
@@ -330,12 +330,11 @@
     $field_name = 'time_field_'.$timeField['id'];
     $checkbox_field_name = 'show_'.$field_name;
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$userField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.all'))));
     }
     // Also add a checkbox (to print the field or not).
@@ -349,12 +348,11 @@
     $field_name = 'user_field_'.$userField['id'];
     $checkbox_field_name = 'show_'.$field_name;
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$userCustomFields[$userField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($userField['id']),
-      'value'=>$userCustomFields[$userField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.all'))));
     }
     // Also add a checkbox (to print the field or not).

From d0a79bc40068548ec871c7c775bd1e1d16add28c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Jul 2019 15:09:33 +0000
Subject: [PATCH 0998/1848] Added code to support multiple time custom fields
 to reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 122 +++++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl         |   2 +-
 WEB-INF/templates/report.tpl         |  46 ++++++++++
 3 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 65d72d833..6fcb747cf 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -86,6 +86,17 @@ static function getWhere($options) {
     if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
+    // Add time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $field_value = $options[$field_name];
+        if ($timeField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
+          $cfoTable = 'cfo'.$timeField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
     // Add user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
@@ -166,6 +177,11 @@ static function getExpenseWhere($options) {
     if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
+
+    // Not adding conditions for time custom fields by design because expenses are not associated with them.
+    // Whether or not this is proper, we'll know eventually if users complain.
+    // This means that filtering by custom fields applies only to time items, not expenses.
+
     // Add user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
@@ -293,6 +309,22 @@ static function getItems($options) {
         array_push($fields, 'cfo.value as cf_1');
       }
     }
+    // Add time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $checkbox_field_name = 'show_'.$field_name;
+        if ($options[$checkbox_field_name]) {
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            $cflTable = 'cfl'.$timeField['id'];
+            array_push($fields, "$cflTable.value as $field_name");
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$timeField['id'];
+            array_push($fields, "$cfoTable.value as $field_name");
+          }
+        }
+      }
+    }
     // Add start time.
     if ($options['show_start']) {
       array_push($fields, "l.start as unformatted_start");
@@ -390,6 +422,25 @@ static function getItems($options) {
           " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
       }
     }
+    // Left joins for time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $checkbox_field_name = 'show_'.$field_name;
+        if ($options[$field_name] || $options[$checkbox_field_name]) {
+          $cflTable = 'cfl'.$timeField['id'];
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$timeField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
+          }
+        }
+      }
+    }
     if ($includeCost && MODE_TIME != $trackingMode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
     if ($options['show_files']) {
@@ -455,6 +506,16 @@ static function getItems($options) {
         array_push($fields, 'null'); // null for task name. We need to match column count for union.
       if ($options['show_custom_field_1'] || $grouping_by_cf_1)
         array_push($fields, 'null'); // null for cf_1.
+      // Add null values for time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          if ($options[$checkbox_field_name]) {
+            array_push($fields, "null as $field_name"); // null for each time custom field.
+          }
+        }
+      }
       if ($options['show_start']) {
         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
@@ -715,6 +776,24 @@ static function getTotals($options)
     // Prepare left joins.
     $left_joins = null;
     // Left joins for custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $field_value = $options[$field_name];
+        if ($field_value) {
+          $cflTable = 'cfl'.$timeField['id'];
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$timeField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
+          }
+        }
+      }
+    }
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -1394,10 +1473,21 @@ static function getReportOptions($bean) {
 
     // Prepare custom field options.
     if ($user->isPluginEnabled('cf')) {
-      require_once('plugins/CustomFields.class.php');
-      $custom_fields = new CustomFields();
+      global $custom_fields;
+      if (!$custom_fields) {
+        require_once('plugins/CustomFields.class.php');
+        $custom_fields = new CustomFields();
+      }  // TODO: reconsider the need for construction for fav report emailing (debug).
 
-      // TODO: add time fields here.
+      // Time fields.
+      if ($custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $control_name = 'time_field_'.$timeField['id'];
+          $checkbox_control_name = 'show_'.$control_name;
+          $options[$control_name] =  $bean->getAttribute($control_name);
+          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
+        }
+      }
 
       // User fields.
       if ($custom_fields->userFields) {
@@ -1408,6 +1498,8 @@ static function getReportOptions($bean) {
           $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
         }
       }
+
+      // TODO: add project fields here.
     }
 
     $options['group_by1'] = $bean->getAttribute('group_by1');
@@ -1900,7 +1992,26 @@ static function makeJoinPart($options) {
     if ($options['show_cost'] && $trackingMode != MODE_TIME) {
       $left_joins .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
     }
-    // Left joins for custom fields.
+    // Left joins for time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $field_value = $options[$field_name];
+        if ($field_value) {
+          $cflTable = 'cfl'.$timeField['id'];
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$timeField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
+          }
+        }
+      }
+    }
+    // Left joins for user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -1991,7 +2102,8 @@ static function makeJoinExpensesPart($options) {
     if (ttReportHelper::groupingBy('project', $options)) {
       $left_joins .= ' left join tt_projects p on (ei.project_id = p.id)';
     }
-    // Left joins for custom fields.
+    // Not adding left joins for time custom fiels by design.
+    // Left joins for user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 42b54855a..2b002293e 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.19.7.5038 | 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.7.5039 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 64c69c6c2..03d8d4497 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -53,6 +53,15 @@
   {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
   {if $bean->getAttribute('chcf_1')}<td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>{/if}
+
+  {* time custom fileds *}
+  {if $custom_fields && $custom_fields->timeFields}
+    {foreach $custom_fields->timeFields as $timeField}
+      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$timeField['label']|escape}}</td>{/if}
+    {/foreach}
+  {/if}
+
   {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
   {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
   {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
@@ -88,6 +97,15 @@
         {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
         {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
         {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['cf_1']|escape}</td>{/if}
+
+        {* time custom fileds *}
+          {if $custom_fields && $custom_fields->timeFields}
+           {foreach $custom_fields->timeFields as $timeField}
+            {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
+
         {if $bean->getAttribute('chstart')}<td></td>{/if}
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
@@ -127,6 +145,16 @@
     {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
     {if $bean->getAttribute('chcf_1')}<td class="cellLeftAligned">{$item.cf_1|escape}</td>{/if}
+
+    {* time custom fileds *}
+    {if $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
+
     {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
@@ -171,6 +199,15 @@
     {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
     {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['cf_1']|escape}</td>{/if}
+
+    {* time custom fileds *}
+    {if $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
@@ -204,6 +241,15 @@
     {if $bean->getAttribute('chproject')}<td></td>{/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
     {if $bean->getAttribute('chcf_1')}<td></td>{/if}
+
+    {* time custom fileds *}
+    {if $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}

From f32696b09bfbb9951419d2849004b4db552fa5a0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Jul 2019 15:07:01 +0000
Subject: [PATCH 0999/1848] Initial release of multiple custom fields for user
 testing.

---
 WEB-INF/lib/ttReportHelper.class.php      |  52 +-
 WEB-INF/lib/ttTimeHelper.class.php        |   8 +-
 WEB-INF/lib/ttWeekViewHelper.class.php    | 131 +++-
 WEB-INF/templates/cf_custom_field_add.tpl |   2 -
 WEB-INF/templates/footer.tpl              |   2 +-
 WEB-INF/templates/mobile/time.tpl         |  10 +-
 WEB-INF/templates/mobile/time_edit.tpl    |   9 +-
 WEB-INF/templates/reports.tpl             |   9 -
 WEB-INF/templates/time.tpl                |  18 +-
 WEB-INF/templates/time_edit.tpl           |   8 +-
 WEB-INF/templates/week.tpl                |  12 +-
 cf_custom_field_add.php                   |   5 -
 cf_custom_fields.php                      |   3 -
 mobile/time.php                           |  53 +-
 mobile/time_edit.php                      |  81 +-
 plugins/CustomFields.class.php            | 888 ++++++++++++----------
 reports.php                               |  21 -
 time.php                                  |  56 +-
 time_edit.php                             |  81 +-
 user_edit.php                             |   4 +-
 week.php                                  |  54 +-
 21 files changed, 843 insertions(+), 664 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 6fcb747cf..f08a09b25 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -55,11 +55,8 @@ static function getWhere($options) {
 
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }
-    } // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
 
     // A shortcut for timesheets.
     if ($options['timesheet_id']) {
@@ -155,11 +152,8 @@ static function getExpenseWhere($options) {
 
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }
-    } // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
 
     // Prepare dropdown parts.
     $dropdown_parts = '';
@@ -180,7 +174,7 @@ static function getExpenseWhere($options) {
 
     // Not adding conditions for time custom fields by design because expenses are not associated with them.
     // Whether or not this is proper, we'll know eventually if users complain.
-    // This means that filtering by custom fields applies only to time items, not expenses.
+    // This means that filtering by time custom fields applies only to time items, not expenses.
 
     // Add user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
@@ -246,11 +240,8 @@ static function getItems($options) {
 
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }
-    } // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
 
     $grouping = ttReportHelper::grouping($options);
     if ($grouping) {
@@ -743,14 +734,10 @@ static function getTotals($options)
     global $user;
     $mdb2 = getConnection();
 
-    // Add user custom fields.
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }
-    } // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
 
     $trackingMode = $user->getTrackingMode();
     $decimalMark = $user->getDecimalMark();
@@ -1474,10 +1461,7 @@ static function getReportOptions($bean) {
     // Prepare custom field options.
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }  // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
 
       // Time fields.
       if ($custom_fields->timeFields) {
@@ -1959,14 +1943,10 @@ static function makeCombinedSelectPart($options) {
   static function makeJoinPart($options) {
     global $user;
 
-    // Add user custom fields.
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }
-    } // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
 
     $trackingMode = $user->getTrackingMode();
     $left_joins = null;
@@ -2083,14 +2063,10 @@ static function makeCostPart($options) {
   static function makeJoinExpensesPart($options) {
     global $user;
 
-    // Add user custom fields.
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) {
-        require_once('plugins/CustomFields.class.php');
-        $custom_fields = new CustomFields();
-      }
-    } // TODO: reconsider the need for construction for fav report emailing (debug).
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
 
     $left_joins = null;
     if (ttReportHelper::groupingBy('user', $options)) {
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index d7278c69e..29010036c 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -859,6 +859,7 @@ static function getRecords($date, $includeFiles = false) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    /*
     $include_cf_1 = $user->isPluginEnabled('cf');
     if ($include_cf_1) {
       $custom_fields = new CustomFields();
@@ -868,7 +869,7 @@ static function getRecords($date, $includeFiles = false) {
       } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
         $custom_field = ", cfo.value as cf_1";
       }
-    }
+    }*/
 
     if ($includeFiles) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
@@ -881,14 +882,15 @@ static function getRecords($date, $includeFiles = false) {
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
-    if ($include_cf_1) {
+    /* Multiple left joins are now required, probably with config options which fields to show.
+     * if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
         $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
       elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
         $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
           " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
       }
-    }
+    }*/
     $left_joins .= $fileJoin;
 
     $result = array();
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 348648163..42815e31b 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -44,45 +44,70 @@ static function getRecordsForInterval($start_date, $end_date, $includeFiles = fa
     $result = array();
     $mdb2 = getConnection();
 
-    $client_field = null;
-    if ($user->isPluginEnabled('cl'))
-      $client_field = ', c.id as client_id, c.name as client';
-
-    $custom_field_1 = null;
-    if ($user->isPluginEnabled('cf')) {
-      $custom_fields = new CustomFields();
-      $cf_1_type = $custom_fields->fields[0]['type'];
-      if ($cf_1_type == CustomFields::TYPE_TEXT) {
-        $custom_field_1 = ', cfl.value as cf_1_value';
-      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $custom_field_1 = ', cfo.id as cf_1_id, cfo.value as cf_1_value';
+    $fields = array(); // An array of fields for database query.
+    array_push($fields, 'l.id as id');
+    array_push($fields, 'l.date as date');
+    array_push($fields, "TIME_FORMAT(l.start, $sql_time_format) as start");
+    array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish");
+    array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
+    array_push($fields, "p.id as project_id");
+    array_push($fields, "p.name as project");
+    array_push($fields, "t.id as task_id");
+    array_push($fields, "t.name as task");
+    array_push($fields, "l.comment");
+    array_push($fields, "l.billable");
+    array_push($fields, "l.invoice_id");
+    if ($user->isPluginEnabled('cl')) {
+      array_push($fields, "c.id as client_id");
+      array_push($fields, "c.name as client");
+    }
+    // Add time custom fields.
+    global $custom_fields;
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+          $cflTable = 'cfl'.$timeField['id'];
+          array_push($fields, "$cflTable.value as $field_name");
+        } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+          $cfoTable = 'cfo'.$timeField['id'];
+          array_push($fields, "$cfoTable.id as $field_name".'_option_id');
+          array_push($fields, "$cfoTable.value as $field_name");
+        }
       }
     }
-
     if ($includeFiles) {
-      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
-      $fileJoin =  " left join (select distinct entity_id from tt_files".
-      " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
-      " on (l.id = Sub1.entity_id)";
+      array_push($fields, 'if(Sub1.entity_id is null, 0, 1) as has_files');
     }
 
     $left_joins = " left join tt_projects p on (l.project_id = p.id)".
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
-    if ($user->isPluginEnabled('cf')) {
-      if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-        $left_joins .= 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
-      elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-        $left_joins .= 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
+
+    // Left joins for time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $cflTable = 'cfl'.$timeField['id'];
+        if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+          // Add one join for each text field.
+          $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
+        } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+          $cfoTable = 'cfo'.$timeField['id'];
+          // Add two joins for each dropdown field.
+          $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
+          $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
+        }
+      }
+    }
+    if ($includeFiles) {
+      $left_joins .=  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (l.id = Sub1.entity_id)";
     }
-    $left_joins .= $fileJoin;
 
-    $sql = "select l.id as id, l.date as date, TIME_FORMAT(l.start, $sql_time_format) as start,".
-      " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
-      " TIME_FORMAT(l.duration, '%k:%i') as duration, p.id as project_id, p.name as project,".
-      " t.id as task_id, t.name as task, l.comment, l.billable, l.invoice_id $client_field $custom_field_1 $filePart".
-      " from tt_log l $left_joins".
+    $sql = "select ".join(', ', $fields)." from tt_log l $left_joins".
       " where l.date >= '$start_date' and l.date <= '$end_date'".
       " and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.date, p.name, t.name, l.start, l.id";
@@ -414,14 +439,18 @@ static function makeRowIdentifier($record) {
     $row_identifier .= $record['project_id'] ? ',pr:'.$record['project_id'] : '';
     // Add task.
     $row_identifier .= $record['task_id'] ? ',ts:'.$record['task_id'] : '';
-    // Add custom field 1.
-    if ($user->isPluginEnabled('cf')) {
-      if ($record['cf_1_id'])
-        $row_identifier .= ',cf_1:'.$record['cf_1_id'];
-      else if ($record['cf_1_value'])
-        $row_identifier .= ',cf_1:'.$record['cf_1_value'];
+    // Add custom field parts.
+    global $custom_fields;
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($timeField['type'] == CustomFields::TYPE_TEXT)
+           $field_value = $record[$field_name];
+        else if ($timeField['type'] == CustomFields::TYPE_DROPDOWN)
+           $field_value =  $record[$field_name.'_option_id'];
+        $row_identifier .= ',cf_'.$timeField['id'].":$field_value";
+      }
     }
-
     return $row_identifier;
   }
 
@@ -450,6 +479,17 @@ static function makeRowLabel($record) {
       $label .= $record['cf_1_value'];
     }
 
+    // Add custom field parts.
+    global $custom_fields;
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $field_value = $record[$field_name];
+        if (!empty($label) && !empty($field_value)) $label .= ' - ';
+        $label .= $field_value;
+      }
+    }
+
     return $label;
   }
 
@@ -526,14 +566,21 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     $id = ttTimeHelper::insert($fields4insert);
     if (!$id) return false; // Something failed.
 
-    // Insert custom field if we have it.
+    // Insert time custom fields if we have them.
     $result = true;
-    $cf_1 = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cf_1');
-    if ($custom_fields && $cf_1) {
-      if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-        $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cf_1);
-      elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-        $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cf_1, null);
+    if ($id && $custom_fields && $custom_fields->timeFields) {
+      if ($fields['row_id']) {
+        foreach ($custom_fields->timeFields as $timeField) {
+//          $control_name = 'time_field_'.$timeField['id'];
+          $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+//            'control_name' => $control_name,
+//            'label' => $timeField['label'],
+            'type' => $timeField['type'],
+//            'required' => $timeField['required'],
+            'value' => ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cf_'.$timeField['id']));
+        }
+      }
+      $result = $custom_fields->insertTimeFields($id, $timeCustomFields); // TODO: fix this.
     }
 
     return $result;
diff --git a/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
index 4c343eec9..089e4b681 100644
--- a/WEB-INF/templates/cf_custom_field_add.tpl
+++ b/WEB-INF/templates/cf_custom_field_add.tpl
@@ -8,12 +8,10 @@
           <td align="right">{$i18n.label.thing_name} (*):</td>
           <td>{$forms.fieldForm.name.control}</td>
         </tr>
-{if isTrue('CF_DEBUG')}
         <tr>
           <td align="right">{$i18n.label.entity}:</td>
           <td>{$forms.fieldForm.entity.control} <a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
-{/if}
         <tr>
           <td align="right">{$i18n.label.type}:</td>
           <td>{$forms.fieldForm.type.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2b002293e..347e9afe0 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.19.7.5039 | 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.7.5040 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 38ec1914c..79398703b 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -60,9 +60,13 @@
 {if $user->isPluginEnabled('iv')}
       <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
-{if ($custom_fields && $custom_fields->fields[0])}
-      <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>
-      <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+      <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
+    </tr>
+  {/foreach}
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     <tr><td>{$i18n.label.project}:</td></tr>
diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
index 472d0dd30..a93c0a60a 100644
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ b/WEB-INF/templates/mobile/time_edit.tpl
@@ -29,9 +29,12 @@ function confirmSave() {
 {if $user->isPluginEnabled('iv')}
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
-{if ($custom_fields && $custom_fields->fields[0])} 
-    <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+    <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
+    {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+    <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
+  {/foreach}
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     <tr><td>{$i18n.label.project}:</td></tr>
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 616282e29..f21150949 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -277,10 +277,6 @@ function handleCheckboxes() {
           <td></td>
           <td valign="top">
             <table border="0" cellpadding="3">
-{if $show_cf_1_dropdown}
-              <tr><td><b>{$i18n.label.option}</b></td></tr>
-              <tr><td>{$forms.reportForm.option.control}</td></tr>
-{/if}
 {if $show_task}
               <tr><td><b>{$i18n.label.task}</b></td></tr>
               <tr><td>{$forms.reportForm.task.control}</td></tr>
@@ -346,9 +342,6 @@ function handleCheckboxes() {
 {/if}
 {if $show_timesheet_checkbox}
                     <tr><td><label>{$forms.reportForm.chtimesheet.control}&nbsp;{$i18n.label.timesheet}</label></td></tr>
-{/if}
-{if $show_cf_1_checkbox}
-                    <tr><td><label>{$forms.reportForm.chcf_1.control}&nbsp;{$custom_fields->fields[0]['label']|escape}</label></td></tr>
 {/if}
                   </table>
                 </td>
@@ -398,7 +391,6 @@ function handleCheckboxes() {
             </table>
           </td>
         </tr>
-{if isTrue('CF_DEBUG')}
 {if $custom_fields && $custom_fields->timeFields}
     <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
   {foreach $custom_fields->timeFields as $timeField}
@@ -411,7 +403,6 @@ function handleCheckboxes() {
     </tr>
   {/foreach}
 {/if}
-{/if}
 {if $custom_fields && $custom_fields->userFields}
     <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
   {foreach $custom_fields->userFields as $userField}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index e3266076b..94be028b3 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -36,10 +36,14 @@
           <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
         </tr>
 {/if}
-{if ($custom_fields && $custom_fields->fields[0])}
-        <tr>
-          <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>
-        </tr>
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+    <tr>
+      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      <td>{$forms.timeRecordForm.$control_name.control}</td>
+    </tr>
+  {/foreach}
 {/if}
 {if $show_project}
         <tr>
@@ -112,9 +116,6 @@
   {if $show_client}
         <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if $show_cf_1}
-        <td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>
-  {/if}
   {if $show_project}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
@@ -142,9 +143,6 @@
     {if $show_client}
         <td valign="top">{$record.client|escape}</td>
     {/if}
-    {if $show_cf_1}
-        <td valign="top">{$record.cf_1|escape}</td>
-    {/if}
     {if $show_project}
         <td valign="top">{$record.project|escape}</td>
     {/if}
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index 42b1674d4..5b0e3e2de 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -40,10 +40,14 @@ function confirmSave() {
       <td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td>
     </tr>
 {/if}
-{if ($custom_fields && $custom_fields->fields[0])} 
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
     <tr>
-      <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>
+      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      <td>{$forms.timeRecordForm.$control_name.control}</td>
     </tr>
+  {/foreach}
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     <tr>
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 6f97c4d2a..fbf512ceb 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -51,10 +51,14 @@ function fillDropdowns() {
           <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
         </tr>
 {/if}
-{if ($custom_fields && $custom_fields->fields[0])}
-        <tr>
-          <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.weekTimeForm.cf_1.control}</td>
-        </tr>
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+    <tr>
+      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      <td>{$forms.weekTimeForm.$control_name.control}</td>
+    </tr>
+  {/foreach}
 {/if}
 {if $show_project}
         <tr>
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index e8de69e7e..961bdd69a 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -40,11 +40,6 @@
   exit();
 }
 $fields = CustomFields::getFields();
-// Deny access when max number of custom fields is already set.
-if (count($fields) >= 1 && !isTrue('CF_DEBUG')) {
-  header('Location: access_denied.php');
-  exit();
-}
 // End of access checks.
 
 if ($request->isPost()) {
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index d877e7c46..cf14f25eb 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -53,9 +53,6 @@
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
   $fields = CustomFields::getFields();
-  // At this time only one custom field is supported. Disable the Add button if we already have one or more custom fields.
-  if (count($fields) > 0 && !isTrue('CF_DEBUG'))
-    $form->getElement('btn_add')->setEnabled(false);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
diff --git a/mobile/time.php b/mobile/time.php
index 996521691..04c25060f 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -110,6 +110,22 @@
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
+$timeCustomFields = array();
+// If we have time custom fields - collect input.
+if ($request->isPost()) {
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+}
+
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
 if ($user->can('track_time')) {
@@ -214,17 +230,19 @@
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->fields[0]) {
-  // Only one custom field is supported at this time.
-  if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox','name'=>'cf_1',
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
   }
 }
 
@@ -251,8 +269,12 @@
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
-    if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
+    // Validate input in time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($timeCustomFields as $timeField) {
+        // Validation is the same for text and dropdown fields.
+        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+      }
     }
     if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
@@ -327,13 +349,10 @@
         'note' => $cl_note,
         'billable' => $cl_billable));
 
-      // Insert a custom field if we have it.
+      // Insert time custom fields if we have them.
       $result = true;
-      if ($id && $custom_fields && $cl_cf_1) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
 
       if ($id && $result) {
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index c3a7ccd78..bce156661 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -68,7 +68,18 @@
   $cl_duration = trim($request->getParameter('duration'));
   $cl_date = $request->getParameter('date');
   $cl_note = trim($request->getParameter('note'));
-  $cl_cf_1 = trim($request->getParameter('cf_1'));
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
   $cl_client = $request->getParameter('client');
   $cl_project = $request->getParameter('project');
   $cl_task = $request->getParameter('task');
@@ -85,14 +96,17 @@
   $cl_date = $item_date->toString($user->date_format);
   $cl_note = $time_rec['comment'];
 
-  // If we have custom fields - obtain values for them.
-  if ($custom_fields) {
-    // Get custom field value for time record.
-    $fields = $custom_fields->get($time_rec['id']);
-    if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-      $cl_cf_1 = $fields[0]['value'];
-    elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-      $cl_cf_1 = $fields[0]['option_id'];
+  // If we have time custom fields - collect values from database.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => $custom_fields->getTimeFieldValue($cl_id, $timeField['id'], $timeField['type']));
+    }
   }
 
   $cl_billable = $time_rec['billable'];
@@ -189,18 +203,19 @@
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 $form->addInput(array('type'=>'textarea','name'=>'note','class'=>'mobile-textarea','value'=>$cl_note));
 
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->fields[0]) {
-  // Only one custom field is supported at this time.
-  if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox',
-      'name'=>'cf_1',
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
-      'empty' => array('' => $i18n->get('dropdown.select'))));
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
   }
 }
 
@@ -236,8 +251,12 @@
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
-  if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
+  // Validate input in time custom fields.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($timeCustomFields as $timeField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+    }
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
@@ -336,12 +355,9 @@
           'note'=>$cl_note,
           'billable'=>$cl_billable));
 
-      // If we have custom fields - update values.
-      if ($res && $custom_fields) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      // Update time custom fields if we have them.
+      if ($res && $custom_fields && $custom_fields->timeFields) {
+        $res = $custom_fields->updateTimeFields($cl_id, $timeCustomFields);
       }
       if ($res)
       {
@@ -398,13 +414,10 @@
         'billable'=>$cl_billable,
         'paid'=>$cl_paid));
 
-      // Insert a custom field if we have it.
+      // Insert time custom fields if we have them.
       $res = true;
-      if ($id && $custom_fields && $cl_cf_1) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $res = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
       if ($id && $res) {
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index f0ff0a4db..a11e40a32 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -1,4 +1,5 @@
 <?php
+
 // +----------------------------------------------------------------------+
 // | Anuko Time Tracker
 // +----------------------------------------------------------------------+
@@ -28,414 +29,507 @@
 
 class CustomFields {
 
-  // Definitions of custom field types.
-  const ENTITY_TIME = 1;    // Field is associated with time entries.
-  const ENTITY_USER = 2;    // Field is associated with users.
-  const ENTITY_PROJECT = 3; // Field is associated with projects.
-
-  const TYPE_TEXT = 1;      // A text field.
-  const TYPE_DROPDOWN = 2;  // A dropdown field with pre-defined values.
-
-  // TODO: replace $fields with entity-specific arrays: timeFields, userFields, etc.
-  var $fields = array();  // Array of custom fields for group.
-
-  // Refactoring ongoing...
-  var $timeFields = null;
-  var $userFields = null;
-  var $projectFields = null;
-
-  // Constructor.
-  function __construct() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    // Get fields.
-    $sql = "select id, entity_type, type, label, required from tt_custom_fields".
-      " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $this->fields[] = array('id'=>$val['id'],'type'=>$val['type'],'label'=>$val['label'],'required'=>$val['required'],'value'=>'');
-        if (CustomFields::ENTITY_TIME == $val['entity_type'])
-          $this->timeFields[] = $val;
-        else if (CustomFields::ENTITY_USER == $val['entity_type'])
-          $this->userFields[] = $val;
-        else if (CustomFields::ENTITY_PROJECT == $val['entity_type'])
-          $this->projectFields[] = $val;
-      }
+    // Definitions of custom field types.
+    const ENTITY_TIME = 1;    // Field is associated with time entries.
+    const ENTITY_USER = 2;    // Field is associated with users.
+    const ENTITY_PROJECT = 3; // Field is associated with projects.
+    const TYPE_TEXT = 1;      // A text field.
+    const TYPE_DROPDOWN = 2;  // A dropdown field with pre-defined values.
+
+    // TODO: replace $fields with entity-specific arrays: timeFields, userFields, etc.
+
+    var $fields = array();  // Array of custom fields for group.
+    // Refactoring ongoing...
+    var $timeFields = null;
+    var $userFields = null;
+    var $projectFields = null;
+
+    // Constructor.
+    function __construct() {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        // Get fields.
+        $sql = "select id, entity_type, type, label, required from tt_custom_fields" .
+                " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            while ($val = $res->fetchRow()) {
+                $this->fields[] = array('id' => $val['id'], 'type' => $val['type'], 'label' => $val['label'], 'required' => $val['required'], 'value' => '');
+                if (CustomFields::ENTITY_TIME == $val['entity_type'])
+                    $this->timeFields[] = $val;
+                else if (CustomFields::ENTITY_USER == $val['entity_type'])
+                    $this->userFields[] = $val;
+                else if (CustomFields::ENTITY_PROJECT == $val['entity_type'])
+                    $this->projectFields[] = $val;
+            }
+        }
+    }
+
+    function insert($log_id, $field_id, $option_id, $value) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value)" .
+                " values($group_id, $org_id, $log_id, $field_id, " . $mdb2->quote($option_id) . ", " . $mdb2->quote($value) . ")";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    function update($log_id, $field_id, $option_id, $value) {
+        if (!$field_id)
+            return true; // Nothing to update.
+
+        // Remove older custom field values.
+        $res = $this->delete($log_id);
+        if (!$res)
+            return false;
+
+        if (!$value && !$option_id)
+            return true; // Do not insert NULL values.
+
+        return $this->insert($log_id, $field_id, $option_id, $value);
     }
-  }
-
-  function insert($log_id, $field_id, $option_id, $value) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value)".
-      " values($group_id, $org_id, $log_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).")";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  function update($log_id, $field_id, $option_id, $value) {
-    if (!$field_id)
-      return true; // Nothing to update.
-
-    // Remove older custom field values, if any.
-    $res = $this->delete($log_id);
-    if (!$res)
-      return false;
-
-    if (!$value && !$option_id)
-      return true; // Do not insert NULL values.
-
-    return $this->insert($log_id, $field_id, $option_id, $value);
-  }
-
-  function delete($log_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "update tt_custom_field_log set status = null".
-      " where log_id = $log_id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  function get($log_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select id, field_id, option_id, value from tt_custom_field_log".
-      " where log_id = $log_id and group_id = $group_id and org_id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $fields = array();
-      while ($val = $res->fetchRow()) {
-        $fields[] = $val;
-      }
-      return $fields;
+
+    function delete($log_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "update tt_custom_field_log set status = null" .
+                " where log_id = $log_id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
     }
-    return false;
-  }
-
-  // insertOption adds a new option to a custom field.
-  static function insertOption($field_id, $option_name) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    // Check if the option exists.
-    $id = 0;
-    $sql = "select id from tt_custom_field_options".
-      " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = ".$mdb2->quote($option_name);
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-    if ($val = $res->fetchRow()) $id = $val['id'];
-
-    // Insert option.
-    if (!$id) {
-      $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value)".
-        " values($group_id, $org_id, $field_id, ".$mdb2->quote($option_name).")";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
+
+    function get($log_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "select id, field_id, option_id, value from tt_custom_field_log" .
+                " where log_id = $log_id and group_id = $group_id and org_id = $org_id and status = 1";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            $fields = array();
+            while ($val = $res->fetchRow()) {
+                $fields[] = $val;
+            }
+            return $fields;
+        }
         return false;
     }
-    return true;
-  }
-
-  // updateOption updates option name.
-  static function updateOption($id, $option_name) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "update tt_custom_field_options set value = ".$mdb2->quote($option_name).
-       " where id = $id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // delete Option deletes an option and all custom field log entries that used it.
-  static function deleteOption($id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $field_id = CustomFields::getFieldIdForOption($id);
-    if (!$field_id) return false;
-
-    // Delete log entries with this option. TODO: why? Research impact.
-    $sql = "update tt_custom_field_log set status = null".
-      " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = ".$mdb2->quote($id);
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    // Delete the option.
-    $sql = "update tt_custom_field_options set status = null".
-      " where id = $id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // getOptions returns an array of options for a custom field.
-  static function getOptions($field_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    // Get options.
-    $sql = "select id, value from tt_custom_field_options".
-      " where field_id = $field_id and group_id = $group_id and org_id = $org_id and status = 1 order by value";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $options = array();
-      while ($val = $res->fetchRow()) {
-        $options[$val['id']] = $val['value'];
-      }
-      return $options;
+
+    // insertOption adds a new option to a custom field.
+    static function insertOption($field_id, $option_name) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        // Check if the option exists.
+        $id = 0;
+        $sql = "select id from tt_custom_field_options" .
+                " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = " . $mdb2->quote($option_name);
+        $res = $mdb2->query($sql);
+        if (is_a($res, 'PEAR_Error'))
+            return false;
+        if ($val = $res->fetchRow())
+            $id = $val['id'];
+
+        // Insert option.
+        if (!$id) {
+            $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value)" .
+                    " values($group_id, $org_id, $field_id, " . $mdb2->quote($option_name) . ")";
+            $affected = $mdb2->exec($sql);
+            if (is_a($affected, 'PEAR_Error'))
+                return false;
+        }
+        return true;
+    }
+
+    // updateOption updates option name.
+    static function updateOption($id, $option_name) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "update tt_custom_field_options set value = " . $mdb2->quote($option_name) .
+                " where id = $id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // delete Option deletes an option and all custom field log entries that used it.
+    static function deleteOption($id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $field_id = CustomFields::getFieldIdForOption($id);
+        if (!$field_id)
+            return false;
+
+        // Delete log entries with this option. TODO: why? Research impact.
+        $sql = "update tt_custom_field_log set status = null" .
+                " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = " . $mdb2->quote($id);
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+            return false;
+
+        // Delete the option.
+        $sql = "update tt_custom_field_options set status = null" .
+                " where id = $id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
     }
-    return false;
-  }
-
-  // getOptionName returns an option name for a custom field.
-  static function getOptionName($id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select value from tt_custom_field_options".
-      " where id = $id and group_id = $group_id and org_id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      $name = $val['value'];
-      return $name;
+
+    // getOptions returns an array of options for a custom field.
+    static function getOptions($field_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        // Get options.
+        $sql = "select id, value from tt_custom_field_options" .
+                " where field_id = $field_id and group_id = $group_id and org_id = $org_id and status = 1 order by value";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            $options = array();
+            while ($val = $res->fetchRow()) {
+                $options[$val['id']] = $val['value'];
+            }
+            return $options;
+        }
+        return false;
     }
-    return false;
-  }
-
-  // getFields returns an array of custom fields for group.
-  static function getFields() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $fields = array();
-    $sql = "select id, entity_type, type, label from tt_custom_fields".
-      " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $fields[] = $val;
-      }
-      return $fields;
+
+    // getOptionName returns an option name for a custom field.
+    static function getOptionName($id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "select value from tt_custom_field_options" .
+                " where id = $id and group_id = $group_id and org_id = $org_id and status = 1";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            $val = $res->fetchRow();
+            $name = $val['value'];
+            return $name;
+        }
+        return false;
     }
-    return false;
-  }
-
-  // getField returns a custom field.
-  static function getField($id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select label, entity_type, type, required from tt_custom_fields".
-      " where id = $id and group_id = $group_id and org_id = $org_id";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      if (!$val)
+
+    // getFields returns an array of custom fields for group.
+    static function getFields() {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $fields = array();
+        $sql = "select id, entity_type, type, label from tt_custom_fields" .
+                " where group_id = $group_id and org_id = $org_id and status = 1 and type > 0";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            while ($val = $res->fetchRow()) {
+                $fields[] = $val;
+            }
+            return $fields;
+        }
         return false;
-      return $val;
     }
-    return false;
-  }
-
-  // getFieldIdForOption returns field id from an associated option id.
-  static function getFieldIdForOption($option_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select field_id from tt_custom_field_options".
-      " where id = $option_id and group_id = $group_id and org_id = $org_id";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      $field_id = $val['field_id'];
-      return $field_id;
+
+    // getField returns a custom field.
+    static function getField($id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "select label, entity_type, type, required from tt_custom_fields" .
+                " where id = $id and group_id = $group_id and org_id = $org_id";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            $val = $res->fetchRow();
+            if (!$val)
+                return false;
+            return $val;
+        }
+        return false;
     }
-    return false;
-  }
-
-  // The insertField inserts a custom field for group.
-  static function insertField($field_name, $entity_type, $field_type, $required) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "insert into tt_custom_fields (group_id, org_id, entity_type, type, label, required, status)".
-      " values($group_id, $org_id, $entity_type, $field_type, ".$mdb2->quote($field_name).", $required, 1)";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // The updateField updates custom field for group.
-  static function updateField($id, $name, $type, $required) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "update tt_custom_fields set label = ".$mdb2->quote($name).", type = $type, required = $required".
-      " where id = $id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // The deleteField deletes a custom field, its options and log entries for group.
-  static function deleteField($field_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    // Mark log entries as deleted. TODO: why are we doing this? Research impact.
-    $sql = "update tt_custom_field_log set status = null".
-      " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    // Mark field options as deleted.
-    $sql = "update tt_custom_field_options set status = null".
-      " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
-
-    // Mark custom field as deleted.
-    $sql = "update tt_custom_fields set status = null".
-      " where id = $field_id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // insertEntityFields - inserts entity custom fields into tt_entity_custom_fields.
-  function insertEntityFields($entity_type, $entity_id, $entityFields) {
-    foreach ($entityFields as $entityField) {
-      if (!$this->insertEntityField($entity_type, $entity_id, $entityField))
+
+    // getFieldIdForOption returns field id from an associated option id.
+    static function getFieldIdForOption($option_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "select field_id from tt_custom_field_options" .
+                " where id = $option_id and group_id = $group_id and org_id = $org_id";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            $val = $res->fetchRow();
+            $field_id = $val['field_id'];
+            return $field_id;
+        }
         return false;
     }
-    return true;
-  }
-
-  // insertEntityField - inserts a single entity custom field into tt_entity_custom_fields.
-  function insertEntityField($entity_type, $entity_id, $entityField) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $created = 'now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
-
-    $field_id = (int) $entityField['field_id'];
-
-    $option_id = $entityField['type'] == CustomFields::TYPE_DROPDOWN ? (int) $entityField['value'] : null;
-    $value = $entityField['type'] == CustomFields::TYPE_TEXT ? $entityField['value'] : null;
-
-    // TODO: add a jon to protect from bogus option_ids in post.
-    $sql = "insert into tt_entity_custom_fields".
-      " (group_id, org_id, entity_type, entity_id, field_id, option_id, value, created, created_ip, created_by)".
-      " values($group_id, $org_id, $entity_type, $entity_id, $field_id, ".$mdb2->quote($option_id).", ".$mdb2->quote($value).", $created)";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // updateEntityFields - updates entity custom fields in tt_entity_custom_fields table
-  // by doing a delete followed up by an insert.
-  function updateEntityFields($entity_type, $entity_id, $entityFields) {
-    $result =  $this->deleteEntityFields($entity_type, $entity_id);
-    if (!$result) return false;
-
-    return $this->insertEntityFields($entity_type, $entity_id, $entityFields);
-  }
-
-  // deleteEntityFields - deletes entity custom fields (permanently).
-  // Note: deleting, rather than marking fields deleted is on purpose
-  // because we want to keep the table small after multiple entity edits.
-  function deleteEntityFields($entity_type, $entity_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
-
-    $sql = "delete from  tt_entity_custom_fields".
-      " where entity_type = $entity_type and entity_id = $entity_id".
-      " and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-  // getEntityFieldValue - obtains entity custom field value from the database.
-  function getEntityFieldValue($entity_type, $entity_id, $field_id, $type) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select option_id, value from tt_entity_custom_fields".
-      " where entity_type = $entity_type and entity_id = $entity_id".
-      " and field_id = $field_id".
-      " and group_id = $group_id and org_id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      if ($val = $res->fetchRow()) {
-        if (CustomFields::TYPE_DROPDOWN == $type)
-          return $val['option_id'];
-        if (CustomFields::TYPE_TEXT == $type)
-          return $val['value'];
-      }
+
+    // The insertField inserts a custom field for group.
+    static function insertField($field_name, $entity_type, $field_type, $required) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        // TODO: refactor this.
+        if (!$entity_type) $entity_type = CustomFields::ENTITY_TIME;
+
+        $sql = "insert into tt_custom_fields (group_id, org_id, entity_type, type, label, required, status)" .
+                " values($group_id, $org_id, $entity_type, $field_type, " . $mdb2->quote($field_name) . ", $required, 1)";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // The updateField updates custom field for group.
+    static function updateField($id, $name, $type, $required) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "update tt_custom_fields set label = " . $mdb2->quote($name) . ", type = $type, required = $required" .
+                " where id = $id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // The deleteField deletes a custom field, its options and log entries for group.
+    static function deleteField($field_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        // Mark log entries as deleted. TODO: why are we doing this? Research impact.
+        $sql = "update tt_custom_field_log set status = null" .
+                " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+            return false;
+
+        // Mark field options as deleted.
+        $sql = "update tt_custom_field_options set status = null" .
+                " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+            return false;
+
+        // Mark custom field as deleted.
+        $sql = "update tt_custom_fields set status = null" .
+                " where id = $field_id and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // insertTimeFields - inserts time custom fields into tt_custom_field_log.
+    function insertTimeFields($log_id, $timeFields) {
+        foreach ($timeFields as $timeField) {
+            if (!$this->insertTimeField($log_id, $timeField))
+                return false;
+        }
+        return true;
+    }
+
+    // insertTimeField - inserts a single time custom field into tt_custom_field_log.
+    function insertTimeField($log_id, $timeField) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $field_id = $timeField['field_id'];
+        $type = $timeField['type'];
+        $option_id = $type == CustomFields::TYPE_DROPDOWN ? (int) $timeField['value'] : null;
+        $value = $type == CustomFields::TYPE_TEXT ? $timeField['value'] : null;
+
+        // Do not insert empty fields.
+        if (($type == CustomFields::TYPE_DROPDOWN && !$option_id) || ($type == CustomFields::TYPE_TEXT && !$value))
+            return true;
+
+        // TODO: add a join to protect from bogus option_ids in post.
+
+        $sql = "insert into tt_custom_field_log (group_id, org_id, log_id, field_id, option_id, value)" .
+                " values($group_id, $org_id, $log_id, $field_id, " . $mdb2->quote($option_id) . ", " . $mdb2->quote($value) . ")";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // insertEntityFields - inserts entity custom fields into tt_entity_custom_fields.
+    function insertEntityFields($entity_type, $entity_id, $entityFields) {
+        foreach ($entityFields as $entityField) {
+            if (!$this->insertEntityField($entity_type, $entity_id, $entityField))
+                return false;
+        }
+        return true;
+    }
+
+    // insertEntityField - inserts a single entity custom field into tt_entity_custom_fields.
+    function insertEntityField($entity_type, $entity_id, $entityField) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $created = 'now(), ' . $mdb2->quote($_SERVER['REMOTE_ADDR']) . ', ' . $user->id;
+
+        $field_id = (int) $entityField['field_id'];
+        $type = $entityField['type'];
+        $option_id = $type == CustomFields::TYPE_DROPDOWN ? (int) $entityField['value'] : null;
+        $value = $type == CustomFields::TYPE_TEXT ? $entityField['value'] : null;
+
+        // Do not insert empty fields.
+        if (($type == CustomFields::TYPE_DROPDOWN && !$option_id) || ($type == CustomFields::TYPE_TEXT && !$value))
+            return true;
+
+        // TODO: add a join to protect from bogus option_ids in post.
+        $sql = "insert into tt_entity_custom_fields" .
+                " (group_id, org_id, entity_type, entity_id, field_id, option_id, value, created, created_ip, created_by)" .
+                " values($group_id, $org_id, $entity_type, $entity_id, $field_id, " . $mdb2->quote($option_id) . ", " . $mdb2->quote($value) . ", $created)";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // updateEntityFields - updates entity custom fields in tt_entity_custom_fields table
+    // by doing a delete followed up by an insert.
+    function updateEntityFields($entity_type, $entity_id, $entityFields) {
+        $result = $this->deleteEntityFields($entity_type, $entity_id);
+        if (!$result)
+            return false;
+
+        return $this->insertEntityFields($entity_type, $entity_id, $entityFields);
+    }
+
+    // deleteEntityFields - deletes entity custom fields (permanently).
+    // Note: deleting, rather than marking fields deleted is on purpose
+    // because we want to keep the table small after multiple entity edits.
+    function deleteEntityFields($entity_type, $entity_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "delete from  tt_entity_custom_fields" .
+                " where entity_type = $entity_type and entity_id = $entity_id" .
+                " and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // deleteTimeFields - deletes time custom fields (permanently).
+    // Note: deleting, rather than marking fields deleted is on purpose
+    // because we want to keep the table small after multiple edits.
+    function deleteTimeFields($log_id) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "delete from  tt_custom_field_log" .
+                " where log_id = $log_id" .
+                " and group_id = $group_id and org_id = $org_id";
+        $affected = $mdb2->exec($sql);
+        return (!is_a($affected, 'PEAR_Error'));
+    }
+
+    // getEntityFieldValue - obtains entity custom field value from the database.
+    function getEntityFieldValue($entity_type, $entity_id, $field_id, $type) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "select option_id, value from tt_entity_custom_fields" .
+                " where entity_type = $entity_type and entity_id = $entity_id" .
+                " and field_id = $field_id" .
+                " and group_id = $group_id and org_id = $org_id and status = 1";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            if ($val = $res->fetchRow()) {
+                if (CustomFields::TYPE_DROPDOWN == $type)
+                    return $val['option_id'];
+                if (CustomFields::TYPE_TEXT == $type)
+                    return $val['value'];
+            }
+        }
+        return null;
+    }
+
+    // getTimeFieldValue - obtains time custom field value from the database.
+    function getTimeFieldValue($log_id, $field_id, $type) {
+        global $user;
+        $mdb2 = getConnection();
+
+        $group_id = $user->getGroup();
+        $org_id = $user->org_id;
+
+        $sql = "select option_id, value from tt_custom_field_log" .
+                " where log_id = $log_id" .
+                " and field_id = $field_id" .
+                " and group_id = $group_id and org_id = $org_id and status = 1";
+        $res = $mdb2->query($sql);
+        if (!is_a($res, 'PEAR_Error')) {
+            if ($val = $res->fetchRow()) {
+                if (CustomFields::TYPE_DROPDOWN == $type)
+                    return $val['option_id'];
+                if (CustomFields::TYPE_TEXT == $type)
+                    return $val['value'];
+            }
+        }
+        return null;
     }
-    return null;
-  }
+
+    // updateTimeFields - updates time custom fields in tt_custom_field_log table
+    // by doing a delete followed up by an insert.
+    function updateTimeFields($log_id, $timeFields) {
+        $result = $this->deleteTimeFields($log_id);
+        if (!$result)
+            return false;
+
+        return $this->insertTimeFields($log_id, $timeFields);
+    }
+
 }
diff --git a/reports.php b/reports.php
index d3a70dc64..0f0cb11ab 100644
--- a/reports.php
+++ b/reports.php
@@ -55,10 +55,6 @@
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
-  $showCustomFieldCheckbox = $custom_fields->fields[0];
-  $showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
-  if ($showCustomFieldDropdown)
-    $showCustomFieldDropdown &= CustomFields::getOptions($custom_fields->fields[0]['id']);
 }
 
 $form = new Form('reportForm');
@@ -97,15 +93,6 @@
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 
-// If we have a TYPE_DROPDOWN custom field - add a control to select an option.
-if ($showCustomFieldDropdown) {
-  $form->addInput(array('type'=>'combobox','name'=>'option',
-    'style'=>'width: 250px;',
-    'value'=>$cl_cf_1,
-    'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
-    'empty'=>array(''=>$i18n->get('dropdown.all'))));
-}
-
 // Add project dropdown.
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 if ($showProject) {
@@ -290,8 +277,6 @@
   $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
 if ($showTask)
   $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ($showCustomFieldCheckbox)
-  $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
 if ($showInvoiceCheckbox)
   $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
 if ($showPaidStatus)
@@ -371,9 +356,6 @@
   $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
 if (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
-if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-  $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
-}
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
 if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
@@ -413,7 +395,6 @@
   $form->setValueByElement('chapproved', '0');
   $form->setValueByElement('chpaid', '0');
 
-  $form->setValueByElement('chcf_1', '0');
   $form->setValueByElement('chunits', '0');
   $form->setValueByElement('chinvoice', '0');
   $form->setValueByElement('chfiles', '1');
@@ -509,8 +490,6 @@
 
 $smarty->assign('client_list', $client_list);
 $smarty->assign('show_client', $showClient);
-$smarty->assign('show_cf_1_dropdown', $showCustomFieldDropdown);
-$smarty->assign('show_cf_1_checkbox', $showCustomFieldCheckbox);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_billable', $showBillable);
diff --git a/time.php b/time.php
index f058a21a5..a06773e72 100644
--- a/time.php
+++ b/time.php
@@ -101,7 +101,6 @@
   // Determine column span for note field.
   $colspan = 0;
   if ($showClient) $colspan++;
-  if ($user->isPluginEnabled('cf')) $colspan++;
   if ($showProject) $colspan++;
   if ($showTask) $colspan++;
   if ($showStart) $colspan++;
@@ -156,6 +155,22 @@
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
+$timeCustomFields = array();
+// If we have time custom fields - collect input.
+if ($request->isPost()) {
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+}
+
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
 if ($user->can('track_time')) {
@@ -271,17 +286,19 @@
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->fields[0]) {
-  // Only one custom field is supported at this time.
-  if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox','name'=>'cf_1',
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
   }
 }
 
@@ -308,8 +325,12 @@
     // Validate user input.
     if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
-    if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
+    // Validate input in time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($timeCustomFields as $timeField) {
+        // Validation is the same for text and dropdown fields.
+        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+      }
     }
     if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
@@ -385,13 +406,10 @@
         'note' => $cl_note,
         'billable' => $cl_billable));
 
-      // Insert a custom field if we have it.
+      // Insert time custom fields if we have them.
       $result = true;
-      if ($id && $custom_fields && $cl_cf_1) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
 
       // Put a new file in storage if we have it.
@@ -450,7 +468,7 @@
 $smarty->assign('time_records', $timeRecords);
 $smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
-$smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
+// $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);
diff --git a/time_edit.php b/time_edit.php
index aceff0243..f6ee7de1e 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -68,7 +68,18 @@
   $cl_duration = trim($request->getParameter('duration'));
   $cl_date = $request->getParameter('date');
   $cl_note = trim($request->getParameter('note'));
-  $cl_cf_1 = trim($request->getParameter('cf_1'));
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
   $cl_client = $request->getParameter('client');
   $cl_project = $request->getParameter('project');
   $cl_task = $request->getParameter('task');
@@ -87,14 +98,17 @@
   $cl_date = $item_date->toString($user->date_format);
   $cl_note = $time_rec['comment'];
 
-  // If we have custom fields - obtain values for them.
-  if ($custom_fields) {
-    // Get custom field value for time record.
-    $fields = $custom_fields->get($time_rec['id']);
-    if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-      $cl_cf_1 = $fields[0]['value'];
-    elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-      $cl_cf_1 = $fields[0]['option_id'];
+  // If we have time custom fields - collect values from database.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => $custom_fields->getTimeFieldValue($cl_id, $timeField['id'], $timeField['type']));
+    }
   }
 
   $cl_billable = $time_rec['billable'];
@@ -192,18 +206,19 @@
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 200px;','value'=>$cl_note));
 
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->fields[0]) {
-  // Only one custom field is supported at this time.
-  if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox',
-      'name'=>'cf_1',
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
-      'empty' => array('' => $i18n->get('dropdown.select'))));
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
   }
 }
 
@@ -241,8 +256,12 @@
   // Validate user input.
   if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
-  if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
+  // Validate input in time custom fields.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($timeCustomFields as $timeField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+    }
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
@@ -342,12 +361,9 @@
         'billable'=>$cl_billable,
         'paid'=>$cl_paid));
 
-      // If we have custom fields - update values.
-      if ($res && $custom_fields) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      // Update time custom fields if we have them.
+      if ($res && $custom_fields && $custom_fields->timeFields) {
+        $res = $custom_fields->updateTimeFields($cl_id, $timeCustomFields);
       }
       if ($res)
       {
@@ -404,13 +420,10 @@
         'billable'=>$cl_billable,
         'paid'=>$cl_paid));
 
-      // Insert a custom field if we have it.
+      // Insert time custom fields if we have them.
       $res = true;
-      if ($id && $custom_fields && $cl_cf_1) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $res = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
       if ($id && $res) {
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
diff --git a/user_edit.php b/user_edit.php
index 843383f42..195e87a34 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -109,7 +109,7 @@
   $cl_login = $user_details['login'];
   $cl_email = $user_details['email'];
   $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
-  // If we have user custom fields - collect vallues from database.
+  // If we have user custom fields - collect values from database.
   if ($custom_fields && $custom_fields->userFields) {
     foreach ($custom_fields->userFields as $userField) {
       $control_name = 'user_field_'.$userField['id'];
@@ -248,7 +248,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       }
 
       $result = ttUserHelper::update($user_id, $fields);
-       // Update user custom fields if we have them.
+      // Update user custom fields if we have them.
       if ($result && $custom_fields && $custom_fields->userFields) {
         $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
       }
diff --git a/week.php b/week.php
index 9af356441..0fe376cc3 100644
--- a/week.php
+++ b/week.php
@@ -107,9 +107,22 @@
 }
 
 // Initialize variables.
-// Custom field.
-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));
-$_SESSION['cf_1'] = $cl_cf_1;
+$timeCustomFields = array();
+// If we have time custom fields - collect input.
+if ($request->isPost()) {
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+}
+
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
   if ($request->isPost()) {
@@ -329,17 +342,19 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->fields[0]) {
-  // Only one custom field is supported at this time.
-  if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox','name'=>'cf_1',
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
   }
 }
 
@@ -359,8 +374,12 @@ function render(&$table, $value, $row, $column, $selected = false) {
     if ($newEntryPosted) {
       if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
         $err->add($i18n->get('error.client'));
-      if ($custom_fields) {
-        if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
+      // Validate input in time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($timeCustomFields as $timeField) {
+          // Validation is the same for text and dropdown fields.
+          if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+        }
       }
       if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
         if (!$cl_project) $err->add($i18n->get('error.project'));
@@ -422,7 +441,12 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 $record['billable'] = $cl_billable ? '1' : '0';
                 $record['project_id'] = $cl_project;
                 $record['task_id'] = $cl_task;
-                $record['cf_1_value'] = $cl_cf_1;
+                if ($custom_fields && $custom_fields->timeFields) {
+                  foreach ($custom_fields->timeFields as $timeField) {
+                    $field_name = 'time_field_'.$timeField['id'];
+                    $record[$field_name] = $timeCustomFields[$timeField['id']]['value'];
+                  }
+                }
                 $fields['row_id'] = ttWeekViewHelper::makeRowIdentifier($record).'_0';
                 // Note: no need to check for a possible conflict with an already existing row
                 // because we are doing an insert that does not affect already existing data.

From 895dd669e8fb21490e3e357570ac78d88b771e08 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Jul 2019 15:51:14 +0000
Subject: [PATCH 1000/1848] Fixed left joins for reporting on multiple time
 custom fields.

---
 WEB-INF/lib/ttReportHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl         | 2 +-
 tofile.php                           | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index f08a09b25..f0ce800b1 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -422,11 +422,11 @@ static function getItems($options) {
           $cflTable = 'cfl'.$timeField['id'];
           if ($timeField['type'] == CustomFields::TYPE_TEXT) {
             // Add one join for each text field.
-            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
           } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
             $cfoTable = 'cfo'.$timeField['id'];
             // Add two joins for each dropdown field.
-            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
             $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
           }
         }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 347e9afe0..10ca1f60e 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.19.7.5040 | 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.7.5041 | 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/tofile.php b/tofile.php
index 9399c787c..324b852e3 100644
--- a/tofile.php
+++ b/tofile.php
@@ -121,6 +121,15 @@
       if ($bean->getAttribute('chclient')) print "\t<client><![CDATA[".$item['client']."]]></client>\n";
       if ($bean->getAttribute('chproject')) print "\t<project><![CDATA[".$item['project']."]]></project>\n";
       if ($bean->getAttribute('chtask')) print "\t<task><![CDATA[".$item['task']."]]></task>\n";
+      // Time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print "\t<$field_name><![CDATA[".$item[$field_name]."]]></$field_name>\n";
+        }
+      }
+      // TODO: add user custom fields, too.
       if ($bean->getAttribute('chcf_1')) print "\t<cf_1><![CDATA[".$item['cf_1']."]]></cf_1>\n";
       if ($bean->getAttribute('chstart')) print "\t<start><![CDATA[".$item['start']."]]></start>\n";
       if ($bean->getAttribute('chfinish')) print "\t<finish><![CDATA[".$item['finish']."]]></finish>\n";

From f6e11c1b80c34c2cdf95b1e3d6e400ae88848f3c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Jul 2019 16:59:58 +0000
Subject: [PATCH 1001/1848] Fixed exporting reports to xml and csv by adding
 multiple custom fields output.

---
 WEB-INF/templates/footer.tpl |  2 +-
 tofile.php                   | 48 +++++++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 10ca1f60e..4dac71793 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.19.7.5041 | 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.7.5042 | 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/tofile.php b/tofile.php
index 324b852e3..8b3ae2302 100644
--- a/tofile.php
+++ b/tofile.php
@@ -54,7 +54,7 @@
 $type = $request->getParameter('type');
 
 // Also, there are 2 variations of report: totals only, or normal. Totals only means that the report
-// is grouped by (either date, user, client, project, task, or cf_1) and user only needs to see subtotals by group.
+// is grouped by (either date, user, client, project, or task) and user only needs to see subtotals by group.
 $totals_only = $bean->getAttribute('chtotalsonly');
 
 // Obtain items.
@@ -117,7 +117,15 @@
       print "<row>\n";
 
       print "\t<date><![CDATA[".$item['date']."]]></date>\n";
-      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print "\t<user><![CDATA[".$item['user']."]]></user>\n"; 
+      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print "\t<user><![CDATA[".$item['user']."]]></user>\n";
+      // User custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print "\t<$field_name><![CDATA[".$item[$field_name]."]]></$field_name>\n";
+        }
+      }
       if ($bean->getAttribute('chclient')) print "\t<client><![CDATA[".$item['client']."]]></client>\n";
       if ($bean->getAttribute('chproject')) print "\t<project><![CDATA[".$item['project']."]]></project>\n";
       if ($bean->getAttribute('chtask')) print "\t<task><![CDATA[".$item['task']."]]></task>\n";
@@ -129,8 +137,6 @@
           if ($bean->getAttribute($checkbox_control_name)) print "\t<$field_name><![CDATA[".$item[$field_name]."]]></$field_name>\n";
         }
       }
-      // TODO: add user custom fields, too.
-      if ($bean->getAttribute('chcf_1')) print "\t<cf_1><![CDATA[".$item['cf_1']."]]></cf_1>\n";
       if ($bean->getAttribute('chstart')) print "\t<start><![CDATA[".$item['start']."]]></start>\n";
       if ($bean->getAttribute('chfinish')) print "\t<finish><![CDATA[".$item['finish']."]]></finish>\n";
       if ($bean->getAttribute('chduration')) {
@@ -207,10 +213,25 @@
     // Normal report. Print headers.
     print '"'.$i18n->get('label.date').'"';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.$i18n->get('label.user').'"';
+    // User custom field labels.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$userField['label']).'"';
+      }
+    }
     if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
     if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
     if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
-    if ($bean->getAttribute('chcf_1')) print ',"'.$custom_fields->fields[0]['label'].'"';
+    // Time custom field labels.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$timeField['label']).'"';
+      }
+    }
     if ($bean->getAttribute('chstart')) print ',"'.$i18n->get('label.start').'"';
     if ($bean->getAttribute('chfinish')) print ',"'.$i18n->get('label.finish').'"';
     if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
@@ -228,10 +249,25 @@
     foreach ($items as $item) {
       print '"'.$item['date'].'"';
       if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.str_replace('"','""',$item['user']).'"';
+      // User custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$item[$field_name]).'"';
+        }
+      }
       if ($bean->getAttribute('chclient')) print ',"'.str_replace('"','""',$item['client']).'"';
       if ($bean->getAttribute('chproject')) print ',"'.str_replace('"','""',$item['project']).'"';
       if ($bean->getAttribute('chtask')) print ',"'.str_replace('"','""',$item['task']).'"';
-      if ($bean->getAttribute('chcf_1')) print ',"'.str_replace('"','""',$item['cf_1']).'"';
+      // Time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$item[$field_name]).'"';
+        }
+      }
       if ($bean->getAttribute('chstart')) print ',"'.$item['start'].'"';
       if ($bean->getAttribute('chfinish')) print ',"'.$item['finish'].'"';
       if ($bean->getAttribute('chduration')) {

From 97d1cb16b9cb85c8e8f7e01456cdec08c50315a8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 14 Jul 2019 17:24:17 +0000
Subject: [PATCH 1002/1848] Fixed exporting reports to pdf by adding multiple
 custom fields to output.

---
 WEB-INF/templates/footer.tpl |  2 +-
 topdf.php                    | 91 +++++++++++++++++++++++++++++++-----
 2 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4dac71793..393d367f3 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.19.7.5042 | 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.7.5043 | 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/topdf.php b/topdf.php
index c9120fcf7..337a05a41 100644
--- a/topdf.php
+++ b/topdf.php
@@ -64,7 +64,7 @@
 $show_note_row = $bean->getAttribute('chnote') && $config->getDefinedValue('report_note_on_separate_row');
 
 // There are 2 variations of report: totals only, or normal. Totals only means that the report
-// is grouped by either date, user, client, project, task or cf_1 and user only needs to see subtotals by group.
+// is grouped by either date, user, client, project, or task and user only needs to see subtotals by group.
 $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
 
 // Obtain items for report.
@@ -151,10 +151,25 @@
   $html .= "<tr $styleHeader>";
   $html .= '<td>'.$i18n->get('label.date').'</td>';
   if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) { $colspan++; $html .= '<td>'.$i18n->get('label.user').'</td>'; }
+  // User custom field labels.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $field_name = 'user_field_'.$userField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) { $colspan++; $html .= '<td>'.htmlspecialchars($userField['label']).'</td>'; }
+    }
+  }
   if ($bean->getAttribute('chclient')) { $colspan++; $html .= '<td>'.$i18n->get('label.client').'</td>'; }
   if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->get('label.project').'</td>'; }
   if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->get('label.task').'</td>'; }
-  if ($bean->getAttribute('chcf_1')) { $colspan++; $html .= '<td>'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>'; }
+  // Time custom field labels.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $field_name = 'time_field_'.$timeField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) { $colspan++; $html .= '<td>'.htmlspecialchars($timeField['label']).'</td>'; }
+    }
+  }
   if ($bean->getAttribute('chstart')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.start').'</td>'; }
   if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
   if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
@@ -182,6 +197,14 @@
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
             $html .= '</td>';
         }
+        // User custom fields.
+        if ($custom_fields && $custom_fields->userFields) {
+          foreach ($custom_fields->userFields as $userField) {
+            $field_name = 'user_field_'.$userField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+          }
+        }
         if ($bean->getAttribute('chclient')) {
             $html .= '<td>';
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
@@ -197,10 +220,13 @@
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
             $html .= '</td>';
         }
-        if ($bean->getAttribute('chcf_1')) {
-            $html .= '<td>';
-            $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
-            $html .= '</td>';
+        // Time custom fields.
+        if ($custom_fields && $custom_fields->timeFields) {
+          foreach ($custom_fields->timeFields as $timeField) {
+            $field_name = 'time_field_'.$timeField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+          }
         }
         if ($bean->getAttribute('chstart')) $html .= '<td></td>';
         if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
@@ -239,10 +265,25 @@
     $html .= '<tr>';
     $html .= '<td>'.$item['date'].'</td>';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= '<td>'.htmlspecialchars($item['user']).'</td>';
+    // User custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td>'.htmlspecialchars($item[$field_name]).'</td>';
+      }
+    }
     if ($bean->getAttribute('chclient')) $html .= '<td>'.htmlspecialchars($item['client']).'</td>';
     if ($bean->getAttribute('chproject')) $html .= '<td>'.htmlspecialchars($item['project']).'</td>';
     if ($bean->getAttribute('chtask')) $html .= '<td>'.htmlspecialchars($item['task']).'</td>';
-    if ($bean->getAttribute('chcf_1')) $html .= '<td>'.htmlspecialchars($item['cf_1']).'</td>';
+    // Time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td>'.htmlspecialchars($item[$field_name]).'</td>';
+      }
+    }
     if ($bean->getAttribute('chstart')) $html .= "<td $styleRightAligned>".$item['start'].'</td>';
     if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
@@ -296,6 +337,14 @@
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
       $html .= '</td>';
     }
+    // User custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+      }
+    }
     if ($bean->getAttribute('chclient')) {
       $html .= '<td>';
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
@@ -311,10 +360,13 @@
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
       $html .= '</td>';
     }
-    if ($bean->getAttribute('chcf_1')) {
-      $html .= '<td>';
-      $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
-      $html .= '</td>';
+    // Time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+      }
     }
     if ($bean->getAttribute('chstart')) $html .= '<td></td>';
     if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
@@ -342,10 +394,25 @@
   $html .= '<tr style="background-color:#e0e0e0;">';
   $html .= '<td>'.$i18n->get('label.total').'</td>';
   if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= '<td></td>';
+  // User custom fields.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $field_name = 'user_field_'.$userField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+    }
+  }
   if ($bean->getAttribute('chclient')) $html .= '<td></td>';
   if ($bean->getAttribute('chproject')) $html .= '<td></td>';
   if ($bean->getAttribute('chtask')) $html .= '<td></td>';
-  if ($bean->getAttribute('chcf_1')) $html .= '<td></td>';
+  // Time custom fields.
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $field_name = 'time_field_'.$timeField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+    }
+  }
   if ($bean->getAttribute('chstart')) $html .= '<td></td>';
   if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';

From f9d19b18d10d5945d25a392dffd0d3e1fe8c8566 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Jul 2019 13:50:57 +0000
Subject: [PATCH 1003/1848] Made progress on including custom field settings in
 fav reports.

---
 WEB-INF/lib/ttCronJobHelper.class.php   |   1 -
 WEB-INF/lib/ttFavReportHelper.class.php | 186 ++++++++++++++++++------
 WEB-INF/templates/footer.tpl            |   2 +-
 3 files changed, 146 insertions(+), 43 deletions(-)

diff --git a/WEB-INF/lib/ttCronJobHelper.class.php b/WEB-INF/lib/ttCronJobHelper.class.php
index 5dcc0b69b..8c44756c7 100644
--- a/WEB-INF/lib/ttCronJobHelper.class.php
+++ b/WEB-INF/lib/ttCronJobHelper.class.php
@@ -103,7 +103,6 @@ private function getReportOptions($id) {
 
     // Drop things we don't need.
     unset($val['id']);
-    unset($val['report_spec']);
     unset($val['status']);
 
     return $val;
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index a3e130c30..6ad729f0d 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -120,15 +120,16 @@ static function insertReport($fields) {
     $org_id = $user->org_id;
 
     $sql = "insert into tt_fav_reports".
-      " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
+      " (name, user_id, group_id, org_id, report_spec, client_id, project_id, task_id,".
       " billable, approved, invoice, timesheet, paid_status, users, period, period_start,".
       " period_end, show_client, show_invoice, show_paid, show_ip,".
       " show_project, show_timesheet, show_start, show_duration, show_cost,".
-      " show_task, show_end, show_note, show_approved, show_custom_field_1, show_work_units,".
+      " show_task, show_end, show_note, show_approved, show_work_units,".
       " group_by1, group_by2, group_by3, show_totals_only)".
       " values(".
       $mdb2->quote($fields['name']).", $user_id, $group_id, $org_id, ".
-      $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
+      $mdb2->quote($fields['report_spec']).", ".
+      $mdb2->quote($fields['client']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
       $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
@@ -137,7 +138,7 @@ static function insertReport($fields) {
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
       $fields['chproject'].", ".$fields['chtimesheet'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
-      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chapproved'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
+      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chapproved'].", ".$fields['chunits'].", ".
       $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
       $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
@@ -159,8 +160,8 @@ static function updateReport($fields) {
 
     $sql = "update tt_fav_reports set ".
       "name = ".$mdb2->quote($fields['name']).", ".
+      "report_spec = ".$mdb2->quote($fields['report_spec']).", ".
       "client_id = ".$mdb2->quote($fields['client']).", ".
-      "cf_1_option_id = ".$mdb2->quote($fields['option']).", ".
       "project_id = ".$mdb2->quote($fields['project']).", ".
       "task_id = ".$mdb2->quote($fields['task']).", ".
       "billable = ".$mdb2->quote($fields['billable']).", ".
@@ -185,7 +186,6 @@ static function updateReport($fields) {
       "show_end = ".$fields['chfinish'].", ".
       "show_note = ".$fields['chnote'].", ".
       "show_approved = ".$fields['chapproved'].", ".
-      "show_custom_field_1 = ".$fields['chcf_1'].", ".
       "show_work_units = ".$fields['chunits'].", ".
       "group_by1 = ".$mdb2->quote($fields['group_by1']).", ".
       "group_by2 = ".$mdb2->quote($fields['group_by2']).", ".
@@ -220,7 +220,6 @@ static function saveReport($bean) {
     if (!$bean->getAttribute('chapproved')) $bean->setAttribute('chapproved', 0);
     if (!$bean->getAttribute('chpaid')) $bean->setAttribute('chpaid', 0);
 
-    if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
     if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0);
     if (!$bean->getAttribute('chinvoice')) $bean->setAttribute('chinvoice', 0);
 
@@ -247,6 +246,7 @@ static function saveReport($bean) {
 
     $fields = array(
       'name'=>$bean->getAttribute('new_fav_report'),
+      'report_spec'=>ttFavReportHelper::makeReportSpec($bean),
       'client'=>$bean->getAttribute('client'),
       'option'=>$bean->getAttribute('option'),
       'project'=>$bean->getAttribute('project'),
@@ -272,7 +272,6 @@ static function saveReport($bean) {
       'chip'=>$bean->getAttribute('chip'),
       'chapproved'=>$bean->getAttribute('chapproved'),
       'chpaid'=>$bean->getAttribute('chpaid'),
-      'chcf_1'=>$bean->getAttribute('chcf_1'),
       'chunits'=>$bean->getAttribute('chunits'),
       'chinvoice'=>$bean->getAttribute('chinvoice'),
       'group_by1'=>$bean->getAttribute('group_by1'),
@@ -316,10 +315,42 @@ static function deleteReport($id) {
   // loadReport - loads report options from database into a bean.
   static function loadReport(&$bean) {
     global $user;
+    // Custom fields.
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
     $user_id = $user->getUser();
 
     $val = ttFavReportHelper::get($bean->getAttribute('favorite_report'));
     if ($val) {
+      // Custom field settings.
+      if ($val['report_spec']) {
+        $report_spec = $val['report_spec'];
+        // Time custom field settings.
+        if ($custom_fields && $custom_fields->timeFields) {
+          foreach ($custom_fields->timeFields as $timeField) {
+            $field_name = 'time_field_'.$timeField['id'];
+            $checkbox_field_name = 'show_'.$field_name;
+            $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
+            $bean->setAttribute($field_name, $field_value);
+            $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
+            $bean->setAttribute($checkbox_field_name, $checkbox_value);
+          }
+        }
+        // User custom field settings.
+        if ($custom_fields && $custom_fields->userFields) {
+          foreach ($custom_fields->userFields as $userField) {
+            $field_name = 'user_field_'.$userField['id'];
+            $checkbox_field_name = 'show_'.$field_name;
+            $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
+            $bean->setAttribute($field_name, $field_value);
+            $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
+            $bean->setAttribute($checkbox_field_name, $checkbox_value);
+          }
+        }
+      }
+
       $bean->setAttribute('client', $val['client_id']);
       $bean->setAttribute('option', $val['cf_1_option_id']);
       $bean->setAttribute('project', $val['project_id']);
@@ -353,7 +384,6 @@ static function loadReport(&$bean) {
       $bean->setAttribute('chfinish', $val['show_end']);
       $bean->setAttribute('chnote', $val['show_note']);
       $bean->setAttribute('chapproved', $val['show_approved']);
-      $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
       $bean->setAttribute('chunits', $val['show_work_units']);
       $bean->setAttribute('group_by1', $val['group_by1']);
       $bean->setAttribute('group_by2', $val['group_by2']);
@@ -363,37 +393,54 @@ static function loadReport(&$bean) {
     } else {
       $attrs = $bean->getAttributes();
       $attrs = array_merge($attrs, array(
-        'client'=>'',
-        'option'=>'',
-        'project'=>'',
-        'task'=>'',
-        'include_records'=>'',
-        'approved'=>'',
-        'paid_status'=>'',
-        'invoice'=>'',
-        'timesheet'=>'',
-        'users'=>$user_id,
-        'period'=>'',
-        'chclient'=>'1',
-        'chstart'=>'1',
-        'chfinish'=>'1',
-        'chduration'=>'1',
-        'chproject'=>'1',
-        'chtask'=>'1',
-        'chnote'=>'1',
-        'chcost'=>'',
-        'chtimesheet'=>'',
-        'chip'=>'',
-        'chapproved'=>'',
-        'chpaid'=>'',
-        'chcf_1'=>'',
-        'chunits'=>'',
-        'chinvoice'=>'',
-        'group_by1'=>'',
-        'group_by2'=>'',
-        'group_by3'=>'',
-        'chtotalsonly'=>'',
-        'new_fav_report'=>''));
+        'client' => null,
+        'project'=> null,
+        'task' => null,
+        'include_records' => null,
+        'approved' => null,
+        'paid_status' => null,
+        'invoice' => null,
+        'timesheet' => null,
+        'users' => $user_id,
+        'period' => null,
+        'chclient' => '1',
+        'chstart' => '1',
+        'chfinish' => '1',
+        'chduration' => '1',
+        'chproject' => '1',
+        'chtask' => '1',
+        'chnote' => '1',
+        'chcost' => null,
+        'chtimesheet' => null,
+        'chip' => null,
+        'chapproved' => null,
+        'chpaid' => null,
+        'chunits' => null,
+        'chinvoice' => null,
+        'group_by1' => null,
+        'group_by2' => null,
+        'group_by3' => null,
+        'chtotalsonly' => null,
+        'new_fav_report' => null));
+      // Time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $custom_field_attrs[$field_name] = null;
+          $custom_field_attrs[$checkbox_field_name] = null;
+        }
+      }
+      // User custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $custom_field_attrs[$field_name] = null;
+          $custom_field_attrs[$checkbox_field_name] = null;
+        }
+      }
+      $attrs = array_merge($attrs, $custom_field_attrs);
       $bean->setAttributes($attrs);
     }
   }
@@ -413,7 +460,6 @@ static function getReportOptions($id) {
     $options = $db_fields; // For now, use db field names as options.
     // Drop things we don't need in reports.
     unset($options['id']);
-    unset($options['report_spec']); // Currently not used.
     unset($options['status']);
 
     // Note: special handling for NULL users field is done in cron.php
@@ -470,4 +516,62 @@ static function adjustOptions($options) {
 
     return $options;
   }
+
+  // makeReportSpec - prepares a value for report_spec field.
+  //
+  // Currently, only custom field settings go there.
+  // Format:
+  // time_field_25:117,show_time_field_25:1,time_field_28:qwerty,show_time_field_28:0
+  static function makeReportSpec($bean) {
+    global $user;
+
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
+
+    // Add time custom field settings.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $field_value = str_replace(',','&#44',$bean->getAttribute($field_name)); 
+        $checkbox_field_name = 'show_'.$field_name;
+        $checkbox_field_value = (int) $bean->getAttribute($checkbox_field_name);
+        if ($field_value) $reportSpecArray[] = $field_name.':'.$field_value;
+        if ($checkbox_field_value) $reportSpecArray[] = $checkbox_field_name.':1';
+      }
+    }
+
+    // Add user custom field settings.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $field_value = str_replace(',','&#44',$bean->getAttribute($field_name));
+        $checkbox_field_name = 'show_'.$field_name;
+        $checkbox_field_value = (int) $bean->getAttribute($checkbox_field_name);
+        if ($field_value) $reportSpecArray[] = $field_name.':'.$field_value;
+        if ($checkbox_field_value) $reportSpecArray[] = $checkbox_field_name.':1';
+      }
+    }
+
+    $reportSpec = implode(',', $reportSpecArray);
+    return $reportSpec;
+  }
+
+  // getFieldSettingFromReportSpec - obtains custom field setting from report_spec string.
+  // See makeReportSpec above.
+  //
+  // $fieldKey is something like "time_field_26", "show_time_field_26", or
+  // "user_field_765", "show_user_field_765".
+  static function getFieldSettingFromReportSpec($fieldKey, $report_spec) {
+    $reportSpecArray = explode(',', $report_spec);
+    foreach ($reportSpecArray as $fieldSetting) {
+      if (ttStartsWith($fieldSetting, $fieldKey.':')) {
+        $value = substr($fieldSetting, strlen($fieldKey)+1);
+        $value = str_replace('&#44',',',$value); // Restore commas.
+        return $value;
+      }
+    }
+    return null; // Not found.
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 393d367f3..775db9c49 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.19.7.5043 | 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.7.5044 | 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>

From 86886803a8ce268cbe64a1937c05df79d645d9ec Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Jul 2019 15:10:59 +0000
Subject: [PATCH 1004/1848] Fixed emailed reports to include multiple custom
 fields.

---
 WEB-INF/lib/ttFavReportHelper.class.php |   1 +
 WEB-INF/lib/ttReportHelper.class.php    | 102 ++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |   2 +-
 3 files changed, 98 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 6ad729f0d..d118edbbb 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -417,6 +417,7 @@ static function loadReport(&$bean) {
         'chpaid' => null,
         'chunits' => null,
         'chinvoice' => null,
+        'chfiles' => '1',
         'group_by1' => null,
         'group_by2' => null,
         'group_by3' => null,
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index f0ce800b1..a9831f307 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1036,10 +1036,25 @@ static function prepareReportBody($options, $comment = null)
     // Determine column span for note field.
     $colspan = 1;
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
+    // User custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($options[$checkbox_control_name]) $colspan++;
+      }
+    }
     if ($options['show_client']) $colspan++;
     if ($options['show_project']) $colspan++;
     if ($options['show_task']) $colspan++;
-    if ($options['show_custom_field_1']) $colspan++;
+    // Time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($options[$checkbox_control_name]) $colspan++;
+      }
+    }
     if ($options['show_start']) $colspan++;
     if ($options['show_end']) $colspan++;
     if ($options['show_duration']) $colspan++;
@@ -1128,14 +1143,28 @@ static function prepareReportBody($options, $comment = null)
       $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
       if ($canViewReports || $isClient)
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
+      // User custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($options[$checkbox_control_name]) $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($userField['label']).'</td>';
+        }
+      }
       if ($options['show_client'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
       if ($options['show_project'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
       if ($options['show_task'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
-      if ($options['show_custom_field_1'])
-        $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
+      // Time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($options[$checkbox_control_name]) $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($timeField['label']).'</td>';
+        }
+      }
       if ($options['show_start'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
       if ($options['show_end'])
@@ -1184,10 +1213,25 @@ static function prepareReportBody($options, $comment = null)
               $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
               if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['user'].'</td>';
+              // User custom fields.
+              if ($custom_fields && $custom_fields->userFields) {
+                foreach ($custom_fields->userFields as $userField) {
+                  $field_name = 'user_field_'.$userField['id'];
+                  $checkbox_control_name = 'show_'.$field_name;
+                  if ($options[$checkbox_control_name]) $body .= '<td></td>';
+                }
+              }
               if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['client'].'</td>';
               if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['project'].'</td>';
               if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['task'].'</td>';
-              if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['cf_1'].'</td>';
+              // Time custom fields.
+              if ($custom_fields && $custom_fields->timeFields) {
+                foreach ($custom_fields->timeFields as $timeField) {
+                  $field_name = 'time_field_'.$timeField['id'];
+                  $checkbox_control_name = 'show_'.$field_name;
+                  if ($options[$checkbox_control_name]) $body .= '<td></td>';
+                }
+              }
               if ($options['show_start']) $body .= '<td></td>';
               if ($options['show_end']) $body .= '<td></td>';
               if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
@@ -1216,14 +1260,28 @@ static function prepareReportBody($options, $comment = null)
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
           if ($canViewReports || $isClient)
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
+          // User custom fields.
+          if ($custom_fields && $custom_fields->userFields) {
+            foreach ($custom_fields->userFields as $userField) {
+              $field_name = 'user_field_'.$userField['id'];
+              $checkbox_control_name = 'show_'.$field_name;
+              if ($options[$checkbox_control_name]) $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record[$field_name]).'</td>';
+            }
+          }
           if ($options['show_client'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
           if ($options['show_project'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['project']).'</td>';
           if ($options['show_task'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['task']).'</td>';
-          if ($options['show_custom_field_1'])
-            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['cf_1']).'</td>';
+          // Time custom fields.
+          if ($custom_fields && $custom_fields->timeFields) {
+            foreach ($custom_fields->timeFields as $timeField) {
+              $field_name = 'time_field_'.$timeField['id'];
+              $checkbox_control_name = 'show_'.$field_name;
+              if ($options[$checkbox_control_name]) $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record[$field_name]).'</td>';
+            }
+          }
           if ($options['show_start'])
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['start'].'</td>';
           if ($options['show_end'])
@@ -1274,9 +1332,25 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
         if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['user'].'</td>';
+        // User custom fields.
+        if ($custom_fields && $custom_fields->userFields) {
+          foreach ($custom_fields->userFields as $userField) {
+            $field_name = 'user_field_'.$userField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($options[$checkbox_control_name]) $body .= '<td></td>';
+          }
+        }
         if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['client'].'</td>';
         if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['project'].'</td>';
         if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['task'].'</td>';
+        // Time custom fields.
+        if ($custom_fields && $custom_fields->timeFields) {
+          foreach ($custom_fields->timeFields as $timeField) {
+            $field_name = 'time_field_'.$timeField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($options[$checkbox_control_name]) $body .= '<td></td>';
+          }
+        }
         if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['cf_1'].'</td>';
         if ($options['show_start']) $body .= '<td></td>';
         if ($options['show_end']) $body .= '<td></td>';
@@ -1301,9 +1375,25 @@ static function prepareReportBody($options, $comment = null)
       $body .= '<tr style="'.$rowSubtotal.'">';
       $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
       if ($canViewReports || $isClient) $body .= '<td></td>';
+      // User custom fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($options[$checkbox_control_name]) $body .= '<td></td>';
+        }
+      }
       if ($options['show_client']) $body .= '<td></td>';
       if ($options['show_project']) $body .= '<td></td>';
       if ($options['show_task']) $body .= '<td></td>';
+      // Time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($options[$checkbox_control_name]) $body .= '<td></td>';
+        }
+      }
       if ($options['show_custom_field_1']) $body .= '<td></td>';
       if ($options['show_start']) $body .= '<td></td>';
       if ($options['show_end']) $body .= '<td></td>';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 775db9c49..ba4178b53 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.19.7.5044 | 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.7.5045 | 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>

From b029d2cfa6611d060549f9a4cefd75a84f2b80f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 Jul 2019 15:59:54 +0000
Subject: [PATCH 1005/1848] Fixed emailed reports by cron by including multiple
 custom fields.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 29 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index d118edbbb..05b863fba 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -515,6 +515,35 @@ static function adjustOptions($options) {
     if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
       $options['approved'] = 1; // Restrict clients to approved records only.
 
+    // Prepare custom field options.
+    if ($user->isPluginEnabled('cf') && $options['report_spec']) {
+      $custom_fields = new CustomFields();
+      $report_spec = $options['report_spec'];
+      // Time fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
+          $options[$field_name] = $field_value;
+          $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
+          $options[$checkbox_field_name] = $checkbox_value;
+        }
+      }
+      // User fields.
+      if ($custom_fields && $custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $field_name = 'user_field_'.$userField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
+          $options[$field_name] = $field_value;
+          $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
+          $options[$checkbox_field_name] = $checkbox_value;
+        }
+      }
+      // TODO: add project fields here.
+    }
+
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ba4178b53..f59e89fb3 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.19.7.5045 | 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.7.5046 | 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>

From 52c1eec33de6aac3771283b2055ac9067dead992 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Aug 2019 19:56:31 +0000
Subject: [PATCH 1006/1848] Fixed export of large tables by operating on
 smaller chunks at a time.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 68 +++++++++++++++--------
 WEB-INF/lib/ttReportHelper.class.php      |  1 +
 WEB-INF/lib/ttTeamHelper.class.php        | 34 ------------
 WEB-INF/templates/footer.tpl              |  2 +-
 reports.php                               | 16 ++++++
 5 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index cd38de9d7..b76c790fc 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -105,7 +105,6 @@ function getRecordsFromTable($table_name) {
     global $user;
     $mdb2 = getConnection();
 
-    $result = array();
     $sql = "select * from $table_name where group_id = $this->group_id and org_id = $user->org_id";
     $res = $mdb2->query($sql);
     $result = array();
@@ -118,6 +117,24 @@ function getRecordsFromTable($table_name) {
     return false;
   }
 
+  // getRecordsChunkFromTable - obtains a subset of records from a given table for a group.
+  // It is a workaround for out of memory condition when a table such as tt_log becomes too large
+  // and we can no longer use the getRecordsFromTable.
+  function getRecordsChunkFromTable($table_name, $limit, $offset) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql = "select * from $table_name where group_id = $this->group_id and org_id = $user->org_id order by id limit $limit offset $offset";
+    $res = $mdb2->query($sql);
+    $result = false;
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // writeData writes group data into file.
   function writeData() {
 
@@ -367,14 +384,12 @@ function writeData() {
     }
 
     // Write time log entries and build logMap at the same time.
-    // TODO: big data sets get us out of memory error.
-    // We need to optimize this by working on smaller result sets at a time.
-    // tt_log is one potentially large table, but so may be others.
-    // Refactor this during next round of work here.
-    $records = $this->getRecordsFromTable('tt_log');
-    if (count($records) > 0) {
-      fwrite($this->file, $this->indentation."  <log>\n");
-      $key = 0;
+    // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
+    fwrite($this->file, $this->indentation."  <log>\n");
+    $offset = 0;
+    $limit = 1000;
+    $key = 0;
+    while ($records = $this->getRecordsChunkFromTable('tt_log', $limit, $offset)) {
       foreach ($records as $record) {
         $key++;
         $this->logMap[$record['id']] = $key;
@@ -396,10 +411,11 @@ function writeData() {
         $log_part .= "></log_item>\n";
         fwrite($this->file, $log_part);
       }
-      fwrite($this->file, $this->indentation."  </log>\n");
       unset($records);
       unset($log_part);
-    }
+      $offset += $limit;
+     }
+    fwrite($this->file, $this->indentation."  </log>\n");
 
     // Write custom fields.
     if (count($custom_fields) > 0) {
@@ -435,9 +451,11 @@ function writeData() {
     }
 
     // Write custom field log.
-    $custom_field_log = ttTeamHelper::getCustomFieldLog($this->group_id);
-    if (count($custom_field_log) > 0) {
-      fwrite($this->file, $this->indentation."  <custom_field_log>\n");
+    // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
+    fwrite($this->file, $this->indentation."  <custom_field_log>\n");
+    $offset = 0;
+    $limit = 1000;
+    while ($custom_field_log = $this->getRecordsChunkFromTable('tt_custom_field_log', $limit, $offset)) {
       foreach ($custom_field_log as $entry) {
         $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
         $custom_field_log_part .= " field_id=\"".$this->customFieldMap[$entry['field_id']]."\"";
@@ -447,15 +465,18 @@ function writeData() {
         $custom_field_log_part .= "></custom_field_log_entry>\n";
         fwrite($this->file, $custom_field_log_part);
       }
-      fwrite($this->file, $this->indentation."  </custom_field_log>\n");
       unset($custom_field_log);
       unset($custom_field_log_part);
-    }
-
-    // Write expense items.
-    $expense_items = ttTeamHelper::getExpenseItems($this->group_id);
-    if (count($expense_items) > 0) {
-      fwrite($this->file, $this->indentation."  <expense_items>\n");
+      $offset += $limit;
+     }
+    fwrite($this->file, $this->indentation."  </custom_field_log>\n");
+
+    // Write expense otems.
+    // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
+    fwrite($this->file, $this->indentation."  <expense_items>\n");
+    $offset = 0;
+    $limit = 1000;
+    while ($expense_items = $this->getRecordsChunkFromTable('tt_expense_items', $limit, $offset)) {
       foreach ($expense_items as $expense_item) {
         $expense_item_part = $this->indentation.'    '."<expense_item date=\"".$expense_item['date']."\"";
         $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
@@ -470,10 +491,11 @@ function writeData() {
         $expense_item_part .= "></expense_item>\n";
         fwrite($this->file, $expense_item_part);
       }
-      fwrite($this->file, $this->indentation."  </expense_items>\n");
       unset($expense_items);
       unset($expense_item_part);
-    }
+      $offset += $limit;
+     }
+    fwrite($this->file, $this->indentation."  </expense_items\n");
 
     // Write predefined expenses.
     $predefined_expenses = $this->getRecordsFromTable('tt_predefined_expenses');
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a9831f307..8ba393b25 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1651,6 +1651,7 @@ static function makeGroupByPart($options) {
     $group_by2 = $options['group_by2'];
     $group_by3 = $options['group_by3'];
 
+    // TODO: redo this using the if instead so that we can include custom fields properly.
     switch ($group_by1) {
       case 'date':
         $group_by_parts .= ', l.date';
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b94f6434c..651226e49 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -308,23 +308,6 @@ static function getAllCustomFieldOptions($group_id) {
     return false;
   }
 
-  // The getCustomFieldLog obtains all custom field log entries for a group.
-  static function getCustomFieldLog($group_id) {
-    $mdb2 = getConnection();
-
-    $sql = "select * from tt_custom_field_log where field_id in (select id from tt_custom_fields where group_id = $group_id) order by id";
-
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getFavReports - obtains all favorite reports for all users in a group.
   static function getFavReports($group_id) {
     $mdb2 = getConnection();
@@ -342,23 +325,6 @@ static function getFavReports($group_id) {
     return false;
   }
 
-  // getExpenseItems - obtains all expense items for all users in a group.
-  static function getExpenseItems($group_id) {
-    $mdb2 = getConnection();
-
-    $result = array();
-    $sql = "select * from tt_expense_items where user_id in (select id from tt_users where group_id = $group_id)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getMonthlyQuotas - obtains monthly quotas for a group.
   static function getMonthlyQuotas($group_id) {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f59e89fb3..b74764280 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.19.7.5046 | 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.7.5047 | 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/reports.php b/reports.php
index 0f0cb11ab..66a6608b4 100644
--- a/reports.php
+++ b/reports.php
@@ -356,6 +356,22 @@
   $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
 if (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
+// If we have time custom fields - add group by options for them.
+/*
+ * This is unfinished work in progress.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    $group_by_options[$field_name] = $timeField['label'];
+  }
+}
+// If we have user custom fields - add group by options for them.
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    $group_by_options[$field_name] = $userField['label'];
+  }
+}*/
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
 if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));

From b5834a3c786be7c5a788eb78b3ed7466b20a2f92 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Aug 2019 20:04:18 +0000
Subject: [PATCH 1007/1848] Fixed export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index b76c790fc..0bd55030e 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -495,7 +495,7 @@ function writeData() {
       unset($expense_item_part);
       $offset += $limit;
      }
-    fwrite($this->file, $this->indentation."  </expense_items\n");
+    fwrite($this->file, $this->indentation."  </expense_items>\n");
 
     // Write predefined expenses.
     $predefined_expenses = $this->getRecordsFromTable('tt_predefined_expenses');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b74764280..017fb6699 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.19.7.5047 | 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.7.5048 | 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>

From bc36522589cbd884a50e581696f7638d92944782 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Aug 2019 21:26:27 +0000
Subject: [PATCH 1008/1848] Added label.sort_by to translation files as part of
 adding sorting to invoices.php (ongoing work).

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index d82477c93..867bd48f0 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -241,6 +241,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 08649ff02..1a3c8c073 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -251,6 +251,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index c33097402..1023187dc 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -232,6 +232,7 @@
 // TODO: translate the following.
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Brugerdefineret felt',
 'label.monthly_quotas' => 'Månedlig kvota',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8c9e47b73..64ddc84e0 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -222,6 +222,8 @@
 'label.condition' => 'Bedingung',
 'label.yes' => 'Ja',
 'label.no' => 'Nein',
+// TODO: translate the following.
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Benutzerfelder',
 'label.monthly_quotas' => 'Monatliche Quoten',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b00abf288..90ec6044e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -211,6 +211,7 @@
 'label.condition' => 'Condition',
 'label.yes' => 'yes',
 'label.no' => 'no',
+'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Custom fields',
 'label.monthly_quotas' => 'Monthly quotas',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 7165bd7ba..8ac7de2a4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -245,6 +245,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 8584fc085..e20712fca 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -238,6 +238,8 @@
 'label.condition' => 'Tingimus',
 'label.yes' => 'jah',
 'label.no' => 'ei',
+// TODO: translate the following.
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eriväljad',
 'label.monthly_quotas' => 'Kuu kvoot',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 4f6573105..365ebaad2 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -243,6 +243,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'فیلدهای سفارشی',
 // Translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index c7d99e007..1201c26b4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -235,6 +235,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Omat kentät',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 870eb67bf..3118f891a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -231,6 +231,7 @@
 // TODO: translate the following.
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Champs personalisés',
 'label.monthly_quotas' => 'Quotas mensuels',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d5a305c26..11c4b459c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -224,6 +224,8 @@
 'label.condition' => 'Κατάσταση',
 'label.yes' => 'ναι',
 'label.no' => 'όχι',
+// TODO: translate the following.
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Προσαρμοσμένα πεδία',
 'label.monthly_quotas' => 'Μηνιαίες ποσοστώσεις',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2a8b16084..8528ba8f3 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -251,6 +251,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'שדות אישיים',
 // Translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 4bf29d59d..5c20c1d9d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -249,6 +249,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 50d9af909..d90592ab0 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -228,6 +228,8 @@
 'label.condition' => 'Condizione',
 'label.yes' => 'si',
 'label.no' => 'no',
+// TODO: translate the following.
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campi personalizzati',
 'label.monthly_quotas' => 'Quote mensili',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b57a92398..a24a9a9cd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -252,6 +252,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index db58959f5..94e965b8d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -251,6 +251,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8ede3f3f6..27683ed1c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -211,6 +211,8 @@
 'label.condition' => 'Voorwaarde',
 'label.yes' => 'ja',
 'label.no' => 'nee',
+// TODO: translate the following.
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eigen velden',
 'label.monthly_quotas' => 'Doelen per maand',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 72812e4f3..ff06b799b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -250,6 +250,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8e7684f21..7886fb4cc 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -237,6 +237,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Niestandardowe pola',
 // Translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9f31b6a57..d9e5dc218 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -234,6 +234,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campos personalizados',
 // Translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index bfd153a25..d80272c7b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -239,6 +239,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 0a8b16bcc..426f86032 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -249,6 +249,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 05d3693ac..c4f76cdd4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -210,6 +210,7 @@
 'label.condition' => 'Условие',
 'label.yes' => 'да',
 'label.no' => 'нет',
+'label.sort_by' => 'Сортировать по',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Дополнительные поля',
 'label.monthly_quotas' => 'Месячные квоты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 834adf5b8..75c6550d0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -240,6 +240,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Vlastné polia',
 // Translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b8363b6ae..32da0b5bf 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -234,6 +234,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ff68be79a..4b7b459bc 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -234,6 +234,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Dodatna polja',
 // Translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3c108e18f..22780dc8a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -231,6 +231,7 @@
 // TODO: translate the following.
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Egna fält',
 'label.monthly_quotas' => 'Månadskvoter',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1f88bf79e..951de7b58 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -256,6 +256,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 0f6ac781e..4484df603 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -242,6 +242,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6168289fc..553c70fe4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -248,6 +248,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
+// 'label.sort_by' => 'Sort by',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 017fb6699..dbf728695 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.19.7.5048 | 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.7.5049 | 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>

From 1a3f9ca3aae51d91704c9f3f5cc25a6a1dc3a9b8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Aug 2019 18:04:02 +0000
Subject: [PATCH 1009/1848] Added sort options on invoices.php page.

---
 WEB-INF/lib/ttGroupHelper.class.php   | 20 ++++++--
 WEB-INF/lib/ttInvoiceHelper.class.php | 16 +++++++
 WEB-INF/resources/ca.lang.php         |  4 +-
 WEB-INF/resources/cs.lang.php         |  4 +-
 WEB-INF/resources/da.lang.php         |  4 +-
 WEB-INF/resources/de.lang.php         |  5 +-
 WEB-INF/resources/en.lang.php         |  5 +-
 WEB-INF/resources/es.lang.php         |  4 +-
 WEB-INF/resources/et.lang.php         |  5 +-
 WEB-INF/resources/fa.lang.php         |  4 +-
 WEB-INF/resources/fi.lang.php         |  4 +-
 WEB-INF/resources/fr.lang.php         |  4 +-
 WEB-INF/resources/gr.lang.php         |  5 +-
 WEB-INF/resources/he.lang.php         |  4 +-
 WEB-INF/resources/hu.lang.php         |  4 +-
 WEB-INF/resources/it.lang.php         |  5 +-
 WEB-INF/resources/ja.lang.php         |  4 +-
 WEB-INF/resources/ko.lang.php         |  4 +-
 WEB-INF/resources/nl.lang.php         |  5 +-
 WEB-INF/resources/no.lang.php         |  4 +-
 WEB-INF/resources/pl.lang.php         |  4 +-
 WEB-INF/resources/pt-br.lang.php      |  4 +-
 WEB-INF/resources/pt.lang.php         |  4 +-
 WEB-INF/resources/ro.lang.php         |  4 +-
 WEB-INF/resources/ru.lang.php         |  4 +-
 WEB-INF/resources/sk.lang.php         |  4 +-
 WEB-INF/resources/sl.lang.php         |  4 +-
 WEB-INF/resources/sr.lang.php         |  4 +-
 WEB-INF/resources/sv.lang.php         |  4 +-
 WEB-INF/resources/tr.lang.php         |  4 +-
 WEB-INF/resources/zh-cn.lang.php      |  4 +-
 WEB-INF/resources/zh-tw.lang.php      |  4 +-
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/invoices.tpl        | 18 +++++++-
 invoices.php                          | 66 +++++++++++++++++++++++++++
 35 files changed, 212 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 05a31562a..c429f2bf3 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -411,7 +411,7 @@ static function getPredefinedExpenses() {
   }
 
   // The getActiveInvoices returns an array of active invoices for a group.
-  static function getActiveInvoices()
+  static function getActiveInvoices($sort_options = false)
   {
     global $user;
     $mdb2 = getConnection();
@@ -425,9 +425,23 @@ static function getActiveInvoices()
     if ($user->isClient())
       $client_part = "and i.client_id = $user->client_id";
 
-    $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i".
+    // Prepare order by part.
+    $order_by_part = 'order  by ';
+    if (!$sort_options)
+      $order_by_part .= 'i.name';
+    else {
+      $order_by_part .= $sort_options['sort_option_1'];
+      if ($sort_options['sort_order_1'] == 'descending') $order_by_part .= ' desc';
+
+      if ($sort_options['sort_option_2']) {
+        $order_by_part .= ', '.$sort_options['sort_option_2'];
+        if ($sort_options['sort_order_2'] == 'descending') $order_by_part .= ' desc';
+      }
+    }
+
+    $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client from tt_invoices i".
       " left join tt_clients c on (c.id = i.client_id)".
-      " where i.status = 1 and i.group_id = $group_id and i.org_id = $org_id $client_part order by i.name";
+      " where i.status = 1 and i.group_id = $group_id and i.org_id = $org_id $client_part $order_by_part";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 4c1bd2b06..a766a0f3e 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -504,4 +504,20 @@ static function prepareInvoiceBody($invoice_id, $comment)
 
     return $body;
   }
+
+  // validSortOption validates user input for sort option.
+  static function validSortOption($option, $emptyValid = false) {
+    if (!$option)
+      return ($emptyValid ? true : false);
+
+    $valid_options = array('name', 'client', 'date');
+
+    return (in_array($option, $valid_options) ? true : false);
+  }
+
+  // validSortOrder validates user input for sort order.
+  static function validSortOrder($order) {
+    $valid_options = array('ascending', 'descending');
+    return (in_array($order, $valid_options) ? true : false);
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 867bd48f0..2a31abea6 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -241,7 +241,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -439,6 +439,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Ha oblidat la seva paraula de pas?',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1a3c8c073..1f10377c5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -251,7 +251,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -447,6 +447,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zapomenuté heslo?',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 1023187dc..ce0eea403 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -232,7 +232,7 @@
 // TODO: translate the following.
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Brugerdefineret felt',
 'label.monthly_quotas' => 'Månedlig kvota',
@@ -420,6 +420,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Har du glemt din adgangskode?',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 64ddc84e0..1ca50d172 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -223,7 +223,7 @@
 'label.yes' => 'Ja',
 'label.no' => 'Nein',
 // TODO: translate the following.
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Benutzerfelder',
 'label.monthly_quotas' => 'Monatliche Quoten',
@@ -403,6 +403,9 @@
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'bezahlt',
 'dropdown.not_paid' => 'nicht bezahlt',
+// TODO: translate the following.
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 90ec6044e..af621e467 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -211,7 +211,7 @@
 'label.condition' => 'Condition',
 'label.yes' => 'yes',
 'label.no' => 'no',
-'label.sort_by' => 'Sort by',
+'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Custom fields',
 'label.monthly_quotas' => 'Monthly quotas',
@@ -384,7 +384,8 @@
 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'paid',
 'dropdown.not_paid' => 'not paid',
-
+'dropdown.ascending' => 'ascending',
+'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8ac7de2a4..3c10065e2 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -245,7 +245,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -438,6 +438,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e20712fca..2ac7b9d56 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -239,7 +239,7 @@
 'label.yes' => 'jah',
 'label.no' => 'ei',
 // TODO: translate the following.
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eriväljad',
 'label.monthly_quotas' => 'Kuu kvoot',
@@ -426,6 +426,9 @@
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'makstud',
 'dropdown.not_paid' => 'mitte makstud',
+// TODO: translate the following.
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Unustasid salasõna?',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 365ebaad2..37a9907d0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -243,7 +243,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'فیلدهای سفارشی',
 // Translate the following.
@@ -432,6 +432,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1201c26b4..94b76fcee 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -235,7 +235,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Omat kentät',
 // TODO: translate the following.
@@ -420,6 +420,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3118f891a..3f562efed 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -231,7 +231,7 @@
 // TODO: translate the following.
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Champs personalisés',
 'label.monthly_quotas' => 'Quotas mensuels',
@@ -412,6 +412,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 11c4b459c..d44acd4ac 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -225,7 +225,7 @@
 'label.yes' => 'ναι',
 'label.no' => 'όχι',
 // TODO: translate the following.
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Προσαρμοσμένα πεδία',
 'label.monthly_quotas' => 'Μηνιαίες ποσοστώσεις',
@@ -411,6 +411,9 @@
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'εξοφλημένο',
 'dropdown.not_paid' => 'δεν έχει εξοφληθεί',
+// TODO: translate the following.
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8528ba8f3..6086b6611 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -251,7 +251,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'שדות אישיים',
 // Translate the following.
@@ -438,6 +438,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5c20c1d9d..d02e27084 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -249,7 +249,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -441,6 +441,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Elfelejtetted a jelszót?',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d90592ab0..f9ad30966 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -229,7 +229,7 @@
 'label.yes' => 'si',
 'label.no' => 'no',
 // TODO: translate the following.
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campi personalizzati',
 'label.monthly_quotas' => 'Quote mensili',
@@ -421,6 +421,9 @@
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'pagato',
 'dropdown.not_paid' => 'non pagato',
+// TODO: translate the following.
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a24a9a9cd..c0c50c39a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -252,7 +252,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -442,6 +442,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'パスワードを忘れましたか？',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 94e965b8d..c98462c73 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -251,7 +251,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -446,6 +446,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '암호를 잊으셨습니까?',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 27683ed1c..b71883ca7 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -212,7 +212,7 @@
 'label.yes' => 'ja',
 'label.no' => 'nee',
 // TODO: translate the following.
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eigen velden',
 'label.monthly_quotas' => 'Doelen per maand',
@@ -386,6 +386,9 @@
 'dropdown.not_approved' => 'afgekeurd',
 'dropdown.paid' => 'betaald',
 'dropdown.not_paid' => 'niet betaald',
+// TODO: translate the following.
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ff06b799b..b15650585 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -250,7 +250,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -442,6 +442,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glemt passordet?',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 7886fb4cc..c6795211f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -237,7 +237,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Niestandardowe pola',
 // Translate the following.
@@ -423,6 +423,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d9e5dc218..6ab30f3a1 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -234,7 +234,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campos personalizados',
 // Translate the following.
@@ -418,6 +418,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d80272c7b..96996831e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -239,7 +239,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -425,6 +425,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 426f86032..c61cef471 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -249,7 +249,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -445,6 +445,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parola pierduta?',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c4f76cdd4..44a829745 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -210,7 +210,7 @@
 'label.condition' => 'Условие',
 'label.yes' => 'да',
 'label.no' => 'нет',
-'label.sort_by' => 'Сортировать по',
+'label.sort' => 'Сортировать',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Дополнительные поля',
 'label.monthly_quotas' => 'Месячные квоты',
@@ -381,6 +381,8 @@
 'dropdown.not_approved' => 'не одобрено',
 'dropdown.paid' => 'оплачено',
 'dropdown.not_paid' => 'не оплачено',
+'dropdown.ascending' => 'возрастает',
+'dropdown.descending' => 'убывает',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 75c6550d0..e6c2562c5 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -240,7 +240,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Vlastné polia',
 // Translate the following.
@@ -428,6 +428,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 32da0b5bf..c9e4a1e2a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -234,7 +234,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -417,6 +417,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 4b7b459bc..ffe29b970 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -234,7 +234,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Dodatna polja',
 // Translate the following.
@@ -421,6 +421,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 22780dc8a..1c3f5c541 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -231,7 +231,7 @@
 // TODO: translate the following.
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Egna fält',
 'label.monthly_quotas' => 'Månadskvoter',
@@ -420,6 +420,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 951de7b58..e2754a688 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -256,7 +256,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -453,6 +453,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parolanızı unuttunuz mu?',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4484df603..cb49aef3c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -242,7 +242,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -433,6 +433,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘记密码？',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 553c70fe4..f6249638d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -248,7 +248,7 @@
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
 // 'label.no' => 'no',
-// 'label.sort_by' => 'Sort by',
+// 'label.sort' => 'Sort',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 // TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
@@ -438,6 +438,8 @@
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
 // 'dropdown.not_paid' => 'not paid',
+// 'dropdown.ascending' => 'ascending',
+// 'dropdown.descending' => 'descending',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘記密碼？',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dbf728695..e04e0c242 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.19.7.5049 | 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.7.5050 | 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/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 5960790c1..2df35a8ce 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -2,6 +2,22 @@
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
+{if $show_sorting_options}
+  {$forms.invoicesForm.open}
+<div style="padding: 10 0 10 0;">
+  <table border="0" class="divider">
+    <tr>
+      <td>
+        <table cellspacing="1" cellpadding="3" border="0">
+          <tr><td>{$i18n.label.sort}:</td><td>{$forms.invoicesForm.sort_option_1.control}</td><td>{$forms.invoicesForm.sort_order_1.control}</td><td>{$forms.invoicesForm.sort_option_2.control}</td><td>{$forms.invoicesForm.sort_order_2.control}</td></tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+  {$forms.invoicesForm.close}
+{/if}
+
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
@@ -21,7 +37,7 @@
         {foreach $invoices as $invoice}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="invoice_view.php?id={$invoice.id}">{$invoice.name|escape}</a></td>
-          <td>{$invoice.client_name|escape}</td>
+          <td>{$invoice.client|escape}</td>
           <td>{$invoice.date}</td>
   {if $user->isPluginEnabled('ps')}
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
diff --git a/invoices.php b/invoices.php
index de51b5366..d07935b83 100644
--- a/invoices.php
+++ b/invoices.php
@@ -41,9 +41,75 @@
 }
 // End of access checks.
 
+if ($request->isPost()) {
+  $sort_option_1 = $request->getParameter('sort_option_1');
+  $sort_order_1 = $request->getParameter('sort_order_1');
+  $sort_option_2 = $request->getParameter('sort_option_2');
+  $sort_order_2 = $request->getParameter('sort_order_2');
+}
+
 $invoices = ttGroupHelper::getActiveInvoices();
 
+$form = new Form('invoicesForm');
+
+// Prepare an array of sort options.
+$sort_options['name'] = $i18n->get('label.thing_name');
+$sort_options['client'] = $i18n->get('label.client');
+$sort_options['date'] = $i18n->get('label.date');
+
+$form->addInput(array('type'=>'combobox',
+  'name'=>'sort_option_1',
+  'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
+  //'style'=>'width: 250px;',
+  'data'=>$sort_options,
+  'value'=>$sort_option_1));
+$form->addInput(array('type'=>'combobox',
+  'name'=>'sort_option_2',
+  'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
+  //'style'=>'width: 250px;',
+  'data'=>$sort_options,
+  'value'=>$sort_option_2,
+  'empty'=>array(''=>$i18n->get('dropdown.no'))));
+
+// Prepare an array of sort order.
+$sort_order['ascending'] = $i18n->get('dropdown.ascending');
+$sort_order['descending'] = $i18n->get('dropdown.descending');
+
+$form->addInput(array('type'=>'combobox',
+  'name'=>'sort_order_1',
+  'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
+  'data'=>$sort_order,
+  'value'=>$sort_order_1));
+$form->addInput(array('type'=>'combobox',
+  'name'=>'sort_order_2',
+  'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
+  'data'=>$sort_order,
+  'value'=>$sort_order_2));
+
+
+$form->addInput(array('type'=>'hidden','name'=>'sorting_changed'));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttInvoiceHelper::validSortOption($sort_option_1)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
+  if (!ttInvoiceHelper::validSortOption($sort_option_2, true)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
+  if (!ttInvoiceHelper::validSortOrder($sort_order_1)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
+  if (!ttInvoiceHelper::validSortOrder($sort_order_2)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
+  if ($sort_option_1 == $sort_option_2) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
+
+  if($request->getParameter('sorting_changed')) {
+    // User changed sorting. Get invoices sorted accordingly.
+    $sort_options = array('sort_option_1'=>$sort_option_1,
+      'sort_order_1'=>$sort_order_1,
+      'sort_option_2'=>$sort_option_2,
+      'sort_order_2'=>$sort_order_2);
+    $invoices = ttGroupHelper::getActiveInvoices($sort_options);
+  }
+}
+
 $smarty->assign('invoices', $invoices);
+$smarty->assign('show_sorting_options', count($invoices) > 1);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.invoices'));
 $smarty->assign('content_page_name', 'invoices.tpl');
 $smarty->display('index.tpl');

From a35264c37d5d5e8c34dbb360738643f7b1768e59 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Aug 2019 12:00:37 +0000
Subject: [PATCH 1010/1848] Increased chunk size for exports to speed things
 up.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 4 +---
 WEB-INF/lib/ttGroupHelper.class.php       | 2 +-
 WEB-INF/templates/footer.tpl              | 2 +-
 invoices.php                              | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 0bd55030e..79938f803 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -387,7 +387,7 @@ function writeData() {
     // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
     fwrite($this->file, $this->indentation."  <log>\n");
     $offset = 0;
-    $limit = 1000;
+    $limit = 5000;
     $key = 0;
     while ($records = $this->getRecordsChunkFromTable('tt_log', $limit, $offset)) {
       foreach ($records as $record) {
@@ -454,7 +454,6 @@ function writeData() {
     // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
     fwrite($this->file, $this->indentation."  <custom_field_log>\n");
     $offset = 0;
-    $limit = 1000;
     while ($custom_field_log = $this->getRecordsChunkFromTable('tt_custom_field_log', $limit, $offset)) {
       foreach ($custom_field_log as $entry) {
         $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
@@ -475,7 +474,6 @@ function writeData() {
     // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
     fwrite($this->file, $this->indentation."  <expense_items>\n");
     $offset = 0;
-    $limit = 1000;
     while ($expense_items = $this->getRecordsChunkFromTable('tt_expense_items', $limit, $offset)) {
       foreach ($expense_items as $expense_item) {
         $expense_item_part = $this->indentation.'    '."<expense_item date=\"".$expense_item['date']."\"";
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index c429f2bf3..182d2e1f5 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -428,7 +428,7 @@ static function getActiveInvoices($sort_options = false)
     // Prepare order by part.
     $order_by_part = 'order  by ';
     if (!$sort_options)
-      $order_by_part .= 'i.name';
+      $order_by_part .= 'name';
     else {
       $order_by_part .= $sort_options['sort_option_1'];
       if ($sort_options['sort_order_1'] == 'descending') $order_by_part .= ' desc';
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e04e0c242..80c5ea9e8 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.19.7.5050 | 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.7.5051 | 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/invoices.php b/invoices.php
index d07935b83..3b6fdc0da 100644
--- a/invoices.php
+++ b/invoices.php
@@ -53,7 +53,7 @@
 $form = new Form('invoicesForm');
 
 // Prepare an array of sort options.
-$sort_options['name'] = $i18n->get('label.thing_name');
+$sort_options['name'] = $i18n->get('label.invoice');
 $sort_options['client'] = $i18n->get('label.client');
 $sort_options['date'] = $i18n->get('label.date');
 

From 0f315cab20bbfc98923c0a50de8dfe28f6241562 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Sep 2019 23:12:36 +0000
Subject: [PATCH 1011/1848] Backticked rank in sql queries as it is now a
 reserved word in MySQL.

---
 WEB-INF/lib/ttOrgImportHelper.class.php |  4 +-
 WEB-INF/lib/ttRoleHelper.class.php      | 34 ++++++++--------
 WEB-INF/lib/ttTeamHelper.class.php      | 10 ++---
 WEB-INF/templates/footer.tpl            |  2 +-
 dbinstall.php                           | 54 ++++++++++++-------------
 mysql.sql                               |  4 +-
 6 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 20dd41764..8549b9022 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -928,7 +928,7 @@ private function insertRole($fields)
     $rights = $fields['rights'];
     $status = $fields['status'];
 
-    $sql = "insert into tt_roles (group_id, org_id, name, rank, description, rights, status)
+    $sql = "insert into tt_roles (group_id, org_id, name, `rank`, description, rights, status)
       values ($group_id, $org_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -1221,7 +1221,7 @@ private function insertCustomFieldLogEntry($fields) {
   private function getTopRole() {
     $mdb2 = getConnection();
 
-    $sql = "select id from tt_roles where group_id = 0 and rank = ".MAX_RANK." and status = 1";
+    $sql = "select id from tt_roles where group_id = 0 and `rank` = ".MAX_RANK." and status = 1";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 326d0faf5..7fa9f8fb2 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -36,7 +36,7 @@ static function get($id)
 
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights, status from tt_roles
+    $sql = "select id, name, description, `rank`, rights, status from tt_roles
       where id = $id and group_id = ".$user->getGroup()." and (status = 0 or status = 1)";
     $res = $mdb2->query($sql);
 
@@ -72,7 +72,7 @@ static function getRoleByName($role_name) {
   static function getTopManagerRoleID() {
     $mdb2 = getConnection();
 
-    $sql = "select id from tt_roles where group_id = 0 and rank = 512";
+    $sql = "select id from tt_roles where group_id = 0 and `rank` = 512";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -110,7 +110,7 @@ static function getRoleByRank($rank) {
     $org_id = $user->org_id;
     $rank = (int) $rank; // Cast to int just in case.
 
-    $sql = "select id from tt_roles where group_id = $group_id and org_id = $org_id and rank = $rank and (status = 1 or status = 0)";
+    $sql = "select id from tt_roles where group_id = $group_id and org_id = $org_id and `rank` = $rank and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -131,7 +131,7 @@ static function update($fields) {
 
     $id = (int)$fields['id'];
     if (isset($fields['name'])) $name_part = 'name = '.$mdb2->quote($fields['name']);
-    if (isset($fields['rank'])) $rank_part = ', rank = '.(int)$fields['rank'];
+    if (isset($fields['rank'])) $rank_part = ', `rank` = '.(int)$fields['rank'];
     if (isset($fields['description'])) $descr_part = ', description = '.$mdb2->quote($fields['description']);
     if (isset($fields['status'])) $status_part = ', status = '.(int)$fields['status'];
     if (isset($fields['rights'])) $rights_part = ', rights = '.$mdb2->quote($fields['rights']);
@@ -169,7 +169,7 @@ static function insert($fields)
     $rights = $fields['rights'];
     $status = $fields['status'];
 
-    $sql = "insert into tt_roles (group_id, org_id, name, rank, description, rights, status)
+    $sql = "insert into tt_roles (group_id, org_id, name, `rank`, description, rights, status)
       values ($group_id, $org_id, ".$mdb2->quote($name).", $rank, ".$mdb2->quote($description).", ".$mdb2->quote($rights).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -199,7 +199,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.user.label'));
     $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
-    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 4, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, `rank`, rights, status) values($group_id, $group_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -207,7 +207,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.client.label'));
     $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
-    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 16, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, `rank`, rights, status) values($group_id, $group_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -215,7 +215,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.comanager.label'));
     $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
-    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 68, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, `rank`, rights, status) values($group_id, $group_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -223,7 +223,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.manager.label'));
     $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
-    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 324, $rights, 1)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, `rank`, rights, status) values($group_id, $group_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -232,7 +232,7 @@ static function createPredefinedRoles($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.supervisor.label'));
     $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
-    $sql = "insert into tt_roles (group_id, org_id, name, description, rank, rights, status) values($group_id, $group_id, $name, $description, 12, $rights, 0)";
+    $sql = "insert into tt_roles (group_id, org_id, name, description, `rank`, rights, status) values($group_id, $group_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -260,7 +260,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.user.label'));
     $description = $mdb2->quote($i18n->get('role.user.description'));
     $rights = $mdb2->quote($rights_user);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 4, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, `rank`, rights, status) values($group_id, $name, $description, 4, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -268,7 +268,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.client.label'));
     $description = $mdb2->quote($i18n->get('role.client.description'));
     $rights = $mdb2->quote($rights_client);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 16, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, `rank`, rights, status) values($group_id, $name, $description, 16, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -276,7 +276,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.comanager.label'));
     $description = $mdb2->quote($i18n->get('role.comanager.description'));
     $rights = $mdb2->quote($rights_comanager);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 68, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, `rank`, rights, status) values($group_id, $name, $description, 68, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -284,7 +284,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.manager.label'));
     $description = $mdb2->quote($i18n->get('role.manager.description'));
     $rights = $mdb2->quote($rights_manager);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 324, $rights, 1)";
+    $sql = "insert into tt_roles (team_id, name, description, `rank`, rights, status) values($group_id, $name, $description, 324, $rights, 1)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -293,7 +293,7 @@ static function createPredefinedRoles_1_17_44($group_id, $lang)
     $name = $mdb2->quote($i18n->get('role.supervisor.label'));
     $description = $mdb2->quote($i18n->get('role.supervisor.description'));
     $rights = $mdb2->quote($rights_supervisor);
-    $sql = "insert into tt_roles (team_id, name, description, rank, rights, status) values($group_id, $name, $description, 12, $rights, 0)";
+    $sql = "insert into tt_roles (team_id, name, description, `rank`, rights, status) values($group_id, $name, $description, 12, $rights, 0)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -308,7 +308,7 @@ static function getRoleByRank_1_17_44($rank, $group_id) {
 
     $rank = (int) $rank; // Cast to int just in case for better security.
 
-    $sql = "select id from tt_roles where team_id = $group_id and rank = $rank and (status = 1 or status = 0)";
+    $sql = "select id from tt_roles where team_id = $group_id and `rank` = $rank and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -325,7 +325,7 @@ static function copyRolesToGroup($group_id) {
     $mdb2 = getConnection();
 
     $org_id = $user->org_id;
-    $columns = '(group_id, org_id, name, description, rank, rights, status)';
+    $columns = '(group_id, org_id, name, description, `rank`, rights, status)';
     $roles = ttGroupHelper::getRoles(); // Roles in current on behalf group.
 
     foreach ($roles as $role) {
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 651226e49..9bb538912 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -136,7 +136,7 @@ static function getActiveRolesForUser()
     // then rank restriction does not apply.
     $max_rank = $user->behalfGroup ? MAX_RANK : $user->rank;
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $max_rank and status = 1 order by rank";
+    $sql = "select id, name, description, `rank`, rights from tt_roles where group_id = $group_id and org_id = $org_id and `rank` < $max_rank and status = 1 order by `rank`";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -156,7 +156,7 @@ static function getActiveRoles($group_id)
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and status = 1 order by rank";
+    $sql = "select id, name, description, `rank`, rights from tt_roles where group_id = $group_id and status = 1 order by `rank`";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -174,8 +174,8 @@ static function getInactiveRoles($group_id)
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, rank, description from tt_roles
-      where group_id = $group_id and status = 0 order by rank";
+    $sql = "select id, name, `rank`, description from tt_roles
+      where group_id = $group_id and status = 0 order by `rank`";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -201,7 +201,7 @@ static function getInactiveRolesForUser()
     // then rank restriction does not apply.
     $max_rank = $user->behalfGroup ? MAX_RANK : $user->rank;
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $max_rank and status = 0 order by rank";
+    $sql = "select id, name, description, `rank`, rights from tt_roles where group_id = $group_id and org_id = $org_id and `rank` < $max_rank and status = 0 order by `rank`";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 80c5ea9e8..66edba20d 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.19.7.5051 | 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.8.5052 | 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/dbinstall.php b/dbinstall.php
index c2ce26180..28eb9646c 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -782,7 +782,7 @@ function ttGenerateKeys() {
     ttExecute("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     ttExecute("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     ttExecute("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
-    ttExecute("create unique index role_idx on tt_roles(team_id, rank, status)");
+    ttExecute("create unique index role_idx on tt_roles(team_id, `rank`, status)");
     ttExecute("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
     ttExecute("ALTER TABLE `tt_users` ADD `role_id` int(11) default NULL AFTER `role`");
     ttExecute("CREATE TABLE `tt_site_config` (`param_name` varchar(32) NOT NULL, `param_value` text default NULL, `created` datetime default NULL, `updated` datetime default NULL, PRIMARY KEY (`param_name`))");
@@ -790,11 +790,11 @@ function ttGenerateKeys() {
     ttExecute("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site')");
     ttExecute("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'data_entry,view_own_data,manage_own_settings,view_users,on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups')");
     ttExecute("UPDATE `tt_site_config` SET `param_value` = '1.17.35' where param_name = 'version_db'");
-    ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set role_id = (select id from tt_roles where rank = 1024) where role = 1024");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = 'data_entry,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,on_behalf_data_entry,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups' where team_id = 0 and rank = 512");
+    ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set role_id = (select id from tt_roles where `rank` = 1024) where role = 1024");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = 'data_entry,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,on_behalf_data_entry,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups' where team_id = 0 and `rank` = 512");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_data', 'view_own_reports,view_own_charts') where team_id > 0");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_data', 'view_reports,view_charts') where team_id > 0");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_charts,manage_own_settings', 'view_own_charts,view_own_invoices,manage_own_settings') where team_id > 0 and rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_charts,manage_own_settings', 'view_own_charts,view_own_invoices,manage_own_settings') where team_id > 0 and `rank` = 16");
     ttExecute("UPDATE `tt_site_config` SET `param_value` = '1.17.40' where param_name = 'version_db'");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'on_behalf_data_entry', 'track_time,track_expenses')");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'data_entry', 'track_own_time,track_own_expenses')");
@@ -846,7 +846,7 @@ function ttGenerateKeys() {
   if ($_POST["convert11744to11797"]) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
-    ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
+    ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and `rank` = 512) where role = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.49' where param_name = 'version_db' and param_value = '1.17.48'");
     ttExecute("ALTER TABLE `tt_users` drop role");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.50' where param_name = 'version_db' and param_value = '1.17.49'");
@@ -935,7 +935,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.86', modified = now() where param_name = 'version_db' and param_value = '1.17.85'");
     ttExecute("ALTER TABLE `tt_groups` ADD `password_complexity` varchar(64) default NULL AFTER `allow_ip`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where `rank` = 512");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'");
@@ -1089,33 +1089,33 @@ function ttGenerateKeys() {
     ttExecute("ALTER TABLE `tt_expense_items` ADD `timesheet_id` int(11) default NULL AFTER `project_id`");
     ttExecute("create index timesheet_idx on tt_expense_items(timesheet_id)");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.37', modified = now() where param_name = 'version_db' and param_value = '1.18.36'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group' where rank = 512");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_own_reports,view_own_charts', 'view_own_reports,view_own_timesheets,view_own_charts') where rank = 16");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_own_reports,view_own_charts', 'view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts') where rank = 4 or rank = 12 or rank = 68 or rank = 324");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_reports,view_charts', 'view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts') where rank = 12 or rank = 68 or rank = 324");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'swap_roles,approve_timesheets', 'swap_roles') where rank = 12 or rank = 68 or rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,manage_subgroups,delete_group' where `rank` = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_own_reports,view_own_charts', 'view_own_reports,view_own_timesheets,view_own_charts') where `rank` = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_own_reports,view_own_charts', 'view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts') where `rank` = 4 or `rank` = 12 or `rank` = 68 or `rank` = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'view_reports,view_charts', 'view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts') where `rank` = 12 or `rank` = 68 or `rank` = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.37') set rights = replace(rights, 'swap_roles,approve_timesheets', 'swap_roles') where `rank` = 12 or `rank` = 68 or `rank` = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.38', modified = now() where param_name = 'version_db' and param_value = '1.18.37'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group' where rank = 512");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'view_all_reports', 'view_all_reports,view_all_timesheets,manage_all_timesheets') where rank = 68 or rank = 324");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'export_data,manage_subgroups', 'export_data,approve_all_timesheets,manage_subgroups') where rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_invoices,view_own_projects,view_own_tasks,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group' where `rank` = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'view_all_reports', 'view_all_reports,view_all_timesheets,manage_all_timesheets') where `rank` = 68 or `rank` = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.38') set rights = replace(rights, 'export_data,manage_subgroups', 'export_data,approve_all_timesheets,manage_subgroups') where `rank` = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.39', modified = now() where param_name = 'version_db' and param_value = '1.18.38'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group' where rank = 512");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_reports', 'view_client_reports') where rank = 16");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_charts,', '') where rank = 16");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_timesheets', 'view_client_timesheets') where rank = 16");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_invoices', 'view_client_invoices') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_timesheets,manage_subgroups,delete_group' where `rank` = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_reports', 'view_client_reports') where `rank` = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_charts,', '') where `rank` = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_timesheets', 'view_client_timesheets') where `rank` = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.39') set rights = replace(rights, 'view_own_invoices', 'view_client_invoices') where `rank` = 16");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.40', modified = now() where param_name = 'version_db' and param_value = '1.18.39'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.40') set rights = replace(rights, 'view_client_timesheets,view_client_invoices', 'view_client_timesheets,view_client_unapproved,view_client_invoices') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.40') set rights = replace(rights, 'view_client_timesheets,view_client_invoices', 'view_client_timesheets,view_client_unapproved,view_client_invoices') where `rank` = 16");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.41', modified = now() where param_name = 'version_db' and param_value = '1.18.40'");
     ttExecute("ALTER TABLE `tt_log` ADD `approved` tinyint(4) default 0 AFTER `billable`");
     ttExecute("ALTER TABLE `tt_expense_items` ADD `approved` tinyint(4) default 0 AFTER `invoice_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.42', modified = now() where param_name = 'version_db' and param_value = '1.18.41'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,delete_group' where rank = 512");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'view_reports,view_timesheets', 'view_reports,approve_reports,view_timesheets') where rank = 12 or rank = 68 or rank = 324");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'export_data,approve_all_timesheets', 'export_data,approve_all_reports,approve_all_timesheets') where rank = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_unapproved,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,delete_group' where `rank` = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'view_reports,view_timesheets', 'view_reports,approve_reports,view_timesheets') where `rank` = 12 or `rank` = 68 or `rank` = 324");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.42') set rights = replace(rights, 'export_data,approve_all_timesheets', 'export_data,approve_all_reports,approve_all_timesheets') where `rank` = 324");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.43', modified = now() where param_name = 'version_db' and param_value = '1.18.42'");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group' where rank = 512");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = replace(rights, 'view_client_timesheets,view_client_unapproved,view_client_invoices', 'view_client_timesheets,view_client_invoices') where rank = 16");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_timesheets,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group' where `rank` = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.43') set rights = replace(rights, 'view_client_timesheets,view_client_unapproved,view_client_invoices', 'view_client_timesheets,view_client_invoices') where `rank` = 16");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.44', modified = now() where param_name = 'version_db' and param_value = '1.18.43'");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `approved` tinyint(4) default NULL AFTER `billable`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `timesheet` tinyint(4) default NULL AFTER `invoice`");
@@ -1156,8 +1156,8 @@ function ttGenerateKeys() {
     ttExecute("ALTER TABLE `tt_groups` ADD `group_key` varchar(32) AFTER `org_id`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.61', modified = now() where param_name = 'version_db' and param_value = '1.18.60'");
     ttGenerateKeys();
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'swap_roles', 'swap_roles,update_work') where rank >= 12");
-    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'view_all_reports', 'view_all_reports,manage_work,bid_on_work') where rank >= 68");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'swap_roles', 'swap_roles,update_work') where `rank` >= 12");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'view_all_reports', 'view_all_reports,manage_work,bid_on_work') where `rank` >= 68");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
diff --git a/mysql.sql b/mysql.sql
index b8d7e134c..ec9c207df 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -73,7 +73,7 @@ CREATE TABLE `tt_roles` (
 );
 
 # Create an index that guarantees unique active and inactive role ranks in each group.
-create unique index role_idx on tt_roles(group_id, rank, status);
+create unique index role_idx on tt_roles(group_id, `rank`, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
@@ -112,7 +112,7 @@ create unique index login_idx on tt_users(login, status);
 
 # Create admin account with password 'secret'. Admin is a superuser who can create groups.
 DELETE from `tt_users` WHERE login = 'admin';
-INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024));
+INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where `rank` = 1024));
 
 
 #

From 5a9b4121b878f297f359c65f4b7d0cf77bf9c0e0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 4 Sep 2019 15:39:35 +0000
Subject: [PATCH 1012/1848] Fixed filling dropdowns on reports.php page load.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/reports.tpl | 9 +++++++++
 reports.php                   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 66edba20d..3d91e6db0 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.19.8.5052 | 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.8.5053 | 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/reports.tpl b/WEB-INF/templates/reports.tpl
index f21150949..41c625602 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -163,6 +163,15 @@ function fillTaskDropdown(project_id) {
   }
 }
 
+// The fillDropdowns function populates the "project" and "task" dropdown controls
+// with relevant values.
+function fillDropdowns() {
+  if(document.body.contains(document.reportForm.client))
+    fillProjectDropdown(document.reportForm.client.value);
+
+  fillTaskDropdown(document.reportForm.project.value);
+}
+
 // Build JavaScript array for assigned projects out of passed in PHP array.
 var assigned_projects = new Array();
 {if $assigned_projects}
diff --git a/reports.php b/reports.php
index 66a6608b4..84d8bde08 100644
--- a/reports.php
+++ b/reports.php
@@ -526,7 +526,7 @@
 $smarty->assign('task_list', $task_list);
 $smarty->assign('assigned_projects', $assigned_projects);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="handleCheckboxes()"');
+$smarty->assign('onload', 'onLoad="handleCheckboxes();fillDropdowns()"');
 $smarty->assign('title', $i18n->get('title.reports'));
 $smarty->assign('content_page_name', 'reports.tpl');
 $smarty->display('index.tpl');

From 286dfd36e9bbd98488c45a74ad811157eb7a0335 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Sep 2019 17:40:32 +0000
Subject: [PATCH 1013/1848] Added d-m-Y date format as an option.

---
 WEB-INF/config.php.dist      | 14 --------------
 WEB-INF/templates/footer.tpl |  2 +-
 group_edit.php               |  1 +
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 1785336fe..473840e08 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -114,20 +114,6 @@ define('DEFAULT_CSS', 'default.css');
 define('RTL_CSS', 'rtl.css'); // For right to left languages.
 
 
-// Default date format. Behaviour with not included formats is undefined. Possible values:
-// '%Y-%m-%d'
-// '%m/%d/%Y'
-// '%d.%m.%Y'
-// '%d.%m.%Y %a'
-define('DATE_FORMAT_DEFAULT', '%Y-%m-%d');
-
-
-// Default time format. Behaviour with not included formats is undefined. Possible values:
-// '%H:%M'
-// '%I:%M %p'
-define('TIME_FORMAT_DEFAULT', '%H:%M');
-
-
 // Default week start day.
 // Possible values: 0 - 6. 0 means Sunday.
 //
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3d91e6db0..769a9f1fe 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.19.8.5053 | 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.9.5054 | 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/group_edit.php b/group_edit.php
index 1df99a1c5..c4fdc2174 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -151,6 +151,7 @@
 $DATE_FORMAT_OPTIONS = array(
   array('id'=>'%Y-%m-%d','name'=>'Y-m-d'),
   array('id'=>'%m/%d/%Y','name'=>'m/d/Y'),
+  array('id'=>'%d-%m-%Y','name'=>'d-m-Y'),
   array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
   array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
 $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,

From 3da25fb7bb9906ed193896f6521cf161dbc983a9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Sep 2019 17:53:41 +0000
Subject: [PATCH 1014/1848] Removed no longer used WEEK_START_DEFAULT from
 config.php.dist.

---
 WEB-INF/config.php.dist      | 6 ------
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 473840e08..87cd5bf11 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -114,12 +114,6 @@ define('DEFAULT_CSS', 'default.css');
 define('RTL_CSS', 'rtl.css'); // For right to left languages.
 
 
-// Default week start day.
-// Possible values: 0 - 6. 0 means Sunday.
-//
-define('WEEK_START_DEFAULT', 0);
-
-
 // Default language of the application.
 // Possible values: en, fr, nl, etc. Empty string means the language is defined by user browser.
 // 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 769a9f1fe..545081133 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.19.9.5054 | 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.9.5055 | 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>

From 758c2c62c05e87b60d4197b6c2c48e714f9927f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Sep 2019 22:25:05 +0000
Subject: [PATCH 1015/1848] Resuming work on remote work plugin.

---
 WEB-INF/lib/ttFileHelper.class.php  |   4 +-
 WEB-INF/lib/ttOfferHelper.class.php | 536 ++++++++++++++++++++++++++++
 WEB-INF/resources/ca.lang.php       |   1 +
 WEB-INF/resources/cs.lang.php       |   1 +
 WEB-INF/resources/da.lang.php       |   1 +
 WEB-INF/resources/de.lang.php       |   1 +
 WEB-INF/resources/en.lang.php       |   1 +
 WEB-INF/resources/es.lang.php       |   1 +
 WEB-INF/resources/et.lang.php       |   1 +
 WEB-INF/resources/fa.lang.php       |   1 +
 WEB-INF/resources/fi.lang.php       |   1 +
 WEB-INF/resources/fr.lang.php       |   1 +
 WEB-INF/resources/gr.lang.php       |   1 +
 WEB-INF/resources/he.lang.php       |   1 +
 WEB-INF/resources/hu.lang.php       |   1 +
 WEB-INF/resources/it.lang.php       |   1 +
 WEB-INF/resources/ja.lang.php       |   1 +
 WEB-INF/resources/ko.lang.php       |   1 +
 WEB-INF/resources/nl.lang.php       |   2 +
 WEB-INF/resources/no.lang.php       |   1 +
 WEB-INF/resources/pl.lang.php       |   1 +
 WEB-INF/resources/pt-br.lang.php    |   1 +
 WEB-INF/resources/pt.lang.php       |   1 +
 WEB-INF/resources/ro.lang.php       |   1 +
 WEB-INF/resources/ru.lang.php       |   1 +
 WEB-INF/resources/sk.lang.php       |   1 +
 WEB-INF/resources/sl.lang.php       |   1 +
 WEB-INF/resources/sr.lang.php       |   1 +
 WEB-INF/resources/sv.lang.php       |   1 +
 WEB-INF/resources/tr.lang.php       |   1 +
 WEB-INF/resources/zh-cn.lang.php    |   1 +
 WEB-INF/resources/zh-tw.lang.php    |   1 +
 WEB-INF/templates/footer.tpl        |   2 +-
 33 files changed, 570 insertions(+), 3 deletions(-)
 create mode 100644 WEB-INF/lib/ttOfferHelper.class.php

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 61dd60285..07d0ad085 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -279,7 +279,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
 
     if (!$this->entityHasFiles($entity_id, $entity_type))
       return true; // No files to delete.
-    
+
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -415,7 +415,7 @@ static function getEntityFiles($id, $type) {
     return $result;
   }
 
-  // get - obtains file details from local database. 
+  // get - obtains file details from local database.
   static function get($id) {
     global $user;
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttOfferHelper.class.php b/WEB-INF/lib/ttOfferHelper.class.php
new file mode 100644
index 000000000..c2ceefa32
--- /dev/null
+++ b/WEB-INF/lib/ttOfferHelper.class.php
@@ -0,0 +1,536 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// ttOfferHelper class is used for handling offers for the Remote work plugin.
+// An offer is a proposal to do something for compensation in selected currency
+// within a specified timeframe.
+class ttOfferHelper {
+  var $errors = null;            // Errors go here. Set in constructor by reference.
+  var $remote_work_uri = null;   // Location of remote work server.
+  var $register_uri = null;      // URI to register with remote work server.
+  var $create_offer_uri = null;  // URI to publish offer.
+  var $get_offer_uri = null;     // URI to get offer details.
+  var $get_offers_uri = null;    // URI to get a list of offers.
+  var $delete_offer_uri = null;  // URI to delete offer.
+  var $delete_offers_uri = null; // URI to delete multiple offers.
+  var $update_offer_uri = null;  // URI to update offer.
+  var $site_id = null;           // Site id for remote work server.
+  var $site_key = null;          // Site key for remote work server.
+
+  // Constructor.
+  function __construct(&$errors) {
+    $this->errors = &$errors;
+
+    if (defined('REMOTE_WORK_URI')) {
+      $this->remote_work_uri = REMOTE_WORK_URI;
+      $this->register_uri = $this->remote_work_uri.'register';
+      $this->create_offer_uri = $this->remote_work_uri.'createoffer';
+      $this->get_offer_uri = $this->remote_work_uri.'getoffer';
+      $this->get_offers_uri = $this->remote_work_uri.'getoffers';
+      $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
+      $this->delete_offers_uri = $this->remote_work_uri.'deleteoffers';
+      $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
+      $this->checkSiteRegistration();
+    }
+  }
+
+  // checkSiteRegistration - obtains site id and key from local database.
+  // If not found, it tries to register with remote work server.
+  function checkSiteRegistration() {
+
+    global $i18n;
+    $mdb2 = getConnection();
+
+    // Obtain site id.
+    $sql = "select param_value as id from tt_site_config where param_name = 'worksite_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if (!$val) {
+      // No site id found, need to register.
+      $fields = array('name' => urlencode('time tracker'),
+        'origin' => urlencode('time tracker source'));
+
+      // Urlify the data for the POST.
+      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+      $fields_string = rtrim($fields_string, '&');
+
+      // Open connection.
+      $ch = curl_init();
+
+      // Set the url, number of POST vars, POST data.
+      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
+      curl_setopt($ch, CURLOPT_POST, true);
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+      // Execute a post request.
+      $result = curl_exec($ch);
+
+      // Close connection.
+      curl_close($ch);
+
+      $result_array = json_decode($result, true);
+      if (!$result_array) {
+        $this->errors->add($i18n->get('error.remote_work'));
+      }
+      else if ($result_array['error']) {
+        // Add an error from remote work server if we have it.
+        $this->errors->add($result_array['error']);
+      }
+      else if ($result_array['id'] && $result_array['key']) {
+        $this->site_id = $result_array['id'];
+        $this->site_key = $result_array['key'];
+
+        // Registration successful. Store id and key locally for future use.
+        $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
+        $mdb2->exec($sql);
+        $sql = "insert into tt_site_config values('worksite_key', ".$mdb2->quote($this->site_key).", now(), null)";
+        $mdb2->exec($sql);
+      } else {
+        $this->errors->add($i18n->get('error.remote_work'));
+      }
+    } else {
+      // Site id found.
+      $this->site_id = $val['id'];
+
+      // Obtain site key.
+      $sql = "select param_value as site_key from tt_site_config where param_name = 'worksite_key'";
+      $res = $mdb2->query($sql);
+      $val = $res->fetchRow();
+      $this->site_key = $val['site_key'];
+    }
+  }
+
+
+
+  // The following code is originally from ttFileHelper an needs to be redone.
+
+  // putFile - puts uploaded file in remote storage.
+  function putFile($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'entity_type' => urlencode($fields['entity_type']),
+      'entity_id' => urlencode($fields['entity_id']),
+      'file_name' => urlencode($fields['file_name']),
+      'description' => urlencode($fields['description']),
+      'content' => urlencode(base64_encode(file_get_contents($_FILES['newfile']['tmp_name'])))
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    // Delete uploaded file.
+    unlink($_FILES['newfile']['tmp_name']);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $file_id = (int) $result_array['file_id'];
+    $file_key = $result_array['file_key'];
+    $error = $result_array['error'];
+
+    if ($error || !$file_id || !$file_key) {
+      if ($error) {
+        // Add an error from file storage facility if we have it.
+        $this->errors->add($error);
+      }
+      return false;
+    }
+
+    // File put was successful. Store file attributes locally.
+    $file_key = $mdb2->quote($file_key);
+    $entity_type = $mdb2->quote($fields['entity_type']);
+    $entity_id = (int) $fields['entity_id'];
+    $file_name = $mdb2->quote($fields['file_name']);
+    $description = $mdb2->quote($fields['description']);
+    $created = 'now()';
+    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $created_by = $user->id;
+
+    $columns = '(group_id, org_id, remote_id, file_key, entity_type, entity_id, file_name, description, created, created_ip, created_by)';
+    $values = "values($group_id, $org_id, $file_id, $file_key, $entity_type, $entity_id, $file_name, $description, $created, $created_ip, $created_by)";
+    $sql = "insert into tt_files $columns $values";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
+  // deleteFile - deletes a file from remote storage and its details from local database.
+  function deleteFile($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'entity_type' => urlencode($fields['entity_type']),
+      'entity_id' => urlencode($fields['entity_id']),
+      'file_id' => urlencode($fields['remote_id']),
+      'file_key' => urlencode($fields['file_key']),
+      'file_name' => urlencode($fields['file_name']));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->deletefile_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.file_storage'));
+    }
+
+    // Delete file reference from database even when remote file storage call fails.
+    // This is by design to keep things simple.
+    $file_id = (int) $fields['id'];
+    $entity_id = (int) $fields['entity_id'];
+    $sql = "delete from tt_files".
+      " where id = $file_id and org_id = $org_id and group_id = $group_id and entity_id = $entity_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->errors->add($i18n->get('error.db'));
+      return false;
+    }
+
+    // File successfully deleted from both file storage and database.
+    return true;
+  }
+
+  // deleteEntityFiles - deletes all files associated with an entity.
+  function deleteEntityFiles($entity_id, $entity_type) {
+
+    if (!$this->entityHasFiles($entity_id, $entity_type))
+      return true; // No files to delete.
+
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'entity_type' => urlencode($entity_type),
+      'entity_id' => urlencode($entity_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->deletefiles_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.file_storage'));
+    }
+
+    // Many things can go wrong with a remote call to file storage facility.
+    // By design, we ignore such errors, and proceed with removal of entity
+    // records from the database.
+
+    // Delete all entity records from the database.
+    $file_id = $fields['id'];
+    $sql = "delete from tt_files".
+      " where entity_id = $entity_id".
+      " and entity_type = ".$mdb2->quote($entity_type).
+      " and org_id = $org_id and group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) {
+      $this->errors->add($i18n->get('error.db'));
+      return false;
+    }
+
+    return true;
+  }
+
+  // entityHasFiles determines if an entity has any files referenced in database.
+  private function entityHasFiles($entity_id, $entity_type) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_files where org_id = $org_id and group_id = $group_id".
+      " and entity_type = ".$mdb2->quote($entity_type)." and entity_id = $entity_id limit 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['id'] > 0;
+  }
+
+  // getOrgKey obtains organization key from the database.
+  private function getOrgKey() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $org_id = $user->org_id;
+    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['group_key'];
+  }
+
+  // getGrtoupKey obtains group key from the database.
+  private function getGroupKey() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select group_key from tt_groups where id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['group_key'];
+  }
+
+  // getEntityFiles obtains a list of files for an entity.
+  static function getEntityFiles($id, $type) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $result = array();
+    $entity_type = $mdb2->quote($type);
+    $sql = "select id, remote_id, file_key, file_name as name, description from tt_files".
+      " where entity_type = $entity_type and entity_id = $id".
+      " and group_id = $group_id and org_id = $org_id and status = 1 order by id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // get - obtains file details from local database.
+  static function get($id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, remote_id, file_key, entity_type, entity_id, file_name, description, status from tt_files".
+      " where id = $id and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      if ($val && $val['id'])
+        return $val;
+    }
+    return false;
+  }
+
+  // update - updates file details in local database.
+  static function update($fields) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $file_id = (int) $fields['id'];
+    $description = $mdb2->quote($fields['description']);
+
+    $sql = "update tt_files set description = $description where id = $file_id".
+      " and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
+    $affected = $mdb2->exec($sql);
+    return !is_a($affected, 'PEAR_Error');
+  }
+
+
+  // getFile - downloads file from remote storage to memory.
+  function getFile($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'entity_type' => urlencode($fields['entity_type']),
+      'entity_id' => urlencode($fields['entity_id']),
+      'file_id' => urlencode($fields['remote_id']),
+      'file_key' => urlencode($fields['file_key']),
+      'file_name' => urlencode($fields['file_name']));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->getfile_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    $error = curl_error();
+    $result_array2 = json_decode($result, true);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+      return false;
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $this->file_data = $result_array['content'];
+    return true;
+  }
+
+
+  // getFileData - returns file data from memory.
+  function getFileData() {
+    return base64_decode($this->file_data);
+  }
+}
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2a31abea6..93f7b66b7 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -120,6 +120,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1f10377c5..9ca5f2153 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -122,6 +122,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index ce0eea403..b4f29f19b 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -117,6 +117,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 1ca50d172..14f2c5097 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -112,6 +112,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index af621e467..45e8b8b12 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -105,6 +105,7 @@
 'error.user_count' => 'Limit on user count.',
 'error.expired' => 'Expiration date reached.',
 'error.file_storage' => 'File storage error.',
+'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3c10065e2..ce4d0693f 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -118,6 +118,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 2ac7b9d56..7121ee449 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -129,6 +129,7 @@
 'error.expired' => 'Kehtivusaeg on lõppenud.',
 // TODO: translate the following.
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 'warn.sure' => 'Oled kindel?',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 37a9907d0..404eb6463 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -125,6 +125,7 @@
 // 'error.expired' => 'Expiration date reached.',
 // TODO: translate the following.
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 94b76fcee..592dfab2c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -119,6 +119,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3f562efed..a5974fafc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -117,6 +117,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d44acd4ac..a362fc7d8 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -113,6 +113,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6086b6611..e18d474b2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -133,6 +133,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d02e27084..4bd340fff 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -122,6 +122,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index f9ad30966..91177ed08 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -117,6 +117,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c0c50c39a..a627219ff 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -124,6 +124,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c98462c73..c8656b94d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -123,6 +123,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b71883ca7..0726b427d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -105,6 +105,8 @@
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
 'error.file_storage' => 'Fout bij het opslaan van het bestand.',
+// TODO: translate the following.
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b15650585..78f7d0583 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -124,6 +124,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c6795211f..e2a807246 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -121,6 +121,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // 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 6ab30f3a1..7bff5c1ff 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -118,6 +118,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 96996831e..9dd84ea19 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -117,6 +117,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c61cef471..537b64885 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -124,6 +124,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 44a829745..6e9aef1b4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -104,6 +104,7 @@
 'error.user_count' => 'Ограничение на количество пользователей.',
 'error.expired' => 'Достигнута дата экспирации.',
 'error.file_storage' => 'Ошибка файлохранилища.',
+'error.remote_work' => 'Ошибка сервера удаленной работы.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e6c2562c5..6a54b2649 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -122,6 +122,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c9e4a1e2a..579646eb0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -114,6 +114,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ffe29b970..8591a93cf 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -118,6 +118,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1c3f5c541..d43ebc7f0 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -117,6 +117,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e2754a688..d37fde559 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -127,6 +127,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // 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 cb49aef3c..64724ed31 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -117,6 +117,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // 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 f6249638d..cfde64db6 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -121,6 +121,7 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage error.',
+// 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 545081133..02eadcc7b 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.19.9.5055 | 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.9.5056 | 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>

From de56f6aea96471f0beaa29ccc1a2fc277288cce3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Sep 2019 23:01:38 +0000
Subject: [PATCH 1016/1848] Ongoing coding of remote work plugin.

---
 WEB-INF/lib/ttOfferHelper.class.php | 231 +++++++++++-----------------
 WEB-INF/templates/footer.tpl        |   2 +-
 2 files changed, 93 insertions(+), 140 deletions(-)

diff --git a/WEB-INF/lib/ttOfferHelper.class.php b/WEB-INF/lib/ttOfferHelper.class.php
index c2ceefa32..f6f9cf5aa 100644
--- a/WEB-INF/lib/ttOfferHelper.class.php
+++ b/WEB-INF/lib/ttOfferHelper.class.php
@@ -126,12 +126,8 @@ function checkSiteRegistration() {
     }
   }
 
-
-
-  // The following code is originally from ttFileHelper an needs to be redone.
-
-  // putFile - puts uploaded file in remote storage.
-  function putFile($fields) {
+  // createOffer - publishes an offer in remote work server.
+  function createOffer($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -145,11 +141,12 @@ function putFile($fields) {
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($this->getGroupKey()),
-      'entity_type' => urlencode($fields['entity_type']),
-      'entity_id' => urlencode($fields['entity_id']),
-      'file_name' => urlencode($fields['file_name']),
-      'description' => urlencode($fields['description']),
-      'content' => urlencode(base64_encode(file_get_contents($_FILES['newfile']['tmp_name'])))
+      'offer_lang' => urlencode($fields['offer_lang']),
+      'offer_subject' => urlencode($fields['offer_subject']),
+      'offer_descr_short' => urlencode($fields['offer_descr_short']),
+      'offer_descr_long' => urlencode($fields['offer_descr_long']),
+      'offer_currency' => urlencode($fields['offer_currency']),
+      'offer_amount' => urlencode($fields['offer_amount'])
     );
 
     // url-ify the data for the POST.
@@ -160,7 +157,7 @@ function putFile($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->create_offer_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -171,44 +168,104 @@ function putFile($fields) {
     // Close connection.
     curl_close($ch);
 
-    // Delete uploaded file.
-    unlink($_FILES['newfile']['tmp_name']);
-
     if (!$result) {
-      $this->errors->add($i18n->get('error.file_storage'));
+      $this->errors->add($i18n->get('error.remote_work'));
       return false;
     }
 
     $result_array = json_decode($result, true);
-    $file_id = (int) $result_array['file_id'];
-    $file_key = $result_array['file_key'];
+    $offer_id = (int) $result_array['offer_id'];
+    $offer_key = $result_array['offer_key'];
     $error = $result_array['error'];
 
-    if ($error || !$file_id || !$file_key) {
+    if ($error || !$offer_id || !$offer_key) {
       if ($error) {
-        // Add an error from file storage facility if we have it.
+        // Add an error from remote work server if we have it.
         $this->errors->add($error);
       }
       return false;
     }
 
-    // File put was successful. Store file attributes locally.
-    $file_key = $mdb2->quote($file_key);
-    $entity_type = $mdb2->quote($fields['entity_type']);
-    $entity_id = (int) $fields['entity_id'];
-    $file_name = $mdb2->quote($fields['file_name']);
-    $description = $mdb2->quote($fields['description']);
-    $created = 'now()';
-    $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $created_by = $user->id;
-
-    $columns = '(group_id, org_id, remote_id, file_key, entity_type, entity_id, file_name, description, created, created_ip, created_by)';
-    $values = "values($group_id, $org_id, $file_id, $file_key, $entity_type, $entity_id, $file_name, $description, $created, $created_ip, $created_by)";
-    $sql = "insert into tt_files $columns $values";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    return true;
   }
 
+
+  // getOffer - gets offer details from remote work server.
+  function getOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+// Do we need these here?
+//      'org_id' => urlencode($org_id),
+//      'org_key' => urlencode($this->getOrgKey()),
+//      'group_id' => urlencode($group_id),
+//      'group_key' => urlencode($this->getGroupKey()),
+      'offer_id' => urlencode($fields['remote_id']));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    $error = curl_error();
+    $result_array2 = json_decode($result, true);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from remote work server if we have it.
+      $this->errors->add($error);
+      return false;
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    // TODO: construct and return an array of fields here...
+    return true;
+  }
+
+  // TODO: redo the function above.
+  // Concerns: 1) why $result_array2
+  // 2) We need to return an array of fields.
+
+  
+  
+  
+  
+  
+  
+    // The following code is originally from ttFileHelper an needs to be redone.
+    // 
   // deleteFile - deletes a file from remote storage and its details from local database.
   function deleteFile($fields) {
     global $i18n;
@@ -424,110 +481,6 @@ static function getEntityFiles($id, $type) {
     return $result;
   }
 
-  // get - obtains file details from local database.
-  static function get($id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select id, remote_id, file_key, entity_type, entity_id, file_name, description, status from tt_files".
-      " where id = $id and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      if ($val && $val['id'])
-        return $val;
-    }
-    return false;
-  }
-
-  // update - updates file details in local database.
-  static function update($fields) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $file_id = (int) $fields['id'];
-    $description = $mdb2->quote($fields['description']);
-
-    $sql = "update tt_files set description = $description where id = $file_id".
-      " and group_id = $group_id and org_id = $org_id and (status = 0 or status = 1)";
-    $affected = $mdb2->exec($sql);
-    return !is_a($affected, 'PEAR_Error');
-  }
-
-
-  // getFile - downloads file from remote storage to memory.
-  function getFile($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
-      'entity_type' => urlencode($fields['entity_type']),
-      'entity_id' => urlencode($fields['entity_id']),
-      'file_id' => urlencode($fields['remote_id']),
-      'file_key' => urlencode($fields['file_key']),
-      'file_name' => urlencode($fields['file_name']));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->getfile_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    $error = curl_error();
-    $result_array2 = json_decode($result, true);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.file_storage'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-    $status = (int) $result_array['status'];
-    $error = $result_array['error'];
-
-    if ($error) {
-      // Add an error from file storage facility if we have it.
-      $this->errors->add($error);
-      return false;
-    }
-    if ($status != 1) {
-      // There is no explicit error message, but still something not right.
-      $this->errors->add($i18n->get('error.file_storage'));
-      return false;
-    }
-
-    $this->file_data = $result_array['content'];
-    return true;
-  }
-
 
   // getFileData - returns file data from memory.
   function getFileData() {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 02eadcc7b..07c502626 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.19.9.5056 | 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.9.5057 | 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>

From 1817dfb91ad4aed4ae1b54763df91045549d08be Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 10 Sep 2019 12:42:55 +0000
Subject: [PATCH 1017/1848] Added localization strings for remote work plugin.

---
 WEB-INF/resources/ca.lang.php    | 5 +++++
 WEB-INF/resources/cs.lang.php    | 5 +++++
 WEB-INF/resources/da.lang.php    | 6 +++++-
 WEB-INF/resources/en.lang.php    | 4 ++++
 WEB-INF/resources/es.lang.php    | 5 +++++
 WEB-INF/resources/et.lang.php    | 5 +++++
 WEB-INF/resources/fa.lang.php    | 5 +++++
 WEB-INF/resources/fi.lang.php    | 5 +++++
 WEB-INF/resources/fr.lang.php    | 5 +++++
 WEB-INF/resources/gr.lang.php    | 5 +++++
 WEB-INF/resources/he.lang.php    | 5 +++++
 WEB-INF/resources/hu.lang.php    | 5 +++++
 WEB-INF/resources/it.lang.php    | 5 +++++
 WEB-INF/resources/ja.lang.php    | 5 +++++
 WEB-INF/resources/ko.lang.php    | 5 +++++
 WEB-INF/resources/nl.lang.php    | 5 +++++
 WEB-INF/resources/no.lang.php    | 5 +++++
 WEB-INF/resources/pl.lang.php    | 5 +++++
 WEB-INF/resources/pt-br.lang.php | 5 +++++
 WEB-INF/resources/pt.lang.php    | 5 +++++
 WEB-INF/resources/ro.lang.php    | 5 +++++
 WEB-INF/resources/ru.lang.php    | 4 ++++
 WEB-INF/resources/sk.lang.php    | 5 +++++
 WEB-INF/resources/sl.lang.php    | 5 +++++
 WEB-INF/resources/sr.lang.php    | 5 +++++
 WEB-INF/resources/sv.lang.php    | 5 +++++
 WEB-INF/resources/tr.lang.php    | 5 +++++
 WEB-INF/resources/zh-cn.lang.php | 5 +++++
 WEB-INF/resources/zh-tw.lang.php | 5 +++++
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 144 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 93f7b66b7..066274cd0 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -682,4 +682,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9ca5f2153..a948e11d6 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -695,4 +695,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index b4f29f19b..cd52e5a0f 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -655,5 +655,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
-);
 
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
+);
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 45e8b8b12..545a48bf1 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -605,4 +605,8 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+'form.work.work_items' => 'Work Items',
+'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index ce4d0693f..7162c6602 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -697,4 +697,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7121ee449..2167bd313 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -662,4 +662,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 404eb6463..4fc605a31 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -679,4 +679,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 592dfab2c..4621b9fa0 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -661,4 +661,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a5974fafc..e2a9489e8 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -651,4 +651,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a362fc7d8..cc10a876d 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -644,4 +644,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e18d474b2..a9ab58f8d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -681,4 +681,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 4bd340fff..b76ce4096 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -687,4 +687,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 91177ed08..fab45d0fd 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -658,4 +658,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a627219ff..be759566c 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -690,4 +690,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c8656b94d..569aac303 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -688,4 +688,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0726b427d..5819c5d43 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -606,4 +606,9 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 78f7d0583..d87c68fd9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -687,4 +687,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e2a807246..f26b35875 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -664,4 +664,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7bff5c1ff..bd6c6b9f0 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -659,4 +659,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9dd84ea19..43f0e5feb 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -669,4 +669,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 537b64885..3162a7e12 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -690,4 +690,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 6e9aef1b4..65aa01b70 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -597,4 +597,8 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.menu' => 'Меню',
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+'form.work.work_items' => 'Единицы работы',
+'form.work.offers' => 'Предложения',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 6a54b2649..b3d1adb04 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -670,4 +670,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 579646eb0..9dd668d49 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -663,4 +663,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8591a93cf..c0936c1a5 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -662,4 +662,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d43ebc7f0..ade86f7d4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -660,4 +660,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d37fde559..2935878fe 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -703,4 +703,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 64724ed31..5d87497ce 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -674,4 +674,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index cfde64db6..aabfbc9dc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -680,4 +680,9 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+
+// Work form. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'form.work.work_items' => 'Work Items',
+// 'form.work.offers' => 'Offers',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 07c502626..2fcd9677a 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.19.9.5057 | 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.9.5058 | 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>

From a9abc90ac8ee59759088cf554e23f8443eb0f804 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Sep 2019 17:34:42 +0000
Subject: [PATCH 1018/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 54 +++++++++++++++++------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/work.tpl    |  4 +--
 work.php                      |  3 ++
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5819c5d43..a80b80f0e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -42,8 +42,7 @@
 'menu.logout' => 'Afmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-// TODO: translate the following.
-// 'menu.register' => 'Register',
+'menu.register' => 'Registreren',
 'menu.profile' => 'Profiel',
 'menu.group' => 'Groep',
 'menu.plugins' => 'Plugins',
@@ -104,9 +103,17 @@
 'error.format' => 'Bestandsformaat niet valide.',
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
+// TODO: improve translations of both error.file_storage and error.remote_work.
+// Both file starage and remote work (freelance) are implemented in external facilities,
+// which are standalone applications out of scope of Time Tracker itseld.
+//
+// error.file_storage means that something happened in a remote file storage server.
+// error.remote_work means that something happened in a remote work server
+// see documentation for remote work plugin, currently under development).
+// Remote work plugin is designed to outsource work to other groups, when one group
+// hires another group to do something (under development at the moment).
 'error.file_storage' => 'Fout bij het opslaan van het bestand.',
-// TODO: translate the following.
-// 'error.remote_work' => 'Remote work server error.',
+'error.remote_work' => 'Fout in de server.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
@@ -213,27 +220,24 @@
 'label.condition' => 'Voorwaarde',
 'label.yes' => 'ja',
 'label.no' => 'nee',
-// TODO: translate the following.
-// 'label.sort' => 'Sort',
+'label.sort' => 'Sorteren',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eigen velden',
 'label.monthly_quotas' => 'Doelen per maand',
-// TODO: translate the following.
-// 'label.entity' => 'Entity',
+'label.entity' => 'Entiteit',
 'label.type' => 'Type',
 'label.type_dropdown' => 'uitklapbaar',
 'label.type_text' => 'tekst',
 'label.required' => 'Verplicht veld',
 'label.fav_report' => 'Standaard rapport',
 'label.schedule' => 'Planning',
-'label.what_is_it' => 'Wat betekent dit?',
+'label.what_is_it' => 'Meer informatie',
 'label.expense' => 'Kosten',
 'label.quantity' => 'Hoeveelheid',
 'label.paid_status' => 'Status van betaling',
 'label.paid' => 'Betaald',
 'label.mark_paid' => 'Markeer als betaald',
-// TODO: translate the following.
-// 'label.week_menu' => 'Week menu',
+'label.week_menu' => 'Week menu',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
 'label.work_units' => 'Werk eenheid',
@@ -254,12 +258,10 @@
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
 
-// Entity names. We use lower case (in English) because they are used in dropdowns, too.
-// They are used to associate a custom field with an entity type.
-// TODO: translate the following.
-// 'entity.time' => 'time',
-// 'entity.user' => 'user',
-// 'entity.project' => 'project',
+// Entity names.
+'entity.time' => 'tijd',
+'entity.user' => 'medewerker',
+'entity.project' => 'project',
 
 // Form titles.
 'title.error' => 'Fout',
@@ -388,9 +390,8 @@
 'dropdown.not_approved' => 'afgekeurd',
 'dropdown.paid' => 'betaald',
 'dropdown.not_paid' => 'niet betaald',
-// TODO: translate the following.
-// 'dropdown.ascending' => 'ascending',
-// 'dropdown.descending' => 'descending',
+'dropdown.ascending' => 'oplopend',
+'dropdown.descending' => 'aflopend',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
@@ -437,9 +438,8 @@
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
-// TODO: translate the following.
-// 'form.reports.time_fields' => 'Time fields',
-// 'form.reports.user_fields' => 'User fields',
+'form.reports.time_fields' => 'Tijd velden',
+'form.reports.user_fields' => 'Mederwerker velden',
 'form.reports.group_by' => 'Groeperen op',
 'form.reports.group_by_no' => '--- niet groeperen ---',
 'form.reports.group_by_date' => 'datum',
@@ -544,8 +544,7 @@
 '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',
+'form.group_edit.advanced_settings' => 'Geavanceerde instellingen',
 
 // 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?',
@@ -608,7 +607,6 @@
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
 
 // Work form. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+'form.work.work_items' => 'Onderdelen werk',
+'form.work.offers' => 'Aanbiedingen',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2fcd9677a..fcc5d5b9d 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.19.9.5058 | 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.9.5059 | 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/work.tpl b/WEB-INF/templates/work.tpl
index af2a7c420..447b5b2a7 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -7,8 +7,8 @@
     <td valign="top">
 {if $user->can('manage_work')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_work}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
+  {if !$inactive_work}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.work.offers}</td></tr>
   {/if}
   {if $active_work}
         <tr>
diff --git a/work.php b/work.php
index 60a8f7c8b..da7b20c18 100644
--- a/work.php
+++ b/work.php
@@ -51,12 +51,15 @@
   // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
   // $completed_work = ttWorkHelper::getCompletedWork(); // Completed work items for other groups.
 }
+// $available_offers = ttWorkHelper::getAvailableOffers(); // Currently available offers to do work.
+// TODO: review access rights for the code above.
 
 $smarty->assign('active_work', $active_work);
 $smarty->assign('inactive_work', $inactive_work);
 $smarty->assign('available_work', $available_work);
 $smarty->assign('in_progress_work', $in_progress_work);
 $smarty->assign('completed_work', $completed_work);
+$smarty->assign('available_offers', $available_offers);
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'work.tpl');
 $smarty->display('index.tpl');

From 0ac0111a64ea1452ed5ccc8290f3de3b328940ba Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Sep 2019 17:38:23 +0000
Subject: [PATCH 1019/1848] Fixed a typo.

---
 WEB-INF/resources/nl.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a80b80f0e..c0264d5cc 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -105,7 +105,7 @@
 'error.expired' => 'Verloop datum is bereikt.',
 // TODO: improve translations of both error.file_storage and error.remote_work.
 // Both file starage and remote work (freelance) are implemented in external facilities,
-// which are standalone applications out of scope of Time Tracker itseld.
+// which are standalone applications out of scope of Time Tracker itself.
 //
 // error.file_storage means that something happened in a remote file storage server.
 // error.remote_work means that something happened in a remote work server

From ee76734a38a171461a0996dde349e6365ec9f995 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Sep 2019 18:08:57 +0000
Subject: [PATCH 1020/1848] Fixed a typo.

---
 WEB-INF/resources/nl.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c0264d5cc..14f08bb77 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -104,7 +104,7 @@
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
 // TODO: improve translations of both error.file_storage and error.remote_work.
-// Both file starage and remote work (freelance) are implemented in external facilities,
+// Both file storage and remote work (freelance) are implemented in external facilities,
 // which are standalone applications out of scope of Time Tracker itself.
 //
 // error.file_storage means that something happened in a remote file storage server.

From b0e334e90797f1c4faeaa3b67284b96e80a4f40b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Sep 2019 23:53:27 +0000
Subject: [PATCH 1021/1848] Some progress on remote work plugin.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/work.tpl   | 63 +++++++-----------------------------
 2 files changed, 13 insertions(+), 52 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fcc5d5b9d..63eaecb4c 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.19.9.5059 | 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.9.5060 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 447b5b2a7..164600a52 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -5,11 +5,8 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->can('manage_work')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if !$inactive_work}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.work.offers}</td></tr>
-  {/if}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
   {if $active_work}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
@@ -23,15 +20,8 @@
     {foreach $active_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.name|escape}</td>
-      {if $show_files}
-        {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
-        {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
-        {/if}
-      {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -45,9 +35,9 @@
         </tr>
       </table>
 
-  {if $inactive_projects}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.inactive_projects}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.work.offers}</td></tr>
+  {if $available_offers}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -57,53 +47,24 @@
           <td></td>
           <td></td>
         </tr>
-    {foreach $inactive_projects as $project}
+    {foreach $available_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-        {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
-        {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
-        {/if}
-      {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td>{$offer.name|escape}</td>
+          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
     {/foreach}
+  {/if}
       </table>
 
       <table width="100%">
         <tr>
           <td align="center"><br>
-            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
           </td>
         </tr>
       </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td></td>
-    {/if}
-        </tr>
-  {if $active_projects}
-    {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files && $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
-      {/if}
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-{/if}
+
     </td>
   </tr>
 </table>

From c20de83bc9b0b370070afa935bffd39fcaae3a03 Mon Sep 17 00:00:00 2001
From: danklee19 <49231594+danklee19@users.noreply.github.com>
Date: Sat, 14 Sep 2019 20:31:34 +0200
Subject: [PATCH 1022/1848] Update ttTimeHelper.class.php (#77)

For showing custom field on 'time' page
modified SQL-Statements
---
 WEB-INF/lib/ttTimeHelper.class.php | 63 +++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 29010036c..6f4906646 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -859,6 +859,45 @@ static function getRecords($date, $includeFiles = false) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    if ($user->isPluginEnabled('cf')) {
+//  require_once('plugins/CustomFields.class.php');
+      global $custom_fields;
+      if (!$custom_fields) $custom_fields = new CustomFields();
+    }
+    $fields = array();    
+
+//    print_r($custom_fields);
+
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+//      print_r($timeField);
+        $field_name = 'time_field_'.$timeField['id'];
+//        $checkbox_field_name = 'show_'.$field_name;
+//        if ($options[$checkbox_field_name]) {
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            $cflTable = 'cfl'.$timeField['id'];
+            array_push($fields, "$cflTable.value as $field_name");
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$timeField['id'];
+            array_push($fields, "$cfoTable.value as $field_name");
+          }
+//        }
+      }
+    }
+    
+// print_r($fields);    
+    
+
+/*      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $field_name = 'time_field_'.$timeField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          if ($options[$checkbox_field_name]) {
+            array_push($fields, "null as $field_name"); // null for each time custom field.
+          }
+        }
+      }
+*/
     /*
     $include_cf_1 = $user->isPluginEnabled('cf');
     if ($include_cf_1) {
@@ -882,6 +921,27 @@ static function getRecords($date, $includeFiles = false) {
       " left join tt_tasks t on (l.task_id = t.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
+      
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+//        $checkbox_field_name = 'show_'.$field_name;
+//        if ($options[$field_name] || $options[$checkbox_field_name]) {
+          $cflTable = 'cfl'.$timeField['id'];
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$timeField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
+          }
+//        }
+      }
+    }
+// print_r($cfoTable);
+      
     /* Multiple left joins are now required, probably with config options which fields to show.
      * if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
@@ -897,9 +957,10 @@ static function getRecords($date, $includeFiles = false) {
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field $filePart from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field ,".join(', ', $fields)." $filePart from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
+//    echo $sql;  
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {

From aaf6e4129e253cc9fc092390aade86dff0e565e5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Sep 2019 18:55:09 +0000
Subject: [PATCH 1023/1848] Fixed SQL query broken in pr#77
 (ttTimeHelper::getRecords when Custom Fields plugin is disabled).

---
 WEB-INF/lib/ttTimeHelper.class.php | 87 ++++++++----------------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 22 insertions(+), 67 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 6f4906646..043e43462 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -860,56 +860,25 @@ static function getRecords($date, $includeFiles = false) {
       $client_field = ", c.name as client";
 
     if ($user->isPluginEnabled('cf')) {
-//  require_once('plugins/CustomFields.class.php');
       global $custom_fields;
       if (!$custom_fields) $custom_fields = new CustomFields();
+      $time_fields_array = array();
     }
-    $fields = array();    
-
-//    print_r($custom_fields);
 
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
-//      print_r($timeField);
         $field_name = 'time_field_'.$timeField['id'];
-//        $checkbox_field_name = 'show_'.$field_name;
-//        if ($options[$checkbox_field_name]) {
-          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-            $cflTable = 'cfl'.$timeField['id'];
-            array_push($fields, "$cflTable.value as $field_name");
-          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-            $cfoTable = 'cfo'.$timeField['id'];
-            array_push($fields, "$cfoTable.value as $field_name");
-          }
-//        }
+        if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+          $cflTable = 'cfl'.$timeField['id'];
+          array_push($time_fields_array, "$cflTable.value as $field_name");
+        } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+          $cfoTable = 'cfo'.$timeField['id'];
+          array_push($time_fields_array, "$cfoTable.value as $field_name");
+        }
       }
+      $time_fields = ", ".join(', ', $time_fields_array);
     }
     
-// print_r($fields);    
-    
-
-/*      if ($custom_fields && $custom_fields->timeFields) {
-        foreach ($custom_fields->timeFields as $timeField) {
-          $field_name = 'time_field_'.$timeField['id'];
-          $checkbox_field_name = 'show_'.$field_name;
-          if ($options[$checkbox_field_name]) {
-            array_push($fields, "null as $field_name"); // null for each time custom field.
-          }
-        }
-      }
-*/
-    /*
-    $include_cf_1 = $user->isPluginEnabled('cf');
-    if ($include_cf_1) {
-      $custom_fields = new CustomFields();
-      $cf_1_type = $custom_fields->fields[0]['type'];
-      if ($cf_1_type == CustomFields::TYPE_TEXT) {
-        $custom_field = ", cfl.value as cf_1";
-      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $custom_field = ", cfo.value as cf_1";
-      }
-    }*/
-
     if ($includeFiles) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
@@ -925,42 +894,28 @@ static function getRecords($date, $includeFiles = false) {
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
-//        $checkbox_field_name = 'show_'.$field_name;
-//        if ($options[$field_name] || $options[$checkbox_field_name]) {
-          $cflTable = 'cfl'.$timeField['id'];
-          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-            // Add one join for each text field.
-            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
-          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-            $cfoTable = 'cfo'.$timeField['id'];
-            // Add two joins for each dropdown field.
-            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
-            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
-          }
-//        }
+        $cflTable = 'cfl'.$timeField['id'];
+        if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+          // Add one join for each text field.
+          $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
+        } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+          $cfoTable = 'cfo'.$timeField['id'];
+          // Add two joins for each dropdown field.
+          $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].')';
+          $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
+        }
       }
     }
-// print_r($cfoTable);
-      
-    /* Multiple left joins are now required, probably with config options which fields to show.
-     * if ($include_cf_1) {
-      if ($cf_1_type == CustomFields::TYPE_TEXT)
-        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
-      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
-          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
-      }
-    }*/
+
     $left_joins .= $fileJoin;
 
     $result = array();
     $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,".
       " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,".
       " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,".
-      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field ,".join(', ', $fields)." $filePart from tt_log l $left_joins".
+      " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $time_fields $filePart from tt_log l $left_joins".
       " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1".
       " order by l.start, l.id";
-//    echo $sql;  
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 63eaecb4c..aa57f3dcb 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.19.9.5060 | 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.9.5061 | 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>

From c96ec4a581b6733e7ae2a9bf7d5fc1344b1022f9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Sep 2019 21:08:47 +0000
Subject: [PATCH 1024/1848] Added label.details to translation files for Remote
 Work plugin.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 066274cd0..166c7b928 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -283,6 +283,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a948e11d6..527d14b95 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -293,6 +293,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index cd52e5a0f..52236c9f7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -273,6 +273,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktive Brugere',
 'label.inactive_users' => 'Inaktive Brugere',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 14f2c5097..66428e55e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -263,6 +263,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 545a48bf1..0e10f3620 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -249,6 +249,7 @@
 'label.download' => 'Download',
 'label.active_users' => 'Active Users',
 'label.inactive_users' => 'Inactive Users',
+'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 7162c6602..08e3f818c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -286,6 +286,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 2167bd313..c93641a1c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -280,6 +280,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktiivsed kasutajad',
 'label.inactive_users' => 'Mitteaktiivsed kasutajad',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 4fc605a31..ed9ea5b1c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -284,6 +284,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'کاربران فعال',
 'label.inactive_users' => 'کاربران غیرفعال',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4621b9fa0..718f53ce2 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -277,6 +277,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktiiviset käyttäjät',
 'label.inactive_users' => 'Ei-aktiiviset käyttäjät',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e2a9489e8..52c6f6b9e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -271,6 +271,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Utilisateurs actifs',
 'label.inactive_users' => 'Utilisateurs inactifs',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index cc10a876d..b6ae5e4d3 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -267,6 +267,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Ενεργοί χρήστες',
 'label.inactive_users' => 'Ανενεργοί χρήστες',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a9ab58f8d..6f47aa884 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -292,6 +292,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'משתמשים פעילים',
 'label.inactive_users' => 'משתמשים לא פעילים',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b76ce4096..aa95b94c0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -289,6 +289,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index fab45d0fd..fc4c65219 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -271,6 +271,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Utenti attivi',
 'label.inactive_users' => 'Utenti inattivi',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index be759566c..90a9d79c6 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -293,6 +293,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 569aac303..1cd6bf540 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -293,6 +293,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 14f08bb77..a2b566772 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -257,6 +257,8 @@
 'label.download' => 'Download',
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d87c68fd9..08d7b7f09 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -290,6 +290,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f26b35875..c7f88c94d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -278,6 +278,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktywni użytkownicy',
 'label.inactive_users' => 'Nieaktywni użytkownicy',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bd6c6b9f0..70c1132b8 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -275,6 +275,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Usuários ativos',
 'label.inactive_users' => 'Usuários inativos',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 43f0e5feb..5e7959818 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -278,6 +278,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3162a7e12..619c07c62 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -290,6 +290,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 65aa01b70..80f5f2bcf 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -248,6 +248,7 @@
 'label.download' => 'Скачать',
 'label.active_users' => 'Активные пользователи',
 'label.inactive_users' => 'Неактивные пользователи',
+'label.details' => 'Детали',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b3d1adb04..f3d999153 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -282,6 +282,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktívny používatelia',
 'label.inactive_users' => 'Neaktívny používatelia',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9dd668d49..d015bdbac 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -273,6 +273,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c0936c1a5..0cf827cfe 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -276,6 +276,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktivni korisnik',
 'label.inactive_users' => 'Neaktivni korisnik',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ade86f7d4..99baea978 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -273,6 +273,8 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktiva användare',
 'label.inactive_users' => 'Inaktiva användare',
+// TODO: translate the following.
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2935878fe..d8ec797ee 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -297,6 +297,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5d87497ce..7121beb89 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -282,6 +282,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index aabfbc9dc..f3e732765 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -288,6 +288,7 @@
 // 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
+// 'label.details' => 'Details',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aa57f3dcb..ecbe45ae3 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.19.9.5061 | 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.9.5062 | 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>

From c66cf20bcc6c6b1110103cc83a5f254b8a1bb227 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Sep 2019 21:23:36 +0000
Subject: [PATCH 1025/1848] Added label.budget to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/work_add.tpl   | 4 ++++
 work_add.php                     | 2 ++
 33 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 166c7b928..2730902a0 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -284,6 +284,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 527d14b95..1ba723029 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -294,6 +294,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 52236c9f7..de3b796be 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -275,6 +275,7 @@
 'label.inactive_users' => 'Inaktive Brugere',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 66428e55e..54321626f 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -265,6 +265,7 @@
 'label.inactive_users' => 'Inaktive Nutzer',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0e10f3620..c95b60eeb 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -250,6 +250,7 @@
 'label.active_users' => 'Active Users',
 'label.inactive_users' => 'Inactive Users',
 'label.details' => 'Details',
+'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 08e3f818c..d36d6421e 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -287,6 +287,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c93641a1c..39c447848 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -282,6 +282,7 @@
 'label.inactive_users' => 'Mitteaktiivsed kasutajad',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ed9ea5b1c..33b0e6847 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -286,6 +286,7 @@
 'label.inactive_users' => 'کاربران غیرفعال',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 718f53ce2..59fca15fa 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -279,6 +279,7 @@
 'label.inactive_users' => 'Ei-aktiiviset käyttäjät',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 52c6f6b9e..a1a50a9e9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -273,6 +273,7 @@
 'label.inactive_users' => 'Utilisateurs inactifs',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index b6ae5e4d3..e40932a29 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -269,6 +269,7 @@
 'label.inactive_users' => 'Ανενεργοί χρήστες',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6f47aa884..2412d630a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -294,6 +294,7 @@
 'label.inactive_users' => 'משתמשים לא פעילים',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index aa95b94c0..2c81071f7 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -290,6 +290,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index fc4c65219..86843eb05 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -273,6 +273,7 @@
 'label.inactive_users' => 'Utenti inattivi',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 90a9d79c6..2a4568ec3 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -294,6 +294,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1cd6bf540..b9a39d3bf 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -294,6 +294,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a2b566772..a2f3cd1ad 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -259,6 +259,7 @@
 'label.inactive_users' => 'Inactieve medewerkers',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 08d7b7f09..bb3bd2511 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -291,6 +291,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c7f88c94d..be92051e6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -280,6 +280,7 @@
 'label.inactive_users' => 'Nieaktywni użytkownicy',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 70c1132b8..d479a4d65 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -277,6 +277,7 @@
 'label.inactive_users' => 'Usuários inativos',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5e7959818..46e1d6eac 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -279,6 +279,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 619c07c62..e2221d7cb 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -291,6 +291,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 80f5f2bcf..aeb571010 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -249,6 +249,7 @@
 'label.active_users' => 'Активные пользователи',
 'label.inactive_users' => 'Неактивные пользователи',
 'label.details' => 'Детали',
+'label.budget' => 'Бюджет',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f3d999153..d853bafc7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -284,6 +284,7 @@
 'label.inactive_users' => 'Neaktívny používatelia',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d015bdbac..bb139505e 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -274,6 +274,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 0cf827cfe..318eb0ffe 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -278,6 +278,7 @@
 'label.inactive_users' => 'Neaktivni korisnik',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 99baea978..8fd08e23a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -275,6 +275,7 @@
 'label.inactive_users' => 'Inaktiva användare',
 // TODO: translate the following.
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d8ec797ee..4bbaff7e8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -298,6 +298,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7121beb89..29206c3b4 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -283,6 +283,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f3e732765..6745e889d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -289,6 +289,7 @@
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
+// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ecbe45ae3..f7f5cca8f 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.19.9.5062 | 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.9.5063 | 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/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 757a4e224..0cc81fa53 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -11,6 +11,10 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.workForm.description.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
 {if $show_files}
         <tr>
           <td align="right">{$i18n.label.file}:</td>
diff --git a/work_add.php b/work_add.php
index 452e515b3..8eecdd291 100644
--- a/work_add.php
+++ b/work_add.php
@@ -49,12 +49,14 @@
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
   $cl_currency = $request->getParameter('currency');
 }
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 // Add a dropdown for currency.

From 93eeca2e6d4cfa17238d6273bc680856b6ebd37f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Sep 2019 22:44:02 +0000
Subject: [PATCH 1026/1848] More progress on Remote Work plugin.

---
 WEB-INF/lib/ttOfferHelper.class.php |  10 +-
 WEB-INF/lib/ttWorkHelper.class.php  | 188 ++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl        |   2 +-
 WEB-INF/templates/work_add.tpl      |   4 +
 work_add.php                        |  40 +++---
 5 files changed, 212 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttOfferHelper.class.php b/WEB-INF/lib/ttOfferHelper.class.php
index f6f9cf5aa..85cba6542 100644
--- a/WEB-INF/lib/ttOfferHelper.class.php
+++ b/WEB-INF/lib/ttOfferHelper.class.php
@@ -33,7 +33,7 @@ class ttOfferHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
   var $remote_work_uri = null;   // Location of remote work server.
   var $register_uri = null;      // URI to register with remote work server.
-  var $create_offer_uri = null;  // URI to publish offer.
+  var $put_offer_uri = null;     // URI to publish offer.
   var $get_offer_uri = null;     // URI to get offer details.
   var $get_offers_uri = null;    // URI to get a list of offers.
   var $delete_offer_uri = null;  // URI to delete offer.
@@ -49,7 +49,7 @@ function __construct(&$errors) {
     if (defined('REMOTE_WORK_URI')) {
       $this->remote_work_uri = REMOTE_WORK_URI;
       $this->register_uri = $this->remote_work_uri.'register';
-      $this->create_offer_uri = $this->remote_work_uri.'createoffer';
+      $this->put_offer_uri = $this->remote_work_uri.'putoffer';
       $this->get_offer_uri = $this->remote_work_uri.'getoffer';
       $this->get_offers_uri = $this->remote_work_uri.'getoffers';
       $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
@@ -126,8 +126,8 @@ function checkSiteRegistration() {
     }
   }
 
-  // createOffer - publishes an offer in remote work server.
-  function createOffer($fields) {
+  // putOffer - publishes an offer in remote work server.
+  function putOffer($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -157,7 +157,7 @@ function createOffer($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->create_offer_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->put_offer_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index b8d2fde8c..4f6fb7feb 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -29,6 +29,194 @@
 
 // Class ttWorkHelper is used to help with operations with the Remote work plugin.
 class ttWorkHelper {
+  var $errors = null;            // Errors go here. Set in constructor by reference.
+  var $remote_work_uri = null;   // Location of remote work server.
+  var $register_uri = null;      // URI to register with remote work server.
+  var $put_work_uri = null;      // URI to publish offer.
+  var $get_work_uri = null;      // URI to get offer details.
+  var $get_active_work_uri = null;    // URI to get active work for group.
+  var $get_available_work_uri = null; // URI to get available work for group.
+  var $delete_work_uri = null;   // URI to delete eotk.
+  // TODO: design how (and what) to delete when a group is deleted.
+  var $update_work_uri = null;  // URI to update work.
+  var $site_id = null;           // Site id for remote work server.
+  var $site_key = null;          // Site key for remote work server.
+
+  // Constructor.
+  function __construct(&$errors) {
+    $this->errors = &$errors;
+
+    if (defined('REMOTE_WORK_URI')) {
+      $this->remote_work_uri = REMOTE_WORK_URI;
+      $this->register_uri = $this->remote_work_uri.'register';
+      $this->put_work_uri = $this->remote_work_uri.'putwork';
+      $this->get_work_uri = $this->remote_work_uri.'getwork';
+      $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
+      $this->get_avaialable_work_uri = $this->remote_work_uri.'getavailablework';
+
+      $this->delete_work_uri = $this->remote_work_uri.'deletework';
+      $this->update_work_uri = $this->remote_work_uri.'updatework';
+      $this->checkSiteRegistration();
+    }
+  }
+
+  // TODO: identical function is in ttOfferHelper. Reduce code duplication.
+  // checkSiteRegistration - obtains site id and key from local database.
+  // If not found, it tries to register with remote work server.
+  function checkSiteRegistration() {
+
+    global $i18n;
+    $mdb2 = getConnection();
+
+    // Obtain site id.
+    $sql = "select param_value as id from tt_site_config where param_name = 'worksite_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if (!$val) {
+      // No site id found, need to register.
+      $fields = array('name' => urlencode('time tracker'),
+        'origin' => urlencode('time tracker source'));
+
+      // Urlify the data for the POST.
+      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+      $fields_string = rtrim($fields_string, '&');
+
+      // Open connection.
+      $ch = curl_init();
+
+      // Set the url, number of POST vars, POST data.
+      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
+      curl_setopt($ch, CURLOPT_POST, true);
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+      // Execute a post request.
+      $result = curl_exec($ch);
+
+      // Close connection.
+      curl_close($ch);
+
+      $result_array = json_decode($result, true);
+      if (!$result_array) {
+        $this->errors->add($i18n->get('error.remote_work'));
+      }
+      else if ($result_array['error']) {
+        // Add an error from remote work server if we have it.
+        $this->errors->add($result_array['error']);
+      }
+      else if ($result_array['id'] && $result_array['key']) {
+        $this->site_id = $result_array['id'];
+        $this->site_key = $result_array['key'];
+
+        // Registration successful. Store id and key locally for future use.
+        $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
+        $mdb2->exec($sql);
+        $sql = "insert into tt_site_config values('worksite_key', ".$mdb2->quote($this->site_key).", now(), null)";
+        $mdb2->exec($sql);
+      } else {
+        $this->errors->add($i18n->get('error.remote_work'));
+      }
+    } else {
+      // Site id found.
+      $this->site_id = $val['id'];
+
+      // Obtain site key.
+      $sql = "select param_value as site_key from tt_site_config where param_name = 'worksite_key'";
+      $res = $mdb2->query($sql);
+      $val = $res->fetchRow();
+      $this->site_key = $val['site_key'];
+    }
+  }
+
+  // putWork - publishes a work item in remote work server.
+  function putWork($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($this->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($this->getGroupKey()),
+      'lang' => urlencode($user->lang),
+      'subject' => urlencode($fields['subject']),
+      'descr_short' => urlencode($fields['descr_short']),
+      'descr_long' => urlencode($fields['descr_long']),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount'])
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->put_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $work_id = (int) $result_array['work_id'];
+    $error = $result_array['error'];
+
+    if ($error || !$work_id) {
+      if ($error) {
+        // Add an error from remote work server if we have it.
+        $this->errors->add($error);
+      }
+      return false;
+    }
+
+    return true;
+  }
+
+  // TODO: identical function is in ttOfferHelper. Redesign.
+  // getOrgKey obtains organization key from the database.
+  private function getOrgKey() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $org_id = $user->org_id;
+    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['group_key'];
+  }
+
+  // TODO: identical function is in ttOfferHelper. Redesign.
+  // getGrtoupKey obtains group key from the database.
+  private function getGroupKey() {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select group_key from tt_groups where id = $group_id and org_id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['group_key'];
+  }
 
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f7f5cca8f..d3524d0e6 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.19.9.5063 | 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.9.5064 | 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/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 0cc81fa53..3e2b00695 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -25,6 +25,10 @@
           <td align="right">{$i18n.label.currency}:</td>
           <td>{$forms.workForm.currency.control}</td>
         </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/work_add.php b/work_add.php
index 8eecdd291..d98ed8242 100644
--- a/work_add.php
+++ b/work_add.php
@@ -51,6 +51,7 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
   $cl_currency = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
 }
 
 $form = new Form('workForm');
@@ -62,6 +63,8 @@
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 // TODO: design how to handle one-time vs ongoing work. Apparently, with a conditional display of relevant controls.
 // Ongoing work - rate per hour control.
@@ -71,39 +74,24 @@
 // TODO: design how to handle categories and sub-categories.
 // One major complication is localization of names.
 
-// Coding and design are currently ongoing.
-
-
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
 
   if ($err->no()) {
-    if (!ttProjectHelper::getProjectByName($cl_name)) {
-      $id = ttProjectHelper::insert(array('name' => $cl_name,
-        'description' => $cl_description,
-        'users' => $cl_users,
-        'tasks' => $cl_tasks,
-        'status' => ACTIVE));
-
-      // Put a new file in storage if we have it.
-      if ($id && $showFiles && $_FILES['newfile']['name']) {
-        $fileHelper = new ttFileHelper($err);
-        $fields = array('entity_type'=>'project',
-          'entity_id' => $id,
-          'file_name' => $_FILES['newfile']['name']);
-        $fileHelper->putFile($fields);
-      }
-      if ($id) {
-        header('Location: projects.php');
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('subject'=>$cl_name,
+      'short_description' => $cl_description,
+      'long_description' => $cl_details,
+      'currency' => $cl_currency,
+      'amount' => $cl_budget);
+     $id = $workHelper->putWork($fields);
+     if ($id) {
+        header('Location: work.php');
         exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.object_exists'));
+    }
   }
 } // isPost
 

From 43a2c748a410588b6b02d481d34f43d985ff526c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 15 Sep 2019 12:21:03 +0000
Subject: [PATCH 1027/1848] Refactoring. Put getGroupKey function into ttUser
 class.

---
 WEB-INF/lib/ttGroup.class.php      |  2 ++
 WEB-INF/lib/ttUser.class.php       |  9 ++++++++-
 WEB-INF/lib/ttWorkHelper.class.php | 17 +----------------
 WEB-INF/templates/footer.tpl       |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 2a5eb1dcf..5e1885af9 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -33,6 +33,7 @@
 // We use it in ttUser class to have acces to "on behalf" group properties.
 class ttGroup {
   var $id = null;               // Group id.
+  var $group_key = null;        // Group key.
   var $parent_id = null;        // Paerent group id.
   var $org_id = null;           // Organization id.
   var $name = null;             // Group name.
@@ -80,6 +81,7 @@ function __construct($id, $org_id) {
     $val = $res->fetchRow();
     if ($val['id'] > 0) {
       $this->id = $val['id'];
+      $this->group_key = $val['group_key'];
       $this->parent_id = $val['parent_id'];
       $this->org_id = $val['org_id'];
       $this->name = $val['name'];
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 6db627884..4084aa0bc 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -39,6 +39,7 @@ class ttUser {
   var $id = null;               // User id.
   var $org_id = null;           // Organization id.
   var $group_id = null;         // Group id.
+  var $group_key = null;        // Group key.
   var $role_id = null;          // Role id.
   var $role_name = null;        // Role name.
   var $rank = null;             // User role rank.
@@ -92,7 +93,7 @@ function __construct($login, $id = null) {
     $mdb2 = getConnection();
 
     $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
-      " u.quota_percent, u.email, g.org_id, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
+      " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
       " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type,".
       " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.holidays, g.workday_minutes, g.custom_logo".
       " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
@@ -114,6 +115,7 @@ function __construct($login, $id = null) {
       $this->id = $val['id'];
       $this->org_id = $val['org_id'];
       $this->group_id = $val['group_id'];
+      $this->group_key = $val['group_key'];
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);
@@ -188,6 +190,11 @@ function getGroup() {
     return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
   }
 
+  // getGroupKey returns group key for active group.
+  function getGroupKey() {
+    return ($this->behalfGroup ? $this->behalfGroup->group_key : $this->group_key);
+  }
+
   // getDecimalMark returns decimal mark for active group.
   function getDecimalMark() {
     return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 4f6fb7feb..66b01e552 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -142,7 +142,7 @@ function putWork($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'lang' => urlencode($user->lang),
       'subject' => urlencode($fields['subject']),
       'descr_short' => urlencode($fields['descr_short']),
@@ -203,21 +203,6 @@ private function getOrgKey() {
     return $val['group_key'];
   }
 
-  // TODO: identical function is in ttOfferHelper. Redesign.
-  // getGrtoupKey obtains group key from the database.
-  private function getGroupKey() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select group_key from tt_groups where id = $group_id and org_id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['group_key'];
-  }
-
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d3524d0e6..ed5e5150b 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.19.9.5064 | 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.9.5065 | 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>

From 4d5bf4e4824f7fc3a5abf98152494d7dbed64de7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 15 Sep 2019 12:36:14 +0000
Subject: [PATCH 1028/1848] A bit more refactoring with ttUser::getGroupKey()
 function.

---
 WEB-INF/lib/ttFileHelper.class.php  | 22 ++++------------------
 WEB-INF/lib/ttOfferHelper.class.php | 22 ++++------------------
 WEB-INF/templates/footer.tpl        |  2 +-
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 07d0ad085..02830474a 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -135,7 +135,7 @@ function putFile($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
       'entity_id' => urlencode($fields['entity_id']),
       'file_name' => urlencode($fields['file_name']),
@@ -214,7 +214,7 @@ function deleteFile($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
       'entity_id' => urlencode($fields['entity_id']),
       'file_id' => urlencode($fields['remote_id']),
@@ -292,7 +292,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($entity_type),
       'entity_id' => urlencode($entity_id));
 
@@ -379,20 +379,6 @@ private function getOrgKey() {
     return $val['group_key'];
   }
 
-  // getGrtoupKey obtains group key from the database.
-  private function getGroupKey() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select group_key from tt_groups where id = $group_id and org_id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['group_key'];
-  }
-
   // getEntityFiles obtains a list of files for an entity.
   static function getEntityFiles($id, $type) {
     global $user;
@@ -466,7 +452,7 @@ function getFile($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
       'entity_id' => urlencode($fields['entity_id']),
       'file_id' => urlencode($fields['remote_id']),
diff --git a/WEB-INF/lib/ttOfferHelper.class.php b/WEB-INF/lib/ttOfferHelper.class.php
index 85cba6542..0a7578771 100644
--- a/WEB-INF/lib/ttOfferHelper.class.php
+++ b/WEB-INF/lib/ttOfferHelper.class.php
@@ -140,7 +140,7 @@ function putOffer($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'offer_lang' => urlencode($fields['offer_lang']),
       'offer_subject' => urlencode($fields['offer_subject']),
       'offer_descr_short' => urlencode($fields['offer_descr_short']),
@@ -205,7 +205,7 @@ function getOffer($fields) {
 //      'org_id' => urlencode($org_id),
 //      'org_key' => urlencode($this->getOrgKey()),
 //      'group_id' => urlencode($group_id),
-//      'group_key' => urlencode($this->getGroupKey()),
+//      'group_key' => urlencode($user->getGroupKey()),
       'offer_id' => urlencode($fields['remote_id']));
 
     // url-ify the data for the POST.
@@ -280,7 +280,7 @@ function deleteFile($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
       'entity_id' => urlencode($fields['entity_id']),
       'file_id' => urlencode($fields['remote_id']),
@@ -358,7 +358,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($this->getOrgKey()),
       'group_id' => urlencode($group_id),
-      'group_key' => urlencode($this->getGroupKey()),
+      'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($entity_type),
       'entity_id' => urlencode($entity_id));
 
@@ -445,20 +445,6 @@ private function getOrgKey() {
     return $val['group_key'];
   }
 
-  // getGrtoupKey obtains group key from the database.
-  private function getGroupKey() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select group_key from tt_groups where id = $group_id and org_id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['group_key'];
-  }
-
   // getEntityFiles obtains a list of files for an entity.
   static function getEntityFiles($id, $type) {
     global $user;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ed5e5150b..97c6fcb73 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.19.9.5065 | 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.9.5066 | 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>

From f28b097244b9eab15b7e5f08029091c6ac52b090 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 15 Sep 2019 12:58:04 +0000
Subject: [PATCH 1029/1848] Refactoring. Put getOrgKey() function into ttUser
 class.

---
 WEB-INF/lib/ttFileHelper.class.php  | 20 ++++----------------
 WEB-INF/lib/ttOfferHelper.class.php | 20 ++++----------------
 WEB-INF/lib/ttUser.class.php        | 18 ++++++++++++++++++
 WEB-INF/lib/ttWorkHelper.class.php  | 15 +--------------
 WEB-INF/templates/footer.tpl        |  2 +-
 5 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 02830474a..a38162706 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -133,7 +133,7 @@ function putFile($fields) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
@@ -212,7 +212,7 @@ function deleteFile($fields) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
@@ -290,7 +290,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($entity_type),
@@ -367,18 +367,6 @@ private function entityHasFiles($entity_id, $entity_type) {
     return $val['id'] > 0;
   }
 
-  // getOrgKey obtains organization key from the database.
-  private function getOrgKey() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $org_id = $user->org_id;
-    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['group_key'];
-  }
-
   // getEntityFiles obtains a list of files for an entity.
   static function getEntityFiles($id, $type) {
     global $user;
@@ -450,7 +438,7 @@ function getFile($fields) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
diff --git a/WEB-INF/lib/ttOfferHelper.class.php b/WEB-INF/lib/ttOfferHelper.class.php
index 0a7578771..97a36e6aa 100644
--- a/WEB-INF/lib/ttOfferHelper.class.php
+++ b/WEB-INF/lib/ttOfferHelper.class.php
@@ -138,7 +138,7 @@ function putOffer($fields) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'offer_lang' => urlencode($fields['offer_lang']),
@@ -203,7 +203,7 @@ function getOffer($fields) {
       'site_key' => urlencode($this->site_key),
 // Do we need these here?
 //      'org_id' => urlencode($org_id),
-//      'org_key' => urlencode($this->getOrgKey()),
+//      'org_key' => urlencode($user->getOrgKey()),
 //      'group_id' => urlencode($group_id),
 //      'group_key' => urlencode($user->getGroupKey()),
       'offer_id' => urlencode($fields['remote_id']));
@@ -278,7 +278,7 @@ function deleteFile($fields) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($fields['entity_type']),
@@ -356,7 +356,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'entity_type' => urlencode($entity_type),
@@ -433,18 +433,6 @@ private function entityHasFiles($entity_id, $entity_type) {
     return $val['id'] > 0;
   }
 
-  // getOrgKey obtains organization key from the database.
-  private function getOrgKey() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $org_id = $user->org_id;
-    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['group_key'];
-  }
-
   // getEntityFiles obtains a list of files for an entity.
   static function getEntityFiles($id, $type) {
     global $user;
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4084aa0bc..83751360a 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -38,6 +38,7 @@ class ttUser {
   var $name = null;             // User name.
   var $id = null;               // User id.
   var $org_id = null;           // Organization id.
+  var $org_key = null;          // Organization key.
   var $group_id = null;         // Group id.
   var $group_key = null;        // Group key.
   var $role_id = null;          // Role id.
@@ -116,6 +117,7 @@ function __construct($login, $id = null) {
       $this->org_id = $val['org_id'];
       $this->group_id = $val['group_id'];
       $this->group_key = $val['group_key'];
+      if ($this->org_id == $this->group_key) $this->org_key = $val['group_key'];
       $this->role_id = $val['role_id'];
       $this->role_name = $val['role_name'];
       $this->rights = explode(',', $val['rights']);
@@ -195,6 +197,22 @@ function getGroupKey() {
     return ($this->behalfGroup ? $this->behalfGroup->group_key : $this->group_key);
   }
 
+  // getOrgKey returns org key.
+  function getOrgKey() {
+    if ($this->org_key) {
+      return $this->org_key;
+    }
+
+    // Org key is not set because we are in a subgroup. Obtain it.
+    $mdb2 = getConnection();
+    $org_id = $this->org_id;
+    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    $this->org_key = $val['group_key'];
+    return $this->org_key;
+  }
+
   // getDecimalMark returns decimal mark for active group.
   function getDecimalMark() {
     return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 66b01e552..061834645 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -140,7 +140,7 @@ function putWork($fields) {
     $curl_fields = array('site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
-      'org_key' => urlencode($this->getOrgKey()),
+      'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
       'lang' => urlencode($user->lang),
@@ -190,19 +190,6 @@ function putWork($fields) {
     return true;
   }
 
-  // TODO: identical function is in ttOfferHelper. Redesign.
-  // getOrgKey obtains organization key from the database.
-  private function getOrgKey() {
-    global $user;
-    $mdb2 = getConnection();
-
-    $org_id = $user->org_id;
-    $sql = "select group_key from tt_groups where id = $org_id and status = 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['group_key'];
-  }
-
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 97c6fcb73..081233f4b 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.19.9.5066 | 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.9.5067 | 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>

From 43aaee1470aa4088737c8d31a57d3eb76d9811c8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 15 Sep 2019 16:27:44 +0000
Subject: [PATCH 1030/1848] Some progress on Remote Work plugin - initial
 implementation of getting active work items.

---
 WEB-INF/lib/ttWorkHelper.class.php | 63 +++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         |  5 ++-
 work.php                           |  6 ++-
 work_add.php                       |  4 +-
 5 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 061834645..80bf43587 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -60,7 +60,6 @@ function __construct(&$errors) {
     }
   }
 
-  // TODO: identical function is in ttOfferHelper. Reduce code duplication.
   // checkSiteRegistration - obtains site id and key from local database.
   // If not found, it tries to register with remote work server.
   function checkSiteRegistration() {
@@ -190,6 +189,68 @@ function putWork($fields) {
     return true;
   }
 
+  // getActiveWork - obtains a list of work items this group is currently oputsourcing.
+  function getActiveWork() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey())
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_active_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // TODO: check for errors here.
+
+    $active_work = $result_array['active_work'];
+
+    // TODO: construct a list of active work items to return.
+    //$work_id = (int) $result_array['work_id'];
+    //$error = $result_array['error'];
+/*
+    if ($error || !$work_id) {
+      if ($error) {
+        // Add an error from remote work server if we have it.
+        $this->errors->add($error);
+      }
+      return false;
+    }
+*/
+    return $active_work;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 081233f4b..9d8f436f4 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.19.9.5067 | 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.9.5068 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 164600a52..3494b66a9 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -11,6 +11,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
     {if $show_files}
           <td></td>
     {/if}
@@ -19,7 +20,9 @@
         </tr>
     {foreach $active_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.name|escape}</td>
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.amount}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
diff --git a/work.php b/work.php
index da7b20c18..a124ee68e 100644
--- a/work.php
+++ b/work.php
@@ -27,7 +27,7 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
-import('ttGroupHelper');
+import('ttWorkHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('update_work') || ttAccessAllowed('bid_on_work')  || ttAccessAllowed('manage_work'))) {
@@ -40,8 +40,10 @@
 }
 // End of access checks.
 
+$workHelper = new ttWorkHelper($err);
+
 if($user->can('manage_work')) {
-  // $active_work = ttWorkHelper::getActiveWork(); // Active work items this group is outsourcing.
+  $active_work = $workHelper->getActiveWork(); // Active work items this group is outsourcing.
   // $inactive_work = ttWorkHelper::getInactiveWork(); // Inactive work items this group was outsourcing.
 }
 if($user->can('bid_on_work')) {
diff --git a/work_add.php b/work_add.php
index d98ed8242..646368aeb 100644
--- a/work_add.php
+++ b/work_add.php
@@ -83,8 +83,8 @@
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
     $fields = array('subject'=>$cl_name,
-      'short_description' => $cl_description,
-      'long_description' => $cl_details,
+      'descr_short' => $cl_description,
+      'descr_long' => $cl_details,
       'currency' => $cl_currency,
       'amount' => $cl_budget);
      $id = $workHelper->putWork($fields);

From fc97c6d187f13c762dabcf9d446bf6e33adc6fd1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 15 Sep 2019 18:10:16 +0000
Subject: [PATCH 1031/1848] Some progress on delete work feature.

---
 WEB-INF/lib/ttWorkHelper.class.php | 64 ++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         |  2 +-
 work_add.php                       |  2 +-
 work_delete.php                    | 79 ++++++++++++++++++++++++++++++
 5 files changed, 146 insertions(+), 3 deletions(-)
 create mode 100644 work_delete.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 80bf43587..5d591aa86 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -251,6 +251,70 @@ function getActiveWork() {
     return $active_work;
   }
 
+  // getWork - gets work item details from remote work server.
+  function getWork($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($work_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    $error = curl_error();
+    $result_array2 = json_decode($result, true);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.file_storage'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+    $status = (int) $result_array['status'];
+    $error = $result_array['error'];
+
+    if ($error) {
+      // Add an error from file storage facility if we have it.
+      $this->errors->add($error);
+      return false;
+    }
+    if ($status != 1) {
+      // There is no explicit error message, but still something not right.
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $this->file_data = $result_array['content'];
+    return true;
+  }
+
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9d8f436f4..1873202f0 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.19.9.5068 | 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.9.5069 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 3494b66a9..64c14ed53 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -22,7 +22,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
-          <td>{$work_item.amount}</td>
+          <td>{$work_item.currency} {$work_item.amount}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
diff --git a/work_add.php b/work_add.php
index 646368aeb..ed879ef52 100644
--- a/work_add.php
+++ b/work_add.php
@@ -85,7 +85,7 @@
     $fields = array('subject'=>$cl_name,
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
-      'currency' => $cl_currency,
+      'currency' => $currencies[$cl_currency - 1]['name'],
       'amount' => $cl_budget);
      $id = $workHelper->putWork($fields);
      if ($id) {
diff --git a/work_delete.php b/work_delete.php
new file mode 100644
index 000000000..23dbcf1de
--- /dev/null
+++ b/work_delete.php
@@ -0,0 +1,79 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getWork($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$task_to_delete = $task['name'];
+
+$form = new Form('taskDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if(ttTaskHelper::get($cl_task_id)) {
+      if (ttTaskHelper::delete($cl_task_id)) {
+        header('Location: tasks.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: tasks.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('task_to_delete', $task_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_task'));
+$smarty->assign('content_page_name', 'task_delete.tpl');
+$smarty->display('index.tpl');

From 7f96e371a1dcced881245725976edc5246e1665a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 16 Sep 2019 12:12:06 +0000
Subject: [PATCH 1032/1848] Fixed reports by adding filtering for text custom
 field values.

---
 WEB-INF/lib/ttReportHelper.class.php | 18 ++++++++++++++++--
 WEB-INF/templates/footer.tpl         |  2 +-
 work_delete.php                      |  2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 8ba393b25..5d36b6b8e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -83,6 +83,7 @@ static function getWhere($options) {
     if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
     if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
+
     // Add time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -94,6 +95,20 @@ static function getWhere($options) {
         }
       }
     }
+
+    // Prepare part for text custom fields using LIKE operator.
+    $cf_text_parts = null;
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        $field_value = $options[$field_name];
+        if ($timeField['type'] == CustomFields::TYPE_TEXT && $field_value) {
+          $cflTableName = 'cfl'.$timeField['id'];
+          $cf_text_parts .= " and $cflTableName.value like ".$mdb2->quote("%$field_value%");
+        }
+      }
+    }
+
     // Add user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
@@ -106,8 +121,7 @@ static function getWhere($options) {
       }
     }
 
-    // Prepare part for text custom fields using LIKE operator.
-    $cf_text_parts = null;
+    // Continue preparing part for text custom fields using LIKE operator.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1873202f0..fbb5c31b1 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.19.9.5069 | 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.10.5070 | 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/work_delete.php b/work_delete.php
index 23dbcf1de..63acf327b 100644
--- a/work_delete.php
+++ b/work_delete.php
@@ -48,6 +48,8 @@
 }
 // End of access checks.
 
+// TODO: coding ongoing down from here...
+
 $task_to_delete = $task['name'];
 
 $form = new Form('taskDeleteForm');

From 39c8e8311de0b1c993c742e232ec6b0e20424bdc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Sep 2019 15:01:37 +0000
Subject: [PATCH 1033/1848] Wrote deleteWork part for Remote Work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 99 ++++++++++++++++++++++--------
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work_delete.tpl  | 20 ++++++
 work_delete.php                    | 26 ++++----
 4 files changed, 104 insertions(+), 43 deletions(-)
 create mode 100644 WEB-INF/templates/work_delete.tpl

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 5d591aa86..c8d8944c1 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -26,6 +26,7 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
+define('TT_CURL_SUCCESS', 1);
 
 // Class ttWorkHelper is used to help with operations with the Remote work plugin.
 class ttWorkHelper {
@@ -232,22 +233,15 @@ function getActiveWork() {
 
     $result_array = json_decode($result, true);
 
-    // TODO: check for errors here.
-
-    $active_work = $result_array['active_work'];
-
-    // TODO: construct a list of active work items to return.
-    //$work_id = (int) $result_array['work_id'];
-    //$error = $result_array['error'];
-/*
-    if ($error || !$work_id) {
-      if ($error) {
-        // Add an error from remote work server if we have it.
-        $this->errors->add($error);
-      }
+    // Check for error.
+    $error = $result_array['error'];
+    if ($error) {
+      // Add an error from remote work server.
+      $this->errors->add($error);
       return false;
     }
-*/
+
+    $active_work = $result_array['active_work'];
     return $active_work;
   }
 
@@ -284,37 +278,88 @@ function getWork($work_id) {
     // Execute a post request.
     $result = curl_exec($ch);
 
-    $error = curl_error();
-    $result_array2 = json_decode($result, true);
-
     // Close connection.
     curl_close($ch);
 
     if (!$result) {
-      $this->errors->add($i18n->get('error.file_storage'));
+      $this->errors->add($i18n->get('error.remote_work'));
       return false;
     }
 
     $result_array = json_decode($result, true);
-    $status = (int) $result_array['status'];
-    $error = $result_array['error'];
 
-    if ($error) {
-      // Add an error from file storage facility if we have it.
-      $this->errors->add($error);
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
       return false;
     }
-    if ($status != 1) {
-      // There is no explicit error message, but still something not right.
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+      return false;
+    }
+
+    $work_item = $result_array['work_item'];
+    return $work_item;
+  }
+
+  // deleteWork - deletes work item from remote work server.
+  function deleteWork($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($work_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->delete_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
       $this->errors->add($i18n->get('error.remote_work'));
       return false;
     }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+      return false;
+    }
 
-    $this->file_data = $result_array['content'];
     return true;
   }
 
-
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fbb5c31b1..8d5555820 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.19.10.5070 | 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.10.5071 | 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/work_delete.tpl b/WEB-INF/templates/work_delete.tpl
new file mode 100644
index 000000000..2831b0f15
--- /dev/null
+++ b/WEB-INF/templates/work_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.workDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$work_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.workDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.workDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workDeleteForm.close}
diff --git a/work_delete.php b/work_delete.php
index 63acf327b..9ba7b9a87 100644
--- a/work_delete.php
+++ b/work_delete.php
@@ -50,32 +50,28 @@
 
 // TODO: coding ongoing down from here...
 
-$task_to_delete = $task['name'];
+$work_to_delete = $work_item['subject'];
 
-$form = new Form('taskDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
+$form = new Form('workDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttTaskHelper::get($cl_task_id)) {
-      if (ttTaskHelper::delete($cl_task_id)) {
-        header('Location: tasks.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.db'));
+    if ($workHelper->deleteWork($cl_work_id)) {
+      header('Location: work.php');
+      exit();
+    }
   } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: tasks.php');
+    header('Location: work.php');
     exit();
   }
 } // isPost
 
-$smarty->assign('task_to_delete', $task_to_delete);
+$smarty->assign('work_to_delete', $work_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_task'));
-$smarty->assign('content_page_name', 'task_delete.tpl');
+$smarty->assign('title', $i18n->get('title.delete_work'));
+$smarty->assign('content_page_name', 'work_delete.tpl');
 $smarty->display('index.tpl');

From 2d530728037081f274d188137f11bbd0c60889ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Sep 2019 16:27:08 +0000
Subject: [PATCH 1034/1848] Added a check for non-empty budget on work_add.php.

---
 WEB-INF/lib/ttWorkHelper.class.php | 28 ++++++++++++++++------------
 WEB-INF/templates/footer.tpl       |  2 +-
 work_add.php                       |  1 +
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index c8d8944c1..fc20994a7 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -176,14 +176,15 @@ function putWork($fields) {
     }
 
     $result_array = json_decode($result, true);
-    $work_id = (int) $result_array['work_id'];
-    $error = $result_array['error'];
 
-    if ($error || !$work_id) {
-      if ($error) {
-        // Add an error from remote work server if we have it.
-        $this->errors->add($error);
-      }
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
       return false;
     }
 
@@ -233,11 +234,14 @@ function getActiveWork() {
 
     $result_array = json_decode($result, true);
 
-    // Check for error.
-    $error = $result_array['error'];
-    if ($error) {
-      // Add an error from remote work server.
-      $this->errors->add($error);
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
       return false;
     }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8d5555820..36caaefe6 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.19.10.5071 | 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.10.5072 | 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/work_add.php b/work_add.php
index ed879ef52..b40e15f95 100644
--- a/work_add.php
+++ b/work_add.php
@@ -79,6 +79,7 @@
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
 
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);

From b9f0941a16201dc88eea9e7d39e0de2a7da5ec69 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Sep 2019 17:28:35 +0000
Subject: [PATCH 1035/1848] Refactored registration code with Remote Work
 server.

---
 WEB-INF/lib/ttWorkHelper.class.php | 25 ++++++++++++++++++-------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index fc20994a7..f9cb0ba74 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -96,17 +96,28 @@ function checkSiteRegistration() {
       // Close connection.
       curl_close($ch);
 
+      if (!$result) {
+        $this->errors->add($i18n->get('error.remote_work'));
+        return false;
+      }
+
       $result_array = json_decode($result, true);
-      if (!$result_array) {
+
+      // Check for errors.
+      $call_status = $result_array['call_status'];
+      if (!$call_status) {
         $this->errors->add($i18n->get('error.remote_work'));
+        return false;
       }
-      else if ($result_array['error']) {
-        // Add an error from remote work server if we have it.
-        $this->errors->add($result_array['error']);
+      if ($call_status['code'] != TT_CURL_SUCCESS) {
+        $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+        return false;
       }
-      else if ($result_array['id'] && $result_array['key']) {
-        $this->site_id = $result_array['id'];
-        $this->site_key = $result_array['key'];
+
+      $reg_status = $result_array['reg_status']; // Registration status.
+      if ($reg_status['site_id'] && $reg_status['site_key']) {
+        $this->site_id = $reg_status['site_id'];
+        $this->site_key = $reg_status['site_key'];
 
         // Registration successful. Store id and key locally for future use.
         $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 36caaefe6..299e87d1e 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.19.10.5072 | 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.10.5073 | 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>

From c055372b354325440b2dc235dd6961be8736e4dc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Sep 2019 20:25:19 +0000
Subject: [PATCH 1036/1848] Added language to an API call.

---
 WEB-INF/lib/ttWorkHelper.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index f9cb0ba74..b30f04d37 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -64,8 +64,8 @@ function __construct(&$errors) {
   // checkSiteRegistration - obtains site id and key from local database.
   // If not found, it tries to register with remote work server.
   function checkSiteRegistration() {
-
     global $i18n;
+    global $user;
     $mdb2 = getConnection();
 
     // Obtain site id.
@@ -74,7 +74,8 @@ function checkSiteRegistration() {
     $val = $res->fetchRow();
     if (!$val) {
       // No site id found, need to register.
-      $fields = array('name' => urlencode('time tracker'),
+      $fields = array('lang' => urlencode($user->lang),
+        'name' => urlencode('time tracker'),
         'origin' => urlencode('time tracker source'));
 
       // Urlify the data for the POST.

From 46307636f3f7d4906b789d17c7b6e37f01b266ca Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Sep 2019 23:30:22 +0000
Subject: [PATCH 1037/1848] Integrated some German strings from pr#81, the ones
 that seemed okay to do. Put clarifying comments for others.

---
 WEB-INF/resources/de.lang.php | 44 +++++++++++++++++------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 54321626f..4920b8bc7 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -38,6 +38,7 @@
 
 // Menus - short selection strings that are displayed on top of application web pages.
 // Example: https://timetracker.anuko.com (black menu on top).
+// Note to translators: try to keep menu strings short so that we don't run out of display room.
 'menu.login' => 'Anmelden',
 'menu.logout' => 'Abmelden',
 'menu.forum' => 'Forum',
@@ -48,8 +49,7 @@
 'menu.group' => 'Gruppe',
 'menu.plugins' => 'Erweiterungen',
 'menu.time' => 'Zeiten',
-// TODO: translate the following.
-// 'menu.week' => 'Week',
+'menu.week' => 'Woche',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
 // TODO: translate the following.
@@ -115,13 +115,12 @@
 // 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
+'warn.sure' => 'Sind Sie sicher?',
 // TODO: translate the following.
-// 'warn.sure' => 'Are you sure?',
 // 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
 
 // Success messages.
-// TODO: translate the following.
-// 'msg.success' => 'Operation completed successfully.',
+'msg.success' => 'Operation vollständig abgeschlossen.',
 
 // Labels for buttons.
 'button.login' => 'Anmelden',
@@ -142,7 +141,9 @@
 'button.close' => 'Schließen',
 'button.stop' => 'Stop',
 // TODO: translate the following.
-// 'button.approve' => 'Approve',
+// (PR#81 suggested 'Freigeben / Genehmigen' for 'Approve' and 'Freigabe zurücknehmen' for 'Disapprove'.
+// The problem is they do not appear precise, deviate from the meaning of approval / disaproval of report items.)
+// 'button.approve' => 'Approve', (suggested 'Freigeben / Genehmigen' does not appear precise)
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
@@ -223,8 +224,7 @@
 'label.condition' => 'Bedingung',
 'label.yes' => 'Ja',
 'label.no' => 'Nein',
-// TODO: translate the following.
-// 'label.sort' => 'Sort',
+'label.sort' => 'Sortieren',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Benutzerfelder',
 'label.monthly_quotas' => 'Monatliche Quoten',
@@ -242,7 +242,7 @@
 'label.paid_status' => 'Bezahlstatus',
 'label.paid' => 'Bezahlt',
 'label.mark_paid' => 'Als bezahlt setzen',
-// 'label.week_menu' => 'Week menu',
+'label.week_menu' => 'Wochenansicht im Menü',
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
 'label.work_units' => 'Arbeitseinheiten',
@@ -263,9 +263,12 @@
 // 'label.download' => 'Download',
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
-// TODO: translate the following.
+// TODO: translate the following or confirm that "Details" is also correct for German (exactly as the English string).
+// label.details is used to identify a field for LONG DESCRIPTION of a work item used in Remote Work plugin.
+// For example, a work item could be "Design a logo", and the Details hold EXACT anfd PRECISE specs of what a customer needs.
+// Another use is with offers with Remote Work plugin, where details hold a long, precise, and complete description of the offer.
 // 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
+'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
@@ -276,8 +279,7 @@
 
 // Form titles.
 'title.error' => 'Fehler',
-// TODO: Translate the following.
-// 'title.success' => 'Success',
+'title.success' => 'Erfol',
 'title.login' => 'Anmelden',
 'title.groups' => 'Gruppen',
 // TODO: translate the following.
@@ -306,8 +308,7 @@
 'title.send_invoice' => 'Rechnung senden',
 'title.charts' => 'Diagramme',
 'title.projects' => 'Projekte',
-// TODO: translate the following.
-// 'title.project_files' => 'Project Files',
+'title.project_files' => 'Projekt-Dateien',
 'title.add_project' => 'Projekt anlegen',
 'title.edit_project' => 'Projekt bearbeiten',
 'title.delete_project' => 'Projekt löschen',
@@ -343,8 +344,7 @@
 'title.export' => 'Daten exportieren',
 'title.import' => 'Daten importieren',
 'title.options' => 'Optionen',
-// TODO: translate the following.
-// 'title.display_options' => 'Display Options',
+'title.display_options' => 'Anzeige-Optionen',
 'title.profile' => 'Profil',
 'title.plugins' => 'Erweiterungen',
 'title.cf_custom_fields' => 'Benutzerfelder',
@@ -551,9 +551,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 Stunden',
 'form.group_edit.24_hours' => '24 Stunden',
-// TODO: translate the following.
-// 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.holidays' => 'Holidays',
+'form.group_edit.display_options' => 'Anzeige-Optionen',
+'form.group_edit.holidays' => 'Feiertage',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',
 'form.group_edit.mode_projects' => 'Projekte',
@@ -566,8 +565,7 @@
 'form.group_edit.allow_overlap' => 'Erlaube Überschneidung',
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
-// TODO: translate the following.
-// 'form.group_edit.confirm_save' => 'Confirm saving',
+'form.group_edit.confirm_save' => 'Speichern bestätigen',
 'form.group_edit.allow_ip' => 'Erlaube IP',
 // TODO: translate the following.
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
@@ -634,5 +632,5 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
-// 'form.display_options.note_on_separate_row' => 'Note on separate row',
+'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 299e87d1e..23932842c 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.19.10.5073 | 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.10.5074 | 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>

From be00bf4ec152de93bd24cbbead8c205c8f4233cb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 18 Sep 2019 12:38:40 +0000
Subject: [PATCH 1038/1848] Added language identifier to API calls for
 localized error messages back.

---
 WEB-INF/lib/ttWorkHelper.class.php | 13 ++++++++-----
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index b30f04d37..5c83eabcc 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -149,13 +149,13 @@ function putWork($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $curl_fields = array('site_id' => urlencode($this->site_id),
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
-      'lang' => urlencode($user->lang),
       'subject' => urlencode($fields['subject']),
       'descr_short' => urlencode($fields['descr_short']),
       'descr_long' => urlencode($fields['descr_long']),
@@ -212,7 +212,8 @@ function getActiveWork() {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $curl_fields = array('site_id' => urlencode($this->site_id),
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
@@ -270,7 +271,8 @@ function getWork($work_id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $curl_fields = array('site_id' => urlencode($this->site_id),
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
@@ -328,7 +330,8 @@ function deleteWork($work_id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $curl_fields = array('site_id' => urlencode($this->site_id),
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 23932842c..5a1d83f4d 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.19.10.5074 | 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.10.5075 | 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>

From 85e51ff5f889333e5f8e61639545bfa490350230 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 18 Sep 2019 12:48:19 +0000
Subject: [PATCH 1039/1848] A bit more refactoring.

---
 WEB-INF/lib/ttWorkHelper.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 5c83eabcc..3406ea0aa 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -111,7 +111,7 @@ function checkSiteRegistration() {
         return false;
       }
       if ($call_status['code'] != TT_CURL_SUCCESS) {
-        $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+        $this->errors->add($call_status['error']);
         return false;
       }
 
@@ -196,7 +196,7 @@ function putWork($fields) {
       return false;
     }
     if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+      $this->errors->add($call_status['error']);
       return false;
     }
 
@@ -254,7 +254,7 @@ function getActiveWork() {
       return false;
     }
     if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+      $this->errors->add($call_status['error']);
       return false;
     }
 
@@ -313,7 +313,7 @@ function getWork($work_id) {
       return false;
     }
     if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+      $this->errors->add($call_status['error']);
       return false;
     }
 
@@ -372,7 +372,7 @@ function deleteWork($work_id) {
       return false;
     }
     if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error_localized'] ? $call_status['error_localized'] : $call_status['error']);
+      $this->errors->add($call_status['error']);
       return false;
     }
 

From 829e4d4ac734c1489dbc67b1740d1baa99711f4e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 12:13:27 +0000
Subject: [PATCH 1040/1848] More progress on Remote Work plugin, implemented
 update work.

---
 WEB-INF/lib/ttWorkHelper.class.php |  97 ++++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl       |   2 +-
 WEB-INF/templates/work_edit.tpl    |  47 +++++++++++++
 work_add.php                       |  17 ++---
 work_delete.php                    |   2 +-
 work_edit.php                      | 107 +++++++++++++++++++++++++++++
 6 files changed, 250 insertions(+), 22 deletions(-)
 create mode 100644 WEB-INF/templates/work_edit.tpl
 create mode 100644 work_edit.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 3406ea0aa..7cc868c33 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -28,7 +28,8 @@
 
 define('TT_CURL_SUCCESS', 1);
 
-// Class ttWorkHelper is used to help with operations with the Remote work plugin.
+// Class ttWorkHelper is used to help with operations with the Remote Work plugin.
+// It does everything via curl calls to a Remote Work server using its API.
 class ttWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
   var $remote_work_uri = null;   // Location of remote work server.
@@ -47,9 +48,14 @@ class ttWorkHelper {
   function __construct(&$errors) {
     $this->errors = &$errors;
 
+    // Note: at some point a need will arise for API versioning.
+    // When this happens, we will append an API version number to the end of URI,
+    // for example: register_0_1 instead of register.
+    // This should theoretically allow a remote work server to be able to work with
+    // a complete variety of deployed clients, including those without versions.
     if (defined('REMOTE_WORK_URI')) {
       $this->remote_work_uri = REMOTE_WORK_URI;
-      $this->register_uri = $this->remote_work_uri.'register';
+      $this->register_uri = $this->remote_work_uri.'register'; // register_0_0
       $this->put_work_uri = $this->remote_work_uri.'putwork';
       $this->get_work_uri = $this->remote_work_uri.'getwork';
       $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
@@ -141,6 +147,20 @@ function checkSiteRegistration() {
   }
 
   // putWork - publishes a work item in remote work server.
+  //
+  // Note about some fields using additional base64 encoding.
+  // There is a problem with data posted by curl calls on the server side for
+  // some languages. Data arrives corrupted.
+  //
+  // For example: consider a case for a single Russian letter ф in the subject field.
+  // UTF-8 encoding for ф: 0xD1 0x84 (2 bytes).
+  // urlencoded ф: %D1%84 - a string of 6 characters.
+  // If we use a curl call like here with only urlencoded ф, what arrives on the server in POST is "C3 91 C2 84"
+  // no idea what it is.
+  //
+  // A workaround for now is to use use an additional base64 encoding for all text fields,
+  // which are decoded back to utf-8 strings on the server side.
+
   function putWork($fields) {
     global $i18n;
     global $user;
@@ -148,7 +168,6 @@ function putWork($fields) {
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
-
     $curl_fields = array('lang' => urlencode($user->lang),
       'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
@@ -156,9 +175,9 @@ function putWork($fields) {
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
-      'subject' => urlencode($fields['subject']),
-      'descr_short' => urlencode($fields['descr_short']),
-      'descr_long' => urlencode($fields['descr_long']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
       'amount' => urlencode($fields['amount'])
     );
@@ -203,6 +222,70 @@ function putWork($fields) {
     return true;
   }
 
+  // updateWork - updates a work item in remote work server.
+  function updateWork($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($fields['work_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount'])
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->update_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getActiveWork - obtains a list of work items this group is currently oputsourcing.
   function getActiveWork() {
     global $i18n;
@@ -388,7 +471,7 @@ static function getCurrencies() {
     if (is_a($res, 'PEAR_Error')) return false;
 
     while ($val = $res->fetchRow()) {
-      $result[] = $val;
+      $result[] = $val['name'];
     }
     return $result;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5a1d83f4d..d287e2253 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.19.10.5075 | 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.10.5076 | 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/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
new file mode 100644
index 000000000..792457226
--- /dev/null
+++ b/WEB-INF/templates/work_edit.tpl
@@ -0,0 +1,47 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.workForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/work_add.php b/work_add.php
index b40e15f95..413546864 100644
--- a/work_add.php
+++ b/work_add.php
@@ -28,9 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttProjectHelper');
-import('ttGroupHelper');
-import('ttFileHelper');
 import('ttWorkHelper');
 
 // Access checks.
@@ -58,11 +55,9 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
-if ($showFiles)
-  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -86,10 +81,9 @@
     $fields = array('subject'=>$cl_name,
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
-      'currency' => $currencies[$cl_currency - 1]['name'],
+      'currency' => $currencies[$cl_currency],
       'amount' => $cl_budget);
-     $id = $workHelper->putWork($fields);
-     if ($id) {
+     if ($workHelper->putWork($fields)) {
         header('Location: work.php');
         exit();
     }
@@ -97,10 +91,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', $show_tasks);
+$smarty->assign('onload', 'onLoad="document.workForm.work_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_work'));
 $smarty->assign('content_page_name', 'work_add.tpl');
 $smarty->display('index.tpl');
diff --git a/work_delete.php b/work_delete.php
index 9ba7b9a87..c0cd443d2 100644
--- a/work_delete.php
+++ b/work_delete.php
@@ -71,7 +71,7 @@
 
 $smarty->assign('work_to_delete', $work_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
+$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_work'));
 $smarty->assign('content_page_name', 'work_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/work_edit.php b/work_edit.php
new file mode 100644
index 000000000..094e2058b
--- /dev/null
+++ b/work_edit.php
@@ -0,0 +1,107 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getWork($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('work_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+} else {
+  $cl_name = $work_item['subject'];
+  $cl_description = $work_item['descr_short'];
+  $cl_details = $work_item['descr_long'];
+  $currency = $work_item['currency'];
+  $cl_currency = array_search($currency, $currencies);
+  $cl_budget = $work_item['amount'];
+}
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+// TODO: coding ongoing down from here...
+
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update work information.
+      $fields = array('work_id'=>$cl_work_id,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => $currencies[$cl_currency],
+        'amount' => $cl_budget);
+      if ($workHelper->updateWork($fields)) {
+        header('Location: work.php');
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_work'));
+$smarty->assign('content_page_name', 'work_edit.tpl');
+$smarty->display('index.tpl');

From 400e8952256f8506c87d8253d757798309106d84 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 13:37:51 +0000
Subject: [PATCH 1041/1848] Added offer_add.php and code to support it.

---
 WEB-INF/lib/ttWorkHelper.class.php | 80 +++++++++++++++++++++++++--
 WEB-INF/resources/ca.lang.php      |  3 ++
 WEB-INF/resources/cs.lang.php      |  3 ++
 WEB-INF/resources/da.lang.php      |  3 ++
 WEB-INF/resources/de.lang.php      |  3 ++
 WEB-INF/resources/en.lang.php      |  3 ++
 WEB-INF/resources/es.lang.php      |  3 ++
 WEB-INF/resources/et.lang.php      |  3 ++
 WEB-INF/resources/fa.lang.php      |  3 ++
 WEB-INF/resources/fi.lang.php      |  3 ++
 WEB-INF/resources/fr.lang.php      |  3 ++
 WEB-INF/resources/gr.lang.php      |  3 ++
 WEB-INF/resources/he.lang.php      |  3 ++
 WEB-INF/resources/hu.lang.php      |  3 ++
 WEB-INF/resources/it.lang.php      |  3 ++
 WEB-INF/resources/ja.lang.php      |  3 ++
 WEB-INF/resources/ko.lang.php      |  3 ++
 WEB-INF/resources/nl.lang.php      |  4 ++
 WEB-INF/resources/no.lang.php      |  3 ++
 WEB-INF/resources/pl.lang.php      |  3 ++
 WEB-INF/resources/pt-br.lang.php   |  3 ++
 WEB-INF/resources/pt.lang.php      |  3 ++
 WEB-INF/resources/ro.lang.php      |  3 ++
 WEB-INF/resources/ru.lang.php      |  3 ++
 WEB-INF/resources/sk.lang.php      |  3 ++
 WEB-INF/resources/sl.lang.php      |  3 ++
 WEB-INF/resources/sr.lang.php      |  3 ++
 WEB-INF/resources/sv.lang.php      |  3 ++
 WEB-INF/resources/tr.lang.php      |  3 ++
 WEB-INF/resources/zh-cn.lang.php   |  3 ++
 WEB-INF/resources/zh-tw.lang.php   |  3 ++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/offer_add.tpl    | 47 ++++++++++++++++
 offer_add.php                      | 87 ++++++++++++++++++++++++++++++
 work_add.php                       |  2 -
 35 files changed, 302 insertions(+), 7 deletions(-)
 create mode 100644 WEB-INF/templates/offer_add.tpl
 create mode 100644 offer_add.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 7cc868c33..465f06cbf 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -34,13 +34,19 @@ class ttWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
   var $remote_work_uri = null;   // Location of remote work server.
   var $register_uri = null;      // URI to register with remote work server.
-  var $put_work_uri = null;      // URI to publish offer.
-  var $get_work_uri = null;      // URI to get offer details.
+  var $put_work_uri = null;      // URI to publish work.
+  var $get_work_uri = null;      // URI to get work details.
   var $get_active_work_uri = null;    // URI to get active work for group.
   var $get_available_work_uri = null; // URI to get available work for group.
-  var $delete_work_uri = null;   // URI to delete eotk.
+  var $delete_work_uri = null;   // URI to delete work.
   // TODO: design how (and what) to delete when a group is deleted.
   var $update_work_uri = null;  // URI to update work.
+  var $put_offer_uri = null;     // URI to publish offer.
+  var $get_offer_uri = null;     // URI to get offer details.
+  var $get_active_offers_uri = null;    // URI to get active offers.
+  var $get_available_offers_uri = null; // URI to get available offers.
+  var $delete_offer_uri = null;  // URI to delete offer.
+  var $delete_offers_uri = null; // URI to delete multiple offers.
   var $site_id = null;           // Site id for remote work server.
   var $site_key = null;          // Site key for remote work server.
 
@@ -60,9 +66,14 @@ function __construct(&$errors) {
       $this->get_work_uri = $this->remote_work_uri.'getwork';
       $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
       $this->get_avaialable_work_uri = $this->remote_work_uri.'getavailablework';
-
       $this->delete_work_uri = $this->remote_work_uri.'deletework';
       $this->update_work_uri = $this->remote_work_uri.'updatework';
+      $this->put_offer_uri = $this->remote_work_uri.'putoffer';
+      $this->get_offer_uri = $this->remote_work_uri.'getoffer';
+      $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
+      $this->get_avaialable_offers_uri = $this->remote_work_uri.'getavailableoffers';
+      $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
+      $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
       $this->checkSiteRegistration();
     }
   }
@@ -462,6 +473,67 @@ function deleteWork($work_id) {
     return true;
   }
 
+  function putOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount'])
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->put_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 2730902a0..1a7c60d95 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -406,6 +406,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1ba723029..26d23341d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -416,6 +416,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index de3b796be..7baf95e85 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -388,6 +388,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 4920b8bc7..74095a635 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -373,6 +373,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index c95b60eeb..5789f8fc2 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -355,6 +355,9 @@
 'title.delete_work' => 'Deleting Work',
 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+'title.add_offer' => 'Adding Offer',
+'title.edit_offer' => 'Editing Offer',
+'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d36d6421e..55c2875f8 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -405,6 +405,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 39c447848..ce318aaa3 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -396,6 +396,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 33b0e6847..d3a5aa285 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -397,6 +397,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 59fca15fa..695401a2b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -388,6 +388,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a1a50a9e9..fa9cfc391 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -382,6 +382,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e40932a29..7e871bcd2 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -381,6 +381,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2412d630a..ea67f691b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -405,6 +405,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 2c81071f7..e596323c8 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -406,6 +406,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 86843eb05..c3c7c25f5 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -391,6 +391,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 2a4568ec3..a0ad03dca 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -412,6 +412,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b9a39d3bf..cd245b045 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -413,6 +413,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a2f3cd1ad..e1a2b62d4 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -361,6 +361,10 @@
 'title.delete_work' => 'Werk verwijderen',
 'title.active_work' => 'Actief werk',
 'title.inactive_work' => 'Inactief werk',
+// TODO: translate the following.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index bb3bd2511..66ea8f183 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -409,6 +409,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index be92051e6..ef55444c8 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -391,6 +391,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d479a4d65..02a29d94e 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -386,6 +386,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 46e1d6eac..4c295c61b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -393,6 +393,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e2221d7cb..38f2a9f1d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -411,6 +411,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index aeb571010..71197becb 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -352,6 +352,9 @@
 'title.delete_work' => 'Удаление работы',
 'title.active_work' => 'Активная работа',
 'title.inactive_work' => 'Неактивная работа',
+'title.add_offer' => 'Добавление предложения',
+'title.edit_offer' => 'Редактирование предложения',
+'title.delete_offer' => 'Удаление предложения',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d853bafc7..2bd2d1c7c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -395,6 +395,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index bb139505e..ba79fb985 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -386,6 +386,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 318eb0ffe..c3ab03bf3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -389,6 +389,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 8fd08e23a..297ae5235 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -390,6 +390,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4bbaff7e8..2ba7259a9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -420,6 +420,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 29206c3b4..a4fb87c76 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -401,6 +401,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6745e889d..08e2e1efc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -406,6 +406,9 @@
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.add_offer' => 'Adding Offer',
+// 'title.edit_offer' => 'Editing Offer',
+// 'title.delete_offer' => 'Deleting Offer',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d287e2253..3b7960b8d 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.19.10.5076 | 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.10.5077 | 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/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
new file mode 100644
index 000000000..3051e9664
--- /dev/null
+++ b/WEB-INF/templates/offer_add.tpl
@@ -0,0 +1,47 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.offerForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.offerForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/offer_add.php b/offer_add.php
new file mode 100644
index 000000000..0eeb04536
--- /dev/null
+++ b/offer_add.php
@@ -0,0 +1,87 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('offer_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+}
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+// Add a dropdown for currency.
+$currencies = ttWorkHelper::getCurrencies();
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('subject'=>$cl_name,
+      'descr_short' => $cl_description,
+      'descr_long' => $cl_details,
+      'currency' => $currencies[$cl_currency],
+      'amount' => $cl_budget);
+     if ($workHelper->putOffer($fields)) {
+        header('Location: work.php');
+        exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_offer'));
+$smarty->assign('content_page_name', 'offer_add.tpl');
+$smarty->display('index.tpl');
diff --git a/work_add.php b/work_add.php
index 413546864..211ac13a7 100644
--- a/work_add.php
+++ b/work_add.php
@@ -41,8 +41,6 @@
 }
 // End of access checks.
 
-$showFiles = $user->isPluginEnabled('at');
-
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));

From 76e46e2defece391363e29c5a1e22b116faca8af Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 13:59:17 +0000
Subject: [PATCH 1042/1848] Added more strings in translation files for Remote
 Work plugin.

---
 WEB-INF/lib/ttOfferHelper.class.php | 463 ----------------------------
 WEB-INF/resources/ca.lang.php       |   2 +
 WEB-INF/resources/cs.lang.php       |   2 +
 WEB-INF/resources/da.lang.php       |   2 +
 WEB-INF/resources/de.lang.php       |   2 +
 WEB-INF/resources/en.lang.php       |   4 +-
 WEB-INF/resources/es.lang.php       |   2 +
 WEB-INF/resources/et.lang.php       |   2 +
 WEB-INF/resources/fa.lang.php       |   2 +
 WEB-INF/resources/fi.lang.php       |   2 +
 WEB-INF/resources/fr.lang.php       |   2 +
 WEB-INF/resources/gr.lang.php       |   2 +
 WEB-INF/resources/he.lang.php       |   2 +
 WEB-INF/resources/hu.lang.php       |   2 +
 WEB-INF/resources/it.lang.php       |   2 +
 WEB-INF/resources/ja.lang.php       |   2 +
 WEB-INF/resources/ko.lang.php       |   2 +
 WEB-INF/resources/nl.lang.php       |   2 +
 WEB-INF/resources/no.lang.php       |   2 +
 WEB-INF/resources/pl.lang.php       |   2 +
 WEB-INF/resources/pt-br.lang.php    |   2 +
 WEB-INF/resources/pt.lang.php       |   2 +
 WEB-INF/resources/ro.lang.php       |   2 +
 WEB-INF/resources/ru.lang.php       |   2 +
 WEB-INF/resources/sk.lang.php       |   2 +
 WEB-INF/resources/sl.lang.php       |   2 +
 WEB-INF/resources/sr.lang.php       |   2 +
 WEB-INF/resources/sv.lang.php       |   2 +
 WEB-INF/resources/tr.lang.php       |   2 +
 WEB-INF/resources/zh-cn.lang.php    |   2 +
 WEB-INF/resources/zh-tw.lang.php    |   2 +
 WEB-INF/templates/footer.tpl        |   2 +-
 32 files changed, 62 insertions(+), 465 deletions(-)
 delete mode 100644 WEB-INF/lib/ttOfferHelper.class.php

diff --git a/WEB-INF/lib/ttOfferHelper.class.php b/WEB-INF/lib/ttOfferHelper.class.php
deleted file mode 100644
index 97a36e6aa..000000000
--- a/WEB-INF/lib/ttOfferHelper.class.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-// ttOfferHelper class is used for handling offers for the Remote work plugin.
-// An offer is a proposal to do something for compensation in selected currency
-// within a specified timeframe.
-class ttOfferHelper {
-  var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $remote_work_uri = null;   // Location of remote work server.
-  var $register_uri = null;      // URI to register with remote work server.
-  var $put_offer_uri = null;     // URI to publish offer.
-  var $get_offer_uri = null;     // URI to get offer details.
-  var $get_offers_uri = null;    // URI to get a list of offers.
-  var $delete_offer_uri = null;  // URI to delete offer.
-  var $delete_offers_uri = null; // URI to delete multiple offers.
-  var $update_offer_uri = null;  // URI to update offer.
-  var $site_id = null;           // Site id for remote work server.
-  var $site_key = null;          // Site key for remote work server.
-
-  // Constructor.
-  function __construct(&$errors) {
-    $this->errors = &$errors;
-
-    if (defined('REMOTE_WORK_URI')) {
-      $this->remote_work_uri = REMOTE_WORK_URI;
-      $this->register_uri = $this->remote_work_uri.'register';
-      $this->put_offer_uri = $this->remote_work_uri.'putoffer';
-      $this->get_offer_uri = $this->remote_work_uri.'getoffer';
-      $this->get_offers_uri = $this->remote_work_uri.'getoffers';
-      $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
-      $this->delete_offers_uri = $this->remote_work_uri.'deleteoffers';
-      $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
-      $this->checkSiteRegistration();
-    }
-  }
-
-  // checkSiteRegistration - obtains site id and key from local database.
-  // If not found, it tries to register with remote work server.
-  function checkSiteRegistration() {
-
-    global $i18n;
-    $mdb2 = getConnection();
-
-    // Obtain site id.
-    $sql = "select param_value as id from tt_site_config where param_name = 'worksite_id'";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    if (!$val) {
-      // No site id found, need to register.
-      $fields = array('name' => urlencode('time tracker'),
-        'origin' => urlencode('time tracker source'));
-
-      // Urlify the data for the POST.
-      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-      $fields_string = rtrim($fields_string, '&');
-
-      // Open connection.
-      $ch = curl_init();
-
-      // Set the url, number of POST vars, POST data.
-      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
-      curl_setopt($ch, CURLOPT_POST, true);
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-      // Execute a post request.
-      $result = curl_exec($ch);
-
-      // Close connection.
-      curl_close($ch);
-
-      $result_array = json_decode($result, true);
-      if (!$result_array) {
-        $this->errors->add($i18n->get('error.remote_work'));
-      }
-      else if ($result_array['error']) {
-        // Add an error from remote work server if we have it.
-        $this->errors->add($result_array['error']);
-      }
-      else if ($result_array['id'] && $result_array['key']) {
-        $this->site_id = $result_array['id'];
-        $this->site_key = $result_array['key'];
-
-        // Registration successful. Store id and key locally for future use.
-        $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
-        $mdb2->exec($sql);
-        $sql = "insert into tt_site_config values('worksite_key', ".$mdb2->quote($this->site_key).", now(), null)";
-        $mdb2->exec($sql);
-      } else {
-        $this->errors->add($i18n->get('error.remote_work'));
-      }
-    } else {
-      // Site id found.
-      $this->site_id = $val['id'];
-
-      // Obtain site key.
-      $sql = "select param_value as site_key from tt_site_config where param_name = 'worksite_key'";
-      $res = $mdb2->query($sql);
-      $val = $res->fetchRow();
-      $this->site_key = $val['site_key'];
-    }
-  }
-
-  // putOffer - publishes an offer in remote work server.
-  function putOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_lang' => urlencode($fields['offer_lang']),
-      'offer_subject' => urlencode($fields['offer_subject']),
-      'offer_descr_short' => urlencode($fields['offer_descr_short']),
-      'offer_descr_long' => urlencode($fields['offer_descr_long']),
-      'offer_currency' => urlencode($fields['offer_currency']),
-      'offer_amount' => urlencode($fields['offer_amount'])
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->put_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-    $offer_id = (int) $result_array['offer_id'];
-    $offer_key = $result_array['offer_key'];
-    $error = $result_array['error'];
-
-    if ($error || !$offer_id || !$offer_key) {
-      if ($error) {
-        // Add an error from remote work server if we have it.
-        $this->errors->add($error);
-      }
-      return false;
-    }
-
-    return true;
-  }
-
-
-  // getOffer - gets offer details from remote work server.
-  function getOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-// Do we need these here?
-//      'org_id' => urlencode($org_id),
-//      'org_key' => urlencode($user->getOrgKey()),
-//      'group_id' => urlencode($group_id),
-//      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($fields['remote_id']));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    $error = curl_error();
-    $result_array2 = json_decode($result, true);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-    $status = (int) $result_array['status'];
-    $error = $result_array['error'];
-
-    if ($error) {
-      // Add an error from remote work server if we have it.
-      $this->errors->add($error);
-      return false;
-    }
-    if ($status != 1) {
-      // There is no explicit error message, but still something not right.
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    // TODO: construct and return an array of fields here...
-    return true;
-  }
-
-  // TODO: redo the function above.
-  // Concerns: 1) why $result_array2
-  // 2) We need to return an array of fields.
-
-  
-  
-  
-  
-  
-  
-    // The following code is originally from ttFileHelper an needs to be redone.
-    // 
-  // deleteFile - deletes a file from remote storage and its details from local database.
-  function deleteFile($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'entity_type' => urlencode($fields['entity_type']),
-      'entity_id' => urlencode($fields['entity_id']),
-      'file_id' => urlencode($fields['remote_id']),
-      'file_key' => urlencode($fields['file_key']),
-      'file_name' => urlencode($fields['file_name']));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->deletefile_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.file_storage'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-    $status = (int) $result_array['status'];
-    $error = $result_array['error'];
-
-    if ($error) {
-      // Add an error from file storage facility if we have it.
-      $this->errors->add($error);
-    }
-    if ($status != 1) {
-      // There is no explicit error message, but still something not right.
-      $this->errors->add($i18n->get('error.file_storage'));
-    }
-
-    // Delete file reference from database even when remote file storage call fails.
-    // This is by design to keep things simple.
-    $file_id = (int) $fields['id'];
-    $entity_id = (int) $fields['entity_id'];
-    $sql = "delete from tt_files".
-      " where id = $file_id and org_id = $org_id and group_id = $group_id and entity_id = $entity_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) {
-      $this->errors->add($i18n->get('error.db'));
-      return false;
-    }
-
-    // File successfully deleted from both file storage and database.
-    return true;
-  }
-
-  // deleteEntityFiles - deletes all files associated with an entity.
-  function deleteEntityFiles($entity_id, $entity_type) {
-
-    if (!$this->entityHasFiles($entity_id, $entity_type))
-      return true; // No files to delete.
-
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'entity_type' => urlencode($entity_type),
-      'entity_id' => urlencode($entity_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->deletefiles_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.file_storage'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-    $status = (int) $result_array['status'];
-    $error = $result_array['error'];
-
-    if ($error) {
-      // Add an error from file storage facility if we have it.
-      $this->errors->add($error);
-    }
-    if ($status != 1) {
-      // There is no explicit error message, but still something not right.
-      $this->errors->add($i18n->get('error.file_storage'));
-    }
-
-    // Many things can go wrong with a remote call to file storage facility.
-    // By design, we ignore such errors, and proceed with removal of entity
-    // records from the database.
-
-    // Delete all entity records from the database.
-    $file_id = $fields['id'];
-    $sql = "delete from tt_files".
-      " where entity_id = $entity_id".
-      " and entity_type = ".$mdb2->quote($entity_type).
-      " and org_id = $org_id and group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) {
-      $this->errors->add($i18n->get('error.db'));
-      return false;
-    }
-
-    return true;
-  }
-
-  // entityHasFiles determines if an entity has any files referenced in database.
-  private function entityHasFiles($entity_id, $entity_type) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select id from tt_files where org_id = $org_id and group_id = $group_id".
-      " and entity_type = ".$mdb2->quote($entity_type)." and entity_id = $entity_id limit 1";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    return $val['id'] > 0;
-  }
-
-  // getEntityFiles obtains a list of files for an entity.
-  static function getEntityFiles($id, $type) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $result = array();
-    $entity_type = $mdb2->quote($type);
-    $sql = "select id, remote_id, file_key, file_name as name, description from tt_files".
-      " where entity_type = $entity_type and entity_id = $id".
-      " and group_id = $group_id and org_id = $org_id and status = 1 order by id";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
-
-  // getFileData - returns file data from memory.
-  function getFileData() {
-    return base64_decode($this->file_data);
-  }
-}
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1a7c60d95..39b4881a1 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -409,6 +409,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 26d23341d..46b5c6559 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -419,6 +419,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7baf95e85..2448eb183 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -391,6 +391,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 74095a635..835ffa1a6 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -376,6 +376,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5789f8fc2..6bf197ec1 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -354,10 +354,12 @@
 'title.edit_work' => 'Editing Work',
 'title.delete_work' => 'Deleting Work',
 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+'title.inactive_work' => 'Inactive Work', // Inactive work items for group.
 'title.add_offer' => 'Adding Offer',
 'title.edit_offer' => 'Editing Offer',
 'title.delete_offer' => 'Deleting Offer',
+'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 55c2875f8..163c1af7d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -408,6 +408,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ce318aaa3..ee7d347be 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -399,6 +399,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index d3a5aa285..6f9d89c61 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -400,6 +400,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 695401a2b..1854b5377 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -391,6 +391,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index fa9cfc391..3a75fbd46 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -385,6 +385,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 7e871bcd2..191b3922a 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -384,6 +384,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ea67f691b..22707536f 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -408,6 +408,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e596323c8..e2dfad562 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -409,6 +409,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index c3c7c25f5..d43a11ca6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -394,6 +394,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a0ad03dca..f75c758fa 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -415,6 +415,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index cd245b045..68a41f67f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -416,6 +416,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e1a2b62d4..f4e907f9b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -365,6 +365,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 66ea8f183..36ac91f18 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -412,6 +412,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ef55444c8..ad340131b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -394,6 +394,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 02a29d94e..755a225a1 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -389,6 +389,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 4c295c61b..c5f6ed04d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -396,6 +396,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 38f2a9f1d..3089e1cef 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -414,6 +414,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 71197becb..c94f08238 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -355,6 +355,8 @@
 'title.add_offer' => 'Добавление предложения',
 'title.edit_offer' => 'Редактирование предложения',
 'title.delete_offer' => 'Удаление предложения',
+'title.active_offers' => 'Активные предложения',
+'title.inactive_offers' => 'Неактивные предложения',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2bd2d1c7c..c997a4c5b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -398,6 +398,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ba79fb985..c7bc00e3d 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -389,6 +389,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c3ab03bf3..1ab52e1d4 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -392,6 +392,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 297ae5235..bd73925ea 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -393,6 +393,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2ba7259a9..15e175b39 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -423,6 +423,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a4fb87c76..b92c48bb2 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -404,6 +404,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 08e2e1efc..675f4bfcd 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -409,6 +409,8 @@
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
+// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3b7960b8d..b49044624 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.19.10.5077 | 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.10.5078 | 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>

From e1062654e68e3c7aa33a41c5ce0c64ef44b865d9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 15:07:56 +0000
Subject: [PATCH 1043/1848] Added display of active offers on work.php.

---
 WEB-INF/lib/ttWorkHelper.class.php | 63 +++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         | 17 ++++----
 work.php                           |  2 +
 4 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 465f06cbf..97aa08275 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -171,7 +171,6 @@ function checkSiteRegistration() {
   //
   // A workaround for now is to use use an additional base64 encoding for all text fields,
   // which are decoded back to utf-8 strings on the server side.
-
   function putWork($fields) {
     global $i18n;
     global $user;
@@ -297,7 +296,7 @@ function updateWork($fields) {
     return true;
   }
 
-  // getActiveWork - obtains a list of work items this group is currently oputsourcing.
+  // getActiveWork - obtains a list of work items this group is currently outsourcing.
   function getActiveWork() {
     global $i18n;
     global $user;
@@ -473,6 +472,7 @@ function deleteWork($work_id) {
     return true;
   }
 
+  // putOffer - publishes an offer in remote work server.
   function putOffer($fields) {
     global $i18n;
     global $user;
@@ -534,6 +534,65 @@ function putOffer($fields) {
     return true;
   }
 
+  // getActiveOffers - obtains a list of offers this group made available to other groups.
+  function getActiveOffers() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey())
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_active_offers_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $active_offers = $result_array['active_offers'];
+    return $active_offers;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b49044624..59fabd896 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.19.10.5078 | 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.10.5079 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 64c14ed53..2da8ee7a2 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -12,9 +12,6 @@
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
-    {if $show_files}
-          <td></td>
-    {/if}
           <td></td>
           <td></td>
         </tr>
@@ -39,20 +36,20 @@
       </table>
 
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.work.offers}</td></tr>
-  {if $available_offers}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
+  {if $active_offers}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td></td>
-    {/if}
+          <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
         </tr>
-    {foreach $available_offers as $offer}
+    {foreach $active_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.name|escape}</td>
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.currency} {$offer.amount}</td>
           <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
diff --git a/work.php b/work.php
index a124ee68e..b8a1795b6 100644
--- a/work.php
+++ b/work.php
@@ -47,6 +47,7 @@
   // $inactive_work = ttWorkHelper::getInactiveWork(); // Inactive work items this group was outsourcing.
 }
 if($user->can('bid_on_work')) {
+  $active_offers = $workHelper->getActiveOffers(); // Active offers this group makes available to other groups.
   // $available_work = ttWorkHelper::getAvailableWork(); // Currently available work items from other groups.
 }
 if($user->can('update_work')) {
@@ -61,6 +62,7 @@
 $smarty->assign('available_work', $available_work);
 $smarty->assign('in_progress_work', $in_progress_work);
 $smarty->assign('completed_work', $completed_work);
+$smarty->assign('active_offers', $active_offers);
 $smarty->assign('available_offers', $available_offers);
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'work.tpl');

From cbadf79d662c7e2a9833106ae5334207429d5655 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 15:53:07 +0000
Subject: [PATCH 1044/1848] Added code to edit offers.

---
 WEB-INF/lib/ttWorkHelper.class.php | 123 +++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |   2 +-
 WEB-INF/templates/offer_edit.tpl   |  41 ++++++++++
 offer_edit.php                     | 104 ++++++++++++++++++++++++
 work_edit.php                      |   3 -
 5 files changed, 269 insertions(+), 4 deletions(-)
 create mode 100644 WEB-INF/templates/offer_edit.tpl
 create mode 100644 offer_edit.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 97aa08275..fbbdbbf19 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -593,6 +593,129 @@ function getActiveOffers() {
     return $active_offers;
   }
 
+  // getOffer - gets offer details from remote work server.
+  function getOffer($offer_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($offer_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $offer = $result_array['offer'];
+    return $offer;
+  }
+
+  // updateOffer - updates an offer in remote work server.
+  function updateOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($fields['work_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount'])
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->update_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 59fabd896..899fecc56 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.19.10.5079 | 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.10.5080 | 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/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
new file mode 100644
index 000000000..a80c82d79
--- /dev/null
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -0,0 +1,41 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.offerForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/offer_edit.php b/offer_edit.php
new file mode 100644
index 000000000..5fc0010ed
--- /dev/null
+++ b/offer_edit.php
@@ -0,0 +1,104 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('bid_on_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('offer_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+} else {
+  $cl_name = $offer['subject'];
+  $cl_description = $offer['descr_short'];
+  $cl_details = $offer['descr_long'];
+  $currency = $offer['currency'];
+  $cl_currency = array_search($currency, $currencies);
+  $cl_budget = $offer['amount'];
+}
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update offer information.
+      $fields = array('work_id'=>$cl_offer_id,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => $currencies[$cl_currency],
+        'amount' => $cl_budget);
+      if ($workHelper->updateOffer($fields)) {
+        header('Location: work.php');
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_offer'));
+$smarty->assign('content_page_name', 'offer_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/work_edit.php b/work_edit.php
index 094e2058b..ac7a8b190 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -74,9 +74,6 @@
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
-// TODO: coding ongoing down from here...
-
-
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));

From 29f9ab1698af584dfdead22b956f48984b8ef8bc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 16:10:09 +0000
Subject: [PATCH 1045/1848] Added code to delete offers for Remote Work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 58 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/offer_delete.tpl | 20 ++++++++
 offer_delete.php                   | 75 ++++++++++++++++++++++++++++++
 work_delete.php                    |  2 -
 5 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 WEB-INF/templates/offer_delete.tpl
 create mode 100644 offer_delete.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index fbbdbbf19..1fa72036b 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -716,6 +716,64 @@ function updateOffer($fields) {
     return true;
   }
 
+  // deleteOffer - deletes an offer from remote work server.
+  function deleteOffer($offer_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($offer_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->delete_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 899fecc56..7034b34f7 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.19.10.5080 | 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.10.5081 | 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/offer_delete.tpl b/WEB-INF/templates/offer_delete.tpl
new file mode 100644
index 000000000..7d8954cfb
--- /dev/null
+++ b/WEB-INF/templates/offer_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.offerDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$offer_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.offerDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.offerDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerDeleteForm.close}
diff --git a/offer_delete.php b/offer_delete.php
new file mode 100644
index 000000000..f08c82a04
--- /dev/null
+++ b/offer_delete.php
@@ -0,0 +1,75 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('bid_on_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$offer_to_delete = $offer['subject'];
+
+$form = new Form('offerDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($workHelper->deleteOffer($cl_offer_id)) {
+      header('Location: work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('offer_to_delete', $offer_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_offer'));
+$smarty->assign('content_page_name', 'offer_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/work_delete.php b/work_delete.php
index c0cd443d2..e4a5e24d9 100644
--- a/work_delete.php
+++ b/work_delete.php
@@ -48,8 +48,6 @@
 }
 // End of access checks.
 
-// TODO: coding ongoing down from here...
-
 $work_to_delete = $work_item['subject'];
 
 $form = new Form('workDeleteForm');

From 17613c3e4d39279ffb447420377a3a55776724a8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 17:39:27 +0000
Subject: [PATCH 1046/1848] Added available work items from other orgs on the
 work.php page.

---
 WEB-INF/lib/ttWorkHelper.class.php | 58 +++++++++++++++++++++++++++++-
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  1 +
 WEB-INF/resources/de.lang.php      |  1 +
 WEB-INF/resources/en.lang.php      |  2 ++
 WEB-INF/resources/es.lang.php      |  1 +
 WEB-INF/resources/et.lang.php      |  1 +
 WEB-INF/resources/fa.lang.php      |  1 +
 WEB-INF/resources/fi.lang.php      |  1 +
 WEB-INF/resources/fr.lang.php      |  1 +
 WEB-INF/resources/gr.lang.php      |  1 +
 WEB-INF/resources/he.lang.php      |  1 +
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  1 +
 WEB-INF/resources/ja.lang.php      |  1 +
 WEB-INF/resources/ko.lang.php      |  1 +
 WEB-INF/resources/nl.lang.php      |  2 ++
 WEB-INF/resources/no.lang.php      |  1 +
 WEB-INF/resources/pl.lang.php      |  1 +
 WEB-INF/resources/pt-br.lang.php   |  1 +
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  1 +
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  1 +
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  1 +
 WEB-INF/resources/sv.lang.php      |  1 +
 WEB-INF/resources/tr.lang.php      |  1 +
 WEB-INF/resources/zh-cn.lang.php   |  1 +
 WEB-INF/resources/zh-tw.lang.php   |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         | 30 ++++++++++++++++
 work.php                           |  2 +-
 34 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 1fa72036b..e7ed5ff42 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -65,7 +65,7 @@ function __construct(&$errors) {
       $this->put_work_uri = $this->remote_work_uri.'putwork';
       $this->get_work_uri = $this->remote_work_uri.'getwork';
       $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
-      $this->get_avaialable_work_uri = $this->remote_work_uri.'getavailablework';
+      $this->get_available_work_uri = $this->remote_work_uri.'getavailablework';
       $this->delete_work_uri = $this->remote_work_uri.'deletework';
       $this->update_work_uri = $this->remote_work_uri.'updatework';
       $this->put_offer_uri = $this->remote_work_uri.'putoffer';
@@ -355,6 +355,62 @@ function getActiveWork() {
     return $active_work;
   }
 
+  // getAvailableWork - obtains a list of available work items this group can  bid on.
+  function getAvailableWork() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id)
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_available_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $available_work = $result_array['available_work'];
+    return $available_work;
+  }
+
   // getWork - gets work item details from remote work server.
   function getWork($work_id) {
     global $i18n;
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 39b4881a1..9aae6d221 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -405,6 +405,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 46b5c6559..73d8db9cf 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -415,6 +415,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2448eb183..84dfab641 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -387,6 +387,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 835ffa1a6..eb797cd87 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -372,6 +372,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 6bf197ec1..115d0957c 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -354,11 +354,13 @@
 'title.edit_work' => 'Editing Work',
 'title.delete_work' => 'Deleting Work',
 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+'title.available_work' => 'Available Work', // Available work items from other organizations.
 'title.inactive_work' => 'Inactive Work', // Inactive work items for group.
 'title.add_offer' => 'Adding Offer',
 'title.edit_offer' => 'Editing Offer',
 'title.delete_offer' => 'Deleting Offer',
 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+'title.active_offers' => 'Available Offers', // Available offers from other organizations.
 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 163c1af7d..f0a8f6557 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -404,6 +404,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ee7d347be..c8edc899b 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -395,6 +395,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 6f9d89c61..3726a3b11 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -396,6 +396,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1854b5377..714b7ffdd 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -387,6 +387,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3a75fbd46..3db3dcfb3 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -381,6 +381,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 191b3922a..21abe0efe 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -380,6 +380,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 22707536f..2d32c6805 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -404,6 +404,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e2dfad562..96040480a 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -405,6 +405,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d43a11ca6..b0092312c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -390,6 +390,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f75c758fa..476a115c5 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -411,6 +411,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 68a41f67f..776264b1a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -412,6 +412,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index f4e907f9b..28e12d49e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -360,6 +360,8 @@
 'title.edit_work' => 'Werk bewerken',
 'title.delete_work' => 'Werk verwijderen',
 'title.active_work' => 'Actief werk',
+// TODO: translate the following.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 'title.inactive_work' => 'Inactief werk',
 // TODO: translate the following.
 // 'title.add_offer' => 'Adding Offer',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 36ac91f18..6e4fd0493 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -408,6 +408,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ad340131b..e71fd5f5a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -390,6 +390,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 755a225a1..3003233d1 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -385,6 +385,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c5f6ed04d..9b98f023c 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -392,6 +392,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3089e1cef..df09632dd 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -410,6 +410,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c94f08238..12f42420e 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -351,6 +351,7 @@
 'title.edit_work' => 'Редактирование работы',
 'title.delete_work' => 'Удаление работы',
 'title.active_work' => 'Активная работа',
+'title.available_work' => 'Имеющаяся работа',
 'title.inactive_work' => 'Неактивная работа',
 'title.add_offer' => 'Добавление предложения',
 'title.edit_offer' => 'Редактирование предложения',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c997a4c5b..f652d086a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -394,6 +394,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c7bc00e3d..19c675168 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -385,6 +385,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1ab52e1d4..7244d08fd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -388,6 +388,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bd73925ea..0b23571f6 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -389,6 +389,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 15e175b39..cf0ba1094 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -419,6 +419,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b92c48bb2..dd2440aa3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -400,6 +400,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 675f4bfcd..a7c5a4fdf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -405,6 +405,7 @@
 // 'title.edit_work' => 'Editing Work',
 // 'title.delete_work' => 'Deleting Work',
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+// 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7034b34f7..549dd7469 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.19.10.5081 | 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.10.5082 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 2da8ee7a2..82af33a13 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -35,6 +35,36 @@
         </tr>
       </table>
 
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
+  {if $available_work}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+    {foreach $available_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.currency} {$work_item.amount}</td>
+          <td></td>
+          <td></td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
   {if $active_offers}
diff --git a/work.php b/work.php
index b8a1795b6..bbbd88241 100644
--- a/work.php
+++ b/work.php
@@ -47,8 +47,8 @@
   // $inactive_work = ttWorkHelper::getInactiveWork(); // Inactive work items this group was outsourcing.
 }
 if($user->can('bid_on_work')) {
+  $available_work = $workHelper->getAvailableWork(); // Currently available work items from other orgs.
   $active_offers = $workHelper->getActiveOffers(); // Active offers this group makes available to other groups.
-  // $available_work = ttWorkHelper::getAvailableWork(); // Currently available work items from other groups.
 }
 if($user->can('update_work')) {
   // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.

From 81fc7b902dffeaca8227894756532d4070a911f5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 17:54:53 +0000
Subject: [PATCH 1047/1848] Added title.available_offers to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9aae6d221..141437e2a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -411,6 +411,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 73d8db9cf..8bc4cbb42 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -421,6 +421,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 84dfab641..4993fc631 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -393,6 +393,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index eb797cd87..99de29942 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -378,6 +378,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 115d0957c..e94859f6a 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -360,7 +360,7 @@
 'title.edit_offer' => 'Editing Offer',
 'title.delete_offer' => 'Deleting Offer',
 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-'title.active_offers' => 'Available Offers', // Available offers from other organizations.
+'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f0a8f6557..b1657b392 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -410,6 +410,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c8edc899b..0edb5fef8 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -401,6 +401,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3726a3b11..a135ed6ec 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -402,6 +402,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 714b7ffdd..333f9bdce 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -393,6 +393,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3db3dcfb3..0cbb48ea5 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -387,6 +387,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 21abe0efe..7e89f6f56 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -386,6 +386,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2d32c6805..76d8c4a08 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -410,6 +410,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 96040480a..e2657f493 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -411,6 +411,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index b0092312c..cb78d281e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -396,6 +396,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 476a115c5..417289d0d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -417,6 +417,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 776264b1a..ae02d30f3 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -418,6 +418,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 28e12d49e..b002e38ae 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -368,6 +368,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6e4fd0493..77b8d7506 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -414,6 +414,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e71fd5f5a..9bcf32ff5 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -396,6 +396,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3003233d1..55ad505f7 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -391,6 +391,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9b98f023c..eb5b1c00e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -398,6 +398,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index df09632dd..cbbf77231 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -416,6 +416,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 12f42420e..560f75174 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -357,6 +357,7 @@
 'title.edit_offer' => 'Редактирование предложения',
 'title.delete_offer' => 'Удаление предложения',
 'title.active_offers' => 'Активные предложения',
+'title.available_offers' => 'Имеющиеся предложения',
 'title.inactive_offers' => 'Неактивные предложения',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f652d086a..f767d1b0c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -400,6 +400,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 19c675168..3cf66b8cb 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -391,6 +391,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7244d08fd..4f38b914a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -394,6 +394,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0b23571f6..6ee292f2a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -395,6 +395,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cf0ba1094..1c36dbb66 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -425,6 +425,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index dd2440aa3..0570609ed 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -406,6 +406,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a7c5a4fdf..55bbcc21d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -411,6 +411,7 @@
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
+// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 549dd7469..eb2f7864c 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.19.10.5082 | 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.10.5083 | 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>

From f2d99439128e7b7d021b873044bb9cb469bee0b9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 19 Sep 2019 18:37:23 +0000
Subject: [PATCH 1048/1848] Addedd code to list available offers on work.php.

---
 WEB-INF/lib/ttWorkHelper.class.php | 58 +++++++++++++++++++++++++++++-
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         | 30 ++++++++++++++++
 work.php                           |  5 +--
 4 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index e7ed5ff42..c83c9c90f 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -71,7 +71,7 @@ function __construct(&$errors) {
       $this->put_offer_uri = $this->remote_work_uri.'putoffer';
       $this->get_offer_uri = $this->remote_work_uri.'getoffer';
       $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
-      $this->get_avaialable_offers_uri = $this->remote_work_uri.'getavailableoffers';
+      $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
       $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
       $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
       $this->checkSiteRegistration();
@@ -649,6 +649,62 @@ function getActiveOffers() {
     return $active_offers;
   }
 
+  // getAvailableOffers - obtains a list of available offers from other organizations.
+  function getAvailableOffers() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id)
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_available_offers_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $available_offers = $result_array['available_offers'];
+    return $available_offers;
+  }
+
   // getOffer - gets offer details from remote work server.
   function getOffer($offer_id) {
     global $i18n;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eb2f7864c..b7fe89987 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.19.10.5083 | 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.10.5084 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 82af33a13..a0ff3d14b 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -95,6 +95,36 @@
         </tr>
       </table>
 
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
+  {if $available_offers}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+    {foreach $available_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.currency} {$offer.amount}</td>
+          <td></td>
+          <td></td>
+        </tr>
+    {/foreach}
+  {/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
     </td>
   </tr>
 </table>
diff --git a/work.php b/work.php
index bbbd88241..fab8ccb0d 100644
--- a/work.php
+++ b/work.php
@@ -44,7 +44,7 @@
 
 if($user->can('manage_work')) {
   $active_work = $workHelper->getActiveWork(); // Active work items this group is outsourcing.
-  // $inactive_work = ttWorkHelper::getInactiveWork(); // Inactive work items this group was outsourcing.
+  $available_offers = $workHelper->getAvailableOffers(); // Available offers from other organizations.
 }
 if($user->can('bid_on_work')) {
   $available_work = $workHelper->getAvailableWork(); // Currently available work items from other orgs.
@@ -58,10 +58,7 @@
 // TODO: review access rights for the code above.
 
 $smarty->assign('active_work', $active_work);
-$smarty->assign('inactive_work', $inactive_work);
 $smarty->assign('available_work', $available_work);
-$smarty->assign('in_progress_work', $in_progress_work);
-$smarty->assign('completed_work', $completed_work);
 $smarty->assign('active_offers', $active_offers);
 $smarty->assign('available_offers', $available_offers);
 $smarty->assign('title', $i18n->get('title.work'));

From 98a19a89339916b32396a1b62137b887968e74b6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 11:56:07 +0000
Subject: [PATCH 1049/1848] Added getGroupName function to ttUser class.

---
 WEB-INF/lib/ttUser.class.php | 5 +++++
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 83751360a..47b69139b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -192,6 +192,11 @@ function getGroup() {
     return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
   }
 
+  // getGroupName returns group name on behalf of which the current user is operating.
+  function getGroupName() {
+    return ($this->behalfGroup ? $this->behalfGroup->name : $this->group_name);
+  }
+
   // getGroupKey returns group key for active group.
   function getGroupKey() {
     return ($this->behalfGroup ? $this->behalfGroup->group_key : $this->group_key);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b7fe89987..59ab19d1b 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.19.10.5084 | 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.10.5085 | 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>

From 3fbdd85e65be8894188d61162fc2e79beae03aa8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 12:37:09 +0000
Subject: [PATCH 1050/1848] Added getEmail function to ttUser class.

---
 WEB-INF/lib/ttBehalfUser.class.php | 7 ++++---
 WEB-INF/lib/ttUser.class.php       | 5 +++++
 WEB-INF/templates/footer.tpl       | 2 +-
 offer_add.php                      | 3 +++
 offer_edit.php                     | 3 +++
 work_add.php                       | 3 +++
 work_edit.php                      | 3 +++
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttBehalfUser.class.php b/WEB-INF/lib/ttBehalfUser.class.php
index 7f7a5ffa9..408602a10 100644
--- a/WEB-INF/lib/ttBehalfUser.class.php
+++ b/WEB-INF/lib/ttBehalfUser.class.php
@@ -33,18 +33,18 @@
 // An instance in kept in ttUser class when user is working on behalf of someone.
 class ttBehalfUser {
   // Work in progress, build on when need arises.
-  // Currently, we need it for quota_percent work (and perhaps in profile_edit.php).
   var $name = null;             // User name.
   var $id = null;               // User id.
   var $quota_percent = 100.0;   // Time quota percent for quotas plugin.
+  var $email = null;            // User email.
 
   // Constructor.
-  // Note: org_id isneeded because we may construct an object in
+  // Note: org_id is needed because we may construct an object in
   // ttUser constructor, when global $user object does not yet exist.
   function __construct($id, $org_id) {
     $mdb2 = getConnection();
 
-    $sql = "select u.name, u.id, u.quota_percent".
+    $sql = "select u.name, u.id, u.quota_percent, u.email".
       " from tt_users u".
       " where u.id = $id and u.org_id = $org_id and u.status = 1";
 
@@ -56,6 +56,7 @@ function __construct($id, $org_id) {
       $this->name = $val['name'];
       $this->id = $val['id'];
       if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
+      $this->email = $val['email'];
     }
   }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 47b69139b..59616f12b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -187,6 +187,11 @@ function getQuotaPercent() {
     return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);
   }
 
+  // getEmail returns email for active user.
+  function getEmail() {
+    return ($this->behalfUser ? $this->behalfUser->email : $this->email);
+  }
+
   // The getGroup returns group id on behalf of which the current user is operating.
   function getGroup() {
     return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 59ab19d1b..a04fa3cd5 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.19.10.5085 | 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.10.5086 | 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/offer_add.php b/offer_add.php
index 0eeb04536..e3efeaa45 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -66,6 +66,9 @@
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
 
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
     $fields = array('subject'=>$cl_name,
diff --git a/offer_edit.php b/offer_edit.php
index 5fc0010ed..23c3c37c6 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -81,6 +81,9 @@
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
 
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       // Update offer information.
diff --git a/work_add.php b/work_add.php
index 211ac13a7..c07ed98b1 100644
--- a/work_add.php
+++ b/work_add.php
@@ -74,6 +74,9 @@
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
 
+  // Ensure user email exists.
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
     $fields = array('subject'=>$cl_name,
diff --git a/work_edit.php b/work_edit.php
index ac7a8b190..43d793e7f 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -81,6 +81,9 @@
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
 
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       // Update work information.

From 454942cd518f707fe3cb1ef3782826d1e125080e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 14:20:16 +0000
Subject: [PATCH 1051/1848] Added audit info to some API calls for Remote Work
 plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 20 +++++++++++++++++---
 WEB-INF/templates/footer.tpl       |  2 +-
 work_add.php                       |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index c83c9c90f..8a25185a1 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -184,12 +184,17 @@ function putWork($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount'])
+      'amount' => urlencode($fields['amount']),
+      'created_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'created_by' => urlencode($user->getUser()),
+      'created_by_name' => urlencode(base64_encode($user->getName())),
+      'created_by_email' => urlencode(base64_encode($user->getEmail()))
     );
 
     // url-ify the data for the POST.
@@ -247,13 +252,18 @@ function updateWork($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
       'work_id' => urlencode($fields['work_id']),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount'])
+      'amount' => urlencode($fields['amount']),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
     );
 
     // url-ify the data for the POST.
@@ -486,7 +496,11 @@ function deleteWork($work_id) {
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($work_id));
+      'work_id' => urlencode($work_id),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
 
     // url-ify the data for the POST.
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a04fa3cd5..119c2761c 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.19.10.5086 | 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.10.5087 | 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/work_add.php b/work_add.php
index c07ed98b1..c085ce7cc 100644
--- a/work_add.php
+++ b/work_add.php
@@ -74,7 +74,7 @@
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
 
-  // Ensure user email exists.
+  // Ensure user email exists (required for workflow).
   if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
 
   if ($err->no()) {

From dd759a74fff16aaea198af1ce4adb450178ccd70 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 14:49:30 +0000
Subject: [PATCH 1052/1848] Added audit info to API calls to Remote Work
 server.

---
 WEB-INF/lib/ttWorkHelper.class.php | 22 ++++++++++++++++++----
 WEB-INF/templates/footer.tpl       |  2 +-
 offer_edit.php                     |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 8a25185a1..5f68387c3 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -556,12 +556,17 @@ function putOffer($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount'])
+      'amount' => urlencode($fields['amount']),
+      'created_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'created_by' => urlencode($user->getUser()),
+      'created_by_name' => urlencode(base64_encode($user->getName())),
+      'created_by_email' => urlencode(base64_encode($user->getEmail()))
     );
 
     // url-ify the data for the POST.
@@ -793,13 +798,18 @@ function updateOffer($fields) {
       'org_id' => urlencode($org_id),
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($fields['work_id']),
+      'offer_id' => urlencode($fields['offer_id']),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount'])
+      'amount' => urlencode($fields['amount']),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
     );
 
     // url-ify the data for the POST.
@@ -858,7 +868,11 @@ function deleteOffer($offer_id) {
       'org_key' => urlencode($user->getOrgKey()),
       'group_id' => urlencode($group_id),
       'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($offer_id));
+      'offer_id' => urlencode($offer_id),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
 
     // url-ify the data for the POST.
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 119c2761c..b6538fa53 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.19.10.5087 | 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.10.5088 | 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/offer_edit.php b/offer_edit.php
index 23c3c37c6..d6b1ea94d 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -87,7 +87,7 @@
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       // Update offer information.
-      $fields = array('work_id'=>$cl_offer_id,
+      $fields = array('offer_id'=>$cl_offer_id,
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,

From d00165d9a02be7c22e6a0e77cc94e72902debc7c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 15:10:41 +0000
Subject: [PATCH 1053/1848] Made Remote Work plugin available to start user
 testing and feedback.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b6538fa53..824cd8be9 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.19.10.5088 | 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.10.5089 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 56868a6b7..97f7cdb95 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -162,12 +162,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
             <td><label for="attachments">{$i18n.label.attachments}</label> <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
-{if isTrue('WORK_DEBUG')}
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.work.control}</td>
             <td><label for="work">{$i18n.title.work}</label> <span id="work_doc"><a href="https://www.anuko.com/lp/tt_34.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
           </tr>
-{/if}
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>

From e335ce3b60006535b51ec53054f67d56d0b4ecc1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 15:42:33 +0000
Subject: [PATCH 1054/1848] Fixed ttWorkHelper constructor for not defined
 REMOTE_WORK_URI situation.

---
 WEB-INF/lib/ttWorkHelper.class.php | 33 +++++++++++++++---------------
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 5f68387c3..cbf81136e 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -54,28 +54,27 @@ class ttWorkHelper {
   function __construct(&$errors) {
     $this->errors = &$errors;
 
+    $this->remote_work_uri = defined('REMOTE_WORK_URI') ? REMOTE_WORK_URI : "https://www.anuko.com/work/";
+
     // Note: at some point a need will arise for API versioning.
     // When this happens, we will append an API version number to the end of URI,
     // for example: register_0_1 instead of register.
     // This should theoretically allow a remote work server to be able to work with
     // a complete variety of deployed clients, including those without versions.
-    if (defined('REMOTE_WORK_URI')) {
-      $this->remote_work_uri = REMOTE_WORK_URI;
-      $this->register_uri = $this->remote_work_uri.'register'; // register_0_0
-      $this->put_work_uri = $this->remote_work_uri.'putwork';
-      $this->get_work_uri = $this->remote_work_uri.'getwork';
-      $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
-      $this->get_available_work_uri = $this->remote_work_uri.'getavailablework';
-      $this->delete_work_uri = $this->remote_work_uri.'deletework';
-      $this->update_work_uri = $this->remote_work_uri.'updatework';
-      $this->put_offer_uri = $this->remote_work_uri.'putoffer';
-      $this->get_offer_uri = $this->remote_work_uri.'getoffer';
-      $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
-      $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
-      $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
-      $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
-      $this->checkSiteRegistration();
-    }
+    $this->register_uri = $this->remote_work_uri.'register'; // register_0_0
+    $this->put_work_uri = $this->remote_work_uri.'putwork';
+    $this->get_work_uri = $this->remote_work_uri.'getwork';
+    $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
+    $this->get_available_work_uri = $this->remote_work_uri.'getavailablework';
+    $this->delete_work_uri = $this->remote_work_uri.'deletework';
+    $this->update_work_uri = $this->remote_work_uri.'updatework';
+    $this->put_offer_uri = $this->remote_work_uri.'putoffer';
+    $this->get_offer_uri = $this->remote_work_uri.'getoffer';
+    $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
+    $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
+    $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
+    $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
+    $this->checkSiteRegistration();
   }
 
   // checkSiteRegistration - obtains site id and key from local database.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 824cd8be9..34def14b9 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.19.10.5089 | 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.10.5090 | 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>

From 70c4546fffbcb320c6da8928574f064ecec0e861 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 16:49:47 +0000
Subject: [PATCH 1055/1848] Removed FILE_STORAGE_URI from config.php.dist and
 set its default value.

---
 WEB-INF/config.php.dist             |  5 -----
 WEB-INF/lib/ttAdmin.class.php       |  7 +++----
 WEB-INF/lib/ttFileHelper.class.php  | 16 +++++++---------
 WEB-INF/lib/ttGroupHelper.class.php |  7 +++----
 WEB-INF/lib/ttOrgHelper.class.php   |  7 +++----
 WEB-INF/templates/footer.tpl        |  2 +-
 6 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 87cd5bf11..6ffdff08e 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -178,11 +178,6 @@ define('AUTH_MODULE', 'db');
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
 
-// File storage facility location for attachments.
-// This feature requires a subscription or a locally installed appliance.
-// define('FILE_STORAGE_URI', 'localhost');
-define('FILE_STORAGE_URI', 'https://www.anuko.com/files/');
-
 // A comma-separated list of default plugins for new group registrations.
 // Example below enables charts and attachments.
 // define('DEFAULT_PLUGINS', 'ch,at');
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 16ff3b599..74d789d12 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -348,10 +348,9 @@ static function deleteGroupFiles($group_id) {
 
     if ($affected == 0) return true; // Do not call file storage utility.
 
-    // Try to make a call to file storage facility.
-    if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
-
-    $deletegroupfiles_uri = FILE_STORAGE_URI.'deletegroupfiles';
+    // Try to make a call to file storage server.
+    $storage_uri = defined('FILE_STORAGE_URI') ? FILE_STORAGE_URI : "https://www.anuko.com/files/";
+    $deletegroupfiles_uri = $storage_uri.'deletegroupfiles';
 
     // Obtain site id.
     $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'";
diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index a38162706..48105e417 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -43,15 +43,13 @@ class ttFileHelper {
   function __construct(&$errors) {
     $this->errors = &$errors;
 
-    if (defined('FILE_STORAGE_URI')) {
-      $this->storage_uri = FILE_STORAGE_URI;
-      $this->register_uri = $this->storage_uri.'register';
-      $this->putfile_uri = $this->storage_uri.'putfile';
-      $this->deletefile_uri = $this->storage_uri.'deletefile';
-      $this->deletefiles_uri = $this->storage_uri.'deletefiles';
-      $this->getfile_uri = $this->storage_uri.'getfile';
-      $this->checkSiteRegistration();
-    }
+    $this->storage_uri = defined('FILE_STORAGE_URI') ? FILE_STORAGE_URI : "https://www.anuko.com/files/";
+    $this->register_uri = $this->storage_uri.'register';
+    $this->putfile_uri = $this->storage_uri.'putfile';
+    $this->deletefile_uri = $this->storage_uri.'deletefile';
+    $this->deletefiles_uri = $this->storage_uri.'deletefiles';
+    $this->getfile_uri = $this->storage_uri.'getfile';
+    $this->checkSiteRegistration();
   }
 
   // checkSiteRegistration - obtains site id and key from local database.
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 182d2e1f5..48e4de724 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -717,10 +717,9 @@ static function deleteGroupFiles($group_id) {
 
     if ($affected == 0) return true; // Do not call file storage utility.
 
-    // Try to make a call to file storage facility.
-    if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
-
-    $deletegroupfiles_uri = FILE_STORAGE_URI.'deletegroupfiles';
+    // Try to make a call to file storage server.
+    $storage_uri = defined('FILE_STORAGE_URI') ? FILE_STORAGE_URI : "https://www.anuko.com/files/";
+    $deletegroupfiles_uri = $storage_uri.'deletegroupfiles';
 
     // Obtain site id.
     $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'";
diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 1893379d3..60126420a 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -137,10 +137,9 @@ static function deleteOrgFiles($org_id) {
 
     if ($affected == 0) return true; // Do not call file storage utility.
 
-    // Try to make a call to file storage facility.
-    if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do.
-
-    $deleteorgfiles_uri = FILE_STORAGE_URI.'deleteorgfiles';
+    // Try to make a call to file storage server.
+    $storage_uri = defined('FILE_STORAGE_URI') ? FILE_STORAGE_URI : "https://www.anuko.com/files/";
+    $deleteorgfiles_uri = $storage_uri.'deleteorgfiles';
 
     // Obtain site id.
     $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 34def14b9..df31d30d6 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.19.10.5090 | 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.10.5091 | 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>

From 5fbdf6925be78230d81b19bdd9d7b596b871607f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 18:18:46 +0000
Subject: [PATCH 1056/1848] Added a clarifying comment for translators for
 error.file_storage and error.remote_work.

---
 WEB-INF/resources/ca.lang.php    |  4 ++--
 WEB-INF/resources/cs.lang.php    |  4 ++--
 WEB-INF/resources/da.lang.php    |  4 ++--
 WEB-INF/resources/de.lang.php    |  4 ++--
 WEB-INF/resources/en.lang.php    | 10 +++++++++-
 WEB-INF/resources/es.lang.php    |  4 ++--
 WEB-INF/resources/et.lang.php    |  4 ++--
 WEB-INF/resources/fa.lang.php    |  4 ++--
 WEB-INF/resources/fi.lang.php    |  4 ++--
 WEB-INF/resources/fr.lang.php    |  4 ++--
 WEB-INF/resources/gr.lang.php    |  4 ++--
 WEB-INF/resources/he.lang.php    |  4 ++--
 WEB-INF/resources/hu.lang.php    |  4 ++--
 WEB-INF/resources/it.lang.php    |  4 ++--
 WEB-INF/resources/ja.lang.php    |  4 ++--
 WEB-INF/resources/ko.lang.php    |  4 ++--
 WEB-INF/resources/nl.lang.php    | 27 ++++++++++++++++-----------
 WEB-INF/resources/no.lang.php    |  4 ++--
 WEB-INF/resources/pl.lang.php    |  4 ++--
 WEB-INF/resources/pt-br.lang.php |  4 ++--
 WEB-INF/resources/pt.lang.php    |  4 ++--
 WEB-INF/resources/ro.lang.php    |  4 ++--
 WEB-INF/resources/ru.lang.php    |  2 +-
 WEB-INF/resources/sk.lang.php    |  4 ++--
 WEB-INF/resources/sl.lang.php    |  4 ++--
 WEB-INF/resources/sr.lang.php    |  4 ++--
 WEB-INF/resources/sv.lang.php    |  4 ++--
 WEB-INF/resources/tr.lang.php    |  4 ++--
 WEB-INF/resources/zh-cn.lang.php |  4 ++--
 WEB-INF/resources/zh-tw.lang.php |  4 ++--
 WEB-INF/templates/footer.tpl     |  2 +-
 31 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 141437e2a..c50eb2fff 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -119,8 +119,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8bc4cbb42..7eb333d46 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -121,8 +121,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4993fc631..450bb31ec 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -116,8 +116,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 99de29942..4fffe05c0 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -111,8 +111,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 'warn.sure' => 'Sind Sie sicher?',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index e94859f6a..248176e97 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -104,7 +104,15 @@
 'error.format' => 'Invalid file format.',
 'error.user_count' => 'Limit on user count.',
 'error.expired' => 'Expiration date reached.',
-'error.file_storage' => 'File storage error.',
+// Meaning of error.file_storage: an (unspecified) error occurred when trying to communicate with remote
+// file storage server (the one that handles attachments). It is a generic message telling us that
+// "something went wrong" when trying to do some operation with attachments.
+// For example, File Storage server could be offline, or Time Tracker config option is wrong, etc.
+'error.file_storage' => 'File storage server error.',
+// Meaning of error.remote_work: an (unspecified) error occurred when trying to communicate with
+// "Remote Work" server, the one that supports the "Work" plugin, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// It is a generic message telling us that "something went wrong" when trying to do some operation with Work plugin.
+// For example, Remote Work server could be offline, among other things.
 'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b1657b392..be8996221 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -117,8 +117,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0edb5fef8..369224cdb 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -128,8 +128,8 @@
 'error.user_count' => 'Kasutajate arvu piirang.',
 'error.expired' => 'Kehtivusaeg on lõppenud.',
 // TODO: translate the following.
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 'warn.sure' => 'Oled kindel?',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a135ed6ec..30b6adbe2 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -124,8 +124,8 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // TODO: translate the following.
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 333f9bdce..4e74f6675 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -118,8 +118,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 0cbb48ea5..baf8e5ccb 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -116,8 +116,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 7e89f6f56..56e493ab6 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -112,8 +112,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 76d8c4a08..adf734a8d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -132,8 +132,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e2657f493..924d6e033 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -121,8 +121,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index cb78d281e..2829898f7 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -116,8 +116,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 417289d0d..3eebba753 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -123,8 +123,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ae02d30f3..c698461c5 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -122,8 +122,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b002e38ae..08127fd36 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -103,17 +103,22 @@
 'error.format' => 'Bestandsformaat niet valide.',
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
-// TODO: improve translations of both error.file_storage and error.remote_work.
-// Both file storage and remote work (freelance) are implemented in external facilities,
-// which are standalone applications out of scope of Time Tracker itself.
-//
-// error.file_storage means that something happened in a remote file storage server.
-// error.remote_work means that something happened in a remote work server
-// see documentation for remote work plugin, currently under development).
-// Remote work plugin is designed to outsource work to other groups, when one group
-// hires another group to do something (under development at the moment).
-'error.file_storage' => 'Fout bij het opslaan van het bestand.',
-'error.remote_work' => 'Fout in de server.',
+
+// TODO: translate error.file_storage and error.remote_work.
+
+// Meaning of error.file_storage: an (unspecified) error occurred when trying to communicate with remote
+// file storage server (the one that handles attachments). It is a generic message telling us that
+// "something went wrong" when trying to do some operation with attachments.
+// For example, File Storage server could be offline, or Time Tracker config option is wrong, etc.
+
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+
+// Meaning of error.remote_work: an (unspecified) error occurred when trying to communicate with
+// "Remote Work" server, the one that supports the "Work" plugin, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// It is a generic message telling us that "something went wrong" when trying to do some operation with Work plugin.
+// For example, Remote Work server could be offline, among other things.
+
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 77b8d7506..cc67415e3 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -123,8 +123,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9bcf32ff5..37a70eddf 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -120,8 +120,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // 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 55ad505f7..78fee2655 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -117,8 +117,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index eb5b1c00e..ce488a0e4 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -116,8 +116,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cbbf77231..fe224447c 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -123,8 +123,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 560f75174..3ce7c652f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -103,7 +103,7 @@
 'error.format' => 'Неверный формат файла.',
 'error.user_count' => 'Ограничение на количество пользователей.',
 'error.expired' => 'Достигнута дата экспирации.',
-'error.file_storage' => 'Ошибка файлохранилища.',
+'error.file_storage' => 'Ошибка сервера для хранения файлов.',
 'error.remote_work' => 'Ошибка сервера удаленной работы.',
 
 // Warning messages.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index f767d1b0c..8f6bc8ec4 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -121,8 +121,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 3cf66b8cb..f6bda9246 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -113,8 +113,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 4f38b914a..0d8b1ada1 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -117,8 +117,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 6ee292f2a..a791f5453 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -116,8 +116,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1c36dbb66..6d0a119bd 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -126,8 +126,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // 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 0570609ed..0bf85186a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -116,8 +116,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // 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 55bbcc21d..e49fc98a3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -120,8 +120,8 @@
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage error.',
-// 'error.remote_work' => 'Remote work server error.',
+// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index df31d30d6..6f373b3ec 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.19.10.5091 | 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.10.5092 | 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>

From 526391e485ddf8ee32469ec9c11a41ceccd3fe15 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 18:36:49 +0000
Subject: [PATCH 1057/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 25 +++++++++++--------------
 WEB-INF/templates/footer.tpl  |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 08127fd36..69e34a45f 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -253,7 +253,7 @@
 'label.submitted' => 'Verzonden',
 'label.approved' => 'Goedgekeurd',
 'label.approval' => 'Rapport goedkeuring',
-'label.mark_approved' => 'Markeer goegkeuring',
+'label.mark_approved' => 'Markeer goedkeuring',
 'label.template' => 'Sjabloon',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
@@ -262,9 +262,8 @@
 'label.download' => 'Download',
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
+'label.details' => 'Details',
+'label.budget' => 'Budget',
 
 // Entity names.
 'entity.time' => 'tijd',
@@ -365,16 +364,14 @@
 'title.edit_work' => 'Werk bewerken',
 'title.delete_work' => 'Werk verwijderen',
 'title.active_work' => 'Actief werk',
-// TODO: translate the following.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
+'title.available_work' => 'Beschikbaar werk',
 'title.inactive_work' => 'Inactief werk',
-// TODO: translate the following.
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+'title.add_offer' => 'Aanbieding toevoegen',
+'title.edit_offer' => 'Aanbieding bewerken',
+'title.delete_offer' => 'Aanbieding verwijderen',
+'title.active_offers' => 'Actieve aanbiedingen',
+'title.available_offers' => 'Beschikbare aanbiedingen',
+'title.inactive_offers' => 'Inactieve aanbiedingen',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -456,7 +453,7 @@
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',
 'form.reports.time_fields' => 'Tijd velden',
-'form.reports.user_fields' => 'Mederwerker velden',
+'form.reports.user_fields' => 'Medewerker velden',
 'form.reports.group_by' => 'Groeperen op',
 'form.reports.group_by_no' => '--- niet groeperen ---',
 'form.reports.group_by_date' => 'datum',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6f373b3ec..262d606d1 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.19.10.5092 | 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.10.5093 | 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>

From ed238d889bf63631778355395aa3f83bc5716154 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 19:04:27 +0000
Subject: [PATCH 1058/1848] Redoing some labels on work.php page.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 3 +++
 WEB-INF/resources/en.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/work.tpl       | 8 ++++----
 31 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c50eb2fff..5137cb7cd 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -285,6 +285,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 7eb333d46..157dc4ad2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -295,6 +295,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 450bb31ec..3088d3bf2 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -276,6 +276,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 4fffe05c0..9233c74d4 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -269,6 +269,9 @@
 // Another use is with offers with Remote Work plugin, where details hold a long, precise, and complete description of the offer.
 // 'label.details' => 'Details',
 'label.budget' => 'Budget',
+// TODO: translate the following.
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 248176e97..5e534452c 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -259,6 +259,8 @@
 'label.inactive_users' => 'Inactive Users',
 'label.details' => 'Details',
 'label.budget' => 'Budget',
+'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index be8996221..d5bc4b2b9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -288,6 +288,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 369224cdb..ef957582f 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -283,6 +283,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 30b6adbe2..8c21340c5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -287,6 +287,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4e74f6675..a2c65200f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -280,6 +280,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index baf8e5ccb..0e39cd0c9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -274,6 +274,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 56e493ab6..72bed0b56 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -270,6 +270,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index adf734a8d..4f2a8c243 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -295,6 +295,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 924d6e033..9ff87b14b 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -291,6 +291,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2829898f7..64d4809de 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -274,6 +274,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3eebba753..030470f3b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -295,6 +295,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c698461c5..90e7f6bc5 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -295,6 +295,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 69e34a45f..cfd826e0f 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -264,6 +264,9 @@
 'label.inactive_users' => 'Inactieve medewerkers',
 'label.details' => 'Details',
 'label.budget' => 'Budget',
+// TODO: translate the following.
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index cc67415e3..2d01997ba 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -292,6 +292,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 37a70eddf..9c20449b1 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -281,6 +281,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 78fee2655..bcba4bad2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -278,6 +278,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ce488a0e4..f1eccf1f7 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -280,6 +280,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fe224447c..4820beec1 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -292,6 +292,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3ce7c652f..39d7e4017 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -250,6 +250,8 @@
 'label.inactive_users' => 'Неактивные пользователи',
 'label.details' => 'Детали',
 'label.budget' => 'Бюджет',
+'label.work' => 'Работа',
+'label.offer' => 'Предложение',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8f6bc8ec4..dbfbe6250 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -285,6 +285,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f6bda9246..b39e2ab99 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -275,6 +275,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 0d8b1ada1..9c47bb180 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -279,6 +279,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a791f5453..64e3dc236 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -276,6 +276,8 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 6d0a119bd..17f160b0d 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -299,6 +299,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 0bf85186a..fce1c9ea3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -284,6 +284,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index e49fc98a3..6372c071e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -290,6 +290,8 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
+// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/templates/work.tpl b/WEB-INF/templates/work.tpl
index a0ff3d14b..250038bcd 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -9,7 +9,7 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
   {if $active_work}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
@@ -39,7 +39,7 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
   {if $available_work}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
@@ -69,7 +69,7 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
   {if $active_offers}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
@@ -99,7 +99,7 @@
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
   {if $available_offers}
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>

From 115e9b4f1c81b8090c72218315bba0d9e9430f6b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 19:29:32 +0000
Subject: [PATCH 1059/1848] Renamed labels on work/offer add/edit pages for
 clarity.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/offer_add.tpl  | 2 +-
 WEB-INF/templates/offer_edit.tpl | 2 +-
 WEB-INF/templates/work_add.tpl   | 2 +-
 WEB-INF/templates/work_edit.tpl  | 2 +-
 offer_add.php                    | 2 +-
 offer_edit.php                   | 2 +-
 work_add.php                     | 2 +-
 work_edit.php                    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 262d606d1..93ae8580c 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.19.10.5093 | 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.10.5094 | 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/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
index 3051e9664..764ab924f 100644
--- a/WEB-INF/templates/offer_add.tpl
+++ b/WEB-INF/templates/offer_add.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td align="right">{$i18n.label.offer} (*):</td>
           <td>{$forms.offerForm.offer_name.control}</td>
         </tr>
         <tr>
diff --git a/WEB-INF/templates/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
index a80c82d79..2494ae9ad 100644
--- a/WEB-INF/templates/offer_edit.tpl
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td align="right">{$i18n.label.offer} (*):</td>
           <td>{$forms.offerForm.offer_name.control}</td>
         </tr>
         <tr>
diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 3e2b00695..13bb385ad 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td align="right">{$i18n.label.work} (*):</td>
           <td>{$forms.workForm.work_name.control}</td>
         </tr>
         <tr>
diff --git a/WEB-INF/templates/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index 792457226..76bb42c1a 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td align="right">{$i18n.label.work} (*):</td>
           <td>{$forms.workForm.work_name.control}</td>
         </tr>
         <tr>
diff --git a/offer_add.php b/offer_add.php
index e3efeaa45..87a35f9aa 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -61,7 +61,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
diff --git a/offer_edit.php b/offer_edit.php
index d6b1ea94d..b2e337904 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -76,7 +76,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
diff --git a/work_add.php b/work_add.php
index c085ce7cc..9fe73d206 100644
--- a/work_add.php
+++ b/work_add.php
@@ -69,7 +69,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
diff --git a/work_edit.php b/work_edit.php
index 43d793e7f..74c9d08fa 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -76,7 +76,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));

From d58de239a5073063107ec45f6ac7ff79b9263a2c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 19:39:27 +0000
Subject: [PATCH 1060/1848] Usability improvements on work.php page.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/work.tpl   | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 93ae8580c..333c7ad8f 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.19.10.5094 | 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.10.5095 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 250038bcd..54dd95d8f 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -5,9 +5,9 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
+{if $active_work}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
-  {if $active_work}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -15,7 +15,7 @@
           <td></td>
           <td></td>
         </tr>
-    {foreach $active_work as $work_item}
+  {foreach $active_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
@@ -23,8 +23,8 @@
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
-    {/foreach}
-  {/if}
+  {/foreach}
+
       </table>
 
       <table width="100%">
@@ -34,10 +34,11 @@
           </td>
         </tr>
       </table>
+{/if}
 
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-  {if $available_work}
+{if $available_work}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -45,7 +46,7 @@
           <td></td>
           <td></td>
         </tr>
-    {foreach $available_work as $work_item}
+  {foreach $available_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
@@ -53,8 +54,8 @@
           <td></td>
           <td></td>
         </tr>
-    {/foreach}
-  {/if}
+  {/foreach}
+{/if}
       </table>
 
       <table width="100%">
@@ -65,9 +66,9 @@
         </tr>
       </table>
 
+{if $active_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
-  {if $active_offers}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -75,7 +76,7 @@
           <td></td>
           <td></td>
         </tr>
-    {foreach $active_offers as $offer}
+  {foreach $active_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
@@ -83,8 +84,7 @@
           <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
-    {/foreach}
-  {/if}
+  {/foreach}
       </table>
 
       <table width="100%">
@@ -94,10 +94,11 @@
           </td>
         </tr>
       </table>
+{/if}
 
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
-  {if $available_offers}
+{if $available_offers}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -105,7 +106,7 @@
           <td></td>
           <td></td>
         </tr>
-    {foreach $available_offers as $offer}
+  {foreach $available_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
@@ -113,8 +114,8 @@
           <td></td>
           <td></td>
         </tr>
-    {/foreach}
-  {/if}
+  {/foreach}
+{/if}
       </table>
 
       <table width="100%">

From 6262668684364c8f1406044e382913a2bd6566de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 20:14:55 +0000
Subject: [PATCH 1061/1848] Added contractor column for offers on work.php
 page.

---
 WEB-INF/resources/ca.lang.php    | 3 +++
 WEB-INF/resources/cs.lang.php    | 3 +++
 WEB-INF/resources/da.lang.php    | 3 +++
 WEB-INF/resources/de.lang.php    | 3 +++
 WEB-INF/resources/en.lang.php    | 3 +++
 WEB-INF/resources/es.lang.php    | 3 +++
 WEB-INF/resources/et.lang.php    | 3 +++
 WEB-INF/resources/fa.lang.php    | 3 +++
 WEB-INF/resources/fi.lang.php    | 3 +++
 WEB-INF/resources/fr.lang.php    | 3 +++
 WEB-INF/resources/gr.lang.php    | 3 +++
 WEB-INF/resources/he.lang.php    | 3 +++
 WEB-INF/resources/hu.lang.php    | 3 +++
 WEB-INF/resources/it.lang.php    | 3 +++
 WEB-INF/resources/ja.lang.php    | 3 +++
 WEB-INF/resources/ko.lang.php    | 3 +++
 WEB-INF/resources/nl.lang.php    | 3 +++
 WEB-INF/resources/no.lang.php    | 3 +++
 WEB-INF/resources/pl.lang.php    | 3 +++
 WEB-INF/resources/pt-br.lang.php | 3 +++
 WEB-INF/resources/pt.lang.php    | 3 +++
 WEB-INF/resources/ro.lang.php    | 3 +++
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 3 +++
 WEB-INF/resources/sl.lang.php    | 3 +++
 WEB-INF/resources/sr.lang.php    | 3 +++
 WEB-INF/resources/sv.lang.php    | 3 +++
 WEB-INF/resources/tr.lang.php    | 3 +++
 WEB-INF/resources/zh-cn.lang.php | 3 +++
 WEB-INF/resources/zh-tw.lang.php | 3 +++
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/work.tpl       | 4 ++++
 32 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5137cb7cd..a1372bda4 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -287,6 +287,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 157dc4ad2..d6fc6ff57 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -297,6 +297,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3088d3bf2..4fdb4b96f 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -278,6 +278,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9233c74d4..524a18d64 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -272,6 +272,9 @@
 // TODO: translate the following.
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5e534452c..821e3236d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -261,6 +261,9 @@
 'label.budget' => 'Budget',
 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                    // Technically, it is either an org name or a combination of org and group names
+                                    // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d5bc4b2b9..6c86e23b7 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -290,6 +290,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ef957582f..0493cd560 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -285,6 +285,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8c21340c5..0e6cb3f53 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -289,6 +289,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a2c65200f..b2c91b1ec 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -282,6 +282,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 0e39cd0c9..f98a575da 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -276,6 +276,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 72bed0b56..a64100e49 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -272,6 +272,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 4f2a8c243..928ea1a9a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -297,6 +297,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 9ff87b14b..805f81732 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -293,6 +293,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 64d4809de..26cd4e8ba 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -276,6 +276,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 030470f3b..acb74fe7b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -297,6 +297,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 90e7f6bc5..43eb93ffa 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -297,6 +297,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index cfd826e0f..b961adcf2 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -267,6 +267,9 @@
 // TODO: translate the following.
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2d01997ba..a194d3337 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -294,6 +294,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9c20449b1..61168a4c3 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -283,6 +283,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bcba4bad2..bc679de80 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -280,6 +280,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f1eccf1f7..191c31db9 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -282,6 +282,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 4820beec1..bdbd5a918 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -294,6 +294,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 39d7e4017..66f8491a4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -252,6 +252,7 @@
 'label.budget' => 'Бюджет',
 'label.work' => 'Работа',
 'label.offer' => 'Предложение',
+'label.contractor' => 'Подрядчик',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index dbfbe6250..e6b12a115 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -287,6 +287,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b39e2ab99..ddc87beb9 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -277,6 +277,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 9c47bb180..2ec381e53 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -281,6 +281,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 64e3dc236..e8bb43197 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -278,6 +278,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 17f160b0d..5212a81cf 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -301,6 +301,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index fce1c9ea3..70612f20c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -286,6 +286,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6372c071e..080802a79 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -292,6 +292,9 @@
 // 'label.budget' => 'Budget',
 // 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
 // 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
+// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
+                                       // Technically, it is either an org name or a combination of org and group names
+                                       // because both work items and offers are owned by Time Tracker groups of users.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 333c7ad8f..87fd3ed30 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.19.10.5095 | 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.10.5096 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 54dd95d8f..51632578e 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -72,6 +72,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -80,6 +81,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape}</td>
           <td>{$offer.currency} {$offer.amount}</td>
           <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
@@ -102,6 +104,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -110,6 +113,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape}</td>
           <td>{$offer.currency} {$offer.amount}</td>
           <td></td>
           <td></td>

From ea1662bd668c41a20fe2caa67e8abcc288a9ff86 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 20 Sep 2019 20:39:23 +0000
Subject: [PATCH 1062/1848] Added client column to work tables on work.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/work.tpl   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 87fd3ed30..d2d613624 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.19.10.5096 | 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.10.5097 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 51632578e..96f891fc9 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -11,6 +11,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -19,6 +20,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape}</td>
           <td>{$work_item.currency} {$work_item.amount}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
@@ -42,6 +44,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -50,6 +53,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape}</td>
           <td>{$work_item.currency} {$work_item.amount}</td>
           <td></td>
           <td></td>

From bcfb910316ef66cb8578050cfa79f11661adc846 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 21 Sep 2019 15:10:24 +0000
Subject: [PATCH 1063/1848] Added payment information to offers.

---
 WEB-INF/lib/ttWorkHelper.class.php | 2 ++
 WEB-INF/resources/ca.lang.php      | 2 ++
 WEB-INF/resources/cs.lang.php      | 2 ++
 WEB-INF/resources/da.lang.php      | 2 ++
 WEB-INF/resources/de.lang.php      | 2 ++
 WEB-INF/resources/en.lang.php      | 2 ++
 WEB-INF/resources/es.lang.php      | 2 ++
 WEB-INF/resources/et.lang.php      | 2 ++
 WEB-INF/resources/fa.lang.php      | 2 ++
 WEB-INF/resources/fi.lang.php      | 2 ++
 WEB-INF/resources/fr.lang.php      | 2 ++
 WEB-INF/resources/gr.lang.php      | 2 ++
 WEB-INF/resources/he.lang.php      | 2 ++
 WEB-INF/resources/hu.lang.php      | 2 ++
 WEB-INF/resources/it.lang.php      | 2 ++
 WEB-INF/resources/ja.lang.php      | 2 ++
 WEB-INF/resources/ko.lang.php      | 2 ++
 WEB-INF/resources/nl.lang.php      | 2 ++
 WEB-INF/resources/no.lang.php      | 2 ++
 WEB-INF/resources/pl.lang.php      | 2 ++
 WEB-INF/resources/pt-br.lang.php   | 2 ++
 WEB-INF/resources/pt.lang.php      | 2 ++
 WEB-INF/resources/ro.lang.php      | 2 ++
 WEB-INF/resources/ru.lang.php      | 1 +
 WEB-INF/resources/sk.lang.php      | 2 ++
 WEB-INF/resources/sl.lang.php      | 2 ++
 WEB-INF/resources/sr.lang.php      | 2 ++
 WEB-INF/resources/sv.lang.php      | 2 ++
 WEB-INF/resources/tr.lang.php      | 2 ++
 WEB-INF/resources/zh-cn.lang.php   | 2 ++
 WEB-INF/resources/zh-tw.lang.php   | 2 ++
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/offer_add.tpl    | 4 ++++
 WEB-INF/templates/offer_edit.tpl   | 4 ++++
 offer_add.php                      | 6 +++++-
 offer_edit.php                     | 7 ++++++-
 36 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index cbf81136e..fdf80cab7 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -562,6 +562,7 @@ function putOffer($fields) {
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
       'amount' => urlencode($fields['amount']),
+      'payment_info' => urlencode(base64_encode($fields['payment_info'])),
       'created_ip' => urlencode($_SERVER['REMOTE_ADDR']),
       'created_by' => urlencode($user->getUser()),
       'created_by_name' => urlencode(base64_encode($user->getName())),
@@ -805,6 +806,7 @@ function updateOffer($fields) {
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
       'amount' => urlencode($fields['amount']),
+      'payment_info' => urlencode(base64_encode($fields['payment_info'])),
       'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
       'modified_by' => urlencode($user->getUser()),
       'modified_by_name' => urlencode(base64_encode($user->getName())),
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a1372bda4..ef585b672 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -290,6 +290,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d6fc6ff57..d493145a6 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -300,6 +300,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4fdb4b96f..8d92afc76 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -281,6 +281,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 524a18d64..c38691866 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -275,6 +275,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 821e3236d..71b33c740 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -264,6 +264,8 @@
 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                     // Technically, it is either an org name or a combination of org and group names
                                     // because both work items and offers are owned by Time Tracker groups of users.
+'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                    // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 6c86e23b7..0955af863 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -293,6 +293,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0493cd560..be0b4d60d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -288,6 +288,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0e6cb3f53..a1f25ce9c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -292,6 +292,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index b2c91b1ec..bed26efc2 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -285,6 +285,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f98a575da..98deacf82 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -279,6 +279,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a64100e49..1c5197d63 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -275,6 +275,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 928ea1a9a..d4306e1b2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -300,6 +300,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 805f81732..1c41a48b4 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -296,6 +296,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 26cd4e8ba..04a83aa2b 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -279,6 +279,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index acb74fe7b..afcc53d39 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -300,6 +300,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 43eb93ffa..bd30ed0de 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -300,6 +300,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b961adcf2..224ff08b3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -270,6 +270,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.S
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a194d3337..2c0f03625 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -297,6 +297,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 61168a4c3..f8b0ebf5f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -286,6 +286,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bc679de80..af31f68c0 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -283,6 +283,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 191c31db9..7f7d7d17d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -285,6 +285,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index bdbd5a918..124a5b826 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -297,6 +297,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 66f8491a4..5941310ee 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -253,6 +253,7 @@
 'label.work' => 'Работа',
 'label.offer' => 'Предложение',
 'label.contractor' => 'Подрядчик',
+'label.how_to_pay' => 'Как оплатить',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e6b12a115..14ba25056 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -290,6 +290,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ddc87beb9..2db2a2713 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -280,6 +280,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 2ec381e53..63c6623b1 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -284,6 +284,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index e8bb43197..08376bed7 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -281,6 +281,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 5212a81cf..8eb67f053 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -304,6 +304,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 70612f20c..090945d7b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -289,6 +289,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 080802a79..81e300507 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -295,6 +295,8 @@
 // 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
+// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d2d613624..1cd0d9a45 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.19.10.5097 | 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.10.5098 | 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/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
index 764ab924f..292a2a7bb 100644
--- a/WEB-INF/templates/offer_add.tpl
+++ b/WEB-INF/templates/offer_add.tpl
@@ -29,6 +29,10 @@
           <td align="right">{$i18n.label.budget} (*):</td>
           <td>{$forms.offerForm.budget.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
+          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/WEB-INF/templates/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
index 2494ae9ad..b860341fa 100644
--- a/WEB-INF/templates/offer_edit.tpl
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -23,6 +23,10 @@
           <td align="right">{$i18n.label.budget} (*):</td>
           <td>{$forms.offerForm.budget.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
+          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/offer_add.php b/offer_add.php
index 87a35f9aa..a61f6b658 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -47,6 +47,7 @@
   $cl_details = trim($request->getParameter('details'));
   $cl_currency = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
+  $cl_payment_info = $request->getParameter('payment_info');
 }
 
 $form = new Form('offerForm');
@@ -57,6 +58,7 @@
 $currencies = ttWorkHelper::getCurrencies();
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 250px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -65,6 +67,7 @@
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
 
   // Ensure user email exists (required for workflow).
   if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
@@ -75,7 +78,8 @@
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
       'currency' => $currencies[$cl_currency],
-      'amount' => $cl_budget);
+      'amount' => $cl_budget,
+      'payment_info' => $cl_payment_info);
      if ($workHelper->putOffer($fields)) {
         header('Location: work.php');
         exit();
diff --git a/offer_edit.php b/offer_edit.php
index b2e337904..abdb195d5 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -56,6 +56,7 @@
   $cl_details = trim($request->getParameter('details'));
   $cl_currency = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
+  $cl_payment_info = $request->getParameter('payment_info');
 } else {
   $cl_name = $offer['subject'];
   $cl_description = $offer['descr_short'];
@@ -63,6 +64,7 @@
   $currency = $offer['currency'];
   $cl_currency = array_search($currency, $currencies);
   $cl_budget = $offer['amount'];
+  $cl_payment_info = $offer['payment_info'];
 }
 
 $form = new Form('offerForm');
@@ -72,6 +74,7 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 250px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -80,6 +83,7 @@
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
 
   // Ensure user email exists (required for workflow).
   if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
@@ -92,7 +96,8 @@
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,
         'currency' => $currencies[$cl_currency],
-        'amount' => $cl_budget);
+        'amount' => $cl_budget,
+        'payment_info' => $cl_payment_info);
       if ($workHelper->updateOffer($fields)) {
         header('Location: work.php');
         exit();

From 97f52acc6ce9b33c0d340ee75140470aa823cc9c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 21 Sep 2019 16:54:29 +0000
Subject: [PATCH 1064/1848] Added a what_is_it link for the budget field on
 work items for Work plugin.

---
 WEB-INF/templates/footer.tpl    | 2 +-
 WEB-INF/templates/work_add.tpl  | 2 +-
 WEB-INF/templates/work_edit.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1cd0d9a45..43352aa3f 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.19.10.5098 | 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.10.5099 | 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/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 13bb385ad..fd7beea40 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -27,7 +27,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control}</td>
+          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td></td>
diff --git a/WEB-INF/templates/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index 76bb42c1a..a5cb6e6b5 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -27,7 +27,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control}</td>
+          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td></td>

From 4a29c9d86ebe143f12f4686f574e8c36cf837a59 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 21 Sep 2019 17:00:09 +0000
Subject: [PATCH 1065/1848] Fixed a budget explaining link, also added them on
 the offer pages.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/offer_add.tpl  | 2 +-
 WEB-INF/templates/offer_edit.tpl | 2 +-
 WEB-INF/templates/work_edit.tpl  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 43352aa3f..2a4aa0e54 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.19.10.5099 | 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.10.5100 | 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/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
index 292a2a7bb..da7e05574 100644
--- a/WEB-INF/templates/offer_add.tpl
+++ b/WEB-INF/templates/offer_add.tpl
@@ -27,7 +27,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control}</td>
+          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td align = "right">{$i18n.label.how_to_pay} (*):</td>
diff --git a/WEB-INF/templates/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
index b860341fa..fb406d1b0 100644
--- a/WEB-INF/templates/offer_edit.tpl
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -21,7 +21,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control}</td>
+          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td align = "right">{$i18n.label.how_to_pay} (*):</td>
diff --git a/WEB-INF/templates/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index a5cb6e6b5..9aaaa85f7 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -27,7 +27,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td></td>

From 2246dfb5be7f29bb2593d306c3bdbf459363bc19 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Sep 2019 17:41:34 +0000
Subject: [PATCH 1066/1848] Work in progress on admin pages for Remote Work
 plugin.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 192 ++++++++++++++++++++++++
 WEB-INF/lib/ttWorkHelper.class.php      |   1 +
 WEB-INF/resources/ca.lang.php           |   1 +
 WEB-INF/resources/cs.lang.php           |   1 +
 WEB-INF/resources/da.lang.php           |   1 +
 WEB-INF/resources/de.lang.php           |   1 +
 WEB-INF/resources/en.lang.php           |   1 +
 WEB-INF/resources/es.lang.php           |   1 +
 WEB-INF/resources/et.lang.php           |   1 +
 WEB-INF/resources/fa.lang.php           |   1 +
 WEB-INF/resources/fi.lang.php           |   1 +
 WEB-INF/resources/fr.lang.php           |   1 +
 WEB-INF/resources/gr.lang.php           |   1 +
 WEB-INF/resources/he.lang.php           |   1 +
 WEB-INF/resources/hu.lang.php           |   1 +
 WEB-INF/resources/it.lang.php           |   1 +
 WEB-INF/resources/ja.lang.php           |   1 +
 WEB-INF/resources/ko.lang.php           |   1 +
 WEB-INF/resources/nl.lang.php           |   2 +
 WEB-INF/resources/no.lang.php           |   1 +
 WEB-INF/resources/pl.lang.php           |   1 +
 WEB-INF/resources/pt-br.lang.php        |   1 +
 WEB-INF/resources/pt.lang.php           |   1 +
 WEB-INF/resources/ro.lang.php           |   1 +
 WEB-INF/resources/ru.lang.php           |   1 +
 WEB-INF/resources/sk.lang.php           |   1 +
 WEB-INF/resources/sl.lang.php           |   1 +
 WEB-INF/resources/sr.lang.php           |   1 +
 WEB-INF/resources/sv.lang.php           |   1 +
 WEB-INF/resources/tr.lang.php           |   1 +
 WEB-INF/resources/zh-cn.lang.php        |   1 +
 WEB-INF/resources/zh-tw.lang.php        |   1 +
 WEB-INF/templates/admin_work.tpl        | 130 ++++++++++++++++
 WEB-INF/templates/header.tpl            |   3 +
 admin_work.php                          |  46 ++++++
 35 files changed, 403 insertions(+)
 create mode 100644 WEB-INF/lib/ttAdminWorkHelper.class.php
 create mode 100644 WEB-INF/templates/admin_work.tpl
 create mode 100644 admin_work.php

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
new file mode 100644
index 000000000..2e71b8b20
--- /dev/null
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -0,0 +1,192 @@
+<?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
+// +----------------------------------------------------------------------+
+
+define('TT_CURL_SUCCESS', 1);
+
+// Class ttAdminWorkHelper is used to help with operations of administering Remote Work server.
+// It does everything via curl calls to a Remote Work server using its API.
+class ttAdminWorkHelper {
+  var $errors = null;            // Errors go here. Set in constructor by reference.
+  var $remote_work_uri = null;   // Location of remote work server.
+  var $register_uri = null;      // URI to register with remote work server.
+  var $get_work_uri = null;      // URI to get work details.
+  var $update_work_uri = null;   // URI to update work.
+  var $get_offer_uri = null;     // URI to get offer details.
+  var $update_offer_uri = null;  // URI to update offer.
+  var $get_pending_work_uri = null;   // URI to get work pending approval.
+  var $get_pending_offers_uri = null; // URI to get offers pending approval.
+  var $site_id = null;           // Site id for remote work server.
+  var $site_key = null;          // Site key for remote work server.
+
+  // Constructor.
+  function __construct(&$errors) {
+    $this->errors = &$errors;
+
+    $this->remote_work_uri = defined('REMOTE_WORK_URI') ? REMOTE_WORK_URI : "https://www.anuko.com/work/";
+    $this->register_uri = $this->remote_work_uri.'register';
+    $this->get_work_uri = $this->remote_work_uri.'admin_getwork';
+    $this->update_work_uri = $this->remote_work_uri.'admin_updatework';
+    $this->get_offer_uri = $this->remote_work_uri.'admin_getoffer';
+    $this->update_offer_uri = $this->remote_work_uri.'admin_updateoffer';
+    $this->get_pending_work_uri = $this->remote_work_uri.'admin_getpendingwork';
+    $this->get_pending_offers_uri = $this->remote_work_uri.'admin_getpendingoffers';
+    $this->checkSiteRegistration();
+  }
+
+  // checkSiteRegistration - obtains site id and key from local database.
+  // If not found, it tries to register with remote work server.
+  function checkSiteRegistration() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    // Obtain site id.
+    $sql = "select param_value as id from tt_site_config where param_name = 'worksite_id'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if (!$val) {
+      // No site id found, need to register.
+      $fields = array('lang' => urlencode($user->lang),
+        'name' => urlencode('time tracker'),
+        'origin' => urlencode('time tracker source'));
+
+      // Urlify the data for the POST.
+      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+      $fields_string = rtrim($fields_string, '&');
+
+      // Open connection.
+      $ch = curl_init();
+
+      // Set the url, number of POST vars, POST data.
+      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
+      curl_setopt($ch, CURLOPT_POST, true);
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+      // Execute a post request.
+      $result = curl_exec($ch);
+
+      // Close connection.
+      curl_close($ch);
+
+      if (!$result) {
+        $this->errors->add($i18n->get('error.remote_work'));
+        return false;
+      }
+
+      $result_array = json_decode($result, true);
+
+      // Check for errors.
+      $call_status = $result_array['call_status'];
+      if (!$call_status) {
+        $this->errors->add($i18n->get('error.remote_work'));
+        return false;
+      }
+      if ($call_status['code'] != TT_CURL_SUCCESS) {
+        $this->errors->add($call_status['error']);
+        return false;
+      }
+
+      $reg_status = $result_array['reg_status']; // Registration status.
+      if ($reg_status['site_id'] && $reg_status['site_key']) {
+        $this->site_id = $reg_status['site_id'];
+        $this->site_key = $reg_status['site_key'];
+
+        // Registration successful. Store id and key locally for future use.
+        $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
+        $mdb2->exec($sql);
+        $sql = "insert into tt_site_config values('worksite_key', ".$mdb2->quote($this->site_key).", now(), null)";
+        $mdb2->exec($sql);
+      } else {
+        $this->errors->add($i18n->get('error.remote_work'));
+      }
+    } else {
+      // Site id found.
+      $this->site_id = $val['id'];
+
+      // Obtain site key.
+      $sql = "select param_value as site_key from tt_site_config where param_name = 'worksite_key'";
+      $res = $mdb2->query($sql);
+      $val = $res->fetchRow();
+      $this->site_key = $val['site_key'];
+    }
+  }
+
+  // getPendingWork - obtains a list of work items pending approval.
+  function getPendingWork() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id)
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_pending_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $pending_work = $result_array['pending_work'];
+    return $pending_work;
+  }
+}
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index fdf80cab7..8eee2da0f 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -47,6 +47,7 @@ class ttWorkHelper {
   var $get_available_offers_uri = null; // URI to get available offers.
   var $delete_offer_uri = null;  // URI to delete offer.
   var $delete_offers_uri = null; // URI to delete multiple offers.
+  var $update_offer_uri = null;  // URI to update offer.
   var $site_id = null;           // Site id for remote work server.
   var $site_key = null;          // Site key for remote work server.
 
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ef585b672..524752eff 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -414,6 +414,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d493145a6..50e5d04fa 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -424,6 +424,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 8d92afc76..2bd598c69 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -396,6 +396,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index c38691866..9e1557c5b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -382,6 +382,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 71b33c740..e2c45fc23 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -371,6 +371,7 @@
 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 'title.available_work' => 'Available Work', // Available work items from other organizations.
 'title.inactive_work' => 'Inactive Work', // Inactive work items for group.
+'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 'title.add_offer' => 'Adding Offer',
 'title.edit_offer' => 'Editing Offer',
 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0955af863..9a2b0638e 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -413,6 +413,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index be0b4d60d..01ef4ef7a 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -404,6 +404,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a1f25ce9c..2dbe6891a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -405,6 +405,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index bed26efc2..e81d07c10 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -396,6 +396,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 98deacf82..61a0ddecf 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -390,6 +390,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1c5197d63..04aa4f3b3 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -389,6 +389,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d4306e1b2..284f8a863 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -413,6 +413,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 1c41a48b4..de16d61c2 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -414,6 +414,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 04a83aa2b..77da3cd23 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -399,6 +399,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index afcc53d39..3a27314f8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -420,6 +420,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index bd30ed0de..289b60b37 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -421,6 +421,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 224ff08b3..0e34c82f0 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -374,6 +374,8 @@
 'title.active_work' => 'Actief werk',
 'title.available_work' => 'Beschikbaar werk',
 'title.inactive_work' => 'Inactief werk',
+// TODO: translate the following.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 'title.add_offer' => 'Aanbieding toevoegen',
 'title.edit_offer' => 'Aanbieding bewerken',
 'title.delete_offer' => 'Aanbieding verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2c0f03625..eaa5eb45f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -417,6 +417,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f8b0ebf5f..d9fd94e55 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -399,6 +399,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index af31f68c0..15ac573aa 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -394,6 +394,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 7f7d7d17d..30e61902b 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -401,6 +401,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 124a5b826..17dd1c1b1 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -419,6 +419,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5941310ee..ac2b73fa8 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -357,6 +357,7 @@
 'title.active_work' => 'Активная работа',
 'title.available_work' => 'Имеющаяся работа',
 'title.inactive_work' => 'Неактивная работа',
+'title.pending_work' => 'Работа в ожидании',
 'title.add_offer' => 'Добавление предложения',
 'title.edit_offer' => 'Редактирование предложения',
 'title.delete_offer' => 'Удаление предложения',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 14ba25056..64f6a6803 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -403,6 +403,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2db2a2713..ce5ba8e76 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -394,6 +394,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 63c6623b1..c9c7e3733 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -397,6 +397,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 08376bed7..b2090a764 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -398,6 +398,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 8eb67f053..96c2fa2a2 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -428,6 +428,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 090945d7b..77d4cfef8 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -409,6 +409,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 81e300507..27beb296b 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -414,6 +414,7 @@
 // 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
+// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
new file mode 100644
index 000000000..58d847454
--- /dev/null
+++ b/WEB-INF/templates/admin_work.tpl
@@ -0,0 +1,130 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+{if $pending_work}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_work}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $pending_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
+          <td>{$work_item.currency} {$work_item.amount}</td>
+          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+        </tr>
+  {/foreach}
+      </table>
+{/if}
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
+{if $available_work}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $available_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape}</td>
+          <td>{$work_item.currency} {$work_item.amount}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
+{if $active_offers}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $active_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape}</td>
+          <td>{$offer.currency} {$offer.amount}</td>
+          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+        </tr>
+  {/foreach}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+{/if}
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
+{if $available_offers}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $available_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape}</td>
+          <td>{$offer.currency} {$offer.amount}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+</table>
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index d9ceab91d..fa66c6190 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -73,6 +73,9 @@
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
+    {if isTrue('REMOTE_WORK_DEBUG')}
+            <a class="mainMenu" href="admin_work.php">{$i18n.label.work}</a>
+    {/if}
           </td>
         </tr>
       </table>
diff --git a/admin_work.php b/admin_work.php
new file mode 100644
index 000000000..dee7edc24
--- /dev/null
+++ b/admin_work.php
@@ -0,0 +1,46 @@
+<?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('ttAdminWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$adminWorkHelper = new ttAdminWorkHelper($err);
+
+$pending_work = $adminWorkHelper->getPendingWork();
+
+$smarty->assign('pending_work', $pending_work);
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'admin_work.tpl');
+$smarty->display('index.tpl');

From 2265fff018c4594a47167fd047f8870e2a3daee0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Sep 2019 18:05:46 +0000
Subject: [PATCH 1067/1848] Initial implementation of admin_work.php.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 55 +++++++++++++++-
 WEB-INF/resources/ca.lang.php           |  1 +
 WEB-INF/resources/cs.lang.php           |  1 +
 WEB-INF/resources/da.lang.php           |  1 +
 WEB-INF/resources/de.lang.php           |  1 +
 WEB-INF/resources/en.lang.php           |  1 +
 WEB-INF/resources/es.lang.php           |  1 +
 WEB-INF/resources/et.lang.php           |  1 +
 WEB-INF/resources/fa.lang.php           |  1 +
 WEB-INF/resources/fi.lang.php           |  1 +
 WEB-INF/resources/fr.lang.php           |  1 +
 WEB-INF/resources/gr.lang.php           |  1 +
 WEB-INF/resources/he.lang.php           |  1 +
 WEB-INF/resources/hu.lang.php           |  1 +
 WEB-INF/resources/it.lang.php           |  1 +
 WEB-INF/resources/ja.lang.php           |  1 +
 WEB-INF/resources/ko.lang.php           |  1 +
 WEB-INF/resources/nl.lang.php           |  2 +
 WEB-INF/resources/no.lang.php           |  1 +
 WEB-INF/resources/pl.lang.php           |  1 +
 WEB-INF/resources/pt-br.lang.php        |  1 +
 WEB-INF/resources/pt.lang.php           |  1 +
 WEB-INF/resources/ro.lang.php           |  1 +
 WEB-INF/resources/ru.lang.php           |  1 +
 WEB-INF/resources/sk.lang.php           |  1 +
 WEB-INF/resources/sl.lang.php           |  1 +
 WEB-INF/resources/sr.lang.php           |  1 +
 WEB-INF/resources/sv.lang.php           |  1 +
 WEB-INF/resources/tr.lang.php           |  1 +
 WEB-INF/resources/zh-cn.lang.php        |  1 +
 WEB-INF/resources/zh-tw.lang.php        |  1 +
 WEB-INF/templates/admin_work.tpl        | 88 +++----------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_work.php                          |  2 +
 34 files changed, 96 insertions(+), 82 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 2e71b8b20..728354d4e 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -137,7 +137,60 @@ function checkSiteRegistration() {
     }
   }
 
-  // getPendingWork - obtains a list of work items pending approval.
+  // getPendingOffers - obtains a list of offers pending approval.
+  function getPendingOffers() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id)
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_pending_offers_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $pending_offers = $result_array['pending_offers'];
+    return $pending_offers;
+  }
+
+    // getPendingWork - obtains a list of work items pending approval.
   function getPendingWork() {
     global $i18n;
     global $user;
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 524752eff..3e38c19a2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -421,6 +421,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 50e5d04fa..fb8b502d2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -431,6 +431,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2bd598c69..5b03bf338 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -403,6 +403,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9e1557c5b..d47c19e9c 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -389,6 +389,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index e2c45fc23..459b250b4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -378,6 +378,7 @@
 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9a2b0638e..61cbaa337 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -420,6 +420,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 01ef4ef7a..5a199bf81 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -411,6 +411,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2dbe6891a..79547fc89 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -412,6 +412,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e81d07c10..a1cdac1e9 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -403,6 +403,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 61a0ddecf..9228c6834 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -397,6 +397,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 04aa4f3b3..300dc3c22 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -396,6 +396,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 284f8a863..6d593c9dc 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -420,6 +420,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index de16d61c2..a8bbe719d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -421,6 +421,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 77da3cd23..f439ba700 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -406,6 +406,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3a27314f8..5dc4d757d 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -427,6 +427,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 289b60b37..a9c2abaed 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -428,6 +428,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0e34c82f0..18bc14052 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -382,6 +382,8 @@
 'title.active_offers' => 'Actieve aanbiedingen',
 'title.available_offers' => 'Beschikbare aanbiedingen',
 'title.inactive_offers' => 'Inactieve aanbiedingen',
+// TODO: translate the following.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index eaa5eb45f..2b02c84e4 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -424,6 +424,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d9fd94e55..ef438e984 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -406,6 +406,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 15ac573aa..08d92193c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -401,6 +401,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 30e61902b..beafbf92d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -408,6 +408,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 17dd1c1b1..98ccd4ae7 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -426,6 +426,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ac2b73fa8..3b0fafbc9 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -364,6 +364,7 @@
 'title.active_offers' => 'Активные предложения',
 'title.available_offers' => 'Имеющиеся предложения',
 'title.inactive_offers' => 'Неактивные предложения',
+'title.pending_offers' => 'Предложения в ожидании',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 64f6a6803..3f2955f3c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -410,6 +410,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ce5ba8e76..1ff3fe338 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -401,6 +401,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c9c7e3733..b3c2eb573 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -404,6 +404,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b2090a764..c95d42326 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -405,6 +405,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 96c2fa2a2..e8aef3b47 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -435,6 +435,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 77d4cfef8..e401aded7 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -416,6 +416,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 27beb296b..7aa36b577 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -421,6 +421,7 @@
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
 // 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
 // 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
+// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index 58d847454..569b09ace 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -21,7 +21,7 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
-          <td>{$work_item.currency} {$work_item.amount}</td>
+          <td nowrap>{$work_item.currency} {$work_item.amount}</td>
           <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
@@ -29,41 +29,9 @@
       </table>
 {/if}
 
+{if $pending_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-{if $available_work}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $available_work as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape}</td>
-          <td>{$work_item.currency} {$work_item.amount}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-{if $active_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_offers}</td></tr>
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -72,59 +40,19 @@
           <td></td>
           <td></td>
         </tr>
-  {foreach $active_offers as $offer}
+  {foreach $pending_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
-          <td>{$offer.currency} {$offer.amount}</td>
-          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td>{$offer.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
+          <td nowrap>{$offer.currency} {$offer.amount}</td>
+          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
 {/if}
 
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
-{if $available_offers}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $available_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.subject|escape}</td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
-          <td>{$offer.currency} {$offer.amount}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
     </td>
   </tr>
 </table>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2a4aa0e54..a803745a4 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.19.10.5100 | 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.10.5101 | 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/admin_work.php b/admin_work.php
index dee7edc24..b1723912d 100644
--- a/admin_work.php
+++ b/admin_work.php
@@ -39,8 +39,10 @@
 $adminWorkHelper = new ttAdminWorkHelper($err);
 
 $pending_work = $adminWorkHelper->getPendingWork();
+$pending_offers = $adminWorkHelper->getPendingOffers();
 
 $smarty->assign('pending_work', $pending_work);
+$smarty->assign('pending_offers', $pending_offers);
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'admin_work.tpl');
 $smarty->display('index.tpl');

From 0a3094c24226bc2e2452070d48c1f20cb8f15288 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Sep 2019 20:01:12 +0000
Subject: [PATCH 1068/1848] Implemented admin_work_delete.php.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 113 ++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |   2 +-
 admin_work_delete.php                   |  71 +++++++++++++++
 3 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 admin_work_delete.php

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 728354d4e..cded106a1 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -36,8 +36,10 @@ class ttAdminWorkHelper {
   var $register_uri = null;      // URI to register with remote work server.
   var $get_work_uri = null;      // URI to get work details.
   var $update_work_uri = null;   // URI to update work.
+  var $delete_work_uri = null;   // URI to delete work.
   var $get_offer_uri = null;     // URI to get offer details.
   var $update_offer_uri = null;  // URI to update offer.
+  var $delete_offer_uri = null;  // URI to delete offer.
   var $get_pending_work_uri = null;   // URI to get work pending approval.
   var $get_pending_offers_uri = null; // URI to get offers pending approval.
   var $site_id = null;           // Site id for remote work server.
@@ -51,8 +53,10 @@ function __construct(&$errors) {
     $this->register_uri = $this->remote_work_uri.'register';
     $this->get_work_uri = $this->remote_work_uri.'admin_getwork';
     $this->update_work_uri = $this->remote_work_uri.'admin_updatework';
+    $this->delete_work_uri = $this->remote_work_uri.'admin_deletework';
     $this->get_offer_uri = $this->remote_work_uri.'admin_getoffer';
     $this->update_offer_uri = $this->remote_work_uri.'admin_updateoffer';
+    $this->delete_offer_uri = $this->remote_work_uri.'admin_deleteoffer';
     $this->get_pending_work_uri = $this->remote_work_uri.'admin_getpendingwork';
     $this->get_pending_offers_uri = $this->remote_work_uri.'admin_getpendingoffers';
     $this->checkSiteRegistration();
@@ -242,4 +246,113 @@ function getPendingWork() {
     $pending_work = $result_array['pending_work'];
     return $pending_work;
   }
+
+  // getWork - gets work item details from remote work server.
+  function getWork($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($work_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $work_item = $result_array['work_item'];
+    return $work_item;
+  }
+
+  // deleteWork - deletes work item from remote work server.
+  function deleteWork($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($work_id),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->delete_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a803745a4..c08a66a25 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.19.10.5101 | 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.10.5102 | 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/admin_work_delete.php b/admin_work_delete.php
new file mode 100644
index 000000000..d64b9fb9c
--- /dev/null
+++ b/admin_work_delete.php
@@ -0,0 +1,71 @@
+<?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('ttAdminWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$work_item = $adminWorkHelper->getWork($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$work_to_delete = $work_item['subject'];
+
+$form = new Form('workDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($adminWorkHelper->deleteWork($cl_work_id)) {
+      header('Location: admin_work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: admin_work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('work_to_delete', $work_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_work'));
+$smarty->assign('content_page_name', 'work_delete.tpl');
+$smarty->display('index.tpl');

From a759105d9cd256d0212f9982e6aeb9addcb5fe77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 22 Sep 2019 21:13:00 +0000
Subject: [PATCH 1069/1848] Implemented admin_offer_delete.php.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 109 ++++++++++++++++++++++++
 WEB-INF/templates/admin_work.tpl        |   2 +-
 WEB-INF/templates/footer.tpl            |   2 +-
 admin_offer_delete.php                  |  71 +++++++++++++++
 4 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 admin_offer_delete.php

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index cded106a1..e28cb581b 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -355,4 +355,113 @@ function deleteWork($work_id) {
 
     return true;
   }
+
+  // deleteOffer - deletes an offer from remote work server.
+  function deleteOffer($offer_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'offer_id' => urlencode($offer_id),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->delete_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
+  // getOffer - gets offer details from remote work server.
+  function getOffer($offer_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'offer_id' => urlencode($offer_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $offer = $result_array['offer'];
+    return $offer;
+  }
 }
diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index 569b09ace..b96865887 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -44,7 +44,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
+          <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
           <td nowrap>{$offer.currency} {$offer.amount}</td>
           <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c08a66a25..ef72a489e 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.19.10.5102 | 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.10.5103 | 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/admin_offer_delete.php b/admin_offer_delete.php
new file mode 100644
index 000000000..05e9b39b6
--- /dev/null
+++ b/admin_offer_delete.php
@@ -0,0 +1,71 @@
+<?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('ttAdminWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$offer = $adminWorkHelper->getOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$offer_to_delete = $offer['subject'];
+
+$form = new Form('offerDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($adminWorkHelper->deleteOffer($cl_offer_id)) {
+      header('Location: admin_work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: admin_work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('offer_to_delete', $offer_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_offer'));
+$smarty->assign('content_page_name', 'offer_delete.tpl');
+$smarty->display('index.tpl');

From e73c59458fa2965b31e1c95057634d05391bd249 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 23 Sep 2019 13:30:06 +0000
Subject: [PATCH 1070/1848] Added a table divider div and admin_work.php for
 better presentation.

---
 WEB-INF/templates/admin_work.tpl | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 default.css                      | 5 ++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index b96865887..ddbf5071e 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -29,6 +29,8 @@
       </table>
 {/if}
 
+<div id="TableDivider"></div>
+
 {if $pending_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_offers}</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ef72a489e..ed64b1d30 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.19.10.5103 | 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.10.5104 | 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/default.css b/default.css
index d744c66e7..cf448abcf 100644
--- a/default.css
+++ b/default.css
@@ -143,9 +143,8 @@ input[type=checkbox], label {
 .divider {
   background-color: #efefef;
 }
-table.divider {
-  width: 720px;
-}
+
+div#TableDivider { height: 30px; }
 
 div#LoginAboutText { width: 400px; }
 

From a561a9d46eafa5159795a9b53df00a7b5ff1813d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 23 Sep 2019 14:39:03 +0000
Subject: [PATCH 1071/1848] Improved presentation of budget field.

---
 WEB-INF/templates/admin_work.tpl | 4 ++--
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/work.tpl       | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index ddbf5071e..b3ec7f4b4 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -21,7 +21,7 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
-          <td nowrap>{$work_item.currency} {$work_item.amount}</td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
           <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
@@ -47,7 +47,7 @@
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
-          <td nowrap>{$offer.currency} {$offer.amount}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
           <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ed64b1d30..00971ce14 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.19.10.5104 | 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.10.5105 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 96f891fc9..7a76975c0 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -21,12 +21,11 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape}</td>
-          <td>{$work_item.currency} {$work_item.amount}</td>
+          <td>{$work_item.amount_with_currency}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
   {/foreach}
-
       </table>
 
       <table width="100%">
@@ -54,7 +53,7 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape}</td>
-          <td>{$work_item.currency} {$work_item.amount}</td>
+          <td>{$work_item.amount_with_currency}</td>
           <td></td>
           <td></td>
         </tr>
@@ -86,7 +85,7 @@
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape}</td>
-          <td>{$offer.currency} {$offer.amount}</td>
+          <td>{$offer.amount_with_currency}</td>
           <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
@@ -118,7 +117,7 @@
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape}</td>
-          <td>{$offer.currency} {$offer.amount}</td>
+          <td>{$offer.amount_with_currency}</td>
           <td></td>
           <td></td>
         </tr>

From e96779caea59a03c5570ef80b559db72fc5dd9fa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 23 Sep 2019 16:19:55 +0000
Subject: [PATCH 1072/1848] Starting to work on admin_work_edit.php.

---
 WEB-INF/lib/ttUser.class.php |   8 +--
 WEB-INF/templates/footer.tpl |   2 +-
 admin_work_edit.php          | 104 +++++++++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 admin_work_edit.php

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 59616f12b..89a1973fb 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -52,8 +52,8 @@ class ttUser {
   var $group_name = null;       // Group name.
   var $behalf_group_name = null;// Group name, on behalf of which we are working.
   var $email = null;            // User email.
-  var $lang = null;             // Language.
-  var $decimal_mark = null;     // Decimal separator.
+  var $lang = 'en';             // Language.
+  var $decimal_mark = '.';      // Decimal separator.
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
@@ -126,8 +126,8 @@ function __construct($login, $id = null) {
       $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
       if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
       $this->email = $val['email'];
-      $this->lang = $val['lang'];
-      $this->decimal_mark = $val['decimal_mark'];
+      if ($val['lang']) $this->lang = $val['lang'];
+      if ($val['decimal_mark']) $this->decimal_mark = $val['decimal_mark'];
       $this->date_format = $val['date_format'];
       $this->time_format = $val['time_format'];
       $this->week_start = $val['week_start'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 00971ce14..685e01d19 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.19.10.5105 | 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.10.5106 | 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/admin_work_edit.php b/admin_work_edit.php
new file mode 100644
index 000000000..bf9a02593
--- /dev/null
+++ b/admin_work_edit.php
@@ -0,0 +1,104 @@
+<?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('ttWorkHelper');
+import('ttAdminWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$work_item = $adminWorkHelper->getWork($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('work_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+} else {
+  $cl_name = $work_item['subject'];
+  $cl_description = $work_item['descr_short'];
+  $cl_details = $work_item['descr_long'];
+  $currency = $work_item['currency'];
+  $cl_currency = array_search($currency, $currencies);
+  $cl_budget = $work_item['amount'];
+}
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update work information.
+      $fields = array('work_id'=>$cl_work_id,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => $currencies[$cl_currency],
+        'amount' => $cl_budget);
+      if ($workHelper->updateWork($fields)) {
+        header('Location: work.php');
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_work'));
+$smarty->assign('content_page_name', 'work_edit.tpl');
+$smarty->display('index.tpl');

From 15b716bb3090329d872bc4fadfd450b8b6ab6ddb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 23 Sep 2019 17:15:37 +0000
Subject: [PATCH 1073/1848] Work in progress on admin_work_edit.php.

---
 WEB-INF/resources/ca.lang.php         |  1 +
 WEB-INF/resources/cs.lang.php         |  1 +
 WEB-INF/resources/da.lang.php         |  1 +
 WEB-INF/resources/de.lang.php         |  1 +
 WEB-INF/resources/en.lang.php         |  2 +
 WEB-INF/resources/es.lang.php         |  1 +
 WEB-INF/resources/et.lang.php         |  1 +
 WEB-INF/resources/fa.lang.php         |  1 +
 WEB-INF/resources/fi.lang.php         |  1 +
 WEB-INF/resources/fr.lang.php         |  1 +
 WEB-INF/resources/gr.lang.php         |  1 +
 WEB-INF/resources/he.lang.php         |  1 +
 WEB-INF/resources/hu.lang.php         |  1 +
 WEB-INF/resources/it.lang.php         |  1 +
 WEB-INF/resources/ja.lang.php         |  1 +
 WEB-INF/resources/ko.lang.php         |  1 +
 WEB-INF/resources/nl.lang.php         |  3 +-
 WEB-INF/resources/no.lang.php         |  1 +
 WEB-INF/resources/pl.lang.php         |  1 +
 WEB-INF/resources/pt-br.lang.php      |  1 +
 WEB-INF/resources/pt.lang.php         |  1 +
 WEB-INF/resources/ro.lang.php         |  1 +
 WEB-INF/resources/ru.lang.php         |  1 +
 WEB-INF/resources/sk.lang.php         |  1 +
 WEB-INF/resources/sl.lang.php         |  1 +
 WEB-INF/resources/sr.lang.php         |  1 +
 WEB-INF/resources/sv.lang.php         |  1 +
 WEB-INF/resources/tr.lang.php         |  1 +
 WEB-INF/resources/zh-cn.lang.php      |  1 +
 WEB-INF/resources/zh-tw.lang.php      |  1 +
 WEB-INF/templates/admin_work_edit.tpl | 55 +++++++++++++++++++++++++++
 admin_work_edit.php                   |  8 +++-
 32 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/admin_work_edit.tpl

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3e38c19a2..6ac795cb5 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -292,6 +292,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index fb8b502d2..ff6fff3ea 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -302,6 +302,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 5b03bf338..cc0db9d58 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -283,6 +283,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index d47c19e9c..511c06d31 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -277,6 +277,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 459b250b4..d741c9d0b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -266,6 +266,7 @@
                                     // because both work items and offers are owned by Time Tracker groups of users.
 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                     // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
@@ -407,6 +408,7 @@
 'dropdown.status_inactive' => 'inactive',
 'dropdown.delete' => 'delete',
 'dropdown.do_not_delete' => 'do not delete',
+'dropdown.pending_approval' => 'pending approval',
 'dropdown.approved' => 'approved',
 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 61cbaa337..c9807ba64 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -295,6 +295,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5a199bf81..c80e1536d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -290,6 +290,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 79547fc89..e8520e0c6 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -294,6 +294,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a1cdac1e9..eb3bc9104 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -287,6 +287,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9228c6834..b82004365 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -281,6 +281,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 300dc3c22..1b3a9c52f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -277,6 +277,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6d593c9dc..d67e28d94 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -302,6 +302,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a8bbe719d..e2f12d62f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -298,6 +298,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index f439ba700..58fbe9265 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -281,6 +281,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 5dc4d757d..c40944d53 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -302,6 +302,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index a9c2abaed..a21f62571 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -302,6 +302,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 18bc14052..e99954c44 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -271,7 +271,8 @@
                                        // Technically, it is either an org name or a combination of org and group names
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.S
+                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 2b02c84e4..88a94a854 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -299,6 +299,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ef438e984..3e92fe18d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -288,6 +288,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 08d92193c..50fcec669 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -285,6 +285,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index beafbf92d..ca1813de9 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -287,6 +287,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 98ccd4ae7..3d0bace62 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -299,6 +299,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3b0fafbc9..f12aed108 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -254,6 +254,7 @@
 'label.offer' => 'Предложение',
 'label.contractor' => 'Подрядчик',
 'label.how_to_pay' => 'Как оплатить',
+'label.moderator_comment' => 'Комментарий модератора',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3f2955f3c..63e2b6809 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -292,6 +292,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 1ff3fe338..e62892ba3 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -282,6 +282,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b3c2eb573..dc4124373 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -286,6 +286,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c95d42326..645f0c4d2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -283,6 +283,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e8aef3b47..6cf2edb11 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -306,6 +306,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e401aded7..62ebffef4 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -291,6 +291,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 7aa36b577..1b518ef36 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -297,6 +297,7 @@
                                        // because both work items and offers are owned by Time Tracker groups of users.
 // 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
                                        // how to pay them, for example: paypal email, check by mail to a specific address, etc.
+// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/templates/admin_work_edit.tpl b/WEB-INF/templates/admin_work_edit.tpl
new file mode 100644
index 000000000..eb71e1171
--- /dev/null
+++ b/WEB-INF/templates/admin_work_edit.tpl
@@ -0,0 +1,55 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work} (*):</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.workForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.workForm.status.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.workForm.moderator_comment.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/admin_work_edit.php b/admin_work_edit.php
index bf9a02593..285965b2e 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -53,6 +53,7 @@
   $cl_details = trim($request->getParameter('details'));
   $cl_currency = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
+  $cl_moderator_comment = $request->getParameter('moderator_comment');
 } else {
   $cl_name = $work_item['subject'];
   $cl_description = $work_item['descr_short'];
@@ -60,6 +61,7 @@
   $currency = $work_item['currency'];
   $cl_currency = array_search($currency, $currencies);
   $cl_budget = $work_item['amount'];
+  $cl_moderator_comment = $work_item['moderator_comment'];
 }
 
 $form = new Form('workForm');
@@ -69,6 +71,9 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.approved'),INACTIVE=>$i18n->get('dropdown.not_approved'))));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -77,6 +82,7 @@
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
   if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
 
   // Ensure user email exists (required for workflow).
   if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
@@ -100,5 +106,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_work'));
-$smarty->assign('content_page_name', 'work_edit.tpl');
+$smarty->assign('content_page_name', 'admin_work_edit.tpl');
 $smarty->display('index.tpl');

From 5e063d7908c7291d45636af8f218f5a6e18585b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Sep 2019 13:01:55 +0000
Subject: [PATCH 1074/1848] Work in progress on moderator approval workflow for
 Remote Work plugin.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 195 ++++++++++++++++++++++++
 WEB-INF/resources/ca.lang.php           |   1 +
 WEB-INF/resources/cs.lang.php           |   1 +
 WEB-INF/resources/da.lang.php           |   1 +
 WEB-INF/resources/de.lang.php           |   1 +
 WEB-INF/resources/es.lang.php           |   1 +
 WEB-INF/resources/et.lang.php           |   1 +
 WEB-INF/resources/fa.lang.php           |   1 +
 WEB-INF/resources/fi.lang.php           |   1 +
 WEB-INF/resources/fr.lang.php           |   1 +
 WEB-INF/resources/gr.lang.php           |   1 +
 WEB-INF/resources/he.lang.php           |   1 +
 WEB-INF/resources/hu.lang.php           |   1 +
 WEB-INF/resources/it.lang.php           |   1 +
 WEB-INF/resources/ja.lang.php           |   1 +
 WEB-INF/resources/ko.lang.php           |   1 +
 WEB-INF/resources/nl.lang.php           |   2 +
 WEB-INF/resources/no.lang.php           |   1 +
 WEB-INF/resources/pl.lang.php           |   1 +
 WEB-INF/resources/pt-br.lang.php        |   1 +
 WEB-INF/resources/pt.lang.php           |   1 +
 WEB-INF/resources/ro.lang.php           |   1 +
 WEB-INF/resources/ru.lang.php           |   1 +
 WEB-INF/resources/sk.lang.php           |   1 +
 WEB-INF/resources/sl.lang.php           |   1 +
 WEB-INF/resources/sr.lang.php           |   1 +
 WEB-INF/resources/sv.lang.php           |   1 +
 WEB-INF/resources/tr.lang.php           |   1 +
 WEB-INF/resources/zh-cn.lang.php        |   1 +
 WEB-INF/resources/zh-tw.lang.php        |   1 +
 WEB-INF/templates/admin_work_edit.tpl   |   2 +-
 admin_work_edit.php                     |  45 +++++-
 32 files changed, 264 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index e28cb581b..6adbdd4ad 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -37,9 +37,13 @@ class ttAdminWorkHelper {
   var $get_work_uri = null;      // URI to get work details.
   var $update_work_uri = null;   // URI to update work.
   var $delete_work_uri = null;   // URI to delete work.
+  var $approve_work_uri = null;    // URI to approved work.
+  var $disapprove_work_uri = null; // URI to disapprove work.
   var $get_offer_uri = null;     // URI to get offer details.
   var $update_offer_uri = null;  // URI to update offer.
   var $delete_offer_uri = null;  // URI to delete offer.
+  var $approve_offer_uri = null;    // URI to approved offer.
+  var $disapprove_offer_uri = null; // URI to disapprove offer.
   var $get_pending_work_uri = null;   // URI to get work pending approval.
   var $get_pending_offers_uri = null; // URI to get offers pending approval.
   var $site_id = null;           // Site id for remote work server.
@@ -54,9 +58,13 @@ function __construct(&$errors) {
     $this->get_work_uri = $this->remote_work_uri.'admin_getwork';
     $this->update_work_uri = $this->remote_work_uri.'admin_updatework';
     $this->delete_work_uri = $this->remote_work_uri.'admin_deletework';
+    $this->approve_work_uri = $this->remote_work_uri.'admin_approvework';
+    $this->disapprove_work_uri = $this->remote_work_uri.'admin_disapprovework';
     $this->get_offer_uri = $this->remote_work_uri.'admin_getoffer';
     $this->update_offer_uri = $this->remote_work_uri.'admin_updateoffer';
     $this->delete_offer_uri = $this->remote_work_uri.'admin_deleteoffer';
+    $this->approve_offer_uri = $this->remote_work_uri.'admin_approveoffer';
+    $this->disapprove_offer_uri = $this->remote_work_uri.'admin_disapproveoffer';
     $this->get_pending_work_uri = $this->remote_work_uri.'admin_getpendingwork';
     $this->get_pending_offers_uri = $this->remote_work_uri.'admin_getpendingoffers';
     $this->checkSiteRegistration();
@@ -464,4 +472,191 @@ function getOffer($offer_id) {
     $offer = $result_array['offer'];
     return $offer;
   }
+
+   // updateWork - updates a work item in remote work server.
+  function updateWork($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($fields['work_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount']),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->update_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
+  // approveWork - approves work item in remote work server.
+  function approveWork($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($fields['work_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount']),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->approve_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
+  // disapproveWork - disapproves work item in remote work server.
+  function disapproveWork($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($fields['work_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount']),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->disapprove_work_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6ac795cb5..0f237e21c 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -455,6 +455,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index ff6fff3ea..e52d1b9f6 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -463,6 +463,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index cc0db9d58..9d77c6aec 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -437,6 +437,7 @@
 'dropdown.delete' => 'Slet',
 'dropdown.do_not_delete' => 'Slet ikke',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 511c06d31..6766407f6 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -421,6 +421,7 @@
 'dropdown.delete' => 'löschen',
 'dropdown.do_not_delete' => 'nicht löschen',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'bezahlt',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c9807ba64..5c2da7972 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -454,6 +454,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c80e1536d..d72720e24 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -443,6 +443,7 @@
 'dropdown.delete' => 'kustuta',
 'dropdown.do_not_delete' => 'ära kustuta',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'makstud',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e8520e0c6..ebb799567 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -449,6 +449,7 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index eb3bc9104..6a923b4a1 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -437,6 +437,7 @@
 'dropdown.delete' => 'poista',
 'dropdown.do_not_delete' => 'älä poista',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b82004365..2d0a4892d 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -429,6 +429,7 @@
 'dropdown.delete' => 'supprimer',
 'dropdown.do_not_delete' => 'ne pas supprimer',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1b3a9c52f..ccd10e059 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -428,6 +428,7 @@
 'dropdown.delete' => 'διαγραφή',
 'dropdown.do_not_delete' => 'μη το διαγράψετε',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'εξοφλημένο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d67e28d94..7c1c90572 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -455,6 +455,7 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e2f12d62f..585723101 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -457,6 +457,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 58fbe9265..4277c6bfc 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -438,6 +438,7 @@
 'dropdown.delete' => 'elimina',
 'dropdown.do_not_delete' => 'non eliminare',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'pagato',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c40944d53..0d1a7a2b8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -458,6 +458,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index a21f62571..fe4599f9b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -462,6 +462,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index e99954c44..4179add13 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -413,6 +413,8 @@
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
 'dropdown.do_not_delete' => 'niet verwijderen',
+// TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 'dropdown.approved' => 'goedgekeurd',
 'dropdown.not_approved' => 'afgekeurd',
 'dropdown.paid' => 'betaald',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 88a94a854..ba3734aa9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -458,6 +458,7 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3e92fe18d..669a3a5ed 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -440,6 +440,7 @@
 'dropdown.delete' => 'usuń',
 'dropdown.do_not_delete' => 'nie usuwaj',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 50fcec669..8adcf4aa9 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -435,6 +435,7 @@
 'dropdown.delete' => 'apagar',
 'dropdown.do_not_delete' => 'não apagar',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ca1813de9..9312fe181 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -441,6 +441,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3d0bace62..e8b7dadfd 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -461,6 +461,7 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f12aed108..4ee3aec21 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -394,6 +394,7 @@
 'dropdown.status_inactive' => 'неактивный',
 'dropdown.delete' => 'удалить',
 'dropdown.do_not_delete' => 'не удалять',
+'dropdown.pending_approval' => 'в ожидании одобрения',
 'dropdown.approved' => 'одобрено',
 'dropdown.not_approved' => 'не одобрено',
 'dropdown.paid' => 'оплачено',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 63e2b6809..a378df653 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -445,6 +445,7 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e62892ba3..82fbc21b2 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -433,6 +433,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index dc4124373..02da7646c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -438,6 +438,7 @@
 'dropdown.delete' => 'obriši',
 'dropdown.do_not_delete' => 'nemoj obrisati',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 645f0c4d2..1b6891fd9 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -437,6 +437,7 @@
 'dropdown.delete' => 'Ta bort',
 'dropdown.do_not_delete' => 'Ta inte bort',
 // TODO: translate the following.
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 6cf2edb11..7f2af552e 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -469,6 +469,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 62ebffef4..47bbae4ba 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -449,6 +449,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1b518ef36..8764492c3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -454,6 +454,7 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
+// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/templates/admin_work_edit.tpl b/WEB-INF/templates/admin_work_edit.tpl
index eb71e1171..8b7613e1d 100644
--- a/WEB-INF/templates/admin_work_edit.tpl
+++ b/WEB-INF/templates/admin_work_edit.tpl
@@ -27,7 +27,7 @@
         </tr>
         <tr>
           <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          <td>{$forms.workForm.budget.control}</td>
         </tr>
         <tr>
           <td align = "right">{$i18n.label.status}:</td>
diff --git a/admin_work_edit.php b/admin_work_edit.php
index 285965b2e..0eb38f887 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -45,6 +45,12 @@
 }
 // End of access checks.
 
+// Status definitions.
+define("STATUS_PENDING_APPROVAL", 4);
+define("STATUS_DISAPPROVED", 8);
+define("STATUS_APPROVED", 12);
+
+$existingStatus = $work_item['status'];
 $currencies = ttWorkHelper::getCurrencies();
 
 if ($request->isPost()) {
@@ -53,6 +59,7 @@
   $cl_details = trim($request->getParameter('details'));
   $cl_currency = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
+  $cl_status = $request->getParameter('status');
   $cl_moderator_comment = $request->getParameter('moderator_comment');
 } else {
   $cl_name = $work_item['subject'];
@@ -61,6 +68,7 @@
   $currency = $work_item['currency'];
   $cl_currency = array_search($currency, $currencies);
   $cl_budget = $work_item['amount'];
+  $cl_status = $work_item['status'];
   $cl_moderator_comment = $work_item['moderator_comment'];
 }
 
@@ -71,8 +79,14 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.approved'),INACTIVE=>$i18n->get('dropdown.not_approved'))));
+
+// Prepare status choices.
+$status_options = array();
+$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
+$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
+$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
+
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -89,16 +103,33 @@
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
-      // Update work information.
       $fields = array('work_id'=>$cl_work_id,
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,
         'currency' => $currencies[$cl_currency],
-        'amount' => $cl_budget);
-      if ($workHelper->updateWork($fields)) {
-        header('Location: work.php');
-        exit();
+        'amount' => $cl_budget,
+        'moderator_comment' => $cl_moderator_comment);
+
+      // Do things differently, depending on status control value.
+      if ($existingStatus == $cl_status) {
+        // Status not changed. Update work information.
+        if ($adminWorkHelper->updateWork($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
+      } else if ($cl_status == STATUS_DISAPPROVED) {
+        // Status changed to "not approved". Disapprove work.
+        if ($adminWorkHelper->disapproveWork($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
+      } else if ($cl_status == STATUS_APPROVED) {
+        // Status changed to "approved". Approve work.
+        if ($adminWorkHelper->approveWork($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
       }
     }
   }

From 078e2657fef518e71a6e2b5b96301192c6aba505 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Sep 2019 14:40:50 +0000
Subject: [PATCH 1075/1848] Fixed disapproveWork function.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 6adbdd4ad..29f41280d 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -599,7 +599,7 @@ function approveWork($work_id) {
   }
 
   // disapproveWork - disapproves work item in remote work server.
-  function disapproveWork($work_id) {
+  function disapproveWork($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 685e01d19..370602519 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.19.10.5106 | 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.10.5107 | 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>

From 786dd793abe6c533d1824c009643b7857c458f44 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Sep 2019 16:56:07 +0000
Subject: [PATCH 1076/1848] Fixed ttAdminWorkHelper::approveWork call.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 29f41280d..7bf4171a5 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -537,7 +537,7 @@ function updateWork($fields) {
   }
 
   // approveWork - approves work item in remote work server.
-  function approveWork($work_id) {
+  function approveWork($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();

From fbab42d88779bcd346840722cd54511c5a1e714b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Sep 2019 18:50:29 +0000
Subject: [PATCH 1077/1848] Added admin_offer_edit.php.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 190 +++++++++++++++++++++++-
 WEB-INF/templates/admin_offer_edit.tpl  |  55 +++++++
 WEB-INF/templates/footer.tpl            |   2 +-
 admin_offer_edit.php                    | 141 ++++++++++++++++++
 4 files changed, 386 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/admin_offer_edit.tpl
 create mode 100644 admin_offer_edit.php

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 7bf4171a5..446d741fe 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -473,7 +473,7 @@ function getOffer($offer_id) {
     return $offer;
   }
 
-   // updateWork - updates a work item in remote work server.
+  // updateWork - updates a work item in remote work server.
   function updateWork($fields) {
     global $i18n;
     global $user;
@@ -659,4 +659,192 @@ function disapproveWork($fields) {
 
     return true;
   }
+
+  // updateOffer - updates an offer in remote work server.
+  function updateOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'offer_id' => urlencode($fields['offer_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount']),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->update_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
+  // approveOffer - approves offer in remote work server.
+  function approveOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'offer_id' => urlencode($fields['offer_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount']),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->approve_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
+
+  // disapproveOffer - disapproves offer in remote work server.
+  function disapproveOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'offer_id' => urlencode($fields['offer_id']),
+      'subject' => urlencode(base64_encode($fields['subject'])),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'currency' => urlencode($fields['currency']),
+      'amount' => urlencode($fields['amount']),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->disapprove_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/templates/admin_offer_edit.tpl b/WEB-INF/templates/admin_offer_edit.tpl
new file mode 100644
index 000000000..edf3e5328
--- /dev/null
+++ b/WEB-INF/templates/admin_offer_edit.tpl
@@ -0,0 +1,55 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.offer} (*):</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.offerForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.offerForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.offerForm.status.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.offerForm.moderator_comment.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 370602519..6a1b9a036 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.19.10.5107 | 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.10.5108 | 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/admin_offer_edit.php b/admin_offer_edit.php
new file mode 100644
index 000000000..c47f3f1fa
--- /dev/null
+++ b/admin_offer_edit.php
@@ -0,0 +1,141 @@
+<?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('ttWorkHelper');
+import('ttAdminWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$offer = $adminWorkHelper->getOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Status definitions.
+define("STATUS_PENDING_APPROVAL", 4);
+define("STATUS_DISAPPROVED", 8);
+define("STATUS_APPROVED", 12);
+
+$existingStatus = $offer['status'];
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('offer_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+  $cl_status = $request->getParameter('status');
+  $cl_moderator_comment = $request->getParameter('moderator_comment');
+} else {
+  $cl_name = $offer['subject'];
+  $cl_description = $offer['descr_short'];
+  $cl_details = $offer['descr_long'];
+  $currency = $offer['currency'];
+  $cl_currency = array_search($currency, $currencies);
+  $cl_budget = $offer['amount'];
+  $cl_status = $offer['status'];
+  $cl_moderator_comment = $offer['moderator_comment'];
+}
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+
+// Prepare status choices.
+$status_options = array();
+$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
+$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
+$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
+
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      $fields = array('offer_id'=>$cl_offer_id,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => $currencies[$cl_currency],
+        'amount' => $cl_budget,
+        'moderator_comment' => $cl_moderator_comment);
+
+      // Do things differently, depending on status control value.
+      if ($existingStatus == $cl_status) {
+        // Status not changed. Update work information.
+        if ($adminWorkHelper->updateOffer($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
+      } else if ($cl_status == STATUS_DISAPPROVED) {
+        // Status changed to "not approved". Disapprove work.
+        if ($adminWorkHelper->disapproveOffer($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
+      } else if ($cl_status == STATUS_APPROVED) {
+        // Status changed to "approved". Approve work.
+        if ($adminWorkHelper->approveOffer($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_offer'));
+$smarty->assign('content_page_name', 'admin_offer_edit.tpl');
+$smarty->display('index.tpl');

From 13d27f3b0d26a288240b592c1f476a4fd862c852 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 10:54:16 +0000
Subject: [PATCH 1078/1848] Added audit info to some delete operations.

---
 WEB-INF/lib/ttExpenseHelper.class.php |  4 +++-
 WEB-INF/lib/ttInvoiceHelper.class.php | 10 ++++++----
 WEB-INF/lib/ttTimeHelper.class.php    |  4 +++-
 WEB-INF/templates/footer.tpl          |  2 +-
 week.php                              |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index e7da92cbb..b191fe379 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -95,7 +95,9 @@ static function markDeleted($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "update tt_expense_items set status = null".
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "update tt_expense_items set status = null".$modified_part.
       " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index a766a0f3e..833f15c3d 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -199,6 +199,8 @@ static function delete($invoice_id, $delete_invoice_items) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
     // Handle custom field log records.
     if ($delete_invoice_items) {
       $sql = "update tt_custom_field_log set status = null".
@@ -210,10 +212,10 @@ static function delete($invoice_id, $delete_invoice_items) {
 
     // Handle time records.
     if ($delete_invoice_items) {
-      $sql = "update tt_log set status = null".
+      $sql = "update tt_log set status = null".$modified_part.
         " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
     } else {
-      $sql = "update tt_log set invoice_id = null".
+      $sql = "update tt_log set invoice_id = null".$modified_part.
         " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
     }
     $affected = $mdb2->exec($sql);
@@ -221,10 +223,10 @@ static function delete($invoice_id, $delete_invoice_items) {
 
     // Handle expense items.
     if ($delete_invoice_items) {
-      $sql = "update tt_expense_items set status = null".
+      $sql = "update tt_expense_items set status = null".$modified_part.
         " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
     } else {
-      $sql = "update tt_expense_items set invoice_id = null".
+      $sql = "update tt_expense_items set invoice_id = null".$modified_part.
         " where invoice_id = $invoice_id and group_id = $group_id and org_id = $org_id";
     }
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 043e43462..6ed1721ee 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -567,7 +567,9 @@ static function delete($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "update tt_log set status = null".
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
+
+    $sql = "update tt_log set status = null".$modified_part.
       " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6a1b9a036..39aa5caec 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.19.10.5108 | 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.10.5109 | 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/week.php b/week.php
index 0fe376cc3..6b7cb1d90 100644
--- a/week.php
+++ b/week.php
@@ -468,7 +468,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
               $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
             } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
               // Delete an already existing record here.
-              $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id'], $user->getUser());
+              $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id']);
             } else {
               $fields = array();
               $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];

From b681346e24bbbd487066e41cb8d618cbf7e3029e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 15:14:27 +0000
Subject: [PATCH 1079/1848] Added status output for active work and offers on
 work.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/work.tpl   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 39aa5caec..929798e3d 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.19.10.5109 | 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.10.5110 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 7a76975c0..9e9007c3c 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -11,7 +11,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -20,7 +20,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape}</td>
+          <td>{$work_item.status_label}</td>
           <td>{$work_item.amount_with_currency}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
@@ -75,7 +75,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -84,7 +84,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
+          <td>{$offer.status_label}</td>
           <td>{$offer.amount_with_currency}</td>
           <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>

From e8847234f36b28d926dfbe5a4c134173894d152c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 17:04:37 +0000
Subject: [PATCH 1080/1848] Combined 4 API calls into 1.

---
 WEB-INF/lib/ttWorkHelper.class.php | 60 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 work.php                           | 11 +++---
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 8eee2da0f..151af26b1 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -45,6 +45,7 @@ class ttWorkHelper {
   var $get_offer_uri = null;     // URI to get offer details.
   var $get_active_offers_uri = null;    // URI to get active offers.
   var $get_available_offers_uri = null; // URI to get available offers.
+  var $get_group_items_uri = null;      // URI to get all group items in one API call.
   var $delete_offer_uri = null;  // URI to delete offer.
   var $delete_offers_uri = null; // URI to delete multiple offers.
   var $update_offer_uri = null;  // URI to update offer.
@@ -73,6 +74,7 @@ function __construct(&$errors) {
     $this->get_offer_uri = $this->remote_work_uri.'getoffer';
     $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
     $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
+    $this->get_group_items_uri = $this->remote_work_uri.'getgroupitems';
     $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
     $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
     $this->checkSiteRegistration();
@@ -929,4 +931,62 @@ static function getCurrencies() {
     }
     return $result;
   }
+
+  // getGroupItems - obtains a list of all items relevant to group in one API call to Remote Work Server.
+  function getGroupItems() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey())
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_group_items_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return $result_array; // Also contains 'call_status' element, probably okay to pass it to caller with useful payload.
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 929798e3d..3ee10fa1f 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.19.10.5110 | 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.10.5111 | 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/work.php b/work.php
index fab8ccb0d..606f8fbf9 100644
--- a/work.php
+++ b/work.php
@@ -41,20 +41,19 @@
 // End of access checks.
 
 $workHelper = new ttWorkHelper($err);
-
+$groupItems = $workHelper->getGroupItems(); // All group items.
 if($user->can('manage_work')) {
-  $active_work = $workHelper->getActiveWork(); // Active work items this group is outsourcing.
-  $available_offers = $workHelper->getAvailableOffers(); // Available offers from other organizations.
+  $active_work = $groupItems['active_work']; // Active work items this group is outsourcing.
+  $available_offers = $groupItems['available_offers']; // Available offers from other organizations.
 }
 if($user->can('bid_on_work')) {
-  $available_work = $workHelper->getAvailableWork(); // Currently available work items from other orgs.
-  $active_offers = $workHelper->getActiveOffers(); // Active offers this group makes available to other groups.
+  $available_work = $groupItems['available_work']; // Currently available work items from other orgs.
+  $active_offers = $groupItems['active_offers']; // Active offers this group makes available to other groups.
 }
 if($user->can('update_work')) {
   // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
   // $completed_work = ttWorkHelper::getCompletedWork(); // Completed work items for other groups.
 }
-// $available_offers = ttWorkHelper::getAvailableOffers(); // Currently available offers to do work.
 // TODO: review access rights for the code above.
 
 $smarty->assign('active_work', $active_work);

From 6c4f7b401d85c06d79838a0f2f4de6a2739f18ec Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 18:10:09 +0000
Subject: [PATCH 1081/1848] Combined several API calls into one, added
 available work and offers on admin_work.php.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 57 +++++++++++++++++++++++++
 WEB-INF/templates/admin_work.tpl        | 52 ++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_work.php                          |  9 +++-
 4 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 446d741fe..db9f124df 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -46,6 +46,7 @@ class ttAdminWorkHelper {
   var $disapprove_offer_uri = null; // URI to disapprove offer.
   var $get_pending_work_uri = null;   // URI to get work pending approval.
   var $get_pending_offers_uri = null; // URI to get offers pending approval.
+  var $get_admin_items_uri = null;    // URI to get all admin items in one API call.
   var $site_id = null;           // Site id for remote work server.
   var $site_key = null;          // Site key for remote work server.
 
@@ -67,6 +68,7 @@ function __construct(&$errors) {
     $this->disapprove_offer_uri = $this->remote_work_uri.'admin_disapproveoffer';
     $this->get_pending_work_uri = $this->remote_work_uri.'admin_getpendingwork';
     $this->get_pending_offers_uri = $this->remote_work_uri.'admin_getpendingoffers';
+    $this->get_admin_items_uri = $this->remote_work_uri.'admin_getitems';
     $this->checkSiteRegistration();
   }
 
@@ -847,4 +849,59 @@ function disapproveOffer($fields) {
 
     return true;
   }
+
+  // getAdminItems - obtains a list of all items relevant to admin in one API call to Remote Work Server.
+  function getAdminItems() {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id)
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_admin_items_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return $result_array; // Also contains 'call_status' element, probably okay to pass it to caller with useful payload.
+  }
 }
diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index b3ec7f4b4..bcc77e88b 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -55,6 +55,58 @@
       </table>
 {/if}
 
+<div id="TableDivider"></div>
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
+{if $available_work}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $available_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape}</td>
+          <td>{$work_item.amount_with_currency}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+<div id="TableDivider"></div>
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
+{if $available_offers}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $active_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.status_label}</td>
+          <td>{$offer.amount_with_currency}</td>
+          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
     </td>
   </tr>
 </table>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3ee10fa1f..7ff0bc104 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.19.10.5111 | 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.10.5112 | 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/admin_work.php b/admin_work.php
index b1723912d..f85a1f99e 100644
--- a/admin_work.php
+++ b/admin_work.php
@@ -38,11 +38,16 @@
 
 $adminWorkHelper = new ttAdminWorkHelper($err);
 
-$pending_work = $adminWorkHelper->getPendingWork();
-$pending_offers = $adminWorkHelper->getPendingOffers();
+$adminItems = $adminWorkHelper->getAdminItems();
+$pending_work = $adminItems['pending_work'];
+$pending_offers = $adminItems['pending_offers'];
+$available_work = $adminItems['available_work'];
+$available_offers = $adminItems['available_offers'];
 
 $smarty->assign('pending_work', $pending_work);
 $smarty->assign('pending_offers', $pending_offers);
+$smarty->assign('available_work', $available_work);
+$smarty->assign('available_offers', $available_offers);
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'admin_work.tpl');
 $smarty->display('index.tpl');

From d7c4b9e7fb5202646f90a296ad53676f68835f70 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 18:17:44 +0000
Subject: [PATCH 1082/1848] Fixed presentation of available offers on
 admin_work.php.

---
 WEB-INF/templates/admin_work.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index bcc77e88b..cbc015c30 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -94,7 +94,7 @@
           <td></td>
           <td></td>
         </tr>
-  {foreach $active_offers as $offer}
+  {foreach $available_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>

From 63d0aa73172c267c8320fd0b1416c18c4adb960d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 18:24:11 +0000
Subject: [PATCH 1083/1848] Presentation fixed on admin_work.php.

---
 WEB-INF/templates/admin_work.tpl | 8 ++++----
 WEB-INF/templates/footer.tpl     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index cbc015c30..5bb4e4297 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -89,7 +89,7 @@
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -98,10 +98,10 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
-          <td>{$offer.status_label}</td>
+          <td>{$offer.group_name|escape}</td>
           <td>{$offer.amount_with_currency}</td>
-          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td></td>
+          <td></td>
         </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7ff0bc104..559dc8418 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.19.10.5112 | 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.10.5113 | 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>

From cb96f3ea7430df12bba172c1457a5ae97782be9b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 19:24:11 +0000
Subject: [PATCH 1084/1848] A bit of refactoring.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 10 +++++-----
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_work.php                          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index db9f124df..474f124c0 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -46,7 +46,7 @@ class ttAdminWorkHelper {
   var $disapprove_offer_uri = null; // URI to disapprove offer.
   var $get_pending_work_uri = null;   // URI to get work pending approval.
   var $get_pending_offers_uri = null; // URI to get offers pending approval.
-  var $get_admin_items_uri = null;    // URI to get all admin items in one API call.
+  var $get_items_uri = null;     // URI to get all admin items in one API call.
   var $site_id = null;           // Site id for remote work server.
   var $site_key = null;          // Site key for remote work server.
 
@@ -68,7 +68,7 @@ function __construct(&$errors) {
     $this->disapprove_offer_uri = $this->remote_work_uri.'admin_disapproveoffer';
     $this->get_pending_work_uri = $this->remote_work_uri.'admin_getpendingwork';
     $this->get_pending_offers_uri = $this->remote_work_uri.'admin_getpendingoffers';
-    $this->get_admin_items_uri = $this->remote_work_uri.'admin_getitems';
+    $this->get_items_uri = $this->remote_work_uri.'admin_getitems';
     $this->checkSiteRegistration();
   }
 
@@ -850,8 +850,8 @@ function disapproveOffer($fields) {
     return true;
   }
 
-  // getAdminItems - obtains a list of all items relevant to admin in one API call to Remote Work Server.
-  function getAdminItems() {
+  // getItems - obtains a list of all items relevant to admin in one API call to Remote Work Server.
+  function getItems() {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -873,7 +873,7 @@ function getAdminItems() {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_admin_items_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_items_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 559dc8418..63aeda8a0 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.19.10.5113 | 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.10.5114 | 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/admin_work.php b/admin_work.php
index f85a1f99e..fd0b7b05c 100644
--- a/admin_work.php
+++ b/admin_work.php
@@ -38,7 +38,7 @@
 
 $adminWorkHelper = new ttAdminWorkHelper($err);
 
-$adminItems = $adminWorkHelper->getAdminItems();
+$adminItems = $adminWorkHelper->getItems();
 $pending_work = $adminItems['pending_work'];
 $pending_offers = $adminItems['pending_offers'];
 $available_work = $adminItems['available_work'];

From 950409abe22615155a5587fd9ba057d4cf528296 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 19:51:09 +0000
Subject: [PATCH 1085/1848] Removed call_status element from arrays that 2
 functions return.

---
 WEB-INF/lib/ttWorkHelper.class.php | 3 ++-
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 151af26b1..a4ef1f6e2 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -987,6 +987,7 @@ function getGroupItems() {
       return false;
     }
 
-    return $result_array; // Also contains 'call_status' element, probably okay to pass it to caller with useful payload.
+    unset($result_array['call_status']); // Remove call_status element,
+    return $result_array;
   }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 63aeda8a0..6858bebba 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.19.10.5114 | 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.10.5115 | 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>

From 6071c383750c11836c9cd90d958f5f960620f21e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 19:54:28 +0000
Subject: [PATCH 1086/1848] Forgot to check in one file.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 474f124c0..cdd517c40 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -902,6 +902,7 @@ function getItems() {
       return false;
     }
 
-    return $result_array; // Also contains 'call_status' element, probably okay to pass it to caller with useful payload.
+    unset($result_array['call_status']); // Remove call_status element.
+    return $result_array;
   }
 }

From f1da282b00744172e9877a76462263871badb457 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Sep 2019 20:52:18 +0000
Subject: [PATCH 1087/1848] Added status and moderator comment on
 work_edit.php.

---
 WEB-INF/lib/form/TextArea.class.php | 2 +-
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/work_edit.tpl     | 8 ++++++++
 work_edit.php                       | 6 ++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/TextArea.class.php b/WEB-INF/lib/form/TextArea.class.php
index be884f0d8..ee68fcb87 100644
--- a/WEB-INF/lib/form/TextArea.class.php
+++ b/WEB-INF/lib/form/TextArea.class.php
@@ -57,7 +57,7 @@ function getHtml() {
 		if ($this->mOnKeyPress) {
 			$html .= " onkeypress=\"$this->mOnKeyPress\"";
 		}
-			
+                if(!$this->isEnabled()) $html .= " readonly";
 		$html .= ">".htmlspecialchars($this->getValue())."</textarea>";
 		
 		return $html;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6858bebba..3786693b8 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.19.10.5115 | 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.10.5116 | 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/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index 9aaaa85f7..eb71e1171 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -29,6 +29,14 @@
           <td align="right">{$i18n.label.budget} (*):</td>
           <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.workForm.status.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.workForm.moderator_comment.control}</td>
+        </tr>
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/work_edit.php b/work_edit.php
index 74c9d08fa..3d057770c 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -63,6 +63,8 @@
   $currency = $work_item['currency'];
   $cl_currency = array_search($currency, $currencies);
   $cl_budget = $work_item['amount'];
+  $cl_status = $work_item['status_label'];
+  $cl_moderator_comment = $work_item['moderator_comment'];
 }
 
 $form = new Form('workForm');
@@ -72,6 +74,10 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
+$form->getElement('status')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->getElement('moderator_comment')->setEnabled(false);
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {

From ee4bec8160ae2cad5611c299372ff06ecec8f74c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Sep 2019 11:41:45 +0000
Subject: [PATCH 1088/1848] Added status and moderator comment on
 offer_edit.php.

---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/offer_edit.tpl | 10 ++++++++++
 WEB-INF/templates/work_edit.tpl  |  2 ++
 offer_edit.php                   |  9 +++++++++
 work_edit.php                    |  3 +++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3786693b8..2552ec237 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.19.10.5116 | 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.10.5117 | 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/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
index fb406d1b0..75f7a0532 100644
--- a/WEB-INF/templates/offer_edit.tpl
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -27,6 +27,16 @@
           <td align = "right">{$i18n.label.how_to_pay} (*):</td>
           <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.offerForm.status.control}</td>
+        </tr>
+{if $show_moderator_comment}
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.offerForm.moderator_comment.control}</td>
+        </tr>
+{/if}
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/WEB-INF/templates/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index eb71e1171..48e4456fb 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -33,10 +33,12 @@
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.workForm.status.control}</td>
         </tr>
+{if $show_moderator_comment}
         <tr>
           <td align = "right">{$i18n.label.moderator_comment}:</td>
           <td>{$forms.workForm.moderator_comment.control}</td>
         </tr>
+{/if}
         <tr>
           <td></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/offer_edit.php b/offer_edit.php
index abdb195d5..729b79d03 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -65,8 +65,12 @@
   $cl_currency = array_search($currency, $currencies);
   $cl_budget = $offer['amount'];
   $cl_payment_info = $offer['payment_info'];
+  $cl_status = $offer['status_label'];
+  $cl_moderator_comment = $offer['moderator_comment'];
 }
 
+$show_moderator_comment = $cl_moderator_comment != null;
+
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
@@ -75,6 +79,10 @@
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 250px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
+$form->getElement('status')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->getElement('moderator_comment')->setEnabled(false);
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -106,6 +114,7 @@
   }
 } // isPost
 
+$smarty->assign('show_moderator_comment', $show_moderator_comment);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_offer'));
 $smarty->assign('content_page_name', 'offer_edit.tpl');
diff --git a/work_edit.php b/work_edit.php
index 3d057770c..eda443716 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -67,6 +67,8 @@
   $cl_moderator_comment = $work_item['moderator_comment'];
 }
 
+$show_moderator_comment = $cl_moderator_comment != null;
+
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
@@ -107,6 +109,7 @@
   }
 } // isPost
 
+$smarty->assign('show_moderator_comment', $show_moderator_comment);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_work'));
 $smarty->assign('content_page_name', 'work_edit.tpl');

From 48f53308625e6d2a79df941405287cc3c2a20536 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Sep 2019 17:46:52 +0000
Subject: [PATCH 1089/1848] Cosmetic, removed unused columns.

---
 WEB-INF/templates/admin_work.tpl | 12 ++----------
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/work.tpl       | 16 ++++------------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index 5bb4e4297..656899261 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -65,17 +65,13 @@
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.client}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
         </tr>
   {foreach $available_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape}</td>
-          <td>{$work_item.amount_with_currency}</td>
-          <td></td>
-          <td></td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
         </tr>
   {/foreach}
 {/if}
@@ -91,17 +87,13 @@
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.contractor}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
         </tr>
   {foreach $available_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape}</td>
-          <td>{$offer.amount_with_currency}</td>
-          <td></td>
-          <td></td>
+          <td nowrap>{$offer.amount_with_currency}</td>
         </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2552ec237..053b8ade1 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.19.10.5117 | 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.10.5118 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 9e9007c3c..f371eb8af 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -21,7 +21,7 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.status_label}</td>
-          <td>{$work_item.amount_with_currency}</td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
@@ -45,17 +45,13 @@
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.client}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
         </tr>
   {foreach $available_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape}</td>
-          <td>{$work_item.amount_with_currency}</td>
-          <td></td>
-          <td></td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
         </tr>
   {/foreach}
 {/if}
@@ -85,7 +81,7 @@
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
-          <td>{$offer.amount_with_currency}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
           <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
         </tr>
@@ -109,17 +105,13 @@
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.contractor}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
         </tr>
   {foreach $available_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$offer.subject|escape}</td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape}</td>
-          <td>{$offer.amount_with_currency}</td>
-          <td></td>
-          <td></td>
+          <td nowrap>{$offer.amount_with_currency}</td>
         </tr>
   {/foreach}
 {/if}

From 854157742719af47505be8fb4cc191bec5c00ae8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Sep 2019 17:53:29 +0000
Subject: [PATCH 1090/1848] Improved styling for table divider div.

---
 WEB-INF/templates/admin_work.tpl | 6 +++---
 WEB-INF/templates/footer.tpl     | 2 +-
 default.css                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
index 656899261..16b4d4434 100644
--- a/WEB-INF/templates/admin_work.tpl
+++ b/WEB-INF/templates/admin_work.tpl
@@ -29,7 +29,7 @@
       </table>
 {/if}
 
-<div id="TableDivider"></div>
+<div class="table-divider"></div>
 
 {if $pending_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
@@ -55,7 +55,7 @@
       </table>
 {/if}
 
-<div id="TableDivider"></div>
+<div class="table-divider"></div>
 
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
@@ -77,7 +77,7 @@
 {/if}
       </table>
 
-<div id="TableDivider"></div>
+<div class="table-divider"></div>
 
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 053b8ade1..9432194d3 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.19.10.5118 | 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.10.5119 | 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/default.css b/default.css
index cf448abcf..89b3fa645 100644
--- a/default.css
+++ b/default.css
@@ -144,7 +144,7 @@ input[type=checkbox], label {
   background-color: #efefef;
 }
 
-div#TableDivider { height: 30px; }
+div.table-divider { height: 30px; }
 
 div#LoginAboutText { width: 400px; }
 

From 6421067fb119007de8d461f85def1e6bc2d98795 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Sep 2019 18:22:46 +0000
Subject: [PATCH 1091/1848] Introduced work_constants.php file for status
 definitions.

---
 WEB-INF/templates/footer.tpl |  2 +-
 admin_offer_edit.php         |  6 +-----
 admin_work_edit.php          |  5 +----
 plugins/work_constants.php   | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 plugins/work_constants.php

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9432194d3..c557d4200 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.19.10.5119 | 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.10.5120 | 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/admin_offer_edit.php b/admin_offer_edit.php
index c47f3f1fa..15afe8ae6 100644
--- a/admin_offer_edit.php
+++ b/admin_offer_edit.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
+require 'plugins/work_constants.php';
 import('form.Form');
 import('ttWorkHelper');
 import('ttAdminWorkHelper');
@@ -45,11 +46,6 @@
 }
 // End of access checks.
 
-// Status definitions.
-define("STATUS_PENDING_APPROVAL", 4);
-define("STATUS_DISAPPROVED", 8);
-define("STATUS_APPROVED", 12);
-
 $existingStatus = $offer['status'];
 $currencies = ttWorkHelper::getCurrencies();
 
diff --git a/admin_work_edit.php b/admin_work_edit.php
index 0eb38f887..d158b8037 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -27,6 +27,7 @@
 // +----------------------------------------------------------------------+
 
 require_once('initialize.php');
+require 'plugins/work_constants.php';
 import('form.Form');
 import('ttWorkHelper');
 import('ttAdminWorkHelper');
@@ -45,10 +46,6 @@
 }
 // End of access checks.
 
-// Status definitions.
-define("STATUS_PENDING_APPROVAL", 4);
-define("STATUS_DISAPPROVED", 8);
-define("STATUS_APPROVED", 12);
 
 $existingStatus = $work_item['status'];
 $currencies = ttWorkHelper::getCurrencies();
diff --git a/plugins/work_constants.php b/plugins/work_constants.php
new file mode 100644
index 000000000..207ca5d35
--- /dev/null
+++ b/plugins/work_constants.php
@@ -0,0 +1,36 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// Status definitions used with Work plugin.
+// Here, we share status values for both work items and offers,
+// although Work Server distinguishes between the two.
+// At this point the values are the same, so it is okay to use shared constants.
+// When need arises we may have to redo this and introduce additional constants.
+define("STATUS_PENDING_APPROVAL", 4);
+define("STATUS_DISAPPROVED", 8);
+define("STATUS_APPROVED", 12);

From 18855715d12cc1b45fe8c50752598a3b91f35fbc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Sep 2019 21:17:50 +0000
Subject: [PATCH 1092/1848] Started on work_view.php.

---
 WEB-INF/lib/ttWorkHelper.class.php | 58 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         |  2 +-
 WEB-INF/templates/work_view.tpl    | 32 ++++++++++++++
 work_view.php                      | 70 ++++++++++++++++++++++++++++++
 5 files changed, 162 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/work_view.tpl
 create mode 100644 work_view.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index a4ef1f6e2..5d235bca7 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -38,6 +38,7 @@ class ttWorkHelper {
   var $get_work_uri = null;      // URI to get work details.
   var $get_active_work_uri = null;    // URI to get active work for group.
   var $get_available_work_uri = null; // URI to get available work for group.
+  var $get_available_work_item_uri = null; // URI to get a single available work item.
   var $delete_work_uri = null;   // URI to delete work.
   // TODO: design how (and what) to delete when a group is deleted.
   var $update_work_uri = null;  // URI to update work.
@@ -68,6 +69,7 @@ function __construct(&$errors) {
     $this->get_work_uri = $this->remote_work_uri.'getwork';
     $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
     $this->get_available_work_uri = $this->remote_work_uri.'getavailablework';
+    $this->get_available_work_item_uri = $this->remote_work_uri.'getavailableworkitem';
     $this->delete_work_uri = $this->remote_work_uri.'deletework';
     $this->update_work_uri = $this->remote_work_uri.'updatework';
     $this->put_offer_uri = $this->remote_work_uri.'putoffer';
@@ -990,4 +992,60 @@ function getGroupItems() {
     unset($result_array['call_status']); // Remove call_status element,
     return $result_array;
   }
+
+  // getAvailableWorkItem - gets available work item details from remote work server.
+  function getAvailableWorkItem($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'work_id' => urlencode($work_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_available_work_item_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $work_item = $result_array['work_item'];
+    return $work_item;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c557d4200..0497df220 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.19.10.5120 | 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.10.5121 | 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/work.tpl b/WEB-INF/templates/work.tpl
index f371eb8af..c0c516bde 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -48,7 +48,7 @@
         </tr>
   {foreach $available_work as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
+          <td><a href="work_view.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape}</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
new file mode 100644
index 000000000..8c2edb6ae
--- /dev/null
+++ b/WEB-INF/templates/work_view.tpl
@@ -0,0 +1,32 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/work_view.php b/work_view.php
new file mode 100644
index 000000000..5c9ff06dd
--- /dev/null
+++ b/work_view.php
@@ -0,0 +1,70 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('bid_on_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$cl_name = $work_item['subject'];
+$cl_description = $work_item['descr_short'];
+$cl_details = $work_item['descr_long'];
+$cl_budget = $work_item['amount_with_currency'];
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->getElement('work_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work_view.tpl');
+$smarty->display('index.tpl');

From 9e6aaeec1c26a4442cdc711a6b7b0727d4ba4c53 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Sep 2019 22:24:18 +0000
Subject: [PATCH 1093/1848] Added offer_view.php.

---
 WEB-INF/lib/ttWorkHelper.class.php | 58 ++++++++++++++++++++++++
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  1 +
 WEB-INF/resources/de.lang.php      |  1 +
 WEB-INF/resources/en.lang.php      |  1 +
 WEB-INF/resources/es.lang.php      |  1 +
 WEB-INF/resources/et.lang.php      |  1 +
 WEB-INF/resources/fa.lang.php      |  1 +
 WEB-INF/resources/fi.lang.php      |  1 +
 WEB-INF/resources/fr.lang.php      |  1 +
 WEB-INF/resources/gr.lang.php      |  1 +
 WEB-INF/resources/he.lang.php      |  1 +
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  1 +
 WEB-INF/resources/ja.lang.php      |  1 +
 WEB-INF/resources/ko.lang.php      |  1 +
 WEB-INF/resources/nl.lang.php      |  1 +
 WEB-INF/resources/no.lang.php      |  1 +
 WEB-INF/resources/pl.lang.php      |  1 +
 WEB-INF/resources/pt-br.lang.php   |  1 +
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  1 +
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  1 +
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  1 +
 WEB-INF/resources/sv.lang.php      |  1 +
 WEB-INF/resources/tr.lang.php      |  1 +
 WEB-INF/resources/zh-cn.lang.php   |  1 +
 WEB-INF/resources/zh-tw.lang.php   |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/offer_view.tpl   | 36 +++++++++++++++
 WEB-INF/templates/work.tpl         |  2 +-
 WEB-INF/templates/work_view.tpl    |  4 ++
 offer_view.php                     | 73 ++++++++++++++++++++++++++++++
 work_view.php                      |  3 ++
 37 files changed, 206 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/offer_view.tpl
 create mode 100644 offer_view.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 5d235bca7..dae457933 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -46,6 +46,7 @@ class ttWorkHelper {
   var $get_offer_uri = null;     // URI to get offer details.
   var $get_active_offers_uri = null;    // URI to get active offers.
   var $get_available_offers_uri = null; // URI to get available offers.
+  var $get_available_offer_uri = null;  // URI to get a single available offer.
   var $get_group_items_uri = null;      // URI to get all group items in one API call.
   var $delete_offer_uri = null;  // URI to delete offer.
   var $delete_offers_uri = null; // URI to delete multiple offers.
@@ -76,6 +77,7 @@ function __construct(&$errors) {
     $this->get_offer_uri = $this->remote_work_uri.'getoffer';
     $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
     $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
+    $this->get_available_offer_uri = $this->remote_work_uri.'getavailableoffer';
     $this->get_group_items_uri = $this->remote_work_uri.'getgroupitems';
     $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
     $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
@@ -1048,4 +1050,60 @@ function getAvailableWorkItem($work_id) {
     $work_item = $result_array['work_item'];
     return $work_item;
   }
+
+  // getAvailableOffer - gets available offer details from remote work server.
+  function getAvailableOffer($offer_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'offer_id' => urlencode($offer_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_available_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $offer = $result_array['offer'];
+    return $offer;
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0f237e21c..05ea0188b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -416,6 +416,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e52d1b9f6..632ceca9a 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -426,6 +426,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9d77c6aec..299149356 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -398,6 +398,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6766407f6..0f58ba784 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -384,6 +384,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index d741c9d0b..72106f11f 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -373,6 +373,7 @@
 'title.available_work' => 'Available Work', // Available work items from other organizations.
 'title.inactive_work' => 'Inactive Work', // Inactive work items for group.
 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+'title.offer' => 'Offer',
 'title.add_offer' => 'Adding Offer',
 'title.edit_offer' => 'Editing Offer',
 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5c2da7972..d6be47ad2 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -415,6 +415,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d72720e24..53183f3c1 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -406,6 +406,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ebb799567..f38760cc2 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -407,6 +407,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 6a923b4a1..379182dc1 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -398,6 +398,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 2d0a4892d..cf374646c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -392,6 +392,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ccd10e059..67068faa9 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -391,6 +391,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7c1c90572..743077d90 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -415,6 +415,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 585723101..d6fc4b4e9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -416,6 +416,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 4277c6bfc..7dbc055ba 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -401,6 +401,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0d1a7a2b8..17a18e9df 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -422,6 +422,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index fe4599f9b..c1d03180f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -423,6 +423,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4179add13..cc4fa139c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -377,6 +377,7 @@
 'title.inactive_work' => 'Inactief werk',
 // TODO: translate the following.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 'title.add_offer' => 'Aanbieding toevoegen',
 'title.edit_offer' => 'Aanbieding bewerken',
 'title.delete_offer' => 'Aanbieding verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ba3734aa9..f6e1170a8 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -419,6 +419,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 669a3a5ed..8499ffba7 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -401,6 +401,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 8adcf4aa9..c0097c711 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -396,6 +396,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9312fe181..ae217cd4a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -403,6 +403,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e8b7dadfd..5f5dd12e2 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -422,6 +422,7 @@
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
 // 'title.add_offer' => 'Adding Offer',
+// 'title.offer' => 'Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
 // 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4ee3aec21..ffdee0d66 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -359,6 +359,7 @@
 'title.available_work' => 'Имеющаяся работа',
 'title.inactive_work' => 'Неактивная работа',
 'title.pending_work' => 'Работа в ожидании',
+'title.offer' => 'Предложение',
 'title.add_offer' => 'Добавление предложения',
 'title.edit_offer' => 'Редактирование предложения',
 'title.delete_offer' => 'Удаление предложения',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a378df653..5abde75eb 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -405,6 +405,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 82fbc21b2..e7e8f273f 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -396,6 +396,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 02da7646c..7e92a5b5a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -399,6 +399,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1b6891fd9..e08a183c3 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -400,6 +400,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7f2af552e..27a37e3c0 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -430,6 +430,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 47bbae4ba..50bfdfb60 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -411,6 +411,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 8764492c3..39d6afa07 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -416,6 +416,7 @@
 // 'title.available_work' => 'Available Work', // Available work items from other organizations.
 // 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 // 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
+// 'title.offer' => 'Offer',
 // 'title.add_offer' => 'Adding Offer',
 // 'title.edit_offer' => 'Editing Offer',
 // 'title.delete_offer' => 'Deleting Offer',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0497df220..8e19e2adc 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.19.10.5121 | 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.10.5122 | 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/offer_view.tpl b/WEB-INF/templates/offer_view.tpl
new file mode 100644
index 000000000..b6baaed28
--- /dev/null
+++ b/WEB-INF/templates/offer_view.tpl
@@ -0,0 +1,36 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.contractor}:</td>
+          <td>{$forms.offerForm.contractor.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.offer}:</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.offerForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work.tpl b/WEB-INF/templates/work.tpl
index c0c516bde..03ab18bf6 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -108,7 +108,7 @@
         </tr>
   {foreach $available_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.subject|escape}</td>
+          <td><a href="offer_view.php?id={$offer.id}">{$offer.subject|escape}</a></td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
index 8c2edb6ae..d34b936a6 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -3,6 +3,10 @@
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.client}:</td>
+          <td>{$forms.workForm.client.control}</td>
+        </tr>
         <tr>
           <td align="right">{$i18n.label.work}:</td>
           <td>{$forms.workForm.work_name.control}</td>
diff --git a/offer_view.php b/offer_view.php
new file mode 100644
index 000000000..1422de09b
--- /dev/null
+++ b/offer_view.php
@@ -0,0 +1,73 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getAvailableOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$cl_contractor = $offer['group_name'];
+$cl_name = $offer['subject'];
+$cl_description = $offer['descr_short'];
+$cl_details = $offer['descr_long'];
+$cl_budget = $offer['amount_with_currency'];
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'contractor','style'=>'width: 250px;','value'=>$cl_contractor));
+$form->getElement('contractor')->setEnabled(false);
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.offer'));
+$smarty->assign('content_page_name', 'offer_view.tpl');
+$smarty->display('index.tpl');
diff --git a/work_view.php b/work_view.php
index 5c9ff06dd..08b8815d3 100644
--- a/work_view.php
+++ b/work_view.php
@@ -48,6 +48,7 @@
 }
 // End of access checks.
 
+$cl_client = $work_item['group_name'];
 $cl_name = $work_item['subject'];
 $cl_description = $work_item['descr_short'];
 $cl_details = $work_item['descr_long'];
@@ -55,6 +56,8 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'client','style'=>'width: 250px;','value'=>$cl_client));
+$form->getElement('client')->setEnabled(false);
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->getElement('work_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));

From 40fd3ed32d58c08b5b81cbd122ff78ca59ac91b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 09:41:39 +0000
Subject: [PATCH 1094/1848] Made controls on work_view.php and offer_view.php
 larger to provide more room.

---
 WEB-INF/templates/footer.tpl | 2 +-
 offer_view.php               | 8 ++++----
 work_view.php                | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8e19e2adc..45ceb893a 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.19.10.5122 | 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.10.5123 | 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/offer_view.php b/offer_view.php
index 1422de09b..2556703ee 100644
--- a/offer_view.php
+++ b/offer_view.php
@@ -56,13 +56,13 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'contractor','style'=>'width: 250px;','value'=>$cl_contractor));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'contractor','value'=>$cl_contractor));
 $form->getElement('contractor')->setEnabled(false);
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
 $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 160px;','value'=>$cl_details));
 $form->getElement('details')->setEnabled(false);
 $form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
 $form->getElement('budget')->setEnabled(false);
diff --git a/work_view.php b/work_view.php
index 08b8815d3..6e9266c61 100644
--- a/work_view.php
+++ b/work_view.php
@@ -56,13 +56,13 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'client','style'=>'width: 250px;','value'=>$cl_client));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'client','value'=>$cl_client));
 $form->getElement('client')->setEnabled(false);
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','maxlength'=>'100','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
 $form->getElement('work_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->getElement('details')->setEnabled(false);
 $form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
 $form->getElement('budget')->setEnabled(false);

From 3f468aaf3bfffe861088b59dc48f939b86c9de2e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 10:06:03 +0000
Subject: [PATCH 1095/1848] Renamed a couple of URIs for clarity of purpose.

---
 WEB-INF/lib/ttWorkHelper.class.php | 20 ++++++++++----------
 WEB-INF/templates/footer.tpl       |  2 +-
 offer_edit.php                     |  2 +-
 work_edit.php                      |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index dae457933..aa65db299 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -35,7 +35,7 @@ class ttWorkHelper {
   var $remote_work_uri = null;   // Location of remote work server.
   var $register_uri = null;      // URI to register with remote work server.
   var $put_work_uri = null;      // URI to publish work.
-  var $get_work_uri = null;      // URI to get work details.
+  var $get_own_work_item_uri = null;  // URI to get own work item details.
   var $get_active_work_uri = null;    // URI to get active work for group.
   var $get_available_work_uri = null; // URI to get available work for group.
   var $get_available_work_item_uri = null; // URI to get a single available work item.
@@ -43,7 +43,7 @@ class ttWorkHelper {
   // TODO: design how (and what) to delete when a group is deleted.
   var $update_work_uri = null;  // URI to update work.
   var $put_offer_uri = null;     // URI to publish offer.
-  var $get_offer_uri = null;     // URI to get offer details.
+  var $get_own_offer_uri = null;        // URI to get own offer details.
   var $get_active_offers_uri = null;    // URI to get active offers.
   var $get_available_offers_uri = null; // URI to get available offers.
   var $get_available_offer_uri = null;  // URI to get a single available offer.
@@ -67,14 +67,14 @@ function __construct(&$errors) {
     // a complete variety of deployed clients, including those without versions.
     $this->register_uri = $this->remote_work_uri.'register'; // register_0_0
     $this->put_work_uri = $this->remote_work_uri.'putwork';
-    $this->get_work_uri = $this->remote_work_uri.'getwork';
+    $this->get_own_work_item_uri = $this->remote_work_uri.'getownworkitem';
     $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
     $this->get_available_work_uri = $this->remote_work_uri.'getavailablework';
     $this->get_available_work_item_uri = $this->remote_work_uri.'getavailableworkitem';
     $this->delete_work_uri = $this->remote_work_uri.'deletework';
     $this->update_work_uri = $this->remote_work_uri.'updatework';
     $this->put_offer_uri = $this->remote_work_uri.'putoffer';
-    $this->get_offer_uri = $this->remote_work_uri.'getoffer';
+    $this->get_own_offer_uri = $this->remote_work_uri.'getownoffer';
     $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
     $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
     $this->get_available_offer_uri = $this->remote_work_uri.'getavailableoffer';
@@ -427,8 +427,8 @@ function getAvailableWork() {
     return $available_work;
   }
 
-  // getWork - gets work item details from remote work server.
-  function getWork($work_id) {
+  // getOwnWorkItem - gets work item details from remote work server.
+  function getOwnWorkItem($work_id) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -453,7 +453,7 @@ function getWork($work_id) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -731,8 +731,8 @@ function getAvailableOffers() {
     return $available_offers;
   }
 
-  // getOffer - gets offer details from remote work server.
-  function getOffer($offer_id) {
+  // getOwnOffer - gets offer details from remote work server.
+  function getOwnOffer($offer_id) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -757,7 +757,7 @@ function getOffer($offer_id) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_offer_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_own_offer_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 45ceb893a..e8cc4b406 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.19.10.5123 | 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.10.5124 | 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/offer_edit.php b/offer_edit.php
index 729b79d03..f39c6cb5c 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -41,7 +41,7 @@
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOffer($cl_offer_id);
+$offer = $workHelper->getOwnOffer($cl_offer_id);
 if (!$offer) {
   header('Location: access_denied.php');
   exit();
diff --git a/work_edit.php b/work_edit.php
index eda443716..dc38e5696 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -41,7 +41,7 @@
 }
 $cl_work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getWork($cl_work_id);
+$work_item = $workHelper->getOwnWorkItem($cl_work_id);
 if (!$work_item) {
   header('Location: access_denied.php');
   exit();

From 6f98d4bfd9af051432c3300273abd3057aba364a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 14:23:51 +0000
Subject: [PATCH 1096/1848] Refactoring in progress for Work Plugin.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 42 +++++++++++++------------
 WEB-INF/lib/ttWorkHelper.class.php      | 36 ++++++++++-----------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/header.tpl            |  2 +-
 admin_work_edit.php                     |  2 +-
 5 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index cdd517c40..06b3bb4fb 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -32,9 +32,10 @@
 // It does everything via curl calls to a Remote Work server using its API.
 class ttAdminWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $remote_work_uri = null;   // Location of remote work server.
+  var $work_server_uri = null;   // Location of remote work server.
   var $register_uri = null;      // URI to register with remote work server.
-  var $get_work_uri = null;      // URI to get work details.
+  var $get_work_item_uri = null; // URI to get work item details.
+
   var $update_work_uri = null;   // URI to update work.
   var $delete_work_uri = null;   // URI to delete work.
   var $approve_work_uri = null;    // URI to approved work.
@@ -54,21 +55,22 @@ class ttAdminWorkHelper {
   function __construct(&$errors) {
     $this->errors = &$errors;
 
-    $this->remote_work_uri = defined('REMOTE_WORK_URI') ? REMOTE_WORK_URI : "https://www.anuko.com/work/";
-    $this->register_uri = $this->remote_work_uri.'register';
-    $this->get_work_uri = $this->remote_work_uri.'admin_getwork';
-    $this->update_work_uri = $this->remote_work_uri.'admin_updatework';
-    $this->delete_work_uri = $this->remote_work_uri.'admin_deletework';
-    $this->approve_work_uri = $this->remote_work_uri.'admin_approvework';
-    $this->disapprove_work_uri = $this->remote_work_uri.'admin_disapprovework';
-    $this->get_offer_uri = $this->remote_work_uri.'admin_getoffer';
-    $this->update_offer_uri = $this->remote_work_uri.'admin_updateoffer';
-    $this->delete_offer_uri = $this->remote_work_uri.'admin_deleteoffer';
-    $this->approve_offer_uri = $this->remote_work_uri.'admin_approveoffer';
-    $this->disapprove_offer_uri = $this->remote_work_uri.'admin_disapproveoffer';
-    $this->get_pending_work_uri = $this->remote_work_uri.'admin_getpendingwork';
-    $this->get_pending_offers_uri = $this->remote_work_uri.'admin_getpendingoffers';
-    $this->get_items_uri = $this->remote_work_uri.'admin_getitems';
+    $this->work_server_uri = defined('WORK_SERVER_URI') ? WORK_SERVER_URI : "https://www.anuko.com/work/";
+    $this->register_uri = $this->work_server_uri.'register';
+    $this->get_work_item_uri = $this->work_server_uri.'admin_getworkitem';
+
+    $this->update_work_uri = $this->work_server_uri.'admin_updatework';
+    $this->delete_work_uri = $this->work_server_uri.'admin_deletework';
+    $this->approve_work_uri = $this->work_server_uri.'admin_approvework';
+    $this->disapprove_work_uri = $this->work_server_uri.'admin_disapprovework';
+    $this->get_offer_uri = $this->work_server_uri.'admin_getoffer';
+    $this->update_offer_uri = $this->work_server_uri.'admin_updateoffer';
+    $this->delete_offer_uri = $this->work_server_uri.'admin_deleteoffer';
+    $this->approve_offer_uri = $this->work_server_uri.'admin_approveoffer';
+    $this->disapprove_offer_uri = $this->work_server_uri.'admin_disapproveoffer';
+    $this->get_pending_work_uri = $this->work_server_uri.'admin_getpendingwork';
+    $this->get_pending_offers_uri = $this->work_server_uri.'admin_getpendingoffers';
+    $this->get_items_uri = $this->work_server_uri.'admin_getitems';
     $this->checkSiteRegistration();
   }
 
@@ -257,8 +259,8 @@ function getPendingWork() {
     return $pending_work;
   }
 
-  // getWork - gets work item details from remote work server.
-  function getWork($work_id) {
+  // getWorkItem - gets work item details from remote work server.
+  function getWorkItem($work_id) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -277,7 +279,7 @@ function getWork($work_id) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index aa65db299..d91252e2a 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -32,7 +32,7 @@
 // It does everything via curl calls to a Remote Work server using its API.
 class ttWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $remote_work_uri = null;   // Location of remote work server.
+  var $work_server_uri = null;   // URI of work server.
   var $register_uri = null;      // URI to register with remote work server.
   var $put_work_uri = null;      // URI to publish work.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
@@ -58,29 +58,29 @@ class ttWorkHelper {
   function __construct(&$errors) {
     $this->errors = &$errors;
 
-    $this->remote_work_uri = defined('REMOTE_WORK_URI') ? REMOTE_WORK_URI : "https://www.anuko.com/work/";
+    $this->work_server_uri = defined('WORK_SERVER_URI') ? WORK_SERVER_URI : "https://www.anuko.com/work/";
 
     // Note: at some point a need will arise for API versioning.
     // When this happens, we will append an API version number to the end of URI,
     // for example: register_0_1 instead of register.
     // This should theoretically allow a remote work server to be able to work with
     // a complete variety of deployed clients, including those without versions.
-    $this->register_uri = $this->remote_work_uri.'register'; // register_0_0
-    $this->put_work_uri = $this->remote_work_uri.'putwork';
-    $this->get_own_work_item_uri = $this->remote_work_uri.'getownworkitem';
-    $this->get_active_work_uri = $this->remote_work_uri.'getactivework';
-    $this->get_available_work_uri = $this->remote_work_uri.'getavailablework';
-    $this->get_available_work_item_uri = $this->remote_work_uri.'getavailableworkitem';
-    $this->delete_work_uri = $this->remote_work_uri.'deletework';
-    $this->update_work_uri = $this->remote_work_uri.'updatework';
-    $this->put_offer_uri = $this->remote_work_uri.'putoffer';
-    $this->get_own_offer_uri = $this->remote_work_uri.'getownoffer';
-    $this->get_active_offers_uri = $this->remote_work_uri.'getactiveoffers';
-    $this->get_available_offers_uri = $this->remote_work_uri.'getavailableoffers';
-    $this->get_available_offer_uri = $this->remote_work_uri.'getavailableoffer';
-    $this->get_group_items_uri = $this->remote_work_uri.'getgroupitems';
-    $this->delete_offer_uri = $this->remote_work_uri.'deleteoffer';
-    $this->update_offer_uri = $this->remote_work_uri.'updateoffer';
+    $this->register_uri = $this->work_server_uri.'register'; // register_0_0
+    $this->put_work_uri = $this->work_server_uri.'putwork';
+    $this->get_own_work_item_uri = $this->work_server_uri.'getownworkitem';
+    $this->get_active_work_uri = $this->work_server_uri.'getactivework';
+    $this->get_available_work_uri = $this->work_server_uri.'getavailablework';
+    $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
+    $this->delete_work_uri = $this->work_server_uri.'deletework';
+    $this->update_work_uri = $this->work_server_uri.'updatework';
+    $this->put_offer_uri = $this->work_server_uri.'putoffer';
+    $this->get_own_offer_uri = $this->work_server_uri.'getownoffer';
+    $this->get_active_offers_uri = $this->work_server_uri.'getactiveoffers';
+    $this->get_available_offers_uri = $this->work_server_uri.'getavailableoffers';
+    $this->get_available_offer_uri = $this->work_server_uri.'getavailableoffer';
+    $this->get_group_items_uri = $this->work_server_uri.'getgroupitems';
+    $this->delete_offer_uri = $this->work_server_uri.'deleteoffer';
+    $this->update_offer_uri = $this->work_server_uri.'updateoffer';
     $this->checkSiteRegistration();
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e8cc4b406..e13050a3d 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.19.10.5124 | 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.10.5125 | 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/header.tpl b/WEB-INF/templates/header.tpl
index fa66c6190..fbb3e88a4 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -73,7 +73,7 @@
           <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
-    {if isTrue('REMOTE_WORK_DEBUG')}
+    {if isTrue('WORK_SERVER_ADMINISTRATION')}
             <a class="mainMenu" href="admin_work.php">{$i18n.label.work}</a>
     {/if}
           </td>
diff --git a/admin_work_edit.php b/admin_work_edit.php
index d158b8037..336b7780b 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -39,7 +39,7 @@
 }
 $cl_work_id = (int)$request->getParameter('id');
 $adminWorkHelper = new ttAdminWorkHelper($err);
-$work_item = $adminWorkHelper->getWork($cl_work_id);
+$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
 if (!$work_item) {
   header('Location: access_denied.php');
   exit();

From 426d131468dbe38b242b394df796ecda59deaf46 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 14:48:53 +0000
Subject: [PATCH 1097/1848] Refactoring in progress.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 22 +++++++++++-----------
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_work_delete.php                   |  4 ++--
 admin_work_edit.php                     | 10 +++++-----
 offer_view.php                          |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 06b3bb4fb..ff098b7b5 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -35,10 +35,10 @@ class ttAdminWorkHelper {
   var $work_server_uri = null;   // Location of remote work server.
   var $register_uri = null;      // URI to register with remote work server.
   var $get_work_item_uri = null; // URI to get work item details.
+  var $update_work_item_uri = null;  // URI to update work item.
+  var $delete_work_item_uri = null;  // URI to delete work item.
 
-  var $update_work_uri = null;   // URI to update work.
-  var $delete_work_uri = null;   // URI to delete work.
-  var $approve_work_uri = null;    // URI to approved work.
+  var $approve_work_uri = null;    // URI to approve work.
   var $disapprove_work_uri = null; // URI to disapprove work.
   var $get_offer_uri = null;     // URI to get offer details.
   var $update_offer_uri = null;  // URI to update offer.
@@ -58,9 +58,9 @@ function __construct(&$errors) {
     $this->work_server_uri = defined('WORK_SERVER_URI') ? WORK_SERVER_URI : "https://www.anuko.com/work/";
     $this->register_uri = $this->work_server_uri.'register';
     $this->get_work_item_uri = $this->work_server_uri.'admin_getworkitem';
+    $this->update_work_item_uri = $this->work_server_uri.'admin_updateworkitem';
+    $this->delete_work_item_uri = $this->work_server_uri.'admin_deleteworkitem';
 
-    $this->update_work_uri = $this->work_server_uri.'admin_updatework';
-    $this->delete_work_uri = $this->work_server_uri.'admin_deletework';
     $this->approve_work_uri = $this->work_server_uri.'admin_approvework';
     $this->disapprove_work_uri = $this->work_server_uri.'admin_disapprovework';
     $this->get_offer_uri = $this->work_server_uri.'admin_getoffer';
@@ -312,8 +312,8 @@ function getWorkItem($work_id) {
     return $work_item;
   }
 
-  // deleteWork - deletes work item from remote work server.
-  function deleteWork($work_id) {
+  // deleteWorkItem - deletes work item from remote work server.
+  function deleteWorkItem($work_id) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -336,7 +336,7 @@ function deleteWork($work_id) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->delete_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -477,8 +477,8 @@ function getOffer($offer_id) {
     return $offer;
   }
 
-  // updateWork - updates a work item in remote work server.
-  function updateWork($fields) {
+  // updateWorkItem - updates a work item in remote work server.
+  function updateWorkItem($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -508,7 +508,7 @@ function updateWork($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->update_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e13050a3d..aadc6a379 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.19.10.5125 | 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.10.5126 | 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/admin_work_delete.php b/admin_work_delete.php
index d64b9fb9c..0700b912c 100644
--- a/admin_work_delete.php
+++ b/admin_work_delete.php
@@ -37,7 +37,7 @@
 }
 $cl_work_id = (int)$request->getParameter('id');
 $adminWorkHelper = new ttAdminWorkHelper($err);
-$work_item = $adminWorkHelper->getWork($cl_work_id);
+$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
 if (!$work_item) {
   header('Location: access_denied.php');
   exit();
@@ -53,7 +53,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if ($adminWorkHelper->deleteWork($cl_work_id)) {
+    if ($adminWorkHelper->deleteWorkItem($cl_work_id)) {
       header('Location: admin_work.php');
       exit();
     }
diff --git a/admin_work_edit.php b/admin_work_edit.php
index 336b7780b..89017b7fd 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -71,9 +71,9 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 
@@ -84,7 +84,7 @@
 $status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
 
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -111,7 +111,7 @@
       // Do things differently, depending on status control value.
       if ($existingStatus == $cl_status) {
         // Status not changed. Update work information.
-        if ($adminWorkHelper->updateWork($fields)) {
+        if ($adminWorkHelper->updateWorkItem($fields)) {
           header('Location: admin_work.php');
           exit();
         }
diff --git a/offer_view.php b/offer_view.php
index 2556703ee..cbf400db4 100644
--- a/offer_view.php
+++ b/offer_view.php
@@ -62,7 +62,7 @@
 $form->getElement('offer_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 160px;','value'=>$cl_details));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->getElement('details')->setEnabled(false);
 $form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
 $form->getElement('budget')->setEnabled(false);

From c3000b0b42334b37227a850b55eb0b9bc49d0591 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 15:19:57 +0000
Subject: [PATCH 1098/1848] Finished refactoring URIs for worok server
 administration.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 33 +++++++++++--------------
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_work_edit.php                     |  4 +--
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index ff098b7b5..871bd8d38 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -37,15 +37,14 @@ class ttAdminWorkHelper {
   var $get_work_item_uri = null; // URI to get work item details.
   var $update_work_item_uri = null;  // URI to update work item.
   var $delete_work_item_uri = null;  // URI to delete work item.
-
-  var $approve_work_uri = null;    // URI to approve work.
-  var $disapprove_work_uri = null; // URI to disapprove work.
+  var $approve_work_item_uri = null; // URI to approve work item.
+  var $disapprove_work_item_uri = null; // URI to disapprove work item.
   var $get_offer_uri = null;     // URI to get offer details.
   var $update_offer_uri = null;  // URI to update offer.
   var $delete_offer_uri = null;  // URI to delete offer.
   var $approve_offer_uri = null;    // URI to approved offer.
   var $disapprove_offer_uri = null; // URI to disapprove offer.
-  var $get_pending_work_uri = null;   // URI to get work pending approval.
+  var $get_pending_work_items_uri = null;  // URI to get work items pending approval.
   var $get_pending_offers_uri = null; // URI to get offers pending approval.
   var $get_items_uri = null;     // URI to get all admin items in one API call.
   var $site_id = null;           // Site id for remote work server.
@@ -60,15 +59,14 @@ function __construct(&$errors) {
     $this->get_work_item_uri = $this->work_server_uri.'admin_getworkitem';
     $this->update_work_item_uri = $this->work_server_uri.'admin_updateworkitem';
     $this->delete_work_item_uri = $this->work_server_uri.'admin_deleteworkitem';
-
-    $this->approve_work_uri = $this->work_server_uri.'admin_approvework';
-    $this->disapprove_work_uri = $this->work_server_uri.'admin_disapprovework';
+    $this->approve_work_item_uri = $this->work_server_uri.'admin_approveworkitem';
+    $this->disapprove_work_item_uri = $this->work_server_uri.'admin_disapproveworkitem';
     $this->get_offer_uri = $this->work_server_uri.'admin_getoffer';
     $this->update_offer_uri = $this->work_server_uri.'admin_updateoffer';
     $this->delete_offer_uri = $this->work_server_uri.'admin_deleteoffer';
     $this->approve_offer_uri = $this->work_server_uri.'admin_approveoffer';
     $this->disapprove_offer_uri = $this->work_server_uri.'admin_disapproveoffer';
-    $this->get_pending_work_uri = $this->work_server_uri.'admin_getpendingwork';
+    $this->get_pending_work_items_uri = $this->work_server_uri.'admin_getpendingworkitems';
     $this->get_pending_offers_uri = $this->work_server_uri.'admin_getpendingoffers';
     $this->get_items_uri = $this->work_server_uri.'admin_getitems';
     $this->checkSiteRegistration();
@@ -206,8 +204,8 @@ function getPendingOffers() {
     return $pending_offers;
   }
 
-    // getPendingWork - obtains a list of work items pending approval.
-  function getPendingWork() {
+  // getPendingWorkItems - obtains a list of work items pending approval.
+  function getPendingWorkItems() {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -226,7 +224,7 @@ function getPendingWork() {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_pending_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_pending_work_items_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -540,8 +538,8 @@ function updateWorkItem($fields) {
     return true;
   }
 
-  // approveWork - approves work item in remote work server.
-  function approveWork($fields) {
+  // approveWorkItem - approves work item in remote work server.
+  function approveWorkItem($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -570,7 +568,7 @@ function approveWork($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->approve_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->approve_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -602,8 +600,8 @@ function approveWork($fields) {
     return true;
   }
 
-  // disapproveWork - disapproves work item in remote work server.
-  function disapproveWork($fields) {
+  // disapproveWorkItem - disapproves work item in remote work server.
+  function disapproveWorkItem($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -627,12 +625,11 @@ function disapproveWork($fields) {
     // url-ify the data for the POST.
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
-
     // Open connection.
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->disapprove_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->disapprove_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index aadc6a379..4e1d7771d 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.19.10.5126 | 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.10.5127 | 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/admin_work_edit.php b/admin_work_edit.php
index 89017b7fd..9700b05d9 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -117,13 +117,13 @@
         }
       } else if ($cl_status == STATUS_DISAPPROVED) {
         // Status changed to "not approved". Disapprove work.
-        if ($adminWorkHelper->disapproveWork($fields)) {
+        if ($adminWorkHelper->disapproveWorkItem($fields)) {
           header('Location: admin_work.php');
           exit();
         }
       } else if ($cl_status == STATUS_APPROVED) {
         // Status changed to "approved". Approve work.
-        if ($adminWorkHelper->approveWork($fields)) {
+        if ($adminWorkHelper->approveWorkItem($fields)) {
           header('Location: admin_work.php');
           exit();
         }

From 879f749fce4379d8a7ef5786f6a06b2e12034d16 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 16:58:44 +0000
Subject: [PATCH 1099/1848] Refactoring of URIs for Work Plugin in progress.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php |  2 +-
 WEB-INF/lib/ttWorkHelper.class.php      | 34 +++++++++++++------------
 WEB-INF/templates/footer.tpl            |  2 +-
 work_add.php                            |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 871bd8d38..d809cb35f 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -32,7 +32,7 @@
 // It does everything via curl calls to a Remote Work server using its API.
 class ttAdminWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $work_server_uri = null;   // Location of remote work server.
+  var $work_server_uri = null;   // Location of work server.
   var $register_uri = null;      // URI to register with remote work server.
   var $get_work_item_uri = null; // URI to get work item details.
   var $update_work_item_uri = null;  // URI to update work item.
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index d91252e2a..aa0d584ef 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -32,12 +32,13 @@
 // It does everything via curl calls to a Remote Work server using its API.
 class ttWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $work_server_uri = null;   // URI of work server.
+  var $work_server_uri = null;   // Location of work server.
   var $register_uri = null;      // URI to register with remote work server.
-  var $put_work_uri = null;      // URI to publish work.
+  var $put_work_item_uri = null;      // URI to publish work item.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
-  var $get_active_work_uri = null;    // URI to get active work for group.
-  var $get_available_work_uri = null; // URI to get available work for group.
+  var $get_own_work_items_uri = null; // URI to get own work items for group.
+  var $get_available_work_items_uri = null; // URI to get available work items for group.
+
   var $get_available_work_item_uri = null; // URI to get a single available work item.
   var $delete_work_uri = null;   // URI to delete work.
   // TODO: design how (and what) to delete when a group is deleted.
@@ -66,10 +67,11 @@ function __construct(&$errors) {
     // This should theoretically allow a remote work server to be able to work with
     // a complete variety of deployed clients, including those without versions.
     $this->register_uri = $this->work_server_uri.'register'; // register_0_0
-    $this->put_work_uri = $this->work_server_uri.'putwork';
+    $this->put_work_item_uri = $this->work_server_uri.'putworkitem';
     $this->get_own_work_item_uri = $this->work_server_uri.'getownworkitem';
-    $this->get_active_work_uri = $this->work_server_uri.'getactivework';
-    $this->get_available_work_uri = $this->work_server_uri.'getavailablework';
+    $this->get_own_work_items_uri = $this->work_server_uri.'getownworkitems';
+    $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
+
     $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
     $this->delete_work_uri = $this->work_server_uri.'deletework';
     $this->update_work_uri = $this->work_server_uri.'updatework';
@@ -163,7 +165,7 @@ function checkSiteRegistration() {
     }
   }
 
-  // putWork - publishes a work item in remote work server.
+  // putWorkItem - publishes a work item in remote work server.
   //
   // Note about some fields using additional base64 encoding.
   // There is a problem with data posted by curl calls on the server side for
@@ -177,7 +179,7 @@ function checkSiteRegistration() {
   //
   // A workaround for now is to use use an additional base64 encoding for all text fields,
   // which are decoded back to utf-8 strings on the server side.
-  function putWork($fields) {
+  function putWorkItem($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -211,7 +213,7 @@ function putWork($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->put_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->put_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -312,8 +314,8 @@ function updateWork($fields) {
     return true;
   }
 
-  // getActiveWork - obtains a list of work items this group is currently outsourcing.
-  function getActiveWork() {
+  // getOwnWorkItems - obtains a list of work items this group is currently outsourcing.
+  function getOwnWorkItems() {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -338,7 +340,7 @@ function getActiveWork() {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_active_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_items_iri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -371,8 +373,8 @@ function getActiveWork() {
     return $active_work;
   }
 
-  // getAvailableWork - obtains a list of available work items this group can  bid on.
-  function getAvailableWork() {
+  // getAvailableWorkItems - obtains a list of available work items this group can  bid on.
+  function getAvailableWorkItems() {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -394,7 +396,7 @@ function getAvailableWork() {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_available_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_available_work_items_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4e1d7771d..8977cddff 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.19.10.5127 | 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.10.5128 | 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/work_add.php b/work_add.php
index 9fe73d206..9bc6d3414 100644
--- a/work_add.php
+++ b/work_add.php
@@ -84,7 +84,7 @@
       'descr_long' => $cl_details,
       'currency' => $currencies[$cl_currency],
       'amount' => $cl_budget);
-     if ($workHelper->putWork($fields)) {
+     if ($workHelper->putWorkItem($fields)) {
         header('Location: work.php');
         exit();
     }

From 25232ad91f66cab254f6e6222badfd3dfc3537d1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 18:31:15 +0000
Subject: [PATCH 1100/1848] Ongoing refactoring of URIs for Work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 58 +++++++++++++++---------------
 WEB-INF/templates/footer.tpl       |  2 +-
 offer_add.php                      |  2 +-
 offer_delete.php                   |  2 +-
 work_add.php                       |  2 +-
 work_delete.php                    |  4 +--
 work_edit.php                      |  2 +-
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index aa0d584ef..3e277d6ec 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -34,18 +34,18 @@ class ttWorkHelper {
   var $errors = null;            // Errors go here. Set in constructor by reference.
   var $work_server_uri = null;   // Location of work server.
   var $register_uri = null;      // URI to register with remote work server.
-  var $put_work_item_uri = null;      // URI to publish work item.
+  var $put_own_work_item_uri = null;  // URI to publish own work item.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
   var $get_own_work_items_uri = null; // URI to get own work items for group.
   var $get_available_work_items_uri = null; // URI to get available work items for group.
-
-  var $get_available_work_item_uri = null; // URI to get a single available work item.
-  var $delete_work_uri = null;   // URI to delete work.
+  var $get_available_work_item_uri = null;  // URI to get a single available work item.
+  var $delete_own_work_item_uri = null;     // URI to delete own work item.
   // TODO: design how (and what) to delete when a group is deleted.
-  var $update_work_uri = null;  // URI to update work.
-  var $put_offer_uri = null;     // URI to publish offer.
-  var $get_own_offer_uri = null;        // URI to get own offer details.
-  var $get_active_offers_uri = null;    // URI to get active offers.
+  var $update_own_work_item_uri = null;  // URI to update own work item.
+  var $put_own_offer_uri = null;     // URI to publish own offer.
+  var $get_own_offer_uri = null;     // URI to get own offer details.
+  var $get_own_offers_uri = null;    // URI to get own offers.
+
   var $get_available_offers_uri = null; // URI to get available offers.
   var $get_available_offer_uri = null;  // URI to get a single available offer.
   var $get_group_items_uri = null;      // URI to get all group items in one API call.
@@ -67,17 +67,17 @@ function __construct(&$errors) {
     // This should theoretically allow a remote work server to be able to work with
     // a complete variety of deployed clients, including those without versions.
     $this->register_uri = $this->work_server_uri.'register'; // register_0_0
-    $this->put_work_item_uri = $this->work_server_uri.'putworkitem';
+    $this->put_own_work_item_uri = $this->work_server_uri.'putownworkitem';
     $this->get_own_work_item_uri = $this->work_server_uri.'getownworkitem';
     $this->get_own_work_items_uri = $this->work_server_uri.'getownworkitems';
     $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
-
     $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
-    $this->delete_work_uri = $this->work_server_uri.'deletework';
-    $this->update_work_uri = $this->work_server_uri.'updatework';
-    $this->put_offer_uri = $this->work_server_uri.'putoffer';
+    $this->delete_own_work_item_uri = $this->work_server_uri.'deleteownworkitem';
+    $this->update_own_work_item_uri = $this->work_server_uri.'updateownworkitem';
+    $this->put_own_offer_uri = $this->work_server_uri.'putownoffer';
     $this->get_own_offer_uri = $this->work_server_uri.'getownoffer';
-    $this->get_active_offers_uri = $this->work_server_uri.'getactiveoffers';
+    $this->get_own_offers_uri = $this->work_server_uri.'getownoffers';
+
     $this->get_available_offers_uri = $this->work_server_uri.'getavailableoffers';
     $this->get_available_offer_uri = $this->work_server_uri.'getavailableoffer';
     $this->get_group_items_uri = $this->work_server_uri.'getgroupitems';
@@ -165,7 +165,7 @@ function checkSiteRegistration() {
     }
   }
 
-  // putWorkItem - publishes a work item in remote work server.
+  // putOwnWorkItem - publishes a work item in remote work server.
   //
   // Note about some fields using additional base64 encoding.
   // There is a problem with data posted by curl calls on the server side for
@@ -179,7 +179,7 @@ function checkSiteRegistration() {
   //
   // A workaround for now is to use use an additional base64 encoding for all text fields,
   // which are decoded back to utf-8 strings on the server side.
-  function putWorkItem($fields) {
+  function putOwnWorkItem($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -213,7 +213,7 @@ function putWorkItem($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->put_work_item_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->put_own_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -245,8 +245,8 @@ function putWorkItem($fields) {
     return true;
   }
 
-  // updateWork - updates a work item in remote work server.
-  function updateWork($fields) {
+  // updateOwnWorkItem - updates a work item in remote work server.
+  function updateOwnWorkItem($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -282,7 +282,7 @@ function updateWork($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->update_own_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -488,8 +488,8 @@ function getOwnWorkItem($work_id) {
     return $work_item;
   }
 
-  // deleteWork - deletes work item from remote work server.
-  function deleteWork($work_id) {
+  // deleteOwnWorkItem - deletes work item from remote work server.
+  function deleteOwnWorkItem($work_id) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -518,7 +518,7 @@ function deleteWork($work_id) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_work_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->delete_own_work_item_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -550,8 +550,8 @@ function deleteWork($work_id) {
     return true;
   }
 
-  // putOffer - publishes an offer in remote work server.
-  function putOffer($fields) {
+  // putOwnOffer - publishes an offer in remote work server.
+  function putOwnOffer($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -586,7 +586,7 @@ function putOffer($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->put_offer_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->put_own_offer_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -618,8 +618,8 @@ function putOffer($fields) {
     return true;
   }
 
-  // getActiveOffers - obtains a list of offers this group made available to other groups.
-  function getActiveOffers() {
+  // getOwnOffers - obtains a list of offers this group made available to other groups.
+  function getOwnOffers() {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -644,7 +644,7 @@ function getActiveOffers() {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_active_offers_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->get_own_offers_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8977cddff..4df8f6172 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.19.10.5128 | 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.10.5129 | 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/offer_add.php b/offer_add.php
index a61f6b658..9ee2bf15e 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -80,7 +80,7 @@
       'currency' => $currencies[$cl_currency],
       'amount' => $cl_budget,
       'payment_info' => $cl_payment_info);
-     if ($workHelper->putOffer($fields)) {
+     if ($workHelper->putOwnOffer($fields)) {
         header('Location: work.php');
         exit();
     }
diff --git a/offer_delete.php b/offer_delete.php
index f08c82a04..91d84ff20 100644
--- a/offer_delete.php
+++ b/offer_delete.php
@@ -41,7 +41,7 @@
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOffer($cl_offer_id);
+$offer = $workHelper->getOwnOffer($cl_offer_id);
 if (!$offer) {
   header('Location: access_denied.php');
   exit();
diff --git a/work_add.php b/work_add.php
index 9bc6d3414..4e183f41f 100644
--- a/work_add.php
+++ b/work_add.php
@@ -84,7 +84,7 @@
       'descr_long' => $cl_details,
       'currency' => $currencies[$cl_currency],
       'amount' => $cl_budget);
-     if ($workHelper->putWorkItem($fields)) {
+     if ($workHelper->putOwnWorkItem($fields)) {
         header('Location: work.php');
         exit();
     }
diff --git a/work_delete.php b/work_delete.php
index e4a5e24d9..87d7bd7c0 100644
--- a/work_delete.php
+++ b/work_delete.php
@@ -41,7 +41,7 @@
 }
 $cl_work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getWork($cl_work_id);
+$work_item = $workHelper->getOwnWorkItem($cl_work_id);
 if (!$work_item) {
   header('Location: access_denied.php');
   exit();
@@ -57,7 +57,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if ($workHelper->deleteWork($cl_work_id)) {
+    if ($workHelper->deleteOwnWorkItem($cl_work_id)) {
       header('Location: work.php');
       exit();
     }
diff --git a/work_edit.php b/work_edit.php
index dc38e5696..9ac0abd1b 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -101,7 +101,7 @@
         'descr_long' => $cl_details,
         'currency' => $currencies[$cl_currency],
         'amount' => $cl_budget);
-      if ($workHelper->updateWork($fields)) {
+      if ($workHelper->updateOwnWorkItem($fields)) {
         header('Location: work.php');
         exit();
       }

From 39ceb8311f982c6e3708f92d5a76b51b685b0e5b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 19:01:11 +0000
Subject: [PATCH 1101/1848] Finished refactoring URIs for Work server.

---
 WEB-INF/lib/ttWorkHelper.class.php | 26 ++++++++++++--------------
 WEB-INF/templates/footer.tpl       |  2 +-
 offer_delete.php                   |  2 +-
 offer_edit.php                     |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 3e277d6ec..98cf6631e 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -45,15 +45,13 @@ class ttWorkHelper {
   var $put_own_offer_uri = null;     // URI to publish own offer.
   var $get_own_offer_uri = null;     // URI to get own offer details.
   var $get_own_offers_uri = null;    // URI to get own offers.
-
   var $get_available_offers_uri = null; // URI to get available offers.
   var $get_available_offer_uri = null;  // URI to get a single available offer.
   var $get_group_items_uri = null;      // URI to get all group items in one API call.
-  var $delete_offer_uri = null;  // URI to delete offer.
-  var $delete_offers_uri = null; // URI to delete multiple offers.
-  var $update_offer_uri = null;  // URI to update offer.
-  var $site_id = null;           // Site id for remote work server.
-  var $site_key = null;          // Site key for remote work server.
+  var $delete_own_offer_uri = null; // URI to delete own offer.
+  var $update_own_offer_uri = null; // URI to update own offer.
+  var $site_id = null;              // Site id for work server.
+  var $site_key = null;             // Site key for work server.
 
   // Constructor.
   function __construct(&$errors) {
@@ -81,8 +79,8 @@ function __construct(&$errors) {
     $this->get_available_offers_uri = $this->work_server_uri.'getavailableoffers';
     $this->get_available_offer_uri = $this->work_server_uri.'getavailableoffer';
     $this->get_group_items_uri = $this->work_server_uri.'getgroupitems';
-    $this->delete_offer_uri = $this->work_server_uri.'deleteoffer';
-    $this->update_offer_uri = $this->work_server_uri.'updateoffer';
+    $this->delete_own_offer_uri = $this->work_server_uri.'deleteownoffer';
+    $this->update_own_offer_uri = $this->work_server_uri.'updateownoffer';
     $this->checkSiteRegistration();
   }
 
@@ -792,8 +790,8 @@ function getOwnOffer($offer_id) {
     return $offer;
   }
 
-  // updateOffer - updates an offer in remote work server.
-  function updateOffer($fields) {
+  // updateOwnOffer - updates an offer in remote work server.
+  function updateOwnOffer($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -830,7 +828,7 @@ function updateOffer($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_offer_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->update_own_offer_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -862,8 +860,8 @@ function updateOffer($fields) {
     return true;
   }
 
-  // deleteOffer - deletes an offer from remote work server.
-  function deleteOffer($offer_id) {
+  // deleteOwnOffer - deletes an offer from remote work server.
+  function deleteOwnOffer($offer_id) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -892,7 +890,7 @@ function deleteOffer($offer_id) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_offer_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->delete_own_offer_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4df8f6172..752bd7d92 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.19.10.5129 | 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.10.5130 | 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/offer_delete.php b/offer_delete.php
index 91d84ff20..897248365 100644
--- a/offer_delete.php
+++ b/offer_delete.php
@@ -57,7 +57,7 @@
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if ($workHelper->deleteOffer($cl_offer_id)) {
+    if ($workHelper->deleteOwnOffer($cl_offer_id)) {
       header('Location: work.php');
       exit();
     }
diff --git a/offer_edit.php b/offer_edit.php
index f39c6cb5c..0f17f7dae 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -106,7 +106,7 @@
         'currency' => $currencies[$cl_currency],
         'amount' => $cl_budget,
         'payment_info' => $cl_payment_info);
-      if ($workHelper->updateOffer($fields)) {
+      if ($workHelper->updateOwnOffer($fields)) {
         header('Location: work.php');
         exit();
       }

From d02c087e6f1d54c6f2d6e6037ff868d019d0dd4c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 19:48:10 +0000
Subject: [PATCH 1102/1848] Added more parameters to a remote call.

---
 WEB-INF/lib/ttWorkHelper.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 98cf6631e..465fa5f26 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -1008,6 +1008,12 @@ function getAvailableWorkItem($work_id) {
       'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
+      'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
+      'user_id' => urlencode($user->getUser()),
+      'user_name' => urlencode(base64_encode($user->getName())),
+      'user_email' => urlencode(base64_encode($user->getEmail())),
+      'user_ip' => urlencode($_SERVER['REMOTE_ADDR']),
       'work_id' => urlencode($work_id));
 
     // url-ify the data for the POST.

From 40aa318e6cb727d98fac9ea3944ef53d940b302d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 28 Sep 2019 21:57:26 +0000
Subject: [PATCH 1103/1848] Added more parameters to a remote call.

---
 WEB-INF/lib/ttWorkHelper.class.php | 6 ++++++
 WEB-INF/templates/footer.tpl       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 465fa5f26..071d2c2a5 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -1070,6 +1070,12 @@ function getAvailableOffer($offer_id) {
       'site_id' => urlencode($this->site_id),
       'site_key' => urlencode($this->site_key),
       'org_id' => urlencode($org_id),
+      'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
+      'user_id' => urlencode($user->getUser()),
+      'user_name' => urlencode(base64_encode($user->getName())),
+      'user_email' => urlencode(base64_encode($user->getEmail())),
+      'user_ip' => urlencode($_SERVER['REMOTE_ADDR']),
       'offer_id' => urlencode($offer_id));
 
     // url-ify the data for the POST.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 752bd7d92..859571278 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.19.10.5130 | 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.10.5131 | 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>

From 9ab93b73bd21c9607f75b55e5fc16002067e4584 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 29 Sep 2019 12:12:24 +0000
Subject: [PATCH 1104/1848] Starting to work on messaging mechanism in Work
 plugin.

---
 WEB-INF/resources/ca.lang.php    |  7 ++++---
 WEB-INF/resources/cs.lang.php    |  7 ++++---
 WEB-INF/resources/da.lang.php    |  7 ++++---
 WEB-INF/resources/de.lang.php    |  6 ++++++
 WEB-INF/resources/en.lang.php    |  7 ++++---
 WEB-INF/resources/es.lang.php    |  7 ++++---
 WEB-INF/resources/et.lang.php    |  7 ++++---
 WEB-INF/resources/fa.lang.php    |  7 ++++---
 WEB-INF/resources/fi.lang.php    |  7 ++++---
 WEB-INF/resources/fr.lang.php    |  7 ++++---
 WEB-INF/resources/gr.lang.php    |  7 ++++---
 WEB-INF/resources/he.lang.php    |  7 ++++---
 WEB-INF/resources/hu.lang.php    |  7 ++++---
 WEB-INF/resources/it.lang.php    |  7 ++++---
 WEB-INF/resources/ja.lang.php    |  7 ++++---
 WEB-INF/resources/ko.lang.php    |  7 ++++---
 WEB-INF/resources/nl.lang.php    |  8 +++++---
 WEB-INF/resources/no.lang.php    |  7 ++++---
 WEB-INF/resources/pl.lang.php    |  7 ++++---
 WEB-INF/resources/pt-br.lang.php |  7 ++++---
 WEB-INF/resources/pt.lang.php    |  7 ++++---
 WEB-INF/resources/ro.lang.php    |  7 ++++---
 WEB-INF/resources/ru.lang.php    |  7 ++++---
 WEB-INF/resources/sk.lang.php    |  7 ++++---
 WEB-INF/resources/sl.lang.php    |  7 ++++---
 WEB-INF/resources/sr.lang.php    |  7 ++++---
 WEB-INF/resources/sv.lang.php    |  7 ++++---
 WEB-INF/resources/tr.lang.php    |  7 ++++---
 WEB-INF/resources/zh-cn.lang.php |  7 ++++---
 WEB-INF/resources/zh-tw.lang.php |  7 ++++---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/work_view.tpl  | 18 ++++++++++++++++++
 32 files changed, 142 insertions(+), 88 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 05ea0188b..97e61cd6e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -704,8 +704,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 632ceca9a..e2b7ebfe9 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -717,8 +717,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 299149356..7db1e3451 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -678,8 +678,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0f58ba784..b41ec4dcc 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -653,4 +653,10 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
+
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 72106f11f..51d294297 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -635,7 +635,8 @@
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
-'form.work.work_items' => 'Work Items',
-'form.work.offers' => 'Offers',
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
+'work.button.send_message' => 'Send message',
+'work.button.make_offer' => 'Make offer',
+'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d6be47ad2..5e3c11cf3 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -719,8 +719,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 53183f3c1..799e69149 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -685,8 +685,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f38760cc2..f5ed5a229 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -702,8 +702,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 379182dc1..8b09ee696 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -684,8 +684,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index cf374646c..96ef09afe 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -674,8 +674,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 67068faa9..be02aaf57 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -667,8 +667,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 743077d90..a2c364e74 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -704,8 +704,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d6fc4b4e9..c6e210bd6 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -709,8 +709,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7dbc055ba..0bc1a0c9c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -681,8 +681,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 17a18e9df..29fc181f0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -712,8 +712,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c1d03180f..136f2d9b0 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -710,8 +710,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index cc4fa139c..4487b0ba5 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -636,7 +636,9 @@
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
-'form.work.work_items' => 'Onderdelen werk',
-'form.work.offers' => 'Aanbiedingen',
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
+// TODO: translate the following.
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index f6e1170a8..bbae702a1 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -709,8 +709,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 8499ffba7..d3e2054bb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -687,8 +687,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index c0097c711..9fddafbce 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -682,8 +682,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ae217cd4a..84bd54c78 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -691,8 +691,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 5f5dd12e2..ef709251e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -712,8 +712,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ffdee0d66..32899de1f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -616,7 +616,8 @@
 'form.display_options.menu' => 'Меню',
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
-'form.work.work_items' => 'Единицы работы',
-'form.work.offers' => 'Предложения',
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
+'work.button.send_message' => 'Отправить сообщение',
+'work.button.make_offer' => 'Сделать предложение',
+'work.button.accept_offer' => 'Принять предложение',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 5abde75eb..a9bebd6e6 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -693,8 +693,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e7e8f273f..4f95eaa45 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -685,8 +685,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7e92a5b5a..b156243dd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -685,8 +685,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index e08a183c3..157990d3e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -683,8 +683,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 27a37e3c0..8bee9061c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -725,8 +725,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 50bfdfb60..02e60b0ba 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -696,8 +696,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 39d6afa07..4834c7e99 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -702,8 +702,9 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
-// Work form. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
-// 'form.work.work_items' => 'Work Items',
-// 'form.work.offers' => 'Offers',
+// 'work.button.send_message' => 'Send message',
+// 'work.button.make_offer' => 'Make offer',
+// 'work.button.accept_offer' => 'Accept offer',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 859571278..6c6d48d8a 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.19.10.5131 | 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.10.5132 | 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/work_view.tpl b/WEB-INF/templates/work_view.tpl
index d34b936a6..ab55a4c00 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -1,3 +1,7 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
 {$forms.workForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
@@ -34,3 +38,17 @@
   </tr>
 </table>
 {$forms.workForm.close}
+
+{if isTrue('WORK_DEBUG')}
+<table width="720" cellspacing="4" cellpadding="4" border="0">
+<tr>
+  <td align="center">
+  <table>
+  <tr>
+    <td><input type="button" onclick="chLocation('work_message.php');" value="{$i18n.button.send_by_email}"></td>
+  </tr>
+  </table>
+  </td>
+</tr>
+</table>
+{/if}

From ceee8d5924467b10289b8ebec6e28b5316fc1881 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 29 Sep 2019 19:00:03 +0000
Subject: [PATCH 1105/1848] Some work in progress on making offers for Work
 plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 33 +++++++++++++++++++++++-
 WEB-INF/resources/ca.lang.php      |  4 +++
 WEB-INF/resources/cs.lang.php      |  4 +++
 WEB-INF/resources/da.lang.php      |  4 +++
 WEB-INF/resources/de.lang.php      |  4 +++
 WEB-INF/resources/en.lang.php      |  4 +++
 WEB-INF/resources/es.lang.php      |  4 +++
 WEB-INF/resources/et.lang.php      |  4 +++
 WEB-INF/resources/fa.lang.php      |  4 +++
 WEB-INF/resources/fi.lang.php      |  4 +++
 WEB-INF/resources/fr.lang.php      |  4 +++
 WEB-INF/resources/gr.lang.php      |  4 +++
 WEB-INF/resources/he.lang.php      |  4 +++
 WEB-INF/resources/hu.lang.php      |  4 +++
 WEB-INF/resources/it.lang.php      |  4 +++
 WEB-INF/resources/ja.lang.php      |  4 +++
 WEB-INF/resources/ko.lang.php      |  4 +++
 WEB-INF/resources/nl.lang.php      |  4 +++
 WEB-INF/resources/no.lang.php      |  4 +++
 WEB-INF/resources/pl.lang.php      |  4 +++
 WEB-INF/resources/pt-br.lang.php   |  4 +++
 WEB-INF/resources/pt.lang.php      |  4 +++
 WEB-INF/resources/ro.lang.php      |  4 +++
 WEB-INF/resources/ru.lang.php      |  4 +++
 WEB-INF/resources/sk.lang.php      |  4 +++
 WEB-INF/resources/sl.lang.php      |  4 +++
 WEB-INF/resources/sr.lang.php      |  4 +++
 WEB-INF/resources/sv.lang.php      |  4 +++
 WEB-INF/resources/tr.lang.php      |  4 +++
 WEB-INF/resources/zh-cn.lang.php   |  4 +++
 WEB-INF/resources/zh-tw.lang.php   |  4 +++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         |  8 ++++--
 WEB-INF/templates/work_view.tpl    |  3 ++-
 admin_offer_edit.php               | 15 ++++++++---
 admin_work_edit.php                |  8 +++---
 offer_add.php                      | 40 +++++++++++++++++++++++-------
 offer_edit.php                     | 27 +++++++++++++-------
 work_add.php                       |  6 ++---
 work_edit.php                      |  9 +++----
 work_view.php                      |  1 +
 41 files changed, 233 insertions(+), 39 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 071d2c2a5..ff979c2af 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -564,6 +564,7 @@ function putOwnOffer($fields) {
       'group_id' => urlencode($group_id),
       'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($fields['work_id']),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
@@ -931,11 +932,41 @@ static function getCurrencies() {
     if (is_a($res, 'PEAR_Error')) return false;
 
     while ($val = $res->fetchRow()) {
-      $result[] = $val['name'];
+      $result[] = array('id'=>$val['id'], 'name'=>$val['name']);
     }
     return $result;
   }
 
+  // getCurrencyID - obtains an ID for currency.
+  static function getCurrencyID($currency) {
+    $mdb2 = getConnection();
+
+    $currency_id = null;
+    $sql = "select id from tt_work_currencies where name = ".$mdb2->quote($currency);
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return null;
+
+    if($val = $res->fetchRow()) {
+      $currency_id = $val['id'];
+    }
+    return $currency_id;
+  }
+
+  // getCurrencyName - obtains currency name using its id.
+  static function getCurrencyName($currency_id) {
+    $mdb2 = getConnection();
+
+    $currency_name = null;
+    $sql = "select name from tt_work_currencies where id = $currency_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return null;
+
+    if($val = $res->fetchRow()) {
+      $currency_name = $val['name'];
+    }
+    return $currency_name;
+  }
+
   // getGroupItems - obtains a list of all items relevant to group in one API call to Remote Work Server.
   function getGroupItems() {
     global $i18n;
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 97e61cd6e..9813ca780 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -706,6 +706,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e2b7ebfe9..6607ed5bb 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -719,6 +719,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7db1e3451..948b591e2 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -680,6 +680,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b41ec4dcc..045533702 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -656,6 +656,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 51d294297..0bc5fba16 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -636,6 +636,10 @@
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
+'work.error.work_not_available' => 'Work item is not available.',
+'work.error.offer_not_available' => 'Offer is not available.',
+'work.label.our_work' => 'Our work',
+'work.label.our_offers' => 'Our offers',
 'work.button.send_message' => 'Send message',
 'work.button.make_offer' => 'Make offer',
 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5e3c11cf3..61c466635 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -721,6 +721,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 799e69149..f6a6d5c7b 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -687,6 +687,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f5ed5a229..1866a21ed 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -704,6 +704,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 8b09ee696..d7136aaee 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -686,6 +686,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 96ef09afe..b8f22e0a8 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -676,6 +676,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index be02aaf57..4b5ab0e7b 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -669,6 +669,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a2c364e74..b8ff35a60 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -706,6 +706,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c6e210bd6..5339cd133 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -711,6 +711,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 0bc1a0c9c..1f287cfd1 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -683,6 +683,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 29fc181f0..f8b18e60c 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -714,6 +714,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 136f2d9b0..d23d8b728 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -712,6 +712,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4487b0ba5..71ca76659 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -638,6 +638,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index bbae702a1..4c55fbca4 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -711,6 +711,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d3e2054bb..90b8ade2e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -689,6 +689,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9fddafbce..1108dbddf 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -684,6 +684,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 84bd54c78..f3c9e9b46 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -693,6 +693,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index ef709251e..c1ab74e33 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -714,6 +714,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 32899de1f..9cf026772 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -617,6 +617,10 @@
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
+'work.error.work_not_available' => 'Работа отсутствует.',
+'work.error.offer_not_available' => 'Предложение отсутствует.',
+'work.label.our_work' => 'Наша работа',
+'work.label.our_offers' => 'Наши предложения',
 'work.button.send_message' => 'Отправить сообщение',
 'work.button.make_offer' => 'Сделать предложение',
 'work.button.accept_offer' => 'Принять предложение',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a9bebd6e6..0620b34d5 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -695,6 +695,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 4f95eaa45..5ec29ac97 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -687,6 +687,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b156243dd..d1056c260 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -687,6 +687,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 157990d3e..750065efa 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -685,6 +685,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 8bee9061c..4127780f9 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -727,6 +727,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 02e60b0ba..739f23db4 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -698,6 +698,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 4834c7e99..2c0928ae3 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -704,6 +704,10 @@
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
+// 'work.error.work_not_available' => 'Work item is not available.',
+// 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.label.our_work' => 'Our work',
+// 'work.label.our_offers' => 'Our offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6c6d48d8a..a7fe25978 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.19.10.5132 | 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.10.5133 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 03ab18bf6..f790c2420 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -7,7 +7,7 @@
     <td valign="top">
 {if $active_work}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_work}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.our_work}</td></tr>
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -67,7 +67,7 @@
 
 {if $active_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.active_offers}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.our_offers}</td></tr>
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -78,7 +78,11 @@
         </tr>
   {foreach $active_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+    {if $offer.work_id}
+          <td><a href='work_view.php?id={$offer.work_id}'>{$offer.subject|escape}</a></td>
+    {else}
           <td>{$offer.subject|escape}</td>
+    {/if}
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
index ab55a4c00..90ca1b8b0 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -45,7 +45,8 @@
   <td align="center">
   <table>
   <tr>
-    <td><input type="button" onclick="chLocation('work_message.php');" value="{$i18n.button.send_by_email}"></td>
+    <td><input type="button" onclick="chLocation('work_message.php');" value="{$i18n.work.button.send_message}"></td>
+    <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
   </tr>
   </table>
   </td>
diff --git a/admin_offer_edit.php b/admin_offer_edit.php
index 15afe8ae6..7c66a7a83 100644
--- a/admin_offer_edit.php
+++ b/admin_offer_edit.php
@@ -46,6 +46,13 @@
 }
 // End of access checks.
 
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $adminWorkHelper->getWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
 $existingStatus = $offer['status'];
 $currencies = ttWorkHelper::getCurrencies();
 
@@ -53,7 +60,7 @@
   $cl_name = trim($request->getParameter('offer_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
-  $cl_currency = $request->getParameter('currency');
+  $cl_currency_id = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
   $cl_status = $request->getParameter('status');
   $cl_moderator_comment = $request->getParameter('moderator_comment');
@@ -62,7 +69,7 @@
   $cl_description = $offer['descr_short'];
   $cl_details = $offer['descr_long'];
   $currency = $offer['currency'];
-  $cl_currency = array_search($currency, $currencies);
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
   $cl_budget = $offer['amount'];
   $cl_status = $offer['status'];
   $cl_moderator_comment = $offer['moderator_comment'];
@@ -73,7 +80,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 
 // Prepare status choices.
@@ -103,7 +110,7 @@
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,
-        'currency' => $currencies[$cl_currency],
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
         'amount' => $cl_budget,
         'moderator_comment' => $cl_moderator_comment);
 
diff --git a/admin_work_edit.php b/admin_work_edit.php
index 9700b05d9..5f5a75cc8 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -54,7 +54,7 @@
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
-  $cl_currency = $request->getParameter('currency');
+  $cl_currency_id = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
   $cl_status = $request->getParameter('status');
   $cl_moderator_comment = $request->getParameter('moderator_comment');
@@ -63,7 +63,7 @@
   $cl_description = $work_item['descr_short'];
   $cl_details = $work_item['descr_long'];
   $currency = $work_item['currency'];
-  $cl_currency = array_search($currency, $currencies);
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
   $cl_budget = $work_item['amount'];
   $cl_status = $work_item['status'];
   $cl_moderator_comment = $work_item['moderator_comment'];
@@ -74,7 +74,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 
 // Prepare status choices.
@@ -104,7 +104,7 @@
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,
-        'currency' => $currencies[$cl_currency],
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
         'amount' => $cl_budget,
         'moderator_comment' => $cl_moderator_comment);
 
diff --git a/offer_add.php b/offer_add.php
index 9ee2bf15e..4a652a1b9 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -39,26 +39,47 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// Do we have work_id?
+$cl_work_id = (int)$request->getParameter('work_id');
+if ($cl_work_id) {
+  $workHelper = new ttWorkHelper($err);
+  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+  if (!$work_item) {
+    header('Location: access_denied.php');
+    exit(); 
+  }
+}
 // End of access checks.
+if ($work_item) $cl_name = $work_item['subject'];
 
 if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('offer_name'));
+  if (!$work_item)
+    $cl_name = trim($request->getParameter('offer_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
-  $cl_currency = $request->getParameter('currency');
+  $cl_currency_id = $request->getParameter('currency');
+  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $request->getParameter('budget');
   $cl_payment_info = $request->getParameter('payment_info');
+} else {
+  if ($work_item) {
+    $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  }
 }
 
 $form = new Form('offerForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_item) $form->getElement('offer_name')->setEnabled(false);
+
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+if ($work_item) $form->getElement('currency')->setEnabled(false); // Do not allow changing currency for offers on existing work items.
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 250px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -74,10 +95,11 @@
 
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
-    $fields = array('subject'=>$cl_name,
+    $fields = array('work_id'=>$cl_work_id,
+      'subject'=>$cl_name,
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
-      'currency' => $currencies[$cl_currency],
+      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
       'amount' => $cl_budget,
       'payment_info' => $cl_payment_info);
      if ($workHelper->putOwnOffer($fields)) {
diff --git a/offer_edit.php b/offer_edit.php
index 0f17f7dae..e4afd3078 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -48,21 +48,28 @@
 }
 // End of access checks.
 
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $workHelper->getAvailableWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
 $currencies = ttWorkHelper::getCurrencies();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('offer_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
-  $cl_currency = $request->getParameter('currency');
+  $cl_currency_id = $request->getParameter('currency');
+  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $request->getParameter('budget');
   $cl_payment_info = $request->getParameter('payment_info');
 } else {
   $cl_name = $offer['subject'];
   $cl_description = $offer['descr_short'];
   $cl_details = $offer['descr_long'];
-  $currency = $offer['currency'];
-  $cl_currency = array_search($currency, $currencies);
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
   $cl_budget = $offer['amount'];
   $cl_payment_info = $offer['payment_info'];
   $cl_status = $offer['status_label'];
@@ -73,12 +80,14 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_id) $form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 250px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
@@ -103,7 +112,7 @@
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,
-        'currency' => $currencies[$cl_currency],
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
         'amount' => $cl_budget,
         'payment_info' => $cl_payment_info);
       if ($workHelper->updateOwnOffer($fields)) {
diff --git a/work_add.php b/work_add.php
index 4e183f41f..8645891f1 100644
--- a/work_add.php
+++ b/work_add.php
@@ -45,7 +45,7 @@
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
-  $cl_currency = $request->getParameter('currency');
+  $cl_currency_id = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
 }
 
@@ -55,7 +55,7 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -82,7 +82,7 @@
     $fields = array('subject'=>$cl_name,
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
-      'currency' => $currencies[$cl_currency],
+      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
       'amount' => $cl_budget);
      if ($workHelper->putOwnWorkItem($fields)) {
         header('Location: work.php');
diff --git a/work_edit.php b/work_edit.php
index 9ac0abd1b..9adc12f1d 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -54,14 +54,13 @@
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
-  $cl_currency = $request->getParameter('currency');
+  $cl_currency_id = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
 } else {
   $cl_name = $work_item['subject'];
   $cl_description = $work_item['descr_short'];
   $cl_details = $work_item['descr_long'];
-  $currency = $work_item['currency'];
-  $cl_currency = array_search($currency, $currencies);
+  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $work_item['amount'];
   $cl_status = $work_item['status_label'];
   $cl_moderator_comment = $work_item['moderator_comment'];
@@ -74,7 +73,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'value'=>$cl_currency));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
@@ -99,7 +98,7 @@
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,
-        'currency' => $currencies[$cl_currency],
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
         'amount' => $cl_budget);
       if ($workHelper->updateOwnWorkItem($fields)) {
         header('Location: work.php');
diff --git a/work_view.php b/work_view.php
index 6e9266c61..d3addcc06 100644
--- a/work_view.php
+++ b/work_view.php
@@ -67,6 +67,7 @@
 $form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
 $form->getElement('budget')->setEnabled(false);
 
+$smarty->assign('work_id', $cl_work_id);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'work_view.tpl');

From 3999488d456d2384ec13f48af3b0063948037ff9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Oct 2019 18:00:01 +0000
Subject: [PATCH 1106/1848] Allowed comma-separated recipients in
 notifications.

---
 WEB-INF/templates/admin_offer_edit.tpl | 17 +++++++++++++++++
 WEB-INF/templates/footer.tpl           |  2 +-
 admin_offer_edit.php                   | 17 +++++++++++++----
 admin_work_edit.php                    |  2 +-
 notification_add.php                   |  4 ++--
 notification_edit.php                  |  4 ++--
 6 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/admin_offer_edit.tpl b/WEB-INF/templates/admin_offer_edit.tpl
index edf3e5328..5831ae0c8 100644
--- a/WEB-INF/templates/admin_offer_edit.tpl
+++ b/WEB-INF/templates/admin_offer_edit.tpl
@@ -3,6 +3,23 @@
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
+{if $work_id}
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td><a href="admin_work_edit.php?id={$work_id}">{$work_name}</a></td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$work_description}</td>
+        </tr>
+  {if $work_details}
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$work_details}</td>
+        </tr>
+  {/if}
+        <tr><td>&nbsp;</td></tr>
+{/if}
         <tr>
           <td align="right">{$i18n.label.offer} (*):</td>
           <td>{$forms.offerForm.offer_name.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a7fe25978..c3926c690 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.19.10.5133 | 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.10.5134 | 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/admin_offer_edit.php b/admin_offer_edit.php
index 7c66a7a83..d47b6a40c 100644
--- a/admin_offer_edit.php
+++ b/admin_offer_edit.php
@@ -61,6 +61,7 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
   $cl_currency_id = $request->getParameter('currency');
+  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $request->getParameter('budget');
   $cl_status = $request->getParameter('status');
   $cl_moderator_comment = $request->getParameter('moderator_comment');
@@ -77,10 +78,12 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_id) $form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 
 // Prepare status choices.
@@ -90,7 +93,7 @@
 $status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
 
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -138,6 +141,12 @@
   }
 } // isPost
 
+if ($work_id) {
+  $smarty->assign('work_id', $work_id);
+  $smarty->assign('work_name', $work_item['subject']);
+  $smarty->assign('work_description', $work_item['descr_short']);
+  $smarty->assign('work_details', $work_item['descr_long']);
+}
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_offer'));
 $smarty->assign('content_page_name', 'admin_offer_edit.tpl');
diff --git a/admin_work_edit.php b/admin_work_edit.php
index 5f5a75cc8..c1d8a257a 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -63,7 +63,7 @@
   $cl_description = $work_item['descr_short'];
   $cl_details = $work_item['descr_long'];
   $currency = $work_item['currency'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $work_item['amount'];
   $cl_status = $work_item['status'];
   $cl_moderator_comment = $work_item['moderator_comment'];
diff --git a/notification_add.php b/notification_add.php
index 05a095468..c6b37fe65 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -87,8 +87,8 @@
   // Validate user input.
   if (!$cl_fav_report_id) $err->add($i18n->get('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
-  if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
-  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
+  if (!ttValidEmailList($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('form.email'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
   if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));
 
diff --git a/notification_edit.php b/notification_edit.php
index 90b84e5a3..8af8dc8c4 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -99,8 +99,8 @@
   // Validate user input.
   if (!$cl_fav_report_id) $err->add($i18n->get('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
-  if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
-  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
+  if (!ttValidEmailList($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('form.email'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
   if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));
 

From 346f642be712b394227003e0121ae926af967de2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Oct 2019 19:25:58 +0000
Subject: [PATCH 1107/1848] Fixed fav reports sent in notifications for custom
 date formats.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 6 ++++++
 WEB-INF/templates/footer.tpl            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 05b863fba..4cc1b0614 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -544,6 +544,12 @@ static function adjustOptions($options) {
       // TODO: add project fields here.
     }
 
+    // Adjust period_start and period_end to user date format.
+    if ($options['period_start'])
+      $options['period_start'] = ttDateToUserFormat($options['period_start']);
+    if ($options['period_end'])
+      $options['period_end'] = ttDateToUserFormat($options['period_end']);
+
     return $options;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c3926c690..587d9af04 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.19.10.5134 | 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.11.5135 | 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>

From eefb68aa9f23f65f255f78479fa0a1409266b19d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 8 Oct 2019 14:18:27 +0000
Subject: [PATCH 1108/1848] Added max length attribute to some work plugin
 related controls.

---
 WEB-INF/lib/form/TextArea.class.php | 1 -
 WEB-INF/templates/footer.tpl        | 2 +-
 admin_offer_edit.php                | 4 ++--
 admin_work_edit.php                 | 4 ++--
 offer_add.php                       | 5 ++---
 offer_edit.php                      | 4 ++--
 offer_view.php                      | 4 ++--
 work_add.php                        | 4 ++--
 work_edit.php                       | 4 ++--
 work_view.php                       | 4 ++--
 10 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/form/TextArea.class.php b/WEB-INF/lib/form/TextArea.class.php
index ee68fcb87..715a6ea95 100644
--- a/WEB-INF/lib/form/TextArea.class.php
+++ b/WEB-INF/lib/form/TextArea.class.php
@@ -47,7 +47,6 @@ function getHtml() {
 
 		if ($this->max_length!="") {
 			if ($this->mOnKeyPress) $this->mOnKeyPress .= ";";
-			$this->mOnKeyPress .= "return validateMaxLenght_".$this->name."(this, event);";
 			$html .= " maxlength=\"$this->max_length\"";
 		}
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 587d9af04..f696c4d73 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.19.11.5135 | 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.11.5136 | 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/admin_offer_edit.php b/admin_offer_edit.php
index d47b6a40c..185255c82 100644
--- a/admin_offer_edit.php
+++ b/admin_offer_edit.php
@@ -78,9 +78,9 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
 if ($work_id) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 if ($work_id) $form->getElement('currency')->setEnabled(false);
diff --git a/admin_work_edit.php b/admin_work_edit.php
index c1d8a257a..c66906d61 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -71,8 +71,8 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
diff --git a/offer_add.php b/offer_add.php
index 4a652a1b9..b28516df7 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -69,10 +69,9 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
 if ($work_item) $form->getElement('offer_name')->setEnabled(false);
-
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
diff --git a/offer_edit.php b/offer_edit.php
index e4afd3078..24a02df21 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -80,9 +80,9 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
 if ($work_id) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 if ($work_id) $form->getElement('currency')->setEnabled(false);
diff --git a/offer_view.php b/offer_view.php
index cbf400db4..6fd2057c1 100644
--- a/offer_view.php
+++ b/offer_view.php
@@ -56,9 +56,9 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'contractor','value'=>$cl_contractor));
+$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
 $form->getElement('contractor')->setEnabled(false);
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
 $form->getElement('offer_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->getElement('description')->setEnabled(false);
diff --git a/work_add.php b/work_add.php
index 8645891f1..fe5937af0 100644
--- a/work_add.php
+++ b/work_add.php
@@ -50,8 +50,8 @@
 }
 
 $form = new Form('workForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
diff --git a/work_edit.php b/work_edit.php
index 9adc12f1d..fc84d5c13 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -70,8 +70,8 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
diff --git a/work_view.php b/work_view.php
index d3addcc06..03995e646 100644
--- a/work_view.php
+++ b/work_view.php
@@ -56,9 +56,9 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'client','value'=>$cl_client));
+$form->addInput(array('type'=>'text','name'=>'client','value'=>$cl_client));
 $form->getElement('client')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','maxlength'=>'100','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
 $form->getElement('work_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->getElement('description')->setEnabled(false);

From 59b5f66a4dfa7e4a6711dcbe24136636ab15032d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 8 Oct 2019 15:02:26 +0000
Subject: [PATCH 1109/1848] Work in progress on Remote Work plugin.

---
 WEB-INF/templates/admin_offer_edit.tpl | 4 ++++
 WEB-INF/templates/footer.tpl           | 2 +-
 admin_offer_edit.php                   | 3 +++
 offer_add.php                          | 2 +-
 offer_edit.php                         | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/admin_offer_edit.tpl b/WEB-INF/templates/admin_offer_edit.tpl
index 5831ae0c8..b79739171 100644
--- a/WEB-INF/templates/admin_offer_edit.tpl
+++ b/WEB-INF/templates/admin_offer_edit.tpl
@@ -46,6 +46,10 @@
           <td align="right">{$i18n.label.budget} (*):</td>
           <td>{$forms.offerForm.budget.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
+          <td>{$forms.offerForm.payment_info.control}</td>
+        </tr>
         <tr>
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.offerForm.status.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f696c4d73..66400b0b8 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.19.11.5136 | 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.11.5137 | 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/admin_offer_edit.php b/admin_offer_edit.php
index 185255c82..3dcbe0823 100644
--- a/admin_offer_edit.php
+++ b/admin_offer_edit.php
@@ -63,6 +63,7 @@
   $cl_currency_id = $request->getParameter('currency');
   if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $request->getParameter('budget');
+  $cl_payment_info = $request->getParameter('payment_info');
   $cl_status = $request->getParameter('status');
   $cl_moderator_comment = $request->getParameter('moderator_comment');
 } else {
@@ -72,6 +73,7 @@
   $currency = $offer['currency'];
   $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
   $cl_budget = $offer['amount'];
+  $cl_payment_info = $offer['payment_info'];
   $cl_status = $offer['status'];
   $cl_moderator_comment = $offer['moderator_comment'];
 }
@@ -85,6 +87,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 
 // Prepare status choices.
 $status_options = array();
diff --git a/offer_add.php b/offer_add.php
index b28516df7..c98565fe3 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -78,7 +78,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 if ($work_item) $form->getElement('currency')->setEnabled(false); // Do not allow changing currency for offers on existing work items.
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
diff --git a/offer_edit.php b/offer_edit.php
index 24a02df21..f5686cde8 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -87,7 +87,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));

From 5b44185b1f92a0b3d9ab3ed62cb6559a42b6a5b6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 8 Oct 2019 15:52:41 +0000
Subject: [PATCH 1110/1848] Some styling improvements for Work plugin.

---
 WEB-INF/templates/footer.tpl | 2 +-
 offer_edit.php               | 4 ++--
 work_add.php                 | 6 +++---
 work_edit.php                | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 66400b0b8..b56d63bf2 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.19.11.5137 | 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.11.5138 | 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/offer_edit.php b/offer_edit.php
index f5686cde8..3880b1819 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -87,10 +87,10 @@
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px; vertical-align: middle','value'=>$cl_payment_info));
 $form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->getElement('moderator_comment')->setEnabled(false);
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
diff --git a/work_add.php b/work_add.php
index fe5937af0..4e7ba1ba3 100644
--- a/work_add.php
+++ b/work_add.php
@@ -50,9 +50,9 @@
 }
 
 $form = new Form('workForm');
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 // Add a dropdown for currency.
 $currencies = ttWorkHelper::getCurrencies();
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
diff --git a/work_edit.php b/work_edit.php
index fc84d5c13..0c53f7ae4 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -70,14 +70,14 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 250px; height: 80px;','value'=>$cl_details));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 250px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->getElement('moderator_comment')->setEnabled(false);
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 

From e69f7a0cdfcd555b45b57fc522a9cc90cb68041b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 8 Oct 2019 16:35:53 +0000
Subject: [PATCH 1111/1848] Added work details on make offer page.

---
 WEB-INF/templates/admin_offer_edit.tpl |  8 +-------
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/offer_add.tpl        | 11 +++++++++++
 WEB-INF/templates/work_view.tpl        |  2 ++
 offer_add.php                          | 11 ++++++++++-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/admin_offer_edit.tpl b/WEB-INF/templates/admin_offer_edit.tpl
index b79739171..88fd3cc68 100644
--- a/WEB-INF/templates/admin_offer_edit.tpl
+++ b/WEB-INF/templates/admin_offer_edit.tpl
@@ -9,15 +9,9 @@
           <td><a href="admin_work_edit.php?id={$work_id}">{$work_name}</a></td>
         </tr>
         <tr>
-          <td align = "right">{$i18n.label.description}:</td>
+          <td></td>
           <td>{$work_description}</td>
         </tr>
-  {if $work_details}
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$work_details}</td>
-        </tr>
-  {/if}
         <tr><td>&nbsp;</td></tr>
 {/if}
         <tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b56d63bf2..8f21157b7 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.19.11.5138 | 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.11.5139 | 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/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
index da7e05574..d31fb1753 100644
--- a/WEB-INF/templates/offer_add.tpl
+++ b/WEB-INF/templates/offer_add.tpl
@@ -3,6 +3,17 @@
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
+{if $work_id}
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td><a href="work_view.php?id={$work_id}">{$work_name}</a></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$forms.offerForm.work_description.control}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+{/if}
         <tr>
           <td align="right">{$i18n.label.offer} (*):</td>
           <td>{$forms.offerForm.offer_name.control}</td>
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
index 90ca1b8b0..37207a72c 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -45,7 +45,9 @@
   <td align="center">
   <table>
   <tr>
+  {if false}
     <td><input type="button" onclick="chLocation('work_message.php');" value="{$i18n.work.button.send_message}"></td>
+  {/if}
     <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
   </tr>
   </table>
diff --git a/offer_add.php b/offer_add.php
index c98565fe3..42925fd59 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -68,7 +68,11 @@
 }
 
 $form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
+if ($cl_work_id) {
+  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
+  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
+  $form->getElement('work_description')->setEnabled(false);
+}
 $form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
 if ($work_item) $form->getElement('offer_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
@@ -108,6 +112,11 @@
   }
 } // isPost
 
+if ($cl_work_id) {
+  $smarty->assign('work_id', $cl_work_id);
+  $smarty->assign('work_name', $work_item['subject']);
+  $smarty->assign('work_description', $work_item['descr_short']);
+}
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_offer'));

From d5a3b4c54c2147b05ae76bc2ff5b59e536a66e3c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 8 Oct 2019 20:00:14 +0000
Subject: [PATCH 1112/1848] A bit more progress on making offers workflow.

---
 WEB-INF/templates/admin_offer_edit.tpl |  4 +-
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/offer_edit.tpl       | 11 ++++
 admin_offer_edit.php                   | 73 +++++++++++++++-----------
 offer_edit.php                         | 11 +++-
 work_edit.php                          |  2 +-
 6 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/templates/admin_offer_edit.tpl b/WEB-INF/templates/admin_offer_edit.tpl
index 88fd3cc68..bd9a6542b 100644
--- a/WEB-INF/templates/admin_offer_edit.tpl
+++ b/WEB-INF/templates/admin_offer_edit.tpl
@@ -10,7 +10,7 @@
         </tr>
         <tr>
           <td></td>
-          <td>{$work_description}</td>
+          <td>{$forms.offerForm.work_description.control}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
 {/if}
@@ -61,7 +61,7 @@
           <td>&nbsp;</td>
         </tr>
         <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_save.control}</td>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_approve.control} {$forms.offerForm.btn_save.control} {$forms.offerForm.btn_disapprove.control} </td>
         </tr>
       </table>
     </td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8f21157b7..0bef6cca3 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.19.11.5139 | 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.11.5140 | 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/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
index 75f7a0532..ba1555e44 100644
--- a/WEB-INF/templates/offer_edit.tpl
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -3,6 +3,17 @@
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
+{if $work_id}
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td><a href="work_view.php?id={$work_id}">{$work_name}</a></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$forms.offerForm.work_description.control}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+{/if}
         <tr>
           <td align="right">{$i18n.label.offer} (*):</td>
           <td>{$forms.offerForm.offer_name.control}</td>
diff --git a/admin_offer_edit.php b/admin_offer_edit.php
index 3dcbe0823..208c08438 100644
--- a/admin_offer_edit.php
+++ b/admin_offer_edit.php
@@ -64,7 +64,7 @@
   if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
   $cl_budget = $request->getParameter('budget');
   $cl_payment_info = $request->getParameter('payment_info');
-  $cl_status = $request->getParameter('status');
+  // $cl_status = $request->getParameter('status');
   $cl_moderator_comment = $request->getParameter('moderator_comment');
 } else {
   $cl_name = $offer['subject'];
@@ -74,13 +74,18 @@
   $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
   $cl_budget = $offer['amount'];
   $cl_payment_info = $offer['payment_info'];
-  $cl_status = $offer['status'];
+  $status = $offer['status'];
+  $status_label = $offer['status_label'];
   $cl_moderator_comment = $offer['moderator_comment'];
 }
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_id) {
+  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
+  $form->getElement('work_description')->setEnabled(false);
+}
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
 if ($work_id) $form->getElement('offer_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
@@ -88,16 +93,24 @@
 if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$status_label));
+$form->getElement('status')->setEnabled(false);
 
 // Prepare status choices.
+/*
 $status_options = array();
 $status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
 $status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
 $status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
 
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
+*/
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+if ($status == STATUS_PENDING_APPROVAL) {
+  $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
+}
 
 if ($request->isPost()) {
   // Validate user input.
@@ -110,35 +123,36 @@
   // Ensure user email exists (required for workflow).
   if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
 
+  $fields = array('offer_id'=>$cl_offer_id,
+    'subject'=>$cl_name,
+    'descr_short' => $cl_description,
+    'descr_long' => $cl_details,
+    'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+    'amount' => $cl_budget,
+    'moderator_comment' => $cl_moderator_comment);
+
   if ($err->no()) {
+    if ($request->getParameter('btn_approve')) {
+      // Approve offer.
+      if ($adminWorkHelper->approveOffer($fields)) {
+        header('Location: admin_work.php');
+        exit();
+      }
+    }
+  
     if ($request->getParameter('btn_save')) {
-      $fields = array('offer_id'=>$cl_offer_id,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget,
-        'moderator_comment' => $cl_moderator_comment);
+      // Update offer without changing its status.
+      if ($adminWorkHelper->updateOffer($fields)) {
+        header('Location: admin_work.php');
+        exit();
+      }
+    }
 
-      // Do things differently, depending on status control value.
-      if ($existingStatus == $cl_status) {
-        // Status not changed. Update work information.
-        if ($adminWorkHelper->updateOffer($fields)) {
-          header('Location: admin_work.php');
-          exit();
-        }
-      } else if ($cl_status == STATUS_DISAPPROVED) {
-        // Status changed to "not approved". Disapprove work.
-        if ($adminWorkHelper->disapproveOffer($fields)) {
-          header('Location: admin_work.php');
-          exit();
-        }
-      } else if ($cl_status == STATUS_APPROVED) {
-        // Status changed to "approved". Approve work.
-        if ($adminWorkHelper->approveOffer($fields)) {
-          header('Location: admin_work.php');
-          exit();
-        }
+    if ($request->getParameter('btn_disapprove')) {
+      // Dispprove offer.
+      if ($adminWorkHelper->disapproveOffer($fields)) {
+        header('Location: admin_work.php');
+        exit();
       }
     }
   }
@@ -148,7 +162,6 @@
   $smarty->assign('work_id', $work_id);
   $smarty->assign('work_name', $work_item['subject']);
   $smarty->assign('work_description', $work_item['descr_short']);
-  $smarty->assign('work_details', $work_item['descr_long']);
 }
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_offer'));
diff --git a/offer_edit.php b/offer_edit.php
index 3880b1819..7c695ee1c 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -80,6 +80,10 @@
 
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+if ($work_id) {
+  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
+  $form->getElement('work_description')->setEnabled(false);
+}
 $form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
 if ($work_id) $form->getElement('offer_name')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
@@ -88,7 +92,7 @@
 if ($work_id) $form->getElement('currency')->setEnabled(false);
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px; vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->getElement('moderator_comment')->setEnabled(false);
@@ -123,6 +127,11 @@
   }
 } // isPost
 
+if ($work_id) {
+  $smarty->assign('work_id', $work_id);
+  $smarty->assign('work_name', $work_item['subject']);
+  $smarty->assign('work_description', $work_item['descr_short']);
+}
 $smarty->assign('show_moderator_comment', $show_moderator_comment);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_offer'));
diff --git a/work_edit.php b/work_edit.php
index 0c53f7ae4..dffe185c7 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -75,7 +75,7 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'text','name'=>'status','value'=>$cl_status));
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->getElement('moderator_comment')->setEnabled(false);

From 34398e6db0f4d84016e0dc10d8738e1f4a11bded Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Oct 2019 01:06:55 +0000
Subject: [PATCH 1113/1848] Fixed issue #82 - clients can mark their invoices
 paid/not paid.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 3 ++-
 WEB-INF/templates/footer.tpl          | 2 +-
 WEB-INF/templates/invoice_view.tpl    | 4 ++--
 invoice_view.php                      | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 833f15c3d..0afd0c9aa 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -107,8 +107,9 @@ static function isPaid($invoice_id) {
   // markPaid marks invoice items as paid.
   static function markPaid($invoice_id, $mark_paid = true) {
     global $user;
-    $mdb2 = getConnection();
+    if ($user->isClient()) return false; // Not for clients.
 
+    $mdb2 = getConnection();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0bef6cca3..194b24e65 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.19.11.5140 | 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.12.5141 | 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/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index 6441b44db..0d8c31ffe 100644
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -68,8 +68,8 @@
         </tr>
       </table>
 
+  {if $show_mark_paid}
   {$forms.invoiceForm.open}
-  {if $user->isPluginEnabled('ps')}
   <table width="720" cellspacing="0" cellpadding="0" border="0">
   <tr>
     <td align="right">
@@ -79,8 +79,8 @@
     </td>
   </tr>
   </table>
-  {/if}
   {$forms.invoiceForm.close}
+  {/if}
 {/if}
     </td>
   </tr>
diff --git a/invoice_view.php b/invoice_view.php
index 605a53020..5e11781c3 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -95,13 +95,14 @@
 // Hidden control for invoice id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
 // invoiceForm only contains controls for "Mark paid" block below invoice table.
-if ($user->isPluginEnabled('ps')) {
+if ($user->isPluginEnabled('ps') && !$user->isClient()) {
   $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
     'data'=>$mark_paid_action_options,
     'value'=>$cl_mark_paid_action_option));
   $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
+  $smarty->assign('show_mark_paid', true);
 }
 
 if ($request->isPost()) {

From 8605afa6f00e97f97798064041b297843a200d94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Oct 2019 17:38:19 +0000
Subject: [PATCH 1114/1848] Added offers column on work.php.

---
 WEB-INF/resources/en.lang.php | 1 +
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/work.tpl    | 2 ++
 default.css                   | 4 ++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0bc5fba16..b7228d133 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -640,6 +640,7 @@
 'work.error.offer_not_available' => 'Offer is not available.',
 'work.label.our_work' => 'Our work',
 'work.label.our_offers' => 'Our offers',
+'work.label.offers' => 'Offers',
 'work.button.send_message' => 'Send message',
 'work.button.make_offer' => 'Make offer',
 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 194b24e65..8d1ec8a60 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.19.12.5141 | 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.12.5142 | 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/work.tpl b/WEB-INF/templates/work.tpl
index f790c2420..034785190 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -12,6 +12,7 @@
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.work.label.offers}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
           <td></td>
           <td></td>
@@ -21,6 +22,7 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.status_label}</td>
+          <td class="midAligned">{if $work_item.num_offers}{$work_item.num_offers}{/if}</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
diff --git a/default.css b/default.css
index 89b3fa645..77559c330 100644
--- a/default.css
+++ b/default.css
@@ -123,6 +123,10 @@ input[type=checkbox], label {
   vertical-align: top;
 }
 
+.midAligned {
+  text-align: center;
+}
+
 .sectionHeader {
   font-weight: bold;
   border-bottom: 1px solid lightgray;

From 09ca0762a80fea4f9e6e2b54e35e8efab72a8fc5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Oct 2019 18:19:39 +0000
Subject: [PATCH 1115/1848] Added work.label.offers in ocalization files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 30 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9813ca780..3628ae032 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -710,6 +710,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 6607ed5bb..22ce44e37 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -723,6 +723,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 948b591e2..a41817c94 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -684,6 +684,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 045533702..a4367f344 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -660,6 +660,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 61c466635..b96aed296 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -725,6 +725,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index f6a6d5c7b..0dbd6c9ca 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -691,6 +691,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 1866a21ed..0bb19d259 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -708,6 +708,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d7136aaee..6ec926d97 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -690,6 +690,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b8f22e0a8..735bb2d07 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -680,6 +680,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4b5ab0e7b..8fce19af8 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -673,6 +673,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index b8ff35a60..f04bbf00c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -710,6 +710,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5339cd133..099c6f2fe 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -715,6 +715,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1f287cfd1..7c28ee423 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -687,6 +687,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f8b18e60c..1f4cc51e8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -718,6 +718,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d23d8b728..0c18572e2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -716,6 +716,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 71ca76659..40bd8f416 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -642,6 +642,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 4c55fbca4..7d165b5a2 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -715,6 +715,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 90b8ade2e..df26f2726 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -693,6 +693,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 1108dbddf..aeeeb00b8 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -688,6 +688,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f3c9e9b46..ea4f09d33 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -697,6 +697,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c1ab74e33..6c117ae2e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -718,6 +718,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 9cf026772..fa6ebc8ce 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -621,6 +621,7 @@
 'work.error.offer_not_available' => 'Предложение отсутствует.',
 'work.label.our_work' => 'Наша работа',
 'work.label.our_offers' => 'Наши предложения',
+    'work.label.offers' => 'Предложения',
 'work.button.send_message' => 'Отправить сообщение',
 'work.button.make_offer' => 'Сделать предложение',
 'work.button.accept_offer' => 'Принять предложение',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 0620b34d5..2507d3bd9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -699,6 +699,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 5ec29ac97..dadd1e233 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -691,6 +691,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d1056c260..628345254 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -691,6 +691,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 750065efa..a0103675a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -689,6 +689,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4127780f9..601f537d0 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -731,6 +731,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 739f23db4..bd278ca10 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -702,6 +702,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2c0928ae3..1ee672aa6 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -708,6 +708,7 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
+// 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept_offer' => 'Accept offer',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8d1ec8a60..bf4e69ccd 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.19.12.5142 | 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.12.5143 | 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>

From be1649efb25436c3abfd31143f295832c7893fc1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Oct 2019 19:30:21 +0000
Subject: [PATCH 1116/1848] Made progress on viewing offers on own work items.

---
 WEB-INF/lib/ttWorkHelper.class.php | 61 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work.tpl         |  2 +-
 WEB-INF/templates/work_offers.tpl  | 30 +++++++++++++++
 work_offers.php                    | 55 +++++++++++++++++++++++++++
 5 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/work_offers.tpl
 create mode 100644 work_offers.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index ff979c2af..16d3ddd74 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -36,6 +36,7 @@ class ttWorkHelper {
   var $register_uri = null;      // URI to register with remote work server.
   var $put_own_work_item_uri = null;  // URI to publish own work item.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
+  var $get_own_work_item_offers_uri = null;  // URI to get offers on own work item.
   var $get_own_work_items_uri = null; // URI to get own work items for group.
   var $get_available_work_items_uri = null; // URI to get available work items for group.
   var $get_available_work_item_uri = null;  // URI to get a single available work item.
@@ -67,6 +68,7 @@ function __construct(&$errors) {
     $this->register_uri = $this->work_server_uri.'register'; // register_0_0
     $this->put_own_work_item_uri = $this->work_server_uri.'putownworkitem';
     $this->get_own_work_item_uri = $this->work_server_uri.'getownworkitem';
+    $this->get_own_work_item_offers_uri = $this->work_server_uri.'getownworkitemoffers';
     $this->get_own_work_items_uri = $this->work_server_uri.'getownworkitems';
     $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
     $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
@@ -486,6 +488,65 @@ function getOwnWorkItem($work_id) {
     return $work_item;
   }
 
+  // getOwnWorkItemOffers - gets offers on own work item from remote work server.
+  function getOwnWorkItemOffers($work_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($work_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_item_offers_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $work_item_offers = $result_array['work_item_offers'];
+    return $work_item_offers;
+  }
+
   // deleteOwnWorkItem - deletes work item from remote work server.
   function deleteOwnWorkItem($work_id) {
     global $i18n;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bf4e69ccd..b903120bd 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.19.12.5143 | 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.12.5144 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 034785190..1d5e40413 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -22,7 +22,7 @@
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.status_label}</td>
-          <td class="midAligned">{if $work_item.num_offers}{$work_item.num_offers}{/if}</td>
+          <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
diff --git a/WEB-INF/templates/work_offers.tpl b/WEB-INF/templates/work_offers.tpl
new file mode 100644
index 000000000..07a253d90
--- /dev/null
+++ b/WEB-INF/templates/work_offers.tpl
@@ -0,0 +1,30 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+
+{if $work_item_offers}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+        </tr>
+  {foreach $work_item_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href='offer_view.php?id={$offer.id}'>{$offer.subject|escape}</a></td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.status_label}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
+        </tr>
+  {/foreach}
+      </table>
+{/if}
+
+    </td>
+  </tr>
+</table>
diff --git a/work_offers.php b/work_offers.php
new file mode 100644
index 000000000..39ab03a62
--- /dev/null
+++ b/work_offers.php
@@ -0,0 +1,55 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getOwnWorkItem($work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$work_item_offers = $workHelper->getOwnWorkItemOffers($work_id);
+
+$smarty->assign('work_item_offers', $work_item_offers);
+$smarty->assign('title', $i18n->get('work.label.offers'));
+$smarty->assign('content_page_name', 'work_offers.tpl');
+$smarty->display('index.tpl');

From e6ab3854fe252c00a25da7aa65656d4386cf7709 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 9 Oct 2019 21:22:48 +0000
Subject: [PATCH 1117/1848] Provided work details on work_offers.php to improve
 the UI.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/work_offers.tpl | 16 +++++++++++++---
 work_offers.php                   |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b903120bd..3de58c5a9 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.19.12.5144 | 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.12.5145 | 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/work_offers.tpl b/WEB-INF/templates/work_offers.tpl
index 07a253d90..d4ecfbbd3 100644
--- a/WEB-INF/templates/work_offers.tpl
+++ b/WEB-INF/templates/work_offers.tpl
@@ -3,20 +3,30 @@
 </script>
 
 <table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+
   <tr>
     <td valign="top">
 
 {if $work_item_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.status}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
         </tr>
   {foreach $work_item_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href='offer_view.php?id={$offer.id}'>{$offer.subject|escape}</a></td>
+          <td><a href='offer_view.php?id={$offer.id}'>{$offer.group_name|escape}</a></td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
diff --git a/work_offers.php b/work_offers.php
index 39ab03a62..9da3930aa 100644
--- a/work_offers.php
+++ b/work_offers.php
@@ -49,6 +49,7 @@
 
 $work_item_offers = $workHelper->getOwnWorkItemOffers($work_id);
 
+$smarty->assign('work_item', $work_item);
 $smarty->assign('work_item_offers', $work_item_offers);
 $smarty->assign('title', $i18n->get('work.label.offers'));
 $smarty->assign('content_page_name', 'work_offers.tpl');

From 317ec89a0967ccb0dd5c833786a4db0c2915b4ff Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 11 Oct 2019 17:38:31 +0000
Subject: [PATCH 1118/1848] A bit more work in progress on Work plugin.

---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/offer_add.tpl  | 14 +++++++++++++-
 WEB-INF/templates/offer_edit.tpl | 25 +++++++++++++------------
 offer_add.php                    |  6 +-----
 offer_edit.php                   |  6 +-----
 offer_view.php                   |  7 +++++++
 6 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3de58c5a9..3997e5d18 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.19.12.5145 | 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.12.5146 | 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/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
index d31fb1753..80e07d803 100644
--- a/WEB-INF/templates/offer_add.tpl
+++ b/WEB-INF/templates/offer_add.tpl
@@ -1,5 +1,17 @@
 {$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
diff --git a/WEB-INF/templates/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
index ba1555e44..5c1e89a33 100644
--- a/WEB-INF/templates/offer_edit.tpl
+++ b/WEB-INF/templates/offer_edit.tpl
@@ -1,19 +1,20 @@
 {$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
-{if $work_id}
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td><a href="work_view.php?id={$work_id}">{$work_name}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$forms.offerForm.work_description.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
         <tr>
           <td align="right">{$i18n.label.offer} (*):</td>
           <td>{$forms.offerForm.offer_name.control}</td>
diff --git a/offer_add.php b/offer_add.php
index 42925fd59..ba430060c 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -112,11 +112,7 @@
   }
 } // isPost
 
-if ($cl_work_id) {
-  $smarty->assign('work_id', $cl_work_id);
-  $smarty->assign('work_name', $work_item['subject']);
-  $smarty->assign('work_description', $work_item['descr_short']);
-}
+$smarty->assign('work_item', $work_item);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_offer'));
diff --git a/offer_edit.php b/offer_edit.php
index 7c695ee1c..436f31b37 100644
--- a/offer_edit.php
+++ b/offer_edit.php
@@ -127,11 +127,7 @@
   }
 } // isPost
 
-if ($work_id) {
-  $smarty->assign('work_id', $work_id);
-  $smarty->assign('work_name', $work_item['subject']);
-  $smarty->assign('work_description', $work_item['descr_short']);
-}
+$smarty->assign('work_item', $work_item);
 $smarty->assign('show_moderator_comment', $show_moderator_comment);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_offer'));
diff --git a/offer_view.php b/offer_view.php
index 6fd2057c1..482d1c4ab 100644
--- a/offer_view.php
+++ b/offer_view.php
@@ -48,6 +48,13 @@
 }
 // End of access checks.
 
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $workHelper->getAvailableWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
 $cl_contractor = $offer['group_name'];
 $cl_name = $offer['subject'];
 $cl_description = $offer['descr_short'];

From db1fcbec8994970c5e2f3e308b01c85e205e49d5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 11 Oct 2019 19:04:15 +0000
Subject: [PATCH 1119/1848] Starting coding accepting / declining offers
 workflow.

---
 WEB-INF/lib/ttWorkHelper.class.php    | 64 +++++++++++++++++++-
 WEB-INF/resources/ca.lang.php         |  3 +-
 WEB-INF/resources/cs.lang.php         |  3 +-
 WEB-INF/resources/da.lang.php         |  3 +-
 WEB-INF/resources/de.lang.php         |  3 +-
 WEB-INF/resources/en.lang.php         |  3 +-
 WEB-INF/resources/es.lang.php         |  3 +-
 WEB-INF/resources/et.lang.php         |  3 +-
 WEB-INF/resources/fa.lang.php         |  3 +-
 WEB-INF/resources/fi.lang.php         |  3 +-
 WEB-INF/resources/fr.lang.php         |  3 +-
 WEB-INF/resources/gr.lang.php         |  3 +-
 WEB-INF/resources/he.lang.php         |  3 +-
 WEB-INF/resources/hu.lang.php         |  3 +-
 WEB-INF/resources/it.lang.php         |  3 +-
 WEB-INF/resources/ja.lang.php         |  3 +-
 WEB-INF/resources/ko.lang.php         |  3 +-
 WEB-INF/resources/nl.lang.php         |  3 +-
 WEB-INF/resources/no.lang.php         |  3 +-
 WEB-INF/resources/pl.lang.php         |  3 +-
 WEB-INF/resources/pt-br.lang.php      |  3 +-
 WEB-INF/resources/pt.lang.php         |  3 +-
 WEB-INF/resources/ro.lang.php         |  3 +-
 WEB-INF/resources/ru.lang.php         |  3 +-
 WEB-INF/resources/sk.lang.php         |  3 +-
 WEB-INF/resources/sl.lang.php         |  3 +-
 WEB-INF/resources/sr.lang.php         |  3 +-
 WEB-INF/resources/sv.lang.php         |  3 +-
 WEB-INF/resources/tr.lang.php         |  3 +-
 WEB-INF/resources/zh-cn.lang.php      |  3 +-
 WEB-INF/resources/zh-tw.lang.php      |  3 +-
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/work_offer_view.tpl | 44 ++++++++++++++
 WEB-INF/templates/work_offers.tpl     |  2 +-
 work_offer_view.php                   | 86 +++++++++++++++++++++++++++
 35 files changed, 255 insertions(+), 33 deletions(-)
 create mode 100644 WEB-INF/templates/work_offer_view.tpl
 create mode 100644 work_offer_view.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 16d3ddd74..5b809696b 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -36,7 +36,8 @@ class ttWorkHelper {
   var $register_uri = null;      // URI to register with remote work server.
   var $put_own_work_item_uri = null;  // URI to publish own work item.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
-  var $get_own_work_item_offers_uri = null;  // URI to get offers on own work item.
+  var $get_own_work_item_offer_uri = null;  // URI to get own work item offer.
+  var $get_own_work_item_offers_uri = null; // URI to get offers on own work item.
   var $get_own_work_items_uri = null; // URI to get own work items for group.
   var $get_available_work_items_uri = null; // URI to get available work items for group.
   var $get_available_work_item_uri = null;  // URI to get a single available work item.
@@ -68,6 +69,7 @@ function __construct(&$errors) {
     $this->register_uri = $this->work_server_uri.'register'; // register_0_0
     $this->put_own_work_item_uri = $this->work_server_uri.'putownworkitem';
     $this->get_own_work_item_uri = $this->work_server_uri.'getownworkitem';
+    $this->get_own_work_item_offer_uri = $this->work_server_uri.'getownworkitemoffer';
     $this->get_own_work_item_offers_uri = $this->work_server_uri.'getownworkitemoffers';
     $this->get_own_work_items_uri = $this->work_server_uri.'getownworkitems';
     $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
@@ -984,6 +986,66 @@ function deleteOwnOffer($offer_id) {
     return true;
   }
 
+  // getOwnWorkItemOffer - gets offer details from remote work server
+  // for an offer posted on own work item.
+  function getOwnWorkItemOffer($offer_id) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($offer_id));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_item_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    $offer = $result_array['offer'];
+    return $offer;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3628ae032..679013a76 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -713,5 +713,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 22ce44e37..e401828d2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -726,5 +726,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a41817c94..3995be64d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -687,5 +687,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a4367f344..6c0201924 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -663,5 +663,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b7228d133..08b35fe6e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -643,5 +643,6 @@
 'work.label.offers' => 'Offers',
 'work.button.send_message' => 'Send message',
 'work.button.make_offer' => 'Make offer',
-'work.button.accept_offer' => 'Accept offer',
+'work.button.accept' => 'Accept',
+'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b96aed296..d0cc8ede0 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -728,5 +728,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0dbd6c9ca..026d1077c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -694,5 +694,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0bb19d259..90b9d86d9 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -711,5 +711,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 6ec926d97..598bc016a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -693,5 +693,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 735bb2d07..8fc272280 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -683,5 +683,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 8fce19af8..3eb0f705f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -676,5 +676,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f04bbf00c..b392596a3 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -713,5 +713,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 099c6f2fe..3b702a824 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -718,5 +718,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7c28ee423..0eb8d42f9 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -690,5 +690,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 1f4cc51e8..8c04cac8a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -721,5 +721,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 0c18572e2..59940530e 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -719,5 +719,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 40bd8f416..464f3a57e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -645,5 +645,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 7d165b5a2..d04dbad7a 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -718,5 +718,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index df26f2726..337f867dd 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -696,5 +696,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index aeeeb00b8..adda37da4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -691,5 +691,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ea4f09d33..36ace36d9 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -700,5 +700,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 6c117ae2e..3b0c588b0 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -721,5 +721,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index fa6ebc8ce..6a7359f83 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -624,5 +624,6 @@
     'work.label.offers' => 'Предложения',
 'work.button.send_message' => 'Отправить сообщение',
 'work.button.make_offer' => 'Сделать предложение',
-'work.button.accept_offer' => 'Принять предложение',
+'work.button.accept' => 'Принять',
+'work.button.decline' => 'Отклонить',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 2507d3bd9..113beb835 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -702,5 +702,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index dadd1e233..60ed86cd2 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -694,5 +694,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 628345254..8c559955d 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -694,5 +694,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a0103675a..a1b6f719c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -692,5 +692,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 601f537d0..8adc4f5d1 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -734,5 +734,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index bd278ca10..7c2f697eb 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -705,5 +705,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1ee672aa6..deada9f15 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -711,5 +711,6 @@
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept_offer' => 'Accept offer',
+// 'work.button.accept' => 'Accept',
+// 'work.button.decline' => 'Decline',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3997e5d18..a91bfe49c 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.19.12.5146 | 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.12.5147 | 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/work_offer_view.tpl b/WEB-INF/templates/work_offer_view.tpl
new file mode 100644
index 000000000..79fa8a161
--- /dev/null
+++ b/WEB-INF/templates/work_offer_view.tpl
@@ -0,0 +1,44 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.contractor}:</td>
+          <td>{$forms.offerForm.contractor.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.offer}:</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.offerForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.offerForm.status.control}</td>
+        </tr>
+{if isTrue('WORK_DEBUG')}
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control} </td>
+{/if}        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work_offers.tpl b/WEB-INF/templates/work_offers.tpl
index d4ecfbbd3..bd867a9f4 100644
--- a/WEB-INF/templates/work_offers.tpl
+++ b/WEB-INF/templates/work_offers.tpl
@@ -26,7 +26,7 @@
         </tr>
   {foreach $work_item_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href='offer_view.php?id={$offer.id}'>{$offer.group_name|escape}</a></td>
+          <td><a href='work_offer_view.php?id={$offer.id}'>{$offer.group_name|escape}</a></td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
diff --git a/work_offer_view.php b/work_offer_view.php
new file mode 100644
index 000000000..e0b8e5d80
--- /dev/null
+++ b/work_offer_view.php
@@ -0,0 +1,86 @@
+<?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');
+require_once('plugins/work_constants.php');
+import('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOwnWorkItemOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Get an associated work item.
+$work_item = $workHelper->getOwnWorkItem($offer['work_id']);
+if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+
+$cl_contractor = $offer['group_name'];
+$cl_name = $offer['subject'];
+$cl_description = $offer['descr_short'];
+$cl_details = $offer['descr_long'];
+$cl_budget = $offer['amount_with_currency'];
+$cl_status = $offer['status_label'];
+
+// TODO: coding ongoing down from here...
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
+$form->getElement('contractor')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
+$form->getElement('status')->setEnabled(false);
+if ($offer['status'] == STATUS_APPROVED) {
+  $form->addInput(array('type'=>'submit','name'=>'btn_accept','value'=>$i18n->get('work.button.accept')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_decline','value'=>$i18n->get('work.button.decline')));
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.offer'));
+$smarty->assign('content_page_name', 'work_offer_view.tpl');
+$smarty->display('index.tpl');

From 67ea03443be54301664f7e9571a79ad35f1e4ad0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 11 Oct 2019 22:44:48 +0000
Subject: [PATCH 1120/1848] Coded declining an offer feature.

---
 WEB-INF/lib/ttWorkHelper.class.php    | 65 +++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/work_offer_view.tpl | 18 +++++++-
 work_offer_view.php                   | 40 ++++++++++++++++-
 4 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 5b809696b..af4922024 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -37,6 +37,7 @@ class ttWorkHelper {
   var $put_own_work_item_uri = null;  // URI to publish own work item.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
   var $get_own_work_item_offer_uri = null;  // URI to get own work item offer.
+  var $decline_own_work_item_offer_uri = null; // URI to decline own work item offer.
   var $get_own_work_item_offers_uri = null; // URI to get offers on own work item.
   var $get_own_work_items_uri = null; // URI to get own work items for group.
   var $get_available_work_items_uri = null; // URI to get available work items for group.
@@ -75,6 +76,7 @@ function __construct(&$errors) {
     $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
     $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
     $this->delete_own_work_item_uri = $this->work_server_uri.'deleteownworkitem';
+    $this->decline_own_work_item_offer_uri = $this->work_server_uri.'declineownworkitemoffer';
     $this->update_own_work_item_uri = $this->work_server_uri.'updateownworkitem';
     $this->put_own_offer_uri = $this->work_server_uri.'putownoffer';
     $this->get_own_offer_uri = $this->work_server_uri.'getownoffer';
@@ -1046,6 +1048,69 @@ function getOwnWorkItemOffer($offer_id) {
     return $offer;
   }
 
+  // declineOwnWorkItemOffer - declines an offer posted on own work item in remote work server.
+  function declineOwnWorkItemOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($fields['offer_id']),
+      'client_comment' => urlencode(base64_encode($fields['client_comment'])));
+      //'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      //'modified_by' => urlencode($user->getUser()),
+      //'modified_by_name' => urlencode(base64_encode($user->getName())),
+      //'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->decline_own_work_item_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a91bfe49c..c9b0814a4 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.19.12.5147 | 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.12.5148 | 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/work_offer_view.tpl b/WEB-INF/templates/work_offer_view.tpl
index 79fa8a161..0dfa4158c 100644
--- a/WEB-INF/templates/work_offer_view.tpl
+++ b/WEB-INF/templates/work_offer_view.tpl
@@ -1,5 +1,17 @@
 {$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
@@ -33,6 +45,10 @@
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.offerForm.status.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.comment} (*):</td>
+          <td>{$forms.offerForm.client_comment.control}</td>
+        </tr>
 {if isTrue('WORK_DEBUG')}
         <tr>
           <td colspan="2" align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control} </td>
diff --git a/work_offer_view.php b/work_offer_view.php
index e0b8e5d80..c221b9292 100644
--- a/work_offer_view.php
+++ b/work_offer_view.php
@@ -53,6 +53,12 @@
 $work_item = $workHelper->getOwnWorkItem($offer['work_id']);
 if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
 
+if ($request->isPost()) {
+  $cl_client_comment = $request->getParameter('client_comment');
+} else {
+  $cl_client_comment = $offer['client_comment'];
+}
+
 $cl_contractor = $offer['group_name'];
 $cl_name = $offer['subject'];
 $cl_description = $offer['descr_short'];
@@ -60,7 +66,6 @@
 $cl_budget = $offer['amount_with_currency'];
 $cl_status = $offer['status_label'];
 
-// TODO: coding ongoing down from here...
 $form = new Form('offerForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
 $form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
@@ -75,11 +80,44 @@
 $form->getElement('budget')->setEnabled(false);
 $form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'client_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_client_comment));
 if ($offer['status'] == STATUS_APPROVED) {
   $form->addInput(array('type'=>'submit','name'=>'btn_accept','value'=>$i18n->get('work.button.accept')));
   $form->addInput(array('type'=>'submit','name'=>'btn_decline','value'=>$i18n->get('work.button.decline')));
 }
 
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_client_comment)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('offer_id'=>$cl_offer_id,
+      'client_comment'=>$cl_client_comment);
+
+    if ($request->getParameter('btn_accept')) {
+      die ("not yet implemented... sorry");
+      // Accept offer.
+      if ($workHelper->acceptOwnWorkItemOffer($fields)) {
+        header('Location: work_offer_view.php?id='.$cl_offer_id);
+        exit();
+      }
+    }
+
+    if ($request->getParameter('btn_decline')) {
+      // Decline offer.
+      if ($workHelper->declineOwnWorkItemOffer($fields)) {
+        header('Location: work_offer_view.php?id='.$cl_offer_id);
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('work_item', $work_item);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.offer'));
 $smarty->assign('content_page_name', 'work_offer_view.tpl');

From 7637464ff5809a0c3038a5fc318786a0528429c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Oct 2019 16:27:45 +0000
Subject: [PATCH 1121/1848] Partial progress on accepting offers in Work
 plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 65 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 work_offer_view.php                |  1 -
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index af4922024..2f1deb40a 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -37,6 +37,7 @@ class ttWorkHelper {
   var $put_own_work_item_uri = null;  // URI to publish own work item.
   var $get_own_work_item_uri = null;  // URI to get own work item details.
   var $get_own_work_item_offer_uri = null;  // URI to get own work item offer.
+  var $accept_own_work_item_offer_uri = null; // URI to accept own work item offer.
   var $decline_own_work_item_offer_uri = null; // URI to decline own work item offer.
   var $get_own_work_item_offers_uri = null; // URI to get offers on own work item.
   var $get_own_work_items_uri = null; // URI to get own work items for group.
@@ -76,6 +77,7 @@ function __construct(&$errors) {
     $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
     $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
     $this->delete_own_work_item_uri = $this->work_server_uri.'deleteownworkitem';
+    $this->accept_own_work_item_offer_uri = $this->work_server_uri.'acceptownworkitemoffer';
     $this->decline_own_work_item_offer_uri = $this->work_server_uri.'declineownworkitemoffer';
     $this->update_own_work_item_uri = $this->work_server_uri.'updateownworkitem';
     $this->put_own_offer_uri = $this->work_server_uri.'putownoffer';
@@ -1111,6 +1113,69 @@ function declineOwnWorkItemOffer($fields) {
     return true;
   }
 
+  // acceptOwnWorkItemOffer - accepts an offer posted on own work item in remote work server.
+  function acceptOwnWorkItemOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($fields['offer_id']),
+      'client_comment' => urlencode(base64_encode($fields['client_comment'])),
+      'accepted_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'accepted_by' => urlencode($user->getUser()),
+      'accepted_by_name' => urlencode(base64_encode($user->getName())),
+      'accepted_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->accept_own_work_item_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getCurrencies - obtains a list of supported currencies.
   static function getCurrencies() {
     $mdb2 = getConnection();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c9b0814a4..e0d3b5a1b 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.19.12.5148 | 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.12.5149 | 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/work_offer_view.php b/work_offer_view.php
index c221b9292..d14084457 100644
--- a/work_offer_view.php
+++ b/work_offer_view.php
@@ -99,7 +99,6 @@
       'client_comment'=>$cl_client_comment);
 
     if ($request->getParameter('btn_accept')) {
-      die ("not yet implemented... sorry");
       // Accept offer.
       if ($workHelper->acceptOwnWorkItemOffer($fields)) {
         header('Location: work_offer_view.php?id='.$cl_offer_id);

From ae1f39b44c791be6fbf61acc3261b14e96b95daa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Oct 2019 11:29:31 +0000
Subject: [PATCH 1122/1848] Some refactoring related to Work plugin.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/work.tpl   | 16 ++++++++++++----
 work.php                     | 12 ++++++------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e0d3b5a1b..320f1c6f7 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.19.12.5149 | 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.12.5150 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 1d5e40413..cd72498f4 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -5,7 +5,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $active_work}
+{if $own_work_items}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.our_work}</td></tr>
         <tr>
@@ -17,15 +17,23 @@
           <td></td>
           <td></td>
         </tr>
-  {foreach $active_work as $work_item}
+  {foreach $own_work_items as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$work_item.subject|escape}</td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.status_label}</td>
           <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
+    {if $work_item.can_edit}
           <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
+    {else}
+          <td></td>
+    {/if}
+    {if $work_item.can_delete}
           <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+    {else}
+          <td></td>
+    {/if}
         </tr>
   {/foreach}
       </table>
@@ -41,14 +49,14 @@
 
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-{if $available_work}
+{if $available_work_items}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.client}</td>
           <td class="tableHeader">{$i18n.label.budget}</td>
         </tr>
-  {foreach $available_work as $work_item}
+  {foreach $available_work_items as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="work_view.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
           <td>{$work_item.description|escape}</td>
diff --git a/work.php b/work.php
index 606f8fbf9..f7cfeb91e 100644
--- a/work.php
+++ b/work.php
@@ -43,12 +43,12 @@
 $workHelper = new ttWorkHelper($err);
 $groupItems = $workHelper->getGroupItems(); // All group items.
 if($user->can('manage_work')) {
-  $active_work = $groupItems['active_work']; // Active work items this group is outsourcing.
+  $own_work_items = $groupItems['own_work_items']; // Own work items this group is outsourcing.
   $available_offers = $groupItems['available_offers']; // Available offers from other organizations.
 }
 if($user->can('bid_on_work')) {
-  $available_work = $groupItems['available_work']; // Currently available work items from other orgs.
-  $active_offers = $groupItems['active_offers']; // Active offers this group makes available to other groups.
+  $available_work_items = $groupItems['available_work_items']; // Currently available work items from other orgs.
+  $own_offers = $groupItems['own_offers']; // Own offers this group makes available to other groups.
 }
 if($user->can('update_work')) {
   // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
@@ -56,9 +56,9 @@
 }
 // TODO: review access rights for the code above.
 
-$smarty->assign('active_work', $active_work);
-$smarty->assign('available_work', $available_work);
-$smarty->assign('active_offers', $active_offers);
+$smarty->assign('own_work_items', $own_work_items);
+$smarty->assign('available_work_items', $available_work_items);
+$smarty->assign('own_offers', $own_offers);
 $smarty->assign('available_offers', $available_offers);
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'work.tpl');

From 4e69e042945f0586cda96f50c164924c6d6de454 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Oct 2019 11:42:43 +0000
Subject: [PATCH 1123/1848] Fixed displaying own offers.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/work.tpl   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 320f1c6f7..5ee395b41 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.19.12.5150 | 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.12.5151 | 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/work.tpl b/WEB-INF/templates/work.tpl
index cd72498f4..dcfb2945a 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -75,7 +75,7 @@
         </tr>
       </table>
 
-{if $active_offers}
+{if $own_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.our_offers}</td></tr>
         <tr>
@@ -86,7 +86,7 @@
           <td></td>
           <td></td>
         </tr>
-  {foreach $active_offers as $offer}
+  {foreach $own_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     {if $offer.work_id}
           <td><a href='work_view.php?id={$offer.work_id}'>{$offer.subject|escape}</a></td>

From 71b20397009d3a14b68a62ab144a9f4ce77778d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Oct 2019 17:00:59 +0000
Subject: [PATCH 1124/1848] Introduced work type string in translaton files.

---
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 2 ++
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/footer.tpl     | 2 +-
 29 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e401828d2..a1803742f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -721,6 +721,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3995be64d..fd692dabb 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -682,6 +682,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6c0201924..691a73187 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -658,6 +658,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d0cc8ede0..edbc5bc12 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -723,6 +723,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 026d1077c..4cc562843 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -689,6 +689,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 90b9d86d9..5643669bf 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -706,6 +706,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 598bc016a..05de8ed92 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -688,6 +688,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 8fc272280..b66100bb9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -678,6 +678,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 3eb0f705f..fa549557c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -671,6 +671,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index b392596a3..3841cbf1c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -708,6 +708,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3b702a824..16a996544 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -713,6 +713,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 0eb8d42f9..17316bb71 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -685,6 +685,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8c04cac8a..a7dde05cd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -716,6 +716,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 59940530e..6e4898705 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -714,6 +714,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 464f3a57e..182a5e41d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -640,6 +640,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d04dbad7a..46407620a 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -713,6 +713,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 337f867dd..918ebec4d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -691,6 +691,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index adda37da4..f68014942 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -686,6 +686,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 36ace36d9..c1276e8ff 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -695,6 +695,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3b0c588b0..a59fbcf23 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -716,6 +716,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 6a7359f83..de88cb6e5 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -619,6 +619,8 @@
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 'work.error.work_not_available' => 'Работа отсутствует.',
 'work.error.offer_not_available' => 'Предложение отсутствует.',
+'work.type.one_time' => 'одноразовая',
+'work.type.ongoing' => 'постоянная',
 'work.label.our_work' => 'Наша работа',
 'work.label.our_offers' => 'Наши предложения',
     'work.label.offers' => 'Предложения',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 113beb835..83246514b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -697,6 +697,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 60ed86cd2..1f99fca52 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -689,6 +689,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8c559955d..cbd369c3b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -689,6 +689,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index a1b6f719c..bdaa99bb2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -687,6 +687,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 8adc4f5d1..aad1932d0 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -729,6 +729,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7c2f697eb..0ed2f282f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -700,6 +700,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index deada9f15..42ac20e95 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -706,6 +706,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5ee395b41..b2d1ad569 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.19.12.5151 | 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.12.5152 | 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>

From 4106b7c65a8f669472b60bd027fe1cdfba52a8b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Oct 2019 17:02:23 +0000
Subject: [PATCH 1125/1848] Forgot to check in a couple of files.

---
 WEB-INF/resources/ca.lang.php | 2 ++
 WEB-INF/resources/en.lang.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 679013a76..0244845a2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -708,6 +708,8 @@
 // TODO: translate the following.
 // 'work.error.work_not_available' => 'Work item is not available.',
 // 'work.error.offer_not_available' => 'Offer is not available.',
+// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 // 'work.label.our_work' => 'Our work',
 // 'work.label.our_offers' => 'Our offers',
 // 'work.label.offers' => 'Offers',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 08b35fe6e..5bc5821e6 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -638,6 +638,8 @@
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 'work.error.work_not_available' => 'Work item is not available.',
 'work.error.offer_not_available' => 'Offer is not available.',
+'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
+'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
 'work.label.our_work' => 'Our work',
 'work.label.our_offers' => 'Our offers',
 'work.label.offers' => 'Offers',

From 437d580892d7b3dabd651db45b94d23675ef6df5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Oct 2019 18:41:15 +0000
Subject: [PATCH 1126/1848] Added work type control on work_add.php anf
 work_edit.php.

---
 WEB-INF/lib/ttWorkHelper.class.php |  2 ++
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work_add.tpl     |  4 ++++
 WEB-INF/templates/work_edit.tpl    |  4 ++++
 work_add.php                       | 11 +++++------
 work_edit.php                      |  5 +++++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 2f1deb40a..77037711d 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -200,6 +200,7 @@ function putOwnWorkItem($fields) {
       'group_id' => urlencode($group_id),
       'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
+      'type' => urlencode($fields['type']),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
@@ -269,6 +270,7 @@ function updateOwnWorkItem($fields) {
       'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
       'work_id' => urlencode($fields['work_id']),
+      'type' => urlencode($fields['type']),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b2d1ad569..488a620af 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.19.12.5152 | 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.12.5153 | 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/work_add.tpl b/WEB-INF/templates/work_add.tpl
index fd7beea40..15b430b59 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -7,6 +7,10 @@
           <td align="right">{$i18n.label.work} (*):</td>
           <td>{$forms.workForm.work_name.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.type}:</td>
+          <td>{$forms.workForm.work_type.control}</td>
+        </tr>
         <tr>
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.workForm.description.control}</td>
diff --git a/WEB-INF/templates/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index 48e4456fb..96959b189 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -7,6 +7,10 @@
           <td align="right">{$i18n.label.work} (*):</td>
           <td>{$forms.workForm.work_name.control}</td>
         </tr>
+        <tr>
+          <td align = "right">{$i18n.label.type}:</td>
+          <td>{$forms.workForm.work_type.control}</td>
+        </tr>
         <tr>
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.workForm.description.control}</td>
diff --git a/work_add.php b/work_add.php
index 4e7ba1ba3..f12aef8f5 100644
--- a/work_add.php
+++ b/work_add.php
@@ -42,6 +42,7 @@
 // End of access checks.
 
 if ($request->isPost()) {
+  $cl_work_type = $request->getParameter('work_type');
   $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
@@ -51,6 +52,8 @@
 
 $form = new Form('workForm');
 $form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
+$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
 $form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 // Add a dropdown for currency.
@@ -59,11 +62,6 @@
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
-// TODO: design how to handle one-time vs ongoing work. Apparently, with a conditional display of relevant controls.
-// Ongoing work - rate per hour control.
-// One-time work - budget dropdown control.
-// When selection changes, we hide and show required controls.
-
 // TODO: design how to handle categories and sub-categories.
 // One major complication is localization of names.
 
@@ -79,7 +77,8 @@
 
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
-    $fields = array('subject'=>$cl_name,
+    $fields = array('type'=>$cl_work_type,
+      'subject'=>$cl_name,
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
       'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
diff --git a/work_edit.php b/work_edit.php
index dffe185c7..e99ca9dcf 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -52,12 +52,14 @@
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('work_name'));
+  $cl_work_type = $request->getParameter('work_type');
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
   $cl_currency_id = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
 } else {
   $cl_name = $work_item['subject'];
+  $cl_work_type = $work_item['type'];
   $cl_description = $work_item['descr_short'];
   $cl_details = $work_item['descr_long'];
   $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
@@ -71,6 +73,8 @@
 $form = new Form('workForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
 $form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
+$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
 $form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
@@ -95,6 +99,7 @@
     if ($request->getParameter('btn_save')) {
       // Update work information.
       $fields = array('work_id'=>$cl_work_id,
+        'type'=>$cl_work_type,
         'subject'=>$cl_name,
         'descr_short' => $cl_description,
         'descr_long' => $cl_details,

From aec8154c1023fb37d413c164724fd46398c05186 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Oct 2019 15:25:41 +0000
Subject: [PATCH 1127/1848] Made client comment optional when accepting or
 declining offers.

---
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/work_offer_view.tpl | 13 ++++++++-----
 work_offer_view.php                   |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 488a620af..5e47b2060 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.19.12.5153 | 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.12.5154 | 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/work_offer_view.tpl b/WEB-INF/templates/work_offer_view.tpl
index 0dfa4158c..00af0aafc 100644
--- a/WEB-INF/templates/work_offer_view.tpl
+++ b/WEB-INF/templates/work_offer_view.tpl
@@ -45,14 +45,17 @@
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.offerForm.status.control}</td>
         </tr>
+{if isTrue('WORK_DEBUG')}
+        <tr><td>&nbsp;</td></tr>
         <tr>
-          <td align = "right">{$i18n.label.comment} (*):</td>
-          <td>{$forms.offerForm.client_comment.control}</td>
+          <td></td>
+          <td align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control}</td>
         </tr>
-{if isTrue('WORK_DEBUG')}
         <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control} </td>
-{/if}        </tr>
+          <td align = "right">{$i18n.label.comment}:</td>
+          <td>{$forms.offerForm.client_comment.control}</td>
+        </tr>
+{/if}
       </table>
     </td>
   </tr>
diff --git a/work_offer_view.php b/work_offer_view.php
index d14084457..84fdc1cd0 100644
--- a/work_offer_view.php
+++ b/work_offer_view.php
@@ -80,15 +80,15 @@
 $form->getElement('budget')->setEnabled(false);
 $form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
 $form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'client_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_client_comment));
 if ($offer['status'] == STATUS_APPROVED) {
   $form->addInput(array('type'=>'submit','name'=>'btn_accept','value'=>$i18n->get('work.button.accept')));
   $form->addInput(array('type'=>'submit','name'=>'btn_decline','value'=>$i18n->get('work.button.decline')));
 }
+$form->addInput(array('type'=>'textarea','name'=>'client_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_client_comment));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_client_comment)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+  if (!ttValidString($cl_client_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   // Ensure user email exists (required for workflow).
   if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));

From 275d3424b2258f1aa24805efb10d2612ff771388 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Oct 2019 16:28:12 +0000
Subject: [PATCH 1128/1848] Added work_view_own.php to allow viewing details of
 non-editable own work items.

---
 WEB-INF/templates/footer.tpl        |  2 +-
 WEB-INF/templates/work.tpl          |  2 +-
 WEB-INF/templates/work_view_own.tpl | 26 +++++++++++
 work_view_own.php                   | 69 +++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/work_view_own.tpl
 create mode 100644 work_view_own.php

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5e47b2060..7e8a39eff 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.19.12.5154 | 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.12.5155 | 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/work.tpl b/WEB-INF/templates/work.tpl
index dcfb2945a..2e7f5ef79 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -19,7 +19,7 @@
         </tr>
   {foreach $own_work_items as $work_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
+          <td><a href="work_view_own.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.status_label}</td>
           <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
diff --git a/WEB-INF/templates/work_view_own.tpl b/WEB-INF/templates/work_view_own.tpl
new file mode 100644
index 000000000..51e825929
--- /dev/null
+++ b/WEB-INF/templates/work_view_own.tpl
@@ -0,0 +1,26 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/work_view_own.php b/work_view_own.php
new file mode 100644
index 000000000..19a809b31
--- /dev/null
+++ b/work_view_own.php
@@ -0,0 +1,69 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getOwnWorkItem($work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$cl_name = $work_item['subject'];
+$cl_description = $work_item['descr_short'];
+$cl_details = $work_item['descr_long'];
+$cl_budget = $work_item['amount_with_currency'];
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('work_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work_view_own.tpl');
+$smarty->display('index.tpl');

From be2f528937bcbebd7714cdd03bc00e53cb95ee71 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Oct 2019 16:33:40 +0000
Subject: [PATCH 1129/1848] Some renaming.

---
 WEB-INF/resources/ca.lang.php    | 4 ++--
 WEB-INF/resources/cs.lang.php    | 4 ++--
 WEB-INF/resources/da.lang.php    | 4 ++--
 WEB-INF/resources/de.lang.php    | 4 ++--
 WEB-INF/resources/en.lang.php    | 4 ++--
 WEB-INF/resources/es.lang.php    | 4 ++--
 WEB-INF/resources/et.lang.php    | 4 ++--
 WEB-INF/resources/fa.lang.php    | 4 ++--
 WEB-INF/resources/fi.lang.php    | 4 ++--
 WEB-INF/resources/fr.lang.php    | 4 ++--
 WEB-INF/resources/gr.lang.php    | 4 ++--
 WEB-INF/resources/he.lang.php    | 4 ++--
 WEB-INF/resources/hu.lang.php    | 4 ++--
 WEB-INF/resources/it.lang.php    | 4 ++--
 WEB-INF/resources/ja.lang.php    | 4 ++--
 WEB-INF/resources/ko.lang.php    | 4 ++--
 WEB-INF/resources/nl.lang.php    | 4 ++--
 WEB-INF/resources/no.lang.php    | 4 ++--
 WEB-INF/resources/pl.lang.php    | 4 ++--
 WEB-INF/resources/pt-br.lang.php | 4 ++--
 WEB-INF/resources/pt.lang.php    | 4 ++--
 WEB-INF/resources/ro.lang.php    | 4 ++--
 WEB-INF/resources/ru.lang.php    | 6 +++---
 WEB-INF/resources/sk.lang.php    | 4 ++--
 WEB-INF/resources/sl.lang.php    | 4 ++--
 WEB-INF/resources/sr.lang.php    | 4 ++--
 WEB-INF/resources/sv.lang.php    | 4 ++--
 WEB-INF/resources/tr.lang.php    | 4 ++--
 WEB-INF/resources/zh-cn.lang.php | 4 ++--
 WEB-INF/resources/zh-tw.lang.php | 4 ++--
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/work.tpl       | 4 ++--
 32 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0244845a2..cb0de346a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -710,8 +710,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a1803742f..8a7c3c7bd 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -723,8 +723,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index fd692dabb..161ef01d5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -684,8 +684,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 691a73187..f29576f27 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -660,8 +660,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5bc5821e6..9d9788f23 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -640,8 +640,8 @@
 'work.error.offer_not_available' => 'Offer is not available.',
 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-'work.label.our_work' => 'Our work',
-'work.label.our_offers' => 'Our offers',
+'work.label.own_work' => 'Own work',
+'work.label.own_offers' => 'Own offers',
 'work.label.offers' => 'Offers',
 'work.button.send_message' => 'Send message',
 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index edbc5bc12..0622e8d12 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -725,8 +725,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 4cc562843..bf358d4c2 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -691,8 +691,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 5643669bf..80b1781e0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -708,8 +708,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 05de8ed92..4e4864ff8 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -690,8 +690,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b66100bb9..417c3093a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -680,8 +680,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index fa549557c..56b6c8a42 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -673,8 +673,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3841cbf1c..79ad5059e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -710,8 +710,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 16a996544..529a73968 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -715,8 +715,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 17316bb71..f07c9a00d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -687,8 +687,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a7dde05cd..86e860d66 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -718,8 +718,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6e4898705..2276102a4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -716,8 +716,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 182a5e41d..44f1dc5b9 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -642,8 +642,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 46407620a..5feaab8f8 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -715,8 +715,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 918ebec4d..b6a5fe62b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -693,8 +693,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f68014942..b6123d0c2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -688,8 +688,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c1276e8ff..c2711ab07 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -697,8 +697,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a59fbcf23..f4f231939 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -718,8 +718,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index de88cb6e5..84562d7cd 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -621,9 +621,9 @@
 'work.error.offer_not_available' => 'Предложение отсутствует.',
 'work.type.one_time' => 'одноразовая',
 'work.type.ongoing' => 'постоянная',
-'work.label.our_work' => 'Наша работа',
-'work.label.our_offers' => 'Наши предложения',
-    'work.label.offers' => 'Предложения',
+'work.label.own_work' => 'Своя работа',
+'work.label.own_offers' => 'Свои предложения',
+'work.label.offers' => 'Предложения',
 'work.button.send_message' => 'Отправить сообщение',
 'work.button.make_offer' => 'Сделать предложение',
 'work.button.accept' => 'Принять',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 83246514b..1991075d0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -699,8 +699,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 1f99fca52..4e27dcaeb 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -691,8 +691,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index cbd369c3b..68d9faac3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -691,8 +691,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bdaa99bb2..9f9858dac 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -689,8 +689,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index aad1932d0..1bb3d793b 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -731,8 +731,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 0ed2f282f..c0e9fb5bd 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -702,8 +702,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 42ac20e95..37c55d4b7 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -708,8 +708,8 @@
 // 'work.error.offer_not_available' => 'Offer is not available.',
 // 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
 // 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.our_work' => 'Our work',
-// 'work.label.our_offers' => 'Our offers',
+// 'work.label.own_work' => 'Own work',
+// 'work.label.own_offers' => 'Own offers',
 // 'work.label.offers' => 'Offers',
 // 'work.button.send_message' => 'Send message',
 // 'work.button.make_offer' => 'Make offer',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7e8a39eff..f0bacb5d2 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.19.12.5155 | 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.12.5156 | 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/work.tpl b/WEB-INF/templates/work.tpl
index 2e7f5ef79..9c40f0304 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -7,7 +7,7 @@
     <td valign="top">
 {if $own_work_items}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.our_work}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_work}</td></tr>
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.work}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
@@ -77,7 +77,7 @@
 
 {if $own_offers}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.our_offers}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_offers}</td></tr>
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>

From 322b65359b35c82c5e0e236d27c3a3eb155808de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Oct 2019 20:34:21 +0000
Subject: [PATCH 1130/1848] Making progress on accepting available offers for
 the Work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/offer_view.tpl   | 24 ++++++++++++++-----
 WEB-INF/templates/work_add.tpl     | 13 ++++++++++-
 WEB-INF/templates/work_view.tpl    |  6 -----
 offer_add.php                      |  2 +-
 offer_view.php                     |  7 +++---
 work_add.php                       | 37 +++++++++++++++++++++++++-----
 8 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 77037711d..8c2e25fb0 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -200,6 +200,7 @@ function putOwnWorkItem($fields) {
       'group_id' => urlencode($group_id),
       'group_name' => urlencode(base64_encode($user->getGroupName())),
       'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($fields['offer_id']),
       'type' => urlencode($fields['type']),
       'subject' => urlencode(base64_encode($fields['subject'])),
       'descr_short' => urlencode(base64_encode($fields['descr_short'])),
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f0bacb5d2..99a558a58 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.19.12.5156 | 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.12.5157 | 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/offer_view.tpl b/WEB-INF/templates/offer_view.tpl
index b6baaed28..138547613 100644
--- a/WEB-INF/templates/offer_view.tpl
+++ b/WEB-INF/templates/offer_view.tpl
@@ -1,3 +1,7 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
 {$forms.offerForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
@@ -19,12 +23,6 @@
           <td align = "right">{$i18n.label.details}:</td>
           <td>{$forms.offerForm.details.control}</td>
         </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.offerForm.newfile.control}</td>
-        </tr>
-{/if}
         <tr>
           <td align="right">{$i18n.label.budget}:</td>
           <td>{$forms.offerForm.budget.control}</td>
@@ -34,3 +32,17 @@
   </tr>
 </table>
 {$forms.offerForm.close}
+
+{if isTrue('WORK_DEBUG')}
+<table width="720" cellspacing="4" cellpadding="4" border="0">
+<tr>
+  <td align="center">
+  <table>
+  <tr>
+    <td><input type="button" onclick="chLocation('work_add.php?offer_id={$offer_id}');" value="{$i18n.work.button.accept}"></td>
+  </tr>
+  </table>
+  </td>
+</tr>
+</table>
+{/if}
diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl
index 15b430b59..eca0ba799 100644
--- a/WEB-INF/templates/work_add.tpl
+++ b/WEB-INF/templates/work_add.tpl
@@ -1,5 +1,16 @@
 {$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
index 37207a72c..c779b507f 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -23,12 +23,6 @@
           <td align = "right">{$i18n.label.details}:</td>
           <td>{$forms.workForm.details.control}</td>
         </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
         <tr>
           <td align="right">{$i18n.label.budget}:</td>
           <td>{$forms.workForm.budget.control}</td>
diff --git a/offer_add.php b/offer_add.php
index ba430060c..8fc1b20b5 100644
--- a/offer_add.php
+++ b/offer_add.php
@@ -46,7 +46,7 @@
   $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
   if (!$work_item) {
     header('Location: access_denied.php');
-    exit(); 
+    exit();
   }
 }
 // End of access checks.
diff --git a/offer_view.php b/offer_view.php
index 482d1c4ab..ec3a98da5 100644
--- a/offer_view.php
+++ b/offer_view.php
@@ -39,9 +39,9 @@
   header('Location: access_denied.php');
   exit();
 }
-$cl_offer_id = (int)$request->getParameter('id');
+$offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getAvailableOffer($cl_offer_id);
+$offer = $workHelper->getAvailableOffer($offer_id);
 if (!$offer) {
   header('Location: access_denied.php');
   exit();
@@ -62,7 +62,6 @@
 $cl_budget = $offer['amount_with_currency'];
 
 $form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
 $form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
 $form->getElement('contractor')->setEnabled(false);
 $form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
@@ -74,6 +73,8 @@
 $form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
 $form->getElement('budget')->setEnabled(false);
 
+
+$smarty->assign('offer_id', $offer_id);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.offer'));
 $smarty->assign('content_page_name', 'offer_view.tpl');
diff --git a/work_add.php b/work_add.php
index f12aef8f5..68bfe06ea 100644
--- a/work_add.php
+++ b/work_add.php
@@ -39,18 +39,37 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// Do we have offer_id?
+$cl_offer_id = (int)$request->getParameter('offer_id');
+if ($cl_offer_id) {
+  $workHelper = new ttWorkHelper($err);
+  $offer = $workHelper->getAvailableOffer($cl_offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 if ($request->isPost()) {
-  $cl_work_type = $request->getParameter('work_type');
   $cl_name = trim($request->getParameter('work_name'));
+  $cl_work_type = $request->getParameter('work_type');
   $cl_description = trim($request->getParameter('description'));
   $cl_details = trim($request->getParameter('details'));
   $cl_currency_id = $request->getParameter('currency');
   $cl_budget = $request->getParameter('budget');
 }
+// Override some fields for work being created on an available offer.
+if ($offer) {
+  $cl_name = $offer['subject'];
+  $cl_work_type = 0; // one-time work
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_budget = $offer['amount'];
+}
 
 $form = new Form('workForm');
+if ($offer)
+  $form->addInput(array('type'=>'hidden','name'=>'offer_id','value'=>$cl_offer_id));
 $form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
 $WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
 $form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
@@ -61,9 +80,13 @@
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-
-// TODO: design how to handle categories and sub-categories.
-// One major complication is localization of names.
+// Disable some controls for work being created on an available offer.
+if ($offer) {
+  $form->getElement('work_name')->setEnabled(false);
+  $form->getElement('work_type')->setEnabled(false);
+  $form->getElement('currency')->setEnabled(false);
+  $form->getElement('budget')->setEnabled(false);
+}
 
 if ($request->isPost()) {
   // Validate user input.
@@ -77,8 +100,9 @@
 
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
-    $fields = array('type'=>$cl_work_type,
-      'subject'=>$cl_name,
+    $fields = array('offer_id' => $cl_offer_id,
+      'subject' => $cl_name,
+      'type' => $cl_work_type,
       'descr_short' => $cl_description,
       'descr_long' => $cl_details,
       'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
@@ -90,6 +114,7 @@
   }
 } // isPost
 
+$smarty->assign('offer', $offer);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.workForm.work_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_work'));

From 93450ef5b971ce080c57018b619cac5b4ddda85d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Oct 2019 11:45:45 +0000
Subject: [PATCH 1131/1848] Removed WORK_DEBUG conditions to hopefully start
 user testing of Work plugin features.

---
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/offer_view.tpl      |  2 --
 WEB-INF/templates/work_offer_view.tpl | 10 ++--------
 WEB-INF/templates/work_view.tpl       |  5 -----
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 99a558a58..9e1861c6e 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.19.12.5157 | 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.12.5158 | 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/offer_view.tpl b/WEB-INF/templates/offer_view.tpl
index 138547613..ad0b385f2 100644
--- a/WEB-INF/templates/offer_view.tpl
+++ b/WEB-INF/templates/offer_view.tpl
@@ -33,7 +33,6 @@
 </table>
 {$forms.offerForm.close}
 
-{if isTrue('WORK_DEBUG')}
 <table width="720" cellspacing="4" cellpadding="4" border="0">
 <tr>
   <td align="center">
@@ -45,4 +44,3 @@
   </td>
 </tr>
 </table>
-{/if}
diff --git a/WEB-INF/templates/work_offer_view.tpl b/WEB-INF/templates/work_offer_view.tpl
index 00af0aafc..874856237 100644
--- a/WEB-INF/templates/work_offer_view.tpl
+++ b/WEB-INF/templates/work_offer_view.tpl
@@ -31,12 +31,6 @@
           <td align = "right">{$i18n.label.details}:</td>
           <td>{$forms.offerForm.details.control}</td>
         </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.offerForm.newfile.control}</td>
-        </tr>
-{/if}
         <tr>
           <td align="right">{$i18n.label.budget}:</td>
           <td>{$forms.offerForm.budget.control}</td>
@@ -45,7 +39,7 @@
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.offerForm.status.control}</td>
         </tr>
-{if isTrue('WORK_DEBUG')}
+
         <tr><td>&nbsp;</td></tr>
         <tr>
           <td></td>
@@ -55,7 +49,7 @@
           <td align = "right">{$i18n.label.comment}:</td>
           <td>{$forms.offerForm.client_comment.control}</td>
         </tr>
-{/if}
+
       </table>
     </td>
   </tr>
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
index c779b507f..92614d911 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -33,19 +33,14 @@
 </table>
 {$forms.workForm.close}
 
-{if isTrue('WORK_DEBUG')}
 <table width="720" cellspacing="4" cellpadding="4" border="0">
 <tr>
   <td align="center">
   <table>
   <tr>
-  {if false}
-    <td><input type="button" onclick="chLocation('work_message.php');" value="{$i18n.work.button.send_message}"></td>
-  {/if}
     <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
   </tr>
   </table>
   </td>
 </tr>
 </table>
-{/if}

From e47d89289096fb7a3f737db3a73813af0de87bad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Oct 2019 16:43:23 +0000
Subject: [PATCH 1132/1848] Got rid of a PHP warning when generating reports
 with 0 inactive users.

---
 WEB-INF/lib/ttReportHelper.class.php | 4 ++--
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5d36b6b8e..1c2387148 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1602,8 +1602,8 @@ static function verifyBean($bean) {
     global $user;
 
     // Check users.
-    $active_users_in_bean = $bean->getAttribute('users_active');
-    $inactive_users_in_bean = $bean->getAttribute('users_inactive');
+    $active_users_in_bean = (array) $bean->getAttribute('users_active');
+    $inactive_users_in_bean = (array) $bean->getAttribute('users_inactive');
     if (is_array($active_users_in_bean) || is_array($inactive_users_in_bean)) {
       $users_in_group = ttGroupHelper::getUsers();
       foreach ($users_in_group as $user_in_group) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9e1861c6e..5440d2010 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.19.12.5158 | 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.12.5159 | 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>

From 94e11c5568c42b1b11cd7dfc526928fd164b7da9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Oct 2019 21:51:54 +0000
Subject: [PATCH 1133/1848] Added audit info to a registration call to Work
 server.

---
 WEB-INF/lib/ttWorkHelper.class.php | 11 ++++++++++-
 WEB-INF/templates/footer.tpl       |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 8c2e25fb0..1b5297b4e 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -105,9 +105,18 @@ function checkSiteRegistration() {
     $val = $res->fetchRow();
     if (!$val) {
       // No site id found, need to register.
+      $group_id = $user->getGroup();
+      $org_id = $user->org_id;
       $fields = array('lang' => urlencode($user->lang),
         'name' => urlencode('time tracker'),
-        'origin' => urlencode('time tracker source'));
+        'origin' => urlencode('time tracker source'),
+        'org_id' => urlencode($org_id),
+        'group_id' => urlencode($group_id),
+        'group_name' => urlencode(base64_encode($user->getGroupName())),
+        'user_id' => urlencode($user->getUser()),
+        'user_name' => urlencode(base64_encode($user->getName())),
+        'user_email' => urlencode(base64_encode($user->getEmail())),
+        'user_ip' => urlencode($_SERVER['REMOTE_ADDR']));
 
       // Urlify the data for the POST.
       foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5440d2010..01a55b6ab 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.19.12.5159 | 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.12.5160 | 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>

From 2e5bde98edf7cada432e372640f82b9b3133deda Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Oct 2019 20:33:42 +0000
Subject: [PATCH 1134/1848] Improved work_edit.php for work items on offers.

---
 WEB-INF/templates/footer.tpl |  2 +-
 work_edit.php                | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 01a55b6ab..14f1830bc 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.19.12.5160 | 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.12.5161 | 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/work_edit.php b/work_edit.php
index e99ca9dcf..c6ffd4ce7 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -46,6 +46,15 @@
   header('Location: access_denied.php');
   exit();
 }
+// Do we have offer_id?
+$offer_id = $work_item['offer_id'];
+if ($offer_id) {
+  $offer = $workHelper->getAvailableOffer($offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 $currencies = ttWorkHelper::getCurrencies();
@@ -67,6 +76,13 @@
   $cl_status = $work_item['status_label'];
   $cl_moderator_comment = $work_item['moderator_comment'];
 }
+// Override some fields for work on an available offer.
+if ($offer) {
+  $cl_name = $offer['subject'];
+  $cl_work_type = 0; // one-time work
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_budget = $offer['amount'];
+}
 
 $show_moderator_comment = $cl_moderator_comment != null;
 
@@ -84,6 +100,13 @@
 $form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
 $form->getElement('moderator_comment')->setEnabled(false);
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+// Disable some controls for work on an available offer.
+if ($offer) {
+  $form->getElement('work_name')->setEnabled(false);
+  $form->getElement('work_type')->setEnabled(false);
+  $form->getElement('currency')->setEnabled(false);
+  $form->getElement('budget')->setEnabled(false);
+}
 
 if ($request->isPost()) {
   // Validate user input.

From 3e0594949439bc20414dcab71889f5fbd2dd3ad7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 18 Oct 2019 18:42:43 +0000
Subject: [PATCH 1135/1848] Some progress on updating work items on offers for
 Work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 68 ++++++++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl       |  2 +-
 work_edit.php                      | 13 ++++--
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 1b5297b4e..55a8dfced 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -46,6 +46,7 @@ class ttWorkHelper {
   var $delete_own_work_item_uri = null;     // URI to delete own work item.
   // TODO: design how (and what) to delete when a group is deleted.
   var $update_own_work_item_uri = null;  // URI to update own work item.
+  var $update_own_work_item_on_offer_uri = null;  // URI to update own work item posted on offer.
   var $put_own_offer_uri = null;     // URI to publish own offer.
   var $get_own_offer_uri = null;     // URI to get own offer details.
   var $get_own_offers_uri = null;    // URI to get own offers.
@@ -80,6 +81,7 @@ function __construct(&$errors) {
     $this->accept_own_work_item_offer_uri = $this->work_server_uri.'acceptownworkitemoffer';
     $this->decline_own_work_item_offer_uri = $this->work_server_uri.'declineownworkitemoffer';
     $this->update_own_work_item_uri = $this->work_server_uri.'updateownworkitem';
+    $this->update_own_work_item_on_offer_uri = $this->work_server_uri.'updateownworkitemonoffer';
     $this->put_own_offer_uri = $this->work_server_uri.'putownoffer';
     $this->get_own_offer_uri = $this->work_server_uri.'getownoffer';
     $this->get_own_offers_uri = $this->work_server_uri.'getownoffers';
@@ -332,6 +334,72 @@ function updateOwnWorkItem($fields) {
     return true;
   }
 
+  // updateOwnWorkItemOnOffer - updates own work item posted on offer in remote work server.
+  function updateOwnWorkItemOnOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($fields['work_id']),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
+    );
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->update_own_work_item_on_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // getOwnWorkItems - obtains a list of work items this group is currently outsourcing.
   function getOwnWorkItems() {
     global $i18n;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 14f1830bc..6089e5496 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.19.12.5161 | 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.12.5162 | 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/work_edit.php b/work_edit.php
index c6ffd4ce7..4512ed2fc 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -128,9 +128,16 @@
         'descr_long' => $cl_details,
         'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
         'amount' => $cl_budget);
-      if ($workHelper->updateOwnWorkItem($fields)) {
-        header('Location: work.php');
-        exit();
+      if ($offer_id > 0) {
+        if ($workHelper->updateOwnWorkItemOnOffer($fields)) {
+          header('Location: work.php');
+          exit();
+        }
+      } else {
+        if ($workHelper->updateOwnWorkItem($fields)) {
+          header('Location: work.php');
+          exit();
+        }
       }
     }
   }

From 9107d1af1942b375585f7ced4647dafe0b9e133c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 18 Oct 2019 21:13:32 +0000
Subject: [PATCH 1136/1848] Work in progress on disapproving work item on
 offers in Work plugin.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 62 +++++++++++++++++++++++++
 WEB-INF/templates/admin_work_edit.tpl   | 14 +++++-
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/work_edit.tpl         | 14 +++++-
 WEB-INF/templates/work_offer_view.tpl   |  2 +-
 WEB-INF/templates/work_offers.tpl       |  1 +
 WEB-INF/templates/work_view_own.tpl     | 14 +++++-
 admin_work_edit.php                     | 23 +++++++--
 work_edit.php                           |  1 +
 work_view_own.php                       | 10 ++++
 10 files changed, 135 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index d809cb35f..5e51fc316 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -38,7 +38,9 @@ class ttAdminWorkHelper {
   var $update_work_item_uri = null;  // URI to update work item.
   var $delete_work_item_uri = null;  // URI to delete work item.
   var $approve_work_item_uri = null; // URI to approve work item.
+  var $approve_work_item_on_offer_uri = null; // URI to approve work item posted on offer.
   var $disapprove_work_item_uri = null; // URI to disapprove work item.
+  var $disapprove_work_item_on_offer_uri = null; // URI to disapprove work item posted on offer.
   var $get_offer_uri = null;     // URI to get offer details.
   var $update_offer_uri = null;  // URI to update offer.
   var $delete_offer_uri = null;  // URI to delete offer.
@@ -60,7 +62,9 @@ function __construct(&$errors) {
     $this->update_work_item_uri = $this->work_server_uri.'admin_updateworkitem';
     $this->delete_work_item_uri = $this->work_server_uri.'admin_deleteworkitem';
     $this->approve_work_item_uri = $this->work_server_uri.'admin_approveworkitem';
+    $this->approve_work_item_on_offer_uri = $this->work_server_uri.'admin_approveworkitemonoffer';
     $this->disapprove_work_item_uri = $this->work_server_uri.'admin_disapproveworkitem';
+    $this->disapprove_work_item_on_offer_uri = $this->work_server_uri.'admin_disapproveworkitemonoffer';
     $this->get_offer_uri = $this->work_server_uri.'admin_getoffer';
     $this->update_offer_uri = $this->work_server_uri.'admin_updateoffer';
     $this->delete_offer_uri = $this->work_server_uri.'admin_deleteoffer';
@@ -661,6 +665,64 @@ function disapproveWorkItem($fields) {
     return true;
   }
 
+  // disapproveWorkItemOnOffer - disapproves work item posted on offer in remote work server.
+  function disapproveWorkItemOnOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($fields['work_id']),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->disapprove_work_item_on_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // updateOffer - updates an offer in remote work server.
   function updateOffer($fields) {
     global $i18n;
diff --git a/WEB-INF/templates/admin_work_edit.tpl b/WEB-INF/templates/admin_work_edit.tpl
index 8b7613e1d..1ae59a6fe 100644
--- a/WEB-INF/templates/admin_work_edit.tpl
+++ b/WEB-INF/templates/admin_work_edit.tpl
@@ -1,5 +1,17 @@
 {$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6089e5496..f996fc690 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.19.12.5162 | 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.12.5163 | 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/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
index 96959b189..7165d5e19 100644
--- a/WEB-INF/templates/work_edit.tpl
+++ b/WEB-INF/templates/work_edit.tpl
@@ -1,5 +1,17 @@
 {$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
diff --git a/WEB-INF/templates/work_offer_view.tpl b/WEB-INF/templates/work_offer_view.tpl
index 874856237..e2afe0003 100644
--- a/WEB-INF/templates/work_offer_view.tpl
+++ b/WEB-INF/templates/work_offer_view.tpl
@@ -5,13 +5,13 @@
     <td>
       <table border=0 width=100%>
         <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
         <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
         <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
       </table>
     </td>
   </tr>
 {/if}
-
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
diff --git a/WEB-INF/templates/work_offers.tpl b/WEB-INF/templates/work_offers.tpl
index bd867a9f4..ea0d8816f 100644
--- a/WEB-INF/templates/work_offers.tpl
+++ b/WEB-INF/templates/work_offers.tpl
@@ -7,6 +7,7 @@
     <td>
       <table border=0 width=100%>
         <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
         <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
         <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
       </table>
diff --git a/WEB-INF/templates/work_view_own.tpl b/WEB-INF/templates/work_view_own.tpl
index 51e825929..61e270b4b 100644
--- a/WEB-INF/templates/work_view_own.tpl
+++ b/WEB-INF/templates/work_view_own.tpl
@@ -1,5 +1,17 @@
 {$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
   <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
diff --git a/admin_work_edit.php b/admin_work_edit.php
index c66906d61..d8fbd65c2 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -44,6 +44,15 @@
   header('Location: access_denied.php');
   exit();
 }
+// Do we have offer_id?
+$offer_id = $work_item['offer_id'];
+if ($offer_id) {
+  $offer = $adminWorkHelper->getOffer($offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 
@@ -117,9 +126,16 @@
         }
       } else if ($cl_status == STATUS_DISAPPROVED) {
         // Status changed to "not approved". Disapprove work.
-        if ($adminWorkHelper->disapproveWorkItem($fields)) {
-          header('Location: admin_work.php');
-          exit();
+        if ($offer_id) {
+          if ($adminWorkHelper->disapproveWorkItemOnOffer($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
+        } else {
+          if ($adminWorkHelper->disapproveWorkItem($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
         }
       } else if ($cl_status == STATUS_APPROVED) {
         // Status changed to "approved". Approve work.
@@ -132,6 +148,7 @@
   }
 } // isPost
 
+$smarty->assign('offer', $offer);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_work'));
 $smarty->assign('content_page_name', 'admin_work_edit.tpl');
diff --git a/work_edit.php b/work_edit.php
index 4512ed2fc..916a9aeef 100644
--- a/work_edit.php
+++ b/work_edit.php
@@ -143,6 +143,7 @@
   }
 } // isPost
 
+$smarty->assign('offer', $offer);
 $smarty->assign('show_moderator_comment', $show_moderator_comment);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_work'));
diff --git a/work_view_own.php b/work_view_own.php
index 19a809b31..15e57632b 100644
--- a/work_view_own.php
+++ b/work_view_own.php
@@ -46,6 +46,15 @@
   header('Location: access_denied.php');
   exit();
 }
+// Do we have offer_id?
+$offer_id = $work_item['offer_id'];
+if ($offer_id) {
+  $offer = $workHelper->getAvailableOffer($offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 $cl_name = $work_item['subject'];
@@ -63,6 +72,7 @@
 $form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
 $form->getElement('budget')->setEnabled(false);
 
+$smarty->assign('offer', $offer);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.work'));
 $smarty->assign('content_page_name', 'work_view_own.tpl');

From 9f6cdb5ec955efcab37d859564f69f2e7b45a689 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 18 Oct 2019 21:52:51 +0000
Subject: [PATCH 1137/1848] Made progress on approving work items on offers for
 Work plugin.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php | 58 +++++++++++++++++++++++++
 WEB-INF/templates/footer.tpl            |  2 +-
 admin_work_edit.php                     | 13 ++++--
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index 5e51fc316..ce8d0f76f 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -723,6 +723,64 @@ function disapproveWorkItemOnOffer($fields) {
     return true;
   }
 
+  // approveWorkItemOnOffer - approves work item posted on offer in remote work server.
+  function approveWorkItemOnOffer($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'user_id' => urlencode($user->id),
+      'work_id' => urlencode($fields['work_id']),
+      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
+      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
+      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
+      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'modified_by' => urlencode($user->getUser()),
+      'modified_by_name' => urlencode(base64_encode($user->getName())),
+      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->approve_work_item_on_offer_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
   // updateOffer - updates an offer in remote work server.
   function updateOffer($fields) {
     global $i18n;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f996fc690..f5a9f1870 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.19.12.5163 | 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.12.5164 | 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/admin_work_edit.php b/admin_work_edit.php
index d8fbd65c2..56003b1ac 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -139,9 +139,16 @@
         }
       } else if ($cl_status == STATUS_APPROVED) {
         // Status changed to "approved". Approve work.
-        if ($adminWorkHelper->approveWorkItem($fields)) {
-          header('Location: admin_work.php');
-          exit();
+        if ($offer_id) {
+          if ($adminWorkHelper->approveWorkItemOnOffer($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
+        } else {
+          if ($adminWorkHelper->approveWorkItem($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
         }
       }
     }

From 32144f905c26b025ecacb59391fa9df82e26ed27 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Oct 2019 13:35:46 +0000
Subject: [PATCH 1138/1848] Work in progress on Work plugin. Disabled some
 controls.

---
 WEB-INF/templates/footer.tpl | 2 +-
 admin_work_edit.php          | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f5a9f1870..613af6afc 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.19.12.5164 | 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.12.5165 | 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/admin_work_edit.php b/admin_work_edit.php
index 56003b1ac..5b4d47e3d 100644
--- a/admin_work_edit.php
+++ b/admin_work_edit.php
@@ -55,7 +55,6 @@
 }
 // End of access checks.
 
-
 $existingStatus = $work_item['status'];
 $currencies = ttWorkHelper::getCurrencies();
 
@@ -85,6 +84,13 @@
 $form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
 $form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+// Disable some controls for work on an available offer.
+if ($offer) {
+  $form->getElement('work_name')->setEnabled(false);
+  // $form->getElement('work_type')->setEnabled(false);
+  $form->getElement('currency')->setEnabled(false);
+  $form->getElement('budget')->setEnabled(false);
+}
 
 // Prepare status choices.
 $status_options = array();

From 7553f3a716b0ac58407904b6ab5a841f04bb2710 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 26 Oct 2019 23:04:05 +0000
Subject: [PATCH 1139/1848] Starting on messaging mechanism between users in
 Work plugin.

---
 WEB-INF/lib/ttWorkHelper.class.php | 66 ++++++++++++++++++++
 WEB-INF/resources/ca.lang.php      |  1 +
 WEB-INF/resources/cs.lang.php      |  1 +
 WEB-INF/resources/da.lang.php      |  1 +
 WEB-INF/resources/de.lang.php      |  1 +
 WEB-INF/resources/en.lang.php      |  3 +
 WEB-INF/resources/es.lang.php      |  1 +
 WEB-INF/resources/et.lang.php      |  1 +
 WEB-INF/resources/fa.lang.php      |  1 +
 WEB-INF/resources/fi.lang.php      |  1 +
 WEB-INF/resources/fr.lang.php      |  1 +
 WEB-INF/resources/gr.lang.php      |  1 +
 WEB-INF/resources/he.lang.php      |  1 +
 WEB-INF/resources/hu.lang.php      |  1 +
 WEB-INF/resources/it.lang.php      |  1 +
 WEB-INF/resources/ja.lang.php      |  1 +
 WEB-INF/resources/ko.lang.php      |  1 +
 WEB-INF/resources/nl.lang.php      |  1 +
 WEB-INF/resources/no.lang.php      |  1 +
 WEB-INF/resources/pl.lang.php      |  1 +
 WEB-INF/resources/pt-br.lang.php   |  1 +
 WEB-INF/resources/pt.lang.php      |  1 +
 WEB-INF/resources/ro.lang.php      |  1 +
 WEB-INF/resources/ru.lang.php      |  1 +
 WEB-INF/resources/sk.lang.php      |  1 +
 WEB-INF/resources/sl.lang.php      |  1 +
 WEB-INF/resources/sr.lang.php      |  1 +
 WEB-INF/resources/sv.lang.php      |  1 +
 WEB-INF/resources/tr.lang.php      |  1 +
 WEB-INF/resources/zh-cn.lang.php   |  1 +
 WEB-INF/resources/zh-tw.lang.php   |  1 +
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/work_message.tpl | 32 ++++++++++
 WEB-INF/templates/work_view.tpl    |  1 +
 work_message.php                   | 97 ++++++++++++++++++++++++++++++
 35 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/work_message.tpl
 create mode 100644 work_message.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index 55a8dfced..bcdd8a37a 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -55,6 +55,7 @@ class ttWorkHelper {
   var $get_group_items_uri = null;      // URI to get all group items in one API call.
   var $delete_own_offer_uri = null; // URI to delete own offer.
   var $update_own_offer_uri = null; // URI to update own offer.
+  var $send_message_uri = null;     // URI to send message.
   var $site_id = null;              // Site id for work server.
   var $site_key = null;             // Site key for work server.
 
@@ -91,6 +92,7 @@ function __construct(&$errors) {
     $this->get_group_items_uri = $this->work_server_uri.'getgroupitems';
     $this->delete_own_offer_uri = $this->work_server_uri.'deleteownoffer';
     $this->update_own_offer_uri = $this->work_server_uri.'updateownoffer';
+    $this->send_message_uri = $this->work_server_uri.'sendmessage';
     $this->checkSiteRegistration();
   }
 
@@ -1482,4 +1484,68 @@ function getAvailableOffer($offer_id) {
     $offer = $result_array['offer'];
     return $offer;
   }
+
+  // sendMessage - sends a message via remote work server.
+  function sendMessage($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
+      'group_key' => urlencode($user->getGroupKey()),
+      'work_id' => urlencode($fields['work_id']),
+      'sender_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'sender_user_id' => urlencode($user->getUser()),
+      'sender_name' => urlencode(base64_encode($user->getName())),
+      'sender_email' => urlencode(base64_encode($user->getEmail())),
+      'message_body' => urlencode(base64_encode($fields['message_body'])));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->send_message_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index cb0de346a..5816fd6a6 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -717,4 +717,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8a7c3c7bd..a3f3c0e8d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -730,4 +730,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 161ef01d5..750a4dab6 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -691,4 +691,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index f29576f27..ce5e07171 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -667,4 +667,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 9d9788f23..6376660d5 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -643,8 +643,11 @@
 'work.label.own_work' => 'Own work',
 'work.label.own_offers' => 'Own offers',
 'work.label.offers' => 'Offers',
+'work.label.message' => 'Message',
 'work.button.send_message' => 'Send message',
 'work.button.make_offer' => 'Make offer',
 'work.button.accept' => 'Accept',
 'work.button.decline' => 'Decline',
+'work.title.send_message' => 'Sending Message',
+'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0622e8d12..8a967089f 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -732,4 +732,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index bf358d4c2..aa9afe003 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -698,4 +698,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 80b1781e0..d5e8da92c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -715,4 +715,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4e4864ff8..60621b769 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -697,4 +697,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 417c3093a..ad82e88e8 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -687,4 +687,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 56b6c8a42..25e3f5976 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -680,4 +680,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 79ad5059e..dd7c3bd14 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -717,4 +717,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 529a73968..f566a3283 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -722,4 +722,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index f07c9a00d..73945b376 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -694,4 +694,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 86e860d66..f56deb6ea 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -725,4 +725,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2276102a4..ff8470e4a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -723,4 +723,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 44f1dc5b9..5cf619605 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -649,4 +649,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5feaab8f8..623854bc2 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -722,4 +722,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b6a5fe62b..98eed22b0 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -700,4 +700,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b6123d0c2..68fdbd34a 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -695,4 +695,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c2711ab07..aeec2cc79 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -704,4 +704,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f4f231939..18c40dd69 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -725,4 +725,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 84562d7cd..692fcd208 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -628,4 +628,5 @@
 'work.button.make_offer' => 'Сделать предложение',
 'work.button.accept' => 'Принять',
 'work.button.decline' => 'Отклонить',
+'work.title.send_message' => 'Отсылка сообщения',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1991075d0..23bca6631 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -706,4 +706,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 4e27dcaeb..e6cb48db7 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -698,4 +698,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 68d9faac3..6d5e3876b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -698,4 +698,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 9f9858dac..2d03e4240 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -696,4 +696,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1bb3d793b..d9967b8bb 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -738,4 +738,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index c0e9fb5bd..7b3d7f2a6 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -709,4 +709,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 37c55d4b7..dd3bde5b6 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -715,4 +715,5 @@
 // 'work.button.make_offer' => 'Make offer',
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
+// 'work.title.send_message' => 'Sending Message',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 613af6afc..2b68640b0 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.19.12.5165 | 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.12.5166 | 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/work_message.tpl b/WEB-INF/templates/work_message.tpl
new file mode 100644
index 000000000..3f237659c
--- /dev/null
+++ b/WEB-INF/templates/work_message.tpl
@@ -0,0 +1,32 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.messageForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $work_item}
+  <tr>
+    <td>
+      <table border="0" width="100%">
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0" width="100%">
+        <tr>
+          <td align="right">{$i18n.work.label.message}:</td>
+          <td>{$forms.messageForm.message_body.control}</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.messageForm.btn_send.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.messageForm.close}
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
index 92614d911..468cb9ddd 100644
--- a/WEB-INF/templates/work_view.tpl
+++ b/WEB-INF/templates/work_view.tpl
@@ -38,6 +38,7 @@
   <td align="center">
   <table>
   <tr>
+    <td><input type="button" onclick="chLocation('work_message.php?work_id={$work_id}');" value="{$i18n.work.button.send_message}"></td>
     <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
   </tr>
   </table>
diff --git a/work_message.php b/work_message.php
new file mode 100644
index 000000000..1a06143e6
--- /dev/null
+++ b/work_message.php
@@ -0,0 +1,97 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// Do we have work_id?
+$cl_work_id = (int)$request->getParameter('work_id');
+if ($cl_work_id) {
+  $workHelper = new ttWorkHelper($err);
+  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+  if (!$work_item) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+if ($work_item) $cl_name = $work_item['subject'];
+
+if ($request->isPost()) {
+  $cl_message_body = trim($request->getParameter('message_body'));
+}
+
+
+
+
+
+
+
+
+$form = new Form('messageForm');
+if ($cl_work_id) {
+  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
+}
+$form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
+$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_message_body)) $err->add($i18n->get('error.field'), $i18n->get('work.label.message'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('work_id'=>$cl_work_id,
+      'message_body' => $cl_message_body);
+    if ($workHelper->sendMessage($fields)) {
+      $msg->add($i18n->get('work.msg.message_sent'));
+      //  header('Location: work.php'); // TODO: where to redirect?
+      // exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
+$smarty->assign('title', $i18n->get('work.title.send_message'));
+$smarty->assign('content_page_name', 'work_message.tpl');
+$smarty->display('index.tpl');

From a9366912b9e33239b61fed09180bd4bf0063cb67 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Oct 2019 13:26:42 +0000
Subject: [PATCH 1140/1848] Updated localization files.

---
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 29 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a3f3c0e8d..633595e7e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -731,4 +731,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 750a4dab6..bf4a88e65 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -692,4 +692,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ce5e07171..ee486f688 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -668,4 +668,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8a967089f..53a0bd5c4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -733,4 +733,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index aa9afe003..562d6528f 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -699,4 +699,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index d5e8da92c..c24d01f80 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -716,4 +716,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 60621b769..62a542a1a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -698,4 +698,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ad82e88e8..a08c65515 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -688,4 +688,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 25e3f5976..1b3fc2081 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -681,4 +681,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index dd7c3bd14..a5c59998d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -718,4 +718,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f566a3283..f333de5f2 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -723,4 +723,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 73945b376..474878f2f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -695,4 +695,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f56deb6ea..ec3a4c754 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -726,4 +726,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ff8470e4a..bdcf6d18a 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -724,4 +724,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5cf619605..71c7ed4c3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -650,4 +650,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 623854bc2..8ef8f168e 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -723,4 +723,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 98eed22b0..dd712827b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -701,4 +701,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 68fdbd34a..52577c71d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -696,4 +696,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index aeec2cc79..195c2a773 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -705,4 +705,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 18c40dd69..3da5b1fb3 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -726,4 +726,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 692fcd208..1b753b2a3 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -629,4 +629,5 @@
 'work.button.accept' => 'Принять',
 'work.button.decline' => 'Отклонить',
 'work.title.send_message' => 'Отсылка сообщения',
+'work.msg.message_sent' => 'Сообщение отослано.',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 23bca6631..ffbf5894b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -707,4 +707,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e6cb48db7..8ecf0bcfc 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -699,4 +699,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6d5e3876b..9996d9a5e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -699,4 +699,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 2d03e4240..3bae63b5f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -697,4 +697,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d9967b8bb..948e9ad5b 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -739,4 +739,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7b3d7f2a6..a5cfe24b3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -710,4 +710,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index dd3bde5b6..22694ddfa 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -716,4 +716,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2b68640b0..5f764e769 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.19.12.5166 | 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.12.5167 | 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>

From d1af7a1aa5e2fbba09f04dbcb80c2c497c490f09 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Nov 2019 13:31:12 +0000
Subject: [PATCH 1141/1848] Resuming development of Work plugin.

---
 WEB-INF/resources/ca.lang.php        |  1 +
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/offer_view_own.tpl | 42 +++++++++++++++
 WEB-INF/templates/work.tpl           |  6 +--
 offer_view_own.php                   | 77 ++++++++++++++++++++++++++++
 5 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 WEB-INF/templates/offer_view_own.tpl
 create mode 100644 offer_view_own.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5816fd6a6..c52298ccf 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -718,4 +718,5 @@
 // 'work.button.accept' => 'Accept',
 // 'work.button.decline' => 'Decline',
 // 'work.title.send_message' => 'Sending Message',
+// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5f764e769..a7cf644bb 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.19.12.5167 | 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.12.5168 | 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/offer_view_own.tpl b/WEB-INF/templates/offer_view_own.tpl
new file mode 100644
index 000000000..d00ae7ea1
--- /dev/null
+++ b/WEB-INF/templates/offer_view_own.tpl
@@ -0,0 +1,42 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.offerForm.open}
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.offer}:</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work.tpl b/WEB-INF/templates/work.tpl
index 9c40f0304..7b00383d5 100644
--- a/WEB-INF/templates/work.tpl
+++ b/WEB-INF/templates/work.tpl
@@ -88,11 +88,7 @@
         </tr>
   {foreach $own_offers as $offer}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    {if $offer.work_id}
-          <td><a href='work_view.php?id={$offer.work_id}'>{$offer.subject|escape}</a></td>
-    {else}
-          <td>{$offer.subject|escape}</td>
-    {/if}
+          <td><a href='offer_view_own.php?id={$offer.id}'>{$offer.subject|escape}</a></td>
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
diff --git a/offer_view_own.php b/offer_view_own.php
new file mode 100644
index 000000000..4f3c7b7a2
--- /dev/null
+++ b/offer_view_own.php
@@ -0,0 +1,77 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOwnOffer($offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $workHelper->getAvailableWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
+$cl_name = $offer['subject'];
+$cl_description = $offer['descr_short'];
+$cl_details = $offer['descr_long'];
+$cl_budget = $offer['amount_with_currency'];
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.offer'));
+$smarty->assign('content_page_name', 'offer_view_own.tpl');
+$smarty->display('index.tpl');

From e9f7a2a68011473764c39a2979c9ba7e190c3716 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Nov 2019 15:25:21 +0000
Subject: [PATCH 1142/1848] Organized work plugin files into separate
 directorires.

---
 WEB-INF/templates/work/admin_offer_edit.tpl |  70 +++++++
 WEB-INF/templates/work/admin_work.tpl       | 104 ++++++++++
 WEB-INF/templates/work/admin_work_edit.tpl  |  67 +++++++
 WEB-INF/templates/work/header.tpl           | 207 ++++++++++++++++++++
 WEB-INF/templates/work/index.tpl            |   5 +
 WEB-INF/templates/work/offer_add.tpl        |  74 +++++++
 WEB-INF/templates/work/offer_delete.tpl     |  20 ++
 WEB-INF/templates/work/offer_edit.tpl       |  67 +++++++
 WEB-INF/templates/work/offer_view.tpl       |  46 +++++
 WEB-INF/templates/work/offer_view_own.tpl   |  42 ++++
 WEB-INF/templates/work/work.tpl             | 140 +++++++++++++
 WEB-INF/templates/work/work_add.tpl         |  62 ++++++
 WEB-INF/templates/work/work_delete.tpl      |  20 ++
 WEB-INF/templates/work/work_edit.tpl        |  73 +++++++
 WEB-INF/templates/work/work_message.tpl     |  32 +++
 WEB-INF/templates/work/work_offer_view.tpl  |  57 ++++++
 WEB-INF/templates/work/work_offers.tpl      |  41 ++++
 WEB-INF/templates/work/work_view.tpl        |  47 +++++
 WEB-INF/templates/work/work_view_own.tpl    |  38 ++++
 work/admin_offer_delete.php                 |  71 +++++++
 work/admin_offer_edit.php                   | 171 ++++++++++++++++
 work/admin_work.php                         |  53 +++++
 work/admin_work_delete.php                  |  71 +++++++
 work/admin_work_edit.php                    | 168 ++++++++++++++++
 work/offer_add.php                          | 120 ++++++++++++
 work/offer_delete.php                       |  75 +++++++
 work/offer_edit.php                         | 135 +++++++++++++
 work/offer_view.php                         |  81 ++++++++
 work/offer_view_own.php                     |  77 ++++++++
 work/work.php                               |  65 ++++++
 work/work_add.php                           | 122 ++++++++++++
 work/work_delete.php                        |  75 +++++++
 work/work_edit.php                          | 151 ++++++++++++++
 work/work_message.php                       |  97 +++++++++
 work/work_offer_view.php                    | 123 ++++++++++++
 work/work_offers.php                        |  56 ++++++
 work/work_view.php                          |  74 +++++++
 work/work_view_own.php                      |  79 ++++++++
 38 files changed, 3076 insertions(+)
 create mode 100644 WEB-INF/templates/work/admin_offer_edit.tpl
 create mode 100644 WEB-INF/templates/work/admin_work.tpl
 create mode 100644 WEB-INF/templates/work/admin_work_edit.tpl
 create mode 100644 WEB-INF/templates/work/header.tpl
 create mode 100644 WEB-INF/templates/work/index.tpl
 create mode 100644 WEB-INF/templates/work/offer_add.tpl
 create mode 100644 WEB-INF/templates/work/offer_delete.tpl
 create mode 100644 WEB-INF/templates/work/offer_edit.tpl
 create mode 100644 WEB-INF/templates/work/offer_view.tpl
 create mode 100644 WEB-INF/templates/work/offer_view_own.tpl
 create mode 100644 WEB-INF/templates/work/work.tpl
 create mode 100644 WEB-INF/templates/work/work_add.tpl
 create mode 100644 WEB-INF/templates/work/work_delete.tpl
 create mode 100644 WEB-INF/templates/work/work_edit.tpl
 create mode 100644 WEB-INF/templates/work/work_message.tpl
 create mode 100644 WEB-INF/templates/work/work_offer_view.tpl
 create mode 100644 WEB-INF/templates/work/work_offers.tpl
 create mode 100644 WEB-INF/templates/work/work_view.tpl
 create mode 100644 WEB-INF/templates/work/work_view_own.tpl
 create mode 100644 work/admin_offer_delete.php
 create mode 100644 work/admin_offer_edit.php
 create mode 100644 work/admin_work.php
 create mode 100644 work/admin_work_delete.php
 create mode 100644 work/admin_work_edit.php
 create mode 100644 work/offer_add.php
 create mode 100644 work/offer_delete.php
 create mode 100644 work/offer_edit.php
 create mode 100644 work/offer_view.php
 create mode 100644 work/offer_view_own.php
 create mode 100644 work/work.php
 create mode 100644 work/work_add.php
 create mode 100644 work/work_delete.php
 create mode 100644 work/work_edit.php
 create mode 100644 work/work_message.php
 create mode 100644 work/work_offer_view.php
 create mode 100644 work/work_offers.php
 create mode 100644 work/work_view.php
 create mode 100644 work/work_view_own.php

diff --git a/WEB-INF/templates/work/admin_offer_edit.tpl b/WEB-INF/templates/work/admin_offer_edit.tpl
new file mode 100644
index 000000000..bd9a6542b
--- /dev/null
+++ b/WEB-INF/templates/work/admin_offer_edit.tpl
@@ -0,0 +1,70 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+{if $work_id}
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td><a href="admin_work_edit.php?id={$work_id}">{$work_name}</a></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$forms.offerForm.work_description.control}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.offer} (*):</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.offerForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.offerForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
+          <td>{$forms.offerForm.payment_info.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.offerForm.status.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.offerForm.moderator_comment.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_approve.control} {$forms.offerForm.btn_save.control} {$forms.offerForm.btn_disapprove.control} </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/admin_work.tpl b/WEB-INF/templates/work/admin_work.tpl
new file mode 100644
index 000000000..39050ab3e
--- /dev/null
+++ b/WEB-INF/templates/work/admin_work.tpl
@@ -0,0 +1,104 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+{if $pending_work}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_work}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $pending_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
+          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
+          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+        </tr>
+  {/foreach}
+      </table>
+{/if}
+
+<div class="table-divider"></div>
+
+{if $pending_offers}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_offers}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $pending_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
+          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
+          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+        </tr>
+  {/foreach}
+      </table>
+{/if}
+
+<div class="table-divider"></div>
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
+{if $available_work}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+        </tr>
+  {foreach $available_work as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$work_item.subject|escape}</td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape}</td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+<div class="table-divider"></div>
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
+{if $available_offers}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+        </tr>
+  {foreach $available_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$offer.subject|escape}</td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+    </td>
+  </tr>
+</table>
diff --git a/WEB-INF/templates/work/admin_work_edit.tpl b/WEB-INF/templates/work/admin_work_edit.tpl
new file mode 100644
index 000000000..1ae59a6fe
--- /dev/null
+++ b/WEB-INF/templates/work/admin_work_edit.tpl
@@ -0,0 +1,67 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work} (*):</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.workForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.workForm.status.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.workForm.moderator_comment.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/WEB-INF/templates/work/header.tpl b/WEB-INF/templates/work/header.tpl
new file mode 100644
index 000000000..084870958
--- /dev/null
+++ b/WEB-INF/templates/work/header.tpl
@@ -0,0 +1,207 @@
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
+  <link rel="icon" href="../favicon.ico" type="image/x-icon">
+  <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+  <link href="../{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+{if $i18n.language.rtl}
+  <link href="../{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+{/if}
+  <title>Time Tracker{if $title} - {$title}{/if}</title>
+  <script src="../js/strftime.js"></script>
+  <script>
+    {* Setup locale for strftime *}
+    {$js_date_locale}
+  </script>
+  <script src="../js/strptime.js"></script>
+</head>
+
+<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" {$onload}>
+
+{assign var="tab_width" value="700"}
+
+<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
+  <tr>
+    <td valign="top" align="center"> <!-- This is to centrally align all our content. -->
+
+      <!-- top image -->
+      <table cellspacing="0" cellpadding="0" width="100%" border="0">
+        <tr>
+{if $user->custom_logo}
+          <td align="center">
+{else}
+          <td bgcolor="#a6ccf7" background="../images/top_bg.gif" align="center">
+{/if}
+            <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
+              <tr>
+                <td valign="top">
+                  <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
+                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../images/1x1.gif" border="0"></td></tr>
+                    <tr valign="top">
+{if $user->custom_logo}
+                      <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="../{$custom_logo}" border="0"></td>
+{else}
+                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/tt_logo.png" border="0"></a></td>
+{/if}
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+      <!-- end of top image -->
+
+{if $authenticated}
+  {if $user->can('administer_site')}
+      <!-- top menu for admin -->
+      <table id="top_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
+        <tr>
+          <td class="systemMenu" height="17" align="center">&nbsp;
+            <a class="systemMenu" href="../logout.php">{$i18n.menu.logout}</a>
+            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+          </td>
+        </tr>
+      </table>
+      <!-- end of top menu for admin -->
+
+      <!-- sub menu for admin -->
+      <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
+        <tr>
+          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
+            <a class="mainMenu" href="../admin_groups.php">{$i18n.menu.groups}</a>
+            <a class="mainMenu" href="../admin_options.php">{$i18n.menu.options}</a>
+    {if isTrue('WORK_SERVER_ADMINISTRATION')}
+            <a class="mainMenu" href="admin_work.php">{$i18n.label.work}</a>
+    {/if}
+          </td>
+        </tr>
+      </table>
+      <!-- end of sub menu for admin -->
+  {else}
+      <!-- top menu for authorized user -->
+      <table id="top_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
+        <tr>
+          <td class="systemMenu" height="17" align="center">&nbsp;
+            <a class="systemMenu" href="../logout.php">{$i18n.menu.logout}</a>
+    {if $user->exists() && $user->can('manage_own_settings')}
+            <a class="systemMenu" href="../profile_edit.php">{$i18n.menu.profile}</a>
+    {/if}
+    {if $user->can('manage_basic_settings')}
+            <a class="systemMenu" href="../group_edit.php">{$i18n.menu.group}</a>
+    {/if}
+    {if $user->can('manage_features')}
+            <a class="systemMenu" href="../plugins.php">{$i18n.menu.plugins}</a>
+    {/if}
+            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+          </td>
+        </tr>
+      </table>
+      <!-- end of top menu for authorized user -->
+
+      <!-- sub menu for authorized user -->
+      <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
+        <tr>
+          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
+    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
+           <a class="mainMenu" href="../time.php">{$i18n.menu.time}</a>
+      {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
+           <a class="mainMenu" href="../week.php">{$i18n.menu.week}</a>
+      {/if}
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+           <a class="mainMenu" href="../expenses.php">{$i18n.menu.expenses}</a>
+    {/if}
+    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
+           <a class="mainMenu" href="../reports.php">{$i18n.menu.reports}</a>
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
+           <a class="mainMenu" href="../timesheets.php">{$i18n.menu.timesheets}</a>
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
+           <a class="mainMenu" href="../invoices.php">{$i18n.title.invoices}</a>
+    {/if}
+    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        $user->isPluginEnabled('cl'))}
+           <a class="mainMenu" href="../charts.php">{$i18n.menu.charts}</a>
+    {/if}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+           <a class="mainMenu" href="../projects.php">{$i18n.menu.projects}</a>
+    {/if}
+    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+           <a class="mainMenu" href="../tasks.php">{$i18n.menu.tasks}</a>
+    {/if}
+    {if $user->can('view_users') || $user->can('manage_users')}
+           <a class="mainMenu" href="../users.php">{$i18n.menu.users}</a>
+    {/if}
+    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
+           <a class="mainMenu" href="../clients.php">{$i18n.menu.clients}</a>
+    {/if}
+    {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
+           <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
+    {/if}
+    {if $user->can('export_data')}
+           <a class="mainMenu" href="../export.php">{$i18n.menu.export}</a>
+    {/if}
+          </td>
+        </tr>
+      </table>
+      <!-- end of sub menu for authorized user -->
+  {/if}
+{else}
+      <!-- top menu for non authorized user -->
+      <table id="top_menu_non_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
+        <tr>
+          <td class="systemMenu" height="17" align="center">&nbsp;
+            <a class="systemMenu" href="../login.php">{$i18n.menu.login}</a>
+  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+            <a class="systemMenu" href="../register.php">{$i18n.menu.register}</a>
+  {/if}
+            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+          </td>
+        </tr>
+      </table>
+{/if}
+      <br>
+
+      <!-- page title and user details -->
+{if $title}
+      <table id="page_title" cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
+        <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
+        <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
+      </table>
+{/if}
+      <!-- end of page title and user details -->
+
+      <!-- output errors -->
+{if $err->yes()}
+      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
+        <tr>
+          <td class="error">
+  {foreach $err->getErrors() as $error}
+            {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
+  {/foreach}
+          </td>
+        </tr>
+      </table>
+{/if}
+      <!-- end of output errors -->
+
+      <!-- output messages -->
+{if $msg->yes()}
+      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
+        <tr>
+          <td class="info_message">
+  {foreach $msg->getErrors() as $message}
+            {$message.message}<br> {* No need to escape. *}
+  {/foreach}
+          </td>
+        </tr>
+      </table>
+{/if}
+      <!-- end of output messages -->
diff --git a/WEB-INF/templates/work/index.tpl b/WEB-INF/templates/work/index.tpl
new file mode 100644
index 000000000..6817f3963
--- /dev/null
+++ b/WEB-INF/templates/work/index.tpl
@@ -0,0 +1,5 @@
+{include file="work/header.tpl"}
+
+{if $content_page_name}{include file="$content_page_name"}{/if}
+
+{include file="footer.tpl"}
diff --git a/WEB-INF/templates/work/offer_add.tpl b/WEB-INF/templates/work/offer_add.tpl
new file mode 100644
index 000000000..80e07d803
--- /dev/null
+++ b/WEB-INF/templates/work/offer_add.tpl
@@ -0,0 +1,74 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+{if $work_id}
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td><a href="work_view.php?id={$work_id}">{$work_name}</a></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$forms.offerForm.work_description.control}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.offer} (*):</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.offerForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.offerForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
+          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/offer_delete.tpl b/WEB-INF/templates/work/offer_delete.tpl
new file mode 100644
index 000000000..7d8954cfb
--- /dev/null
+++ b/WEB-INF/templates/work/offer_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.offerDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$offer_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.offerDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.offerDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerDeleteForm.close}
diff --git a/WEB-INF/templates/work/offer_edit.tpl b/WEB-INF/templates/work/offer_edit.tpl
new file mode 100644
index 000000000..5c1e89a33
--- /dev/null
+++ b/WEB-INF/templates/work/offer_edit.tpl
@@ -0,0 +1,67 @@
+{$forms.offerForm.open}
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.offer} (*):</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.offerForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
+          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.offerForm.status.control}</td>
+        </tr>
+{if $show_moderator_comment}
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.offerForm.moderator_comment.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/offer_view.tpl b/WEB-INF/templates/work/offer_view.tpl
new file mode 100644
index 000000000..ad0b385f2
--- /dev/null
+++ b/WEB-INF/templates/work/offer_view.tpl
@@ -0,0 +1,46 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.contractor}:</td>
+          <td>{$forms.offerForm.contractor.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.offer}:</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
+
+<table width="720" cellspacing="4" cellpadding="4" border="0">
+<tr>
+  <td align="center">
+  <table>
+  <tr>
+    <td><input type="button" onclick="chLocation('work_add.php?offer_id={$offer_id}');" value="{$i18n.work.button.accept}"></td>
+  </tr>
+  </table>
+  </td>
+</tr>
+</table>
diff --git a/WEB-INF/templates/work/offer_view_own.tpl b/WEB-INF/templates/work/offer_view_own.tpl
new file mode 100644
index 000000000..d00ae7ea1
--- /dev/null
+++ b/WEB-INF/templates/work/offer_view_own.tpl
@@ -0,0 +1,42 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.offerForm.open}
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.offer}:</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/work.tpl b/WEB-INF/templates/work/work.tpl
new file mode 100644
index 000000000..3397dc6a1
--- /dev/null
+++ b/WEB-INF/templates/work/work.tpl
@@ -0,0 +1,140 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td valign="top">
+{if $own_work_items}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_work}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.work.label.offers}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $own_work_items as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href="work_view_own.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.status_label}</td>
+          <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
+    {if $work_item.can_edit}
+          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
+    {else}
+          <td></td>
+    {/if}
+    {if $work_item.can_delete}
+          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+    {else}
+          <td></td>
+    {/if}
+        </tr>
+  {/foreach}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+{/if}
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
+{if $available_work_items}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+        </tr>
+  {foreach $available_work_items as $work_item}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href="work_view.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
+          <td>{$work_item.description|escape}</td>
+          <td>{$work_item.group_name|escape}</td>
+          <td nowrap>{$work_item.amount_with_currency}</td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
+{if $own_offers}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_offers}</td></tr>
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $own_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href='offer_view_own.php?id={$offer.id}'>{$offer.subject|escape}</a></td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.status_label}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
+          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
+          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+        </tr>
+  {/foreach}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+{/if}
+
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
+{if $available_offers}
+        <tr>
+          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
+          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+        </tr>
+  {foreach $available_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href="offer_view.php?id={$offer.id}">{$offer.subject|escape}</a></td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.group_name|escape}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
+        </tr>
+  {/foreach}
+{/if}
+      </table>
+
+      <table width="100%">
+        <tr>
+          <td align="center"><br>
+            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
+          </td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+</table>
diff --git a/WEB-INF/templates/work/work_add.tpl b/WEB-INF/templates/work/work_add.tpl
new file mode 100644
index 000000000..eca0ba799
--- /dev/null
+++ b/WEB-INF/templates/work/work_add.tpl
@@ -0,0 +1,62 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work} (*):</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.type}:</td>
+          <td>{$forms.workForm.work_type.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.workForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/WEB-INF/templates/work/work_delete.tpl b/WEB-INF/templates/work/work_delete.tpl
new file mode 100644
index 000000000..2831b0f15
--- /dev/null
+++ b/WEB-INF/templates/work/work_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.workDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$work_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.workDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.workDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workDeleteForm.close}
diff --git a/WEB-INF/templates/work/work_edit.tpl b/WEB-INF/templates/work/work_edit.tpl
new file mode 100644
index 000000000..7165d5e19
--- /dev/null
+++ b/WEB-INF/templates/work/work_edit.tpl
@@ -0,0 +1,73 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work} (*):</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.type}:</td>
+          <td>{$forms.workForm.work_type.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.currency}:</td>
+          <td>{$forms.workForm.currency.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget} (*):</td>
+          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.workForm.status.control}</td>
+        </tr>
+{if $show_moderator_comment}
+        <tr>
+          <td align = "right">{$i18n.label.moderator_comment}:</td>
+          <td>{$forms.workForm.moderator_comment.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/WEB-INF/templates/work/work_message.tpl b/WEB-INF/templates/work/work_message.tpl
new file mode 100644
index 000000000..3f237659c
--- /dev/null
+++ b/WEB-INF/templates/work/work_message.tpl
@@ -0,0 +1,32 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.messageForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $work_item}
+  <tr>
+    <td>
+      <table border="0" width="100%">
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0" width="100%">
+        <tr>
+          <td align="right">{$i18n.work.label.message}:</td>
+          <td>{$forms.messageForm.message_body.control}</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.messageForm.btn_send.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.messageForm.close}
diff --git a/WEB-INF/templates/work/work_offer_view.tpl b/WEB-INF/templates/work/work_offer_view.tpl
new file mode 100644
index 000000000..e2afe0003
--- /dev/null
+++ b/WEB-INF/templates/work/work_offer_view.tpl
@@ -0,0 +1,57 @@
+{$forms.offerForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $work_item}
+    <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.contractor}:</td>
+          <td>{$forms.offerForm.contractor.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.offer}:</td>
+          <td>{$forms.offerForm.offer_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.offerForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.offerForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.offerForm.budget.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.status}:</td>
+          <td>{$forms.offerForm.status.control}</td>
+        </tr>
+
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td></td>
+          <td align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.comment}:</td>
+          <td>{$forms.offerForm.client_comment.control}</td>
+        </tr>
+
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/work_offers.tpl b/WEB-INF/templates/work/work_offers.tpl
new file mode 100644
index 000000000..ea0d8816f
--- /dev/null
+++ b/WEB-INF/templates/work/work_offers.tpl
@@ -0,0 +1,41 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td valign="top">
+
+{if $work_item_offers}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
+        <tr>
+          <td class="tableHeader">{$i18n.label.contractor}</td>
+          <td class="tableHeader">{$i18n.label.description}</td>
+          <td class="tableHeader">{$i18n.label.status}</td>
+          <td class="tableHeader">{$i18n.label.budget}</td>
+        </tr>
+  {foreach $work_item_offers as $offer}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td><a href='work_offer_view.php?id={$offer.id}'>{$offer.group_name|escape}</a></td>
+          <td>{$offer.description|escape}</td>
+          <td>{$offer.status_label}</td>
+          <td nowrap>{$offer.amount_with_currency}</td>
+        </tr>
+  {/foreach}
+      </table>
+{/if}
+
+    </td>
+  </tr>
+</table>
diff --git a/WEB-INF/templates/work/work_view.tpl b/WEB-INF/templates/work/work_view.tpl
new file mode 100644
index 000000000..468cb9ddd
--- /dev/null
+++ b/WEB-INF/templates/work/work_view.tpl
@@ -0,0 +1,47 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.client}:</td>
+          <td>{$forms.workForm.client.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
+
+<table width="720" cellspacing="4" cellpadding="4" border="0">
+<tr>
+  <td align="center">
+  <table>
+  <tr>
+    <td><input type="button" onclick="chLocation('work_message.php?work_id={$work_id}');" value="{$i18n.work.button.send_message}"></td>
+    <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
+  </tr>
+  </table>
+  </td>
+</tr>
+</table>
diff --git a/WEB-INF/templates/work/work_view_own.tpl b/WEB-INF/templates/work/work_view_own.tpl
new file mode 100644
index 000000000..61e270b4b
--- /dev/null
+++ b/WEB-INF/templates/work/work_view_own.tpl
@@ -0,0 +1,38 @@
+{$forms.workForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border=0 width=100%>
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.work}:</td>
+          <td>{$forms.workForm.work_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.details}:</td>
+          <td>{$forms.workForm.details.control}</td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.budget}:</td>
+          <td>{$forms.workForm.budget.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}
diff --git a/work/admin_offer_delete.php b/work/admin_offer_delete.php
new file mode 100644
index 000000000..51c46fce3
--- /dev/null
+++ b/work/admin_offer_delete.php
@@ -0,0 +1,71 @@
+<?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('ttAdminWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$offer = $adminWorkHelper->getOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$offer_to_delete = $offer['subject'];
+
+$form = new Form('offerDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($adminWorkHelper->deleteOffer($cl_offer_id)) {
+      header('Location: admin_work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: admin_work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('offer_to_delete', $offer_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_offer'));
+$smarty->assign('content_page_name', 'work/offer_delete.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/admin_offer_edit.php b/work/admin_offer_edit.php
new file mode 100644
index 000000000..32ed2a8ed
--- /dev/null
+++ b/work/admin_offer_edit.php
@@ -0,0 +1,171 @@
+<?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');
+require '../plugins/work_constants.php';
+import('form.Form');
+import('ttWorkHelper');
+import('ttAdminWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$offer = $adminWorkHelper->getOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $adminWorkHelper->getWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
+$existingStatus = $offer['status'];
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('offer_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency_id = $request->getParameter('currency');
+  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  $cl_budget = $request->getParameter('budget');
+  $cl_payment_info = $request->getParameter('payment_info');
+  // $cl_status = $request->getParameter('status');
+  $cl_moderator_comment = $request->getParameter('moderator_comment');
+} else {
+  $cl_name = $offer['subject'];
+  $cl_description = $offer['descr_short'];
+  $cl_details = $offer['descr_long'];
+  $currency = $offer['currency'];
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_budget = $offer['amount'];
+  $cl_payment_info = $offer['payment_info'];
+  $status = $offer['status'];
+  $status_label = $offer['status_label'];
+  $cl_moderator_comment = $offer['moderator_comment'];
+}
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+if ($work_id) {
+  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
+  $form->getElement('work_description')->setEnabled(false);
+}
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_id) $form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+if ($work_id) $form->getElement('currency')->setEnabled(false);
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$status_label));
+$form->getElement('status')->setEnabled(false);
+
+// Prepare status choices.
+/*
+$status_options = array();
+$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
+$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
+$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
+
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
+*/
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+if ($status == STATUS_PENDING_APPROVAL) {
+  $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
+}
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
+  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  $fields = array('offer_id'=>$cl_offer_id,
+    'subject'=>$cl_name,
+    'descr_short' => $cl_description,
+    'descr_long' => $cl_details,
+    'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+    'amount' => $cl_budget,
+    'payment_info' => $cl_payment_info,
+    'moderator_comment' => $cl_moderator_comment);
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_approve')) {
+      // Approve offer.
+      if ($adminWorkHelper->approveOffer($fields)) {
+        header('Location: admin_work.php');
+        exit();
+      }
+    }
+  
+    if ($request->getParameter('btn_save')) {
+      // Update offer without changing its status.
+      if ($adminWorkHelper->updateOffer($fields)) {
+        header('Location: admin_work.php');
+        exit();
+      }
+    }
+
+    if ($request->getParameter('btn_disapprove')) {
+      // Dispprove offer.
+      if ($adminWorkHelper->disapproveOffer($fields)) {
+        header('Location: admin_work.php');
+        exit();
+      }
+    }
+  }
+} // isPost
+
+if ($work_id) {
+  $smarty->assign('work_id', $work_id);
+  $smarty->assign('work_name', $work_item['subject']);
+  $smarty->assign('work_description', $work_item['descr_short']);
+}
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_offer'));
+$smarty->assign('content_page_name', 'work/admin_offer_edit.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/admin_work.php b/work/admin_work.php
new file mode 100644
index 000000000..19b420987
--- /dev/null
+++ b/work/admin_work.php
@@ -0,0 +1,53 @@
+<?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('ttAdminWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$adminWorkHelper = new ttAdminWorkHelper($err);
+
+$adminItems = $adminWorkHelper->getItems();
+$pending_work = $adminItems['pending_work'];
+$pending_offers = $adminItems['pending_offers'];
+$available_work = $adminItems['available_work'];
+$available_offers = $adminItems['available_offers'];
+
+$smarty->assign('pending_work', $pending_work);
+$smarty->assign('pending_offers', $pending_offers);
+$smarty->assign('available_work', $available_work);
+$smarty->assign('available_offers', $available_offers);
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work/admin_work.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/admin_work_delete.php b/work/admin_work_delete.php
new file mode 100644
index 000000000..38084e565
--- /dev/null
+++ b/work/admin_work_delete.php
@@ -0,0 +1,71 @@
+<?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('ttAdminWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$work_to_delete = $work_item['subject'];
+
+$form = new Form('workDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($adminWorkHelper->deleteWorkItem($cl_work_id)) {
+      header('Location: admin_work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: admin_work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('work_to_delete', $work_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_work'));
+$smarty->assign('content_page_name', 'work/work_delete.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/admin_work_edit.php b/work/admin_work_edit.php
new file mode 100644
index 000000000..626b1a77e
--- /dev/null
+++ b/work/admin_work_edit.php
@@ -0,0 +1,168 @@
+<?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');
+require '../plugins/work_constants.php';
+import('form.Form');
+import('ttWorkHelper');
+import('ttAdminWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('administer_site')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$adminWorkHelper = new ttAdminWorkHelper($err);
+$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// Do we have offer_id?
+$offer_id = $work_item['offer_id'];
+if ($offer_id) {
+  $offer = $adminWorkHelper->getOffer($offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+
+$existingStatus = $work_item['status'];
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('work_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency_id = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+  $cl_status = $request->getParameter('status');
+  $cl_moderator_comment = $request->getParameter('moderator_comment');
+} else {
+  $cl_name = $work_item['subject'];
+  $cl_description = $work_item['descr_short'];
+  $cl_details = $work_item['descr_long'];
+  $currency = $work_item['currency'];
+  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  $cl_budget = $work_item['amount'];
+  $cl_status = $work_item['status'];
+  $cl_moderator_comment = $work_item['moderator_comment'];
+}
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+// Disable some controls for work on an available offer.
+if ($offer) {
+  $form->getElement('work_name')->setEnabled(false);
+  // $form->getElement('work_type')->setEnabled(false);
+  $form->getElement('currency')->setEnabled(false);
+  $form->getElement('budget')->setEnabled(false);
+}
+
+// Prepare status choices.
+$status_options = array();
+$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
+$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
+$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
+
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      $fields = array('work_id'=>$cl_work_id,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+        'amount' => $cl_budget,
+        'moderator_comment' => $cl_moderator_comment);
+
+      // Do things differently, depending on status control value.
+      if ($existingStatus == $cl_status) {
+        // Status not changed. Update work information.
+        if ($adminWorkHelper->updateWorkItem($fields)) {
+          header('Location: admin_work.php');
+          exit();
+        }
+      } else if ($cl_status == STATUS_DISAPPROVED) {
+        // Status changed to "not approved". Disapprove work.
+        if ($offer_id) {
+          if ($adminWorkHelper->disapproveWorkItemOnOffer($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
+        } else {
+          if ($adminWorkHelper->disapproveWorkItem($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
+        }
+      } else if ($cl_status == STATUS_APPROVED) {
+        // Status changed to "approved". Approve work.
+        if ($offer_id) {
+          if ($adminWorkHelper->approveWorkItemOnOffer($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
+        } else {
+          if ($adminWorkHelper->approveWorkItem($fields)) {
+            header('Location: admin_work.php');
+            exit();
+          }
+        }
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('offer', $offer);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_work'));
+$smarty->assign('content_page_name', 'work/admin_work_edit.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/offer_add.php b/work/offer_add.php
new file mode 100644
index 000000000..159bc3241
--- /dev/null
+++ b/work/offer_add.php
@@ -0,0 +1,120 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// Do we have work_id?
+$cl_work_id = (int)$request->getParameter('work_id');
+if ($cl_work_id) {
+  $workHelper = new ttWorkHelper($err);
+  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+  if (!$work_item) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+if ($work_item) $cl_name = $work_item['subject'];
+
+if ($request->isPost()) {
+  if (!$work_item)
+    $cl_name = trim($request->getParameter('offer_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency_id = $request->getParameter('currency');
+  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  $cl_budget = $request->getParameter('budget');
+  $cl_payment_info = $request->getParameter('payment_info');
+} else {
+  if ($work_item) {
+    $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  }
+}
+
+$form = new Form('offerForm');
+if ($cl_work_id) {
+  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
+  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
+  $form->getElement('work_description')->setEnabled(false);
+}
+$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_item) $form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+// Add a dropdown for currency.
+$currencies = ttWorkHelper::getCurrencies();
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+if ($work_item) $form->getElement('currency')->setEnabled(false); // Do not allow changing currency for offers on existing work items.
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('work_id'=>$cl_work_id,
+      'subject'=>$cl_name,
+      'descr_short' => $cl_description,
+      'descr_long' => $cl_details,
+      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+      'amount' => $cl_budget,
+      'payment_info' => $cl_payment_info);
+     if ($workHelper->putOwnOffer($fields)) {
+        header('Location: work.php');
+        exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_offer'));
+$smarty->assign('content_page_name', 'work/offer_add.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/offer_delete.php b/work/offer_delete.php
new file mode 100644
index 000000000..c8772599a
--- /dev/null
+++ b/work/offer_delete.php
@@ -0,0 +1,75 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('bid_on_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOwnOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$offer_to_delete = $offer['subject'];
+
+$form = new Form('offerDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($workHelper->deleteOwnOffer($cl_offer_id)) {
+      header('Location: work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('offer_to_delete', $offer_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_offer'));
+$smarty->assign('content_page_name', 'work/offer_delete.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/offer_edit.php b/work/offer_edit.php
new file mode 100644
index 000000000..5eba66378
--- /dev/null
+++ b/work/offer_edit.php
@@ -0,0 +1,135 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('bid_on_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOwnOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $workHelper->getAvailableWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('offer_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency_id = $request->getParameter('currency');
+  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  $cl_budget = $request->getParameter('budget');
+  $cl_payment_info = $request->getParameter('payment_info');
+} else {
+  $cl_name = $offer['subject'];
+  $cl_description = $offer['descr_short'];
+  $cl_details = $offer['descr_long'];
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_budget = $offer['amount'];
+  $cl_payment_info = $offer['payment_info'];
+  $cl_status = $offer['status_label'];
+  $cl_moderator_comment = $offer['moderator_comment'];
+}
+
+$show_moderator_comment = $cl_moderator_comment != null;
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+if ($work_id) {
+  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
+  $form->getElement('work_description')->setEnabled(false);
+}
+$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+if ($work_id) $form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+if ($work_id) $form->getElement('currency')->setEnabled(false);
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px; vertical-align: middle','value'=>$cl_payment_info));
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
+$form->getElement('status')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
+$form->getElement('moderator_comment')->setEnabled(false);
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update offer information.
+      $fields = array('offer_id'=>$cl_offer_id,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+        'amount' => $cl_budget,
+        'payment_info' => $cl_payment_info);
+      if ($workHelper->updateOwnOffer($fields)) {
+        header('Location: work.php');
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('show_moderator_comment', $show_moderator_comment);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_offer'));
+$smarty->assign('content_page_name', 'work/offer_edit.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/offer_view.php b/work/offer_view.php
new file mode 100644
index 000000000..614b93188
--- /dev/null
+++ b/work/offer_view.php
@@ -0,0 +1,81 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getAvailableOffer($offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $workHelper->getAvailableWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
+$cl_contractor = $offer['group_name'];
+$cl_name = $offer['subject'];
+$cl_description = $offer['descr_short'];
+$cl_details = $offer['descr_long'];
+$cl_budget = $offer['amount_with_currency'];
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
+$form->getElement('contractor')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+
+$smarty->assign('offer_id', $offer_id);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.offer'));
+$smarty->assign('content_page_name', 'work/offer_view.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/offer_view_own.php b/work/offer_view_own.php
new file mode 100644
index 000000000..c87013d08
--- /dev/null
+++ b/work/offer_view_own.php
@@ -0,0 +1,77 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOwnOffer($offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Is this offer associated with a work item?
+$work_id = $offer['work_id'];
+if ($work_id) {
+  $work_item = $workHelper->getAvailableWorkItem($work_id);
+  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+}
+
+$cl_name = $offer['subject'];
+$cl_description = $offer['descr_short'];
+$cl_details = $offer['descr_long'];
+$cl_budget = $offer['amount_with_currency'];
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.offer'));
+$smarty->assign('content_page_name', 'work/offer_view_own.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work.php b/work/work.php
new file mode 100644
index 000000000..4f40e4ca9
--- /dev/null
+++ b/work/work.php
@@ -0,0 +1,65 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('update_work') || ttAccessAllowed('bid_on_work')  || ttAccessAllowed('manage_work'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$workHelper = new ttWorkHelper($err);
+$groupItems = $workHelper->getGroupItems(); // All group items.
+if($user->can('manage_work')) {
+  $own_work_items = $groupItems['own_work_items']; // Own work items this group is outsourcing.
+  $available_offers = $groupItems['available_offers']; // Available offers from other organizations.
+}
+if($user->can('bid_on_work')) {
+  $available_work_items = $groupItems['available_work_items']; // Currently available work items from other orgs.
+  $own_offers = $groupItems['own_offers']; // Own offers this group makes available to other groups.
+}
+if($user->can('update_work')) {
+  // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
+  // $completed_work = ttWorkHelper::getCompletedWork(); // Completed work items for other groups.
+}
+// TODO: review access rights for the code above.
+
+$smarty->assign('own_work_items', $own_work_items);
+$smarty->assign('available_work_items', $available_work_items);
+$smarty->assign('own_offers', $own_offers);
+$smarty->assign('available_offers', $available_offers);
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work/work.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_add.php b/work/work_add.php
new file mode 100644
index 000000000..c0b8795fd
--- /dev/null
+++ b/work/work_add.php
@@ -0,0 +1,122 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// Do we have offer_id?
+$cl_offer_id = (int)$request->getParameter('offer_id');
+if ($cl_offer_id) {
+  $workHelper = new ttWorkHelper($err);
+  $offer = $workHelper->getAvailableOffer($cl_offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('work_name'));
+  $cl_work_type = $request->getParameter('work_type');
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency_id = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+}
+// Override some fields for work being created on an available offer.
+if ($offer) {
+  $cl_name = $offer['subject'];
+  $cl_work_type = 0; // one-time work
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_budget = $offer['amount'];
+}
+
+$form = new Form('workForm');
+if ($offer)
+  $form->addInput(array('type'=>'hidden','name'=>'offer_id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
+$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+// Add a dropdown for currency.
+$currencies = ttWorkHelper::getCurrencies();
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+// Disable some controls for work being created on an available offer.
+if ($offer) {
+  $form->getElement('work_name')->setEnabled(false);
+  $form->getElement('work_type')->setEnabled(false);
+  $form->getElement('currency')->setEnabled(false);
+  $form->getElement('budget')->setEnabled(false);
+}
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('offer_id' => $cl_offer_id,
+      'subject' => $cl_name,
+      'type' => $cl_work_type,
+      'descr_short' => $cl_description,
+      'descr_long' => $cl_details,
+      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+      'amount' => $cl_budget);
+     if ($workHelper->putOwnWorkItem($fields)) {
+        header('Location: work.php');
+        exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('offer', $offer);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.workForm.work_name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_work'));
+$smarty->assign('content_page_name', 'work/work_add.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_delete.php b/work/work_delete.php
new file mode 100644
index 000000000..75a111da3
--- /dev/null
+++ b/work/work_delete.php
@@ -0,0 +1,75 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getOwnWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$work_to_delete = $work_item['subject'];
+
+$form = new Form('workDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if ($workHelper->deleteOwnWorkItem($cl_work_id)) {
+      header('Location: work.php');
+      exit();
+    }
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: work.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('work_to_delete', $work_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->get('title.delete_work'));
+$smarty->assign('content_page_name', 'work/work_delete.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_edit.php b/work/work_edit.php
new file mode 100644
index 000000000..f265da859
--- /dev/null
+++ b/work/work_edit.php
@@ -0,0 +1,151 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getOwnWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// Do we have offer_id?
+$offer_id = $work_item['offer_id'];
+if ($offer_id) {
+  $offer = $workHelper->getAvailableOffer($offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+
+$currencies = ttWorkHelper::getCurrencies();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('work_name'));
+  $cl_work_type = $request->getParameter('work_type');
+  $cl_description = trim($request->getParameter('description'));
+  $cl_details = trim($request->getParameter('details'));
+  $cl_currency_id = $request->getParameter('currency');
+  $cl_budget = $request->getParameter('budget');
+} else {
+  $cl_name = $work_item['subject'];
+  $cl_work_type = $work_item['type'];
+  $cl_description = $work_item['descr_short'];
+  $cl_details = $work_item['descr_long'];
+  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
+  $cl_budget = $work_item['amount'];
+  $cl_status = $work_item['status_label'];
+  $cl_moderator_comment = $work_item['moderator_comment'];
+}
+// Override some fields for work on an available offer.
+if ($offer) {
+  $cl_name = $offer['subject'];
+  $cl_work_type = 0; // one-time work
+  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
+  $cl_budget = $offer['amount'];
+}
+
+$show_moderator_comment = $cl_moderator_comment != null;
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
+$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
+$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
+$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
+$form->getElement('status')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
+$form->getElement('moderator_comment')->setEnabled(false);
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+// Disable some controls for work on an available offer.
+if ($offer) {
+  $form->getElement('work_name')->setEnabled(false);
+  $form->getElement('work_type')->setEnabled(false);
+  $form->getElement('currency')->setEnabled(false);
+  $form->getElement('budget')->setEnabled(false);
+}
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
+  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      // Update work information.
+      $fields = array('work_id'=>$cl_work_id,
+        'type'=>$cl_work_type,
+        'subject'=>$cl_name,
+        'descr_short' => $cl_description,
+        'descr_long' => $cl_details,
+        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
+        'amount' => $cl_budget);
+      if ($offer_id > 0) {
+        if ($workHelper->updateOwnWorkItemOnOffer($fields)) {
+          header('Location: work.php');
+          exit();
+        }
+      } else {
+        if ($workHelper->updateOwnWorkItem($fields)) {
+          header('Location: work.php');
+          exit();
+        }
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('offer', $offer);
+$smarty->assign('show_moderator_comment', $show_moderator_comment);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_work'));
+$smarty->assign('content_page_name', 'work/work_edit.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_message.php b/work/work_message.php
new file mode 100644
index 000000000..ca74915d4
--- /dev/null
+++ b/work/work_message.php
@@ -0,0 +1,97 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// Do we have work_id?
+$cl_work_id = (int)$request->getParameter('work_id');
+if ($cl_work_id) {
+  $workHelper = new ttWorkHelper($err);
+  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+  if (!$work_item) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+if ($work_item) $cl_name = $work_item['subject'];
+
+if ($request->isPost()) {
+  $cl_message_body = trim($request->getParameter('message_body'));
+}
+
+
+
+
+
+
+
+
+$form = new Form('messageForm');
+if ($cl_work_id) {
+  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
+}
+$form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
+$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_message_body)) $err->add($i18n->get('error.field'), $i18n->get('work.label.message'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('work_id'=>$cl_work_id,
+      'message_body' => $cl_message_body);
+    if ($workHelper->sendMessage($fields)) {
+      $msg->add($i18n->get('work.msg.message_sent'));
+      //  header('Location: work.php'); // TODO: where to redirect?
+      // exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
+$smarty->assign('title', $i18n->get('work.title.send_message'));
+$smarty->assign('content_page_name', 'work/work_message.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_offer_view.php b/work/work_offer_view.php
new file mode 100644
index 000000000..dc1074942
--- /dev/null
+++ b/work/work_offer_view.php
@@ -0,0 +1,123 @@
+<?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');
+require_once('../plugins/work_constants.php');
+import('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getOwnWorkItemOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Get an associated work item.
+$work_item = $workHelper->getOwnWorkItem($offer['work_id']);
+if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
+
+if ($request->isPost()) {
+  $cl_client_comment = $request->getParameter('client_comment');
+} else {
+  $cl_client_comment = $offer['client_comment'];
+}
+
+$cl_contractor = $offer['group_name'];
+$cl_name = $offer['subject'];
+$cl_description = $offer['descr_short'];
+$cl_details = $offer['descr_long'];
+$cl_budget = $offer['amount_with_currency'];
+$cl_status = $offer['status_label'];
+
+$form = new Form('offerForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
+$form->getElement('contractor')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('offer_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
+$form->getElement('status')->setEnabled(false);
+if ($offer['status'] == STATUS_APPROVED) {
+  $form->addInput(array('type'=>'submit','name'=>'btn_accept','value'=>$i18n->get('work.button.accept')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_decline','value'=>$i18n->get('work.button.decline')));
+}
+$form->addInput(array('type'=>'textarea','name'=>'client_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_client_comment));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_client_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('offer_id'=>$cl_offer_id,
+      'client_comment'=>$cl_client_comment);
+
+    if ($request->getParameter('btn_accept')) {
+      // Accept offer.
+      if ($workHelper->acceptOwnWorkItemOffer($fields)) {
+        header('Location: work_offer_view.php?id='.$cl_offer_id);
+        exit();
+      }
+    }
+
+    if ($request->getParameter('btn_decline')) {
+      // Decline offer.
+      if ($workHelper->declineOwnWorkItemOffer($fields)) {
+        header('Location: work_offer_view.php?id='.$cl_offer_id);
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.offer'));
+$smarty->assign('content_page_name', 'work/work_offer_view.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_offers.php b/work/work_offers.php
new file mode 100644
index 000000000..e045892ea
--- /dev/null
+++ b/work/work_offers.php
@@ -0,0 +1,56 @@
+<?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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getOwnWorkItem($work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$work_item_offers = $workHelper->getOwnWorkItemOffers($work_id);
+
+$smarty->assign('work_item', $work_item);
+$smarty->assign('work_item_offers', $work_item_offers);
+$smarty->assign('title', $i18n->get('work.label.offers'));
+$smarty->assign('content_page_name', 'work/work_offers.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_view.php b/work/work_view.php
new file mode 100644
index 000000000..2bd8d3fd3
--- /dev/null
+++ b/work/work_view.php
@@ -0,0 +1,74 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('bid_on_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$cl_work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$cl_client = $work_item['group_name'];
+$cl_name = $work_item['subject'];
+$cl_description = $work_item['descr_short'];
+$cl_details = $work_item['descr_long'];
+$cl_budget = $work_item['amount_with_currency'];
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
+$form->addInput(array('type'=>'text','name'=>'client','value'=>$cl_client));
+$form->getElement('client')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('work_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('work_id', $cl_work_id);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work/work_view.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_view_own.php b/work/work_view_own.php
new file mode 100644
index 000000000..9930eaf99
--- /dev/null
+++ b/work/work_view_own.php
@@ -0,0 +1,79 @@
+<?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('ttWorkHelper');
+import('form.Form');
+
+// Access checks.
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$work_id = (int)$request->getParameter('id');
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getOwnWorkItem($work_id);
+if (!$work_item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// Do we have offer_id?
+$offer_id = $work_item['offer_id'];
+if ($offer_id) {
+  $offer = $workHelper->getAvailableOffer($offer_id);
+  if (!$offer) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+
+$cl_name = $work_item['subject'];
+$cl_description = $work_item['descr_short'];
+$cl_details = $work_item['descr_long'];
+$cl_budget = $work_item['amount_with_currency'];
+
+$form = new Form('workForm');
+$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
+$form->getElement('work_name')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
+$form->getElement('description')->setEnabled(false);
+$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
+$form->getElement('details')->setEnabled(false);
+$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
+$form->getElement('budget')->setEnabled(false);
+
+$smarty->assign('offer', $offer);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.work'));
+$smarty->assign('content_page_name', 'work/work_view_own.tpl');
+$smarty->display('work/index.tpl');

From a6950a55683617d3155756b055d52b2b955cec4e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Nov 2019 16:06:24 +0000
Subject: [PATCH 1143/1848] Fixed redirects on Work plugin pages.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php |   1 +
 WEB-INF/templates/admin_offer_edit.tpl  |  70 ----------
 WEB-INF/templates/admin_work.tpl        | 104 ---------------
 WEB-INF/templates/admin_work_edit.tpl   |  67 ----------
 WEB-INF/templates/footer.tpl            |   2 +-
 WEB-INF/templates/header.tpl            |   4 +-
 WEB-INF/templates/offer_add.tpl         |  74 -----------
 WEB-INF/templates/offer_delete.tpl      |  20 ---
 WEB-INF/templates/offer_edit.tpl        |  67 ----------
 WEB-INF/templates/offer_view.tpl        |  46 -------
 WEB-INF/templates/offer_view_own.tpl    |  42 ------
 WEB-INF/templates/work.tpl              | 140 --------------------
 WEB-INF/templates/work_add.tpl          |  62 ---------
 WEB-INF/templates/work_delete.tpl       |  20 ---
 WEB-INF/templates/work_edit.tpl         |  73 ----------
 WEB-INF/templates/work_message.tpl      |  32 -----
 WEB-INF/templates/work_offer_view.tpl   |  57 --------
 WEB-INF/templates/work_offers.tpl       |  41 ------
 WEB-INF/templates/work_view.tpl         |  47 -------
 WEB-INF/templates/work_view_own.tpl     |  38 ------
 admin_offer_delete.php                  |  71 ----------
 admin_offer_edit.php                    | 169 ------------------------
 admin_work.php                          |  53 --------
 admin_work_delete.php                   |  71 ----------
 admin_work_edit.php                     | 168 -----------------------
 offer_add.php                           | 120 -----------------
 offer_delete.php                        |  75 -----------
 offer_edit.php                          | 135 -------------------
 offer_view.php                          |  81 ------------
 offer_view_own.php                      |  77 -----------
 work.php                                |  65 ---------
 work/admin_offer_delete.php             |   4 +-
 work/admin_offer_edit.php               |   4 +-
 work/admin_work.php                     |   2 +-
 work/admin_work_delete.php              |   4 +-
 work/admin_work_edit.php                |   6 +-
 work/offer_add.php                      |   6 +-
 work/offer_delete.php                   |   6 +-
 work/offer_edit.php                     |   6 +-
 work/offer_view.php                     |   6 +-
 work/offer_view_own.php                 |   6 +-
 work/work.php                           |   4 +-
 work/work_add.php                       |   6 +-
 work/work_delete.php                    |   6 +-
 work/work_edit.php                      |   8 +-
 work/work_message.php                   |   6 +-
 work/work_offer_view.php                |   6 +-
 work/work_offers.php                    |   6 +-
 work/work_view.php                      |   6 +-
 work/work_view_own.php                  |   8 +-
 work_add.php                            | 122 -----------------
 work_delete.php                         |  75 -----------
 work_edit.php                           | 151 ---------------------
 work_message.php                        |  97 --------------
 work_offer_view.php                     | 123 -----------------
 work_offers.php                         |  56 --------
 work_view.php                           |  74 -----------
 work_view_own.php                       |  79 -----------
 58 files changed, 57 insertions(+), 2918 deletions(-)
 delete mode 100644 WEB-INF/templates/admin_offer_edit.tpl
 delete mode 100644 WEB-INF/templates/admin_work.tpl
 delete mode 100644 WEB-INF/templates/admin_work_edit.tpl
 delete mode 100644 WEB-INF/templates/offer_add.tpl
 delete mode 100644 WEB-INF/templates/offer_delete.tpl
 delete mode 100644 WEB-INF/templates/offer_edit.tpl
 delete mode 100644 WEB-INF/templates/offer_view.tpl
 delete mode 100644 WEB-INF/templates/offer_view_own.tpl
 delete mode 100644 WEB-INF/templates/work.tpl
 delete mode 100644 WEB-INF/templates/work_add.tpl
 delete mode 100644 WEB-INF/templates/work_delete.tpl
 delete mode 100644 WEB-INF/templates/work_edit.tpl
 delete mode 100644 WEB-INF/templates/work_message.tpl
 delete mode 100644 WEB-INF/templates/work_offer_view.tpl
 delete mode 100644 WEB-INF/templates/work_offers.tpl
 delete mode 100644 WEB-INF/templates/work_view.tpl
 delete mode 100644 WEB-INF/templates/work_view_own.tpl
 delete mode 100644 admin_offer_delete.php
 delete mode 100644 admin_offer_edit.php
 delete mode 100644 admin_work.php
 delete mode 100644 admin_work_delete.php
 delete mode 100644 admin_work_edit.php
 delete mode 100644 offer_add.php
 delete mode 100644 offer_delete.php
 delete mode 100644 offer_edit.php
 delete mode 100644 offer_view.php
 delete mode 100644 offer_view_own.php
 delete mode 100644 work.php
 delete mode 100644 work_add.php
 delete mode 100644 work_delete.php
 delete mode 100644 work_edit.php
 delete mode 100644 work_message.php
 delete mode 100644 work_offer_view.php
 delete mode 100644 work_offers.php
 delete mode 100644 work_view.php
 delete mode 100644 work_view_own.php

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
index ce8d0f76f..22098b277 100644
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ b/WEB-INF/lib/ttAdminWorkHelper.class.php
@@ -797,6 +797,7 @@ function updateOffer($fields) {
       'descr_long' => urlencode(base64_encode($fields['descr_long'])),
       'currency' => urlencode($fields['currency']),
       'amount' => urlencode($fields['amount']),
+      'payment_info' => urlencode(base64_encode($fields['payment_info'])),
       'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
       'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
       'modified_by' => urlencode($user->getUser()),
diff --git a/WEB-INF/templates/admin_offer_edit.tpl b/WEB-INF/templates/admin_offer_edit.tpl
deleted file mode 100644
index bd9a6542b..000000000
--- a/WEB-INF/templates/admin_offer_edit.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-{if $work_id}
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td><a href="admin_work_edit.php?id={$work_id}">{$work_name}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$forms.offerForm.work_description.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.offer} (*):</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.offerForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.offerForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
-          <td>{$forms.offerForm.payment_info.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.offerForm.status.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.offerForm.moderator_comment.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_approve.control} {$forms.offerForm.btn_save.control} {$forms.offerForm.btn_disapprove.control} </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/admin_work.tpl b/WEB-INF/templates/admin_work.tpl
deleted file mode 100644
index 16b4d4434..000000000
--- a/WEB-INF/templates/admin_work.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $pending_work}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_work}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $pending_work as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-
-<div class="table-divider"></div>
-
-{if $pending_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_offers}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $pending_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.subject|escape}</td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-
-<div class="table-divider"></div>
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-{if $available_work}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_work as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape}</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-<div class="table-divider"></div>
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
-{if $available_offers}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.subject|escape}</td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/admin_work_edit.tpl b/WEB-INF/templates/admin_work_edit.tpl
deleted file mode 100644
index 1ae59a6fe..000000000
--- a/WEB-INF/templates/admin_work_edit.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work} (*):</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.workForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.workForm.status.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.workForm.moderator_comment.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a7cf644bb..6b904f8b2 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.19.12.5168 | 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.12.5170 | 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/header.tpl b/WEB-INF/templates/header.tpl
index fbb3e88a4..837ef05b3 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -74,7 +74,7 @@
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
     {if isTrue('WORK_SERVER_ADMINISTRATION')}
-            <a class="mainMenu" href="admin_work.php">{$i18n.label.work}</a>
+            <a class="mainMenu" href="work/admin_work.php">{$i18n.label.work}</a>
     {/if}
           </td>
         </tr>
@@ -142,7 +142,7 @@
            <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
     {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
-           <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
+           <a class="mainMenu" href="work/work.php">{$i18n.title.work}</a>
     {/if}
     {if $user->can('export_data')}
            <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
diff --git a/WEB-INF/templates/offer_add.tpl b/WEB-INF/templates/offer_add.tpl
deleted file mode 100644
index 80e07d803..000000000
--- a/WEB-INF/templates/offer_add.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-{if $work_id}
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td><a href="work_view.php?id={$work_id}">{$work_name}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$forms.offerForm.work_description.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.offer} (*):</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.offerForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.offerForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
-          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/offer_delete.tpl b/WEB-INF/templates/offer_delete.tpl
deleted file mode 100644
index 7d8954cfb..000000000
--- a/WEB-INF/templates/offer_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.offerDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$offer_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.offerDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.offerDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerDeleteForm.close}
diff --git a/WEB-INF/templates/offer_edit.tpl b/WEB-INF/templates/offer_edit.tpl
deleted file mode 100644
index 5c1e89a33..000000000
--- a/WEB-INF/templates/offer_edit.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.offer} (*):</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.offerForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
-          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.offerForm.status.control}</td>
-        </tr>
-{if $show_moderator_comment}
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.offerForm.moderator_comment.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/offer_view.tpl b/WEB-INF/templates/offer_view.tpl
deleted file mode 100644
index ad0b385f2..000000000
--- a/WEB-INF/templates/offer_view.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.contractor}:</td>
-          <td>{$forms.offerForm.contractor.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.offer}:</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
-
-<table width="720" cellspacing="4" cellpadding="4" border="0">
-<tr>
-  <td align="center">
-  <table>
-  <tr>
-    <td><input type="button" onclick="chLocation('work_add.php?offer_id={$offer_id}');" value="{$i18n.work.button.accept}"></td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
diff --git a/WEB-INF/templates/offer_view_own.tpl b/WEB-INF/templates/offer_view_own.tpl
deleted file mode 100644
index d00ae7ea1..000000000
--- a/WEB-INF/templates/offer_view_own.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.offerForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.offer}:</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work.tpl b/WEB-INF/templates/work.tpl
deleted file mode 100644
index 7b00383d5..000000000
--- a/WEB-INF/templates/work.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $own_work_items}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_work}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
-          <td class="tableHeader">{$i18n.work.label.offers}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $own_work_items as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="work_view_own.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.status_label}</td>
-          <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-    {if $work_item.can_edit}
-          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-    {else}
-          <td></td>
-    {/if}
-    {if $work_item.can_delete}
-          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
-    {else}
-          <td></td>
-    {/if}
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-{/if}
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-{if $available_work_items}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_work_items as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="work_view.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape}</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-{if $own_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_offers}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $own_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href='offer_view_own.php?id={$offer.id}'>{$offer.subject|escape}</a></td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.status_label}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-{/if}
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
-{if $available_offers}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="offer_view.php?id={$offer.id}">{$offer.subject|escape}</a></td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl
deleted file mode 100644
index eca0ba799..000000000
--- a/WEB-INF/templates/work_add.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work} (*):</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.type}:</td>
-          <td>{$forms.workForm.work_type.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.workForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.workForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/WEB-INF/templates/work_delete.tpl b/WEB-INF/templates/work_delete.tpl
deleted file mode 100644
index 2831b0f15..000000000
--- a/WEB-INF/templates/work_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.workDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$work_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.workDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.workDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workDeleteForm.close}
diff --git a/WEB-INF/templates/work_edit.tpl b/WEB-INF/templates/work_edit.tpl
deleted file mode 100644
index 7165d5e19..000000000
--- a/WEB-INF/templates/work_edit.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work} (*):</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.type}:</td>
-          <td>{$forms.workForm.work_type.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.workForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.workForm.status.control}</td>
-        </tr>
-{if $show_moderator_comment}
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.workForm.moderator_comment.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/WEB-INF/templates/work_message.tpl b/WEB-INF/templates/work_message.tpl
deleted file mode 100644
index 3f237659c..000000000
--- a/WEB-INF/templates/work_message.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.messageForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $work_item}
-  <tr>
-    <td>
-      <table border="0" width="100%">
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0" width="100%">
-        <tr>
-          <td align="right">{$i18n.work.label.message}:</td>
-          <td>{$forms.messageForm.message_body.control}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.messageForm.btn_send.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.messageForm.close}
diff --git a/WEB-INF/templates/work_offer_view.tpl b/WEB-INF/templates/work_offer_view.tpl
deleted file mode 100644
index e2afe0003..000000000
--- a/WEB-INF/templates/work_offer_view.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.contractor}:</td>
-          <td>{$forms.offerForm.contractor.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.offer}:</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.offerForm.status.control}</td>
-        </tr>
-
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td></td>
-          <td align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.comment}:</td>
-          <td>{$forms.offerForm.client_comment.control}</td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work_offers.tpl b/WEB-INF/templates/work_offers.tpl
deleted file mode 100644
index ea0d8816f..000000000
--- a/WEB-INF/templates/work_offers.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td valign="top">
-
-{if $work_item_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $work_item_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href='work_offer_view.php?id={$offer.id}'>{$offer.group_name|escape}</a></td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.status_label}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/work_view.tpl b/WEB-INF/templates/work_view.tpl
deleted file mode 100644
index 468cb9ddd..000000000
--- a/WEB-INF/templates/work_view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.client}:</td>
-          <td>{$forms.workForm.client.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.workForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
-
-<table width="720" cellspacing="4" cellpadding="4" border="0">
-<tr>
-  <td align="center">
-  <table>
-  <tr>
-    <td><input type="button" onclick="chLocation('work_message.php?work_id={$work_id}');" value="{$i18n.work.button.send_message}"></td>
-    <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
diff --git a/WEB-INF/templates/work_view_own.tpl b/WEB-INF/templates/work_view_own.tpl
deleted file mode 100644
index 61e270b4b..000000000
--- a/WEB-INF/templates/work_view_own.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.workForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/admin_offer_delete.php b/admin_offer_delete.php
deleted file mode 100644
index 05e9b39b6..000000000
--- a/admin_offer_delete.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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('ttAdminWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$offer = $adminWorkHelper->getOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$offer_to_delete = $offer['subject'];
-
-$form = new Form('offerDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($adminWorkHelper->deleteOffer($cl_offer_id)) {
-      header('Location: admin_work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: admin_work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('offer_to_delete', $offer_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_offer'));
-$smarty->assign('content_page_name', 'offer_delete.tpl');
-$smarty->display('index.tpl');
diff --git a/admin_offer_edit.php b/admin_offer_edit.php
deleted file mode 100644
index 208c08438..000000000
--- a/admin_offer_edit.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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');
-require 'plugins/work_constants.php';
-import('form.Form');
-import('ttWorkHelper');
-import('ttAdminWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$offer = $adminWorkHelper->getOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $adminWorkHelper->getWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$existingStatus = $offer['status'];
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('offer_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $request->getParameter('budget');
-  $cl_payment_info = $request->getParameter('payment_info');
-  // $cl_status = $request->getParameter('status');
-  $cl_moderator_comment = $request->getParameter('moderator_comment');
-} else {
-  $cl_name = $offer['subject'];
-  $cl_description = $offer['descr_short'];
-  $cl_details = $offer['descr_long'];
-  $currency = $offer['currency'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-  $cl_payment_info = $offer['payment_info'];
-  $status = $offer['status'];
-  $status_label = $offer['status_label'];
-  $cl_moderator_comment = $offer['moderator_comment'];
-}
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-if ($work_id) {
-  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
-  $form->getElement('work_description')->setEnabled(false);
-}
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-if ($work_id) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-if ($work_id) $form->getElement('currency')->setEnabled(false);
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$status_label));
-$form->getElement('status')->setEnabled(false);
-
-// Prepare status choices.
-/*
-$status_options = array();
-$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
-$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
-$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
-*/
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-if ($status == STATUS_PENDING_APPROVAL) {
-  $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
-  $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
-}
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  $fields = array('offer_id'=>$cl_offer_id,
-    'subject'=>$cl_name,
-    'descr_short' => $cl_description,
-    'descr_long' => $cl_details,
-    'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-    'amount' => $cl_budget,
-    'moderator_comment' => $cl_moderator_comment);
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_approve')) {
-      // Approve offer.
-      if ($adminWorkHelper->approveOffer($fields)) {
-        header('Location: admin_work.php');
-        exit();
-      }
-    }
-  
-    if ($request->getParameter('btn_save')) {
-      // Update offer without changing its status.
-      if ($adminWorkHelper->updateOffer($fields)) {
-        header('Location: admin_work.php');
-        exit();
-      }
-    }
-
-    if ($request->getParameter('btn_disapprove')) {
-      // Dispprove offer.
-      if ($adminWorkHelper->disapproveOffer($fields)) {
-        header('Location: admin_work.php');
-        exit();
-      }
-    }
-  }
-} // isPost
-
-if ($work_id) {
-  $smarty->assign('work_id', $work_id);
-  $smarty->assign('work_name', $work_item['subject']);
-  $smarty->assign('work_description', $work_item['descr_short']);
-}
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_offer'));
-$smarty->assign('content_page_name', 'admin_offer_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/admin_work.php b/admin_work.php
deleted file mode 100644
index fd0b7b05c..000000000
--- a/admin_work.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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('ttAdminWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$adminWorkHelper = new ttAdminWorkHelper($err);
-
-$adminItems = $adminWorkHelper->getItems();
-$pending_work = $adminItems['pending_work'];
-$pending_offers = $adminItems['pending_offers'];
-$available_work = $adminItems['available_work'];
-$available_offers = $adminItems['available_offers'];
-
-$smarty->assign('pending_work', $pending_work);
-$smarty->assign('pending_offers', $pending_offers);
-$smarty->assign('available_work', $available_work);
-$smarty->assign('available_offers', $available_offers);
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'admin_work.tpl');
-$smarty->display('index.tpl');
diff --git a/admin_work_delete.php b/admin_work_delete.php
deleted file mode 100644
index 0700b912c..000000000
--- a/admin_work_delete.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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('ttAdminWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$work_to_delete = $work_item['subject'];
-
-$form = new Form('workDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($adminWorkHelper->deleteWorkItem($cl_work_id)) {
-      header('Location: admin_work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: admin_work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('work_to_delete', $work_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_work'));
-$smarty->assign('content_page_name', 'work_delete.tpl');
-$smarty->display('index.tpl');
diff --git a/admin_work_edit.php b/admin_work_edit.php
deleted file mode 100644
index 5b4d47e3d..000000000
--- a/admin_work_edit.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?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');
-require 'plugins/work_constants.php';
-import('form.Form');
-import('ttWorkHelper');
-import('ttAdminWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// Do we have offer_id?
-$offer_id = $work_item['offer_id'];
-if ($offer_id) {
-  $offer = $adminWorkHelper->getOffer($offer_id);
-  if (!$offer) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-$existingStatus = $work_item['status'];
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('work_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  $cl_budget = $request->getParameter('budget');
-  $cl_status = $request->getParameter('status');
-  $cl_moderator_comment = $request->getParameter('moderator_comment');
-} else {
-  $cl_name = $work_item['subject'];
-  $cl_description = $work_item['descr_short'];
-  $cl_details = $work_item['descr_long'];
-  $currency = $work_item['currency'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $work_item['amount'];
-  $cl_status = $work_item['status'];
-  $cl_moderator_comment = $work_item['moderator_comment'];
-}
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-// Disable some controls for work on an available offer.
-if ($offer) {
-  $form->getElement('work_name')->setEnabled(false);
-  // $form->getElement('work_type')->setEnabled(false);
-  $form->getElement('currency')->setEnabled(false);
-  $form->getElement('budget')->setEnabled(false);
-}
-
-// Prepare status choices.
-$status_options = array();
-$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
-$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
-$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $fields = array('work_id'=>$cl_work_id,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget,
-        'moderator_comment' => $cl_moderator_comment);
-
-      // Do things differently, depending on status control value.
-      if ($existingStatus == $cl_status) {
-        // Status not changed. Update work information.
-        if ($adminWorkHelper->updateWorkItem($fields)) {
-          header('Location: admin_work.php');
-          exit();
-        }
-      } else if ($cl_status == STATUS_DISAPPROVED) {
-        // Status changed to "not approved". Disapprove work.
-        if ($offer_id) {
-          if ($adminWorkHelper->disapproveWorkItemOnOffer($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        } else {
-          if ($adminWorkHelper->disapproveWorkItem($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        }
-      } else if ($cl_status == STATUS_APPROVED) {
-        // Status changed to "approved". Approve work.
-        if ($offer_id) {
-          if ($adminWorkHelper->approveWorkItemOnOffer($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        } else {
-          if ($adminWorkHelper->approveWorkItem($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        }
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_work'));
-$smarty->assign('content_page_name', 'admin_work_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/offer_add.php b/offer_add.php
deleted file mode 100644
index 8fc1b20b5..000000000
--- a/offer_add.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// Do we have work_id?
-$cl_work_id = (int)$request->getParameter('work_id');
-if ($cl_work_id) {
-  $workHelper = new ttWorkHelper($err);
-  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-  if (!$work_item) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-if ($work_item) $cl_name = $work_item['subject'];
-
-if ($request->isPost()) {
-  if (!$work_item)
-    $cl_name = trim($request->getParameter('offer_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $request->getParameter('budget');
-  $cl_payment_info = $request->getParameter('payment_info');
-} else {
-  if ($work_item) {
-    $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  }
-}
-
-$form = new Form('offerForm');
-if ($cl_work_id) {
-  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
-  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
-  $form->getElement('work_description')->setEnabled(false);
-}
-$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-if ($work_item) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-// Add a dropdown for currency.
-$currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-if ($work_item) $form->getElement('currency')->setEnabled(false); // Do not allow changing currency for offers on existing work items.
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('work_id'=>$cl_work_id,
-      'subject'=>$cl_name,
-      'descr_short' => $cl_description,
-      'descr_long' => $cl_details,
-      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-      'amount' => $cl_budget,
-      'payment_info' => $cl_payment_info);
-     if ($workHelper->putOwnOffer($fields)) {
-        header('Location: work.php');
-        exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('title.add_offer'));
-$smarty->assign('content_page_name', 'offer_add.tpl');
-$smarty->display('index.tpl');
diff --git a/offer_delete.php b/offer_delete.php
deleted file mode 100644
index 897248365..000000000
--- a/offer_delete.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$offer_to_delete = $offer['subject'];
-
-$form = new Form('offerDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($workHelper->deleteOwnOffer($cl_offer_id)) {
-      header('Location: work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('offer_to_delete', $offer_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_offer'));
-$smarty->assign('content_page_name', 'offer_delete.tpl');
-$smarty->display('index.tpl');
diff --git a/offer_edit.php b/offer_edit.php
deleted file mode 100644
index 436f31b37..000000000
--- a/offer_edit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $workHelper->getAvailableWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('offer_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $request->getParameter('budget');
-  $cl_payment_info = $request->getParameter('payment_info');
-} else {
-  $cl_name = $offer['subject'];
-  $cl_description = $offer['descr_short'];
-  $cl_details = $offer['descr_long'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-  $cl_payment_info = $offer['payment_info'];
-  $cl_status = $offer['status_label'];
-  $cl_moderator_comment = $offer['moderator_comment'];
-}
-
-$show_moderator_comment = $cl_moderator_comment != null;
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-if ($work_id) {
-  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
-  $form->getElement('work_description')->setEnabled(false);
-}
-$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-if ($work_id) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-if ($work_id) $form->getElement('currency')->setEnabled(false);
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px; vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
-$form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->getElement('moderator_comment')->setEnabled(false);
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      // Update offer information.
-      $fields = array('offer_id'=>$cl_offer_id,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget,
-        'payment_info' => $cl_payment_info);
-      if ($workHelper->updateOwnOffer($fields)) {
-        header('Location: work.php');
-        exit();
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('show_moderator_comment', $show_moderator_comment);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_offer'));
-$smarty->assign('content_page_name', 'offer_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/offer_view.php b/offer_view.php
deleted file mode 100644
index ec3a98da5..000000000
--- a/offer_view.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getAvailableOffer($offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $workHelper->getAvailableWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$cl_contractor = $offer['group_name'];
-$cl_name = $offer['subject'];
-$cl_description = $offer['descr_short'];
-$cl_details = $offer['descr_long'];
-$cl_budget = $offer['amount_with_currency'];
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
-$form->getElement('contractor')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-
-$smarty->assign('offer_id', $offer_id);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.offer'));
-$smarty->assign('content_page_name', 'offer_view.tpl');
-$smarty->display('index.tpl');
diff --git a/offer_view_own.php b/offer_view_own.php
deleted file mode 100644
index 4f3c7b7a2..000000000
--- a/offer_view_own.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnOffer($offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $workHelper->getAvailableWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$cl_name = $offer['subject'];
-$cl_description = $offer['descr_short'];
-$cl_details = $offer['descr_long'];
-$cl_budget = $offer['amount_with_currency'];
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.offer'));
-$smarty->assign('content_page_name', 'offer_view_own.tpl');
-$smarty->display('index.tpl');
diff --git a/work.php b/work.php
deleted file mode 100644
index f7cfeb91e..000000000
--- a/work.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('update_work') || ttAccessAllowed('bid_on_work')  || ttAccessAllowed('manage_work'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$workHelper = new ttWorkHelper($err);
-$groupItems = $workHelper->getGroupItems(); // All group items.
-if($user->can('manage_work')) {
-  $own_work_items = $groupItems['own_work_items']; // Own work items this group is outsourcing.
-  $available_offers = $groupItems['available_offers']; // Available offers from other organizations.
-}
-if($user->can('bid_on_work')) {
-  $available_work_items = $groupItems['available_work_items']; // Currently available work items from other orgs.
-  $own_offers = $groupItems['own_offers']; // Own offers this group makes available to other groups.
-}
-if($user->can('update_work')) {
-  // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
-  // $completed_work = ttWorkHelper::getCompletedWork(); // Completed work items for other groups.
-}
-// TODO: review access rights for the code above.
-
-$smarty->assign('own_work_items', $own_work_items);
-$smarty->assign('available_work_items', $available_work_items);
-$smarty->assign('own_offers', $own_offers);
-$smarty->assign('available_offers', $available_offers);
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work.tpl');
-$smarty->display('index.tpl');
diff --git a/work/admin_offer_delete.php b/work/admin_offer_delete.php
index 51c46fce3..a1bd5fac1 100644
--- a/work/admin_offer_delete.php
+++ b/work/admin_offer_delete.php
@@ -32,14 +32,14 @@
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $adminWorkHelper = new ttAdminWorkHelper($err);
 $offer = $adminWorkHelper->getOffer($cl_offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/admin_offer_edit.php b/work/admin_offer_edit.php
index 32ed2a8ed..ab795c136 100644
--- a/work/admin_offer_edit.php
+++ b/work/admin_offer_edit.php
@@ -34,14 +34,14 @@
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $adminWorkHelper = new ttAdminWorkHelper($err);
 $offer = $adminWorkHelper->getOffer($cl_offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/admin_work.php b/work/admin_work.php
index 19b420987..86a029a4a 100644
--- a/work/admin_work.php
+++ b/work/admin_work.php
@@ -31,7 +31,7 @@
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/admin_work_delete.php b/work/admin_work_delete.php
index 38084e565..11b599430 100644
--- a/work/admin_work_delete.php
+++ b/work/admin_work_delete.php
@@ -32,14 +32,14 @@
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $cl_work_id = (int)$request->getParameter('id');
 $adminWorkHelper = new ttAdminWorkHelper($err);
 $work_item = $adminWorkHelper->getWorkItem($cl_work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/admin_work_edit.php b/work/admin_work_edit.php
index 626b1a77e..51169325c 100644
--- a/work/admin_work_edit.php
+++ b/work/admin_work_edit.php
@@ -34,14 +34,14 @@
 
 // Access checks.
 if (!ttAccessAllowed('administer_site')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $cl_work_id = (int)$request->getParameter('id');
 $adminWorkHelper = new ttAdminWorkHelper($err);
 $work_item = $adminWorkHelper->getWorkItem($cl_work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // Do we have offer_id?
@@ -49,7 +49,7 @@
 if ($offer_id) {
   $offer = $adminWorkHelper->getOffer($offer_id);
   if (!$offer) {
-    header('Location: access_denied.php');
+    header('Location: ../access_denied.php');
     exit();
   }
 }
diff --git a/work/offer_add.php b/work/offer_add.php
index 159bc3241..bafdae216 100644
--- a/work/offer_add.php
+++ b/work/offer_add.php
@@ -32,11 +32,11 @@
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 // Do we have work_id?
@@ -45,7 +45,7 @@
   $workHelper = new ttWorkHelper($err);
   $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
   if (!$work_item) {
-    header('Location: access_denied.php');
+    header('Location: ../access_denied.php');
     exit();
   }
 }
diff --git a/work/offer_delete.php b/work/offer_delete.php
index c8772599a..fd3d2e7d1 100644
--- a/work/offer_delete.php
+++ b/work/offer_delete.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $offer = $workHelper->getOwnOffer($cl_offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/offer_edit.php b/work/offer_edit.php
index 5eba66378..bd2172210 100644
--- a/work/offer_edit.php
+++ b/work/offer_edit.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $offer = $workHelper->getOwnOffer($cl_offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/offer_view.php b/work/offer_view.php
index 614b93188..1e045bf20 100644
--- a/work/offer_view.php
+++ b/work/offer_view.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $offer = $workHelper->getAvailableOffer($offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/offer_view_own.php b/work/offer_view_own.php
index c87013d08..57b1b95b3 100644
--- a/work/offer_view_own.php
+++ b/work/offer_view_own.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $offer = $workHelper->getOwnOffer($offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/work.php b/work/work.php
index 4f40e4ca9..b043690b4 100644
--- a/work/work.php
+++ b/work/work.php
@@ -31,11 +31,11 @@
 
 // Access checks.
 if (!(ttAccessAllowed('update_work') || ttAccessAllowed('bid_on_work')  || ttAccessAllowed('manage_work'))) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 // End of access checks.
diff --git a/work/work_add.php b/work/work_add.php
index c0b8795fd..df12c9155 100644
--- a/work/work_add.php
+++ b/work/work_add.php
@@ -32,11 +32,11 @@
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 // Do we have offer_id?
@@ -45,7 +45,7 @@
   $workHelper = new ttWorkHelper($err);
   $offer = $workHelper->getAvailableOffer($cl_offer_id);
   if (!$offer) {
-    header('Location: access_denied.php');
+    header('Location: ../access_denied.php');
     exit();
   }
 }
diff --git a/work/work_delete.php b/work/work_delete.php
index 75a111da3..1d94603ab 100644
--- a/work/work_delete.php
+++ b/work/work_delete.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 $cl_work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $work_item = $workHelper->getOwnWorkItem($cl_work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/work_edit.php b/work/work_edit.php
index f265da859..7e27106b8 100644
--- a/work/work_edit.php
+++ b/work/work_edit.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 $cl_work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $work_item = $workHelper->getOwnWorkItem($cl_work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // Do we have offer_id?
@@ -51,7 +51,7 @@
 if ($offer_id) {
   $offer = $workHelper->getAvailableOffer($offer_id);
   if (!$offer) {
-    header('Location: access_denied.php');
+    header('Location: ../access_denied.php');
     exit();
   }
 }
diff --git a/work/work_message.php b/work/work_message.php
index ca74915d4..9a009aa82 100644
--- a/work/work_message.php
+++ b/work/work_message.php
@@ -32,11 +32,11 @@
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 // Do we have work_id?
@@ -45,7 +45,7 @@
   $workHelper = new ttWorkHelper($err);
   $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
   if (!$work_item) {
-    header('Location: access_denied.php');
+    header('Location: ../access_denied.php');
     exit();
   }
 }
diff --git a/work/work_offer_view.php b/work/work_offer_view.php
index dc1074942..c0dd5ee1a 100644
--- a/work/work_offer_view.php
+++ b/work/work_offer_view.php
@@ -33,18 +33,18 @@
 
 // Access checks.
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $cl_offer_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $offer = $workHelper->getOwnWorkItemOffer($cl_offer_id);
 if (!$offer) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/work_offers.php b/work/work_offers.php
index e045892ea..eae9841bb 100644
--- a/work/work_offers.php
+++ b/work/work_offers.php
@@ -31,18 +31,18 @@
 
 // Access checks.
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 $work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $work_item = $workHelper->getOwnWorkItem($work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/work_view.php b/work/work_view.php
index 2bd8d3fd3..cb73f2eed 100644
--- a/work/work_view.php
+++ b/work/work_view.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $cl_work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // End of access checks.
diff --git a/work/work_view_own.php b/work/work_view_own.php
index 9930eaf99..c4b887e7e 100644
--- a/work/work_view_own.php
+++ b/work/work_view_own.php
@@ -32,18 +32,18 @@
 
 // Access checks.
 if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
+  header('Location: ../feature_disabled.php');
   exit();
 }
 if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 $work_id = (int)$request->getParameter('id');
 $workHelper = new ttWorkHelper($err);
 $work_item = $workHelper->getOwnWorkItem($work_id);
 if (!$work_item) {
-  header('Location: access_denied.php');
+  header('Location: ../access_denied.php');
   exit();
 }
 // Do we have offer_id?
@@ -51,7 +51,7 @@
 if ($offer_id) {
   $offer = $workHelper->getAvailableOffer($offer_id);
   if (!$offer) {
-    header('Location: access_denied.php');
+    header('Location: ../access_denied.php');
     exit();
   }
 }
diff --git a/work_add.php b/work_add.php
deleted file mode 100644
index 68bfe06ea..000000000
--- a/work_add.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// Do we have offer_id?
-$cl_offer_id = (int)$request->getParameter('offer_id');
-if ($cl_offer_id) {
-  $workHelper = new ttWorkHelper($err);
-  $offer = $workHelper->getAvailableOffer($cl_offer_id);
-  if (!$offer) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('work_name'));
-  $cl_work_type = $request->getParameter('work_type');
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  $cl_budget = $request->getParameter('budget');
-}
-// Override some fields for work being created on an available offer.
-if ($offer) {
-  $cl_name = $offer['subject'];
-  $cl_work_type = 0; // one-time work
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-}
-
-$form = new Form('workForm');
-if ($offer)
-  $form->addInput(array('type'=>'hidden','name'=>'offer_id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
-$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-// Add a dropdown for currency.
-$currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-// Disable some controls for work being created on an available offer.
-if ($offer) {
-  $form->getElement('work_name')->setEnabled(false);
-  $form->getElement('work_type')->setEnabled(false);
-  $form->getElement('currency')->setEnabled(false);
-  $form->getElement('budget')->setEnabled(false);
-}
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('offer_id' => $cl_offer_id,
-      'subject' => $cl_name,
-      'type' => $cl_work_type,
-      'descr_short' => $cl_description,
-      'descr_long' => $cl_details,
-      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-      'amount' => $cl_budget);
-     if ($workHelper->putOwnWorkItem($fields)) {
-        header('Location: work.php');
-        exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.workForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('title.add_work'));
-$smarty->assign('content_page_name', 'work_add.tpl');
-$smarty->display('index.tpl');
diff --git a/work_delete.php b/work_delete.php
deleted file mode 100644
index 87d7bd7c0..000000000
--- a/work_delete.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$work_to_delete = $work_item['subject'];
-
-$form = new Form('workDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($workHelper->deleteOwnWorkItem($cl_work_id)) {
-      header('Location: work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('work_to_delete', $work_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_work'));
-$smarty->assign('content_page_name', 'work_delete.tpl');
-$smarty->display('index.tpl');
diff --git a/work_edit.php b/work_edit.php
deleted file mode 100644
index 916a9aeef..000000000
--- a/work_edit.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// Do we have offer_id?
-$offer_id = $work_item['offer_id'];
-if ($offer_id) {
-  $offer = $workHelper->getAvailableOffer($offer_id);
-  if (!$offer) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('work_name'));
-  $cl_work_type = $request->getParameter('work_type');
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  $cl_budget = $request->getParameter('budget');
-} else {
-  $cl_name = $work_item['subject'];
-  $cl_work_type = $work_item['type'];
-  $cl_description = $work_item['descr_short'];
-  $cl_details = $work_item['descr_long'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $work_item['amount'];
-  $cl_status = $work_item['status_label'];
-  $cl_moderator_comment = $work_item['moderator_comment'];
-}
-// Override some fields for work on an available offer.
-if ($offer) {
-  $cl_name = $offer['subject'];
-  $cl_work_type = 0; // one-time work
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-}
-
-$show_moderator_comment = $cl_moderator_comment != null;
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
-$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
-$form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->getElement('moderator_comment')->setEnabled(false);
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-// Disable some controls for work on an available offer.
-if ($offer) {
-  $form->getElement('work_name')->setEnabled(false);
-  $form->getElement('work_type')->setEnabled(false);
-  $form->getElement('currency')->setEnabled(false);
-  $form->getElement('budget')->setEnabled(false);
-}
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      // Update work information.
-      $fields = array('work_id'=>$cl_work_id,
-        'type'=>$cl_work_type,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget);
-      if ($offer_id > 0) {
-        if ($workHelper->updateOwnWorkItemOnOffer($fields)) {
-          header('Location: work.php');
-          exit();
-        }
-      } else {
-        if ($workHelper->updateOwnWorkItem($fields)) {
-          header('Location: work.php');
-          exit();
-        }
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('show_moderator_comment', $show_moderator_comment);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_work'));
-$smarty->assign('content_page_name', 'work_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/work_message.php b/work_message.php
deleted file mode 100644
index 1a06143e6..000000000
--- a/work_message.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// Do we have work_id?
-$cl_work_id = (int)$request->getParameter('work_id');
-if ($cl_work_id) {
-  $workHelper = new ttWorkHelper($err);
-  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-  if (!$work_item) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-if ($work_item) $cl_name = $work_item['subject'];
-
-if ($request->isPost()) {
-  $cl_message_body = trim($request->getParameter('message_body'));
-}
-
-
-
-
-
-
-
-
-$form = new Form('messageForm');
-if ($cl_work_id) {
-  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
-}
-$form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
-$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_message_body)) $err->add($i18n->get('error.field'), $i18n->get('work.label.message'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('work_id'=>$cl_work_id,
-      'message_body' => $cl_message_body);
-    if ($workHelper->sendMessage($fields)) {
-      $msg->add($i18n->get('work.msg.message_sent'));
-      //  header('Location: work.php'); // TODO: where to redirect?
-      // exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('work.title.send_message'));
-$smarty->assign('content_page_name', 'work_message.tpl');
-$smarty->display('index.tpl');
diff --git a/work_offer_view.php b/work_offer_view.php
deleted file mode 100644
index 84fdc1cd0..000000000
--- a/work_offer_view.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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');
-require_once('plugins/work_constants.php');
-import('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnWorkItemOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Get an associated work item.
-$work_item = $workHelper->getOwnWorkItem($offer['work_id']);
-if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-
-if ($request->isPost()) {
-  $cl_client_comment = $request->getParameter('client_comment');
-} else {
-  $cl_client_comment = $offer['client_comment'];
-}
-
-$cl_contractor = $offer['group_name'];
-$cl_name = $offer['subject'];
-$cl_description = $offer['descr_short'];
-$cl_details = $offer['descr_long'];
-$cl_budget = $offer['amount_with_currency'];
-$cl_status = $offer['status_label'];
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
-$form->getElement('contractor')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
-$form->getElement('status')->setEnabled(false);
-if ($offer['status'] == STATUS_APPROVED) {
-  $form->addInput(array('type'=>'submit','name'=>'btn_accept','value'=>$i18n->get('work.button.accept')));
-  $form->addInput(array('type'=>'submit','name'=>'btn_decline','value'=>$i18n->get('work.button.decline')));
-}
-$form->addInput(array('type'=>'textarea','name'=>'client_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_client_comment));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_client_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('offer_id'=>$cl_offer_id,
-      'client_comment'=>$cl_client_comment);
-
-    if ($request->getParameter('btn_accept')) {
-      // Accept offer.
-      if ($workHelper->acceptOwnWorkItemOffer($fields)) {
-        header('Location: work_offer_view.php?id='.$cl_offer_id);
-        exit();
-      }
-    }
-
-    if ($request->getParameter('btn_decline')) {
-      // Decline offer.
-      if ($workHelper->declineOwnWorkItemOffer($fields)) {
-        header('Location: work_offer_view.php?id='.$cl_offer_id);
-        exit();
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.offer'));
-$smarty->assign('content_page_name', 'work_offer_view.tpl');
-$smarty->display('index.tpl');
diff --git a/work_offers.php b/work_offers.php
deleted file mode 100644
index 9da3930aa..000000000
--- a/work_offers.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$work_item_offers = $workHelper->getOwnWorkItemOffers($work_id);
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('work_item_offers', $work_item_offers);
-$smarty->assign('title', $i18n->get('work.label.offers'));
-$smarty->assign('content_page_name', 'work_offers.tpl');
-$smarty->display('index.tpl');
diff --git a/work_view.php b/work_view.php
deleted file mode 100644
index 03995e646..000000000
--- a/work_view.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$cl_client = $work_item['group_name'];
-$cl_name = $work_item['subject'];
-$cl_description = $work_item['descr_short'];
-$cl_details = $work_item['descr_long'];
-$cl_budget = $work_item['amount_with_currency'];
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'client','value'=>$cl_client));
-$form->getElement('client')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('work_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-$smarty->assign('work_id', $cl_work_id);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work_view.tpl');
-$smarty->display('index.tpl');
diff --git a/work_view_own.php b/work_view_own.php
deleted file mode 100644
index 15e57632b..000000000
--- a/work_view_own.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($work_id);
-if (!$work_item) {
-  header('Location: access_denied.php');
-  exit();
-}
-// Do we have offer_id?
-$offer_id = $work_item['offer_id'];
-if ($offer_id) {
-  $offer = $workHelper->getAvailableOffer($offer_id);
-  if (!$offer) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-$cl_name = $work_item['subject'];
-$cl_description = $work_item['descr_short'];
-$cl_details = $work_item['descr_long'];
-$cl_budget = $work_item['amount_with_currency'];
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('work_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work_view_own.tpl');
-$smarty->display('index.tpl');

From 036e6675223e9685f5218c76a368a1ac16db23d8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Nov 2019 18:01:57 +0000
Subject: [PATCH 1144/1848] Add a capability to send messages to offer owners.

---
 WEB-INF/lib/ttWorkHelper.class.php       | 76 ++++++++++++++++++--
 WEB-INF/templates/footer.tpl             |  2 +-
 WEB-INF/templates/work/offer_message.tpl | 32 +++++++++
 WEB-INF/templates/work/offer_view.tpl    |  1 +
 work/offer_message.php                   | 90 ++++++++++++++++++++++++
 work/work_message.php                    | 35 ++++-----
 6 files changed, 209 insertions(+), 27 deletions(-)
 create mode 100644 WEB-INF/templates/work/offer_message.tpl
 create mode 100644 work/offer_message.php

diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
index bcdd8a37a..6ddf87513 100644
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ b/WEB-INF/lib/ttWorkHelper.class.php
@@ -55,7 +55,8 @@ class ttWorkHelper {
   var $get_group_items_uri = null;      // URI to get all group items in one API call.
   var $delete_own_offer_uri = null; // URI to delete own offer.
   var $update_own_offer_uri = null; // URI to update own offer.
-  var $send_message_uri = null;     // URI to send message.
+  var $send_message_to_work_owner_uri = null; // URI to send message to work owner.
+  var $send_message_to_offer_owner_uri = null; // URI to send message to offer owner.
   var $site_id = null;              // Site id for work server.
   var $site_key = null;             // Site key for work server.
 
@@ -92,7 +93,8 @@ function __construct(&$errors) {
     $this->get_group_items_uri = $this->work_server_uri.'getgroupitems';
     $this->delete_own_offer_uri = $this->work_server_uri.'deleteownoffer';
     $this->update_own_offer_uri = $this->work_server_uri.'updateownoffer';
-    $this->send_message_uri = $this->work_server_uri.'sendmessage';
+    $this->send_message_to_work_owner_uri = $this->work_server_uri.'sendmessagetoworkowner';
+    $this->send_message_to_offer_owner_uri = $this->work_server_uri.'sendmessagetoofferowner';
     $this->checkSiteRegistration();
   }
 
@@ -1485,8 +1487,8 @@ function getAvailableOffer($offer_id) {
     return $offer;
   }
 
-  // sendMessage - sends a message via remote work server.
-  function sendMessage($fields) {
+  // sendMessageToWorkOwner - sends a message to work owner via remote work server.
+  function sendMessageToWorkOwner($fields) {
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -1517,7 +1519,71 @@ function sendMessage($fields) {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->send_message_uri);
+    curl_setopt($ch, CURLOPT_URL, $this->send_message_to_work_owner_uri);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+    // Execute a post request.
+    $result = curl_exec($ch);
+
+    // Close connection.
+    curl_close($ch);
+
+    if (!$result) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+
+    $result_array = json_decode($result, true);
+
+    // Check for errors.
+    $call_status = $result_array['call_status'];
+    if (!$call_status) {
+      $this->errors->add($i18n->get('error.remote_work'));
+      return false;
+    }
+    if ($call_status['code'] != TT_CURL_SUCCESS) {
+      $this->errors->add($call_status['error']);
+      return false;
+    }
+
+    return true;
+  }
+
+  // sendMessageToOfferOwner - sends a message to offer owner via remote work server.
+  function sendMessageToOfferOwner($fields) {
+    global $i18n;
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $curl_fields = array('lang' => urlencode($user->lang),
+      'site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      'org_id' => urlencode($org_id),
+      'org_key' => urlencode($user->getOrgKey()),
+      'group_id' => urlencode($group_id),
+      'group_name' => urlencode(base64_encode($user->getGroupName())),
+      'group_key' => urlencode($user->getGroupKey()),
+      'offer_id' => urlencode($fields['offer_id']),
+      'sender_ip' => urlencode($_SERVER['REMOTE_ADDR']),
+      'sender_user_id' => urlencode($user->getUser()),
+      'sender_name' => urlencode(base64_encode($user->getName())),
+      'sender_email' => urlencode(base64_encode($user->getEmail())),
+      'message_body' => urlencode(base64_encode($fields['message_body'])));
+
+    // url-ify the data for the POST.
+    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+    $fields_string = rtrim($fields_string, '&');
+
+    // Open connection.
+    $ch = curl_init();
+
+    // Set the url, number of POST vars, POST data.
+    curl_setopt($ch, CURLOPT_URL, $this->send_message_to_offer_owner_uri);
     curl_setopt($ch, CURLOPT_POST, true);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6b904f8b2..eff84a8a3 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.19.12.5170 | 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.12.5171 | 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/work/offer_message.tpl b/WEB-INF/templates/work/offer_message.tpl
new file mode 100644
index 000000000..c97a3db91
--- /dev/null
+++ b/WEB-INF/templates/work/offer_message.tpl
@@ -0,0 +1,32 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.messageForm.open}
+<table cellspacing="4" cellpadding="7" border="0" width="720">
+{if $offer}
+  <tr>
+    <td>
+      <table border="0" width="100%">
+        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
+      </table>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0" width="100%">
+        <tr>
+          <td align="right">{$i18n.work.label.message}:</td>
+          <td>{$forms.messageForm.message_body.control}</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.messageForm.btn_send.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.messageForm.close}
diff --git a/WEB-INF/templates/work/offer_view.tpl b/WEB-INF/templates/work/offer_view.tpl
index ad0b385f2..3d9d7d0c5 100644
--- a/WEB-INF/templates/work/offer_view.tpl
+++ b/WEB-INF/templates/work/offer_view.tpl
@@ -38,6 +38,7 @@
   <td align="center">
   <table>
   <tr>
+    <td><input type="button" onclick="chLocation('offer_message.php?offer_id={$offer_id}');" value="{$i18n.work.button.send_message}"></td>
     <td><input type="button" onclick="chLocation('work_add.php?offer_id={$offer_id}');" value="{$i18n.work.button.accept}"></td>
   </tr>
   </table>
diff --git a/work/offer_message.php b/work/offer_message.php
new file mode 100644
index 000000000..ff324808e
--- /dev/null
+++ b/work/offer_message.php
@@ -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('ttWorkHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_work')) {
+  header('Location: ../access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wk')) {
+  header('Location: ../feature_disabled.php');
+  exit();
+}
+$cl_offer_id = (int)$request->getParameter('offer_id');
+if (!$cl_offer_id) {
+  header('Location: ../access_denied.php');
+  exit();
+}
+$workHelper = new ttWorkHelper($err);
+$offer = $workHelper->getAvailableOffer($cl_offer_id);
+if (!$offer) {
+  header('Location: ../access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$cl_name = $offer['subject'];
+
+if ($request->isPost()) {
+  $cl_message_body = trim($request->getParameter('message_body'));
+}
+
+$form = new Form('messageForm');
+$form->addInput(array('type'=>'hidden','name'=>'offer_id','value'=>$cl_offer_id));
+$form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
+$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_message_body)) $err->add($i18n->get('error.field'), $i18n->get('work.label.message'));
+
+  // Ensure user email exists (required for workflow).
+  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
+
+  if ($err->no()) {
+    $workHelper = new ttWorkHelper($err);
+    $fields = array('offer_id'=>$cl_offer_id,
+      'message_body' => $cl_message_body);
+    if ($workHelper->sendMessageToOfferOwner($fields)) {
+      $msg->add($i18n->get('work.msg.message_sent'));
+      //  header('Location: work.php'); // TODO: where to redirect?
+      // exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('offer', $offer);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
+$smarty->assign('title', $i18n->get('work.title.send_message'));
+$smarty->assign('content_page_name', 'work/offer_message.tpl');
+$smarty->display('work/index.tpl');
diff --git a/work/work_message.php b/work/work_message.php
index 9a009aa82..984b2665b 100644
--- a/work/work_message.php
+++ b/work/work_message.php
@@ -39,34 +39,27 @@
   header('Location: ../feature_disabled.php');
   exit();
 }
-// Do we have work_id?
 $cl_work_id = (int)$request->getParameter('work_id');
-if ($cl_work_id) {
-  $workHelper = new ttWorkHelper($err);
-  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-  if (!$work_item) {
-    header('Location: ../access_denied.php');
-    exit();
-  }
+if (!$cl_work_id) {
+  header('Location: ../access_denied.php');
+  exit();
+}
+$workHelper = new ttWorkHelper($err);
+$work_item = $workHelper->getAvailableWorkItem($cl_work_id);
+if (!$work_item) {
+  header('Location: ../access_denied.php');
+  exit();
 }
 // End of access checks.
-if ($work_item) $cl_name = $work_item['subject'];
+
+$cl_name = $work_item['subject'];
 
 if ($request->isPost()) {
   $cl_message_body = trim($request->getParameter('message_body'));
 }
 
-
-
-
-
-
-
-
 $form = new Form('messageForm');
-if ($cl_work_id) {
-  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
-}
+$form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
 $form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
 $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
 
@@ -79,9 +72,9 @@
 
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
-    $fields = array('work_id'=>$cl_work_id,
+    $fields = array('work_id'=>$work_id,
       'message_body' => $cl_message_body);
-    if ($workHelper->sendMessage($fields)) {
+    if ($workHelper->sendMessageToWorkOwner($fields)) {
       $msg->add($i18n->get('work.msg.message_sent'));
       //  header('Location: work.php'); // TODO: where to redirect?
       // exit();

From 0137a7040ede0fa5081906a43529b428cd0d2b32 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Nov 2019 18:11:33 +0000
Subject: [PATCH 1145/1848] Fixed sending messages to work owners.

---
 WEB-INF/templates/footer.tpl | 2 +-
 work/work_message.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eff84a8a3..3eb2d745c 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.19.12.5171 | 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.12.5172 | 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/work/work_message.php b/work/work_message.php
index 984b2665b..91d02b5cb 100644
--- a/work/work_message.php
+++ b/work/work_message.php
@@ -72,7 +72,7 @@
 
   if ($err->no()) {
     $workHelper = new ttWorkHelper($err);
-    $fields = array('work_id'=>$work_id,
+    $fields = array('work_id'=>$cl_work_id,
       'message_body' => $cl_message_body);
     if ($workHelper->sendMessageToWorkOwner($fields)) {
       $msg->add($i18n->get('work.msg.message_sent'));

From a260f5f197167f71f28a1df6a9b760e4bc784847 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Nov 2019 16:42:16 +0000
Subject: [PATCH 1146/1848] Added attachments to expense items.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 104 +++++++++++++++++++++++++-
 WEB-INF/resources/ca.lang.php         |   1 +
 WEB-INF/resources/cs.lang.php         |   1 +
 WEB-INF/resources/da.lang.php         |   2 +
 WEB-INF/resources/de.lang.php         |   2 +
 WEB-INF/resources/en.lang.php         |   1 +
 WEB-INF/resources/es.lang.php         |   1 +
 WEB-INF/resources/et.lang.php         |   2 +
 WEB-INF/resources/fa.lang.php         |   2 +
 WEB-INF/resources/fi.lang.php         |   2 +
 WEB-INF/resources/fr.lang.php         |   2 +
 WEB-INF/resources/gr.lang.php         |   2 +
 WEB-INF/resources/he.lang.php         |   1 +
 WEB-INF/resources/hu.lang.php         |   1 +
 WEB-INF/resources/it.lang.php         |   2 +
 WEB-INF/resources/ja.lang.php         |   1 +
 WEB-INF/resources/ko.lang.php         |   1 +
 WEB-INF/resources/nl.lang.php         |   2 +
 WEB-INF/resources/no.lang.php         |   1 +
 WEB-INF/resources/pl.lang.php         |   2 +
 WEB-INF/resources/pt-br.lang.php      |   2 +
 WEB-INF/resources/pt.lang.php         |   1 +
 WEB-INF/resources/ro.lang.php         |   1 +
 WEB-INF/resources/ru.lang.php         |   1 +
 WEB-INF/resources/sk.lang.php         |   1 +
 WEB-INF/resources/sl.lang.php         |   1 +
 WEB-INF/resources/sr.lang.php         |   2 +
 WEB-INF/resources/sv.lang.php         |   2 +
 WEB-INF/resources/tr.lang.php         |   1 +
 WEB-INF/resources/zh-cn.lang.php      |   1 +
 WEB-INF/resources/zh-tw.lang.php      |   1 +
 WEB-INF/templates/expenses.tpl        |  16 ++++
 WEB-INF/templates/footer.tpl          |   2 +-
 WEB-INF/templates/report.tpl          |   5 +-
 expense_files.php                     |  89 ++++++++++++++++++++++
 expenses.php                          |  22 +++++-
 file_delete.php                       |  30 +++++++-
 file_download.php                     |  11 ++-
 file_edit.php                         |  24 +++++-
 39 files changed, 332 insertions(+), 14 deletions(-)
 create mode 100644 expense_files.php

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index b191fe379..303ca5767 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -52,7 +52,11 @@ static function insert($fields) {
       " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
       ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $id = $mdb2->lastInsertID('tt_expense_items', 'id');
+    return $id;
   }
 
   // update - updates a record in tt_expense_items table.
@@ -91,6 +95,15 @@ static function markDeleted($id) {
     global $user;
     $mdb2 = getConnection();
 
+    // Delete associated files.
+    if ($user->isPluginEnabled('at')) {
+      import('ttFileHelper');
+      global $err;
+      $fileHelper = new ttFileHelper($err);
+      if (!$fileHelper->deleteEntityFiles($id, 'expense'))
+        return false;
+    }
+
     $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
@@ -159,8 +172,84 @@ static function getItem($id) {
     return false;
   }
 
+  // getItemForFileView - retrieves an expense item identified by its id for
+  // attachment view operation.
+  //
+  // It is different from getItem, as we want users with appropriate rights
+  // to be able to see other users files, without changing "on behalf" user.
+  // For example, viewing reports for all users and their attached files
+  // from report links.
+  static function getItemForFileView($id) {
+    // There are several possible situations:
+    //
+    // Record is ours. Check "view_own_reports" or "view_all_reports".
+    // Record is for the current on behalf user. Check "view_reports" or "view_all_reports".
+    // Record is for someone else. Check "view_reports" or "view_all_reports" and rank.
+    //
+    // It looks like the best way is to use 2 queries, obtain user_id first, then check rank.
+
+    global $user;
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // Obtain user_id for the expense item.
+    $sql = "select ei.id, ei.user_id, ei.invoice_id, ei.approved from tt_expense_items ei ".
+      " where ei.id = $id and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    if (!$res->numRows()) return false;
+
+    $val = $res->fetchRow();
+    $user_id = $val['user_id'];
+
+    // If record is ours.
+    if ($user_id == $user->id) {
+      if ($user->can('view_own_reports') || $user->can('view_all_reports')) {
+        $val['can_edit'] = !($val['invoice_id'] || $val['approved']);
+        return $val;
+      }
+      return false; // No rights.
+    }
+
+    // If record belongs to a user we impersonate.
+    if ($user->behalfUser && $user_id == $user->behalfUser->id) {
+      if ($user->can('view_reports') || $user->can('view_all_reports')) {
+        $val['can_edit'] = !($val['invoice_id'] || $val['approved']);
+        return $val;
+      }
+      return false; // No rights.
+    }
+
+    // Record belongs to someone else. We need to check user rank.
+    if (!($user->can('view_reports') || $user->can('view_all_reports'))) return false;
+    $max_rank = $user->can('view_all_reports') ? MAX_RANK : $user->getMaxRankForGroup($group_id);
+
+    $left_joins = ' left join tt_users u on (ei.user_id = u.id)';
+    $left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
+
+    $where_part = " where ei.id = $id and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1".
+    $where_part .= " and r.rank <= $max_rank";
+
+    $sql = "select ei.id, ei.user_id, ei.invoice_id, ei.approved".
+      " from tt_expense_items ei $left_joins $where_part";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if (!$res->numRows()) {
+        return false;
+      }
+      if ($val = $res->fetchRow()) {
+        $val['can_edit'] = false;
+        return $val;
+      }
+    }
+    return false;
+  }
+
   // getItems - returns expense items for a user for a given date.
-  static function getItems($date) {
+  static function getItems($date, $includeFiles = false) {
     global $user;
     $mdb2 = getConnection();
 
@@ -174,13 +263,22 @@ static function getItems($date) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'expense' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (ei.id = Sub1.entity_id)";
+    }
+
     $left_joins = "";
     $left_joins = " left join tt_projects p on (ei.project_id = p.id)";
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (ei.client_id = c.id)";
 
+    $left_joins .= $fileJoin;
+
     $sql = "select ei.id as id $client_field, p.name as project, ei.name as item, ei.cost as cost,".
-      " ei.invoice_id, ei.approved from tt_expense_items ei $left_joins".
+      " ei.invoice_id, ei.approved $filePart from tt_expense_items ei $left_joins".
       " where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id".
       " and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1 order by ei.id";
 
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c52298ccf..f49ce3025 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -327,6 +327,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 633595e7e..6459cc953 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -337,6 +337,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index bf4a88e65..e03d73d43 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -313,6 +313,8 @@
 'title.expenses' => 'Udgifter',
 'title.edit_expense' => 'Redigér Udgift',
 'title.delete_expense' => 'Slet Udgift',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Predefinerede Udgifter',
 'title.add_predefined_expense' => 'Tilføj Predefinerede Udgifter',
 'title.edit_predefined_expense' => 'Redigér Predefinerede Udgifter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ee486f688..b4663d1b3 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -306,6 +306,8 @@
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Kostenposition ändern',
 'title.delete_expense' => 'Kostenposition löschen',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Berichte',
 'title.report' => 'Bericht',
 'title.send_report' => 'Bericht senden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 6376660d5..0c1b8e0a9 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -292,6 +292,7 @@
 'title.expenses' => 'Expenses',
 'title.edit_expense' => 'Editing Expense Item',
 'title.delete_expense' => 'Deleting Expense Item',
+'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Predefined Expenses',
 'title.add_predefined_expense' => 'Adding Predefined Expense',
 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 53a0bd5c4..a8faaf364 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -326,6 +326,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 562d6528f..ecb4a1e20 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -322,6 +322,8 @@
 'title.expenses' => 'Kulud',
 'title.edit_expense' => 'Kulukirje muutmine',
 'title.delete_expense' => 'Kulukirje kustutamine',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Eelmääratud kulukirje',
 'title.add_predefined_expense' => 'Lisa eelmääratud kulukirje',
 'title.edit_predefined_expense' => 'Muuda eelmääratut kulukirjet',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index c24d01f80..33776560a 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -324,6 +324,8 @@
 'title.expenses' => 'هزینه ها',
 'title.edit_expense' => 'ویرایش آیتم هزینه ها',
 'title.delete_expense' => 'حذف آیتم هزینه ها',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'گزارشات',
 'title.report' => 'گزارش',
 'title.send_report' => 'ارسال گزارش',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 62a542a1a..d8d477d15 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -317,6 +317,8 @@
 'title.expenses' => 'Kulut',
 'title.edit_expense' => 'Kulutietojen muokkaus',
 'title.delete_expense' => 'Kulutiedon poisto',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Raportit',
 'title.report' => 'Raportti',
 'title.send_report' => 'Raportin lähetys',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a08c65515..39755c50c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -311,6 +311,8 @@
 'title.expenses' => 'Dépenses',
 'title.edit_expense' => 'Modification d\\\'une dépense',
 'title.delete_expense' => 'Suppression d\\\'une dépense',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Rapports',
 'title.report' => 'Rapport',
 'title.send_report' => 'Envoi du rapport',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1b3fc2081..16baaf28c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -307,6 +307,8 @@
 'title.expenses' => 'Δαπάνες',
 'title.edit_expense' => 'Επεξεργασία δαπάνης',
 'title.delete_expense' => 'Διαγραφή δαπάνης',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Προκαθορισμένες δαπάνες',
 'title.add_predefined_expense' => 'Προσθήκη προκαθορισμένης δαπάνης',
 'title.edit_predefined_expense' => 'Επεξεργασία προκαθορισμένης δαπάνης',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index a5c59998d..706be9cae 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -332,6 +332,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'דוחות',
 'title.report' => 'דוח',
 'title.send_report' => 'שליחת דוח',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f333de5f2..8176a45c8 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -328,6 +328,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 474878f2f..7f667b445 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -315,6 +315,8 @@
 'title.expenses' => 'Spese',
 'title.edit_expense' => 'Modifica voce di spesa',
 'title.delete_expense' => 'Eliminezione voce di spesa',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Spese predefinite',
 'title.add_predefined_expense' => 'Aggiunta spese predefinite',
 'title.edit_predefined_expense' => 'Modifica spese predefinite',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ec3a4c754..fb0fd6fcb 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -333,6 +333,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index bdcf6d18a..8414edb52 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -333,6 +333,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 71c7ed4c3..fc7aeb361 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -297,6 +297,8 @@
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Bewerk kosten artikel',
 'title.delete_expense' => 'Verwijder kosten artikel',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Vaste kosten',
 'title.add_predefined_expense' => 'Vaste kosten toevoegen',
 'title.edit_predefined_expense' => 'Vaste kosten bewerken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8ef8f168e..b0dc2ead0 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -330,6 +330,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index dd712827b..de6ded99a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -318,6 +318,8 @@
 'title.expenses' => 'Wydatki',
 'title.edit_expense' => 'Edytowanie wpisu',
 'title.delete_expense' => 'Usuwanie wpisu',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Raporty',
 'title.report' => 'Raport',
 'title.send_report' => 'Wysyłanie raportu',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 52577c71d..fafb843bb 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -315,6 +315,8 @@
 'title.expenses' => 'Gastos',
 'title.edit_expense' => 'Editando item de gasto',
 'title.delete_expense' => 'Apagando item de gasto',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Relatórios',
 'title.report' => 'Report',
 'title.send_report' => 'Enviando relatório',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 195c2a773..3c6ecefd9 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -316,6 +316,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3da5b1fb3..9b6fc1750 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -333,6 +333,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1b753b2a3..a08157191 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -280,6 +280,7 @@
 'title.expenses' => 'Расходы',
 'title.edit_expense' => 'Редактирование предмета расхода',
 'title.delete_expense' => 'Удаление предмета расхода',
+'title.expense_files' => 'Файлы предмета расхода',
 'title.predefined_expenses' => 'Предопределенные расходы',
 'title.add_predefined_expense' => 'Добавление предопределенного расхода',
 'title.edit_predefined_expense' => 'Редактирование предопределенного расхода',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ffbf5894b..88d310e12 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -322,6 +322,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Zostavy',
 'title.report' => 'Zostava',
 'title.send_report' => 'Odosielanie zostavy',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8ecf0bcfc..ae9d8ab8c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -312,6 +312,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 9996d9a5e..b29f81bca 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -316,6 +316,8 @@
 'title.expenses' => 'Troškovi',
 'title.edit_expense' => 'Izmeni stavke troškova',
 'title.delete_expense' => 'Obriši stavke troškova',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.reports' => 'Izveštaji',
 'title.report' => 'Izveštaj',
 'title.send_report' => 'Slanje izveštaja',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3bae63b5f..41dea480e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -313,6 +313,8 @@
 'title.expenses' => 'Kostnader',
 'title.edit_expense' => 'Redigera kostnad',
 'title.delete_expense' => 'Ta bort kostnad',
+// TODO: translate the following.
+// 'title.expense_files' => 'Expense Item Files',
 'title.predefined_expenses' => 'Fördefinierade kostnader',
 'title.add_predefined_expense' => 'Lägg till fördefinierad kostnad',
 'title.edit_predefined_expense' => 'Redigera fördefinierad kostnad',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 948e9ad5b..4ac00f1c1 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -342,6 +342,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a5cfe24b3..8d96b36ee 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -322,6 +322,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 22694ddfa..77acaecad 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -328,6 +328,7 @@
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
+// 'title.expense_files' => 'Expense Item Files',
 // 'title.predefined_expenses' => 'Predefined Expenses',
 // 'title.add_predefined_expense' => 'Adding Predefined Expense',
 // 'title.edit_predefined_expense' => 'Editing Predefined Expense',
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 7272f01fe..c064b13de 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -153,6 +153,12 @@ function recalculateCost() {
           <td align="right">{$i18n.label.cost} (*):</td>
           <td>{$forms.expensesForm.cost.control} {$user->getCurrency()|escape}</td>
         </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.expensesForm.newfile.control}</td>
+        </tr>
+{/if}
       </table>
     </td>
     <td valign="top">
@@ -183,6 +189,9 @@ function recalculateCost() {
   {/if}
         <td class="tableHeader">{$i18n.label.item}</td>
         <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
+  {if $show_files}
+        <td></td>
+  {/if}
         <td></td>
         <td></td>
       </tr>
@@ -196,6 +205,13 @@ function recalculateCost() {
     {/if}
         <td valign="top">{$item.item|escape}</td>
         <td valign="top" align="right">{$item.cost}</td>
+    {if $show_files}
+      {if $item.has_files}
+        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {else}
+        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+      {/if}
+    {/if}
         <td valign="top" align="center">
     {if $item.approved || $item.invoice_id}
           &nbsp;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3eb2d745c..323328bb4 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.19.12.5172 | 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.13.5173 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 03d8d4497..e2207f1c7 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -166,7 +166,10 @@
     {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
-    {if $bean->getAttribute('chfiles')}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
+    {if $bean->getAttribute('chfiles')}
+      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
+      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
+    {/if}
     {if $use_checkboxes}
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
diff --git a/expense_files.php b/expense_files.php
new file mode 100644
index 000000000..feab9b611
--- /dev/null
+++ b/expense_files.php
@@ -0,0 +1,89 @@
+<?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('ttExpenseHelper');
+import('ttFileHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('at')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_id = (int)$request->getParameter('id');
+$item = ttExpenseHelper::getItemForFileView($cl_id);
+if (!$item) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_description = trim($request->getParameter('description'));
+}
+
+$fileHelper = new ttFileHelper($err);
+$files = $fileHelper::getEntityFiles($cl_id, 'expense');
+
+$form = new Form('fileUploadForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+$form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // We are adding a new file.
+
+  // Validate user input.
+  if (!$_FILES['newfile']['name']) $err->add($i18n->get('error.upload'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Finished validating user input.
+
+  if ($err->no()) {
+    $fields = array('entity_type'=>'expense',
+      'entity_id' => $cl_id,
+      'file_name' => $_FILES['newfile']['name'],
+      'description'=>$cl_description);
+    if ($fileHelper->putFile($fields)) {
+      header('Location: expense_files.php?id='.$cl_id);
+      exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('can_edit', $item['can_edit']);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('files', $files);
+$smarty->assign('title', $i18n->get('title.expense_files'));
+$smarty->assign('content_page_name', 'entity_files.tpl');
+$smarty->display('index.tpl');
diff --git a/expenses.php b/expenses.php
index 2c25bde66..2b7a15bc4 100644
--- a/expenses.php
+++ b/expenses.php
@@ -33,6 +33,7 @@
 import('DateAndTime');
 import('ttTimeHelper');
 import('ttExpenseHelper');
+import('ttFileHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
@@ -83,6 +84,7 @@
 
 $tracking_mode = $user->getTrackingMode();
 $show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
+$showFiles = $user->isPluginEnabled('at');
 
 // Initialize variables.
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
@@ -182,6 +184,8 @@
 }
 $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
@@ -212,8 +216,19 @@
 
     // Insert record.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
-          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
+      $id = ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1));
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'expense',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+
+      if ($id) {
         header('Location: expenses.php');
         exit();
       } else
@@ -224,8 +239,9 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_project', $show_project);
+$smarty->assign('show_files', $showFiles);
 $smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date, $showFiles));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/file_delete.php b/file_delete.php
index 3ef22aead..ff56f118b 100644
--- a/file_delete.php
+++ b/file_delete.php
@@ -30,6 +30,8 @@
 import('form.Form');
 import('ttFileHelper');
 import('ttTimeHelper');
+import('ttExpenseHelper');
+import('ttTimesheetHelper');
 import('ttProjectHelper');
 
 // Access checks.
@@ -47,14 +49,26 @@
     exit();
   }
 }
+if ($entity_type == 'expense') {
+  if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses')) || !ttExpenseHelper::getItemForFileView($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($entity_type == 'timesheet') {
+  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimesheetHelper::getTimesheet($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 if ($entity_type == 'project') {
   if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }
 }
-if ($entity_type != 'project' && $entity_type != 'time') {
-  // Currently, files are only associated with time records and projects.
+if (!($entity_type == 'time' || $entity_type != 'expense' || $entity_type != 'timesheet' || $entity_type == 'project')) {
+  // Currently, files are only associated with time records, expense items, timesheets, and projects.
   // Improve access checks when the feature evolves.
   header('Location: access_denied.php');
   exit();
@@ -76,6 +90,12 @@
       if ($entity_type == 'time') {
         header('Location: time_files.php?id='.$file['entity_id']);
       }
+      if ($entity_type == 'expense') {
+        header('Location: expense_files.php?id='.$file['entity_id']);
+      }
+      if ($entity_type == 'timesheet') {
+        header('Location: timesheet_files.php?id='.$file['entity_id']);
+      }
       if ($entity_type == 'project') {
         header('Location: project_files.php?id='.$file['entity_id']);
       }
@@ -85,6 +105,12 @@
     if ($entity_type == 'time') {
       header('Location: time_files.php?id='.$file['entity_id']);
     }
+    if ($entity_type == 'expense') {
+      header('Location: expense_files.php?id='.$file['entity_id']);
+    }
+    if ($entity_type == 'timesheet') {
+      header('Location: timesheet_files.php?id='.$file['entity_id']);
+    }
     if ($entity_type == 'project') {
       header('Location: project_files.php?id='.$file['entity_id']);
     }
diff --git a/file_download.php b/file_download.php
index e4d35c705..ac076b27e 100644
--- a/file_download.php
+++ b/file_download.php
@@ -30,6 +30,7 @@
 import('form.Form');
 import('ttFileHelper');
 import('ttTimeHelper');
+import('ttExpenseHelper');
 import('ttProjectHelper');
 
 // Access checks.
@@ -47,14 +48,20 @@
     exit();
   }
 }
+if ($entity_type == 'expense') {
+  if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses')) || !ttExpenseHelper::getItemForFileView($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 if ($entity_type == 'project') {
   if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects')) || !ttProjectHelper::get($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }
 }
-if ($entity_type != 'project' && $entity_type != 'time') {
-  // Currently, files are only associated with time records and projects.
+if ($entity_type != 'project' && $entity_type != 'time' && $entity_type != 'expense') {
+  // Currently, files are only associated with time records, expense items, and projects.
   // Improve access checks when the feature evolves.
   header('Location: access_denied.php');
   exit();
diff --git a/file_edit.php b/file_edit.php
index 4a675a502..d2c8f2990 100644
--- a/file_edit.php
+++ b/file_edit.php
@@ -30,6 +30,8 @@
 import('form.Form');
 import('ttFileHelper');
 import('ttTimeHelper');
+import('ttExpenseHelper');
+import('ttTimesheetHelper');
 import('ttProjectHelper');
 
 // Access checks.
@@ -47,14 +49,26 @@
     exit();
   }
 }
+if ($entity_type == 'expense') {
+  if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses')) || !ttExpenseHelper::getItemForFileView($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+if ($entity_type == 'timesheet') {
+  if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time')) || !ttTimesheetHelper::getTimesheet($file['entity_id'])) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 if ($entity_type == 'project') {
   if (!ttAccessAllowed('manage_projects') || !ttProjectHelper::get($file['entity_id'])) {
     header('Location: access_denied.php');
     exit();
   }
 }
-if ($entity_type != 'project' && $entity_type != 'time') {
-  // Currently, files are only associated with time records and projects.
+if (!($entity_type == 'time' || $entity_type != 'expense' || $entity_type != 'timesheet' || $entity_type == 'project')) {
+  // Currently, files are only associated with time records, expense items, timesheets, and projects.
   // Improve access checks when the feature evolves.
   header('Location: access_denied.php');
   exit();
@@ -87,6 +101,12 @@
         if ($entity_type == 'time') {
           header('Location: time_files.php?id='.$file['entity_id']);
         }
+        if ($entity_type == 'expense') {
+          header('Location: expense_files.php?id='.$file['entity_id']);
+        }
+        if ($entity_type == 'timesheet') {
+          header('Location: timesheet_files.php?id='.$file['entity_id']);
+        }
         if ($entity_type == 'project') {
           header('Location: project_files.php?id='.$file['entity_id']);
         }

From 1e8b19c543f518ad77d649922b0f1665acf2581c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Nov 2019 19:38:34 +0000
Subject: [PATCH 1147/1848] Fixing export of fav reports by including properly
 mapped report_spec field.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 69 ++++++++++++++++++++++-
 WEB-INF/lib/ttOrgImportHelper.class.php   |  1 -
 WEB-INF/templates/footer.tpl              |  2 +-
 3 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 79938f803..91d463542 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -556,10 +556,10 @@ function writeData() {
           }
         }
         $fav_report_part = $this->indentation.'    '."<fav_report id=\"".$this->favReportMap[$fav_report['id']]."\"";
-        $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
         $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\"";
+        $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
+        $fav_report_part .= " report_spec=\"".$this->remapReportSpec($fav_report['report_spec'])."\"";
         $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
-        $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"";
         $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
         $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
         $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
@@ -585,7 +585,6 @@ function writeData() {
         $fav_report_part .= " show_note=\"".$fav_report['show_note']."\"";
         $fav_report_part .= " show_approved=\"".$fav_report['show_approved']."\"";
         $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
-        $fav_report_part .= " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"";
         $fav_report_part .= " show_work_units=\"".$fav_report['show_work_units']."\"";
         $fav_report_part .= " group_by1=\"".$fav_report['group_by1']."\"";
         $fav_report_part .= " group_by2=\"".$fav_report['group_by2']."\"";
@@ -670,4 +669,68 @@ private function encodeLineBreaks($source) {
     $result = str_replace ("\r", '&#13;', $result);
     return $result;
   }
+
+  // isDropdownCustomField is a helper function for remapReportSpecPart.
+  // It deteremines if a custom field is of dropdown type.
+  private function isDropdownCustomField($field_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql = "select type from tt_custom_fields where group_id = $this->group_id and org_id = $user->org_id and id = $field_id";
+    $res = $mdb2->query($sql);
+    $isDropdown = false;
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $isDropdown = $val['type'] == 2; // TYPE_DROPDOWN, see CustomFields.class.php.
+        break;
+      }
+    }
+    return $isDropdown;
+  }
+
+  // remapReportSpecPart is a helper function remapReportSpec below.
+  // It remaps a single report spec part.
+  private function remapReportSpecPart($report_spec_part, $prefix) {
+    // Strip prefix.
+    $remainder = substr($report_spec_part, strlen($prefix));
+    // Find colon, which separates field id from its value.
+    $pos = strpos($remainder, ':');
+    $field_id = substr($remainder, 0, $pos);
+    $field_value = substr($remainder, $pos + 1);
+    $mapped_field_id = $this->customFieldMap[$field_id];
+
+    // Do we need to map option id?
+    if (!ttStartsWith($prefix, 'show_') && $this->isDropdownCustomField($field_id)) {
+      $mapped_field_value = $this->customFieldOptionMap[$field_value];
+    } else {
+      $mapped_field_value = $field_value;
+    }
+
+    $mappedPart = $prefix.$mapped_field_id.':'.$mapped_field_value;
+    return $mappedPart;
+  }
+
+  // remapReportSpec takes the source report spec as a parameter.
+  // It remaps it with new custom field and option ids so that it can be used for import.
+  private function remapReportSpec($report_spec) {
+    $remappedSpec = null;
+    $report_spec_parts = explode(',', $report_spec);
+    foreach ($report_spec_parts as $report_spec_part) {
+      if (ttStartsWith($report_spec_part, 'time_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'time_field_');
+      } elseif (ttStartsWith($report_spec_part, 'show_time_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'show_time_field_');
+      } elseif (ttStartsWith($report_spec_part, 'user_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'user_field_');
+      } elseif (ttStartsWith($report_spec_part, 'show_user_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'show_user_field_');
+      } else {
+        // Use the part as is.
+        $remappedSpec .= ','.$report_spec_part;
+      }
+    }
+    // Trim comma from the beginning.
+    $remappedSpec = ltrim($remappedSpec, ',');
+    return $remappedSpec;
+  }
 }
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 8549b9022..2d2f48d3e 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -487,7 +487,6 @@ function startElement($parser, $name, $attrs) {
           'chfinish' => (int) $attrs['SHOW_END'],
           'chnote' => (int) $attrs['SHOW_NOTE'],
           'chapproved' => (int) $attrs['SHOW_APPROVED'],
-          'chcf_1' => (int) $attrs['SHOW_CUSTOM_FIELD_1'],
           'chunits' => (int) $attrs['SHOW_WORK_UNITS'],
           'group_by1' => $attrs['GROUP_BY1'],
           'group_by2' => $attrs['GROUP_BY2'],
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 323328bb4..640f0444b 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.19.13.5173 | 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.13.5174 | 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>

From c6f8b562679212a775131c220648547fdc34d023 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Nov 2019 20:48:39 +0000
Subject: [PATCH 1148/1848] Fixed import of report_spec field for fav reports.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 74 +++++++++++++++++++++++--
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 2d2f48d3e..a3287a403 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -461,8 +461,8 @@ function startElement($parser, $name, $attrs) {
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
+          'report_spec' => $this->remapReportSpec($attrs['REPORT_SPEC']),
           'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
-          'option' => $this->currentGroupCustomFieldOptionMap[$attrs['CF_1_OPTION_ID']],
           'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
           'billable' => $attrs['BILLABLE'],
@@ -1038,15 +1038,15 @@ private function insertFavReport($fields) {
     $org_id = (int) $fields['org_id'];
 
     $sql = "insert into tt_fav_reports".
-      " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
+      " (name, user_id, group_id, org_id, report_spec, client_id, project_id, task_id,".
       " billable, approved, invoice, timesheet, paid_status, users, period, period_start, period_end,".
       " show_client, show_invoice, show_paid, show_ip,".
       " show_project, show_timesheet, show_start, show_duration, show_cost,".
-      " show_task, show_end, show_note, show_approved, show_custom_field_1, show_work_units,".
+      " show_task, show_end, show_note, show_approved, show_work_units,".
       " group_by1, group_by2, group_by3, show_totals_only)".
       " values(".
       $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
-      $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
+      $mdb2->quote($fields['report_spec']).", ".$mdb2->quote($fields['client']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
       $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
@@ -1056,7 +1056,7 @@ private function insertFavReport($fields) {
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
       $fields['chproject'].", ".$fields['chtimesheet'].", ".$fields['chstart'].", ".$fields['chduration'].", ".
       $fields['chcost'].", ".$fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".
-      $fields['chapproved'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
+      $fields['chapproved'].", ".$fields['chunits'].", ".
       $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
       $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
@@ -1244,4 +1244,68 @@ private function loginExists($login) {
     }
     return false;
   }
+
+  // isDropdownCustomField is a helper function for remapReportSpecPart.
+  // It deteremines if a custom field is of dropdown type.
+  private function isDropdownCustomField($field_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $sql = "select type from tt_custom_fields where id = $field_id";
+    $res = $mdb2->query($sql);
+    $isDropdown = false;
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $isDropdown = $val['type'] == 2; // TYPE_DROPDOWN, see CustomFields.class.php.
+        break;
+      }
+    }
+    return $isDropdown;
+  }
+
+  // remapReportSpecPart is a helper function remapReportSpec below.
+  // It remaps a single report spec part.
+  private function remapReportSpecPart($report_spec_part, $prefix) {
+    // Strip prefix.
+    $remainder = substr($report_spec_part, strlen($prefix));
+    // Find colon, which separates field id from its value.
+    $pos = strpos($remainder, ':');
+    $field_id = substr($remainder, 0, $pos);
+    $field_value = substr($remainder, $pos + 1);
+    $mapped_field_id = $this->currentGroupCustomFieldMap[$field_id];
+
+    // Do we need to map option id?
+    if (!ttStartsWith($prefix, 'show_') && $this->isDropdownCustomField($mapped_field_id)) {
+      $mapped_field_value = $this->currentGroupCustomFieldOptionMap[$field_value];
+    } else {
+      $mapped_field_value = $field_value;
+    }
+
+    $mappedPart = $prefix.$mapped_field_id.':'.$mapped_field_value;
+    return $mappedPart;
+  }
+
+  // remapReportSpec takes the source report spec as a parameter.
+  // It remaps it with new custom field and option ids so that it can be used for import.
+  private function remapReportSpec($report_spec) {
+    $remappedSpec = null;
+    $report_spec_parts = explode(',', $report_spec);
+    foreach ($report_spec_parts as $report_spec_part) {
+      if (ttStartsWith($report_spec_part, 'time_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'time_field_');
+      } elseif (ttStartsWith($report_spec_part, 'show_time_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'show_time_field_');
+      } elseif (ttStartsWith($report_spec_part, 'user_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'user_field_');
+      } elseif (ttStartsWith($report_spec_part, 'show_user_field_')) {
+        $remappedSpec .= ','.$this->remapReportSpecPart($report_spec_part, 'show_user_field_');
+      } else {
+        // Use the part as is.
+        $remappedSpec .= ','.$report_spec_part;
+      }
+    }
+    // Trim comma from the beginning.
+    $remappedSpec = ltrim($remappedSpec, ',');
+    return $remappedSpec;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 640f0444b..3284d0f1b 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.19.13.5174 | 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.13.5175 | 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>

From 4c73ffe1308c8a82dcaa462596e0897632978ddc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 30 Nov 2019 21:13:39 +0000
Subject: [PATCH 1149/1848] A bit of cleanup.

---
 WEB-INF/lib/ttFavReportHelper.class.php |  1 -
 WEB-INF/lib/ttReportHelper.class.php    | 32 +++----------------------
 WEB-INF/templates/footer.tpl            |  2 +-
 WEB-INF/templates/report.tpl            |  5 ----
 report.php                              |  1 -
 5 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 4cc1b0614..2707fd2b1 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -352,7 +352,6 @@ static function loadReport(&$bean) {
       }
 
       $bean->setAttribute('client', $val['client_id']);
-      $bean->setAttribute('option', $val['cf_1_option_id']);
       $bean->setAttribute('project', $val['project_id']);
       $bean->setAttribute('task', $val['task_id']);
       $bean->setAttribute('include_records', $val['billable']);
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1c2387148..9ca76e63e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -70,7 +70,6 @@ static function getWhere($options) {
       $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
-    if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')';
     if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
     if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
     if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
@@ -264,7 +263,6 @@ static function getItems($options) {
       $grouping_by_project = ttReportHelper::groupingBy('project', $options);
       $grouping_by_task = ttReportHelper::groupingBy('task', $options);
       $grouping_by_user = ttReportHelper::groupingBy('user', $options);
-      $grouping_by_cf_1 = ttReportHelper::groupingBy('cf_1', $options);
     }
     $convertTo12Hour = ('%I:%M %p' == $user->getTimeFormat()) && ($options['show_start'] || $options['show_end']);
     $trackingMode = $user->getTrackingMode();
@@ -303,17 +301,6 @@ static function getItems($options) {
     // Add task name if it is selected.
     if ($options['show_task'] || $grouping_by_task)
       array_push($fields, 't.name as task');
-    // Add custom field.
-    $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1;
-    if ($include_cf_1) {
-      $custom_fields = new CustomFields();
-      $cf_1_type = $custom_fields->fields[0]['type'];
-      if ($cf_1_type == CustomFields::TYPE_TEXT) {
-        array_push($fields, 'cfl.value as cf_1');
-      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        array_push($fields, 'cfo.value as cf_1');
-      }
-    }
     // Add time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -419,14 +406,6 @@ static function getItems($options) {
       $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
     if ($options['show_task'] || $grouping_by_task)
       $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
-    if ($include_cf_1) {
-      if ($cf_1_type == CustomFields::TYPE_TEXT)
-        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
-      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
-          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
-      }
-    }
     // Left joins for time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -509,8 +488,6 @@ static function getItems($options) {
         array_push($fields, 'p.name as project');
       if ($options['show_task'] || $grouping_by_task)
         array_push($fields, 'null'); // null for task name. We need to match column count for union.
-      if ($options['show_custom_field_1'] || $grouping_by_cf_1)
-        array_push($fields, 'null'); // null for cf_1.
       // Add null values for time custom fields.
       if ($custom_fields && $custom_fields->timeFields) {
         foreach ($custom_fields->timeFields as $timeField) {
@@ -668,7 +645,7 @@ static function putInSession($report_items) {
     $report_item_ids = trim($report_item_ids, ',');
     $report_item_expense_ids = trim($report_item_expense_ids, ',');
 
-    // The lists are reqdy. Put them in session.
+    // The lists are ready. Put them in session.
     if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids;
     if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids;
   }
@@ -734,9 +711,9 @@ static function getSubtotals($options) {
           $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
           $val['expenses'] = str_replace('.', $decimalMark, $val['expenses']);
         }
-        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
       } else
-        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time, 'units'=> $val['units']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'time'=>$time, 'units'=> $val['units']);
     }
 
     return $subtotals;
@@ -1365,7 +1342,6 @@ static function prepareReportBody($options, $comment = null)
             if ($options[$checkbox_control_name]) $body .= '<td></td>';
           }
         }
-        if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['cf_1'].'</td>';
         if ($options['show_start']) $body .= '<td></td>';
         if ($options['show_end']) $body .= '<td></td>';
         if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
@@ -1408,7 +1384,6 @@ static function prepareReportBody($options, $comment = null)
           if ($options[$checkbox_control_name]) $body .= '<td></td>';
         }
       }
-      if ($options['show_custom_field_1']) $body .= '<td></td>';
       if ($options['show_start']) $body .= '<td></td>';
       if ($options['show_end']) $body .= '<td></td>';
       if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
@@ -1557,7 +1532,6 @@ static function getReportOptions($bean) {
     $options['show_task'] = $bean->getAttribute('chtask');
     $options['show_end'] = $bean->getAttribute('chfinish');
     $options['show_note'] = $bean->getAttribute('chnote');
-    $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
     $options['show_work_units'] = $bean->getAttribute('chunits');
     $options['show_timesheet'] = $bean->getAttribute('chtimesheet');
     $options['show_files'] = $bean->getAttribute('chfiles');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3284d0f1b..3645de481 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.19.13.5175 | 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.13.5176 | 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/report.tpl b/WEB-INF/templates/report.tpl
index e2207f1c7..b65d0dfa9 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -52,7 +52,6 @@
   {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
   {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
-  {if $bean->getAttribute('chcf_1')}<td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>{/if}
 
   {* time custom fileds *}
   {if $custom_fields && $custom_fields->timeFields}
@@ -96,7 +95,6 @@
         {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
         {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
         {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
-        {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['cf_1']|escape}</td>{/if}
 
         {* time custom fileds *}
           {if $custom_fields && $custom_fields->timeFields}
@@ -144,7 +142,6 @@
     {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
-    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAligned">{$item.cf_1|escape}</td>{/if}
 
     {* time custom fileds *}
     {if $custom_fields && $custom_fields->timeFields}
@@ -201,7 +198,6 @@
     {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
-    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['cf_1']|escape}</td>{/if}
 
     {* time custom fileds *}
     {if $custom_fields && $custom_fields->timeFields}
@@ -243,7 +239,6 @@
     {if $bean->getAttribute('chclient')}<td></td>{/if}
     {if $bean->getAttribute('chproject')}<td></td>{/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
-    {if $bean->getAttribute('chcf_1')}<td></td>{/if}
 
     {* time custom fileds *}
     {if $custom_fields && $custom_fields->timeFields}
diff --git a/report.php b/report.php
index 53c73ee1c..da035fca7 100644
--- a/report.php
+++ b/report.php
@@ -291,7 +291,6 @@
 if ($bean->getAttribute('chclient')) $colspan++;
 if ($bean->getAttribute('chproject')) $colspan++;
 if ($bean->getAttribute('chtask')) $colspan++;
-if ($bean->getAttribute('chcf_1')) $colspan++;
 if ($bean->getAttribute('chstart')) $colspan++;
 if ($bean->getAttribute('chfinish')) $colspan++;
 if ($bean->getAttribute('chduration')) $colspan++;

From 4bb7513dea9e74af838160b33908f4d8145f69f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Dec 2019 14:47:45 +0000
Subject: [PATCH 1150/1848] A bit more cleanup.

---
 WEB-INF/lib/ttReportHelper.class.php | 86 ++--------------------------
 WEB-INF/templates/footer.tpl         |  2 +-
 mobile/time.php                      |  3 -
 time.php                             |  3 -
 4 files changed, 7 insertions(+), 87 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 9ca76e63e..fa7519a05 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1495,7 +1495,6 @@ static function getReportOptions($bean) {
     $options['name'] = null; // No name required.
     $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php.
     $options['client_id'] = $bean->getAttribute('client');
-    $options['cf_1_option_id'] = $bean->getAttribute('option');
     $options['project_id'] = $bean->getAttribute('project');
     $options['task_id'] = $bean->getAttribute('task');
     $options['billable'] = $bean->getAttribute('include_records');
@@ -1656,9 +1655,6 @@ static function makeGroupByPart($options) {
       case 'task':
         $group_by_parts .= ', t.name';
         break;
-      case 'cf_1':
-        $group_by_parts .= ', cfo.value';
-        break;
     }
     switch ($group_by2) {
       case 'date':
@@ -1676,9 +1672,6 @@ static function makeGroupByPart($options) {
       case 'task':
         $group_by_parts .= ', t.name';
         break;
-      case 'cf_1':
-        $group_by_parts .= ', cfo.value';
-        break;
     }
     switch ($group_by3) {
       case 'date':
@@ -1696,9 +1689,6 @@ static function makeGroupByPart($options) {
       case 'task':
         $group_by_parts .= ', t.name';
         break;
-      case 'cf_1':
-        $group_by_parts .= ', cfo.value';
-        break;
     }
     // Remove garbage from the beginning.
     $group_by_parts = ltrim($group_by_parts, ', ');
@@ -1793,10 +1783,6 @@ static function makeConcatPart($options) {
         $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
         $fields_part .= ', t.name as task';
         break;
-      case 'cf_1':
-        $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
-        $fields_part .= ', cfo.value as cf_1';
-        break;
     }
     switch ($group_by2) {
       case 'date':
@@ -1818,10 +1804,6 @@ static function makeConcatPart($options) {
         $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
         $fields_part .= ', t.name as task';
         break;
-      case 'cf_1':
-        $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
-        $fields_part .= ', cfo.value as cf_1';
-        break;
     }
     switch ($group_by3) {
       case 'date':
@@ -1843,10 +1825,6 @@ static function makeConcatPart($options) {
         $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
         $fields_part .= ', t.name as task';
         break;
-      case 'cf_1':
-        $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')";
-        $fields_part .= ', cfo.value as cf_1';
-        break;
     }
     // Remove garbage from both ends.
     $what_to_concat = trim($what_to_concat, "', -");
@@ -1877,16 +1855,10 @@ static function makeConcatExpensesPart($options) {
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
         $fields_part .= ', p.name as project';
         break;
-
       case 'task':
         $what_to_concat .= ", ' - ', 'Null'";
         $fields_part .= ', null as task';
         break;
-
-      case 'cf_1':
-        $what_to_concat .= ", ' - ', 'Null'";
-        $fields_part .= ', null as cf_1';
-        break;
     }
     switch ($group_by2) {
       case 'date':
@@ -1904,16 +1876,10 @@ static function makeConcatExpensesPart($options) {
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
         $fields_part .= ', p.name as project';
         break;
-
       case 'task':
         $what_to_concat .= ", ' - ', 'Null'";
         $fields_part .= ', null as task';
         break;
-
-      case 'cf_1':
-        $what_to_concat .= ", ' - ', 'Null'";
-        $fields_part .= ', null as cf_1';
-        break;
     }
     switch ($group_by3) {
       case 'date':
@@ -1931,16 +1897,10 @@ static function makeConcatExpensesPart($options) {
         $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
         $fields_part .= ', p.name as project';
         break;
-
       case 'task':
         $what_to_concat .= ", ' - ', 'Null'";
         $fields_part .= ', null as task';
         break;
-
-      case 'cf_1':
-        $what_to_concat .= ", ' - ', 'Null'";
-        $fields_part .= ', null as cf_1';
-        break;
     }
     // Remove garbage from the beginning.
     if ($what_to_concat)
@@ -1968,14 +1928,9 @@ static function makeCombinedSelectPart($options) {
       case 'project':
         $fields .= ', project';
         break;
-
       case 'task':
         $fields .= ', task';
         break;
-
-      case 'cf_1':
-        $fields .= ', cf_1';
-        break;
     }
     switch ($group_by2) {
       case 'user':
@@ -1987,14 +1942,9 @@ static function makeCombinedSelectPart($options) {
       case 'project':
         $fields .= ', project';
         break;
-
       case 'task':
         $fields .= ', task';
         break;
-
-      case 'cf_1':
-        $fields .= ', cf_1';
-        break;
     }
     switch ($group_by3) {
       case 'user':
@@ -2006,14 +1956,9 @@ static function makeCombinedSelectPart($options) {
       case 'project':
         $fields .= ', project';
         break;
-
       case 'task':
         $fields .= ', task';
         break;
-
-      case 'cf_1':
-        $fields .= ', cf_1';
-        break;
     }
     return $fields;
   }
@@ -2041,13 +1986,6 @@ static function makeJoinPart($options) {
     if (ttReportHelper::groupingBy('task', $options)) {
       $left_joins .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
-    if (ttReportHelper::groupingBy('cf_1', $options)) {
-      $custom_fields = new CustomFields();
-      if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-        $left_joins .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
-      elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-        $left_joins .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)';
-    }
     if ($options['show_cost'] && $trackingMode != MODE_TIME) {
       $left_joins .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
     }
@@ -2214,32 +2152,20 @@ static function makeGroupByHeader($options) {
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
-      if ('cf_1' == $group_by1)
-        $group_by_header .= ' - '.$custom_fields->fields[0]['label'];
-      else {
-        $key = 'label.'.$group_by1;
-        $group_by_header .= ' - '.$i18n->get($key);
-      }
+      $key = 'label.'.$group_by1;
+      $group_by_header .= ' - '.$i18n->get($key);
     }
     if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
       // We have group_by2.
       $group_by2 = $options['group_by2'];
-      if ('cf_1' == $group_by2)
-        $group_by_header .= ' - '.$custom_fields->fields[0]['label'];
-      else {
-        $key = 'label.'.$group_by2;
-        $group_by_header .= ' - '.$i18n->get($key);
-      }
+      $key = 'label.'.$group_by2;
+      $group_by_header .= ' - '.$i18n->get($key);
     }
     if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
       // We have group_by3.
       $group_by3 = $options['group_by3'];
-      if ('cf_1' == $group_by3)
-        $group_by_header .= ' - '.$custom_fields->fields[0]['label'];
-      else {
-        $key = 'label.'.$group_by3;
-        $group_by_header .= ' - '.$i18n->get($key);
-      }
+      $key = 'label.'.$group_by3;
+      $group_by_header .= ' - '.$i18n->get($key);
     }
     $group_by_header = ltrim($group_by_header, ' -');
     return $group_by_header;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3645de481..fe5bcc009 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.19.13.5176 | 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.13.5177 | 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/time.php b/mobile/time.php
index 04c25060f..c5fb0ea75 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -91,9 +91,6 @@
 $cl_finish = trim($request->getParameter('finish'));
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
-// Custom field.
-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));
-$_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
   if ($request->isPost()) {
diff --git a/time.php b/time.php
index a06773e72..4ee881e0c 100644
--- a/time.php
+++ b/time.php
@@ -136,9 +136,6 @@
 $cl_finish = trim($request->getParameter('finish'));
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
-// Custom field.
-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));
-$_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
   if ($request->isPost()) {

From ccf40a11f0f5265322d92f53cf756eaf76ff2052 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Dec 2019 15:12:51 +0000
Subject: [PATCH 1151/1848] Fixed mobile timer.php page to display multiple
 custom fields.

---
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/mobile/timer.tpl | 10 +++--
 mobile/timer.php                   | 63 ++++++++++++++++++------------
 time.php                           |  1 -
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fe5bcc009..0dcc6c0ec 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.19.13.5177 | 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.13.5178 | 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/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl
index 631f4977d..ea52f6b6b 100644
--- a/WEB-INF/templates/mobile/timer.tpl
+++ b/WEB-INF/templates/mobile/timer.tpl
@@ -71,9 +71,13 @@ startTimer();
 {if $user->isPluginEnabled('iv')}
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
-{if ($custom_fields && $custom_fields->fields[0])}
-      <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>
-      <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+      <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
+    </tr>
+  {/foreach}
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     <tr><td>{$i18n.label.project}:</td></tr>
diff --git a/mobile/timer.php b/mobile/timer.php
index d814637f6..2df6c73cc 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -60,9 +60,6 @@
 // Initialize variables.
 $cl_start = trim($request->getParameter('browser_time'));
 $cl_finish = trim($request->getParameter('browser_time'));
-// Custom field.
-$cl_cf_1 = trim($request->getParameter('cf_1', ($request->isPost() ? null : @$_SESSION['cf_1'])));
-$_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
   if ($request->isPost()) {
@@ -79,6 +76,22 @@
 $cl_task = $request->getParameter('task', @$_SESSION['task']);
 $_SESSION['task'] = $cl_task;
 
+$timeCustomFields = array();
+// If we have time custom fields - collect input.
+if ($request->isPost()) {
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+}
+
 // Obtain uncompleted record. Assumtion is that only 1 uncompleted record is allowed.
 $uncompleted = ttTimeHelper::getUncompleted($user->getUser());
 $enable_controls = ($uncompleted == null);
@@ -164,18 +177,19 @@
 else
   $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.finish'),'enable'=>!$enable_start));
 
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->fields[0]) {
-  // Only one custom field is supported at this time.
-  if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
-    $form->addInput(array('type'=>'combobox','name'=>'cf_1',
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
       'style'=>'width: 250px;',
-      'value'=>$cl_cf_1,
-      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))
-    ));
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
   }
 }
 
@@ -188,8 +202,12 @@
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
-    if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
+    // Validate input in time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($timeCustomFields as $timeField) {
+        // Validation is the same for text and dropdown fields.
+        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+      }
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
@@ -236,13 +254,10 @@
         'note' => $cl_note,
         'billable' => $cl_billable));
 
-      // Insert a custom field if we have it.
+      // Insert time custom fields if we have them.
       $result = true;
-      if ($id && $custom_fields && $cl_cf_1) {
-        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
-          $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
 
       if ($id && $result) {
@@ -285,11 +300,7 @@
 
 $week_total = ttTimeHelper::getTimeForWeek($cl_date);
 $smarty->assign('week_total', $week_total);
-
 $smarty->assign('uncompleted', $uncompleted);
-
-
-
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
diff --git a/time.php b/time.php
index 4ee881e0c..8b1c0926f 100644
--- a/time.php
+++ b/time.php
@@ -465,7 +465,6 @@
 $smarty->assign('time_records', $timeRecords);
 $smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
-// $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);

From 32e7a079dfa9b6c21ff46e9aafc5a435aadf797c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Dec 2019 15:23:32 +0000
Subject: [PATCH 1152/1848] Removed no longer used fields from tt_fav_reports
 table.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 11 +++++++----
 mysql.sql                    |  4 +---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0dcc6c0ec..820cf9c40 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.19.13.5178 | 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.14.5179 | 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/dbinstall.php b/dbinstall.php
index 28eb9646c..ea476d403 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11907"]) {
+  if ($_POST["convert11900to11914"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1180,6 +1180,9 @@ function ttGenerateKeys() {
     ttExecute("CREATE TABLE `tt_entity_custom_fields` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned NOT NULL,`org_id` int(10) unsigned NOT NULL,`entity_type` tinyint(4) NOT NULL,`entity_id` int(10) unsigned NOT NULL,`field_id` int(10) unsigned NOT NULL,`option_id` int(10) unsigned default NULL,`value` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned default NULL,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned default NULL,`status` tinyint(4) default 1,PRIMARY KEY  (`id`))");
     ttExecute("create unique index entity_idx on tt_entity_custom_fields(entity_type, entity_id, field_id)");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.7', modified = now() where param_name = 'version_db' and param_value = '1.19.6'");
+    ttExecute("ALTER TABLE `tt_fav_reports` drop `cf_1_option_id`");
+    ttExecute("ALTER TABLE `tt_fav_reports` drop `show_custom_field_1`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.14', modified = now() where param_name = 'version_db' and param_value = '1.19.7'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1229,7 +1232,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.7)</b>
+    <td width="80%"><b>Create database structure (v1.19.14)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1278,8 +1281,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.7)</td>
-    <td><input type="submit" name="convert11900to11907" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.14)</td>
+    <td><input type="submit" name="convert11900to11914" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index ec9c207df..3e9df4a1b 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -265,7 +265,6 @@ CREATE TABLE `tt_fav_reports` (
   `org_id` int(11) default NULL,                         # organization id
   `report_spec` text default NULL,                       # future replacement field for all report settings
   `client_id` int(11) default NULL,                      # client id (if selected)
-  `cf_1_option_id` int(11) default NULL,                 # custom field 1 option id (if selected)
   `project_id` int(11) default NULL,                     # project id (if selected)
   `task_id` int(11) default NULL,                        # task id (if selected)
   `billable` tinyint(4) default NULL,                    # whether to include billable, not billable, or all records
@@ -290,7 +289,6 @@ CREATE TABLE `tt_fav_reports` (
   `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
   `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
   `show_approved` tinyint(4) NOT NULL default 0,         # whether to show approved column
-  `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
   `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
   `group_by1` varchar(20) default NULL,                  # group by field 1
@@ -641,4 +639,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.7', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.14', now()); # TODO: change when structure changes.

From 5ff83cbed9ba642dae03995ee318b3de11c72b69 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Dec 2019 18:15:26 +0000
Subject: [PATCH 1153/1848] Fixed week view for multiple custom fields.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 53 +++++++++++---------------
 WEB-INF/templates/footer.tpl           |  2 +-
 display_options.php                    |  1 -
 week.php                               |  5 ++-
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 42815e31b..857626041 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -126,13 +126,12 @@ static function getRecordsForInterval($start_date, $end_date, $includeFiles = fa
   // getDataForWeekView - builds an array to render a table of durations and comments for a week view.
   // In a week view we want one row representing the same attributes to have 7 values for each day of week.
   // We identify similar records by a combination of client, billable, project, task, and custom field values.
-  // This will allow us to extend the feature when more custom fields are added.
   //
-  // "cl:546,bl:1,pr:23456,ts:27464,cf_1:example text"
-  // The above means client 546, billable, project 23456, task 27464, custom field text "example text".
+  // "cl:546,bl:1,pr:23456,ts:27464,time_field_856:BASE64ENCODEDtext,time_field_857:2345"
+  // The above means client 546, billable, project 23456, task 27464, custom time_field_856 is base64 encoded,
+  // custom time_field_857 option id is 2345".
   //
-  // "cl:546,bl:0,pr:23456,ts:27464,cf_1:7623"
-  // The above means client 546, not billable, project 23456, task 27464, custom field option id 7623.
+  // We use base64 encoding for text fields to make parsing of such things possible when text contains commas, etc.
   //
   // Daily comments are implemented as alternate rows following week durations (when enabled).
   // For example: row_0 - new entry durations, row_1 - new entry daily comments,
@@ -165,7 +164,7 @@ static function getRecordsForInterval($start_date, $end_date, $includeFiles = fa
   //   ),
   //
   //   array( // Row 2.
-  //     'row_id' => 'cl:546,bl:1,pr:23456,ts:27464,cf_1:7623_0',
+  //     'row_id' => 'cl:546,bl:1,pr:23456,ts:27464,time_field_857:7623_0',
   //     'label' => 'Anuko - Time Tracker - Coding - Option 2',
   //     'day_0' => array('control_id' => '2_day_0', 'tt_log_id' => 12345, 'duration' => '00:00'),
   //     'day_1' => array('control_id' => '2_day_1', 'tt_log_id' => 12346, 'duration' => '01:00'),
@@ -176,7 +175,7 @@ static function getRecordsForInterval($start_date, $end_date, $includeFiles = fa
   //     'day_6' => array('control_id' => '2_day_6', 'tt_log_id' => null, 'duration' => null)
   //   ),
   //   array( // Row 3.
-  //     'row_id' => 'cl:546,bl:1,pr:23456,ts:27464,cf_1:7623_0_notes',
+  //     'row_id' => 'cl:546,bl:1,pr:23456,ts:27464,time_field_857:7623_0_notes',
   //     'label' => 'Notes:',
   //     'day_0' => array('control_id' => '3_day_0', 'tt_log_id' => 12345, 'note' => 'Comment one'),
   //     'day_1' => array('control_id' => '3_day_1', 'tt_log_id' => 12346, 'note' => 'Comment two'),
@@ -425,8 +424,7 @@ static function getLockedDaysForWeek($start_date) {
   // makeRowIdentifier - builds a string identifying a row for a week view from a single record properties.
   //                     Note that the return value is without a suffix.
   // For example:
-  // "cl:546,bl:0,pr:23456,ts:27464,cf_1:example text"
-  // "cl:546,bl:1,pr:23456,ts:27464,cf_1:7623"
+  // "cl:546,bl:0,pr:23456,ts:27464,time_field_856:example text,time_field_857:7623"
   static function makeRowIdentifier($record) {
     global $user;
     // Start with client.
@@ -445,10 +443,10 @@ static function makeRowIdentifier($record) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         if ($timeField['type'] == CustomFields::TYPE_TEXT)
-           $field_value = $record[$field_name];
+           $field_value = base64_encode($record[$field_name]);
         else if ($timeField['type'] == CustomFields::TYPE_DROPDOWN)
            $field_value =  $record[$field_name.'_option_id'];
-        $row_identifier .= ',cf_'.$timeField['id'].":$field_value";
+        $row_identifier .= ",$field_name:$field_value";
       }
     }
     return $row_identifier;
@@ -473,12 +471,6 @@ static function makeRowLabel($record) {
     if (!empty($label) && !empty($record['task'])) $label .= ' - ';
     $label .= $record['task'];
 
-    // Add custom field 1.
-    if ($user->isPluginEnabled('cf')) {
-      if (!empty($label) && !empty($record['cf_1_value'])) $label .= ' - ';
-      $label .= $record['cf_1_value'];
-    }
-
     // Add custom field parts.
     global $custom_fields;
     if ($custom_fields && $custom_fields->timeFields) {
@@ -494,9 +486,9 @@ static function makeRowLabel($record) {
   }
 
   // parseFromWeekViewRow - obtains field value encoded in row identifier.
-  // For example, for a row id like "cl:546,bl:0,pr:23456,ts:27464,cf_1:example text"
+  // For example, for a row id like "cl:546,bl:0,pr:23456,ts:27464,time_field_856:example text,time_field_857:2345"
   // requesting a client "cl" should return 546.
-  static function parseFromWeekViewRow($row_id, $field_label) {
+  static function parseFromWeekViewRow($row_id, $field_label, $base64decode = false) {
     // Find beginning of label.
     $pos = strpos($row_id, $field_label);
     if ($pos === false) return null; // Not found.
@@ -504,15 +496,19 @@ static function parseFromWeekViewRow($row_id, $field_label) {
     // Strip suffix from row id.
     $suffixPos = strrpos($row_id, '_');
     if ($suffixPos)
-      $remaninder = substr($row_id, 0, $suffixPos);
+      $remainder = substr($row_id, 0, $suffixPos);
 
     // Find beginning of value.
-    $posBegin = 1 + strpos($remaninder, ':', $pos);
+    $posBegin = 1 + strpos($remainder, ':', $pos);
     // Find end of value.
-    $posEnd = strpos($remaninder, ',', $posBegin);
-    if ($posEnd === false) $posEnd = strlen($remaninder);
-    // Return value.
-    return substr($remaninder, $posBegin, $posEnd - $posBegin);
+    $posEnd = strpos($remainder, ',', $posBegin);
+    if ($posEnd === false) $posEnd = strlen($remainder);
+
+    $result = substr($remainder, $posBegin, $posEnd - $posBegin);
+    if ($base64decode)
+        $result = base64_decode($result);
+
+    return $result;
   }
 
   // dateFromDayHeader calculates date from start date and day header in week view.
@@ -571,13 +567,10 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     if ($id && $custom_fields && $custom_fields->timeFields) {
       if ($fields['row_id']) {
         foreach ($custom_fields->timeFields as $timeField) {
-//          $control_name = 'time_field_'.$timeField['id'];
+          $base64decode = $timeField['type'] == CustomFields::TYPE_TEXT; // Decode all text fields back to clear text.
           $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-//            'control_name' => $control_name,
-//            'label' => $timeField['label'],
             'type' => $timeField['type'],
-//            'required' => $timeField['required'],
-            'value' => ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cf_'.$timeField['id']));
+            'value' => ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'time_field_'.$timeField['id'], $base64decode));
         }
       }
       $result = $custom_fields->insertTimeFields($id, $timeCustomFields); // TODO: fix this.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 820cf9c40..b00f04392 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.19.14.5179 | 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.14.5180 | 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/display_options.php b/display_options.php
index ec4ddd95a..d65f15ab3 100644
--- a/display_options.php
+++ b/display_options.php
@@ -51,7 +51,6 @@
 
 // Time page.
 // $form->addInput(array('type'=>'checkbox','name'=>'time_client','value'=>$cl_time_client));
-// $form->addInput(array('type'=>'checkbox','name'=>'time_cf_1','value'=>$cl_time_cf_1));
 // $form->addInput(array('type'=>'checkbox','name'=>'time_project','value'=>$cl_time_project));
 // $form->addInput(array('type'=>'checkbox','name'=>'time_task','value'=>$cl_time_task));
 // $form->addInput(array('type'=>'checkbox','name'=>'time_start','value'=>$cl_time_start));
diff --git a/week.php b/week.php
index 6b7cb1d90..b0d609d13 100644
--- a/week.php
+++ b/week.php
@@ -444,7 +444,10 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 if ($custom_fields && $custom_fields->timeFields) {
                   foreach ($custom_fields->timeFields as $timeField) {
                     $field_name = 'time_field_'.$timeField['id'];
-                    $record[$field_name] = $timeCustomFields[$timeField['id']]['value'];
+                    if ($timeField['type'] == CustomFields::TYPE_TEXT)
+                      $record[$field_name] = $timeCustomFields[$timeField['id']]['value'];
+                    else if ($timeField['type'] == CustomFields::TYPE_DROPDOWN)
+                      $record[$field_name.'_option_id'] = $timeCustomFields[$timeField['id']]['value'];
                   }
                 }
                 $fields['row_id'] = ttWeekViewHelper::makeRowIdentifier($record).'_0';

From 99cfa872fb82c5939be1dc8d4bc2ab0bd5c220cd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Mar 2020 16:36:52 +0000
Subject: [PATCH 1154/1848] Fixed timesheet approval workflow.

---
 WEB-INF/templates/footer.tpl | 2 +-
 timesheet_view.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b00f04392..e2fee92b3 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.19.14.5180 | 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.15.5181 | 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/timesheet_view.php b/timesheet_view.php
index c8d7048a4..a1ee74d26 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -65,7 +65,7 @@
   $showApprovers = count($approvers) >= 1;
 }
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
-$showApprove = $timesheet['submit_status'] && $timesheet['approve_status'] == null;
+$showApprove = $timesheet['submit_status'] && $timesheet['approve_status'] == null && $canApprove;
 
 // Add a form with controls.
 $form = new Form('timesheetForm');

From 789503c8ec404352b316cf4302e29f9d729d67e4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Mar 2020 18:05:54 +0000
Subject: [PATCH 1155/1848] Removed a PHP warning condition.

---
 WEB-INF/templates/footer.tpl | 2 +-
 reports.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e2fee92b3..1da155dcb 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.19.15.5181 | 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.15.5182 | 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/reports.php b/reports.php
index 84d8bde08..253652b94 100644
--- a/reports.php
+++ b/reports.php
@@ -391,7 +391,7 @@
 
 if ($request->isGet() && !$bean->isSaved()) {
   // No previous form data were found in session. Use the following default values.
-  $form->setValueByElement('users_active', array_keys($user_list_active));
+  $form->setValueByElement('users_active', array_keys((array)$user_list_active));
   $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
   $form->setValueByElement('start_date', $period->getStartDate());
   $form->setValueByElement('end_date', $period->getEndDate());

From 8762873a1eb28de2d927fad1a5906a6541b2a3c0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Mar 2020 18:31:48 +0000
Subject: [PATCH 1156/1848] Got rid of another PHP warning.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 89a1973fb..1bdb1c19f 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -571,7 +571,7 @@ function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
 
     $groups[] = array('id'=>$group_id, 'name'=>$name);
 
-    $subgroups = $this->getSubgroups($group_id);
+    $subgroups = (array) $this->getSubgroups($group_id);
     foreach($subgroups as $subgroup) {
       $this->addGroupToDropdown($groups, $subgroup['id'], $subgroup_level+1);
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1da155dcb..6a17b0185 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.19.15.5182 | 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.15.5183 | 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>

From a5e16a489f2021c9d709f59b34fa2ab611540d2f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Mar 2020 18:37:16 +0000
Subject: [PATCH 1157/1848] Got rid of another PHP warning.

---
 WEB-INF/lib/ttGroupHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 48e4de724..83ffe648c 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -157,7 +157,7 @@ static function markGroupDeleted($group_id) {
     // Keep the logic simple by returning false on first error.
 
     // Obtain subgroups and call self recursively on them.
-    $subgroups = $user->getSubgroups($group_id);
+    $subgroups = (array) $user->getSubgroups($group_id);
     foreach($subgroups as $subgroup) {
       if (!ttGroupHelper::markGroupDeleted($subgroup['id']))
         return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6a17b0185..f682fe618 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.19.15.5183 | 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.15.5184 | 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>

From 402edebfaefcf41f70e3c9e9b8223a32e5575416 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 17 Mar 2020 23:49:40 +0000
Subject: [PATCH 1158/1848] Eliminated one more PHP warning.

---
 WEB-INF/templates/footer.tpl | 2 +-
 charts.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f682fe618..e49e3ff34 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.19.15.5184 | 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.15.5185 | 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/charts.php b/charts.php
index 862a2fad6..4ca91a151 100644
--- a/charts.php
+++ b/charts.php
@@ -205,7 +205,7 @@
 $file_name = $img_dir.$file_name; // Full file name. 
 
 // Clean up the file system from older images.
-$img_files = glob($img_dir.'chart_*.png');
+$img_files = (array) glob($img_dir.'chart_*.png');
 foreach($img_files as $file) {
   // If the create time of file is older than 1 minute, delete it.
   if (filemtime($file) < (time() - 60)) {

From 5a1c585bdc0633e871a1c2af81df22dfb28f314e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 18 Mar 2020 01:36:13 +0000
Subject: [PATCH 1159/1848] Got rid of one more PHP warning.

---
 WEB-INF/templates/footer.tpl |  2 +-
 charts.php                   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e49e3ff34..94fc6e34f 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.19.15.5185 | 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.15.5186 | 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/charts.php b/charts.php
index 4ca91a151..942b5ce7b 100644
--- a/charts.php
+++ b/charts.php
@@ -205,11 +205,13 @@
 $file_name = $img_dir.$file_name; // Full file name. 
 
 // Clean up the file system from older images.
-$img_files = (array) glob($img_dir.'chart_*.png');
-foreach($img_files as $file) {
-  // If the create time of file is older than 1 minute, delete it.
-  if (filemtime($file) < (time() - 60)) {
-    unlink($file);
+$img_files = glob($img_dir.'chart_*.png');
+if (is_array($img_files)) {
+  foreach($img_files as $file) {
+    // If file creation time is older than 1 minute, delete it.
+    if (filemtime($file) < (time() - 60)) {
+      unlink($file);
+    }
   }
 }
 

From 93e14dc4da46515c90b86d0330f1d3588f3c4ac0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 13 May 2020 18:10:26 +0000
Subject: [PATCH 1160/1848] Fixed ttValidDate function to handle DD-MM-YYYY
 date format.

---
 WEB-INF/lib/common.lib.php   | 3 ++-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index b19feacdc..1f2829442 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -245,9 +245,10 @@ function ttValidDate($val)
   if (strlen($val) == 0)
     return false;
 
-  // This should accept a string in format 'YYYY-MM-DD', 'MM/DD/YYYY', 'DD.MM.YYYY', or 'DD.MM.YYYY whatever'.
+  // This should accept a string in format 'YYYY-MM-DD', 'MM/DD/YYYY', 'DD-MM-YYYY', 'DD.MM.YYYY', or 'DD.MM.YYYY whatever'.
   if (!preg_match('/^\d\d\d\d-\d\d-\d\d$/', $val) &&
     !preg_match('/^\d\d\/\d\d\/\d\d\d\d$/', $val) &&
+    !preg_match('/^\d\d\-\d\d\-\d\d\d\d$/', $val) &&
     !preg_match('/^\d\d\.\d\d\.\d\d\d\d$/', $val) &&
     !preg_match('/^\d\d\.\d\d\.\d\d\d\d .+$/', $val))
     return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 94fc6e34f..9af4352eb 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.19.15.5186 | 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.16.5187 | 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>

From 355dfcff28334a24ab0d6f02535072a152ccf592 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 2 Jun 2020 17:51:50 +0000
Subject: [PATCH 1161/1848] Improved bot protection slightly.

---
 WEB-INF/lib/ttRegistrator.class.php | 10 +++++-----
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index e054fe001..936bb4ffd 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -217,7 +217,7 @@ private function setCreatedBy($user_id) {
 
   // registeredRecently determines if we already have successful recent registration(s) from user IP.
   // "recent" means the following:
-  // - 2 or more registrations during last 10 minutes, or
+  // - 2 or more registrations during last 15 minutes, or
   // - 1 registration during last minute.
   //
   // This offers some level of protection from bot registrations.
@@ -225,17 +225,17 @@ function registeredRecently() {
     $mdb2 = getConnection();
 
     $ip_part = ' created_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $sql = 'select count(*) as cnt from tt_groups where '.$ip_part.' and created > now() - interval 10 minute';
+    $sql = 'select count(*) as cnt from tt_groups where '.$ip_part.' and created > now() - interval 15 minute';
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error'))
       return false;
     $val = $res->fetchRow();
     if ($val['cnt'] == 0)
-      return false; // No registrations in last 10 minutes.
+      return false; // No registrations in last 15 minutes.
     if ($val['cnt'] >= 2)
-      return true;  // 2 or more registrations in last 10 mintes.
+      return true;  // 2 or more registrations in last 15 mintes.
 
-    // If we are here, there was exactly one registration during last 10 minutes.
+    // If we are here, there was exactly one registration during last 15 minutes.
     // Determine if it occurred within the last minute in a separate query.
     $sql = 'select created from tt_groups where '.$ip_part.' and created > now() - interval 1 minute';
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9af4352eb..72e375036 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.19.16.5187 | 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.16.5188 | 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>

From 3540c71810375d32fbddfdcd40ba90f87d423bec Mon Sep 17 00:00:00 2001
From: Juergen Neumann <j.neumann@junes.eu>
Date: Thu, 11 Jun 2020 22:23:51 +0200
Subject: [PATCH 1162/1848] patched openldap to work with member_of groups
 (#90)

Co-authored-by: Juergen Neumann <juergen@junes.eu>
---
 WEB-INF/lib/auth/Auth_ldap.class.php | 45 +++++++++++++++++-----------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 5fb3dcf3d..b2138e67c 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -199,12 +199,6 @@ function authenticate($login, $password)
         echo '$login_oldap='; var_dump($login_oldap); echo '<br />';
       }
 
-      // check if the user specified full login
-      if (strpos($login, '@') === false) {
-        // append default domain
-        $login .= '@' . $this->params['default_domain'];
-      }
-
       $lb = @ldap_bind($lc, $login_oldap, $password);
 
       if (isTrue('DEBUG')) {
@@ -221,11 +215,18 @@ function authenticate($login, $password)
         // TODO: Fix this for OpenLDAP, as samaccountname has nothing to do with it.
         // get groups
 
-        $filter = 'samaccountname='.Auth_ldap::ldap_escape($login_oldap);
-        $fields = array('samaccountname', 'mail', 'memberof', 'department', 'displayname', 'telephonenumber', 'primarygroupid');
+        if (isTrue('DEBUG')) {
+          echo '$member_of : '; var_dump($member_of); echo '<br />';
+        }
+
+        $filter = 'uid='.$login; 	// ldap search filter
+        $fields = array('memberof');    // ldap search attributes
+        // $fields = 'uid';
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
         if (isTrue('DEBUG')) {
+          echo '$filter='; var_dump($filter); echo '<br />';
+          echo '$fields='; var_dump($fields); echo '<br />';
           echo '$sr='; var_dump($sr); echo '<br />';
           echo 'ldap_error()='; echo ldap_error($lc); echo '<br />';
         }
@@ -248,24 +249,28 @@ function authenticate($login, $password)
           return false;
         }
 
-        $groups = array();
+        $groups = array(); // existing ldap group memberships
 
-        // extract group names from
-        // assuming the groups are in format: CN=<group_name>,...
         for ($i = 0; $i < @$entries[0]['memberof']['count']; $i++) {
-          $grp = $entries[0]['memberof'][$i];
-          $grp_fields = explode(',', $grp);
-          $groups[] = substr($grp_fields[0], 3);
-        }
+	  $grp = $entries[0]['memberof'][$i];
+          $groups[] = $grp; // append group to array
+          if (isTrue('DEBUG')) {
+            var_dump($grp); echo ' appended to $groups<br />';
+          };
 
-        if (isTrue('DEBUG')) {
-          echo '$member_of'; var_dump($member_of); echo '<br />';
         }
 
+
         // check for group membership
         foreach ($member_of as $check_grp) {
+          if (isTrue('DEBUG')) {
+            echo '$check_grp:'; var_dump($check_grp); echo '<br />';
+          };
           if (!in_array($check_grp, $groups)) {
             ldap_unbind($lc);
+            if (isTrue('DEBUG')) {
+        	echo '=> '.$login.' is not a member of '.$check_grp.'<br />';
+            };
             return false;
           }
         }
@@ -273,6 +278,12 @@ function authenticate($login, $password)
 
       ldap_unbind($lc);
 
+      // check if the user specified full login
+      if (strpos($login, '@') === false) {
+	// append default domain
+        $login .= '@' . $this->params['default_domain'];
+      }
+
       return array('login' => $login, 'data' => $entries, 'member_of' => $groups);
     }
 

From cf6afd523f46b24e4b08fd50ec2e6c3fc849bcf0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 11 Jun 2020 20:38:13 +0000
Subject: [PATCH 1163/1848] Cleaned up some comments and styles, hopefully
 without breaking stuff.

---
 WEB-INF/lib/auth/Auth_ldap.class.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index b2138e67c..59a539389 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -38,10 +38,6 @@
 // In April 2012, a previously mandatory search for group membership was put in a conditional block (if ($member_of) -
 // when mandatory membership in groups is actually defined in config.php).
 // This made the module work with Sun Directory Server when NO GROUP MEMBERSHIP is specified.
-// Note 1: search is likely to fail with Sun DS if 'member_of' => array()); is used in config.php.
-// Note 2: search is likely to not work properly with OpenLDAP as well because of Windows specific filtering code in there
-// (we are looking for matches for Windows-specific samaccountname property). Search needs to be redone during the next
-// refactoring effort.
 
 
 /**
@@ -212,8 +208,6 @@ function authenticate($login, $password)
       }
 
       if ($member_of) {
-        // TODO: Fix this for OpenLDAP, as samaccountname has nothing to do with it.
-        // get groups
 
         if (isTrue('DEBUG')) {
           echo '$member_of : '; var_dump($member_of); echo '<br />';
@@ -221,7 +215,6 @@ function authenticate($login, $password)
 
         $filter = 'uid='.$login; 	// ldap search filter
         $fields = array('memberof');    // ldap search attributes
-        // $fields = 'uid';
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
         if (isTrue('DEBUG')) {
@@ -256,21 +249,19 @@ function authenticate($login, $password)
           $groups[] = $grp; // append group to array
           if (isTrue('DEBUG')) {
             var_dump($grp); echo ' appended to $groups<br />';
-          };
-
+          }
         }
 
-
         // check for group membership
         foreach ($member_of as $check_grp) {
           if (isTrue('DEBUG')) {
             echo '$check_grp:'; var_dump($check_grp); echo '<br />';
-          };
+          }
           if (!in_array($check_grp, $groups)) {
             ldap_unbind($lc);
             if (isTrue('DEBUG')) {
-        	echo '=> '.$login.' is not a member of '.$check_grp.'<br />';
-            };
+              echo '=> '.$login.' is not a member of '.$check_grp.'<br />';
+            }
             return false;
           }
         }

From a1cd3a3e2d443a0aaca4109d64cbb2665bfb386d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 Jun 2020 14:32:16 +0000
Subject: [PATCH 1164/1848] Included an improvement as per issue #89.

---
 WEB-INF/templates/footer.tpl | 2 +-
 initialize.php               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 72e375036..36c85f355 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.19.16.5188 | 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.16.5189 | 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/initialize.php b/initialize.php
index 241d72334..404872936 100644
--- a/initialize.php
+++ b/initialize.php
@@ -85,8 +85,8 @@
 // Set lifetime for garbage collection.
 ini_set('session.gc_maxlifetime', $phpsessid_ttl);
 // Set PHP session path, if defined to avoid garbage collection interference from other scripts.
-if (defined('PHP_SESSION_PATH')) {
-  ini_set('session.save_path', PHP_SESSION_PATH);
+if (defined('PHP_SESSION_PATH') && realpath(PHP_SESSION_PATH)) {
+  ini_set('session.save_path', realpath(PHP_SESSION_PATH));
   ini_set('session.gc_probability', 1);
 }
 

From 908e119d978dcfd26b126036ce4514c39a00c8a4 Mon Sep 17 00:00:00 2001
From: BTR Naidu <naidu@users.noreply.github.com>
Date: Tue, 16 Jun 2020 16:25:28 +0200
Subject: [PATCH 1165/1848] File permission error while loading the landing
 page (#92)

---
 dockerfile-tt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dockerfile-tt b/dockerfile-tt
index 8902cbf7e..2b102f1ff 100644
--- a/dockerfile-tt
+++ b/dockerfile-tt
@@ -34,3 +34,5 @@ RUN cp /var/www/html/WEB-INF/config.php.dist /var/www/html/WEB-INF/config.php
 RUN sed -i "s|mysqli://root:no@localhost/dbname|mysqli://anuko_user:anuko_pw@anuko_db/timetracker|g" /var/www/html/WEB-INF/config.php
 # Note that db is defined as anuko_db/timetracker where anuko_db is service name and timetracker is db name.
 # See docker-compose.yml for details.
+
+RUN chown -R www-data /var/www/html/

From 88a5ef90c0a639efa0b9b140325beb3dd9f6a01f Mon Sep 17 00:00:00 2001
From: Juergen Neumann <j.neumann@junes.eu>
Date: Tue, 16 Jun 2020 16:59:16 +0200
Subject: [PATCH 1166/1848] Applying .Auth_ldap::ldap_escape($login) to
 openldap. (#93)

* Applying .Auth_ldap::ldap_escape($login) to openldap.

* added $user_login_attribute to config for openldap authentication

Co-authored-by: Juergen Neumann <juergen@junes.eu>
---
 WEB-INF/config.php.dist              |  3 ++-
 WEB-INF/lib/auth/Auth_ldap.class.php | 14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 6ffdff08e..a288ec0bf 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -150,7 +150,8 @@ define('AUTH_MODULE', 'db');
 //  'server' => '127.0.0.1',                    // OpenLDAP server address or name. For secure LDAP use ldaps://hostname:port here.
 //  'type' => 'openldap',                       // Type of server. openldap type should also work with Sun Directory Server when member_of is empty.
                                                 // It may work with other (non Windows AD) LDAP servers. For Windows AD use the 'ad' type.
-//  'base_dn' => 'ou=People,dc=example,dc=com', // Base distinguished name in LDAP catalog.
+//  'base_dn' => 'ou=People,dc=example,dc=com', // Path of user's base distinguished name in LDAP catalog.
+//  'user_login_attribute' => 'uid',            // LDAP attribute used for login
 //  'default_domain' => 'example.com',          // Default domain.
 //  'member_of' => array());                    // List of groups, membership in which is required for user to be authenticated.
 
diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 59a539389..3c43fd3a3 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -189,7 +189,15 @@ function authenticate($login, $password)
     if ($this->params['type'] == 'openldap') {
 
       // Assuming OpenLDAP server.
-      $login_oldap = 'uid='.$login.','.$this->params['base_dn'];
+
+      if (empty($this->params['user_login_attribute'])) {
+        $user_login_attribute = 'uid';
+      } else {
+        $user_login_attribute = @$this->params['user_login_attribute'];
+
+      }
+
+      $login_oldap = $user_login_attribute.'='.Auth_ldap::ldap_escape($login).','.$this->params['base_dn'];
 
       if (isTrue('DEBUG')) {
         echo '$login_oldap='; var_dump($login_oldap); echo '<br />';
@@ -213,8 +221,8 @@ function authenticate($login, $password)
           echo '$member_of : '; var_dump($member_of); echo '<br />';
         }
 
-        $filter = 'uid='.$login; 	// ldap search filter
-        $fields = array('memberof');    // ldap search attributes
+        $filter = $user_login_attribute.'='.Auth_ldap::ldap_escape($login); 	// ldap search filter
+        $fields = array('memberof');                                            // ldap search attributes
         $sr = @ldap_search($lc, $this->params['base_dn'], $filter, $fields);
 
         if (isTrue('DEBUG')) {

From fe25e6cf65c4cfda4ec5726a71c48ce7e7b36dde Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 16 Jun 2020 15:11:34 +0000
Subject: [PATCH 1167/1848] Some cleanup after pr #93 merge.

---
 WEB-INF/lib/auth/Auth_ldap.class.php | 3 +--
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 3c43fd3a3..7f3495737 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -193,8 +193,7 @@ function authenticate($login, $password)
       if (empty($this->params['user_login_attribute'])) {
         $user_login_attribute = 'uid';
       } else {
-        $user_login_attribute = @$this->params['user_login_attribute'];
-
+        $user_login_attribute = $this->params['user_login_attribute'];
       }
 
       $login_oldap = $user_login_attribute.'='.Auth_ldap::ldap_escape($login).','.$this->params['base_dn'];
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 36c85f355..fc42d9df4 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.19.16.5189 | 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.16.5190 | 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>

From 74c23e14f9c755aef8139a0e7f01ac9c67500532 Mon Sep 17 00:00:00 2001
From: BTR Naidu <naidu@users.noreply.github.com>
Date: Sat, 20 Jun 2020 17:24:22 +0200
Subject: [PATCH 1168/1848] missing freetype library causes chart from loading
 (#95)

---
 dockerfile-tt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dockerfile-tt b/dockerfile-tt
index 2b102f1ff..9c79f4786 100644
--- a/dockerfile-tt
+++ b/dockerfile-tt
@@ -11,8 +11,9 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 RUN docker-php-ext-install mysqli
 
 # Install gd extension.
-RUN apt-get update && apt-get install libpng-dev -y \
- && docker-php-ext-install gd
+RUN apt-get update && apt-get install libpng-dev libfreetype6-dev -y \
+ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ \
+ && docker-php-ext-install gd 
 
 # Install ldap extension.
 RUN apt-get install libldap2-dev -y \

From b525c77813327c06b2d005e00b81dbfa8231e740 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 29 Jun 2020 20:55:36 +0000
Subject: [PATCH 1169/1848] Started to work on binding templates to projects.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 14 ++++++++++----
 mysql.sql                    | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fc42d9df4..05c0feed6 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.19.16.5190 | 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.17.5191 | 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/dbinstall.php b/dbinstall.php
index ea476d403..f596a05e6 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11914"]) {
+  if ($_POST["convert11900to11917"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1183,6 +1183,11 @@ function ttGenerateKeys() {
     ttExecute("ALTER TABLE `tt_fav_reports` drop `cf_1_option_id`");
     ttExecute("ALTER TABLE `tt_fav_reports` drop `show_custom_field_1`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.14', modified = now() where param_name = 'version_db' and param_value = '1.19.7'");
+    ttExecute("CREATE TABLE `tt_project_template_binds` (`project_id` int(10) unsigned NOT NULL,`template_id` int(10) unsigned NOT NULL,`group_id` int(10) unsigned NOT NULL,`org_id` int(10) unsigned NOT NULL)");
+    ttExecute("create index project_idx on tt_project_template_binds(project_id);");
+    ttExecute("create index template_idx on tt_project_template_binds(template_id)");
+    ttExecute("create unique index project_template_idx on tt_project_template_binds(project_id, template_id)");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.17', modified = now() where param_name = 'version_db' and param_value = '1.19.14'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1210,6 +1215,7 @@ function ttGenerateKeys() {
     ttExecute("OPTIMIZE TABLE tt_log");
     ttExecute("OPTIMIZE TABLE tt_monthly_quotas");
     ttExecute("OPTIMIZE TABLE tt_templates");
+    ttExecute("OPTIMIZE TABLE tt_project_template_binds");
     ttExecute("OPTIMIZE TABLE tt_predefined_expenses");
     ttExecute("OPTIMIZE TABLE tt_project_task_binds");
     ttExecute("OPTIMIZE TABLE tt_projects");
@@ -1232,7 +1238,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.14)</b>
+    <td width="80%"><b>Create database structure (v1.19.17)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1281,8 +1287,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.14)</td>
-    <td><input type="submit" name="convert11900to11914" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.17)</td>
+    <td><input type="submit" name="convert11900to11917" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 3e9df4a1b..ae31890b5 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -565,6 +565,22 @@ CREATE TABLE `tt_templates` (
 );
 
 
+#
+# Structure for table tt_project_template_binds. This table maps projects to templates.
+#
+CREATE TABLE `tt_project_template_binds` (
+  `project_id` int(10) unsigned NOT NULL,        # project id
+  `template_id` int(10) unsigned NOT NULL,       # template id
+  `group_id` int(10) unsigned NOT NULL,          # group id
+  `org_id` int(10) unsigned NOT NULL             # organization id
+);
+
+# Indexes for tt_project_template_binds.
+create index project_idx on tt_project_template_binds(project_id);
+create index template_idx on tt_project_template_binds(template_id);
+create unique index project_template_idx on tt_project_template_binds(project_id, template_id);
+
+
 #
 # Structure for table tt_files.
 # This table keeps file attachment information.
@@ -639,4 +655,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.14', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.17', now()); # TODO: change when structure changes.

From 625b4e3d69fe52e2b5affd9ed2d6ae616020053d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Jun 2020 14:30:38 +0000
Subject: [PATCH 1170/1848] Work in progress on associating templates with
 projects.

---
 WEB-INF/lib/ttOrgHelper.class.php      |  1 +
 WEB-INF/lib/ttTemplateHelper.class.php | 23 +++++++++++++++++++++++
 WEB-INF/templates/footer.tpl           |  2 +-
 template_edit.php                      |  6 ++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 60126420a..ffb39beb4 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -98,6 +98,7 @@ static function deleteOrg($org_id) {
       'tt_config',
       'tt_cron',
       'tt_fav_reports',
+      'tt_project_template_binds',
       'tt_templates',
       'tt_monthly_quotas',
       'tt_predefined_expenses',
diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index e3a935646..e963877cc 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -118,4 +118,27 @@ static function update($fields) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // getAssignedProjects - returns an array of projects associatied with a template.
+  static function getAssignedProjects($template_id)
+  {
+    global $user;
+
+    $result = array();
+    $mdb2 = getConnection();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // Do a query with inner join to get assigned projects.
+    $sql = "select p.id, p.name from tt_projects p
+      inner join tt_project_template_binds ptb on (ptb.project_id = p.id and ptb.template_id = $template_id)
+      where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 05c0feed6..cbfce2f69 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.19.17.5191 | 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.17.5192 | 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/template_edit.php b/template_edit.php
index 90e5f5655..568d9dbbb 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -47,16 +47,22 @@
 }
 // End of access checks.
 
+$projects = ttGroupHelper::getActiveProjects();
+
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_content = trim($request->getParameter('content'));
   $cl_status = $request->getParameter('status');
+  $cl_projects = $request->getParameter('projects');
 } else {
   $cl_name = $template['name'];
   $cl_description = $template['description'];
   $cl_content = $template['content'];
   $cl_status = $template['status'];
+  $assigned_projects = ttTemplateHelper::getAssignedProjects($cl_template_id);
+  foreach ($assigned_projects as $project_item)
+    $cl_projects[] = $project_item['id'];
 }
 
 $form = new Form('templateForm');

From dcfe5eb3b0e95d80cd4854d5244c16a8ef9e0ddb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Jun 2020 15:37:59 +0000
Subject: [PATCH 1171/1848] Added project selector on template_edit.php.

---
 WEB-INF/lib/ttTemplateHelper.class.php | 20 +++++++++++++++++++-
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/task_add.tpl         |  2 +-
 WEB-INF/templates/task_edit.tpl        |  2 +-
 WEB-INF/templates/template_edit.tpl    |  7 +++++++
 template_edit.php                      |  5 ++++-
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index e963877cc..33839d58e 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -109,6 +109,7 @@ static function update($fields) {
     $content = $fields['content'];
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     $status = (int) $fields['status'];
+    $projects = $fields['projects'];
 
     $sql = "update tt_templates set name = ".$mdb2->quote($name).
       ", description = ".$mdb2->quote($description).
@@ -116,7 +117,24 @@ static function update($fields) {
       ", status = ".$status.
       " where id = $template_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error'))
+      die($affected->getMessage());
+
+    // Insert project binds into tt_project_template_binds table.
+    $sql = "delete from tt_project_template_binds where template_id = $template_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      die($affected->getMessage());
+    if (count($projects) > 0)
+      foreach ($projects as $p_id) {
+        $sql = "insert into tt_project_template_binds (project_id, template_id, group_id, org_id)".
+          " values($p_id, $template_id, $group_id, $org_id)";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+          die($affected->getMessage());
+      }
+
+    return true;
   }
 
   // getAssignedProjects - returns an array of projects associatied with a template.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cbfce2f69..903c257ac 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.19.17.5192 | 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.17.5193 | 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/task_add.tpl b/WEB-INF/templates/task_add.tpl
index 8e7f7882f..d1892709a 100644
--- a/WEB-INF/templates/task_add.tpl
+++ b/WEB-INF/templates/task_add.tpl
@@ -13,7 +13,7 @@
         </tr>
 {if $show_projects}
         <tr><td>&nbsp;</td></tr>
-        <tr valign="top">
+        <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.taskForm.projects.control}</td>
         </tr>
diff --git a/WEB-INF/templates/task_edit.tpl b/WEB-INF/templates/task_edit.tpl
index 0bf189bba..0c2b1a555 100644
--- a/WEB-INF/templates/task_edit.tpl
+++ b/WEB-INF/templates/task_edit.tpl
@@ -17,7 +17,7 @@
         </tr>
 {if $show_projects}
         <tr><td>&nbsp;</td></tr>
-        <tr valign="top">
+        <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.taskForm.projects.control}</td>
         </tr>
diff --git a/WEB-INF/templates/template_edit.tpl b/WEB-INF/templates/template_edit.tpl
index 6f3e406f8..f4db77878 100644
--- a/WEB-INF/templates/template_edit.tpl
+++ b/WEB-INF/templates/template_edit.tpl
@@ -19,6 +19,13 @@
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.templateForm.status.control}</td>
         </tr>
+{if $show_projects}
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td align="right">{$i18n.label.projects}:</td>
+          <td>{$forms.templateForm.projects.control}</td>
+        </tr>
+{/if}
         <tr>
           <td height="40"></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/template_edit.php b/template_edit.php
index 568d9dbbb..1bff1a3bf 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -72,6 +72,7 @@
 $form->addInput(array('type'=>'textarea','name'=>'content','style'=>'width: 250px; height: 80px;','value'=>$cl_content));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
@@ -87,7 +88,8 @@
         'name' => $cl_name,
         'description' => $cl_description,
         'content' => $cl_content,
-        'status' => $cl_status))) {
+        'status' => $cl_status,
+        'projects' => $cl_projects))) {
         header('Location: templates.php');
         exit();
       } else
@@ -96,6 +98,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0 && defined('TEMPLATES_DEBUG'));
 $smarty->assign('title', $i18n->get('title.edit_template'));
 $smarty->assign('content_page_name', 'template_edit.tpl');
 $smarty->display('index.tpl');

From 6942f78f7bfe309b368e8243f715d4381e6ccd9d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Jun 2020 16:13:15 +0000
Subject: [PATCH 1172/1848] Added project selector on template_add.php.

---
 WEB-INF/lib/ttTemplateHelper.class.php | 16 +++++++++++++++-
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/template_add.tpl     |  7 +++++++
 WEB-INF/templates/templates.tpl        |  2 +-
 template_add.php                       | 11 ++++++++++-
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index 33839d58e..6aec08c73 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -81,6 +81,7 @@ static function insert($fields) {
     $name = $fields['name'];
     $description = $fields['description'];
     $content = $fields['content'];
+    $projects = $fields['projects'];
 
     $created_part = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
@@ -89,10 +90,23 @@ static function insert($fields) {
       " values ($group_id, $org_id, ".$mdb2->quote($name).
       ", ".$mdb2->quote($description).", ".$mdb2->quote($content).$created_part.")";
     $affected = $mdb2->exec($sql);
+    $last_id = 0;
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    return true;
+    $last_id = $mdb2->lastInsertID('tt_templates', 'id');
+
+    if (is_array($projects)) {
+      foreach ($projects as $p_id) {
+        // Insert project binds into tt_project_template_binds table.
+        $sql = "insert into tt_project_template_binds (project_id, template_id, group_id, org_id)".
+          " values($p_id, $last_id, $group_id, $org_id)";
+        $affected = $mdb2->exec($sql);
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+      }
+    }
+    return $last_id;
   }
 
   // update function - updates a template in database.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 903c257ac..a232aa149 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.19.17.5193 | 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.17.5194 | 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/template_add.tpl b/WEB-INF/templates/template_add.tpl
index 2a52cec32..bfd624028 100644
--- a/WEB-INF/templates/template_add.tpl
+++ b/WEB-INF/templates/template_add.tpl
@@ -15,6 +15,13 @@
           <td align="right">{$i18n.label.template} (*):</td>
           <td>{$forms.templateForm.content.control}</td>
         </tr>
+{if $show_projects}
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td align="right">{$i18n.label.projects}:</td>
+          <td>{$forms.templateForm.projects.control}</td>
+        </tr>
+{/if}
         <tr>
           <td height="40"></td>
           <td>{$i18n.label.required_fields}</td>
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index 2e388b491..c0a74422d 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -26,7 +26,7 @@
       </table>
 {if $inactive_templates}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.inactive_tasks}</td></tr>
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.inactive_templates}</td></tr>
         <tr>
           <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
           <td class="tableHeader" width="45%">{$i18n.label.description}</td>
diff --git a/template_add.php b/template_add.php
index 6fb0238e4..e7e828444 100644
--- a/template_add.php
+++ b/template_add.php
@@ -41,16 +41,23 @@
 }
 // End of access checks.
 
+$projects = ttGroupHelper::getActiveProjects();
+
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_content = trim($request->getParameter('content'));
+  $cl_projects = $request->getParameter('projects');
+} else {
+  foreach ($projects as $project_item)
+    $cl_projects[] = $project_item['id'];
 }
 
 $form = new Form('templateForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'textarea','name'=>'content','style'=>'width: 250px; height: 80px;','value'=>$cl_content));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -64,7 +71,8 @@
     if (ttTemplateHelper::insert(array(
         'name' => $cl_name,
         'description' => $cl_description,
-        'content' => $cl_content))) {
+        'content' => $cl_content,
+        'projects' => $cl_projects))) {
         header('Location: templates.php');
         exit();
       } else
@@ -73,6 +81,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0 && defined('TEMPLATES_DEBUG'));
 $smarty->assign('title', $i18n->get('title.add_template'));
 $smarty->assign('content_page_name', 'template_add.tpl');
 $smarty->display('index.tpl');

From 9fbacfa36e86370d8c71ef7a282c769e4d7d6710 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Jun 2020 21:42:05 +0000
Subject: [PATCH 1173/1848] More progress towards associating templates with
 projects.

---
 WEB-INF/lib/ttProjectHelper.class.php  |  6 ++++++
 WEB-INF/lib/ttTemplateHelper.class.php | 28 ++++++++++++++++++++++++++
 WEB-INF/lib/ttUser.class.php           | 11 ++++++++--
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/time.tpl             |  4 ++--
 WEB-INF/templates/time_script.tpl      |  1 +
 projects.php                           |  6 ++++--
 time.php                               | 20 +++++++++++-------
 8 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 399cba2d2..d456c3110 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -204,6 +204,12 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Delete template binds to this project.
+    $sql = "delete from tt_project_template_binds where project_id = $id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
     // Finally, delete the project from the projects field in tt_clients table.
     $result = ttClientHelper::deleteProject($id);
     return $result;
diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index 6aec08c73..cedda1671 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -67,6 +67,12 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Delete project binds to this template.
+    $sql = "delete from tt_project_template_binds where template_id = $id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
     return true;
   }
 
@@ -173,4 +179,26 @@ static function getAssignedProjects($template_id)
     }
     return $result;
   }
+
+   // getAssignedTemplates - returns a comma-separated list of template ids assigned to a project.
+  static function getAssignedTemplates($project_id)
+  {
+    global $user;
+
+    $result = array();
+    $mdb2 = getConnection();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select template_id from tt_project_template_binds
+      where project_id = $project_id and group_id = $group_id and org_id = $org_id" ;
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val['template_id'];
+      }
+    }
+    $comma_separated = implode(',', $result); // This is a comma-separated list of associated template ids.
+    return $comma_separated;
+  }
 }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 1bdb1c19f..42f9b0d90 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -32,6 +32,7 @@
 import('ttGroup');
 import('form.Form');
 import('form.ActionForm');
+import('ttTemplateHelper');
 
 class ttUser {
   var $login = null;            // User login.
@@ -333,7 +334,7 @@ function setOption($option, $enable = true)
   }
 
   // getAssignedProjects - returns an array of assigned projects.
-  function getAssignedProjects($includeFiles = false)
+  function getAssignedProjects($options = null)
   {
     $result = array();
     $mdb2 = getConnection();
@@ -342,7 +343,7 @@ function getAssignedProjects($includeFiles = false)
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
-    if ($includeFiles) {
+    if ($options['include_files']) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
@@ -356,6 +357,12 @@ function getAssignedProjects($includeFiles = false)
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
+        // If we have to include templates, get them in a separate query for each project.
+        // Although, theoretically, we could use mysql group_concat, but this requires grouping by, which makes
+        // maintenance of this code more complex.
+        if ($options['include_templates']) {
+          $val['templates'] = ttTemplateHelper::getAssignedTemplates($val['id']);
+        }
         $result[] = $val;
       }
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a232aa149..4ec458529 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.19.17.5194 | 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.17.5195 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 94be028b3..5663d89b7 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -30,7 +30,7 @@
           <td>{$forms.timeRecordForm.client.control}</td>
         </tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
+{if $show_billable}
         <tr>
           <td align="right">&nbsp;</td>
           <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
@@ -81,7 +81,7 @@
           <td>{$forms.timeRecordForm.newfile.control}</td>
         </tr>
 {/if}
-{if $template_dropdown}
+{if $show_templates}
         <tr>
           <td align="right">{$i18n.label.template}:</td>
           <td>{$forms.timeRecordForm.template.control}</td>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 3e8a02024..529acfe5a 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -13,6 +13,7 @@
 // project_names[325] = "Time Tracker";   // Project name.
 // task_ids[325] = "100,101,302,303,304"; // Comma-separated list ot task ids for project.
 // task_names[100] = "Coding";            // Task name.
+// template_ids[325] = "17,21";           // Comma-separated list ot template ids for project. NOT YET IMPLEMENTED.
 
 // Prepare an array of project ids for clients.
 var project_ids = new Array();
diff --git a/projects.php b/projects.php
index 1b137895e..0075c038f 100644
--- a/projects.php
+++ b/projects.php
@@ -45,8 +45,10 @@
 if($user->can('manage_projects')) {
   $active_projects = ttGroupHelper::getActiveProjects($showFiles);
   $inactive_projects = ttGroupHelper::getInactiveProjects($showFiles);
-} else
-  $active_projects = $user->getAssignedProjects($showFiles);
+} else {
+  $options['include_files'] = $showFiles;
+  $active_projects = $user->getAssignedProjects($options);
+}
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);
diff --git a/time.php b/time.php
index 8b1c0926f..5e24904a5 100644
--- a/time.php
+++ b/time.php
@@ -69,6 +69,7 @@
 $group_id = $user->getGroup();
 
 $showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
@@ -76,6 +77,7 @@
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showFinish = $showStart;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+$showTemplates = $user->isPluginEnabled('tp');
 $showFiles = $user->isPluginEnabled('at');
 
 // Initialize and store date in session.
@@ -206,7 +208,8 @@
 
 if ($showProject) {
   // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
+  $options['include_templates'] = $showTemplates;
+  $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);',
     'name'=>'project',
@@ -245,6 +248,9 @@
   }
 }
 
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
@@ -277,9 +283,7 @@
 
 
 
-// TODO: refactoring ongoing down from here. Use $showBillable, perhaps?
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+// TODO: refactoring ongoing down from here.
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
@@ -300,7 +304,7 @@
 }
 
 // If we have templates, add a dropdown to select one.
-if ($user->isPluginEnabled('tp')){
+if ($showTemplates){
   $templates = ttGroupHelper::getActiveTemplates();
   if (count($templates) >= 1) {
     $form->addInput(array('type'=>'combobox',
@@ -310,7 +314,7 @@
       'data'=>$templates,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $smarty->assign('template_dropdown', 1);
+    $smarty->assign('show_templates', 1);
     $smarty->assign('templates', $templates);
   }
 }
@@ -358,7 +362,7 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
+    if ($showTemplates && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
@@ -465,11 +469,13 @@
 $smarty->assign('time_records', $timeRecords);
 $smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
+$smarty->assign('show_templates', $showTemplates);
 $smarty->assign('show_note_column', $showNoteColumn);
 $smarty->assign('show_note_row', $showNoteRow);
 $smarty->assign('show_files', $showFiles);

From 4128cf13931abaa84cbe57ca1d094a183124ca1d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Jun 2020 21:57:04 +0000
Subject: [PATCH 1174/1848] Fixed template content population - broken in
 previous commit.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/time.tpl   | 2 +-
 time.php                     | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4ec458529..3794de8f5 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.19.17.5195 | 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.17.5196 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 5663d89b7..d153dc96d 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -81,7 +81,7 @@
           <td>{$forms.timeRecordForm.newfile.control}</td>
         </tr>
 {/if}
-{if $show_templates}
+{if $template_dropdown}
         <tr>
           <td align="right">{$i18n.label.template}:</td>
           <td>{$forms.timeRecordForm.template.control}</td>
diff --git a/time.php b/time.php
index 5e24904a5..3a9e582aa 100644
--- a/time.php
+++ b/time.php
@@ -77,7 +77,6 @@
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showFinish = $showStart;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
-$showTemplates = $user->isPluginEnabled('tp');
 $showFiles = $user->isPluginEnabled('at');
 
 // Initialize and store date in session.
@@ -304,7 +303,7 @@
 }
 
 // If we have templates, add a dropdown to select one.
-if ($showTemplates){
+if ($user->isPluginEnabled('tp')){
   $templates = ttGroupHelper::getActiveTemplates();
   if (count($templates) >= 1) {
     $form->addInput(array('type'=>'combobox',
@@ -314,7 +313,7 @@
       'data'=>$templates,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $smarty->assign('show_templates', 1);
+    $smarty->assign('template_dropdown', 1);
     $smarty->assign('templates', $templates);
   }
 }
@@ -362,7 +361,7 @@
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    if ($showTemplates && !ttValidTemplateText($cl_note)) {
+    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));

From df5542ddf3de5aa8051f551a8a05ec88cd8d6aad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 2 Jul 2020 17:51:19 +0000
Subject: [PATCH 1175/1848] Work in progress adding bind templates with
 projects option.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  1 +
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  1 +
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  1 +
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  1 +
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/templates.tpl  |  6 ++++++
 templates.php                    | 10 ++++++++++
 33 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f49ce3025..658a19318 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -276,6 +276,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 6459cc953..4ec5d0093 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -286,6 +286,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index e03d73d43..3905d8950 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -266,6 +266,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b4663d1b3..b0e8c4af5 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -256,6 +256,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0c1b8e0a9..b52195d6b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -250,6 +250,7 @@
 'label.approval' => 'Report approval',
 'label.mark_approved' => 'Mark approved',
 'label.template' => 'Template',
+'label.bind_templates_with_projects' => 'Bind templates with projects',
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
 'label.file' => 'File',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a8faaf364..30fb2803d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -279,6 +279,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ecb4a1e20..1539d26e3 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -273,6 +273,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 33776560a..eb5f095e5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -277,6 +277,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d8d477d15..1b0f0bc9a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -270,6 +270,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 39755c50c..e84e6f9fc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -264,6 +264,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 16baaf28c..46a18d53e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -260,6 +260,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 706be9cae..c1697904a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -285,6 +285,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8176a45c8..b136dc1fd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -282,6 +282,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7f667b445..0805dcbe3 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -264,6 +264,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index fb0fd6fcb..5826460b8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -286,6 +286,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 8414edb52..0b2b51b1d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -286,6 +286,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index fc7aeb361..29826bcd2 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -255,6 +255,8 @@
 'label.approval' => 'Rapport goedkeuring',
 'label.mark_approved' => 'Markeer goedkeuring',
 'label.template' => 'Sjabloon',
+// TODO: translate the following.
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
 'label.file' => 'Bestand',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b0dc2ead0..c1696fc11 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -283,6 +283,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index de6ded99a..046fa922c 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -271,6 +271,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index fafb843bb..5e97cf7ac 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -268,6 +268,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 3c6ecefd9..01751f8e5 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -271,6 +271,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9b6fc1750..9756a1cea 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -283,6 +283,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index a08157191..48795ca22 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -241,6 +241,7 @@
 'label.approval' => 'Одобрение отчётов',
 'label.mark_approved' => 'Отметить одобрение',
 'label.template' => 'Шаблон',
+'label.bind_templates_with_projects' => 'Связать шаблоны с проектамиЫ',
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
 'label.file' => 'Файл',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 88d310e12..159b6ce45 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -275,6 +275,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ae9d8ab8c..6ffa74b57 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -266,6 +266,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b29f81bca..523277b32 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -269,6 +269,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 41dea480e..4112465f2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -266,6 +266,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4ac00f1c1..ab1d51bae 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -290,6 +290,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 8d96b36ee..7b6dbef6d 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -275,6 +275,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 77acaecad..454b000c1 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -281,6 +281,7 @@
 // 'label.approval' => 'Report approval',
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
+// 'label.bind_templates_with_projects' => 'Bind templates with projects',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3794de8f5..fdcbd866b 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.19.17.5196 | 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.17.5197 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index c0a74422d..80991537e 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -3,6 +3,12 @@
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
+{if defined('TEMPLATES_DEBUG')}
+        <tr>
+          <td align="right" nowrap>{$forms.templatesForm.bind_templates_with_projects.control}</td>
+          <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+{/if}
 {if $inactive_templates}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
 {/if}
diff --git a/templates.php b/templates.php
index 6bf6ae393..0b1f312fb 100644
--- a/templates.php
+++ b/templates.php
@@ -41,7 +41,17 @@
 }
 // End of access checks.
 
+$config = $user->getConfigHelper();
+
+if ($request->isPost()) {
+  $cl_bind_templates_with_projects = $request->getParameter('bind_templates_with_projects');
+} else {
+  $cl_bind_templates_with_projects = $config->getDefinedValue('bind_templates_with_projects');
+}
+
+
 $form = new Form('templatesForm');
+$form->addInput(array('type'=>'checkbox','name'=>'bind_templates_with_projects','value'=>$cl_bind_templates_with_projects));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_add')) {

From 70a998d4a2a235a44e64dda3d96b0cda71e5df1c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 2 Jul 2020 20:51:50 +0000
Subject: [PATCH 1176/1848] Some more work in progress on binding templates
 with projects.

---
 WEB-INF/lib/ttUser.class.php    |  3 ++-
 WEB-INF/templates/footer.tpl    |  2 +-
 WEB-INF/templates/templates.tpl |  3 +++
 template_edit.php               | 18 ++++++++++++------
 templates.php                   | 17 ++++++++++++-----
 time.php                        |  2 +-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 42f9b0d90..4ef5d26e0 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -356,11 +356,12 @@ function getAssignedProjects($options = null)
       " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
+      $bindTemplatesWithProjects = $options['include_templates'];
       while ($val = $res->fetchRow()) {
         // If we have to include templates, get them in a separate query for each project.
         // Although, theoretically, we could use mysql group_concat, but this requires grouping by, which makes
         // maintenance of this code more complex.
-        if ($options['include_templates']) {
+        if ($bindTemplatesWithProjects) {
           $val['templates'] = ttTemplateHelper::getAssignedTemplates($val['id']);
         }
         $result[] = $val;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fdcbd866b..9580c3c07 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.19.17.5197 | 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.17.5199 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index 80991537e..3a7da2b7e 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -8,6 +8,9 @@
           <td align="right" nowrap>{$forms.templatesForm.bind_templates_with_projects.control}</td>
           <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.templatesForm.btn_save.control}</td>
+        </tr>
 {/if}
 {if $inactive_templates}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
diff --git a/template_edit.php b/template_edit.php
index 1bff1a3bf..da8485047 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -47,22 +47,28 @@
 }
 // End of access checks.
 
-$projects = ttGroupHelper::getActiveProjects();
+$config = $user->getConfigHelper();
+$bindTemplatesWithProjects = $config->getDefinedValue('bind_templates_with_projects');
+if ($bindTemplatesWithProjects)
+  $projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_content = trim($request->getParameter('content'));
   $cl_status = $request->getParameter('status');
-  $cl_projects = $request->getParameter('projects');
+  if ($bindTemplatesWithProjects)
+    $cl_projects = $request->getParameter('projects');
 } else {
   $cl_name = $template['name'];
   $cl_description = $template['description'];
   $cl_content = $template['content'];
   $cl_status = $template['status'];
-  $assigned_projects = ttTemplateHelper::getAssignedProjects($cl_template_id);
-  foreach ($assigned_projects as $project_item)
-    $cl_projects[] = $project_item['id'];
+  if ($bindTemplatesWithProjects) {
+    $assigned_projects = ttTemplateHelper::getAssignedProjects($cl_template_id);
+    foreach ($assigned_projects as $project_item)
+      $cl_projects[] = $project_item['id'];
+  }
 }
 
 $form = new Form('templateForm');
@@ -98,7 +104,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', count($projects) > 0 && defined('TEMPLATES_DEBUG'));
+$smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0 && defined('TEMPLATES_DEBUG'));
 $smarty->assign('title', $i18n->get('title.edit_template'));
 $smarty->assign('content_page_name', 'template_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/templates.php b/templates.php
index 0b1f312fb..cf315d085 100644
--- a/templates.php
+++ b/templates.php
@@ -49,20 +49,27 @@
   $cl_bind_templates_with_projects = $config->getDefinedValue('bind_templates_with_projects');
 }
 
-
 $form = new Form('templatesForm');
 $form->addInput(array('type'=>'checkbox','name'=>'bind_templates_with_projects','value'=>$cl_bind_templates_with_projects));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+$activeTemplates = ttGroupHelper::getActiveTemplates();
+$inactiveTemplates = ttGroupHelper::getInactiveTemplates();
 
 if ($request->isPost()) {
+  if ($request->getParameter('btn_save')) {
+    // Save button clicked. Update config.
+    $config->setDefinedValue('bind_templates_with_projects', $cl_bind_templates_with_projects);
+    if (!$user->updateGroup(array('config' => $config->getConfig()))) {
+      $err->add($i18n->get('error.db'));
+    }
+  }
+
   if ($request->getParameter('btn_add')) {
     // The Add button clicked. Redirect to template_add.php page.
     header('Location: template_add.php');
     exit();
   }
-} else {
-  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $activeTemplates = ttGroupHelper::getActiveTemplates();
-  $inactiveTemplates = ttGroupHelper::getInactiveTemplates();
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
diff --git a/time.php b/time.php
index 3a9e582aa..a48458add 100644
--- a/time.php
+++ b/time.php
@@ -207,7 +207,7 @@
 
 if ($showProject) {
   // Dropdown for projects assigned to user.
-  $options['include_templates'] = $showTemplates;
+  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);',

From 9cbb307079829d2c3660fd7900a71b7b1eb9f62e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 3 Jul 2020 16:28:48 +0000
Subject: [PATCH 1177/1848] Initial implementation of template binds to
 projects.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/templates.tpl   | 19 ++++----
 WEB-INF/templates/time_script.tpl | 75 ++++++++++++++++++++++++++++---
 mobile/time.php                   | 16 ++++---
 mobile/time_edit.php              | 16 ++++---
 template_add.php                  |  3 +-
 template_edit.php                 |  2 +-
 time.php                          | 13 +++---
 time_edit.php                     | 16 ++++---
 9 files changed, 119 insertions(+), 43 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9580c3c07..930618e50 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.19.17.5199 | 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.17.5200 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index 3a7da2b7e..d4532873d 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -3,15 +3,6 @@
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-{if defined('TEMPLATES_DEBUG')}
-        <tr>
-          <td align="right" nowrap>{$forms.templatesForm.bind_templates_with_projects.control}</td>
-          <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.templatesForm.btn_save.control}</td>
-        </tr>
-{/if}
 {if $inactive_templates}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
 {/if}
@@ -55,6 +46,16 @@
         <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
       </table>
 {/if}
+      <div class="table-divider"></div>
+      <table width="100%">
+        <tr>
+          <td align="right" width=25%">{$forms.templatesForm.bind_templates_with_projects.control}</td>
+          <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.templatesForm.btn_save.control}</td>
+        </tr>
+      </table>
     </td>
   </tr>
 </table>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 529acfe5a..495a16aee 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -44,32 +44,47 @@ var task_names = new Array();
   task_names[{$task.id}] = "{$task.name|escape:'javascript'}";
 {/foreach}
 
-{if $template_dropdown}
-var templates = new Array();
-{foreach $templates as $template}
-  templates[{$template.id}] = "{$template.content|escape:'javascript'}";
+// Prepare an array of template ids for projects.
+var template_ids = new Array();
+{if $bind_templates_with_projects}
+  {foreach $project_list as $project}
+  template_ids[{$project.id}] = "{$project.templates}";
+  {/foreach}
+{/if}
+// Prepare an array of template names.
+var template_names = new Array();
+{if $bind_templates_with_projects}
+  {foreach $template_list as $template}
+  template_names[{$template.id}] = "{$template.name|escape:'javascript'}";
+  {/foreach}
+{/if}
+// Prepare an array of template bodies.
+var template_bodies = new Array();
+{foreach $template_list as $template}
+  template_bodies[{$template.id}] = "{$template.content|escape:'javascript'}";
 {/foreach}
 
 // The fillNote function populates the Note field with a selected template body.
 function fillNote(id) {
   if (!id) return; // Do nothing.
-  var template_body = templates[id];
+  var template_body = template_bodies[id];
   var note = document.getElementById("note");
   note.value = template_body;
 }
-{/if}
 
 // Mandatory top options for project and task dropdowns.
 var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}";
 var empty_label_task = "{$i18n.dropdown.select|escape:'javascript'}";
+var empty_label_template = "{$i18n.dropdown.select|escape:'javascript'}";
 
-// The fillDropdowns function populates the "project" and "task" dropdown controls
+// The fillDropdowns function populates the "project", "task", and "template" dropdown controls
 // with relevant values.
 function fillDropdowns() {
   if(document.body.contains(document.timeRecordForm.client))
     fillProjectDropdown(document.timeRecordForm.client.value);
 
   fillTaskDropdown(document.timeRecordForm.project.value);
+  fillTemplateDropdown(document.timeRecordForm.project.value);
 }
 
 // The fillProjectDropdown function populates the project combo box with
@@ -167,6 +182,52 @@ function fillTaskDropdown(id) {
   }
 }
 
+// The fillTemplateDropdown function populates the template combo box with
+// templates associated with a selected project (project id is passed here as id).
+function fillTemplateDropdown(id) {
+{if !$bind_templates_with_projects}
+  return; // Do nothing if we are not binding templates with projects,
+{/if}
+
+  var str_ids = template_ids[id];
+
+  var dropdown = document.getElementById("template");
+  if (dropdown == null) return; // Nothing to do.
+
+  // Determine previously selected item.
+  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+
+  // Remove existing content.
+  dropdown.length = 0;
+  // Add mandatory top option.
+  dropdown.options[0] = new Option(empty_label_template, '', true);
+
+  // Populate the dropdown from the template_names array.
+  if (str_ids) {
+    var ids = new Array();
+    ids = str_ids.split(",");
+    var len = ids.length;
+
+    var idx = 1;
+    for (var i = 0; i < len; i++) {
+      var t_id = ids[i];
+      if (template_names[t_id]) {
+        dropdown.options[idx] = new Option(template_names[t_id], t_id);
+        idx++;
+      }
+    }
+
+    // If a previously selected item is still in dropdown - select it.
+    if (dropdown.options.length > 0) {
+      for (var i = 0; i < dropdown.options.length; i++) {
+        if (dropdown.options[i].value == selected_item) {
+          dropdown.options[i].selected = true;
+        }
+      }
+    }
+  }
+}
+
 // The formDisable function disables some fields depending on what we have in other fields.
 function formDisable(formField) {
   var formFieldValue = eval("document.timeRecordForm." + formField + ".value");
diff --git a/mobile/time.php b/mobile/time.php
index c5fb0ea75..b37a0a959 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -31,6 +31,7 @@
 import('ttUserHelper');
 import('ttGroupHelper');
 import('ttClientHelper');
+import('ttConfigHelper');
 import('ttTimeHelper');
 import('DateAndTime');
 
@@ -65,6 +66,7 @@
 }
 
 $group_id = $user->getGroup();
+$config = new ttConfigHelper($user->getConfig());
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -161,9 +163,10 @@
 
 if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
   // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
+  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
+  $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
@@ -245,17 +248,18 @@
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
-  $templates = ttGroupHelper::getActiveTemplates();
-  if (count($templates) >= 1) {
+  $template_list = ttGroupHelper::getActiveTemplates();
+  if (count($template_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
       'style'=>'width: 250px;',
-      'data'=>$templates,
+      'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
-    $smarty->assign('templates', $templates);
+    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('template_list', $template_list);
   }
 }
 
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index bce156661..18acb98b4 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -32,6 +32,7 @@
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
+import('ttConfigHelper');
 import('DateAndTime');
 
 // Access checks.
@@ -49,6 +50,7 @@
 // End of access checks.
 
 $user_id = $user->getUser();
+$config = new ttConfigHelper($user->getConfig());
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -138,9 +140,10 @@
 
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
   // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
+  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
+  $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
@@ -221,17 +224,18 @@
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
-  $templates = ttGroupHelper::getActiveTemplates();
-  if (count($templates) >= 1) {
+  $template_list = ttGroupHelper::getActiveTemplates();
+  if (count($template_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
       'style'=>'width: 250px;',
-      'data'=>$templates,
+      'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
-    $smarty->assign('templates', $templates);
+    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('template_list', $template_list);
   }
 }
 
diff --git a/template_add.php b/template_add.php
index e7e828444..98dd41430 100644
--- a/template_add.php
+++ b/template_add.php
@@ -41,6 +41,7 @@
 }
 // End of access checks.
 
+$config = new ttConfigHelper($user->getConfig());
 $projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
@@ -81,7 +82,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', count($projects) > 0 && defined('TEMPLATES_DEBUG'));
+$smarty->assign('show_projects', count($projects) > 0 && $config->getDefinedValue('bind_templates_with_projects'));
 $smarty->assign('title', $i18n->get('title.add_template'));
 $smarty->assign('content_page_name', 'template_add.tpl');
 $smarty->display('index.tpl');
diff --git a/template_edit.php b/template_edit.php
index da8485047..7619e7378 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -104,7 +104,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0 && defined('TEMPLATES_DEBUG'));
+$smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0 && $bindTemplatesWithProjects);
 $smarty->assign('title', $i18n->get('title.edit_template'));
 $smarty->assign('content_page_name', 'template_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/time.php b/time.php
index a48458add..823cd8287 100644
--- a/time.php
+++ b/time.php
@@ -67,6 +67,7 @@
 }
 
 $group_id = $user->getGroup();
+$config = new ttConfigHelper($user->getConfig());
 
 $showClient = $user->isPluginEnabled('cl');
 $showBillable = $user->isPluginEnabled('iv');
@@ -95,7 +96,6 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-$config = new ttConfigHelper($user->getConfig());
 $showNoteColumn = !$config->getDefinedValue('time_note_on_separate_row');
 $showNoteRow = $config->getDefinedValue('time_note_on_separate_row');
 if ($showNoteRow) {
@@ -210,7 +210,7 @@
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
@@ -304,17 +304,18 @@
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
-  $templates = ttGroupHelper::getActiveTemplates();
-  if (count($templates) >= 1) {
+  $template_list = ttGroupHelper::getActiveTemplates();
+  if (count($template_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
       'style'=>'width: 250px;',
-      'data'=>$templates,
+      'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
-    $smarty->assign('templates', $templates);
+    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('template_list', $template_list);
   }
 }
 
diff --git a/time_edit.php b/time_edit.php
index f6ee7de1e..8734d2ab8 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -32,6 +32,7 @@
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
+import('ttConfigHelper');
 import('DateAndTime');
 
 // Access checks.
@@ -49,6 +50,7 @@
 // End of access checks.
 
 $user_id = $user->getUser();
+$config = new ttConfigHelper($user->getConfig());
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -141,9 +143,10 @@
 
 if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
   // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
+  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
+  $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
@@ -224,17 +227,18 @@
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
-  $templates = ttGroupHelper::getActiveTemplates();
-  if (count($templates) >= 1) {
+  $template_list = ttGroupHelper::getActiveTemplates();
+  if (count($template_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
       'style'=>'width: 250px;',
-      'data'=>$templates,
+      'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
-    $smarty->assign('templates', $templates);
+    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('template_list', $template_list);
   }
 }
 

From 3deb102003dcfb43b1594d713fd942eb782c6ca6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Jul 2020 13:05:25 +0000
Subject: [PATCH 1178/1848] Introduced label.prepopulate_empty_note string in
 translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 3 ++-
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 658a19318..63bc3123f 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -277,6 +277,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 4ec5d0093..d79763485 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -287,6 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3905d8950..53e73200c 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -267,6 +267,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b0e8c4af5..b7e3b2efd 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -257,6 +257,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b52195d6b..b7f3a21f2 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -251,6 +251,7 @@
 'label.mark_approved' => 'Mark approved',
 'label.template' => 'Template',
 'label.bind_templates_with_projects' => 'Bind templates with projects',
+'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
 'label.file' => 'File',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 30fb2803d..9867273e3 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -280,6 +280,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1539d26e3..573689a57 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -274,6 +274,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index eb5f095e5..de9fefe1d 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -278,6 +278,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1b0f0bc9a..3f45c2752 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -271,6 +271,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e84e6f9fc..769006928 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -265,6 +265,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 46a18d53e..661a31697 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -261,6 +261,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index c1697904a..8e72b7c93 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -286,6 +286,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b136dc1fd..03d54e4f2 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -283,6 +283,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 0805dcbe3..d9c6023e9 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -265,6 +265,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 5826460b8..afc001282 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -287,6 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 0b2b51b1d..23ba28957 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -287,6 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 29826bcd2..5c9516b2e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -257,6 +257,7 @@
 'label.template' => 'Sjabloon',
 // TODO: translate the following.
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
 'label.file' => 'Bestand',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c1696fc11..6059ed09c 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -284,6 +284,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 046fa922c..6c7adf0f6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -272,6 +272,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5e97cf7ac..daf8fc1d3 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -269,6 +269,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 01751f8e5..204a72e31 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -272,6 +272,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9756a1cea..01a0f37f4 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -284,6 +284,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 48795ca22..f40becac9 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -241,7 +241,8 @@
 'label.approval' => 'Одобрение отчётов',
 'label.mark_approved' => 'Отметить одобрение',
 'label.template' => 'Шаблон',
-'label.bind_templates_with_projects' => 'Связать шаблоны с проектамиЫ',
+'label.bind_templates_with_projects' => 'Связать шаблоны с проектами',
+'label.prepopulate_empty_note' => 'Подставлять шаблон в пустое поле',
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
 'label.file' => 'Файл',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 159b6ce45..313fcfd2d 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -276,6 +276,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 6ffa74b57..19cceabca 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -267,6 +267,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 523277b32..19f6d345e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -270,6 +270,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4112465f2..72113f964 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -267,6 +267,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index ab1d51bae..2d509b658 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -291,6 +291,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7b6dbef6d..9dccc6b25 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -276,6 +276,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 454b000c1..0d0ad29f8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -282,6 +282,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
+// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 930618e50..e3d6cad82 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.19.17.5200 | 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.17.5201 | 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>

From 0b1455a77e7fd2d543b843edf2f6dcc863699118 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 4 Jul 2020 13:43:56 +0000
Subject: [PATCH 1179/1848] Introduced a handler for prepopulate_empty_note
 option.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/templates.tpl   |  4 ++++
 WEB-INF/templates/time_script.tpl | 10 ++++++++++
 mobile/time.php                   |  1 +
 templates.php                     |  4 ++++
 time.php                          |  1 +
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e3d6cad82..96a499dd4 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.19.17.5201 | 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.18.5202 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index d4532873d..eb1b2027f 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -52,6 +52,10 @@
           <td align="right" width=25%">{$forms.templatesForm.bind_templates_with_projects.control}</td>
           <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
+        <tr>
+          <td align="right">{$forms.templatesForm.prepopulate_empty_note.control}</td>
+          <td><label for="prepopulate_empty_note">{$i18n.label.prepopulate_empty_note}</label> <a href="https://www.anuko.com/lp/tt_43.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
         <tr>
           <td colspan="2" height="50" align="center">{$forms.templatesForm.btn_save.control}</td>
         </tr>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 495a16aee..d6c48a833 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -226,6 +226,16 @@ function fillTemplateDropdown(id) {
       }
     }
   }
+
+  // Do things for prepopulate_empty_note.
+  if ({$prepopulate_empty_note} && dropdown.options.length >= 2) { // 2 because of mandatory top option.
+    var note = document.getElementById("note");
+    if (note.value == "") {
+      // We have an empty Note field.
+      dropdown.options[1].selected = true; // Select first template.
+      note.value = template_bodies[dropdown.options[1].value]; // Pre-polulate note with first template body.
+    }
+  }
 }
 
 // The formDisable function disables some fields depending on what we have in other fields.
diff --git a/mobile/time.php b/mobile/time.php
index b37a0a959..0293574dc 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -259,6 +259,7 @@
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('prepopulate_empty_note', $config->getDefinedValue('prepopulate_empty_note'));
     $smarty->assign('template_list', $template_list);
   }
 }
diff --git a/templates.php b/templates.php
index cf315d085..1a643e8f3 100644
--- a/templates.php
+++ b/templates.php
@@ -45,12 +45,15 @@
 
 if ($request->isPost()) {
   $cl_bind_templates_with_projects = $request->getParameter('bind_templates_with_projects');
+  $cl_prepopulate_empty_note = $request->getParameter('prepopulate_empty_note');
 } else {
   $cl_bind_templates_with_projects = $config->getDefinedValue('bind_templates_with_projects');
+  $cl_prepopulate_empty_note = $config->getDefinedValue('prepopulate_empty_note');
 }
 
 $form = new Form('templatesForm');
 $form->addInput(array('type'=>'checkbox','name'=>'bind_templates_with_projects','value'=>$cl_bind_templates_with_projects));
+$form->addInput(array('type'=>'checkbox','name'=>'prepopulate_empty_note','value'=>$cl_prepopulate_empty_note));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 $activeTemplates = ttGroupHelper::getActiveTemplates();
@@ -60,6 +63,7 @@
   if ($request->getParameter('btn_save')) {
     // Save button clicked. Update config.
     $config->setDefinedValue('bind_templates_with_projects', $cl_bind_templates_with_projects);
+    $config->setDefinedValue('prepopulate_empty_note', $cl_prepopulate_empty_note);
     if (!$user->updateGroup(array('config' => $config->getConfig()))) {
       $err->add($i18n->get('error.db'));
     }
diff --git a/time.php b/time.php
index 823cd8287..44d895a5b 100644
--- a/time.php
+++ b/time.php
@@ -315,6 +315,7 @@
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('prepopulate_empty_note', $config->getDefinedValue('prepopulate_empty_note'));
     $smarty->assign('template_list', $template_list);
   }
 }

From da251bb9b537cdf266ba905493c96d8a20690d5b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 5 Jul 2020 15:03:23 +0000
Subject: [PATCH 1180/1848] Changed prepopulate_empty_note to prepopulate_note
 logic.

---
 WEB-INF/resources/ca.lang.php     |  2 +-
 WEB-INF/resources/cs.lang.php     |  2 +-
 WEB-INF/resources/da.lang.php     |  2 +-
 WEB-INF/resources/de.lang.php     |  2 +-
 WEB-INF/resources/en.lang.php     |  2 +-
 WEB-INF/resources/es.lang.php     |  2 +-
 WEB-INF/resources/et.lang.php     |  2 +-
 WEB-INF/resources/fa.lang.php     |  2 +-
 WEB-INF/resources/fi.lang.php     |  2 +-
 WEB-INF/resources/fr.lang.php     |  2 +-
 WEB-INF/resources/gr.lang.php     |  2 +-
 WEB-INF/resources/he.lang.php     |  2 +-
 WEB-INF/resources/hu.lang.php     |  2 +-
 WEB-INF/resources/it.lang.php     |  2 +-
 WEB-INF/resources/ja.lang.php     |  2 +-
 WEB-INF/resources/ko.lang.php     |  2 +-
 WEB-INF/resources/nl.lang.php     |  2 +-
 WEB-INF/resources/no.lang.php     |  2 +-
 WEB-INF/resources/pl.lang.php     |  2 +-
 WEB-INF/resources/pt-br.lang.php  |  2 +-
 WEB-INF/resources/pt.lang.php     |  2 +-
 WEB-INF/resources/ro.lang.php     |  2 +-
 WEB-INF/resources/ru.lang.php     |  2 +-
 WEB-INF/resources/sk.lang.php     |  2 +-
 WEB-INF/resources/sl.lang.php     |  2 +-
 WEB-INF/resources/sr.lang.php     |  2 +-
 WEB-INF/resources/sv.lang.php     |  2 +-
 WEB-INF/resources/tr.lang.php     |  2 +-
 WEB-INF/resources/zh-cn.lang.php  |  2 +-
 WEB-INF/resources/zh-tw.lang.php  |  2 +-
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/templates.tpl   |  4 ++--
 WEB-INF/templates/time_script.tpl | 11 ++++-------
 mobile/time.php                   |  2 +-
 mobile/time_edit.php              |  1 +
 templates.php                     |  8 ++++----
 time.php                          |  2 +-
 time_edit.php                     |  1 +
 38 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 63bc3123f..9893ad523 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -277,7 +277,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d79763485..59756d1b5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -287,7 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 53e73200c..a8a14b53d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -267,7 +267,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b7e3b2efd..a8f1d165a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -257,7 +257,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b7f3a21f2..2beefaa1c 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -251,7 +251,7 @@
 'label.mark_approved' => 'Mark approved',
 'label.template' => 'Template',
 'label.bind_templates_with_projects' => 'Bind templates with projects',
-'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+'label.prepopulate_note' => 'Prepopulate Note field',
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
 'label.file' => 'File',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9867273e3..1cf3ce768 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -280,7 +280,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 573689a57..5e2e78caa 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -274,7 +274,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index de9fefe1d..e078a0a34 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -278,7 +278,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3f45c2752..575dc04f6 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -271,7 +271,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 769006928..5fe0f76d7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -265,7 +265,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 661a31697..5d0dd6bde 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -261,7 +261,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8e72b7c93..199e26533 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -286,7 +286,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 03d54e4f2..a4a4dd005 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -283,7 +283,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d9c6023e9..b10575302 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -265,7 +265,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index afc001282..8ebec5955 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -287,7 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 23ba28957..76c159472 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -287,7 +287,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5c9516b2e..06f764d4c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -257,7 +257,7 @@
 'label.template' => 'Sjabloon',
 // TODO: translate the following.
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
 'label.file' => 'Bestand',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6059ed09c..ad95bd7e3 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -284,7 +284,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 6c7adf0f6..f988df4a4 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -272,7 +272,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index daf8fc1d3..5c9d89a32 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -269,7 +269,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 204a72e31..3043e8bba 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -272,7 +272,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 01a0f37f4..add70a4ea 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -284,7 +284,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f40becac9..fb050a1a0 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -242,7 +242,7 @@
 'label.mark_approved' => 'Отметить одобрение',
 'label.template' => 'Шаблон',
 'label.bind_templates_with_projects' => 'Связать шаблоны с проектами',
-'label.prepopulate_empty_note' => 'Подставлять шаблон в пустое поле',
+'label.prepopulate_note' => 'Подставлять шаблон в поле',
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
 'label.file' => 'Файл',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 313fcfd2d..cf0b8432b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -276,7 +276,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 19cceabca..f4aa21b58 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -267,7 +267,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 19f6d345e..be5739b6e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -270,7 +270,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 72113f964..43b0d92b6 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -267,7 +267,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2d509b658..e241cace8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -291,7 +291,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 9dccc6b25..b1d81418b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -276,7 +276,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 0d0ad29f8..05615586d 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -282,7 +282,7 @@
 // 'label.mark_approved' => 'Mark approved',
 // 'label.template' => 'Template',
 // 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_empty_note' => 'Prepopulate empty Note field',
+// 'label.prepopulate_note' => 'Prepopulate Note field',
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 96a499dd4..6743bb1ee 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.19.18.5202 | 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.18.5203 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index eb1b2027f..71b7daebc 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -53,8 +53,8 @@
           <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
-          <td align="right">{$forms.templatesForm.prepopulate_empty_note.control}</td>
-          <td><label for="prepopulate_empty_note">{$i18n.label.prepopulate_empty_note}</label> <a href="https://www.anuko.com/lp/tt_43.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          <td align="right">{$forms.templatesForm.prepopulate_note.control}</td>
+          <td><label for="prepopulate_note">{$i18n.label.prepopulate_note}</label> <a href="https://www.anuko.com/lp/tt_43.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
           <td colspan="2" height="50" align="center">{$forms.templatesForm.btn_save.control}</td>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index d6c48a833..14157a932 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -227,14 +227,11 @@ function fillTemplateDropdown(id) {
     }
   }
 
-  // Do things for prepopulate_empty_note.
-  if ({$prepopulate_empty_note} && dropdown.options.length >= 2) { // 2 because of mandatory top option.
+  // Prepopulate note if we have to.
+  if ({$prepopulate_note} && dropdown.options.length >= 2) { // 2 because of mandatory top option.
     var note = document.getElementById("note");
-    if (note.value == "") {
-      // We have an empty Note field.
-      dropdown.options[1].selected = true; // Select first template.
-      note.value = template_bodies[dropdown.options[1].value]; // Pre-polulate note with first template body.
-    }
+    dropdown.options[1].selected = true; // Select first template.
+    note.value = template_bodies[dropdown.options[1].value]; // Pre-polulate note with first template body.
   }
 }
 
diff --git a/mobile/time.php b/mobile/time.php
index 0293574dc..427d22aa3 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -259,7 +259,7 @@
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
-    $smarty->assign('prepopulate_empty_note', $config->getDefinedValue('prepopulate_empty_note'));
+    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
   }
 }
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 18acb98b4..f901952cf 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -235,6 +235,7 @@
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
   }
 }
diff --git a/templates.php b/templates.php
index 1a643e8f3..fec66b599 100644
--- a/templates.php
+++ b/templates.php
@@ -45,15 +45,15 @@
 
 if ($request->isPost()) {
   $cl_bind_templates_with_projects = $request->getParameter('bind_templates_with_projects');
-  $cl_prepopulate_empty_note = $request->getParameter('prepopulate_empty_note');
+  $cl_prepopulate_note = $request->getParameter('prepopulate_note');
 } else {
   $cl_bind_templates_with_projects = $config->getDefinedValue('bind_templates_with_projects');
-  $cl_prepopulate_empty_note = $config->getDefinedValue('prepopulate_empty_note');
+  $cl_prepopulate_note = $config->getDefinedValue('prepopulate_note');
 }
 
 $form = new Form('templatesForm');
 $form->addInput(array('type'=>'checkbox','name'=>'bind_templates_with_projects','value'=>$cl_bind_templates_with_projects));
-$form->addInput(array('type'=>'checkbox','name'=>'prepopulate_empty_note','value'=>$cl_prepopulate_empty_note));
+$form->addInput(array('type'=>'checkbox','name'=>'prepopulate_note','value'=>$cl_prepopulate_note));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 $activeTemplates = ttGroupHelper::getActiveTemplates();
@@ -63,7 +63,7 @@
   if ($request->getParameter('btn_save')) {
     // Save button clicked. Update config.
     $config->setDefinedValue('bind_templates_with_projects', $cl_bind_templates_with_projects);
-    $config->setDefinedValue('prepopulate_empty_note', $cl_prepopulate_empty_note);
+    $config->setDefinedValue('prepopulate_note', $cl_prepopulate_note);
     if (!$user->updateGroup(array('config' => $config->getConfig()))) {
       $err->add($i18n->get('error.db'));
     }
diff --git a/time.php b/time.php
index 44d895a5b..1a9a07b4c 100644
--- a/time.php
+++ b/time.php
@@ -315,7 +315,7 @@
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
-    $smarty->assign('prepopulate_empty_note', $config->getDefinedValue('prepopulate_empty_note'));
+    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
   }
 }
diff --git a/time_edit.php b/time_edit.php
index 8734d2ab8..bbf55d086 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -238,6 +238,7 @@
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     $smarty->assign('template_dropdown', 1);
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
   }
 }

From 0d1cbcf045d46d6fac66bed2a141c72620bd7651 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 5 Jul 2020 15:57:14 +0000
Subject: [PATCH 1181/1848] Implemented prepopulateNote as a separate function.

---
 WEB-INF/templates/time_script.tpl | 18 ++++++++++++------
 mobile/time.php                   |  2 +-
 mobile/time_edit.php              |  2 +-
 time.php                          |  2 +-
 time_edit.php                     |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 14157a932..c64131d5e 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -85,6 +85,7 @@ function fillDropdowns() {
 
   fillTaskDropdown(document.timeRecordForm.project.value);
   fillTemplateDropdown(document.timeRecordForm.project.value);
+  prepopulateNote();
 }
 
 // The fillProjectDropdown function populates the project combo box with
@@ -226,13 +227,18 @@ function fillTemplateDropdown(id) {
       }
     }
   }
+}
 
-  // Prepopulate note if we have to.
-  if ({$prepopulate_note} && dropdown.options.length >= 2) { // 2 because of mandatory top option.
-    var note = document.getElementById("note");
-    dropdown.options[1].selected = true; // Select first template.
-    note.value = template_bodies[dropdown.options[1].value]; // Pre-polulate note with first template body.
-  }
+// The prepopulateNote function populates the note field with first found template body in Template dropdown.
+function prepopulateNote() {
+  var dropdown = document.getElementById("template");
+  if (dropdown == null) return; // Nothing to do.
+
+  if (!{$prepopulate_note} || dropdown.options.length <= 1) return ; // 1 because of mandatory top option.
+
+  dropdown.options[1].selected = true; // Select first template.
+  var note = document.getElementById("note");
+  note.value = template_bodies[dropdown.options[1].value]; // Prepolulate note with first template body.
 }
 
 // The formDisable function disables some fields depending on what we have in other fields.
diff --git a/mobile/time.php b/mobile/time.php
index 427d22aa3..c361fbe0d 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -166,7 +166,7 @@
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index f901952cf..e6e790827 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -143,7 +143,7 @@
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
diff --git a/time.php b/time.php
index 1a9a07b4c..0f30eac7c 100644
--- a/time.php
+++ b/time.php
@@ -210,7 +210,7 @@
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,
diff --git a/time_edit.php b/time_edit.php
index bbf55d086..2a0a02357 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -146,7 +146,7 @@
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
   $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
     'style'=>'width: 250px;',
     'value'=>$cl_project,

From c44d8fd50bf6211a266df402fb979a7e5aefcf86 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 6 Jul 2020 01:04:30 +0000
Subject: [PATCH 1182/1848] Fixed the script for Now buttons to work again.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/time_script.tpl | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6743bb1ee..0571b5a74 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.19.18.5203 | 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.18.5204 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index c64131d5e..707121128 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -231,10 +231,13 @@ function fillTemplateDropdown(id) {
 
 // The prepopulateNote function populates the note field with first found template body in Template dropdown.
 function prepopulateNote() {
+  {if !prepopulate_note}
+    return;
+  {/if}
   var dropdown = document.getElementById("template");
   if (dropdown == null) return; // Nothing to do.
 
-  if (!{$prepopulate_note} || dropdown.options.length <= 1) return ; // 1 because of mandatory top option.
+  if (dropdown.options.length <= 1) return ; // 1 because of mandatory top option.
 
   dropdown.options[1].selected = true; // Select first template.
   var note = document.getElementById("note");

From b4de969043705a34ebf68e0af33a23a8c71dbce7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 6 Jul 2020 01:07:54 +0000
Subject: [PATCH 1183/1848] A better fix for previous commit.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/time_script.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0571b5a74..e5f70cfbd 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.19.18.5204 | 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.18.5205 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 707121128..84ff653d2 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -231,7 +231,7 @@ function fillTemplateDropdown(id) {
 
 // The prepopulateNote function populates the note field with first found template body in Template dropdown.
 function prepopulateNote() {
-  {if !prepopulate_note}
+  {if !$prepopulate_note}
     return;
   {/if}
   var dropdown = document.getElementById("template");

From 014dcc496cb0e4385213a6d3a9f75d6fa77c4fcc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 7 Jul 2020 17:51:54 +0000
Subject: [PATCH 1184/1848] Cosmetic improvements in comments.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/time_script.tpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e5f70cfbd..9a047ba35 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.19.18.5205 | 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.18.5206 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 84ff653d2..709a7cff7 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -78,7 +78,7 @@ var empty_label_task = "{$i18n.dropdown.select|escape:'javascript'}";
 var empty_label_template = "{$i18n.dropdown.select|escape:'javascript'}";
 
 // The fillDropdowns function populates the "project", "task", and "template" dropdown controls
-// with relevant values.
+// with relevant values, and also prepopulates the Note field, if required.
 function fillDropdowns() {
   if(document.body.contains(document.timeRecordForm.client))
     fillProjectDropdown(document.timeRecordForm.client.value);
@@ -239,9 +239,9 @@ function prepopulateNote() {
 
   if (dropdown.options.length <= 1) return ; // 1 because of mandatory top option.
 
-  dropdown.options[1].selected = true; // Select first template.
+  dropdown.options[1].selected = true; // Select first available template.
   var note = document.getElementById("note");
-  note.value = template_bodies[dropdown.options[1].value]; // Prepolulate note with first template body.
+  note.value = template_bodies[dropdown.options[1].value]; // Prepolulate the Note field with first template body.
 }
 
 // The formDisable function disables some fields depending on what we have in other fields.

From 531fba94204370984d817fa7f7543d7d59e3fbfe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 7 Jul 2020 18:09:47 +0000
Subject: [PATCH 1185/1848] Made coding of template_add.php and
 template_edit.php more consistent.

---
 WEB-INF/templates/footer.tpl |  2 +-
 template_add.php             | 12 ++++++++----
 template_edit.php            |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9a047ba35..3cdabc241 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.19.18.5206 | 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.18.5207 | 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/template_add.php b/template_add.php
index 98dd41430..cc2dc83b6 100644
--- a/template_add.php
+++ b/template_add.php
@@ -42,7 +42,9 @@
 // End of access checks.
 
 $config = new ttConfigHelper($user->getConfig());
-$projects = ttGroupHelper::getActiveProjects();
+$bindTemplatesWithProjects = $config->getDefinedValue('bind_templates_with_projects');
+if ($bindTemplatesWithProjects)
+  $projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -50,8 +52,10 @@
   $cl_content = trim($request->getParameter('content'));
   $cl_projects = $request->getParameter('projects');
 } else {
-  foreach ($projects as $project_item)
-    $cl_projects[] = $project_item['id'];
+  if ($bindTemplatesWithProjects) {
+    foreach ($projects as $project_item)
+      $cl_projects[] = $project_item['id'];
+  }
 }
 
 $form = new Form('templateForm');
@@ -82,7 +86,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', count($projects) > 0 && $config->getDefinedValue('bind_templates_with_projects'));
+$smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.add_template'));
 $smarty->assign('content_page_name', 'template_add.tpl');
 $smarty->display('index.tpl');
diff --git a/template_edit.php b/template_edit.php
index 7619e7378..ef2b38cf1 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -104,7 +104,7 @@
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0 && $bindTemplatesWithProjects);
+$smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.edit_template'));
 $smarty->assign('content_page_name', 'template_edit.tpl');
 $smarty->display('index.tpl');

From c7fb55551bd14b7d9f649a085c7fff11d18de768 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 7 Jul 2020 20:00:46 +0000
Subject: [PATCH 1186/1848] Some usability fixes for templates plugin.

---
 WEB-INF/lib/ttGroupHelper.class.php | 5 +++--
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/templates.tpl     | 7 +++++--
 WEB-INF/templates/time_script.tpl   | 6 ++++--
 templates.php                       | 5 ++++-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 83ffe648c..af8d55345 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -174,7 +174,8 @@ static function markGroupDeleted($group_id) {
       'tt_config',
       'tt_predefined_expenses',
       'tt_client_project_binds',
-      'tt_project_task_binds'
+      'tt_project_task_binds',
+      'tt_project_template_binds'
     );
     foreach($tables_to_delete_from as $table) {
       if (!ttGroupHelper::deleteGroupEntriesFromTable($group_id, $table))
@@ -187,7 +188,7 @@ static function markGroupDeleted($group_id) {
     //
     // 1) Users may mark some of them deleted during their work.
     // If we mark all of them deleted here, we can't recover nicely
-    // as we'll lose track of what was accidentally deleted by user.
+    // as we'll lose track of what was deleted by users.
     //
     // 2) DB maintenance script (Clean up DB from inactive groups) should
     // get rid of these items permanently eventually.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3cdabc241..25f44c0e6 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.19.18.5207 | 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.18.5208 | 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/templates.tpl b/WEB-INF/templates/templates.tpl
index 71b7daebc..a22325788 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -48,12 +48,15 @@
 {/if}
       <div class="table-divider"></div>
       <table width="100%">
+
+{if $show_bind_with_projects_checkbox}
         <tr>
-          <td align="right" width=25%">{$forms.templatesForm.bind_templates_with_projects.control}</td>
+          <td align="right" width="25%">{$forms.templatesForm.bind_templates_with_projects.control}</td>
           <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
+{/if}
         <tr>
-          <td align="right">{$forms.templatesForm.prepopulate_note.control}</td>
+          <td align="right" width="25%">{$forms.templatesForm.prepopulate_note.control}</td>
           <td><label for="prepopulate_note">{$i18n.label.prepopulate_note}</label> <a href="https://www.anuko.com/lp/tt_43.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
         </tr>
         <tr>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 709a7cff7..2c6364305 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -83,8 +83,10 @@ function fillDropdowns() {
   if(document.body.contains(document.timeRecordForm.client))
     fillProjectDropdown(document.timeRecordForm.client.value);
 
-  fillTaskDropdown(document.timeRecordForm.project.value);
-  fillTemplateDropdown(document.timeRecordForm.project.value);
+  if(document.body.contains(document.timeRecordForm.project)) {
+    fillTaskDropdown(document.timeRecordForm.project.value);
+    fillTemplateDropdown(document.timeRecordForm.project.value);
+  }
   prepopulateNote();
 }
 
diff --git a/templates.php b/templates.php
index fec66b599..45ea2e477 100644
--- a/templates.php
+++ b/templates.php
@@ -42,6 +42,8 @@
 // End of access checks.
 
 $config = $user->getConfigHelper();
+$trackingMode = $user->getTrackingMode();
+$showBindWithProjectsCheckbox = $trackingMode != MODE_TIME;
 
 if ($request->isPost()) {
   $cl_bind_templates_with_projects = $request->getParameter('bind_templates_with_projects');
@@ -52,7 +54,7 @@
 }
 
 $form = new Form('templatesForm');
-$form->addInput(array('type'=>'checkbox','name'=>'bind_templates_with_projects','value'=>$cl_bind_templates_with_projects));
+if ($showBindWithProjectsCheckbox) $form->addInput(array('type'=>'checkbox','name'=>'bind_templates_with_projects','value'=>$cl_bind_templates_with_projects));
 $form->addInput(array('type'=>'checkbox','name'=>'prepopulate_note','value'=>$cl_prepopulate_note));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
@@ -79,6 +81,7 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_templates', $activeTemplates);
 $smarty->assign('inactive_templates', $inactiveTemplates);
+$smarty->assign('show_bind_with_projects_checkbox', $showBindWithProjectsCheckbox);
 $smarty->assign('title', $i18n->get('title.templates'));
 $smarty->assign('content_page_name', 'templates.tpl');
 $smarty->display('index.tpl');

From 79d5bdaa98570c812069ff57bfe185e5d74a73ef Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 7 Jul 2020 20:58:44 +0000
Subject: [PATCH 1187/1848] Cosmetic.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 2 +-
 WEB-INF/templates/templates.tpl           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 91d463542..9b23edbee 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -470,7 +470,7 @@ function writeData() {
      }
     fwrite($this->file, $this->indentation."  </custom_field_log>\n");
 
-    // Write expense otems.
+    // Write expense items.
     // We use getRecordsChunkFromTable here to avoid out of memory condition for large tables.
     fwrite($this->file, $this->indentation."  <expense_items>\n");
     $offset = 0;
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index a22325788..c1ffff729 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -48,7 +48,6 @@
 {/if}
       <div class="table-divider"></div>
       <table width="100%">
-
 {if $show_bind_with_projects_checkbox}
         <tr>
           <td align="right" width="25%">{$forms.templatesForm.bind_templates_with_projects.control}</td>

From c72ff82cccba42b7a4fcaea557db86b5068228bc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 9 Jul 2020 15:47:10 +0000
Subject: [PATCH 1188/1848] Added project to template binds to export.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 27 +++++++++++++++++++++--
 WEB-INF/templates/footer.tpl              |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 9b23edbee..843fe84f4 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -48,6 +48,7 @@ class ttGroupExportHelper {
   var $customFieldMap = array();
   var $customFieldOptionMap = array();
   var $favReportMap = array();
+  var $templateMap = array();
 
   // Constructor.
   function __construct($group_id, $file, $indentation) {
@@ -218,6 +219,11 @@ function writeData() {
     foreach ($fav_reports as $key=>$fav_report)
       $this->favReportMap[$fav_report['id']] = $key + 1;
 
+    // Prepare template map.
+    $templates = $this->getRecordsFromTable('tt_templates');
+    foreach ($templates as $key=>$template)
+      $this->templateMap[$template['id']] = $key + 1;
+
     // Write roles.
     fwrite($this->file, $this->indentation."  <roles>\n");
     foreach ($roles as $role) {
@@ -511,11 +517,11 @@ function writeData() {
     }
 
     // Write templates.
-    $templates = $this->getRecordsFromTable('tt_templates');
     if (count($templates) > 0) {
       fwrite($this->file, $this->indentation."  <templates>\n");
       foreach ($templates as $template) {
-        $template_part = $this->indentation.'    '."<template name=\"".htmlspecialchars($template['name'])."\"";
+        $template_part = $this->indentation.'    '."<template id=\"".$this->templateMap[$template['id']]."\"";
+        $template_part .= " name=\"".htmlspecialchars($template['name'])."\"";
         $template_part .= " description=\"".htmlspecialchars($template['description'])."\"";
         $template_part .= " content=\"".$this->encodeLineBreaks($template['content'])."\"";
         $template_part .= " status=\"".$template['status']."\"";
@@ -527,6 +533,23 @@ function writeData() {
       unset($template_part);
     }
 
+    // Write project to template binds.
+    $project_template_binds = $this->getRecordsFromTable('tt_project_template_binds');
+    if (count($project_template_binds) > 0) {
+      fwrite($this->file, $this->indentation."  <project_template_binds>\n");
+      foreach ($project_template_binds as $bind) {
+        $project_id = $this->projectMap[$bind['project_id']];
+        $template_id = $this->templateMap[$bind['template_id']];
+        $bind_part = $this->indentation.'    '."<project_template_bind project_id=\"".$project_id."\"";
+        $bind_part .= " template_id=\"".$template_id."\"";
+        $bind_part .= "></project_template_bind>\n";
+        fwrite($this->file, $bind_part);
+      }
+      fwrite($this->file, $this->indentation."  </project_template_binds>\n");
+      unset($project_template_binds);
+      unset($bind_part);
+    }
+
     // Write monthly quotas.
     $quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
     if (count($quotas) > 0) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 25f44c0e6..260dbd101 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.19.18.5208 | 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.18.5209 | 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>

From 3f2d1e909531212f384110df06a80c261248284e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 9 Jul 2020 16:24:50 +0000
Subject: [PATCH 1189/1848] Added project to template binds to org import
 feature.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 42 ++++++++++++++++++++++---
 WEB-INF/templates/footer.tpl            |  2 +-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index a3287a403..32a5c81f1 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -51,6 +51,7 @@ class ttOrgImportHelper {
   var $currentGroupLogMap     = array();
   var $currentGroupCustomFieldMap = array();
   var $currentGroupCustomFieldOptionMap = array();
+  var $currentGroupTemplateMap = array();
   var $currentGroupFavReportMap = array();
 
   // Constructor.
@@ -66,7 +67,7 @@ function startElement($parser, $name, $attrs) {
     // First pass through the file determines if we can import data.
     // We require 2 things:
     //   1) Database schema version must be set. This ensures we have a compatible file.
-    //   2) No login coillisions are allowed.
+    //   2) No login collisions are allowed.
     if ($this->firstPass) {
       if ($name == 'ORG' && $this->canImport) {
          if ($attrs['SCHEMA'] == null) {
@@ -145,7 +146,8 @@ function startElement($parser, $name, $attrs) {
         unset($this->currentGroupLogMap); $this->currentGroupLogMap = array();
         unset($this->currentGroupCustomFieldMap); $this->currentGroupCustomFieldMap = array();
         unset($this->currentGroupCustomFieldOptionMap); $this->currentGroupCustomFieldOptionMap = array();
-        unset($this->currentGroupFavReportMap); $this->currentGroupCustomFavReportMap = array();
+        unset($this->currentGroupTemplateMap); $this->currentGroupTemplateMap = array();
+        unset($this->currentGroupFavReportMap); $this->currentGroupFavReportMap = array();
         return;
       }
 
@@ -425,13 +427,26 @@ function startElement($parser, $name, $attrs) {
       }
 
       if ($name == 'TEMPLATE') {
-        if (!$this->insertTemplate(array(
+        $template_id = $this->insertTemplate(array(
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'description' => $attrs['DESCRIPTION'],
           'content' => $attrs['CONTENT'],
-          'status' => $attrs['STATUS']))) {
+          'status' => $attrs['STATUS']));
+        if ($template_id) {
+          // Add a mapping.
+          $this->currentGroupTemplateMap[$attrs['ID']] = $template_id;
+        } else $this->errors->add($i18n->get('error.db'));
+        return;
+      }
+
+      if ($name == 'PROJECT_TEMPLATE_BIND') {
+        if (!$this->insertProjectTemplateBind(array(
+          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'template_id' => $this->currentGroupTemplateMap[$attrs['TEMPLATE_ID']],
+          'group_id' => $this->current_group_id,
+          'org_id' => $this->org_id))) {
           $this->errors->add($i18n->get('error.db'));
         }
         return;
@@ -774,6 +789,25 @@ private function insertTemplate($fields) {
     $sql = "INSERT INTO tt_templates (group_id, org_id, name, description, content, status)".
       " values ($group_id, $org_id, $name, $description, $content, $status)";
     $affected = $mdb2->exec($sql);
+    $last_id = 0;
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    $last_id = $mdb2->lastInsertID('tt_templates', 'id');
+    return $last_id;
+  }
+
+  // insertProjectTemplateBind - inserts a project to template bind into tt_project_template_binds table.
+  private function insertProjectTemplateBind($fields) {
+    $mdb2 = getConnection();
+
+    $group_id = (int) $fields['group_id'];
+    $org_id = (int) $fields['org_id'];
+    $project_id = (int) $fields['project_id'];
+    $template_id = (int) $fields['template_id'];
+    $sql = "insert into tt_project_template_binds (project_id, template_id, group_id, org_id)".
+      " values($project_id, $template_id, $group_id, $org_id)";
+    $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 260dbd101..60f29194f 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.19.18.5209 | 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.18.5210 | 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>

From e476c52025052a373ed9c2cb203ac66c889b7663 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 9 Jul 2020 16:58:44 +0000
Subject: [PATCH 1190/1848] Added project checkbox validation for
 template_add.php and template_edit.php.

---
 WEB-INF/templates/footer.tpl | 2 +-
 template_add.php             | 1 +
 template_edit.php            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 60f29194f..7b9f348e1 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.19.18.5210 | 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.18.5211 | 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/template_add.php b/template_add.php
index cc2dc83b6..086baf3b4 100644
--- a/template_add.php
+++ b/template_add.php
@@ -70,6 +70,7 @@
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_content)) $err->add($i18n->get('error.field'), $i18n->get('label.template'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_projects, 'tt_projects')) $err->add($i18n->get('error.field'), $i18n->get('label.projects'));
   // Finished validating user input.
 
   if ($err->no()) {
diff --git a/template_edit.php b/template_edit.php
index ef2b38cf1..117b8166b 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -86,6 +86,7 @@
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_content)) $err->add($i18n->get('error.field'), $i18n->get('label.template'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_projects, 'tt_projects')) $err->add($i18n->get('error.field'), $i18n->get('label.projects'));
   // Finished validating user input.
 
   if ($err->no()) {

From 4e51b63d93099cc2a3fa9254aead526efc543645 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 10 Jul 2020 12:31:15 +0000
Subject: [PATCH 1191/1848] Fixed time edit pages for prepopulate_note option.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/time_script.tpl | 3 +--
 mobile/time.php                   | 2 +-
 time.php                          | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7b9f348e1..6b1217816 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.19.18.5211 | 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.18.5212 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 2c6364305..463ab4f72 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -78,7 +78,7 @@ var empty_label_task = "{$i18n.dropdown.select|escape:'javascript'}";
 var empty_label_template = "{$i18n.dropdown.select|escape:'javascript'}";
 
 // The fillDropdowns function populates the "project", "task", and "template" dropdown controls
-// with relevant values, and also prepopulates the Note field, if required.
+// with relevant values.
 function fillDropdowns() {
   if(document.body.contains(document.timeRecordForm.client))
     fillProjectDropdown(document.timeRecordForm.client.value);
@@ -87,7 +87,6 @@ function fillDropdowns() {
     fillTaskDropdown(document.timeRecordForm.project.value);
     fillTemplateDropdown(document.timeRecordForm.project.value);
   }
-  prepopulateNote();
 }
 
 // The fillProjectDropdown function populates the project combo box with
diff --git a/mobile/time.php b/mobile/time.php
index c361fbe0d..fa349e531 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -374,7 +374,7 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns()"');
+$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'mobile/time.tpl');
diff --git a/time.php b/time.php
index 0f30eac7c..d3ddba7c8 100644
--- a/time.php
+++ b/time.php
@@ -484,7 +484,7 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns()"');
+$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'time.tpl');

From 48b54a11a55b9e021875310bc64f468b0a919ef6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 10 Jul 2020 14:06:21 +0000
Subject: [PATCH 1192/1848] Some refactoring in time.php.

---
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/time.php              |  6 ++-
 time.php                     | 85 ++++++++++++++++++++----------------
 3 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6b1217816..c9819b144 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.19.18.5212 | 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.18.5213 | 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/time.php b/mobile/time.php
index fa349e531..83a6c4bf0 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -51,13 +51,13 @@
 if ($request->isPost()) {
   $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
   if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
+    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
     exit();
   }
 }
 // End of access checks.
 
-// Determine user for which we display this page.
+// Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
   $user_id = $request->getParameter('user');
   $user->setOnBehalfUser($user_id);
@@ -127,6 +127,8 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
+
+// Dropdown for user and a hidden control to indicate user change.
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
diff --git a/time.php b/time.php
index d3ddba7c8..d1ccc235e 100644
--- a/time.php
+++ b/time.php
@@ -52,7 +52,7 @@
 if ($request->isPost()) {
   $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
   if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
+    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
     exit();
   }
 }
@@ -171,6 +171,8 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
+
+// Dropdown for user and a hidden control to indicate user change.
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
@@ -192,6 +194,7 @@
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
+// Note: for other tracking modes the control is added further below.
 if (MODE_TIME == $trackingMode && $showClient) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
@@ -205,6 +208,27 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
 if ($showProject) {
   // Dropdown for projects assigned to user.
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
@@ -218,7 +242,7 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
-  // Dropdown for clients if the clients plugin is enabled.
+  // Client dropdown.
   if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
@@ -247,9 +271,7 @@
   }
 }
 
-if ($showBillable)
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-
+// Task dropdown.
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
@@ -261,7 +283,7 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 
-// Add other controls.
+// Start and finish controls.
 if ($showStart) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
@@ -271,36 +293,12 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
+// Duration control.
 if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+// File upload control.
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-if (!defined('NOTE_INPUT_HEIGHT'))
-  define('NOTE_INPUT_HEIGHT', 40);
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
-$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
-
-
-
-// TODO: refactoring ongoing down from here.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
-
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -320,8 +318,19 @@
   }
 }
 
-// Submit.
+// Note control.
+if (!defined('NOTE_INPUT_HEIGHT'))
+  define('NOTE_INPUT_HEIGHT', 40);
+$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+// Calendar.
+$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+// A hidden control for today's date from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
+// Submit button.
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
+
 if ($request->isPost()) {
+  // Submit handler.
   if ($request->getParameter('btn_submit')) {
 
     // Validate user input.
@@ -334,10 +343,10 @@
         if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
       }
     }
-    if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+    if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $user->task_required) {
+    if (MODE_PROJECTS_AND_TASKS == $trackingMode && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
@@ -351,11 +360,11 @@
             $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
-        if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+        if (TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType) {
           $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
           $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
-        if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
+        if (TYPE_DURATION == $recordType || TYPE_ALL == $recordType)
           $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {
@@ -391,7 +400,7 @@
       if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
-
+    // TODO: refactoring going on down from here...
     // Insert record.
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(

From 460f0561291505d0258e98504715624225c5963e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 10 Jul 2020 14:30:57 +0000
Subject: [PATCH 1193/1848] Refactored ttTimeHelper::insert function to use
 group_id and org_id from the global User object.

---
 WEB-INF/lib/ttTimeHelper.class.php     | 5 +++--
 WEB-INF/lib/ttWeekViewHelper.class.php | 2 --
 WEB-INF/templates/footer.tpl           | 2 +-
 mobile/time.php                        | 2 --
 mobile/time_edit.php                   | 2 --
 mobile/timer.php                       | 2 --
 time.php                               | 2 --
 time_edit.php                          | 2 --
 8 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 6ed1721ee..112f2c28d 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -433,9 +433,10 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $user_id = (int) $fields['user_id'];
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
     $date = $fields['date'];
     $start = $fields['start'];
     $finish = $fields['finish'];
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 857626041..ff17017cf 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -548,8 +548,6 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     // Prepare an array of fields for regular insert function.
     $fields4insert = array();
     $fields4insert['user_id'] = $user->getUser();
-    $fields4insert['group_id'] = $user->getGroup();
-    $fields4insert['org_id'] = $user->org_id;
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
     $fields4insert['client'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c9819b144..7f4d7bad9 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.19.18.5213 | 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.18.5214 | 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/time.php b/mobile/time.php
index 83a6c4bf0..62263d5a4 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -342,8 +342,6 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user_id,
-        'group_id' => $group_id,
-        'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index e6e790827..2dcfcb93e 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -407,8 +407,6 @@
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
         'user_id'=>$user_id,
-        'group_id'=>$user->getGroup(),
-        'org_id' => $user->org_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,
diff --git a/mobile/timer.php b/mobile/timer.php
index 2df6c73cc..bac4d2871 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -243,8 +243,6 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getUser(),
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time.php b/time.php
index d1ccc235e..42677da94 100644
--- a/time.php
+++ b/time.php
@@ -406,8 +406,6 @@
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user_id,
-        'group_id' => $group_id,
-        'org_id' => $user->org_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time_edit.php b/time_edit.php
index 2a0a02357..55333ed25 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -413,8 +413,6 @@
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
         'user_id'=>$user_id,
-        'group_id'=>$user->getGroup(),
-        'org_id' => $user->org_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,

From a14b698457379b27a967053819894ae35fbbfd8f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 10 Jul 2020 14:55:15 +0000
Subject: [PATCH 1194/1848] Refactored ttTimeHelper::insert function further to
 obtain user_id from the global User object.

---
 WEB-INF/lib/ttTimeHelper.class.php     | 2 +-
 WEB-INF/lib/ttWeekViewHelper.class.php | 1 -
 WEB-INF/templates/footer.tpl           | 2 +-
 mobile/time.php                        | 1 -
 mobile/time_edit.php                   | 1 -
 mobile/timer.php                       | 1 -
 time.php                               | 1 -
 time_edit.php                          | 1 -
 8 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 112f2c28d..f34241c84 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -433,10 +433,10 @@ static function insert($fields)
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $user_id = (int) $fields['user_id'];
     $date = $fields['date'];
     $start = $fields['start'];
     $finish = $fields['finish'];
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index ff17017cf..05ec4e9d0 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -547,7 +547,6 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
 
     // Prepare an array of fields for regular insert function.
     $fields4insert = array();
-    $fields4insert['user_id'] = $user->getUser();
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
     $fields4insert['client'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7f4d7bad9..f4700238a 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.19.18.5214 | 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.18.5215 | 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/time.php b/mobile/time.php
index 62263d5a4..e51e00bdc 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -341,7 +341,6 @@
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 2dcfcb93e..b4f7f7f55 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -406,7 +406,6 @@
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,
diff --git a/mobile/timer.php b/mobile/timer.php
index bac4d2871..c1d248fd6 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -242,7 +242,6 @@
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user->getUser(),
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time.php b/time.php
index 42677da94..6dc112bcd 100644
--- a/time.php
+++ b/time.php
@@ -405,7 +405,6 @@
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
-        'user_id' => $user_id,
         'client' => $cl_client,
         'project' => $cl_project,
         'task' => $cl_task,
diff --git a/time_edit.php b/time_edit.php
index 55333ed25..020e4a0e8 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -412,7 +412,6 @@
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,

From 7a5393e48b3341f522c094191729fa8b73583c28 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 10 Jul 2020 15:28:05 +0000
Subject: [PATCH 1195/1848] A bit more refactoring in ttTimeHelper class.

---
 WEB-INF/lib/ttTimeHelper.class.php | 21 ++++++++++-----------
 WEB-INF/templates/footer.tpl       |  2 +-
 mobile/time_edit.php               |  1 -
 mobile/timer.php                   |  1 -
 time.php                           |  1 -
 time_edit.php                      |  1 -
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f34241c84..faa1197cd 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -452,10 +452,6 @@ static function insert($fields)
     $note = $fields['note'];
     $billable = $fields['billable'];
     $paid = $fields['paid'];
-    if (array_key_exists('status', $fields)) { // Key exists and may be NULL during migration of data.
-      $status_f = ', status';
-      $status_v = ', '.$mdb2->quote($fields['status']);
-    }
 
     $start = ttTimeHelper::to24HourFormat($start);
     if ($finish) {
@@ -469,8 +465,8 @@ static function insert($fields)
     if (!$paid) $paid = 0;
 
     if ($duration) {
-      $sql = "insert into tt_log (user_id, group_id, org_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+      $sql = "insert into tt_log (user_id, group_id, org_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by) ".
+        "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -479,8 +475,8 @@ static function insert($fields)
       if ($duration === false) $duration = 0;
       if (!$duration && ttTimeHelper::getUncompleted($user_id)) return false;
 
-      $sql = "insert into tt_log (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by $status_f) ".
-        "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v $status_v)";
+      $sql = "insert into tt_log (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by) ".
+        "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v)";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -496,9 +492,12 @@ static function update($fields)
     global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $id = $fields['id'];
     $date = $fields['date'];
-    $user_id = $fields['user_id'];
     $client = $fields['client'];
     $project = $fields['project'];
     $task = $fields['task'];
@@ -529,7 +528,7 @@ static function update($fields)
 
     if ($duration) {
       $sql = "UPDATE tt_log set start = NULL, duration = '$duration', client_id = ".$mdb2->quote($client).", project_id = ".$mdb2->quote($project).", task_id = ".$mdb2->quote($task).", ".
-        "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id";
+        "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
@@ -542,7 +541,7 @@ static function update($fields)
         return false;
 
       $sql = "UPDATE tt_log SET start = '$start', duration = '$duration', client_id = ".$mdb2->quote($client).", project_id = ".$mdb2->quote($project).", task_id = ".$mdb2->quote($task).", ".
-        "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id";
+        "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f4700238a..7486f21e1 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.19.18.5215 | 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.18.5216 | 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/time_edit.php b/mobile/time_edit.php
index b4f7f7f55..6fefebd86 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -350,7 +350,6 @@
       $res = ttTimeHelper::update(array(
           'id'=>$cl_id,  
           'date'=>$new_date->toString(DB_DATEFORMAT),
-          'user_id'=>$user_id,
           'client'=>$cl_client,
           'project'=>$cl_project,
           'task'=>$cl_task,
diff --git a/mobile/timer.php b/mobile/timer.php
index c1d248fd6..c7c1c2d40 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -274,7 +274,6 @@
       $res = ttTimeHelper::update(array(
         'id'=>$record['id'],
         'date'=>$cl_date,
-        'user_id'=>$user->getUser(),
         'client'=>$record['client_id'],
         'project'=>$record['project_id'],
         'task'=>$record['task_id'],
diff --git a/time.php b/time.php
index 6dc112bcd..868443c08 100644
--- a/time.php
+++ b/time.php
@@ -449,7 +449,6 @@
       $res = ttTimeHelper::update(array(
           'id'=>$record['id'],
           'date'=>$record['date'],
-          'user_id'=>$user_id,
           'client'=>$record['client_id'],
           'project'=>$record['project_id'],
           'task'=>$record['task_id'],
diff --git a/time_edit.php b/time_edit.php
index 020e4a0e8..83989404f 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -355,7 +355,6 @@
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
         'date'=>$new_date->toString(DB_DATEFORMAT),
-        'user_id'=>$user_id,
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,

From 38519bee6c2939e943d73ad669d9065f451863a8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 10 Jul 2020 15:44:44 +0000
Subject: [PATCH 1196/1848] Cosmetic. Finished refactoring time.php.

---
 time.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/time.php b/time.php
index 868443c08..b1c0c4dba 100644
--- a/time.php
+++ b/time.php
@@ -330,9 +330,8 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
-  // Submit handler.
   if ($request->getParameter('btn_submit')) {
-
+    // Submit button clicked.
     // Validate user input.
     if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
@@ -400,7 +399,7 @@
       if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
-    // TODO: refactoring going on down from here...
+
     // Insert record.
     if ($err->no()) {
       $id = ttTimeHelper::insert(array(

From f78244d64bb38fd5e147d20413f1bf13f1ad0dc2 Mon Sep 17 00:00:00 2001
From: jadrian-abramovitch
 <48164570+jadrian-abramovitch@users.noreply.github.com>
Date: Fri, 10 Jul 2020 16:12:47 -0400
Subject: [PATCH 1197/1848] Update Calendar.class.php (#97)

Days now turn purple instead of red until they are complete (default 8 hours) at which point they turn red as usual
---
 WEB-INF/lib/form/Calendar.class.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 447a45e02..74f52895d 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -28,6 +28,7 @@
 
 import('form.FormElement');
 import('DateAndTime');
+import('ttTimeHelper');
 
 class Calendar extends FormElement {
   var $holidays = array();
@@ -183,8 +184,20 @@ function toString($date="") {
 
             // Entries exist.
             if($active_dates) {
-              if( in_array(strftime(DB_DATEFORMAT, $date), $active_dates) )
-                $stl_link = ' class="CalendarLinkRecordsExist"';
+              $day_total_minutes = ttTimeHelper::toMinutes(ttTimeHelper::getTimeForDay($date_to_check));
+              global $user;
+              $workday_minutes = $user->getWorkdayMinutes();
+
+              //check for any entries in the day
+              if( in_array(strftime(DB_DATEFORMAT, $date), $active_dates) ){
+                //check if entries total to a complete work day
+                if ($day_total_minutes >= $workday_minutes){
+                  $stl_link = ' class="CalendarLinkRecordsExist"';
+                }
+                else {
+                  $stl_link = ' class="CalendarLinkNonCompleteDay"';
+                }
+              }
             }
 
             $str .= "<a".$stl_link." href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT, $date)."\" tabindex=\"-1\">".date("d",$date)."</a>";
@@ -242,6 +255,7 @@ function _genStyles() {
       $str .= ".CalendarLinkWeekend {color: #999999;}\n";
       $str .= ".CalendarLinkHoliday {color: #999999;}\n";
       $str .= ".CalendarLinkRecordsExist {color: #FF0000;}\n";
+      $str .= ".CalendarLinkNonCompleteDay {color: #800080;}\n";
         $str .= "</style>\n";
         return $str;
     }

From 80e8cc371b87d8a29863085ec3307d5a789e4659 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 13:34:07 +0000
Subject: [PATCH 1198/1848] Some refactoring and fixes on mobile time.php.

---
 WEB-INF/templates/footer.tpl      |   2 +-
 WEB-INF/templates/mobile/time.tpl |  29 ++++----
 mobile/time.php                   | 107 ++++++++++++++++++++----------
 time.php                          |  12 ++--
 4 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7486f21e1..71d4fc489 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.19.18.5216 | 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.18.5217 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 79398703b..b14e4d456 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -17,18 +17,18 @@
 <table cellspacing="3" cellpadding="0" border="0" width="100%">
 <tr>
   <td align="center">
-    {if $time_records}
-      <table class="mobile-table-details">
-      {foreach $time_records as $record}
+{if $time_records}
+    <table class="mobile-table-details">
+  {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}
         <td valign="top">{$record.project|escape}</td>
-{/if}
+    {/if}
         <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
         <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a>{/if}</td>
         <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a>{/if}</td>
       </tr>
-      {/foreach}
+  {/foreach}
     </table>
     <table border="0">
       <tr>
@@ -36,7 +36,7 @@
         <td>{$day_total}</td>
       </tr>
     </table>
-    {/if}
+{/if}
   </td>
 </tr>
 </table>
@@ -53,11 +53,11 @@
       <tr><td>{$i18n.label.user}:</td></tr>
       <tr><td>{$forms.timeRecordForm.user.control}</td></tr>
 {/if}
-{if $user->isPluginEnabled('cl')}
+{if $show_client}
       <tr><td>{$i18n.label.client}:</td></tr>
       <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
+{if $show_billable}
       <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if $custom_fields && $custom_fields->timeFields}
@@ -68,22 +68,23 @@
     </tr>
   {/foreach}
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <tr><td>{$i18n.label.project}:</td></tr>
     <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
     <tr><td>{$i18n.label.task}:</td></tr>
     <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_start}
     <tr><td>{$i18n.label.start}:</td></tr>
     <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
-
+{/if}
+{if $show_finish}
     <tr><td>{$i18n.label.finish}:</td></tr>
     <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_duration}
     <tr><td>{$i18n.label.duration}:</td></tr>
     <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
 {/if}
diff --git a/mobile/time.php b/mobile/time.php
index e51e00bdc..f1c4e4d84 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -68,6 +68,16 @@
 $group_id = $user->getGroup();
 $config = new ttConfigHelper($user->getConfig());
 
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
@@ -94,7 +104,7 @@
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
 $cl_billable = 1;
-if ($user->isPluginEnabled('iv')) {
+if ($showBillable) {
   if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
@@ -150,7 +160,8 @@
 }
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
+// Note: for other tracking modes the control is added further below.
+if (MODE_TIME == $trackingMode && $showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -163,7 +174,28 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
   // Dropdown for projects assigned to user.
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
@@ -176,8 +208,8 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
+  // Client dropdown.
+  if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
@@ -205,7 +237,8 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+// Task dropdown.
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -215,7 +248,9 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
-if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+
+// Start and finish controls.
+if ($showStart) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
   if ($user->punch_mode && !$user->canOverridePunchMode()) {
@@ -224,29 +259,10 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 60px;','value'=>$cl_note));
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
+// Duration control.
+if ($showDuration)
+  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -266,12 +282,20 @@
   }
 }
 
-// Submit.
+// Note control.
+$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 60px;','value'=>$cl_note));
+
+// A hidden control for today's date from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
+
+// Submit button.
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
+
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
-
+    // Submit button clicked.
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     // Validate input in time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
@@ -280,12 +304,14 @@
         if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
       }
     }
-    if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
+    if ($showProject) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && $user->task_required) {
+    if ($showTask && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
+    
+    // TODO: refactoring going on down from here...
     if (strlen($cl_duration) == 0) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
@@ -368,6 +394,19 @@
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
+
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_duration', $showDuration);
+
+
+
+
+
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/time.php b/time.php
index b1c0c4dba..1055470d0 100644
--- a/time.php
+++ b/time.php
@@ -138,7 +138,7 @@
 $cl_duration = trim($request->getParameter('duration'));
 $cl_note = trim($request->getParameter('note'));
 $cl_billable = 1;
-if ($user->isPluginEnabled('iv')) {
+if ($showBillable) {
   if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
@@ -293,9 +293,11 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
+
 // Duration control.
 if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+
 // File upload control.
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
@@ -322,10 +324,13 @@
 if (!defined('NOTE_INPUT_HEIGHT'))
   define('NOTE_INPUT_HEIGHT', 40);
 $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+
 // Calendar.
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+
 // A hidden control for today's date from user's browser.
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
+
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
@@ -342,10 +347,10 @@
         if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
       }
     }
-    if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode) {
+    if ($showProject) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (MODE_PROJECTS_AND_TASKS == $trackingMode && $user->task_required) {
+    if ($showTask && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
@@ -480,7 +485,6 @@
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
-$smarty->assign('show_templates', $showTemplates);
 $smarty->assign('show_note_column', $showNoteColumn);
 $smarty->assign('show_note_row', $showNoteRow);
 $smarty->assign('show_files', $showFiles);

From 1a8bb88c2b59660be6d55da2816af800191a95b4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 14:32:23 +0000
Subject: [PATCH 1199/1848] Finished refactoring mobile time.php and template.

---
 WEB-INF/templates/footer.tpl      |   2 +-
 WEB-INF/templates/mobile/time.tpl | 105 +++++++++++++++---------------
 WEB-INF/templates/time.tpl        |  96 +++++++++++++--------------
 mobile/time.php                   |  14 +---
 time.php                          |   4 +-
 5 files changed, 105 insertions(+), 116 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 71d4fc489..3c0845777 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.19.18.5217 | 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.18.5218 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index b14e4d456..038d6790d 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -15,94 +15,91 @@
 </table>
 
 <table cellspacing="3" cellpadding="0" border="0" width="100%">
-<tr>
-  <td align="center">
+  <tr>
+    <td align="center">
 {if $time_records}
-    <table class="mobile-table-details">
+      <table class="mobile-table-details">
   {foreach $time_records as $record}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
     {if $show_project}
-        <td valign="top">{$record.project|escape}</td>
+          <td valign="top">{$record.project|escape}</td>
     {/if}
-        <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-        <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a>{/if}</td>
-        <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a>{/if}</td>
-      </tr>
+          <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
+          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a>{/if}</td>
+          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a>{/if}</td>
+        </tr>
   {/foreach}
-    </table>
-    <table border="0">
-      <tr>
-        <td align="right">{$i18n.label.day_total}:</td>
-        <td>{$day_total}</td>
-      </tr>
-    </table>
+      </table>
+      <table border="0">
+        <tr>
+          <td align="right">{$i18n.label.day_total}:</td>
+          <td>{$day_total}</td>
+        </tr>
+      </table>
 {/if}
-  </td>
-</tr>
+    </td>
+  </tr>
 </table>
 
 {$forms.timeRecordForm.open}
 <table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width = "100%">
   <tr>
-    <td valign="top">
-    <table border="0">
+    <td>
+      <table width = "100%">
+        <tr>
+          <td valign="top">
+            <table border="0">
 {if $user_dropdown}
-      <tr><td>{$i18n.label.user}:</td></tr>
-      <tr><td>{$forms.timeRecordForm.user.control}</td></tr>
+              <tr><td>{$i18n.label.user}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.user.control}</td></tr>
 {/if}
 {if $show_client}
-      <tr><td>{$i18n.label.client}:</td></tr>
-      <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
+              <tr><td>{$i18n.label.client}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
 {/if}
 {if $show_billable}
-      <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
+              <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if $custom_fields && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
-      <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
-    </tr>
+              <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
+              {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+              <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
+              </tr>
   {/foreach}
 {/if}
 {if $show_project}
-    <tr><td>{$i18n.label.project}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
+              <tr><td>{$i18n.label.project}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
 {if $show_task}
-    <tr><td>{$i18n.label.task}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
+              <tr><td>{$i18n.label.task}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
 {if $show_start}
-    <tr><td>{$i18n.label.start}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
+              <tr><td>{$i18n.label.start}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
 {/if}
 {if $show_finish}
-    <tr><td>{$i18n.label.finish}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
+              <tr><td>{$i18n.label.finish}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
 {/if}
 {if $show_duration}
-    <tr><td>{$i18n.label.duration}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
+              <tr><td>{$i18n.label.duration}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
 {/if}
 {if $template_dropdown}
-    <tr><td>{$i18n.label.template}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.template.control}</td></tr>
+              <tr><td>{$i18n.label.template}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.template.control}</td></tr>
 {/if}
-
-    <tr><td>{$i18n.label.note}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
-    </table>
+              <tr><td>{$i18n.label.note}:</td></tr>
+              <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
+            </table>
+          </td>
+        </tr>
+        <tr><td colspan="2" height="50" align="center">{$forms.timeRecordForm.btn_submit.control}</td></tr>
+      </table>
     </td>
   </tr>
-  <tr>
-    <td colspan="2" height="50" align="center">{$forms.timeRecordForm.btn_submit.control}</td>
-  </tr>
-  </table>
-  </td>
-</tr>
 </table>
 {$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index d153dc96d..0b78b1788 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -38,11 +38,11 @@
 {/if}
 {if $custom_fields && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
-    <tr>
-      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      <td>{$forms.timeRecordForm.$control_name.control}</td>
-    </tr>
+        <tr>
+          <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+          <td>{$forms.timeRecordForm.$control_name.control}</td>
+        </tr>
   {/foreach}
 {/if}
 {if $show_project}
@@ -108,96 +108,96 @@
 </table>
 
 <table width="720">
-<tr>
-  <td valign="top">
+  <tr>
+    <td valign="top">
 {if $time_records}
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
+        <tr>
   {if $show_client}
-        <td class="tableHeader">{$i18n.label.client}</td>
+          <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
   {if $show_project}
-        <td class="tableHeader">{$i18n.label.project}</td>
+          <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
   {if $show_task}
-        <td class="tableHeader">{$i18n.label.task}</td>
+          <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
   {if $show_start}
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
+          <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
   {/if}
   {if $show_finish}
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
+          <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
   {/if}
-        <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
+          <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
   {if $show_note_column}
-        <td class="tableHeader">{$i18n.label.note}</td>
+          <td class="tableHeader">{$i18n.label.note}</td>
   {/if}
   {if $show_files}
-        <td></td>
+          <td></td>
   {/if}
-        <td></td>
-        <td></td>
-      </tr>
+          <td></td>
+          <td></td>
+        </tr>
   {foreach $time_records as $record}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
     {if $show_client}
-        <td valign="top">{$record.client|escape}</td>
+          <td valign="top">{$record.client|escape}</td>
     {/if}
     {if $show_project}
-        <td valign="top">{$record.project|escape}</td>
+          <td valign="top">{$record.project|escape}</td>
     {/if}
     {if $show_task}
-        <td valign="top">{$record.task|escape}</td>
+          <td valign="top">{$record.task|escape}</td>
     {/if}
     {if $show_start}
-        <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+          <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
     {/if}
     {if $show_finish}
-        <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+          <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
-        <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+          <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
     {if $show_note_column}
-        <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+          <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
     {/if}
     {if $show_files}
       {if $record.has_files}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
       {else}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
       {/if}
     {/if}
-        <td valign="top" align="center">
+          <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
+            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
       {if ($record.duration == '0:00' && $record.start <> '')}
-          <input type="hidden" name="record_id" value="{$record.id}">
-          <input type="hidden" name="browser_date" value="">
-          <input type="hidden" name="browser_time" value="">
-          <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
+            <input type="hidden" name="record_id" value="{$record.id}">
+            <input type="hidden" name="browser_date" value="">
+            <input type="hidden" name="browser_time" value="">
+            <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
       {/if}
     {/if}
-        </td>
-        <td valign="top" align="center">
+          </td>
+          <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
+            &nbsp;
     {else}
-          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
+            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
     {/if}
-        </td>
-      </tr>
+          </td>
+        </tr>
     {if $show_note_row && $record.comment}
-      <tr>
-        <td align="right" valign="top">{$i18n.label.note}:</td>
-        <td colspan="{$colspan}" align="left" valign="top">{$record.comment|escape}</td>
-      </tr>
+        <tr>
+          <td align="right" valign="top">{$i18n.label.note}:</td>
+          <td colspan="{$colspan}" align="left" valign="top">{$record.comment|escape}</td>
+        </tr>
     {/if}
   {/foreach}
-    </table>
+      </table>
 {/if}
-  </td>
-</tr>
+    </td>
+  </tr>
 </table>
 
 <table cellpadding="3" cellspacing="1" width="720">
diff --git a/mobile/time.php b/mobile/time.php
index f1c4e4d84..233f1d16f 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -310,8 +310,6 @@
     if ($showTask && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
-    
-    // TODO: refactoring going on down from here...
     if (strlen($cl_duration) == 0) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
@@ -323,11 +321,11 @@
             $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
-        if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+        if ($showStart) {
           $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
           $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
-        if ((TYPE_DURATION == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType()))
+        if ($showDuration)
           $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {
@@ -393,8 +391,8 @@
 
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
-
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
@@ -402,12 +400,6 @@
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
-
-
-
-
-
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
diff --git a/time.php b/time.php
index 1055470d0..9f85d5981 100644
--- a/time.php
+++ b/time.php
@@ -364,11 +364,11 @@
             $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
         }
       } else {
-        if (TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType) {
+        if ($showStart) {
           $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
           $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
         }
-        if (TYPE_DURATION == $recordType || TYPE_ALL == $recordType)
+        if ($showDuration)
           $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
       }
     } else {

From bf36e82b0af62613d2826ef793e199eddaaa0ac6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 15:11:09 +0000
Subject: [PATCH 1200/1848] Some html fixes.

---
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/header.tpl        | 1 +
 WEB-INF/templates/mobile/header.tpl | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3c0845777..0390d8a25 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.19.18.5218 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5219 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 837ef05b3..55d047caa 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index ec0b05926..054c75363 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">

From 07c9f1d30e074481292412cda209f1516550ec1e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 15:28:35 +0000
Subject: [PATCH 1201/1848] Starting refactoring Calendar.class.php.

---
 WEB-INF/lib/form/Calendar.class.php | 8 +-------
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 74f52895d..61b393cba 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -31,9 +31,7 @@
 import('ttTimeHelper');
 
 class Calendar extends FormElement {
-  var $holidays = array();
-  var $showHolidays = true;
-  var $weekStartDay = 0;
+  var $weekStartDay = 0; // Defaults to Sunday.
   
     var $mHeader = "padding: 5px; font-size: 8pt; color: #333333; background-color: #d9d9d9;";
     var $mDayCell = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #333333; background-color: #ffffff;";
@@ -72,10 +70,6 @@ function setCellStyle($style) { $this->mCellStyle = $style; }
     function setACellStyle($style) { $this->mACellStyle = $style; }
     function setLinkStyle($style) { $this->mLinkStyle = $style; }
 
-    function setShowHolidays($value) {
-      $this->showHolidays = $value;
-    }
-
     /**
      * @return void
      * @param date
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0390d8a25..2278dd082 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">Anuko Time Tracker 1.19.18.5219 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5220 | 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>

From 20156f595b5b9716fa7e7ab4789ba838e52f1192 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 15:53:33 +0000
Subject: [PATCH 1202/1848] Work in progress moving styles out of Calendar
 class into css file.

---
 WEB-INF/lib/form/Calendar.class.php | 12 +++---------
 WEB-INF/templates/footer.tpl        |  2 +-
 default.css                         | 25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 61b393cba..8ce99cc7e 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -33,9 +33,6 @@
 class Calendar extends FormElement {
   var $weekStartDay = 0; // Defaults to Sunday.
   
-    var $mHeader = "padding: 5px; font-size: 8pt; color: #333333; background-color: #d9d9d9;";
-    var $mDayCell = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #333333; background-color: #ffffff;";
-    var $mDaySelected = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #666666; background-color: #a6ccf7;";
     var $mDayWeekend = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #666666; background-color: #f7f7f7;";
     var $mDayHoliday = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #666666; background-color: #f7f7f7;";
     var $mDayHeader = "padding: 5px; border: 1px solid white; font-size: 8pt; color: #333333;";
@@ -106,7 +103,7 @@ function toString($date="") {
       $str = $this->_genStyles();
 
       $str .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">
-          <tr><td align="center"><div class="CalendarHeader">'.
+          <tr><td align="center"><div class="calendarHeader">'.
           //'<a href="?date='.$prevyear.'">&lt;&lt;</a> '.
           '<a href="?date='.$prevdate.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
           $this->mMonthNames[$thismonth-1].'&nbsp;'.$thisyear.
@@ -159,7 +156,7 @@ function toString($date="") {
               $stl_cell = ' class="CalendarDayWeekend"';
               $stl_link = ' class="CalendarLinkWeekend"';
             } else {
-              $stl_cell = ' class="CalendarDay"';
+              $stl_cell = ' class="calendarDay"';
             }
 
             // holidays
@@ -171,7 +168,7 @@ function toString($date="") {
 
             // selected day
             if ( $indate == strftime(DB_DATEFORMAT, $date))
-              $stl_cell = ' class="CalendarDaySelected"';
+              $stl_cell = ' class="calendarDaySelected"';
 
 
             $str .= '<td'.$stl_cell.'>';
@@ -238,9 +235,6 @@ function _getWeekDayBefore($year, $month) {
 
     function _genStyles() {
       $str = "<style>\n";
-      $str .= ".CalendarHeader {". $this->mHeader ."}\n";
-      $str .= ".CalendarDay {". $this->mDayCell  ."}\n";
-      $str .= ".CalendarDaySelected {". $this->mDaySelected  ."}\n";
       $str .= ".CalendarDayWeekend {". $this->mDayWeekend ."}\n";
       $str .= ".CalendarDayHoliday {". $this->mDayHoliday ."}\n";
       $str .= ".CalendarDayHeader {". $this->mDayHeader ."}\n";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2278dd082..cb33cd926 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">Anuko Time Tracker 1.19.18.5220 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5221 | 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/default.css b/default.css
index 77559c330..932dc4fe7 100644
--- a/default.css
+++ b/default.css
@@ -80,6 +80,31 @@ input[type=checkbox], label {
   font-weight: bold;
 }
 
+/* calendar styles */
+.calendarHeader {
+  padding: 5px;
+  font-size: 8pt;
+  color: #333333;
+  background-color: #d9d9d9;
+}
+
+.calendarDay {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+.calendarDaySelected {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #666666;
+  background-color: #a6ccf7;
+}
+/* end of calendar styles */
+
 .tableHeader {
   font-weight: bold;
   text-align: left;

From 87aa42aaee990c9fb733caa9cd7898cdb818e0c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 16:08:53 +0000
Subject: [PATCH 1203/1848] Continued to move styles out of Calendar class.

---
 WEB-INF/lib/form/Calendar.class.php | 16 ++++-----------
 WEB-INF/templates/footer.tpl        |  2 +-
 default.css                         | 30 +++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 8ce99cc7e..f5fe24e5c 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -33,9 +33,6 @@
 class Calendar extends FormElement {
   var $weekStartDay = 0; // Defaults to Sunday.
   
-    var $mDayWeekend = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #666666; background-color: #f7f7f7;";
-    var $mDayHoliday = "padding: 5px; border: 1px solid silver; font-size: 8pt; color: #666666; background-color: #f7f7f7;";
-    var $mDayHeader = "padding: 5px; border: 1px solid white; font-size: 8pt; color: #333333;";
     var $mDayHeaderWeekend = "padding: 5px; border: 1px solid white; font-size: 8pt; color: #999999;";
 
     var $controlName = "";
@@ -130,9 +127,9 @@ function toString($date="") {
       for ( $i=0; $i<7; $i++ ) {
         $weekdayNameIdx = ($i + $this->weekStartDay) % 7;
         if ($i==$weekend_start || $i==$weekend_end) {
-          $str .= '<td class="CalendarDayHeaderWeekend">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
+          $str .= '<td class="calendarDayHeaderWeekend">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
         } else {
-          $str .= '<td class="CalendarDayHeader">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
+          $str .= '<td class="calendarDayHeader">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
         }
       }
 
@@ -153,7 +150,7 @@ function toString($date="") {
 
             // weekend
             if ($j==$weekend_start || $j==$weekend_end) {
-              $stl_cell = ' class="CalendarDayWeekend"';
+              $stl_cell = ' class="calendarDayWeekend"';
               $stl_link = ' class="CalendarLinkWeekend"';
             } else {
               $stl_cell = ' class="calendarDay"';
@@ -162,7 +159,7 @@ function toString($date="") {
             // holidays
             $date_to_check = ttTimeHelper::dateInDatabaseFormat($thisyear, $thismonth, $start_date+$j);
             if (ttTimeHelper::isHoliday($date_to_check)) {
-              $stl_cell = ' class="CalendarDayHoliday"';
+              $stl_cell = ' class="calendarDayHoliday"';
               $stl_link = ' class="CalendarLinkHoliday"';
             }
 
@@ -235,11 +232,6 @@ function _getWeekDayBefore($year, $month) {
 
     function _genStyles() {
       $str = "<style>\n";
-      $str .= ".CalendarDayWeekend {". $this->mDayWeekend ."}\n";
-      $str .= ".CalendarDayHoliday {". $this->mDayHoliday ."}\n";
-      $str .= ".CalendarDayHeader {". $this->mDayHeader ."}\n";
-      $str .= ".CalendarDayHeaderWeekend {". $this->mDayHeaderWeekend ."}\n";
-      
       $str .= ".CalendarLinkWeekend {color: #999999;}\n";
       $str .= ".CalendarLinkHoliday {color: #999999;}\n";
       $str .= ".CalendarLinkRecordsExist {color: #FF0000;}\n";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cb33cd926..2f8b120bf 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">Anuko Time Tracker 1.19.18.5221 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5222 | 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/default.css b/default.css
index 932dc4fe7..7f138ed38 100644
--- a/default.css
+++ b/default.css
@@ -103,6 +103,36 @@ input[type=checkbox], label {
   color: #666666;
   background-color: #a6ccf7;
 }
+
+.calendarDayWeekend {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #666666;
+  background-color: #f7f7f7;
+}
+
+.calendarDayHoliday {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #666666;
+  background-color: #f7f7f7;
+}
+
+.calendarDayHeader {
+  padding: 5px;
+  border: 1px solid white;
+  font-size: 8pt;
+  color: #333333;
+}
+
+.calendarDayHeaderWeekend {
+  padding: 5px;
+  border: 1px solid white;
+  font-size: 8pt;
+  color: #999999;
+}
 /* end of calendar styles */
 
 .tableHeader {

From 20828bfde633fb14b03f8b9e2056ce68493346b0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 16:40:00 +0000
Subject: [PATCH 1204/1848] Some more refactoring in Calendar class.

---
 WEB-INF/lib/form/Calendar.class.php | 90 ++++++++++++-----------------
 WEB-INF/templates/footer.tpl        |  2 +-
 default.css                         | 16 +++++
 3 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index f5fe24e5c..e7db6bcfd 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -31,38 +31,34 @@
 import('ttTimeHelper');
 
 class Calendar extends FormElement {
-  var $weekStartDay = 0; // Defaults to Sunday.
-  
-    var $mDayHeaderWeekend = "padding: 5px; border: 1px solid white; font-size: 8pt; color: #999999;";
-
-    var $controlName = "";
-    var $highlight = "time"; // Determines what type of active days to highlight ("time" or "expenses"). 
-
-    function __construct($name) {
-      $this->class = 'Calendar';
-      $this->controlName = $name; // TODO: why controlName? Other classes have "name".
-      $this->mMonthNames = array('January','February','March','April','May','June','July','August','September','October','November','December');
-      $this->mWeekDayShortNames = array('Su','Mo','Tu','We','Th','Fr','Sa');
-    }
-
-    function setHighlight($highlight) {
-    	if ($highlight && $highlight != 'time')
-    	  $this->highlight = $highlight;
-    }
-
-    function localize() {
-      global $user;
-      global $i18n;
+  var $weekStartDay = 0;   // Defaults to Sunday.
+  var $highlight = 'time'; // Determines what type of active days to highlight ("time" or "expenses").
+  var $monthNames = array('January','February','March','April','May','June','July','August','September','October','November','December');
+  var $weekdayShortNames = array('Su','Mo','Tu','We','Th','Fr','Sa');
+
+  // Constructor.
+  function __construct($name) {
+    $this->class = 'Calendar';
+    $this->name = $name;
+  }
+
+  // Sets what we highlight (days with existing time or expense entries).
+  function setHighlight($highlight) {
+    if ($highlight && $highlight != 'time')
+      $this->highlight = $highlight;
+  }
+
+  // Localizes Calendar control for user language.
+  function localize() {
+    global $user;
+    global $i18n;
       
-      $this->mMonthNames = $i18n->monthNames;
-      $this->mWeekDayShortNames = $i18n->weekdayShortNames;
-      $this->weekStartDay = $user->getWeekStart();
-    }
+    $this->monthNames = $i18n->monthNames;
+    $this->weekdayShortNames = $i18n->weekdayShortNames;
+    $this->weekStartDay = $user->getWeekStart();
+  }
 
-    function setStyle($style) { $this->style = $style; }
-    function setCellStyle($style) { $this->mCellStyle = $style; }
-    function setACellStyle($style) { $this->mACellStyle = $style; }
-    function setLinkStyle($style) { $this->mLinkStyle = $style; }
+  // TODO: refactoring ongoing down from here...
 
     /**
      * @return void
@@ -97,13 +93,11 @@ function toString($date="") {
       $prevmonth = date ( "m", $prev );
       $prevdate = strftime(DB_DATEFORMAT, $prev );
 
-      $str = $this->_genStyles();
-
       $str .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">
           <tr><td align="center"><div class="calendarHeader">'.
           //'<a href="?date='.$prevyear.'">&lt;&lt;</a> '.
           '<a href="?date='.$prevdate.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
-          $this->mMonthNames[$thismonth-1].'&nbsp;'.$thisyear.
+          $this->monthNames[$thismonth-1].'&nbsp;'.$thisyear.
           '  <a href="?date='.$nextdate.'" tabindex="-1">&gt;&gt;&gt;</a>'.
           //' <a href="?date='.$nextyear.'">&gt;&gt;</a>'.
           '</div></td></tr>
@@ -127,9 +121,9 @@ function toString($date="") {
       for ( $i=0; $i<7; $i++ ) {
         $weekdayNameIdx = ($i + $this->weekStartDay) % 7;
         if ($i==$weekend_start || $i==$weekend_end) {
-          $str .= '<td class="calendarDayHeaderWeekend">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
+          $str .= '<td class="calendarDayHeaderWeekend">'.$this->weekdayShortNames[$weekdayNameIdx].'</td>';
         } else {
-          $str .= '<td class="calendarDayHeader">'.$this->mWeekDayShortNames[$weekdayNameIdx].'</td>';
+          $str .= '<td class="calendarDayHeader">'.$this->weekdayShortNames[$weekdayNameIdx].'</td>';
         }
       }
 
@@ -151,7 +145,7 @@ function toString($date="") {
             // weekend
             if ($j==$weekend_start || $j==$weekend_end) {
               $stl_cell = ' class="calendarDayWeekend"';
-              $stl_link = ' class="CalendarLinkWeekend"';
+              $stl_link = ' class="calendarLinkWeekend"';
             } else {
               $stl_cell = ' class="calendarDay"';
             }
@@ -160,7 +154,7 @@ function toString($date="") {
             $date_to_check = ttTimeHelper::dateInDatabaseFormat($thisyear, $thismonth, $start_date+$j);
             if (ttTimeHelper::isHoliday($date_to_check)) {
               $stl_cell = ' class="calendarDayHoliday"';
-              $stl_link = ' class="CalendarLinkHoliday"';
+              $stl_link = ' class="calendarLinkHoliday"';
             }
 
             // selected day
@@ -180,15 +174,15 @@ function toString($date="") {
               if( in_array(strftime(DB_DATEFORMAT, $date), $active_dates) ){
                 //check if entries total to a complete work day
                 if ($day_total_minutes >= $workday_minutes){
-                  $stl_link = ' class="CalendarLinkRecordsExist"';
+                  $stl_link = ' class="calendarLinkRecordsExist"';
                 }
                 else {
-                  $stl_link = ' class="CalendarLinkNonCompleteDay"';
+                  $stl_link = ' class="calendarLinkNonCompleteDay"';
                 }
               }
             }
 
-            $str .= "<a".$stl_link." href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT, $date)."\" tabindex=\"-1\">".date("d",$date)."</a>";
+            $str .= "<a".$stl_link." href=\"?".$this->name."=".strftime(DB_DATEFORMAT, $date)."\" tabindex=\"-1\">".date("d",$date)."</a>";
 
             $str .= "</TD>";
           }
@@ -199,16 +193,16 @@ function toString($date="") {
         $str .= "</TR>\n";
       }
 
-      $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->controlName."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
+      $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
       $str .= "</table>\n";
 
-      $str .= "<input type=\"hidden\" name=\"$this->controlName\" value=\"$indate\">\n";
+      $str .= "<input type=\"hidden\" name=\"$this->name\" value=\"$indate\">\n";
 
       // Add script to adjust today link to match browser today, as PHP may run in a different timezone.
       $str .= "<script>\n";
       $str .= "function adjustToday() {\n";
       $str .= "  var browser_today = new Date();\n";
-      $str .= "  document.getElementById('today_link').href = '?$this->controlName='+browser_today.strftime('".DB_DATEFORMAT."');\n";
+      $str .= "  document.getElementById('today_link').href = '?$this->name='+browser_today.strftime('".DB_DATEFORMAT."');\n";
       $str .= "}\n";
       $str .= "adjustToday();\n";
       $str .= "</script>\n";
@@ -230,16 +224,6 @@ function _getWeekDayBefore($year, $month) {
       );
     }
 
-    function _genStyles() {
-      $str = "<style>\n";
-      $str .= ".CalendarLinkWeekend {color: #999999;}\n";
-      $str .= ".CalendarLinkHoliday {color: #999999;}\n";
-      $str .= ".CalendarLinkRecordsExist {color: #FF0000;}\n";
-      $str .= ".CalendarLinkNonCompleteDay {color: #800080;}\n";
-        $str .= "</style>\n";
-        return $str;
-    }
-    
     // _getActiveDates returns an array of dates, for which entries exist for user.
     // Type of entries (time or expenses) is determined by $this->highlight value.
     function _getActiveDates($start, $end) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2f8b120bf..369e61911 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">Anuko Time Tracker 1.19.18.5222 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5223 | 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/default.css b/default.css
index 7f138ed38..3eac29ec2 100644
--- a/default.css
+++ b/default.css
@@ -133,6 +133,22 @@ input[type=checkbox], label {
   font-size: 8pt;
   color: #999999;
 }
+
+.calendarLinkWeekend {
+  color: #999999;
+}
+
+.calendarLinkHoliday {
+  color: #999999;
+}
+
+.calendarLinkRecordsExist {
+  color: #ff0000;
+}
+
+.calendarLinkNonCompleteDay {
+  color: #800080;
+}
 /* end of calendar styles */
 
 .tableHeader {

From 8dd1f536714f1bc6f09d2176dc84871d33ab94a3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 17:18:16 +0000
Subject: [PATCH 1205/1848] Some more refactoring in Calendar class.

---
 WEB-INF/lib/form/Calendar.class.php | 57 +++++++++++------------------
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index e7db6bcfd..dee9fbc0c 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -58,37 +58,28 @@ function localize() {
     $this->weekStartDay = $user->getWeekStart();
   }
 
-  // TODO: refactoring ongoing down from here...
-
-    /**
-     * @return void
-     * @param date
-     * @desc Enter description here...
-     */
-    function toString($date="") {
-      global $i18n;
-    	
-      $indate = $this->value;
-      if (!$indate) $indate = strftime(DB_DATEFORMAT);
-
-      //current year and month
-      if ( strlen ( $indate ) > 0 ) {
-        $indateObj = new DateAndTime(DB_DATEFORMAT, $indate);
-        $thismonth = $indateObj->getMonth();
-        $thisyear = $indateObj->getYear();
-      } else {
-        $thismonth = date("m");
-        $thisyear = date("Y");
-      }
+  // Generates html code for Calendar control.
+  function getHtml() {
+    global $i18n; // Needed to print Today.
+
+    $selectedDate = $this->value;
+    if (!$selectedDate) $selectedDate = strftime(DB_DATEFORMAT);
+
+    // Determine month and year for selected date.
+    $selectedDateObject = new DateAndTime(DB_DATEFORMAT, $selectedDate);
+    $selectedMonth = $selectedDateObject->getMonth();
+    $selectedYear = $selectedDateObject->getYear();
+
+    // TODO: refactoring ongoing down from here...
 
       // next date, month, year
-      $next = mktime ( 2, 0, 0, $thismonth + 1, 1, $thisyear );
+      $next = mktime ( 2, 0, 0, $selectedMonth + 1, 1, $selectedYear );
       $nextyear = date ( "Y", $next );
       $nextmonth = date ( "m", $next );
       $nextdate = strftime (DB_DATEFORMAT, $next );
 
       // prev date, month, year
-      $prev = mktime ( 2, 0, 0, $thismonth - 1, 1, $thisyear );
+      $prev = mktime ( 2, 0, 0, $selectedMonth - 1, 1, $selectedYear );
       $prevyear = date ( "Y", $prev );
       $prevmonth = date ( "m", $prev );
       $prevdate = strftime(DB_DATEFORMAT, $prev );
@@ -97,7 +88,7 @@ function toString($date="") {
           <tr><td align="center"><div class="calendarHeader">'.
           //'<a href="?date='.$prevyear.'">&lt;&lt;</a> '.
           '<a href="?date='.$prevdate.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
-          $this->monthNames[$thismonth-1].'&nbsp;'.$thisyear.
+          $this->monthNames[$selectedMonth-1].'&nbsp;'.$selectedYear.
           '  <a href="?date='.$nextdate.'" tabindex="-1">&gt;&gt;&gt;</a>'.
           //' <a href="?date='.$nextyear.'">&gt;&gt;</a>'.
           '</div></td></tr>
@@ -129,14 +120,14 @@ function toString($date="") {
 
       $str .= "</tr>\n";
 
-      list($wkstart,$monthstart,$monthend,$start_date) = $this->_getWeekDayBefore( $thisyear, $thismonth );
+      list($wkstart,$monthstart,$monthend,$start_date) = $this->_getWeekDayBefore( $selectedYear, $selectedMonth );
 
       $active_dates = $this->_getActiveDates($monthstart, $monthend);
 
-      for ( $i = $wkstart; $i<=$monthend;  $i=mktime(0,0,0,$thismonth,$start_date+=7,$thisyear) ) {
+      for ( $i = $wkstart; $i<=$monthend;  $i=mktime(0,0,0,$selectedMonth,$start_date+=7,$selectedYear) ) {
         $str .= "<TR>\n";
           for ( $j = 0; $j < 7; $j++ ) {
-            $date = mktime(0,0,0,$thismonth,$start_date+$j,$thisyear);
+            $date = mktime(0,0,0,$selectedMonth,$start_date+$j,$selectedYear);
             if (($date >= $monthstart) && ($date <= $monthend)) {
 
             $stl_cell = "";
@@ -151,14 +142,14 @@ function toString($date="") {
             }
 
             // holidays
-            $date_to_check = ttTimeHelper::dateInDatabaseFormat($thisyear, $thismonth, $start_date+$j);
+            $date_to_check = ttTimeHelper::dateInDatabaseFormat($selectedYear, $selectedMonth, $start_date+$j);
             if (ttTimeHelper::isHoliday($date_to_check)) {
               $stl_cell = ' class="calendarDayHoliday"';
               $stl_link = ' class="calendarLinkHoliday"';
             }
 
             // selected day
-            if ( $indate == strftime(DB_DATEFORMAT, $date))
+            if ( $selectedDate == strftime(DB_DATEFORMAT, $date))
               $stl_cell = ' class="calendarDaySelected"';
 
 
@@ -196,7 +187,7 @@ function toString($date="") {
       $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
       $str .= "</table>\n";
 
-      $str .= "<input type=\"hidden\" name=\"$this->name\" value=\"$indate\">\n";
+      $str .= "<input type=\"hidden\" name=\"$this->name\" value=\"$selectedDate\">\n";
 
       // Add script to adjust today link to match browser today, as PHP may run in a different timezone.
       $str .= "<script>\n";
@@ -210,10 +201,6 @@ function toString($date="") {
       return $str;
     }
 
-    function getHtml() {
-        return $this->toString();
-    }
-
     function _getWeekDayBefore($year, $month) {
       $weekday = date ( "w", mktime ( 2, 0, 0, $month, 1 - $this->weekStartDay, $year ) );
       return array(
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 369e61911..534bbf28c 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">Anuko Time Tracker 1.19.18.5223 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5224 | 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>

From 60d966e3deb00d1e6b263d373330f4d1aaf18306 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Jul 2020 21:16:52 +0000
Subject: [PATCH 1206/1848] Ongoing refactoring of Calendar class.

---
 WEB-INF/lib/form/Calendar.class.php | 50 +++++++++++++----------------
 WEB-INF/templates/footer.tpl        |  2 +-
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index dee9fbc0c..209ab640a 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -70,35 +70,29 @@ function getHtml() {
     $selectedMonth = $selectedDateObject->getMonth();
     $selectedYear = $selectedDateObject->getYear();
 
-    // TODO: refactoring ongoing down from here...
+    // Determine date for the 1st of next month for calendar navigation.
+    $firstOfNextMonth2AM = mktime(2, 0, 0, $selectedMonth + 1, 1, $selectedYear); // 2 am on the 1st of next month.
+    $firstOfNextMonth = strftime(DB_DATEFORMAT, $firstOfNextMonth2AM);
+
+    // Determine date for the 1st of previous month.
+    $firstOfPreviousMonth2AM = mktime(2, 0, 0, $selectedMonth - 1, 1, $selectedYear); // 2 am on the 1st of previous month.
+    $firstOfPreviousMonth = strftime(DB_DATEFORMAT, $firstOfPreviousMonth2AM);
+
+    // Print calendar header.
+    $str .= "\n\n<!-- start of calendar -->\n";
+    $str .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">'."\n";
+    $str .= '  <tr><td align="center">';
+    $str .= '<div class="calendarHeader">';
+    $str .= '<a href="?date='.$firstOfPreviousMonth.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
+      $this->monthNames[$selectedMonth-1].'&nbsp;'.$selectedYear.
+      '  <a href="?date='.$firstOfNextMonth.'" tabindex="-1">&gt;&gt;&gt;</a></div></td></tr>'."\n";
+    $str .= "</table>\n";
+
+    // Print day headers.
+    $str .= '<table border="0" cellpadding="1" cellspacing="1" width="100%">'."\n";
+    $str .= '  <tr>';
 
-      // next date, month, year
-      $next = mktime ( 2, 0, 0, $selectedMonth + 1, 1, $selectedYear );
-      $nextyear = date ( "Y", $next );
-      $nextmonth = date ( "m", $next );
-      $nextdate = strftime (DB_DATEFORMAT, $next );
-
-      // prev date, month, year
-      $prev = mktime ( 2, 0, 0, $selectedMonth - 1, 1, $selectedYear );
-      $prevyear = date ( "Y", $prev );
-      $prevmonth = date ( "m", $prev );
-      $prevdate = strftime(DB_DATEFORMAT, $prev );
-
-      $str .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">
-          <tr><td align="center"><div class="calendarHeader">'.
-          //'<a href="?date='.$prevyear.'">&lt;&lt;</a> '.
-          '<a href="?date='.$prevdate.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
-          $this->monthNames[$selectedMonth-1].'&nbsp;'.$selectedYear.
-          '  <a href="?date='.$nextdate.'" tabindex="-1">&gt;&gt;&gt;</a>'.
-          //' <a href="?date='.$nextyear.'">&gt;&gt;</a>'.
-          '</div></td></tr>
-          </table>';
-
-      $str .= '<center>
-          <table border="0" cellpadding="1" cellspacing="1" width="100%">
-          <tr>';
-
-      $str .= "<tr>";
+    // TODO: refactoring ongoing down from here...
 
       // TODO: refactor this entire class, as $weekend_start and $weekend_end
       // are not what their names suggest (debug with non zero week start to see it).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 534bbf28c..7e4eb8f09 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">Anuko Time Tracker 1.19.18.5224 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5225 | 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>

From c262af459163f93e8f381eda1960d1e948e22665 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 12 Jul 2020 16:43:32 +0000
Subject: [PATCH 1207/1848] Refactored Calendar class for clarity.

---
 WEB-INF/lib/form/Calendar.class.php | 249 ++++++++++++++--------------
 WEB-INF/templates/footer.tpl        |   2 +-
 2 files changed, 123 insertions(+), 128 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 209ab640a..e3bf05924 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -61,6 +61,7 @@ function localize() {
   // Generates html code for Calendar control.
   function getHtml() {
     global $i18n; // Needed to print Today.
+    global $user;
 
     $selectedDate = $this->value;
     if (!$selectedDate) $selectedDate = strftime(DB_DATEFORMAT);
@@ -79,154 +80,148 @@ function getHtml() {
     $firstOfPreviousMonth = strftime(DB_DATEFORMAT, $firstOfPreviousMonth2AM);
 
     // Print calendar header.
-    $str .= "\n\n<!-- start of calendar -->\n";
-    $str .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">'."\n";
-    $str .= '  <tr><td align="center">';
-    $str .= '<div class="calendarHeader">';
-    $str .= '<a href="?date='.$firstOfPreviousMonth.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
+    $html .= "\n\n\n\n\n\n<!-- start of calendar -->\n";
+    $html .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">'."\n";
+    $html .= '  <tr><td align="center">';
+    $html .= '<div class="calendarHeader">';
+    $html .= '<a href="?date='.$firstOfPreviousMonth.'" tabindex="-1">&lt;&lt;&lt;</a>  '.
       $this->monthNames[$selectedMonth-1].'&nbsp;'.$selectedYear.
       '  <a href="?date='.$firstOfNextMonth.'" tabindex="-1">&gt;&gt;&gt;</a></div></td></tr>'."\n";
-    $str .= "</table>\n";
+    $html .= "</table>\n";
+
+    // Start printing calendar table.
+    $html .= '<table border="0" cellpadding="1" cellspacing="1" width="100%">'."\n";
+
+    // Determine column indexes in calendar table for weekend start and end days.
+    if (defined('WEEKEND_START_DAY')) {
+      $weekend_start_idx = (7 + WEEKEND_START_DAY - $this->weekStartDay) % 7;
+      $weekend_end_idx = (7 + WEEKEND_START_DAY + 1 - $this->weekStartDay) % 7;
+    } else {
+      $weekend_start_idx = 6 - $this->weekStartDay;
+      $weekend_end_idx = (7 - $this->weekStartDay) % 7;
+    }
 
     // Print day headers.
-    $str .= '<table border="0" cellpadding="1" cellspacing="1" width="100%">'."\n";
-    $str .= '  <tr>';
-
-    // TODO: refactoring ongoing down from here...
-
-      // TODO: refactor this entire class, as $weekend_start and $weekend_end
-      // are not what their names suggest (debug with non zero week start to see it).
-      $weekend_start = 6 - $this->weekStartDay;      // Saturday by default.
-      $weekend_end = (7 - $this->weekStartDay) % 7;  // Sunday by default.
-      if (defined('WEEKEND_START_DAY')) {
-      	$weekend_start = (7 + WEEKEND_START_DAY - $this->weekStartDay) % 7;
-      	$weekend_end = (7 + WEEKEND_START_DAY + 1 - $this->weekStartDay) % 7;
-      } 
-
-      for ( $i=0; $i<7; $i++ ) {
-        $weekdayNameIdx = ($i + $this->weekStartDay) % 7;
-        if ($i==$weekend_start || $i==$weekend_end) {
-          $str .= '<td class="calendarDayHeaderWeekend">'.$this->weekdayShortNames[$weekdayNameIdx].'</td>';
-        } else {
-          $str .= '<td class="calendarDayHeader">'.$this->weekdayShortNames[$weekdayNameIdx].'</td>';
-        }
+    $html .= '  <tr>';
+    for ($i = 0; $i < 7; $i++) {
+      $weekdayNameIdx = ($i + $this->weekStartDay) % 7;
+      if ($i == $weekend_start_idx || $i == $weekend_end_idx) {
+        $html .= '<td class="calendarDayHeaderWeekend">'.$this->weekdayShortNames[$weekdayNameIdx].'</td>';
+      } else {
+        $html .= '<td class="calendarDayHeader">'.$this->weekdayShortNames[$weekdayNameIdx].'</td>';
       }
+    }
+    $html .= "</tr>\n";
+
+    // Determine timestamps for iteration.
+    $firstDayOfSelectedMonth0am = mktime(0, 0, 0, $selectedMonth, 1, $selectedYear);
+    $lastDayOfSelectedMonth0am = mktime( 0, 0, 0, $selectedMonth + 1, 0, $selectedYear);
+    // Determine index of the 1st day of month in calendar table, which depends on user weekStartDay.
+    $firstDayOfSelectedMonthIdx = date("w", mktime ( 2, 0, 0, $selectedMonth, 1 - $this->weekStartDay, $selectedYear));
+    // Determine a timestamp when 1st display week starts by shifting back.
+    $firstWeekStart0am = $firstDayOfSelectedMonth0am - 86400 * $firstDayOfSelectedMonthIdx;
+    // Determine start day index, (0 or negative when we display empty days in a previous month).
+    $startDayIdx = 1 - $firstDayOfSelectedMonthIdx;
+
+    // Determine active dates where entries exist for user.
+    $active_dates = $this->getActiveDates($firstDayOfSelectedMonth0am, $lastDayOfSelectedMonth0am);
+
+    $workday_minutes = $user->getWorkdayMinutes();
+
+    // Print calendar cells one week row at a time.
+    for ($timestamp = $firstWeekStart0am; $timestamp <= $lastDayOfSelectedMonth0am; $timestamp = mktime(0, 0, 0, $selectedMonth, $startDayIdx += 7, $selectedYear)) {
+      $html .= "  <tr>";
+      // Iterate through week days.
+      for ($j = 0; $j < 7; $j++) {
+        $cellDate0am = mktime(0, 0, 0, $selectedMonth, $startDayIdx + $j, $selectedYear);
+        if (($cellDate0am >= $firstDayOfSelectedMonth0am) && ($cellDate0am <= $lastDayOfSelectedMonth0am)) {
+          $cell_style = "";
+          $link_style = "";
+
+          // Handle weekends.
+          if ($j == $weekend_start_idx || $j == $weekend_end_idx) {
+            $cell_style = ' class="calendarDayWeekend"';
+            $link_style = ' class="calendarLinkWeekend"';
+          } else
+            $cell_style = ' class="calendarDay"';
+
+          // Handle holidays.
+          $date_to_check = ttTimeHelper::dateInDatabaseFormat($selectedYear, $selectedMonth, $startDayIdx+$j);
+          if (ttTimeHelper::isHoliday($date_to_check)) {
+            $cell_style = ' class="calendarDayHoliday"';
+            $link_style = ' class="calendarLinkHoliday"';
+          }
 
-      $str .= "</tr>\n";
-
-      list($wkstart,$monthstart,$monthend,$start_date) = $this->_getWeekDayBefore( $selectedYear, $selectedMonth );
-
-      $active_dates = $this->_getActiveDates($monthstart, $monthend);
-
-      for ( $i = $wkstart; $i<=$monthend;  $i=mktime(0,0,0,$selectedMonth,$start_date+=7,$selectedYear) ) {
-        $str .= "<TR>\n";
-          for ( $j = 0; $j < 7; $j++ ) {
-            $date = mktime(0,0,0,$selectedMonth,$start_date+$j,$selectedYear);
-            if (($date >= $monthstart) && ($date <= $monthend)) {
-
-            $stl_cell = "";
-            $stl_link = "";
-
-            // weekend
-            if ($j==$weekend_start || $j==$weekend_end) {
-              $stl_cell = ' class="calendarDayWeekend"';
-              $stl_link = ' class="calendarLinkWeekend"';
-            } else {
-              $stl_cell = ' class="calendarDay"';
-            }
-
-            // holidays
-            $date_to_check = ttTimeHelper::dateInDatabaseFormat($selectedYear, $selectedMonth, $start_date+$j);
-            if (ttTimeHelper::isHoliday($date_to_check)) {
-              $stl_cell = ' class="calendarDayHoliday"';
-              $stl_link = ' class="calendarLinkHoliday"';
-            }
-
-            // selected day
-            if ( $selectedDate == strftime(DB_DATEFORMAT, $date))
-              $stl_cell = ' class="calendarDaySelected"';
-
-
-            $str .= '<td'.$stl_cell.'>';
+          // Handle selected day.
+          if ($selectedDate == strftime(DB_DATEFORMAT, $cellDate0am))
+            $cell_style = ' class="calendarDaySelected"';
 
+          $html .= '<td'.$cell_style.'>';
+          if($active_dates) {
             // Entries exist.
-            if($active_dates) {
+            if( in_array(strftime(DB_DATEFORMAT, $cellDate0am), $active_dates) ){
+              // TODO: add a config option to eliminate these call for users not wanting this feature.
               $day_total_minutes = ttTimeHelper::toMinutes(ttTimeHelper::getTimeForDay($date_to_check));
-              global $user;
-              $workday_minutes = $user->getWorkdayMinutes();
-
-              //check for any entries in the day
-              if( in_array(strftime(DB_DATEFORMAT, $date), $active_dates) ){
-                //check if entries total to a complete work day
-                if ($day_total_minutes >= $workday_minutes){
-                  $stl_link = ' class="calendarLinkRecordsExist"';
-                }
-                else {
-                  $stl_link = ' class="calendarLinkNonCompleteDay"';
-                }
-              }
+              // Check if entries total to a complete work day.
+              if ($day_total_minutes >= $workday_minutes)
+                $link_style = ' class="calendarLinkRecordsExist"';
+              else
+                $link_style = ' class="calendarLinkNonCompleteDay"';
             }
-
-            $str .= "<a".$stl_link." href=\"?".$this->name."=".strftime(DB_DATEFORMAT, $date)."\" tabindex=\"-1\">".date("d",$date)."</a>";
-
-            $str .= "</TD>";
-          }
-          else {
-            $str .= "<TD>&nbsp;</TD>\n";
           }
+          $html .= "<a".$link_style." href=\"?".$this->name."=".strftime(DB_DATEFORMAT, $cellDate0am)."\" tabindex=\"-1\">".date("d",$cellDate0am)."</a>";
+          $html .= "</td>";
+        } else {
+          $html .= "<td>&nbsp;</td>";
         }
-        $str .= "</TR>\n";
       }
+      $html .= "</tr>\n";
+    }
 
-      $str .= "<tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
-      $str .= "</table>\n";
+    // Finished printing calendar table.
 
-      $str .= "<input type=\"hidden\" name=\"$this->name\" value=\"$selectedDate\">\n";
+    // Print Today link.
+    $html .= "  <tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
+    $html .= "</table>\n";
 
-      // Add script to adjust today link to match browser today, as PHP may run in a different timezone.
-      $str .= "<script>\n";
-      $str .= "function adjustToday() {\n";
-      $str .= "  var browser_today = new Date();\n";
-      $str .= "  document.getElementById('today_link').href = '?$this->name='+browser_today.strftime('".DB_DATEFORMAT."');\n";
-      $str .= "}\n";
-      $str .= "adjustToday();\n";
-      $str .= "</script>\n";
-      
-      return $str;
-    }
+    // Add a hidden control for selected date.
+    $html .= "<input type=\"hidden\" name=\"$this->name\" value=\"$selectedDate\">\n";
 
-    function _getWeekDayBefore($year, $month) {
-      $weekday = date ( "w", mktime ( 2, 0, 0, $month, 1 - $this->weekStartDay, $year ) );
-      return array(
-        mktime ( 0, 0, 0, $month, 1 - $weekday, $year ),
-        mktime ( 0, 0, 0, $month, 1, $year ),
-      mktime ( 0, 0, 0, $month + 1, 0, $year ),
-      (1 - $weekday)
-      );
-    }
+    // Add script to adjust today link to match browser today, as PHP may run in a different timezone.
+    $html .= "<script>\n";
+    $html .= "function adjustToday() {\n";
+    $html .= "  var browser_today = new Date();\n";
+    $html .= "  document.getElementById('today_link').href = '?$this->name='+browser_today.strftime('".DB_DATEFORMAT."');\n";
+    $html .= "}\n";
+    $html .= "adjustToday();\n";
+    $html .= "</script>\n";
+
+    $html .= "<!-- end of calendar -->\n\n\n\n\n\n\n";
+    return $html;
+  }
 
-    // _getActiveDates returns an array of dates, for which entries exist for user.
-    // Type of entries (time or expenses) is determined by $this->highlight value.
-    function _getActiveDates($start, $end) {
+  // getActiveDates returns an array of dates, for which entries exist for user.
+  // Type of entries (time or expenses) is determined by $this->highlight value.
+  function getActiveDates($start, $end) {
       
-      global $user;
-      $user_id = $user->getUser();
+    global $user;
+    $user_id = $user->getUser();
       
-      $table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';
+    $table = ($this->highlight == 'expenses') ? 'tt_expense_items' : 'tt_log';
       
-      $mdb2 = getConnection();
-
-      $start_date = date("Y-m-d", $start);
-      $end_date = date("Y-m-d", $end);
-      $sql = "SELECT date FROM $table WHERE date >= '$start_date' AND date <= '$end_date' AND user_id = $user_id AND status = 1";
-      $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        while ($row = $res->fetchRow()) {
-          $out[] = date('Y-m-d', strtotime($row['date']));
-        }
-        return @$out;
+    $mdb2 = getConnection();
+
+    $start_date = date("Y-m-d", $start);
+    $end_date = date("Y-m-d", $end);
+    $sql = "SELECT date FROM $table WHERE date >= '$start_date' AND date <= '$end_date' AND user_id = $user_id AND status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($row = $res->fetchRow()) {
+        $out[] = date('Y-m-d', strtotime($row['date']));
       }
-      else
-        return false;
+      return @$out;
     }
+    else
+      return false;
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7e4eb8f09..d6e3c31ac 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">Anuko Time Tracker 1.19.18.5225 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5226 | 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>

From 6c7355065a9e027cc82979e6ea54c62a598a03a9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 12 Jul 2020 16:49:19 +0000
Subject: [PATCH 1208/1848] Cosmetic.

---
 WEB-INF/lib/form/Calendar.class.php | 6 +++---
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index e3bf05924..e80f87380 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -134,7 +134,7 @@ function getHtml() {
       // Iterate through week days.
       for ($j = 0; $j < 7; $j++) {
         $cellDate0am = mktime(0, 0, 0, $selectedMonth, $startDayIdx + $j, $selectedYear);
-        if (($cellDate0am >= $firstDayOfSelectedMonth0am) && ($cellDate0am <= $lastDayOfSelectedMonth0am)) {
+        if ($cellDate0am >= $firstDayOfSelectedMonth0am && $cellDate0am <= $lastDayOfSelectedMonth0am) {
           $cell_style = "";
           $link_style = "";
 
@@ -157,9 +157,9 @@ function getHtml() {
             $cell_style = ' class="calendarDaySelected"';
 
           $html .= '<td'.$cell_style.'>';
-          if($active_dates) {
+          if ($active_dates) {
             // Entries exist.
-            if( in_array(strftime(DB_DATEFORMAT, $cellDate0am), $active_dates) ){
+            if (in_array(strftime(DB_DATEFORMAT, $cellDate0am), $active_dates)) {
               // TODO: add a config option to eliminate these call for users not wanting this feature.
               $day_total_minutes = ttTimeHelper::toMinutes(ttTimeHelper::getTimeForDay($date_to_check));
               // Check if entries total to a complete work day.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d6e3c31ac..9e70ecb45 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">Anuko Time Tracker 1.19.18.5226 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5227 | 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>

From 447afd69ce1a81cfaa2d17de1d050e418ffb68f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 12 Jul 2020 18:52:07 +0000
Subject: [PATCH 1209/1848] Added a config option whether to show not complete
 days in calendar.

---
 WEB-INF/lib/form/Calendar.class.php   |  19 +++--
 WEB-INF/resources/ca.lang.php         |   1 +
 WEB-INF/resources/cs.lang.php         |   1 +
 WEB-INF/resources/da.lang.php         |   1 +
 WEB-INF/resources/de.lang.php         |   2 +
 WEB-INF/resources/en.lang.php         |   1 +
 WEB-INF/resources/es.lang.php         |   1 +
 WEB-INF/resources/et.lang.php         |   1 +
 WEB-INF/resources/fa.lang.php         |   1 +
 WEB-INF/resources/fi.lang.php         |   1 +
 WEB-INF/resources/fr.lang.php         |   1 +
 WEB-INF/resources/gr.lang.php         |   1 +
 WEB-INF/resources/he.lang.php         |   1 +
 WEB-INF/resources/hu.lang.php         |   1 +
 WEB-INF/resources/it.lang.php         |   1 +
 WEB-INF/resources/ja.lang.php         |   1 +
 WEB-INF/resources/ko.lang.php         |   1 +
 WEB-INF/resources/nl.lang.php         |   2 +
 WEB-INF/resources/no.lang.php         |   1 +
 WEB-INF/resources/pl.lang.php         |   1 +
 WEB-INF/resources/pt-br.lang.php      |   1 +
 WEB-INF/resources/pt.lang.php         |   1 +
 WEB-INF/resources/ro.lang.php         |   1 +
 WEB-INF/resources/ru.lang.php         |   1 +
 WEB-INF/resources/sk.lang.php         |   1 +
 WEB-INF/resources/sl.lang.php         |   1 +
 WEB-INF/resources/sr.lang.php         |   1 +
 WEB-INF/resources/sv.lang.php         |   1 +
 WEB-INF/resources/tr.lang.php         |   1 +
 WEB-INF/resources/zh-cn.lang.php      |   1 +
 WEB-INF/resources/zh-tw.lang.php      |   1 +
 WEB-INF/templates/display_options.tpl |   4 +
 WEB-INF/templates/footer.tpl          |   2 +-
 WEB-INF/templates/test.tpl            |  17 +++++
 display_options.php                   |   4 +
 test.php                              | 106 ++++++++++++++++++++++++++
 36 files changed, 176 insertions(+), 8 deletions(-)
 create mode 100644 WEB-INF/templates/test.tpl
 create mode 100644 test.php

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index e80f87380..b624a8da2 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -126,6 +126,8 @@ function getHtml() {
     // Determine active dates where entries exist for user.
     $active_dates = $this->getActiveDates($firstDayOfSelectedMonth0am, $lastDayOfSelectedMonth0am);
 
+    $handleHolidays = $user->getHolidays() != null;
+    $handleNotCompleteDays = $user->isOptionEnabled('time_not_complete_days');
     $workday_minutes = $user->getWorkdayMinutes();
 
     // Print calendar cells one week row at a time.
@@ -147,7 +149,7 @@ function getHtml() {
 
           // Handle holidays.
           $date_to_check = ttTimeHelper::dateInDatabaseFormat($selectedYear, $selectedMonth, $startDayIdx+$j);
-          if (ttTimeHelper::isHoliday($date_to_check)) {
+          if ($handleHolidays && ttTimeHelper::isHoliday($date_to_check)) {
             $cell_style = ' class="calendarDayHoliday"';
             $link_style = ' class="calendarLinkHoliday"';
           }
@@ -157,16 +159,19 @@ function getHtml() {
             $cell_style = ' class="calendarDaySelected"';
 
           $html .= '<td'.$cell_style.'>';
+          // Handle days with existing entries.
           if ($active_dates) {
             // Entries exist.
             if (in_array(strftime(DB_DATEFORMAT, $cellDate0am), $active_dates)) {
-              // TODO: add a config option to eliminate these call for users not wanting this feature.
-              $day_total_minutes = ttTimeHelper::toMinutes(ttTimeHelper::getTimeForDay($date_to_check));
-              // Check if entries total to a complete work day.
-              if ($day_total_minutes >= $workday_minutes)
-                $link_style = ' class="calendarLinkRecordsExist"';
+              if ($handleNotCompleteDays && $this->highlight == 'time') {
+                $day_total_minutes = ttTimeHelper::toMinutes(ttTimeHelper::getTimeForDay($date_to_check));
+                if ($day_total_minutes >= $workday_minutes)
+                  $link_style = ' class="calendarLinkRecordsExist"';
+                else
+                  $link_style = ' class="calendarLinkNonCompleteDay"';
+              }
               else
-                $link_style = ' class="calendarLinkNonCompleteDay"';
+                $link_style = ' class="calendarLinkRecordsExist"';
             }
           }
           $html .= "<a".$link_style." href=\"?".$this->name."=".strftime(DB_DATEFORMAT, $cellDate0am)."\" tabindex=\"-1\">".date("d",$cellDate0am)."</a>";
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9893ad523..5260ecc1d 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -706,6 +706,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 59756d1b5..2ae8ed511 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -719,6 +719,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a8a14b53d..f15a08b09 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -681,6 +681,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a8f1d165a..fa0407b8f 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -657,6 +657,8 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
+// TODO: translate the following.
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2beefaa1c..c96415300 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -637,6 +637,7 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Note on separate row',
+'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 'work.error.work_not_available' => 'Work item is not available.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1cf3ce768..fe77bf299 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -721,6 +721,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5e2e78caa..9dc067415 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -688,6 +688,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e078a0a34..a9a1d76f0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -705,6 +705,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 575dc04f6..6e1787474 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -687,6 +687,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5fe0f76d7..a4a9a74f7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -677,6 +677,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5d0dd6bde..8137dbd58 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -670,6 +670,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 199e26533..5010087a8 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -706,6 +706,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a4a4dd005..683636a67 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -711,6 +711,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index b10575302..4d3540592 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -684,6 +684,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8ebec5955..cfbeca196 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -714,6 +714,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 76c159472..2ed5c1bfc 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -712,6 +712,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 06f764d4c..6d815c746 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -640,6 +640,8 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
+// TODO: translate the following.
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ad95bd7e3..8afcf5c17 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -711,6 +711,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index f988df4a4..4dbf608fe 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -690,6 +690,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5c9d89a32..cca28d179 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -685,6 +685,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 3043e8bba..57db2d012 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -693,6 +693,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index add70a4ea..eab6eb7a5 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -714,6 +714,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index fb050a1a0..1050013e0 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -618,6 +618,7 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.menu' => 'Меню',
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
+'form.display_options.not_complete_days' => 'Незавершенные дни',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 'work.error.work_not_available' => 'Работа отсутствует.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index cf0b8432b..e0ae714fc 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -695,6 +695,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f4aa21b58..0dd6f7206 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -687,6 +687,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index be5739b6e..b7b93ffbd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -688,6 +688,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 43b0d92b6..24797672a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -686,6 +686,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e241cace8..c2f30dfbb 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -727,6 +727,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b1d81418b..9cbb47534 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -698,6 +698,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 05615586d..774b8024a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -704,6 +704,7 @@
 // TODO: translate the following.
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
+// 'form.display_options.not_complete_days' => 'Not complete days',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index d7bbdd57d..918a48f9e 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -5,6 +5,10 @@
   <tr>
     <td><label for="time_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
     <td nowrap>{$forms.displayOptionsForm.time_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+    <tr>
+    <td><label for="time_not_complete_days">{$i18n.form.display_options.not_complete_days}:</label></td>
+    <td nowrap>{$forms.displayOptionsForm.time_not_complete_days.control} <a href="https://www.anuko.com/lp/tt_44.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
   </tr>
   <tr>
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9e70ecb45..3e158c480 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">Anuko Time Tracker 1.19.18.5227 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5228 | 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/test.tpl b/WEB-INF/templates/test.tpl
new file mode 100644
index 000000000..325d686bc
--- /dev/null
+++ b/WEB-INF/templates/test.tpl
@@ -0,0 +1,17 @@
+<style>
+.not_billable td {
+  color: #ff6666;
+}
+</style>
+
+{$forms.timeRecordForm.open}
+<table cellspacing="4" cellpadding="0" border="0">
+  <tr>
+    <td valign="top">
+      <table>
+        <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.timeRecordForm.close}
diff --git a/display_options.php b/display_options.php
index d65f15ab3..7dd724d44 100644
--- a/display_options.php
+++ b/display_options.php
@@ -41,9 +41,11 @@
 
 if ($request->isPost()) {
   $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row');
+  $cl_time_not_complete_days = $request->getParameter('time_not_complete_days');
   $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row');
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
+  $cl_time_not_complete_days = $config->getDefinedValue('time_not_complete_days');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
 }
 
@@ -58,6 +60,7 @@
 // $form->addInput(array('type'=>'checkbox','name'=>'time_duration','value'=>$cl_time_duration));
 // $form->addInput(array('type'=>'checkbox','name'=>'time_note','value'=>$cl_time_note));
 $form->addInput(array('type'=>'checkbox','name'=>'time_note_on_separate_row','value'=>$cl_time_note_on_separate_row));
+$form->addInput(array('type'=>'checkbox','name'=>'time_not_complete_days','value'=>$cl_time_not_complete_days));
 // TODO: consider adding other fields (timesheet, work_units, invoice, approved, cost, paid)?
 
 // Reports.
@@ -70,6 +73,7 @@
   if ($err->no()) {
     // Update config.
     $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);
+    $config->setDefinedValue('time_not_complete_days', $cl_time_not_complete_days);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
     if ($user->updateGroup(array('config' => $config->getConfig()))) {
       header('Location: success.php');
diff --git a/test.php b/test.php
new file mode 100644
index 000000000..971ebaf36
--- /dev/null
+++ b/test.php
@@ -0,0 +1,106 @@
+<?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('ttConfigHelper');
+import('ttUserHelper');
+import('ttGroupHelper');
+import('ttClientHelper');
+import('ttTimeHelper');
+import('ttFileHelper');
+import('DateAndTime');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
+if ($request->isPost()) {
+  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for whom we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+$group_id = $user->getGroup();
+$config = new ttConfigHelper($user->getConfig());
+
+// Initialize and store date in session.
+$cl_date = $request->getParameter('date', @$_SESSION['date']);
+$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
+if($selected_date->isError())
+  $selected_date = new DateAndTime(DB_DATEFORMAT);
+if(!$cl_date)
+  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+$_SESSION['date'] = $cl_date;
+
+// Elements of timeRecordForm.
+$form = new Form('timeRecordForm');
+
+// Calendar.
+$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+
+// A hidden control for today's date from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_submit')) {
+
+  }
+} // isPost
+
+
+$smarty->assign('selected_date', $selected_date);
+$smarty->assign('week_total', $week_total);
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
+$smarty->assign('title', $i18n->get('title.time'));
+$smarty->assign('content_page_name', 'test.tpl');
+$smarty->display('index.tpl');
+

From 86ac2ba703cf3477f4cd5d28dd4ee55e09ee8671 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 12 Jul 2020 18:53:45 +0000
Subject: [PATCH 1210/1848] Removed test page.

---
 WEB-INF/templates/test.tpl |  17 ------
 test.php                   | 106 -------------------------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 WEB-INF/templates/test.tpl
 delete mode 100644 test.php

diff --git a/WEB-INF/templates/test.tpl b/WEB-INF/templates/test.tpl
deleted file mode 100644
index 325d686bc..000000000
--- a/WEB-INF/templates/test.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<style>
-.not_billable td {
-  color: #ff6666;
-}
-</style>
-
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-  <tr>
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.timeRecordForm.close}
diff --git a/test.php b/test.php
deleted file mode 100644
index 971ebaf36..000000000
--- a/test.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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('ttConfigHelper');
-import('ttUserHelper');
-import('ttGroupHelper');
-import('ttClientHelper');
-import('ttTimeHelper');
-import('ttFileHelper');
-import('DateAndTime');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
-  exit();
-}
-if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for whom we display this page.
-if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-$group_id = $user->getGroup();
-$config = new ttConfigHelper($user->getConfig());
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-
-// Elements of timeRecordForm.
-$form = new Form('timeRecordForm');
-
-// Calendar.
-$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
-
-// A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-
-  }
-} // isPost
-
-
-$smarty->assign('selected_date', $selected_date);
-$smarty->assign('week_total', $week_total);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
-$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
-$smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'test.tpl');
-$smarty->display('index.tpl');
-

From 275fa15951ebfe27ba05572471de9e0ef914680c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 13 Jul 2020 13:28:47 +0000
Subject: [PATCH 1211/1848] Cosmetic. Removed some white space.

---
 WEB-INF/lib/form/Calendar.class.php | 4 ++--
 WEB-INF/templates/footer.tpl        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index b624a8da2..1847b3fa8 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -80,7 +80,7 @@ function getHtml() {
     $firstOfPreviousMonth = strftime(DB_DATEFORMAT, $firstOfPreviousMonth2AM);
 
     // Print calendar header.
-    $html .= "\n\n\n\n\n\n<!-- start of calendar -->\n";
+    $html .= "\n\n<!-- start of calendar -->\n";
     $html .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">'."\n";
     $html .= '  <tr><td align="center">';
     $html .= '<div class="calendarHeader">';
@@ -201,7 +201,7 @@ function getHtml() {
     $html .= "adjustToday();\n";
     $html .= "</script>\n";
 
-    $html .= "<!-- end of calendar -->\n\n\n\n\n\n\n";
+    $html .= "<!-- end of calendar -->\n\n";
     return $html;
   }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3e158c480..549a20384 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">Anuko Time Tracker 1.19.18.5228 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.18.5229 | 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>

From 28992336205e7e453226a26273b4e5743eb81da0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 14 Jul 2020 18:22:40 +0000
Subject: [PATCH 1212/1848] Starting to work on custom css. Introduced a
 database field.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 549a20384..f0706ae07 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">Anuko Time Tracker 1.19.18.5229 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.19.5230 | 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/dbinstall.php b/dbinstall.php
index f596a05e6..242d57b84 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11917"]) {
+  if ($_POST["convert11900to11919"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1188,6 +1188,8 @@ function ttGenerateKeys() {
     ttExecute("create index template_idx on tt_project_template_binds(template_id)");
     ttExecute("create unique index project_template_idx on tt_project_template_binds(project_id, template_id)");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.17', modified = now() where param_name = 'version_db' and param_value = '1.19.14'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `custom_css` text default NULL AFTER `config`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.19', modified = now() where param_name = 'version_db' and param_value = '1.19.17'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1238,7 +1240,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.17)</b>
+    <td width="80%"><b>Create database structure (v1.19.19)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1287,8 +1289,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.17)</td>
-    <td><input type="submit" name="convert11900to11917" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.19)</td>
+    <td><input type="submit" name="convert11900to11919" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index ae31890b5..e3ccd7d2c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -39,6 +39,7 @@ CREATE TABLE `tt_groups` (
   `workday_minutes` smallint(4) default 480,             # number of work minutes in a regular working day
   `custom_logo` tinyint(4) default 0,                    # whether to use a custom logo or not
   `config` text default NULL,                            # miscellaneous group configuration settings
+  `custom_css` text default NULL,                        # custom css for group
   `created` datetime default NULL,                       # creation timestamp
   `created_ip` varchar(45) default NULL,                 # creator ip
   `created_by` int(11) default NULL,                     # creator user_id
@@ -655,4 +656,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.17', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.19', now()); # TODO: change when structure changes.

From c6d062ac68917e6e08f0e9f0706c071a09fb04d4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 14 Jul 2020 19:58:59 +0000
Subject: [PATCH 1213/1848] Some more work in progress on custom css feature.

---
 WEB-INF/lib/ttUser.class.php          | 12 ++++++++++--
 WEB-INF/resources/ca.lang.php         |  1 +
 WEB-INF/resources/cs.lang.php         |  1 +
 WEB-INF/resources/da.lang.php         |  1 +
 WEB-INF/resources/de.lang.php         |  1 +
 WEB-INF/resources/en.lang.php         |  1 +
 WEB-INF/resources/es.lang.php         |  1 +
 WEB-INF/resources/et.lang.php         |  1 +
 WEB-INF/resources/fa.lang.php         |  1 +
 WEB-INF/resources/fi.lang.php         |  1 +
 WEB-INF/resources/fr.lang.php         |  1 +
 WEB-INF/resources/gr.lang.php         |  1 +
 WEB-INF/resources/he.lang.php         |  1 +
 WEB-INF/resources/hu.lang.php         |  1 +
 WEB-INF/resources/it.lang.php         |  1 +
 WEB-INF/resources/ja.lang.php         |  1 +
 WEB-INF/resources/ko.lang.php         |  1 +
 WEB-INF/resources/nl.lang.php         |  1 +
 WEB-INF/resources/no.lang.php         |  1 +
 WEB-INF/resources/pl.lang.php         |  1 +
 WEB-INF/resources/pt-br.lang.php      |  1 +
 WEB-INF/resources/pt.lang.php         |  1 +
 WEB-INF/resources/ro.lang.php         |  1 +
 WEB-INF/resources/ru.lang.php         |  1 +
 WEB-INF/resources/sk.lang.php         |  1 +
 WEB-INF/resources/sl.lang.php         |  1 +
 WEB-INF/resources/sr.lang.php         |  1 +
 WEB-INF/resources/sv.lang.php         |  1 +
 WEB-INF/resources/tr.lang.php         |  1 +
 WEB-INF/resources/zh-cn.lang.php      |  1 +
 WEB-INF/resources/zh-tw.lang.php      |  1 +
 WEB-INF/templates/display_options.tpl |  8 ++++++++
 WEB-INF/templates/footer.tpl          |  2 +-
 display_options.php                   |  1 +
 34 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4ef5d26e0..ed3dc437b 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -74,6 +74,7 @@ class ttUser {
   // Refactoring ongoing. Towards using helper instead of config string?
   var $config = null;           // Comma-separated list of miscellaneous config options.
   var $configHelper = null;     // An instance of ttConfigHelper class.
+  var $custom_css = null;       // Custom css.
 
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
@@ -97,7 +98,7 @@ function __construct($login, $id = null) {
     $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
       " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
       " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type,".
-      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.holidays, g.workday_minutes, g.custom_logo".
+      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.holidays, g.workday_minutes, g.custom_logo".
       " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
@@ -155,7 +156,9 @@ function __construct($login, $id = null) {
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
-      
+
+      $this->custom_css = $val['custom_css'];
+
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
         $this->behalf_id = $_SESSION['behalf_id'];
@@ -304,6 +307,11 @@ function getConfigInt($name, $defaultVal) {
     return $config->getIntValue($name, $defaultVal);
   }
 
+  // getCustomCss returns custom css for active group.
+  function getCustomCss() {
+    return ($this->behalfGroup ? $this->behalfGroup->custom_css : $this->custom_css);
+  }
+
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5260ecc1d..30efec063 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -707,6 +707,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2ae8ed511..707b3dcbe 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -720,6 +720,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f15a08b09..9b061118f 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -682,6 +682,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index fa0407b8f..a66723626 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -659,6 +659,7 @@
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
 // TODO: translate the following.
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index c96415300..4b17bc464 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -638,6 +638,7 @@
 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 'form.display_options.not_complete_days' => 'Not complete days',
+'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 'work.error.work_not_available' => 'Work item is not available.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index fe77bf299..0bd854328 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -722,6 +722,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 9dc067415..0b4603566 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -689,6 +689,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a9a1d76f0..ef7591192 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -706,6 +706,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 6e1787474..2d91252ef 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -688,6 +688,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a4a9a74f7..a4452a4e2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -678,6 +678,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 8137dbd58..d2d036ddf 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -671,6 +671,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5010087a8..3f0cf5d66 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -707,6 +707,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 683636a67..82f1ff081 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -712,6 +712,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 4d3540592..15407a6b9 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -685,6 +685,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index cfbeca196..b116fb35b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -715,6 +715,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2ed5c1bfc..6b17d47d2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -713,6 +713,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 6d815c746..5881139e3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -642,6 +642,7 @@
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
 // TODO: translate the following.
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8afcf5c17..3677fdda5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -712,6 +712,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4dbf608fe..dff252c93 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -691,6 +691,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index cca28d179..db5e0f17c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -686,6 +686,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 57db2d012..b88fb9f18 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -694,6 +694,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index eab6eb7a5..c569adb7e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -715,6 +715,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1050013e0..5302c225b 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -619,6 +619,7 @@
 'form.display_options.menu' => 'Меню',
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 'form.display_options.not_complete_days' => 'Незавершенные дни',
+'form.display_options.custom_css' => 'Пользовательская CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 'work.error.work_not_available' => 'Работа отсутствует.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e0ae714fc..53c5ee3dc 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -696,6 +696,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 0dd6f7206..a3d350ca6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -688,6 +688,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b7b93ffbd..fe385a67c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -689,6 +689,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 24797672a..221c39d4a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -687,6 +687,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c2f30dfbb..0f0537325 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -728,6 +728,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 9cbb47534..29422cc5f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -699,6 +699,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 774b8024a..d4720b341 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -705,6 +705,7 @@
 // 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
 // TODO: translate the following.
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index 918a48f9e..0f78e082e 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -19,6 +19,14 @@
     <td nowrap>{$forms.displayOptionsForm.report_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
   </tr>
 
+{if defined(CUSTOM_CSS_DEBUG)}
+  <tr><td>&nbsp;</td></tr>
+  <tr><td class="sectionHeaderNoBorder">{$i18n.form.display_options.custom_css}</td></tr>
+  <tr>
+    <td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td>
+  </tr>
+{/if}
+
   <tr><td>&nbsp;</td></tr>
   <tr>
     <td colspan="2" height="50" align="center">{$forms.displayOptionsForm.btn_save.control}</td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f0706ae07..0ae53d506 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">Anuko Time Tracker 1.19.19.5230 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.19.5231 | 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/display_options.php b/display_options.php
index 7dd724d44..4430af38b 100644
--- a/display_options.php
+++ b/display_options.php
@@ -67,6 +67,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'report_note_on_separate_row','value'=>$cl_report_note_on_separate_row));
 // TODO: add PDF break controller here.
 
+$form->addInput(array('type'=>'textarea','name'=>'custom_css','style'=>'width: 250px; height: 40px;','value'=>$cl_custom_css));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){

From f33ed44a6703ba05d933c2b37d44900bca8cfd49 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 15 Jul 2020 01:08:39 +0000
Subject: [PATCH 1214/1848] Initial implementation of custom css for groups.

---
 WEB-INF/lib/ttUser.class.php          |  3 ++-
 WEB-INF/templates/display_options.tpl |  2 --
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/header.tpl          |  3 +++
 WEB-INF/templates/mobile/header.tpl   |  3 +++
 custom_css.php                        | 34 +++++++++++++++++++++++++++
 display_options.php                   |  6 ++++-
 7 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 custom_css.php

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ed3dc437b..a62fc5809 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -716,6 +716,7 @@ function updateGroup($fields) {
     if (isset($fields['allow_ip'])) $allow_ip_part = ', allow_ip = '.$mdb2->quote($fields['allow_ip']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
+    if (isset($fields['custom_css'])) $custom_css_part = ', custom_css = '.$mdb2->quote($fields['custom_css']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['holidays'])) $holidays_part = ', holidays = '.$mdb2->quote($fields['holidays']);
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
@@ -723,7 +724,7 @@ function updateGroup($fields) {
 
     $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
       $time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
-      $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
+      $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$custom_css_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index 0f78e082e..f41bd6f58 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -19,13 +19,11 @@
     <td nowrap>{$forms.displayOptionsForm.report_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
   </tr>
 
-{if defined(CUSTOM_CSS_DEBUG)}
   <tr><td>&nbsp;</td></tr>
   <tr><td class="sectionHeaderNoBorder">{$i18n.form.display_options.custom_css}</td></tr>
   <tr>
     <td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td>
   </tr>
-{/if}
 
   <tr><td>&nbsp;</td></tr>
   <tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0ae53d506..50ff6f264 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">Anuko Time Tracker 1.19.19.5231 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.20.5232 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 55d047caa..4d140ed3e 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -7,6 +7,9 @@
   <link href="{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
   <link href="{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+{/if}
+{if $user->getCustomCss()}
+  <link href="custom_css.php" rel="stylesheet" type="text/css">
 {/if}
   <title>Time Tracker{if $title} - {$title}{/if}</title>
   <script src="js/strftime.js"></script>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 054c75363..6290dd025 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -8,6 +8,9 @@
   <link href="../{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
   <link href="../{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+{/if}
+{if $user->getCustomCss()}
+  <link href="../custom_css.php" rel="stylesheet" type="text/css">
 {/if}
   <title>Time Tracker{if $title} - {$title}{/if}</title>
   <script src="../js/strftime.js"></script>
diff --git a/custom_css.php b/custom_css.php
new file mode 100644
index 000000000..979e9a5bd
--- /dev/null
+++ b/custom_css.php
@@ -0,0 +1,34 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// This file outputs custom css for group, if defined.
+
+require_once('initialize.php');
+
+header("Content-type: text/css; charset: UTF-8");
+echo $user->getCustomCss();
diff --git a/display_options.php b/display_options.php
index 4430af38b..37a584657 100644
--- a/display_options.php
+++ b/display_options.php
@@ -43,10 +43,12 @@
   $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row');
   $cl_time_not_complete_days = $request->getParameter('time_not_complete_days');
   $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row');
+  $cl_custom_css = trim($request->getParameter('custom_css'));
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
   $cl_time_not_complete_days = $config->getDefinedValue('time_not_complete_days');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
+  $cl_custom_css = $user->getCustomCss();
 }
 
 $form = new Form('displayOptionsForm');
@@ -76,7 +78,9 @@
     $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);
     $config->setDefinedValue('time_not_complete_days', $cl_time_not_complete_days);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
-    if ($user->updateGroup(array('config' => $config->getConfig()))) {
+    if ($user->updateGroup(array(
+      'config' => $config->getConfig(),
+      'custom_css' => $cl_custom_css))) {
       header('Location: success.php');
       exit();
     } else

From 1b2c65d92bb6a1afff12080cd9713ffa90e331a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 15 Jul 2020 15:12:13 +0000
Subject: [PATCH 1215/1848] Added a user input validator for custom css.

---
 WEB-INF/lib/common.lib.php   | 19 +++++++++++++++++++
 WEB-INF/templates/footer.tpl |  2 +-
 display_options.php          |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 1f2829442..e01deeaa5 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -177,6 +177,25 @@ function ttValidString($val, $emptyValid = false)
   return true;    
 }
 
+// ttValidCss is used to check user input for custom css.
+function ttValidCss($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0)
+    return true;
+
+  // String must not contain any tags.
+  if (stristr($val, '<'))
+    return false;
+
+  // Security note: the above may not be enough.
+  // Currently it is unclear how vulnerable we are assuming custom css is available only to a logged on user
+  // (one custom css per group).
+  // However, if abuse occurs or when the issue is better understood, we may have to rewrite this function,
+  // perhaps by specifying what exactly we allow to style.
+  return true;
+}
+
 // ttValidTemplateText is used to check template-based user input.
 // When templates are used, required input parts must be filled by user.
 // We identify these parts by 3 "stop sign" emojis (aka "octagonal sign" U+1F6D1).
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 50ff6f264..d10afc302 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">Anuko Time Tracker 1.19.20.5232 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.20.5233 | 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/display_options.php b/display_options.php
index 37a584657..a4d3deacb 100644
--- a/display_options.php
+++ b/display_options.php
@@ -73,6 +73,10 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
+  // Validate user input.
+  if (!ttValidCss($cl_custom_css)) $err->add($i18n->get('error.field'), $i18n->get('form.display_options.custom_css'));
+  // Finished validating user input.
+
   if ($err->no()) {
     // Update config.
     $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);

From ddf4f8e805d3ae7c551ea86a55392af1db92b7d3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 15 Jul 2020 16:06:22 +0000
Subject: [PATCH 1216/1848] Fixed future entries behaviour for subgroups.

---
 WEB-INF/lib/ttGroup.class.php          | 4 +---
 WEB-INF/lib/ttUser.class.php           | 2 --
 WEB-INF/lib/ttWeekViewHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl           | 2 +-
 expenses.php                           | 2 +-
 mobile/expense_edit.php                | 2 +-
 mobile/expenses.php                    | 2 +-
 mobile/time.php                        | 2 +-
 mobile/time_edit.php                   | 2 +-
 mobile/timer.php                       | 2 +-
 time.php                               | 2 +-
 time_edit.php                          | 2 +-
 12 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 5e1885af9..46ce5be56 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -34,7 +34,7 @@
 class ttGroup {
   var $id = null;               // Group id.
   var $group_key = null;        // Group key.
-  var $parent_id = null;        // Paerent group id.
+  var $parent_id = null;        // Parent group id.
   var $org_id = null;           // Organization id.
   var $name = null;             // Group name.
   var $lang = null;             // Language.
@@ -48,7 +48,6 @@ class ttGroup {
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
-  var $future_entries = 0;      // Whether to allow creating future entries.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -117,7 +116,6 @@ function __construct($id, $org_id) {
       // Set user config options.
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
-      $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
     }
 
     // Determine active user count in a separate query.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a62fc5809..8bf029921 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -64,7 +64,6 @@ class ttUser {
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
-  var $future_entries = 0;      // Whether to allow creating future entries.
   var $bcc_email = null;        // Bcc email.
   var $allow_ip = null;         // Specification from where user is allowed access.
   var $password_complexity = null; // Password complexity example.
@@ -155,7 +154,6 @@ function __construct($login, $id = null) {
       // Set user config options.
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
-      $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
 
       $this->custom_css = $val['custom_css'];
 
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 05ec4e9d0..aee8c8d61 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -537,7 +537,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     $objEntryDate = new DateAndTime(DB_DATEFORMAT, $entry_date);
 
     // Prohibit creating entries in future.
-    if (!$user->future_entries && $fields['browser_today']) {
+    if (!$user->isOptionEnabled('future_entries') && $fields['browser_today']) {
       $objBrowserToday = new DateAndTime(DB_DATEFORMAT, $fields['browser_today']);
       if ($objEntryDate->after($objBrowserToday)) {
         $err->add($i18n->get('error.future_date'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d10afc302..687331f88 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">Anuko Time Tracker 1.19.20.5233 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.20.5234 | 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/expenses.php b/expenses.php
index 2b7a15bc4..7959bb311 100644
--- a/expenses.php
+++ b/expenses.php
@@ -202,7 +202,7 @@
     if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
-    if (!$user->getConfigOption('future_entries')) {
+    if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index 654d1698d..67813a6f1 100644
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -167,7 +167,7 @@
   $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
 
   // Prohibit creating entries in future.
-  if (!$user->getConfigOption('future_entries')) {
+  if (!$user->isOptionEnabled('future_entries')) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 3b229368e..05d469985 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -203,7 +203,7 @@
     if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
 
     // Prohibit creating entries in future.
-    if (!$user->getConfigOption('future_entries')) {
+    if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
diff --git a/mobile/time.php b/mobile/time.php
index 233f1d16f..1e5276cdf 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -340,7 +340,7 @@
     // Finished validating user input.
 
     // Prohibit creating entries in future.
-    if (!$user->future_entries) {
+    if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 6fefebd86..7e50731b6 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -305,7 +305,7 @@
   $new_date = new DateAndTime($user->date_format, $cl_date);
 
   // Prohibit creating entries in future.
-  if (!$user->future_entries) {
+  if (!$user->isOptionEnabled('future_entries')) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
diff --git a/mobile/timer.php b/mobile/timer.php
index c7c1c2d40..0b513c235 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -218,7 +218,7 @@
     // Finished validating user input.
 
     // Prohibit creating entries in future.
-    if (!$user->future_entries) {
+    if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
diff --git a/time.php b/time.php
index 9f85d5981..6664243a6 100644
--- a/time.php
+++ b/time.php
@@ -383,7 +383,7 @@
     // Finished validating user input.
 
     // Prohibit creating entries in future.
-    if (!$user->future_entries) {
+    if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
diff --git a/time_edit.php b/time_edit.php
index 83989404f..918ecea52 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -310,7 +310,7 @@
   $new_date = new DateAndTime($user->date_format, $cl_date);
 
   // Prohibit creating entries in future.
-  if (!$user->future_entries) {
+  if (!$user->isOptionEnabled('future_entries')) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));

From bacffb8ff036d508d8004f6b169adda11696627a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 15 Jul 2020 16:09:40 +0000
Subject: [PATCH 1217/1848] Forgot to check in one file.

---
 expense_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expense_edit.php b/expense_edit.php
index 3cebac129..f736f2132 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -172,7 +172,7 @@
   $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
 
   // Prohibit creating entries in future.
-  if (!$user->getConfigOption('future_entries')) {
+  if (!$user->isOptionEnabled('future_entries')) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));

From b6a3fe7a3cf32bcfa0c20d57cf855cbbe670893f Mon Sep 17 00:00:00 2001
From: WizardStan <wizard@houseoffire.ca>
Date: Thu, 16 Jul 2020 09:27:49 -0400
Subject: [PATCH 1218/1848] Replace cal_days_in_month with generic date call
 (#99)

---
 plugins/MonthlyQuota.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index c8559ad46..0a8ee4e9b 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -133,7 +133,7 @@ private function getMany($year){
   // getNumWorkdays returns a number of work days in a given month.
   private function getNumWorkdays($month, $year) {
 
-    $daysInMonth = cal_days_in_month(CAL_GREGORIAN, $month, $year); // Number of calendar days in month.
+    $daysInMonth = date('t', mktime(0, 0, 0, $month, 1, $year));
 
     $workdaysInMonth = 0;
     // Iterate through the entire month.

From 671b1a087c997ada7a9435a1ea8eb19e447e0f59 Mon Sep 17 00:00:00 2001
From: WizardStan <wizard@houseoffire.ca>
Date: Thu, 16 Jul 2020 09:51:00 -0400
Subject: [PATCH 1219/1848] Create notifications that trigger based on hours
 (#98)

---
 WEB-INF/lib/common.lib.php           |  3 ++-
 WEB-INF/lib/ttReportHelper.class.php | 30 +++++++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index e01deeaa5..725f343c0 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -343,7 +343,8 @@ function ttValidCondition($val, $emptyValid = true)
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
 
-  if (!preg_match("/^count\s?(=|[<>]=?|<>)\s?\d+$/", $val))
+  if (!preg_match("/^count\s?(=|[<>]=?|<>)\s?\d+$/", $val) &&
+      !preg_match("/^hours\s?(=|[<>]=?|<>)\s?\d+$/", $val))
     return false;
 
   return true;
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index fa7519a05..4fd0ce8a1 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -882,6 +882,7 @@ static function getTotals($options)
     $totals['start_date'] = $period->getStartDate();
     $totals['end_date'] = $period->getEndDate();
     $totals['time'] = $total_time;
+    $totals['minutes'] = $val['time'] / 60;
     $totals['units'] = $val['units'];
     $totals['cost'] = $total_cost;
     $totals['expenses'] = $total_expenses;
@@ -1417,9 +1418,20 @@ static function prepareReportBody($options, $comment = null)
   // checkFavReportCondition - checks whether it is okay to send fav report.
   static function checkFavReportCondition($options, $condition)
   {
-    $items = ttReportHelper::getItems($options);
-
-    $condition = trim(str_replace('count', '', $condition));
+    $actual_value = 0;
+    $condition = trim($condition);
+    if (ttStartsWith($condition, "count")) {
+      $items = ttReportHelper::getItems($options);
+      $actual_value = count($items);
+      $condition = trim(str_replace('count', '', $condition));
+    } else if (ttStartsWith($condition, "hours")) {
+      $totals = ttReportHelper::getTotals($options);
+      $actual_value = (int)($totals['minutes'] / 60);
+      $condition = trim(str_replace('hours', '', $condition));
+    } else {
+      echo "Invalid condition: " . $condition . "\n";
+      return false;
+    }
 
     $greater_or_equal = ttStartsWith($condition, '>=');
     if ($greater_or_equal) $condition = trim(str_replace('>=', '', $condition));
@@ -1441,12 +1453,12 @@ static function checkFavReportCondition($options, $condition)
 
     $count_required = (int) $condition;
 
-    if ($greater && count($items) > $count_required) return true;
-    if ($greater_or_equal && count($items) >= $count_required) return true;
-    if ($less && count($items) < $count_required) return true;
-    if ($less_or_equal && count($items) <= $count_required) return true;
-    if ($equal && count($items) == $count_required) return true;
-    if ($not_equal && count($items) <> $count_required) return true;
+    if ($greater && $actual_value > $required_value) return true;
+    if ($greater_or_equal && $actual_value >= $required_value) return true;
+    if ($less && $actual_value < $required_value) return true;
+    if ($less_or_equal && $actual_value <= $required_value) return true;
+    if ($equal && $actual_value == $required_value) return true;
+    if ($not_equal && $actual_value <> $required_value) return true;
 
     return false;
   }

From d289826b3ede1b7072b1a8fc9da245f3a6e84370 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 16 Jul 2020 15:34:41 +0000
Subject: [PATCH 1220/1848] Some fixes on notification_add.php.

---
 WEB-INF/lib/ttReportHelper.class.php | 2 +-
 WEB-INF/templates/footer.tpl         | 2 +-
 notification_add.php                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4fd0ce8a1..20057dde2 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1451,7 +1451,7 @@ static function checkFavReportCondition($options, $condition)
     $equal = ttStartsWith($condition, '=');
     if ($equal) $condition = trim(str_replace('=', '', $condition));
 
-    $count_required = (int) $condition;
+    $count_required = (int) $condition; // TODO: remove this?
 
     if ($greater && $actual_value > $required_value) return true;
     if ($greater_or_equal && $actual_value >= $required_value) return true;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 687331f88..d92f72131 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">Anuko Time Tracker 1.19.20.5234 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.21.5235 | 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/notification_add.php b/notification_add.php
index c6b37fe65..ad8d9f800 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -46,7 +46,7 @@
   header('Location: access_denied.php'); // No users in subgroup.
   exit();
 }
-if ($request->isPost()) {
+if ($request->isPost() && $request->getParameter('fav_report')) {
   $cl_fav_report_id = (int) $request->getParameter('fav_report');
   if (!ttFavReportHelper::get($cl_fav_report_id)) {
     header('Location: access_denied.php'); // Invalid fav report id in post.
@@ -87,7 +87,7 @@
   // Validate user input.
   if (!$cl_fav_report_id) $err->add($i18n->get('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
-  if (!ttValidEmailList($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('form.email'));
+  if (!ttValidEmailList($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
   if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));

From 46871f56c8ca60987ef8e2efd782f9d5a80c0ad3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 16 Jul 2020 15:59:56 +0000
Subject: [PATCH 1221/1848] Introduced a comment field for notifications in
 database.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d92f72131..dce6f46b3 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">Anuko Time Tracker 1.19.21.5235 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5236 | 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/dbinstall.php b/dbinstall.php
index 242d57b84..b6f831479 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11919"]) {
+  if ($_POST["convert11900to11922"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1190,6 +1190,8 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.17', modified = now() where param_name = 'version_db' and param_value = '1.19.14'");
     ttExecute("ALTER TABLE `tt_groups` ADD `custom_css` text default NULL AFTER `config`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.19', modified = now() where param_name = 'version_db' and param_value = '1.19.17'");
+    ttExecute("ALTER TABLE `tt_cron` ADD `comment` text AFTER `subject`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.22', modified = now() where param_name = 'version_db' and param_value = '1.19.19'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1240,7 +1242,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.19)</b>
+    <td width="80%"><b>Create database structure (v1.19.22)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1289,8 +1291,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.19)</td>
-    <td><input type="submit" name="convert11900to11919" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.22)</td>
+    <td><input type="submit" name="convert11900to11922" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index e3ccd7d2c..1e37a59df 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -314,6 +314,7 @@ CREATE TABLE `tt_cron` (
   `email` varchar(100) default NULL,            # email to send results to
   `cc` varchar(100) default NULL,               # cc email to send results to
   `subject` varchar(100) default NULL,          # email subject
+  `comment` text,                               # user provided comment for notification
   `report_condition` varchar(255) default NULL, # report condition, "count > 0" for sending not empty reports
   `status` tinyint(4) default 1,                # entry status
   PRIMARY KEY (`id`)
@@ -656,4 +657,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.19', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.22', now()); # TODO: change when structure changes.

From ea1f50ae859891bb5ecae9155e56630580d7564d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 16 Jul 2020 16:45:49 +0000
Subject: [PATCH 1222/1848] Introduced a comment field for notifications, also
 fixed a problem introduced in pr#98, hopefully.

---
 WEB-INF/lib/ttNotificationHelper.class.php | 10 ++++++----
 WEB-INF/lib/ttReportHelper.class.php       |  6 +++---
 WEB-INF/templates/footer.tpl               |  2 +-
 WEB-INF/templates/notification_add.tpl     |  4 ++++
 WEB-INF/templates/notification_edit.tpl    |  4 ++++
 cron.php                                   |  4 ++--
 notification_add.php                       |  4 ++++
 notification_edit.php                      |  5 +++++
 8 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index 8e5cb8aff..35c309040 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -37,7 +37,7 @@ static function get($id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c".
+    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.comment, c.report_condition, c.status, fr.name from tt_cron c".
       " left join tt_fav_reports fr on (fr.id = c.report_id)".
       " where c.id = $id and c.group_id = $group_id and c.org_id = $org_id";
     $res = $mdb2->query($sql);
@@ -79,11 +79,12 @@ static function insert($fields) {
     $email = $fields['email'];
     $cc = $fields['cc'];
     $subject = $fields['subject'];
+    $comment = $fields['comment'];
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
-    $sql = "insert into tt_cron (group_id, org_id, cron_spec, next, report_id, email, cc, subject, report_condition, status)".
-      " values ($group_id, $org_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_cron (group_id, org_id, cron_spec, next, report_id, email, cc, subject, comment, report_condition, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($comment).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -106,12 +107,13 @@ static function update($fields) {
     $email = $fields['email'];
     $cc = $fields['cc'];
     $subject = $fields['subject'];
+    $comment = $fields['comment'];
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
     $sql = "update tt_cron".
       " set cron_spec = ".$mdb2->quote($cron_spec).", next = $next, report_id = $report_id".
-      ",  email = ".$mdb2->quote($email).", cc = ".$mdb2->quote($cc).", subject = ".$mdb2->quote($subject).
+      ",  email = ".$mdb2->quote($email).", cc = ".$mdb2->quote($cc).", subject = ".$mdb2->quote($subject).", comment = ".$mdb2->quote($comment).
       ", report_condition = ".$mdb2->quote($report_condition).", status = ".$mdb2->quote($status).
       " where id = $notification_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 20057dde2..72c99df85 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1451,7 +1451,7 @@ static function checkFavReportCondition($options, $condition)
     $equal = ttStartsWith($condition, '=');
     if ($equal) $condition = trim(str_replace('=', '', $condition));
 
-    $count_required = (int) $condition; // TODO: remove this?
+    $required_value = (int) $condition;
 
     if ($greater && $actual_value > $required_value) return true;
     if ($greater_or_equal && $actual_value >= $required_value) return true;
@@ -1464,14 +1464,14 @@ static function checkFavReportCondition($options, $condition)
   }
 
   // sendFavReport - sends a favorite report to a specified email, called from cron.php
-  static function sendFavReport($options, $subject, $email, $cc) {
+  static function sendFavReport($options, $subject, $comment, $email, $cc) {
     // We are called from cron.php, we have no $bean in session.
     // cron.php sets global $user and $i18n objects to match our favorite report user.
     global $user;
     global $i18n;
 
     // Prepare report body.
-    $body = ttReportHelper::prepareReportBody($options);
+    $body = ttReportHelper::prepareReportBody($options, $comment);
 
     import('mail.Mailer');
     $mailer = new Mailer();
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dce6f46b3..0612eddd4 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">Anuko Time Tracker 1.19.22.5236 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5237 | 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/notification_add.tpl b/WEB-INF/templates/notification_add.tpl
index a710c0c1d..b3aaed8e7 100644
--- a/WEB-INF/templates/notification_add.tpl
+++ b/WEB-INF/templates/notification_add.tpl
@@ -23,6 +23,10 @@
           <td align="right">{$i18n.label.subject}:</td>
           <td>{$forms.notificationForm.subject.control}</td>
         </tr>
+        <tr>
+          <td align="right">{$i18n.label.comment}:</td>
+          <td>{$forms.notificationForm.comment.control}</td>
+        </tr>
         <tr>
           <td align="right">{$i18n.label.condition}:</td>
           <td>{$forms.notificationForm.report_condition.control} <a href="https://www.anuko.com/lp/tt_9.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
diff --git a/WEB-INF/templates/notification_edit.tpl b/WEB-INF/templates/notification_edit.tpl
index abb03e658..7c46761ea 100644
--- a/WEB-INF/templates/notification_edit.tpl
+++ b/WEB-INF/templates/notification_edit.tpl
@@ -23,6 +23,10 @@
           <td align="right">{$i18n.label.subject}:</td>
           <td>{$forms.notificationForm.subject.control}</td>
         </tr>
+        <tr>
+          <td align="right">{$i18n.label.comment}:</td>
+          <td>{$forms.notificationForm.comment.control}</td>
+        </tr>
         <tr>
           <td align="right">{$i18n.label.condition}:</td>
           <td>{$forms.notificationForm.report_condition.control} <a href="https://www.anuko.com/lp/tt_9.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
diff --git a/cron.php b/cron.php
index 337f96aef..331b4f36e 100644
--- a/cron.php
+++ b/cron.php
@@ -47,7 +47,7 @@
 $mdb2 = getConnection();
 $now = time();
 
-$sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c".
+$sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.comment, c.report_condition from tt_cron c".
   " inner join tt_fav_reports fr on".
   " (c.report_id = fr.id and c.group_id = fr.group_id and c.org_id = fr.org_id)". // Report for a correct group.
   " inner join tt_users u on (u.id = fr.user_id and u.status = 1)". // Report for an active user.
@@ -94,7 +94,7 @@
 
   // Email report if condition is okay.
   if ($condition_ok) {
-    if (ttReportHelper::sendFavReport($options, $val['subject'], $val['email'], $val['cc']))
+    if (ttReportHelper::sendFavReport($options, $val['subject'], $val['comment'], $val['email'], $val['cc']))
       echo "Report ".$val['report_id']. " sent.<br>";
     else
       echo "Error while emailing report...<br>";
diff --git a/notification_add.php b/notification_add.php
index ad8d9f800..8b0f96b56 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -62,6 +62,7 @@
   $cl_email = trim($request->getParameter('email'));
   $cl_cc = trim($request->getParameter('cc'));
   $cl_subject = trim($request->getParameter('subject'));
+  $cl_comment = trim($request->getParameter('comment'));
   $cl_report_condition = trim($request->getParameter('report_condition'));
 } else {
   $cl_cron_spec = '0 4 * * 1'; // Default schedule - weekly on Mondays at 04:00 (server time).
@@ -80,6 +81,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
 $form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
 $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
+$form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_comment));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -90,6 +92,7 @@
   if (!ttValidEmailList($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
   if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));
 
   if ($err->no()) {
@@ -103,6 +106,7 @@
         'email' => $cl_email,
         'cc' => $cl_cc,
         'subject' => $cl_subject,
+        'comment' => $cl_comment,
         'report_condition' => $cl_report_condition,
         'status' => ACTIVE))) {
         header('Location: notifications.php');
diff --git a/notification_edit.php b/notification_edit.php
index 8af8dc8c4..975b313a8 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -68,6 +68,7 @@
   $cl_email = trim($request->getParameter('email'));
   $cl_cc = trim($request->getParameter('cc'));
   $cl_subject = trim($request->getParameter('subject'));
+  $cl_comment = trim($request->getParameter('comment'));
   $cl_report_condition = trim($request->getParameter('report_condition'));
 } else {
   $notification = ttNotificationHelper::get($notification_id);
@@ -76,6 +77,7 @@
   $cl_email = $notification['email'];
   $cl_cc = $notification['cc'];
   $cl_subject = $notification['subject'];
+  $cl_comment = $notification['comment'];
   $cl_report_condition = $notification['report_condition'];
 }
 
@@ -92,6 +94,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
 $form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
 $form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
+$form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_comment));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
 
@@ -102,6 +105,7 @@
   if (!ttValidEmailList($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('form.email'));
   if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
   if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));
 
   if ($err->no()) {
@@ -116,6 +120,7 @@
         'email' => $cl_email,
         'cc' => $cl_cc,
         'subject' => $cl_subject,
+        'comment' => $cl_comment,
         'report_condition' => $cl_report_condition,
         'status' => ACTIVE))) {
         header('Location: notifications.php');

From d29671803b59b1ec58b339376e078a734809f8a4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 16 Jul 2020 18:58:37 +0000
Subject: [PATCH 1223/1848] Added a what is it link explaining the
 Notifications plugin.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/plugins.tpl | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0612eddd4..5d0c119d1 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">Anuko Time Tracker 1.19.22.5237 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5238 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 97f7cdb95..5972ea148 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -46,10 +46,13 @@ function handlePluginCheckboxes() {
 
   var notificationsCheckbox = document.getElementById("notifications");
   configureLabel = document.getElementById("notifications_conf");
+  docLabel = document.getElementById("notifications_doc");
   if (notificationsCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
+    configureLabel.style.display = "";
+    docLabel.style.display = "none";
   } else {
-    configureLabel.style.visibility = "hidden";
+    configureLabel.style.display = "none";
+    docLabel.style.display = "";
   }
 
   var lockingCheckbox = document.getElementById("locking");
@@ -128,7 +131,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_conf">{if $user_exists}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
+            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_doc"><a href="https://www.anuko.com/lp/tt_45.htm" target="_blank">{$i18n.label.what_is_it}</a></span><span id="notifications_conf">{if $user_exists}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.locking.control}</td>

From 1a5c3d1ff839f38f075bc0ac283ccd022c4a6155 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 16 Jul 2020 19:54:49 +0000
Subject: [PATCH 1224/1848] Improved usability of plugins.php page by hiding
 configure links when they cannot be used.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/plugins.tpl | 16 ++++++++--------
 plugins.php                   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5d0c119d1..2e88c8980 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">Anuko Time Tracker 1.19.22.5238 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5239 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 5972ea148..6de5ede7b 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -123,31 +123,31 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.custom_fields.control}</td>
-            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_conf"><a href="cf_custom_fields.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_conf">{if $user->isPluginEnabled('cf')}<a href="cf_custom_fields.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.expenses.control}</td>
-            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_conf"><a href="predefined_expenses.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_conf">{if $user->isPluginEnabled('ex')}<a href="predefined_expenses.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_doc"><a href="https://www.anuko.com/lp/tt_45.htm" target="_blank">{$i18n.label.what_is_it}</a></span><span id="notifications_conf">{if $user_exists}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
+            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_doc"><a href="https://www.anuko.com/lp/tt_45.htm" target="_blank">{$i18n.label.what_is_it}</a></span><span id="notifications_conf">{if $user_exists && $user->isPluginEnabled('no')}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.locking.control}</td>
-            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_conf"><a href="locking.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_conf">{if $user->isPluginEnabled('lk')}<a href="locking.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.quotas.control}</td>
-            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_conf"><a href="quotas.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_conf">{if $user->isPluginEnabled('mq')}<a href="quotas.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.week_view.control}</td>
-            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_conf"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_conf">{if $user->isPluginEnabled('wv')}<a href="week_view.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
-            <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_conf"><a href="work_units.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_conf">{if $user->isPluginEnabled('wu')}<a href="work_units.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
@@ -159,7 +159,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
-            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_conf"><a href="templates.php">{$i18n.label.configure}</a></span> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span> <span id="templates_conf">{if $user->isPluginEnabled('tp')}<a href="templates.php">{$i18n.label.configure}</a>{/if}</span></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
diff --git a/plugins.php b/plugins.php
index bc26e5869..d39f306bb 100644
--- a/plugins.php
+++ b/plugins.php
@@ -154,7 +154,7 @@
   if ($user->updateGroup(array(
     'plugins' => $plugins,
     'config' => $config))) {
-    header('Location: success.php');
+    header('Location: plugins.php');
     exit();
   } else
     $err->add($i18n->get('error.db'));

From 949f015f5c8fd1e02c6210843607695541c164bb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 14:04:15 +0000
Subject: [PATCH 1225/1848] Improved export-import to include notification
 comments.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 6 ++++--
 WEB-INF/templates/footer.tpl              | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 843fe84f4..b4fe59f9f 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -632,6 +632,7 @@ function writeData() {
         $notification_part .= " email=\"".htmlspecialchars($notification['email'])."\"";
         $notification_part .= " cc=\"".htmlspecialchars($notification['cc'])."\"";
         $notification_part .= " subject=\"".htmlspecialchars($notification['subject'])."\"";
+        $notification_part .= " comment=\"".htmlspecialchars($notification['comment'])."\"";
         $notification_part .= " report_condition=\"".htmlspecialchars($notification['report_condition'])."\"";
         $notification_part .= " status=\"".$notification['status']."\"";
         $notification_part .= "></notification>\n";
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 32a5c81f1..d6d28ec90 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -525,6 +525,7 @@ function startElement($parser, $name, $attrs) {
           'email' => $attrs['EMAIL'],
           'cc' => $attrs['CC'],
           'subject' => $attrs['SUBJECT'],
+          'comment' => $attrs['COMMENT'],
           'report_condition' => $attrs['REPORT_CONDITION'],
           'status' => $attrs['STATUS']))) {
           $this->errors->add($i18n->get('error.db'));
@@ -1115,12 +1116,13 @@ private function insertNotification($fields)
     $email = $fields['email'];
     $cc = $fields['cc'];
     $subject = $fields['subject'];
+    $comment = $fields['comment'];
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
 
     $sql = "insert into tt_cron".
-      " (group_id, org_id, cron_spec, last, next, report_id, email, cc, subject, report_condition, status)".
-      " values ($group_id, $org_id, ".$mdb2->quote($cron_spec).", $last, $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
+      " (group_id, org_id, cron_spec, last, next, report_id, email, cc, subject, comment, report_condition, status)".
+      " values ($group_id, $org_id, ".$mdb2->quote($cron_spec).", $last, $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($comment).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2e88c8980..98b5601ed 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">Anuko Time Tracker 1.19.22.5239 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5240 | 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>

From d4fad1407df291684602c74fe97ba46d3dd9eb2b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 14:17:42 +0000
Subject: [PATCH 1226/1848] Improved export-import by including custom_css
 field.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 6 ++++--
 WEB-INF/templates/footer.tpl              | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index b4fe59f9f..d6415daea 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -162,6 +162,7 @@ function writeData() {
     $group_part .= " workday_minutes=\"".$group['workday_minutes']."\"";
     $group_part .= " custom_logo=\"".$group['custom_logo']."\"";
     $group_part .= " config=\"".$group['config']."\"";
+    $group_part .= " custom_css=\"".$group['custom_css']."\"";
     $group_part .= ">\n";
 
     // Write group info.
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index d6d28ec90..dbf838281 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -123,7 +123,8 @@ function startElement($parser, $name, $attrs) {
           'lock_spec' => $attrs['LOCK_SPEC'],
           'workday_minutes' => $attrs['WORKDAY_MINUTES'],
           'custom_logo' => $attrs['CUSTOM_LOGO'],
-          'config' => $attrs['CONFIG']));
+          'config' => $attrs['CONFIG'],
+          'custom_css' => $attrs['CUSTOM_CSS']));
 
         // Special handling for top group.
         if (!$this->org_id && $this->current_group_id) {
@@ -706,7 +707,7 @@ private function createGroup($fields) {
     $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format, time_format,'.
       ' week_start, tracking_mode, project_required, task_required, record_type, bcc_email,'.
       ' allow_ip, password_complexity, plugins, lock_spec,'.
-      ' workday_minutes, config, created, created_ip, created_by)';
+      ' workday_minutes, config, custom_css, created, created_ip, created_by)';
 
     $values = ' values (';
     $values .= $mdb2->quote($fields['parent_id']);
@@ -731,6 +732,7 @@ private function createGroup($fields) {
     $values .= ', '.$mdb2->quote($fields['lock_spec']);
     $values .= ', '.(int)$fields['workday_minutes'];
     $values .= ', '.$mdb2->quote($fields['config']);
+    $values .= ', '.$mdb2->quote($fields['custom_css']);
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98b5601ed..ee29c6fa3 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">Anuko Time Tracker 1.19.22.5240 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5241 | 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>

From 2480fe1dfdbf27e5bf85bb987faf459959057e5a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 14:41:37 +0000
Subject: [PATCH 1227/1848] Fixed date format for subgroups on time edit pages.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/time_edit.php         | 2 +-
 time_edit.php                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ee29c6fa3..1849d25a5 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">Anuko Time Tracker 1.19.22.5241 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5242 | 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/time_edit.php b/mobile/time_edit.php
index 7e50731b6..044724067 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -95,7 +95,7 @@
   $cl_start = $time_rec['start'];
   $cl_finish = $time_rec['finish'];
   $cl_duration = $time_rec['duration'];
-  $cl_date = $item_date->toString($user->date_format);
+  $cl_date = $item_date->toString($user->getDateFormat());
   $cl_note = $time_rec['comment'];
 
   // If we have time custom fields - collect values from database.
diff --git a/time_edit.php b/time_edit.php
index 918ecea52..726fdb1a5 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -97,7 +97,7 @@
   $cl_start = $time_rec['start'];
   $cl_finish = $time_rec['finish'];
   $cl_duration = $time_rec['duration'];
-  $cl_date = $item_date->toString($user->date_format);
+  $cl_date = $item_date->toString($user->getDateFormat());
   $cl_note = $time_rec['comment'];
 
   // If we have time custom fields - collect values from database.

From b879f1edf25503b5802d690887ba4f4b27c8efeb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 15:25:33 +0000
Subject: [PATCH 1228/1848] Fixes and refactoring of time_edit.php for
 subgroups.

---
 WEB-INF/templates/footer.tpl    |   2 +-
 WEB-INF/templates/time_edit.tpl |  14 ++---
 time_edit.php                   | 108 +++++++++++++++++++++++---------
 3 files changed, 85 insertions(+), 39 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1849d25a5..5c387a17e 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">Anuko Time Tracker 1.19.22.5242 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5243 | 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/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index 5b0e3e2de..f1eca33cf 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -22,19 +22,19 @@ function confirmSave() {
   <tr>
     <td valign="top">
     <table border="0">
-{if $user->isPluginEnabled('cl')}
+{if $show_client}
     <tr>
       <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
       <td>{$forms.timeRecordForm.client.control}</td>
     </tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
+{if $show_billable}
     <tr>
       <td align="right">&nbsp;</td>
       <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
     </tr>
 {/if}
-{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
+{if $show_paid_status}
     <tr>
       <td align="right">&nbsp;</td>
       <td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td>
@@ -49,19 +49,19 @@ function confirmSave() {
     </tr>
   {/foreach}
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <tr>
       <td align="right">{$i18n.label.project} (*):</td>
       <td>{$forms.timeRecordForm.project.control}</td>
     </tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
     <tr>
       <td align="right">{$i18n.label.task}{if $user->task_required} (*){/if}:</td>
       <td>{$forms.timeRecordForm.task.control}</td>
     </tr>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_start}
     <tr>
       <td align="right">{$i18n.label.start}:</td>
       <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
@@ -71,7 +71,7 @@ function confirmSave() {
       <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
     </tr>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_duration}
     <tr>
       <td align="right">{$i18n.label.duration}:</td>
       <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
diff --git a/time_edit.php b/time_edit.php
index 726fdb1a5..8ee3a5a23 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -52,6 +52,17 @@
 $user_id = $user->getUser();
 $config = new ttConfigHelper($user->getConfig());
 
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
@@ -86,9 +97,9 @@
   $cl_project = $request->getParameter('project');
   $cl_task = $request->getParameter('task');
   $cl_billable = 1;
-  if ($user->isPluginEnabled('iv'))
+  if ($showBillable)
     $cl_billable = $request->getParameter('billable');
-  if ($user->isPluginEnabled('ps'))
+  if ($showPaidStatus)
     $cl_paid = $request->getParameter('paid');
 } else {
   $cl_client = $time_rec['client_id'];
@@ -128,7 +139,8 @@
 $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+// Note: for other tracking modes the control is added further below.
+if (MODE_TIME == $trackingMode && $showClient) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -141,7 +153,31 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+if ($showPaidStatus)
+  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
   // Dropdown for projects assigned to user.
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
@@ -154,8 +190,8 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
+  // Client dropdown.
+  if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
@@ -183,7 +219,8 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Task dropdown.
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -194,8 +231,8 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 
-// Add other controls.
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+// Start and finish controls.
+if ($showStart) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
   if ($user->punch_mode && !$user->canOverridePunchMode()) {
@@ -204,26 +241,13 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+
+// Duration control.
+if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 200px;','value'=>$cl_note));
 
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
+// Date field.
+$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -243,19 +267,31 @@
   }
 }
 
+// Note control.
+$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 200px;','value'=>$cl_note));
+
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
-  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
+
+// A hidden control for today's date from user's browser.
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
+
+// Copy button.
 $on_click_action = 'browser_today.value=get_date();';
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+
+// Save button.
 if ($confirm_save) $on_click_action .= 'return(confirmSave());';
 $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
+
+// Delete button.
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
+
+
+
+
+// TODO: refactoring ongoing down from here...
 if ($request->isPost()) {
 
   // Validate user input.
@@ -444,6 +480,16 @@
   $smarty->assign('confirm_save', true);
   $smarty->assign('entry_date', $cl_date);
 }
+// TODO: review the below.
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);+
+$smarty->assign('show_paid_status', $showPaidStatus);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_duration', $showDuration);
+// TODO: review the above.
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 93745a6d1b827ee09581c03a26dbe9d6ce379f59 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 15:55:47 +0000
Subject: [PATCH 1229/1848] Some more refactoring and fixes in time_edit.php
 for subgroups.

---
 WEB-INF/templates/footer.tpl |  2 +-
 time_edit.php                | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5c387a17e..13c588a7b 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">Anuko Time Tracker 1.19.22.5243 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5244 | 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/time_edit.php b/time_edit.php
index 8ee3a5a23..9f9078978 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -287,15 +287,10 @@
 // Delete button.
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
-
-
-
-
-// TODO: refactoring ongoing down from here...
 if ($request->isPost()) {
 
   // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+  if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   // Validate input in time custom fields.
   if ($custom_fields && $custom_fields->timeFields) {
@@ -304,10 +299,10 @@
       if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
     }
   }
-  if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+  if ($showProject) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
   }
-  if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+  if ($showTask && $user->task_required) {
     if (!$cl_task) $err->add($i18n->get('error.task'));
   }
   if (!$cl_duration) {
@@ -323,11 +318,11 @@
           $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
       }
     } else {
-      if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+      if ($showStart) {
         $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
         $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
       }
-      if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+      if ($showDuration)
         $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
     }
   } else {
@@ -342,6 +337,10 @@
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 
+
+
+  // TODO: refactoring ongoing down from here...
+  //
   // This is a new date for the time record.
   $new_date = new DateAndTime($user->date_format, $cl_date);
 

From 0ca9ea459c33b93aa32c94d8c969919ce2c671a4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 17:02:01 +0000
Subject: [PATCH 1230/1848] Refactoring. Removed redundant variables.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/mobile/time.tpl | 2 --
 WEB-INF/templates/time.tpl        | 4 ----
 mobile/time.php                   | 2 --
 time.php                          | 2 --
 time_edit.php                     | 2 --
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 13c588a7b..6d820a612 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">Anuko Time Tracker 1.19.22.5244 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5245 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 038d6790d..07e50fb39 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -79,8 +79,6 @@
 {if $show_start}
               <tr><td>{$i18n.label.start}:</td></tr>
               <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
-{/if}
-{if $show_finish}
               <tr><td>{$i18n.label.finish}:</td></tr>
               <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
 {/if}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 0b78b1788..4d87c5520 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -62,8 +62,6 @@
           <td align="right">{$i18n.label.start}:</td>
           <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
         </tr>
-{/if}
-{if $show_finish}
         <tr>
           <td align="right">{$i18n.label.finish}:</td>
           <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
@@ -124,8 +122,6 @@
   {/if}
   {if $show_start}
           <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
-  {/if}
-  {if $show_finish}
           <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
   {/if}
           <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
diff --git a/mobile/time.php b/mobile/time.php
index 1e5276cdf..8f4ca0a32 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -75,7 +75,6 @@
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showFinish = $showStart;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 
 // Initialize and store date in session.
@@ -398,7 +397,6 @@
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);
-$smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
diff --git a/time.php b/time.php
index 6664243a6..bbd5d14a3 100644
--- a/time.php
+++ b/time.php
@@ -76,7 +76,6 @@
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showFinish = $showStart;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
 
@@ -483,7 +482,6 @@
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);
-$smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('show_note_column', $showNoteColumn);
 $smarty->assign('show_note_row', $showNoteRow);
diff --git a/time_edit.php b/time_edit.php
index 9f9078978..84d9ee815 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -60,7 +60,6 @@
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showFinish = $showStart;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 
 // Use custom fields plugin if it is enabled.
@@ -486,7 +485,6 @@
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);
-$smarty->assign('show_finish', $showFinish);
 $smarty->assign('show_duration', $showDuration);
 // TODO: review the above.
 $smarty->assign('client_list', $client_list);

From e03dc2637114395272c7e4d297190a4e64c84270 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 17:24:18 +0000
Subject: [PATCH 1231/1848] Finished refactoring and fixing time_edit.php for
 subgroups.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/time_script.tpl |  2 +-
 time_edit.php                     | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6d820a612..31c4051cf 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">Anuko Time Tracker 1.19.22.5245 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5246 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 463ab4f72..65a691abe 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -295,7 +295,7 @@ function setNow(formField) {
   x.disabled = false;
   x.style.background = "white";
   var today = new Date();
-  var time_format = '{$user->time_format}';
+  var time_format = '{$user->getTimeFormat()}';
   var obj = eval("document.timeRecordForm." + formField);
   obj.value = today.strftime(time_format);
   formDisable(formField);
diff --git a/time_edit.php b/time_edit.php
index 84d9ee815..9a29192f5 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -336,12 +336,8 @@
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 
-
-
-  // TODO: refactoring ongoing down from here...
-  //
   // This is a new date for the time record.
-  $new_date = new DateAndTime($user->date_format, $cl_date);
+  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
 
   // Prohibit creating entries in future.
   if (!$user->isOptionEnabled('future_entries')) {
@@ -411,7 +407,7 @@
     }
   }
 
-  // Save as new record.
+  // Copy record.
   if ($request->getParameter('btn_copy')) {
     // We need to:
     // 1) Prohibit saving into locked range.
@@ -478,7 +474,6 @@
   $smarty->assign('confirm_save', true);
   $smarty->assign('entry_date', $cl_date);
 }
-// TODO: review the below.
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);+
 $smarty->assign('show_paid_status', $showPaidStatus);
@@ -486,7 +481,6 @@
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_duration', $showDuration);
-// TODO: review the above.
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From b6822faa15d427c6e0d581795606f9963b05f491 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 20:38:48 +0000
Subject: [PATCH 1232/1848] Fixes for mobile time_edit.php for subgroups and
 paid status.

---
 WEB-INF/templates/footer.tpl           |   2 +-
 WEB-INF/templates/mobile/time_edit.tpl |  15 ++--
 mobile/time_edit.php                   | 114 +++++++++++++++++--------
 3 files changed, 89 insertions(+), 42 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 31c4051cf..30b272236 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">Anuko Time Tracker 1.19.22.5246 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5247 | 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/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
index a93c0a60a..5fd10ad15 100644
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ b/WEB-INF/templates/mobile/time_edit.tpl
@@ -22,13 +22,16 @@ function confirmSave() {
   <tr>
     <td valign="top">
     <table border="0">
-{if $user->isPluginEnabled('cl')}
+{if $show_client}
     <tr><td>{$i18n.label.client}:</td></tr>
     <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
+{if $show_billable}
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
+{if $show_paid_status}
+    <tr><td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td></tr>
+{/if}
 {if $custom_fields && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
     <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
@@ -36,21 +39,21 @@ function confirmSave() {
     <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
   {/foreach}
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <tr><td>{$i18n.label.project}:</td></tr>
     <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
     <tr><td>{$i18n.label.task}:</td></tr>
     <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_start}
     <tr><td>{$i18n.label.start}:</td></tr>
     <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
     <tr><td>{$i18n.label.finish}:</td></tr>
     <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_duration}
     <tr><td>{$i18n.label.duration}:</td></tr>
     <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
 {/if}
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 044724067..1aa7dd1f4 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -52,6 +52,16 @@
 $user_id = $user->getUser();
 $config = new ttConfigHelper($user->getConfig());
 
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
@@ -86,8 +96,10 @@
   $cl_project = $request->getParameter('project');
   $cl_task = $request->getParameter('task');
   $cl_billable = 1;
-  if ($user->isPluginEnabled('iv'))
+  if ($showBillable)
     $cl_billable = $request->getParameter('billable');
+  if ($showPaidStatus)
+    $cl_paid = $request->getParameter('paid');
 } else {
   $cl_client = $time_rec['client_id'];
   $cl_project = $time_rec['project_id'];
@@ -112,6 +124,7 @@
   }
 
   $cl_billable = $time_rec['billable'];
+  $cl_paid = $time_rec['paid'];
 
   // Add an info message to the form if we are editing an uncompleted record.
   if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
@@ -125,7 +138,8 @@
 $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+// Note: for other tracking modes the control is added further below.
+if (MODE_TIME == $trackingMode && $showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -138,7 +152,32 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// Paid status checkbox.
+if ($showPaidStatus)
+  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
   // Dropdown for projects assigned to user.
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
   $project_list = $user->getAssignedProjects($options);
@@ -152,7 +191,7 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
+  if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
@@ -180,7 +219,8 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Task dropdown.
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -191,8 +231,8 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 
-// Add other controls.
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+// Start and finish controls.
+if ($showStart) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
   if ($user->punch_mode && !$user->canOverridePunchMode()) {
@@ -201,26 +241,13 @@
     $form->getElement('finish')->setEnabled(false);
   }
 }
-if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+
+// Duration control.
+if ($showDuration)
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
-$form->addInput(array('type'=>'textarea','name'=>'note','class'=>'mobile-textarea','value'=>$cl_note));
 
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
+// Date field.
+$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -240,21 +267,30 @@
   }
 }
 
+// Note control.
+$form->addInput(array('type'=>'textarea','name'=>'note','class'=>'mobile-textarea','value'=>$cl_note));
+
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// A hidden control for today's date from user's browser.
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save click.
+
+// Copy button.
 $on_click_action = 'browser_today.value=get_date();';
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+
+// Save button.
 if ($confirm_save) $on_click_action .= 'return(confirmSave());';
 $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
+
+// Delete button.
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 
 if ($request->isPost()) {
 
   // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+  if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   // Validate input in time custom fields.
   if ($custom_fields && $custom_fields->timeFields) {
@@ -263,10 +299,10 @@
       if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
     }
   }
-  if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+  if ($showProject) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
   }
-  if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+  if ($showTask && $user->task_required) {
     if (!$cl_task) $err->add($i18n->get('error.task'));
   }
   if (!$cl_duration) {
@@ -282,11 +318,11 @@
           $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
       }
     } else {
-      if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+      if ($showStart) {
         $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
         $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
       }
-      if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
+      if ($showDuration)
         $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
     }
   } else {
@@ -302,7 +338,7 @@
   // Finished validating user input.
 
   // This is a new date for the time record.
-  $new_date = new DateAndTime($user->date_format, $cl_date);
+  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
 
   // Prohibit creating entries in future.
   if (!$user->isOptionEnabled('future_entries')) {
@@ -357,7 +393,8 @@
           'finish'=>$cl_finish,
           'duration'=>$cl_duration,
           'note'=>$cl_note,
-          'billable'=>$cl_billable));
+          'billable'=>$cl_billable,
+          'paid'=>$cl_paid));
 
       // Update time custom fields if we have them.
       if ($res && $custom_fields && $custom_fields->timeFields) {
@@ -371,7 +408,7 @@
     }
   }
 
-  // Save as new record.
+  // Copy record.
   if ($request->getParameter('btn_copy')) {
     // We need to:
     // 1) Prohibit saving into locked range.
@@ -438,6 +475,13 @@
   $smarty->assign('confirm_save', true);
   $smarty->assign('entry_date', $cl_date);
 }
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);+
+$smarty->assign('show_paid_status', $showPaidStatus);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_duration', $showDuration);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 081acd4e1fecd5758b0f876b87dc37e375b9a159 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 19 Jul 2020 22:16:18 +0000
Subject: [PATCH 1233/1848] Cosmetic. Updated a link.

---
 README.md     | 2 +-
 time_edit.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6a1d2d34..758acdd81 100644
--- a/README.md
+++ b/README.md
@@ -9,5 +9,5 @@ Anuko [Time Tracker](https://www.anuko.com/time_tracker/index.htm) is a simple,
 ## Resources
 * Project home page: https://www.anuko.com/time_tracker/index.htm
 * Forum: https://www.anuko.com/forum/viewforum.php?f=4
-* Info for developers: https://www.anuko.com/time_tracker/info_for_developers.htm
+* Info for developers: https://www.anuko.com/time-tracker/info-for-developers.htm
 * How to contribute: https://www.anuko.com/time_tracker/contribute.htm
diff --git a/time_edit.php b/time_edit.php
index 9a29192f5..44f04253c 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -156,6 +156,7 @@
 if ($showBillable)
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 
+// Paid status checkbox.
 if ($showPaidStatus)
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 

From 3e96210ecf7bce9b0da0e5d059143b78df6912a4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 12:57:26 +0000
Subject: [PATCH 1234/1848] Fixed removed finish column on time.php, which was
 broken a few commits ago.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/time.tpl   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 30b272236..23544c09c 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">Anuko Time Tracker 1.19.22.5247 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5248 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 4d87c5520..0cbf0caca 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -147,8 +147,6 @@
     {/if}
     {if $show_start}
           <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
-    {/if}
-    {if $show_finish}
           <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
           <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>

From 946f8b11aeb07971fbf58e045cfe12ae97d813de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 19:01:02 +0000
Subject: [PATCH 1235/1848] Replaced tracking_mode with getTrackingMode() on
 time_delete.php pages - a fix for subgroups.

---
 WEB-INF/templates/footer.tpl             |  2 +-
 WEB-INF/templates/mobile/time_delete.tpl |  4 ++--
 WEB-INF/templates/time_delete.tpl        | 12 ++++++------
 mobile/time_delete.php                   |  4 ++++
 time_delete.php                          | 11 +++++++++++
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 23544c09c..61d7fc607 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">Anuko Time Tracker 1.19.22.5248 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5249 | 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/mobile/time_delete.tpl b/WEB-INF/templates/mobile/time_delete.tpl
index 0428e13b1..2e3ac7fea 100644
--- a/WEB-INF/templates/mobile/time_delete.tpl
+++ b/WEB-INF/templates/mobile/time_delete.tpl
@@ -4,14 +4,14 @@
   <td>
   <table border="0" cellpadding="3" cellspacing="1" width="100%">
   <tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td class="tableHeader" align="center">{$i18n.label.project}</td>
 {/if}
     <td class="tableHeader" align="center">{$i18n.label.duration}</td>
     <td class="tableHeader" align="center">{$i18n.label.note}</td>
   </tr>
   <tr bgcolor="#f5f5f5">
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td>{$time_rec.project_name|escape}</td>
 {/if}
     <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl
index 41b7a4e97..480672229 100644
--- a/WEB-INF/templates/time_delete.tpl
+++ b/WEB-INF/templates/time_delete.tpl
@@ -4,13 +4,13 @@
   <td>
   <table border='0' cellpadding='3' cellspacing='1' width="100%">
   <tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td class="tableHeader" align="center">{$i18n.label.project}</td>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
     <td class="tableHeader" align="center">{$i18n.label.task}</td>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_start}
     <td class="tableHeader" align="center">{$i18n.label.start}</td>
     <td class="tableHeader" align="center">{$i18n.label.finish}</td>
 {/if}
@@ -20,13 +20,13 @@
     <td class="tableHeader" align="center">{$i18n.label.note}</td>
   </tr>
   <tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <td>{$time_rec.project_name|escape}</td>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
     <td>{$time_rec.task_name|escape}</td>
 {/if}
-{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_start}
     <td align="right">{if $time_rec.start}{$time_rec.start}{else}&nbsp;{/if}</td>
     <td align="right">{if $time_rec.finish<>$time_rec.start}{$time_rec.finish}{else}&nbsp;{/if}</td>
 {/if}
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index a68da767a..c8e692534 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -46,6 +46,9 @@
 }
 // End of access checks.
 
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
 
@@ -82,6 +85,7 @@
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 $smarty->assign('time_rec', $time_rec);
+$smarty->assign('show_project', $showProject);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_time_record'));
 $smarty->assign('content_page_name', 'mobile/time_delete.tpl');
diff --git a/time_delete.php b/time_delete.php
index a7b802b60..c953bb95e 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -46,6 +46,13 @@
 }
 // End of access checks.
 
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
 
@@ -83,6 +90,10 @@
 $form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
 $smarty->assign('time_rec', $time_rec);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_duration', $showDuration);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_time_record'));
 $smarty->assign('content_page_name', 'time_delete.tpl');

From 96baf55f083b3a030db790e3c5e962eae7299a16 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 19:04:11 +0000
Subject: [PATCH 1236/1848] Forgot to check in one file.

---
 WEB-INF/templates/time_delete.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl
index 480672229..c8d90be0f 100644
--- a/WEB-INF/templates/time_delete.tpl
+++ b/WEB-INF/templates/time_delete.tpl
@@ -14,7 +14,7 @@
     <td class="tableHeader" align="center">{$i18n.label.start}</td>
     <td class="tableHeader" align="center">{$i18n.label.finish}</td>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_duration}
     <td class="tableHeader" align="center">{$i18n.label.duration}</td>
 {/if}
     <td class="tableHeader" align="center">{$i18n.label.note}</td>
@@ -30,7 +30,7 @@
     <td align="right">{if $time_rec.start}{$time_rec.start}{else}&nbsp;{/if}</td>
     <td align="right">{if $time_rec.finish<>$time_rec.start}{$time_rec.finish}{else}&nbsp;{/if}</td>
 {/if}
-{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+{if $show_duration}
     <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
 {/if}
     <td>{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>

From d2fd4e451a9c11206c758fb08c76d704ada2bc07 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 20:31:23 +0000
Subject: [PATCH 1237/1848] Fixes to mobile timer.php page for subgroups.

---
 WEB-INF/templates/footer.tpl       |  2 +-
 WEB-INF/templates/mobile/timer.tpl |  8 ++++----
 mobile/timer.php                   | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 61d7fc607..9826a20cb 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">Anuko Time Tracker 1.19.22.5249 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5250 | 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/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl
index ea52f6b6b..65f267d40 100644
--- a/WEB-INF/templates/mobile/timer.tpl
+++ b/WEB-INF/templates/mobile/timer.tpl
@@ -64,11 +64,11 @@ startTimer();
   <tr>
     <td valign="top">
     <table border="0">
-{if $user->isPluginEnabled('cl')}
+{if $show_client}
     <tr><td>{$i18n.label.client}:</td></tr>
     <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
+{if $show_billable}
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if $custom_fields && $custom_fields->timeFields}
@@ -79,11 +79,11 @@ startTimer();
     </tr>
   {/foreach}
 {/if}
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_project}
     <tr><td>{$i18n.label.project}:</td></tr>
     <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
-{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_task}
     <tr><td>{$i18n.label.task}:</td></tr>
     <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
diff --git a/mobile/timer.php b/mobile/timer.php
index 0b513c235..7bcb26ebf 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -39,6 +39,16 @@
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
+
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 
 // Initialize and store date in session.
 $cl_date  = $request->getParameter('date', @$_SESSION['date']);
@@ -297,6 +307,10 @@
 $week_total = ttTimeHelper::getTimeForWeek($cl_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('uncompleted', $uncompleted);
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);

From 833461e745b7e32572bc9ab3685d0acd9aecbbe1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 20:48:58 +0000
Subject: [PATCH 1238/1848] Some more fixes to mobile timer.php for subgroups.

---
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/timer.php             | 65 ++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9826a20cb..f9f4cd055 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">Anuko Time Tracker 1.19.22.5250 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5251 | 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/timer.php b/mobile/timer.php
index 7bcb26ebf..ac43dc86d 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -46,9 +46,6 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-$recordType = $user->getRecordType();
-$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 
 // Initialize and store date in session.
 $cl_date  = $request->getParameter('date', @$_SESSION['date']);
@@ -110,7 +107,7 @@
 $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $trackingMode && $showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -124,7 +121,28 @@
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable,'enable'=>$enable_controls));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -137,8 +155,8 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
+  // Client dropdown.
+  if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
@@ -166,7 +184,8 @@
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+// Task dropdown.
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -177,32 +196,20 @@
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable,'enable'=>$enable_controls));
+
+// A hidden control for today's date from user's browser.
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on button click.
+
+// A hidden control for current time from user's browser.
 $form->addInput(array('type'=>'hidden','name'=>'browser_time','value'=>''));  // User current time, which gets filled in on button click.
+
+// Start and stop buttons.
 $enable_start = $uncompleted ? false : true;
 if (!$uncompleted)
   $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.start'),'enable'=>$enable_start));
 else
   $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.finish'),'enable'=>!$enable_start));
 
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_start')) {
@@ -210,7 +217,7 @@
     $cl_finish = null;
 
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     // Validate input in time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
@@ -219,10 +226,10 @@
         if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
       }
     }
-    if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+    if ($showProject) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+    if ($showTask && $user->task_required) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     // Finished validating user input.

From 47a42b5bb69cafffeeee6b2966bb15d6e78c61fd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 21:23:18 +0000
Subject: [PATCH 1239/1848] Cosmetic. External link changed.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 758acdd81..e5da55021 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,4 @@ Anuko [Time Tracker](https://www.anuko.com/time_tracker/index.htm) is a simple,
 * Project home page: https://www.anuko.com/time_tracker/index.htm
 * Forum: https://www.anuko.com/forum/viewforum.php?f=4
 * Info for developers: https://www.anuko.com/time-tracker/info-for-developers.htm
-* How to contribute: https://www.anuko.com/time_tracker/contribute.htm
+* How to contribute: https://www.anuko.com/time-tracker/contribute.htm

From 4749e37e1ada0a0f05b70f5d53d5a5dcd55ba0ed Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 20 Jul 2020 22:08:42 +0000
Subject: [PATCH 1240/1848] Updated links to product home page.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e5da55021..70fd57398 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # Anuko Time Tracker
 
 ## About
-Anuko [Time Tracker](https://www.anuko.com/time_tracker/index.htm) is a simple, easy to use, open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
+Anuko [Time Tracker](https://www.anuko.com/time-tracker/index.htm) is a simple, easy to use, open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
 
 ## Free Hosting
 [Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time_tracker/free_hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
 
 ## Resources
-* Project home page: https://www.anuko.com/time_tracker/index.htm
+* Project home page: https://www.anuko.com/time-tracker/index.htm
 * Forum: https://www.anuko.com/forum/viewforum.php?f=4
 * Info for developers: https://www.anuko.com/time-tracker/info-for-developers.htm
 * How to contribute: https://www.anuko.com/time-tracker/contribute.htm

From b22fddc94c6d0e786064ffdb25903cc7af92cf26 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 22 Jul 2020 19:36:10 +0000
Subject: [PATCH 1241/1848] Some refactoring and fixes, mostly on week view for
 subgroups.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/week.tpl   | 16 ++++++++--------
 mobile/task_delete.php       |  2 +-
 mobile/task_edit.php         |  2 +-
 task_delete.php              |  2 +-
 week.php                     | 17 +++++++++++------
 6 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f9f4cd055..e482b2edf 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">Anuko Time Tracker 1.19.22.5251 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5252 | 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/week.tpl b/WEB-INF/templates/week.tpl
index fbf512ceb..a61ed907f 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -45,7 +45,7 @@ function fillDropdowns() {
           <td>{$forms.weekTimeForm.client.control}</td>
         </tr>
 {/if}
-{if $user->isPluginEnabled('iv')}
+{if $show_billable}
         <tr>
           <td align="right">&nbsp;</td>
           <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
@@ -108,16 +108,16 @@ function fillDropdowns() {
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
         <td width="5%" class="tableHeader">{$i18n.label.date}</td>
-  {if $user->isPluginEnabled('cl')}
+  {if $show_client}
         <td width="20%" class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}
         <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_task}
         <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
-  {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+  {if $show_start}
         <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
         <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
   {/if}
@@ -132,13 +132,13 @@ function fillDropdowns() {
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
         <td valign="top">{$record.date}</td>
-    {if $user->isPluginEnabled('cl')}
+    {if $show_client}
         <td valign="top">{$record.client|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_project}
         <td valign="top">{$record.project|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+    {if $show_task}
         <td valign="top">{$record.task|escape}</td>
     {/if}
     {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
diff --git a/mobile/task_delete.php b/mobile/task_delete.php
index 153f3a2d8..dd0dae935 100644
--- a/mobile/task_delete.php
+++ b/mobile/task_delete.php
@@ -35,7 +35,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index facf18c67..02a947676 100644
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -36,7 +36,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
diff --git a/task_delete.php b/task_delete.php
index d8e14399f..bd0eec717 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -35,7 +35,7 @@
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
diff --git a/week.php b/week.php
index b0d609d13..11a6243be 100644
--- a/week.php
+++ b/week.php
@@ -58,9 +58,12 @@
 // End of access checks.
 
 $showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
 
 // Initialize and store date in session.
@@ -124,7 +127,7 @@
 }
 
 $cl_billable = 1;
-if ($user->isPluginEnabled('iv')) {
+if ($showBillable) {
   if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
@@ -267,7 +270,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $form->addInputElement($table);
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
+if (MODE_TIME == $trackingMode && $showClient) {
   $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -280,7 +283,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if ($showProject) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
@@ -321,7 +324,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 }
 
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
@@ -381,10 +384,10 @@ function render(&$table, $value, $row, $column, $selected = false) {
           if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
         }
       }
-      if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
+      if ($showProject) {
         if (!$cl_project) $err->add($i18n->get('error.project'));
       }
-      if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+      if ($showTask && $user->task_required) {
         if (!$cl_task) $err->add($i18n->get('error.task'));
       }
     }
@@ -546,10 +549,12 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('time_records', $records);
 $smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_week_note', $showWeekNote);
 $smarty->assign('show_week_list', $user->isOptionEnabled('week_list'));
+$smarty->assign('show_start', $showStart);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('menu.week'));
 $smarty->assign('content_page_name', 'week.tpl');

From 75e29e3433af3ba57bb8b7375ef55669ff4b1a3f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 23 Jul 2020 17:47:22 +0000
Subject: [PATCH 1242/1848] Refactoring and some fixes to week view for
 subgroups.

---
 WEB-INF/templates/footer.tpl |   2 +-
 WEB-INF/templates/week.tpl   |   6 +-
 week.php                     | 149 +++++++++++++++++++----------------
 3 files changed, 86 insertions(+), 71 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e482b2edf..31b354ad8 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">Anuko Time Tracker 1.19.22.5252 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5253 | 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/week.tpl b/WEB-INF/templates/week.tpl
index a61ed907f..9c3aa516b 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -33,10 +33,10 @@ function fillDropdowns() {
   <tr>
     <td valign="top">
       <table>
-{if $on_behalf_control}
+{if $user_dropdown}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.weekTimeForm.onBehalfUser.control}</td>
+          <td>{$forms.weekTimeForm.user.control}</td>
         </tr>
 {/if}
 {if $show_client}
@@ -141,7 +141,7 @@ function fillDropdowns() {
     {if $show_task}
         <td valign="top">{$record.task|escape}</td>
     {/if}
-    {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+    {if $show_start}
         <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
         <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
diff --git a/week.php b/week.php
index 11a6243be..b9ae253b0 100644
--- a/week.php
+++ b/week.php
@@ -55,13 +55,32 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
   exit();
 }
+if ($request->isPost()) {
+  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
+    exit();
+  }
+}
 // End of access checks.
 
+// Determine user for whom we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+$group_id = $user->getGroup();
+
 $showClient = $user->isPluginEnabled('cl');
 $showBillable = $user->isPluginEnabled('iv');
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showWeekNote = $user->isOptionEnabled('week_note');
+$showWeekNotes = $user->isOptionEnabled('week_notes');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
@@ -110,22 +129,6 @@
 }
 
 // Initialize variables.
-$timeCustomFields = array();
-// If we have time custom fields - collect input.
-if ($request->isPost()) {
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
-  }
-}
-
 $cl_billable = 1;
 if ($showBillable) {
   if ($request->isPost()) {
@@ -135,7 +138,6 @@
     if (isset($_SESSION['billable']))
       $cl_billable = $_SESSION['billable'];
 }
-$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
 $cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -145,6 +147,22 @@
 $cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note']));
 $_SESSION['note'] = $cl_note;
 
+$timeCustomFields = array();
+// If we have time custom fields - collect input.
+if ($request->isPost()) {
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+}
+
 // Get the data we need to display week view.
 // Get column headers, which are day numbers in month.
 $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
@@ -159,9 +177,6 @@
 
 // Build day totals (total durations for each day in week).
 $dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders);
-$showWeekNote = $user->isOptionEnabled('week_note');
-$showWeekNotes = $user->isOptionEnabled('week_notes');
-
 
 // Define rendering class for a label field to the left of durations.
 class LabelCellRenderer extends DefaultCellRenderer {
@@ -239,20 +254,22 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $form = new Form('weekTimeForm');
 
 if ($user->can('track_time')) {
+  $rank = $user->getMaxRankForGroup($group_id);
   if ($user->can('track_own_time'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'onBehalfUser',
+      'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
+      'name'=>'user',
       'style'=>'width: 250px;',
-      'value'=>$on_behalf_id,
+      'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
-    $smarty->assign('on_behalf_control', 1);
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
   }
 }
 
@@ -283,6 +300,27 @@ function render(&$table, $value, $row, $column, $selected = false) {
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
+// Billable checkbox.
+if ($user->isPluginEnabled('iv'))
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
 if ($showProject) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
@@ -296,7 +334,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
+  if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
@@ -324,6 +362,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 }
 
+// Task dropdown.
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
@@ -334,32 +373,22 @@ function render(&$table, $value, $row, $column, $selected = false) {
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
-if (!defined('NOTE_INPUT_HEIGHT'))
-  define('NOTE_INPUT_HEIGHT', 40);
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
 
-// Add other controls.
-$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+// Week note control.
+if ($showWeekNote) {
+  if (!defined('NOTE_INPUT_HEIGHT'))
+    define('NOTE_INPUT_HEIGHT', 40);
+  $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+}
+
+// Calendar.
+$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date));
+
+// A hidden control for today's date from user's browser.
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
+// Submit button.
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
 
 // Submit.
 if ($request->isPost()) {
@@ -375,7 +404,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       }
     }
     if ($newEntryPosted) {
-      if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+      if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
         $err->add($i18n->get('error.client'));
       // Validate input in time custom fields.
       if ($custom_fields && $custom_fields->timeFields) {
@@ -508,10 +537,10 @@ function render(&$table, $value, $row, $column, $selected = false) {
               $fields['comment'] = $postedComment;
               $result = ttWeekViewHelper::modifyCommentFromWeekView($fields);
             }
-            if (!$result) break; // Break out of the loop in case of first error.
+            if (!$result) break; // Break out of the loop on first error.
           }
         }
-        if (!$result) break; // Break out of the loop in case of first error.
+        if (!$result) break; // Break out of the loop on first error.
         $rowNumber++;
       }
       if ($result) {
@@ -520,26 +549,12 @@ function render(&$table, $value, $row, $column, $selected = false) {
       }
     }
   }
-  elseif ($request->getParameter('onBehalfUser')) {
-    if($user->can('track_time')) {
-      unset($_SESSION['behalf_id']);
-      unset($_SESSION['behalf_name']);
-
-      if($on_behalf_id != $user->id) {
-        $_SESSION['behalf_id'] = $on_behalf_id;
-        $_SESSION['behalf_name'] = ttUserHelper::getUserName($on_behalf_id);
-      }
-      header('Location: week.php');
-      exit();
-    }
-  }
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
-
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 41a0db7f1b4b896f98678c35f4e046d49362e1f9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 23 Jul 2020 18:51:19 +0000
Subject: [PATCH 1243/1848] Simplified week view by removing Stop buttons for
 potential uncompleted records because they do not seem to belong here.

---
 WEB-INF/templates/footer.tpl | 2 +-
 WEB-INF/templates/week.tpl   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 31b354ad8..08e37f289 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">Anuko Time Tracker 1.19.22.5253 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5254 | 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/week.tpl b/WEB-INF/templates/week.tpl
index 9c3aa516b..2ee2e68a5 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -159,12 +159,6 @@ function fillDropdowns() {
           &nbsp;
     {else}
           <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
-      {if ($record.duration == '0:00' && $record.start <> '')}
-          <input type="hidden" name="record_id" value="{$record.id}">
-          <input type="hidden" name="browser_date" value="">
-          <input type="hidden" name="browser_time" value="">
-          <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
-      {/if}
     {/if}
         </td>
         <td valign="top" align="center">

From 9d575b992f42e691e533a447c515f48c48415ee3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 25 Jul 2020 16:09:50 +0000
Subject: [PATCH 1244/1848] A fix for week view for subgroups.

---
 WEB-INF/templates/footer.tpl | 2 +-
 week.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 08e37f289..be6fce09c 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">Anuko Time Tracker 1.19.22.5254 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5255 | 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/week.php b/week.php
index b9ae253b0..a1a579094 100644
--- a/week.php
+++ b/week.php
@@ -242,7 +242,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     }
     // Disable control when time entry mode is TYPE_START_FINISH and there is no value in control
     // because we can't supply start and finish times in week view - there are no fields for them.
-    if (!$field->getValue() && TYPE_START_FINISH == $user->record_type) {
+    if (!$field->getValue() && TYPE_START_FINISH == $user->getRecordType()) {
         $field->setEnabled(false);
     }
     $this->setValue($field->getHtml());

From 36caf164fcbefcce69ba1dc134522d78e375121c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 25 Jul 2020 20:03:49 +0000
Subject: [PATCH 1245/1848] Moved task required option to tasks.php page.

---
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/group_edit.tpl       | 16 +---------------
 WEB-INF/templates/mobile/time.tpl      |  2 +-
 WEB-INF/templates/mobile/time_edit.tpl |  2 +-
 WEB-INF/templates/tasks.tpl            | 16 +++++++++++++++-
 WEB-INF/templates/time.tpl             |  2 +-
 WEB-INF/templates/time_edit.tpl        |  2 +-
 group_edit.php                         |  8 ++------
 mobile/time.php                        |  4 +++-
 mobile/time_edit.php                   |  4 +++-
 tasks.php                              | 23 +++++++++++++++++++++++
 time.php                               |  4 +++-
 time_edit.php                          |  4 +++-
 13 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index be6fce09c..9a2f53491 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">Anuko Time Tracker 1.19.22.5255 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5256 | 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 67bddd9e5..c55663ceb 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -1,19 +1,5 @@
 <script>
 function chLocation(newLocation) { document.location = newLocation; }
-
-// handleTaskRequiredCheckbox - controls visibility of the Task Required checkbox.
-function handleTaskRequiredCheckbox() {
-  var taskRequiredCheckbox = document.getElementById("task_required");
-  var taskRequiredLabel = document.getElementById("task_required_label");
-  var trackingModeDropdown = document.getElementById("tracking_mode");
-  if (trackingModeDropdown.value == 2) {
-    taskRequiredCheckbox.style.visibility = "visible";
-    taskRequiredLabel.style.visibility = "visible";
-  } else {
-    taskRequiredCheckbox.style.visibility = "hidden";
-    taskRequiredLabel.style.visibility = "hidden";
-  }
-}
 </script>
 
 {$forms.groupForm.open}
@@ -74,7 +60,7 @@ function handleTaskRequiredCheckbox() {
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
-            <td>{$forms.groupForm.tracking_mode.control} {$forms.groupForm.task_required.control} <span id="task_required_label"><label for="task_required">{$i18n.label.required}</label></span></td>
+            <td>{$forms.groupForm.tracking_mode.control}</td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.record_type}:</td>
diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 07e50fb39..a346ad6c6 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -73,7 +73,7 @@
               <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
 {if $show_task}
-              <tr><td>{$i18n.label.task}:</td></tr>
+              <tr><td>{$i18n.label.task}{if $task_required} (*){/if}:</td></tr>
               <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
 {if $show_start}
diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
index 5fd10ad15..3025a63f7 100644
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ b/WEB-INF/templates/mobile/time_edit.tpl
@@ -44,7 +44,7 @@ function confirmSave() {
     <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
 {if $show_task}
-    <tr><td>{$i18n.label.task}:</td></tr>
+    <tr><td>{$i18n.label.task}{if $task_required} (*){/if}:</td></tr>
     <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
 {if $show_start}
diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 24fd04380..c5afab227 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -2,6 +2,7 @@
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
+{$forms.tasksForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
@@ -78,7 +79,20 @@
     {/foreach}
   {/if}
       </table>
-  {/if}
+{/if}
+      <div class="table-divider"></div>
+      <table width="100%">
+        <tr>
+          <td align="right" width="25%">{$forms.tasksForm.task_required.control}</td>
+          <td><label for="task_required">{$i18n.label.required}</label> <a href="https://www.anuko.com/lp/tt_46.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.tasksForm.btn_save.control}</td>
+        </tr>
+      </table>
+
+
     </td>
   </tr>
 </table>
+{$forms.tasksForm.close}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 0cbf0caca..377b26c01 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -53,7 +53,7 @@
 {/if}
 {if $show_task}
         <tr>
-          <td align="right">{$i18n.label.task}{if $user->task_required} (*){/if}:</td>
+          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
           <td>{$forms.timeRecordForm.task.control}</td>
         </tr>
 {/if}
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index f1eca33cf..45c9bc666 100644
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -57,7 +57,7 @@ function confirmSave() {
 {/if}
 {if $show_task}
     <tr>
-      <td align="right">{$i18n.label.task}{if $user->task_required} (*){/if}:</td>
+      <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
       <td>{$forms.timeRecordForm.task.control}</td>
     </tr>
 {/if}
diff --git a/group_edit.php b/group_edit.php
index c4fdc2174..2196d280b 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -85,7 +85,6 @@
   $cl_holidays = trim($request->getParameter('holidays'));
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');
-  $cl_task_required = $request->getParameter('task_required');
   $cl_record_type = $request->getParameter('record_type');
   $cl_punch_mode = $request->getParameter('punch_mode');
   $cl_allow_overlap = $request->getParameter('allow_overlap');
@@ -102,7 +101,6 @@
   $cl_holidays = $group['holidays'];
   $cl_tracking_mode = $group['tracking_mode'];
   $cl_project_required = $group['project_required'];
-  $cl_task_required = $group['task_required'];
   $cl_record_type = $group['record_type'];
   $cl_punch_mode = $config->getDefinedValue('punch_mode');
   $cl_allow_overlap = $config->getDefinedValue('allow_overlap');
@@ -177,9 +175,8 @@
 $tracking_mode_options[MODE_TIME] = $i18n->get('form.group_edit.mode_time');
 $tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.group_edit.mode_projects');
 $tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.group_edit.mode_projects_and_tasks');
-$form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode,'onchange'=>'handleTaskRequiredCheckbox()'));
+$form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode));
 $form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
-$form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
 
 // Prepare record type choices.
 $record_type_options = array();
@@ -241,7 +238,6 @@
         'holidays' => $cl_holidays,
         'tracking_mode' => $cl_tracking_mode,
         'project_required' => $cl_project_required,
-        'task_required' => $cl_task_required,
         'record_type' => $cl_record_type,
         'uncompleted_indicators' => $cl_uncompleted_indicators,
         'config' => $config->getConfig()))) {
@@ -255,7 +251,7 @@
 
 $smarty->assign('group_dropdown', count($groups) > 1);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
+$smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
 $smarty->assign('content_page_name', 'group_edit.tpl');
 $smarty->display('index.tpl');
diff --git a/mobile/time.php b/mobile/time.php
index 8f4ca0a32..58661632a 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -73,6 +73,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
@@ -306,7 +307,7 @@
     if ($showProject) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if ($showTask && $user->task_required) {
+    if ($showTask && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
@@ -396,6 +397,7 @@
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('client_list', $client_list);
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 1aa7dd1f4..fb3a918dc 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -58,6 +58,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
@@ -302,7 +303,7 @@
   if ($showProject) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
   }
-  if ($showTask && $user->task_required) {
+  if ($showTask && $task_required) {
     if (!$cl_task) $err->add($i18n->get('error.task'));
   }
   if (!$cl_duration) {
@@ -480,6 +481,7 @@
 $smarty->assign('show_paid_status', $showPaidStatus);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('client_list', $client_list);
diff --git a/tasks.php b/tasks.php
index 7b5f99790..2e13ead5c 100644
--- a/tasks.php
+++ b/tasks.php
@@ -41,12 +41,35 @@
 }
 // End of access checks.
 
+$config = $user->getConfigHelper();
+
+if ($request->isPost()) {
+  $cl_task_required = $request->getParameter('task_required');
+} else {
+  $cl_task_required = $config->getDefinedValue('task_required');
+}
+
 if($user->can('manage_tasks')) {
   $active_tasks = ttGroupHelper::getActiveTasks();
   $inactive_tasks = ttGroupHelper::getInactiveTasks();
 } else
   $active_tasks = $user->getAssignedTasks();
 
+$form = new Form('tasksForm');
+$form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_save')) {
+    // Save button clicked. Update config.
+    $config->setDefinedValue('task_required', $cl_task_required);
+    if (!$user->updateGroup(array('config' => $config->getConfig()))) {
+      $err->add($i18n->get('error.db'));
+    }
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_tasks', $active_tasks);
 $smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));
diff --git a/time.php b/time.php
index bbd5d14a3..5e0dda153 100644
--- a/time.php
+++ b/time.php
@@ -74,6 +74,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
@@ -349,7 +350,7 @@
     if ($showProject) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if ($showTask && $user->task_required) {
+    if ($showTask && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     if (strlen($cl_duration) == 0) {
@@ -481,6 +482,7 @@
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('show_note_column', $showNoteColumn);
diff --git a/time_edit.php b/time_edit.php
index 44f04253c..b672c41cb 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -58,6 +58,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
@@ -302,7 +303,7 @@
   if ($showProject) {
     if (!$cl_project) $err->add($i18n->get('error.project'));
   }
-  if ($showTask && $user->task_required) {
+  if ($showTask &&  $taskRequired) {
     if (!$cl_task) $err->add($i18n->get('error.task'));
   }
   if (!$cl_duration) {
@@ -480,6 +481,7 @@
 $smarty->assign('show_paid_status', $showPaidStatus);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('client_list', $client_list);

From c2306552c7c718337bb40f22642db073ac44d336 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 25 Jul 2020 20:24:01 +0000
Subject: [PATCH 1246/1848] Refactoring and some fixes for task_required config
 option.

---
 WEB-INF/lib/ttGroup.class.php             | 4 +---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 -
 WEB-INF/lib/ttGroupHelper.class.php       | 3 +--
 WEB-INF/lib/ttOrgImportHelper.class.php   | 4 +---
 WEB-INF/lib/ttUser.class.php              | 7 ++-----
 WEB-INF/templates/footer.tpl              | 2 +-
 WEB-INF/templates/time_script.tpl         | 2 +-
 WEB-INF/templates/week.tpl                | 2 +-
 week.php                                  | 4 +++-
 9 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index 46ce5be56..bd0f944e3 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -44,7 +44,6 @@ class ttGroup {
   var $week_start = 0;          // Week start day.
   var $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
-  var $task_required = 0;       // Whether task selection is required on time entires.
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
@@ -92,8 +91,7 @@ function __construct($id, $org_id) {
       $this->tracking_mode = $val['tracking_mode'];
       /* TODO: initialize other things here.
       $this->project_required = $val['project_required'];
-      $this->task_required = $val['task_required'];
-       */
+      */
       $this->record_type = $val['record_type'];
       /*
       $this->bcc_email = $val['bcc_email'];
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index d6415daea..a510da274 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -152,7 +152,6 @@ function writeData() {
     $group_part .= " week_start=\"".$group['week_start']."\"";
     $group_part .= " tracking_mode=\"".$group['tracking_mode']."\"";
     $group_part .= " project_required=\"".$group['project_required']."\"";
-    $group_part .= " task_required=\"".$group['task_required']."\"";
     $group_part .= " record_type=\"".$group['record_type']."\"";
     $group_part .= " bcc_email=\"".$group['bcc_email']."\"";
     $group_part .= " allow_ip=\"".$group['allow_ip']."\"";
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index af8d55345..895fa1dc6 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -97,7 +97,7 @@ static function insertSubgroup($fields) {
     $attrs = ttGroupHelper::getGroupAttrs($parent_id);
 
     $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format,'.
-      ' time_format, week_start, tracking_mode, project_required, task_required, record_type, bcc_email,'.
+      ' time_format, week_start, tracking_mode, project_required, record_type, bcc_email,'.
       ' allow_ip, password_complexity, plugins, lock_spec,'.
       ' workday_minutes, config, created, created_ip, created_by)';
 
@@ -113,7 +113,6 @@ static function insertSubgroup($fields) {
     $values .= ', '.(int)$attrs['week_start'];
     $values .= ', '.(int)$attrs['tracking_mode'];
     $values .= ', '.(int)$attrs['project_required'];
-    $values .= ', '.(int)$attrs['task_required'];
     $values .= ', '.(int)$attrs['record_type'];
     $values .= ', '.$mdb2->quote($attrs['bcc_email']);
     $values .= ', '.$mdb2->quote($attrs['allow_ip']);
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index dbf838281..ac970426f 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -114,7 +114,6 @@ function startElement($parser, $name, $attrs) {
           'week_start' => $attrs['WEEK_START'],
           'tracking_mode' => $attrs['TRACKING_MODE'],
           'project_required' => $attrs['PROJECT_REQUIRED'],
-          'task_required' => $attrs['TASK_REQUIRED'],
           'record_type' => $attrs['RECORD_TYPE'],
           'bcc_email' => $attrs['BCC_EMAIL'],
           'allow_ip' => $attrs['ALLOW_IP'],
@@ -705,7 +704,7 @@ private function createGroup($fields) {
     $mdb2 = getConnection();
 
     $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format, time_format,'.
-      ' week_start, tracking_mode, project_required, task_required, record_type, bcc_email,'.
+      ' week_start, tracking_mode, project_required, record_type, bcc_email,'.
       ' allow_ip, password_complexity, plugins, lock_spec,'.
       ' workday_minutes, config, custom_css, created, created_ip, created_by)';
 
@@ -723,7 +722,6 @@ private function createGroup($fields) {
     $values .= ', '.(int)$fields['week_start'];
     $values .= ', '.(int)$fields['tracking_mode'];
     $values .= ', '.(int)$fields['project_required'];
-    $values .= ', '.(int)$fields['task_required'];
     $values .= ', '.(int)$fields['record_type'];
     $values .= ', '.$mdb2->quote($fields['bcc_email']);
     $values .= ', '.$mdb2->quote($fields['allow_ip']);
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 8bf029921..58c51c632 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -60,7 +60,6 @@ class ttUser {
   var $week_start = 0;          // Week start day.
   var $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
-  var $task_required = 0;       // Whether task selection is required on time entires.
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
   var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
@@ -96,7 +95,7 @@ function __construct($login, $id = null) {
 
     $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
       " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
-      " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type,".
+      " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.record_type,".
       " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.holidays, g.workday_minutes, g.custom_logo".
       " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
@@ -134,7 +133,6 @@ function __construct($login, $id = null) {
       $this->week_start = $val['week_start'];
       $this->tracking_mode = $val['tracking_mode'];
       $this->project_required = $val['project_required'];
-      $this->task_required = $val['task_required'];
       $this->record_type = $val['record_type'];
       $this->bcc_email = $val['bcc_email'];
       $this->allow_ip = $val['allow_ip'];
@@ -707,7 +705,6 @@ function updateGroup($fields) {
     if (isset($fields['tracking_mode'])) {
       $tracking_mode_part = ', tracking_mode = '.(int) $fields['tracking_mode'];
       $project_required_part = ' , project_required = '.(int) $fields['project_required'];
-      $task_required_part = ' , task_required = '.(int) $fields['task_required'];
     }
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type'];
     if (isset($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']);
@@ -721,7 +718,7 @@ function updateGroup($fields) {
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
 
     $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
-      $time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
+      $time_format_part.$week_start_part.$tracking_mode_part.$project_required_part.$record_type_part.
       $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$custom_css_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9a2f53491..9668dfc5c 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">Anuko Time Tracker 1.19.22.5256 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5257 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 65a691abe..977db3d6c 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -178,7 +178,7 @@ function fillTaskDropdown(id) {
     }
 
     // Select a task if user is required to do so and there is only one task available.
-    if ({$user->task_required} && dropdown.options.length == 2) { // 2 because of mandatory top option.
+    if ({$user->getConfigOption('task_required')} && dropdown.options.length == 2) { // 2 because of mandatory top option.
       dropdown.options[1].selected = true;
     }
   }
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 2ee2e68a5..5ac3be85e 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -68,7 +68,7 @@ function fillDropdowns() {
 {/if}
 {if $show_task}
         <tr>
-          <td align="right">{$i18n.label.task}:</td>
+          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
           <td>{$forms.weekTimeForm.task.control}</td>
         </tr>
 {/if}
diff --git a/week.php b/week.php
index a1a579094..d86e0c99c 100644
--- a/week.php
+++ b/week.php
@@ -79,6 +79,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $user->getConfigOption('task_required');
 $showWeekNote = $user->isOptionEnabled('week_note');
 $showWeekNotes = $user->isOptionEnabled('week_notes');
 $recordType = $user->getRecordType();
@@ -416,7 +417,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       if ($showProject) {
         if (!$cl_project) $err->add($i18n->get('error.project'));
       }
-      if ($showTask && $user->task_required) {
+      if ($showTask && $taskRequired) {
         if (!$cl_task) $err->add($i18n->get('error.task'));
       }
     }
@@ -567,6 +568,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
 $smarty->assign('show_week_note', $showWeekNote);
 $smarty->assign('show_week_list', $user->isOptionEnabled('week_list'));
 $smarty->assign('show_start', $showStart);

From bfef42dbca33313493b40dfdd265ee55f47ab29e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 25 Jul 2020 20:34:38 +0000
Subject: [PATCH 1247/1848] Fixed mobile timer.php for subgroups regarding
 task_required.

---
 WEB-INF/templates/footer.tpl       | 2 +-
 WEB-INF/templates/mobile/timer.tpl | 2 +-
 mobile/timer.php                   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9668dfc5c..0109338fa 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">Anuko Time Tracker 1.19.22.5257 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.22.5258 | 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/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl
index 65f267d40..1fee04af3 100644
--- a/WEB-INF/templates/mobile/timer.tpl
+++ b/WEB-INF/templates/mobile/timer.tpl
@@ -84,7 +84,7 @@ startTimer();
     <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
 {/if}
 {if $show_task}
-    <tr><td>{$i18n.label.task}:</td></tr>
+    <tr><td>{$i18n.label.task}{if $task_required} (*){/if}:</td></tr>
     <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
 {/if}
     </table>
diff --git a/mobile/timer.php b/mobile/timer.php
index ac43dc86d..e301716a4 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -46,6 +46,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $user->getConfigOption('task_required');
 
 // Initialize and store date in session.
 $cl_date  = $request->getParameter('date', @$_SESSION['date']);
@@ -229,7 +230,7 @@
     if ($showProject) {
       if (!$cl_project) $err->add($i18n->get('error.project'));
     }
-    if ($showTask && $user->task_required) {
+    if ($showTask && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
     // Finished validating user input.
@@ -318,6 +319,7 @@
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('client_list', $client_list);

From 889ae54eaa95a4a69e0a4da875e2a250ca18a713 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 25 Jul 2020 20:43:05 +0000
Subject: [PATCH 1248/1848] Dropped task_required field from tt_groups table as
 it is now a part of config field.

---
 WEB-INF/templates/footer.tpl |  2 +-
 dbinstall.php                | 10 ++++++----
 mysql.sql                    |  3 +--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0109338fa..80cb8a906 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">Anuko Time Tracker 1.19.22.5258 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5259 | 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/dbinstall.php b/dbinstall.php
index b6f831479..59d3923f8 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1161,7 +1161,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11922"]) {
+  if ($_POST["convert11900to11923"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1192,6 +1192,8 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.19', modified = now() where param_name = 'version_db' and param_value = '1.19.17'");
     ttExecute("ALTER TABLE `tt_cron` ADD `comment` text AFTER `subject`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.22', modified = now() where param_name = 'version_db' and param_value = '1.19.19'");
+    ttExecute("ALTER TABLE `tt_groups` drop `task_required`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.23', modified = now() where param_name = 'version_db' and param_value = '1.19.22'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1242,7 +1244,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.22)</b>
+    <td width="80%"><b>Create database structure (v1.19.23)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1291,8 +1293,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.22)</td>
-    <td><input type="submit" name="convert11900to11922" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.23)</td>
+    <td><input type="submit" name="convert11900to11923" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 1e37a59df..e9f4cc031 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -27,7 +27,6 @@ CREATE TABLE `tt_groups` (
   `week_start` smallint(2) NOT NULL default 0,           # Week start day, 0 == Sunday.
   `tracking_mode` smallint(2) NOT NULL default 1,        # tracking mode ("time", "projects" or "projects and tasks")
   `project_required` smallint(2) NOT NULL default 0,     # whether a project selection is required or optional
-  `task_required` smallint(2) NOT NULL default 0,        # whether a task selection is required or optional
   `record_type` smallint(2) NOT NULL default 0,          # time record type ("start and finish", "duration", or both)
   `bcc_email` varchar(100) default NULL,                 # bcc email to copy all reports to
   `allow_ip` varchar(255) default NULL,                  # specification from where users are allowed access
@@ -657,4 +656,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.22', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.23', now()); # TODO: change when structure changes.

From cdbd32b362368570f0627288bf5f83739a055d60 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 26 Jul 2020 11:56:46 +0000
Subject: [PATCH 1249/1848] Fixed behavior of Now buttons, broken in one of
 recent commits.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/time_script.tpl | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 80cb8a906..f752264da 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">Anuko Time Tracker 1.19.23.5259 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5260 | 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/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 977db3d6c..3d2013832 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -177,10 +177,12 @@ function fillTaskDropdown(id) {
       }
     }
 
+{if $user->getConfigOption('task_required')}
     // Select a task if user is required to do so and there is only one task available.
-    if ({$user->getConfigOption('task_required')} && dropdown.options.length == 2) { // 2 because of mandatory top option.
+    if (dropdown.options.length == 2) { // 2 because of mandatory top option.
       dropdown.options[1].selected = true;
     }
+{/if}
   }
 }
 

From 9304cf358161f2dd63b0b570d57e3d84343ca81b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 26 Jul 2020 13:24:37 +0000
Subject: [PATCH 1250/1848] Cosmetic. Updated a link to user guide.

---
 WEB-INF/config.php.dist      | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index a288ec0bf..24dd5a266 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -86,7 +86,7 @@ define('WEEKEND_START_DAY', 6);
 // Forum and help links from the main menu.
 //
 define('FORUM_LINK', 'https://www.anuko.com/forum/viewforum.php?f=4');
-define('HELP_LINK', 'https://www.anuko.com/time_tracker/user_guide/index.htm');
+define('HELP_LINK', 'https://www.anuko.com/time-tracker/user-guide/index.htm');
 
 
 // Default sender for mail.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f752264da..b7e572713 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">Anuko Time Tracker 1.19.23.5260 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5261 | 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>

From 9c45529c062bf66c7def4dc4d8624a7cefda0061 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 28 Jul 2020 14:45:30 +0000
Subject: [PATCH 1251/1848] Moved the Required checkbox on top of tasks.php
 page to make it more visible.

---
 WEB-INF/templates/footer.tpl |  2 +-
 WEB-INF/templates/tasks.tpl  | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b7e572713..50b48e893 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">Anuko Time Tracker 1.19.23.5261 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5262 | 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/tasks.tpl b/WEB-INF/templates/tasks.tpl
index c5afab227..df502c7ae 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -7,6 +7,16 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_tasks')}
+      <table width="100%">
+        <tr>
+          <td align="right" width="25%">{$forms.tasksForm.task_required.control}</td>
+          <td><label for="task_required">{$i18n.label.required}</label> <a href="https://www.anuko.com/lp/tt_46.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.tasksForm.btn_save.control}</td>
+        </tr>
+      </table>
+      <div class="table-divider"></div>
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_tasks}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
@@ -80,18 +90,6 @@
   {/if}
       </table>
 {/if}
-      <div class="table-divider"></div>
-      <table width="100%">
-        <tr>
-          <td align="right" width="25%">{$forms.tasksForm.task_required.control}</td>
-          <td><label for="task_required">{$i18n.label.required}</label> <a href="https://www.anuko.com/lp/tt_46.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.tasksForm.btn_save.control}</td>
-        </tr>
-      </table>
-
-
     </td>
   </tr>
 </table>

From b243785a17e90bb671058b092f390decbf20c149 Mon Sep 17 00:00:00 2001
From: kanfil <lior@tikalk.com>
Date: Thu, 30 Jul 2020 21:32:04 +0300
Subject: [PATCH 1252/1848] Save custom field values in session (#102)

---
 time.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/time.php b/time.php
index 5e0dda153..a76b470d5 100644
--- a/time.php
+++ b/time.php
@@ -155,19 +155,21 @@
 
 $timeCustomFields = array();
 // If we have time custom fields - collect input.
-if ($request->isPost()) {
+#if ($request->isPost()) {
   if ($custom_fields && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $control_name = 'time_field_'.$timeField['id'];
+      $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+      $_SESSION[$control_name] = $cl_control_name;
       $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
         'control_name' => $control_name,
         'label' => $timeField['label'],
         'type' => $timeField['type'],
         'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
+        'value' => trim($cl_control_name));
     }
   }
-}
+#}
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');

From ee4536e9f776191a95e1abd86ef873572a642961 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 30 Jul 2020 18:40:01 +0000
Subject: [PATCH 1253/1848] Added time custom fields storage in session to
 mobile time.php as in pr #102.

---
 WEB-INF/templates/footer.tpl |  2 +-
 mobile/time.php              | 24 ++++++++++++------------
 time.php                     | 28 +++++++++++++---------------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 50b48e893..1aa8e7ba2 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">Anuko Time Tracker 1.19.23.5262 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5263 | 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/time.php b/mobile/time.php
index 58661632a..1cda7fb63 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -119,19 +119,19 @@
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
+// Handle time custom fields.
 $timeCustomFields = array();
-// If we have time custom fields - collect input.
-if ($request->isPost()) {
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $control_name = 'time_field_'.$timeField['id'];
+    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+    $_SESSION[$control_name] = $cl_control_name;
+    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+      'control_name' => $control_name,
+      'label' => $timeField['label'],
+      'type' => $timeField['type'],
+      'required' => $timeField['required'],
+      'value' => trim($cl_control_name));
   }
 }
 
diff --git a/time.php b/time.php
index a76b470d5..e375e8425 100644
--- a/time.php
+++ b/time.php
@@ -153,23 +153,21 @@
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
+// Handle time custom fields.
 $timeCustomFields = array();
-// If we have time custom fields - collect input.
-#if ($request->isPost()) {
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
-      $_SESSION[$control_name] = $cl_control_name;
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($cl_control_name));
-    }
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $control_name = 'time_field_'.$timeField['id'];
+    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+    $_SESSION[$control_name] = $cl_control_name;
+    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+      'control_name' => $control_name,
+      'label' => $timeField['label'],
+      'type' => $timeField['type'],
+      'required' => $timeField['required'],
+      'value' => trim($cl_control_name));
   }
-#}
+}
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');

From 070846bb07629367d044a3affbea6f8135040c3f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 31 Jul 2020 15:00:29 +0000
Subject: [PATCH 1254/1848] Started to use relative values in css for better
 presentation.

---
 WEB-INF/templates/footer.tpl | 2 +-
 default.css                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1aa8e7ba2..9027eee8e 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">Anuko Time Tracker 1.19.23.5263 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5264 | 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/default.css b/default.css
index 3eac29ec2..3b4921acf 100644
--- a/default.css
+++ b/default.css
@@ -63,17 +63,17 @@ input[type=checkbox], label {
 }
 
 .systemMenu {
-  font-size: 11pt;
+  font-size: 1rem;
   font-weight: bold;
   color: white;
   background-color: black;
-  margin: 2px 4px 2px 4px;
+  margin: .1rem .2rem .1rem .2rem;
 }
 
 .mainMenu {
-  font-size: 11pt;
+  font-size: 1rem;
   color: #444444;
-  margin: 2px 4px 2px 4px;
+  margin: .1rem .2rem .1rem .2rem;
 }
 
 .onBehalf {

From 7f3061d5269131fea433dd6465565c93c9dcbb70 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 31 Jul 2020 15:47:40 +0000
Subject: [PATCH 1255/1848] Renamed tt_logo.png to just logo.png.

---
 WEB-INF/templates/footer.tpl        |   2 +-
 WEB-INF/templates/header.tpl        |   2 +-
 WEB-INF/templates/mobile/header.tpl |   2 +-
 WEB-INF/templates/work/header.tpl   |   2 +-
 images/{tt_logo.png => logo.png}    | Bin
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename images/{tt_logo.png => logo.png} (100%)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9027eee8e..36d26a192 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">Anuko Time Tracker 1.19.23.5264 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5265 | 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/header.tpl b/WEB-INF/templates/header.tpl
index 4d140ed3e..4e89a8a20 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -45,7 +45,7 @@
 {if $user->custom_logo}
                       <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$custom_logo}" border="0"></td>
 {else}
-                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="images/tt_logo.png" border="0"></a></td>
+                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="images/logo.png" border="0"></a></td>
 {/if}
                     </tr>
                   </table>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 6290dd025..e6d661d3a 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -46,7 +46,7 @@
 {if $user->custom_logo}
                       <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$mobile_custom_logo}" border="0"></td>
 {else}
-                      <td height="55" align="center"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/tt_logo.png" border="0"></td>
+                      <td height="55" align="center"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/logo.png" border="0"></td>
 {/if}
                     </tr>
                   </table>
diff --git a/WEB-INF/templates/work/header.tpl b/WEB-INF/templates/work/header.tpl
index 084870958..03f986885 100644
--- a/WEB-INF/templates/work/header.tpl
+++ b/WEB-INF/templates/work/header.tpl
@@ -41,7 +41,7 @@
 {if $user->custom_logo}
                       <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="../{$custom_logo}" border="0"></td>
 {else}
-                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/tt_logo.png" border="0"></a></td>
+                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/logo.png" border="0"></a></td>
 {/if}
                     </tr>
                   </table>
diff --git a/images/tt_logo.png b/images/logo.png
similarity index 100%
rename from images/tt_logo.png
rename to images/logo.png

From f534234e691f5b53ce6dccd3412c42d32f572c9a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 31 Jul 2020 16:33:39 +0000
Subject: [PATCH 1256/1848] Fixed language for for the login screen.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 58c51c632..331633e11 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -53,7 +53,7 @@ class ttUser {
   var $group_name = null;       // Group name.
   var $behalf_group_name = null;// Group name, on behalf of which we are working.
   var $email = null;            // User email.
-  var $lang = 'en';             // Language.
+  var $lang = null;             // Language.
   var $decimal_mark = '.';      // Decimal separator.
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 36d26a192..e1a6031d3 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">Anuko Time Tracker 1.19.23.5265 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5266 | 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>

From 10c01f419f509827c240e46f80e495269c30a6da Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Aug 2020 13:19:49 +0000
Subject: [PATCH 1257/1848] Fixed broken PDF reposrts after renaming logo
 image.

---
 WEB-INF/templates/footer.tpl | 2 +-
 group_edit.php               | 2 +-
 topdf.php                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e1a6031d3..dcf355e63 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">Anuko Time Tracker 1.19.23.5266 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5267 | 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/group_edit.php b/group_edit.php
index 2196d280b..c8ad2e142 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -92,7 +92,7 @@
   $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
   $cl_confirm_save = $request->getParameter('confirm_save');
 } else {
-  $cl_currency = ($group['currency'] == ''? CURRENCY_DEFAULT : $group['currency']);
+  $cl_currency = ($group['currency'] == '' ? CURRENCY_DEFAULT : $group['currency']);
   $cl_lang = $group['lang'];
   $cl_decimal_mark = $group['decimal_mark'];
   $cl_date_format = $group['date_format'];
diff --git a/topdf.php b/topdf.php
index 337a05a41..42c31e07f 100644
--- a/topdf.php
+++ b/topdf.php
@@ -460,7 +460,7 @@
 // Extend TCPDF class so that we can use custom header and footer.
 class ttPDF extends TCPDF {
 
-  public $image_file = 'images/tt_logo.png'; // Image file for the logo in header.
+  public $image_file = 'images/logo.png'; // Image file for the logo in header.
   public $page_word = 'Page'; // Localized "Page" word in footer, ex: Page 1/2.
 
   // SetImageFile - sets image file name.

From e650913e25f14120ac4510a740f4bbc3c19f0e98 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Aug 2020 15:44:40 +0000
Subject: [PATCH 1258/1848] Added a link explaining tracking mode.

---
 WEB-INF/templates/footer.tpl     | 2 +-
 WEB-INF/templates/group_edit.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dcf355e63..53f5fb82a 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">Anuko Time Tracker 1.19.23.5267 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5268 | 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 c55663ceb..e9b6deb56 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -60,7 +60,7 @@ function chLocation(newLocation) { document.location = newLocation; }
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
-            <td>{$forms.groupForm.tracking_mode.control}</td>
+            <td>{$forms.groupForm.tracking_mode.control} <a href="https://www.anuko.com/lp/tt_47.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.record_type}:</td>

From 3094adc7be3492465d3b7336bdee3df4e0850ea9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Aug 2020 16:15:17 +0000
Subject: [PATCH 1259/1848] Changed APP_NAME named constant to DIR_NAME to
 better reflect its meaning.

---
 WEB-INF/config.php.dist              | 14 +++++++-------
 WEB-INF/lib/form/DateField.class.php |  4 ++--
 WEB-INF/templates/footer.tpl         |  2 +-
 password_reset.php                   |  4 ++--
 readme.txt                           |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 24dd5a266..9583d59b3 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -50,13 +50,13 @@ define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8mb4');
 define('MULTIORG_MODE', true);
 
 
-// Application name.
-// If you install time tracker into a sub-directory of your site reflect this in the APP_NAME parameter.
-// For example, for http://localhost/timetracker/ define APP_NAME as 'timetracker'.
+// Directory name.
+// If you install time tracker into a sub-directory of your site reflect this in the DIR_NAME parameter.
+// For example, for http://localhost/timetracker/ define DIR_NAME as 'timetracker'.
 //
-// define('APP_NAME', 'timetracker');
+// define('DIR_NAME', 'timetracker');
 //
-define('APP_NAME', '');
+define('DIR_NAME', '');
 
 
 // WEEKEND_START_DAY
@@ -151,7 +151,7 @@ define('AUTH_MODULE', 'db');
 //  'type' => 'openldap',                       // Type of server. openldap type should also work with Sun Directory Server when member_of is empty.
                                                 // It may work with other (non Windows AD) LDAP servers. For Windows AD use the 'ad' type.
 //  'base_dn' => 'ou=People,dc=example,dc=com', // Path of user's base distinguished name in LDAP catalog.
-//  'user_login_attribute' => 'uid',            // LDAP attribute used for login
+//  'user_login_attribute' => 'uid',            // LDAP attribute used for login.
 //  'default_domain' => 'example.com',          // Default domain.
 //  'member_of' => array());                    // List of groups, membership in which is required for user to be authenticated.
 
@@ -172,7 +172,7 @@ define('AUTH_MODULE', 'db');
 // define('DEBUG', false); // Note: enabling DEBUG breaks redirects as debug output is printed before setting redirect header. Do not enable on production systems.
 
 
-// Team managers can set monthly work hour quota for years between the following  values.
+// Group managers can set monthly work hour quota for years between the following  values.
 // define('MONTHLY_QUOTA_YEAR_START', 2010); // If nothing is specified, it falls back to 2015.
 // define('MONTHLY_QUOTA_YEAR_END', 2025);   // If nothing is specified, it falls back to 2030.
 
diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index a197126fb..73c68220a 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,8 +406,8 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      if (APP_NAME)
-      	$app_root = '/'.APP_NAME;
+      if (DIR_NAME)
+        $app_root = '/'.DIR_NAME;
 
       $html .= "&nbsp;<img src=\"".$app_root."/images/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
     }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 53f5fb82a..5a7521eeb 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">Anuko Time Tracker 1.19.23.5268 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5269 | 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/password_reset.php b/password_reset.php
index 4d4e24867..bbb54adb5 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -100,8 +100,8 @@
         $http = 'http';
 
       $cl_subject = $user_i18n->get('form.reset_password.email_subject');
-      if (APP_NAME)
-        $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/'.APP_NAME.'/password_change.php?ref='.$temp_ref;
+      if (DIR_NAME)
+        $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/'.DIR_NAME.'/password_change.php?ref='.$temp_ref;
       else
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
 
diff --git a/readme.txt b/readme.txt
index c8929fae4..421a18cdb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -29,7 +29,7 @@ The general installation procedure looks like this:
 5) Create a config file by coping WEB-INF/config.php.dist to WEB-INF/config.php.
 6) Change $dsn value in /WEB-INF/config.php file to reflect your database connection parameters (user name and password).
 7) If you are upgrading from earlier Time Tracker version run dbinstall.php from your browser and do only the required "Update database structure" steps.
-8) If you install time tracker into a sub-directory of your site reflect this in the APP_NAME parameter in /WEB-INF/config.php file. For example, for http://localhost/timetracker/ set APP_NAME = "timetracker".
+8) If you install time tracker into a sub-directory of your site reflect this in the DIR_NAME parameter in /WEB-INF/config.php file. For example, for http://localhost/timetracker/ set DIR_NAME = "timetracker".
 9) Login to your time tracker site as admin with password "secret" without quotes and create at least one group.
 10) Change admin password (on the admin "options" page). You can also use the following SQL console command:
   update tt_users set password = md5('new_password_here') where login='admin'

From 469a150062dc321309af92cfb50f249a8d931d94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Aug 2020 17:46:26 +0000
Subject: [PATCH 1260/1848] Shortened images directory name to img to keep
 things a bit shorter.

---
 WEB-INF/lib/form/DateField.class.php      |   2 +-
 WEB-INF/templates/admin_groups.tpl        |   4 ++--
 WEB-INF/templates/cf_custom_fields.tpl    |   4 ++--
 WEB-INF/templates/cf_dropdown_options.tpl |   4 ++--
 WEB-INF/templates/clients.tpl             |   8 ++++----
 WEB-INF/templates/entity_files.tpl        |   4 ++--
 WEB-INF/templates/expenses.tpl            |   8 ++++----
 WEB-INF/templates/groups.tpl              |   4 ++--
 WEB-INF/templates/header.tpl              |  10 +++++-----
 WEB-INF/templates/invoices.tpl            |   2 +-
 WEB-INF/templates/mobile/header.tpl       |  10 +++++-----
 WEB-INF/templates/mobile/time.tpl         |   4 ++--
 WEB-INF/templates/notifications.tpl       |   4 ++--
 WEB-INF/templates/predefined_expenses.tpl |   4 ++--
 WEB-INF/templates/projects.tpl            |  18 +++++++++---------
 WEB-INF/templates/report.tpl              |   4 ++--
 WEB-INF/templates/roles.tpl               |   8 ++++----
 WEB-INF/templates/tasks.tpl               |   8 ++++----
 WEB-INF/templates/templates.tpl           |   8 ++++----
 WEB-INF/templates/time.tpl                |   8 ++++----
 WEB-INF/templates/timesheets.tpl          |  16 ++++++++--------
 WEB-INF/templates/users.tpl               |   8 ++++----
 WEB-INF/templates/week.tpl                |   8 ++++----
 WEB-INF/templates/work/admin_work.tpl     |   8 ++++----
 WEB-INF/templates/work/header.tpl         |  10 +++++-----
 WEB-INF/templates/work/work.tpl           |   8 ++++----
 {images => img}/1x1.gif                   | Bin
 {images => img}/calendar.gif              | Bin
 {images => img}/icon_delete.png           | Bin
 {images => img}/icon_edit.png             | Bin
 {images => img}/icon_file.png             | Bin
 {images => img}/icon_files.png            | Bin
 {images => img}/logo.png                  | Bin
 {images => img}/subm_bg.gif               | Bin
 {images => img}/top_bg.gif                | Bin
 initialize.php                            |   4 ++--
 password_change.php                       |   4 ++--
 topdf.php                                 |   6 +++---
 38 files changed, 99 insertions(+), 99 deletions(-)
 rename {images => img}/1x1.gif (100%)
 rename {images => img}/calendar.gif (100%)
 rename {images => img}/icon_delete.png (100%)
 rename {images => img}/icon_edit.png (100%)
 rename {images => img}/icon_file.png (100%)
 rename {images => img}/icon_files.png (100%)
 rename {images => img}/logo.png (100%)
 rename {images => img}/subm_bg.gif (100%)
 rename {images => img}/top_bg.gif (100%)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 73c68220a..18a3ec475 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -409,7 +409,7 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       if (DIR_NAME)
         $app_root = '/'.DIR_NAME;
 
-      $html .= "&nbsp;<img src=\"".$app_root."/images/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
+      $html .= "&nbsp;<img src=\"".$app_root."/img/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
     }
 
     return $html;
diff --git a/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
index 218fe77cd..9f2ecb6f4 100644
--- a/WEB-INF/templates/admin_groups.tpl
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -22,8 +22,8 @@
     <td>{$group.name|escape}</td>
     <td nowrap>{$group.date}</td>
     <td align="center">{$group.lang}</td>
-    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
   </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index e64f18157..e056c606b 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -30,8 +30,8 @@
           <td>{$i18n.label.type_dropdown}</td>
           <td><a href="cf_dropdown_options.php?field_id={$field['id']}">{$i18n.label.configure}</a></td>
       {/if}
-          <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index b920d733e..d694a1ebc 100644
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -16,8 +16,8 @@
     {foreach $options as $key=>$val}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$val|escape}</td>
-          <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index ca93b92f5..cba3256c3 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -20,8 +20,8 @@
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$client.name|escape}</td>
           <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
@@ -43,8 +43,8 @@
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$client.name|escape}</td>
           <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/entity_files.tpl b/WEB-INF/templates/entity_files.tpl
index fc552b24b..fe5dc5445 100644
--- a/WEB-INF/templates/entity_files.tpl
+++ b/WEB-INF/templates/entity_files.tpl
@@ -16,8 +16,8 @@
           <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
           <td>{$file.description|escape}</td>
     {if $can_edit}
-          <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
     {/if}
         </tr>
   {/foreach}
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index c064b13de..1e9476c3d 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -207,23 +207,23 @@ function recalculateCost() {
         <td valign="top" align="right">{$item.cost}</td>
     {if $show_files}
       {if $item.has_files}
-        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
       {else}
-        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
       {/if}
     {/if}
         <td valign="top" align="center">
     {if $item.approved || $item.invoice_id}
           &nbsp;
     {else}
-          <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
+          <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a>
     {/if}
         </td>
         <td valign="top" align="center">
     {if $item.approved || $item.invoice_id}
           &nbsp;
     {else}
-          <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
+          <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a>
     {/if}
         </td>
       </tr>
diff --git a/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl
index 0289ef9ee..7b2a24017 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -22,8 +22,8 @@
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$subgroup.name|escape}</td>
     <td>{$subgroup.description|escape}</td>
-    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
   </tr>
   {/foreach}
 </table>
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 4e89a8a20..eaf163824 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -34,18 +34,18 @@
 {if $user->custom_logo}
           <td align="center">
 {else}
-          <td bgcolor="#a6ccf7" background="images/top_bg.gif" align="center">
+          <td bgcolor="#a6ccf7" background="img/top_bg.gif" align="center">
 {/if}
             <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
               <tr>
                 <td valign="top">
                   <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr><td height="6" colspan="2"><img width="1" height="6" src="images/1x1.gif" border="0"></td></tr>
+                    <tr><td height="6" colspan="2"><img width="1" height="6" src="img/1x1.gif" border="0"></td></tr>
                     <tr valign="top">
 {if $user->custom_logo}
                       <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$custom_logo}" border="0"></td>
 {else}
-                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="images/logo.png" border="0"></a></td>
+                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="img/logo.png" border="0"></a></td>
 {/if}
                     </tr>
                   </table>
@@ -74,7 +74,7 @@
       <!-- sub menu for admin -->
       <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
+          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
     {if isTrue('WORK_SERVER_ADMINISTRATION')}
@@ -109,7 +109,7 @@
       <!-- sub menu for authorized user -->
       <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
+          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
       {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 2df35a8ce..af632ef58 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -43,7 +43,7 @@
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
   {if !$user->isClient()}
-          <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
   {/if}
         </tr>
         {/foreach}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index e6d661d3a..8888e27b6 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -35,18 +35,18 @@
 {if $user->custom_logo}
           <td align="center">
 {else}
-          <td bgcolor="#a6ccf7" background="../images/top_bg.gif" align="center">
+          <td bgcolor="#a6ccf7" background="../img/top_bg.gif" align="center">
 {/if}
             <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
               <tr>
                 <td valign="top">
                   <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../images/1x1.gif" border="0"></td></tr>
+                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../img/1x1.gif" border="0"></td></tr>
                     <tr valign="top">
 {if $user->custom_logo}
                       <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$mobile_custom_logo}" border="0"></td>
 {else}
-                      <td height="55" align="center"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/logo.png" border="0"></td>
+                      <td height="55" align="center"><img alt="Anuko Time Tracker" width="300" height="43" src="../img/logo.png" border="0"></td>
 {/if}
                     </tr>
                   </table>
@@ -64,7 +64,7 @@
       <!-- sub menu for admin -->
       <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
-          <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
+          <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../img/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
           </td>
@@ -76,7 +76,7 @@
       <!-- sub menu for authorized user -->
       <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
-          <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
+          <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../img/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index a346ad6c6..5be118c69 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -25,8 +25,8 @@
           <td valign="top">{$record.project|escape}</td>
     {/if}
           <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a>{/if}</td>
-          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a>{/if}</td>
+          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a>{/if}</td>
+          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a>{/if}</td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index 3a62e8cb2..3cd3347b7 100644
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -19,8 +19,8 @@
           <td>{$notification['cron_spec']|escape}</td>
           <td>{$notification['email']|escape}</td>
           <td>{$notification['report_condition']|escape}</td>
-          <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
index 4f138becf..e115b58db 100644
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -14,8 +14,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$predefined_expense['name']|escape}</td>
           <td>{$predefined_expense['cost']|escape}</td>
-          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index 92348e7ab..7e6317310 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -26,13 +26,13 @@
           <td>{$project.description|escape}</td>
       {if $show_files}
         {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
         {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
         {/if}
       {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -64,13 +64,13 @@
           <td>{$project.description|escape}</td>
       {if $show_files}
         {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
         {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
         {/if}
       {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
@@ -98,7 +98,7 @@
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
       {if $show_files && $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
       {/if}
         </tr>
     {/foreach}
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index b65d0dfa9..822083df1 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -164,8 +164,8 @@
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
     {if $bean->getAttribute('chfiles')}
-      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
-      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
+      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a>{/if}</td>{/if}
+      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a>{/if}</td>{/if}
     {/if}
     {if $use_checkboxes}
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
diff --git a/WEB-INF/templates/roles.tpl b/WEB-INF/templates/roles.tpl
index 85efc66bd..d1d60b849 100644
--- a/WEB-INF/templates/roles.tpl
+++ b/WEB-INF/templates/roles.tpl
@@ -22,8 +22,8 @@
           <td>{$role.name|escape}</td>
           <td>{$role.rank}</td>
           <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -52,8 +52,8 @@
           <td>{$role.name|escape}</td>
           <td>{$role.rank}</td>
           <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index df502c7ae..646899ddf 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -32,8 +32,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -60,8 +60,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index c1ffff729..fa3faac63 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -16,8 +16,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
@@ -37,8 +37,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 377b26c01..d0121d0ee 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -155,16 +155,16 @@
     {/if}
     {if $show_files}
       {if $record.has_files}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
       {else}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
       {/if}
     {/if}
           <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
+            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a>
       {if ($record.duration == '0:00' && $record.start <> '')}
             <input type="hidden" name="record_id" value="{$record.id}">
             <input type="hidden" name="browser_date" value="">
@@ -177,7 +177,7 @@
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
             &nbsp;
     {else}
-            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
+            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a>
     {/if}
           </td>
         </tr>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index a5e893e59..237eb98be 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -40,13 +40,13 @@
   {/if}
   {if $show_files}
         {if $timesheet.has_files}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
         {else}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
         {/if}
   {/if}
-          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
 {/foreach}
       </table>
@@ -86,13 +86,13 @@
     {/if}
     {if $show_files}
       {if $timesheet.has_files}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
       {else}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
       {/if}
     {/if}
-          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 401751fcb..d7d3e3aa7 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -35,8 +35,8 @@
           <td class="cellRightAligned">{$u.quota_percent}</td>
       {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
-          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>{else}<td></td>{/if}
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>{else}<td></td>{/if}
       {else}
           <td></td>
           <td></td>
@@ -76,8 +76,8 @@
           <td class="cellRightAligned">{$u.quota_percent}</td>
       {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank}
-          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a></td>
-          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a></td>
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
+          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
       {else}
           <td></td>
           <td></td>
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 5ac3be85e..9d3ef0bf2 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -149,23 +149,23 @@ function fillDropdowns() {
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
     {if $show_files}
       {if $record.has_files}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
       {else}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
       {/if}
     {/if}
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
+          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a>
     {/if}
         </td>
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
+          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a>
     {/if}
         </td>
       </tr>
diff --git a/WEB-INF/templates/work/admin_work.tpl b/WEB-INF/templates/work/admin_work.tpl
index 39050ab3e..929b4d619 100644
--- a/WEB-INF/templates/work/admin_work.tpl
+++ b/WEB-INF/templates/work/admin_work.tpl
@@ -22,8 +22,8 @@
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
-          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
-          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
+          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
@@ -48,8 +48,8 @@
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
           <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
-          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
+          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/work/header.tpl b/WEB-INF/templates/work/header.tpl
index 03f986885..582e76144 100644
--- a/WEB-INF/templates/work/header.tpl
+++ b/WEB-INF/templates/work/header.tpl
@@ -30,18 +30,18 @@
 {if $user->custom_logo}
           <td align="center">
 {else}
-          <td bgcolor="#a6ccf7" background="../images/top_bg.gif" align="center">
+          <td bgcolor="#a6ccf7" background="../img/top_bg.gif" align="center">
 {/if}
             <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
               <tr>
                 <td valign="top">
                   <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../images/1x1.gif" border="0"></td></tr>
+                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../img/1x1.gif" border="0"></td></tr>
                     <tr valign="top">
 {if $user->custom_logo}
                       <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="../{$custom_logo}" border="0"></td>
 {else}
-                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="../images/logo.png" border="0"></a></td>
+                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="../img/logo.png" border="0"></a></td>
 {/if}
                     </tr>
                   </table>
@@ -70,7 +70,7 @@
       <!-- sub menu for admin -->
       <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
+          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
             <a class="mainMenu" href="../admin_groups.php">{$i18n.menu.groups}</a>
             <a class="mainMenu" href="../admin_options.php">{$i18n.menu.options}</a>
     {if isTrue('WORK_SERVER_ADMINISTRATION')}
@@ -105,7 +105,7 @@
       <!-- sub menu for authorized user -->
       <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="images/subm_bg.gif">&nbsp;
+          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="../time.php">{$i18n.menu.time}</a>
       {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
diff --git a/WEB-INF/templates/work/work.tpl b/WEB-INF/templates/work/work.tpl
index 3397dc6a1..76d953065 100644
--- a/WEB-INF/templates/work/work.tpl
+++ b/WEB-INF/templates/work/work.tpl
@@ -25,12 +25,12 @@
           <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
     {if $work_item.can_edit}
-          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
+          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
     {else}
           <td></td>
     {/if}
     {if $work_item.can_delete}
-          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
     {else}
           <td></td>
     {/if}
@@ -92,8 +92,8 @@
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../images/icon_edit.png"></a></td>
-          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../images/icon_delete.png"></a></td>
+          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
+          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/images/1x1.gif b/img/1x1.gif
similarity index 100%
rename from images/1x1.gif
rename to img/1x1.gif
diff --git a/images/calendar.gif b/img/calendar.gif
similarity index 100%
rename from images/calendar.gif
rename to img/calendar.gif
diff --git a/images/icon_delete.png b/img/icon_delete.png
similarity index 100%
rename from images/icon_delete.png
rename to img/icon_delete.png
diff --git a/images/icon_edit.png b/img/icon_edit.png
similarity index 100%
rename from images/icon_edit.png
rename to img/icon_edit.png
diff --git a/images/icon_file.png b/img/icon_file.png
similarity index 100%
rename from images/icon_file.png
rename to img/icon_file.png
diff --git a/images/icon_files.png b/img/icon_files.png
similarity index 100%
rename from images/icon_files.png
rename to img/icon_files.png
diff --git a/images/logo.png b/img/logo.png
similarity index 100%
rename from images/logo.png
rename to img/logo.png
diff --git a/images/subm_bg.gif b/img/subm_bg.gif
similarity index 100%
rename from images/subm_bg.gif
rename to img/subm_bg.gif
diff --git a/images/top_bg.gif b/img/top_bg.gif
similarity index 100%
rename from images/top_bg.gif
rename to img/top_bg.gif
diff --git a/initialize.php b/initialize.php
index 404872936..a1393f6e6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -146,8 +146,8 @@
 import('ttUser');
 $user = new ttUser(null, $auth->getUserId());
 if ($user->custom_logo) {
-  $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
-  $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
+  $smarty->assign('custom_logo', 'img/'.$user->group_id.'.png');
+  $smarty->assign('mobile_custom_logo', '../img/'.$user->group_id.'.png');
 }
 $smarty->assign('user', $user);
 
diff --git a/password_change.php b/password_change.php
index b4e577557..cefc30e5f 100644
--- a/password_change.php
+++ b/password_change.php
@@ -53,8 +53,8 @@
   $smarty->assign('i18n', $i18n->keys);
 }
 if ($user->custom_logo) {
-  $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
-  $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
+  $smarty->assign('custom_logo', 'img/'.$user->group_id.'.png');
+  $smarty->assign('mobile_custom_logo', '../img/'.$user->group_id.'.png');
 }
 $smarty->assign('user', $user);
 
diff --git a/topdf.php b/topdf.php
index 42c31e07f..2ea70ddcc 100644
--- a/topdf.php
+++ b/topdf.php
@@ -460,7 +460,7 @@
 // Extend TCPDF class so that we can use custom header and footer.
 class ttPDF extends TCPDF {
 
-  public $image_file = 'images/logo.png'; // Image file for the logo in header.
+  public $image_file = 'img/logo.png'; // Image file for the logo in header.
   public $page_word = 'Page'; // Localized "Page" word in footer, ex: Page 1/2.
 
   // SetImageFile - sets image file name.
@@ -494,8 +494,8 @@ public function Footer() {
 $pdf = new ttPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
 
 // If custom logo file exists - set it.
-if (file_exists('images/'.$user->group_id.'.png'))
-  $pdf->SetImageFile('images/'.$user->group_id.'.png');
+if (file_exists('img/'.$user->group_id.'.png'))
+  $pdf->SetImageFile('img/'.$user->group_id.'.png');
 
 // Set page word for the footer.
 $pdf->SetPageWord($i18n->get('label.page'));

From 70cdab83a9d235dbaae74a17b3d32eb11ecdd1c6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 Aug 2020 21:07:42 +0000
Subject: [PATCH 1261/1848] Refactored I18n class.

---
 WEB-INF/lib/I18n.class.php   | 51 +++++++++++++++++++-----------------
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 7eb6228ff..ed8380815 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -32,7 +32,6 @@ class I18n {
   var $monthNames;
   var $weekdayNames;
   var $weekdayShortNames;
-  var $holidays;
   var $keys = array(); // These are our localized strings.
 
   // get - obtains a localized value from $keys array.
@@ -52,24 +51,18 @@ function get($key) {
     return $value;
   }
 
-  // TODO: refactoring ongoing down from here...
-    function getWeekDayName($id) {
-      $id = (int) $id;
-      return $this->weekdayNames[$id];
-    }
-
-    function load($localName) {
-    $kw = array();
-    $filename = strtolower($localName) . '.lang.php';
-    $inc_filename = RESOURCE_DIR . '/' . $this->defaultLang . '.lang.php';
-
-    if (file_exists($inc_filename)) {
-      include($inc_filename);
+  // load - loads localized strings into $keys array by first going through the default file (en.lang.php)
+  // and then through the requested language file (which is supplied as parameter).
+  // This means we end up with default English strings when keys are missing in the translation file.
+  function load($langName) {
+    // Load default English keys first.
+    $defaultFileName = RESOURCE_DIR . '/' . $this->defaultLang . '.lang.php';
+    if (file_exists($defaultFileName)) {
+      include($defaultFileName);
 
       $this->monthNames = $i18n_months;
       $this->weekdayNames = $i18n_weekdays;
-
-        $this->weekdayShortNames = $i18n_weekdays_short;
+      $this->weekdayShortNames = $i18n_weekdays_short;
 
       foreach ($i18n_key_words as $kword=>$value) {
         $pos = strpos($kword, ".");
@@ -86,15 +79,17 @@ function load($localName) {
       }
     }
 
-    $inc_filename = RESOURCE_DIR . '/' . $filename;
-    if (file_exists($inc_filename) && ($localName != $this->defaultLang)) {
-      require($inc_filename);
+    // Now load the keys from the requested file.
+    // This overwrites already loaded English strings.
+    $requestedFileName = strtolower($langName) . '.lang.php';
+    $requestedFileName = RESOURCE_DIR . '/' . $requestedFileName;
+    if (file_exists($requestedFileName) && ($langName != $this->defaultLang)) {
+      require($requestedFileName);
 
-      $this->lang = $localName;
+      $this->lang = $langName;
       $this->monthNames = $i18n_months;
       $this->weekdayNames = $i18n_weekdays;
-        $this->weekdayShortNames = $i18n_weekdays_short;
-        $this->holidays = $i18n_holidays;
+      $this->weekdayShortNames = $i18n_weekdays_short;
       foreach ($i18n_key_words as $kword=>$value) {
         if (!$value) continue;
         $pos = strpos($kword, ".");
@@ -109,10 +104,11 @@ function load($localName) {
           $this->keys[$kword] = $value;
         }
       }
-      return true;
     }
   }
 
+  // hasLang determines if a file for requested language exists.
+  // This is a helper function for getBrowserLanguage below.
   function hasLang($lang)
   {
     $filename = RESOURCE_DIR . '/' . strtolower($lang) . '.lang.php';
@@ -146,7 +142,7 @@ function getBrowserLanguage()
     return false;
   }
 
-  // getLangFileList() returns a list of language files.
+  // getLangFileList() returns a list of available language files.
   static function getLangFileList() {
     $fileList = array();
     $d = @opendir(RESOURCE_DIR);
@@ -161,8 +157,15 @@ static function getLangFileList() {
     return $fileList;
   }
 
+  // getLangFromFilename returns language designation from a file name such as (ru, pt-br, etc.).
   static function getLangFromFilename($filename)
   {
     return substr($filename, 0, strpos($filename, '.'));
   }
+
+  // getWeekDayName returns a localized weekday name.
+  function getWeekDayName($id) {
+    $id = (int) $id;
+    return $this->weekdayNames[$id];
+  }
 }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5a7521eeb..e157c623b 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">Anuko Time Tracker 1.19.23.5269 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5270 | 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>

From d7467da439f41dc126e09df8b124bc5ff5147078 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Aug 2020 13:53:11 +0000
Subject: [PATCH 1262/1848] Introduced EMAIL_REQUIRED config option.

---
 WEB-INF/config.php.dist             | 4 ++++
 WEB-INF/lib/ttRegistrator.class.php | 2 +-
 WEB-INF/templates/footer.tpl        | 2 +-
 WEB-INF/templates/register.tpl      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 9583d59b3..d2772ffdf 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -50,6 +50,10 @@ define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8mb4');
 define('MULTIORG_MODE', true);
 
 
+// EMAIL_REQUIRED defines whether an email is required for new registrations.
+define('EMAIL_REQUIRED', false);
+
+
 // Directory name.
 // If you install time tracker into a sub-directory of your site reflect this in the DIR_NAME parameter.
 // For example, for http://localhost/timetracker/ define DIR_NAME as 'timetracker'.
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 936bb4ffd..09de79a4b 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -84,7 +84,7 @@ function validate() {
       $this->err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($this->password1 !== $this->password2)
       $this->err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-    if (!ttValidEmail($this->email, true))
+    if (!ttValidEmail($this->email, !isTrue('EMAIL_REQUIRED')))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.email'));
     if (!ttUserHelper::canAdd())
       $this->err->add($i18n->get('error.user_count'));
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e157c623b..f17ed2542 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">Anuko Time Tracker 1.19.23.5270 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5271 | 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/register.tpl b/WEB-INF/templates/register.tpl
index d751c9bfa..cdf343f2d 100644
--- a/WEB-INF/templates/register.tpl
+++ b/WEB-INF/templates/register.tpl
@@ -33,7 +33,7 @@
           <td>{$forms.groupForm.password2.control}</td>
         </tr>
         <tr>
-          <td align="right" nowrap>{$i18n.label.email}:</td>
+          <td align="right" nowrap>{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</td>
           <td>{$forms.groupForm.manager_email.control}</td>
         </tr>
         <tr>

From 829b3196939bd06792da5d57f73d49dd98c3a240 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Aug 2020 14:44:35 +0000
Subject: [PATCH 1263/1848] Cosmetic presentation fix for attachment display on
 projects.php.

---
 WEB-INF/templates/footer.tpl   | 2 +-
 WEB-INF/templates/projects.tpl | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f17ed2542..19f2f036f 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">Anuko Time Tracker 1.19.23.5271 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5272 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 7e6317310..345b7ef47 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -97,8 +97,12 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
-      {if $show_files && $project.has_files}
+      {if $show_files}
+        {if $project.has_files}
           <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+        {else}
+          <td>&nbsp;</td>
+        {/if}
       {/if}
         </tr>
     {/foreach}

From 1b1312986ef577890693952a04c098be6e190560 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Aug 2020 16:44:40 +0000
Subject: [PATCH 1264/1848] Improved error reporting for recent registrations.

---
 WEB-INF/lib/ttRegistrator.class.php | 1 +
 WEB-INF/resources/ca.lang.php       | 1 +
 WEB-INF/resources/cs.lang.php       | 1 +
 WEB-INF/resources/da.lang.php       | 1 +
 WEB-INF/resources/de.lang.php       | 2 ++
 WEB-INF/resources/en.lang.php       | 1 +
 WEB-INF/resources/es.lang.php       | 1 +
 WEB-INF/resources/et.lang.php       | 2 ++
 WEB-INF/resources/fa.lang.php       | 1 +
 WEB-INF/resources/fi.lang.php       | 1 +
 WEB-INF/resources/fr.lang.php       | 1 +
 WEB-INF/resources/gr.lang.php       | 1 +
 WEB-INF/resources/he.lang.php       | 1 +
 WEB-INF/resources/hu.lang.php       | 1 +
 WEB-INF/resources/it.lang.php       | 1 +
 WEB-INF/resources/ja.lang.php       | 1 +
 WEB-INF/resources/ko.lang.php       | 1 +
 WEB-INF/resources/nl.lang.php       | 2 ++
 WEB-INF/resources/no.lang.php       | 1 +
 WEB-INF/resources/pl.lang.php       | 1 +
 WEB-INF/resources/pt-br.lang.php    | 1 +
 WEB-INF/resources/pt.lang.php       | 1 +
 WEB-INF/resources/ro.lang.php       | 1 +
 WEB-INF/resources/ru.lang.php       | 1 +
 WEB-INF/resources/sk.lang.php       | 1 +
 WEB-INF/resources/sl.lang.php       | 1 +
 WEB-INF/resources/sr.lang.php       | 1 +
 WEB-INF/resources/sv.lang.php       | 1 +
 WEB-INF/resources/tr.lang.php       | 1 +
 WEB-INF/resources/zh-cn.lang.php    | 1 +
 WEB-INF/resources/zh-tw.lang.php    | 1 +
 WEB-INF/templates/footer.tpl        | 2 +-
 32 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 09de79a4b..aadd7d14f 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -100,6 +100,7 @@ function register() {
     // Protection from too many recent bot registrations from user IP.
     if (!$this->created_by_id) { // No problems for logged in user (site admin).
       if ($this->registeredRecently()) {
+        $this->err->add($i18n->get('error.registered_recently'));
         $this->err->add($i18n->get('error.access_denied'));
         return false;
       }
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 30efec063..c16f214a3 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -82,6 +82,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Error de la base de dades.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dada "{0}" incorrecta.',
 'error.empty' => 'L\\\'Arxiu "{0}" està buit.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 707b3dcbe..14a319bf3 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -84,6 +84,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Chyba databáze.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Nesprávná "{0}" data.',
 'error.empty' => 'Pole "{0}" je prázdné.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9b061118f..29534c54a 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -77,6 +77,7 @@
 'error.sys' => 'System fejl.',
 'error.db' => 'Database fejl.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Forkert "{0}" data.',
 'error.empty' => 'Felt "{0}" er tom.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a66723626..b76f05cfd 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -75,6 +75,8 @@
 'error.access_denied' => 'Zugriff verweigert.',
 'error.sys' => 'Systemfehler.',
 'error.db' => 'Datenbankfehler.',
+// TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 'error.feature_disabled' => 'Funktion ist deaktiviert.',
 'error.field' => 'Ungültige "{0}" Daten.',
 'error.empty' => 'Feld "{0}" ist leer.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4b17bc464..45e5868d2 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -72,6 +72,7 @@
 'error.access_denied' => 'Access denied.',
 'error.sys' => 'System error.',
 'error.db' => 'Database error.',
+'error.registered_recently' => 'Registered recently.',
 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Incorrect "{0}" data.',
 'error.empty' => 'Field "{0}" is empty.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0bd854328..8ffb5fa3d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -81,6 +81,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Error de la base de datos.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dato "{0}" incorrecto.',
 'error.empty' => 'El archivo "{0}" esta vacío.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0b4603566..80766f902 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -76,6 +76,8 @@
 'error.access_denied' => 'Puudub ligipääs.',
 'error.sys' => 'Rakenduse viga.',
 'error.db' => 'Andmebaasi viga.',
+// TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 'error.feature_disabled' => 'Rakenduse funktsionaalsus on välja lülitatud.',
 'error.field' => 'Välja "{0}" andmed ei vasta nõutele.',
 'error.empty' => 'Väli "{0}" on tühi.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ef7591192..3fedc3e22 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -81,6 +81,7 @@
 'error.sys' => 'خطا در سیستم.',
 'error.db' => 'خطا در پایگاه داده.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'داده اشتباه در "{0}".',
 'error.empty' => 'فیلد "{0}" خالیست.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 2d91252ef..9a2c841c6 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -79,6 +79,7 @@
 'error.sys' => 'Järjestelmävirhe.',
 'error.db' => 'Tietokantavirhe.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Virheellinen "{0}" tieto.',
 'error.empty' => 'Kenttä "{0}" on tyhjä.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a4452a4e2..c3656c231 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -77,6 +77,7 @@
 'error.sys' => 'Erreur système.',
 'error.db' => 'Erreur de base de données.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Donnée "{0}" incorrecte.',
 'error.empty' => 'Le champ "{0}" est vide.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d2d036ddf..23ec5b88f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -76,6 +76,7 @@
 'error.sys' => 'Σφάλμα συστήματος.',
 'error.db' => 'Σφάλμα βάσης δεδομένων.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Λανθασμένο "{0}" δεδομένο.',
 'error.empty' => 'Το πεδίο "{0}" είναι κενό.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3f0cf5d66..8dd36fdf4 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -83,6 +83,7 @@
 'error.sys' => 'שגיאת מערכת',
 'error.db' => 'שגיאה של בסיס הנתונים',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'נתון "{0}" שגוי',
 'error.empty' => 'השדה "{0}" ריק',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 82f1ff081..e450a4d3f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -84,6 +84,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Adatbázis hiba.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Hibás "{0}" mező tartalma.',
 'error.empty' => 'A "{0}" mező üres.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 15407a6b9..e48125e5f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -78,6 +78,7 @@
 'error.sys' => 'Errore di sistema.',
 'error.db' => 'Errore database.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dato "{0}" errato.',
 'error.empty' => 'Il campo "{0}" è vuoto.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b116fb35b..511ac3037 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -82,6 +82,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'データベースのエラー。',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '不正確な"{0}"データ。',
 'error.empty' => '"{0}"のフィールドが空白です。',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6b17d47d2..17e83f372 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -82,6 +82,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => '데이터베이스 오류.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '부정확한 "{0}" 의 데이터.',
 'error.empty' => '"{0}" 의 필드가 비어있습니다.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5881139e3..12890db33 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -71,6 +71,8 @@
 'error.access_denied' => 'Toegang geweigerd.',
 'error.sys' => 'Systeem fout.',
 'error.db' => 'Database fout.',
+// TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 'error.feature_disabled' => 'Functie is uitgeschakeld.',
 'error.field' => 'Incorrecte gegevens: "{0}".',
 'error.empty' => 'Veld "{0}" is leeg.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 3677fdda5..8cbb1c5bd 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -83,6 +83,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Databasefeil.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Feil "{0}" data.',
 'error.empty' => 'Feltet "{0}" er tomt.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index dff252c93..09a3e3517 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -80,6 +80,7 @@
 'error.sys' => 'Błąd systemu.',
 'error.db' => 'Błąd bazy danych.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Niepoprawne dane: "{0}".',
 'error.empty' => 'Pole "{0}" jest puste.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index db5e0f17c..6949d3bef 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -77,6 +77,7 @@
 'error.sys' => 'Erro no sistema.',
 'error.db' => 'Erro no banco de dados.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Dados incorretos "{0}".',
 'error.empty' => 'Campo "{0}" está vazio.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b88fb9f18..5232c5822 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -83,6 +83,7 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 // 'error.db' => 'Database error.',
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 // 'error.field' => 'Incorrect "{0}" data.',
 // 'error.empty' => 'Field "{0}" is empty.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c569adb7e..1a0586ea2 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -85,6 +85,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Eroare baza de date.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 // 'error.field' => 'Incorrect "{0}" data.',
 'error.empty' => 'Campul "{0}" este gol.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5302c225b..4c4b7ff8f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -71,6 +71,7 @@
 'error.access_denied' => 'Доступ запрещён.',
 'error.sys' => 'Системная ошибка.',
 'error.db' => 'Ошибка базы данных.',
+'error.registered_recently' => 'Недавняя регистрация.',
 'error.feature_disabled' => 'Функция отключена.',
 'error.field' => 'Некорректные данные в поле "{0}".',
 'error.empty' => 'Пустое поле "{0}".',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 53c5ee3dc..26d91c217 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -81,6 +81,7 @@
 'error.sys' => 'Systémová chyba.',
 'error.db' => 'Databázová chyba.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Nesprávne "{0}" údaje.',
 'error.empty' => 'Pole "{0}" je prázdne.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index a3d350ca6..b69c4ba0a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -81,6 +81,7 @@
 // 'error.access_denied' => 'Access denied.',
 // 'error.sys' => 'System error.',
 // 'error.db' => 'Database error.',
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 // 'error.field' => 'Incorrect "{0}" data.',
 // 'error.empty' => 'Field "{0}" is empty.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index fe385a67c..e6dbaeb5b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -77,6 +77,7 @@
 'error.sys' => 'Greška u sistemu.',
 'error.db' => 'Greška u bazi podataka.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Pogrešan "{0}" podatak.',
 'error.empty' => 'Polje "{0}" je prazno.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 221c39d4a..7c1d468dd 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -77,6 +77,7 @@
 'error.sys' => 'Systemfel.',
 'error.db' => 'Databasfel.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '"{0}" innehåller ett felaktigt värde.',
 'error.empty' => '"{0}" kan inte vara tomt.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 0f0537325..c3ffd03f4 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -85,6 +85,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => 'Veritabanı hatası.',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => 'Hatalı veri "{0}".',
 'error.empty' => 'Alan "{0}" boştur.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 29422cc5f..ddc48aff3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -77,6 +77,7 @@
 'error.sys' => '系统错误。',
 'error.db' => '数据库错误。',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '不正确的"{0}"数据。',
 'error.empty' => '栏目"{0}"为空。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index d4720b341..ca657fef9 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -80,6 +80,7 @@
 // 'error.sys' => 'System error.',
 'error.db' => '資料庫錯誤。',
 // TODO: translate the following.
+// 'error.registered_recently' => 'Registered recently.',
 // 'error.feature_disabled' => 'Feature is disabled.',
 'error.field' => '不正確的"{0}"資料。',
 'error.empty' => '欄目"{0}"為空。',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 19f2f036f..1a46a4552 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">Anuko Time Tracker 1.19.23.5272 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5273 | 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>

From 5d7378e5ee0e6b4090e53e50ffcea74f9a2a6c9e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Aug 2020 21:46:13 +0000
Subject: [PATCH 1265/1848] Removed non-editable sender field from mail.tpl to
 simplify it.

---
 WEB-INF/config.php.dist    |  2 +-
 WEB-INF/templates/mail.tpl |  4 ----
 invoice_send.php           | 10 ----------
 report_send.php            | 10 ----------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index d2772ffdf..89cbd3965 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -95,7 +95,7 @@ define('HELP_LINK', 'https://www.anuko.com/time-tracker/user-guide/index.htm');
 
 // Default sender for mail.
 //
-define('SENDER', '"Anuko Time Tracker" <no-reply@timetracker.anuko.com>');
+define('SENDER', 'Anuko Time Tracker <no-reply@timetracker.anuko.com>');
 
 
 // MAIL_MODE - mail sending mode. Can be 'mail' or 'smtp'.
diff --git a/WEB-INF/templates/mail.tpl b/WEB-INF/templates/mail.tpl
index c57399f1f..13e2be598 100644
--- a/WEB-INF/templates/mail.tpl
+++ b/WEB-INF/templates/mail.tpl
@@ -6,10 +6,6 @@
     <tr>
       <td valign="top" colspan="2">
         <table>
-        <tr>
-          <td align="right">{$i18n.form.mail.from} (*):</td>
-          <td>{$sender}</td>
-        </tr>
         <tr>
           <td align="right">{$i18n.form.mail.to} (*):</td>
           <td>{$forms.mailForm.receiver.control}</td>
diff --git a/invoice_send.php b/invoice_send.php
index e94e8050f..c69edbd9d 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -101,16 +101,6 @@
   }
 } // isPost
 
-$smarty->assign('sender', SENDER);
-if (function_exists('imap_mime_header_decode')) {
-  // Decode sender in case it is encoded. PHP IMAP extension must be installed for us to get here.
-  $elements = imap_mime_header_decode(SENDER);
-  if (count($elements) > 1) {
-      // Reassign sender.
-      $smarty->assign('sender', $elements[count($elements) - 2]->text);
-  }
-}
-
 $smarty->assign('title', $i18n->get('title.send_invoice'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
diff --git a/report_send.php b/report_send.php
index 526457bf4..e837f3e50 100644
--- a/report_send.php
+++ b/report_send.php
@@ -95,16 +95,6 @@
   }
 }
 
-$smarty->assign('sender', SENDER);
-if (function_exists('imap_mime_header_decode')) {
-  $elements = imap_mime_header_decode(SENDER);
-  if (count($elements) > 1) {
-      // Reassign sender.
-      $new = $elements[count($elements) - 2]->text;
-      $smarty->assign('sender', $elements[count($elements) - 2]->text);
-  }
-}
-
 $smarty->assign('title', $i18n->get('title.send_report'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');

From eb8e81c3bf667dea03e9c3a1131af13245a65910 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Aug 2020 22:00:11 +0000
Subject: [PATCH 1266/1848] Removed no longer used string from translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 1 -
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 1 -
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c16f214a3..c6195cccc 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -645,7 +645,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'De',
 'form.mail.to' => 'Per a',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 14a319bf3..daefafebf 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -658,7 +658,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 29534c54a..23c5df739 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -622,7 +622,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
 'form.mail.report_subject' => 'Tidsregistrerings Rapport',
 'form.mail.footer' => 'Anuko Time Tracker er et simpelt, let at bruge, open source<br>tidsregistrerings system. Besøg <a href="https://www.anuko.com">www.anuko.com</a> for mere information.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b76f05cfd..482f42bcb 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -600,7 +600,6 @@
 'form.group_delete.hint' => 'Sind Sie sicher, dass Sie die gesamte Gruppe löschen möchten?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Von',
 'form.mail.to' => 'An',
 'form.mail.report_subject' => 'Time Tracker Bericht',
 'form.mail.footer' => 'Anuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source<br>Zeitverwaltungs-System. Besuchen Sie <a href="https://www.anuko.com">www.anuko.com</a> für weitere Informationen.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 45e5868d2..5003f5b16 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -583,7 +583,6 @@
 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'From',
 'form.mail.to' => 'To',
 'form.mail.report_subject' => 'Time Tracker Report',
 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8ffb5fa3d..0136a9db0 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -659,7 +659,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
 // TODO: translate form.mail.report_subject.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 80766f902..433ed64d3 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -630,7 +630,6 @@
 'form.group_delete.hint' => 'Oled kindel, et soovid kogu gruppi kustutada?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Kellelt',
 'form.mail.to' => 'Kellele',
 'form.mail.report_subject' => 'Time Tracker raport',
 'form.mail.footer' => 'Anuko Time Tracker on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga <br>ajaarvestussüsteem. Lisainfo saamiseks külastage <a href="https://www.anuko.com">www.anuko.com</a> lehekülge.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3fedc3e22..3b767ea8d 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -644,7 +644,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'از',
 'form.mail.to' => 'به',
 'form.mail.report_subject' => 'گزارش تایم شیت',
 // TODO: translate form.mail.footer.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9a2c841c6..f895b34b2 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -627,7 +627,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Lähettäjä',
 'form.mail.to' => 'Vastaanottaja',
 'form.mail.report_subject' => 'Time Tracker -raportti',
 'form.mail.footer' => 'Anuko Time Tracker on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto. Lisätietoja sivulla <a href="https://www.anuko.com">www.anuko.com</a>.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index c3656c231..06b0550be 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -618,7 +618,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'De',
 'form.mail.to' => 'À',
 'form.mail.report_subject' => 'Rapport Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker est un système de gestion du temps, open source, simple et facile à utiliser. Visitez <a href="https://www.anuko.com">www.anuko.com</a> pour plus d\\\'informations.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 23ec5b88f..dc921299e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -610,7 +610,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Από',
 'form.mail.to' => 'Προς',
 'form.mail.report_subject' => 'Time Tracker αναφορά',
 'form.mail.footer' => 'Το Anuko Time Tracker είναι ένα απλό, εύχρηστο, ανοικτού κώδικα σύστημα παρακολούθησης χρόνου. Επισκεφθείτε τη διεύθυνση <a href="https://www.anuko.com">www.anuko.com</a> για περισσότερες πληροφορίες.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8dd36fdf4..f082be589 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -646,7 +646,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'מאת',
 'form.mail.to' => 'אל',
 'form.mail.report_subject' => 'דוח Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן. בקר באתר <a href="https://www.anuko.com">www.anuko.com</a> לפרטים נוספים.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e450a4d3f..02b1ef081 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -650,7 +650,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Feladó',
 'form.mail.to' => 'Címzett',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e48125e5f..f4c30d7cc 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -625,7 +625,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Da',
 'form.mail.to' => 'A',
 'form.mail.report_subject' => 'Rapporto Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker è un sistema semplice e open source <br>per registrare i tempi di lavoro. Visita <a href="https://www.anuko.com">www.anuko.com</a> per maggiori informazioni.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 511ac3037..0808b0bd2 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -653,7 +653,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'から',
 'form.mail.to' => 'まで',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 17e83f372..b92b05304 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -651,7 +651,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => '부터',
 'form.mail.to' => '까지', // TODO: is this correct? The meaning is that we send an email TO this person.
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 12890db33..35955b252 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -587,7 +587,6 @@
 'form.group_delete.hint' => 'Bent u er zeker van dat u de hele groep wilt verwijderen?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Van',
 'form.mail.to' => 'Aan',
 'form.mail.report_subject' => 'Time Tracker rapport',
 'form.mail.footer' => 'Anuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek <a href="https://www.anuko.com">www.anuko.com</a> voor meer informatie.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8cbb1c5bd..dc6ffa1f6 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -650,7 +650,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 09a3e3517..1c3c51dcd 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -630,7 +630,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Od',
 'form.mail.to' => 'Do',
 'form.mail.report_subject' => 'Raport Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker jest prostym, łatwym w użyciu, otwartoźródłowym<br>systemem śledzenia czasu. Odwiedź <a href="https://www.anuko.com">www.anuko.com</a>, aby uzyskać więcej informacji.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 6949d3bef..bcf76ad7f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -625,7 +625,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
 'form.mail.report_subject' => 'Relatório do Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker é um sistema, simples, de fácil uso, de código aberto,<br>de rastreamento do tempo. Visite <a href="https://www.anuko.com">www.anuko.com</a> para mais informações.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5232c5822..f607279b4 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -632,7 +632,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1a0586ea2..3014652df 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -653,7 +653,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'De la',
 'form.mail.to' => 'Catre',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 4c4b7ff8f..8d11e2bcd 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -564,7 +564,6 @@
 'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'От',
 'form.mail.to' => 'Кому',
 'form.mail.report_subject' => 'Time Tracker отчёт',
 'form.mail.footer' => 'Anuko Time Tracker - это открытая (open source), простая и лёгкая в использовании система трекинга рабочего времени. Подробности на сайте <a href="https://www.anuko.com">www.anuko.com</a>.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 26d91c217..e6f76e279 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -635,7 +635,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
 'form.mail.report_subject' => 'Time Tracker zostava',
 'form.mail.footer' => 'Anuko Time Tracker je jednoduchý a ľahko použiteľný systém na sledovanie času s otvoreným zdrojovým kódom.<br> Navštívte <a href="https://www.anuko.com">www.anuko.com</a> pre viac informácií.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b69c4ba0a..ce46d71a5 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -626,7 +626,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e6dbaeb5b..be48065bc 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -628,7 +628,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Forma mejla. Pogledajte primer na https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
 'form.mail.report_subject' => 'Evidencija vremena',
 'form.mail.footer' => 'Anuko Time Tracker je jednostavan i lak za korišćenje za praćenje <br>radnog vremena. Posetite <a href="https://www.anuko.com">www.anuko.com</a> za više informacija.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 7c1d468dd..de3b37b04 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -627,7 +627,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Från',
 'form.mail.to' => 'Till',
 'form.mail.report_subject' => 'Tidsrapport',
 'form.mail.footer' => 'Anuko Time Tracker är en lättanvänd applikation byggd med öppen källkod för att enkelt spåra och hålla koll på arbetstider. Besök <a href="https://www.anuko.com">www.anuko.com</a> för mer information.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c3ffd03f4..cb7e4ab91 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -666,7 +666,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => 'Kimden',
 'form.mail.to' => 'Kime',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index ddc48aff3..cc186b6bf 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -637,7 +637,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => '从',
 'form.mail.to' => '到',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index ca657fef9..bd10eecc4 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -643,7 +643,6 @@
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
-'form.mail.from' => '從',
 'form.mail.to' => '到',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a46a4552..ccba687b6 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">Anuko Time Tracker 1.19.23.5273 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5274 | 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>

From 16b64e409b21e48d3ede0bf903ff3b6fa0fafc64 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 Aug 2020 20:38:34 +0000
Subject: [PATCH 1267/1848] Removed no longer used enablePlugin() function.

---
 WEB-INF/lib/ttUser.class.php | 28 ----------------------------
 WEB-INF/templates/footer.tpl |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 331633e11..c1b771a2d 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -778,34 +778,6 @@ function markUserDeleted($user_id) {
     return true;
   }
 
-  // enablePlugin either enables or disables a specific plugin for group.
-  function enablePlugin($plugin, $enable = true)
-  {
-    if (!$this->can('manage_advanced_settings'))
-      return false; // Note: enablePlugin is currently only used on week_view.php.
-                    // So, it's not really a plugin we are enabling, but rather week view display options.
-                    // Therefore, a check for manage_advanced_settings, not manage_features.
-
-    $plugin_array = explode(',', $this->plugins);
-    if ($enable && !in_array($plugin, $plugin_array))
-      $plugin_array[] = $plugin; // Add plugin to array.
-
-    if (!$enable && in_array($plugin, $plugin_array)) {
-      $key = array_search($plugin, $plugin_array);
-      if ($key !== false)
-        unset($plugin_array[$key]); // Remove plugin from array.
-    }
-
-    $plugins = implode(',', $plugin_array);
-    if ($plugins != $this->plugins) {
-      if (!$this->updateGroup(array('plugins' => $plugins)))
-        return false;
-      $this->plugins = $plugins;
-    }
-
-    return true;
-  }
-
   // isUserValid determines if a user is valid for on behalf work.
   function isUserValid($user_id) {
     if ($user_id == $this->id)
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ccba687b6..2290a8307 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">Anuko Time Tracker 1.19.23.5274 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5275 | 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>

From 7ac1f44518da55cf0baaa11c880aeb1189283faf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 20 Aug 2020 21:01:12 +0000
Subject: [PATCH 1268/1848] Initial attempt to include custom fields in group
 by options in reports for user testing, with some known remaining issues.

---
 WEB-INF/lib/ttReportHelper.class.php | 297 +++++++++++++++------------
 WEB-INF/templates/footer.tpl         |   2 +-
 reports.php                          |   4 +-
 3 files changed, 162 insertions(+), 141 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 72c99df85..6229b5e9b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -281,7 +281,7 @@ static function getItems($options) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_field_name = 'show_'.$field_name;
-        if ($options[$checkbox_field_name]) {
+        if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
           if ($userField['type'] == CustomFields::TYPE_TEXT) {
             $ecfTableName = 'ecf'.$userField['id'];
             array_push($fields, "$ecfTableName.value as $field_name");
@@ -306,7 +306,7 @@ static function getItems($options) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_field_name = 'show_'.$field_name;
-        if ($options[$checkbox_field_name]) {
+        if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
           if ($timeField['type'] == CustomFields::TYPE_TEXT) {
             $cflTable = 'cfl'.$timeField['id'];
             array_push($fields, "$cflTable.value as $field_name");
@@ -382,7 +382,7 @@ static function getItems($options) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_field_name = 'show_'.$field_name;
         $entity_type = CustomFields::ENTITY_USER;
-        if ($options[$field_name] || $options[$checkbox_field_name]) {
+        if ($options[$field_name] || $options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
           $ecfTable = 'ecf'.$userField['id'];
           if ($userField['type'] == CustomFields::TYPE_TEXT) {
             // Add one join for each text field.
@@ -411,7 +411,7 @@ static function getItems($options) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_field_name = 'show_'.$field_name;
-        if ($options[$field_name] || $options[$checkbox_field_name]) {
+        if ($options[$field_name] || $options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
           $cflTable = 'cfl'.$timeField['id'];
           if ($timeField['type'] == CustomFields::TYPE_TEXT) {
             // Add one join for each text field.
@@ -469,7 +469,7 @@ static function getItems($options) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
-          if ($options[$checkbox_field_name]) {
+          if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
             if ($userField['type'] == CustomFields::TYPE_TEXT) {
               $ecfTableName = 'ecf'.$userField['id'];
               array_push($fields, "$ecfTableName.value as $field_name");
@@ -493,7 +493,7 @@ static function getItems($options) {
         foreach ($custom_fields->timeFields as $timeField) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_field_name = 'show_'.$field_name;
-          if ($options[$checkbox_field_name]) {
+          if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
             array_push($fields, "null as $field_name"); // null for each time custom field.
           }
         }
@@ -537,13 +537,13 @@ static function getItems($options) {
 
       // Prepare sql query part for left joins.
       $left_joins = null;
-      // Left joins for custom fields.
+      // Left joins for user custom fields.
       if ($custom_fields && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
           $entity_type = CustomFields::ENTITY_USER;
-          if ($options[$field_name] || $options[$checkbox_field_name]) {
+          if ($options[$field_name] || $options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
             $ecfTable = 'ecf'.$userField['id'];
             if ($userField['type'] == CustomFields::TYPE_TEXT) {
               // Add one join for each text field.
@@ -670,13 +670,14 @@ static function getSubtotals($options) {
     $mdb2 = getConnection();
 
     $concat_part = ttReportHelper::makeConcatPart($options);
+    $group_by_fields_part = ttReportHelper::makeGroupByFieldsPart($options);
     $work_unit_part = ttReportHelper::makeWorkUnitPart($options);
     $join_part = ttReportHelper::makeJoinPart($options);
     $cost_part = ttReportHelper::makeCostPart($options);
     $where = ttReportHelper::getWhere($options);
     $group_by_part = ttReportHelper::makeGroupByPart($options);
 
-    $parts = "$concat_part, sum(time_to_sec(l.duration)) as time, null as expenses".$work_unit_part.$cost_part;
+    $parts = $concat_part.$group_by_fields_part.", sum(time_to_sec(l.duration)) as time, null as expenses".$work_unit_part.$cost_part;
     $sql = "select $parts from tt_log l $join_part $where $group_by_part";
     // By now we have sql for time items.
 
@@ -1641,67 +1642,33 @@ static function makeGroupByKey($options, $row) {
     return $group_by_key;
   }
 
+  // makeSingleDropdownGroupByPart is a helper function for makeGroupByPart.
+  // It prepates a group by part corresponding to a single dropdown control.
+  static function makeSingleDropdownGroupByPart($dropdown_value, $options) {
+    if ($dropdown_value == null || $dropdown_value == 'no_grouping')
+      return null;
+    if ('date' == $dropdown_value)
+      return (', l.date');
+    if ('user' == $dropdown_value)
+      return (', u.name');
+    if ('client' == $dropdown_value)
+      return (', c.name');
+    if ('project' == $dropdown_value)
+      return (', p.name');
+    if ('task' == $dropdown_value)
+      return (', t.name');
+    if (ttReportHelper::groupingBy($dropdown_value, $options))
+      return (", $dropdown_value");
+  }
+
   // makeGroupByPart builds a combined group by part for sql query for time items using group_by1,
   // group_by2, and group_by3 values passed in $options.
   static function makeGroupByPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
-    $group_by1 = $options['group_by1'];
-    $group_by2 = $options['group_by2'];
-    $group_by3 = $options['group_by3'];
-
-    // TODO: redo this using the if instead so that we can include custom fields properly.
-    switch ($group_by1) {
-      case 'date':
-        $group_by_parts .= ', l.date';
-        break;
-      case 'user':
-        $group_by_parts .= ', u.name';
-        break;
-      case 'client':
-        $group_by_parts .= ', c.name';
-        break;
-      case 'project':
-        $group_by_parts .= ', p.name';
-        break;
-      case 'task':
-        $group_by_parts .= ', t.name';
-        break;
-    }
-    switch ($group_by2) {
-      case 'date':
-        $group_by_parts .= ', l.date';
-        break;
-      case 'user':
-        $group_by_parts .= ', u.name';
-        break;
-      case 'client':
-        $group_by_parts .= ', c.name';
-        break;
-      case 'project':
-        $group_by_parts .= ', p.name';
-        break;
-      case 'task':
-        $group_by_parts .= ', t.name';
-        break;
-    }
-    switch ($group_by3) {
-      case 'date':
-        $group_by_parts .= ', l.date';
-        break;
-      case 'user':
-        $group_by_parts .= ', u.name';
-        break;
-      case 'client':
-        $group_by_parts .= ', c.name';
-        break;
-      case 'project':
-        $group_by_parts .= ', p.name';
-        break;
-      case 'task':
-        $group_by_parts .= ', t.name';
-        break;
-    }
+    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by1'], $options);
+    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by2'], $options);
+    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by3'], $options);
     // Remove garbage from the beginning.
     $group_by_parts = ltrim($group_by_parts, ', ');
     $group_by_part = "group by $group_by_parts";
@@ -1769,80 +1736,136 @@ static function makeGroupByExpensesPart($options) {
     return $group_by_part;
   }
 
-  // makeConcatPart builds a concatenation part for getSubtotals query (for time items).
-  static function makeConcatPart($options) {
-    $group_by1 = $options['group_by1'];
-    $group_by2 = $options['group_by2'];
-    $group_by3 = $options['group_by3'];
+  // makeSingleDropdownConcatPart is a helper function for makeConcatPart.
+  // It make a concatenation part for getSubtotals query for time items
+  // corresponding to a single dropdown control.
+  static function makeSingleDropdownConcatPart($dropdown_value, $options) {
+    if ($dropdown_value == null || $dropdown_value == 'no_grouping')
+      return null;
+    if ('date' == $dropdown_value)
+      return (", ' - ', l.date");
+    if ('user' == $dropdown_value)
+      return (", ' - ', u.name");
+    if ('client' == $dropdown_value)
+      return (", ' - ', coalesce(c.name, 'Null')");
+    if ('project' == $dropdown_value)
+      return (", ' - ', coalesce(p.name, 'Null')");
+    if ('task' == $dropdown_value)
+      return (", ' - ', coalesce(t.name, 'Null')");
+    if (ttReportHelper::groupingBy($dropdown_value, $options)) {
+      return ttReportHelper::makeSingleDropdownConcatCustomFieldPart($dropdown_value);
+    }
+  }
 
-    switch ($group_by1) {
-      case 'date':
-        $what_to_concat .= ", ' - ', l.date";
-        break;
-      case 'user':
-        $what_to_concat .= ", ' - ', u.name";
-        $fields_part .= ', u.name as user';
-        break;
-      case 'client':
-        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
-        $fields_part .= ', c.name as client';
-        break;
-      case 'project':
-        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
-        $fields_part .= ', p.name as project';
-        break;
-      case 'task':
-        $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
-        $fields_part .= ', t.name as task';
-        break;
+  // makeSingleDropdownConcatCustomFieldPart is a helper function for makeSingleDropdownConcatPart.
+  // It prepares the part when a custom field is selected.
+  static function makeSingleDropdownConcatCustomFieldPart($dropdown_value) {
+    global $custom_fields;
+
+    // Iterate through time custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(ecf".$userField['id'].".value, 'Null')");
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$userField['id'].".value, 'Null')");
+          }
+        }
+      }
     }
-    switch ($group_by2) {
-      case 'date':
-        $what_to_concat .= ", ' - ', l.date";
-        break;
-      case 'user':
-        $what_to_concat .= ", ' - ', u.name";
-        $fields_part .= ', u.name as user';
-        break;
-      case 'client':
-        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
-        $fields_part .= ', c.name as client';
-        break;
-      case 'project':
-        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
-        $fields_part .= ', p.name as project';
-        break;
-      case 'task':
-        $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
-        $fields_part .= ', t.name as task';
-        break;
+    // Iterate through time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(cfl".$timeField['id'].".value, 'Null')");
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$timeField['id'].".value, 'Null')");
+          }
+        }
+      }
     }
-    switch ($group_by3) {
-      case 'date':
-        $what_to_concat .= ", ' - ', l.date";
-        break;
-      case 'user':
-        $what_to_concat .= ", ' - ', u.name";
-        $fields_part .= ', u.name as user';
-        break;
-      case 'client':
-        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
-        $fields_part .= ', c.name as client';
-        break;
-      case 'project':
-        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
-        $fields_part .= ', p.name as project';
-        break;
-      case 'task':
-        $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')";
-        $fields_part .= ', t.name as task';
-        break;
+    return null;
+  }
+
+  // makeSingleDropdownGroupByFieldPart is a helper function for makeGroupByFieldsPart.
+  // It make a fields part for getSubtotals query for time items
+  // corresponding to a single group by dropdown control.
+  static function makeSingleDropdownGroupByFieldPart($dropdown_value, $options) {
+    if ($dropdown_value == null || $dropdown_value == 'no_grouping')
+      return null;
+    if ('user' == $dropdown_value)
+      return (', u.name as user');
+    if ('client' == $dropdown_value)
+      return (', c.name as client');
+    if ('project' == $dropdown_value)
+      return (', p.name as project');
+    if ('task' == $dropdown_value)
+      return (', t.name as task');
+    if (ttReportHelper::groupingBy($dropdown_value, $options)) {
+      return ttReportHelper::makeSingleDropdownGroupByCustomFieldPart($dropdown_value);
     }
-    // Remove garbage from both ends.
-    $what_to_concat = trim($what_to_concat, "', -");
-    $concat_part = "concat($what_to_concat) as group_field";
-    $concat_part = trim($concat_part, ' -');
-    return "$concat_part $fields_part";
+  }
+
+  // makeSingleDropdownGroupByCustomFieldPart is a helper function for makeGroupByFieldsPart.
+  // It prepares the part when a custom field is selected.
+  static function makeSingleDropdownGroupByCustomFieldPart($dropdown_value) {
+    global $custom_fields;
+
+    // Iterate through time custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ecf".$userField['id'].".value as $field_name");
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$userField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
+    // Iterate through time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            return (", cfl".$timeField['id'].".value as $field_name");
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$timeField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
+    return null;
+  }
+
+  // makeGroupByFieldsPart builds a list of fields for sql query for time items using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByFieldsPart($options) {
+    if (!ttReportHelper::grouping($options)) return null;
+
+    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by1'], $options);
+    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by2'], $options);
+    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by3'], $options);
+    return $group_by_fields_parts;
+  }
+
+  // makeConcatPart builds a concatenation part for getSubtotals query (for time items).
+  static function makeConcatPart($options) {
+    if (!ttReportHelper::grouping($options)) return null;
+
+    $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by1'], $options);
+    $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by2'], $options);
+    $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by3'], $options);
+    // Remove garbage from the beginning.
+    $concat_part = trim($concat_part, "', -");
+    $concat_part = "concat($concat_part) as group_field";
+    return $concat_part;
   }
 
   // makeConcatPart builds a concatenation part for getSubtotals query (for expense items).
@@ -2006,7 +2029,7 @@ static function makeJoinPart($options) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = $options[$field_name];
-        if ($field_value) {
+        if ($field_value || ttReportHelper::groupingBy($field_name, $options)) {
           $cflTable = 'cfl'.$timeField['id'];
           if ($timeField['type'] == CustomFields::TYPE_TEXT) {
             // Add one join for each text field.
@@ -2026,7 +2049,7 @@ static function makeJoinPart($options) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
         $entity_type = CustomFields::ENTITY_USER;
-        if ($field_value) {
+        if ($field_value || ttReportHelper::groupingBy($field_name, $options)) {
           // We need to add left joins when input is not null.
           $ecfTable = 'ecf'.$userField['id'];
           if ($userField['type'] == CustomFields::TYPE_TEXT) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2290a8307..a0bfa83b9 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">Anuko Time Tracker 1.19.23.5275 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5276 | 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/reports.php b/reports.php
index 253652b94..94b837cc1 100644
--- a/reports.php
+++ b/reports.php
@@ -357,8 +357,6 @@
 if (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
 // If we have time custom fields - add group by options for them.
-/*
- * This is unfinished work in progress.
 if ($custom_fields && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
@@ -371,7 +369,7 @@
     $field_name = 'user_field_'.$userField['id'];
     $group_by_options[$field_name] = $userField['label'];
   }
-}*/
+}
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
 if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));

From a33fc4c1ebcc8bf8ded9c7d0583f7a8269d7b5b7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Aug 2020 17:27:54 +0000
Subject: [PATCH 1269/1848] Fixed reports for expenses when grouped by various
 custom fields.

---
 WEB-INF/lib/ttReportHelper.class.php | 284 +++++++++++++++------------
 WEB-INF/templates/footer.tpl         |   2 +-
 2 files changed, 156 insertions(+), 130 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 6229b5e9b..655b32ab3 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -685,12 +685,14 @@ static function getSubtotals($options) {
     if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
       $concat_part = ttReportHelper::makeConcatExpensesPart($options);
+      $group_by_fields_part = ttReportHelper::makeGroupByFieldsExpensesPart($options);
       $join_part = ttReportHelper::makeJoinExpensesPart($options);
       $where = ttReportHelper::getExpenseWhere($options);
       $group_by_expenses_part = ttReportHelper::makeGroupByExpensesPart($options);
-      $sql_for_expenses = "select $concat_part, null as time";
-      if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
-      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_expenses_part";
+      $parts = $concat_part.$group_by_fields_part.", null as time";
+      if ($options['show_work_units']) $parts .= ", null as units";
+      $parts .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses";
+      $sql_for_expenses = "select $parts from tt_expense_items ei $join_part $where $group_by_expenses_part";
 
       // Create a combined query.
       $fields = ttReportHelper::makeCombinedSelectPart($options);
@@ -1675,64 +1677,34 @@ static function makeGroupByPart($options) {
     return $group_by_part;
   }
 
+  // makeSingleDropdownGroupByExpensesPart is a helper function for makeGroupByExpensesPart.
+  // It prepates a group by part corresponding to a single dropdown control.
+  static function makeSingleDropdownGroupByExpensesPart($dropdown_value, $options) {
+    if ($dropdown_value == null || $dropdown_value == 'no_grouping')
+      return null;
+    if ('date' == $dropdown_value)
+      return (', ei.date');
+    if ('user' == $dropdown_value)
+      return (', u.name');
+    if ('client' == $dropdown_value)
+      return (', c.name');
+    if ('project' == $dropdown_value)
+      return (', p.name');
+    if (ttReportHelper::groupingBy($dropdown_value, $options))
+      return (", $dropdown_value");
+  }
+
   // makeGroupByExpensesPart builds a combined group by part for sql query for expense items using
   // group_by1, group_by2, and group_by3 values passed in $options.
   static function makeGroupByExpensesPart($options) {
-    $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
-      ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
-      ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
-    if ($no_grouping) return null;
-
-    $group_by1 = $options['group_by1'];
-    $group_by2 = $options['group_by2'];
-    $group_by3 = $options['group_by3'];
+    if (!ttReportHelper::grouping($options)) return null;
 
-    switch ($group_by1) {
-      case 'date':
-        $group_by_parts .= ', ei.date';
-        break;
-      case 'user':
-        $group_by_parts .= ', u.name';
-        break;
-      case 'client':
-        $group_by_parts .= ', c.name';
-        break;
-      case 'project':
-        $group_by_parts .= ', p.name';
-        break;
-    }
-    switch ($group_by2) {
-      case 'date':
-        $group_by_parts .= ', ei.date';
-        break;
-      case 'user':
-        $group_by_parts .= ', u.name';
-        break;
-      case 'client':
-        $group_by_parts .= ', c.name';
-        break;
-      case 'project':
-        $group_by_parts .= ', p.name';
-        break;
-    }
-    switch ($group_by3) {
-      case 'date':
-        $group_by_parts .= ', ei.date';
-        break;
-      case 'user':
-        $group_by_parts .= ', u.name';
-        break;
-      case 'client':
-        $group_by_parts .= ', c.name';
-        break;
-      case 'project':
-        $group_by_parts .= ', p.name';
-        break;
-    }
+    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByExpensesPart($options['group_by1'], $options);
+    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByExpensesPart($options['group_by2'], $options);
+    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByExpensesPart($options['group_by3'], $options);
     // Remove garbage from the beginning.
     $group_by_parts = ltrim($group_by_parts, ', ');
-    if ($group_by_parts)
-      $group_by_part = "group by $group_by_parts";
+    $group_by_part = "group by $group_by_parts";
     return $group_by_part;
   }
 
@@ -1762,7 +1734,7 @@ static function makeSingleDropdownConcatPart($dropdown_value, $options) {
   static function makeSingleDropdownConcatCustomFieldPart($dropdown_value) {
     global $custom_fields;
 
-    // Iterate through time custom fields.
+    // Iterate through user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -1791,6 +1763,40 @@ static function makeSingleDropdownConcatCustomFieldPart($dropdown_value) {
     return null;
   }
 
+  // makeSingleDropdownConcatCustomFieldExpensesPart is a helper function for makeSingleDropdownConcatExpensesPart.
+  // It prepares the part when a custom field is selected.
+  static function makeSingleDropdownConcatCustomFieldExpensesPart($dropdown_value) {
+    global $custom_fields;
+
+    // Iterate through user custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(ecf".$userField['id'].".value, 'Null')");
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$userField['id'].".value, 'Null')");
+          }
+        }
+      }
+    }
+    // Iterate through time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', 'Null'");
+          } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', 'Null'");
+          }
+        }
+      }
+    }
+    return null;
+  }
+
   // makeSingleDropdownGroupByFieldPart is a helper function for makeGroupByFieldsPart.
   // It make a fields part for getSubtotals query for time items
   // corresponding to a single group by dropdown control.
@@ -1815,7 +1821,7 @@ static function makeSingleDropdownGroupByFieldPart($dropdown_value, $options) {
   static function makeSingleDropdownGroupByCustomFieldPart($dropdown_value) {
     global $custom_fields;
 
-    // Iterate through time custom fields.
+    // Iterate through user custom fields.
     if ($custom_fields && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -1844,6 +1850,36 @@ static function makeSingleDropdownGroupByCustomFieldPart($dropdown_value) {
     return null;
   }
 
+  // makeSingleDropdownGroupByCustomFieldExpensesPart is a helper function for makeGroupByFieldsPart.
+  // It prepares the part when a custom field is selected.
+  static function makeSingleDropdownGroupByCustomFieldExpensesPart($dropdown_value) {
+    global $custom_fields;
+
+    // Iterate through user custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($userField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ecf".$userField['id'].".value as $field_name");
+          } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$userField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
+    // Iterate through time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($dropdown_value == $field_name) {
+          return (", null as $field_name");
+        }
+      }
+    }
+    return null;
+  }
+
   // makeGroupByFieldsPart builds a list of fields for sql query for time items using group_by1,
   // group_by2, and group_by3 values passed in $options.
   static function makeGroupByFieldsPart($options) {
@@ -1855,6 +1891,17 @@ static function makeGroupByFieldsPart($options) {
     return $group_by_fields_parts;
   }
 
+  // makeGroupByFieldsExpensesPart builds a list of fields for sql query for expense items using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByFieldsExpensesPart($options) {
+    if (!ttReportHelper::grouping($options)) return null;
+
+    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by1'], $options);
+    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by2'], $options);
+    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by3'], $options);
+    return $group_by_fields_parts;
+  }
+
   // makeConcatPart builds a concatenation part for getSubtotals query (for time items).
   static function makeConcatPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
@@ -1863,85 +1910,64 @@ static function makeConcatPart($options) {
     $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by2'], $options);
     $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by3'], $options);
     // Remove garbage from the beginning.
-    $concat_part = trim($concat_part, "', -");
+    if (ttStartsWith($concat_part, ", ' - ', "))
+      $concat_part = substr($concat_part, 9);
     $concat_part = "concat($concat_part) as group_field";
     return $concat_part;
   }
 
+  // makeSingleDropdownConcatExpensesPart is a helper function for makeConcatExpensesPart.
+  // It make a concatenation part for getSubtotals query for expense items
+  // corresponding to a single dropdown control.
+  static function makeSingleDropdownConcatExpensesPart($dropdown_value, $options) {
+    if ($dropdown_value == null || $dropdown_value == 'no_grouping')
+      return null;
+    if ('date' == $dropdown_value)
+      return (", ' - ', ei.date");
+    if ('user' == $dropdown_value)
+      return (", ' - ', u.name");
+    if ('client' == $dropdown_value)
+      return (", ' - ', coalesce(c.name, 'Null')");
+    if ('project' == $dropdown_value)
+      return (", ' - ', coalesce(p.name, 'Null')");
+    if ('task' == $dropdown_value)
+      return (", ' - ', 'Null'");
+    if (ttReportHelper::groupingBy($dropdown_value, $options)) {
+      return ttReportHelper::makeSingleDropdownConcatCustomFieldExpensesPart($dropdown_value);
+    }
+  }
+
   // makeConcatPart builds a concatenation part for getSubtotals query (for expense items).
   static function makeConcatExpensesPart($options) {
-    $group_by1 = $options['group_by1'];
-    $group_by2 = $options['group_by2'];
-    $group_by3 = $options['group_by3'];
+    if (!ttReportHelper::grouping($options)) return null;
 
-    switch ($group_by1) {
-      case 'date':
-        $what_to_concat .= ", ' - ', ei.date";
-        break;
-      case 'user':
-        $what_to_concat .= ", ' - ', u.name";
-        $fields_part .= ', u.name as user';
-        break;
-      case 'client':
-        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
-        $fields_part .= ', c.name as client';
-        break;
-      case 'project':
-        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
-        $fields_part .= ', p.name as project';
-        break;
-      case 'task':
-        $what_to_concat .= ", ' - ', 'Null'";
-        $fields_part .= ', null as task';
-        break;
-    }
-    switch ($group_by2) {
-      case 'date':
-        $what_to_concat .= ", ' - ', ei.date";
-        break;
-      case 'user':
-        $what_to_concat .= ", ' - ', u.name";
-        $fields_part .= ', u.name as user';
-        break;
-      case 'client':
-        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
-        $fields_part .= ', c.name as client';
-        break;
-      case 'project':
-        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
-        $fields_part .= ', p.name as project';
-        break;
-      case 'task':
-        $what_to_concat .= ", ' - ', 'Null'";
-        $fields_part .= ', null as task';
-        break;
-    }
-    switch ($group_by3) {
-      case 'date':
-        $what_to_concat .= ", ' - ', ei.date";
-        break;
-      case 'user':
-        $what_to_concat .= ", ' - ', u.name";
-        $fields_part .= ', u.name as user';
-        break;
-      case 'client':
-        $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')";
-        $fields_part .= ', c.name as client';
-        break;
-      case 'project':
-        $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')";
-        $fields_part .= ', p.name as project';
-        break;
-      case 'task':
-        $what_to_concat .= ", ' - ', 'Null'";
-        $fields_part .= ', null as task';
-        break;
-    }
+    $concat_part .= ttReportHelper::makeSingleDropdownConcatExpensesPart($options['group_by1'], $options);
+    $concat_part .= ttReportHelper::makeSingleDropdownConcatExpensesPart($options['group_by2'], $options);
+    $concat_part .= ttReportHelper::makeSingleDropdownConcatExpensesPart($options['group_by3'], $options);
     // Remove garbage from the beginning.
-    if ($what_to_concat)
-        $what_to_concat = substr($what_to_concat, 8);
-    $concat_part = "concat($what_to_concat) as group_field";
-    return "$concat_part $fields_part";
+    if (ttStartsWith($concat_part, ", ' - ', "))
+      $concat_part = substr($concat_part, 9);
+    $concat_part = "concat($concat_part) as group_field";
+    return $concat_part;
+  }
+
+  // makeSingleDropdownGroupByFieldExpensesPart is a helper function for makeGroupByFieldsExpensesPart.
+  // It make a fields part for getSubtotals query for expense items
+  // corresponding to a single group by dropdown control.
+  static function makeSingleDropdownGroupByFieldExpensesPart($dropdown_value, $options) {
+    if ($dropdown_value == null || $dropdown_value == 'no_grouping')
+      return null;
+    if ('user' == $dropdown_value)
+      return (', u.name as user');
+    if ('client' == $dropdown_value)
+      return (', c.name as client');
+    if ('project' == $dropdown_value)
+      return (', p.name as project');
+    if ('task' == $dropdown_value)
+      return (', null as task');
+    if (ttReportHelper::groupingBy($dropdown_value, $options)) {
+      return ttReportHelper::makeSingleDropdownGroupByCustomFieldExpensesPart($dropdown_value);
+    }
   }
 
   // makeCombinedSelectPart builds a list of fields for a combined select on a union for getSubtotals.
@@ -2137,7 +2163,7 @@ static function makeJoinExpensesPart($options) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
         $entity_type = CustomFields::ENTITY_USER;
-        if ($field_value) {
+        if ($field_value || ttReportHelper::groupingBy($field_name, $options)) {
           // We need to add left joins when input is not null.
           $ecfTable = 'ecf'.$userField['id'];
           if ($userField['type'] == CustomFields::TYPE_TEXT) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a0bfa83b9..2f7b9a148 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">Anuko Time Tracker 1.19.23.5276 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5277 | 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>

From 5e8379fccfbc3a20fb6653b64278000f59638f89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Aug 2020 23:37:29 +0000
Subject: [PATCH 1270/1848] Fixed totals only reports when grouping by time
 custom fields to eliminate multiple rows.

---
 WEB-INF/lib/ttReportHelper.class.php | 6 +++---
 WEB-INF/templates/footer.tpl         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 655b32ab3..0a1f4b803 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -701,7 +701,7 @@ static function getSubtotals($options) {
       $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by $fields";
       $sql = $combined;
     }
-
+//die($sql);
     // Execute query.
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
@@ -2059,11 +2059,11 @@ static function makeJoinPart($options) {
           $cflTable = 'cfl'.$timeField['id'];
           if ($timeField['type'] == CustomFields::TYPE_TEXT) {
             // Add one join for each text field.
-            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].")";
           } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
             $cfoTable = 'cfo'.$timeField['id'];
             // Add two joins for each dropdown field.
-            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1)";
+            $left_joins .= " left join tt_custom_field_log $cflTable on ($cflTable.log_id = l.id and $cflTable.status = 1 and $cflTable.field_id = ".$timeField['id'].")";
             $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $cflTable.field_id and $cfoTable.id = $cflTable.option_id)";
           }
         }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 2f7b9a148..1e95b9a39 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">Anuko Time Tracker 1.19.23.5277 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5278 | 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>

From ffb49a46ad93331209e9286ba38ebe8cbf5bff63 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Aug 2020 13:04:10 +0000
Subject: [PATCH 1271/1848] Fixed headers in totals only reports when grouping
 by custom fields.

---
 WEB-INF/lib/ttReportHelper.class.php | 50 +++++++++++++++++++++++-----
 WEB-INF/templates/footer.tpl         |  2 +-
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 0a1f4b803..c48cfb265 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -2199,12 +2199,47 @@ static function groupingBy($what, $options) {
     return $grouping;
   }
 
-  // makeGroupByHeader builds a column header for a totals-only report using group_by1,
-  // group_by2, and group_by3 values passed in $options.
-  static function makeGroupByHeader($options) {
+  // makeGroupByHeaderdPart is a helper function for makeGroupByHeader.
+  // It obtains a part of the header associated with a single group by dropdown.
+  static function makeGroupByHeaderPart($dropdown_value) {
     global $i18n;
     global $custom_fields;
 
+    // First, try to get a label from a translation file, which is the most likely scenario
+    // such as grouping by date, user, project, or task.
+    $key = 'label.'.$dropdown_value;
+    $part = $i18n->get($key);
+    if ($part) return $part;
+
+    // If label is not found in translation file, we may be grouping by a custom field.
+    // Obtain custom field label if so.
+
+    // Process time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($custom_fields->timeFields as $timeField) {
+        $field_name = 'time_field_'.$timeField['id'];
+        if ($dropdown_value == $field_name) {
+          return $timeField['label'];
+        }
+      }
+    }
+    // Process user custom fields.
+    if ($custom_fields && $custom_fields->userFields) {
+      foreach ($custom_fields->userFields as $userField) {
+        $field_name = 'user_field_'.$userField['id'];
+        if ($dropdown_value == $field_name) {
+          return $userField['label'];
+        }
+      }
+    }
+
+    // Return null if nothing is found.
+    return null;
+  }
+
+  // makeGroupByHeader builds a column header for a totals-only report using group_by1,
+  // group_by2, and group_by3 values passed in $options.
+  static function makeGroupByHeader($options) {
     $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
       ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
       ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
@@ -2213,20 +2248,17 @@ static function makeGroupByHeader($options) {
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
-      $key = 'label.'.$group_by1;
-      $group_by_header .= ' - '.$i18n->get($key);
+      $group_by_header .= ' - '.ttReportHelper::makeGroupByHeaderPart($group_by1);
     }
     if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
       // We have group_by2.
       $group_by2 = $options['group_by2'];
-      $key = 'label.'.$group_by2;
-      $group_by_header .= ' - '.$i18n->get($key);
+      $group_by_header .= ' - '.ttReportHelper::makeGroupByHeaderPart($group_by2);
     }
     if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
       // We have group_by3.
       $group_by3 = $options['group_by3'];
-      $key = 'label.'.$group_by3;
-      $group_by_header .= ' - '.$i18n->get($key);
+      $group_by_header .= ' - '.ttReportHelper::makeGroupByHeaderPart($group_by3);
     }
     $group_by_header = ltrim($group_by_header, ' -');
     return $group_by_header;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1e95b9a39..e50ec2e1e 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">Anuko Time Tracker 1.19.23.5278 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5279 | 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>

From 265283090e39161683fb68690ce30b27a0475bf8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Aug 2020 14:24:49 +0000
Subject: [PATCH 1272/1848] Cosmetic improvment in comment.

---
 WEB-INF/lib/ttReportHelper.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c48cfb265..e090af6f4 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -665,6 +665,9 @@ static function getFromSession() {
   // getSubtotals calculates report items subtotals when a report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
+  // getSubtotals uses helper functions such as makeConcatPart and others to get parts to assemble an sql query from.
+  // Query may become quite complex depending on $options, whether custom fields are used, etc.
+  // This is the reason for having individual functions for parts (to keep getSubtotals easier to manage).
   static function getSubtotals($options) {
     global $user;
     $mdb2 = getConnection();
@@ -701,7 +704,7 @@ static function getSubtotals($options) {
       $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by $fields";
       $sql = $combined;
     }
-//die($sql);
+
     // Execute query.
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());

From 369d91a563b2d0812c2f8271be8a26024607100e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 31 Aug 2020 22:49:10 +0000
Subject: [PATCH 1273/1848] Cosmetic link fix.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 70fd57398..f3b7987ef 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 Anuko [Time Tracker](https://www.anuko.com/time-tracker/index.htm) is a simple, easy to use, open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
 
 ## Free Hosting
-[Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time_tracker/free_hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
+[Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time-tracker/free-hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
 
 ## Resources
 * Project home page: https://www.anuko.com/time-tracker/index.htm

From dcd9548e4ac0b5b307a3427361d7508a2119a3d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 3 Sep 2020 18:20:53 +0000
Subject: [PATCH 1274/1848] Refactored password_reset.php for consistency of
 success and error messages display.

---
 WEB-INF/templates/footer.tpl         |  2 +-
 WEB-INF/templates/password_reset.tpl |  6 ------
 password_reset.php                   | 16 +++++++++-------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e50ec2e1e..bb92ff430 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">Anuko Time Tracker 1.19.23.5279 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5280 | 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/password_reset.tpl b/WEB-INF/templates/password_reset.tpl
index 93c5d49db..a8dadf957 100644
--- a/WEB-INF/templates/password_reset.tpl
+++ b/WEB-INF/templates/password_reset.tpl
@@ -2,11 +2,6 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $result_message}
-      <table cellspacing="4" cellpadding="7" border="0" width="100%">
-        <tr><td align="center"><font color="red"><b>{$result_message}</b></font></td></tr>
-      </table>
-{else}
       <table>
         <tr>
           <td align="right">{$i18n.label.login}:</td>
@@ -20,7 +15,6 @@
           <td colspan="3" align="center">{$forms.resetPasswordForm.btn_submit.control}</td>
         </tr>
       </table>
-{/if}
     </td>
   </tr>
 </table>
diff --git a/password_reset.php b/password_reset.php
index bbb54adb5..8e3badbc4 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -88,10 +88,10 @@
 
     if ($receiver) {
       import('mail.Mailer');
-      $sender = new Mailer();
-      $sender->setCharSet(CHARSET);
-      $sender->setSender(SENDER);
-      $sender->setReceiver("$receiver");
+      $mailer = new Mailer();
+      $mailer->setCharSet(CHARSET);
+      $mailer->setSender(SENDER);
+      $mailer->setReceiver("$receiver");
       if ((!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) || ($_SERVER['SERVER_PORT'] == 443))
         $secure_connection = true;
       if($secure_connection)
@@ -105,9 +105,11 @@
       else
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
 
-      $sender->setMailMode(MAIL_MODE);
-      $res = $sender->send($cl_subject, sprintf($user_i18n->get('form.reset_password.email_body'), $_SERVER['REMOTE_ADDR'], $pass_edit_url));
-      $smarty->assign('result_message', $res ? $i18n->get('form.reset_password.message') : $i18n->get('error.mail_send'));
+      $mailer->setMailMode(MAIL_MODE);
+      if ($mailer->send($cl_subject, sprintf($user_i18n->get('form.reset_password.email_body'), $_SERVER['REMOTE_ADDR'], $pass_edit_url)))
+        $msg->add($i18n->get('form.reset_password.message'));
+      else
+        $err->add($i18n->get('error.mail_send'));
     }
   }
 } // isPost

From b5170d623c7f174639586e9ed3f4dd6b6323dac4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Sep 2020 16:29:57 +0000
Subject: [PATCH 1275/1848] Introduced a configurable php session cookie name.

---
 WEB-INF/config.php.dist      | 8 +++++++-
 WEB-INF/templates/footer.tpl | 2 +-
 initialize.php               | 9 ++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 89cbd3965..89ec98a1a 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -71,9 +71,15 @@ define('DIR_NAME', '');
 define('WEEKEND_START_DAY', 6);
 
 
+// SESSION_COOKIE_NAME
+//
+// PHP session cookie name. 
+// define('SESSION_COOKIE_NAME', 'tt_PHPSESSID');
+
+
 // PHPSESSID_TTL
 //
-// Lifetime in seconds for tt_PHPSESSID cookie. Time to live is extended by this value
+// Lifetime in seconds for session cookie. Time to live is extended by this value
 // with each visit to the site so that users don't have to re-login. 
 // define('PHPSESSID_TTL', 86400);
 //
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bb92ff430..1604f7e48 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">Anuko Time Tracker 1.19.23.5280 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5281 | 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/initialize.php b/initialize.php
index a1393f6e6..b4f8e2aa4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -90,16 +90,19 @@
   ini_set('session.gc_probability', 1);
 }
 
+// "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.
+if (!defined('SESSION_COOKIE_NAME')) define('SESSION_COOKIE_NAME', 'tt_PHPSESSID');
+
 // Set session cookie lifetime.
 session_set_cookie_params($phpsessid_ttl);
-if (isset($_COOKIE['tt_PHPSESSID'])) {
+if (isset($_COOKIE[SESSION_COOKIE_NAME])) {
   // Extend PHP session cookie lifetime by PHPSESSID_TTL (if defined, otherwise 24 hours) 
   // so that users don't have to re-login during this period from now. 
-  setcookie('tt_PHPSESSID', $_COOKIE['tt_PHPSESSID'],  time() + $phpsessid_ttl, '/');
+  setcookie(SESSION_COOKIE_NAME, $_COOKIE[SESSION_COOKIE_NAME],  time() + $phpsessid_ttl, '/');
 }
 
 // Start or resume PHP session.
-session_name('tt_PHPSESSID'); // "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.
+session_name(SESSION_COOKIE_NAME);
 @session_start();
 
 // Authorization.

From 47c8e993fe8947e44c61aff455881f2b400ce705 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Sep 2020 17:05:38 +0000
Subject: [PATCH 1276/1848] Introduced a configurable login cookie name.

---
 WEB-INF/config.php.dist      | 8 +++++++-
 WEB-INF/lib/Auth.class.php   | 2 +-
 WEB-INF/templates/footer.tpl | 2 +-
 initialize.php               | 1 +
 login.php                    | 4 ++--
 mobile/login.php             | 4 ++--
 mobile/user_delete.php       | 6 +++---
 mobile/user_edit.php         | 8 ++++----
 password_change.php          | 2 +-
 register.php                 | 2 +-
 user_delete.php              | 6 +++---
 user_edit.php                | 8 ++++----
 12 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 89ec98a1a..4db71fad4 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -73,7 +73,7 @@ define('WEEKEND_START_DAY', 6);
 
 // SESSION_COOKIE_NAME
 //
-// PHP session cookie name. 
+// PHP session cookie name.
 // define('SESSION_COOKIE_NAME', 'tt_PHPSESSID');
 
 
@@ -93,6 +93,12 @@ define('WEEKEND_START_DAY', 6);
 // define('PHP_SESSION_PATH', '/tmp/timetracker'); // Directory must exist and be writable.
 
 
+// LOGIN_COOKIE_NAME
+//
+// Cookie name for user login to remember it between browser sessions.
+// define('LOGIN_COOKIE_NAME', 'tt_login');
+
+
 // Forum and help links from the main menu.
 //
 define('FORUM_LINK', 'https://www.anuko.com/forum/viewforum.php?f=4');
diff --git a/WEB-INF/lib/Auth.class.php b/WEB-INF/lib/Auth.class.php
index ecb48340b..ccf2d915d 100644
--- a/WEB-INF/lib/Auth.class.php
+++ b/WEB-INF/lib/Auth.class.php
@@ -32,7 +32,7 @@ class Auth {
   function isAuthenticated() {
     if (isset($_SESSION['authenticated'])) {
 // This check does not work properly because we are not getting here. Need to improve.
-//        if (!isset($_COOKIE['tt_login'])) {
+//        if (!isset($_COOKIE[LOGIN_COOKIE_NAME])) {
 //          die ("Your browser's cookie functionality is turned off. Please turn it on.");
 //        }
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1604f7e48..46628ad7b 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">Anuko Time Tracker 1.19.23.5281 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5282 | 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/initialize.php b/initialize.php
index b4f8e2aa4..4c526a13b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -92,6 +92,7 @@
 
 // "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.
 if (!defined('SESSION_COOKIE_NAME')) define('SESSION_COOKIE_NAME', 'tt_PHPSESSID');
+if (!defined('LOGIN_COOKIE_NAME')) define('LOGIN_COOKIE_NAME', 'tt_login');
 
 // Set session cookie lifetime.
 session_set_cookie_params($phpsessid_ttl);
diff --git a/login.php b/login.php
index 8185203a3..705692045 100644
--- a/login.php
+++ b/login.php
@@ -32,7 +32,7 @@
 import('ttUser');
 
 $cl_login = $request->getParameter('login');
-if ($cl_login == null && $request->isGet()) $cl_login = @$_COOKIE['tt_login'];
+if ($cl_login == null && $request->isGet()) $cl_login = @$_COOKIE[LOGIN_COOKIE_NAME];
 $cl_password = $request->getParameter('password');
 
 $form = new Form('loginForm');
@@ -58,7 +58,7 @@
         $_SESSION['date'] = $current_user_date;
 
       // Remember user login in a cookie.
-      setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');
+      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
 
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
diff --git a/mobile/login.php b/mobile/login.php
index a432e5b60..fb574767a 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -34,7 +34,7 @@
 if ($request->isPost()) {
   $cl_login = $request->getParameter('login');
 } else {
-  $cl_login = @$_COOKIE['tt_login'];
+  $cl_login = @$_COOKIE[LOGIN_COOKIE_NAME];
 }
 $cl_password = $request->getParameter('password');
 
@@ -63,7 +63,7 @@
         $_SESSION['date'] = $current_user_date;
 
       // Remember user login in a cookie.
-      setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');
+      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
 
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
diff --git a/mobile/user_delete.php b/mobile/user_delete.php
index e44483ecc..132f73022 100644
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -61,9 +61,9 @@
       }
       // If we deleted our own account, do housekeeping and logout.
       if ($user->id == $user_id) {
-        // Remove tt_login cookie that stores login name.
-        unset($_COOKIE['tt_login']);
-        setcookie('tt_login', NULL, -1);
+        // Remove LOGIN_COOKIE_NAME cookie that stores login name.
+        unset($_COOKIE[LOGIN_COOKIE_NAME]);
+        setcookie(LOGIN_COOKIE_NAME, NULL, -1);
 
         $auth->doLogout();
         header('Location: login.php');
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 411586bda..58de5e8ab 100644
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -195,7 +195,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   
           // If our own login changed, set new one in cookie to remember it.
           if (($user_id == $user->id) && ($user->login != $cl_login)) {
-            setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');
+            setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
           }
   
           // In case the name of the "on behalf" user has changed - set it in session.
@@ -205,9 +205,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
   
           // If we deactivated our own account, do housekeeping and logout.
           if ($user->id == $user_id && !is_null($cl_status) && $cl_status == INACTIVE) {
-            // Remove tt_login cookie that stores login name.
-            unset($_COOKIE['tt_login']);
-            setcookie('tt_login', NULL, -1);
+            // Remove LOGIN_COOKIE_NAME cookie that stores login name.
+            unset($_COOKIE[LOGIN_COOKIE_NAME]);
+            setcookie(LOGIN_COOKIE_NAME, NULL, -1);
   
             $auth->doLogout();
             header('Location: login.php');
diff --git a/password_change.php b/password_change.php
index cefc30e5f..5fea82629 100644
--- a/password_change.php
+++ b/password_change.php
@@ -83,7 +83,7 @@
     ttUserHelper::setPassword($user_id, $cl_password1);
 
     if ($auth->doLogin($user->login, $cl_password1)) {
-      setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
+      setcookie(LOGIN_COOKIE_NAME, $user->login, time() + COOKIE_EXPIRE, '/');
       // Redirect, depending on user role.
       if ($user->can('administer_site')) {
         header('Location: admin_groups.php');
diff --git a/register.php b/register.php
index 0c0374b33..47f3b406e 100644
--- a/register.php
+++ b/register.php
@@ -106,7 +106,7 @@
   if ($err->no()) {
     // Registration successful.
     if ($auth->doLogin($cl_manager_login, $cl_password1)) {
-      setcookie('tt_login', $cl_manager_login, time() + COOKIE_EXPIRE, '/');
+      setcookie(LOGIN_COOKIE_NAME, $cl_manager_login, time() + COOKIE_EXPIRE, '/');
       header('Location: time.php');
     } else {
       header('Location: login.php');
diff --git a/user_delete.php b/user_delete.php
index 38d4f5424..24f84010f 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -61,9 +61,9 @@
       }
       // If we deleted our own account, do housekeeping and logout.
       if ($user->id == $user_id) {
-        // Remove tt_login cookie that stores login name.
-        unset($_COOKIE['tt_login']);
-        setcookie('tt_login', NULL, -1);
+        // Remove LOGIN_COOKIE_NAME cookie that stores login name.
+        unset($_COOKIE[LOGIN_COOKIE_NAME]);
+        setcookie(LOGIN_COOKIE_NAME, NULL, -1);
 
         $auth->doLogout();
         header('Location: login.php');
diff --git a/user_edit.php b/user_edit.php
index 195e87a34..d74ae2785 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -256,7 +256,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       if ($result) {
         // If our own login changed, set new one in cookie to remember it.
         if (($user_id == $user->id) && ($user->login != $cl_login)) {
-          setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');
+          setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
         }
 
         // In case the name of the "on behalf" user has changed - set it in session.
@@ -266,9 +266,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
         // If we deactivated our own account, do housekeeping and logout.
         if ($user->id == $user_id && !is_null($cl_status) && $cl_status == INACTIVE) {
-          // Remove tt_login cookie that stores login name.
-          unset($_COOKIE['tt_login']);
-          setcookie('tt_login', NULL, -1);
+          // Remove LOGIN_COOKIE_NAME cookie that stores login name.
+          unset($_COOKIE[LOGIN_COOKIE_NAME]);
+          setcookie(LOGIN_COOKIE_NAME, NULL, -1);
 
           $auth->doLogout();
           header('Location: login.php');

From c5fa0dcd085fc5d8cc669dcedd892c3d405c3523 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Sep 2020 20:06:05 +0000
Subject: [PATCH 1277/1848] Fixed double-encoding of special characters on
 tme_delete pages.

---
 WEB-INF/templates/footer.tpl | 2 +-
 mobile/time_delete.php       | 3 ---
 time_delete.php              | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 46628ad7b..c59aa67dd 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">Anuko Time Tracker 1.19.23.5282 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5283 | 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/time_delete.php b/mobile/time_delete.php
index c8e692534..e80c5c733 100644
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -49,9 +49,6 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
-// Escape comment for presentation.
-$time_rec['comment'] = htmlspecialchars($time_rec['comment']);
-
 if ($request->isPost()) {
   if ($request->getParameter('delete_button'))  {  // Delete button pressed.
 
diff --git a/time_delete.php b/time_delete.php
index c953bb95e..9cbed727e 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -53,9 +53,6 @@
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 
-// Escape comment for presentation.
-$time_rec['comment'] = htmlspecialchars($time_rec['comment']);
-
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
 

From 437760730a94f54222ad2f3e64f5151e1ba20a1c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Sep 2020 21:47:48 +0000
Subject: [PATCH 1278/1848] Removed no longer needed files.

---
 WEB-INF/templates/table_test.tpl |  12 ----
 table_test.php                   | 118 -------------------------------
 2 files changed, 130 deletions(-)
 delete mode 100644 WEB-INF/templates/table_test.tpl
 delete mode 100644 table_test.php

diff --git a/WEB-INF/templates/table_test.tpl b/WEB-INF/templates/table_test.tpl
deleted file mode 100644
index cf7e4b2ba..000000000
--- a/WEB-INF/templates/table_test.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{$forms.weekTimeForm.open}
-<table width="720">
-  <tr valign="top">
-    <td>{$forms.weekTimeForm.week_durations.control}</td>
-  </tr>
-</table>
-<table>
-  <tr>
-    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
-  </tr>
-</table>
-{$forms.weekTimeForm.close}
diff --git a/table_test.php b/table_test.php
deleted file mode 100644
index 7cd5cda35..000000000
--- a/table_test.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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('form.DefaultCellRenderer');
-import('form.Table');
-import('form.TextField');
-
-$durations_with_labels = array(
-  array( // Row 0.
-    'id' => 'something goes here too', // Row ideentifier.
-    'label' => 'This is a label for row 0',
-    'day_0' => array('id' => '0_0', 'duration' => '00:00'),
-    'day_1' => array('id' => '0_1', 'duration' => '01:00'),
-    'day_2' => array('id' => '0_2', 'duration' => '02:00'),
-    'day_3' => array('id' => '0_3', 'duration' => null),
-    'day_4' => array('id' => '0_4', 'duration' => '04:00')
-  ),
-  array( // Row 1.
-    'label' => 'This is a label for row 1',
-    'day_0' => array('id' => '1_0', 'duration' => '00:30'),
-    'day_1' => array('id' => '1_1', 'duration' => '01:30'),
-    'day_2' => array('id' => '1_2', 'duration' => '02:30'),
-  )
-);
-
-$totals = array(
-    'label' => 'Total:',
-    'day_0' => '00:30',
-    'day_1' => '02:30',
-    'day_2' => '04:30',
-    'day_3' => null,
-    'day_4' => '04:00',
-    'day_5' => null,
-    'day_6' => null
-);
-
-// Define rendering class for a label field to the left of durations.
-class LabelCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200,'valign'=>'middle'));
-    $this->setValue(htmlspecialchars($value));
-    return $this->toString();
-  }
-}
-
-// Define rendering class for a single cell for time entry in week view table.
-class TimeCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    $field_name = $table->getValueAt($row,$column)['id']; // Our text field names (and ids) are like x_y (row_column).
-    $field = new TextField($field_name);
-    $field->setFormName($table->getFormName());
-    $field->setSize(2);
-    $field->setValue($table->getValueAt($row,$column)['duration']);
-    $this->setValue($field->getHtml());
-    return $this->toString();
-  }
-}
-
-// Elements of weekTimeForm.
-$form = new Form('weekTimeForm');
-
-// Create week_durations table.
-$table = new Table('week_durations');
-// $table->setIAScript('markModified'); // TODO: write a script to mark table or particular cells as modified.
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
-$table->setData($durations_with_labels);
-// Add columns to table.
-$table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $totals['label']));
-$table->addColumn(new TableColumn('day_0', 'day 0', new TimeCellRenderer(), $totals['day_0']));
-$table->addColumn(new TableColumn('day_1', 'day 1', new TimeCellRenderer(), $totals['day_1']));
-$table->addColumn(new TableColumn('day_2', 'day 2', new TimeCellRenderer(), $totals['day_2']));
-$table->addColumn(new TableColumn('day_3', 'day 3', new TimeCellRenderer(), $totals['day_3']));
-$table->addColumn(new TableColumn('day_4', 'day 4', new TimeCellRenderer(), $totals['day_4']));
-$table->addColumn(new TableColumn('day_5', 'day 5', new TimeCellRenderer()));
-$table->addColumn(new TableColumn('day_6', 'day 6', new TimeCellRenderer()));
-$table->setInteractive(false);
-$form->addInputElement($table);
-
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
-
-// Submit.
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-  }
-}
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'table_test.tpl');
-$smarty->display('index.tpl');

From 80a4772c2f46c88432215e83fdf11fc77084f694 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Sep 2020 16:08:23 +0000
Subject: [PATCH 1279/1848] Cosmetic maintenance improvement.

---
 WEB-INF/lib/ttOrgHelper.class.php | 20 +++++++++++++++++++-
 WEB-INF/templates/footer.tpl      |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index ffb39beb4..81169032a 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -68,10 +68,28 @@ static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
 
+    // Construct $org_sizes_part (if we have to).
+    $sql = "show tables like 'org_sizes'";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error') && $res->fetchRow()) {
+       // org_sizes table exist.
+       $sql = "select org_id from org_sizes order by org_id";
+       $res = $mdb2->query($sql);
+       if (!is_a($res, 'PEAR_Error')) {
+         while ($val = $res->fetchRow()) {
+           $orgs_to_ignore[] = $val['org_id'];
+         }
+         $comma_separated = implode(',', $orgs_to_ignore);
+         if ($comma_separated) {
+           $org_sizes_part = " and org_id not in ($comma_separated)";
+         }
+       }
+    }
+
     // Determine inactive organizations by querying the database for max access timestamp for its users.
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
-      " (select max(accessed) as last_access, org_id from tt_users where org_id > 0 group by org_id order by last_access, org_id) as t".
+      " (select max(accessed) as last_access, org_id from tt_users where org_id > 0".$org_sizes_part." group by org_id order by last_access, org_id) as t".
       " where last_access is null or last_access < $cutoff_timestamp limit 50"; // Max 50 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c59aa67dd..a7126d9e5 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">Anuko Time Tracker 1.19.23.5283 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5284 | 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>

From dbaa1e2d8b7a838da612fb8aa060c09c688969f3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Sep 2020 19:21:29 +0000
Subject: [PATCH 1280/1848] Added week total on mobile time.php.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/mobile/time.tpl | 4 ++++
 mobile/time.php                   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a7126d9e5..1a38b304f 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">Anuko Time Tracker 1.19.23.5284 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5285 | 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/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 5be118c69..3c9d4276c 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -35,6 +35,10 @@
           <td align="right">{$i18n.label.day_total}:</td>
           <td>{$day_total}</td>
         </tr>
+        <tr>
+          <td align="right">{$i18n.label.week_total}:</td>
+          <td>{$week_total}</td>
+        </tr>
       </table>
 {/if}
     </td>
diff --git a/mobile/time.php b/mobile/time.php
index 1cda7fb63..0bdfcfaa4 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -392,6 +392,7 @@
 $smarty->assign('next_date', $next_date);
 $smarty->assign('prev_date', $prev_date);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
+$smarty->assign('week_total', ttTimeHelper::getTimeForWeek($selected_date));
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);

From 699d0753f8a1315bf03ee061ec1e15612a65cabf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Sep 2020 17:02:13 +0000
Subject: [PATCH 1281/1848] Added a display option controlling whether to show
 custom fields in the list of records for each day.

---
 WEB-INF/templates/display_options.tpl |  3 +++
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/time.tpl            | 12 ++++++++++++
 display_options.php                   |  4 ++++
 time.php                              |  7 +++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index f41bd6f58..025b7d984 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -11,6 +11,9 @@
     <td nowrap>{$forms.displayOptionsForm.time_not_complete_days.control} <a href="https://www.anuko.com/lp/tt_44.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
   </tr>
   <tr>
+    <td><label for="record_custom_fields">{$i18n.label.custom_fields}:</label></td>
+    <td nowrap>{$forms.displayOptionsForm.record_custom_fields.control} <a href="https://www.anuko.com/lp/tt_48.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
 
   <tr><td>&nbsp;</td></tr>
   <tr><td class="sectionHeaderNoBorder">{$i18n.title.reports}</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1a38b304f..3c8cdf7fd 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">Anuko Time Tracker 1.19.23.5285 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5286 | 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/time.tpl b/WEB-INF/templates/time.tpl
index d0121d0ee..be0299a48 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -114,6 +114,11 @@
   {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
+  {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          <td class="tableHeader">{$timeField['label']|escape}</td>
+      {/foreach}
+  {/if}
   {if $show_project}
           <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
@@ -139,6 +144,13 @@
     {if $show_client}
           <td valign="top">{$record.client|escape}</td>
     {/if}
+    {* record custom fileds *}
+    {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+          <td>{$record.$control_name|escape}</td>
+      {/foreach}
+    {/if}
     {if $show_project}
           <td valign="top">{$record.project|escape}</td>
     {/if}
diff --git a/display_options.php b/display_options.php
index a4d3deacb..8df3ba2b2 100644
--- a/display_options.php
+++ b/display_options.php
@@ -42,11 +42,13 @@
 if ($request->isPost()) {
   $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row');
   $cl_time_not_complete_days = $request->getParameter('time_not_complete_days');
+  $cl_record_custom_fields = $request->getParameter('record_custom_fields');
   $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row');
   $cl_custom_css = trim($request->getParameter('custom_css'));
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
   $cl_time_not_complete_days = $config->getDefinedValue('time_not_complete_days');
+  $cl_record_custom_fields = $config->getDefinedValue('record_custom_fields');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
   $cl_custom_css = $user->getCustomCss();
 }
@@ -63,6 +65,7 @@
 // $form->addInput(array('type'=>'checkbox','name'=>'time_note','value'=>$cl_time_note));
 $form->addInput(array('type'=>'checkbox','name'=>'time_note_on_separate_row','value'=>$cl_time_note_on_separate_row));
 $form->addInput(array('type'=>'checkbox','name'=>'time_not_complete_days','value'=>$cl_time_not_complete_days));
+$form->addInput(array('type'=>'checkbox','name'=>'record_custom_fields','value'=>$cl_record_custom_fields));
 // TODO: consider adding other fields (timesheet, work_units, invoice, approved, cost, paid)?
 
 // Reports.
@@ -81,6 +84,7 @@
     // Update config.
     $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row);
     $config->setDefinedValue('time_not_complete_days', $cl_time_not_complete_days);
+    $config->setDefinedValue('record_custom_fields', $cl_record_custom_fields);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
     if ($user->updateGroup(array(
       'config' => $config->getConfig(),
diff --git a/time.php b/time.php
index e375e8425..b249f05b7 100644
--- a/time.php
+++ b/time.php
@@ -79,6 +79,7 @@
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
+$showRecordCustomFields = $user->isOptionEnabled('record_custom_fields');
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -102,6 +103,11 @@
   // Determine column span for note field.
   $colspan = 0;
   if ($showClient) $colspan++;
+  if ($showRecordCustomFields && $custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $colspan++;
+    }
+  }
   if ($showProject) $colspan++;
   if ($showTask) $colspan++;
   if ($showStart) $colspan++;
@@ -477,6 +483,7 @@
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_record_custom_fields', $showRecordCustomFields);
 $smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);

From dc3f6787167d402b56748ed9369efab5a0650adb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Sep 2020 19:03:28 +0000
Subject: [PATCH 1282/1848] Fixed column span for reports with show note on
 separate row option.

---
 WEB-INF/templates/footer.tpl |  2 +-
 report.php                   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3c8cdf7fd..21b8924ca 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">Anuko Time Tracker 1.19.23.5286 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5287 | 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/report.php b/report.php
index da035fca7..539a897c7 100644
--- a/report.php
+++ b/report.php
@@ -286,11 +286,23 @@
 $totals = ttReportHelper::getTotals($options);
 
 // Determine column span for note field.
-$colspan = 1;
+$colspan = 0;
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $checkbox_control_name = 'show_user_field_'.$userField['id'];
+    if ($bean->getAttribute($checkbox_control_name)) $colspan++;
+  }
+}
 if ($bean->getAttribute('chclient')) $colspan++;
 if ($bean->getAttribute('chproject')) $colspan++;
 if ($bean->getAttribute('chtask')) $colspan++;
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $checkbox_control_name = 'show_time_field_'.$timeField['id'];
+    if ($bean->getAttribute($checkbox_control_name)) $colspan++;
+  }
+}
 if ($bean->getAttribute('chstart')) $colspan++;
 if ($bean->getAttribute('chfinish')) $colspan++;
 if ($bean->getAttribute('chduration')) $colspan++;

From 0e59ca83782ca8de51829b1ec4081976a639d43b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Sep 2020 13:01:03 +0000
Subject: [PATCH 1283/1848] Introduced label.menu in translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 +-
 WEB-INF/resources/cs.lang.php    | 2 +-
 WEB-INF/resources/da.lang.php    | 3 ++-
 WEB-INF/resources/de.lang.php    | 4 ++--
 WEB-INF/resources/en.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 3 ++-
 WEB-INF/resources/fa.lang.php    | 3 ++-
 WEB-INF/resources/fi.lang.php    | 3 ++-
 WEB-INF/resources/fr.lang.php    | 3 ++-
 WEB-INF/resources/gr.lang.php    | 3 ++-
 WEB-INF/resources/he.lang.php    | 3 ++-
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 3 ++-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 3 ++-
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 3 ++-
 WEB-INF/resources/pt-br.lang.php | 3 ++-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 3 ++-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 3 ++-
 WEB-INF/resources/sv.lang.php    | 3 ++-
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 3 ++-
 WEB-INF/resources/zh-tw.lang.php | 2 +-
 WEB-INF/templates/footer.tpl     | 2 +-
 31 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c6195cccc..de6e0df96 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -157,6 +157,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Moneda',
@@ -704,7 +705,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index daefafebf..92411b33b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -159,6 +159,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Měna',
@@ -717,7 +718,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 23c5df739..3ab49c39e 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -152,6 +152,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Team navn', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Valuta',
@@ -679,7 +681,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 482f42bcb..7db6f93bb 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -149,6 +149,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Gruppenname',
 'label.address' => 'Adresse',
 'label.currency' => 'Währung',
@@ -655,8 +657,6 @@
 // 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-// TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
 // TODO: translate the following.
 // 'form.display_options.not_complete_days' => 'Not complete days',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5003f5b16..b052ec602 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -145,6 +145,7 @@
 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+'label.menu' => 'Menu',
 'label.group_name' => 'Group name',
 'label.address' => 'Address',
 'label.currency' => 'Currency',
@@ -635,7 +636,6 @@
 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 'form.display_options.not_complete_days' => 'Not complete days',
 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0136a9db0..0c1d2c6b9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -156,6 +156,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 'label.address' => 'Dirección',
 'label.currency' => 'Moneda',
@@ -719,7 +720,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 433ed64d3..b6b442441 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -164,6 +164,8 @@
 
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Grupi nimi',
 'label.address' => 'Aadress',
 'label.currency' => 'Valuuta',
@@ -687,7 +689,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3b767ea8d..35fb9feff 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -160,6 +160,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'نام تیم', // TODO: replace "team" with "group".
 'label.address' => 'آدرس',
 'label.currency' => 'واحد پول',
@@ -703,7 +705,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f895b34b2..753dcf8ce 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -154,6 +154,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Tiimin nimi', // TODO: replace "team" with "group".
 'label.address' => 'Osoite',
 'label.currency' => 'Valuutta',
@@ -685,7 +687,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 06b0550be..ca00e9471 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -152,6 +152,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nom équipe', // TODO: replace "team" with "group".
 'label.address' => 'Adresse',
 'label.currency' => 'Devise',
@@ -675,7 +677,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index dc921299e..ba630f269 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -148,6 +148,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Όνομα ομάδας',
 'label.address' => 'Διεύθυνση',
 'label.currency' => 'Νόμισμα',
@@ -668,7 +670,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f082be589..296e82b1b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -168,6 +168,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'שם הצוות', // TODO: replace "team" with "group".
 'label.address' => 'כתובת',
 'label.currency' => 'מטבע',
@@ -704,7 +706,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 02b1ef081..6328f330f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -160,6 +160,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Pénznem',
@@ -709,7 +710,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index f4c30d7cc..e3bc6a31d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -152,6 +152,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nome del gruppo',
 'label.address' => 'Indirizzo',
 'label.currency' => 'Moneta',
@@ -682,7 +684,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0808b0bd2..26d222ebd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -163,6 +163,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '通貨',
@@ -712,7 +713,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index b92b05304..fbfd6794b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -162,6 +162,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '화폐',
@@ -710,7 +711,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 35955b252..7ce3b19c0 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -151,6 +151,8 @@
 'button.disapprove' => 'Afkeuren',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Groepsnaam',
 'label.address' => 'Adres',
 'label.currency' => 'Munteenheid',
@@ -639,7 +641,6 @@
 'form.timesheet_view.disapprove_body' => "Jouw tijdenoverzicht %s is afgekeurd.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-'form.display_options.menu' => 'Menu',
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
 // TODO: translate the following.
 // 'form.display_options.not_complete_days' => 'Not complete days',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index dc6ffa1f6..81aff4489 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -162,6 +162,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Valuta',
@@ -709,7 +710,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 1c3c51dcd..2000584e9 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -156,6 +156,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nazwa zespołu',  // TODO: replace "team" with "group".
 'label.address' => 'Adres',
 'label.currency' => 'Waluta',
@@ -688,7 +690,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bcf76ad7f..61afec796 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -153,6 +153,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Nome da equipe',  // TODO: replace "team" with "group".
 'label.address' => 'Endereço',
 'label.currency' => 'Moeda',
@@ -683,7 +685,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index f607279b4..b4aa0cc02 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -155,6 +155,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 // 'label.currency' => 'Currency',
@@ -691,7 +692,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3014652df..419b26467 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -162,6 +162,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Moneda',
@@ -712,7 +713,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 8d11e2bcd..49ee3edeb 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -136,6 +136,7 @@
 'button.disapprove' => 'Не одобрить',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+'label.menu' => 'Меню',
 'label.group_name' => 'Название группы',
 'label.address' => 'Адрес',
 'label.currency' => 'Валюта',
@@ -616,7 +617,6 @@
 'form.timesheet_view.disapprove_body' => "Ваш табель %s не одобрен.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-'form.display_options.menu' => 'Меню',
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 'form.display_options.not_complete_days' => 'Незавершенные дни',
 'form.display_options.custom_css' => 'Пользовательская CSS',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e6f76e279..eceb1e521 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -158,6 +158,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Názov tímu', // TODO: replace "team" with "group".
 'label.address' => 'Adresa',
 'label.currency' => 'Mena',
@@ -693,7 +695,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ce46d71a5..8ee642e54 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -152,6 +152,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 // 'label.currency' => 'Currency',
@@ -685,7 +686,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index be48065bc..8bc2e7223 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -153,6 +153,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Naziv tim-a', // TODO: replace "team" with "group".
 'label.address' => 'Adresa',
 'label.currency' => 'Valuta',
@@ -686,7 +688,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index de3b37b04..dd3981f36 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -152,6 +152,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => 'Namn på grupp',
 'label.address' => 'Adress',
 'label.currency' => 'Valuta',
@@ -684,7 +686,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cb7e4ab91..9475ad0d2 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -166,6 +166,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => 'Para birimi',
@@ -725,7 +726,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index cc186b6bf..ed76b599a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -154,6 +154,8 @@
 // 'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
+// TODO: translate the following.
+// 'label.menu' => 'Menu',
 'label.group_name' => '团队名称', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'label.address' => 'Address',
@@ -696,7 +698,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index bd10eecc4..913c12cf1 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -159,6 +159,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
+// 'label.menu' => 'Menu',
 // 'label.group_name' => 'Group name',
 // 'label.address' => 'Address',
 'label.currency' => '貨幣',
@@ -702,7 +703,6 @@
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 // TODO: translate the following.
-// 'form.display_options.menu' => 'Menu',
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.custom_css' => 'Custom CSS',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 21b8924ca..bf3ff0991 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">Anuko Time Tracker 1.19.23.5287 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5288 | 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>

From b482d50d4e04e6a5e5e65b6e7142db1f084c9dce Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Sep 2020 15:25:32 +0000
Subject: [PATCH 1284/1848] Starting work on improving presentation on mobile
 screens.

---
 WEB-INF/templates/footer.tpl  |   2 +-
 WEB-INF/templates/footer2.tpl |   7 ++
 WEB-INF/templates/header2.tpl | 191 ++++++++++++++++++++++++++++++++++
 WEB-INF/templates/index2.tpl  |   5 +
 rtl.css                       |  14 ++-
 5 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/footer2.tpl
 create mode 100644 WEB-INF/templates/header2.tpl
 create mode 100644 WEB-INF/templates/index2.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bf3ff0991..4e07aa67a 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">Anuko Time Tracker 1.19.23.5288 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5289 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
new file mode 100644
index 000000000..9d3b69616
--- /dev/null
+++ b/WEB-INF/templates/footer2.tpl
@@ -0,0 +1,7 @@
+</div> {* page-content *}
+
+<div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5289 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+
+</body>
+</html>
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
new file mode 100644
index 000000000..d887e22a6
--- /dev/null
+++ b/WEB-INF/templates/header2.tpl
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" href="favicon.ico" type="image/x-icon">
+  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+  <link href="{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+{if $i18n.language.rtl}
+  <link href="{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+{/if}
+{if $user->getCustomCss()}
+  <link href="custom_css.php" rel="stylesheet" type="text/css">
+{/if}
+  <title>Time Tracker{if $title} - {$title}{/if}</title>
+  <script src="js/strftime.js"></script>
+  <script>
+    {* Setup locale for strftime *}
+    {$js_date_locale}
+  </script>
+  <script src="js/strptime.js"></script>
+</head>
+
+<body {$onload}>
+
+<div class="logo">
+{if $user->custom_logo}
+  <img alt="Time Tracker" width="300" height="43" src="{$custom_logo}">
+{else}
+  <a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="img{$smarty.const.APP_RESOURCE_DIR}/logo.png"></a>
+{/if}
+</div>
+
+{* top menu for small screens *}
+<div class="top-menu-small-screen">
+  <table class="top-menu-table">
+    <tr>
+      <td><a href="site_map.php">{$i18n.label.menu}</a> </td>
+      <td><a href="{$smarty.const.HELP_LINK}">{$i18n.menu.help}</a></td>
+    </tr>
+  </table>
+</div>
+{* end of top menu for small screens *}
+
+{* top menu for large screens *}
+{if $authenticated}
+  {if $user->can('administer_site')}
+  {* top menu for admin *}
+<div class="top-menu-large-screen">
+  <table class="top-menu-table">
+    <tr>
+      <td><a href="logout.php">{$i18n.menu.logout}</a></td>
+      <td><a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a></td>
+      <td><a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a></td>
+    </tr>
+  </table>
+</div>
+  {* end of top menu for admin *}
+
+  {* sub menu for admin *}
+<div class="top-submenu-large-screen">
+  <table class="top-submenu-table">
+    <tr>
+      <td><a href="admin_groups.php">{$i18n.menu.groups}</a></td>
+      <td><a href="admin_options.php">{$i18n.menu.options}</a></td>
+    {if isTrue('WORK_SERVER_ADMINISTRATION')}
+      <td><a href="work/admin_work.php">{$i18n.label.work}</a></td>
+    {/if}
+    </td>
+  </table>
+</div>
+  {* end of sub menu for admin *}
+  {else}
+  {* top menu for authorized user *}
+<div class="top-menu-large-screen">
+  <table class="top-menu-table">
+    <tr>
+      <td><a href="logout.php">{$i18n.menu.logout}</a></td>
+    {if $user->exists() && $user->can('manage_own_settings')}
+      <td><a href="profile_edit.php">{$i18n.menu.profile}</a></td>
+    {/if}
+    {if $user->can('manage_basic_settings')}
+      <td><a href="group_edit.php">{$i18n.menu.group}</a></td>
+    {/if}
+    {if $user->can('manage_features')}
+      <td><a href="plugins.php">{$i18n.menu.plugins}</a></td>
+    {/if}
+      <td><a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a></td>
+      <td><a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a></td>
+    </tr>
+  </table>
+</div>
+  {* end of top menu for authorized user *}
+
+  {* sub menu for authorized user *}
+<div class="top-submenu-large-screen">
+  <table class="top-submenu-table">
+    <tr>
+    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
+      <td><a href="time.php">{$i18n.menu.time}</a></td>
+      {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
+      <td><a href="week.php">{$i18n.menu.week}</a></td>
+      {/if}
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+      <td><a href="expenses.php">{$i18n.menu.expenses}</a></td>
+    {/if}
+    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
+      <td><a href="reports.php">{$i18n.menu.reports}</a></td>
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
+      <td><a href="timesheets.php">{$i18n.menu.timesheets}</a></td>
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
+      <td><a href="invoices.php">{$i18n.title.invoices}</a></td>
+    {/if}
+    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        $user->isPluginEnabled('cl'))}
+      <td><a href="charts.php">{$i18n.menu.charts}</a></td>
+    {/if}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+      <td><a href="projects.php">{$i18n.menu.projects}</a></td>
+    {/if}
+    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+      <td><a href="tasks.php">{$i18n.menu.tasks}</a></td>
+    {/if}
+    {if $user->can('view_users') || $user->can('manage_users')}
+      <td><a href="users.php">{$i18n.menu.users}</a></td>
+    {/if}
+    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
+      <td><a href="clients.php">{$i18n.menu.clients}</a></td>
+    {/if}
+    {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
+      <td><a href="work/work.php">{$i18n.title.work}</a></td>
+    {/if}
+    {if $user->can('export_data')}
+      <td><a href="export.php">{$i18n.menu.export}</a></td>
+    {/if}
+    </tr>
+  </table>
+</div>
+  {* end of sub menu for authorized user *}
+  {/if}
+{else}
+  {* top menu for non authorized user *}
+<div class="top-menu-large-screen">
+  <table class="top-menu-table">
+    <tr>
+      <td><a href="login.php">{$i18n.menu.login}</a></td>
+  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+      <td><a href="register.php">{$i18n.menu.register}</a></td>
+  {/if}
+      <td><a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a></td>
+      <td><a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a></td>
+    </tr>
+  </table>
+</div>
+{/if}
+{* end of top menu for large screens *}
+
+{* page title and user details *}
+{if $title}
+<div class="page-title">{$title}{if $timestring}: {$timestring}{/if}</div>
+  {if $authenticated}
+<div class="user-details">{$user->getUserPartForHeader()}</div> {* No need to escape as it is done in the class. *}
+  {/if}
+{/if}
+{* end of page title and user details *}
+
+{* output errors *}
+{if $err->yes()}
+<div class="page-errors">
+  {foreach $err->getErrors() as $error}
+{$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
+  {/foreach}
+</div>
+{/if}
+{* end of output errors *}
+
+{* output messages *}
+{if $msg->yes()}
+<div class="page-messages">
+  {foreach $msg->getErrors() as $message}
+{$message.message}<br> {* No need to escape. *}
+  {/foreach}
+</div>
+{/if}
+{* end of output messages *}
+
+<div class="page-content">
\ No newline at end of file
diff --git a/WEB-INF/templates/index2.tpl b/WEB-INF/templates/index2.tpl
new file mode 100644
index 000000000..410a7616a
--- /dev/null
+++ b/WEB-INF/templates/index2.tpl
@@ -0,0 +1,5 @@
+{include file="header2.tpl"}
+
+{if $content_page_name}{include file="$content_page_name"}{/if}
+
+{include file="footer2.tpl"}
diff --git a/rtl.css b/rtl.css
index ede511c8e..5688a2823 100644
--- a/rtl.css
+++ b/rtl.css
@@ -2,4 +2,16 @@
 
 html {
   direction: rtl;
-}
\ No newline at end of file
+}
+
+.large-screen-label {
+  text-align: left;
+}
+
+.small-screen-label {
+  text-align: right;
+}
+
+.td-with-input {
+  text-align: right;
+}

From bb8dacfd02940c68b9529a78787e52132b25714a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Sep 2020 16:16:07 +0000
Subject: [PATCH 1285/1848] Some initial work on mobile styles.

---
 WEB-INF/templates/header2.tpl  |   4 +-
 WEB-INF/templates/site_map.tpl |  90 +++++++
 default2.css                   | 428 +++++++++++++++++++++++++++++++++
 login.php                      |  11 +-
 site_map.php                   |  41 ++++
 5 files changed, 570 insertions(+), 4 deletions(-)
 create mode 100644 WEB-INF/templates/site_map.tpl
 create mode 100644 default2.css
 create mode 100644 site_map.php

diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index d887e22a6..4af0ef8af 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+  <link href="default2.css" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
   <link href="{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
 {/if}
@@ -27,7 +27,7 @@
 {if $user->custom_logo}
   <img alt="Time Tracker" width="300" height="43" src="{$custom_logo}">
 {else}
-  <a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="img{$smarty.const.APP_RESOURCE_DIR}/logo.png"></a>
+  <a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="img/logo.png"></a>
 {/if}
 </div>
 
diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
new file mode 100644
index 000000000..695a99093
--- /dev/null
+++ b/WEB-INF/templates/site_map.tpl
@@ -0,0 +1,90 @@
+{if $authenticated}
+  {if $user->can('administer_site')}
+  {* sub menu for admin *}
+<p>
+  <a href="admin_groups.php">{$i18n.menu.groups}</a><br>
+  <a href="admin_options.php">{$i18n.menu.options}</a><br>
+    {if isTrue('WORK_SERVER_ADMINISTRATION')}
+  <a href="work/admin_work.php">{$i18n.label.work}</a><br>
+    {/if}
+</p>
+  {* end of sub menu for admin *}
+  {* main menu for admin *}
+<p>
+  <a href="logout.php">{$i18n.menu.logout}</a><br>
+  <a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a><br>
+  <a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a><br>
+</p>
+  {* end of main menu for admin *}
+  {else}
+  {* sub menu for authorized user *}
+<p>
+    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
+        <a href="time.php">{$i18n.menu.time}</a><br>
+      {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
+  <a href="week.php">{$i18n.menu.week}</a><br>
+      {/if}
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
+  <a href="expenses.php">{$i18n.menu.expenses}</a><br>
+    {/if}
+    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
+  <a href="reports.php">{$i18n.menu.reports}</a><br>
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
+  <a href="timesheets.php">{$i18n.menu.timesheets}</a><br>
+    {/if}
+    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
+  <a href="invoices.php">{$i18n.title.invoices}</a><br>
+    {/if}
+    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        $user->isPluginEnabled('cl'))}
+  <a href="charts.php">{$i18n.menu.charts}</a><br>
+    {/if}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+  <a href="projects.php">{$i18n.menu.projects}</a><br>
+    {/if}
+    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+  <a href="tasks.php">{$i18n.menu.tasks}</a><br>
+    {/if}
+    {if $user->can('view_users') || $user->can('manage_users')}
+  <a href="users.php">{$i18n.menu.users}</a><br>
+    {/if}
+    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
+  <a href="clients.php">{$i18n.menu.clients}</a><br>
+    {/if}
+    {if $user->can('export_data')}
+  <a href="export.php">{$i18n.menu.export}</a><br>
+    {/if}
+</p>
+  {* end of sub menu for authorized user *}
+  {* main menu for authorized user *}
+<p>
+  <a href="logout.php">{$i18n.menu.logout}</a><br>
+    {if $user->exists() && $user->can('manage_own_settings')}
+  <a href="profile_edit.php">{$i18n.menu.profile}</a><br>
+    {/if}
+    {if $user->can('manage_basic_settings')}
+  <a href="group_edit.php">{$i18n.menu.group}</a><br>
+    {/if}
+    {if $user->can('manage_features')}
+  <a href="plugins.php">{$i18n.menu.plugins}</a><br>
+    {/if}
+  <a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a><br>
+  <a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a><br>
+</p>
+  {* end of main menu for authorized user *}
+  {/if}
+{else}
+  {* main menu for non authorized user *}
+<p>
+  <a href="login.php">{$i18n.menu.login}</a><br>
+  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+  <a href="register.php">{$i18n.menu.register}</a><br>
+  {/if}
+  <a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a><br>
+  <a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a><br>
+</p>
+  {* end of main menu for non authorized user *}
+{/if}
diff --git a/default2.css b/default2.css
new file mode 100644
index 000000000..a5536914e
--- /dev/null
+++ b/default2.css
@@ -0,0 +1,428 @@
+body {
+  margin: 0px;
+  font-size: 10pt;
+  font-family: Verdana, sans-serif;
+  background-color: white;
+}
+
+div.logo {
+  padding: .5rem;
+  text-align: center;
+  background-color: #a6ccf7;
+}
+
+div.top-menu-large-screen {
+  background-color: black;
+  display: block;
+}
+
+.top-submenu-large-screen {
+  background-color: #d9d9d9;
+  display: block;
+}
+
+div.top-menu-small-screen {
+  background-color: black;
+  display: none;
+}
+
+div.top-menu-small-screen a {
+  font-size: 1rem;
+  font-weight: bold;
+  color: white;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+div.top-menu-large-screen a {
+  font-size: 1rem;
+  font-weight: bold;
+  color: white;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+.top-menu-table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.top-submenu-table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.top-submenu-large-screen a {
+  font-size: 1rem;
+  color: #444444;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+div.page-title {
+  font-size: 12pt;
+  font-weight: bold;
+  color: silver;
+  text-align: center;
+  padding: .25rem;
+  border-bottom: 1px solid lightgray;
+  margin-bottom: .2rem;
+}
+
+div.user-details {
+  text-align: center;
+  padding: .2rem;
+}
+
+.page-errors {
+  margin-top: .5rem;
+  text-align: center;
+  color: red;
+}
+
+.page-content {
+  text-align: center;
+}
+
+.form-control-separator {
+  height: .5rem;
+}
+
+div#LoginAboutText {
+  padding: 1rem;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+#ldapDefaultDomain {
+  color: #777777;
+}
+
+div.page-hint {
+  margin-top: 1rem;
+}
+
+.centered-table {
+  margin-top: .5rem;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+}
+
+.large-screen-label {
+  text-align: right;
+  vertical-align: middle;
+  display: table-cell;
+}
+
+.small-screen-label {
+  text-align: left;
+  display: none;
+}
+
+.small-screen-form-control-separator {
+  height: .25rem;
+  display: none;
+}
+
+.page-content input {
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
+}
+
+.td-with-input {
+  text-align: left;
+}
+
+.page-content input:focus {
+  background-color: yellow;
+  border: 1px solid black;
+  outline: none;
+}
+
+
+@media screen and (max-width: 600px) {
+
+  .large-screen-label {
+      display: none;
+  }
+
+  .small-screen-label {
+      display: block;
+  }
+
+  .small-screen-form-control-separator {
+      display: block;
+  }
+}
+
+
+
+
+
+
+.contribute-msg {
+  text-align: center;
+  padding: .2rem;
+  background-color: #eeeeee;
+}
+
+.version-and-copyright {
+  text-align: center;
+  padding: .5rem;
+}
+
+
+@media screen and (max-width: 1170px) {
+  div.top-menu-small-screen {
+    display: block;
+  }
+
+  div.top-menu-large-screen {
+    display: none;
+  }
+
+  div.top-submenu-large-screen {
+    display: none;
+  }
+}
+
+
+
+
+
+
+
+
+
+
+a { color: blue; text-decoration: none; }
+
+a:visited { text-decoration: none; }
+
+a:hover { text-decoration: underline; }
+
+html {
+  overflow-y: scroll;
+}
+
+table { font-size: 10pt; font-family: Verdana, sans-serif; }
+
+input, button, select, textarea {
+  font-size: 10pt;
+  font-family: Verdana, sans-serif;
+  margin: 2px 2px 2px 2px;
+  padding: 2px 5px 2px 5px;
+}
+
+input[type=checkbox], label {
+  vertical-align: middle;
+}
+
+.pageTitle {
+  font-size: 12pt;
+  font-weight: bold;
+  color: silver;
+}
+
+.systemMenu {
+  font-size: 1rem;
+  font-weight: bold;
+  color: white;
+  background-color: black;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+.mainMenu {
+  font-size: 1rem;
+  color: #444444;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+.onBehalf {
+  font-weight: bold;
+}
+
+/* calendar styles */
+.calendarHeader {
+  padding: 5px;
+  font-size: 8pt;
+  color: #333333;
+  background-color: #d9d9d9;
+}
+
+.calendarDay {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+.calendarDaySelected {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #666666;
+  background-color: #a6ccf7;
+}
+
+.calendarDayWeekend {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #666666;
+  background-color: #f7f7f7;
+}
+
+.calendarDayHoliday {
+  padding: 5px;
+  border: 1px solid silver;
+  font-size: 8pt;
+  color: #666666;
+  background-color: #f7f7f7;
+}
+
+.calendarDayHeader {
+  padding: 5px;
+  border: 1px solid white;
+  font-size: 8pt;
+  color: #333333;
+}
+
+.calendarDayHeaderWeekend {
+  padding: 5px;
+  border: 1px solid white;
+  font-size: 8pt;
+  color: #999999;
+}
+
+.calendarLinkWeekend {
+  color: #999999;
+}
+
+.calendarLinkHoliday {
+  color: #999999;
+}
+
+.calendarLinkRecordsExist {
+  color: #ff0000;
+}
+
+.calendarLinkNonCompleteDay {
+  color: #800080;
+}
+/* end of calendar styles */
+
+.tableHeader {
+  font-weight: bold;
+  text-align: left;
+}
+
+.tableHeaderCentered {
+  font-weight: bold;
+  text-align: center;
+}
+
+.rowReportItem {
+  background-color: #f5f5f5;
+}
+
+.rowReportItemAlt {
+  background-color: #ffffff;
+}
+
+.rowReportSubtotal {
+  background-color: #e0e0e0;
+}
+
+.cellLeftAligned {
+  text-align: left;
+  vertical-align: top;
+}
+
+.cellRightAligned {
+  text-align: right;
+  vertical-align: top;
+}
+
+.cellLeftAlignedSubtotal {
+  font-weight: bold;
+  vertical-align: top;
+}
+
+.cellRightAlignedSubtotal {
+  font-weight: bold;
+  text-align: right;
+  vertical-align: top;
+}
+
+.midAligned {
+  text-align: center;
+}
+
+.sectionHeader {
+  font-weight: bold;
+  border-bottom: 1px solid lightgray;
+}
+
+.sectionHeaderNoBorder {
+  font-weight: bold;
+}
+
+.error {
+  color: red;
+}
+
+.info_message {
+  color: #0000c0;
+}
+
+.divider {
+  background-color: #efefef;
+}
+
+div.table-divider { height: 30px; }
+
+.uncompleted-entry {
+  display: inline-block;
+  height: 8px;
+  width: 8px;
+  border: 1px solid rgba(0, 0, 0, .1);
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, .1);
+}
+.uncompleted-entry.active { background-color: red; }
+
+.table_icon {
+  height: 16px;
+  width: 16px;
+}
+
+/* Mobile styles */
+.mobile-table {
+  border: 0;
+  width: 100%;
+  border-spacing: 0;
+}
+
+.mobile-textarea {
+  width: 100%;
+  resize: vertical;
+  height: 5em;
+}
+
+.mobile-input {
+  width: 100%;
+}
+
+.mobile-table-details {
+  width: 100%;
+  table-layout: fixed;
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  border-spacing: 1px;
+  border: 0;
+}
+
+.mobile-table-details td {
+  padding: 3px;
+}
diff --git a/login.php b/login.php
index 705692045..ac506fccc 100644
--- a/login.php
+++ b/login.php
@@ -85,6 +85,13 @@
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
 $smarty->assign('title', $i18n->get('title.login'));
-$smarty->assign('content_page_name', 'login.tpl');
+if (defined('DEBUG_MOBILE'))
+  $smarty->assign('content_page_name', 'login2.tpl');
+else {
+  $smarty->assign('content_page_name', 'login.tpl');
+}
 $smarty->assign('about_text', $i18n->get('form.login.about'));
-$smarty->display('index.tpl');
+if (defined('DEBUG_MOBILE'))
+  $smarty->display('index2.tpl');
+else
+  $smarty->display('index.tpl');
diff --git a/site_map.php b/site_map.php
new file mode 100644
index 000000000..05c6172a8
--- /dev/null
+++ b/site_map.php
@@ -0,0 +1,41 @@
+<?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');
+
+// Access checks.
+// No need.
+// End of access checks.
+
+// Determine is user is authenticated or not.
+global $auth;
+$authenticated = $auth->isAuthenticated(); // This call assigns 'authenticated' to smarty.
+
+// $smarty->assign('title', $i18n->get('form.label.menu'));
+$smarty->assign('content_page_name', 'site_map.tpl');
+$smarty->display('index2.tpl');

From 8f2cfae8517bd8b18594950175b8c00f1c096574 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Sep 2020 16:49:14 +0000
Subject: [PATCH 1286/1848] Added mobile-friendly login templates.

---
 WEB-INF/templates/footer.tpl      |  2 +-
 WEB-INF/templates/footer2.tpl     |  2 +-
 WEB-INF/templates/login.db2.tpl   | 20 ++++++++++++++++++++
 WEB-INF/templates/login.ldap2.tpl | 23 +++++++++++++++++++++++
 WEB-INF/templates/login2.tpl      | 14 ++++++++++++++
 5 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/login.db2.tpl
 create mode 100644 WEB-INF/templates/login.ldap2.tpl
 create mode 100644 WEB-INF/templates/login2.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4e07aa67a..eef858b3b 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">Anuko Time Tracker 1.19.23.5289 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5290 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 9d3b69616..274ed2567 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5289 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5290 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/login.db2.tpl b/WEB-INF/templates/login.db2.tpl
new file mode 100644
index 000000000..97e0c1886
--- /dev/null
+++ b/WEB-INF/templates/login.db2.tpl
@@ -0,0 +1,20 @@
+<table class="centered-table">
+  <tr class = "small-screen-label"><td align="left">{$i18n.label.login}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.login}:</td>
+    <td class="td-with-input">{$forms.loginForm.login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td align="left">{$i18n.label.password}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.password}:</td>
+    <td class="td-with-input">{$forms.loginForm.password.control}</td>
+  </tr>
+  <tr>
+    <td colspan="2"><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.loginForm.btn_login.control}</td>
+  </tr>
+</table>
diff --git a/WEB-INF/templates/login.ldap2.tpl b/WEB-INF/templates/login.ldap2.tpl
new file mode 100644
index 000000000..74d0eda44
--- /dev/null
+++ b/WEB-INF/templates/login.ldap2.tpl
@@ -0,0 +1,23 @@
+{if $show_hint}
+<div class="page-hint">{$i18n.label.ldap_hint}</div>
+{/if}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td align="left">{$i18n.label.login}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.login}:</td>
+    <td class="td-with-input">{$forms.loginForm.login.control}<span id="ldapDefaultDomain">@{$Auth_ldap_params.default_domain}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td align="left">{$i18n.label.password}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.password}:</td>
+    <td class="td-with-input">{$forms.loginForm.password.control}</td>
+  </tr>
+  <tr>
+    <td colspan="2"><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.loginForm.btn_login.control}</td>
+  </tr>
+</table>
diff --git a/WEB-INF/templates/login2.tpl b/WEB-INF/templates/login2.tpl
new file mode 100644
index 000000000..fa4237dbf
--- /dev/null
+++ b/WEB-INF/templates/login2.tpl
@@ -0,0 +1,14 @@
+<script>
+function get_date() {
+  var date = new Date();
+  return date.strftime("%Y-%m-%d");
+}
+</script>
+
+{$forms.loginForm.open}
+{include file="login.`$smarty.const.AUTH_MODULE`2.tpl"}
+{$forms.loginForm.close}
+
+{if !empty($about_text)}
+  <div id="LoginAboutText">{$about_text}</div>
+{/if}

From 9b66da374af45d3e62b8af2df4db29bbc5c97a24 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Sep 2020 18:15:26 +0000
Subject: [PATCH 1287/1848] Some style fixes for mobile login pages.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/footer2.tpl     | 2 +-
 WEB-INF/templates/login.db2.tpl   | 4 ++--
 WEB-INF/templates/login.ldap2.tpl | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index eef858b3b..d607961ff 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">Anuko Time Tracker 1.19.23.5290 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5291 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 274ed2567..3a472507f 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5290 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5291 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/login.db2.tpl b/WEB-INF/templates/login.db2.tpl
index 97e0c1886..71eb170c8 100644
--- a/WEB-INF/templates/login.db2.tpl
+++ b/WEB-INF/templates/login.db2.tpl
@@ -1,11 +1,11 @@
 <table class="centered-table">
-  <tr class = "small-screen-label"><td align="left">{$i18n.label.login}:</td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.login}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.login}:</td>
     <td class="td-with-input">{$forms.loginForm.login.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td align="left">{$i18n.label.password}:</td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.password}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.password}:</td>
     <td class="td-with-input">{$forms.loginForm.password.control}</td>
diff --git a/WEB-INF/templates/login.ldap2.tpl b/WEB-INF/templates/login.ldap2.tpl
index 74d0eda44..e51abec12 100644
--- a/WEB-INF/templates/login.ldap2.tpl
+++ b/WEB-INF/templates/login.ldap2.tpl
@@ -2,13 +2,13 @@
 <div class="page-hint">{$i18n.label.ldap_hint}</div>
 {/if}
 <table class="centered-table">
-  <tr class = "small-screen-label"><td align="left">{$i18n.label.login}:</td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.login}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.login}:</td>
     <td class="td-with-input">{$forms.loginForm.login.control}<span id="ldapDefaultDomain">@{$Auth_ldap_params.default_domain}</span></td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td align="left">{$i18n.label.password}:</td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.password}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.password}:</td>
     <td class="td-with-input">{$forms.loginForm.password.control}</td>

From 6eca4003aeffeb54a318a0f022a591bb177ddc4b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Sep 2020 19:22:28 +0000
Subject: [PATCH 1288/1848] Some progress with making registration page
 mobile-friendly.

---
 WEB-INF/templates/footer.tpl    |  2 +-
 WEB-INF/templates/footer2.tpl   |  2 +-
 WEB-INF/templates/register2.tpl | 56 +++++++++++++++++++++++++++++++++
 default2.css                    | 28 +++++++----------
 register.php                    | 11 +++++--
 5 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 WEB-INF/templates/register2.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d607961ff..e7c1cdde1 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">Anuko Time Tracker 1.19.23.5291 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5292 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 3a472507f..c3797a337 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5291 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5292 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/register2.tpl b/WEB-INF/templates/register2.tpl
new file mode 100644
index 000000000..d91ec66ea
--- /dev/null
+++ b/WEB-INF/templates/register2.tpl
@@ -0,0 +1,56 @@
+{$forms.groupForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td>{$i18n.label.group_name} (*):</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.group_name} (*):</td>
+    <td class="td-with-input">{$forms.groupForm.group_name.control} <a href="https://www.anuko.com/lp/tt_37.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.currency}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.currency}:</td>
+    <td class="td-with-input">{$forms.groupForm.currency.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.language}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.language}:</td>
+    <td class="td-with-input">{$forms.groupForm.lang.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.manager_name} (*):</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.manager_name} (*):</td>
+    <td class="td-with-input">{$forms.groupForm.manager_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.manager_login} (*):</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.manager_login} (*):</td>
+    <td class="td-with-input">{$forms.groupForm.manager_login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.password} (*):</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.password} (*):</td>
+    <td class="td-with-input">{$forms.groupForm.password1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.confirm_password} (*):</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.confirm_password} (*):</td>
+    <td class="td-with-input">{$forms.groupForm.password2.control}</td>
+  </tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</td>
+    <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
+  </tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.groupForm.btn_submit.control}</td>
+  </tr>
+</table>
+{$forms.groupForm.close}
diff --git a/default2.css b/default2.css
index a5536914e..b24fa06c2 100644
--- a/default2.css
+++ b/default2.css
@@ -138,6 +138,17 @@ div.page-hint {
   outline: none;
 }
 
+.contribute-msg {
+  text-align: center;
+  margin-top: 2rem;
+  padding: .2rem;
+  background-color: #eeeeee;
+}
+
+.version-and-copyright {
+  text-align: center;
+  padding: .5rem;
+}
 
 @media screen and (max-width: 600px) {
 
@@ -154,23 +165,6 @@ div.page-hint {
   }
 }
 
-
-
-
-
-
-.contribute-msg {
-  text-align: center;
-  padding: .2rem;
-  background-color: #eeeeee;
-}
-
-.version-and-copyright {
-  text-align: center;
-  padding: .5rem;
-}
-
-
 @media screen and (max-width: 1170px) {
   div.top-menu-small-screen {
     display: block;
diff --git a/register.php b/register.php
index 47f3b406e..28c6d8bf5 100644
--- a/register.php
+++ b/register.php
@@ -118,5 +118,12 @@
 $smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
-$smarty->assign('content_page_name', 'register.tpl');
-$smarty->display('index.tpl');
+if (defined('DEBUG_MOBILE'))
+  $smarty->assign('content_page_name', 'register2.tpl');
+else {
+  $smarty->assign('content_page_name', 'register.tpl');
+}
+if (defined('DEBUG_MOBILE'))
+  $smarty->display('index2.tpl');
+else
+  $smarty->display('index.tpl');

From 2f756f715ce0e2249b895feccca838b17f095224 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 25 Sep 2020 12:32:51 +0000
Subject: [PATCH 1289/1848] Some style fixes for registration page.

---
 WEB-INF/templates/footer.tpl    |   2 +-
 WEB-INF/templates/footer2.tpl   |   2 +-
 WEB-INF/templates/register2.tpl |  41 +++++++++++++++++---------------
 default2.css                    |  26 +++++++++++++++++---
 img/icon-question-mark.png      | Bin 0 -> 1119 bytes
 5 files changed, 47 insertions(+), 24 deletions(-)
 create mode 100644 img/icon-question-mark.png

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e7c1cdde1..4e66e0f70 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">Anuko Time Tracker 1.19.23.5292 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5293 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index c3797a337..23ce92f69 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5292 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5293 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/register2.tpl b/WEB-INF/templates/register2.tpl
index d91ec66ea..5584fde39 100644
--- a/WEB-INF/templates/register2.tpl
+++ b/WEB-INF/templates/register2.tpl
@@ -1,50 +1,53 @@
 {$forms.groupForm.open}
 <table class="centered-table">
-  <tr class = "small-screen-label"><td>{$i18n.label.group_name} (*):</td></tr>
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.group_name} (*):</td>
-    <td class="td-with-input">{$forms.groupForm.group_name.control} <a href="https://www.anuko.com/lp/tt_37.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+    <td class="large-screen-label"><label for="group_name">{$i18n.label.group_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.group_name.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_37.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_37.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.currency}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="currency">{$i18n.label.currency}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.currency}:</td>
+    <td class="large-screen-label"><label for="currency">{$i18n.label.currency}:</label></td>
     <td class="td-with-input">{$forms.groupForm.currency.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.language}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="lang">{$i18n.label.language}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.language}:</td>
+    <td class="large-screen-label"><label for="lang">{$i18n.label.language}:</label></td>
     <td class="td-with-input">{$forms.groupForm.lang.control}</td>
   </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.manager_name} (*):</td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_name">{$i18n.label.manager_name} (*):</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.manager_name} (*):</td>
+    <td class="large-screen-label"><label for="manager_name">{$i18n.label.manager_name} (*):</label></td>
     <td class="td-with-input">{$forms.groupForm.manager_name.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.manager_login} (*):</td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_login">{$i18n.label.manager_login} (*):</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.manager_login} (*):</td>
+    <td class="large-screen-label"><label for="manager_login">{$i18n.label.manager_login} (*):</label></td>
     <td class="td-with-input">{$forms.groupForm.manager_login.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.password} (*):</td></tr>
+  <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.password} (*):</td>
+    <td class="large-screen-label"><label for="password1">{$i18n.label.password} (*):</label></td>
     <td class="td-with-input">{$forms.groupForm.password1.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.confirm_password} (*):</td></tr>
+  <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password} (*):</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.confirm_password} (*):</td>
+    <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
     <td class="td-with-input">{$forms.groupForm.password2.control}</td>
   </tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_email">{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</td>
+    <td class="large-screen-label"><label for="manager_email">{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</label></td>
     <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
   </tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
@@ -53,4 +56,4 @@
     <td colspan="2">{$forms.groupForm.btn_submit.control}</td>
   </tr>
 </table>
-{$forms.groupForm.close}
+{$forms.groupForm.close}
\ No newline at end of file
diff --git a/default2.css b/default2.css
index b24fa06c2..f4a3a8e07 100644
--- a/default2.css
+++ b/default2.css
@@ -150,18 +150,38 @@ div.page-hint {
   padding: .5rem;
 }
 
+.centered-table td img {
+  vertical-align: middle;
+}
+
+.what-is-it-img {
+  display: none;
+}
+
+.what-is-it-text {
+  display: inline-block;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
-      display: none;
+    display: none;
   }
 
   .small-screen-label {
-      display: block;
+    display: block;
   }
 
   .small-screen-form-control-separator {
-      display: block;
+    display: block;
+  }
+  
+  .what-is-it-img {
+    display: inline-block;
+  }
+  
+  .what-is-it-text {
+    display: none;
   }
 }
 
diff --git a/img/icon-question-mark.png b/img/icon-question-mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6225d27106d55648816f78920581bc7587b0f44
GIT binary patch
literal 1119
zcmaJ=OK1~87~ZBfN^P|uRa+sB+X{lsKJqk6V@<M+33N+HBaOH2W7@3kKHQy}q^D{X
z6g<R(P!L3KiXgr&;=!Wz;6bg57g10V1yQOfp2Rp?o9e;1Fgr6p|M&f`Z%$+e_qH~7
zHWLKVnojXqytg@PjT`^Beyxgl>p=Z^G-QmTqG&-PrWg_gX-yo1Stu&ygZE)CK{R%&
zxjf1X1DtGVl<4?SCC$WWg6QolnW8)n5s=`Rsz=GiTenG|Dp7JcC@_MVfCV)*Wx=7T
z!JIrbE=LryZ#U>IahO1ZNCYKqLbth6lw9KF@YylbBv^7m<5BW=Qh6Z*5{3mqkYc<t
z6JkLqK(PTP5{UEwAHy;<>!X>lmu0wMm}6M5{E;}CrHpb}KDitV-=bszA(Nx&VzEdS
z{gh#i(QG6Vp&1|T^Lep{*DmWwEO~XitH!`XTeegasfG?5Mo}^*QIy1){w_f?S7>#6
zxlOoXbV)R6mSUWeYL0^Ne^*Ug@wQPG{>k^B#CEQ1LOKg=W73lG;6}TgP$rkKpok1B
zXBZQ;E@lb_GVFq3g2YgeVu2vas_s~p5Q4y^bsLGg4AXp+#2l2WDqJ!d_Qk{DU^2wV
zS++kGVIsSBCH#IL8|34Do~>bdL!Q*2j%rxt4>nX6>xe-!abzA^>LI8kEkgrKMRRKX
zT>N$Uma$6xTmp5mG){(gM*G*OYbLB8=eQzVd|8n`)Un<zEbRW5h4=VTJWlhmT<N*=
zqgw52T*G|$DNVb!18TLjX~&jT4_#jlfU`~Wi!oP~z8?E_zN6xv_jj0$mC@nKVWx4m
z(tUa%Ff-9Ib0FW^zG2myeVNX?(}C{qo(u1ur9MVe8;?o;SDv<Fy#0`L@TaFc^rERJ
zb>#Zy&oh}DSLVzHin#WvrEN>sO%%N9o(_CUKKbG4^ekR2H=KEJsq)0t+kC41wH@o+
z_TXrX8Iy)bo(@caJFay*=Qg=7&(EHG)O2p4y8a&ZcJthxi))X&hz2*YaFWf9&F(Kd
OPd?p0$X||+9Qg(7pK7T9

literal 0
HcmV?d00001


From 1d94570d421f7098a997136d7119ed4d82171cd2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 25 Sep 2020 13:00:12 +0000
Subject: [PATCH 1290/1848] Style fixes for login pages.

---
 WEB-INF/templates/footer.tpl      | 2 +-
 WEB-INF/templates/footer2.tpl     | 2 +-
 WEB-INF/templates/login.db2.tpl   | 8 ++++----
 WEB-INF/templates/login.ldap2.tpl | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4e66e0f70..713d34116 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">Anuko Time Tracker 1.19.23.5293 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5294 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 23ce92f69..40e7f2547 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5293 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5294 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/login.db2.tpl b/WEB-INF/templates/login.db2.tpl
index 71eb170c8..4ab3ad2c0 100644
--- a/WEB-INF/templates/login.db2.tpl
+++ b/WEB-INF/templates/login.db2.tpl
@@ -1,13 +1,13 @@
 <table class="centered-table">
-  <tr class = "small-screen-label"><td>{$i18n.label.login}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.login}:</td>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login}:</label></td>
     <td class="td-with-input">{$forms.loginForm.login.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.password}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="password">{$i18n.label.password}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.password}:</td>
+    <td class="large-screen-label"><label for="password">{$i18n.label.password}:</label></td>
     <td class="td-with-input">{$forms.loginForm.password.control}</td>
   </tr>
   <tr>
diff --git a/WEB-INF/templates/login.ldap2.tpl b/WEB-INF/templates/login.ldap2.tpl
index e51abec12..7fd32ed2e 100644
--- a/WEB-INF/templates/login.ldap2.tpl
+++ b/WEB-INF/templates/login.ldap2.tpl
@@ -2,15 +2,15 @@
 <div class="page-hint">{$i18n.label.ldap_hint}</div>
 {/if}
 <table class="centered-table">
-  <tr class = "small-screen-label"><td>{$i18n.label.login}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.login}:</td>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login}:</label></td>
     <td class="td-with-input">{$forms.loginForm.login.control}<span id="ldapDefaultDomain">@{$Auth_ldap_params.default_domain}</span></td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td>{$i18n.label.password}:</td></tr>
+  <tr class = "small-screen-label"><td><label for="password">{$i18n.label.password}:</label></td></tr>
   <tr>
-    <td class="large-screen-label">{$i18n.label.password}:</td>
+    <td class="large-screen-label"><label for="password">{$i18n.label.password}:</label></td>
     <td class="td-with-input">{$forms.loginForm.password.control}</td>
   </tr>
   <tr>

From 01da94bbc817e3ebeb3eff697dab5ea1ce74224f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 25 Sep 2020 13:41:04 +0000
Subject: [PATCH 1291/1848] Renamed 3 icon files.

---
 WEB-INF/templates/admin_groups.tpl        |   4 ++--
 WEB-INF/templates/cf_custom_fields.tpl    |   4 ++--
 WEB-INF/templates/cf_dropdown_options.tpl |   4 ++--
 WEB-INF/templates/clients.tpl             |   8 ++++----
 WEB-INF/templates/entity_files.tpl        |   4 ++--
 WEB-INF/templates/expenses.tpl            |   8 ++++----
 WEB-INF/templates/footer.tpl              |   2 +-
 WEB-INF/templates/footer2.tpl             |   2 +-
 WEB-INF/templates/groups.tpl              |   4 ++--
 WEB-INF/templates/invoices.tpl            |   2 +-
 WEB-INF/templates/mobile/time.tpl         |   4 ++--
 WEB-INF/templates/notifications.tpl       |   4 ++--
 WEB-INF/templates/predefined_expenses.tpl |   4 ++--
 WEB-INF/templates/projects.tpl            |  18 +++++++++---------
 WEB-INF/templates/report.tpl              |   4 ++--
 WEB-INF/templates/roles.tpl               |   8 ++++----
 WEB-INF/templates/tasks.tpl               |   8 ++++----
 WEB-INF/templates/templates.tpl           |   8 ++++----
 WEB-INF/templates/time.tpl                |   8 ++++----
 WEB-INF/templates/timesheets.tpl          |  16 ++++++++--------
 WEB-INF/templates/users.tpl               |   8 ++++----
 WEB-INF/templates/week.tpl                |   8 ++++----
 WEB-INF/templates/work/admin_work.tpl     |   8 ++++----
 WEB-INF/templates/work/work.tpl           |   8 ++++----
 img/{icon_delete.png => icon-delete.png}  | Bin
 img/{icon_edit.png => icon-edit.png}      | Bin
 img/{icon_file.png => icon-file.png}      | Bin
 img/{icon_files.png => icon-files.png}    | Bin
 28 files changed, 78 insertions(+), 78 deletions(-)
 rename img/{icon_delete.png => icon-delete.png} (100%)
 rename img/{icon_edit.png => icon-edit.png} (100%)
 rename img/{icon_file.png => icon-file.png} (100%)
 rename img/{icon_files.png => icon-files.png} (100%)

diff --git a/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
index 9f2ecb6f4..af98c12fd 100644
--- a/WEB-INF/templates/admin_groups.tpl
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -22,8 +22,8 @@
     <td>{$group.name|escape}</td>
     <td nowrap>{$group.date}</td>
     <td align="center">{$group.lang}</td>
-    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
   </tr>
   {/foreach}
 {/if}
diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index e056c606b..6636d79e1 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -30,8 +30,8 @@
           <td>{$i18n.label.type_dropdown}</td>
           <td><a href="cf_dropdown_options.php?field_id={$field['id']}">{$i18n.label.configure}</a></td>
       {/if}
-          <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index d694a1ebc..92b2d4dac 100644
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -16,8 +16,8 @@
     {foreach $options as $key=>$val}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$val|escape}</td>
-          <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index cba3256c3..07b835c87 100644
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -20,8 +20,8 @@
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$client.name|escape}</td>
           <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
@@ -43,8 +43,8 @@
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$client.name|escape}</td>
           <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/entity_files.tpl b/WEB-INF/templates/entity_files.tpl
index fe5dc5445..ab9564852 100644
--- a/WEB-INF/templates/entity_files.tpl
+++ b/WEB-INF/templates/entity_files.tpl
@@ -16,8 +16,8 @@
           <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
           <td>{$file.description|escape}</td>
     {if $can_edit}
-          <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
     {/if}
         </tr>
   {/foreach}
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 1e9476c3d..3c5867279 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -207,23 +207,23 @@ function recalculateCost() {
         <td valign="top" align="right">{$item.cost}</td>
     {if $show_files}
       {if $item.has_files}
-        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
       {else}
-        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
       {/if}
     {/if}
         <td valign="top" align="center">
     {if $item.approved || $item.invoice_id}
           &nbsp;
     {else}
-          <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a>
+          <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
     {/if}
         </td>
         <td valign="top" align="center">
     {if $item.approved || $item.invoice_id}
           &nbsp;
     {else}
-          <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a>
+          <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
     {/if}
         </td>
       </tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 713d34116..a4d2075af 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">Anuko Time Tracker 1.19.23.5294 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5295 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 40e7f2547..e7b8069a4 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5294 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5295 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl
index 7b2a24017..636a252b0 100644
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -22,8 +22,8 @@
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$subgroup.name|escape}</td>
     <td>{$subgroup.description|escape}</td>
-    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
   </tr>
   {/foreach}
 </table>
diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index af632ef58..e27eb3991 100644
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -43,7 +43,7 @@
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
   {if !$user->isClient()}
-          <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
   {/if}
         </tr>
         {/foreach}
diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index 3c9d4276c..6b8bca0c6 100644
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -25,8 +25,8 @@
           <td valign="top">{$record.project|escape}</td>
     {/if}
           <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a>{/if}</td>
-          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a>{/if}</td>
+          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a>{/if}</td>
+          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a>{/if}</td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index 3cd3347b7..d54579027 100644
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -19,8 +19,8 @@
           <td>{$notification['cron_spec']|escape}</td>
           <td>{$notification['email']|escape}</td>
           <td>{$notification['report_condition']|escape}</td>
-          <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
index e115b58db..d35fac0b4 100644
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -14,8 +14,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$predefined_expense['name']|escape}</td>
           <td>{$predefined_expense['cost']|escape}</td>
-          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index 345b7ef47..19bbe2373 100644
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -26,13 +26,13 @@
           <td>{$project.description|escape}</td>
       {if $show_files}
         {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
         {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
         {/if}
       {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -64,13 +64,13 @@
           <td>{$project.description|escape}</td>
       {if $show_files}
         {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
         {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
         {/if}
       {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
@@ -99,7 +99,7 @@
           <td>{$project.description|escape}</td>
       {if $show_files}
         {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
         {else}
           <td>&nbsp;</td>
         {/if}
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 822083df1..f7ef4ff2e 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -164,8 +164,8 @@
     {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
     {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
     {if $bean->getAttribute('chfiles')}
-      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a>{/if}</td>{/if}
-      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a>{/if}</td>{/if}
+      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
+      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
     {/if}
     {if $use_checkboxes}
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
diff --git a/WEB-INF/templates/roles.tpl b/WEB-INF/templates/roles.tpl
index d1d60b849..227392489 100644
--- a/WEB-INF/templates/roles.tpl
+++ b/WEB-INF/templates/roles.tpl
@@ -22,8 +22,8 @@
           <td>{$role.name|escape}</td>
           <td>{$role.rank}</td>
           <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -52,8 +52,8 @@
           <td>{$role.name|escape}</td>
           <td>{$role.rank}</td>
           <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 646899ddf..591820199 100644
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -32,8 +32,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
   {/if}
@@ -60,8 +60,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index fa3faac63..282387830 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -16,8 +16,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
@@ -37,8 +37,8 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
     {/foreach}
       </table>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index be0299a48..69d214127 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -167,16 +167,16 @@
     {/if}
     {if $show_files}
       {if $record.has_files}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
       {else}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
       {/if}
     {/if}
           <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a>
+            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
       {if ($record.duration == '0:00' && $record.start <> '')}
             <input type="hidden" name="record_id" value="{$record.id}">
             <input type="hidden" name="browser_date" value="">
@@ -189,7 +189,7 @@
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
             &nbsp;
     {else}
-            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a>
+            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
     {/if}
           </td>
         </tr>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 237eb98be..318702a71 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -40,13 +40,13 @@
   {/if}
   {if $show_files}
         {if $timesheet.has_files}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
         {else}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
         {/if}
   {/if}
-          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
 {/foreach}
       </table>
@@ -86,13 +86,13 @@
     {/if}
     {if $show_files}
       {if $timesheet.has_files}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
       {else}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
       {/if}
     {/if}
-          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index d7d3e3aa7..c3f6861ea 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -35,8 +35,8 @@
           <td class="cellRightAligned">{$u.quota_percent}</td>
       {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
-          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>{else}<td></td>{/if}
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>{else}<td></td>{/if}
       {else}
           <td></td>
           <td></td>
@@ -76,8 +76,8 @@
           <td class="cellRightAligned">{$u.quota_percent}</td>
       {/if}
       {if $u.group_id != $user->group_id || $u.rank < $user->rank}
-          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a></td>
-          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a></td>
+          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
       {else}
           <td></td>
           <td></td>
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 9d3ef0bf2..92ce31d92 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -149,23 +149,23 @@ function fillDropdowns() {
         <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
     {if $show_files}
       {if $record.has_files}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_files.png"></a></td>
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
       {else}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon_file.png"></a></td>
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
       {/if}
     {/if}
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon_edit.png"></a>
+          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
     {/if}
         </td>
         <td valign="top" align="center">
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
           &nbsp;
     {else}
-          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon_delete.png"></a>
+          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
     {/if}
         </td>
       </tr>
diff --git a/WEB-INF/templates/work/admin_work.tpl b/WEB-INF/templates/work/admin_work.tpl
index 929b4d619..13f37e911 100644
--- a/WEB-INF/templates/work/admin_work.tpl
+++ b/WEB-INF/templates/work/admin_work.tpl
@@ -22,8 +22,8 @@
           <td>{$work_item.description|escape}</td>
           <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
-          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
-          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
+          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
+          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
@@ -48,8 +48,8 @@
           <td>{$offer.description|escape}</td>
           <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
           <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
-          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
+          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
+          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/WEB-INF/templates/work/work.tpl b/WEB-INF/templates/work/work.tpl
index 76d953065..67235b64f 100644
--- a/WEB-INF/templates/work/work.tpl
+++ b/WEB-INF/templates/work/work.tpl
@@ -25,12 +25,12 @@
           <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
           <td nowrap>{$work_item.amount_with_currency}</td>
     {if $work_item.can_edit}
-          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
+          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
     {else}
           <td></td>
     {/if}
     {if $work_item.can_delete}
-          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
+          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
     {else}
           <td></td>
     {/if}
@@ -92,8 +92,8 @@
           <td>{$offer.description|escape}</td>
           <td>{$offer.status_label}</td>
           <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon_edit.png"></a></td>
-          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon_delete.png"></a></td>
+          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
+          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
         </tr>
   {/foreach}
       </table>
diff --git a/img/icon_delete.png b/img/icon-delete.png
similarity index 100%
rename from img/icon_delete.png
rename to img/icon-delete.png
diff --git a/img/icon_edit.png b/img/icon-edit.png
similarity index 100%
rename from img/icon_edit.png
rename to img/icon-edit.png
diff --git a/img/icon_file.png b/img/icon-file.png
similarity index 100%
rename from img/icon_file.png
rename to img/icon-file.png
diff --git a/img/icon_files.png b/img/icon-files.png
similarity index 100%
rename from img/icon_files.png
rename to img/icon-files.png

From 98027b33bac363af92bf89aefd0121a4ef24232b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 25 Sep 2020 16:20:35 +0000
Subject: [PATCH 1292/1848] Starting to get rid of styles from php code.

---
 WEB-INF/lib/form/Form.class.php          |   2 +
 WEB-INF/lib/form/FormElement.class.php   |  30 +-
 WEB-INF/lib/form/PasswordField.class.php |   2 +
 WEB-INF/lib/form/TextField.class.php     |   2 +
 WEB-INF/templates/header2.tpl            |   2 +-
 default.css                              | 214 +++++++++++
 default2.css                             | 442 -----------------------
 login.php                                |   4 +-
 8 files changed, 238 insertions(+), 460 deletions(-)
 delete mode 100644 default2.css

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 1f77414b1..1bbf2253e 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -53,12 +53,14 @@ function addInput($params) {
       case 'text':
         import('form.TextField');
         $el = new TextField($params['name']);
+        if (isset($params['class'])) $el->setCssClass($params['class']);
         if (isset($params['maxlength'])) $el->setMaxLength($params['maxlength']);
         break;
 
       case 'password':
         import('form.PasswordField');
         $el = new PasswordField($params['name']);
+        if (isset($params['class'])) $el->setCssClass($params['class']);
         if (isset($params['maxlength'])) $el->setMaxLength($params['maxlength']);
         break;
 
diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index 0443e6c9a..096084ef4 100644
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -28,27 +28,27 @@
 
 // FromElement is the base class for controls on forms.
 class FormElement {
-  var $id = '';         // Control id.
-  var $name;            // Control name.
-  var $form_name = '';  // Form name the control is in.
-  var $value = '';      // Value of the control.
-  var $size = '';       // Control size.
-  var $max_length = ''; // Max length of text in control.
-  var $on_change = '';  // What happens when value of control changes.
-  var $on_click = '';   // What happens when the control is clicked.
-  var $label = '';      // Optional label for control.
-  var $style = '';      // Control style.
-  var $enabled = true;  // Whether the control is enabled.
-  var $class = 'FormElement'; // PHP class name for the element.
-  var $cssClass = null; // CSS class name for the element.
+  var $id = '';          // control id
+  var $name;             // control name
+  var $form_name = '';   // form name the control is in
+  var $value = '';       // value of the control
+  var $size = '';        // control size
+  var $max_length = '';  // max length of text in control
+  var $on_change = '';   // what happens when value of control changes
+  var $on_click = '';    // what happens when the control is clicked
+  var $label = '';       // optional label for control
+  var $style = '';       // control style
+  var $enabled = true;   // whether the control is enabled
+  var $class = 'FormElement'; // php class name for the control
+  var $css_class = null; // css class name for the control
 
   function __construct() {
   }
 
   function getName() { return $this->name; }
   function getClass() { return $this->class; }
-  function getCssClass() { return $this->cssClass; }
-  function setCssClass($cssClass) { $this->cssClass = $cssClass; }
+  function getCssClass() { return $this->css_class; }
+  function setCssClass($css_class) { $this->css_class = $css_class; }
 
   function setFormName($name) { $this->form_name = $name; }
   function getFormName() { return $this->form_name; }
diff --git a/WEB-INF/lib/form/PasswordField.class.php b/WEB-INF/lib/form/PasswordField.class.php
index 747a6ac45..579be5edb 100644
--- a/WEB-INF/lib/form/PasswordField.class.php
+++ b/WEB-INF/lib/form/PasswordField.class.php
@@ -33,6 +33,7 @@ class PasswordField extends FormElement {
   function __construct($name)
   {
     $this->class = 'PasswordField';
+    $this->css_class = 'password-field';
     $this->name = $name;
   }
 
@@ -40,6 +41,7 @@ function getHtml() {
     if ($this->id == '') $this->id = $this->name;
 
     $html = "\n\t<input type=\"password\"";
+    $html .= " class=\"$this->css_class\"";
     $html.= ' id="'.$this->id.'"';
     $html.= ' name="'.$this->name.'"';
 
diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index 6b745a2af..fdfb76837 100644
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -35,6 +35,7 @@ class TextField extends FormElement {
   function __construct($name)
   {
     $this->class = 'TextField';
+    $this->css_class = 'text-field';
     $this->name = $name;
   }
 
@@ -43,6 +44,7 @@ function setTitle($title) { $this->title = $title; }
   function getHtml() {
     if (empty($this->id)) $this->id = $this->name;
     $html = "\n\t<input type=\"text\"";
+    $html .= " class=\"$this->css_class\"";
     $html .= " id=\"$this->id\" name=\"$this->name\"";
     if (!empty($this->size)) $html .= " size=\"$this->size\"";
     if (!empty($this->style)) $html .= " style=\"$this->style\"";
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index 4af0ef8af..9aba06219 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="default2.css" rel="stylesheet" type="text/css">
+  <link href="{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
   <link href="{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
 {/if}
diff --git a/default.css b/default.css
index 3b4921acf..d6b8f6571 100644
--- a/default.css
+++ b/default.css
@@ -27,6 +27,220 @@
 // +----------------------------------------------------------------------+
 */
 
+body {
+  margin: 0px;
+  font-size: 10pt;
+  font-family: Verdana, sans-serif;
+  background-color: white;
+}
+
+div.logo {
+  padding: .5rem;
+  text-align: center;
+  background-color: #a6ccf7;
+}
+
+div.top-menu-large-screen {
+  background-color: black;
+  display: block;
+}
+
+.top-submenu-large-screen {
+  background-color: #d9d9d9;
+  display: block;
+}
+
+div.top-menu-small-screen {
+  background-color: black;
+  display: none;
+}
+
+div.top-menu-small-screen a {
+  font-size: 1rem;
+  font-weight: bold;
+  color: white;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+div.top-menu-large-screen a {
+  font-size: 1rem;
+  font-weight: bold;
+  color: white;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+.top-menu-table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.top-submenu-table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.top-submenu-large-screen a {
+  font-size: 1rem;
+  color: #444444;
+  margin: .1rem .2rem .1rem .2rem;
+}
+
+div.page-title {
+  font-size: 12pt;
+  font-weight: bold;
+  color: silver;
+  text-align: center;
+  padding: .25rem;
+  border-bottom: 1px solid lightgray;
+  margin-bottom: .2rem;
+}
+
+div.user-details {
+  text-align: center;
+  padding: .2rem;
+}
+
+.page-errors {
+  margin-top: .5rem;
+  text-align: center;
+  color: red;
+}
+
+.page-content {
+  text-align: center;
+}
+
+.form-control-separator {
+  height: .5rem;
+}
+
+div#LoginAboutText {
+  padding: 1rem;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+#ldapDefaultDomain {
+  color: #777777;
+}
+
+div.page-hint {
+  margin-top: 1rem;
+}
+
+.centered-table {
+  margin-top: .5rem;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+}
+
+.large-screen-label {
+  text-align: right;
+  vertical-align: middle;
+  display: table-cell;
+}
+
+.small-screen-label {
+  text-align: left;
+  display: none;
+}
+
+.small-screen-form-control-separator {
+  height: .25rem;
+  display: none;
+}
+
+.page-content input {
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
+}
+
+.td-with-input {
+  text-align: left;
+}
+
+.page-content input:focus {
+  background-color: yellow;
+  border: 1px solid black;
+  outline: none;
+}
+
+.contribute-msg {
+  text-align: center;
+  margin-top: 2rem;
+  padding: .2rem;
+  background-color: #eeeeee;
+}
+
+.version-and-copyright {
+  text-align: center;
+  padding: .5rem;
+}
+
+.centered-table td img {
+  vertical-align: middle;
+}
+
+.what-is-it-img {
+  display: none;
+}
+
+.what-is-it-text {
+  display: inline-block;
+}
+
+input.text-field {
+  width: 220px;
+}
+
+input.password-field {
+  width: 220px;
+}
+
+@media screen and (max-width: 600px) {
+
+  .large-screen-label {
+    display: none;
+  }
+
+  .small-screen-label {
+    display: block;
+  }
+
+  .small-screen-form-control-separator {
+    display: block;
+  }
+
+  .what-is-it-img {
+    display: inline-block;
+  }
+
+  .what-is-it-text {
+    display: none;
+  }
+}
+
+@media screen and (max-width: 1170px) {
+  div.top-menu-small-screen {
+    display: block;
+  }
+
+  div.top-menu-large-screen {
+    display: none;
+  }
+
+  div.top-submenu-large-screen {
+    display: none;
+  }
+}
+
+
+
+
+
+/* TODO: below are legacy styles. Review as work on mobile-friendly pages continues. */
 a { color: blue; text-decoration: none; }
 
 a:visited { text-decoration: none; }
diff --git a/default2.css b/default2.css
deleted file mode 100644
index f4a3a8e07..000000000
--- a/default2.css
+++ /dev/null
@@ -1,442 +0,0 @@
-body {
-  margin: 0px;
-  font-size: 10pt;
-  font-family: Verdana, sans-serif;
-  background-color: white;
-}
-
-div.logo {
-  padding: .5rem;
-  text-align: center;
-  background-color: #a6ccf7;
-}
-
-div.top-menu-large-screen {
-  background-color: black;
-  display: block;
-}
-
-.top-submenu-large-screen {
-  background-color: #d9d9d9;
-  display: block;
-}
-
-div.top-menu-small-screen {
-  background-color: black;
-  display: none;
-}
-
-div.top-menu-small-screen a {
-  font-size: 1rem;
-  font-weight: bold;
-  color: white;
-  margin: .1rem .2rem .1rem .2rem;
-}
-
-div.top-menu-large-screen a {
-  font-size: 1rem;
-  font-weight: bold;
-  color: white;
-  margin: .1rem .2rem .1rem .2rem;
-}
-
-.top-menu-table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.top-submenu-table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.top-submenu-large-screen a {
-  font-size: 1rem;
-  color: #444444;
-  margin: .1rem .2rem .1rem .2rem;
-}
-
-div.page-title {
-  font-size: 12pt;
-  font-weight: bold;
-  color: silver;
-  text-align: center;
-  padding: .25rem;
-  border-bottom: 1px solid lightgray;
-  margin-bottom: .2rem;
-}
-
-div.user-details {
-  text-align: center;
-  padding: .2rem;
-}
-
-.page-errors {
-  margin-top: .5rem;
-  text-align: center;
-  color: red;
-}
-
-.page-content {
-  text-align: center;
-}
-
-.form-control-separator {
-  height: .5rem;
-}
-
-div#LoginAboutText {
-  padding: 1rem;
-  margin-left:auto;
-  margin-right:auto;
-}
-
-#ldapDefaultDomain {
-  color: #777777;
-}
-
-div.page-hint {
-  margin-top: 1rem;
-}
-
-.centered-table {
-  margin-top: .5rem;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-}
-
-.large-screen-label {
-  text-align: right;
-  vertical-align: middle;
-  display: table-cell;
-}
-
-.small-screen-label {
-  text-align: left;
-  display: none;
-}
-
-.small-screen-form-control-separator {
-  height: .25rem;
-  display: none;
-}
-
-.page-content input {
-  border-radius: 4px;
-  border: 1px solid #c9c9c9;
-  padding: .4rem;
-}
-
-.td-with-input {
-  text-align: left;
-}
-
-.page-content input:focus {
-  background-color: yellow;
-  border: 1px solid black;
-  outline: none;
-}
-
-.contribute-msg {
-  text-align: center;
-  margin-top: 2rem;
-  padding: .2rem;
-  background-color: #eeeeee;
-}
-
-.version-and-copyright {
-  text-align: center;
-  padding: .5rem;
-}
-
-.centered-table td img {
-  vertical-align: middle;
-}
-
-.what-is-it-img {
-  display: none;
-}
-
-.what-is-it-text {
-  display: inline-block;
-}
-
-@media screen and (max-width: 600px) {
-
-  .large-screen-label {
-    display: none;
-  }
-
-  .small-screen-label {
-    display: block;
-  }
-
-  .small-screen-form-control-separator {
-    display: block;
-  }
-  
-  .what-is-it-img {
-    display: inline-block;
-  }
-  
-  .what-is-it-text {
-    display: none;
-  }
-}
-
-@media screen and (max-width: 1170px) {
-  div.top-menu-small-screen {
-    display: block;
-  }
-
-  div.top-menu-large-screen {
-    display: none;
-  }
-
-  div.top-submenu-large-screen {
-    display: none;
-  }
-}
-
-
-
-
-
-
-
-
-
-
-a { color: blue; text-decoration: none; }
-
-a:visited { text-decoration: none; }
-
-a:hover { text-decoration: underline; }
-
-html {
-  overflow-y: scroll;
-}
-
-table { font-size: 10pt; font-family: Verdana, sans-serif; }
-
-input, button, select, textarea {
-  font-size: 10pt;
-  font-family: Verdana, sans-serif;
-  margin: 2px 2px 2px 2px;
-  padding: 2px 5px 2px 5px;
-}
-
-input[type=checkbox], label {
-  vertical-align: middle;
-}
-
-.pageTitle {
-  font-size: 12pt;
-  font-weight: bold;
-  color: silver;
-}
-
-.systemMenu {
-  font-size: 1rem;
-  font-weight: bold;
-  color: white;
-  background-color: black;
-  margin: .1rem .2rem .1rem .2rem;
-}
-
-.mainMenu {
-  font-size: 1rem;
-  color: #444444;
-  margin: .1rem .2rem .1rem .2rem;
-}
-
-.onBehalf {
-  font-weight: bold;
-}
-
-/* calendar styles */
-.calendarHeader {
-  padding: 5px;
-  font-size: 8pt;
-  color: #333333;
-  background-color: #d9d9d9;
-}
-
-.calendarDay {
-  padding: 5px;
-  border: 1px solid silver;
-  font-size: 8pt;
-  color: #333333;
-  background-color: #ffffff;
-}
-
-.calendarDaySelected {
-  padding: 5px;
-  border: 1px solid silver;
-  font-size: 8pt;
-  color: #666666;
-  background-color: #a6ccf7;
-}
-
-.calendarDayWeekend {
-  padding: 5px;
-  border: 1px solid silver;
-  font-size: 8pt;
-  color: #666666;
-  background-color: #f7f7f7;
-}
-
-.calendarDayHoliday {
-  padding: 5px;
-  border: 1px solid silver;
-  font-size: 8pt;
-  color: #666666;
-  background-color: #f7f7f7;
-}
-
-.calendarDayHeader {
-  padding: 5px;
-  border: 1px solid white;
-  font-size: 8pt;
-  color: #333333;
-}
-
-.calendarDayHeaderWeekend {
-  padding: 5px;
-  border: 1px solid white;
-  font-size: 8pt;
-  color: #999999;
-}
-
-.calendarLinkWeekend {
-  color: #999999;
-}
-
-.calendarLinkHoliday {
-  color: #999999;
-}
-
-.calendarLinkRecordsExist {
-  color: #ff0000;
-}
-
-.calendarLinkNonCompleteDay {
-  color: #800080;
-}
-/* end of calendar styles */
-
-.tableHeader {
-  font-weight: bold;
-  text-align: left;
-}
-
-.tableHeaderCentered {
-  font-weight: bold;
-  text-align: center;
-}
-
-.rowReportItem {
-  background-color: #f5f5f5;
-}
-
-.rowReportItemAlt {
-  background-color: #ffffff;
-}
-
-.rowReportSubtotal {
-  background-color: #e0e0e0;
-}
-
-.cellLeftAligned {
-  text-align: left;
-  vertical-align: top;
-}
-
-.cellRightAligned {
-  text-align: right;
-  vertical-align: top;
-}
-
-.cellLeftAlignedSubtotal {
-  font-weight: bold;
-  vertical-align: top;
-}
-
-.cellRightAlignedSubtotal {
-  font-weight: bold;
-  text-align: right;
-  vertical-align: top;
-}
-
-.midAligned {
-  text-align: center;
-}
-
-.sectionHeader {
-  font-weight: bold;
-  border-bottom: 1px solid lightgray;
-}
-
-.sectionHeaderNoBorder {
-  font-weight: bold;
-}
-
-.error {
-  color: red;
-}
-
-.info_message {
-  color: #0000c0;
-}
-
-.divider {
-  background-color: #efefef;
-}
-
-div.table-divider { height: 30px; }
-
-.uncompleted-entry {
-  display: inline-block;
-  height: 8px;
-  width: 8px;
-  border: 1px solid rgba(0, 0, 0, .1);
-  border-radius: 50%;
-  background-color: rgba(0, 0, 0, .1);
-}
-.uncompleted-entry.active { background-color: red; }
-
-.table_icon {
-  height: 16px;
-  width: 16px;
-}
-
-/* Mobile styles */
-.mobile-table {
-  border: 0;
-  width: 100%;
-  border-spacing: 0;
-}
-
-.mobile-textarea {
-  width: 100%;
-  resize: vertical;
-  height: 5em;
-}
-
-.mobile-input {
-  width: 100%;
-}
-
-.mobile-table-details {
-  width: 100%;
-  table-layout: fixed;
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  border-spacing: 1px;
-  border: 0;
-}
-
-.mobile-table-details td {
-  padding: 3px;
-}
diff --git a/login.php b/login.php
index ac506fccc..9230f6383 100644
--- a/login.php
+++ b/login.php
@@ -36,8 +36,8 @@
 $cl_password = $request->getParameter('password');
 
 $form = new Form('loginForm');
-$form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'100','name'=>'login','style'=>'width: 220px;','value'=>$cl_login));
-$form->addInput(array('type'=>'password','size'=>'25','maxlength'=>'50','name'=>'password','style'=>'width: 220px;','value'=>$cl_password));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
+$form->addInput(array('type'=>'password','maxlength'=>'50','name'=>'password','value'=>$cl_password));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
 $form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.login')));
 

From 35d297385731a237fba5777518fc72a5383f2414 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 25 Sep 2020 20:07:10 +0000
Subject: [PATCH 1293/1848] Some more style fixes.

---
 WEB-INF/lib/form/Combobox.class.php |  2 ++
 WEB-INF/lib/form/Form.class.php     |  1 +
 default.css                         | 18 ++++++++++++++++++
 register.php                        |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/form/Combobox.class.php b/WEB-INF/lib/form/Combobox.class.php
index 88f0b50a9..a0ae0e5a0 100644
--- a/WEB-INF/lib/form/Combobox.class.php
+++ b/WEB-INF/lib/form/Combobox.class.php
@@ -47,6 +47,7 @@ class Combobox extends FormElement {
 
   function __construct($name) {
     $this->class = 'Combobox';
+    $this->css_class = 'dropdown-field';
     $this->name = $name;
   }
 
@@ -68,6 +69,7 @@ function getHtml() {
 	    if ($this->id=="") $this->id = $this->name;
 	    
 		$html = "\n\t<select";
+                $html .= " class=\"$this->css_class\"";
 		$html .= " name=\"$this->name\" id=\"$this->id\"";
 		
 		if ($this->size!="")
diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 1bbf2253e..d00261015 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -118,6 +118,7 @@ function addInput($params) {
 			    $el = new Combobox($params["name"]);
 			    $el->setData(@$params["data"]);
 			    $el->setDataDefault(@$params["empty"]);
+                            if (isset($params['class'])) $el->setCssClass($params['class']);
                             if (isset($params["multiple"])) {
                               $el->setMultiple($params["multiple"]);
                               $el->name .= '[]'; // Add brackets to the end of name to get back an array on POST.
diff --git a/default.css b/default.css
index d6b8f6571..8e25f8d48 100644
--- a/default.css
+++ b/default.css
@@ -191,6 +191,12 @@ div.page-hint {
   display: inline-block;
 }
 
+input[type=submit] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+}
+
 input.text-field {
   width: 220px;
 }
@@ -199,6 +205,10 @@ input.password-field {
   width: 220px;
 }
 
+.dropdown-field {
+  width: 237px;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
@@ -220,6 +230,14 @@ input.password-field {
   .what-is-it-text {
     display: none;
   }
+
+  div.contribute-msg {
+    display: none;
+  }
+
+  div.version-and-copyright {
+    display: none;
+  }
 }
 
 @media screen and (max-width: 1170px) {
diff --git a/register.php b/register.php
index 28c6d8bf5..805b586f4 100644
--- a/register.php
+++ b/register.php
@@ -77,7 +77,7 @@
   $longname_lang[] = array('id'=>I18n::getLangFromFilename($lfile),'name'=>$lname);
 }
 $longname_lang = mu_sort($longname_lang, 'name');
-$form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 200px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
+$form->addInput(array('type'=>'combobox','name'=>'lang','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
 
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_login','value'=>$cl_manager_login));

From 5be184c6a12d5817bff6792a93bb07e544fa4c19 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 25 Sep 2020 20:08:47 +0000
Subject: [PATCH 1294/1848] Version update for style changes in previous
 commit.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/footer2.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4d2075af..ebdfa18e0 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">Anuko Time Tracker 1.19.23.5295 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5296 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index e7b8069a4..b58425fcb 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5295 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5296 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>

From 92abb45c0decac07198b4c84db999ea8db83d701 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Sep 2020 18:17:54 +0000
Subject: [PATCH 1295/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 90 +++++++++++++----------------------
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/footer2.tpl |  2 +-
 3 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 7ce3b19c0..0efc55c61 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -71,8 +71,7 @@
 'error.access_denied' => 'Toegang geweigerd.',
 'error.sys' => 'Systeem fout.',
 'error.db' => 'Database fout.',
-// TODO: translate the following.
-// 'error.registered_recently' => 'Registered recently.',
+'error.registered_recently' => 'Recent geregistreerd.',
 'error.feature_disabled' => 'Functie is uitgeschakeld.',
 'error.field' => 'Incorrecte gegevens: "{0}".',
 'error.empty' => 'Veld "{0}" is leeg.',
@@ -105,22 +104,8 @@
 'error.format' => 'Bestandsformaat niet valide.',
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
-
-// TODO: translate error.file_storage and error.remote_work.
-
-// Meaning of error.file_storage: an (unspecified) error occurred when trying to communicate with remote
-// file storage server (the one that handles attachments). It is a generic message telling us that
-// "something went wrong" when trying to do some operation with attachments.
-// For example, File Storage server could be offline, or Time Tracker config option is wrong, etc.
-
-// 'error.file_storage' => 'File storage server error.', // See comment in English file.
-
-// Meaning of error.remote_work: an (unspecified) error occurred when trying to communicate with
-// "Remote Work" server, the one that supports the "Work" plugin, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// It is a generic message telling us that "something went wrong" when trying to do some operation with Work plugin.
-// For example, Remote Work server could be offline, among other things.
-
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
+'error.file_storage' => 'Bestand server probleem.',
+'error.remote_work' => 'Werk op afstand server probleem.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
@@ -151,8 +136,7 @@
 'button.disapprove' => 'Afkeuren',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-// TODO: translate the following.
-// 'label.menu' => 'Menu',
+'label.menu' => 'Menu',
 'label.group_name' => 'Groepsnaam',
 'label.address' => 'Adres',
 'label.currency' => 'Munteenheid',
@@ -259,9 +243,8 @@
 'label.approval' => 'Rapport goedkeuring',
 'label.mark_approved' => 'Markeer goedkeuring',
 'label.template' => 'Sjabloon',
-// TODO: translate the following.
-// 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_note' => 'Prepopulate Note field',
+'label.bind_templates_with_projects' => 'Verbind sjabloon aan projecten',
+'label.prepopulate_note' => 'Vul het notitieveld van tevoren in',
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
 'label.file' => 'Bestand',
@@ -271,15 +254,11 @@
 'label.inactive_users' => 'Inactieve medewerkers',
 'label.details' => 'Details',
 'label.budget' => 'Budget',
-// TODO: translate the following.
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
+'label.work' => 'Werk',
+'label.offer' => 'Aanbod',
+'label.contractor' => 'Aanbieder',
+'label.how_to_pay' => 'Betaalwijze',
+'label.moderator_comment' => 'Commentaar',
 
 // Entity names.
 'entity.time' => 'tijd',
@@ -304,8 +283,7 @@
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Bewerk kosten artikel',
 'title.delete_expense' => 'Verwijder kosten artikel',
-// TODO: translate the following.
-// 'title.expense_files' => 'Expense Item Files',
+'title.expense_files' => 'Kosten bestanden',
 'title.predefined_expenses' => 'Vaste kosten',
 'title.add_predefined_expense' => 'Vaste kosten toevoegen',
 'title.edit_predefined_expense' => 'Vaste kosten bewerken',
@@ -384,17 +362,15 @@
 'title.active_work' => 'Actief werk',
 'title.available_work' => 'Beschikbaar werk',
 'title.inactive_work' => 'Inactief werk',
-// TODO: translate the following.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
+'title.pending_work' => 'Werk in afwachting van goedkeuring',
+'title.offer' => 'Aanbod',
 'title.add_offer' => 'Aanbieding toevoegen',
 'title.edit_offer' => 'Aanbieding bewerken',
 'title.delete_offer' => 'Aanbieding verwijderen',
 'title.active_offers' => 'Actieve aanbiedingen',
 'title.available_offers' => 'Beschikbare aanbiedingen',
 'title.inactive_offers' => 'Inactieve aanbiedingen',
-// TODO: translate the following.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
+'title.pending_offers' => 'Aangeboden werk in afwachting van goedkeuring',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -423,8 +399,7 @@
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
 'dropdown.do_not_delete' => 'niet verwijderen',
-// TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
+'dropdown.pending_approval' => 'in afwachting van goedkeuring',
 'dropdown.approved' => 'goedgekeurd',
 'dropdown.not_approved' => 'afgekeurd',
 'dropdown.paid' => 'betaald',
@@ -641,24 +616,23 @@
 'form.timesheet_view.disapprove_body' => "Jouw tijdenoverzicht %s is afgekeurd.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+// TODO: fix form.display_options.note_on_separate_row. Kolom does not seem correct. Note on separate ROW (not column).
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
-// TODO: translate the following.
-// 'form.display_options.not_complete_days' => 'Not complete days',
-// 'form.display_options.custom_css' => 'Custom CSS',
+'form.display_options.not_complete_days' => 'Niet complete dagen',
+'form.display_options.custom_css' => 'Aangepaste CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
+'work.error.work_not_available' => 'Werk onderdeel is niet beschikbaar.',
+'work.error.offer_not_available' => 'Aanbod is niet beschikbaar.',
+'work.type.one_time' => 'eenmalig',
+'work.type.ongoing' => 'doorlopend',
+'work.label.own_work' => 'Eigen werk',
+'work.label.own_offers' => 'Eigen aanbod',
+'work.label.offers' => 'Aanbiedingen',
+'work.button.send_message' => 'Verstuur bericht',
+'work.button.make_offer' => 'maak aanbieding',
+'work.button.accept' => 'Accepteer',
+'work.button.decline' => 'Weiger',
+'work.title.send_message' => 'Bericht wordt verstuurd',
+'work.msg.message_sent' => 'Bericht is verstuurd.',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ebdfa18e0..5ef6a669d 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">Anuko Time Tracker 1.19.23.5296 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5297 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index b58425fcb..037c4982a 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5296 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5297 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>

From c4488f2a1e7d9c0d2e931fa0b62e0697dab1b650 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Sep 2020 18:49:30 +0000
Subject: [PATCH 1296/1848] Cosmetic comment fix.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/footer2.tpl | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0efc55c61..1705e2cd3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -616,8 +616,7 @@
 'form.timesheet_view.disapprove_body' => "Jouw tijdenoverzicht %s is afgekeurd.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-// TODO: fix form.display_options.note_on_separate_row. Kolom does not seem correct. Note on separate ROW (not column).
-'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom',
+'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom', // Translator (Henk) comment: "kolom is the right word in Dutch."
 'form.display_options.not_complete_days' => 'Niet complete dagen',
 'form.display_options.custom_css' => 'Aangepaste CSS',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5ef6a669d..ce0bac546 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">Anuko Time Tracker 1.19.23.5297 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5298 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 037c4982a..ab4de13ee 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5297 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5298 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>

From f01cf6083d8f021a38aff99321c9dbac680dd54d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Sep 2020 21:04:47 +0000
Subject: [PATCH 1297/1848] Incremental cleanup.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/footer2.tpl |  2 +-
 WEB-INF/templates/login.tpl   | 21 ---------------------
 login.php                     | 11 ++---------
 4 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 WEB-INF/templates/login.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ce0bac546..dd471c7af 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">Anuko Time Tracker 1.19.23.5298 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5299 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index ab4de13ee..ff133ff0d 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5298 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5299 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/login.tpl b/WEB-INF/templates/login.tpl
deleted file mode 100644
index d7d9b93f4..000000000
--- a/WEB-INF/templates/login.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<script>
-<!--
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-//-->
-</script>
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      {$forms.loginForm.open}
-      {include file="login.`$smarty.const.AUTH_MODULE`.tpl"}
-      {$forms.loginForm.close}
-    </td>
-  </tr>
-</table>
-
-{if !empty($about_text)}
-  <div id="LoginAboutText"> {$about_text} </div>
-{/if}
diff --git a/login.php b/login.php
index 9230f6383..b4822ac82 100644
--- a/login.php
+++ b/login.php
@@ -85,13 +85,6 @@
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
 $smarty->assign('title', $i18n->get('title.login'));
-if (defined('DEBUG_MOBILE'))
-  $smarty->assign('content_page_name', 'login2.tpl');
-else {
-  $smarty->assign('content_page_name', 'login.tpl');
-}
+$smarty->assign('content_page_name', 'login2.tpl');
 $smarty->assign('about_text', $i18n->get('form.login.about'));
-if (defined('DEBUG_MOBILE'))
-  $smarty->display('index2.tpl');
-else
-  $smarty->display('index.tpl');
+$smarty->display('index2.tpl');

From 336d6a82a5e0531ec2b8073948d364bab7d8d81f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Sep 2020 21:09:09 +0000
Subject: [PATCH 1298/1848] Incremental cleanup.

---
 WEB-INF/templates/footer.tpl     |  2 +-
 WEB-INF/templates/footer2.tpl    |  2 +-
 WEB-INF/templates/login.db.tpl   | 21 ---------------------
 WEB-INF/templates/login.ldap.tpl | 28 ----------------------------
 4 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 WEB-INF/templates/login.db.tpl
 delete mode 100644 WEB-INF/templates/login.ldap.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dd471c7af..6c86dd43a 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">Anuko Time Tracker 1.19.23.5299 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5300 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index ff133ff0d..abb4a5bb6 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5299 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5300 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/login.db.tpl b/WEB-INF/templates/login.db.tpl
deleted file mode 100644
index 977d9b996..000000000
--- a/WEB-INF/templates/login.db.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<table border="0">
-  <tr>
-    <td{if !$i18n.language.rtl} align="right"{/if}>{$i18n.label.login}:</td>
-    <td>{$forms.loginForm.login.control}</td>
-  </tr>
-  <tr>
-    <td{if !$i18n.language.rtl} align="right"{/if}>{$i18n.label.password}:</td>
-    <td>{$forms.loginForm.password.control}</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2" align="center" height="50">{$forms.loginForm.btn_login.control}</td>
-  </tr>
-</table>
-  
\ No newline at end of file
diff --git a/WEB-INF/templates/login.ldap.tpl b/WEB-INF/templates/login.ldap.tpl
deleted file mode 100644
index bf285dc29..000000000
--- a/WEB-INF/templates/login.ldap.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<table border="0">
-  {if $show_hint}
-  <tr>
-    <td colspan="2" align="center">{$i18n.label.ldap_hint}</td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  {/if}
-  <tr>
-    <td{if !$i18n.language.rtl} align="right"{/if}>{$i18n.label.login}:</td>
-    <td>{$forms.loginForm.login.control} <font color="#777777">@{$Auth_ldap_params.default_domain}</font></td>
-  </tr>
-  <tr>
-    <td{if !$i18n.language.rtl} align="right"{/if}>{$i18n.label.password}:</td>
-    <td>{$forms.loginForm.password.control}</td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2" align="center" height="50">{$forms.loginForm.btn_login.control}</td>
-  </tr>
-</table>
-  
\ No newline at end of file

From 6356d37222081b4689cb6987a3cc8c8bf3ac8c79 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Sep 2020 21:18:08 +0000
Subject: [PATCH 1299/1848] Some more cleanup.

---
 WEB-INF/templates/footer.tpl   |  2 +-
 WEB-INF/templates/footer2.tpl  |  2 +-
 WEB-INF/templates/register.tpl | 51 ----------------------------------
 register.php                   | 11 ++------
 4 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 WEB-INF/templates/register.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6c86dd43a..7eb578c96 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">Anuko Time Tracker 1.19.23.5300 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5301 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index abb4a5bb6..5e45dda42 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5300 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5301 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl
deleted file mode 100644
index cdf343f2d..000000000
--- a/WEB-INF/templates/register.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{$forms.groupForm.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.groupForm.group_name.control} <a href="https://www.anuko.com/lp/tt_37.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.groupForm.currency.control}</td>
-        </tr>
-        <tr>
-           <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.groupForm.lang.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.groupForm.manager_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.groupForm.manager_login.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.groupForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.groupForm.password2.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</td>
-          <td>{$forms.groupForm.manager_email.control}</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.groupForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/register.php b/register.php
index 805b586f4..a036c26d4 100644
--- a/register.php
+++ b/register.php
@@ -118,12 +118,5 @@
 $smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
-if (defined('DEBUG_MOBILE'))
-  $smarty->assign('content_page_name', 'register2.tpl');
-else {
-  $smarty->assign('content_page_name', 'register.tpl');
-}
-if (defined('DEBUG_MOBILE'))
-  $smarty->display('index2.tpl');
-else
-  $smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'register2.tpl');
+$smarty->display('index2.tpl');

From 3b1879fa7a3bdb3043ef7ddf1d0d009448c65645 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Sep 2020 21:39:13 +0000
Subject: [PATCH 1300/1848] Recoded password_reset.php for mobile access.

---
 WEB-INF/templates/footer.tpl          |  2 +-
 WEB-INF/templates/footer2.tpl         |  2 +-
 WEB-INF/templates/password_reset.tpl  | 21 ---------------------
 WEB-INF/templates/password_reset2.tpl | 13 +++++++++++++
 password_reset.php                    |  6 +++---
 5 files changed, 18 insertions(+), 26 deletions(-)
 delete mode 100644 WEB-INF/templates/password_reset.tpl
 create mode 100644 WEB-INF/templates/password_reset2.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7eb578c96..c24fce3db 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">Anuko Time Tracker 1.19.23.5301 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5302 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 5e45dda42..d444412cf 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5301 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5302 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/password_reset.tpl b/WEB-INF/templates/password_reset.tpl
deleted file mode 100644
index a8dadf957..000000000
--- a/WEB-INF/templates/password_reset.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{$forms.resetPasswordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <td align="right">{$i18n.label.login}:</td>
-          <td colspan="3">{$forms.resetPasswordForm.login.control}</td>
-        </tr>
-        <tr>
-          <td colspan="4">&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td colspan="3" align="center">{$forms.resetPasswordForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.resetPasswordForm.close}
diff --git a/WEB-INF/templates/password_reset2.tpl b/WEB-INF/templates/password_reset2.tpl
new file mode 100644
index 000000000..45a0d5051
--- /dev/null
+++ b/WEB-INF/templates/password_reset2.tpl
@@ -0,0 +1,13 @@
+{$forms.resetPasswordForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login}:</label></td>
+    <td class="td-with-input">{$forms.resetPasswordForm.login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.resetPasswordForm.btn_submit.control}</td>
+  </tr>
+</table>
+{$forms.resetPasswordForm.close}
diff --git a/password_reset.php b/password_reset.php
index 8e3badbc4..af596491d 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -39,7 +39,7 @@
 $cl_login = $request->getParameter('login');
 
 $form = new Form('resetPasswordForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.reset_password')));
 
 if ($request->isPost()) {
@@ -117,5 +117,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.resetPasswordForm.login.focus()"');
 $smarty->assign('title', $i18n->get('title.reset_password'));
-$smarty->assign('content_page_name', 'password_reset.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'password_reset2.tpl');
+$smarty->display('index2.tpl');

From 0ffecde6a0f5e99c94be8e614be27e68fc599762 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 30 Sep 2020 16:08:42 +0000
Subject: [PATCH 1301/1848] Added styles for page-messages class.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/footer2.tpl | 2 +-
 default.css                   | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c24fce3db..41a8138e5 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">Anuko Time Tracker 1.19.23.5302 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5303 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index d444412cf..f0348a191 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5302 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5303 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/default.css b/default.css
index 8e25f8d48..41445cb71 100644
--- a/default.css
+++ b/default.css
@@ -106,6 +106,12 @@ div.user-details {
   color: red;
 }
 
+.page-messages {
+  margin-top: .5rem;
+  text-align: center;
+  color: blue;
+}
+
 .page-content {
   text-align: center;
 }

From 18b9e5d6cb7a0d817bc53da915f4daa5744885f7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 30 Sep 2020 18:01:12 +0000
Subject: [PATCH 1302/1848] Recoded password_change.php for mobile access.

---
 WEB-INF/templates/footer.tpl           |  2 +-
 WEB-INF/templates/footer2.tpl          |  2 +-
 WEB-INF/templates/password_change.tpl  | 41 --------------------------
 WEB-INF/templates/password_change2.tpl | 22 ++++++++++++++
 password_change.php                    |  4 +--
 5 files changed, 26 insertions(+), 45 deletions(-)
 delete mode 100644 WEB-INF/templates/password_change.tpl
 create mode 100644 WEB-INF/templates/password_change2.tpl

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 41a8138e5..9906a4660 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">Anuko Time Tracker 1.19.23.5303 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5304 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index f0348a191..6c131b1f1 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5303 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5304 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/password_change.tpl b/WEB-INF/templates/password_change.tpl
deleted file mode 100644
index 797f4a358..000000000
--- a/WEB-INF/templates/password_change.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{$forms.newPasswordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $result_message}
-      <table cellspacing="4" cellpadding="7" border="0" width="100%">
-        <tr><td align="center"><font color="red"><b>{$result_message}</b></font></td></tr>
-      </table>
-{else}
-      <table>
-        <tr>
-          <td colspan="4" height="40">{$i18n.form.change_password.tip}</td>
-        </tr>
-        <tr>
-          <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.password} (*):</td>
-          <td colspan="3">{$forms.newPasswordForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.confirm_password} (*):</td>
-          <td colspan="3">{$forms.newPasswordForm.password2.control}</td>
-        </tr>
-        <tr>
-          <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td colspan="3" align="center">{$forms.newPasswordForm.btn_save.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.newPasswordForm.close}
diff --git a/WEB-INF/templates/password_change2.tpl b/WEB-INF/templates/password_change2.tpl
new file mode 100644
index 000000000..703c46aaa
--- /dev/null
+++ b/WEB-INF/templates/password_change2.tpl
@@ -0,0 +1,22 @@
+{$forms.newPasswordForm.open}
+<div class="page-hint">{$i18n.form.change_password.tip}</div>
+<div class="form-control-separator"></div>
+<table class="centered-table">
+    <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password1">{$i18n.label.password} (*):</label></td>
+    <td class="td-with-input">{$forms.newPasswordForm.password1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
+    <td class="td-with-input">{$forms.newPasswordForm.password2.control}</td>
+  </tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.newPasswordForm.btn_save.control}</td>
+  </tr>
+</table>
+{$forms.newPasswordForm.close}
diff --git a/password_change.php b/password_change.php
index 5fea82629..9876de233 100644
--- a/password_change.php
+++ b/password_change.php
@@ -101,5 +101,5 @@
 
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->get('title.change_password'));
-$smarty->assign('content_page_name', 'password_change.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'password_change2.tpl');
+$smarty->display('index2.tpl');

From e5bab2ede37a71c5b05829e57ce57c1aa7904f89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Oct 2020 12:42:46 +0000
Subject: [PATCH 1303/1848] Started to work on a mobile friendly time2.php.

---
 WEB-INF/templates/footer.tpl  |   2 +-
 WEB-INF/templates/footer2.tpl |   2 +-
 WEB-INF/templates/time2.tpl   | 276 ++++++++++++++++++
 default.css                   |  24 ++
 time2.php                     | 507 ++++++++++++++++++++++++++++++++++
 5 files changed, 809 insertions(+), 2 deletions(-)
 create mode 100644 WEB-INF/templates/time2.tpl
 create mode 100644 time2.php

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9906a4660..fa450f819 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">Anuko Time Tracker 1.19.23.5304 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5305 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 6c131b1f1..242f95431 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5304 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5305 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
new file mode 100644
index 000000000..8a0a186ec
--- /dev/null
+++ b/WEB-INF/templates/time2.tpl
@@ -0,0 +1,276 @@
+{include file="time_script.tpl"}
+
+<style>
+.not_billable td {
+  color: #ff6666;
+}
+</style>
+
+{$forms.timeRecordForm.open}
+<div class="small-screen-calendar">{$forms.timeRecordForm.date.control}</div>
+<table class="centered-table">
+  <tr>
+    <td>
+      <table class="centered-table">
+{if $user_dropdown}
+        <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+        <tr>
+          <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.user.control}</td>
+        </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_client}
+        <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+        <tr>
+          <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.client.control}</td>
+        </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+        <tr class = "small-screen-label"><td><label for="note1">{$i18n.label.note}:</label></td></tr>
+        <tr>
+          <td class="large-screen-label"><label for="note1">{$i18n.label.note}:</label></td>
+          <td>{$forms.timeRecordForm.note1.control}</td>
+        </tr>
+      </table>
+    </td>
+    <td><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td>
+  </tr>
+</table>
+
+
+
+
+
+
+
+
+
+
+
+<table cellspacing="4" cellpadding="0" border="0">
+{if $show_navigation}
+  <tr>
+    <td align="center" colspan=2">
+      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td valign="top">
+      <table>
+{if $user_dropdown}
+        <tr>
+          <td align="right">{$i18n.label.user}:</td>
+          <td>{$forms.timeRecordForm.user.control}</td>
+        </tr>
+{/if}
+{if $show_client}
+        <tr>
+          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
+          <td>{$forms.timeRecordForm.client.control}</td>
+        </tr>
+{/if}
+{if $show_billable}
+        <tr>
+          <td align="right">&nbsp;</td>
+          <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
+        </tr>
+{/if}
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+        <tr>
+          <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+          <td>{$forms.timeRecordForm.$control_name.control}</td>
+        </tr>
+  {/foreach}
+{/if}
+{if $show_project}
+        <tr>
+          <td align="right">{$i18n.label.project} (*):</td>
+          <td>{$forms.timeRecordForm.project.control}</td>
+        </tr>
+{/if}
+{if $show_task}
+        <tr>
+          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
+          <td>{$forms.timeRecordForm.task.control}</td>
+        </tr>
+{/if}
+{if $show_start}
+        <tr>
+          <td align="right">{$i18n.label.start}:</td>
+          <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
+        </tr>
+        <tr>
+          <td align="right">{$i18n.label.finish}:</td>
+          <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
+        </tr>
+{/if}
+{if $show_duration}
+        <tr>
+          <td align="right">{$i18n.label.duration}:</td>
+          <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
+        </tr>
+{/if}
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.timeRecordForm.newfile.control}</td>
+        </tr>
+{/if}
+{if $template_dropdown}
+        <tr>
+          <td align="right">{$i18n.label.template}:</td>
+          <td>{$forms.timeRecordForm.template.control}</td>
+        </tr>
+{/if}
+      </table>
+    </td>
+    <td valign="top">
+      <table>
+        <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<table>
+  <tr>
+    <td align="right">{$i18n.label.note}:</td>
+    <td align="left">{$forms.timeRecordForm.note.control}</td>
+  </tr>
+  <tr>
+    <td align="center" colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
+  </tr>
+</table>
+
+<table width="720">
+  <tr>
+    <td valign="top">
+{if $time_records}
+      <table border="0" cellpadding="3" cellspacing="1" width="100%">
+        <tr>
+  {if $show_client}
+          <td class="tableHeader">{$i18n.label.client}</td>
+  {/if}
+  {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          <td class="tableHeader">{$timeField['label']|escape}</td>
+      {/foreach}
+  {/if}
+  {if $show_project}
+          <td class="tableHeader">{$i18n.label.project}</td>
+  {/if}
+  {if $show_task}
+          <td class="tableHeader">{$i18n.label.task}</td>
+  {/if}
+  {if $show_start}
+          <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
+          <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
+  {/if}
+          <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
+  {if $show_note_column}
+          <td class="tableHeader">{$i18n.label.note}</td>
+  {/if}
+  {if $show_files}
+          <td></td>
+  {/if}
+          <td></td>
+          <td></td>
+        </tr>
+  {foreach $time_records as $record}
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
+    {if $show_client}
+          <td valign="top">{$record.client|escape}</td>
+    {/if}
+    {* record custom fileds *}
+    {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+          <td>{$record.$control_name|escape}</td>
+      {/foreach}
+    {/if}
+    {if $show_project}
+          <td valign="top">{$record.project|escape}</td>
+    {/if}
+    {if $show_task}
+          <td valign="top">{$record.task|escape}</td>
+    {/if}
+    {if $show_start}
+          <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+          <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+    {/if}
+          <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+    {if $show_note_column}
+          <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {/if}
+    {if $show_files}
+      {if $record.has_files}
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+          <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
+      {if ($record.duration == '0:00' && $record.start <> '')}
+            <input type="hidden" name="record_id" value="{$record.id}">
+            <input type="hidden" name="browser_date" value="">
+            <input type="hidden" name="browser_time" value="">
+            <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
+      {/if}
+    {/if}
+          </td>
+          <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+            &nbsp;
+    {else}
+            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
+    {/if}
+          </td>
+        </tr>
+    {if $show_note_row && $record.comment}
+        <tr>
+          <td align="right" valign="top">{$i18n.label.note}:</td>
+          <td colspan="{$colspan}" align="left" valign="top">{$record.comment|escape}</td>
+        </tr>
+    {/if}
+  {/foreach}
+      </table>
+{/if}
+    </td>
+  </tr>
+</table>
+
+<table cellpadding="3" cellspacing="1" width="720">
+  <tr>
+    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
+    <td align="right">{$i18n.label.day_total}: {$day_total}</td>
+  </tr>
+  {if $user->isPluginEnabled('mq')}
+  <tr>
+    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
+    {if $over_balance}
+    <td align="right">{$i18n.form.time.over_balance}: <span style="color: green;">{$balance_remaining}</span></td>
+    {else}
+    <td align="right">{$i18n.form.time.remaining_balance}: <span style="color: red;">{$balance_remaining}</span></td>
+    {/if}
+  </tr>
+  <tr>
+    <td align="left">{$i18n.label.quota}: {$month_quota}</td>
+    {if $over_quota}
+    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
+    {else}
+    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
+    {/if}
+  </tr>
+  {/if}
+</table>
+
+{$forms.timeRecordForm.close}
diff --git a/default.css b/default.css
index 41445cb71..04c89795c 100644
--- a/default.css
+++ b/default.css
@@ -215,6 +215,22 @@ input.password-field {
   width: 237px;
 }
 
+.small-screen-calendar {
+  display: none;
+  width: 210px;
+  margin-top: 1rem;
+  margin-left: auto;
+  margin-right: auto
+}
+
+.large-screen-calendar {
+  display: inline-block;
+  width: 210px;
+  margin-top: 1rem;
+  margin-left: auto;
+  margin-right: auto
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
@@ -225,6 +241,14 @@ input.password-field {
     display: block;
   }
 
+  .small-screen-calendar {
+    display: block;
+  }
+
+  .large-screen-calendar {
+    display: none;
+  }
+
   .small-screen-form-control-separator {
     display: block;
   }
diff --git a/time2.php b/time2.php
new file mode 100644
index 000000000..ced38613f
--- /dev/null
+++ b/time2.php
@@ -0,0 +1,507 @@
+<?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('ttConfigHelper');
+import('ttUserHelper');
+import('ttGroupHelper');
+import('ttClientHelper');
+import('ttTimeHelper');
+import('ttFileHelper');
+import('DateAndTime');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
+if ($request->isPost()) {
+  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for whom we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+$group_id = $user->getGroup();
+$config = new ttConfigHelper($user->getConfig());
+
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+$showFiles = $user->isPluginEnabled('at');
+$showRecordCustomFields = $user->isOptionEnabled('record_custom_fields');
+
+// Initialize and store date in session.
+$cl_date = $request->getParameter('date', @$_SESSION['date']);
+$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
+if($selected_date->isError())
+  $selected_date = new DateAndTime(DB_DATEFORMAT);
+if(!$cl_date)
+  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+$_SESSION['date'] = $cl_date;
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+$showNoteColumn = !$config->getDefinedValue('time_note_on_separate_row');
+$showNoteRow = $config->getDefinedValue('time_note_on_separate_row');
+if ($showNoteRow) {
+  // Determine column span for note field.
+  $colspan = 0;
+  if ($showClient) $colspan++;
+  if ($showRecordCustomFields && $custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $colspan++;
+    }
+  }
+  if ($showProject) $colspan++;
+  if ($showTask) $colspan++;
+  if ($showStart) $colspan++;
+  if ($showFinish) $colspan++;
+  $colspan++; // There is always a duration.
+  if ($showFiles) $colspan++;
+  $colspan++; // There is always an edit column.
+  // $colspan++; // There is always a delete column.
+  // $colspan--; // Remove one column for label.
+  $smarty->assign('colspan', $colspan);
+}
+
+if ($user->isPluginEnabled('mq')){
+  require_once('plugins/MonthlyQuota.class.php');
+  $quota = new MonthlyQuota();
+  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
+  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
+  $month_total_minutes = ttTimeHelper::toMinutes($month_total);
+  $balance_left = $quota_minutes_from_1st - $month_total_minutes;
+  $minutes_left = $month_quota_minutes - $month_total_minutes;
+  
+  $smarty->assign('month_total', $month_total);
+  $smarty->assign('month_quota', ttTimeHelper::toAbsDuration($month_quota_minutes));
+  $smarty->assign('over_balance', $balance_left < 0);
+  $smarty->assign('balance_remaining', ttTimeHelper::toAbsDuration($balance_left));
+  $smarty->assign('over_quota', $minutes_left < 0);
+  $smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
+}
+
+// Initialize variables.
+$cl_start = trim($request->getParameter('start'));
+$cl_finish = trim($request->getParameter('finish'));
+$cl_duration = trim($request->getParameter('duration'));
+$cl_note = trim($request->getParameter('note'));
+$cl_billable = 1;
+if ($showBillable) {
+  if ($request->isPost()) {
+    $cl_billable = $request->getParameter('billable');
+    $_SESSION['billable'] = (int) $cl_billable;
+  } else
+    if (isset($_SESSION['billable']))
+      $cl_billable = $_SESSION['billable'];
+}
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
+$_SESSION['client'] = $cl_client;
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
+$_SESSION['project'] = $cl_project;
+$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
+$_SESSION['task'] = $cl_task;
+
+// Handle time custom fields.
+$timeCustomFields = array();
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $control_name = 'time_field_'.$timeField['id'];
+    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+    $_SESSION[$control_name] = $cl_control_name;
+    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+      'control_name' => $control_name,
+      'label' => $timeField['label'],
+      'type' => $timeField['type'],
+      'required' => $timeField['required'],
+      'value' => trim($cl_control_name));
+  }
+}
+
+// Elements of timeRecordForm.
+$form = new Form('timeRecordForm');
+
+// Dropdown for user and a hidden control to indicate user change.
+if ($user->can('track_time')) {
+  $rank = $user->getMaxRankForGroup($group_id);
+  if ($user->can('track_own_time'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
+      'name'=>'user',
+      'style'=>'width: 250px;',
+      'value'=>$user_id,
+      'data'=>$user_list,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
+  }
+}
+
+// Dropdown for clients in MODE_TIME. Use all active clients.
+// Note: for other tracking modes the control is added further below.
+if (MODE_TIME == $trackingMode && $showClient) {
+  $active_clients = ttGroupHelper::getActiveClients(true);
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillProjectDropdown(this.value);',
+    'name'=>'client',
+    'style'=>'width: 250px;',
+    'value'=>$cl_client,
+    'data'=>$active_clients,
+    'datakeys'=>array('id', 'name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  // Note: in other modes the client list is filtered to relevant clients only. See below.
+}
+
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
+  // Dropdown for projects assigned to user.
+  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
+  $project_list = $user->getAssignedProjects($options);
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
+    'name'=>'project',
+    'style'=>'width: 250px;',
+    'value'=>$cl_project,
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+  // Client dropdown.
+  if ($showClient) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    // We need an array of assigned project ids to do some trimming.
+    foreach($project_list as $project)
+      $projects_assigned_to_user[] = $project['id'];
+
+    // Build a client list out of active clients. Use only clients that are relevant to user.
+    // Also trim their associated project list to only assigned projects (to user).
+    foreach($active_clients as $client) {
+      $projects_assigned_to_client = explode(',', $client['projects']);
+      if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user))
+        $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
+      if ($intersection) {
+        $client['projects'] = implode(',', $intersection);
+        $client_list[] = $client;
+      }
+    }
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'style'=>'width: 250px;',
+      'value'=>$cl_client,
+      'data'=>$client_list,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  }
+}
+
+// Task dropdown.
+if ($showTask) {
+  $task_list = ttGroupHelper::getActiveTasks();
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'task',
+    'style'=>'width: 250px;',
+    'value'=>$cl_task,
+    'data'=>$task_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+}
+
+// Start and finish controls.
+if ($showStart) {
+  $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
+  $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
+  if ($user->punch_mode && !$user->canOverridePunchMode()) {
+    // Make the start and finish fields read-only.
+    $form->getElement('start')->setEnabled(false);
+    $form->getElement('finish')->setEnabled(false);
+  }
+}
+
+// Duration control.
+if ($showDuration)
+  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+
+// File upload control.
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+
+// If we have templates, add a dropdown to select one.
+if ($user->isPluginEnabled('tp')){
+  $template_list = ttGroupHelper::getActiveTemplates();
+  if (count($template_list) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillNote(this.value);',
+      'name'=>'template',
+      'style'=>'width: 250px;',
+      'data'=>$template_list,
+      'datakeys'=>array('id','name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $smarty->assign('template_dropdown', 1);
+    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
+    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
+    $smarty->assign('template_list', $template_list);
+  }
+}
+
+// Note control.
+if (!defined('NOTE_INPUT_HEIGHT'))
+  define('NOTE_INPUT_HEIGHT', 40);
+$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+$form->addInput(array('type'=>'textarea','name'=>'note1','value'=>$cl_note));
+
+// Calendar.
+$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+
+// A hidden control for today's date from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
+
+// Submit button.
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_submit')) {
+    // Submit button clicked.
+    // Validate user input.
+    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
+      $err->add($i18n->get('error.client'));
+    // Validate input in time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($timeCustomFields as $timeField) {
+        // Validation is the same for text and dropdown fields.
+        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+      }
+    }
+    if ($showProject) {
+      if (!$cl_project) $err->add($i18n->get('error.project'));
+    }
+    if ($showTask && $taskRequired) {
+      if (!$cl_task) $err->add($i18n->get('error.task'));
+    }
+    if (strlen($cl_duration) == 0) {
+      if ($cl_start || $cl_finish) {
+        if (!ttTimeHelper::isValidTime($cl_start))
+          $err->add($i18n->get('error.field'), $i18n->get('label.start'));
+        if ($cl_finish) {
+          if (!ttTimeHelper::isValidTime($cl_finish))
+            $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
+          if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
+            $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
+        }
+      } else {
+        if ($showStart) {
+          $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
+          $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
+        }
+        if ($showDuration)
+          $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
+      }
+    } else {
+      if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
+        $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
+    }
+    if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
+      $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    }
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
+    // Finished validating user input.
+
+    // Prohibit creating entries in future.
+    if (!$user->isOptionEnabled('future_entries')) {
+      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+      if ($selected_date->after($browser_today))
+        $err->add($i18n->get('error.future_date'));
+    }
+
+    // Prohibit creating entries in locked range.
+    if ($user->isDateLocked($selected_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    // Prohibit creating another uncompleted record.
+    if ($err->no()) {
+      if (($not_completed_rec = ttTimeHelper::getUncompleted($user_id)) && (($cl_finish == '') && ($cl_duration == '')))
+        $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
+    }
+
+    // Prohibit creating an overlapping record.
+    if ($err->no()) {
+      if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
+        $err->add($i18n->get('error.overlap'));
+    }
+
+    // Insert record.
+    if ($err->no()) {
+      $id = ttTimeHelper::insert(array(
+        'date' => $cl_date,
+        'client' => $cl_client,
+        'project' => $cl_project,
+        'task' => $cl_task,
+        'start' => $cl_start,
+        'finish' => $cl_finish,
+        'duration' => $cl_duration,
+        'note' => $cl_note,
+        'billable' => $cl_billable));
+
+      // Insert time custom fields if we have them.
+      $result = true;
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
+      }
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'time',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+
+      if ($id && $result && $err->no()) {
+        header('Location: time.php');
+        exit();
+      }
+      $err->add($i18n->get('error.db'));
+    }
+  } elseif ($request->getParameter('btn_stop')) {
+    // Stop button pressed to finish an uncompleted record.
+    $record_id = $request->getParameter('record_id');
+    $record = ttTimeHelper::getRecord($record_id);
+    $browser_date = $request->getParameter('browser_date');
+    $browser_time = $request->getParameter('browser_time');
+
+    // Can we complete this record?
+    if ($record['date'] == $browser_date                                // closing today's record
+      && ttTimeHelper::isValidInterval($record['start'], $browser_time) // finish time is greater than start time
+      && !ttTimeHelper::overlaps($user_id, $browser_date, $record['start'], $browser_time)) { // no overlap
+      $res = ttTimeHelper::update(array(
+          'id'=>$record['id'],
+          'date'=>$record['date'],
+          'client'=>$record['client_id'],
+          'project'=>$record['project_id'],
+          'task'=>$record['task_id'],
+          'start'=>$record['start'],
+          'finish'=>$browser_time,
+          'note'=>$record['comment'],
+          'billable'=>$record['billable']));
+      if (!$res)
+        $err->add($i18n->get('error.db'));
+    } else {
+      // Cannot complete, redirect for manual edit.
+      header('Location: time_edit.php?id='.$record_id);
+      exit();
+    }
+  }
+} // isPost
+
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
+$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
+
+$smarty->assign('selected_date', $selected_date);
+$smarty->assign('week_total', $week_total);
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
+$smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_record_custom_fields', $showRecordCustomFields);
+$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_duration', $showDuration);
+$smarty->assign('show_note_column', $showNoteColumn);
+$smarty->assign('show_note_row', $showNoteRow);
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('client_list', $client_list);
+$smarty->assign('project_list', $project_list);
+$smarty->assign('task_list', $task_list);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
+$smarty->assign('title', $i18n->get('title.time'));
+$smarty->assign('content_page_name', 'time2.tpl');
+$smarty->display('index2.tpl');

From c0d6b76ac8e1333dd167850f97e3e280841e26cb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Oct 2020 13:27:56 +0000
Subject: [PATCH 1304/1848] Added mobile styles for checkboxes.

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/footer2.tpl | 2 +-
 WEB-INF/templates/time2.tpl   | 9 +++++++++
 default.css                   | 5 +++++
 rtl.css                       | 4 ++++
 time2.php                     | 3 ---
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index fa450f819..24b1ca30a 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">Anuko Time Tracker 1.19.23.5305 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5306 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 242f95431..157f25ef2 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5305 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5306 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 8a0a186ec..1b282e0d2 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -28,6 +28,15 @@
         </tr>
         <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if $show_billable}
+        <tr>
+          <td class = "large-screen-label">&nbsp;</td>
+          <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
+        </tr>
+{/if}
+
+
+
         <tr class = "small-screen-label"><td><label for="note1">{$i18n.label.note}:</label></td></tr>
         <tr>
           <td class="large-screen-label"><label for="note1">{$i18n.label.note}:</label></td>
diff --git a/default.css b/default.css
index 04c89795c..fd63a814b 100644
--- a/default.css
+++ b/default.css
@@ -226,11 +226,16 @@ input.password-field {
 .large-screen-calendar {
   display: inline-block;
   width: 210px;
+  padding-left: 1rem;
   margin-top: 1rem;
   margin-left: auto;
   margin-right: auto
 }
 
+.checkbox-label {
+  float: left;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/rtl.css b/rtl.css
index 5688a2823..c0328a7aa 100644
--- a/rtl.css
+++ b/rtl.css
@@ -15,3 +15,7 @@ html {
 .td-with-input {
   text-align: right;
 }
+
+.checkbox-label {
+  float: right;
+}
\ No newline at end of file
diff --git a/time2.php b/time2.php
index ced38613f..9d52b8c0d 100644
--- a/time2.php
+++ b/time2.php
@@ -190,7 +190,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
       'name'=>'user',
-      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
@@ -206,7 +205,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
@@ -269,7 +267,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),

From bccb1b5a3633e7ae2563ac092ed5ba571cf20f77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Oct 2020 13:43:21 +0000
Subject: [PATCH 1305/1848] Incremental progress on mobile time2.php page.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/footer2.tpl |  2 +-
 WEB-INF/templates/time2.tpl   | 10 ++++++++++
 rtl.css                       |  2 +-
 time2.php                     |  3 +--
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 24b1ca30a..21ffe3a65 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">Anuko Time Tracker 1.19.23.5306 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5307 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 157f25ef2..08e0a08c5 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5306 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5307 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 1b282e0d2..4756eed57 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -34,6 +34,16 @@
           <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
         </tr>
 {/if}
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+        <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
+        <tr>
+          <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.$control_name.control}</td>
+        </tr>
+  {/foreach}
+{/if}
 
 
 
diff --git a/rtl.css b/rtl.css
index c0328a7aa..a566e4ae7 100644
--- a/rtl.css
+++ b/rtl.css
@@ -18,4 +18,4 @@ html {
 
 .checkbox-label {
   float: right;
-}
\ No newline at end of file
+}
diff --git a/time2.php b/time2.php
index 9d52b8c0d..c212fe87b 100644
--- a/time2.php
+++ b/time2.php
@@ -221,10 +221,9 @@
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));

From 29f117e5f3e3c2e02f9d21c7da56a26cd07aa100 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 3 Oct 2020 14:06:11 +0000
Subject: [PATCH 1306/1848] Some more progress on time2.php.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/footer2.tpl |  2 +-
 WEB-INF/templates/time2.tpl   | 18 ++++++++++++++++--
 time2.php                     |  2 --
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 21ffe3a65..d9d4d9d16 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">Anuko Time Tracker 1.19.23.5307 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker 1.19.23.5308 | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 08e0a08c5..8ac03c53e 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5307 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5308 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 4756eed57..aa457c1d2 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -44,12 +44,26 @@
         </tr>
   {/foreach}
 {/if}
+{if $show_project}
+        <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+        <tr>
+          <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.project.control}</td>
+        </tr>
+{/if}
+{if $show_task}
+        <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
+        <tr>
+          <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
+        </tr>
+{/if}
 
 
 
-        <tr class = "small-screen-label"><td><label for="note1">{$i18n.label.note}:</label></td></tr>
+        <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
         <tr>
-          <td class="large-screen-label"><label for="note1">{$i18n.label.note}:</label></td>
+          <td class="large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
           <td>{$forms.timeRecordForm.note1.control}</td>
         </tr>
       </table>
diff --git a/time2.php b/time2.php
index c212fe87b..60fdd6ecd 100644
--- a/time2.php
+++ b/time2.php
@@ -239,7 +239,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
@@ -278,7 +277,6 @@
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
-    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),

From 8294fab0e1644e993dc46f3129fcbdaf5d31797e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20Lundgren?= <adevade@users.noreply.github.com>
Date: Sun, 4 Oct 2020 16:14:13 +0200
Subject: [PATCH 1307/1848] Add constant for app version in initialize.php
 (#103)

---
 WEB-INF/templates/footer.tpl  | 2 +-
 WEB-INF/templates/footer2.tpl | 2 +-
 initialize.php                | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d9d4d9d16..932919af6 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">Anuko Time Tracker 1.19.23.5308 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker {constant("APP_VERSION")} | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 8ac03c53e..71864e0de 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker 1.19.23.5308 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker {constant("APP_VERSION")} | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/initialize.php b/initialize.php
index 4c526a13b..3f3d49a4e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,6 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
+define("APP_VERSION", "1.19.23.5308");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 18b55ec52820e5496cced9462e264c2abb04ba57 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Oct 2020 18:54:08 +0000
Subject: [PATCH 1308/1848] Some refactoring to keep things consistent.

---
 WEB-INF/templates/header.tpl        | 26 +++++++++++++-------------
 WEB-INF/templates/header2.tpl       | 28 ++++++++++++++--------------
 WEB-INF/templates/mobile/header.tpl | 10 +++++-----
 WEB-INF/templates/site_map.tpl      | 20 ++++++++++----------
 WEB-INF/templates/time2.tpl         | 15 +++++++++++++++
 WEB-INF/templates/work/header.tpl   | 26 +++++++++++++-------------
 initialize.php                      |  2 +-
 7 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index eaf163824..7a1e4d842 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
+  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
-  <link href="{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+  <link href="{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
 {/if}
 {if $user->getCustomCss()}
   <link href="custom_css.php" rel="stylesheet" type="text/css">
@@ -64,8 +64,8 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a>
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
@@ -99,8 +99,8 @@
     {if $user->can('manage_features')}
             <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a>
     {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
@@ -129,14 +129,14 @@
            <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
-        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
            <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
            <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+    {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
            <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
@@ -162,11 +162,11 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="login.php">{$i18n.menu.login}</a>
-  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+  {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
             <a class="systemMenu" href="register.php">{$i18n.menu.register}</a>
   {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index 9aba06219..1573d6124 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
+  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
-  <link href="{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+  <link href="{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
 {/if}
 {if $user->getCustomCss()}
   <link href="custom_css.php" rel="stylesheet" type="text/css">
@@ -36,7 +36,7 @@
   <table class="top-menu-table">
     <tr>
       <td><a href="site_map.php">{$i18n.label.menu}</a> </td>
-      <td><a href="{$smarty.const.HELP_LINK}">{$i18n.menu.help}</a></td>
+      <td><a href="{constant('HELP_LINK')}">{$i18n.menu.help}</a></td>
     </tr>
   </table>
 </div>
@@ -50,8 +50,8 @@
   <table class="top-menu-table">
     <tr>
       <td><a href="logout.php">{$i18n.menu.logout}</a></td>
-      <td><a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a></td>
-      <td><a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a></td>
+      <td><a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a></td>
+      <td><a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a></td>
     </tr>
   </table>
 </div>
@@ -85,8 +85,8 @@
     {if $user->can('manage_features')}
       <td><a href="plugins.php">{$i18n.menu.plugins}</a></td>
     {/if}
-      <td><a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a></td>
-      <td><a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a></td>
+      <td><a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a></td>
+      <td><a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a></td>
     </tr>
   </table>
 </div>
@@ -115,14 +115,14 @@
       <td><a href="invoices.php">{$i18n.title.invoices}</a></td>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
-        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
       <td><a href="charts.php">{$i18n.menu.charts}</a></td>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
       <td><a href="projects.php">{$i18n.menu.projects}</a></td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+    {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
       <td><a href="tasks.php">{$i18n.menu.tasks}</a></td>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
@@ -148,11 +148,11 @@
   <table class="top-menu-table">
     <tr>
       <td><a href="login.php">{$i18n.menu.login}</a></td>
-  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+  {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
       <td><a href="register.php">{$i18n.menu.register}</a></td>
   {/if}
-      <td><a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a></td>
-      <td><a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a></td>
+      <td><a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a></td>
+      <td><a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a></td>
     </tr>
   </table>
 </div>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index 8888e27b6..ccea5e7e1 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
+  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="icon" href="../favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
-  <link href="../{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+  <link href="../{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
-  <link href="../{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+  <link href="../{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
 {/if}
 {if $user->getCustomCss()}
   <link href="../custom_css.php" rel="stylesheet" type="text/css">
@@ -83,10 +83,10 @@
     {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
            <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
            <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()}
+    {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode()}
            <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
index 695a99093..48b8d40c1 100644
--- a/WEB-INF/templates/site_map.tpl
+++ b/WEB-INF/templates/site_map.tpl
@@ -12,8 +12,8 @@
   {* main menu for admin *}
 <p>
   <a href="logout.php">{$i18n.menu.logout}</a><br>
-  <a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a><br>
-  <a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a><br>
+  <a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a><br>
+  <a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a><br>
 </p>
   {* end of main menu for admin *}
   {else}
@@ -38,14 +38,14 @@
   <a href="invoices.php">{$i18n.title.invoices}</a><br>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
-        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
   <a href="charts.php">{$i18n.menu.charts}</a><br>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
   <a href="projects.php">{$i18n.menu.projects}</a><br>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+    {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
   <a href="tasks.php">{$i18n.menu.tasks}</a><br>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
@@ -71,8 +71,8 @@
     {if $user->can('manage_features')}
   <a href="plugins.php">{$i18n.menu.plugins}</a><br>
     {/if}
-  <a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a><br>
-  <a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a><br>
+  <a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a><br>
+  <a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a><br>
 </p>
   {* end of main menu for authorized user *}
   {/if}
@@ -80,11 +80,11 @@
   {* main menu for non authorized user *}
 <p>
   <a href="login.php">{$i18n.menu.login}</a><br>
-  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+  {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
   <a href="register.php">{$i18n.menu.register}</a><br>
   {/if}
-  <a href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a><br>
-  <a href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a><br>
+  <a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a><br>
+  <a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a><br>
 </p>
   {* end of main menu for non authorized user *}
 {/if}
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index aa457c1d2..91a31bede 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -58,6 +58,21 @@
           <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
         </tr>
 {/if}
+{if $show_start}
+        <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start}:</label></td></tr>
+        <tr>
+          <td class = "large-screen-label"><label for="start">{$i18n.label.start}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
+        </tr>
+        <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.finish}:</label></td></tr>
+        <tr>
+          <td class = "large-screen-label"><label for="finish">{$i18n.label.finish}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
+        </tr>
+{/if}
+
+
+
 
 
 
diff --git a/WEB-INF/templates/work/header.tpl b/WEB-INF/templates/work/header.tpl
index 582e76144..75a0d586f 100644
--- a/WEB-INF/templates/work/header.tpl
+++ b/WEB-INF/templates/work/header.tpl
@@ -1,11 +1,11 @@
 <html>
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={$smarty.const.CHARSET}">
+  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
   <link rel="icon" href="../favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
-  <link href="../{$smarty.const.DEFAULT_CSS}" rel="stylesheet" type="text/css">
+  <link href="../{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
 {if $i18n.language.rtl}
-  <link href="../{$smarty.const.RTL_CSS}" rel="stylesheet" type="text/css">
+  <link href="../{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
 {/if}
   <title>Time Tracker{if $title} - {$title}{/if}</title>
   <script src="../js/strftime.js"></script>
@@ -60,8 +60,8 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="../logout.php">{$i18n.menu.logout}</a>
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
@@ -95,8 +95,8 @@
     {if $user->can('manage_features')}
             <a class="systemMenu" href="../plugins.php">{$i18n.menu.plugins}</a>
     {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
@@ -125,14 +125,14 @@
            <a class="mainMenu" href="../invoices.php">{$i18n.title.invoices}</a>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
-        ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() ||
+        (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
            <a class="mainMenu" href="../charts.php">{$i18n.menu.charts}</a>
     {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())}
+    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
            <a class="mainMenu" href="../projects.php">{$i18n.menu.projects}</a>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
+    {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
            <a class="mainMenu" href="../tasks.php">{$i18n.menu.tasks}</a>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
@@ -158,11 +158,11 @@
         <tr>
           <td class="systemMenu" height="17" align="center">&nbsp;
             <a class="systemMenu" href="../login.php">{$i18n.menu.login}</a>
-  {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
+  {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
             <a class="systemMenu" href="../register.php">{$i18n.menu.register}</a>
   {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
+            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
+            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
diff --git a/initialize.php b/initialize.php
index 3f3d49a4e..893a5422f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5308");
+define("APP_VERSION", "1.19.23.5309");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b144d75b2df15061b13f2b929b6a33ba76162c77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Oct 2020 21:55:38 +0000
Subject: [PATCH 1309/1848] A bit more progress on mobile-friendly time2.php.

---
 WEB-INF/templates/footer.tpl  |  2 +-
 WEB-INF/templates/footer2.tpl |  2 +-
 WEB-INF/templates/time2.tpl   | 14 +++++++++++++-
 initialize.php                |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 932919af6..a5ae56f90 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">Anuko Time Tracker {constant("APP_VERSION")} | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">Anuko Time Tracker {constant('APP_VERSION')} | 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/footer2.tpl b/WEB-INF/templates/footer2.tpl
index 71864e0de..8844f56e8 100644
--- a/WEB-INF/templates/footer2.tpl
+++ b/WEB-INF/templates/footer2.tpl
@@ -1,7 +1,7 @@
 </div> {* page-content *}
 
 <div class="contribute-msg"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></div>
-<div class="version-and-copyright">Anuko Time Tracker {constant("APP_VERSION")} | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
+<div class="version-and-copyright">Anuko Time Tracker {constant('APP_VERSION')} | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a></div>
 
 </body>
 </html>
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 91a31bede..18fdd2d8a 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -33,6 +33,7 @@
           <td class = "large-screen-label">&nbsp;</td>
           <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $custom_fields && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
@@ -42,6 +43,7 @@
           <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
           <td class="td-with-input">{$forms.timeRecordForm.$control_name.control}</td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
 {if $show_project}
@@ -50,6 +52,7 @@
           <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
           <td class="td-with-input">{$forms.timeRecordForm.project.control}</td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_task}
         <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
@@ -57,6 +60,7 @@
           <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
           <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_start}
         <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start}:</label></td></tr>
@@ -64,13 +68,21 @@
           <td class = "large-screen-label"><label for="start">{$i18n.label.start}:</label></td>
           <td class="td-with-input">{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
         <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.finish}:</label></td></tr>
         <tr>
           <td class = "large-screen-label"><label for="finish">{$i18n.label.finish}:</label></td>
           <td class="td-with-input">{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_duration}
+        <tr class = "small-screen-label"><td><label for="duration">{$i18n.label.duration}:</label></td></tr>
+        <tr>
+          <td class = "large-screen-label"><label for="duration">{$i18n.label.duration}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}:</td>
+        </tr>
 {/if}
-
 
 
 
diff --git a/initialize.php b/initialize.php
index 893a5422f..6131ebb8f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5309");
+define("APP_VERSION", "1.19.23.5310");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From fa3f70996fb21010b4f225af1d015e3ab0d53fea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Oct 2020 22:46:21 +0000
Subject: [PATCH 1310/1848] More progress on mobile-friendly time2.php.

---
 WEB-INF/lib/form/Form.class.php        |   1 +
 WEB-INF/lib/form/FormElement.class.php |   2 ++
 WEB-INF/lib/form/TextField.class.php   |   1 +
 WEB-INF/resources/en.lang.php          |   1 +
 WEB-INF/templates/time2.tpl            |   8 ++++----
 img/icon-now.png                       | Bin 0 -> 1581 bytes
 time2.php                              |   6 ++++--
 7 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 img/icon-now.png

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index d00261015..e991f725e 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -55,6 +55,7 @@ function addInput($params) {
         $el = new TextField($params['name']);
         if (isset($params['class'])) $el->setCssClass($params['class']);
         if (isset($params['maxlength'])) $el->setMaxLength($params['maxlength']);
+        if (isset($params['placeholder'])) $el->setPLaceholder($params['placeholder']);
         break;
 
       case 'password':
diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index 096084ef4..ace22d9af 100644
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -32,6 +32,7 @@ class FormElement {
   var $name;             // control name
   var $form_name = '';   // form name the control is in
   var $value = '';       // value of the control
+  var $placeholder = ''; // placeholder
   var $size = '';        // control size
   var $max_length = '';  // max length of text in control
   var $on_change = '';   // what happens when value of control changes
@@ -83,6 +84,7 @@ function isEnabled() { return $this->enabled; }
 
   function setOnChange($str) { $this->on_change = $str; }
   function setOnClick($str) { $this->on_click = $str; }
+  function setPlaceholder($str) { $this->placeholder = $str; }
 
   function localize() {} // Localization occurs in derived classes and is dependent on control type.
                          // For example, in calendar control we need to localize day and month names.
diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index fdfb76837..bb05c6738 100644
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -49,6 +49,7 @@ function getHtml() {
     if (!empty($this->size)) $html .= " size=\"$this->size\"";
     if (!empty($this->style)) $html .= " style=\"$this->style\"";
     if (!empty($this->title)) $html .= " title=\"$this->title\"";
+    if (!empty($this->placeholder)) $html .= " placeholder=\"$this->placeholder\"";
 
     if($this->isEnabled()) {
       if (!empty($this->max_length)) $html .= " maxlength=\"$this->max_length\"";
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index b052ec602..d17ba4dc9 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -441,6 +441,7 @@
 
 // Time form. See example at https://timetracker.anuko.com/time.php.
 'form.time.duration_format' => '(hh:mm or 0.0h)',
+'form.time.duration_placeholder' => 'hh:mm or 0.0h',
 'form.time.billable' => 'Billable',
 'form.time.uncompleted' => 'Uncompleted',
 'form.time.remaining_quota' => 'Remaining quota',
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 18fdd2d8a..eb51d954d 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -66,13 +66,13 @@
         <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start}:</label></td></tr>
         <tr>
           <td class = "large-screen-label"><label for="start">{$i18n.label.start}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
+          <td class="td-with-input">{$forms.timeRecordForm.start.control} <img src="img/icon-now.png" onclick="setNow('start');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
         </tr>
         <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
         <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.finish}:</label></td></tr>
         <tr>
           <td class = "large-screen-label"><label for="finish">{$i18n.label.finish}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
+          <td class="td-with-input">{$forms.timeRecordForm.finish.control}<img src="img/icon-now.png" onclick="setNow('finish');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
         </tr>
         <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
@@ -80,7 +80,7 @@
         <tr class = "small-screen-label"><td><label for="duration">{$i18n.label.duration}:</label></td></tr>
         <tr>
           <td class = "large-screen-label"><label for="duration">{$i18n.label.duration}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}:</td>
+          <td class="td-with-input">{$forms.timeRecordForm.duration.control}</td>
         </tr>
 {/if}
 
@@ -159,7 +159,7 @@
           <td>{$forms.timeRecordForm.task.control}</td>
         </tr>
 {/if}
-{if $show_start}
+{if !$show_start}
         <tr>
           <td align="right">{$i18n.label.start}:</td>
           <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
diff --git a/img/icon-now.png b/img/icon-now.png
new file mode 100644
index 0000000000000000000000000000000000000000..44cd60462a63ad9732e33138105f077434ee0bf6
GIT binary patch
literal 1581
zcmaJ>4{X#_7(c+t+*l$5l|N>dP6rNp?Q5@hYuz2W-R-thZ;rdm*hGb1`)(_1ueY|h
z-3W;ZpaCRA`6p2sF4JIw5Ew2HoJ@nsK%I_2h!_LLsY{Ru%M7T&;Op&fOk-%$zVE$$
zzu))!zW2SirM|AFs9-^X&1NeK*80O}e9(IH??>Oq#_tGdm~U1$nh`B-b_hDOc_l3d
zv7jn6!!Q)2&bG6#(q_9aBu5*~#?Z68sHt|r^0BAYBtqM4mCMsfL2QL47K6=l!i``5
zcmT&_$&IgMLsTf~gDrCHIvqyV)kVd1ts*Dk%RN|SnnwgGGzBcJDhY#6yYUP!k8Eq1
z#IcNv+3Ln8L^X!$F`uSGjI~pQNI3!Kbl8D|;vC#EjHUoZ0-B^;1fY1<#Zv&wJ~)b|
zOL0Ez4`gGZnHz60%_L8f9UUF^4#uwO%_QJBj-+UkrU~Rh7@Y}IND~R8G{@kFhN#O)
zQ`Qog#VEwIl<CHi(uow*WGFOAoG`M5LM0>9LXre_id0oAuZ*{0hT&Zq|Lbi;JCl$M
zLqkjHBHE95X%38Pcke(sM@gLYOQv)slcyw-P=P8;m<AFBGK!FL{yAMn8z?A#O-xyT
zgMK%jO34x*7vgM8l2{@pFcJZPBoKnc077CI$;E;SIu2r1K#OE57_HbPga;JMFkXi%
z;G+EiRC_s!tEliX3=LR+72^jvY%pP%LPCUAU<)hX#X9ea<$XF7Oihn!nv!dmprWJ<
zQ@55eUxc*-YZtQ`p)R*WDWGdAme~ego)S5evdhJAl*_>oG-O#qbRw&Qqv8bP;(#bQ
zXdxD3@hn)HQm<Ufl(T{Yz~!J^G%^7|`8osDPJh5#9jKxifRjj#B=X{f@NA1lU|ZHw
zWKRPWk@kqGiLG|4hiIB}AXRiFY4sj*z$UB-5cw}MG%;mUfmt@MVovf}?Z+!Zq8Zhg
zkYHR$DJJeQWfiVQ)j|hZUo9#q=6}OXa9Ck-%o!b1&O}ZSI%t+TdBV|T@{WKBbTR1Y
z1{m0RBx<uwYY+Op(e!ub`Jtu$74rti=9fPH@`m00(ylywOEJ4lX*_zPw`|jgWluD1
zCklqXZEQNS*YW=5;-)h@=JwP!Jz0AFRLwxoNc-r81M%NFyGFal-!V46QQM4tIq&rJ
z%fp))?bEO8=+_sX@!Y(z?V0zE<^B9e<-w}yubuGa2S1-3SX8bg4}a6U_{g>;Yk%Jn
znH4KsTt2*E+p0BlPq&<Zn^|)1d*YXm3Xb&^4c$?@=SErv`x=BjC&_6C>X-giA1}Nh
z6t}LuI5Rx2t$2LJ;VWhF7rBAFlf&=AOTx`RH<kRoKX8cAV!x_$hCGG!TVmJBTOJsH
zy5D$d_)vf4svlO(+5h8q@vEzjYbTDMZ7+Nz{n>8*_VwQG8Q#%LvrER-7AhmQ8J;)4
zcwuDb`p&LfBf}3@)Xe(i>c*$4JjeUON5QR<z2p1NjlHsOjZqcq`e|3}{N;m>uJjF^
zavj}@_xCLD@fSZh_0Sb<QFmawSUtEfx-&HXR@+F~?R?6%{zAj1SD)X5Sr>S)y3T*N
IYR!g!0N`&ei2wiq

literal 0
HcmV?d00001

diff --git a/time2.php b/time2.php
index 60fdd6ecd..4747d02ad 100644
--- a/time2.php
+++ b/time2.php
@@ -295,8 +295,10 @@
 }
 
 // Duration control.
-if ($showDuration)
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+if ($showDuration) {
+  $placeholder = $user->getDecimalMark() == ',' ? str_replace('.', ',', $i18n->get('form.time.duration_placeholder')) : $i18n->get('form.time.duration_placeholder');
+  $form->addInput(array('type'=>'text','name'=>'duration','placeholder'=>$placeholder,'value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+}
 
 // File upload control.
 if ($showFiles)

From 1ca2b6d35c3e90987a70285500740b23e53b7311 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 4 Oct 2020 23:10:23 +0000
Subject: [PATCH 1311/1848] Some more progress on mobile time2.php page, still
 incomplete.

---
 WEB-INF/templates/time2.tpl | 22 ++++++++++++++++++----
 initialize.php              |  2 +-
 time2.php                   |  1 -
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index eb51d954d..96f2d090f 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -82,12 +82,26 @@
           <td class = "large-screen-label"><label for="duration">{$i18n.label.duration}:</label></td>
           <td class="td-with-input">{$forms.timeRecordForm.duration.control}</td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_files}
+        <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
+        <tr>
+          <td class = "large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.newfile.control}</td>
+        </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $template_dropdown}
+        <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
+        <tr>
+          <td class = "large-screen-label"><label for="template">{$i18n.label.template}:</label></td>
+          <td class="td-with-input">{$forms.timeRecordForm.template.control}</td>
+        </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 
-
-
-
-
+{* TODO: work in progress down from here... *}
         <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
         <tr>
           <td class="large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
diff --git a/initialize.php b/initialize.php
index 6131ebb8f..819a1362c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5310");
+define("APP_VERSION", "1.19.23.5311");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time2.php b/time2.php
index 4747d02ad..aa145246c 100644
--- a/time2.php
+++ b/time2.php
@@ -311,7 +311,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
-      'style'=>'width: 250px;',
       'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));

From 7dcea55b7b1da128afc0d613e20f659cde172041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20Lundgren?= <adevade@users.noreply.github.com>
Date: Tue, 6 Oct 2020 15:36:55 +0200
Subject: [PATCH 1312/1848] Remove unnecessary stuff from html head (#104)

---
 WEB-INF/templates/header.tpl  | 10 +++++-----
 WEB-INF/templates/header2.tpl | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 7a1e4d842..10640cb29 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html lang="{constant('LANG_DEFAULT')}">
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
+  <meta charset="{constant('CHARSET')}">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
+  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet">
 {if $i18n.language.rtl}
-  <link href="{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
+  <link href="{constant('RTL_CSS')}" rel="stylesheet">
 {/if}
 {if $user->getCustomCss()}
-  <link href="custom_css.php" rel="stylesheet" type="text/css">
+  <link href="custom_css.php" rel="stylesheet">
 {/if}
   <title>Time Tracker{if $title} - {$title}{/if}</title>
   <script src="js/strftime.js"></script>
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index 1573d6124..6bc5f65fe 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html lang="{constant('LANG_DEFAULT')}">
 <head>
-  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
+  <meta charset="{constant('CHARSET')}">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
+  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet">
 {if $i18n.language.rtl}
-  <link href="{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
+  <link href="{constant('RTL_CSS')}" rel="stylesheet">
 {/if}
 {if $user->getCustomCss()}
-  <link href="custom_css.php" rel="stylesheet" type="text/css">
+  <link href="custom_css.php" rel="stylesheet">
 {/if}
   <title>Time Tracker{if $title} - {$title}{/if}</title>
   <script src="js/strftime.js"></script>
@@ -188,4 +188,4 @@
 {/if}
 {* end of output messages *}
 
-<div class="page-content">
\ No newline at end of file
+<div class="page-content">

From 479fdab665c89cdd57ce1864cba701bf46994f70 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 9 Oct 2020 21:17:02 +0000
Subject: [PATCH 1313/1848] Resuming work on time2.php.

---
 WEB-INF/templates/time2.tpl | 100 ++----------------------------------
 default.css                 |   7 +++
 initialize.php              |   2 +-
 time2.php                   |   5 +-
 4 files changed, 13 insertions(+), 101 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 96f2d090f..819c35d94 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -100,29 +100,24 @@
         </tr>
         <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-
-{* TODO: work in progress down from here... *}
         <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
         <tr>
           <td class="large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
-          <td>{$forms.timeRecordForm.note1.control}</td>
+          <td>{$forms.timeRecordForm.note.control}</td>
         </tr>
+        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
       </table>
     </td>
     <td><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td>
   </tr>
+  <tr><td colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
 </table>
 
 
 
 
 
-
-
-
-
-
-
+{* TODO: work in progress down from here... *}
 <table cellspacing="4" cellpadding="0" border="0">
 {if $show_navigation}
   <tr>
@@ -131,95 +126,8 @@
     </td>
   </tr>
 {/if}
-  <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.timeRecordForm.user.control}</td>
-        </tr>
-{/if}
-{if $show_client}
-        <tr>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.timeRecordForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_billable}
-        <tr>
-          <td align="right">&nbsp;</td>
-          <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
-        </tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-        <tr>
-          <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
-          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-          <td>{$forms.timeRecordForm.$control_name.control}</td>
-        </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.timeRecordForm.project.control}</td>
-        </tr>
-{/if}
-{if $show_task}
-        <tr>
-          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
-          <td>{$forms.timeRecordForm.task.control}</td>
-        </tr>
-{/if}
-{if !$show_start}
-        <tr>
-          <td align="right">{$i18n.label.start}:</td>
-          <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.finish}:</td>
-          <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
-        </tr>
-{/if}
-{if $show_duration}
-        <tr>
-          <td align="right">{$i18n.label.duration}:</td>
-          <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
-        </tr>
-{/if}
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.timeRecordForm.newfile.control}</td>
-        </tr>
-{/if}
-{if $template_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.template}:</td>
-          <td>{$forms.timeRecordForm.template.control}</td>
-        </tr>
-{/if}
-      </table>
-    </td>
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
-      </table>
-    </td>
-  </tr>
 </table>
 
-<table>
-  <tr>
-    <td align="right">{$i18n.label.note}:</td>
-    <td align="left">{$forms.timeRecordForm.note.control}</td>
-  </tr>
-  <tr>
-    <td align="center" colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
-  </tr>
-</table>
 
 <table width="720">
   <tr>
diff --git a/default.css b/default.css
index fd63a814b..2f5d054a9 100644
--- a/default.css
+++ b/default.css
@@ -236,6 +236,13 @@ input.password-field {
   float: left;
 }
 
+#note {
+  width: 100%;
+  margin: 0;
+  height: 4rem;
+  resize: none;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index 819a1362c..a4f9a088b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5311");
+define("APP_VERSION", "1.19.23.5312");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time2.php b/time2.php
index aa145246c..f87c76c30 100644
--- a/time2.php
+++ b/time2.php
@@ -322,10 +322,7 @@
 }
 
 // Note control.
-if (!defined('NOTE_INPUT_HEIGHT'))
-  define('NOTE_INPUT_HEIGHT', 40);
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
-$form->addInput(array('type'=>'textarea','name'=>'note1','value'=>$cl_note));
+$form->addInput(array('type'=>'textarea','name'=>'note','value'=>$cl_note));
 
 // Calendar.
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar

From 82559f64f6454db810549ad2a6983cc23361ee99 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Oct 2020 15:12:03 +0000
Subject: [PATCH 1314/1848] Improved time2.php.

---
 WEB-INF/templates/time2.tpl | 16 ++++------------
 default.css                 |  4 +---
 initialize.php              |  2 +-
 time2.php                   | 15 ++++++++++++++-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 819c35d94..94f18bcb7 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -1,5 +1,6 @@
 {include file="time_script.tpl"}
 
+{* TODO: remove this from here to css *}
 <style>
 .not_billable td {
   color: #ff6666;
@@ -9,9 +10,7 @@
 {$forms.timeRecordForm.open}
 <div class="small-screen-calendar">{$forms.timeRecordForm.date.control}</div>
 <table class="centered-table">
-  <tr>
-    <td>
-      <table class="centered-table">
+  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td></tr>
 {if $user_dropdown}
         <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
         <tr>
@@ -103,20 +102,13 @@
         <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
         <tr>
           <td class="large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
-          <td>{$forms.timeRecordForm.note.control}</td>
+          <td colspan="2">{$forms.timeRecordForm.note.control}</td>
         </tr>
         <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-      </table>
-    </td>
-    <td><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td>
-  </tr>
-  <tr><td colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
+  <tr><td colspan="3">{$forms.timeRecordForm.btn_submit.control}</td>
 </table>
 
 
-
-
-
 {* TODO: work in progress down from here... *}
 <table cellspacing="4" cellpadding="0" border="0">
 {if $show_navigation}
diff --git a/default.css b/default.css
index 2f5d054a9..a0f391763 100644
--- a/default.css
+++ b/default.css
@@ -224,12 +224,10 @@ input.password-field {
 }
 
 .large-screen-calendar {
-  display: inline-block;
+  display: block;
   width: 210px;
   padding-left: 1rem;
   margin-top: 1rem;
-  margin-left: auto;
-  margin-right: auto
 }
 
 .checkbox-label {
diff --git a/initialize.php b/initialize.php
index a4f9a088b..fa20d990a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5312");
+define("APP_VERSION", "1.19.23.5313");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time2.php b/time2.php
index f87c76c30..e5d1275a1 100644
--- a/time2.php
+++ b/time2.php
@@ -177,6 +177,7 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
+$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 // Dropdown for user and a hidden control to indicate user change.
 if ($user->can('track_time')) {
@@ -194,6 +195,7 @@
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
     $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -209,6 +211,7 @@
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -228,6 +231,7 @@
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -243,6 +247,7 @@
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 
   // Client dropdown.
   if ($showClient) {
@@ -269,6 +274,7 @@
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -281,6 +287,7 @@
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Start and finish controls.
@@ -292,17 +299,21 @@
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
   }
+  $largeScreenCalendarRowSpan += 4;
 }
 
 // Duration control.
 if ($showDuration) {
   $placeholder = $user->getDecimalMark() == ',' ? str_replace('.', ',', $i18n->get('form.time.duration_placeholder')) : $i18n->get('form.time.duration_placeholder');
   $form->addInput(array('type'=>'text','name'=>'duration','placeholder'=>$placeholder,'value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // File upload control.
-if ($showFiles)
+if ($showFiles) {
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+  $largeScreenCalendarRowSpan += 2;
+}
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -318,6 +329,7 @@
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
     $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -472,6 +484,7 @@
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 
+$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));

From 175f2ddbe6edd39eb9cc87f085a8d6281e07b9e2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Oct 2020 15:17:56 +0000
Subject: [PATCH 1315/1848] Removed unneeded whitespace to improve formatting
 in time2.php.

---
 WEB-INF/templates/time2.tpl | 142 ++++++++++++++++++------------------
 initialize.php              |   2 +-
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 94f18bcb7..5c2ce3dd8 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -12,99 +12,99 @@
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td></tr>
 {if $user_dropdown}
-        <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
-        <tr>
-          <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.user.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_client}
-        <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
-        <tr>
-          <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.client.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_billable}
-        <tr>
-          <td class = "large-screen-label">&nbsp;</td>
-          <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $custom_fields && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
         {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-        <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
-        <tr>
-          <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.$control_name.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
 {if $show_project}
-        <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
-        <tr>
-          <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.project.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_task}
-        <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
-        <tr>
-          <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_start}
-        <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start}:</label></td></tr>
-        <tr>
-          <td class = "large-screen-label"><label for="start">{$i18n.label.start}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.start.control} <img src="img/icon-now.png" onclick="setNow('start');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-        <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.finish}:</label></td></tr>
-        <tr>
-          <td class = "large-screen-label"><label for="finish">{$i18n.label.finish}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.finish.control}<img src="img/icon-now.png" onclick="setNow('finish');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="start">{$i18n.label.start}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.start.control} <img src="img/icon-now.png" onclick="setNow('start');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.finish}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="finish">{$i18n.label.finish}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.finish.control}<img src="img/icon-now.png" onclick="setNow('finish');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_duration}
-        <tr class = "small-screen-label"><td><label for="duration">{$i18n.label.duration}:</label></td></tr>
-        <tr>
-          <td class = "large-screen-label"><label for="duration">{$i18n.label.duration}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.duration.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="duration">{$i18n.label.duration}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="duration">{$i18n.label.duration}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.duration.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_files}
-        <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
-        <tr>
-          <td class = "large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.newfile.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.newfile.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $template_dropdown}
-        <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
-        <tr>
-          <td class = "large-screen-label"><label for="template">{$i18n.label.template}:</label></td>
-          <td class="td-with-input">{$forms.timeRecordForm.template.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="template">{$i18n.label.template}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.template.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-        <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
-        <tr>
-          <td class="large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
-          <td colspan="2">{$forms.timeRecordForm.note.control}</td>
-        </tr>
-        <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
+    <td colspan="2">{$forms.timeRecordForm.note.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="3">{$forms.timeRecordForm.btn_submit.control}</td>
 </table>
 
diff --git a/initialize.php b/initialize.php
index fa20d990a..bb6096dc1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5313");
+define("APP_VERSION", "1.19.23.5314");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 079f479853121cea7ecd8a2234c209f1f2397de2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Oct 2020 20:32:05 +0000
Subject: [PATCH 1316/1848] Some more work done on time2.php.

---
 WEB-INF/templates/time2.tpl | 112 ++++++++++++++++++++++++++++++++++--
 default.css                 |  27 ++++++++-
 initialize.php              |   2 +-
 3 files changed, 134 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 5c2ce3dd8..057ef03bd 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -108,8 +108,110 @@
   <tr><td colspan="3">{$forms.timeRecordForm.btn_submit.control}</td>
 </table>
 
+{if $time_records}
+<div class="record-list">
+<table class="x-scrollable-table">
+  <tr>
+  {if $show_client}
+    <th>{$i18n.label.client}</th>
+  {/if}
+  {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+    {foreach $custom_fields->timeFields as $timeField}
+    <th>{$timeField['label']|escape}</th>
+    {/foreach}
+  {/if}
+  {if $show_project}
+    <th>{$i18n.label.project}</th>
+  {/if}
+  {if $show_task}
+    <th>{$i18n.label.task}</th>
+  {/if}
+  {if $show_start}
+    <th>{$i18n.label.start}</th>
+    <th>{$i18n.label.finish}</th>
+  {/if}
+    <th>{$i18n.label.duration}</th>
+  {if $show_note_column}
+    <th>{$i18n.label.note}</th>
+  {/if}
+  {if $show_files}
+    <th></th>
+  {/if}
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $time_records as $record}
+  <tr>
+    {if $show_client}
+    <td class="text-cell">{$record.client|escape}</td>
+    {/if}
+    {* record custom fileds *}
+    {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+    <td class="text-cell">{$record.$control_name|escape}</td>
+      {/foreach}
+    {/if}
+    {if $show_project}
+     <td class="text-cell">{$record.project|escape}</td>
+    {/if}
+    {if $show_task}
+    <td class="text-cell">{$record.task|escape}</td>
+    {/if}
+    {if $show_start}
+    <td class="time-cell">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+    {/if}
+    <td class="time-cell">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+    {if $show_note_column}
+    <td class="text-cell">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {/if}
+    {if $show_files}
+      {if $record.has_files}
+    <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+    <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+    <td>
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+      &nbsp;
+    {else}
+      <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
+      {if ($record.duration == '0:00' && $record.start <> '')}
+        <input type="hidden" name="record_id" value="{$record.id}">
+        <input type="hidden" name="browser_date" value="">
+        <input type="hidden" name="browser_time" value="">
+        <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
+      {/if}
+    {/if}
+    </td>
+    <td>
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+      &nbsp;
+    {else}
+      <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
+    {/if}
+    </td>
+  </tr>
+    {if $show_note_row && $record.comment}
+  <tr>
+    <td>{$i18n.label.note}:</td>
+    <td colspan="{$colspan}" class="text-cell">{$record.comment|escape}</td>
+  </tr>
+    {/if}
+  {/foreach}
+</table>
+</div>
+{/if}
+{$forms.timeRecordForm.close}
+
+
+
+
 
 {* TODO: work in progress down from here... *}
+{*
 <table cellspacing="4" cellpadding="0" border="0">
 {if $show_navigation}
   <tr>
@@ -119,8 +221,8 @@
   </tr>
 {/if}
 </table>
-
-
+*}
+{*
 <table width="720">
   <tr>
     <td valign="top">
@@ -160,7 +262,6 @@
     {if $show_client}
           <td valign="top">{$record.client|escape}</td>
     {/if}
-    {* record custom fileds *}
     {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
@@ -221,7 +322,8 @@
     </td>
   </tr>
 </table>
-
+*}
+{*
 <table cellpadding="3" cellspacing="1" width="720">
   <tr>
     <td align="left">{$i18n.label.week_total}: {$week_total}</td>
@@ -246,5 +348,5 @@
   </tr>
   {/if}
 </table>
+*}
 
-{$forms.timeRecordForm.close}
diff --git a/default.css b/default.css
index a0f391763..25c414c78 100644
--- a/default.css
+++ b/default.css
@@ -141,6 +141,32 @@ div.page-hint {
   display: inline-block;
 }
 
+.record-list {
+  margin-top: 1rem;
+  margin-left: 1rem;
+  margin-right: 1rem;
+}
+.x-scrollable-table {
+  display: inline-block;
+  margin-top: .5rem;
+  margin-left: auto;
+  margin-right: auto;
+  padding: .5rem;
+  background-color: #f0f0f0;
+}
+
+.x-scrollable-table th {
+  white-space: nowrap;
+}
+
+.text-cell {
+  text-align: left;
+}
+
+.time-cell {
+  text-align: right;
+}
+
 .large-screen-label {
   text-align: right;
   vertical-align: middle;
@@ -179,7 +205,6 @@ div.page-hint {
   padding: .2rem;
   background-color: #eeeeee;
 }
-
 .version-and-copyright {
   text-align: center;
   padding: .5rem;
diff --git a/initialize.php b/initialize.php
index bb6096dc1..ac675f915 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5314");
+define("APP_VERSION", "1.19.23.5315");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 548b846edcc5dd3a492ee05eb95c420c47fb1552 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 14:31:55 +0000
Subject: [PATCH 1317/1848] Some more progress with time2.php - added daily
 totals.

---
 WEB-INF/templates/time2.tpl | 29 ++++++++++++++++++++++++++++-
 default.css                 | 21 ++++++++++++++++++---
 initialize.php              |  2 +-
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 057ef03bd..268ee01cd 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -196,7 +196,7 @@
   </tr>
     {if $show_note_row && $record.comment}
   <tr>
-    <td>{$i18n.label.note}:</td>
+    <td class="note-header-cell">{$i18n.label.note}:</td>
     <td colspan="{$colspan}" class="text-cell">{$record.comment|escape}</td>
   </tr>
     {/if}
@@ -206,6 +206,33 @@
 {/if}
 {$forms.timeRecordForm.close}
 
+<div class="day-totals">
+<table class="centered-table">
+  <tr>
+    <td class="day-totals-col1">{$i18n.label.week_total}: {$week_total}</td>
+    <td class="day-totals-col2">{$i18n.label.day_total}: {$day_total}</td>
+  </tr>
+{if $user->isPluginEnabled('mq')}
+  <tr>
+    <td class="day-totals-col1">{$i18n.label.month_total}: {$month_total}</td>
+    {if $over_balance}
+    <td class="day-totals-col2">{$i18n.form.time.over_balance}: <span style="color: green;">{$balance_remaining}</span></td>
+    {else}
+    <td class="day-totals-col2">{$i18n.form.time.remaining_balance}: <span style="color: red;">{$balance_remaining}</span></td>
+    {/if}
+  </tr>
+  <tr>
+    <td class="day-totals-col1">{$i18n.label.quota}: {$month_quota}</td>
+    {if $over_quota}
+    <td class="day-totals-col2">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
+    {else}
+    <td class="day-totals-col2">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
+    {/if}
+  </tr>
+{/if}
+</table>
+</div>
+
 
 
 
diff --git a/default.css b/default.css
index 25c414c78..75eebb146 100644
--- a/default.css
+++ b/default.css
@@ -142,10 +142,9 @@ div.page-hint {
 }
 
 .record-list {
-  margin-top: 1rem;
-  margin-left: 1rem;
-  margin-right: 1rem;
+  margin: 1rem;
 }
+
 .x-scrollable-table {
   display: inline-block;
   margin-top: .5rem;
@@ -167,6 +166,10 @@ div.page-hint {
   text-align: right;
 }
 
+.note-header-cell {
+  text-align: right;
+}
+
 .large-screen-label {
   text-align: right;
   vertical-align: middle;
@@ -266,6 +269,18 @@ input.password-field {
   resize: none;
 }
 
+.day-totals-col1 {
+  text-align: left;
+  padding-left: .5rem;
+  padding-right: .5rem;
+}
+
+.day-totals-col2 {
+  padding-left: .5rem;
+  padding-right: .5rem;
+  text-align: right;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index ac675f915..abdcdf39b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5315");
+define("APP_VERSION", "1.19.23.5316");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From aecb3805b282d1df71fde7034e4da3ddc94bc067 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 15:03:53 +0000
Subject: [PATCH 1318/1848] Removed styles from time2.php to css.

---
 WEB-INF/templates/time2.tpl | 17 +++++------------
 default.css                 | 20 ++++++++++++++++++++
 initialize.php              |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 268ee01cd..58d053ba9 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -1,12 +1,5 @@
 {include file="time_script.tpl"}
 
-{* TODO: remove this from here to css *}
-<style>
-.not_billable td {
-  color: #ff6666;
-}
-</style>
-
 {$forms.timeRecordForm.open}
 <div class="small-screen-calendar">{$forms.timeRecordForm.date.control}</div>
 <table class="centered-table">
@@ -141,7 +134,7 @@
     <th></th>
   </tr>
   {foreach $time_records as $record}
-  <tr>
+  <tr{if !$record.billable} class="not-billable"{/if}>
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
@@ -216,17 +209,17 @@
   <tr>
     <td class="day-totals-col1">{$i18n.label.month_total}: {$month_total}</td>
     {if $over_balance}
-    <td class="day-totals-col2">{$i18n.form.time.over_balance}: <span style="color: green;">{$balance_remaining}</span></td>
+    <td class="day-totals-col2">{$i18n.form.time.over_balance}: <span class="over-quota-balance">{$balance_remaining}</span></td>
     {else}
-    <td class="day-totals-col2">{$i18n.form.time.remaining_balance}: <span style="color: red;">{$balance_remaining}</span></td>
+    <td class="day-totals-col2">{$i18n.form.time.remaining_balance}: <span class="remaining-quota-balance">{$balance_remaining}</span></td>
     {/if}
   </tr>
   <tr>
     <td class="day-totals-col1">{$i18n.label.quota}: {$month_quota}</td>
     {if $over_quota}
-    <td class="day-totals-col2">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
+    <td class="day-totals-col2">{$i18n.form.time.over_quota}: <span class="over-quota">{$quota_remaining}</span></td>
     {else}
-    <td class="day-totals-col2">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
+    <td class="day-totals-col2">{$i18n.form.time.remaining_quota}: <span class="remaining-quota">{$quota_remaining}</span></td>
     {/if}
   </tr>
 {/if}
diff --git a/default.css b/default.css
index 75eebb146..c353c548f 100644
--- a/default.css
+++ b/default.css
@@ -281,6 +281,26 @@ input.password-field {
   text-align: right;
 }
 
+.not-billable {
+  color: #ff6666;
+}
+
+.remaining-quota {
+  color: red;
+}
+
+.remaining-quota-balance {
+  color: red;
+}
+
+.over-quota {
+  color: green;
+}
+
+.over-quota-balance {
+  color: green;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index abdcdf39b..8d5cd70a3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5316");
+define("APP_VERSION", "1.19.23.5317");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 02588ee4e26691fdc2d288d9c096f8df563cef42 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 15:29:23 +0000
Subject: [PATCH 1319/1848] Finished work on time2.php. It should now be
 usable, although styles needs to be improved.

---
 WEB-INF/templates/time2.tpl | 151 ++----------------------------------
 default.css                 |   4 +
 initialize.php              |   2 +-
 3 files changed, 11 insertions(+), 146 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 58d053ba9..33aa428e7 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -1,5 +1,11 @@
 {include file="time_script.tpl"}
 
+{if $show_navigation}
+<div class="optional-nav">
+  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
+</div>
+{/if}
+
 {$forms.timeRecordForm.open}
 <div class="small-screen-calendar">{$forms.timeRecordForm.date.control}</div>
 <table class="centered-table">
@@ -225,148 +231,3 @@
 {/if}
 </table>
 </div>
-
-
-
-
-
-{* TODO: work in progress down from here... *}
-{*
-<table cellspacing="4" cellpadding="0" border="0">
-{if $show_navigation}
-  <tr>
-    <td align="center" colspan=2">
-      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
-    </td>
-  </tr>
-{/if}
-</table>
-*}
-{*
-<table width="720">
-  <tr>
-    <td valign="top">
-{if $time_records}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-        <tr>
-  {if $show_client}
-          <td class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-          <td class="tableHeader">{$timeField['label']|escape}</td>
-      {/foreach}
-  {/if}
-  {if $show_project}
-          <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-  {if $show_task}
-          <td class="tableHeader">{$i18n.label.task}</td>
-  {/if}
-  {if $show_start}
-          <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
-          <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
-  {/if}
-          <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
-  {if $show_note_column}
-          <td class="tableHeader">{$i18n.label.note}</td>
-  {/if}
-  {if $show_files}
-          <td></td>
-  {/if}
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $time_records as $record}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {if $show_client}
-          <td valign="top">{$record.client|escape}</td>
-    {/if}
-    {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-          <td>{$record.$control_name|escape}</td>
-      {/foreach}
-    {/if}
-    {if $show_project}
-          <td valign="top">{$record.project|escape}</td>
-    {/if}
-    {if $show_task}
-          <td valign="top">{$record.task|escape}</td>
-    {/if}
-    {if $show_start}
-          <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
-          <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
-    {/if}
-          <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
-    {if $show_note_column}
-          <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
-    {/if}
-    {if $show_files}
-      {if $record.has_files}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-      {else}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-      {/if}
-    {/if}
-          <td valign="top" align="center">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
-    {else}
-            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
-      {if ($record.duration == '0:00' && $record.start <> '')}
-            <input type="hidden" name="record_id" value="{$record.id}">
-            <input type="hidden" name="browser_date" value="">
-            <input type="hidden" name="browser_time" value="">
-            <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
-      {/if}
-    {/if}
-          </td>
-          <td valign="top" align="center">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-            &nbsp;
-    {else}
-            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
-    {/if}
-          </td>
-        </tr>
-    {if $show_note_row && $record.comment}
-        <tr>
-          <td align="right" valign="top">{$i18n.label.note}:</td>
-          <td colspan="{$colspan}" align="left" valign="top">{$record.comment|escape}</td>
-        </tr>
-    {/if}
-  {/foreach}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-*}
-{*
-<table cellpadding="3" cellspacing="1" width="720">
-  <tr>
-    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td align="right">{$i18n.label.day_total}: {$day_total}</td>
-  </tr>
-  {if $user->isPluginEnabled('mq')}
-  <tr>
-    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
-    {if $over_balance}
-    <td align="right">{$i18n.form.time.over_balance}: <span style="color: green;">{$balance_remaining}</span></td>
-    {else}
-    <td align="right">{$i18n.form.time.remaining_balance}: <span style="color: red;">{$balance_remaining}</span></td>
-    {/if}
-  </tr>
-  <tr>
-    <td align="left">{$i18n.label.quota}: {$month_quota}</td>
-    {if $over_quota}
-    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
-    {else}
-    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
-    {/if}
-  </tr>
-  {/if}
-</table>
-*}
-
diff --git a/default.css b/default.css
index c353c548f..2df2d2121 100644
--- a/default.css
+++ b/default.css
@@ -301,6 +301,10 @@ input.password-field {
   color: green;
 }
 
+.optional-nav {
+  margin-top: .5rem;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index 8d5cd70a3..9dda5d0d8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5317");
+define("APP_VERSION", "1.19.23.5318");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 8ae14c590f3f77d136c9fd37242cabcf381cd92c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 16:06:21 +0000
Subject: [PATCH 1320/1848] Improved td padding on time2.php for day records
 table.

---
 default.css    | 4 ++++
 initialize.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index 2df2d2121..4c0c8697f 100644
--- a/default.css
+++ b/default.css
@@ -158,6 +158,10 @@ div.page-hint {
   white-space: nowrap;
 }
 
+.x-scrollable-table td {
+  padding: .25rem;
+}
+
 .text-cell {
   text-align: left;
 }
diff --git a/initialize.php b/initialize.php
index 9dda5d0d8..488b1fe77 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5318");
+define("APP_VERSION", "1.19.23.5319");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b014fb5b7352e81e28b5d126be37572cc68aeade Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 18:59:35 +0000
Subject: [PATCH 1321/1848] Made time_delete.php mobile-friendly.

---
 WEB-INF/templates/time_delete.tpl  | 50 ------------------------------
 WEB-INF/templates/time_delete2.tpl | 37 ++++++++++++++++++++++
 default.css                        |  4 +++
 initialize.php                     |  2 +-
 rtl.css                            | 20 ++++++++++++
 time_delete.php                    |  4 +--
 6 files changed, 64 insertions(+), 53 deletions(-)
 delete mode 100644 WEB-INF/templates/time_delete.tpl
 create mode 100644 WEB-INF/templates/time_delete2.tpl

diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl
deleted file mode 100644
index c8d90be0f..000000000
--- a/WEB-INF/templates/time_delete.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-<tr>
-  <td>
-  <table border='0' cellpadding='3' cellspacing='1' width="100%">
-  <tr>
-{if $show_project}
-    <td class="tableHeader" align="center">{$i18n.label.project}</td>
-{/if}
-{if $show_task}
-    <td class="tableHeader" align="center">{$i18n.label.task}</td>
-{/if}
-{if $show_start}
-    <td class="tableHeader" align="center">{$i18n.label.start}</td>
-    <td class="tableHeader" align="center">{$i18n.label.finish}</td>
-{/if}
-{if $show_duration}
-    <td class="tableHeader" align="center">{$i18n.label.duration}</td>
-{/if}
-    <td class="tableHeader" align="center">{$i18n.label.note}</td>
-  </tr>
-  <tr>
-{if $show_project}
-    <td>{$time_rec.project_name|escape}</td>
-{/if}
-{if $show_task}
-    <td>{$time_rec.task_name|escape}</td>
-{/if}
-{if $show_start}
-    <td align="right">{if $time_rec.start}{$time_rec.start}{else}&nbsp;{/if}</td>
-    <td align="right">{if $time_rec.finish<>$time_rec.start}{$time_rec.finish}{else}&nbsp;{/if}</td>
-{/if}
-{if $show_duration}
-    <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
-{/if}
-    <td>{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>
-  </tr>
-  </table>
-  <table width="100%">
-  <tr>
-    <td align="center">&nbsp;</td>
-  </tr>
-  <tr>
-    <td align="center">{$forms.timeRecordForm.delete_button.control}&nbsp;&nbsp;{$forms.timeRecordForm.cancel_button.control}</td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
-{$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/time_delete2.tpl b/WEB-INF/templates/time_delete2.tpl
new file mode 100644
index 000000000..9d51fcc62
--- /dev/null
+++ b/WEB-INF/templates/time_delete2.tpl
@@ -0,0 +1,37 @@
+{$forms.timeRecordForm.open}
+<table class="centered-table">
+  <tr>
+{if $show_project}
+    <th>{$i18n.label.project}</th>
+{/if}
+{if $show_task}
+    <th>{$i18n.label.task}</th>
+{/if}
+{if $show_start}
+    <th>{$i18n.label.start}</td>
+    <th>{$i18n.label.finish}</th>
+{/if}
+{if $show_duration}
+    <th>{$i18n.label.duration}</th>
+{/if}
+    <th>{$i18n.label.note}</th>
+  </tr>
+  <tr>
+{if $show_project}
+    <td class="text-cell">{$time_rec.project_name|escape}</td>
+{/if}
+{if $show_task}
+    <td class="text-cell">{$time_rec.task_name|escape}</td>
+{/if}
+{if $show_start}
+    <td class="time-cell">{if $time_rec.start}{$time_rec.start}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{if $time_rec.finish<>$time_rec.start}{$time_rec.finish}{else}&nbsp;{/if}</td>
+{/if}
+{if $show_duration}
+    <td class="time-cell">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
+{/if}
+    <td class="text-cell">{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>
+  </tr>
+</table>
+<div class="button-set">{$forms.timeRecordForm.delete_button.control}&nbsp;{$forms.timeRecordForm.cancel_button.control}</div>
+{$forms.timeRecordForm.close}
diff --git a/default.css b/default.css
index 4c0c8697f..7910d8371 100644
--- a/default.css
+++ b/default.css
@@ -309,6 +309,10 @@ input.password-field {
   margin-top: .5rem;
 }
 
+.button-set {
+  margin-top: .5rem;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index 488b1fe77..88850f272 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5319");
+define("APP_VERSION", "1.19.23.5320");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/rtl.css b/rtl.css
index a566e4ae7..b47b925ad 100644
--- a/rtl.css
+++ b/rtl.css
@@ -19,3 +19,23 @@ html {
 .checkbox-label {
   float: right;
 }
+
+.day-totals-col1 {
+  text-align: right;
+}
+
+.day-totals-col2 {
+  text-align: left;
+}
+
+.text-cell {
+  text-align: right;
+}
+
+.time-cell {
+  text-align: left;
+}
+
+.note-header-cell {
+  text-align: left;
+}
diff --git a/time_delete.php b/time_delete.php
index 9cbed727e..f1ec7b575 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -93,5 +93,5 @@
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_time_record'));
-$smarty->assign('content_page_name', 'time_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'time_delete2.tpl');
+$smarty->display('index2.tpl');

From 3ff66b4fafec233e0b0f2c4f97e04e268606bf3e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 20:11:56 +0000
Subject: [PATCH 1322/1848] Made time_edit.php mobile-friendly.

---
 WEB-INF/templates/time_edit.tpl  | 108 -----------------------------
 WEB-INF/templates/time_edit2.tpl | 113 +++++++++++++++++++++++++++++++
 default.css                      |   1 +
 initialize.php                   |   2 +-
 time_edit.php                    |  18 ++---
 5 files changed, 122 insertions(+), 120 deletions(-)
 delete mode 100644 WEB-INF/templates/time_edit.tpl
 create mode 100644 WEB-INF/templates/time_edit2.tpl

diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
deleted file mode 100644
index 45c9bc666..000000000
--- a/WEB-INF/templates/time_edit.tpl
+++ /dev/null
@@ -1,108 +0,0 @@
-{include file="time_script.tpl"}
-
-{* Conditional include of confirmSave handler. *}
-{if $confirm_save}
-<script>
-var original_date = "{$entry_date}";
-
-function confirmSave() {
-  var date_on_save = document.getElementById("date").value;
-  if (original_date != date_on_save) {
-    return confirm("{$i18n.warn.confirm_save}");
-  }
-}
-</script>
-{/if}
-
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width = "100%">
-  <tr>
-    <td valign="top">
-    <table border="0">
-{if $show_client}
-    <tr>
-      <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-      <td>{$forms.timeRecordForm.client.control}</td>
-    </tr>
-{/if}
-{if $show_billable}
-    <tr>
-      <td align="right">&nbsp;</td>
-      <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
-    </tr>
-{/if}
-{if $show_paid_status}
-    <tr>
-      <td align="right">&nbsp;</td>
-      <td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td>
-    </tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-    <tr>
-      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      <td>{$forms.timeRecordForm.$control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-    <tr>
-      <td align="right">{$i18n.label.project} (*):</td>
-      <td>{$forms.timeRecordForm.project.control}</td>
-    </tr>
-{/if}
-{if $show_task}
-    <tr>
-      <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
-      <td>{$forms.timeRecordForm.task.control}</td>
-    </tr>
-{/if}
-{if $show_start}
-    <tr>
-      <td align="right">{$i18n.label.start}:</td>
-      <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.finish}:</td>
-      <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
-    </tr>
-{/if}
-{if $show_duration}
-    <tr>
-      <td align="right">{$i18n.label.duration}:</td>
-      <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.label.date}:</td>
-      <td>{$forms.timeRecordForm.date.control}</td>
-    </tr>
-{if $template_dropdown}
-    <tr>
-      <td align="right">{$i18n.label.template}:</td>
-      <td>{$forms.timeRecordForm.template.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.label.note}:</td>
-      <td>{$forms.timeRecordForm.note.control}</td>
-    </tr>
-    <tr>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td align="left">{$forms.timeRecordForm.btn_save.control} {$forms.timeRecordForm.btn_copy.control} {$forms.timeRecordForm.btn_delete.control}</td>
-    </tr>
-    </table>
-    </td>
-    </tr>
-  </table>
-  </td>
-  </tr>
-</table>
-{$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/time_edit2.tpl b/WEB-INF/templates/time_edit2.tpl
new file mode 100644
index 000000000..dc3d78cd0
--- /dev/null
+++ b/WEB-INF/templates/time_edit2.tpl
@@ -0,0 +1,113 @@
+{include file="time_script.tpl"}
+
+{* Conditional include of confirmSave handler. *}
+{if $confirm_save}
+<script>
+var original_date = "{$entry_date}";
+
+function confirmSave() {
+  var date_on_save = document.getElementById("date").value;
+  if (original_date != date_on_save) {
+    return confirm("{$i18n.warn.confirm_save}");
+  }
+}
+</script>
+{/if}
+
+{$forms.timeRecordForm.open}
+<table class="centered-table">
+  <tr>
+{if $show_client}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_billable}
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_paid_status}
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+    {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+{if $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_task}
+  <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_start}
+  <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="start">{$i18n.label.start}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.start.control} <img src="img/icon-now.png" onclick="setNow('start');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.finish}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="finish">{$i18n.label.finish}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.finish.control}<img src="img/icon-now.png" onclick="setNow('finish');" title="{$i18n.button.now}" alt="{$i18n.button.now}"></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_duration}
+  <tr class = "small-screen-label"><td><label for="duration">{$i18n.label.duration}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="duration">{$i18n.label.duration}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.duration.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="date">{$i18n.label.date} (*):</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="date">{$i18n.label.date} (*):</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.date.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $template_dropdown}
+  <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="template">{$i18n.label.template}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.template.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="note">{$i18n.label.note}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="note">{$i18n.label.note}:</label></td>
+    <td>{$forms.timeRecordForm.note.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.timeRecordForm.btn_save.control} {$forms.timeRecordForm.btn_copy.control} {$forms.timeRecordForm.btn_delete.control}</div>
+{$forms.timeRecordForm.close}
diff --git a/default.css b/default.css
index 7910d8371..21488b480 100644
--- a/default.css
+++ b/default.css
@@ -311,6 +311,7 @@ input.password-field {
 
 .button-set {
   margin-top: .5rem;
+  margin-bottom: 1rem;
 }
 
 @media screen and (max-width: 600px) {
diff --git a/initialize.php b/initialize.php
index 88850f272..261c7af2b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5320");
+define("APP_VERSION", "1.19.23.5321");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index b672c41cb..75b9018f7 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -145,7 +145,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
@@ -169,7 +168,6 @@
       $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -185,7 +183,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
@@ -212,7 +209,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
@@ -225,7 +221,6 @@
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
-    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
@@ -244,8 +239,10 @@
 }
 
 // Duration control.
-if ($showDuration)
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+if ($showDuration) {
+  $placeholder = $user->getDecimalMark() == ',' ? str_replace('.', ',', $i18n->get('form.time.duration_placeholder')) : $i18n->get('form.time.duration_placeholder');
+  $form->addInput(array('type'=>'text','name'=>'duration','placeholder'=>$placeholder,'value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+}
 
 // Date field.
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
@@ -257,7 +254,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
-      'style'=>'width: 250px;',
       'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -269,7 +265,7 @@
 }
 
 // Note control.
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 200px;','value'=>$cl_note));
+$form->addInput(array('type'=>'textarea','name'=>'note','value'=>$cl_note));
 
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
@@ -490,5 +486,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('title', $i18n->get('title.edit_time_record'));
-$smarty->assign('content_page_name', 'time_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'time_edit2.tpl');
+$smarty->display('index2.tpl');

From aedd1af74c6e79e7dcae4515cb8c80475a2bbb56 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 20:21:47 +0000
Subject: [PATCH 1323/1848] Mobile friendlier time entry pages released for
 user testing.

---
 initialize.php         |  2 +-
 time.php               | 38 ++++++++++++++++++++++----------------
 time2.php => time1.php | 38 ++++++++++++++++----------------------
 3 files changed, 39 insertions(+), 39 deletions(-)
 rename time2.php => time1.php (94%)

diff --git a/initialize.php b/initialize.php
index 261c7af2b..6910a5469 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5321");
+define("APP_VERSION", "1.19.23.5322");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index b249f05b7..e5d1275a1 100644
--- a/time.php
+++ b/time.php
@@ -177,6 +177,7 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
+$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 // Dropdown for user and a hidden control to indicate user change.
 if ($user->can('track_time')) {
@@ -190,11 +191,11 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
       'name'=>'user',
-      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
     $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -206,11 +207,11 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -223,14 +224,14 @@
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -242,11 +243,11 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 
   // Client dropdown.
   if ($showClient) {
@@ -269,11 +270,11 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -282,11 +283,11 @@
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
-    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Start and finish controls.
@@ -298,15 +299,21 @@
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
   }
+  $largeScreenCalendarRowSpan += 4;
 }
 
 // Duration control.
-if ($showDuration)
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+if ($showDuration) {
+  $placeholder = $user->getDecimalMark() == ',' ? str_replace('.', ',', $i18n->get('form.time.duration_placeholder')) : $i18n->get('form.time.duration_placeholder');
+  $form->addInput(array('type'=>'text','name'=>'duration','placeholder'=>$placeholder,'value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
+  $largeScreenCalendarRowSpan += 2;
+}
 
 // File upload control.
-if ($showFiles)
+if ($showFiles) {
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+  $largeScreenCalendarRowSpan += 2;
+}
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -315,7 +322,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
-      'style'=>'width: 250px;',
       'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -323,13 +329,12 @@
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
     $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
 // Note control.
-if (!defined('NOTE_INPUT_HEIGHT'))
-  define('NOTE_INPUT_HEIGHT', 40);
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+$form->addInput(array('type'=>'textarea','name'=>'note','value'=>$cl_note));
 
 // Calendar.
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
@@ -479,6 +484,7 @@
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 
+$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
@@ -502,5 +508,5 @@
 $smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'time.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'time2.tpl');
+$smarty->display('index2.tpl');
diff --git a/time2.php b/time1.php
similarity index 94%
rename from time2.php
rename to time1.php
index e5d1275a1..b249f05b7 100644
--- a/time2.php
+++ b/time1.php
@@ -177,7 +177,6 @@
 
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
-$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 // Dropdown for user and a hidden control to indicate user change.
 if ($user->can('track_time')) {
@@ -191,11 +190,11 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
       'name'=>'user',
+      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
     $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -207,11 +206,11 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
+    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $largeScreenCalendarRowSpan += 2;
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -224,14 +223,14 @@
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
-    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -243,11 +242,11 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
     'name'=>'project',
+    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $largeScreenCalendarRowSpan += 2;
 
   // Client dropdown.
   if ($showClient) {
@@ -270,11 +269,11 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
+      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -283,11 +282,11 @@
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
+    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $largeScreenCalendarRowSpan += 2;
 }
 
 // Start and finish controls.
@@ -299,21 +298,15 @@
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
   }
-  $largeScreenCalendarRowSpan += 4;
 }
 
 // Duration control.
-if ($showDuration) {
-  $placeholder = $user->getDecimalMark() == ',' ? str_replace('.', ',', $i18n->get('form.time.duration_placeholder')) : $i18n->get('form.time.duration_placeholder');
-  $form->addInput(array('type'=>'text','name'=>'duration','placeholder'=>$placeholder,'value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-  $largeScreenCalendarRowSpan += 2;
-}
+if ($showDuration)
+  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
 
 // File upload control.
-if ($showFiles) {
+if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-  $largeScreenCalendarRowSpan += 2;
-}
 
 // If we have templates, add a dropdown to select one.
 if ($user->isPluginEnabled('tp')){
@@ -322,6 +315,7 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillNote(this.value);',
       'name'=>'template',
+      'style'=>'width: 250px;',
       'data'=>$template_list,
       'datakeys'=>array('id','name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -329,12 +323,13 @@
     $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
     $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
     $smarty->assign('template_list', $template_list);
-    $largeScreenCalendarRowSpan += 2;
   }
 }
 
 // Note control.
-$form->addInput(array('type'=>'textarea','name'=>'note','value'=>$cl_note));
+if (!defined('NOTE_INPUT_HEIGHT'))
+  define('NOTE_INPUT_HEIGHT', 40);
+$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
 
 // Calendar.
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
@@ -484,7 +479,6 @@
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 
-$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
@@ -508,5 +502,5 @@
 $smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'time2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'time.tpl');
+$smarty->display('index.tpl');

From ae62ca4be67826ae84091de56cdb11dff69d14cf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 20:43:55 +0000
Subject: [PATCH 1324/1848] Security fix: disabling password reset link
 immediately after password change.

---
 WEB-INF/lib/ttUserHelper.class.php | 4 ++++
 initialize.php                     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 17ef08c23..3af2fcb32 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -324,6 +324,10 @@ static function setPassword($user_id, $password) {
     $sql = "update tt_users set password = md5(".$mdb2->quote($password).") where id = $user_id";
     $affected = $mdb2->exec($sql);
 
+    if (!is_a($affected, 'PEAR_Error')) {
+      $sql = "delete from tt_tmp_refs where user_id = $user_id";
+      $affected = $mdb2->exec($sql);
+    }
     return (!is_a($affected, 'PEAR_Error'));
   }
 
diff --git a/initialize.php b/initialize.php
index 6910a5469..594ae5e21 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5322");
+define("APP_VERSION", "1.19.23.5323");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d2f75328eb0a8ac47b897ac8dae54fdafec3e67c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 21:44:59 +0000
Subject: [PATCH 1325/1848] Security fix: added protection against flooding
 user mailboxes with too many password reset emails.

---
 WEB-INF/lib/ttUserHelper.class.php | 28 ++++++++++++++++++++++++++++
 initialize.php                     |  2 +-
 password_reset.php                 |  5 +++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 3af2fcb32..eac057304 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -306,6 +306,34 @@ static function delete($user_id) {
     return true;
   }
 
+  // The recentRefExists determines if a reasonably recent user reference already exists.
+  // We do it similar to ttRegistrator::registeredRecently().
+  static function recentRefExists($user_id) {
+    $mdb2 = getConnection();
+
+    $sql = "select count(*) as cnt from tt_tmp_refs where user_id = $user_id and created > now() - interval 15 minute";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    $val = $res->fetchRow();
+    if ($val['cnt'] == 0)
+      return false; // No references in last 15 minutes.
+    if ($val['cnt'] >= 2)
+      return true;  // 2 or more references in last 15 mintes.
+
+    // If we are here, there was exactly one reference during last 15 minutes.
+    // Determine if it occurred within the last minute in a separate query.
+    $sql = "select created from tt_tmp_refs where user_id = $user_id and created > now() - interval 1 minute";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    $val = $res->fetchRow();
+    if ($val)
+      return true;
+
+    return false;
+  }
+
   // The saveTmpRef saves a temporary reference for user that is used to reset user password.
   static function saveTmpRef($ref, $user_id) {
     $mdb2 = getConnection();
diff --git a/initialize.php b/initialize.php
index 594ae5e21..afde5964e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5323");
+define("APP_VERSION", "1.19.23.5324");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/password_reset.php b/password_reset.php
index af596491d..01e04f3a1 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -64,6 +64,11 @@
   if ($err->no()) {
     $user = new ttUser($cl_login); // Note: reusing $user from initialize.php here.
 
+    // Protection against flooding user mailbox with too many password reset emails.
+    if (ttUserHelper::recentRefExists($user->id)) $err->add($i18n->get('error.access_denied'));
+  }
+
+  if ($err->no()) {
     // Prepare and save a temporary reference for user.
     $temp_ref = md5(uniqid());
     ttUserHelper::saveTmpRef($temp_ref, $user->id);

From d9472904361495f318c9d0294ffd28acaaeae42f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Oct 2020 22:25:28 +0000
Subject: [PATCH 1326/1848] Security fix for csv injections.

---
 WEB-INF/lib/common.lib.php |  9 +++++++++
 initialize.php             |  2 +-
 tofile.php                 | 22 +++++++++++-----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 725f343c0..e4d4a38f9 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -459,3 +459,12 @@ function ttRandomString($length = 32) {
   }
   return $randomString;
 }
+
+// ttNeutralizeForCsv neutralizes user input for export to CSV files
+// by removing =, +, -, and @ characters from the beginning of cell values.
+// This mitigates a risk of CSV injection, see https://owasp.org/www-community/attacks/CSV_Injection
+// Additionally, it replaces each quote character with a double quote.
+function ttNeutralizeForCsv($val) {
+  $result = ltrim($val, '=+-@');
+  return str_replace('"', '""', $result);
+}
diff --git a/initialize.php b/initialize.php
index afde5964e..93d019171 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5324");
+define("APP_VERSION", "1.19.23.5325");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/tofile.php b/tofile.php
index 8b3ae2302..996ffe9fd 100644
--- a/tofile.php
+++ b/tofile.php
@@ -218,7 +218,7 @@
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_control_name = 'show_'.$field_name;
-        if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$userField['label']).'"';
+        if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($userField['label']).'"';
       }
     }
     if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
@@ -229,7 +229,7 @@
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_control_name = 'show_'.$field_name;
-        if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$timeField['label']).'"';
+        if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($timeField['label']).'"';
       }
     }
     if ($bean->getAttribute('chstart')) print ',"'.$i18n->get('label.start').'"';
@@ -248,24 +248,24 @@
     // Print items.
     foreach ($items as $item) {
       print '"'.$item['date'].'"';
-      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.str_replace('"','""',$item['user']).'"';
+      if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.ttNeutralizeForCsv($item['user']).'"';
       // User custom fields.
       if ($custom_fields && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_control_name = 'show_'.$field_name;
-          if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$item[$field_name]).'"';
+          if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($item[$field_name]).'"';
         }
       }
-      if ($bean->getAttribute('chclient')) print ',"'.str_replace('"','""',$item['client']).'"';
-      if ($bean->getAttribute('chproject')) print ',"'.str_replace('"','""',$item['project']).'"';
-      if ($bean->getAttribute('chtask')) print ',"'.str_replace('"','""',$item['task']).'"';
+      if ($bean->getAttribute('chclient')) print ',"'.ttNeutralizeForCsv($item['client']).'"';
+      if ($bean->getAttribute('chproject')) print ',"'.ttNeutralizeForCsv($item['project']).'"';
+      if ($bean->getAttribute('chtask')) print ',"'.ttNeutralizeForCsv($item['task']).'"';
       // Time custom fields.
       if ($custom_fields && $custom_fields->timeFields) {
         foreach ($custom_fields->timeFields as $timeField) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_control_name = 'show_'.$field_name;
-          if ($bean->getAttribute($checkbox_control_name)) print ',"'.str_replace('"','""',$item[$field_name]).'"';
+          if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($item[$field_name]).'"';
         }
       }
       if ($bean->getAttribute('chstart')) print ',"'.$item['start'].'"';
@@ -277,7 +277,7 @@
         print ',"'.$val.'"';
       }
       if ($bean->getAttribute('chunits')) print ',"'.$item['units'].'"';
-      if ($bean->getAttribute('chnote')) print ',"'.str_replace('"','""',$item['note']).'"';
+      if ($bean->getAttribute('chnote')) print ',"'.ttNeutralizeForCsv($item['note']).'"';
       if ($bean->getAttribute('chcost')) {
         if ($user->can('manage_invoices') || $user->isClient())
           print ',"'.$item['cost'].'"';
@@ -290,8 +290,8 @@
         $ip = $item['modified'] ? $item['modified_ip'].' '.$item['modified'] : $item['created_ip'].' '.$item['created'];
         print ',"'.$ip.'"';
       }
-      if ($bean->getAttribute('chinvoice')) print ',"'.str_replace('"','""',$item['invoice']).'"';
-      if ($bean->getAttribute('chtimesheet')) print ',"'.str_replace('"','""',$item['timesheet_name']).'"';
+      if ($bean->getAttribute('chinvoice')) print ',"'.ttNeutralizeForCsv($item['invoice']).'"';
+      if ($bean->getAttribute('chtimesheet')) print ',"'.ttNeutralizeForCsv($item['timesheet_name']).'"';
       print "\n";
     }
   }

From f4b122289fa6a551b389b0fd20a6dc9395648f7f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Oct 2020 21:57:31 +0000
Subject: [PATCH 1327/1848] Fixed adjusting today links to match user today.

---
 WEB-INF/lib/form/Calendar.class.php | 12 +-----------
 WEB-INF/templates/time_script.tpl   | 18 ++++++++++++++++++
 initialize.php                      |  2 +-
 time.php                            |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 1847b3fa8..d335e1503 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -186,21 +186,11 @@ function getHtml() {
     // Finished printing calendar table.
 
     // Print Today link.
-    $html .= "  <tr><td colspan=\"7\" align=\"center\"><a id=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
+    $html .= "  <tr><td colspan=\"7\" align=\"center\"><a class=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
     $html .= "</table>\n";
 
     // Add a hidden control for selected date.
     $html .= "<input type=\"hidden\" name=\"$this->name\" value=\"$selectedDate\">\n";
-
-    // Add script to adjust today link to match browser today, as PHP may run in a different timezone.
-    $html .= "<script>\n";
-    $html .= "function adjustToday() {\n";
-    $html .= "  var browser_today = new Date();\n";
-    $html .= "  document.getElementById('today_link').href = '?$this->name='+browser_today.strftime('".DB_DATEFORMAT."');\n";
-    $html .= "}\n";
-    $html .= "adjustToday();\n";
-    $html .= "</script>\n";
-
     $html .= "<!-- end of calendar -->\n\n";
     return $html;
   }
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 3d2013832..5834ba3cc 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -312,4 +312,22 @@ function get_time() {
   var date = new Date();
   return date.strftime("%H:%M");
 }
+
+// adjustTodayLinks adjusts today links to match today in user browser on load and also on click.
+function adjustTodayLinks() {
+  var today_links = document.getElementsByClassName("today_link");
+  var i;
+  var browser_today = new Date();
+  for (i = 0; i < today_links.length; i++) {
+    today_links[i].href = '?date='+browser_today.strftime("%Y-%m-%d");
+    today_links[i].onclick = function() {
+      var today = new Date();
+      var links = document.getElementsByClassName("today_link");
+      var j;
+      for (j = 0; j < links.length; j++) {
+        links[j].href = '?date='+today.strftime("%Y-%m-%d");
+      }
+    }
+  }
+}
 </script>
diff --git a/initialize.php b/initialize.php
index 93d019171..ac9207d8b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5325");
+define("APP_VERSION", "1.19.23.5326");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index e5d1275a1..af9df005f 100644
--- a/time.php
+++ b/time.php
@@ -505,7 +505,7 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
+$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();adjustTodayLinks()"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
 $smarty->assign('content_page_name', 'time2.tpl');

From 098297f74391fcb3df684f12151b6e09501c00f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Oct 2020 19:56:17 +0000
Subject: [PATCH 1328/1848] Recoded charts.php for mobile access.

---
 WEB-INF/templates/charts2.tpl |  79 ++++++++++++
 charts.php                    |  16 ++-
 charts1.php                   | 227 ++++++++++++++++++++++++++++++++++
 default.css                   |  31 +++++
 initialize.php                |   2 +-
 5 files changed, 349 insertions(+), 6 deletions(-)
 create mode 100644 WEB-INF/templates/charts2.tpl
 create mode 100644 charts1.php

diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts2.tpl
new file mode 100644
index 000000000..7a996a82b
--- /dev/null
+++ b/WEB-INF/templates/charts2.tpl
@@ -0,0 +1,79 @@
+<script>
+// adjustTodayLinks adjusts today links to match today in user browser on load and also on click.
+function adjustTodayLinks() {
+  var today_links = document.getElementsByClassName("today_link");
+  var i;
+  var browser_today = new Date();
+  for (i = 0; i < today_links.length; i++) {
+    today_links[i].href = '?date='+browser_today.strftime("%Y-%m-%d");
+    today_links[i].onclick = function() {
+      var today = new Date();
+      var links = document.getElementsByClassName("today_link");
+      var j;
+      for (j = 0; j < links.length; j++) {
+        links[j].href = '?date='+today.strftime("%Y-%m-%d");
+      }
+    }
+  }
+}
+</script>
+
+{$forms.chartForm.open}
+<div class="small-screen-calendar">{$forms.chartForm.date.control}</div>
+<table class="centered-table">
+  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
+{if $user_dropdown}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="interval">{$i18n.form.charts.interval}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="interval">{$i18n.form.charts.interval}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.interval.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $chart_selector}
+  <tr class = "small-screen-label"><td><label for="type">{$i18n.form.charts.chart}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="type">{$i18n.form.charts.chart}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.type.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+</table>
+
+<div class="chart">
+<table class="centered-table">
+  <tr>
+    <td><img class="chart-image" src="{$img_file_name}"></td>
+    <td class="large-screen-chart-list">
+      <table border="0" cellspacing="3">
+      {section name=i loop=$totals}
+      {if $smarty.section.i.index <= 12}
+        <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
+      {/if}
+      {/section}
+      </table>
+    </td>
+</table>
+</div>
+
+<div class="chart">
+<table class="centered-table">
+  <tr>
+    <td class="small-screen-chart-list">
+      <table border="0" cellspacing="3">
+      {section name=i loop=$totals}
+      {if $smarty.section.i.index <= 12}
+        <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
+      {/if}
+      {/section}
+      </table>
+    </td>
+</table>
+</div>
+{$forms.chartForm.close}
diff --git a/charts.php b/charts.php
index 942b5ce7b..6f5be7482 100644
--- a/charts.php
+++ b/charts.php
@@ -112,8 +112,9 @@
 
 // Elements of chartForm.
 $chart_form = new Form('chartForm');
+$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
-// User dropdown. Changes the user "on behalf" of whom we are working. 
+// User dropdown. Changes the user "on behalf" of whom we are working.
 if ($user->can('view_charts')) {
   $rank = $user->getMaxRankForGroup($user->getGroup());
   if ($user->can('view_own_charts'))
@@ -130,6 +131,7 @@
       'datakeys'=>array('id','name'),
     ));
     $chart_form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -149,6 +151,7 @@
   'value' => $cl_interval,
   'data' => $intervals
 ));
+$largeScreenCalendarRowSpan += 2;
 
 // Chart type options.
 $chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
@@ -168,6 +171,7 @@
     'value' => $cl_type,
     'data' => $types
   ));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Calendar.
@@ -196,13 +200,13 @@
 foreach($totals as $total) {
   $data_set->addPoint(new Point( $total['name'], $total['time']));
 }
-$chart->setDataSet($data_set); 
+$chart->setDataSet($data_set);
 
 // Prepare a file name.
 $img_dir = TEMPLATE_DIR.'_c/'; // Directory.
 $file_name = uniqid('chart_').'.png'; // Short file name. Unique ID here is to avoid problems with browser caching.
 $img_ref = 'WEB-INF/templates_c/'.$file_name; // Image reference for html.
-$file_name = $img_dir.$file_name; // Full file name. 
+$file_name = $img_dir.$file_name; // Full file name.
 
 // Clean up the file system from older images.
 $img_files = glob($img_dir.'chart_*.png');
@@ -219,9 +223,11 @@
 $chart->renderEx(array('fileName'=>$file_name,'hideLogo'=>true,'hideTitle'=>true,'hideLabel'=>true));
 // At this point libchart usage is complete and we have chart image on disk.
 
+$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('img_file_name', $img_ref);
 $smarty->assign('chart_selector', $chart_selector);
+$smarty->assign('onload', 'onLoad="adjustTodayLinks()"');
 $smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
 $smarty->assign('title', $i18n->get('title.charts'));
-$smarty->assign('content_page_name', 'charts.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'charts2.tpl');
+$smarty->display('index2.tpl');
diff --git a/charts1.php b/charts1.php
new file mode 100644
index 000000000..3b4ce15a1
--- /dev/null
+++ b/charts1.php
@@ -0,0 +1,227 @@
+<?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
+// +----------------------------------------------------------------------+
+
+// Note: This script uses Lichart PHP library and requires GD 2.0.1 or later.
+
+require_once('initialize.php');
+import('form.Form');
+import('DateAndTime');
+import('ttChartHelper');
+import('ttUserConfig');
+import('PieChartEx');
+import('ttUserHelper');
+import('ttTeamHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_charts') || ttAccessAllowed('view_charts'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ch')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // Nobody to display a chart for.
+  exit();
+}
+if ($user->behalf_id && (!$user->can('view_charts') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('view_own_charts') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
+  exit();
+}
+if ($request->isPost() && $request->getParameter('user')) {
+  if (!$user->isUserValid($request->getParameter('user'))) {
+    header('Location: access_denied.php'); // Wrong user id on post.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for which we display this page.
+$userChanged = $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+$uc = new ttUserConfig();
+$tracking_mode = $user->getTrackingMode();
+
+// Initialize and store date in session.
+$cl_date = $request->getParameter('date', @$_SESSION['date']);
+if(!$cl_date) {
+  $now = new DateAndTime(DB_DATEFORMAT);
+  $cl_date = $now->toString(DB_DATEFORMAT);
+}
+$_SESSION['date'] = $cl_date;
+
+if ($request->isPost()) {
+  $cl_interval = $request->getParameter('interval');
+  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+  $_SESSION['chart_interval'] = $cl_interval;
+  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+
+  $cl_type = $request->getParameter('type');
+  if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
+  $_SESSION['chart_type'] = $cl_type;
+  $uc->setValue(SYSC_CHART_TYPE, $cl_type);
+} else {
+  // Initialize chart interval.
+  $cl_interval = $_SESSION['chart_interval'];
+  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+  $_SESSION['chart_interval'] = $cl_interval;
+
+  // Initialize chart type.
+  $cl_type = $_SESSION['chart_type'];
+  if (!$cl_type) $cl_type = $uc->getValue(SYSC_CHART_TYPE);
+  $cl_type = ttChartHelper::adjustType($cl_type);
+  $_SESSION['chart_type'] = $cl_type;
+}
+
+// Elements of chartForm.
+$chart_form = new Form('chartForm');
+
+// User dropdown. Changes the user "on behalf" of whom we are working.
+if ($user->can('view_charts')) {
+  $rank = $user->getMaxRankForGroup($user->getGroup());
+  if ($user->can('view_own_charts'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
+    $chart_form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
+      'name'=>'user',
+      'value'=>$user_id,
+      'data'=>$user_list,
+      'datakeys'=>array('id','name'),
+    ));
+    $chart_form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
+  }
+}
+
+// Chart interval options.
+$intervals = array();
+$intervals[INTERVAL_THIS_DAY] = $i18n->get('dropdown.selected_day');
+$intervals[INTERVAL_THIS_WEEK] = $i18n->get('dropdown.selected_week');
+$intervals[INTERVAL_THIS_MONTH] = $i18n->get('dropdown.selected_month');
+$intervals[INTERVAL_THIS_YEAR] = $i18n->get('dropdown.selected_year');
+$intervals[INTERVAL_ALL_TIME] = $i18n->get('dropdown.all_time');
+
+// Chart interval dropdown.
+$chart_form->addInput(array('type' => 'combobox',
+  'onchange' => 'this.form.submit();',
+  'name' => 'interval',
+  'value' => $cl_interval,
+  'data' => $intervals
+));
+
+// Chart type options.
+$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
+if ($chart_selector) {
+  $types = array();
+  if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
+    $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
+  if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
+    $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
+  if ($user->isPluginEnabled('cl'))
+    $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
+
+  // Add chart type dropdown.
+  $chart_form->addInput(array('type' => 'combobox',
+    'onchange' => 'this.form.submit();',
+    'name' => 'type',
+    'value' => $cl_type,
+    'data' => $types
+  ));
+}
+
+// Calendar.
+$chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
+
+// Get data for our chart.
+$totals = ttChartHelper::getTotals($user_id, $cl_type, $cl_date, $cl_interval);
+$smarty->assign('totals', $totals);
+
+// Prepare chart for drawing.
+/*
+ * We use libchart.php library to draw chart images. It can draw chart labels, too (embed in the image).
+ * But quality of such auto-scaled text is not good. Therefore, we only use libchart to draw a pie-chart picture with
+ * auto-calculated percentage markers around it. We print labels (to the side of the picture) ourselves,
+ * using the same colors libchart is using. For labels printout, the $totals array (which is used for picture points)
+ * is also passed to charts.tpl Smarty template.
+ *
+ * To make all of the above possible with only one database call to obtain $totals we have to print the chart image
+ * to a file here (see code below). Once the image is available as a .png file, the charts.tpl can render it.
+ *
+ * PieChartEx class is a little extension to libchart-provided PieChart class. It allows us to print the chart
+ * without title, logo, and labels.
+ */
+$chart = new PieChartEx(300, 300);
+$data_set = new XYDataSet();
+foreach($totals as $total) {
+  $data_set->addPoint(new Point( $total['name'], $total['time']));
+}
+$chart->setDataSet($data_set);
+
+// Prepare a file name.
+$img_dir = TEMPLATE_DIR.'_c/'; // Directory.
+$file_name = uniqid('chart_').'.png'; // Short file name. Unique ID here is to avoid problems with browser caching.
+$img_ref = 'WEB-INF/templates_c/'.$file_name; // Image reference for html.
+$file_name = $img_dir.$file_name; // Full file name.
+
+// Clean up the file system from older images.
+$img_files = glob($img_dir.'chart_*.png');
+if (is_array($img_files)) {
+  foreach($img_files as $file) {
+    // If file creation time is older than 1 minute, delete it.
+    if (filemtime($file) < (time() - 60)) {
+      unlink($file);
+    }
+  }
+}
+
+// Write chart image to file system.
+$chart->renderEx(array('fileName'=>$file_name,'hideLogo'=>true,'hideTitle'=>true,'hideLabel'=>true));
+// At this point libchart usage is complete and we have chart image on disk.
+
+$smarty->assign('img_file_name', $img_ref);
+$smarty->assign('chart_selector', $chart_selector);
+$smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
+$smarty->assign('title', $i18n->get('title.charts'));
+$smarty->assign('content_page_name', 'charts.tpl');
+$smarty->display('index.tpl');
diff --git a/default.css b/default.css
index 21488b480..3f737b048 100644
--- a/default.css
+++ b/default.css
@@ -180,6 +180,14 @@ div.page-hint {
   display: table-cell;
 }
 
+.large-screen-chart-list {
+  display: table-cell;
+}
+
+.small-screen-chart-list {
+  display: none;
+}
+
 .small-screen-label {
   text-align: left;
   display: none;
@@ -247,6 +255,21 @@ input.password-field {
   width: 237px;
 }
 
+.chart-image {
+  width: 300px;
+  height: 300px;
+}
+
+.chart-color-cell {
+  width: .4rem;
+  height: 1rem;
+}
+
+.chart-description-cell {
+  text-align: left;
+  padding-left: .25rem;
+}
+
 .small-screen-calendar {
   display: none;
   width: 210px;
@@ -320,6 +343,14 @@ input.password-field {
     display: none;
   }
 
+  .large-screen-chart-list {
+    display: none;
+  }
+
+  .small-screen-chart-list {
+    display: table-cell;
+  }
+
   .small-screen-label {
     display: block;
   }
diff --git a/initialize.php b/initialize.php
index ac9207d8b..afbc0c358 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5326");
+define("APP_VERSION", "1.19.23.5327");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9ee1e3c1cb8869d12dd786cc42d7d21e8a1a12ff Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Oct 2020 17:40:16 +0000
Subject: [PATCH 1329/1848] Changed software license to SSPL going forward.

---
 WEB-INF/templates/charts2.tpl |   4 +-
 initialize.php                |   2 +-
 license.txt                   | 179 +++++++++++++++++++++++++++++++---
 license_old.txt               |  20 ++++
 4 files changed, 188 insertions(+), 17 deletions(-)
 create mode 100644 license_old.txt

diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts2.tpl
index 7a996a82b..d3e8ffa0c 100644
--- a/WEB-INF/templates/charts2.tpl
+++ b/WEB-INF/templates/charts2.tpl
@@ -51,7 +51,7 @@ function adjustTodayLinks() {
   <tr>
     <td><img class="chart-image" src="{$img_file_name}"></td>
     <td class="large-screen-chart-list">
-      <table border="0" cellspacing="3">
+      <table>
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
         <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
@@ -66,7 +66,7 @@ function adjustTodayLinks() {
 <table class="centered-table">
   <tr>
     <td class="small-screen-chart-list">
-      <table border="0" cellspacing="3">
+      <table>
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
         <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
diff --git a/initialize.php b/initialize.php
index afbc0c358..bcd8c4fc8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -37,7 +37,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5327");
+define("APP_VERSION", "1.19.23.5328");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/license.txt b/license.txt
index eaa424c64..5c63aca6f 100644
--- a/license.txt
+++ b/license.txt
@@ -1,20 +1,171 @@
-Anuko Time Tracker
+Server Side Public License
 
-Copyright Anuko International Ltd. (https://www.anuko.com)
+VERSION 1, OCTOBER 16, 2018
 
-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.
+Copyright © 2018 MongoDB, Inc.
 
-There are only two ways to violate the license:
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+TERMS AND CONDITIONS
+0. Definitions.
 
-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).
+“This License” refers to Server Side Public License.
 
-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).
+“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the Program.
+
+To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+1. Source Code.
+
+The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+
+A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program, subject to section 13. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+Subject to section 13, you may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+    b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+    c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+    d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+    b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+    c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+    d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+    e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+7. Additional Terms.
+
+“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+    b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+    c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+    d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+    e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+    f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+11. Patents.
+
+A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot use, propagate or convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not use, propagate or convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+13. Offering the Program as a Service.
+
+If you make the functionality of the Program or a modified version available to third parties as a service, you must make the Service Source Code available via network download to everyone at no charge, under the terms of this License. Making the functionality of the Program or modified version available to third parties as a service includes, without limitation, enabling third parties to interact with the functionality of the Program or modified version remotely through a computer network, offering a service the value of which entirely or primarily derives from the value of the Program or modified version, or offering a service that accomplishes for users the primary purpose of the Program or modified version.
+
+“Service Source Code” means the Corresponding Source for the Program or the modified version, and the Corresponding Source for all programs that you use to make the Program or modified version available as a service, including, without limitation, management software, user interfaces, application program interfaces, automation software, monitoring software, backup software, storage software and hosting software, all such that a user could run an instance of the service using the Service Source Code you make available.
+14. Revised Versions of this License.
+
+MongoDB, Inc. may publish revised and/or new versions of the Server Side Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the Server Side Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by MongoDB, Inc. If the Program does not specify a version number of the Server Side Public License, you may choose any version ever published by MongoDB, Inc.
+
+If the Program specifies that a proxy can decide which future versions of the Server Side Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
 
-This license applies to this document only, not any other software that it
-may be combined with. 
diff --git a/license_old.txt b/license_old.txt
new file mode 100644
index 000000000..115ac2c43
--- /dev/null
+++ b/license_old.txt
@@ -0,0 +1,20 @@
+Anuko Time Tracker
+
+Copyright 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.

From aa895eb7dcfa199a1bf939408a77b24b82e7c82c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Oct 2020 20:45:44 +0000
Subject: [PATCH 1330/1848] Cosmetic style improvements on charts.php.

---
 WEB-INF/templates/charts2.tpl |  7 +++++--
 charts.php                    | 28 ++--------------------------
 default.css                   | 34 ++++++----------------------------
 3 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts2.tpl
index d3e8ffa0c..d79ac852f 100644
--- a/WEB-INF/templates/charts2.tpl
+++ b/WEB-INF/templates/charts2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+License: See license.txt *}
+
 <script>
 // adjustTodayLinks adjusts today links to match today in user browser on load and also on click.
 function adjustTodayLinks() {
@@ -51,7 +54,7 @@ function adjustTodayLinks() {
   <tr>
     <td><img class="chart-image" src="{$img_file_name}"></td>
     <td class="large-screen-chart-list">
-      <table>
+      <table class="chart-list">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
         <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
@@ -66,7 +69,7 @@ function adjustTodayLinks() {
 <table class="centered-table">
   <tr>
     <td class="small-screen-chart-list">
-      <table>
+      <table class="chart-list">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
         <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
diff --git a/charts.php b/charts.php
index 6f5be7482..2240e1412 100644
--- a/charts.php
+++ b/charts.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+License: See license.txt */
 
 // Note: This script uses Lichart PHP library and requires GD 2.0.1 or later.
 
diff --git a/default.css b/default.css
index 3f737b048..06420e754 100644
--- a/default.css
+++ b/default.css
@@ -1,31 +1,5 @@
-/*
-// +----------------------------------------------------------------------+
-// | 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
-// +----------------------------------------------------------------------+
-*/
+/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+License: See license.txt */
 
 body {
   margin: 0px;
@@ -141,6 +115,10 @@ div.page-hint {
   display: inline-block;
 }
 
+.chart-list {
+  border-spacing: .2rem;
+}
+
 .record-list {
   margin: 1rem;
 }

From 0332941d3ee88e1ec02f6e5c10e92ef6a3fc9953 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Oct 2020 14:10:49 +0000
Subject: [PATCH 1331/1848] Removed deprecated function call and related code.

---
 WEB-INF/lib/common.lib.php | 42 ++------------------------------------
 initialize.php             | 34 +++---------------------------
 2 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index e4d4a38f9..7b0370b82 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+License: See license.txt */
 
 // import() function loads a class.
 function import($class_name) {
@@ -105,13 +81,6 @@ function toFloat($value) {
 		return null;
 	}
 
-	function stripslashes_deep($value) {
-	    $value = is_array($value) ?
-                array_map('stripslashes_deep', $value) :
-                stripslashes($value);
-    	return $value;
-	}
-
 	function &getConnection() {
         if (!isset($GLOBALS["_MDB2_CONNECTION"])) {
 
@@ -143,13 +112,6 @@ function time_to_decimal($val) {
   return $decimalTime;
 }
 
-function magic_quotes_off()
-{
-  $_POST = array_map('stripslashes_deep', $_POST);
-  $_GET = array_map('stripslashes_deep', $_GET);
-  $_COOKIE = array_map('stripslashes_deep', $_COOKIE);
-}
-
 // check_extension checks whether a required PHP extension is loaded and dies if not so.
 function check_extension($ext)
 {
diff --git a/initialize.php b/initialize.php
index bcd8c4fc8..33bd5a7a5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+License: See license.txt */
 
 // Report all errors except E_NOTICE and E_STRICT.
 // Ignoring E_STRICT is here because PEAR 1.9.4 that we use is not E_STRICT compliant.
@@ -37,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5328");
+define("APP_VERSION", "1.19.23.5329");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
@@ -135,10 +111,6 @@
 
 date_default_timezone_set(@date_default_timezone_get());
 
-// Strip auto-inserted extra slashes when magic_quotes ON for PHP versions prior to 5.4.0.
-if (get_magic_quotes_gpc())
-  magic_quotes_off();
-
 // Initialize global objects that are needed for the application.
 import('html.HttpRequest');
 $request = new ttHttpRequest();

From 477c9b98be927794fc43444dd454a57486054788 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Oct 2020 14:16:52 +0000
Subject: [PATCH 1332/1848] Cosmetic.

---
 WEB-INF/lib/common.lib.php    |  2 +-
 WEB-INF/templates/charts2.tpl |  2 +-
 charts.php                    |  2 +-
 default.css                   |  2 +-
 initialize.php                |  4 ++--
 license_old.txt               | 20 --------------------
 6 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 license_old.txt

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 7b0370b82..389b29c94 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
 // import() function loads a class.
diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts2.tpl
index d79ac852f..7f4c3844a 100644
--- a/WEB-INF/templates/charts2.tpl
+++ b/WEB-INF/templates/charts2.tpl
@@ -1,4 +1,4 @@
-{* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt *}
 
 <script>
diff --git a/charts.php b/charts.php
index 2240e1412..d4fb52b3b 100644
--- a/charts.php
+++ b/charts.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
 // Note: This script uses Lichart PHP library and requires GD 2.0.1 or later.
diff --git a/default.css b/default.css
index 06420e754..278305591 100644
--- a/default.css
+++ b/default.css
@@ -1,4 +1,4 @@
-/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
 body {
diff --git a/initialize.php b/initialize.php
index 33bd5a7a5..cf84accde 100644
--- a/initialize.php
+++ b/initialize.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (c) Anuko International Ltd. (https://www.anuko.com
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
 // Report all errors except E_NOTICE and E_STRICT.
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5329");
+define("APP_VERSION", "1.19.23.5330");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/license_old.txt b/license_old.txt
deleted file mode 100644
index 115ac2c43..000000000
--- a/license_old.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Anuko Time Tracker
-
-Copyright 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.

From 9be324c50db75600eb2f45df2801c6cc210a6648 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Oct 2020 15:32:08 +0000
Subject: [PATCH 1333/1848] Added a workaround into embedded MDB2 code to get
 rid of PHP warnings.

---
 WEB-INF/lib/pear/MDB2.php | 8 +++++---
 initialize.php            | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/pear/MDB2.php b/WEB-INF/lib/pear/MDB2.php
index 45c0802df..24dd84d21 100644
--- a/WEB-INF/lib/pear/MDB2.php
+++ b/WEB-INF/lib/pear/MDB2.php
@@ -823,9 +823,11 @@ static function parseDSN($dsn)
             $parsed['dbsyntax'] = $str;
         }
 
-        if (!count($dsn)) {
-            return $parsed;
-        }
+        if (is_array($dsn) || $dsn instanceof Countable) { // Added by Nik on Oct 19, 2020 to avoid flooding logs with warnings.
+            if (!count($dsn)) {
+                return $parsed;
+            }
+        } // Ideally, this should be fixed in MDB2 package.
 
         // Get (if found): username and password
         // $dsn => username:password@protocol+hostspec/database
diff --git a/initialize.php b/initialize.php
index cf84accde..04c61f5a5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -7,13 +7,13 @@
 if (!defined('E_STRICT')) define('E_STRICT', 2048);
 // if (!defined('E_DEPRECATED')) define('E_DEPRECATED', 8192);
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT); // & ~E_DEPRECATED);
-// E_ALL tends to change as PHP evloves, therefore we use & here instead of exclusive OR (^).
+// E_ALL tends to change as PHP evolves, therefore we use & here instead of exclusive OR (^).
 
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5330");
+define("APP_VERSION", "1.19.23.5331");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From adb2b6280c8d14d37980785bdf4892ea180a8a32 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Oct 2020 20:25:58 +0000
Subject: [PATCH 1334/1848] Updated smarty to version 3.1.36 to get rid of a
 PHP warning.

---
 WEB-INF/lib/smarty/Autoloader.php             |  110 +
 WEB-INF/lib/smarty/Smarty.class.php           | 2042 ++++--
 WEB-INF/lib/smarty/SmartyBC.class.php         |  477 ++
 WEB-INF/lib/smarty/bootstrap.php              |   16 +
 WEB-INF/lib/smarty/debug.tpl                  |  283 +-
 WEB-INF/lib/smarty/plugins/block.php.php      |   27 -
 .../lib/smarty/plugins/block.textformat.php   |  125 +-
 .../lib/smarty/plugins/function.counter.php   |   84 +-
 WEB-INF/lib/smarty/plugins/function.cycle.php |  124 +-
 WEB-INF/lib/smarty/plugins/function.fetch.php |  348 +-
 .../plugins/function.html_checkboxes.php      |  301 +-
 .../smarty/plugins/function.html_image.php    |  175 +-
 .../smarty/plugins/function.html_options.php  |  231 +-
 .../smarty/plugins/function.html_radios.php   |  272 +-
 .../plugins/function.html_select_date.php     |  526 +-
 .../plugins/function.html_select_time.php     |  450 +-
 .../smarty/plugins/function.html_table.php    |  149 +-
 .../lib/smarty/plugins/function.mailto.php    |  177 +-
 WEB-INF/lib/smarty/plugins/function.math.php  |  119 +-
 .../smarty/plugins/modifier.capitalize.php    |  156 +-
 .../smarty/plugins/modifier.date_format.php   |   88 +-
 .../plugins/modifier.debug_print_var.php      |  124 +-
 .../lib/smarty/plugins/modifier.escape.php    |  276 +-
 .../smarty/plugins/modifier.mb_wordwrap.php   |   71 +
 .../smarty/plugins/modifier.regex_replace.php |   59 +-
 .../lib/smarty/plugins/modifier.replace.php   |   44 +-
 .../lib/smarty/plugins/modifier.spacify.php   |   43 +-
 .../lib/smarty/plugins/modifier.truncate.php  |   87 +-
 .../smarty/plugins/modifiercompiler.cat.php   |   23 +-
 .../modifiercompiler.count_characters.php     |   43 +-
 .../modifiercompiler.count_paragraphs.php     |   21 +-
 .../modifiercompiler.count_sentences.php      |   21 +-
 .../plugins/modifiercompiler.count_words.php  |   42 +-
 .../plugins/modifiercompiler.default.php      |   37 +-
 .../plugins/modifiercompiler.escape.php       |  112 +
 .../plugins/modifiercompiler.from_charset.php |   30 +
 .../plugins/modifiercompiler.indent.php       |   36 +-
 .../smarty/plugins/modifiercompiler.lower.php |   36 +-
 .../plugins/modifiercompiler.noprint.php      |   16 +-
 .../modifiercompiler.string_format.php        |   26 +-
 .../smarty/plugins/modifiercompiler.strip.php |   33 +-
 .../plugins/modifiercompiler.strip_tags.php   |   32 +-
 .../plugins/modifiercompiler.to_charset.php   |   30 +
 .../plugins/modifiercompiler.unescape.php     |   44 +
 .../smarty/plugins/modifiercompiler.upper.php |   32 +-
 .../plugins/modifiercompiler.wordwrap.php     |   50 +-
 .../plugins/outputfilter.trimwhitespace.php   |  136 +-
 .../plugins/shared.escape_special_chars.php   |   27 +-
 .../plugins/shared.literal_compiler_param.php |   35 +
 .../smarty/plugins/shared.make_timestamp.php  |   44 +-
 .../smarty/plugins/shared.mb_str_replace.php  |   87 +-
 .../lib/smarty/plugins/shared.mb_unicode.php  |   51 +
 .../variablefilter.htmlspecialchars.php       |   21 +-
 .../sysplugins/smarty_cacheresource.php       |  219 +
 .../smarty_cacheresource_custom.php           |  297 +
 .../smarty_cacheresource_keyvaluestore.php    |  538 ++
 WEB-INF/lib/smarty/sysplugins/smarty_data.php |   68 +
 .../sysplugins/smarty_internal_block.php      |   90 +
 .../smarty_internal_cacheresource_file.php    |  368 +-
 .../smarty_internal_compile_append.php        |   50 +-
 .../smarty_internal_compile_assign.php        |  114 +-
 .../smarty_internal_compile_block.php         |  318 +-
 .../smarty_internal_compile_block_child.php   |   24 +
 .../smarty_internal_compile_block_parent.php  |   31 +
 .../smarty_internal_compile_break.php         |  136 +-
 .../smarty_internal_compile_call.php          |  123 +-
 .../smarty_internal_compile_capture.php       |  124 +-
 .../smarty_internal_compile_child.php         |   79 +
 .../smarty_internal_compile_config_load.php   |  112 +-
 .../smarty_internal_compile_continue.php      |   67 +-
 .../smarty_internal_compile_debug.php         |   42 +-
 .../smarty_internal_compile_eval.php          |   73 +-
 .../smarty_internal_compile_extends.php       |  202 +-
 .../smarty_internal_compile_for.php           |  205 +-
 .../smarty_internal_compile_foreach.php       |  478 +-
 .../smarty_internal_compile_function.php      |  303 +-
 .../sysplugins/smarty_internal_compile_if.php |  294 +-
 .../smarty_internal_compile_include.php       |  459 +-
 .../smarty_internal_compile_include_php.php   |  144 +-
 .../smarty_internal_compile_insert.php        |  168 +-
 .../smarty_internal_compile_ldelim.php        |   40 +-
 .../smarty_internal_compile_make_nocache.php  |   62 +
 .../smarty_internal_compile_nocache.php       |   80 +-
 .../smarty_internal_compile_parent.php        |   31 +
 ..._internal_compile_private_block_plugin.php |  152 +-
 ...nternal_compile_private_foreachsection.php |  228 +
 ...ternal_compile_private_function_plugin.php |   82 +-
 ...arty_internal_compile_private_modifier.php |  189 +-
 ..._compile_private_object_block_function.php |   92 +-
 ...ternal_compile_private_object_function.php |  112 +-
 .../smarty_internal_compile_private_php.php   |  253 +
 ...ernal_compile_private_print_expression.php |  198 +-
 ...ernal_compile_private_registered_block.php |  129 +-
 ...al_compile_private_registered_function.php |  102 +-
 ...ernal_compile_private_special_variable.php |  191 +-
 .../smarty_internal_compile_rdelim.php        |   39 +-
 .../smarty_internal_compile_section.php       |  535 +-
 .../smarty_internal_compile_setfilter.php     |   68 +
 ...ty_internal_compile_shared_inheritance.php |   49 +
 .../smarty_internal_compile_while.php         |  148 +-
 .../smarty_internal_compilebase.php           |  233 +-
 .../sysplugins/smarty_internal_config.php     |  288 -
 .../smarty_internal_config_file_compiler.php  |  225 +-
 .../smarty_internal_configfilelexer.php       |  791 ++-
 .../smarty_internal_configfileparser.php      | 1268 ++--
 .../sysplugins/smarty_internal_data.php       |  629 +-
 .../sysplugins/smarty_internal_debug.php      |  585 +-
 .../smarty_internal_errorhandler.php          |  113 +
 .../smarty_internal_extension_handler.php     |  197 +
 .../sysplugins/smarty_internal_filter.php     |   89 -
 .../smarty_internal_filter_handler.php        |   67 -
 .../smarty_internal_function_call_handler.php |   40 -
 .../smarty_internal_get_include_path.php      |   44 -
 ...rty_internal_method_addautoloadfilters.php |   53 +
 ...ty_internal_method_adddefaultmodifiers.php |   42 +
 .../smarty_internal_method_append.php         |   74 +
 .../smarty_internal_method_appendbyref.php    |   49 +
 .../smarty_internal_method_assignbyref.php    |   36 +
 .../smarty_internal_method_assignglobal.php   |   44 +
 .../smarty_internal_method_clearallassign.php |   36 +
 .../smarty_internal_method_clearallcache.php  |   41 +
 .../smarty_internal_method_clearassign.php    |   43 +
 .../smarty_internal_method_clearcache.php     |   50 +
 ..._internal_method_clearcompiledtemplate.php |  131 +
 .../smarty_internal_method_clearconfig.php    |   41 +
 ...marty_internal_method_compileallconfig.php |   36 +
 ...ty_internal_method_compilealltemplates.php |  130 +
 .../smarty_internal_method_configload.php     |  182 +
 .../smarty_internal_method_createdata.php     |   44 +
 ...rty_internal_method_getautoloadfilters.php |   37 +
 ...arty_internal_method_getconfigvariable.php |   34 +
 .../smarty_internal_method_getconfigvars.php  |   58 +
 ...marty_internal_method_getdebugtemplate.php |   35 +
 ...ty_internal_method_getdefaultmodifiers.php |   35 +
 .../smarty_internal_method_getglobal.php      |   47 +
 ...ty_internal_method_getregisteredobject.php |   44 +
 ...arty_internal_method_getstreamvariable.php |   50 +
 .../smarty_internal_method_gettags.php        |   63 +
 ...smarty_internal_method_gettemplatevars.php |  119 +
 .../smarty_internal_method_literals.php       |  100 +
 .../smarty_internal_method_loadfilter.php     |   77 +
 .../smarty_internal_method_loadplugin.php     |  111 +
 .../smarty_internal_method_mustcompile.php    |   50 +
 ..._internal_method_registercacheresource.php |   42 +
 .../smarty_internal_method_registerclass.php  |   46 +
 ...al_method_registerdefaultconfighandler.php |   42 +
 ...al_method_registerdefaultpluginhandler.php |   43 +
 ..._method_registerdefaulttemplatehandler.php |   88 +
 .../smarty_internal_method_registerfilter.php |   87 +
 .../smarty_internal_method_registerobject.php |   84 +
 .../smarty_internal_method_registerplugin.php |   58 +
 ...marty_internal_method_registerresource.php |   46 +
 ...rty_internal_method_setautoloadfilters.php |   72 +
 ...marty_internal_method_setdebugtemplate.php |   41 +
 ...ty_internal_method_setdefaultmodifiers.php |   38 +
 .../smarty_internal_method_unloadfilter.php   |   43 +
 ...nternal_method_unregistercacheresource.php |   40 +
 ...marty_internal_method_unregisterfilter.php |   43 +
 ...marty_internal_method_unregisterobject.php |   40 +
 ...marty_internal_method_unregisterplugin.php |   41 +
 ...rty_internal_method_unregisterresource.php |   40 +
 .../smarty_internal_nocache_insert.php        |   54 +-
 .../sysplugins/smarty_internal_parsetree.php  |  264 +-
 .../smarty_internal_parsetree_code.php        |   42 +
 .../smarty_internal_parsetree_dq.php          |   95 +
 .../smarty_internal_parsetree_dqcontent.php   |   42 +
 .../smarty_internal_parsetree_tag.php         |   67 +
 .../smarty_internal_parsetree_template.php    |  169 +
 .../smarty_internal_parsetree_text.php        |   57 +
 .../sysplugins/smarty_internal_register.php   |  156 -
 .../smarty_internal_resource_eval.php         |  137 +-
 .../smarty_internal_resource_extends.php      |  242 +-
 .../smarty_internal_resource_file.php         |  254 +-
 .../smarty_internal_resource_php.php          |  181 +-
 .../smarty_internal_resource_registered.php   |  190 +-
 .../smarty_internal_resource_stream.php       |  139 +-
 .../smarty_internal_resource_string.php       |  185 +-
 .../smarty_internal_runtime_cachemodify.php   |   68 +
 ...rty_internal_runtime_cacheresourcefile.php |  139 +
 .../smarty_internal_runtime_capture.php       |  174 +
 .../smarty_internal_runtime_codeframe.php     |  100 +
 .../smarty_internal_runtime_filterhandler.php |   69 +
 .../smarty_internal_runtime_foreach.php       |  162 +
 ...smarty_internal_runtime_getincludepath.php |  181 +
 .../smarty_internal_runtime_inheritance.php   |  251 +
 .../smarty_internal_runtime_make_nocache.php  |   54 +
 .../smarty_internal_runtime_tplfunction.php   |  177 +
 .../smarty_internal_runtime_updatecache.php   |  183 +
 .../smarty_internal_runtime_updatescope.php   |  115 +
 .../smarty_internal_runtime_writefile.php     |  100 +
 ...smarty_internal_smartytemplatecompiler.php |  194 +-
 .../sysplugins/smarty_internal_template.php   | 1524 ++---
 .../smarty_internal_templatebase.php          |  386 ++
 .../smarty_internal_templatecompilerbase.php  | 2031 +++++-
 .../smarty_internal_templatelexer.php         | 1603 +++--
 .../smarty_internal_templateparser.php        | 6013 +++++++++--------
 .../smarty_internal_testinstall.php           |  609 ++
 .../sysplugins/smarty_internal_undefined.php  |   67 +
 .../sysplugins/smarty_internal_utility.php    |  300 -
 .../sysplugins/smarty_internal_wrapper.php    |  131 -
 .../sysplugins/smarty_internal_write_file.php |   56 -
 .../lib/smarty/sysplugins/smarty_resource.php |  262 +
 .../sysplugins/smarty_resource_custom.php     |   93 +
 .../sysplugins/smarty_resource_recompiled.php |   94 +
 .../sysplugins/smarty_resource_uncompiled.php |   49 +
 .../lib/smarty/sysplugins/smarty_security.php |  744 +-
 .../sysplugins/smarty_template_cached.php     |  257 +
 .../sysplugins/smarty_template_compiled.php   |  257 +
 .../sysplugins/smarty_template_config.php     |  100 +
 .../smarty_template_resource_base.php         |  152 +
 .../sysplugins/smarty_template_source.php     |  213 +
 .../sysplugins/smarty_undefined_variable.php  |   33 +
 .../lib/smarty/sysplugins/smarty_variable.php |   47 +
 .../sysplugins/smartycompilerexception.php    |   45 +
 .../lib/smarty/sysplugins/smartyexception.php |   19 +
 215 files changed, 28955 insertions(+), 13721 deletions(-)
 create mode 100644 WEB-INF/lib/smarty/Autoloader.php
 create mode 100644 WEB-INF/lib/smarty/SmartyBC.class.php
 create mode 100644 WEB-INF/lib/smarty/bootstrap.php
 delete mode 100644 WEB-INF/lib/smarty/plugins/block.php.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.from_charset.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.to_charset.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
 create mode 100644 WEB-INF/lib/smarty/plugins/shared.literal_compiler_param.php
 create mode 100644 WEB-INF/lib/smarty/plugins/shared.mb_unicode.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_custom.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_data.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_block.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_child.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_parent.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_child.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_make_nocache.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_parent.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_shared_inheritance.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_config.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_filter.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_filter_handler.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_get_include_path.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_addautoloadfilters.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_adddefaultmodifiers.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignbyref.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignglobal.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compileallconfig.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compilealltemplates.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getautoloadfilters.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvariable.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdebugtemplate.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdefaultmodifiers.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getglobal.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getstreamvariable.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_literals.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setautoloadfilters.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdebugtemplate.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdefaultmodifiers.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_code.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dq.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_tag.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_register.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cachemodify.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cacheresourcefile.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_capture.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_filterhandler.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_foreach.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_getincludepath.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_inheritance.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_tplfunction.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatecache.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatescope.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_undefined.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_utility.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_wrapper.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_write_file.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_resource.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_resource_recompiled.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_resource_uncompiled.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_template_cached.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_template_compiled.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_template_config.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_template_resource_base.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_template_source.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_undefined_variable.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_variable.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
 create mode 100644 WEB-INF/lib/smarty/sysplugins/smartyexception.php

diff --git a/WEB-INF/lib/smarty/Autoloader.php b/WEB-INF/lib/smarty/Autoloader.php
new file mode 100644
index 000000000..c09361b66
--- /dev/null
+++ b/WEB-INF/lib/smarty/Autoloader.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ */
+
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ * @author  Uwe Tews
+ *             Usage:
+ *                  require_once '...path/Autoloader.php';
+ *                  Smarty_Autoloader::register();
+ *             or
+ *                  include '...path/bootstrap.php';
+ *
+ *                  $smarty = new Smarty();
+ */
+class Smarty_Autoloader
+{
+    /**
+     * Filepath to Smarty root
+     *
+     * @var string
+     */
+    public static $SMARTY_DIR = null;
+
+    /**
+     * Filepath to Smarty internal plugins
+     *
+     * @var string
+     */
+    public static $SMARTY_SYSPLUGINS_DIR = null;
+
+    /**
+     * Array with Smarty core classes and their filename
+     *
+     * @var array
+     */
+    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+
+    /**
+     * Registers Smarty_Autoloader backward compatible to older installations.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function registerBC($prepend = false)
+    {
+        /**
+         * register the class autoloader
+         */
+        if (!defined('SMARTY_SPL_AUTOLOAD')) {
+            define('SMARTY_SPL_AUTOLOAD', 0);
+        }
+        if (SMARTY_SPL_AUTOLOAD
+            && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+        ) {
+            $registeredAutoLoadFunctions = spl_autoload_functions();
+            if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) {
+                spl_autoload_register();
+            }
+        } else {
+            self::register($prepend);
+        }
+    }
+
+    /**
+     * Registers Smarty_Autoloader as an SPL autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
+            self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
+        }
+    }
+
+    /**
+     * Handles auto loading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
+            return;
+        }
+        $_class = strtolower($class);
+        if (isset(self::$rootClasses[ $_class ])) {
+            $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
+            if (is_file($file)) {
+                include $file;
+            }
+        } else {
+            $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+            if (is_file($file)) {
+                include $file;
+            }
+        }
+        return;
+    }
+}
diff --git a/WEB-INF/lib/smarty/Smarty.class.php b/WEB-INF/lib/smarty/Smarty.class.php
index feb88171e..9e0ca7670 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -1,815 +1,1425 @@
 <?php
-
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 3895 2010-12-31 13:47:12Z uwe.tews@googlemail.com $
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
- * 
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
- * @package Smarty
- * @version 3.0.7
- */
-
-/**
- * define shorthand directory separator constant
+ *
+ * @link      http://www.smarty.net/
+ * @copyright 2018 New Digital Group, Inc.
+ * @copyright 2018 Uwe Tews
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews   <uwe dot tews at gmail dot com>
+ * @author    Rodney Rehm
+ * @package   Smarty
+ * @version   3.1.34-dev
  */
-if (!defined('DS')) {
-    define('DS', DIRECTORY_SEPARATOR);
-} 
-
 /**
  * set SMARTY_DIR to absolute path to Smarty library files.
  * Sets SMARTY_DIR only if user application has not already defined it.
  */
 if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DS);
-} 
-
+    /**
+     *
+     */
+    define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+}
 /**
  * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
  * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
  */
 if (!defined('SMARTY_SYSPLUGINS_DIR')) {
-    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
-} 
+    /**
+     *
+     */
+    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR);
+}
 if (!defined('SMARTY_PLUGINS_DIR')) {
-    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
-} 
+    /**
+     *
+     */
+    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DIRECTORY_SEPARATOR);
+}
+if (!defined('SMARTY_MBSTRING')) {
+    /**
+     *
+     */
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
+}
 if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    define('SMARTY_RESOURCE_CHAR_SET', 'UTF-8');
-} 
+    // UTF-8 can only be done properly when mbstring is available!
+    /**
+     * @deprecated in favor of Smarty::$_CHARSET
+     */
+    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+}
 if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
+    /**
+     * @deprecated in favor of Smarty::$_DATE_FORMAT
+     */
     define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-} 
-
+}
+/**
+ * Load Smarty_Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+    include dirname(__FILE__) . '/bootstrap.php';
+}
 /**
- * register the class autoloader
+ * Load always needed external class files
  */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-} 
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
-    } 
-} else {
-    spl_autoload_register('smartyAutoload');
-} 
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
 
 /**
  * This is the main Smarty class
+ *
+ * @package Smarty
+ *
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method int clearAllCache(int $exp_time = null, string $type = null)
+ * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
+ * @method int compileAllTemplates(string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
+ * @method int compileAllConfig(string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
+ * @method int clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
  */
-class Smarty extends Smarty_Internal_Data {
-	/**
-	* constant definitions
-	*/
-    // smarty version
-    const SMARTY_VERSION = 'Smarty-3.0.7'; 
-  	//define variable scopes
-	const SCOPE_LOCAL = 0;
-	const SCOPE_PARENT = 1;
-	const SCOPE_ROOT = 2;
-	const SCOPE_GLOBAL = 3;
-	// define caching modes
-	const CACHING_OFF = 0;
-	const CACHING_LIFETIME_CURRENT = 1;
-	const CACHING_LIFETIME_SAVED = 2;
-	/** modes for handling of "<?php ... ?>" tags in templates. **/
-	const PHP_PASSTHRU = 0; //-> print tags as plain text
-	const PHP_QUOTE = 1; //-> escape tags as entities
-	const PHP_REMOVE = 2; //-> escape tags as entities
-	const PHP_ALLOW = 3; //-> escape tags as entities
-	// filter types
-	const FILTER_POST = 'post';
-	const FILTER_PRE = 'pre';
-	const FILTER_OUTPUT = 'output';
-	const FILTER_VARIABLE = 'variable';
-	// plugin types
-	const PLUGIN_FUNCTION = 'function';
-	const PLUGIN_BLOCK = 'block';
-	const PLUGIN_COMPILER = 'compiler';
-	const PLUGIN_MODIFIER = 'modifier';
-
-	/**
-	* static variables
-	*/
-    // assigned global tpl vars
-    static $global_tpl_vars = array(); 
-
-	/**
-	* variables
-	*/
-    // auto literal on delimiters with whitspace
-    public $auto_literal = true; 
-    // display error on not assigned variables
-    public $error_unassigned = false; 
-    // template directory
-    public $template_dir = null; 
-    // default template handler
-    public $default_template_handler_func = null; 
-    // compile directory
-    public $compile_dir = null; 
-    // plugins directory
-    public $plugins_dir = null; 
-    // cache directory
-    public $cache_dir = null; 
-    // config directory
-    public $config_dir = null; 
-    // force template compiling?
-    public $force_compile = false; 
-    // check template for modifications?
-    public $compile_check = true; 
-    // locking concurrent compiles
-    public $compile_locking = true; 
-    // use sub dirs for compiled/cached files?
-    public $use_sub_dirs = false; 
-    // compile_error?
-    public $compile_error = false; 
-    // caching enabled
-    public $caching = false; 
-    // merge compiled includes
-    public $merge_compiled_includes = false; 
-    // cache lifetime
-    public $cache_lifetime = 3600; 
-    // force cache file creation
-    public $force_cache = false; 
-    // cache_id
-    public $cache_id = null; 
-    // compile_id
-    public $compile_id = null; 
-    // template delimiters
+class Smarty extends Smarty_Internal_TemplateBase
+{
+    /**
+     * smarty version
+     */
+    const SMARTY_VERSION = '3.1.36';
+    /**
+     * define variable scopes
+     */
+    const SCOPE_LOCAL    = 1;
+    const SCOPE_PARENT   = 2;
+    const SCOPE_TPL_ROOT = 4;
+    const SCOPE_ROOT     = 8;
+    const SCOPE_SMARTY   = 16;
+    const SCOPE_GLOBAL   = 32;
+    /**
+     * define caching modes
+     */
+    const CACHING_OFF              = 0;
+    const CACHING_LIFETIME_CURRENT = 1;
+    const CACHING_LIFETIME_SAVED   = 2;
+    /**
+     * define constant for clearing cache files be saved expiration dates
+     */
+    const CLEAR_EXPIRED = -1;
+    /**
+     * define compile check modes
+     */
+    const COMPILECHECK_OFF       = 0;
+    const COMPILECHECK_ON        = 1;
+    const COMPILECHECK_CACHEMISS = 2;
+    /**
+     * define debug modes
+     */
+    const DEBUG_OFF        = 0;
+    const DEBUG_ON         = 1;
+    const DEBUG_INDIVIDUAL = 2;
+    /**
+     * modes for handling of "<?php ... ?>" tags in templates.
+     */
+    const PHP_PASSTHRU = 0; //-> print tags as plain text
+    const PHP_QUOTE    = 1; //-> escape tags as entities
+    const PHP_REMOVE   = 2; //-> escape tags as entities
+    const PHP_ALLOW    = 3; //-> escape tags as entities
+    /**
+     * filter types
+     */
+    const FILTER_POST     = 'post';
+    const FILTER_PRE      = 'pre';
+    const FILTER_OUTPUT   = 'output';
+    const FILTER_VARIABLE = 'variable';
+    /**
+     * plugin types
+     */
+    const PLUGIN_FUNCTION         = 'function';
+    const PLUGIN_BLOCK            = 'block';
+    const PLUGIN_COMPILER         = 'compiler';
+    const PLUGIN_MODIFIER         = 'modifier';
+    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
+
+    /**
+     * assigned global tpl vars
+     */
+    public static $global_tpl_vars = array();
+
+    /**
+     * Flag denoting if Multibyte String functions are available
+     */
+    public static $_MBSTRING = SMARTY_MBSTRING;
+
+    /**
+     * The character set to adhere to (e.g. "UTF-8")
+     */
+    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+
+    /**
+     * The date format to be used internally
+     * (accepts date() and strftime())
+     */
+    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+
+    /**
+     * Flag denoting if PCRE should run in UTF-8 mode
+     */
+    public static $_UTF8_MODIFIER = 'u';
+
+    /**
+     * Flag denoting if operating system is windows
+     */
+    public static $_IS_WINDOWS = false;
+
+    /**
+     * auto literal on delimiters with whitespace
+     *
+     * @var boolean
+     */
+    public $auto_literal = true;
+
+    /**
+     * display error on not assigned variables
+     *
+     * @var boolean
+     */
+    public $error_unassigned = false;
+
+    /**
+     * look up relative file path in include_path
+     *
+     * @var boolean
+     */
+    public $use_include_path = false;
+
+    /**
+     * flag if template_dir is normalized
+     *
+     * @var bool
+     */
+    public $_templateDirNormalized = false;
+
+    /**
+     * joined template directory string used in cache keys
+     *
+     * @var string
+     */
+    public $_joined_template_dir = null;
+
+    /**
+     * flag if config_dir is normalized
+     *
+     * @var bool
+     */
+    public $_configDirNormalized = false;
+
+    /**
+     * joined config directory string used in cache keys
+     *
+     * @var string
+     */
+    public $_joined_config_dir = null;
+
+    /**
+     * default template handler
+     *
+     * @var callable
+     */
+    public $default_template_handler_func = null;
+
+    /**
+     * default config handler
+     *
+     * @var callable
+     */
+    public $default_config_handler_func = null;
+
+    /**
+     * default plugin handler
+     *
+     * @var callable
+     */
+    public $default_plugin_handler_func = null;
+
+    /**
+     * flag if template_dir is normalized
+     *
+     * @var bool
+     */
+    public $_compileDirNormalized = false;
+
+    /**
+     * flag if plugins_dir is normalized
+     *
+     * @var bool
+     */
+    public $_pluginsDirNormalized = false;
+
+    /**
+     * flag if template_dir is normalized
+     *
+     * @var bool
+     */
+    public $_cacheDirNormalized = false;
+
+    /**
+     * force template compiling?
+     *
+     * @var boolean
+     */
+    public $force_compile = false;
+
+    /**
+     * use sub dirs for compiled/cached files?
+     *
+     * @var boolean
+     */
+    public $use_sub_dirs = false;
+
+    /**
+     * allow ambiguous resources (that are made unique by the resource handler)
+     *
+     * @var boolean
+     */
+    public $allow_ambiguous_resources = false;
+
+    /**
+     * merge compiled includes
+     *
+     * @var boolean
+     */
+    public $merge_compiled_includes = false;
+
+    /*
+    * flag for behaviour when extends: resource  and {extends} tag are used simultaneous
+    *   if false disable execution of {extends} in templates called by extends resource.
+    *   (behaviour as versions < 3.1.28)
+    *
+    * @var boolean
+    */
+    public $extends_recursion = true;
+
+    /**
+     * force cache file creation
+     *
+     * @var boolean
+     */
+    public $force_cache = false;
+
+    /**
+     * template left-delimiter
+     *
+     * @var string
+     */
     public $left_delimiter = "{";
-    public $right_delimiter = "}"; 
-    // security
+
+    /**
+     * template right-delimiter
+     *
+     * @var string
+     */
+    public $right_delimiter = "}";
+
+    /**
+     * array of strings which shall be treated as literal by compiler
+     *
+     * @var array string
+     */
+    public $literals = array();
+
+    /**
+     * class name
+     * This should be instance of Smarty_Security.
+     *
+     * @var string
+     * @see Smarty_Security
+     */
     public $security_class = 'Smarty_Security';
+
+    /**
+     * implementation of security class
+     *
+     * @var Smarty_Security
+     */
     public $security_policy = null;
+
+    /**
+     * controls handling of PHP-blocks
+     *
+     * @var integer
+     */
     public $php_handling = self::PHP_PASSTHRU;
-    public $allow_php_tag = false;
+
+    /**
+     * controls if the php template file resource is allowed
+     *
+     * @var bool
+     */
     public $allow_php_templates = false;
-    public $direct_access_security = true; 
-    public $trusted_dir = array();
-    // debug mode
+
+    /**
+     * debug mode
+     * Setting this to true enables the debug-console.
+     *
+     * @var boolean
+     */
     public $debugging = false;
+
+    /**
+     * This determines if debugging is enable-able from the browser.
+     * <ul>
+     *  <li>NONE => no debugging control allowed</li>
+     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
+     * </ul>
+     *
+     * @var string
+     */
     public $debugging_ctrl = 'NONE';
+
+    /**
+     * Name of debugging URL-param.
+     * Only used when $debugging_ctrl is set to 'URL'.
+     * The name of the URL-parameter that activates debugging.
+     *
+     * @var string
+     */
     public $smarty_debug_id = 'SMARTY_DEBUG';
-    public $debug_tpl = null; 
-    // When set, smarty does uses this value as error_reporting-level.
-    public $error_reporting = null; 
-    // config var settings
-    public $config_overwrite = true; //Controls whether variables with the same name overwrite each other.
-    public $config_booleanize = true; //Controls whether config values of on/true/yes and off/false/no get converted to boolean
-    public $config_read_hidden = false; //Controls whether hidden config sections/vars are read from the file.                                                      
-    // config vars
-    public $config_vars = array(); 
-    // assigned tpl vars
-    public $tpl_vars = array(); 
-    // dummy parent object
-    public $parent = null; 
-    // global template functions
-    public $template_functions = array(); 
-    // resource type used if none given
-    public $default_resource_type = 'file'; 
-    // caching type
-    public $caching_type = 'file'; 
-    // internal cache resource types
-    public $cache_resource_types = array('file'); 
-    // internal config properties
-    public $properties = array(); 
-    // config type
-    public $default_config_type = 'file'; 
-    // cached template objects
-    public $template_objects = null; 
-    // check If-Modified-Since headers
-    public $cache_modified_check = false; 
-    // registered plugins
-    public $registered_plugins = array(); 
-    // plugin search order
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class'); 
-    // registered objects
-    public $registered_objects = array(); 
-    // registered classes
-    public $registered_classes = array(); 
-    // registered filters
-    public $registered_filters = array(); 
-    // registered resources
-    public $registered_resources = array(); 
-    // autoload filter
-    public $autoload_filters = array(); 
-    // status of filter on variable output
-    public $variable_filter = true; 
-    // default modifier
-    public $default_modifiers = array(); 
-    // global internal smarty  vars
-    static $_smarty_vars = array(); 
-    // start time for execution time calculation
-    public $start_time = 0; 
-    // default file permissions
-    public $_file_perms = 0644; 
-    // default dir permissions
-    public $_dir_perms = 0771; 
-    // block tag hierarchy
-    public $_tag_stack = array(); 
-    // flag if {block} tag is compiled for template inheritance
-    public $inheritance = false;
-    // generate deprecated function call notices?
-    public $deprecation_notices = true;
-    // Smarty 2 BC
-    public $_version = self::SMARTY_VERSION;
-    // self pointer to Smarty object
-    public $smarty;
-
-    /**
-     * Class constructor, initializes basic smarty properties
+
+    /**
+     * Path of debug template.
+     *
+     * @var string
      */
-    public function __construct()
-    { 
-		// selfpointer need by some other class methods
-		$this->smarty = $this;
-        if (is_callable('mb_internal_encoding')) {
-            mb_internal_encoding(SMARTY_RESOURCE_CHAR_SET);
-        } 
-        $this->start_time = microtime(true); 
-        // set default dirs
-        $this->template_dir = array('.' . DS . 'templates' . DS);
-        $this->compile_dir = '.' . DS . 'templates_c' . DS;
-        $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
-        $this->cache_dir = '.' . DS . 'cache' . DS;
-        $this->config_dir = '.' . DS . 'configs' . DS;
-        $this->debug_tpl = SMARTY_DIR . 'debug.tpl';
-        if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
-        } 
-    } 
-
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    { 
-    } 
-
-    /**
-     * fetches a rendered Smarty template
-     * 
-     * @param string $template the resource handle of the template file or template object
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $ |null $parent next higher level of Smarty variables
-     * @return string rendered template output
-     */
-    public function fetch($template, $cache_id = null, $compile_id = null, $parent = null, $display = false)
-    {
-        if (!empty($cache_id) && is_object($cache_id)) {
-            $parent = $cache_id;
-            $cache_id = null;
-        } 
-        if ($parent === null) {
-            // get default Smarty data object
-            $parent = $this;
-        } 
-        // create template object if necessary
-        ($template instanceof $this->template_class)? $_template = $template :
-        $_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent, false);
-        if (isset($this->error_reporting)) {
-        	$_smarty_old_error_level = error_reporting($this->error_reporting);
-    	}
-    	// check URL debugging control
-        if (!$this->debugging && $this->debugging_ctrl == 'URL') {
-            if (isset($_SERVER['QUERY_STRING'])) {
-                $_query_string = $_SERVER['QUERY_STRING'];
-            } else {
-                $_query_string = '';
-            } 
-            if (false !== strpos($_query_string, $this->smarty_debug_id)) {
-                if (false !== strpos($_query_string, $this->smarty_debug_id . '=on')) {
-                    // enable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', true);
-                    $this->debugging = true;
-                } elseif (false !== strpos($_query_string, $this->smarty_debug_id . '=off')) {
-                    // disable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', false);
-                    $this->debugging = false;
-                } else {
-                    // enable debugging for this page
-                    $this->debugging = true;
-                } 
-            } else {
-                if (isset($_COOKIE['SMARTY_DEBUG'])) {
-                    $this->debugging = true;
-                } 
-            } 
-        } 
-        // obtain data for cache modified check
-        if ($this->cache_modified_check && $this->caching && $display) {
-            $_isCached = $_template->isCached() && !$_template->has_nocache_code;
-            if ($_isCached) {
-                $_gmt_mtime = gmdate('D, d M Y H:i:s', $_template->getCachedTimestamp()) . ' GMT';
-            } else {
-                $_gmt_mtime = '';
-            } 
-        } 
-        // return rendered template
-        if ((!$this->caching || $_template->resource_object->isEvaluated) && (isset($this->autoload_filters['output']) || isset($this->registered_filters['output']))) {
-            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_template->getRenderedTemplate(), $_template);
-        } else {
-            $_output = $_template->getRenderedTemplate();
-        } 
-        $_template->rendered_content = null;
-        if (isset($this->error_reporting)) {
-        	error_reporting($_smarty_old_error_level);
-        } 
-        // display or fetch
-        if ($display) {
-            if ($this->caching && $this->cache_modified_check) {
-                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                if ($_isCached && $_gmt_mtime == $_last_modified_date) {
-                    if (php_sapi_name() == 'cgi')
-                        header('Status: 304 Not Modified');
-                    else
-                        header('HTTP/1.1 304 Not Modified');
-                } else {
-                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->getCachedTimestamp()) . ' GMT');
-                    echo $_output;
-                } 
-            } else {
-                echo $_output;
-            } 
-            // debug output
-            if ($this->debugging) {
-                Smarty_Internal_Debug::display_debug($this);
-            } 
-            return;
-        } else {
-            // return fetched content
-            return $_output;
-        } 
-    } 
+    public $debug_tpl = null;
 
     /**
-     * displays a Smarty template
-     * 
-     * @param string $ |object $template the resource handle of the template file  or template object
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
+     * When set, smarty uses this value as error_reporting-level.
+     *
+     * @var int
      */
-    public function display($template, $cache_id = null, $compile_id = null, $parent = null)
-    { 
-        // display template
-        $this->fetch ($template, $cache_id, $compile_id, $parent, true);
-    } 
+    public $error_reporting = null;
 
     /**
-     * test if cache i valid
-     * 
-     * @param string $ |object $template the resource handle of the template file or template object
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
-     * @return boolean cache status
+     * Controls whether variables with the same name overwrite each other.
+     *
+     * @var boolean
      */
-    public function isCached($template, $cache_id = null, $compile_id = null, $parent = null)
-    {
-    	if ($parent === null) {
-    		$parent = $this;
-    	}
-        if (!($template instanceof $this->template_class)) {
-            $template = $this->createTemplate ($template, $cache_id, $compile_id, $parent, false);
-        } 
-        // return cache status of template
-        return $template->isCached();
-    } 
+    public $config_overwrite = true;
 
     /**
-     * creates a data object
-     * 
-     * @param object $parent next higher level of Smarty variables
-     * @returns object data object
+     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+     *
+     * @var boolean
      */
-    public function createData($parent = null)
-    {
-        return new Smarty_Data($parent, $this);
-    } 
+    public $config_booleanize = true;
 
     /**
-     * creates a template object
-     * 
-     * @param string $template the resource handle of the template file
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
-     * @param boolean $do_clone flag is Smarty object shall be cloned
-     * @returns object template object
+     * Controls whether hidden config sections/vars are read from the file.
+     *
+     * @var boolean
      */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
-    {
-        if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        } 
-        if (!empty($parent) && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        } 
-        if (!is_object($template)) {
-            // we got a template resource
-            // already in template cache?
-            $_templateId =  sha1($template . $cache_id . $compile_id);
-            if (isset($this->template_objects[$_templateId]) && $this->caching) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-            } else {
-                // create new template object
-                if ($do_clone) {
-                	$tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
-                } else {
-                	$tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-                }
-            } 
-        } else {
-            // just return a copy of template class
-            $tpl = $template;
-        } 
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            } 
-        } 
-        return $tpl;
-    } 
-    
-     
+    public $config_read_hidden = false;
 
     /**
-     * Check if a template resource exists
-     * 
-     * @param string $resource_name template name
-     * @return boolean status
-     */
-    function templateExists($resource_name)
-    { 
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this); 
-        // check if it does exists
-        $result = $tpl->isExisting();
-        $this->template_objects = $save;
-        return $result;
-    } 
-
-    /**
-     * Returns a single or all global  variables
-     * 
-     * @param object $smarty 
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
-     */
-    function getGlobal($varname = null)
-    {
-        if (isset($varname)) {
-            if (isset(self::$global_tpl_vars[$varname])) {
-                return self::$global_tpl_vars[$varname]->value;
-            } else {
-                return '';
-            } 
-        } else {
-            $_result = array();
-            foreach (self::$global_tpl_vars AS $key => $var) {
-                $_result[$key] = $var->value;
-            } 
-            return $_result;
-        } 
-    } 
-
-    /**
-    * Empty cache folder
-    * 
-    * @param integer $exp_time expiration time
-    * @param string $type resource type
-    * @return integer number of cache files deleted
-    */
-    function clearAllCache($exp_time = null, $type = null)
-    { 
-       // load cache resource and call clearAll
-        return $this->loadCacheResource($type)->clearAll($exp_time);
-    }        
-
-    /**
-    * Empty cache for a specific template
-    * 
-    * @param string $template_name template name
-    * @param string $cache_id cache id
-    * @param string $compile_id compile id
-    * @param integer $exp_time expiration time
-    * @param string $type resource type
-    * @return integer number of cache files deleted
-    */
-    function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    { 
-       // load cache resource and call clear
-        return $this->loadCacheResource($type)->clear($template_name, $cache_id, $compile_id, $exp_time);
-    }
+     * locking concurrent compiles
+     *
+     * @var boolean
+     */
+    public $compile_locking = true;
 
     /**
-     * Loads security class and enables security
+     * Controls whether cache resources should use locking mechanism
+     *
+     * @var boolean
      */
-    public function enableSecurity($security_class = null)
-    {
-    	if ($security_class instanceof Smarty_Security) {
-			$this->security_policy = $security_class;
-			return;
-		}
-    	if ($security_class == null) {
-    		$security_class = $this->security_class;
-    	}
-        if (class_exists($security_class)) {
-            $this->security_policy = new $security_class($this);
-        } else {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } 
-    } 
+    public $cache_locking = false;
 
     /**
-     * Disable security
+     * seconds to wait for acquiring a lock before ignoring the write lock
+     *
+     * @var float
      */
-    public function disableSecurity()
-    {
-       $this->security_policy = null;
-    } 
+    public $locking_timeout = 10;
 
     /**
-    * Loads cache resource.
-    * 
-    * @param string $type cache resource type
-    * @return object of cache resource
-    */
-    public function loadCacheResource($type = null) {
-        if (!isset($type)) {
-            $type = $this->caching_type;
-        } 
-        if (in_array($type, $this->cache_resource_types)) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-            return new $cache_resource_class($this);
-        } 
-        else {
-            // try plugins dir
-            $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
-            if ($this->loadPlugin($cache_resource_class)) {
-                return new $cache_resource_class($this);
-            } 
-            else {
-                throw new SmartyException("Unable to load cache resource '{$type}'");
-            } 
-        } 
-    } 
+     * resource type used if none given
+     * Must be an valid key of $registered_resources.
+     *
+     * @var string
+     */
+    public $default_resource_type = 'file';
 
+    /**
+     * caching type
+     * Must be an element of $cache_resource_types.
+     *
+     * @var string
+     */
+    public $caching_type = 'file';
 
     /**
-     * Set template directory
-     * 
-     * @param string $ |array $template_dir folder(s) of template sorces
+     * config type
+     *
+     * @var string
      */
-    public function setTemplateDir($template_dir)
-    {
-        $this->template_dir = (array)$template_dir;
-        return;
-    } 
+    public $default_config_type = 'file';
 
     /**
-     * Adds template directory(s) to existing ones
-     * 
-     * @param string $ |array $template_dir folder(s) of template sources
+     * check If-Modified-Since headers
+     *
+     * @var boolean
      */
-    public function addTemplateDir($template_dir)
-    {
-        $this->template_dir = array_unique(array_merge((array)$this->template_dir, (array)$template_dir));
-        return;
-    } 
- 
+    public $cache_modified_check = false;
+
     /**
-     * Adds directory of plugin files
-     * 
-     * @param object $smarty 
-     * @param string $ |array $ plugins folder
-     * @return 
+     * registered plugins
+     *
+     * @var array
      */
-    function addPluginsDir($plugins_dir)
-    {
-        $this->plugins_dir = array_unique(array_merge((array)$this->plugins_dir, (array)$plugins_dir));
-        return;
-    } 
+    public $registered_plugins = array();
 
+    /**
+     * registered objects
+     *
+     * @var array
+     */
+    public $registered_objects = array();
 
     /**
-     * return a reference to a registered object
-     * 
-     * @param string $name object name
-     * @return object 
+     * registered classes
+     *
+     * @var array
      */
-    function getRegisteredObject($name)
-    {
-        if (!isset($this->registered_objects[$name]))
-            throw new SmartyException("'$name' is not a registered object");
+    public $registered_classes = array();
 
-        if (!is_object($this->registered_objects[$name][0]))
-            throw new SmartyException("registered '$name' is not an object");
+    /**
+     * registered filters
+     *
+     * @var array
+     */
+    public $registered_filters = array();
 
-        return $this->registered_objects[$name][0];
-    } 
+    /**
+     * registered resources
+     *
+     * @var array
+     */
+    public $registered_resources = array();
 
+    /**
+     * registered cache resources
+     *
+     * @var array
+     */
+    public $registered_cache_resources = array();
 
     /**
-     * return name of debugging template
-     * 
-     * @return string 
+     * autoload filter
+     *
+     * @var array
      */
-    function getDebugTemplate()
-    {
-        return $this->debug_tpl;
-    } 
+    public $autoload_filters = array();
 
     /**
-     * set the debug template
-     * 
-     * @param string $tpl_name 
-     * @return bool 
+     * default modifier
+     *
+     * @var array
      */
-    function setDebugTemplate($tpl_name)
-    {
-        return $this->debug_tpl = $tpl_name;
-    } 
+    public $default_modifiers = array();
 
     /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     * 
-     * @param string $plugin_name class plugin name to load
-     * @return string |boolean filepath of loaded file or false
+     * autoescape variable output
+     *
+     * @var boolean
      */
-    public function loadPlugin($plugin_name, $check = true)
-    { 
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false)))
-            return true; 
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_plugin_name = strtolower($plugin_name);
-        $_name_parts = explode('_', $_plugin_name, 3); 
-        // class name must have three parts to be valid plugin
-        if (count($_name_parts) < 3 || $_name_parts[0] !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-            return false;
-        } 
-        // if type is "internal", get plugin from sysplugins
-        if ($_name_parts[1] == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . $_plugin_name . '.php';
-            if (file_exists($file)) {
-                require_once($file);
-                return $file;
-            } else {
-                return false;
-            } 
-        } 
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php"; 
-        // loop through plugin dirs and find the plugin
-        foreach((array)$this->plugins_dir as $_plugin_dir) {
-            if (strpos('/\\', substr($_plugin_dir, -1)) === false) {
-                $_plugin_dir .= DS;
-            } 
-            $file = $_plugin_dir . $_plugin_filename;
-            if (file_exists($file)) {
-                require_once($file);
-                return $file;
-            } 
-        } 
-        // no plugin loaded
-        return false;
-    } 
-
-    /**
-    * clean up properties on cloned object
-     */
-    public function __clone()
-    {
-    	// clear config vars
-    	$this->config_vars = array(); 
-    	// clear assigned tpl vars
-    	$this->tpl_vars = array();
-    	// clear objects for external methods
-    	unset($this->register);  
-    	unset($this->filter);  
-	}
-
-
-    /**
-     * Handle unknown class methods
-	 *
-     * @param string $name unknown methode name
-     * @param array $args aurgument array
-     */
-    public function __call($name, $args)
-    {
-        static $camel_func;
-        if (!isset($camel_func))
-            $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); 
-        // see if this is a set/get for a property
-        $first3 = strtolower(substr($name, 0, 3));
-        if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') {
-            // try to keep case correct for future PHP 6.0 case-sensitive class methods
-            // lcfirst() not available < PHP 5.3.0, so improvise
-            $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4); 
-            // convert camel case to underscored name
-            $property_name = preg_replace_callback('/([A-Z])/', $camel_func, $property_name);
-            if (!property_exists($this, $property_name)) {
-                throw new SmartyException("property '$property_name' does not exist.");
-                return false;
-            } 
-            if ($first3 == 'get')
-                return $this->$property_name;
-            else
-                return $this->$property_name = $args[0];
-        }
-       // Smarty Backward Compatible wrapper
-		if (strpos($name,'_') !== false) {
-        	if (!isset($this->wrapper)) {
-           	 $this->wrapper = new Smarty_Internal_Wrapper($this);
-        	} 
-        	return $this->wrapper->convert($name, $args);
-        }
-        // external Smarty methods ?
-        foreach(array('filter','register') as $external) {  
-        	if (method_exists("Smarty_Internal_{$external}",$name)) {
-        		if (!isset($this->$external)) {
-        			$class = "Smarty_Internal_{$external}";
-            		$this->$external = new $class($this);
-        		} 
-        		return call_user_func_array(array($this->$external,$name), $args);
-			}
-		}
-		if (in_array($name,array('clearCompiledTemplate','compileAllTemplates','compileAllConfig','testInstall','getTags'))) {
-       		if (!isset($this->utility)) {
-            	$this->utility = new Smarty_Internal_Utility($this);
-        	} 
-        	return call_user_func_array(array($this->utility,$name), $args);
-		}
-         // PHP4 call to constructor?
-        if (strtolower($name) == 'smarty') {
-            throw new SmartyException('Please use parent::__construct() to call parent constuctor');
-            return false;
-        } 
-        throw new SmartyException("Call of unknown function '$name'.");
-   } 
-} 
+    public $escape_html = false;
 
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    if (substr($_class, 0, 16) === 'smarty_internal_' || $_class == 'smarty_security') {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    } 
-} 
+    /**
+     * start time for execution time calculation
+     *
+     * @var int
+     */
+    public $start_time = 0;
 
-/**
- * Smarty exception class
- */
-Class SmartyException extends Exception {
-}
+    /**
+     * required by the compiler for BC
+     *
+     * @var string
+     */
+    public $_current_file = null;
 
-/**
- * Smarty compiler exception class
- */
-Class SmartyCompilerException extends SmartyException  {
-}
+    /**
+     * internal flag to enable parser debugging
+     *
+     * @var bool
+     */
+    public $_parserdebug = false;
 
-?>
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 1;
+
+    /**
+     * Debug object
+     *
+     * @var Smarty_Internal_Debug
+     */
+    public $_debug = null;
+
+    /**
+     * template directory
+     *
+     * @var array
+     */
+    protected $template_dir = array('./templates/');
+
+    /**
+     * flags for normalized template directory entries
+     *
+     * @var array
+     */
+    protected $_processedTemplateDir = array();
+
+    /**
+     * config directory
+     *
+     * @var array
+     */
+    protected $config_dir = array('./configs/');
+
+    /**
+     * flags for normalized template directory entries
+     *
+     * @var array
+     */
+    protected $_processedConfigDir = array();
+
+    /**
+     * compile directory
+     *
+     * @var string
+     */
+    protected $compile_dir = './templates_c/';
+
+    /**
+     * plugins directory
+     *
+     * @var array
+     */
+    protected $plugins_dir = array();
+
+    /**
+     * cache directory
+     *
+     * @var string
+     */
+    protected $cache_dir = './cache/';
+
+    /**
+     * removed properties
+     *
+     * @var string[]
+     */
+    protected $obsoleteProperties = array(
+        'resource_caching', 'template_resource_caching', 'direct_access_security',
+        '_dir_perms', '_file_perms', 'plugin_search_order',
+        'inheritance_merge_compiled_includes', 'resource_cache_mode',
+    );
+
+    /**
+     * List of private properties which will call getter/setter on a direct access
+     *
+     * @var string[]
+     */
+    protected $accessMap = array(
+        'template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
+        'plugins_dir'  => 'PluginsDir', 'compile_dir' => 'CompileDir',
+        'cache_dir'    => 'CacheDir',
+    );
+
+    /**
+     * Initialize new Smarty object
+     */
+    public function __construct()
+    {
+        $this->_clearTemplateCache();
+        parent::__construct();
+        if (is_callable('mb_internal_encoding')) {
+            mb_internal_encoding(Smarty::$_CHARSET);
+        }
+        $this->start_time = microtime(true);
+        if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
+            Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
+        }
+        // Check if we're running on windows
+        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+        if (Smarty::$_CHARSET !== 'UTF-8') {
+            Smarty::$_UTF8_MODIFIER = '';
+        }
+    }
+
+    /**
+     * Enable error handler to mute expected messages
+     *
+     * @return     boolean
+     * @deprecated
+     */
+    public static function muteExpectedErrors()
+    {
+        return Smarty_Internal_ErrorHandler::muteExpectedErrors();
+    }
+
+    /**
+     * Disable error handler muting expected messages
+     *
+     * @deprecated
+     */
+    public static function unmuteExpectedErrors()
+    {
+        restore_error_handler();
+    }
+
+    /**
+     * Check if a template resource exists
+     *
+     * @param string $resource_name template name
+     *
+     * @return bool status
+     * @throws \SmartyException
+     */
+    public function templateExists($resource_name)
+    {
+        // create source object
+        $source = Smarty_Template_Source::load(null, $this, $resource_name);
+        return $source->exists;
+    }
+
+    /**
+     * Loads security class and enables security
+     *
+     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return Smarty                 current Smarty instance for chaining
+     * @throws \SmartyException
+     */
+    public function enableSecurity($security_class = null)
+    {
+        Smarty_Security::enableSecurity($this, $security_class);
+        return $this;
+    }
+
+    /**
+     * Disable security
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function disableSecurity()
+    {
+        $this->security_policy = null;
+        return $this;
+    }
+
+    /**
+     * Add template directory(s)
+     *
+     * @param string|array $template_dir directory(s) of template sources
+     * @param string       $key          of the array element to assign the template dir to
+     * @param bool         $isConfig     true for config_dir
+     *
+     * @return Smarty          current Smarty instance for chaining
+     */
+    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
+    {
+        if ($isConfig) {
+            $processed = &$this->_processedConfigDir;
+            $dir = &$this->config_dir;
+            $this->_configDirNormalized = false;
+        } else {
+            $processed = &$this->_processedTemplateDir;
+            $dir = &$this->template_dir;
+            $this->_templateDirNormalized = false;
+        }
+        if (is_array($template_dir)) {
+            foreach ($template_dir as $k => $v) {
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $dir[] = $v;
+                } else {
+                    // string indexes are overridden
+                    $dir[ $k ] = $v;
+                    unset($processed[ $key ]);
+                }
+            }
+        } else {
+            if ($key !== null) {
+                // override directory at specified index
+                $dir[ $key ] = $template_dir;
+                unset($processed[ $key ]);
+            } else {
+                // append new directory
+                $dir[] = $template_dir;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get template directories
+     *
+     * @param mixed $index    index of directory to get, null to get all
+     * @param bool  $isConfig true for config_dir
+     *
+     * @return array list of template directories, or directory of $index
+     */
+    public function getTemplateDir($index = null, $isConfig = false)
+    {
+        if ($isConfig) {
+            $dir = &$this->config_dir;
+        } else {
+            $dir = &$this->template_dir;
+        }
+        if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
+            $this->_normalizeTemplateConfig($isConfig);
+        }
+        if ($index !== null) {
+            return isset($dir[ $index ]) ? $dir[ $index ] : null;
+        }
+        return $dir;
+    }
+
+    /**
+     * Set template directory
+     *
+     * @param string|array $template_dir directory(s) of template sources
+     * @param bool         $isConfig     true for config_dir
+     *
+     * @return \Smarty current Smarty instance for chaining
+     */
+    public function setTemplateDir($template_dir, $isConfig = false)
+    {
+        if ($isConfig) {
+            $this->config_dir = array();
+            $this->_processedConfigDir = array();
+        } else {
+            $this->template_dir = array();
+            $this->_processedTemplateDir = array();
+        }
+        $this->addTemplateDir($template_dir, null, $isConfig);
+        return $this;
+    }
+
+    /**
+     * Add config directory(s)
+     *
+     * @param string|array $config_dir directory(s) of config sources
+     * @param mixed        $key        key of the array element to assign the config dir to
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addConfigDir($config_dir, $key = null)
+    {
+        return $this->addTemplateDir($config_dir, $key, true);
+    }
+
+    /**
+     * Get config directory
+     *
+     * @param mixed $index index of directory to get, null to get all
+     *
+     * @return array configuration directory
+     */
+    public function getConfigDir($index = null)
+    {
+        return $this->getTemplateDir($index, true);
+    }
+
+    /**
+     * Set config directory
+     *
+     * @param $config_dir
+     *
+     * @return Smarty       current Smarty instance for chaining
+     */
+    public function setConfigDir($config_dir)
+    {
+        return $this->setTemplateDir($config_dir, true);
+    }
+
+    /**
+     * Adds directory of plugin files
+     *
+     * @param null|array|string $plugins_dir
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addPluginsDir($plugins_dir)
+    {
+        if (empty($this->plugins_dir)) {
+            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
+        }
+        $this->plugins_dir = array_merge($this->plugins_dir, (array)$plugins_dir);
+        $this->_pluginsDirNormalized = false;
+        return $this;
+    }
+
+    /**
+     * Get plugin directories
+     *
+     * @return array list of plugin directories
+     */
+    public function getPluginsDir()
+    {
+        if (empty($this->plugins_dir)) {
+            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
+            $this->_pluginsDirNormalized = false;
+        }
+        if (!$this->_pluginsDirNormalized) {
+            if (!is_array($this->plugins_dir)) {
+                $this->plugins_dir = (array)$this->plugins_dir;
+            }
+            foreach ($this->plugins_dir as $k => $v) {
+                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, '/\\') . DIRECTORY_SEPARATOR, true);
+            }
+            $this->_cache[ 'plugin_files' ] = array();
+            $this->_pluginsDirNormalized = true;
+        }
+        return $this->plugins_dir;
+    }
+
+    /**
+     * Set plugins directory
+     *
+     * @param string|array $plugins_dir directory(s) of plugins
+     *
+     * @return Smarty       current Smarty instance for chaining
+     */
+    public function setPluginsDir($plugins_dir)
+    {
+        $this->plugins_dir = (array)$plugins_dir;
+        $this->_pluginsDirNormalized = false;
+        return $this;
+    }
+
+    /**
+     * Get compiled directory
+     *
+     * @return string path to compiled templates
+     */
+    public function getCompileDir()
+    {
+        if (!$this->_compileDirNormalized) {
+            $this->_normalizeDir('compile_dir', $this->compile_dir);
+            $this->_compileDirNormalized = true;
+        }
+        return $this->compile_dir;
+    }
+
+    /**
+     *
+     * @param  string $compile_dir directory to store compiled templates in
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setCompileDir($compile_dir)
+    {
+        $this->_normalizeDir('compile_dir', $compile_dir);
+        $this->_compileDirNormalized = true;
+        return $this;
+    }
+
+    /**
+     * Get cache directory
+     *
+     * @return string path of cache directory
+     */
+    public function getCacheDir()
+    {
+        if (!$this->_cacheDirNormalized) {
+            $this->_normalizeDir('cache_dir', $this->cache_dir);
+            $this->_cacheDirNormalized = true;
+        }
+        return $this->cache_dir;
+    }
+
+    /**
+     * Set cache directory
+     *
+     * @param string $cache_dir directory to store cached templates in
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setCacheDir($cache_dir)
+    {
+        $this->_normalizeDir('cache_dir', $cache_dir);
+        $this->_cacheDirNormalized = true;
+        return $this;
+    }
+
+    /**
+     * creates a template object
+     *
+     * @param string  $template   the resource handle of the template file
+     * @param mixed   $cache_id   cache id to be used with this template
+     * @param mixed   $compile_id compile id to be used with this template
+     * @param object  $parent     next higher level of Smarty variables
+     * @param boolean $do_clone   flag is Smarty object shall be cloned
+     *
+     * @return \Smarty_Internal_Template template object
+     * @throws \SmartyException
+     */
+    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+    {
+        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
+            $parent = $cache_id;
+            $cache_id = null;
+        }
+        if ($parent !== null && is_array($parent)) {
+            $data = $parent;
+            $parent = null;
+        } else {
+            $data = null;
+        }
+        if (!$this->_templateDirNormalized) {
+            $this->_normalizeTemplateConfig(false);
+        }
+        $_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
+        $tpl = null;
+        if ($this->caching && isset(Smarty_Internal_Template::$isCacheTplObj[ $_templateId ])) {
+            $tpl = $do_clone ? clone Smarty_Internal_Template::$isCacheTplObj[ $_templateId ] :
+                Smarty_Internal_Template::$isCacheTplObj[ $_templateId ];
+            $tpl->inheritance = null;
+            $tpl->tpl_vars = $tpl->config_vars = array();
+        } elseif (!$do_clone && isset(Smarty_Internal_Template::$tplObjCache[ $_templateId ])) {
+            $tpl = clone Smarty_Internal_Template::$tplObjCache[ $_templateId ];
+            $tpl->inheritance = null;
+            $tpl->tpl_vars = $tpl->config_vars = array();
+        } else {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
+            $tpl->templateId = $_templateId;
+        }
+        if ($do_clone) {
+            $tpl->smarty = clone $tpl->smarty;
+        }
+        $tpl->parent = $parent ? $parent : $this;
+        // fill data if present
+        if (!empty($data) && is_array($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+            }
+        }
+        if ($this->debugging || $this->debugging_ctrl === 'URL') {
+            $tpl->smarty->_debug = new Smarty_Internal_Debug();
+            // check URL debugging control
+            if (!$this->debugging && $this->debugging_ctrl === 'URL') {
+                $tpl->smarty->_debug->debugUrl($tpl->smarty);
+            }
+        }
+        return $tpl;
+    }
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param string $plugin_name class plugin name to load
+     * @param bool   $check       check if already loaded
+     *
+     * @return string |boolean filepath of loaded file or false
+     * @throws \SmartyException
+     */
+    public function loadPlugin($plugin_name, $check = true)
+    {
+        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
+    }
+
+    /**
+     * Get unique template id
+     *
+     * @param string                    $template_name
+     * @param null|mixed                $cache_id
+     * @param null|mixed                $compile_id
+     * @param null                      $caching
+     * @param \Smarty_Internal_Template $template
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function _getTemplateId(
+        $template_name,
+        $cache_id = null,
+        $compile_id = null,
+        $caching = null,
+        Smarty_Internal_Template $template = null
+    ) {
+        $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
+            $template_name;
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        $caching = (int)($caching === null ? $this->caching : $caching);
+        if ((isset($template) && strpos($template_name, ':.') !== false) || $this->allow_ambiguous_resources) {
+            $_templateId =
+                Smarty_Resource::getUniqueTemplateName((isset($template) ? $template : $this), $template_name) .
+                "#{$cache_id}#{$compile_id}#{$caching}";
+        } else {
+            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
+        }
+        if (isset($_templateId[ 150 ])) {
+            $_templateId = sha1($_templateId);
+        }
+        return $_templateId;
+    }
+
+    /**
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute if required
+     *
+     * @param string $path     file path
+     * @param bool   $realpath if true - convert to absolute
+     *                         false - convert to relative
+     *                         null - keep as it is but
+     *                         remove /./ /../
+     *
+     * @return string
+     */
+    public function _realpath($path, $realpath = null)
+    {
+        $nds = array('/' => '\\', '\\' => '/');
+        preg_match(
+            '%^(?<root>(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
+            $path,
+            $parts
+        );
+        $path = $parts[ 'path' ];
+        if ($parts[ 'root' ] === '\\') {
+            $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
+        } else {
+            if ($realpath !== null && !$parts[ 'root' ]) {
+                $path = getcwd() . DIRECTORY_SEPARATOR . $path;
+            }
+        }
+        // normalize DIRECTORY_SEPARATOR
+        $path = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $path);
+        $parts[ 'root' ] = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $parts[ 'root' ]);
+        do {
+            $path = preg_replace(
+                array('#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'),
+                DIRECTORY_SEPARATOR,
+                $path,
+                -1,
+                $count
+            );
+        } while ($count > 0);
+        return $realpath !== false ? $parts[ 'root' ] . $path : str_ireplace(getcwd(), '.', $parts[ 'root' ] . $path);
+    }
+
+    /**
+     * Empty template objects cache
+     */
+    public function _clearTemplateCache()
+    {
+        Smarty_Internal_Template::$isCacheTplObj = array();
+        Smarty_Internal_Template::$tplObjCache = array();
+    }
+
+    /**
+     * @param boolean $use_sub_dirs
+     */
+    public function setUseSubDirs($use_sub_dirs)
+    {
+        $this->use_sub_dirs = $use_sub_dirs;
+    }
+
+    /**
+     * @param int $error_reporting
+     */
+    public function setErrorReporting($error_reporting)
+    {
+        $this->error_reporting = $error_reporting;
+    }
+
+    /**
+     * @param boolean $escape_html
+     */
+    public function setEscapeHtml($escape_html)
+    {
+        $this->escape_html = $escape_html;
+    }
+
+    /**
+     * Return auto_literal flag
+     *
+     * @return boolean
+     */
+    public function getAutoLiteral()
+    {
+        return $this->auto_literal;
+    }
+
+    /**
+     * Set auto_literal flag
+     *
+     * @param boolean $auto_literal
+     */
+    public function setAutoLiteral($auto_literal = true)
+    {
+        $this->auto_literal = $auto_literal;
+    }
+
+    /**
+     * @param boolean $force_compile
+     */
+    public function setForceCompile($force_compile)
+    {
+        $this->force_compile = $force_compile;
+    }
+
+    /**
+     * @param boolean $merge_compiled_includes
+     */
+    public function setMergeCompiledIncludes($merge_compiled_includes)
+    {
+        $this->merge_compiled_includes = $merge_compiled_includes;
+    }
+
+    /**
+     * Get left delimiter
+     *
+     * @return string
+     */
+    public function getLeftDelimiter()
+    {
+        return $this->left_delimiter;
+    }
+
+    /**
+     * Set left delimiter
+     *
+     * @param string $left_delimiter
+     */
+    public function setLeftDelimiter($left_delimiter)
+    {
+        $this->left_delimiter = $left_delimiter;
+    }
+
+    /**
+     * Get right delimiter
+     *
+     * @return string $right_delimiter
+     */
+    public function getRightDelimiter()
+    {
+        return $this->right_delimiter;
+    }
+
+    /**
+     * Set right delimiter
+     *
+     * @param string
+     */
+    public function setRightDelimiter($right_delimiter)
+    {
+        $this->right_delimiter = $right_delimiter;
+    }
+
+    /**
+     * @param boolean $debugging
+     */
+    public function setDebugging($debugging)
+    {
+        $this->debugging = $debugging;
+    }
+
+    /**
+     * @param boolean $config_overwrite
+     */
+    public function setConfigOverwrite($config_overwrite)
+    {
+        $this->config_overwrite = $config_overwrite;
+    }
+
+    /**
+     * @param boolean $config_booleanize
+     */
+    public function setConfigBooleanize($config_booleanize)
+    {
+        $this->config_booleanize = $config_booleanize;
+    }
+
+    /**
+     * @param boolean $config_read_hidden
+     */
+    public function setConfigReadHidden($config_read_hidden)
+    {
+        $this->config_read_hidden = $config_read_hidden;
+    }
+
+    /**
+     * @param boolean $compile_locking
+     */
+    public function setCompileLocking($compile_locking)
+    {
+        $this->compile_locking = $compile_locking;
+    }
+
+    /**
+     * @param string $default_resource_type
+     */
+    public function setDefaultResourceType($default_resource_type)
+    {
+        $this->default_resource_type = $default_resource_type;
+    }
+
+    /**
+     * @param string $caching_type
+     */
+    public function setCachingType($caching_type)
+    {
+        $this->caching_type = $caching_type;
+    }
+
+    /**
+     * Test install
+     *
+     * @param null $errors
+     */
+    public function testInstall(&$errors = null)
+    {
+        Smarty_Internal_TestInstall::testInstall($this, $errors);
+    }
+
+    /**
+     * Get Smarty object
+     *
+     * @return Smarty
+     */
+    public function _getSmartyObj()
+    {
+        return $this;
+    }
+
+    /**
+     * <<magic>> Generic getter.
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
+     *
+     * @param string $name property name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        if (isset($this->accessMap[ $name ])) {
+            $method = 'get' . $this->accessMap[ $name ];
+            return $this->{$method}();
+        } elseif (isset($this->_cache[ $name ])) {
+            return $this->_cache[ $name ];
+        } elseif (in_array($name, $this->obsoleteProperties)) {
+            return null;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+        return null;
+    }
+
+    /**
+     * <<magic>> Generic setter.
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
+     *
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
+     *
+     */
+    public function __set($name, $value)
+    {
+        if (isset($this->accessMap[ $name ])) {
+            $method = 'set' . $this->accessMap[ $name ];
+            $this->{$method}($value);
+        } elseif (in_array($name, $this->obsoleteProperties)) {
+            return;
+        } elseif (is_object($value) && method_exists($value, $name)) {
+            $this->$name = $value;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+    }
+
+    /**
+     * Normalize and set directory string
+     *
+     * @param string $dirName cache_dir or compile_dir
+     * @param string $dir     filepath of folder
+     */
+    private function _normalizeDir($dirName, $dir)
+    {
+        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+        if (class_exists('Smarty_Internal_ErrorHandler', false)) {
+            if (!isset(Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ])) {
+                Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ] = null;
+            }
+        }
+    }
+
+    /**
+     * Normalize template_dir or config_dir
+     *
+     * @param bool $isConfig true for config_dir
+     */
+    private function _normalizeTemplateConfig($isConfig)
+    {
+        if ($isConfig) {
+            $processed = &$this->_processedConfigDir;
+            $dir = &$this->config_dir;
+        } else {
+            $processed = &$this->_processedTemplateDir;
+            $dir = &$this->template_dir;
+        }
+        if (!is_array($dir)) {
+            $dir = (array)$dir;
+        }
+        foreach ($dir as $k => $v) {
+            if (!isset($processed[ $k ])) {
+                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+                $processed[ $k ] = true;
+            }
+        }
+        $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
+        $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
+            $this->_joined_template_dir = join('#', $this->template_dir);
+    }
+}
diff --git a/WEB-INF/lib/smarty/SmartyBC.class.php b/WEB-INF/lib/smarty/SmartyBC.class.php
new file mode 100644
index 000000000..836f98153
--- /dev/null
+++ b/WEB-INF/lib/smarty/SmartyBC.class.php
@@ -0,0 +1,477 @@
+<?php
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        SmartyBC.class.php
+ * SVN:         $Id: $
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ *
+ * @link      http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
+ */
+/**
+ * @ignore
+ */
+require_once dirname(__FILE__) . '/Smarty.class.php';
+
+/**
+ * Smarty Backward Compatibility Wrapper Class
+ *
+ * @package Smarty
+ */
+class SmartyBC extends Smarty
+{
+    /**
+     * Smarty 2 BC
+     *
+     * @var string
+     */
+    public $_version = self::SMARTY_VERSION;
+
+    /**
+     * This is an array of directories where trusted php scripts reside.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+
+    /**
+     * Initialize new SmartyBC object
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * wrapper for assign_by_ref
+     *
+     * @param string $tpl_var the template variable name
+     * @param mixed  &$value  the referenced value to assign
+     */
+    public function assign_by_ref($tpl_var, &$value)
+    {
+        $this->assignByRef($tpl_var, $value);
+    }
+
+    /**
+     * wrapper for append_by_ref
+     *
+     * @param string  $tpl_var the template variable name
+     * @param mixed   &$value  the referenced value to append
+     * @param boolean $merge   flag if array elements shall be merged
+     */
+    public function append_by_ref($tpl_var, &$value, $merge = false)
+    {
+        $this->appendByRef($tpl_var, $value, $merge);
+    }
+
+    /**
+     * clear the given assigned template variable.
+     *
+     * @param string $tpl_var the template variable to clear
+     */
+    public function clear_assign($tpl_var)
+    {
+        $this->clearAssign($tpl_var);
+    }
+
+    /**
+     * Registers custom function to be used in templates
+     *
+     * @param string $function      the name of the template function
+     * @param string $function_impl the name of the PHP function to register
+     * @param bool   $cacheable
+     * @param mixed  $cache_attrs
+     *
+     * @throws \SmartyException
+     */
+    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
+    {
+        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
+    }
+
+    /**
+     * Unregister custom function
+     *
+     * @param string $function name of template function
+     */
+    public function unregister_function($function)
+    {
+        $this->unregisterPlugin('function', $function);
+    }
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @param string  $object        name of template object
+     * @param object  $object_impl   the referenced PHP object to register
+     * @param array   $allowed       list of allowed methods (empty = all)
+     * @param boolean $smarty_args   smarty argument format, else traditional
+     * @param array   $block_methods list of methods that are block format
+     *
+     * @throws   SmartyException
+     * @internal param array $block_functs list of methods that are block format
+     */
+    public function register_object(
+        $object,
+        $object_impl,
+        $allowed = array(),
+        $smarty_args = true,
+        $block_methods = array()
+    ) {
+        settype($allowed, 'array');
+        settype($smarty_args, 'boolean');
+        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
+    }
+
+    /**
+     * Unregister object
+     *
+     * @param string $object name of template object
+     */
+    public function unregister_object($object)
+    {
+        $this->unregisterObject($object);
+    }
+
+    /**
+     * Registers block function to be used in templates
+     *
+     * @param string $block      name of template block
+     * @param string $block_impl PHP function to register
+     * @param bool   $cacheable
+     * @param mixed  $cache_attrs
+     *
+     * @throws \SmartyException
+     */
+    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
+    {
+        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
+    }
+
+    /**
+     * Unregister block function
+     *
+     * @param string $block name of template function
+     */
+    public function unregister_block($block)
+    {
+        $this->unregisterPlugin('block', $block);
+    }
+
+    /**
+     * Registers compiler function
+     *
+     * @param string $function      name of template function
+     * @param string $function_impl name of PHP function to register
+     * @param bool   $cacheable
+     *
+     * @throws \SmartyException
+     */
+    public function register_compiler_function($function, $function_impl, $cacheable = true)
+    {
+        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
+    }
+
+    /**
+     * Unregister compiler function
+     *
+     * @param string $function name of template function
+     */
+    public function unregister_compiler_function($function)
+    {
+        $this->unregisterPlugin('compiler', $function);
+    }
+
+    /**
+     * Registers modifier to be used in templates
+     *
+     * @param string $modifier      name of template modifier
+     * @param string $modifier_impl name of PHP function to register
+     *
+     * @throws \SmartyException
+     */
+    public function register_modifier($modifier, $modifier_impl)
+    {
+        $this->registerPlugin('modifier', $modifier, $modifier_impl);
+    }
+
+    /**
+     * Unregister modifier
+     *
+     * @param string $modifier name of template modifier
+     */
+    public function unregister_modifier($modifier)
+    {
+        $this->unregisterPlugin('modifier', $modifier);
+    }
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @param string $type      name of resource
+     * @param array  $functions array of functions to handle resource
+     */
+    public function register_resource($type, $functions)
+    {
+        $this->registerResource($type, $functions);
+    }
+
+    /**
+     * Unregister a resource
+     *
+     * @param string $type name of resource
+     */
+    public function unregister_resource($type)
+    {
+        $this->unregisterResource($type);
+    }
+
+    /**
+     * Registers a prefilter function to apply
+     * to a template before compiling
+     *
+     * @param callable $function
+     *
+     * @throws \SmartyException
+     */
+    public function register_prefilter($function)
+    {
+        $this->registerFilter('pre', $function);
+    }
+
+    /**
+     * Unregister a prefilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_prefilter($function)
+    {
+        $this->unregisterFilter('pre', $function);
+    }
+
+    /**
+     * Registers a postfilter function to apply
+     * to a compiled template after compilation
+     *
+     * @param callable $function
+     *
+     * @throws \SmartyException
+     */
+    public function register_postfilter($function)
+    {
+        $this->registerFilter('post', $function);
+    }
+
+    /**
+     * Unregister a postfilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_postfilter($function)
+    {
+        $this->unregisterFilter('post', $function);
+    }
+
+    /**
+     * Registers an output filter function to apply
+     * to a template output
+     *
+     * @param callable $function
+     *
+     * @throws \SmartyException
+     */
+    public function register_outputfilter($function)
+    {
+        $this->registerFilter('output', $function);
+    }
+
+    /**
+     * Unregister an outputfilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_outputfilter($function)
+    {
+        $this->unregisterFilter('output', $function);
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     *
+     * @throws \SmartyException
+     */
+    public function load_filter($type, $name)
+    {
+        $this->loadFilter($type, $name);
+    }
+
+    /**
+     * clear cached content for the given template and cache id
+     *
+     * @param string $tpl_file   name of template file
+     * @param string $cache_id   name of cache_id
+     * @param string $compile_id name of compile_id
+     * @param string $exp_time   expiration time
+     *
+     * @return boolean
+     */
+    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
+    {
+        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * clear the entire contents of cache (all templates)
+     *
+     * @param string $exp_time expire time
+     *
+     * @return boolean
+     */
+    public function clear_all_cache($exp_time = null)
+    {
+        return $this->clearCache(null, null, null, $exp_time);
+    }
+
+    /**
+     * test to see if valid cache exists for this template
+     *
+     * @param string $tpl_file name of template file
+     * @param string $cache_id
+     * @param string $compile_id
+     *
+     * @return bool
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
+    {
+        return $this->isCached($tpl_file, $cache_id, $compile_id);
+    }
+
+    /**
+     * clear all the assigned template variables.
+     */
+    public function clear_all_assign()
+    {
+        $this->clearAllAssign();
+    }
+
+    /**
+     * clears compiled version of specified template resource,
+     * or all compiled template files if one is not specified.
+     * This function is for advanced use only, not normally needed.
+     *
+     * @param string $tpl_file
+     * @param string $compile_id
+     * @param string $exp_time
+     *
+     * @return boolean results of {@link smarty_core_rm_auto()}
+     */
+    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
+    {
+        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
+    }
+
+    /**
+     * Checks whether requested template exists.
+     *
+     * @param string $tpl_file
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function template_exists($tpl_file)
+    {
+        return $this->templateExists($tpl_file);
+    }
+
+    /**
+     * Returns an array containing template variables
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function get_template_vars($name = null)
+    {
+        return $this->getTemplateVars($name);
+    }
+
+    /**
+     * Returns an array containing config variables
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function get_config_vars($name = null)
+    {
+        return $this->getConfigVars($name);
+    }
+
+    /**
+     * load configuration values
+     *
+     * @param string $file
+     * @param string $section
+     * @param string $scope
+     */
+    public function config_load($file, $section = null, $scope = 'global')
+    {
+        $this->ConfigLoad($file, $section, $scope);
+    }
+
+    /**
+     * return a reference to a registered object
+     *
+     * @param string $name
+     *
+     * @return object
+     */
+    public function get_registered_object($name)
+    {
+        return $this->getRegisteredObject($name);
+    }
+
+    /**
+     * clear configuration values
+     *
+     * @param string $var
+     */
+    public function clear_config($var = null)
+    {
+        $this->clearConfig($var);
+    }
+
+    /**
+     * trigger Smarty error
+     *
+     * @param string  $error_msg
+     * @param integer $error_type
+     */
+    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
+    {
+        trigger_error("Smarty error: $error_msg", $error_type);
+    }
+}
diff --git a/WEB-INF/lib/smarty/bootstrap.php b/WEB-INF/lib/smarty/bootstrap.php
new file mode 100644
index 000000000..2c830468e
--- /dev/null
+++ b/WEB-INF/lib/smarty/bootstrap.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * Load and register Smarty Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+    include dirname(__FILE__) . '/Autoloader.php';
+}
+Smarty_Autoloader::register(true);
diff --git a/WEB-INF/lib/smarty/debug.tpl b/WEB-INF/lib/smarty/debug.tpl
index 058c5b204..edc7bef98 100644
--- a/WEB-INF/lib/smarty/debug.tpl
+++ b/WEB-INF/lib/smarty/debug.tpl
@@ -1,133 +1,160 @@
 {capture name='_smarty_debug' assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-    <title>Smarty Debug Console</title>
-<style type="text/css">
-{literal}
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
-
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
-
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
-
-body {
-    background: black; 
-}
-
-p, table, div {
-    background: #f0ead8;
-} 
-
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
-
-table {
-    width: 100%;
-}
-
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
-
-td {
-    color: green;
-}
-
-.odd {
-    background-color: #eeeeee;
-}
-
-.even {
-    background-color: #fafafa;
-}
-
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
-
-#table_assigned_vars th {
-    color: blue;
-}
-
-#table_config_vars th {
-    color: maroon;
-}
-{/literal}
-</style>
-</head>
-<body>
-
-<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
-
-{if !empty($template_data)}
-<h2>included templates &amp; config files (load time in seconds)</h2>
-
-<div>
-{foreach $template_data as $template}
-  <font color=brown>{$template.name}</font>
-  <span class="exectime">
-   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
-  </span>
-  <br>
-{/foreach}
-</div>
-{/if}
-
-<h2>assigned template variables</h2>
-
-<table id="table_assigned_vars">
-    {foreach $assigned_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>${$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var}</td></tr>
-    {/foreach}
-</table>
-
-<h2>assigned config file variables (outer template scope)</h2>
-
-<table id="table_config_vars">
-    {foreach $config_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>{$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var}</td></tr>
-    {/foreach}
-
-</table>
-</body>
-</html>
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style type="text/css">
+            {literal}
+            body, h1, h2, h3, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
+
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
+
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
+
+            body {
+                background: black;
+            }
+
+            p, table, div {
+                background: #f0ead8;
+            }
+
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
+
+            table {
+                width: 100%;
+            }
+
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+            }
+
+            td {
+                color: green;
+            }
+
+            .odd {
+                background-color: #eeeeee;
+            }
+
+            .even {
+                background-color: #fafafa;
+            }
+
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
+
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+            #blue h3 {
+                color: blue;
+            }
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
+            #table_assigned_vars th {
+                color: blue;
+                font-weight: bold;
+            }
+
+            #table_config_vars th {
+                color: maroon;
+            }
+
+            {/literal}
+        </style>
+    </head>
+    <body>
+
+    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+
+    {if !empty($template_data)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <font color=brown>{$template.name}</font>
+                <br />&nbsp;&nbsp;<span class="exectime">
+                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+                 </span>
+                <br />
+            {/foreach}
+        </div>
+    {/if}
+
+    <h2>assigned template variables</h2>
+
+    <table id="table_assigned_vars">
+        {foreach $assigned_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <td><h3><font color=blue>${$vars@key}</font></h3>
+                    {if isset($vars['nocache'])}<b>Nocache</b><br />{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
+         {/foreach}
+    </table>
+
+    <h2>assigned config file variables</h2>
+
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <td><h3><font color=blue>#{$vars@key}#</font></h3>
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+            </tr>
+        {/foreach}
+
+    </table>
+    </body>
+    </html>
 {/capture}
 <script type="text/javascript">
-{$id = $template_name|default:''|md5}
-    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
-    _smarty_console.document.write("{$debug_output|escape:'javascript'}");
+    {$id = '__Smarty__'}
+    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
+    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>
diff --git a/WEB-INF/lib/smarty/plugins/block.php.php b/WEB-INF/lib/smarty/plugins/block.php.php
deleted file mode 100644
index 8fedd8b43..000000000
--- a/WEB-INF/lib/smarty/plugins/block.php.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin to execute PHP code
- * 
- * @package Smarty
- * @subpackage PluginsBlock
- * @author Uwe Tews 
- */
-
-/**
- * Smarty {php}{/php} block plugin
- * 
- * @param string $content contents of the block
- * @param object $template template object
- * @param boolean $ &$repeat repeat flag
- * @return string content re-formatted
- */
-function smarty_block_php($params, $content, $template, &$repeat)
-{ 
-    if (!$template->allow_php_tag) {
-        throw new SmartyException("{php} is deprecated, set allow_php_tag = true to enable");
-    } 
-    eval($content);
-    return '';
-}
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/block.textformat.php b/WEB-INF/lib/smarty/plugins/block.textformat.php
index 517fd62dd..5e494637e 100644
--- a/WEB-INF/lib/smarty/plugins/block.textformat.php
+++ b/WEB-INF/lib/smarty/plugins/block.textformat.php
@@ -2,41 +2,51 @@
 /**
  * Smarty plugin to format text blocks
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsBlock
  */
-
 /**
  * Smarty {textformat}{/textformat} block plugin
- * 
- * Type:     block function<br>
- * Name:     textformat<br>
+ * Type:     block function
+ * Name:     textformat
  * Purpose:  format text a certain way with preset styles
- *            or custom wrap/indent settings<br>
- * 
- * @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat}
- *       (Smarty online manual)
- * @param array $params parameters
- * <pre>
- * Params:   style: string (email)
- *            indent: integer (0)
- *            wrap: integer (80)
- *            wrap_char string ("\n")
- *            indent_char: string (" ")
- *            wrap_boundary: boolean (true)
- * </pre>
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $content contents of the block
- * @param object $template template object
- * @param boolean &$repeat repeat flag
+ *           or custom wrap/indent settings
+ * Params:
+ *
+ * - style         - string (email)
+ * - indent        - integer (0)
+ * - wrap          - integer (80)
+ * - wrap_char     - string ("\n")
+ * - indent_char   - string (" ")
+ * - wrap_boundary - boolean (true)
+ *
+ * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ *         (Smarty online manual)
+ *
+ * @param array                    $params   parameters
+ * @param string                   $content  contents of the block
+ * @param Smarty_Internal_Template $template template object
+ * @param boolean                  &$repeat  repeat flag
+ *
  * @return string content re-formatted
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @throws \SmartyException
  */
-function smarty_block_textformat($params, $content, $template, &$repeat)
+function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
 {
     if (is_null($content)) {
         return;
-    } 
-
+    }
+    if (Smarty::$_MBSTRING) {
+        $template->_checkPlugins(
+            array(
+                array(
+                    'function' => 'smarty_modifier_mb_wordwrap',
+                    'file'     => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php'
+                )
+            )
+        );
+    }
     $style = null;
     $indent = 0;
     $indent_first = 0;
@@ -45,7 +55,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
     $wrap_char = "\n";
     $wrap_cut = false;
     $assign = null;
-
     foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'style':
@@ -54,49 +63,59 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
             case 'assign':
                 $$_key = (string)$_val;
                 break;
-
             case 'indent':
             case 'indent_first':
             case 'wrap':
                 $$_key = (int)$_val;
                 break;
-
             case 'wrap_cut':
                 $$_key = (bool)$_val;
                 break;
-
             default:
-                trigger_error("textformat: unknown attribute '$_key'");
-        } 
-    } 
-
-    if ($style == 'email') {
+                trigger_error("textformat: unknown attribute '{$_key}'");
+        }
+    }
+    if ($style === 'email') {
         $wrap = 72;
-    } 
+    }
     // split into paragraphs
-    $_paragraphs = preg_split('![\r\n][\r\n]!', $content);
-    $_output = '';
-
-    for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) {
-        if ($_paragraphs[$_x] == '') {
+    $_paragraphs = preg_split('![\r\n]{2}!', $content);
+    foreach ($_paragraphs as &$_paragraph) {
+        if (!$_paragraph) {
             continue;
-        } 
+        }
         // convert mult. spaces & special chars to single space
-        $_paragraphs[$_x] = preg_replace(array('!\s+!', '!(^\s+)|(\s+$)!'), array(' ', ''), $_paragraphs[$_x]); 
+        $_paragraph =
+            preg_replace(
+                array(
+                    '!\s+!' . Smarty::$_UTF8_MODIFIER,
+                    '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
+                ),
+                array(
+                    ' ',
+                    ''
+                ),
+                $_paragraph
+            );
         // indent first line
         if ($indent_first > 0) {
-            $_paragraphs[$_x] = str_repeat($indent_char, $indent_first) . $_paragraphs[$_x];
-        } 
+            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+        }
         // wordwrap sentences
-        $_paragraphs[$_x] = wordwrap($_paragraphs[$_x], $wrap - $indent, $wrap_char, $wrap_cut); 
+        if (Smarty::$_MBSTRING) {
+            $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+        } else {
+            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+        }
         // indent lines
         if ($indent > 0) {
-            $_paragraphs[$_x] = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraphs[$_x]);
-        } 
-    } 
+            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+        }
+    }
     $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-    
-    return $assign ? $template->assign($assign, $_output) : $_output;
-} 
-
-?>
\ No newline at end of file
+    if ($assign) {
+        $template->assign($assign, $_output);
+    } else {
+        return $_output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.counter.php b/WEB-INF/lib/smarty/plugins/function.counter.php
index 7c50bd44b..a4129e77c 100644
--- a/WEB-INF/lib/smarty/plugins/function.counter.php
+++ b/WEB-INF/lib/smarty/plugins/function.counter.php
@@ -1,78 +1,62 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {counter} function plugin
- *
- * Type:     function<br>
- * Name:     counter<br>
+ * Type:     function
+ * Name:     counter
  * Purpose:  print out a counter value
+ *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
- * @param array parameters
- * @param Smarty
- * @param object $template template object
+ * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ *         (Smarty online manual)
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 function smarty_function_counter($params, $template)
 {
     static $counters = array();
-
-    $name = (isset($params['name'])) ? $params['name'] : 'default';
-    if (!isset($counters[$name])) {
-        $counters[$name] = array(
-            'start'=>1,
-            'skip'=>1,
-            'direction'=>'up',
-            'count'=>1
-            );
+    $name = (isset($params[ 'name' ])) ? $params[ 'name' ] : 'default';
+    if (!isset($counters[ $name ])) {
+        $counters[ $name ] = array('start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1);
     }
-    $counter =& $counters[$name];
-
-    if (isset($params['start'])) {
-        $counter['start'] = $counter['count'] = (int)$params['start'];
+    $counter =& $counters[ $name ];
+    if (isset($params[ 'start' ])) {
+        $counter[ 'start' ] = $counter[ 'count' ] = (int)$params[ 'start' ];
     }
-
-    if (!empty($params['assign'])) {
-        $counter['assign'] = $params['assign'];
+    if (!empty($params[ 'assign' ])) {
+        $counter[ 'assign' ] = $params[ 'assign' ];
     }
-
-    if (isset($counter['assign'])) {
-        $template->assign($counter['assign'], $counter['count']);
+    if (isset($counter[ 'assign' ])) {
+        $template->assign($counter[ 'assign' ], $counter[ 'count' ]);
     }
-    
-    if (isset($params['print'])) {
-        $print = (bool)$params['print'];
+    if (isset($params[ 'print' ])) {
+        $print = (bool)$params[ 'print' ];
     } else {
-        $print = empty($counter['assign']);
+        $print = empty($counter[ 'assign' ]);
     }
-
     if ($print) {
-        $retval = $counter['count'];
+        $retval = $counter[ 'count' ];
     } else {
         $retval = null;
     }
-
-    if (isset($params['skip'])) {
-        $counter['skip'] = $params['skip'];
+    if (isset($params[ 'skip' ])) {
+        $counter[ 'skip' ] = $params[ 'skip' ];
+    }
+    if (isset($params[ 'direction' ])) {
+        $counter[ 'direction' ] = $params[ 'direction' ];
     }
-    
-    if (isset($params['direction'])) {
-        $counter['direction'] = $params['direction'];
+    if ($counter[ 'direction' ] === 'down') {
+        $counter[ 'count' ] -= $counter[ 'skip' ];
+    } else {
+        $counter[ 'count' ] += $counter[ 'skip' ];
     }
-
-    if ($counter['direction'] == "down")
-        $counter['count'] -= $counter['skip'];
-    else
-        $counter['count'] += $counter['skip'];
-    
     return $retval;
-    
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.cycle.php b/WEB-INF/lib/smarty/plugins/function.cycle.php
index 98e3e2878..07ffcc5e2 100644
--- a/WEB-INF/lib/smarty/plugins/function.cycle.php
+++ b/WEB-INF/lib/smarty/plugins/function.cycle.php
@@ -2,105 +2,91 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {cycle} function plugin
+ * Type:     function
+ * Name:     cycle
+ * Date:     May 3, 2002
+ * Purpose:  cycle through given values
+ * Params:
  *
- * Type:     function<br>
- * Name:     cycle<br>
- * Date:     May 3, 2002<br>
- * Purpose:  cycle through given values<br>
- * Input:
- *         - name = name of cycle (optional)
- *         - values = comma separated list of values to cycle,
- *                    or an array of values to cycle
- *                    (this can be left out for subsequent calls)
- *         - reset = boolean - resets given var to true
- *         - print = boolean - print var or not. default is true
- *         - advance = boolean - whether or not to advance the cycle
- *         - delimiter = the value delimiter, default is ","
- *         - assign = boolean, assigns to template var instead of
- *                    printed.
+ * - name      - name of cycle (optional)
+ * - values    - comma separated list of values to cycle, or an array of values to cycle
+ *               (this can be left out for subsequent calls)
+ * - reset     - boolean - resets given var to true
+ * - print     - boolean - print var or not. default is true
+ * - advance   - boolean - whether or not to advance the cycle
+ * - delimiter - the value delimiter, default is ","
+ * - assign    - boolean, assigns to template var instead of printed.
+ *
+ * Examples:
  *
- * Examples:<br>
- * <pre>
  * {cycle values="#eeeeee,#d0d0d0d"}
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Mark Priatel <mpriatel@rogers.com>
- * @author credit to Gerard <gerard@interfold.com>
- * @author credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version  1.3
- * @param array
- * @param object $template template object
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ *           (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Mark Priatel <mpriatel@rogers.com>
+ * @author  credit to Gerard <gerard@interfold.com>
+ * @author  credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version 1.3
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
-
 function smarty_function_cycle($params, $template)
 {
     static $cycle_vars;
-    
-    $name = (empty($params['name'])) ? 'default' : $params['name'];
-    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
-    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
-            
-    if (!in_array('values', array_keys($params))) {
-        if(!isset($cycle_vars[$name]['values'])) {
-            trigger_error("cycle: missing 'values' parameter");
+    $name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ];
+    $print = (isset($params[ 'print' ])) ? (bool)$params[ 'print' ] : true;
+    $advance = (isset($params[ 'advance' ])) ? (bool)$params[ 'advance' ] : true;
+    $reset = (isset($params[ 'reset' ])) ? (bool)$params[ 'reset' ] : false;
+    if (!isset($params[ 'values' ])) {
+        if (!isset($cycle_vars[ $name ][ 'values' ])) {
+            trigger_error('cycle: missing \'values\' parameter');
             return;
         }
     } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
-            $cycle_vars[$name]['index'] = 0;
+        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
+            $cycle_vars[ $name ][ 'index' ] = 0;
         }
-        $cycle_vars[$name]['values'] = $params['values'];
+        $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];
     }
-
-    if (isset($params['delimiter'])) {
-        $cycle_vars[$name]['delimiter'] = $params['delimiter'];
-    } elseif (!isset($cycle_vars[$name]['delimiter'])) {
-        $cycle_vars[$name]['delimiter'] = ',';       
+    if (isset($params[ 'delimiter' ])) {
+        $cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ];
+    } elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) {
+        $cycle_vars[ $name ][ 'delimiter' ] = ',';
     }
-    
-    if(is_array($cycle_vars[$name]['values'])) {
-        $cycle_array = $cycle_vars[$name]['values'];
+    if (is_array($cycle_vars[ $name ][ 'values' ])) {
+        $cycle_array = $cycle_vars[ $name ][ 'values' ];
     } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
+        $cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]);
     }
-    
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
-        $cycle_vars[$name]['index'] = 0;
+    if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) {
+        $cycle_vars[ $name ][ 'index' ] = 0;
     }
-    
-    if (isset($params['assign'])) {
+    if (isset($params[ 'assign' ])) {
         $print = false;
-        $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+        $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
     }
-        
-    if($print) {
-        $retval = $cycle_array[$cycle_vars[$name]['index']];
+    if ($print) {
+        $retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ];
     } else {
         $retval = null;
     }
-
-    if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
-            $cycle_vars[$name]['index'] = 0;
+    if ($advance) {
+        if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) {
+            $cycle_vars[ $name ][ 'index' ] = 0;
         } else {
-            $cycle_vars[$name]['index']++;
+            $cycle_vars[ $name ][ 'index' ]++;
         }
     }
-    
     return $retval;
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.fetch.php b/WEB-INF/lib/smarty/plugins/function.fetch.php
index 2b09fb947..768761b23 100644
--- a/WEB-INF/lib/smarty/plugins/function.fetch.php
+++ b/WEB-INF/lib/smarty/plugins/function.fetch.php
@@ -2,215 +2,203 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {fetch} plugin
- *
- * Type:     function<br>
- * Name:     fetch<br>
+ * Type:     function
+ * Name:     fetch
  * Purpose:  fetch file, web or ftp data and display results
- * @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
- *       (Smarty online manual)
+ *
+ * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
- * @param array $params parameters
- * @param object $template template object
- * @return string|null if the assign parameter is passed, Smarty assigns the
- *                     result to a template variable
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
+ * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
  */
 function smarty_function_fetch($params, $template)
 {
-    if (empty($params['file'])) {
-        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
+    if (empty($params[ 'file' ])) {
+        trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
         return;
     }
-
-    $content = '';
-    if (isset($template->security_policy) && !preg_match('!^(http|ftp)://!i', $params['file'])) {
-        if(!$template->security_policy->isTrustedResourceDir($params['file'])) {
-            return;
-        }
-        
-        // fetch the file
-        if($fp = @fopen($params['file'],'r')) {
-            while(!feof($fp)) {
-                $content .= fgets ($fp,4096);
+    // strip file protocol
+    if (stripos($params[ 'file' ], 'file://') === 0) {
+        $params[ 'file' ] = substr($params[ 'file' ], 7);
+    }
+    $protocol = strpos($params[ 'file' ], '://');
+    if ($protocol !== false) {
+        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+    }
+    if (isset($template->smarty->security_policy)) {
+        if ($protocol) {
+            // remote resource (or php stream, …)
+            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+                return;
             }
-            fclose($fp);
         } else {
-            trigger_error('[plugin] fetch cannot read file \'' . $params['file'] . '\'',E_USER_NOTICE);
-            return;
+            // local file
+            if (!$template->smarty->security_policy->isTrustedResourceDir($params[ 'file' ])) {
+                return;
+            }
         }
-    } else {
-        // not a local file
-        if(preg_match('!^http://!i',$params['file'])) {
-            // http fetch
-            if($uri_parts = parse_url($params['file'])) {
-                // set defaults
-                $host = $server_name = $uri_parts['host'];
-                $timeout = 30;
-                $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-                $agent = "Smarty Template Engine ".$template->_version;
-                $referer = "";
-                $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
-                $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
-                $_is_proxy = false;
-                if(empty($uri_parts['port'])) {
-                    $port = 80;
-                } else {
-                    $port = $uri_parts['port'];
-                }
-                if(!empty($uri_parts['user'])) {
-                    $user = $uri_parts['user'];
-                }
-                if(!empty($uri_parts['pass'])) {
-                    $pass = $uri_parts['pass'];
-                }
-                // loop through parameters, setup headers
-                foreach($params as $param_key => $param_value) {
-                    switch($param_key) {
-                        case "file":
-                        case "assign":
-                        case "assign_headers":
-                            break;
-                        case "user":
-                            if(!empty($param_value)) {
-                                $user = $param_value;
-                            }
-                            break;
-                        case "pass":
-                            if(!empty($param_value)) {
-                                $pass = $param_value;
-                            }
-                            break;
-                        case "accept":
-                            if(!empty($param_value)) {
-                                $accept = $param_value;
-                            }
-                            break;
-                        case "header":
-                            if(!empty($param_value)) {
-                                if(!preg_match('![\w\d-]+: .+!',$param_value)) {
-                                    trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
-                                    return;
-                                } else {
-                                    $extra_headers[] = $param_value;
-                                }
-                            }
-                            break;
-                        case "proxy_host":
-                            if(!empty($param_value)) {
-                                $proxy_host = $param_value;
-                            }
-                            break;
-                        case "proxy_port":
-                            if(!preg_match('!\D!', $param_value)) {
-                                $proxy_port = (int) $param_value;
-                            } else {
-                                trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+    }
+    $content = '';
+    if ($protocol === 'http') {
+        // http fetch
+        if ($uri_parts = parse_url($params[ 'file' ])) {
+            // set defaults
+            $host = $server_name = $uri_parts[ 'host' ];
+            $timeout = 30;
+            $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+            $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
+            $referer = '';
+            $uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
+            $uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
+            $_is_proxy = false;
+            if (empty($uri_parts[ 'port' ])) {
+                $port = 80;
+            } else {
+                $port = $uri_parts[ 'port' ];
+            }
+            if (!empty($uri_parts[ 'user' ])) {
+                $user = $uri_parts[ 'user' ];
+            }
+            if (!empty($uri_parts[ 'pass' ])) {
+                $pass = $uri_parts[ 'pass' ];
+            }
+            // loop through parameters, setup headers
+            foreach ($params as $param_key => $param_value) {
+                switch ($param_key) {
+                    case 'file':
+                    case 'assign':
+                    case 'assign_headers':
+                        break;
+                    case 'user':
+                        if (!empty($param_value)) {
+                            $user = $param_value;
+                        }
+                        break;
+                    case 'pass':
+                        if (!empty($param_value)) {
+                            $pass = $param_value;
+                        }
+                        break;
+                    case 'accept':
+                        if (!empty($param_value)) {
+                            $accept = $param_value;
+                        }
+                        break;
+                    case 'header':
+                        if (!empty($param_value)) {
+                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+                                trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
                                 return;
-                            }
-                            break;
-                        case "agent":
-                            if(!empty($param_value)) {
-                                $agent = $param_value;
-                            }
-                            break;
-                        case "referer":
-                            if(!empty($param_value)) {
-                                $referer = $param_value;
-                            }
-                            break;
-                        case "timeout":
-                            if(!preg_match('!\D!', $param_value)) {
-                                $timeout = (int) $param_value;
                             } else {
-                                trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
-                                return;
+                                $extra_headers[] = $param_value;
                             }
-                            break;
-                        default:
-                            trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
+                        }
+                        break;
+                    case 'proxy_host':
+                        if (!empty($param_value)) {
+                            $proxy_host = $param_value;
+                        }
+                        break;
+                    case 'proxy_port':
+                        if (!preg_match('!\D!', $param_value)) {
+                            $proxy_port = (int)$param_value;
+                        } else {
+                            trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
                             return;
-                    }
+                        }
+                        break;
+                    case 'agent':
+                        if (!empty($param_value)) {
+                            $agent = $param_value;
+                        }
+                        break;
+                    case 'referer':
+                        if (!empty($param_value)) {
+                            $referer = $param_value;
+                        }
+                        break;
+                    case 'timeout':
+                        if (!preg_match('!\D!', $param_value)) {
+                            $timeout = (int)$param_value;
+                        } else {
+                            trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
+                            return;
+                        }
+                        break;
+                    default:
+                        trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
+                        return;
                 }
-                if(!empty($proxy_host) && !empty($proxy_port)) {
-                    $_is_proxy = true;
-                    $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+            }
+            if (!empty($proxy_host) && !empty($proxy_port)) {
+                $_is_proxy = true;
+                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
+            } else {
+                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
+            }
+            if (!$fp) {
+                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+                return;
+            } else {
+                if ($_is_proxy) {
+                    fputs($fp, 'GET ' . $params[ 'file' ] . " HTTP/1.0\r\n");
                 } else {
-                    $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+                    fputs($fp, "GET $uri HTTP/1.0\r\n");
                 }
-
-                if(!$fp) {
-                    trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
-                    return;
-                } else {
-                    if($_is_proxy) {
-                        fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
-                    } else {
-                        fputs($fp, "GET $uri HTTP/1.0\r\n");
-                    }
-                    if(!empty($host)) {
-                        fputs($fp, "Host: $host\r\n");
-                    }
-                    if(!empty($accept)) {
-                        fputs($fp, "Accept: $accept\r\n");
-                    }
-                    if(!empty($agent)) {
-                        fputs($fp, "User-Agent: $agent\r\n");
-                    }
-                    if(!empty($referer)) {
-                        fputs($fp, "Referer: $referer\r\n");
-                    }
-                    if(isset($extra_headers) && is_array($extra_headers)) {
-                        foreach($extra_headers as $curr_header) {
-                            fputs($fp, $curr_header."\r\n");
-                        }
-                    }
-                    if(!empty($user) && !empty($pass)) {
-                        fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
-                    }
-
-                    fputs($fp, "\r\n");
-                    while(!feof($fp)) {
-                        $content .= fgets($fp,4096);
-                    }
-                    fclose($fp);
-                    $csplit = preg_split("!\r\n\r\n!",$content,2);
-
-                    $content = $csplit[1];
-
-                    if(!empty($params['assign_headers'])) {
-                        $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
+                if (!empty($host)) {
+                    fputs($fp, "Host: $host\r\n");
+                }
+                if (!empty($accept)) {
+                    fputs($fp, "Accept: $accept\r\n");
+                }
+                if (!empty($agent)) {
+                    fputs($fp, "User-Agent: $agent\r\n");
+                }
+                if (!empty($referer)) {
+                    fputs($fp, "Referer: $referer\r\n");
+                }
+                if (isset($extra_headers) && is_array($extra_headers)) {
+                    foreach ($extra_headers as $curr_header) {
+                        fputs($fp, $curr_header . "\r\n");
                     }
                 }
-            } else {
-                trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
-                return;
-            }
-        } else {
-            // ftp fetch
-            if($fp = @fopen($params['file'],'r')) {
-                while(!feof($fp)) {
-                    $content .= fgets ($fp,4096);
+                if (!empty($user) && !empty($pass)) {
+                    fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
+                }
+                fputs($fp, "\r\n");
+                while (!feof($fp)) {
+                    $content .= fgets($fp, 4096);
                 }
                 fclose($fp);
-            } else {
-                trigger_error('[plugin] fetch cannot read file \'' . $params['file'] .'\'',E_USER_NOTICE);
-                return;
+                $csplit = preg_split("!\r\n\r\n!", $content, 2);
+                $content = $csplit[ 1 ];
+                if (!empty($params[ 'assign_headers' ])) {
+                    $template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ]));
+                }
             }
+        } else {
+            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+            return;
+        }
+    } else {
+        $content = @file_get_contents($params[ 'file' ]);
+        if ($content === false) {
+            throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
         }
-
     }
-
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'],$content);
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $content);
     } else {
         return $content;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php b/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php
index 6a1a3ffdc..302358edd 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php
@@ -2,142 +2,285 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_checkboxes} function plugin
- *
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
+ * File:       function.html_checkboxes.php
+ * Type:       function
+ * Name:       html_checkboxes
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of checkbox input types
  * Examples:
- * <pre>
+ *
  * {html_checkboxes values=$ids output=$names}
  * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
  * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- * @param array $params parameters
- * Input:<br>
- *           - name       (optional) - string default "checkbox"
- *           - values     (required) - array
- *           - options    (optional) - associative array
- *           - checked    (optional) - array default not set
- *           - separator  (optional) - ie <br> or &nbsp;
- *           - output     (optional) - the output next to each checkbox
- *           - assign     (optional) - assign the output as an array to this variable
- * @param object $template template object
+ *
+ * Params:
+ *
+ * - name       (optional) - string default "checkbox"
+ * - values     (required) - array
+ * - options    (optional) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each checkbox
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *             (Smarty online manual)
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
  * @return string
- * @uses smarty_function_escape_special_chars()
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \SmartyException
  */
-function smarty_function_html_checkboxes($params, $template)
+function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
     $name = 'checkbox';
     $values = null;
     $options = null;
-    $selected = null;
+    $selected = array();
     $separator = '';
+    $escape = true;
     $labels = true;
+    $label_ids = false;
     $output = null;
-
     $extra = '';
-
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
             case 'separator':
-                $$_key = $_val;
+                $$_key = (string)$_val;
                 break;
-
+            case 'escape':
             case 'labels':
+            case 'label_ids':
                 $$_key = (bool)$_val;
                 break;
-
             case 'options':
                 $$_key = (array)$_val;
                 break;
-
             case 'values':
             case 'output':
                 $$_key = array_values((array)$_val);
                 break;
-
             case 'checked':
             case 'selected':
-                $selected = array_map('strval', array_values((array)$_val));
+                if (is_array($_val)) {
+                    $selected = array();
+                    foreach ($_val as $_sel) {
+                        if (is_object($_sel)) {
+                            if (method_exists($_sel, '__toString')) {
+                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+                            } else {
+                                trigger_error(
+                                    'html_checkboxes: selected attribute contains an object of class \'' .
+                                    get_class($_sel) . '\' without __toString() method',
+                                    E_USER_NOTICE
+                                );
+                                continue;
+                            }
+                        } else {
+                            $_sel = smarty_function_escape_special_chars((string)$_sel);
+                        }
+                        $selected[ $_sel ] = true;
+                    }
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, '__toString')) {
+                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
+                    } else {
+                        trigger_error(
+                            'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+                            '\' without __toString() method',
+                            E_USER_NOTICE
+                        );
+                    }
+                } else {
+                    $selected = smarty_function_escape_special_chars((string)$_val);
+                }
                 break;
-
             case 'checkboxes':
-                trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
+                trigger_error(
+                    'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+                    E_USER_WARNING
+                );
                 $options = (array)$_val;
                 break;
-
             case 'assign':
                 break;
-
+            case 'strict':
+                break;
+            case 'disabled':
+            case 'readonly':
+                if (!empty($params[ 'strict' ])) {
+                    if (!is_scalar($_val)) {
+                        trigger_error(
+                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+                            E_USER_NOTICE
+                        );
+                    }
+                    if ($_val === true || $_val === $_key) {
+                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+                    }
+                    break;
+                }
+            // omit break; to fall through!
+            // no break
             default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    settype($selected, 'array');
+    if (!isset($options) && !isset($values)) {
+        return '';
+    } /* raise error here? */
     $_html_result = array();
-
     if (isset($options)) {
-
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
-
-
+        foreach ($options as $_key => $_val) {
+            $_html_result[] =
+                smarty_function_html_checkboxes_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
     } else {
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_html_result[] =
+                smarty_function_html_checkboxes_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
         }
-
     }
-
-    if(!empty($params['assign'])) {
-        $template->assign($params['assign'], $_html_result);
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $_html_result);
     } else {
-        return implode("\n",$_html_result);
+        return implode("\n", $_html_result);
     }
-
 }
 
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) {
+/**
+ * @param      $name
+ * @param      $value
+ * @param      $output
+ * @param      $selected
+ * @param      $extra
+ * @param      $separator
+ * @param      $labels
+ * @param      $label_ids
+ * @param bool $escape
+ *
+ * @return string
+ */
+function smarty_function_html_checkboxes_output(
+    $name,
+    $value,
+    $output,
+    $selected,
+    $extra,
+    $separator,
+    $labels,
+    $label_ids,
+    $escape = true
+) {
     $_output = '';
-    if ($labels) $_output .= '<label>';
-    $_output .= '<input type="checkbox" name="'
-        . smarty_function_escape_special_chars($name) . '[]" value="'
-        . smarty_function_escape_special_chars($value) . '"';
-
-    if (in_array((string)$value, $selected)) {
+    if (is_object($value)) {
+        if (method_exists($value, '__toString')) {
+            $value = (string)$value->__toString();
+        } else {
+            trigger_error(
+                'html_options: value is an object of class \'' . get_class($value) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $value = (string)$value;
+    }
+    if (is_object($output)) {
+        if (method_exists($output, '__toString')) {
+            $output = (string)$output->__toString();
+        } else {
+            trigger_error(
+                'html_options: output is an object of class \'' . get_class($output) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $output = (string)$output;
+    }
+    if ($labels) {
+        if ($label_ids) {
+            $_id = smarty_function_escape_special_chars(
+                preg_replace(
+                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
+                    '_',
+                    $name . '_' . $value
+                )
+            );
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';
+        }
+    }
+    $name = smarty_function_escape_special_chars($name);
+    $value = smarty_function_escape_special_chars($value);
+    if ($escape) {
+        $output = smarty_function_escape_special_chars($output);
+    }
+    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
+    if ($labels && $label_ids) {
+        $_output .= ' id="' . $_id . '"';
+    }
+    if (is_array($selected)) {
+        if (isset($selected[ $value ])) {
+            $_output .= ' checked="checked"';
+        }
+    } elseif ($value === $selected) {
         $_output .= ' checked="checked"';
     }
     $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
-
+    if ($labels) {
+        $_output .= '</label>';
+    }
+    $_output .= $separator;
     return $_output;
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.html_image.php b/WEB-INF/lib/smarty/plugins/function.html_image.php
index abb7b5789..ad468e4f1 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_image.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_image.php
@@ -1,42 +1,49 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_image} function plugin
- * 
- * Type:     function<br>
- * Name:     html_image<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  format HTML tags for the image<br>
+ * Type:     function
+ * Name:     html_image
+ * Date:     Feb 24, 2003
+ * Purpose:  format HTML tags for the image
  * Examples: {html_image file="/images/masthead.gif"}
  * Output:   <img src="/images/masthead.gif" width=400 height=23>
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author credits to Duda <duda@big.hu> 
+ * Params:
+ *
+ * - file        - (required) - file (and path) of image
+ * - height      - (optional) - image height (default actual height)
+ * - width       - (optional) - image width (default actual width)
+ * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
+ * - path_prefix - prefix for path output (optional, default empty)
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ *          (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
  * @version 1.0
- * @param array $params parameters
- * Input:<br>
- *          - file = file (and path) of image (required)
- *          - height = image height (optional, default actual height)
- *          - width = image width (optional, default actual width)
- *          - basedir = base directory for absolute paths, default
- *                      is environment variable DOCUMENT_ROOT
- *          - path_prefix = prefix for path output (optional, default empty)
- * @param object $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
  */
-function smarty_function_html_image($params, $template)
+function smarty_function_html_image($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
- 
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
     $alt = '';
     $file = '';
     $height = '';
@@ -45,9 +52,8 @@ function smarty_function_html_image($params, $template)
     $prefix = '';
     $suffix = '';
     $path_prefix = '';
-    $server_vars = $_SERVER;
-    $basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
-    foreach($params as $_key => $_val) {
+    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'file':
             case 'height':
@@ -57,81 +63,96 @@ function smarty_function_html_image($params, $template)
             case 'basedir':
                 $$_key = $_val;
                 break;
-
             case 'alt':
                 if (!is_array($_val)) {
                     $$_key = smarty_function_escape_special_chars($_val);
                 } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                    throw new SmartyException(
+                        "html_image: extra attribute '{$_key}' cannot be an array",
+                        E_USER_NOTICE
+                    );
+                }
                 break;
-
             case 'link':
             case 'href':
                 $prefix = '<a href="' . $_val . '">';
                 $suffix = '</a>';
                 break;
-
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                    throw new SmartyException(
+                        "html_image: extra attribute '{$_key}' cannot be an array",
+                        E_USER_NOTICE
+                    );
+                }
                 break;
-        } 
-    } 
-
+        }
+    }
     if (empty($file)) {
-        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+        trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
         return;
-    } 
-
-    if (substr($file, 0, 1) == '/') {
+    }
+    if ($file[ 0 ] === '/') {
         $_image_path = $basedir . $file;
     } else {
         $_image_path = $file;
-    } 
-
-    if (!isset($params['width']) || !isset($params['height'])) {
+    }
+    // strip file protocol
+    if (stripos($params[ 'file' ], 'file://') === 0) {
+        $params[ 'file' ] = substr($params[ 'file' ], 7);
+    }
+    $protocol = strpos($params[ 'file' ], '://');
+    if ($protocol !== false) {
+        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+    }
+    if (isset($template->smarty->security_policy)) {
+        if ($protocol) {
+            // remote resource (or php stream, …)
+            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+                return;
+            }
+        } else {
+            // local file
+            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
+                return;
+            }
+        }
+    }
+    if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
+        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
         if (!$_image_data = @getimagesize($_image_path)) {
             if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+                trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
                 return;
-            } else if (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+            } elseif (!is_readable($_image_path)) {
+                trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
                 return;
             } else {
-                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-                return;
-            } 
-        } 
-        if (isset($template->security_policy)) {
-            if (!$template->security_policy->isTrustedResourceDir($_image_path)) {
+                trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
                 return;
-            } 
-        } 
-
-        if (!isset($params['width'])) {
-            $width = $_image_data[0];
-        } 
-        if (!isset($params['height'])) {
-            $height = $_image_data[1];
-        } 
-    } 
-
-    if (isset($params['dpi'])) {
-        if (strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
+            }
+        }
+        if (!isset($params[ 'width' ])) {
+            $width = $_image_data[ 0 ];
+        }
+        if (!isset($params[ 'height' ])) {
+            $height = $_image_data[ 1 ];
+        }
+    }
+    if (isset($params[ 'dpi' ])) {
+        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
+            // FIXME: (rodneyrehm) wrong dpi assumption
+            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
             $dpi_default = 72;
         } else {
             $dpi_default = 96;
-        } 
-        $_resize = $dpi_default / $params['dpi'];
+        }
+        $_resize = $dpi_default / $params[ 'dpi' ];
         $width = round($width * $_resize);
         $height = round($height * $_resize);
-    } 
-
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
-} 
-
-?>
\ No newline at end of file
+    }
+    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
+           $height . '"' . $extra . ' />' . $suffix;
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.html_options.php b/WEB-INF/lib/smarty/plugins/function.html_options.php
index 7ac039028..6907e8ee1 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_options.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_options.php
@@ -1,133 +1,230 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_options} function plugin
- * 
- * Type:     function<br>
- * Name:     html_options<br>
+ * Type:     function
+ * Name:     html_options
  * Purpose:  Prints the list of <option> tags generated from
- *            the passed parameters
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param array $params parameters
- * Input:<br>
- *            - name       (optional) - string default "select"
- *            - values     (required if no options supplied) - array
- *            - options    (required if no values supplied) - associative array
- *            - selected   (optional) - string default not set
- *            - output     (required if not options supplied) - array
- * @param object $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *           the passed parameters
+ * Params:
+ *
+ * - name       (optional) - string default "select"
+ * - values     (required) - if no options supplied) - array
+ * - options    (required) - if no values supplied) - associative array
+ * - selected   (optional) - string default not set
+ * - output     (required) - if not options supplied) - array
+ * - id         (optional) - string default not set
+ * - class      (optional) - string default not set
+ *
+ * @link   http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ *           (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @uses   smarty_function_escape_special_chars()
+ * @throws \SmartyException
  */
-function smarty_function_html_options($params, $template)
+function smarty_function_html_options($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
     $name = null;
     $values = null;
     $options = null;
-    $selected = array();
+    $selected = null;
     $output = null;
     $id = null;
     $class = null;
-
     $extra = '';
-    $options_extra = '';
-
-    foreach($params as $_key => $_val) {
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'name':
             case 'class':
             case 'id':
                 $$_key = (string)$_val;
                 break;
-
             case 'options':
-                $$_key = (array)$_val;
+                $options = (array)$_val;
                 break;
-
             case 'values':
             case 'output':
                 $$_key = array_values((array)$_val);
                 break;
-
             case 'selected':
-                $$_key = array_map('strval', array_values((array)$_val));
+                if (is_array($_val)) {
+                    $selected = array();
+                    foreach ($_val as $_sel) {
+                        if (is_object($_sel)) {
+                            if (method_exists($_sel, '__toString')) {
+                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+                            } else {
+                                trigger_error(
+                                    'html_options: selected attribute contains an object of class \'' .
+                                    get_class($_sel) . '\' without __toString() method',
+                                    E_USER_NOTICE
+                                );
+                                continue;
+                            }
+                        } else {
+                            $_sel = smarty_function_escape_special_chars((string)$_sel);
+                        }
+                        $selected[ $_sel ] = true;
+                    }
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, '__toString')) {
+                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
+                    } else {
+                        trigger_error(
+                            'html_options: selected attribute is an object of class \'' . get_class($_val) .
+                            '\' without __toString() method',
+                            E_USER_NOTICE
+                        );
+                    }
+                } else {
+                    $selected = smarty_function_escape_special_chars((string)$_val);
+                }
                 break;
-
+            case 'strict':
+                break;
+            case 'disabled':
+            case 'readonly':
+                if (!empty($params[ 'strict' ])) {
+                    if (!is_scalar($_val)) {
+                        trigger_error(
+                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+                            E_USER_NOTICE
+                        );
+                    }
+                    if ($_val === true || $_val === $_key) {
+                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+                    }
+                    break;
+                }
+            // omit break; to fall through!
+            // no break
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                    trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
                 break;
-        } 
-    } 
-
-    if (!isset($options) && !isset($values))
+        }
+    }
+    if (!isset($options) && !isset($values)) {
+        /* raise error here? */
         return '';
-    /* raise error here? */
-
+    }
     $_html_result = '';
     $_idx = 0;
-
     if (isset($options)) {
         foreach ($options as $_key => $_val) {
-          $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
             $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        } 
-    } 
-
+        }
+    }
     if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
-        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-    } 
-
+        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+        $_html_result =
+            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
+            '</select>' . "\n";
+    }
     return $_html_result;
-} 
+}
 
+/**
+ * @param $key
+ * @param $value
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
 function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
 {
     if (!is_array($value)) {
-        $_html_result = '<option value="' .
-        smarty_function_escape_special_chars($key) . '"';
-        if (in_array((string)$key, $selected))
+        $_key = smarty_function_escape_special_chars($key);
+        $_html_result = '<option value="' . $_key . '"';
+        if (is_array($selected)) {
+            if (isset($selected[ $_key ])) {
+                $_html_result .= ' selected="selected"';
+            }
+        } elseif ($_key === $selected) {
             $_html_result .= ' selected="selected"';
-        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
-        $_html_result .= $_html_class . $_html_id . '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
+        }
+        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
+        if (is_object($value)) {
+            if (method_exists($value, '__toString')) {
+                $value = smarty_function_escape_special_chars((string)$value->__toString());
+            } else {
+                trigger_error(
+                    'html_options: value is an object of class \'' . get_class($value) .
+                    '\' without __toString() method',
+                    E_USER_NOTICE
+                );
+                return '';
+            }
+        } else {
+            $value = smarty_function_escape_special_chars((string)$value);
+        }
+        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
         $idx++;
     } else {
         $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, $id.'-'.$idx, $class, $_idx);
+        $_html_result =
+            smarty_function_html_options_optgroup(
+                $key,
+                $value,
+                $selected,
+                !empty($id) ? ($id . '-' . $idx) : null,
+                $class,
+                $_idx
+            );
         $idx++;
     }
     return $_html_result;
-} 
+}
 
+/**
+ * @param $key
+ * @param $values
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
     $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
     foreach ($values as $key => $value) {
         $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    } 
+    }
     $optgroup_html .= "</optgroup>\n";
     return $optgroup_html;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.html_radios.php b/WEB-INF/lib/smarty/plugins/function.html_radios.php
index c6b27edf2..5e834587c 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_radios.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_radios.php
@@ -1,154 +1,266 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_radios} function plugin
- * 
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
+ * File:       function.html_radios.php
+ * Type:       function
+ * Name:       html_radios
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of radio input types
+ * Params:
+ *
+ * - name       (optional) - string default "radio"
+ * - values     (required) - array
+ * - options    (required) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each radio button
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
  * Examples:
- * <pre>
+ *
  * {html_radios values=$ids output=$names}
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *      (Smarty online manual)
- * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
- * @author credits to Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *          (Smarty online manual)
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
  * @version 1.0
- * @param array $params parameters
- * Input:<br>
- *            - name       (optional) - string default "radio"
- *            - values     (required) - array
- *            - options    (optional) - associative array
- *            - checked    (optional) - array default not set
- *            - separator  (optional) - ie <br> or &nbsp;
- *            - output     (optional) - the output next to each radio button
- *            - assign     (optional) - assign the output as an array to this variable
- * @param object $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \SmartyException
  */
-function smarty_function_html_radios($params, $template)
+function smarty_function_html_radios($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
     $name = 'radio';
     $values = null;
     $options = null;
     $selected = null;
     $separator = '';
+    $escape = true;
     $labels = true;
     $label_ids = false;
     $output = null;
     $extra = '';
-
-    foreach($params as $_key => $_val) {
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'name':
             case 'separator':
                 $$_key = (string)$_val;
                 break;
-
             case 'checked':
             case 'selected':
                 if (is_array($_val)) {
                     trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, '__toString')) {
+                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
+                    } else {
+                        trigger_error(
+                            'html_radios: selected attribute is an object of class \'' . get_class($_val) .
+                            '\' without __toString() method',
+                            E_USER_NOTICE
+                        );
+                    }
                 } else {
                     $selected = (string)$_val;
-                } 
+                }
                 break;
-
+            case 'escape':
             case 'labels':
             case 'label_ids':
                 $$_key = (bool)$_val;
                 break;
-
             case 'options':
                 $$_key = (array)$_val;
                 break;
-
             case 'values':
             case 'output':
                 $$_key = array_values((array)$_val);
                 break;
-
             case 'radios':
-                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
+                trigger_error(
+                    'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+                    E_USER_WARNING
+                );
                 $options = (array)$_val;
                 break;
-
             case 'assign':
                 break;
-
+            case 'strict':
+                break;
+            case 'disabled':
+            case 'readonly':
+                if (!empty($params[ 'strict' ])) {
+                    if (!is_scalar($_val)) {
+                        trigger_error(
+                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+                            E_USER_NOTICE
+                        );
+                    }
+                    if ($_val === true || $_val === $_key) {
+                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+                    }
+                    break;
+                }
+            // omit break; to fall through!
+            // no break
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                    trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
                 break;
-        } 
-    } 
-
-    if (!isset($options) && !isset($values))
+        }
+    }
+    if (!isset($options) && !isset($values)) {
+        /* raise error here? */
         return '';
-    /* raise error here? */
-
+    }
     $_html_result = array();
-
     if (isset($options)) {
-        foreach ($options as $_key => $_val)
-        $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        foreach ($options as $_key => $_val) {
+            $_html_result[] =
+                smarty_function_html_radios_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
-        } 
-    } 
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'], $_html_result);
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_html_result[] =
+                smarty_function_html_radios_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
+    }
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $_html_result);
     } else {
         return implode("\n", $_html_result);
-    } 
-} 
+    }
+}
 
-function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids)
-{
+/**
+ * @param $name
+ * @param $value
+ * @param $output
+ * @param $selected
+ * @param $extra
+ * @param $separator
+ * @param $labels
+ * @param $label_ids
+ * @param $escape
+ *
+ * @return string
+ */
+function smarty_function_html_radios_output(
+    $name,
+    $value,
+    $output,
+    $selected,
+    $extra,
+    $separator,
+    $labels,
+    $label_ids,
+    $escape
+) {
     $_output = '';
+    if (is_object($value)) {
+        if (method_exists($value, '__toString')) {
+            $value = (string)$value->__toString();
+        } else {
+            trigger_error(
+                'html_options: value is an object of class \'' . get_class($value) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $value = (string)$value;
+    }
+    if (is_object($output)) {
+        if (method_exists($output, '__toString')) {
+            $output = (string)$output->__toString();
+        } else {
+            trigger_error(
+                'html_options: output is an object of class \'' . get_class($output) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $output = (string)$output;
+    }
     if ($labels) {
         if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
+            $_id = smarty_function_escape_special_chars(
+                preg_replace(
+                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
+                    '_',
+                    $name . '_' . $value
+                )
+            );
             $_output .= '<label for="' . $_id . '">';
         } else {
             $_output .= '<label>';
-        } 
-    } 
-    $_output .= '<input type="radio" name="'
-     . smarty_function_escape_special_chars($name) . '" value="'
-     . smarty_function_escape_special_chars($value) . '"';
-
-    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
-
-    if ((string)$value == $selected) {
+        }
+    }
+    $name = smarty_function_escape_special_chars($name);
+    $value = smarty_function_escape_special_chars($value);
+    if ($escape) {
+        $output = smarty_function_escape_special_chars($output);
+    }
+    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
+    if ($labels && $label_ids) {
+        $_output .= ' id="' . $_id . '"';
+    }
+    if ($value === $selected) {
         $_output .= ' checked="checked"';
-    } 
+    }
     $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
+    if ($labels) {
+        $_output .= '</label>';
+    }
     $_output .= $separator;
-
     return $_output;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.html_select_date.php b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
index 1d57fdc7a..86403e3dc 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_select_date.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
@@ -1,61 +1,80 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_select_date} plugin
- * 
- * Type:     function<br>
- * Name:     html_select_date<br>
+ * Type:     function
+ * Name:     html_select_date
  * Purpose:  Prints the dropdowns for date selection.
- * 
- * ChangeLog:<br>
+ * ChangeLog:
+ *
  *            - 1.0 initial release
  *            - 1.1 added support for +/- N syntax for begin
- *                 and end year values. (Monte)
+ *              and end year values. (Monte)
  *            - 1.2 added support for yyyy-mm-dd syntax for
- *                 time value. (Jan Rosier)
+ *              time value. (Jan Rosier)
  *            - 1.3 added support for choosing format for
- *                 month values (Gary Loescher)
+ *              month values (Gary Loescher)
  *            - 1.3.1 added support for choosing format for
- *                 day values (Marcus Bointon)
+ *              day values (Marcus Bointon)
  *            - 1.3.2 support negative timestamps, force year
  *              dropdown to include given date unless explicitly set (Monte)
  *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
  *              of 0000-00-00 dates (cybot, boots)
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
- *      (Smarty online manual)
- * @version 1.3.4
- * @author Andrei Zmievski 
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param array $params parameters
- * @param object $template template object
- * @return string 
+ *            - 2.0 complete rewrite for performance,
+ *              added attributes month_names, *_id
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *           (Smarty online manual)
+ * @version 2.0
+ * @author  Andrei Zmievski
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  Rodney Rehm
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @throws \SmartyException
  */
-function smarty_function_html_select_date($params, $template)
+function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    require_once(SMARTY_PLUGINS_DIR . 'function.html_options.php');
-
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    // generate timestamps used for month names only
+    static $_month_timestamps = null;
+    static $_current_year = null;
+    if ($_month_timestamps === null) {
+        $_current_year = date('Y');
+        $_month_timestamps = array();
+        for ($i = 1; $i <= 12; $i++) {
+            $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
+        }
+    }
     /* Default values. */
-    $prefix = "Date_";
-    $start_year = strftime("%Y");
-    $end_year = $start_year;
+    $prefix = 'Date_';
+    $start_year = null;
+    $end_year = null;
     $display_days = true;
     $display_months = true;
     $display_years = true;
-    $month_format = "%B";
+    $month_format = '%B';
     /* Write months as numbers by default  GL */
-    $month_value_format = "%m";
-    $day_format = "%02d";
+    $month_value_format = '%m';
+    $day_format = '%02d';
     /* Write day values using this format MB */
-    $day_value_format = "%d";
+    $day_value_format = '%d';
     $year_as_text = false;
     /* Display years in reverse order? Ie. 2000,1999,.... */
     $reverse_years = false;
@@ -80,23 +99,47 @@ function smarty_function_html_select_date($params, $template)
     $field_order = 'MDY';
     /* String printed between the different fields. */
     $field_separator = "\n";
-    $time = time();
-    $all_empty = null;
-    $day_empty = null;
-    $month_empty = null;
-    $year_empty = null;
+    $option_separator = "\n";
+    $time = null;
+    // $all_empty = null;
+    // $day_empty = null;
+    // $month_empty = null;
+    // $year_empty = null;
     $extra_attrs = '';
-
+    $all_id = null;
+    $day_id = null;
+    $month_id = null;
+    $year_id = null;
     foreach ($params as $_key => $_value) {
         switch ($_key) {
-            case 'prefix':
             case 'time':
+                if (!is_array($_value) && $_value !== null) {
+                    $template->_checkPlugins(
+                        array(
+                            array(
+                                'function' => 'smarty_make_timestamp',
+                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                            )
+                        )
+                    );
+                    $time = smarty_make_timestamp($_value);
+                }
+                break;
+            case 'month_names':
+                if (is_array($_value) && count($_value) === 12) {
+                    $$_key = $_value;
+                } else {
+                    trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
+                }
+                break;
+            case 'prefix':
+            case 'field_array':
             case 'start_year':
             case 'end_year':
-            case 'month_format':
             case 'day_format':
             case 'day_value_format':
-            case 'field_array':
+            case 'month_format':
+            case 'month_value_format':
             case 'day_size':
             case 'month_size':
             case 'year_size':
@@ -106,18 +149,17 @@ function smarty_function_html_select_date($params, $template)
             case 'year_extra':
             case 'field_order':
             case 'field_separator':
-            case 'month_value_format':
+            case 'option_separator':
+            case 'all_empty':
             case 'month_empty':
             case 'day_empty':
             case 'year_empty':
+            case 'all_id':
+            case 'month_id':
+            case 'day_id':
+            case 'year_id':
                 $$_key = (string)$_value;
                 break;
-
-            case 'all_empty':
-                $$_key = (string)$_value;
-                $day_empty = $month_empty = $year_empty = $all_empty;
-                break;
-
             case 'display_days':
             case 'display_months':
             case 'display_years':
@@ -125,206 +167,222 @@ function smarty_function_html_select_date($params, $template)
             case 'reverse_years':
                 $$_key = (bool)$_value;
                 break;
-
             default:
                 if (!is_array($_value)) {
                     $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
                 } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
                 break;
-        } 
-    } 
-
-    if (preg_match('!^-\d+$!', $time)) {
-        // negative timestamp, use date()
-        $time = date('Y-m-d', $time);
-    } 
-    // If $time is not in format yyyy-mm-dd
-    if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
-        $time = $found[1];
+        }
+    }
+    // Note: date() is faster than strftime()
+    // Note: explode(date()) is faster than date() date() date()
+    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
+        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
+            // $_REQUEST[$field_array] given
+            foreach (array(
+                'Y' => 'Year',
+                'm' => 'Month',
+                'd' => 'Day'
+            ) as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName =
+                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                        date($_elementKey);
+            }
+        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
+            // $_REQUEST given
+            foreach (array(
+                'Y' => 'Year',
+                'm' => 'Month',
+                'd' => 'Day'
+            ) as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+            }
+        } else {
+            // no date found, use NOW
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
+    } elseif ($time === null) {
+        if (array_key_exists('time', $params)) {
+            $_year = $_month = $_day = $time = null;
+        } else {
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
     } else {
-        // use smarty_make_timestamp to get an unix timestamp and
-        // strftime to make yyyy-mm-dd
-        $time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
-    } 
-    // Now split this in pieces, which later can be used to set the select
-    $time = explode("-", $time); 
-    // make syntax "+N" or "-N" work with start_year and end_year
-    if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
-        if ($match[1] == '+') {
-            $end_year = strftime('%Y') + $match[2];
+        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
+    }
+    // make syntax "+N" or "-N" work with $start_year and $end_year
+    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
+    foreach (array(
+        'start',
+        'end'
+    ) as $key) {
+        $key .= '_year';
+        $t = $$key;
+        if ($t === null) {
+            $$key = (int)$_current_year;
+        } elseif ($t[ 0 ] === '+') {
+            $$key = (int)($_current_year + (int)trim(substr($t, 1)));
+        } elseif ($t[ 0 ] === '-') {
+            $$key = (int)($_current_year - (int)trim(substr($t, 1)));
         } else {
-            $end_year = strftime('%Y') - $match[2];
-        } 
-    } 
-    if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
-        if ($match[1] == '+') {
-            $start_year = strftime('%Y') + $match[2];
+            $$key = (int)$$key;
+        }
+    }
+    // flip for ascending or descending
+    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
+        $t = $end_year;
+        $end_year = $start_year;
+        $start_year = $t;
+    }
+    // generate year <select> or <input>
+    if ($display_years) {
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($year_extra) {
+            $_extra .= ' ' . $year_extra;
+        }
+        if ($year_as_text) {
+            $_html_years =
+                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+                $extra_attrs . ' />';
         } else {
-            $start_year = strftime('%Y') - $match[2];
-        } 
-    } 
-    if (strlen($time[0]) > 0) {
-        if ($start_year > $time[0] && !isset($params['start_year'])) {
-            // force start year to include given date if not explicitly set
-            $start_year = $time[0];
-        } 
-        if ($end_year < $time[0] && !isset($params['end_year'])) {
-            // force end year to include given date if not explicitly set
-            $end_year = $time[0];
-        } 
-    } 
-
-    $field_order = strtoupper($field_order);
-
-    $html_result = $month_result = $day_result = $year_result = "";
-
-    $field_separator_count = -1;
+            $_html_years = '<select name="' . $_name . '"';
+            if ($year_id !== null || $all_id !== null) {
+                $_html_years .= ' id="' . smarty_function_escape_special_chars(
+                        $year_id !== null ?
+                            ($year_id ? $year_id : $_name) :
+                            ($all_id ? ($all_id . $_name) :
+                                $_name)
+                    ) . '"';
+            }
+            if ($year_size) {
+                $_html_years .= ' size="' . $year_size . '"';
+            }
+            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+            if (isset($year_empty) || isset($all_empty)) {
+                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
+                                $option_separator;
+            }
+            $op = $start_year > $end_year ? -1 : 1;
+            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+                $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
+                                '</option>' . $option_separator;
+            }
+            $_html_years .= '</select>';
+        }
+    }
+    // generate month <select> or <input>
     if ($display_months) {
-        $field_separator_count++;
-        $month_names = array();
-        $month_values = array();
-        if (isset($month_empty)) {
-            $month_names[''] = $month_empty;
-            $month_values[''] = '';
-        } 
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($month_extra) {
+            $_extra .= ' ' . $month_extra;
+        }
+        $_html_months = '<select name="' . $_name . '"';
+        if ($month_id !== null || $all_id !== null) {
+            $_html_months .= ' id="' . smarty_function_escape_special_chars(
+                    $month_id !== null ?
+                        ($month_id ? $month_id : $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($month_size) {
+            $_html_months .= ' size="' . $month_size . '"';
+        }
+        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($month_empty) || isset($all_empty)) {
+            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
+                             $option_separator;
+        }
         for ($i = 1; $i <= 12; $i++) {
-            $month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000));
-            $month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
-        } 
-
-        $month_result .= '<select name=';
-        if (null !== $field_array) {
-            $month_result .= '"' . $field_array . '[' . $prefix . 'Month]"';
-        } else {
-            $month_result .= '"' . $prefix . 'Month"';
-        } 
-        if (null !== $month_size) {
-            $month_result .= ' size="' . $month_size . '"';
-        } 
-        if (null !== $month_extra) {
-            $month_result .= ' ' . $month_extra;
-        } 
-        if (null !== $all_extra) {
-            $month_result .= ' ' . $all_extra;
-        } 
-        $month_result .= $extra_attrs . '>' . "\n";
-
-        $month_result .= smarty_function_html_options(array('output' => $month_names,
-                'values' => $month_values,
-                'selected' => (int)$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
-                'print_result' => false),
-                 $template);
-        $month_result .= '</select>';
-    } 
-
+            $_val = sprintf('%02d', $i);
+            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
+                ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
+            $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+            $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
+                             '>' . $_text . '</option>' . $option_separator;
+        }
+        $_html_months .= '</select>';
+    }
+    // generate day <select> or <input>
     if ($display_days) {
-        $field_separator_count++;
-        $days = array();
-        if (isset($day_empty)) {
-            $days[''] = $day_empty;
-            $day_values[''] = '';
-        } 
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($day_extra) {
+            $_extra .= ' ' . $day_extra;
+        }
+        $_html_days = '<select name="' . $_name . '"';
+        if ($day_id !== null || $all_id !== null) {
+            $_html_days .= ' id="' .
+                           smarty_function_escape_special_chars(
+                               $day_id !== null ? ($day_id ? $day_id : $_name) :
+                                   ($all_id ? ($all_id . $_name) : $_name)
+                           ) . '"';
+        }
+        if ($day_size) {
+            $_html_days .= ' size="' . $day_size . '"';
+        }
+        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($day_empty) || isset($all_empty)) {
+            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
+                           $option_separator;
+        }
         for ($i = 1; $i <= 31; $i++) {
-            $days[] = sprintf($day_format, $i);
-            $day_values[] = sprintf($day_value_format, $i);
-        } 
-
-        $day_result .= '<select name=';
-        if (null !== $field_array) {
-            $day_result .= '"' . $field_array . '[' . $prefix . 'Day]"';
-        } else {
-            $day_result .= '"' . $prefix . 'Day"';
-        } 
-        if (null !== $day_size) {
-            $day_result .= ' size="' . $day_size . '"';
-        } 
-        if (null !== $all_extra) {
-            $day_result .= ' ' . $all_extra;
-        } 
-        if (null !== $day_extra) {
-            $day_result .= ' ' . $day_extra;
-        } 
-        $day_result .= $extra_attrs . '>' . "\n";
-        $day_result .= smarty_function_html_options(array('output' => $days,
-                'values' => $day_values,
-                'selected' => $time[2],
-                'print_result' => false),
-             $template);
-        $day_result .= '</select>';
-    } 
-
-    if ($display_years) {
-        $field_separator_count++;
-        if (null !== $field_array) {
-            $year_name = $field_array . '[' . $prefix . 'Year]';
-        } else {
-            $year_name = $prefix . 'Year';
-        } 
-        if ($year_as_text) {
-            $year_result .= '<input type="text" name="' . $year_name . '" value="' . $time[0] . '" size="4" maxlength="4"';
-            if (null !== $all_extra) {
-                $year_result .= ' ' . $all_extra;
-            } 
-            if (null !== $year_extra) {
-                $year_result .= ' ' . $year_extra;
-            } 
-            $year_result .= ' />';
-        } else {
-            $years = range((int)$start_year, (int)$end_year);
-            if ($reverse_years) {
-                rsort($years, SORT_NUMERIC);
-            } else {
-                sort($years, SORT_NUMERIC);
-            } 
-            $yearvals = $years;
-            if (isset($year_empty)) {
-                array_unshift($years, $year_empty);
-                array_unshift($yearvals, '');
-            } 
-            $year_result .= '<select name="' . $year_name . '"';
-            if (null !== $year_size) {
-                $year_result .= ' size="' . $year_size . '"';
-            } 
-            if (null !== $all_extra) {
-                $year_result .= ' ' . $all_extra;
-            } 
-            if (null !== $year_extra) {
-                $year_result .= ' ' . $year_extra;
-            } 
-            $year_result .= $extra_attrs . '>' . "\n";
-            $year_result .= smarty_function_html_options(array('output' => $years,
-                    'values' => $yearvals,
-                    'selected' => $time[0],
-                    'print_result' => false),
-                   $template);
-            $year_result .= '</select>';
-        } 
-    } 
-    // Loop thru the field_order field
+            $_val = sprintf('%02d', $i);
+            $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+            $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
+            $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
+                           $_text . '</option>' . $option_separator;
+        }
+        $_html_days .= '</select>';
+    }
+    // order the fields for output
+    $_html = '';
     for ($i = 0; $i <= 2; $i++) {
-        $c = substr($field_order, $i, 1);
-        switch ($c) {
-            case 'D':
-                $html_result .= $day_result;
+        switch ($field_order[ $i ]) {
+            case 'Y':
+            case 'y':
+                if (isset($_html_years)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_years;
+                }
                 break;
-
+            case 'm':
             case 'M':
-                $html_result .= $month_result;
+                if (isset($_html_months)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_months;
+                }
                 break;
-
-            case 'Y':
-                $html_result .= $year_result;
+            case 'd':
+            case 'D':
+                if (isset($_html_days)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_days;
+                }
                 break;
-        } 
-        // Add the field seperator
-        if ($i < $field_separator_count) {
-            $html_result .= $field_separator;
-        } 
-    } 
-
-    return $html_result;
+        }
+    }
+    return $_html;
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.html_select_time.php b/WEB-INF/lib/smarty/plugins/function.html_select_time.php
index ddde4f5ac..cb047bc0a 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_select_time.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_select_time.php
@@ -1,66 +1,119 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_select_time} function plugin
- * 
- * Type:     function<br>
- * Name:     html_select_time<br>
+ * Type:     function
+ * Name:     html_select_time
  * Purpose:  Prints the dropdowns for time selection
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
- *          (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net> 
- * @credits Monte Ohrt <monte AT ohrt DOT com>
- * @param array $params parameters
- * @param object $template template object
- * @return string 
- * @uses smarty_make_timestamp()
+ *
+ * @link   http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *           (Smarty online manual)
+ * @author Roberto Berto <roberto@berto.net>
+ * @author Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @uses   smarty_make_timestamp()
+ * @throws \SmartyException
  */
-function smarty_function_html_select_time($params, $template)
+function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    require_once(SMARTY_PLUGINS_DIR . 'function.html_options.php');
-
-    /* Default values. */
-    $prefix = "Time_";
-    $time = time();
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    $prefix = 'Time_';
+    $field_array = null;
+    $field_separator = "\n";
+    $option_separator = "\n";
+    $time = null;
     $display_hours = true;
     $display_minutes = true;
     $display_seconds = true;
     $display_meridian = true;
+    $hour_format = '%02d';
+    $hour_value_format = '%02d';
+    $minute_format = '%02d';
+    $minute_value_format = '%02d';
+    $second_format = '%02d';
+    $second_value_format = '%02d';
+    $hour_size = null;
+    $minute_size = null;
+    $second_size = null;
+    $meridian_size = null;
+    $all_empty = null;
+    $hour_empty = null;
+    $minute_empty = null;
+    $second_empty = null;
+    $meridian_empty = null;
+    $all_id = null;
+    $hour_id = null;
+    $minute_id = null;
+    $second_id = null;
+    $meridian_id = null;
     $use_24_hours = true;
     $minute_interval = 1;
     $second_interval = 1;
-    /* Should the select boxes be part of an array when returned from PHP?
-       e.g. setting it to "birthday", would create "birthday[Hour]",
-       "birthday[Minute]", "birthday[Seconds]" & "birthday[Meridian]".
-       Can be combined with prefix. */
-    $field_array = null;
+    $extra_attrs = '';
     $all_extra = null;
     $hour_extra = null;
     $minute_extra = null;
     $second_extra = null;
     $meridian_extra = null;
-
     foreach ($params as $_key => $_value) {
         switch ($_key) {
-            case 'prefix':
             case 'time':
+                if (!is_array($_value) && $_value !== null) {
+                    $template->_checkPlugins(
+                        array(
+                            array(
+                                'function' => 'smarty_make_timestamp',
+                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                            )
+                        )
+                    );
+                    $time = smarty_make_timestamp($_value);
+                }
+                break;
+            case 'prefix':
             case 'field_array':
+            case 'field_separator':
+            case 'option_separator':
             case 'all_extra':
             case 'hour_extra':
             case 'minute_extra':
             case 'second_extra':
             case 'meridian_extra':
+            case 'all_empty':
+            case 'hour_empty':
+            case 'minute_empty':
+            case 'second_empty':
+            case 'meridian_empty':
+            case 'all_id':
+            case 'hour_id':
+            case 'minute_id':
+            case 'second_id':
+            case 'meridian_id':
+            case 'hour_format':
+            case 'hour_value_format':
+            case 'minute_format':
+            case 'minute_value_format':
+            case 'second_format':
+            case 'second_value_format':
                 $$_key = (string)$_value;
                 break;
-
             case 'display_hours':
             case 'display_minutes':
             case 'display_seconds':
@@ -68,127 +121,234 @@ function smarty_function_html_select_time($params, $template)
             case 'use_24_hours':
                 $$_key = (bool)$_value;
                 break;
-
             case 'minute_interval':
             case 'second_interval':
+            case 'hour_size':
+            case 'minute_size':
+            case 'second_size':
+            case 'meridian_size':
                 $$_key = (int)$_value;
                 break;
-
             default:
-                trigger_error("[html_select_time] unknown parameter $_key", E_USER_WARNING);
-        } 
-    } 
-
-    $time = smarty_make_timestamp($time);
-
-    $html_result = '';
-
-    if ($display_hours) {
-        $hours = $use_24_hours ? range(0, 23) : range(1, 12);
-        $hour_fmt = $use_24_hours ? '%H' : '%I';
-        for ($i = 0, $for_max = count($hours); $i < $for_max; $i++)
-        $hours[$i] = sprintf('%02d', $hours[$i]);
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Hour]"';
+                if (!is_array($_value)) {
+                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                } else {
+                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
+        if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
+            // $_REQUEST[$field_array] given
+            foreach (array(
+                'H' => 'Hour',
+                'i' => 'Minute',
+                's' => 'Second'
+            ) as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName =
+                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                        date($_elementKey);
+            }
+            $_meridian =
+                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
+                    '';
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
+            // $_REQUEST given
+            foreach (array(
+                'H' => 'Hour',
+                'i' => 'Minute',
+                's' => 'Second'
+            ) as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+            }
+            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
+                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } else {
-            $html_result .= '"' . $prefix . 'Hour"';
-        } 
-        if (null !== $hour_extra) {
-            $html_result .= ' ' . $hour_extra;
-        } 
-        if (null !== $all_extra) {
-            $html_result .= ' ' . $all_extra;
-        } 
-        $html_result .= '>' . "\n";
-        $html_result .= smarty_function_html_options(array('output' => $hours,
-                'values' => $hours,
-                'selected' => strftime($hour_fmt, $time),
-                'print_result' => false),
-            $template);
-        $html_result .= "</select>\n";
-    } 
-
-    if ($display_minutes) {
-        $all_minutes = range(0, 59);
-        for ($i = 0, $for_max = count($all_minutes); $i < $for_max; $i += $minute_interval)
-        $minutes[] = sprintf('%02d', $all_minutes[$i]);
-        $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval);
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Minute]"';
+            // no date found, use NOW
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
+    } elseif ($time === null) {
+        if (array_key_exists('time', $params)) {
+            $_hour = $_minute = $_second = $time = null;
         } else {
-            $html_result .= '"' . $prefix . 'Minute"';
-        } 
-        if (null !== $minute_extra) {
-            $html_result .= ' ' . $minute_extra;
-        } 
-        if (null !== $all_extra) {
-            $html_result .= ' ' . $all_extra;
-        } 
-        $html_result .= '>' . "\n";
-
-        $html_result .= smarty_function_html_options(array('output' => $minutes,
-                'values' => $minutes,
-                'selected' => $selected,
-                'print_result' => false),
-              $template);
-        $html_result .= "</select>\n";
-    } 
-
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
+        }
+    } else {
+        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+    }
+    // generate hour <select>
+    if ($display_hours) {
+        $_html_hours = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($hour_extra) {
+            $_extra .= ' ' . $hour_extra;
+        }
+        $_html_hours = '<select name="' . $_name . '"';
+        if ($hour_id !== null || $all_id !== null) {
+            $_html_hours .= ' id="' .
+                            smarty_function_escape_special_chars(
+                                $hour_id !== null ? ($hour_id ? $hour_id : $_name) :
+                                    ($all_id ? ($all_id . $_name) : $_name)
+                            ) . '"';
+        }
+        if ($hour_size) {
+            $_html_hours .= ' size="' . $hour_size . '"';
+        }
+        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($hour_empty) || isset($all_empty)) {
+            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
+                            $option_separator;
+        }
+        $start = $use_24_hours ? 0 : 1;
+        $end = $use_24_hours ? 23 : 12;
+        for ($i = $start; $i <= $end; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
+            $_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
+            if (!$use_24_hours) {
+                $_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
+            }
+            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+            $_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
+                            $_text . '</option>' . $option_separator;
+        }
+        $_html_hours .= '</select>';
+    }
+    // generate minute <select>
+    if ($display_minutes) {
+        $_html_minutes = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($minute_extra) {
+            $_extra .= ' ' . $minute_extra;
+        }
+        $_html_minutes = '<select name="' . $_name . '"';
+        if ($minute_id !== null || $all_id !== null) {
+            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
+                    $minute_id !== null ?
+                        ($minute_id ? $minute_id : $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($minute_size) {
+            $_html_minutes .= ' size="' . $minute_size . '"';
+        }
+        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($minute_empty) || isset($all_empty)) {
+            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
+                              $option_separator;
+        }
+        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+        for ($i = 0; $i <= 59; $i += $minute_interval) {
+            $_val = sprintf('%02d', $i);
+            $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+            $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
+            $_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+                              '>' . $_text . '</option>' . $option_separator;
+        }
+        $_html_minutes .= '</select>';
+    }
+    // generate second <select>
     if ($display_seconds) {
-        $all_seconds = range(0, 59);
-        for ($i = 0, $for_max = count($all_seconds); $i < $for_max; $i += $second_interval)
-        $seconds[] = sprintf('%02d', $all_seconds[$i]);
-        $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval);
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Second]"';
-        } else {
-            $html_result .= '"' . $prefix . 'Second"';
-        } 
-
-        if (null !== $second_extra) {
-            $html_result .= ' ' . $second_extra;
-        } 
-        if (null !== $all_extra) {
-            $html_result .= ' ' . $all_extra;
-        } 
-        $html_result .= '>' . "\n";
-
-        $html_result .= smarty_function_html_options(array('output' => $seconds,
-                'values' => $seconds,
-                'selected' => $selected,
-                'print_result' => false),
-             $template);
-        $html_result .= "</select>\n";
-    } 
-
+        $_html_seconds = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($second_extra) {
+            $_extra .= ' ' . $second_extra;
+        }
+        $_html_seconds = '<select name="' . $_name . '"';
+        if ($second_id !== null || $all_id !== null) {
+            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
+                    $second_id !== null ?
+                        ($second_id ? $second_id : $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($second_size) {
+            $_html_seconds .= ' size="' . $second_size . '"';
+        }
+        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($second_empty) || isset($all_empty)) {
+            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
+                              $option_separator;
+        }
+        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+        for ($i = 0; $i <= 59; $i += $second_interval) {
+            $_val = sprintf('%02d', $i);
+            $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+            $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
+            $_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+                              '>' . $_text . '</option>' . $option_separator;
+        }
+        $_html_seconds .= '</select>';
+    }
+    // generate meridian <select>
     if ($display_meridian && !$use_24_hours) {
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Meridian]"';
-        } else {
-            $html_result .= '"' . $prefix . 'Meridian"';
-        } 
-
-        if (null !== $meridian_extra) {
-            $html_result .= ' ' . $meridian_extra;
-        } 
-        if (null !== $all_extra) {
-            $html_result .= ' ' . $all_extra;
-        } 
-        $html_result .= '>' . "\n";
-
-        $html_result .= smarty_function_html_options(array('output' => array('AM', 'PM'),
-                'values' => array('am', 'pm'),
-                'selected' => strtolower(strftime('%p', $time)),
-                'print_result' => false),
-            $template);
-        $html_result .= "</select>\n";
-    } 
-
-    return $html_result;
-} 
-
-?>
\ No newline at end of file
+        $_html_meridian = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($meridian_extra) {
+            $_extra .= ' ' . $meridian_extra;
+        }
+        $_html_meridian = '<select name="' . $_name . '"';
+        if ($meridian_id !== null || $all_id !== null) {
+            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
+                    $meridian_id !== null ?
+                        ($meridian_id ? $meridian_id :
+                            $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($meridian_size) {
+            $_html_meridian .= ' size="' . $meridian_size . '"';
+        }
+        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($meridian_empty) || isset($all_empty)) {
+            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
+                               '</option>' . $option_separator;
+        }
+        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
+                           '>AM</option>' . $option_separator . '<option value="pm"' .
+                           ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
+                           '</select>';
+    }
+    $_html = '';
+    foreach (array(
+        '_html_hours',
+        '_html_minutes',
+        '_html_seconds',
+        '_html_meridian'
+    ) as $k) {
+        if (isset($$k)) {
+            if ($_html) {
+                $_html .= $field_separator;
+            }
+            $_html .= $$k;
+        }
+    }
+    return $_html;
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.html_table.php b/WEB-INF/lib/smarty/plugins/function.html_table.php
index 7986a9bcf..ae61e83dc 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_table.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_table.php
@@ -1,53 +1,51 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_table} function plugin
- * 
- * Type:     function<br>
- * Name:     html_table<br>
- * Date:     Feb 17, 2003<br>
- * Purpose:  make an html table from an array of data<br>
- * 
- * 
+ * Type:     function
+ * Name:     html_table
+ * Date:     Feb 17, 2003
+ * Purpose:  make an html table from an array of data
+ * Params:
+ *
+ * - loop       - array to loop through
+ * - cols       - number of columns, comma separated list of column names
+ *                or array of column names
+ * - rows       - number of rows
+ * - table_attr - table attributes
+ * - th_attr    - table heading attributes (arrays are cycled)
+ * - tr_attr    - table row attributes (arrays are cycled)
+ * - td_attr    - table cell attributes (arrays are cycled)
+ * - trailpad   - value to pad trailing cells with
+ * - caption    - text for caption element
+ * - vdir       - vertical direction (default: "down", means top-to-bottom)
+ * - hdir       - horizontal direction (default: "right", means left-to-right)
+ * - inner      - inner loop (default "cols": print $loop line by line,
+ *                $loop will be printed column by column otherwise)
+ *
  * Examples:
- * <pre>
+ *
  * {table loop=$data}
  * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
  * {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
- * 
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author credit to Messju Mohr <messju at lammfellpuschen dot de> 
- * @author credit to boots <boots dot smarty at yahoo dot com> 
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author  credit to boots <boots dot smarty at yahoo dot com>
  * @version 1.1
- * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
- *          (Smarty online manual)
+ * @link    http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ *           (Smarty online manual)
+ *
  * @param array $params parameters
- * Input:<br>
- *          - loop = array to loop through
- *          - cols = number of columns, comma separated list of column names
- *                   or array of column names
- *          - rows = number of rows
- *          - table_attr = table attributes
- *          - th_attr = table heading attributes (arrays are cycled)
- *          - tr_attr = table row attributes (arrays are cycled)
- *          - td_attr = table cell attributes (arrays are cycled)
- *          - trailpad = value to pad trailing cells with
- *          - caption = text for caption element 
- *          - vdir = vertical direction (default: "down", means top-to-bottom)
- *          - hdir = horizontal direction (default: "right", means left-to-right)
- *          - inner = inner loop (default "cols": print $loop line by line,
- *                    $loop will be printed column by column otherwise)
- * @param object $template template object
- * @return string 
+ *
+ * @return string
  */
-function smarty_function_html_table($params, $template)
+function smarty_function_html_table($params)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
@@ -61,18 +59,15 @@ function smarty_function_html_table($params, $template)
     $inner = 'cols';
     $caption = '';
     $loop = null;
-
-    if (!isset($params['loop'])) {
-        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
+    if (!isset($params[ 'loop' ])) {
+        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
         return;
-    } 
-
+    }
     foreach ($params as $_key => $_value) {
         switch ($_key) {
             case 'loop':
                 $$_key = (array)$_value;
                 break;
-
             case 'cols':
                 if (is_array($_value) && !empty($_value)) {
                     $cols = $_value;
@@ -84,13 +79,11 @@ function smarty_function_html_table($params, $template)
                     $cols_count = (int)$_value;
                 } else {
                     $cols_count = $cols;
-                } 
+                }
                 break;
-
             case 'rows':
                 $$_key = (int)$_value;
                 break;
-
             case 'table_attr':
             case 'trailpad':
             case 'hdir':
@@ -99,79 +92,73 @@ function smarty_function_html_table($params, $template)
             case 'caption':
                 $$_key = (string)$_value;
                 break;
-
             case 'tr_attr':
             case 'td_attr':
             case 'th_attr':
                 $$_key = $_value;
                 break;
-        } 
-    } 
-
+        }
+    }
     $loop_count = count($loop);
-    if (empty($params['rows'])) {
+    if (empty($params[ 'rows' ])) {
         /* no rows specified */
         $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params['cols'])) {
-        if (!empty($params['rows'])) {
+    } elseif (empty($params[ 'cols' ])) {
+        if (!empty($params[ 'rows' ])) {
             /* no cols specified, but rows */
             $cols_count = ceil($loop_count / $rows);
-        } 
-    } 
-
+        }
+    }
     $output = "<table $table_attr>\n";
-
     if (!empty($caption)) {
         $output .= '<caption>' . $caption . "</caption>\n";
-    } 
-
+    }
     if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+        $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
-
         for ($r = 0; $r < $cols_count; $r++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[$r];
+            $output .= $cols[ $r ];
             $output .= "</th>\n";
-        } 
+        }
         $output .= "</tr></thead>\n";
-    } 
-
+    }
     $output .= "<tbody>\n";
     for ($r = 0; $r < $rows; $r++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
-
+        $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
         for ($c = 0; $c < $cols_count; $c++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
-            if ($inner != 'cols') {
+            $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+            if ($inner !== 'cols') {
                 /* shuffle x to loop over rows*/
                 $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            } 
-
+            }
             if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
             } else {
                 $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            } 
-        } 
+            }
+        }
         $output .= "</tr>\n";
-    } 
+    }
     $output .= "</tbody>\n";
     $output .= "</table>\n";
-
     return $output;
-} 
+}
 
+/**
+ * @param $name
+ * @param $var
+ * @param $no
+ *
+ * @return string
+ */
 function smarty_function_html_table_cycle($name, $var, $no)
 {
     if (!is_array($var)) {
         $ret = $var;
     } else {
-        $ret = $var[$no % count($var)];
-    } 
-
+        $ret = $var[ $no % count($var) ];
+    }
     return ($ret) ? ' ' . $ret : '';
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.mailto.php b/WEB-INF/lib/smarty/plugins/function.mailto.php
index 976218f53..27351df82 100644
--- a/WEB-INF/lib/smarty/plugins/function.mailto.php
+++ b/WEB-INF/lib/smarty/plugins/function.mailto.php
@@ -1,65 +1,63 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {mailto} function plugin
- * 
- * Type:     function<br>
- * Name:     mailto<br>
+ * Type:     function
+ * Name:     mailto
  * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally
- *            encode them.<br>
- * 
+ * Purpose:  automate mailto address link creation, and optionally encode them.
+ * Params:
+ *
+ * - address    - (required) - e-mail address
+ * - text       - (optional) - text to display, default is address
+ * - encode     - (optional) - can be one of:
+ *                             * none : no encoding (default)
+ *                             * javascript : encode with javascript
+ *                             * javascript_charcode : encode with javascript charcode
+ *                             * hex : encode with hexadecimal (no javascript)
+ * - cc         - (optional) - address(es) to carbon copy
+ * - bcc        - (optional) - address(es) to blind carbon copy
+ * - subject    - (optional) - e-mail subject
+ * - newsgroups - (optional) - newsgroup(s) to post to
+ * - followupto - (optional) - address(es) to follow up to
+ * - extra      - (optional) - extra tags for the href link
+ *
  * Examples:
- * <pre>
+ *
  * {mailto address="me@domain.com"}
  * {mailto address="me@domain.com" encode="javascript"}
  * {mailto address="me@domain.com" encode="hex"}
  * {mailto address="me@domain.com" subject="Hello to you!"}
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
- * 
- * @link http://smarty.php.net/manual/en/language.function.mailto.php {mailto}
- *          (Smarty online manual)
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ *           (Smarty online manual)
  * @version 1.2
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author credits to Jason Sweat (added cc, bcc and subject functionality) 
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
  * @param array $params parameters
- * Input:<br>
- *          - address = e-mail address
- *          - text = (optional) text to display, default is address
- *          - encode = (optional) can be one of:
- *                 * none : no encoding (default)
- *                 * javascript : encode with javascript
- *                 * javascript_charcode : encode with javascript charcode
- *                 * hex : encode with hexidecimal (no javascript)
- *          - cc = (optional) address(es) to carbon copy
- *          - bcc = (optional) address(es) to blind carbon copy
- *          - subject = (optional) e-mail subject
- *          - newsgroups = (optional) newsgroup(s) to post to
- *          - followupto = (optional) address(es) to follow up to
- *          - extra = (optional) extra tags for the href link
- * @param object $template template object
- * @return string 
+ *
+ * @return string
  */
-function smarty_function_mailto($params, $template)
+function smarty_function_mailto($params)
 {
+    static $_allowed_encoding =
+        array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
-
-    if (empty($params['address'])) {
-        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+    if (empty($params[ 'address' ])) {
+        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
         return;
     } else {
-        $address = $params['address'];
-    } 
-
-    $text = $address; 
+        $address = $params[ 'address' ];
+    }
+    $text = $address;
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
     $search = array('%40', '%2C');
@@ -70,87 +68,70 @@ function smarty_function_mailto($params, $template)
             case 'cc':
             case 'bcc':
             case 'followupto':
-                if (!empty($value))
+                if (!empty($value)) {
                     $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+                }
                 break;
-
             case 'subject':
             case 'newsgroups':
                 $mail_parms[] = $var . '=' . rawurlencode($value);
                 break;
-
             case 'extra':
             case 'text':
                 $$var = $value;
-
+            // no break
             default:
-        } 
-    } 
-
-    $mail_parm_vals = '';
-    for ($i = 0; $i < count($mail_parms); $i++) {
-        $mail_parm_vals .= (0 == $i) ? '?' : '&';
-        $mail_parm_vals .= $mail_parms[$i];
-    } 
-    $address .= $mail_parm_vals;
-
-    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
-    if (!in_array($encode, array('javascript', 'javascript_charcode', 'hex', 'none'))) {
-        trigger_error("mailto: 'encode' parameter must be none, javascript or hex",E_USER_WARNING);
+        }
+    }
+    if ($mail_parms) {
+        $address .= '?' . join('&', $mail_parms);
+    }
+    $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
+    if (!isset($_allowed_encoding[ $encode ])) {
+        trigger_error(
+            "mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+            E_USER_WARNING
+        );
         return;
-    } 
-
-    if ($encode == 'javascript') {
+    }
+    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
+    if ($encode === 'javascript') {
         $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-
         $js_encode = '';
-        for ($x = 0; $x < strlen($string); $x++) {
-            $js_encode .= '%' . bin2hex($string[$x]);
-        } 
-
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+            $js_encode .= '%' . bin2hex($string[ $x ]);
+        }
         return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode == 'javascript_charcode') {
+    } elseif ($encode === 'javascript_charcode') {
         $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        for($x = 0, $y = strlen($string); $x < $y; $x++) {
-            $ord[] = ord($string[$x]);
-        } 
-
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n";
-        $_ret .= "<!--\n";
-        $_ret .= "{document.write(String.fromCharCode(";
-        $_ret .= implode(',', $ord);
-        $_ret .= "))";
-        $_ret .= "}\n";
-        $_ret .= "//-->\n";
-        $_ret .= "</script>\n";
-
+        for ($x = 0, $y = strlen($string); $x < $y; $x++) {
+            $ord[] = ord($string[ $x ]);
+        }
+        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
+                implode(',', $ord) . "))" . "}\n" . "</script>\n";
         return $_ret;
-    } elseif ($encode == 'hex') {
+    } elseif ($encode === 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[2])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
+        if (!empty($match[ 2 ])) {
+            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
             return;
-        } 
+        }
         $address_encode = '';
-        for ($x = 0; $x < strlen($address); $x++) {
-            if (preg_match('!\w!', $address[$x])) {
-                $address_encode .= '%' . bin2hex($address[$x]);
+        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
+                $address_encode .= '%' . bin2hex($address[ $x ]);
             } else {
-                $address_encode .= $address[$x];
-            } 
-        } 
+                $address_encode .= $address[ $x ];
+            }
+        }
         $text_encode = '';
-        for ($x = 0; $x < strlen($text); $x++) {
-            $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
-        } 
-
+        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+            $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
+        }
         $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
         return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
     } else {
         // no encoding
         return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/plugins/function.math.php b/WEB-INF/lib/smarty/plugins/function.math.php
index cd90020a4..7348d9649 100644
--- a/WEB-INF/lib/smarty/plugins/function.math.php
+++ b/WEB-INF/lib/smarty/plugins/function.math.php
@@ -1,83 +1,112 @@
 <?php
 /**
  * Smarty plugin
- *
  * This plugin is only for Smarty2 BC
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {math} function plugin
+ * Type:     function
+ * Name:     math
+ * Purpose:  handle math computations in template
+ *
+ * @link   http://www.smarty.net/manual/en/language.function.math.php {math}
+ *           (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
  *
- * Type:     function<br>
- * Name:     math<br>
- * Purpose:  handle math computations in template<br>
- * @link http://smarty.php.net/manual/en/language.function.math.php {math}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array $params parameters
- * @param object $template template object
  * @return string|null
  */
 function smarty_function_math($params, $template)
 {
+    static $_allowed_funcs =
+        array(
+            'int'   => true,
+            'abs'   => true,
+            'ceil'  => true,
+            'cos'   => true,
+            'exp'   => true,
+            'floor' => true,
+            'log'   => true,
+            'log10' => true,
+            'max'   => true,
+            'min'   => true,
+            'pi'    => true,
+            'pow'   => true,
+            'rand'  => true,
+            'round' => true,
+            'sin'   => true,
+            'sqrt'  => true,
+            'srand' => true,
+            'tan'   => true
+        );
     // be sure equation parameter is present
-    if (empty($params['equation'])) {
-        trigger_error("math: missing equation parameter",E_USER_WARNING);
+    if (empty($params[ 'equation' ])) {
+        trigger_error("math: missing equation parameter", E_USER_WARNING);
         return;
     }
-
-    $equation = $params['equation'];
-
+    $equation = $params[ 'equation' ];
     // make sure parenthesis are balanced
-    if (substr_count($equation,"(") != substr_count($equation,")")) {
-        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
+    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
+        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
         return;
     }
-
-    // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
-    $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
-                           'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
-    
-    foreach($match[1] as $curr_var) {
-        if ($curr_var && !in_array($curr_var, array_keys($params)) && !in_array($curr_var, $allowed_funcs)) {
-            trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
-            return;
-        }
+    // disallow backticks
+    if (strpos($equation, '`') !== false) {
+        trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
+        return;
     }
-
-    foreach($params as $key => $val) {
-        if ($key != "equation" && $key != "format" && $key != "assign") {
+    // also disallow dollar signs
+    if (strpos($equation, '$') !== false) {
+        trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
+        return;
+    }
+    foreach ($params as $key => $val) {
+        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
             // make sure value is not empty
-            if (strlen($val)==0) {
-                trigger_error("math: parameter $key is empty",E_USER_WARNING);
+            if (strlen($val) === 0) {
+                trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
                 return;
             }
             if (!is_numeric($val)) {
-                trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
+                trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
                 return;
             }
+        }
+    }
+    // match all vars in equation, make sure all are passed
+    preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
+    foreach ($match[ 1 ] as $curr_var) {
+        if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
+            trigger_error(
+                "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
+                E_USER_WARNING
+            );
+            return;
+        }
+    }
+    foreach ($params as $key => $val) {
+        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
         }
     }
     $smarty_math_result = null;
-    eval("\$smarty_math_result = ".$equation.";");
-
-    if (empty($params['format'])) {
-        if (empty($params['assign'])) {
+    eval("\$smarty_math_result = " . $equation . ";");
+    if (empty($params[ 'format' ])) {
+        if (empty($params[ 'assign' ])) {
             return $smarty_math_result;
         } else {
-            $template->assign($params['assign'],$smarty_math_result);
+            $template->assign($params[ 'assign' ], $smarty_math_result);
         }
     } else {
-        if (empty($params['assign'])){
-            printf($params['format'],$smarty_math_result);
+        if (empty($params[ 'assign' ])) {
+            printf($params[ 'format' ], $smarty_math_result);
         } else {
-            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
+            $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result));
         }
     }
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
index cd24589d8..c5fc400a6 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
@@ -1,37 +1,145 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
-
 /**
  * Smarty capitalize modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     capitalize<br>
+ * Type:     modifier
+ * Name:     capitalize
  * Purpose:  capitalize words in the string
- * 
- * @link 
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $ 
- * @return string 
+ * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
+ *
+ * @param string  $string    string to capitalize
+ * @param boolean $uc_digits also capitalize "x123" to "X123"
+ * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+ *
+ * @return string capitalized string
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Rodney Rehm
  */
-function smarty_modifier_capitalize($string, $uc_digits = false)
-{ 
-    // uppercase with php function ucwords
-    $upper_string = ucwords($string); 
-    // check for any missed hyphenated words
-    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!ue", "'\\1'.ucfirst('\\2')", $upper_string); 
+function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+{
+    if (Smarty::$_MBSTRING) {
+        if ($lc_rest) {
+            // uppercase (including hyphenated words)
+            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
+        } else {
+            // uppercase word breaks
+            $upper_string = preg_replace_callback(
+                "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+                'smarty_mod_cap_mbconvert_cb',
+                $string
+            );
+        }
+        // check uc_digits case
+        if (!$uc_digits) {
+            if (preg_match_all(
+                "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
+                $string,
+                $matches,
+                PREG_OFFSET_CAPTURE
+            )
+            ) {
+                foreach ($matches[ 1 ] as $match) {
+                    $upper_string =
+                        substr_replace(
+                            $upper_string,
+                            mb_strtolower($match[ 0 ], Smarty::$_CHARSET),
+                            $match[ 1 ],
+                            strlen($match[ 0 ])
+                        );
+                }
+            }
+        }
+        $upper_string =
+            preg_replace_callback(
+                "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
+                'smarty_mod_cap_mbconvert2_cb',
+                $upper_string
+            );
+        return $upper_string;
+    }
+    // lowercase first
+    if ($lc_rest) {
+        $string = strtolower($string);
+    }
+    // uppercase (including hyphenated words)
+    $upper_string =
+        preg_replace_callback(
+            "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+            'smarty_mod_cap_ucfirst_cb',
+            $string
+        );
     // check uc_digits case
     if (!$uc_digits) {
-        if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!u", $string, $matches, PREG_OFFSET_CAPTURE)) {
-            foreach($matches[1] as $match)
-            $upper_string = substr_replace($upper_string, $match[0], $match[1], strlen($match[0]));
-        } 
-    } 
+        if (preg_match_all(
+            "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
+            $string,
+            $matches,
+            PREG_OFFSET_CAPTURE
+        )
+        ) {
+            foreach ($matches[ 1 ] as $match) {
+                $upper_string =
+                    substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
+            }
+        }
+    }
+    $upper_string = preg_replace_callback(
+        "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
+        'smarty_mod_cap_ucfirst2_cb',
+        $upper_string
+    );
     return $upper_string;
-} 
+}
+
+/**
+ *
+ * Bug: create_function() use exhausts memory when used in long loops
+ * Fix: use declared functions for callbacks instead of using create_function()
+ * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
+ *
+ * @author Kyle Renfrow
+ */
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_mbconvert_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_mbconvert2_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
 
-?>
\ No newline at end of file
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
+}
+
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst2_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.date_format.php b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
index 3656c1c88..c8e88c5c9 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.date_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
@@ -1,61 +1,85 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
-
 /**
  * Smarty date_format modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     date_format<br>
- * Purpose:  format datestamps via strftime<br>
- * Input:<br>
+ * Type:     modifier
+ * Name:     date_format
+ * Purpose:  format datestamps via strftime
+ * Input:
  *          - string: input date string
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $ 
- * @param string $ 
- * @param string $ 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string       input date string
+ * @param string $format       strftime format for output
+ * @param string $default_date default date if $string is empty
+ * @param string $formatter    either 'strftime' or 'auto'
+ *
  * @return string |void
- * @uses smarty_make_timestamp()
+ * @uses   smarty_make_timestamp()
  */
-function smarty_modifier_date_format($string, $format = SMARTY_RESOURCE_DATE_FORMAT, $default_date = '',$formatter='auto')
+function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
 {
+    if ($format === null) {
+        $format = Smarty::$_DATE_FORMAT;
+    }
     /**
-    * Include the {@link shared.make_timestamp.php} plugin
-    */
-    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    if ($string != '') {
+     * require_once the {@link shared.make_timestamp.php} plugin
+     */
+    static $is_loaded = false;
+    if (!$is_loaded) {
+        if (!is_callable('smarty_make_timestamp')) {
+            include_once SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php';
+        }
+        $is_loaded = true;
+    }
+    if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date != '') {
+    } elseif (!empty($default_date)) {
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;
-    } 
-    if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
-        if (DS == '\\') {
-            $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
-            $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
+    }
+    if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+        if (Smarty::$_IS_WINDOWS) {
+            $_win_from = array(
+                '%D',
+                '%h',
+                '%n',
+                '%r',
+                '%R',
+                '%t',
+                '%T'
+            );
+            $_win_to = array(
+                '%m/%d/%y',
+                '%b',
+                "\n",
+                '%I:%M:%S %p',
+                '%H:%M',
+                "\t",
+                '%H:%M:%S'
+            );
             if (strpos($format, '%e') !== false) {
                 $_win_from[] = '%e';
                 $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            } 
+            }
             if (strpos($format, '%l') !== false) {
                 $_win_from[] = '%l';
                 $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            } 
+            }
             $format = str_replace($_win_from, $_win_to, $format);
-        } 
+        }
         return strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);
     }
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.debug_print_var.php b/WEB-INF/lib/smarty/plugins/modifier.debug_print_var.php
index 013337ae0..78397d017 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.debug_print_var.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.debug_print_var.php
@@ -1,55 +1,62 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Debug
  */
-
 /**
  * Smarty debug_print_var modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     debug_print_var<br>
+ * Type:     modifier
+ * Name:     debug_print_var
  * Purpose:  formats variable contents for display in the console
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php debug_print_var (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param array $ |object
- * @param integer $ 
- * @param integer $ 
- * @return string 
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array|object $var     variable to be formatted
+ * @param int          $max     maximum recursion depth if $var is an array or object
+ * @param int          $length  maximum string length if $var is a string
+ * @param int          $depth   actual recursion depth
+ * @param array        $objects processed objects in actual depth to prevent recursive object processing
+ *
+ * @return string
  */
-function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '<i>\n</i>',
-        "\r" => '<i>\r</i>',
-        "\t" => '<i>\t</i>'
-        );
-
+    $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
     switch (gettype($var)) {
-        case 'array' :
+        case 'array':
             $results = '<b>Array (' . count($var) . ')</b>';
+            if ($depth === $max) {
+                break;
+            }
             foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
+                            '</b> =&gt; ' .
+                            smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
                 $depth--;
-            } 
+            }
             break;
-        case 'object' :
+        case 'object':
             $object_vars = get_object_vars($var);
             $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            if (in_array($var, $objects)) {
+                $results .= ' called recursive';
+                break;
+            }
+            if ($depth === $max) {
+                break;
+            }
+            $objects[] = $var;
             foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
+                            '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
                 $depth--;
-            } 
+            }
             break;
-        case 'boolean' :
-        case 'NULL' :
-        case 'resource' :
+        case 'boolean':
+        case 'NULL':
+        case 'resource':
             if (true === $var) {
                 $results = 'true';
             } elseif (false === $var) {
@@ -57,31 +64,40 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
             } elseif (null === $var) {
                 $results = 'null';
             } else {
-                $results = htmlspecialchars((string) $var);
-            } 
+                $results = htmlspecialchars((string)$var);
+            }
             $results = '<i>' . $results . '</i>';
             break;
-        case 'integer' :
-        case 'float' :
-            $results = htmlspecialchars((string) $var);
+        case 'integer':
+        case 'float':
+            $results = htmlspecialchars((string)$var);
             break;
-        case 'string' :
+        case 'string':
             $results = strtr($var, $_replace);
-            if (strlen($var) > $length) {
-                $results = substr($var, 0, $length - 3) . '...';
-            } 
-            $results = htmlspecialchars('"' . $results . '"');
+            if (Smarty::$_MBSTRING) {
+                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
+                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
+                }
+            } else {
+                if (isset($var[ $length ])) {
+                    $results = substr($var, 0, $length - 3) . '...';
+                }
+            }
+            $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
             break;
-        case 'unknown type' :
-        default :
-            $results = strtr((string) $var, $_replace);
-            if (strlen($results) > $length) {
-                $results = substr($results, 0, $length - 3) . '...';
-            } 
-            $results = htmlspecialchars($results);
-    } 
-
+        case 'unknown type':
+        default:
+            $results = strtr((string)$var, $_replace);
+            if (Smarty::$_MBSTRING) {
+                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
+                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
+                }
+            } else {
+                if (strlen($results) > $length) {
+                    $results = substr($results, 0, $length - 3) . '...';
+                }
+            }
+            $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
+    }
     return $results;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.escape.php b/WEB-INF/lib/smarty/plugins/modifier.escape.php
index 37bc0e30e..150901c7c 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.escape.php
@@ -1,91 +1,255 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
- 
 /**
  * Smarty escape modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     escape<br>
+ * Type:     modifier
+ * Name:     escape
  * Purpose:  escape string for output
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $string input string
- * @param string $esc_type escape type
- * @param string $char_set character set
+ *
+ * @link   http://www.smarty.net/docs/en/language.modifier.escape
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string  $string        input string
+ * @param string  $esc_type      escape type
+ * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
+ * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ *
  * @return string escaped input string
  */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = SMARTY_RESOURCE_CHAR_SET)
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
+    static $_double_encode = null;
+    static $is_loaded_1 = false;
+    static $is_loaded_2 = false;
+    if ($_double_encode === null) {
+        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
+    }
+    if (!$char_set) {
+        $char_set = Smarty::$_CHARSET;
+    }
     switch ($esc_type) {
         case 'html':
-            return htmlspecialchars($string, ENT_QUOTES, $char_set);
-
+            if ($_double_encode) {
+                // php >=5.3.2 - go native
+                return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+            } else {
+                if ($double_encode) {
+                    // php <5.2.3 - only handle double encoding
+                    return htmlspecialchars($string, ENT_QUOTES, $char_set);
+                } else {
+                    // php <5.2.3 - prevent double encoding
+                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
+                    $string = str_replace(
+                        array(
+                            '%%%SMARTY_START%%%',
+                            '%%%SMARTY_END%%%'
+                        ),
+                        array(
+                            '&',
+                            ';'
+                        ),
+                        $string
+                    );
+                    return $string;
+                }
+            }
+        // no break
         case 'htmlall':
-            return htmlentities($string, ENT_QUOTES, $char_set);
-
+            if (Smarty::$_MBSTRING) {
+                // mb_convert_encoding ignores htmlspecialchars()
+                if ($_double_encode) {
+                    // php >=5.3.2 - go native
+                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+                } else {
+                    if ($double_encode) {
+                        // php <5.2.3 - only handle double encoding
+                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
+                    } else {
+                        // php <5.2.3 - prevent double encoding
+                        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
+                        $string =
+                            str_replace(
+                                array(
+                                    '%%%SMARTY_START%%%',
+                                    '%%%SMARTY_END%%%'
+                                ),
+                                array(
+                                    '&',
+                                    ';'
+                                ),
+                                $string
+                            );
+                        return $string;
+                    }
+                }
+                // htmlentities() won't convert everything, so use mb_convert_encoding
+                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
+            }
+            // no MBString fallback
+            if ($_double_encode) {
+                return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
+            } else {
+                if ($double_encode) {
+                    return htmlentities($string, ENT_QUOTES, $char_set);
+                } else {
+                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+                    $string = htmlentities($string, ENT_QUOTES, $char_set);
+                    $string = str_replace(
+                        array(
+                            '%%%SMARTY_START%%%',
+                            '%%%SMARTY_END%%%'
+                        ),
+                        array(
+                            '&',
+                            ';'
+                        ),
+                        $string
+                    );
+                    return $string;
+                }
+            }
+        // no break
         case 'url':
             return rawurlencode($string);
-
         case 'urlpathinfo':
             return str_replace('%2F', '/', rawurlencode($string));
-
-        case 'quotes': 
+        case 'quotes':
             // escape unescaped single quotes
             return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-
-        case 'hex': 
-            // escape every character into hex
+        case 'hex':
+            // escape every byte into hex
+            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
             $return = '';
-            for ($x = 0; $x < strlen($string); $x++) {
-                $return .= '%' . bin2hex($string[$x]);
-            } 
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '%' . bin2hex($string[ $x ]);
+            }
             return $return;
-
         case 'hexentity':
             $return = '';
-            for ($x = 0; $x < strlen($string); $x++) {
-                $return .= '&#x' . bin2hex($string[$x]) . ';';
-            } 
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+                    }
+                    $is_loaded_1 = true;
+                }
+                $return = '';
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
+                }
+                return $return;
+            }
+            // no MBString fallback
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '&#x' . bin2hex($string[ $x ]) . ';';
+            }
             return $return;
-
         case 'decentity':
             $return = '';
-            for ($x = 0; $x < strlen($string); $x++) {
-                $return .= '&#' . ord($string[$x]) . ';';
-            } 
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+                    }
+                    $is_loaded_1 = true;
+                }
+                $return = '';
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    $return .= '&#' . $unicode . ';';
+                }
+                return $return;
+            }
+            // no MBString fallback
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '&#' . ord($string[ $x ]) . ';';
+            }
             return $return;
-
-        case 'javascript': 
+        case 'javascript':
             // escape quotes and backslashes, newlines, etc.
-            return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/'));
-
-        case 'mail': 
-          require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-          return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-
-        case 'nonstd': 
+            return strtr(
+                $string,
+                array(
+                    '\\' => '\\\\',
+                    "'"  => "\\'",
+                    '"'  => '\\"',
+                    "\r" => '\\r',
+                    "\n" => '\\n',
+                    '</' => '<\/'
+                )
+            );
+        case 'mail':
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_2) {
+                    if (!is_callable('smarty_mb_str_replace')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
+                    }
+                    $is_loaded_2 = true;
+                }
+                return smarty_mb_str_replace(
+                    array(
+                        '@',
+                        '.'
+                    ),
+                    array(
+                        ' [AT] ',
+                        ' [DOT] '
+                    ),
+                    $string
+                );
+            }
+            // no MBString fallback
+            return str_replace(
+                array(
+                    '@',
+                    '.'
+                ),
+                array(
+                    ' [AT] ',
+                    ' [DOT] '
+                ),
+                $string
+            );
+        case 'nonstd':
             // escape non-standard chars, such as ms document quotes
-            $_res = '';
-            for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
-                $_ord = ord(substr($string, $_i, 1)); 
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+                    }
+                    $is_loaded_1 = true;
+                }
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    if ($unicode >= 126) {
+                        $return .= '&#' . $unicode . ';';
+                    } else {
+                        $return .= chr($unicode);
+                    }
+                }
+                return $return;
+            }
+            $_length = strlen($string);
+            for ($_i = 0; $_i < $_length; $_i++) {
+                $_ord = ord(substr($string, $_i, 1));
                 // non-standard char, escape it
                 if ($_ord >= 126) {
-                    $_res .= '&#' . $_ord . ';';
+                    $return .= '&#' . $_ord . ';';
                 } else {
-                    $_res .= substr($string, $_i, 1);
-                } 
-            } 
-            return $_res;
-
+                    $return .= substr($string, $_i, 1);
+                }
+            }
+            return $return;
         default:
             return $string;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php b/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
new file mode 100644
index 000000000..1cd625b64
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     mb_wordwrap
+ * Purpose:  Wrap a string to a given number of characters
+ *
+ * @link   http://php.net/manual/en/function.wordwrap.php for similarity
+ *
+ * @param string  $str   the string to wrap
+ * @param int     $width the width of the output
+ * @param string  $break the character used to break the line
+ * @param boolean $cut   ignored parameter, just for the sake of
+ *
+ * @return string  wrapped string
+ * @author Rodney Rehm
+ */
+function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+{
+    // break words into tokens using white space as a delimiter
+    $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+    $length = 0;
+    $t = '';
+    $_previous = false;
+    $_space = false;
+    foreach ($tokens as $_token) {
+        $token_length = mb_strlen($_token, Smarty::$_CHARSET);
+        $_tokens = array($_token);
+        if ($token_length > $width) {
+            if ($cut) {
+                $_tokens = preg_split(
+                    '!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
+                    $_token,
+                    -1,
+                    PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
+                );
+            }
+        }
+        foreach ($_tokens as $token) {
+            $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
+            $token_length = mb_strlen($token, Smarty::$_CHARSET);
+            $length += $token_length;
+            if ($length > $width) {
+                // remove space before inserted break
+                if ($_previous) {
+                    $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                }
+                if (!$_space) {
+                    // add the break before the token
+                    if (!empty($t)) {
+                        $t .= $break;
+                    }
+                    $length = $token_length;
+                }
+            } elseif ($token === "\n") {
+                // hard break must reset counters
+                $length = 0;
+            }
+            $_previous = $_space;
+            // add the token
+            $t .= $token;
+        }
+    }
+    return $t;
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php b/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
index 9f148800e..7eb550695 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
@@ -2,45 +2,54 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
-
 /**
  * Smarty regex_replace modifier plugin
- *
- * Type:     modifier<br>
- * Name:     regex_replace<br>
+ * Type:     modifier
+ * Name:     regex_replace
  * Purpose:  regular expression search/replace
- * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string|array
- * @param string|array
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string       $string  input string
+ * @param string|array $search  regular expression(s) to search for
+ * @param string|array $replace string(s) that should be replaced
+ * @param int          $limit   the maximum number of replacements
+ *
  * @return string
  */
-function smarty_modifier_regex_replace($string, $search, $replace)
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
 {
-    if(is_array($search)) {
-      foreach($search as $idx => $s)
-        $search[$idx] = _smarty_regex_replace_check($s);
+    if (is_array($search)) {
+        foreach ($search as $idx => $s) {
+            $search[ $idx ] = _smarty_regex_replace_check($s);
+        }
     } else {
-      $search = _smarty_regex_replace_check($search);
-    }       
-
-    return preg_replace($search, $replace, $string);
+        $search = _smarty_regex_replace_check($search);
+    }
+    return preg_replace($search, $replace, $string, $limit);
 }
 
+/**
+ * @param  string $search string(s) that should be replaced
+ *
+ * @return string
+ * @ignore
+ */
 function _smarty_regex_replace_check($search)
 {
-    if (($pos = strpos($search,"\0")) !== false)
-      $search = substr($search,0,$pos);
-    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-        /* remove eval-modifier from $search */
-        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
+    // null-byte injection detection
+    // anything behind the first null-byte is ignored
+    if (($pos = strpos($search, "\0")) !== false) {
+        $search = substr($search, 0, $pos);
+    }
+    // remove eval-modifier from $search
+    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
+        $search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
     }
     return $search;
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifier.replace.php b/WEB-INF/lib/smarty/plugins/modifier.replace.php
index 0636a1914..a98f5a4a6 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.replace.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.replace.php
@@ -1,29 +1,37 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
-
 /**
  * Smarty replace modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     replace<br>
+ * Type:     modifier
+ * Name:     replace
  * Purpose:  simple search/replace
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
- * @param string $ 
- * @param string $ 
- * @param string $ 
- * @return string 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ *
+ * @param string $string  input string
+ * @param string $search  text to search for
+ * @param string $replace replacement text
+ *
+ * @return string
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-    return smarty_mb_str_replace($search, $replace, $string);
-} 
-
-?>
\ No newline at end of file
+    static $is_loaded = false;
+    if (Smarty::$_MBSTRING) {
+        if (!$is_loaded) {
+            if (!is_callable('smarty_mb_str_replace')) {
+                include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
+            }
+            $is_loaded = true;
+        }
+        return smarty_mb_str_replace($search, $replace, $string);
+    }
+    return str_replace($search, $replace, $string);
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.spacify.php b/WEB-INF/lib/smarty/plugins/modifier.spacify.php
index f14e026bc..98efd4b30 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.spacify.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.spacify.php
@@ -1,37 +1,26 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
-
 /**
  * Smarty spacify modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     spacify<br>
+ * Type:     modifier
+ * Name:     spacify
  * Purpose:  add spaces between characters in a string
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $ 
- * @param string $ 
- * @return string 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string       input string
+ * @param string $spacify_char string to insert between characters.
+ *
+ * @return string
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')
-{ 
-    // mb_ functions available?
-    if (function_exists('mb_strlen') && mb_detect_encoding($string, 'UTF-8, ISO-8859-1') === 'UTF-8') {
-        $strlen = mb_strlen($string);
-        while ($strlen) {
-            $array[] = mb_substr($string, 0, 1, "UTF-8");
-            $string = mb_substr($string, 1, $strlen, "UTF-8");
-            $strlen = mb_strlen($string);
-        } 
-        return implode($spacify_char, $array);
-    } else {
-        return implode($spacify_char, preg_split('//', $string, -1));
-    } 
-} 
-
-?>
\ No newline at end of file
+{
+    // well… what about charsets besides latin and UTF-8?
+    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.truncate.php b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
index 0e9d4b9f2..bb881bf6e 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.truncate.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
@@ -2,66 +2,61 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
- 
 /**
  * Smarty truncate modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     truncate<br>
+ * Type:     modifier
+ * Name:     truncate
  * Purpose:  Truncate a string to a certain length if necessary,
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $string input string
- * @param integer $length lenght of truncated text
- * @param string $etc end string
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string  $string      input string
+ * @param integer $length      length of truncated text
+ * @param string  $etc         end string
  * @param boolean $break_words truncate at word boundary
- * @param boolean $middle truncate in the middle of text
+ * @param boolean $middle      truncate in the middle of text
+ *
  * @return string truncated string
  */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...',
-    $break_words = false, $middle = false)
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
 {
-    if ($length == 0)
+    if ($length === 0) {
         return '';
-
-    if (is_callable('mb_strlen')) {
-        if (mb_detect_encoding($string, 'UTF-8, ISO-8859-1') === 'UTF-8') {
-            // $string has utf-8 encoding
-            if (mb_strlen($string) > $length) {
-                $length -= min($length, mb_strlen($etc));
-                if (!$break_words && !$middle) {
-                    $string = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($string, 0, $length + 1));
-                } 
-                if (!$middle) {
-                    return mb_substr($string, 0, $length) . $etc;
-                } else {
-                    return mb_substr($string, 0, $length / 2) . $etc . mb_substr($string, - $length / 2);
-                } 
-            } else {
-                return $string;
-            } 
-        } 
-    } 
-    // $string has no utf-8 encoding
-    if (strlen($string) > $length) {
+    }
+    if (Smarty::$_MBSTRING) {
+        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
+            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
+            if (!$break_words && !$middle) {
+                $string = preg_replace(
+                    '/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER,
+                    '',
+                    mb_substr($string, 0, $length + 1, Smarty::$_CHARSET)
+                );
+            }
+            if (!$middle) {
+                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
+            }
+            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
+        }
+        return $string;
+    }
+    // no MBString fallback
+    if (isset($string[ $length ])) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        } 
+        }
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
-        } else {
-            return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
-        } 
-    } else {
-        return $string;
-    } 
-} 
-
-?>
\ No newline at end of file
+        }
+        return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
+    }
+    return $string;
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php
index 693722267..21d0e6624 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php
@@ -2,28 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty cat modifier plugin
- *
- * Type:     modifier<br>
- * Name:     cat<br>
+ * Type:     modifier
+ * Name:     cat
  * Date:     Feb 24, 2003
  * Purpose:  catenate a value to a variable
  * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
- * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *          (Smarty online manual)
- * @author   Uwe Tews
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *           (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_cat($params, $compiler)
+function smarty_modifiercompiler_cat($params)
 {
-    return '('.implode(').(', $params).')';
+    return '(' . implode(').(', $params) . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php
index 12a87c488..6c44278af 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php
@@ -2,38 +2,31 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty count_characters modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     count_characteres<br>
+ * Type:     modifier
+ * Name:     count_characters
  * Purpose:  count the number of characters in a text
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ *         manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_characters($params, $compiler)
+function smarty_modifiercompiler_count_characters($params)
 {
-    // mb_ functions available?
-    if (function_exists('mb_strlen')) {
-        // count also spaces?
-        if (isset($params[1]) && $params[1] == 'true') {
-            return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strlen(' . $params[0] . ', SMARTY_RESOURCE_CHAR_SET) : strlen(' . $params[0] . '))';
-        } 
-        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[^\s\pZ]#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'/[^\s]/\',' . $params[0] . ', $tmp))';
-    } else {
-        // count also spaces?
-        if (isset($params[1]) && $params[1] == 'true') {
-            return 'strlen(' . $params[0] . ')';
-        } 
-        return 'preg_match_all(\'/[^\s]/\',' . $params[0] . ', $tmp)';
-    } 
+    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
+        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+    }
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strlen(' . $params[ 0 ] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
index d221e3dc2..e214a56f0 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
@@ -2,26 +2,25 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty count_paragraphs modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_paragraphs<br>
+ * Type:     modifier
+ * Name:     count_paragraphs
  * Purpose:  count the number of paragraphs in a text
- * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews 
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_paragraphs($params, $compiler)
+function smarty_modifiercompiler_count_paragraphs($params)
 {
     // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
+    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php
index 6d0bcf660..027745635 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php
@@ -2,26 +2,25 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty count_sentences modifier plugin
- *
- * Type:     modifier<br>
+ * Type:     modifier
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
- * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_sentences (Smarty online manual)
- * @author Uwe Tews 
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_sentences($params, $compiler)
+function smarty_modifiercompiler_count_sentences($params)
 {
-    // find periods with a word before but not after.
-    return 'preg_match_all(\'/[^\s]\.(?!\w)/\', ' . $params[0] . ', $tmp)';
+    // find periods, question marks, exclamation marks with a word before but not after.
+    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php
index 82bc47866..6d889da5c 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty count_words modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     count_words<br>
+ * Type:     modifier
+ * Name:     count_words
  * Purpose:  count the number of words in a text
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
-*/
-function smarty_modifiercompiler_count_words($params, $compiler)
-{ 
-    // mb_ functions available?
-    if (function_exists('mb_strlen')) {
-        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[\w\pL]+#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'#\w+#\',' . $params[0] . ', $tmp))';
-    } else {
-        return 'str_word_count(' . $params[0] . ')';
-    } 
-} 
-
-?>
\ No newline at end of file
+ */
+function smarty_modifiercompiler_count_words($params)
+{
+    if (Smarty::$_MBSTRING) {
+        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
+        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
+               $params[ 0 ] . ', $tmp)';
+    }
+    // no MBString fallback
+    return 'str_word_count(' . $params[ 0 ] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php
index efbbaef80..ae886c4b2 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php
@@ -2,32 +2,31 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty default modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     default<br>
+ * Type:     modifier
+ * Name:     default
  * Purpose:  designate default value for empty variables
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_default ($params, $compiler)
+function smarty_modifiercompiler_default($params)
 {
-    $output = $params[0];
-    if (!isset($params[1])) {
-        $params[1] = "''";
-    } 
-    for ($i = 1, $cnt = count($params); $i < $cnt; $i++) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $params[$i] . ' : $tmp)';
-    } 
+    $output = $params[ 0 ];
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = "''";
+    }
+    array_shift($params);
+    foreach ($params as $param) {
+        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
+    }
     return $output;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
new file mode 100644
index 000000000..e0763adce
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @author Rodney Rehm
+ *
+ * @param array                                $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @return string with compiled code
+ * @throws \SmartyException
+ */
+function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
+{
+    static $_double_encode = null;
+    static $is_loaded = false;
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+    if ($_double_encode === null) {
+        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
+    }
+    try {
+        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
+        $double_encode = smarty_literal_compiler_param($params, 3, true);
+        if (!$char_set) {
+            $char_set = Smarty::$_CHARSET;
+        }
+        switch ($esc_type) {
+            case 'html':
+                if ($_double_encode) {
+                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                           var_export($double_encode, true) . ')';
+                } elseif ($double_encode) {
+                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
+                } else {
+                    // fall back to modifier.escape.php
+                }
+            // no break
+            case 'htmlall':
+                if (Smarty::$_MBSTRING) {
+                    if ($_double_encode) {
+                        // php >=5.2.3 - go native
+                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+                               var_export($char_set, true) . ', ' . var_export($double_encode, true) .
+                               '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
+                    } elseif ($double_encode) {
+                        // php <5.2.3 - only handle double encoding
+                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+                               var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
+                    } else {
+                        // fall back to modifier.escape.php
+                    }
+                }
+                // no MBString fallback
+                if ($_double_encode) {
+                    // php >=5.2.3 - go native
+                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                           var_export($double_encode, true) . ')';
+                } elseif ($double_encode) {
+                    // php <5.2.3 - only handle double encoding
+                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
+                } else {
+                    // fall back to modifier.escape.php
+                }
+            // no break
+            case 'url':
+                return 'rawurlencode(' . $params[ 0 ] . ')';
+            case 'urlpathinfo':
+                return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
+            case 'quotes':
+                // escape unescaped single quotes
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
+            case 'javascript':
+                // escape quotes and backslashes, newlines, etc.
+                return 'strtr(' .
+                       $params[ 0 ] .
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
+        }
+    } catch (SmartyException $e) {
+        // pass through to regular plugin fallback
+    }
+    // could not optimize |escape call, so fallback to regular plugin
+    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+            'smarty_modifier_escape';
+    } else {
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+            'smarty_modifier_escape';
+    }
+    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.from_charset.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.from_charset.php
new file mode 100644
index 000000000..acce7784b
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.from_charset.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty from_charset modifier plugin
+ * Type:     modifier
+ * Name:     from_charset
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_from_charset($params)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[ 0 ];
+    }
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = '"ISO-8859-1"';
+    }
+    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php
index cb99120b1..2088ad6a8 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php
@@ -1,32 +1,30 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty indent modifier plugin
- *
- * Type:     modifier<br>
- * Name:     indent<br>
+ * Type:     modifier
+ * Name:     indent
  * Purpose:  indent lines of text
- * @link http://smarty.php.net/manual/en/language.modifier.indent.php
- *          indent (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_indent($params, $compiler)
+function smarty_modifiercompiler_indent($params)
 {
-    if (!isset($params[1])) {
-        $params[1] = 4;
-    } 
-    if (!isset($params[2])) {
-        $params[2] = "' '";
-    } 
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 4;
+    }
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = "' '";
+    }
+    return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php
index 13858d48d..0d899a002 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php
@@ -1,31 +1,29 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty lower modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     lower<br>
+ * Type:     modifier
+ * Name:     lower
  * Purpose:  convert string to lowercase
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_lower($params, $compiler)
+function smarty_modifiercompiler_lower($params)
 {
-    if (function_exists('mb_strtolower')) {
-        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtolower(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtolower(' . $params[0] . '))' ;
-    } else {
-        return 'strtolower(' . $params[0] . ')';
-    } 
-} 
-
-?>
\ No newline at end of file
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strtolower(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strtolower(' . $params[ 0 ] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.noprint.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.noprint.php
index 5fac7b6cc..1275190e0 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.noprint.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.noprint.php
@@ -2,23 +2,19 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty noprint modifier plugin
- *
- * Type:     modifier<br>
- * Name:     noprint<br>
+ * Type:     modifier
+ * Name:     noprint
  * Purpose:  return an empty string
- * @author   Uwe Tews
- * @param array $params parameters
+ *
+ * @author Uwe Tews
  * @return string with compiled code
  */
-function smarty_modifiercompiler_noprint($params, $compiler)
+function smarty_modifiercompiler_noprint()
 {
     return "''";
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
index de4054ec9..663094311 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
@@ -1,26 +1,24 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty string_format modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     string_format<br>
+ * Type:     modifier
+ * Name:     string_format
  * Purpose:  format strings via sprintf
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_string_format($params, $compiler)
+function smarty_modifiercompiler_string_format($params)
 {
-    return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
-} 
-
-?>
\ No newline at end of file
+    return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php
index 83c36391e..04ea332c5 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php
@@ -2,32 +2,29 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty strip modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     strip<br>
+ * Type:     modifier
+ * Name:     strip
  * Purpose:  Replace all repeated spaces, newlines, tabs
- *              with a single space or supplied replacement string.<br>
+ *              with a single space or supplied replacement string.
  * Example:  {$var|strip} {$var|strip:"&nbsp;"}
  * Date:     September 25th, 2002
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_strip($params, $compiler)
+function smarty_modifiercompiler_strip($params)
 {
-    if (!isset($params[1])) {
-        $params[1] = "' '";
-    } 
-    return "preg_replace('!\s+!', {$params[1]},{$params[0]})";
-} 
-
-?>
\ No newline at end of file
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = "' '";
+    }
+    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
index ec1a96590..1bca1a28e 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
@@ -2,33 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty strip_tags modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     strip_tags<br>
+ * Type:     modifier
+ * Name:     strip_tags
  * Purpose:  strip html tags from text
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_strip_tags($params, $compiler)
+function smarty_modifiercompiler_strip_tags($params)
 {
-   if (!isset($params[1])) {
-        $params[1] = true;
-    } 
-    if ($params[1] === true) {
+    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
-        return 'strip_tags(' . $params[0] . ')';
-    } 
-} 
-
-?>
\ No newline at end of file
+        return 'strip_tags(' . $params[ 0 ] . ')';
+    }
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.to_charset.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.to_charset.php
new file mode 100644
index 000000000..d652eab1b
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.to_charset.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty to_charset modifier plugin
+ * Type:     modifier
+ * Name:     to_charset
+ * Purpose:  convert character encoding from internal encoding to $charset
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_to_charset($params)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[ 0 ];
+    }
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = '"ISO-8859-1"';
+    }
+    return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
new file mode 100644
index 000000000..05beb81f5
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty unescape modifier plugin
+ * Type:     modifier
+ * Name:     unescape
+ * Purpose:  unescape html entities
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_unescape($params)
+{
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 'html';
+    }
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
+    } else {
+        $params[ 2 ] = "'{$params[ 2 ]}'";
+    }
+    switch (trim($params[ 1 ], '"\'')) {
+        case 'entity':
+        case 'htmlall':
+            if (Smarty::$_MBSTRING) {
+                return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
+            }
+            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
+        case 'html':
+            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+        case 'url':
+            return 'rawurldecode(' . $params[ 0 ] . ')';
+        default:
+            return $params[ 0 ];
+    }
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
index f6635020f..ea4e95b7a 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
@@ -2,29 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty upper modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     lower<br>
+ * Type:     modifier
+ * Name:     lower
  * Purpose:  convert string to uppercase
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_upper($params, $compiler)
+function smarty_modifiercompiler_upper($params)
 {
-    if (function_exists('mb_strtoupper')) {
-        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtoupper(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtoupper(' . $params[0] . '))' ;
-    } else {
-        return 'strtoupper(' . $params[0] . ')';
-    } 
-} 
-
-?>
\ No newline at end of file
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strtoupper(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strtoupper(' . $params[ 0 ] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php
index ff593c728..8565f140e 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php
@@ -2,34 +2,38 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty wordwrap modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     wordwrap<br>
+ * Type:     modifier
+ * Name:     wordwrap
  * Purpose:  wrap a string of text at a given length
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews 
- * @param array $params parameters
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array                                 $params parameters
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler
+ *
  * @return string with compiled code
+ * @throws \SmartyException
  */
-function smarty_modifiercompiler_wordwrap($params, $compiler)
+function smarty_modifiercompiler_wordwrap($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    if (!isset($params[1])) {
-        $params[1] = 80;
-    } 
-    if (!isset($params[2])) {
-        $params[2] = '"\n"';
-    } 
-    if (!isset($params[3])) {
-        $params[3] = 'false';
-    } 
-    return 'wordwrap(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
-} 
-
-?>
\ No newline at end of file
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 80;
+    }
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = '"\n"';
+    }
+    if (!isset($params[ 3 ])) {
+        $params[ 3 ] = 'false';
+    }
+    $function = 'wordwrap';
+    if (Smarty::$_MBSTRING) {
+        $function = $compiler->getPlugin('mb_wordwrap', 'modifier');
+    }
+    return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php b/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php
index 20e9bb600..7e4503a1c 100644
--- a/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php
+++ b/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php
@@ -2,76 +2,88 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
-
 /**
  * Smarty trimwhitespace outputfilter plugin
+ * Trim unnecessary whitespace from HTML markup.
+ *
+ * @author Rodney Rehm
  *
- * File:     outputfilter.trimwhitespace.php<br>
- * Type:     outputfilter<br>
- * Name:     trimwhitespace<br>
- * Date:     Jan 25, 2003<br>
- * Purpose:  trim leading white space and blank lines from
- *           template source after it gets interpreted, cleaning
- *           up code and saving bandwidth. Does not affect
- *           <<PRE>></PRE> and <SCRIPT></SCRIPT> blocks.<br>
- * Install:  Drop into the plugin directory, call
- *           <code>$smarty->load_filter('output','trimwhitespace');</code>
- *           from application.
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author Contributions from Lars Noschinski <lars@usenet.noschinski.de>
- * @version  1.3
  * @param string $source input string
- * @param object &$smarty Smarty object
+ *
  * @return string filtered output
+ * @todo   substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
  */
-function smarty_outputfilter_trimwhitespace($source, $smarty)
+function smarty_outputfilter_trimwhitespace($source)
 {
-    // Pull out the script blocks
-    preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match);
-    $_script_blocks = $match[0];
-    $source = preg_replace("!<script[^>]*?>.*?</script>!is",
-                           '@@@SMARTY:TRIM:SCRIPT@@@', $source);
-
-    // Pull out the pre blocks
-    preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match);
-    $_pre_blocks = $match[0];
-    $source = preg_replace("!<pre[^>]*?>.*?</pre>!is",
-                           '@@@SMARTY:TRIM:PRE@@@', $source);
-    
-    // Pull out the textarea blocks
-    preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match);
-    $_textarea_blocks = $match[0];
-    $source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is",
-                           '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
-
-    // remove all leading spaces, tabs and carriage returns NOT
-    // preceeded by a php close tag.
-    $source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
-
-    // replace textarea blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
-
-    // replace pre blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
-
-    // replace script blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
-
+    $store = array();
+    $_store = 0;
+    $_offset = 0;
+    // Unify Line-Breaks to \n
+    $source = preg_replace('/\015\012|\015|\012/', "\n", $source);
+    // capture Internet Explorer and KnockoutJS Conditional Comments
+    if (preg_match_all(
+        '#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is',
+        $source,
+        $matches,
+        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+    )
+    ) {
+        foreach ($matches as $match) {
+            $store[] = $match[ 0 ][ 0 ];
+            $_length = strlen($match[ 0 ][ 0 ]);
+            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
+    // Strip all HTML-Comments
+    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
+    $source = preg_replace('#<!--.*?-->#ms', '', $source);
+    // capture html elements not to be messed with
+    $_offset = 0;
+    if (preg_match_all(
+        '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+        $source,
+        $matches,
+        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+    )
+    ) {
+        foreach ($matches as $match) {
+            $store[] = $match[ 0 ][ 0 ];
+            $_length = strlen($match[ 0 ][ 0 ]);
+            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
+    $expressions = array(// replace multiple spaces between tags by a single space
+                         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
+                         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
+                         // remove spaces between attributes (but not in attribute values!)
+                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                         // note: for some very weird reason trim() seems to remove spaces inside attributes.
+                         // maybe a \0 byte or something is interfering?
+                         '#^\s+<#Ss'                                                               => '<',
+                         '#>\s+$#Ss'                                                               => '>',
+    );
+    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
+    // note: for some very weird reason trim() seems to remove spaces inside attributes.
+    // maybe a \0 byte or something is interfering?
+    // $source = trim( $source );
+    $_offset = 0;
+    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        foreach ($matches as $match) {
+            $_length = strlen($match[ 0 ][ 0 ]);
+            $replace = $store[ $match[ 1 ][ 0 ] ];
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+            $_offset += strlen($replace) - $_length;
+            $_store++;
+        }
+    }
     return $source;
 }
-
-function smarty_outputfilter_trimwhitespace_replace($search_str, $replace, &$subject) {
-    $_len = strlen($search_str);
-    $_pos = 0;
-    for ($_i=0, $_count=count($replace); $_i<$_count; $_i++)
-        if (($_pos=strpos($subject, $search_str, $_pos))!==false)
-            $subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
-        else
-            break;
-
-}
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php b/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php
index e36b2c897..6b18d3eec 100644
--- a/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php
+++ b/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php
@@ -2,28 +2,31 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
-
 /**
  * escape_special_chars common function
- *
- * Function: smarty_function_escape_special_chars<br>
+ * Function: smarty_function_escape_special_chars
  * Purpose:  used by other smarty functions to escape
  *           special chars except for already escaped ones
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string text that should by escaped
+ *
  * @return string
  */
 function smarty_function_escape_special_chars($string)
 {
-    if(!is_array($string)) {
-        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-        $string = htmlspecialchars($string);
-        $string = str_replace(array('%%%SMARTY_START%%%','%%%SMARTY_END%%%'), array('&',';'), $string);
+    if (!is_array($string)) {
+        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
+            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
+        } else {
+            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+            $string = htmlspecialchars($string);
+            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+        }
     }
     return $string;
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/shared.literal_compiler_param.php b/WEB-INF/lib/smarty/plugins/shared.literal_compiler_param.php
new file mode 100644
index 000000000..65caf03c8
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/shared.literal_compiler_param.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+/**
+ * evaluate compiler parameter
+ *
+ * @param array   $params  parameter array as given to the compiler function
+ * @param integer $index   array index of the parameter to convert
+ * @param mixed   $default value to be returned if the parameter is not present
+ *
+ * @return mixed evaluated value of parameter or $default
+ * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
+ * @author Rodney Rehm
+ */
+function smarty_literal_compiler_param($params, $index, $default = null)
+{
+    // not set, go default
+    if (!isset($params[ $index ])) {
+        return $default;
+    }
+    // test if param is a literal
+    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
+        throw new SmartyException(
+            '$param[' . $index .
+            '] is not a literal and is thus not evaluatable at compile time'
+        );
+    }
+    $t = null;
+    eval("\$t = " . $params[ $index ] . ";");
+    return $t;
+}
diff --git a/WEB-INF/lib/smarty/plugins/shared.make_timestamp.php b/WEB-INF/lib/smarty/plugins/shared.make_timestamp.php
index 9789f53f7..9626dc68e 100644
--- a/WEB-INF/lib/smarty/plugins/shared.make_timestamp.php
+++ b/WEB-INF/lib/smarty/plugins/shared.make_timestamp.php
@@ -2,42 +2,48 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
-
 /**
- * Function: smarty_make_timestamp<br>
- * Purpose:  used by other smarty functions to make a timestamp
- *           from a string.
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string $string
- * @return string
+ * Function: smarty_make_timestamp
+ * Purpose:  used by other smarty functions to make a timestamp from a string.
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
+ * @return int
  */
-
 function smarty_make_timestamp($string)
 {
-    if(empty($string)) {
+    if (empty($string)) {
         // use "now":
         return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
-    } elseif (strlen($string)==14 && ctype_digit($string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?            
-        return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+    } elseif ($string instanceof DateTime
+              || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
+    ) {
+        return (int)$string->format('U'); // PHP 5.2 BC
+    } elseif (strlen($string) === 14 && ctype_digit($string)) {
+        // it is mysql timestamp format of YYYYMMDDHHMMSS?
+        return mktime(
+            substr($string, 8, 2),
+            substr($string, 10, 2),
+            substr($string, 12, 2),
+            substr($string, 4, 2),
+            substr($string, 6, 2),
+            substr($string, 0, 4)
+        );
     } elseif (is_numeric($string)) {
         // it is a numeric string, we handle it as timestamp
         return (int)$string;
     } else {
         // strtotime should handle it
         $time = strtotime($string);
-        if ($time == -1 || $time === false) {
+        if ($time === -1 || $time === false) {
             // strtotime() was not able to parse $string, use "now":
             return time();
         }
         return $time;
     }
 }
-
-?>
diff --git a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
index 8bc156f08..206cf9ea6 100644
--- a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
+++ b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
@@ -1,38 +1,53 @@
 <?php
-
-if(!function_exists('smarty_mb_str_replace')) {
-  function smarty_mb_str_replace($search, $replace, $subject, &$count=0) { 
-      if (!is_array($search) && is_array($replace)) { 
-          return false; 
-      } 
-      if (is_array($subject)) { 
-          // call mb_replace for each single string in $subject 
-          foreach ($subject as &$string) { 
-              $string = &smarty_mb_str_replace($search, $replace, $string, $c); 
-              $count += $c; 
-          } 
-      } elseif (is_array($search)) { 
-          if (!is_array($replace)) { 
-              foreach ($search as &$string) { 
-                  $subject = smarty_mb_str_replace($string, $replace, $subject, $c); 
-                  $count += $c; 
-              } 
-          } else { 
-              $n = max(count($search), count($replace)); 
-              while ($n--) { 
-                  $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c); 
-                  $count += $c; 
-                  next($search); 
-                  next($replace); 
-              } 
-          } 
-      } else { 
-          $parts = mb_split(preg_quote($search), $subject); 
-          $count = count($parts)-1; 
-          $subject = implode($replace, $parts); 
-      } 
-      return $subject; 
-  }
+/**
+ * Smarty shared plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+if (!function_exists('smarty_mb_str_replace')) {
+    /**
+     * Multibyte string replace
+     *
+     * @param string|string[] $search  the string to be searched
+     * @param string|string[] $replace the replacement string
+     * @param string          $subject the source string
+     * @param int             &$count  number of matches found
+     *
+     * @return string replaced string
+     * @author Rodney Rehm
+     */
+    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
+    {
+        if (!is_array($search) && is_array($replace)) {
+            return false;
+        }
+        if (is_array($subject)) {
+            // call mb_replace for each single string in $subject
+            foreach ($subject as &$string) {
+                $string = smarty_mb_str_replace($search, $replace, $string, $c);
+                $count += $c;
+            }
+        } elseif (is_array($search)) {
+            if (!is_array($replace)) {
+                foreach ($search as &$string) {
+                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
+                    $count += $c;
+                }
+            } else {
+                $n = max(count($search), count($replace));
+                while ($n--) {
+                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
+                    $count += $c;
+                    next($search);
+                    next($replace);
+                }
+            }
+        } else {
+            $parts = mb_split(preg_quote($search), $subject);
+            $count = count($parts) - 1;
+            $subject = implode($replace, $parts);
+        }
+        return $subject;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/shared.mb_unicode.php b/WEB-INF/lib/smarty/plugins/shared.mb_unicode.php
new file mode 100644
index 000000000..7d1206506
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/shared.mb_unicode.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+/**
+ * convert characters to their decimal unicode equivalents
+ *
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
+ * @param string $string   characters to calculate unicode of
+ * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
+ *
+ * @return array sequence of unicodes
+ * @author Rodney Rehm
+ */
+function smarty_mb_to_unicode($string, $encoding = null)
+{
+    if ($encoding) {
+        $expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
+    } else {
+        $expanded = mb_convert_encoding($string, 'UTF-32BE');
+    }
+    return unpack('N*', $expanded);
+}
+
+/**
+ * convert unicodes to the character of given encoding
+ *
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
+ * @param integer|array $unicode  single unicode or list of unicodes to convert
+ * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
+ *
+ * @return string unicode as character sequence in given $encoding
+ * @author Rodney Rehm
+ */
+function smarty_mb_from_unicode($unicode, $encoding = null)
+{
+    $t = '';
+    if (!$encoding) {
+        $encoding = mb_internal_encoding();
+    }
+    foreach ((array)$unicode as $utf32be) {
+        $character = pack('N*', $utf32be);
+        $t .= mb_convert_encoding($character, $encoding, 'UTF-32BE');
+    }
+    return $t;
+}
diff --git a/WEB-INF/lib/smarty/plugins/variablefilter.htmlspecialchars.php b/WEB-INF/lib/smarty/plugins/variablefilter.htmlspecialchars.php
index 4d3550c04..3c85295db 100644
--- a/WEB-INF/lib/smarty/plugins/variablefilter.htmlspecialchars.php
+++ b/WEB-INF/lib/smarty/plugins/variablefilter.htmlspecialchars.php
@@ -1,22 +1,19 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
-
 /**
  * Smarty htmlspecialchars variablefilter plugin
- * 
- * @param string $source input string
- * @param object $ &$smarty Smarty object
+ *
+ * @param string                    $source input string
+ * @param \Smarty_Internal_Template $template
+ *
  * @return string filtered output
  */
-
-function smarty_variablefilter_htmlspecialchars($source, $smarty)
+function smarty_variablefilter_htmlspecialchars($source, Smarty_Internal_Template $template)
 {
-    return htmlspecialchars($source, ENT_QUOTES);
-} 
-
-?>
\ No newline at end of file
+    return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
new file mode 100644
index 000000000..91e9f3924
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param \Smarty_Template_Cached  $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    abstract public function populate(\Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
+    abstract public function populateTimestamp(Smarty_Template_Cached $cached);
+
+    /**
+     * Read the cached template and process header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param boolean                  $update    flag if called because cache update
+     *
+     * @return boolean true or false if the cached content does not exist
+     */
+    abstract public function process(
+        Smarty_Internal_Template $_template,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    );
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
+    abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    abstract public function readCachedContent(Smarty_Internal_Template $_template);
+
+    /**
+     * Return cached content
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return null|string
+     */
+    public function getCachedContent(Smarty_Internal_Template $_template)
+    {
+        if ($_template->cached->handler->process($_template)) {
+            ob_start();
+            $unifunc = $_template->cached->unifunc;
+            $unifunc($_template);
+            return ob_get_clean();
+        }
+        return null;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool|null
+     */
+    public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
+        $start = microtime(true);
+        $hadLock = null;
+        while ($this->hasLock($smarty, $cached)) {
+            $hadLock = true;
+            if (microtime(true) - $start > $smarty->locking_timeout) {
+                // abort waiting for lock release
+                return false;
+            }
+            sleep(1);
+        }
+        return $hadLock;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // check if lock exists
+        return false;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // create lock
+        return true;
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // release lock
+        return true;
+    }
+
+    /**
+     * Load Cache Resource Handler
+     *
+     * @param Smarty $smarty Smarty object
+     * @param string $type   name of the cache resource
+     *
+     * @throws SmartyException
+     * @return Smarty_CacheResource Cache Resource Handler
+     */
+    public static function load(Smarty $smarty, $type = null)
+    {
+        if (!isset($type)) {
+            $type = $smarty->caching_type;
+        }
+        // try smarty's cache
+        if (isset($smarty->_cache[ 'cacheresource_handlers' ][ $type ])) {
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ];
+        }
+        // try registered resource
+        if (isset($smarty->registered_cache_resources[ $type ])) {
+            // do not cache these instances as they may vary from instance to instance
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = $smarty->registered_cache_resources[ $type ];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $type ])) {
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
+        }
+        // try plugins dir
+        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
+        if ($smarty->loadPlugin($cache_resource_class)) {
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
+        }
+        // give up
+        throw new SmartyException("Unable to load cache resource '{$type}'");
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_custom.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_custom.php
new file mode 100644
index 000000000..68ad11289
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_custom.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
+{
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string  $id         unique cache content identifier
+     * @param string  $name       template name
+     * @param string  $cache_id   cache id
+     * @param string  $compile_id compile id
+     * @param string  $content    cached content
+     * @param integer $mtime      cache modification timestamp (epoch)
+     *
+     * @return void
+     */
+    abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
+     *
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+    {
+        return false;
+    }
+
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
+     * @param string       $content    content to cache
+     *
+     * @return boolean      success
+     */
+    abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
+
+    /**
+     * Delete content from cache
+     *
+     * @param string|null  $name       template name
+     * @param string|null  $cache_id   cache id
+     * @param string|null  $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     *
+     * @return integer      number of deleted caches
+     */
+    abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $path = $cached->source->uid . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->smarty->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $mtime =
+            $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
+        if ($mtime !== null) {
+            $cached->timestamp = $mtime;
+            $cached->exists = !!$cached->timestamp;
+            return;
+        }
+        $timestamp = null;
+        $this->fetch(
+            $cached->filepath,
+            $cached->source->name,
+            $cached->cache_id,
+            $cached->compile_id,
+            $cached->content,
+            $timestamp
+        );
+        $cached->timestamp = isset($timestamp) ? $timestamp : false;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process the header
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @param Smarty_Template_Cached    $cached      cached object
+     * @param boolean                   $update      flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
+     */
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
+        if (!$cached) {
+            $cached = $_smarty_tpl->cached;
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            $this->fetch(
+                $_smarty_tpl->cached->filepath,
+                $_smarty_tpl->source->name,
+                $_smarty_tpl->cache_id,
+                $_smarty_tpl->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            eval('?>' . $content);
+            $cached->content = null;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean                  success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        return $this->save(
+            $_template->cached->filepath,
+            $_template->source->name,
+            $_template->cache_id,
+            $_template->compile_id,
+            $_template->cache_lifetime,
+            $content
+        );
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|boolean  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            $timestamp = null;
+            $this->fetch(
+                $_template->cached->filepath,
+                $_template->source->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $this->delete(null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return int number of cache files deleted
+     * @throws \SmartyException
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $cache_name = null;
+        if (isset($resource_name)) {
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                $cache_name = $source->name;
+            } else {
+                return 0;
+            }
+        }
+        return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $id = $cached->lock_id;
+        $name = $cached->source->name . '.lock';
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
+        if ($mtime === null) {
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
+        }
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        $id = $cached->lock_id;
+        $name = $cached->source->name . '.lock';
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        $name = $cached->source->name . '.lock';
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
new file mode 100644
index 000000000..59bf1d4a8
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -0,0 +1,538 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Smarty Cache Handler Base for Key/Value Storage Implementations
+ * This class implements the functionality required to use simple key/value stores
+ * for hierarchical cache groups. key/value stores like memcache or APC do not support
+ * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
+ * is no problem to filesystem and RDBMS implementations.
+ * This implementation is based on the concept of invalidation. While one specific cache
+ * can be identified and cleared, any range of caches cannot be identified. For this reason
+ * each level of the cache group hierarchy can have its own value in the store. These values
+ * are nothing but microtimes, telling us when a particular cache group was cleared for the
+ * last time. These keys are evaluated for every cache read to determine if the cache has
+ * been invalidated since it was created and should hence be treated as inexistent.
+ * Although deep hierarchies are possible, they are not recommended. Try to keep your
+ * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
+ * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
+ * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
+ * consider using »a|b|c|$page-$items-$whatever« instead.
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
+{
+    /**
+     * cache for contents
+     *
+     * @var array
+     */
+    protected $contents = array();
+
+    /**
+     * cache for timestamps
+     *
+     * @var array
+     */
+    protected $timestamps = array();
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
+                            $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        if (!$this->fetch(
+            $cached->filepath,
+            $cached->source->name,
+            $cached->cache_id,
+            $cached->compile_id,
+            $content,
+            $timestamp,
+            $cached->source->uid
+        )
+        ) {
+            return;
+        }
+        $cached->content = $content;
+        $cached->timestamp = (int)$timestamp;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process the header
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @param Smarty_Template_Cached    $cached      cached object
+     * @param boolean                   $update      flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
+     */
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
+        if (!$cached) {
+            $cached = $_smarty_tpl->cached;
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            if (!$this->fetch(
+                $_smarty_tpl->cached->filepath,
+                $_smarty_tpl->source->name,
+                $_smarty_tpl->cache_id,
+                $_smarty_tpl->compile_id,
+                $content,
+                $timestamp,
+                $_smarty_tpl->source->uid
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            eval('?>' . $content);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean                  success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        $this->addMetaTimestamp($content);
+        return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|false  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            if (!$this->fetch(
+                $_template->cached->filepath,
+                $_template->source->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp,
+                $_template->source->uid
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     * {@internal the $exp_time argument is ignored altogether }}
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time [being ignored]
+     *
+     * @return integer number of cache files deleted [always -1]
+     * @uses   purge() to clear the whole store
+     * @uses   invalidate() to mark everything outdated if purge() is inapplicable
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        if (!$this->purge()) {
+            $this->invalidate(null);
+        }
+        return -1;
+    }
+
+    /**
+     * Empty cache for a specific template
+     * {@internal the $exp_time argument is ignored altogether}}
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time [being ignored]
+     *
+     * @return int number of cache files deleted [always -1]
+     * @throws \SmartyException
+     * @uses   buildCachedFilepath() to generate the CacheID
+     * @uses   invalidate() to mark CacheIDs parent chain as outdated
+     * @uses   delete() to remove CacheID from cache
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+               $this->sanitize($compile_id);
+        $this->delete(array($cid));
+        $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
+        return -1;
+    }
+
+    /**
+     * Get template's unique ID
+     *
+     * @param Smarty $smarty        Smarty object
+     * @param string $resource_name template name
+     *
+     * @return string filepath of cache file
+     * @throws \SmartyException
+     */
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
+    {
+        if (isset($resource_name)) {
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
+            }
+        }
+        return '';
+    }
+
+    /**
+     * Sanitize CacheID components
+     *
+     * @param string $string CacheID component to sanitize
+     *
+     * @return string sanitized CacheID component
+     */
+    protected function sanitize($string)
+    {
+        $string = trim($string, '|');
+        if (!$string) {
+            return '';
+        }
+        return preg_replace('#[^\w\|]+#S', '_', $string);
+    }
+
+    /**
+     * Fetch and prepare a cache object.
+     *
+     * @param string  $cid           CacheID to fetch
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param string  $content       cached content
+     * @param integer &$timestamp    cached timestamp (epoch)
+     * @param string  $resource_uid  resource's uid
+     *
+     * @return boolean success
+     */
+    protected function fetch(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        &$content = null,
+        &$timestamp = null,
+        $resource_uid = null
+    ) {
+        $t = $this->read(array($cid));
+        $content = !empty($t[ $cid ]) ? $t[ $cid ] : null;
+        $timestamp = null;
+        if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
+            $invalidated =
+                $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
+            if ($invalidated > $timestamp) {
+                $timestamp = null;
+                $content = null;
+            }
+        }
+        return !!$content;
+    }
+
+    /**
+     * Add current microtime to the beginning of $cache_content
+     * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
+     *
+     * @param string &$content the content to be cached
+     */
+    protected function addMetaTimestamp(&$content)
+    {
+        $mt = explode(' ', microtime());
+        $ts = pack('NN', $mt[ 1 ], (int)($mt[ 0 ] * 100000000));
+        $content = $ts . $content;
+    }
+
+    /**
+     * Extract the timestamp the $content was cached
+     *
+     * @param string &$content the cached content
+     *
+     * @return float  the microtime the content was cached
+     */
+    protected function getMetaTimestamp(&$content)
+    {
+        extract(unpack('N1s/N1m/a*content', $content));
+        /**
+         * @var  int $s
+         * @var  int $m
+         */
+        return $s + ($m / 100000000);
+    }
+
+    /**
+     * Invalidate CacheID
+     *
+     * @param string $cid           CacheID
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's uid
+     *
+     * @return void
+     */
+    protected function invalidate(
+        $cid = null,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        $now = microtime(true);
+        $key = null;
+        // invalidate everything
+        if (!$resource_name && !$cache_id && !$compile_id) {
+            $key = 'IVK#ALL';
+        } // invalidate all caches by template
+        else {
+            if ($resource_name && !$cache_id && !$compile_id) {
+                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+            } // invalidate all caches by cache group
+            else {
+                if (!$resource_name && $cache_id && !$compile_id) {
+                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+                } // invalidate all caches by compile id
+                else {
+                    if (!$resource_name && !$cache_id && $compile_id) {
+                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+                    } // invalidate by combination
+                    else {
+                        $key = 'IVK#CID#' . $cid;
+                    }
+                }
+            }
+        }
+        $this->write(array($key => $now));
+    }
+
+    /**
+     * Determine the latest timestamp known to the invalidation chain
+     *
+     * @param string $cid           CacheID to determine latest invalidation timestamp of
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     *
+     * @return float  the microtime the CacheID was invalidated
+     */
+    protected function getLatestInvalidationTimestamp(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        // abort if there is no CacheID
+        if (false && !$cid) {
+            return 0;
+        }
+        // abort if there are no InvalidationKeys to check
+        if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
+            return 0;
+        }
+        // there are no InValidationKeys
+        if (!($values = $this->read($_cid))) {
+            return 0;
+        }
+        // make sure we're dealing with floats
+        $values = array_map('floatval', $values);
+        return max($values);
+    }
+
+    /**
+     * Translate a CacheID into the list of applicable InvalidationKeys.
+     * Splits 'some|chain|into|an|array' into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
+     *
+     * @param string $cid           CacheID to translate
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     *
+     * @return array  list of InvalidationKeys
+     * @uses   $invalidationKeyPrefix to prepend to each InvalidationKey
+     */
+    protected function listInvalidationKeys(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        $t = array('IVK#ALL');
+        $_name = $_compile = '#';
+        if ($resource_name) {
+            $_name .= $resource_uid . '#' . $this->sanitize($resource_name);
+            $t[] = 'IVK#TEMPLATE' . $_name;
+        }
+        if ($compile_id) {
+            $_compile .= $this->sanitize($compile_id);
+            $t[] = 'IVK#COMPILE' . $_compile;
+        }
+        $_name .= '#';
+        $cid = trim($cache_id, '|');
+        if (!$cid) {
+            return $t;
+        }
+        $i = 0;
+        while (true) {
+            // determine next delimiter position
+            $i = strpos($cid, '|', $i);
+            // add complete CacheID if there are no more delimiters
+            if ($i === false) {
+                $t[] = 'IVK#CACHE#' . $cid;
+                $t[] = 'IVK#CID' . $_name . $cid . $_compile;
+                $t[] = 'IVK#CID' . $_name . $_compile;
+                break;
+            }
+            $part = substr($cid, 0, $i);
+            // add slice to list
+            $t[] = 'IVK#CACHE#' . $part;
+            $t[] = 'IVK#CID' . $_name . $part . $_compile;
+            // skip past delimiter position
+            $i++;
+        }
+        return $t;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $key = 'LOCK#' . $cached->filepath;
+        $data = $this->read(array($key));
+        return $data && time() - $data[ $key ] < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->write(array($key => time()), $smarty->locking_timeout);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->delete(array($key));
+    }
+
+    /**
+     * Read values for a set of keys from cache
+     *
+     * @param array $keys list of keys to fetch
+     *
+     * @return array list of values with the given keys used as indexes
+     */
+    abstract protected function read(array $keys);
+
+    /**
+     * Save values for a set of keys to cache
+     *
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
+     *
+     * @return boolean true on success, false on failure
+     */
+    abstract protected function write(array $keys, $expire = null);
+
+    /**
+     * Remove values from cache
+     *
+     * @param array $keys list of keys to delete
+     *
+     * @return boolean true on success, false on failure
+     */
+    abstract protected function delete(array $keys);
+
+    /**
+     * Remove *all* values from cache
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function purge()
+    {
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_data.php b/WEB-INF/lib/smarty/sysplugins/smarty_data.php
new file mode 100644
index 000000000..2545ed3a8
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_data.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Plugin Data
+ * This file contains the data object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * class for the Smarty data object
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data
+{
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    public static $count = 0;
+
+    /**
+     * Data block name
+     *
+     * @var string
+     */
+    public $dataObjectName = '';
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array                    $_parent parent template
+     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
+     * @param string                          $name    optional data block name
+     *
+     * @throws SmartyException
+     */
+    public function __construct($_parent = null, $smarty = null, $name = null)
+    {
+        parent::__construct();
+        self::$count++;
+        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+            }
+        } elseif ($_parent !== null) {
+            throw new SmartyException('Wrong type for template variables');
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_block.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_block.php
new file mode 100644
index 000000000..9956d642b
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_block.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Smarty {block} tag class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Block
+{
+    /**
+     * Block name
+     *
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * Hide attribute
+     *
+     * @var bool
+     */
+    public $hide = false;
+
+    /**
+     * Append attribute
+     *
+     * @var bool
+     */
+    public $append = false;
+
+    /**
+     * prepend attribute
+     *
+     * @var bool
+     */
+    public $prepend = false;
+
+    /**
+     * Block calls $smarty.block.child
+     *
+     * @var bool
+     */
+    public $callsChild = false;
+
+    /**
+     * Inheritance child block
+     *
+     * @var Smarty_Internal_Block|null
+     */
+    public $child = null;
+
+    /**
+     * Inheritance calling parent block
+     *
+     * @var Smarty_Internal_Block|null
+     */
+    public $parent = null;
+
+    /**
+     * Inheritance Template index
+     *
+     * @var int
+     */
+    public $tplIndex = 0;
+
+    /**
+     * Smarty_Internal_Block constructor.
+     * - if outer level {block} of child template ($state === 1) save it as child root block
+     * - otherwise process inheritance and render
+     *
+     * @param string   $name     block name
+     * @param int|null $tplIndex index of outer level {block} if nested
+     */
+    public function __construct($name, $tplIndex)
+    {
+        $this->name = $name;
+        $this->tplIndex = $tplIndex;
+    }
+
+    /**
+     * Compiled block code overloaded by {block} class
+     *
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function callBlock(Smarty_Internal_Template $tpl)
+    {
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
index c2f9a726e..61618449d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -1,205 +1,239 @@
 <?php
-
 /**
  * Smarty Internal Plugin CacheResource File
- * 
- * Implements the file system as resource for the HTML cache
- * Version ussing nocache inserts
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Cacher
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * This class does contain all necessary methods for the HTML cache on file system
+ * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
+ *
+ * @package    Smarty
+ * @subpackage Cacher
  */
-class Smarty_Internal_CacheResource_File {
-    function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
+class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
+{
     /**
-     * Returns the filepath of the cached template output
-     * 
-     * @param object $_template current template
-     * @return string the cache filepath
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
      */
-    public function getCachedFilepath($_template)
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
-        $_source_file_path = str_replace(':', '.', $_template->getTemplateFilepath());
-        $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $_template->templateUid; 
+        $source = &$_template->source;
+        $smarty = &$_template->smarty;
+        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        $_filepath = sha1($source->uid . $smarty->_joined_template_dir);
+        $cached->filepath = $smarty->getCacheDir();
+        if (isset($_template->cache_id)) {
+            $cached->filepath .= preg_replace(
+                                     array(
+                                         '![^\w|]+!',
+                                         '![|]+!'
+                                     ),
+                                     array(
+                                         '_',
+                                         $_compile_dir_sep
+                                     ),
+                                     $_template->cache_id
+                                 ) . $_compile_dir_sep;
+        }
+        if (isset($_template->compile_id)) {
+            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
+        }
         // if use_sub_dirs, break file into directories
-        if ($this->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        } 
-        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_cache_id)) {
-            $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
-        } else {
-            $_cache_id = '';
-        } 
-        if (isset($_compile_id)) {
-            $_compile_id = $_compile_id . $_compile_dir_sep;
-        } else {
-            $_compile_id = '';
-        } 
-        $_cache_dir = $this->smarty->cache_dir;
-        if (strpos('/\\', substr($_cache_dir, -1)) === false) {
-            $_cache_dir .= DS;
-        } 
-        return $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-    } 
+        if ($smarty->use_sub_dirs) {
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+                                 $_filepath[ 3 ] .
+                                 DIRECTORY_SEPARATOR .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
+        }
+        $cached->filepath .= $_filepath;
+        $basename = $source->handler->getBasename($source);
+        if (!empty($basename)) {
+            $cached->filepath .= '.' . $basename;
+        }
+        if ($smarty->cache_locking) {
+            $cached->lock_id = $cached->filepath . '.lock';
+        }
+        $cached->filepath .= '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
 
     /**
-     * Returns the timpestamp of the cached template output
-     * 
-     * @param object $_template current template
-     * @return integer |booelan the template timestamp or false if the file does not exist
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return void
      */
-    public function getCachedTimestamp($_template)
-    { 
-        // return @filemtime ($_template->getCachedFilepath());
-        return ($_template->getCachedFilepath() && file_exists($_template->getCachedFilepath())) ? filemtime($_template->getCachedFilepath()) : false ;
-    } 
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
 
     /**
-     * Returns the cached template output
-     * 
-     * @param object $_template current template
-     * @return string |booelan the template content or false if the file does not exist
+     * Read the cached template and process its header
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @param Smarty_Template_Cached    $cached      cached object
+     * @param bool                      $update      flag if called because cache update
+     *
+     * @return boolean true or false if the cached content does not exist
      */
-    public function getCachedContents($_template, $no_render = false)
-    {
-    	if (!$no_render) {
-        	ob_start();
-    	}
-        $_smarty_tpl = $_template;
-        include $_template->getCachedFilepath();
-        if ($no_render) {
-        	return null;
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
+        $_smarty_tpl->cached->valid = false;
+        if ($update && defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($_smarty_tpl->cached->filepath));
+            return true;
         } else {
-          return ob_get_clean();
+            return @include $_smarty_tpl->cached->filepath;
         }
-    } 
+    }
 
     /**
-     * Writes the rendered template output to cache file
-     * 
-     * @param object $_template current template
-     * @return boolean status
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     * @throws \SmartyException
      */
-    public function writeCachedContent($_template, $content)
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        if (!$_template->resource_object->isEvaluated) {
-            if (Smarty_Internal_Write_File::writeFile($_template->getCachedFilepath(), $content, $this->smarty) === true) {
-                $_template->cached_timestamp = filemtime($_template->getCachedFilepath());
+        if ($_template->smarty->ext->_writeFile->writeFile(
+                $_template->cached->filepath,
+                $content,
+                $_template->smarty
+            ) === true
+        ) {
+            if (function_exists('opcache_invalidate')
+                && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
+            ) {
+                opcache_invalidate($_template->cached->filepath, true);
+            } elseif (function_exists('apc_compile_file')) {
+                apc_compile_file($_template->cached->filepath);
+            }
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
                 return true;
-            } 
-        } 
+            }
+        }
         return false;
-    } 
+    }
 
     /**
-     * Empty cache folder
-     * 
-     * @param integer $exp_time expiration time
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        if (is_file($_template->cached->filepath)) {
+            return file_get_contents($_template->cached->filepath);
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
-    public function clearAll($exp_time = null)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        return $this->clear(null, null, null, $exp_time);
-    } 
+        return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
+    }
+
     /**
      * Empty cache for a specific template
-     * 
-     * @param string $resource_name template name
-     * @param string $cache_id cache id
-     * @param string $compile_id compile id
-     * @param integer $exp_time expiration time
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
-    public function clear($resource_name, $cache_id, $compile_id, $exp_time)
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            clearstatcache(true, $cached->lock_id);
+        } else {
+            clearstatcache();
+        }
+        if (is_file($cached->lock_id)) {
+            $t = filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $this->smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $this->smarty->use_sub_dirs ? 3 : 0;
-        $_dir = rtrim($this->smarty->cache_dir, '/\\') . DS;
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($this->smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . DS;
-                } 
-            } 
-        } 
-        if (isset($resource_name)) {
-            $_save_stat = $this->smarty->caching;
-            $this->smarty->caching = true;
-            $tpl = new $this->smarty->template_class($resource_name, $this->smarty); 
-            // remove from template cache
-            unset($this->smarty->template_objects[crc32($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]);
-            $this->smarty->caching = $_save_stat;
-            if ($tpl->isExisting()) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCachedFilepath()));
-            } else {
-                return 0;
-            } 
-        } 
-        $_count = 0;
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (strpos($_file, '.svn') !== false) continue; 
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    } 
-                } else {
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
-                    $_parts_count = count($_parts); 
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[$_parts_count-1] != $_resourcename_parts) {
-                            continue;
-                        } 
-                    } 
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) {
-                        continue;
-                    } 
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        } 
-                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
-                            if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
-                        } 
-                    } 
-                    // expired ?
-                    if (isset($exp_time) && time() - @filemtime($_file) < $exp_time) {
-                        continue;
-                    } 
-                    $_count += @unlink((string) $_file) ? 1 : 0;
-                } 
-            } 
-        } 
-        return $_count;
-    } 
-} 
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        @unlink($cached->lock_id);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_append.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_append.php
index 98e696e30..1a9befbf6 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_append.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_append.php
@@ -1,50 +1,52 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Append
- * 
  * Compiles the {append} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Compile Append Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
-
+class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
+{
     /**
      * Compiles code for the {append} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
         // the following must be assigned at runtime because it will be overwritten in parent class
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope','index');
+        $this->optional_attributes = array('scope', 'index');
+        $this->mapCache = array();
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
+        $_attr = $this->getAttributes($compiler, $args);
         // map to compile assign attributes
-        if (isset($_attr['index'])) {
-            $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
-            unset($_attr['index']);
+        if (isset($_attr[ 'index' ])) {
+            $_params[ 'smarty_internal_index' ] = '[' . $_attr[ 'index' ] . ']';
+            unset($_attr[ 'index' ]);
         } else {
-            $_params['smarty_internal_index'] = '[]';
+            $_params[ 'smarty_internal_index' ] = '[]';
         }
         $_new_attr = array();
         foreach ($_attr as $key => $value) {
             $_new_attr[] = array($key => $value);
-        } 
+        }
         // call compile assign
         return parent::compile($_new_attr, $compiler, $_params);
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_assign.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_assign.php
index 8d8c643af..1f0ab9b7d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_assign.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_assign.php
@@ -1,64 +1,96 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Assign
- * 
  * Compiles the {assign} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Assign Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'noscope');
+
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array(
+        'local'    => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+        'root'     => Smarty::SCOPE_ROOT, 'global' => Smarty::SCOPE_GLOBAL,
+        'tpl_root' => Smarty::SCOPE_TPL_ROOT, 'smarty' => Smarty::SCOPE_SMARTY
+    );
+
     /**
      * Compiles code for the {assign} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
         // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
         $this->optional_attributes = array('scope');
-        $_nocache = 'null';
-        $_scope = 'null'; 
+        $this->mapCache = array();
+        $_nocache = false;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-		// nocache ?
-        if ($this->compiler->tag_nocache || $this->compiler->nocache) {
-            $_nocache = 'true'; 
+        $_attr = $this->getAttributes($compiler, $args);
+        // nocache ?
+        if ($_var = $compiler->getId($_attr[ 'var' ])) {
+            $_var = "'{$_var}'";
+        } else {
+            $_var = $_attr[ 'var' ];
+        }
+        if ($compiler->tag_nocache || $compiler->nocache) {
+            $_nocache = true;
             // create nocache var to make it know for further compiling
-            $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
-        } 
+            $compiler->setNocacheInVariable($_attr[ 'var' ]);
+        }
         // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $this->compiler->trigger_template_error('illegal value for "scope" attribute', $this->compiler->lex->taglineno);
-            } 
-        } 
-        // compiled output
-        if (isset($parameter['smarty_internal_index'])) {
-            return "<?php if (!isset(\$_smarty_tpl->tpl_vars[$_attr[var]]) || !is_array(\$_smarty_tpl->tpl_vars[$_attr[var]]->value)) \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];?>";
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
         } else {
-            return "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);?>";
-        } 
-    } 
-} 
-
-?>
\ No newline at end of file
+            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+        }
+        // optional parameter
+        $_params = '';
+        if ($_nocache || $_scope) {
+            $_params .= ' ,' . var_export($_nocache, true);
+        }
+        if ($_scope) {
+            $_params .= ' ,' . $_scope;
+        }
+        if (isset($parameter[ 'smarty_internal_index' ])) {
+            $output =
+                "<?php \$_tmp_array = isset(\$_smarty_tpl->tpl_vars[{$_var}]) ? \$_smarty_tpl->tpl_vars[{$_var}]->value : array();\n";
+            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
+            $output .= "settype(\$_tmp_array, 'array');\n";
+            $output .= "}\n";
+            $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
+            $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});?>";
+        } else {
+            $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});?>";
+        }
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
index cd1ca281b..8ff15d8e5 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
@@ -1,187 +1,189 @@
 <?php
 /**
- * Smarty Internal Plugin Compile Block
- * 
- * Compiles the {block}{/block} tags
- * 
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews 
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * Smarty Internal Plugin Compile Block Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('name');
-    public $shorttag_order = array('name');
+
     /**
-     * Compiles code for the {block} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @return boolean true
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
      */
-    public function compile($args, $compiler)
-    {
-        $this->compiler = $compiler;
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        $save = array($_attr, $compiler->parser->current_buffer, $this->compiler->nocache, $this->compiler->smarty->merge_compiled_includes, $compiler->smarty->inheritance);
-        $this->_open_tag('block', $save);
-        if ($_attr['nocache'] == true) {
-            $compiler->nocache = true;
-        }
-        // set flag for {block} tag
-        $compiler->smarty->inheritance = true;
-        // must merge includes
-        $this->compiler->smarty->merge_compiled_includes = true; 
+    public $shorttag_order = array('name');
 
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-        return true;
-    } 
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('hide', 'nocache');
 
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
 
-    static function saveBlockData($block_content, $block_tag, $template, $filepath)
+    /**
+     * Compiles code for the {block} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-    	$_rdl = preg_quote($template->smarty->right_delimiter);
-        $_ldl = preg_quote($template->smarty->left_delimiter);
-
-        if (0 == preg_match("!({$_ldl}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)(=true)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
-            $error_text = 'Syntax Error in template "' . $template->getTemplateFilepath() . '"   "' . htmlspecialchars($block_tag) . '" illegal options';
-            throw new SmartyCompilerException($error_text);
+        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+            $compiler->_cache[ 'blockNesting' ] = 0;
+        }
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
+            // make sure that inheritance gets initialized in template code
+            $this->registerInit($compiler);
+            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
         } else {
-            $_name = trim($_match[3], '\'"'); 
-            // replace {$smarty.block.child}
-            if (strpos($block_content, $template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter) !== false) {
-                if (isset($template->block_data[$_name])) {
-                    $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter,
-                        $template->block_data[$_name]['source'], $block_content);
-                    unset($template->block_data[$_name]);
-                } else {
-                    $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter,
-                        '', $block_content);
-                } 
-            } 
-            if (isset($template->block_data[$_name])) {
-                if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-                    $template->block_data[$_name]['source'] =
-                    str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
-                } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
-                    $template->block_data[$_name]['source'] .= $block_content;
-                } elseif ($template->block_data[$_name]['mode'] == 'append') {
-                    $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
-                } 
-            } else {
-                $template->block_data[$_name]['source'] = $block_content;
-            } 
-            if ($_match[6] == 'append') {
-                $template->block_data[$_name]['mode'] = 'append';
-            } elseif ($_match[6] == 'prepend') {
-                $template->block_data[$_name]['mode'] = 'prepend';
-            } else {
-                $template->block_data[$_name]['mode'] = 'replace';
-            } 
-            $template->block_data[$_name]['file'] = $filepath;
+            $this->option_flags = array('hide', 'nocache');
         }
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        ++$compiler->_cache[ 'blockNesting' ];
+        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(mt_rand(), true));
+        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
+        $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ] = $_className;
+        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
+        $compiler->_cache[ 'blockParams' ][ 1 ][ 'subBlocks' ][ trim($_attr[ 'name' ], '"\'') ][] = $_className;
+        $this->openTag(
+            $compiler,
+            'block',
+            array(
+                $_attr, $compiler->nocache, $compiler->parser->current_buffer,
+                $compiler->template->compiled->has_nocache_code,
+                $compiler->template->caching
+            )
+        );
+        $compiler->saveRequiredPlugins(true);
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->suppressNocacheProcessing = true;
     }
-
-	static function compileChildBlock ($compiler, $_name = null)
-	{
-		$_output = '';
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-		if ($_name == null) {
-        	$stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-            	if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                	$_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\"");
-                	break;
-                }
-            }
-		// flag that child is already compile by {$smarty.block.child} inclusion
-        $compiler->template->block_data[$_name]['compiled'] = true;
-        }
-		if ($_name == null) {
-       		$compiler->trigger_template_error('{$smarty.block.child} used out of context', $this->compiler->lex->taglineno);
-		}
-		// undefined child?
-		if (!isset($compiler->template->block_data[$_name])) {
-       		return '';
-		}
-		$_tpl = new Smarty_Internal_template ('eval:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id, 
-		               $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime);
-		$_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-		$_tpl->template_filepath = $compiler->template->block_data[$_name]['file'];
-		if ($compiler->nocache) {
-			$_tpl->forceNocache = 2;
-		} else {
-			$_tpl->forceNocache = 1;
-		}
-		$_tpl->suppressHeader = true;
-		$_tpl->suppressFileDependency = true;
-		if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-			$_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->getCompiledTemplate());
-		} elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-			$_output = $_tpl->getCompiledTemplate() . $compiler->parser->current_buffer->to_smarty_php();
-		} elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-			$_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->getCompiledTemplate();
-		} elseif (!empty($compiler->template->block_data[$_name])) {
-			$_output = $_tpl->getCompiledTemplate();
-		}
-		$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-		$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-		if ($_tpl->has_nocache_code) {
-			$compiler->template->has_nocache_code = true;
-		}
-		foreach($_tpl->required_plugins as $code => $tmp1) {
-			foreach($tmp1 as $name => $tmp) {
-				foreach($tmp as $type => $data) {
-					$compiler->template->required_plugins[$code][$name][$type] = $data;
-				}
-			}
-		}
-		unset($_tpl);
-		return $_output;
-	}
-
 }
 
 /**
  * Smarty Internal Plugin Compile BlockClose Class
  */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
      * Compiles code for the {/block} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
-        $this->compiler->has_code = true; 
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        $saved_data = $this->_close_tag(array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-        	$_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
+        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+        // init block parameter
+        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
+        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
+        $_name = $_attr[ 'name' ];
+        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+        foreach ($_attr as $name => $stat) {
+            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
+                $_block[ $name ] = 'true';
+            }
+        }
+        $_className = $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ];
+        // get compiled block code
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $output = "<?php\n";
+        $output .= "/* {block {$_name}} */\n";
+        $output .= "class {$_className} extends Smarty_Internal_Block\n";
+        $output .= "{\n";
+        foreach ($_block as $property => $value) {
+            $output .= "public \${$property} = " . var_export($value, true) . ";\n";
+        }
+        $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
+        $output .= $compiler->compileRequiredPlugins();
+        $compiler->restoreRequiredPlugins();
+        if ($compiler->template->compiled->has_nocache_code) {
+            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+        }
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        $output .= "}\n";
+        $output .= "}\n";
+        $output .= "/* {/block {$_name}} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+        $compiler->tag_nocache = $compiler->nocache;
+        $compiler->nocache = $_nocache;
+        $compiler->parser->current_buffer = $_buffer;
+        $output = "<?php \n";
+        if ($compiler->_cache[ 'blockNesting' ] === 1) {
+            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
         } else {
-            $_output = $compiler->parser->current_buffer->to_smarty_php();
-            unset ($compiler->template->block_data[$_name]['compiled']);
+            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
+        }
+        $output .= "?>\n";
+        --$compiler->_cache[ 'blockNesting' ];
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
+            unset($compiler->_cache[ 'blockNesting' ]);
         }
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->nocache = $saved_data[2];
-        $compiler->smarty->merge_compiled_includes = $saved_data[3];
-        $compiler->smarty->inheritance = $saved_data[4];
-        // $_output content has already nocache code processed
+        $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;
-        return $_output;
-    } 
-} 
-?>
\ No newline at end of file
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_child.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_child.php
new file mode 100644
index 000000000..588d18628
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_child.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'block_child';
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_parent.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_parent.php
new file mode 100644
index 000000000..97f11ca43
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block_parent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'block_parent';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Parent';
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_break.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_break.php
index 0c0bee1fe..1ee8d75d7 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_break.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_break.php
@@ -1,65 +1,117 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Break
- * 
  * Compiles the {break} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Compile Break Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $optional_attributes = array('levels'); 
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('levels');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('levels');
 
+    /**
+     * Tag name may be overloaded by Smarty_Internal_Compile_Continue
+     *
+     * @var string
+     */
+    public $tag = 'break';
 
     /**
      * Compiles code for the {break} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
-    {    
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        list($levels, $foreachLevels) = $this->checkLevels($args, $compiler);
+        $output = "<?php ";
+        if ($foreachLevels > 0 && $this->tag === 'continue') {
+            $foreachLevels--;
+        }
+        if ($foreachLevels > 0) {
+            /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+            $foreachCompiler = $compiler->getTagCompiler('foreach');
+            $output .= $foreachCompiler->compileRestore($foreachLevels);
         }
+        $output .= "{$this->tag} {$levels};?>";
+        return $output;
+    }
 
-        if (isset($_attr['levels'])) {
-            if (!is_numeric($_attr['levels'])) {
-                $this->compiler->trigger_template_error('level attribute must be a numeric constant', $this->compiler->lex->taglineno);
-            } 
-            $_levels = $_attr['levels'];
+    /**
+     * check attributes and return array of break and foreach levels
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return array
+     * @throws \SmartyCompilerException
+     */
+    public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        if (isset($_attr[ 'levels' ])) {
+            if (!is_numeric($_attr[ 'levels' ])) {
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
+            }
+            $levels = $_attr[ 'levels' ];
         } else {
-            $_levels = 1;
-        } 
-        $level_count = $_levels;
+            $levels = 1;
+        }
+        $level_count = $levels;
         $stack_count = count($compiler->_tag_stack) - 1;
+        $foreachLevels = 0;
+        $lastTag = '';
         while ($level_count > 0 && $stack_count >= 0) {
-            if (in_array($compiler->_tag_stack[$stack_count][0], array('for', 'foreach', 'while', 'section'))) {
+            if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
+                $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ];
+                if ($level_count === 0) {
+                    break;
+                }
                 $level_count--;
-            } 
+                if ($compiler->_tag_stack[ $stack_count ][ 0 ] === 'foreach') {
+                    $foreachLevels++;
+                }
+            }
             $stack_count--;
-        } 
-        if ($level_count != 0) {
-            $this->compiler->trigger_template_error("cannot break {$_levels} level(s)", $this->compiler->lex->taglineno);
-        } 
-        // this tag does not return compiled code
-        $this->compiler->has_code = true;
-        return "<?php break {$_levels}?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+        }
+        if ($level_count !== 0) {
+            $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
+        }
+        if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+            $foreachLevels--;
+        }
+        return array($levels, $foreachLevels);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_call.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_call.php
index 50ba6328d..445cabc60 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_call.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_call.php
@@ -1,108 +1,89 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Function_Call
- * 
  * Compiles the calls of user defined tags defined by {function}
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function_Call Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('name');
-    public $optional_attributes = array('_any'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
 
     /**
      * Compiles the calls of user defined tags defined by {function}
-     * 
-     * @param array $args array with attributes from parser
+     *
+     * @param array  $args     array with attributes from parser
      * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
     {
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
+        $_attr = $this->getAttributes($compiler, $args);
         // save possible attributes
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
-        } 
-        $_name = $_attr['name'];
-        unset($_attr['name'], $_attr['assign'], $_attr['nocache']); 
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
+        }
+        //$_name = trim($_attr['name'], "''");
+        $_name = $_attr[ 'name' ];
+        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]);
         // set flag (compiled code of {function} must be included in cache file
-        if ($compiler->nocache || $compiler->tag_nocache) {
+        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
             $_nocache = 'true';
         } else {
             $_nocache = 'false';
-        } 
+        }
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
             if (is_int($_key)) {
                 $_paramsArray[] = "$_key=>$_value";
             } else {
                 $_paramsArray[] = "'$_key'=>$_value";
-            } 
-        }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    } 
-                } 
-            } 
-        } elseif (isset($this->smarty->template_functions[$_name]['parameter'])) {
-           foreach ($this->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    } 
-                } 
-            } 
-        }
-        //varibale name?
-        if (!(strpos($_name,'$')===false)) {
-        	$call_cache = $_name;
-        	$call_function = '$tmp = "smarty_template_function_".'.$_name.'; $tmp';
-       	} else {
-        	$_name = trim($_name, "'\"");
-       		$call_cache = "'{$_name}'";
-         	$call_function = 'smarty_template_function_'.$_name;
+            }
         }
-      	
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-    	$_hash = str_replace('-','_',$compiler->template->properties['nocache_hash']);
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
+        //$compiler->suppressNocacheProcessing = true;
         // was there an assign attribute
         if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } 
+            $_output =
+                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
         } else {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            } 
-        } 
+            $_output =
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+        }
         return $_output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_capture.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_capture.php
index 74ade6804..a4ffbc9ea 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_capture.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_capture.php
@@ -1,81 +1,105 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Capture
- * 
  * Compiles the {capture} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Capture Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('name');
-    public $optional_attributes = array('name', 'assign', 'append'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('name', 'assign', 'append');
+
+    /**
+     * Compiles code for the {$smarty.capture.xxx}
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public static function compileSpecialVariable(
+        $args,
+        Smarty_Internal_TemplateCompilerBase $compiler,
+        $parameter = null
+    ) {
+        return '$_smarty_tpl->smarty->ext->_capture->getBuffer($_smarty_tpl' .
+               (isset($parameter[ 1 ]) ? ", {$parameter[ 1 ]})" : ')');
+    }
 
     /**
      * Compiles code for the {capture} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param null                                  $parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
-        $assign = isset($_attr['assign']) ? $_attr['assign'] : null;
-        $append = isset($_attr['append']) ? $_attr['append'] : null;
-
-        $this->compiler->_capture_stack[] = array($buffer, $assign, $append, $this->compiler->nocache);
+        $_attr = $this->getAttributes($compiler, $args, $parameter, 'capture');
+        $buffer = isset($_attr[ 'name' ]) ? $_attr[ 'name' ] : "'default'";
+        $assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : 'null';
+        $append = isset($_attr[ 'append' ]) ? $_attr[ 'append' ] : 'null';
+        $compiler->_cache[ 'capture_stack' ][] = array($compiler->nocache);
         // maybe nocache because of nocache variables
-        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
-        $_output = "<?php ob_start(); ?>";
-
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
         return $_output;
-    } 
-} 
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Captureclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/capture} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param null                                  $parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler; 
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
+        $_attr = $this->getAttributes($compiler, $args, $parameter, '/capture');
         // must endblock be nocache?
-        if ($this->compiler->nocache) {
-            $this->compiler->tag_nocache = true;
-        } 
-
-        list($buffer, $assign, $append, $this->compiler->nocache) = array_pop($this->compiler->_capture_stack);
-
-        $_output = "<?php ";
-        if (isset($assign)) {
-            $_output .= " \$_smarty_tpl->assign($assign, ob_get_contents());";
-        } 
-        if (isset($append)) {
-            $_output .= " \$_smarty_tpl->append($append, ob_get_contents());";
-        } 
-        $_output .= " Smarty::\$_smarty_vars['capture'][$buffer]=ob_get_clean();?>";
-        return $_output;
-    } 
-} 
-
-?>
\ No newline at end of file
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($compiler->nocache) = array_pop($compiler->_cache[ 'capture_stack' ]);
+        return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);?>";
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_child.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_child.php
new file mode 100644
index 000000000..f728c18bf
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_child.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'child';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Child';
+
+    /**
+     * Compiles code for the {child} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $tag = isset($parameter[ 0 ]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'";
+        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+            $compiler->trigger_template_error(
+                "{$tag} used outside {block} tags ",
+                $compiler->parser->lex->taglineno
+            );
+        }
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        if ($this->blockType === 'Child') {
+            $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+        }
+        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+        $output = "<?php \n";
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= '$_smarty_tpl->inheritance->call' . $this->blockType . '($_smarty_tpl, $this' .
+                   ($this->blockType === 'Child' ? '' : ", {$tag}") . ");\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        $output .= "?>\n";
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_config_load.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
index 733e1ac5d..8fe64ee10 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
@@ -1,64 +1,96 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Config Load
- * 
  * Compiles the {config load} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Config Load Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
-    public $shorttag_order = array('file','section');
-    public $optional_attributes = array('section', 'scope'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file', 'section');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('section', 'scope');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'noscope');
+
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array(
+        'local'  => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+        'root'   => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+        'smarty' => Smarty::SCOPE_SMARTY, 'global' => Smarty::SCOPE_SMARTY
+    );
 
     /**
      * Compiles code for the {config_load} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
-
-         
-        // save posible attributes
-        $conf_file = $_attr['file'];
-        if (isset($_attr['section'])) {
-            $section = $_attr['section'];
+        // save possible attributes
+        $conf_file = $_attr[ 'file' ];
+        if (isset($_attr[ 'section' ])) {
+            $section = $_attr[ 'section' ];
         } else {
             $section = 'null';
-        } 
-        $scope = 'local';
+        }
         // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (in_array($_attr['scope'],array('local','parent','root','global'))) {
-                $scope = $_attr['scope'];
-           } else {
-                $this->compiler->trigger_template_error('illegal value for "scope" attribute', $this->compiler->lex->taglineno);
-           } 
-        } 
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
+        } else {
+            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+        }
         // create config object
-        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
+        $_output =
+            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
         return $_output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_continue.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_continue.php
index ddbbc812f..e545728ee 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_continue.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_continue.php
@@ -1,64 +1,25 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Continue
- * 
  * Compiles the {continue} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Compile Continue Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $optional_attributes = array('levels'); 
-    public $shorttag_order = array('levels');
-
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_Compile_Break
+{
     /**
-     * Compiles code for the {continue} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return string compiled code
+     * Tag name
+     *
+     * @var string
      */
-    public function compile($args, $compiler, $parameter)
-    {
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['levels'])) {
-            if (!is_numeric($_attr['levels'])) {
-                $this->compiler->trigger_template_error('level attribute must be a numeric constant', $this->compiler->lex->taglineno);
-            } 
-            $_levels = $_attr['levels'];
-        } else {
-            $_levels = 1;
-        } 
-        $level_count = $_levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (in_array($compiler->_tag_stack[$stack_count][0], array('for', 'foreach', 'while', 'section'))) {
-                $level_count--;
-            } 
-            $stack_count--;
-        } 
-        if ($level_count != 0) {
-            $this->compiler->trigger_template_error("cannot continue {$_levels} level(s)", $this->compiler->lex->taglineno);
-        } 
-        // this tag does not return compiled code
-        $this->compiler->has_code = true;
-        return "<?php continue {$_levels}?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+    public $tag = 'continue';
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_debug.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_debug.php
index f6189e7e1..799416689 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_debug.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_debug.php
@@ -1,38 +1,40 @@
-<?php 
+<?php
 /**
  * Smarty Internal Plugin Compile Debug
+ * Compiles the {debug} tag.
+ * It opens a window the the Smarty Debugging Console.
  *
- * Compiles the {debug} tag 
- * It opens a window the the Smarty Debugging Console
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Debug Class
- */ 
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {debug} tag
-     * 
-     * @param array $args array with attributes from parser
+     *
+     * @param array  $args     array with attributes from parser
      * @param object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
     {
-        $this->compiler = $compiler; 
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-		// compile always as nocache
-		$this->compiler->tag_nocache = true;
-
+        $_attr = $this->getAttributes($compiler, $args);
+        // compile always as nocache
+        $compiler->tag_nocache = true;
         // display debug template
-        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
+        $_output =
+            "<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+        $_output .= "unset(\$_smarty_debug);\n?>";
         return $_output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_eval.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_eval.php
index aa3c25807..8e0174e3e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_eval.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_eval.php
@@ -1,51 +1,70 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Eval
+ * Compiles the {eval} tag.
  *
- * Compiles the {eval} tag 
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Eval Class
- */ 
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('var');
-    public $optional_attributes = array('assign'); 
-    public $shorttag_order = array('var','assign');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('var', 'assign');
 
     /**
      * Compiles code for the {eval} tag
-     * 
-     * @param array $args array with attributes from parser
+     *
+     * @param array  $args     array with attributes from parser
      * @param object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
     {
-        $this->compiler = $compiler; 
-        $this->required_attributes = array('var');
-        $this->optional_attributes = array('assign'); 
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        if (isset($_attr['assign'])) {
-              // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
+        $_attr = $this->getAttributes($compiler, $args);
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
         }
-  
         // create template object
-        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);"; 
-        //was there an assign attribute? 
+        $_output =
+            "\$_template = new {$compiler->smarty->template_class}('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        //was there an assign attribute?
         if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());";
+            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
         } else {
-            $_output .= "echo \$_template->getRenderedTemplate();";
-        } 
+            $_output .= 'echo $_template->fetch();';
+        }
         return "<?php $_output ?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_extends.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_extends.php
index b62b531d0..d72d2b76f 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_extends.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_extends.php
@@ -1,90 +1,158 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile extend
- * 
  * Compiles the {extends} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile extend Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
+
+    /**
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array('extends_resource');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('file');
 
     /**
-     * Compiles code for the {extends} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     * Compiles code for the {extends} tag extends: resource
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
-        $this->_rdl = preg_quote($this->smarty->right_delimiter);
-        $this->_ldl = preg_quote($this->smarty->left_delimiter);
-        $filepath = $compiler->template->getTemplateFilepath();
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
         }
-
-        $_smarty_tpl = $compiler->template; 
-        $include_file = null;
-        if (strpos($_attr['file'],'$_tmp') !== false) {
-        	$this->compiler->trigger_template_error('illegal value for file attribute', $this->compiler->lex->taglineno);
+        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
         }
-        eval('$include_file = ' . $_attr['file'] . ';'); 
-        // create template object
-        $_template = new $compiler->smarty->template_class($include_file, $this->smarty, $compiler->template); 
-        // save file dependency
-        if (in_array($_template->resource_type,array('eval','string'))) {
-        	$template_sha1 = sha1($include_file);
-    	} else {
-        	$template_sha1 = sha1($_template->getTemplateFilepath());
-    	}
-        if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
-            $this->compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"",$compiler->lex->line-1);
-        } 
-        $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->getTemplateFilepath(), $_template->getTemplateTimestamp(),$_template->resource_type);
-        $_content = substr($compiler->template->template_source,$compiler->lex->counter-1);
-        if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) !=
-                preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) {
-            $this->compiler->trigger_template_error('unmatched {block} {/block} pairs');
-        } 
-        preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-        $_result_count = count($_result[0]);
-        $_start = 0;
-        while ($_start < $_result_count) {
-            $_end = 0;
-            $_level = 1;
-            while ($_level != 0) {
-                $_end++;
-                if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                    $_level++;
+        // add code to initialize inheritance
+        $this->registerInit($compiler, true);
+        $file = trim($_attr[ 'file' ], '\'"');
+        if (strlen($file) > 8 && substr($file, 0, 8) === 'extends:') {
+            // generate code for each template
+            $files = array_reverse(explode('|', substr($file, 8)));
+            $i = 0;
+            foreach ($files as $file) {
+                if ($file[ 0 ] === '"') {
+                    $file = trim($file, '".');
                 } else {
-                    $_level--;
-                } 
-            } 
-            $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.block.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-                substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])));
-            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
-            $_start = $_start + $_end + 1;
-        } 
-        $compiler->template->template_source = $_template->getTemplateSource();
-        $compiler->template->template_filepath = $_template->getTemplateFilepath();
-        $compiler->abort_and_recompile = true;
+                    $file = "'{$file}'";
+                }
+                $i++;
+                if ($i === count($files) && isset($_attr[ 'extends_resource' ])) {
+                    $this->compileEndChild($compiler);
+                }
+                $this->compileInclude($compiler, $file);
+            }
+            if (!isset($_attr[ 'extends_resource' ])) {
+                $this->compileEndChild($compiler);
+            }
+        } else {
+            $this->compileEndChild($compiler, $_attr[ 'file' ]);
+        }
+        $compiler->has_code = false;
         return '';
-    } 
+    }
 
-} 
-?>
\ No newline at end of file
+    /**
+     * Add code for inheritance endChild() method to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param null|string                           $template optional inheritance parent template
+     *
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler, $template = null)
+    {
+        $inlineUids = '';
+        if (isset($template) && $compiler->smarty->merge_compiled_includes) {
+            $code = $compiler->compileTag('include', array($template, array('scope' => 'parent')));
+            if (preg_match('/([,][\s]*[\'][a-z0-9]+[\'][,][\s]*[\']content.*[\'])[)]/', $code, $match)) {
+                $inlineUids = $match[ 1 ];
+            }
+        }
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
+            $compiler->parser,
+            '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl' .
+            (isset($template) ?
+                ", {$template}{$inlineUids}" :
+                '') . ");\n?>"
+        );
+    }
+
+    /**
+     * Add code for including subtemplate to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param string                                $template subtemplate name
+     *
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $template)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
+            $compiler->parser,
+            $compiler->compileTag(
+                'include',
+                array(
+                    $template,
+                    array('scope' => 'parent')
+                )
+            )
+        );
+    }
+
+    /**
+     * Create source code for {extends} from source components array
+     *
+     * @param \Smarty_Internal_Template $template
+     *
+     * @return string
+     */
+    public static function extendsSourceArrayCode(Smarty_Internal_Template $template)
+    {
+        $resources = array();
+        foreach ($template->source->components as $source) {
+            $resources[] = $source->resource;
+        }
+        return $template->smarty->left_delimiter . 'extends file=\'extends:' . join('|', $resources) .
+               '\' extends_resource=true' . $template->smarty->right_delimiter;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php
index 2e5d0a11f..3f113e56d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php
@@ -1,147 +1,164 @@
 <?php
 /**
  * Smarty Internal Plugin Compile For
- * 
  * Compiles the {for} {forelse} {/for} tags
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile For Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {for} tag
-     * 
-     * Smarty 3 does implement two different sytaxes:
-     * 
+     * Smarty 3 does implement two different syntax's:
      * - {for $var in $array}
      * For looping over arrays or iterators
-     * 
      * - {for $x=0; $x<$y; $x++}
      * For general loops
-     * 
-     * The parser is gereration different sets of attribute by which this compiler can 
-     * determin which syntax is used.
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     * The parser is generating different sets of attribute by which this compiler can
+     * determine which syntax is used.
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
-        $this->compiler = $compiler; 
-        if ($parameter == 0) {
-        	$this->required_attributes = array('start','to');
-        	$this->optional_attributes = array('max','step');
+        $compiler->loopNesting++;
+        if ($parameter === 0) {
+            $this->required_attributes = array('start', 'to');
+            $this->optional_attributes = array('max', 'step');
         } else {
-        	$this->required_attributes = array('start','ifexp','var','step');
-        	$this->optional_attributes = array();
+            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
+            $this->optional_attributes = array();
         }
+        $this->mapCache = array();
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        $local_vars = array();
-
-        $output = "<?php ";
-        if ($parameter == 1) {
-            foreach ($_attr['start'] as $_statement) {
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
-                $compiler->local_var[$_statement['var']] = true;
-                $local_vars[] = $_statement['var'];
-            } 
-            $output .= "  if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n";
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = "<?php\n";
+        if ($parameter === 1) {
+            foreach ($_attr[ 'start' ] as $_statement) {
+                if (is_array($_statement[ 'var' ])) {
+                    $var = $_statement[ 'var' ][ 'var' ];
+                    $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+                } else {
+                    $var = $_statement[ 'var' ];
+                    $index = '';
+                }
+                $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
+            }
+            if (is_array($_attr[ 'var' ])) {
+                $var = $_attr[ 'var' ][ 'var' ];
+                $index = $_attr[ 'var' ][ 'smarty_internal_index' ];
+            } else {
+                $var = $_attr[ 'var' ];
+                $index = '';
+            }
+            $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
         } else {
-            $_statement = $_attr['start'];
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-            $compiler->local_var[$_statement['var']] = true;
-            $local_vars[] = $_statement['var'];
-            if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+            $_statement = $_attr[ 'start' ];
+            if (is_array($_statement[ 'var' ])) {
+                $var = $_statement[ 'var' ][ 'var' ];
+                $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
-            } 
-            if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
+                $var = $_statement[ 'var' ];
+                $index = '';
+            }
+            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);";
+            if (isset($_attr[ 'step' ])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
-            } 
-            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
-        } 
-        $output .= "?>";
-
-        $this->_open_tag('for', array('for', $this->compiler->nocache, $local_vars)); 
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
+            }
+            if (isset($_attr[ 'max' ])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
+            }
+            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
+        }
+        $output .= '?>';
+        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
         // maybe nocache because of nocache variables
-        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
         // return compiled code
         return $output;
-    } 
-} 
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Forelse Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {forelse} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
-        $this->compiler = $compiler; 
         // check and get attributes
-        $_attr  = $this->_get_attributes($args);
-
-        list($_open_tag, $nocache, $local_vars) = $this->_close_tag(array('for'));
-        $this->_open_tag('forelse', array('forelse', $nocache, $local_vars));
+        $_attr = $this->getAttributes($compiler, $args);
+        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
+        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
         return "<?php }} else { ?>";
-    } 
-} 
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Forclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/for} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
-        $this->compiler = $compiler; 
+        $compiler->loopNesting--;
         // check and get attributes
-        $_attr  = $this->_get_attributes($args); 
+        $_attr = $this->getAttributes($compiler, $args);
         // must endblock be nocache?
-        if ($this->compiler->nocache) {
-            $this->compiler->tag_nocache = true;
-        } 
-
-        list($_open_tag, $this->compiler->nocache, $local_vars) = $this->_close_tag(array('for', 'forelse'));
-
-        foreach ($local_vars as $var) {
-            unset($compiler->local_var[$var]);
-        } 
-        if ($_open_tag == 'forelse')
-            return "<?php }  ?>";
-        else
-            return "<?php }} ?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
+        $output = "<?php }\n";
+        if ($openTag !== 'forelse') {
+            $output .= "}\n";
+        }
+        $output .= "?>";
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
index 6ad1e07ef..a68da5409 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
@@ -1,219 +1,343 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Foreach
- * 
  * Compiles the {foreach} {foreachelse} {/foreach} tags
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Foreach Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('from', 'item');
-    public $optional_attributes = array('name', 'key'); 
-    public $shorttag_order = array('from','item','key','name');
 
     /**
-     * Compiles code for the {foreach} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return string compiled code
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
      */
-    public function compile($args, $compiler, $parameter)
-    {
-        $this->compiler = $compiler;
-        $tpl = $compiler->template; 
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
+    public $optional_attributes = array('name', 'key', 'properties');
 
-        $from = $_attr['from'];
-        $item = $_attr['item'];
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('from', 'item', 'key', 'name');
 
-        if (substr_compare("\$_smarty_tpl->getVariable($item)", $from,0, strlen("\$_smarty_tpl->getVariable($item)")) == 0) {
-            $this->compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $this->compiler->lex->taglineno);
-        } 
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
 
-        if (isset($_attr['key'])) {
-            $key = $_attr['key'];
-        } else {
-            $key = null;
-        } 
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'foreach';
 
-        $this->_open_tag('foreach', array('foreach', $this->compiler->nocache, $item, $key)); 
-        // maybe nocache because of nocache variables
-        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
+    /**
+     * Valid properties of $smarty.foreach.name.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
 
-        if (isset($_attr['name'])) {
-            $name = $_attr['name'];
-            $has_name = true;
-            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
-        } else {
-            $name = null;
-            $has_name = false;
-        } 
-        $ItemVarName = '$' . trim($item, '\'"') . '@'; 
-        // evaluates which Smarty variables and properties have to be computed
-        if ($has_name) {
-            $usesSmartyFirst = strpos($tpl->template_source, $SmartyVarName . 'first') !== false;
-            $usesSmartyLast = strpos($tpl->template_source, $SmartyVarName . 'last') !== false;
-            $usesSmartyIndex = strpos($tpl->template_source, $SmartyVarName . 'index') !== false;
-            $usesSmartyIteration = strpos($tpl->template_source, $SmartyVarName . 'iteration') !== false;
-            $usesSmartyShow = strpos($tpl->template_source, $SmartyVarName . 'show') !== false;
-            $usesSmartyTotal = strpos($tpl->template_source, $SmartyVarName . 'total') !== false;
-        } else {
-            $usesSmartyFirst = false;
-            $usesSmartyLast = false;
-            $usesSmartyTotal = false;
-            $usesSmartyShow = false;
-        } 
+    /**
+     * Valid properties of $item@xxx variable
+     *
+     * @var array
+     */
+    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
 
-        $usesPropFirst = $usesSmartyFirst || strpos($tpl->template_source, $ItemVarName . 'first') !== false;
-        $usesPropLast = $usesSmartyLast || strpos($tpl->template_source, $ItemVarName . 'last') !== false;
-        $usesPropIndex = $usesPropFirst || strpos($tpl->template_source, $ItemVarName . 'index') !== false;
-        $usesPropIteration = $usesPropLast || strpos($tpl->template_source, $ItemVarName . 'iteration') !== false;
-        $usesPropShow = strpos($tpl->template_source, $ItemVarName . 'show') !== false;
-        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->template_source, $ItemVarName . 'total') !== false; 
-        // generate output code
-        $output = "<?php ";
-        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable;\n";
-        $compiler->local_var[$item] = true;
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
-            $compiler->local_var[$key] = true;
-        } 
-        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
-        if ($usesPropTotal) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
-        } 
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
-        } 
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
-        } 
-        if ($usesPropShow) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-        } 
-        if ($has_name) {
-            if ($usesSmartyTotal) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
-            } 
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
-            } 
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
-            } 
-            if ($usesSmartyShow) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-            } 
-        } 
-        if ($usesPropTotal) {
-			$output .= "if (\$_smarty_tpl->tpl_vars[$item]->total > 0){\n";
-        } else {
-			$output .= "if (\$_smarty_tpl->_count(\$_from) > 0){\n";
-		}
-		$output .= "    foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
-        } 
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
-        } 
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
-        } 
-        if ($usesPropFirst) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
-        } 
-        if ($usesPropLast) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
-        } 
-        if ($has_name) {
-            if ($usesSmartyFirst) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
-            } 
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
-            } 
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
-            } 
-            if ($usesSmartyLast) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
-            } 
-        } 
-        $output .= "?>";
+    /**
+     * Flag if tag had name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = false;
 
+    /**
+     * Compiles code for the {foreach} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->loopNesting++;
+        // init
+        $this->isNamed = false;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $from = $_attr[ 'from' ];
+        $item = $compiler->getId($_attr[ 'item' ]);
+        if ($item === false) {
+            $item = $compiler->getVariableName($_attr[ 'item' ]);
+        }
+        $key = $name = null;
+        $attributes = array('item' => $item);
+        if (isset($_attr[ 'key' ])) {
+            $key = $compiler->getId($_attr[ 'key' ]);
+            if ($key === false) {
+                $key = $compiler->getVariableName($_attr[ 'key' ]);
+            }
+            $attributes[ 'key' ] = $key;
+        }
+        if (isset($_attr[ 'name' ])) {
+            $this->isNamed = true;
+            $name = $attributes[ 'name' ] = $compiler->getId($_attr[ 'name' ]);
+        }
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $fromName = $compiler->getVariableName($_attr[ 'from' ]);
+        if ($fromName) {
+            foreach (array('item', 'key') as $a) {
+                if (isset($attributes[ $a ]) && $attributes[ $a ] === $fromName) {
+                    $compiler->trigger_template_error(
+                        "'{$a}' and 'from' may not have same variable name '{$fromName}'",
+                        null,
+                        true
+                    );
+                }
+            }
+        }
+        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
+        $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter++ . '_';
+        // search for used tag attributes
+        $itemAttr = array();
+        $namedAttr = array();
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults[ 'item' ])) {
+            $itemAttr = $this->matchResults[ 'item' ];
+        }
+        if (!empty($this->matchResults[ 'named' ])) {
+            $namedAttr = $this->matchResults[ 'named' ];
+        }
+        if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) {
+            foreach ($match[ 1 ] as $prop) {
+                if (in_array($prop, $this->itemProperties)) {
+                    $itemAttr[ $prop ] = true;
+                } else {
+                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+                }
+            }
+            if ($this->isNamed) {
+                foreach ($match[ 1 ] as $prop) {
+                    if (in_array($prop, $this->nameProperties)) {
+                        $nameAttr[ $prop ] = true;
+                    } else {
+                        $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+                    }
+                }
+            }
+        }
+        if (isset($itemAttr[ 'first' ])) {
+            $itemAttr[ 'index' ] = true;
+        }
+        if (isset($namedAttr[ 'first' ])) {
+            $namedAttr[ 'index' ] = true;
+        }
+        if (isset($namedAttr[ 'last' ])) {
+            $namedAttr[ 'iteration' ] = true;
+            $namedAttr[ 'total' ] = true;
+        }
+        if (isset($itemAttr[ 'last' ])) {
+            $itemAttr[ 'iteration' ] = true;
+            $itemAttr[ 'total' ] = true;
+        }
+        if (isset($namedAttr[ 'show' ])) {
+            $namedAttr[ 'total' ] = true;
+        }
+        if (isset($itemAttr[ 'show' ])) {
+            $itemAttr[ 'total' ] = true;
+        }
+        $keyTerm = '';
+        if (isset($attributes[ 'key' ])) {
+            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
+        }
+        if (isset($itemAttr[ 'key' ])) {
+            $keyTerm = "{$itemVar}->key => ";
+        }
+        if ($this->isNamed) {
+            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+        }
+        $needTotal = isset($itemAttr[ 'total' ]);
+        // Register tag
+        $this->openTag(
+            $compiler,
+            'foreach',
+            array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2)
+        );
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        // generate output code
+        $output = "<?php\n";
+        $output .= "\$_from = \$_smarty_tpl->smarty->ext->_foreach->init(\$_smarty_tpl, $from, " .
+                   var_export($item, true);
+        if ($name || $needTotal || $key) {
+            $output .= ', ' . var_export($needTotal, true);
+        }
+        if ($name || $key) {
+            $output .= ', ' . var_export($key, true);
+        }
+        if ($name) {
+            $output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
+        }
+        $output .= ");\n";
+        if (isset($itemAttr[ 'show' ])) {
+            $output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
+        }
+        if (isset($itemAttr[ 'iteration' ])) {
+            $output .= "{$itemVar}->iteration = 0;\n";
+        }
+        if (isset($itemAttr[ 'index' ])) {
+            $output .= "{$itemVar}->index = -1;\n";
+        }
+	    $output .= "{$itemVar}->do_else = true;\n";
+        $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+	    $output .= "{$itemVar}->do_else = false;\n";
+        if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
+        }
+        if (isset($itemAttr[ 'iteration' ])) {
+            $output .= "{$itemVar}->iteration++;\n";
+        }
+        if (isset($itemAttr[ 'index' ])) {
+            $output .= "{$itemVar}->index++;\n";
+        }
+        if (isset($itemAttr[ 'first' ])) {
+            $output .= "{$itemVar}->first = !{$itemVar}->index;\n";
+        }
+        if (isset($itemAttr[ 'last' ])) {
+            $output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
+        }
+        if (isset($foreachVar)) {
+            if (isset($namedAttr[ 'iteration' ])) {
+                $output .= "{$foreachVar}->value['iteration']++;\n";
+            }
+            if (isset($namedAttr[ 'index' ])) {
+                $output .= "{$foreachVar}->value['index']++;\n";
+            }
+            if (isset($namedAttr[ 'first' ])) {
+                $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
+            }
+            if (isset($namedAttr[ 'last' ])) {
+                $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
+            }
+        }
+        if (!empty($itemAttr)) {
+            $output .= "{$local}saved = {$itemVar};\n";
+        }
+        $output .= '?>';
         return $output;
-    } 
-} 
+    }
+
+    /**
+     * Compiles code for to restore saved template variables
+     *
+     * @param int $levels number of levels to restore
+     *
+     * @return string compiled code
+     */
+    public function compileRestore($levels)
+    {
+        return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});";
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Foreachelse Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {foreachelse} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        list($_open_tag, $nocache, $item, $key) = $this->_close_tag(array('foreach'));
-        $this->_open_tag('foreachelse', array('foreachelse', $nocache, $item, $key));
-
-        return "<?php }} else { ?>";
-    } 
-} 
+        $_attr = $this->getAttributes($compiler, $args);
+        list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
+        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
+        $output = "<?php\n";
+        if ($restore === 2) {
+            $output .= "{$itemVar} = {$local}saved;\n";
+        }
+        $output .= "}\nif ({$itemVar}->do_else) {\n?>";
+        return $output;
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Foreachclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/foreach} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        // check and get attributes
-        $_attr = $this->_get_attributes($args); 
+        $compiler->loopNesting--;
         // must endblock be nocache?
-        if ($this->compiler->nocache) {
-            $this->compiler->tag_nocache = true;
-        } 
-
-        list($_open_tag, $this->compiler->nocache, $item, $key) = $this->_close_tag(array('foreach', 'foreachelse'));
-        unset($compiler->local_var[$item]);
-        if ($key != null) {
-            unset($compiler->local_var[$key]);
-        } 
-
-        if ($_open_tag == 'foreachelse')
-            return "<?php } ?>";
-        else
-            return "<?php }} ?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list(
+            $openTag, $compiler->nocache, $local, $itemVar, $restore
+            ) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        $output = "<?php\n";
+        if ($restore === 2) {
+            $output .= "{$itemVar} = {$local}saved;\n";
+        }
+        $output .= "}\n";
+        /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+        $foreachCompiler = $compiler->getTagCompiler('foreach');
+        $output .= $foreachCompiler->compileRestore(1);
+        $output .= "?>";
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
index db2409a30..6e408ca72 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
@@ -1,134 +1,231 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function
- * 
  * Compiles the {function} {/function} tags
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('name');
-    public $optional_attributes = array('_any'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
 
     /**
      * Compiles code for the {function} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-      * @param array $parameter array with compilation parameter
-    * @return boolean true
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return bool true
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
-		unset($_attr['nocache']);
-        $save = array($_attr, $compiler->parser->current_buffer,
-            $compiler->template->has_nocache_code, $compiler->template->required_plugins);
-        $this->_open_tag('function', $save);
-        $_name = trim($_attr['name'], "'\"");
-        unset($_attr['name']);
-        $compiler->template->properties['function'][$_name]['parameter'] = array();
-		$_smarty_tpl = $compiler->template;
-        foreach ($_attr as $_key => $_data) {
-        	eval ('$tmp='.$_data.';');
-            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
-        } 
-        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
-        if ($compiler->template->caching) {
-            $output = '';
-        } else {
-            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
-    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-        } 
-        // Init temporay context
-        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
-        $compiler->template->has_nocache_code = false;
-        $compiler->has_code = false;
-        $compiler->template->properties['function'][$_name]['compiled'] = '';
+        unset($_attr[ 'nocache' ]);
+        $_name = trim($_attr[ 'name' ], '\'"');
+        $compiler->parent_compiler->tpl_function[ $_name ] = array();
+        $save = array(
+            $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+            $compiler->template->caching
+        );
+        $this->openTag($compiler, 'function', $save);
+        // Init temporary context
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->saveRequiredPlugins(true);
         return true;
-    } 
-} 
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Functionclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiler object
+     *
+     * @var object
+     */
+    private $compiler = null;
+
     /**
      * Compiles code for the {/function} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return boolean true
+     *
+     * @param array                                        $args     array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $this->compiler = $compiler;
-        $_attr = $this->_get_attributes($args);
-        $saved_data = $this->_close_tag(array('function'));
-        $_name = trim($saved_data[0]['name'], "'\""); 
-        // build plugin include code
-        $plugins_string = '';
-        if (!empty($compiler->template->required_plugins['compiled'])) {
-            $plugins_string = '<?php ';
-            foreach($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-                } 
-            } 
-            $plugins_string .= '?>';
-        } 
-        if (!empty($compiler->template->required_plugins['nocache'])) {
-            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            foreach($compiler->template->required_plugins['nocache'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
-                } 
-            } 
-            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
-        } 
- 		// remove last line break from function definition
- 		$last = count($compiler->parser->current_buffer->subtrees) - 1;
- 		if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
- 			unset($compiler->parser->current_buffer->subtrees[$last]);
- 		}
-        // if caching save template function for possible nocache call
-        if ($compiler->template->caching) {
-            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
-             . $compiler->parser->current_buffer->to_smarty_php();
-            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
-            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
-            $compiler->has_code = false;
-            $output = true;
+        $saved_data = $this->closeTag($compiler, array('function'));
+        $_attr = $saved_data[ 0 ];
+        $_name = trim($_attr[ 'name' ], '\'"');
+        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
+            $compiler->parent_compiler->template->compiled->filepath;
+        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
+        $_parameter = $_attr;
+        unset($_parameter[ 'name' ]);
+        // default parameter
+        $_paramsArray = array();
+        foreach ($_parameter as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        if (!empty($_paramsArray)) {
+            $_params = 'array(' . implode(',', $_paramsArray) . ')';
+            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
         } else {
-            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}}?>\n";
-        } 
-        // restore old compiler status
-        $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
-        $compiler->template->required_plugins = $saved_data[3];
-        return $output;
-    } 
-} 
+            $_paramsCode = '';
+        }
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+        $_funcNameCaching = $_funcName . '_nocache';
+        if ($compiler->template->compiled->has_nocache_code) {
+            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
+            $output = "<?php\n";
+            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+            $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
+            $output .= "ob_start();\n";
+            $output .= $compiler->compileRequiredPlugins();
+            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+            $output .= $_paramsCode;
+            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
+            $output .= "\$params = var_export(\$params, true);\n";
+            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";?>";
+            $compiler->parser->current_buffer->append_subtree(
+                $compiler->parser,
+                new Smarty_Internal_ParseTree_Tag(
+                    $compiler->parser,
+                    $output
+                )
+            );
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+            $output .= "}\n}\n";
+            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree(
+                $compiler->parser,
+                new Smarty_Internal_ParseTree_Tag(
+                    $compiler->parser,
+                    $output
+                )
+            );
+            $_functionCode = new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                preg_replace_callback(
+                    "/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                    array($this, 'removeNocache'),
+                    $_functionCode->to_smarty_php($compiler->parser)
+                )
+            );
+        }
+        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
+        $output = "<?php\n";
+        $output .= "/* {$_funcName} */\n";
+        $output .= "if (!function_exists('{$_funcName}')) {\n";
+        $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
+        $output .= $_paramsCode;
+        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
+        $output .= $compiler->compileCheckPlugins(array_merge($compiler->required_plugins[ 'compiled' ],
+            $compiler->required_plugins[ 'nocache' ]));
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n}}\n";
+        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // restore old buffer
+        $compiler->parser->current_buffer = $saved_data[ 1 ];
+        // restore old status
+        $compiler->restoreRequiredPlugins();
+        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
+        $compiler->template->caching = $saved_data[ 3 ];
+        return true;
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Remove nocache code
+     *
+     * @param $match
+     *
+     * @return string
+     */
+    public function removeNocache($match)
+    {
+        $code =
+            preg_replace(
+                "/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                '',
+                $match[ 0 ]
+            );
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_if.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_if.php
index 41e6597e4..df3dc3fad 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_if.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_if.php
@@ -1,179 +1,207 @@
 <?php
 /**
  * Smarty Internal Plugin Compile If
- * 
  * Compiles the {if} {else} {elseif} {/if} tags
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile If Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {if} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        $this->_open_tag('if',array(1,$this->compiler->nocache));
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'if', array(1, $compiler->nocache));
         // must whole block be nocache ?
-        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
-        if (is_array($parameter['if condition'])) {
-        	if ($this->compiler->nocache) {
-        		$_nocache = ',true';
-            	// create nocache var to make it know for further compiling
-            	if (is_array($parameter['if condition']['var'])) {
-            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-            	} else {
-            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-            	}
-        	} else {
-        		$_nocache = '';
-        	}
-            if (is_array($parameter['if condition']['var'])) {
-            	$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
-	            $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        if (!isset($parameter[ 'if condition' ])) {
+            $compiler->trigger_template_error('missing if condition', null, true);
+        }
+        if (is_array($parameter[ 'if condition' ])) {
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+            } else {
+                $var = $parameter[ 'if condition' ][ 'var' ];
+            }
+            if ($compiler->nocache) {
+                // create nocache var to make it know for further compiling
+                $compiler->setNocacheInVariable($var);
+            }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+            $assignAttr = array();
+            $assignAttr[][ 'value' ] = $prefixVar;
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                $_output .= $assignCompiler->compile(
+                    $assignAttr,
+                    $compiler,
+                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+                );
             } else {
-	            $_output = "<?php \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";           
-	            $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
-	        }
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
+                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
+            }
+            $_output .= "<?php if ({$prefixVar}) {?>";
             return $_output;
         } else {
-            return "<?php if ({$parameter['if condition']}){?>";
-        } 
-    } 
-} 
+            return "<?php if ({$parameter['if condition']}) {?>";
+        }
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Else Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {else} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        list($nesting, $compiler->tag_nocache) = $this->_close_tag(array('if', 'elseif'));
-        $this->_open_tag('else',array($nesting,$compiler->tag_nocache));
-
-        return "<?php }else{ ?>";
-    } 
-} 
+        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
+        $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
+        return '<?php } else { ?>';
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile ElseIf Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {elseif} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        list($nesting, $compiler->tag_nocache) = $this->_close_tag(array('if', 'elseif'));
-
-		if (is_array($parameter['if condition'])) {
-			$condition_by_assign = true;
-			if ($this->compiler->nocache) {
-        		$_nocache = ',true';
-				// create nocache var to make it know for further compiling
-				if (is_array($parameter['if condition']['var'])) {
-					$this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-				} else {
-					$this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-				}
-			} else {
-				$_nocache = '';
-			}
-		} else {
-			$condition_by_assign = false;
-		}
-
-        if (empty($this->compiler->prefix_code)) {
-        	if ($condition_by_assign) {
-            	$this->_open_tag('elseif', array($nesting + 1, $compiler->tag_nocache));
-            	if (is_array($parameter['if condition']['var'])) {
-            		$_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
-	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
-            	} else {
-	            	$_output = "<?php }else{ \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";          
-	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
-				}
-            	return $_output;
-        	} else {
-            	$this->_open_tag('elseif', array($nesting, $compiler->tag_nocache));
-            	return "<?php }elseif({$parameter['if condition']}){?>";
-        	}
+        $_attr = $this->getAttributes($compiler, $args);
+        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
+        if (!isset($parameter[ 'if condition' ])) {
+            $compiler->trigger_template_error('missing elseif condition', null, true);
+        }
+        $assignCode = '';
+        $var = '';
+        if (is_array($parameter[ 'if condition' ])) {
+            $condition_by_assign = true;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+            } else {
+                $var = $parameter[ 'if condition' ][ 'var' ];
+            }
+            if ($compiler->nocache) {
+                // create nocache var to make it know for further compiling
+                $compiler->setNocacheInVariable($var);
+            }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            $assignAttr = array();
+            $assignAttr[][ 'value' ] = $prefixVar;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                $assignCode .= $assignCompiler->compile(
+                    $assignAttr,
+                    $compiler,
+                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+                );
+            } else {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
+                $assignCode .= $assignCompiler->compile($assignAttr, $compiler, array());
+            }
+        } else {
+            $condition_by_assign = false;
+        }
+        $prefixCode = $compiler->getPrefixCode();
+        if (empty($prefixCode)) {
+            if ($condition_by_assign) {
+                $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
+                $_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+            } else {
+                $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
+                return "<?php } elseif ({$parameter['if condition']}) {?>";
+            }
         } else {
-            $tmp = '';
-            foreach ($this->compiler->prefix_code as $code) $tmp .= $code;
-            $this->compiler->prefix_code = array();
-            $this->_open_tag('elseif', array($nesting + 1, $compiler->tag_nocache));
-        	if ($condition_by_assign) {
-            	if (is_array($parameter['if condition']['var'])) {
-            		$_output = "<?php }else{?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
-	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
-            	} else {
-	            	$_output = "<?php }else{?>{$tmp}<?php \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";           
-	            	$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
-				}
-            	return $_output;
-        	} else {
-            	return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>";
-        	}
-        } 
-    } 
-} 
+            $_output = $compiler->appendCode("<?php } else {\n?>", $prefixCode);
+            $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
+            if ($condition_by_assign) {
+                $_output = $compiler->appendCode($_output, $assignCode);
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+            } else {
+                return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
+            }
+        }
+    }
+}
 
 /**
-* Smarty Internal Plugin Compile Ifclose Class
-*/
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
+ * Smarty Internal Plugin Compile Ifclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {/if} tag
-    * 
-    * @param array $args array with attributes from parser
-    * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {/if} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-            // must endblock be nocache?
-            if ($this->compiler->nocache) {
-                $this->compiler->tag_nocache = true;
-            } 
-        list($nesting, $this->compiler->nocache) = $this->_close_tag(array('if', 'else', 'elseif'));
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
         $tmp = '';
-        for ($i = 0; $i < $nesting ; $i++) $tmp .= '}';
+        for ($i = 0; $i < $nesting; $i++) {
+            $tmp .= '}';
+        }
         return "<?php {$tmp}?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
index 01d260eb7..716c91d49 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
@@ -1,176 +1,347 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Include
- * 
  * Compiles the {include} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Include Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
-	// caching mode to create nocache code but no cache file
-	const CACHING_NOCACHE_CODE = 9999;
-	// attribute definitions
+class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
+{
+    /**
+     * caching mode to create nocache code but no cache file
+     */
+    const CACHING_NOCACHE_CODE = 9999;
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
-   	public $shorttag_order = array('file');
-    public $option_flags = array('nocache','inline','caching');
-    public $optional_attributes = array('_any'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'inline', 'caching');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array(
+        'parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
+        'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+        'smarty' => Smarty::SCOPE_SMARTY
+    );
 
     /**
      * Compiles code for the {include} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     *
+     * @param array                                  $args     array with attributes from parser
+     * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object
+     *
+     * @return string
+     * @throws \Exception
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler)
     {
-        $this->compiler = $compiler;
+        $uid = $t_hash = null;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        // save posible attributes
-        $include_file = $_attr['file'];
-        $has_compiled_template = false;
-        if ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) {
-            // check if compiled code can be merged (contains no variable part)
-            if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) and substr_count($include_file, '(') == 0) {
-             $tmp = null;
-	    eval("\$tmp = $include_file;");
-                if ($this->compiler->template->template_resource != $tmp) {
-                    $tpl = new $compiler->smarty->template_class ($tmp, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
-                    // suppress writing of compiled file
-                    $tpl->write_compiled_code = false;
-                    if ($this->compiler->template->caching) {
-                        // needs code for cached page but no cache file
-                        $tpl->caching = self::CACHING_NOCACHE_CODE;
-                    } 
-//                    if ($this->compiler->template->mustCompile) {
-                        // make sure whole chain gest compiled
-                        $tpl->mustCompile = true;
-//                    } 
-                    if ($tpl->resource_object->usesCompiler && $tpl->isExisting()) {
-                        // get compiled code
-                        $compiled_tpl = $tpl->getCompiledTemplate(); 
-                        // merge compiled code for {function} tags
-                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']); 
-                        // merge filedependency by evaluating header code
-                        preg_match_all("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", $compiled_tpl, $result);
-                        $saved_has_nocache_code = $compiler->template->has_nocache_code;
-                        $saved_nocache_hash = $compiler->template->properties['nocache_hash'];
-                        $_smarty_tpl = $compiler->template;
-                        eval($result[2][0]);
-                        $compiler->template->properties['nocache_hash'] = $saved_nocache_hash;
-                        $compiler->template->has_nocache_code = $saved_has_nocache_code; 
-                        // remove header code
-                        $compiled_tpl = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_tpl);
-                        if ($tpl->has_nocache_code) {
-                            // replace nocache_hash
-                            $compiled_tpl = preg_replace("/{$tpl->properties['nocache_hash']}/", $compiler->template->properties['nocache_hash'], $compiled_tpl);
-                            $compiler->template->has_nocache_code = true;
-                        } 
-                        $has_compiled_template = true;
-                    } 
-                } 
-            } 
-        } 
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
-        } 
-
-        $_parent_scope = Smarty::SCOPE_LOCAL;
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
-            } 
-        } 
-        $_caching = 'null';
-        if ($this->compiler->nocache || $this->compiler->tag_nocache) {
-            $_caching = Smarty::CACHING_OFF;
-        } 
-        // default for included templates
-        if ($this->compiler->template->caching && !$this->compiler->nocache && !$this->compiler->tag_nocache) {
+        $_attr = $this->getAttributes($compiler, $args);
+        $fullResourceName = $source_resource = $_attr[ 'file' ];
+        $variable_template = false;
+        $cache_tpl = false;
+        // parse resource_name
+        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+            $type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
+            $name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
+            $handler = Smarty_Resource::load($compiler->smarty, $type);
+            if ($handler->recompiled || $handler->uncompiled) {
+                $variable_template = true;
+            }
+            if (!$variable_template) {
+                if ($type !== 'string') {
+                    $fullResourceName = "{$type}:{$name}";
+                    $compiled = $compiler->parent_compiler->template->compiled;
+                    if (isset($compiled->includes[ $fullResourceName ])) {
+                        $compiled->includes[ $fullResourceName ]++;
+                        $cache_tpl = true;
+                    } else {
+                        if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
+                            $fullResourceName
+                        ) {
+                            // recursive call of current template
+                            $compiled->includes[ $fullResourceName ] = 2;
+                            $cache_tpl = true;
+                        } else {
+                            $compiled->includes[ $fullResourceName ] = 1;
+                        }
+                    }
+                    $fullResourceName = $match[ 1 ] . $fullResourceName . $match[ 1 ];
+                }
+            }
+            if (empty($match[ 5 ])) {
+                $variable_template = true;
+            }
+        } else {
+            $variable_template = true;
+        }
+        // scope setup
+        $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+        // set flag to cache subtemplate object when called within loop or template name is variable.
+        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
+            $_cache_tpl = 'true';
+        } else {
+            $_cache_tpl = 'false';
+        }
+        // assume caching is off
+        $_caching = Smarty::CACHING_OFF;
+        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
+        // caching was on and {include} is not in nocache mode
+        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
             $_caching = self::CACHING_NOCACHE_CODE;
-        } 
+        }
+        // flag if included template code should be merged into caller
+        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
+                                   !$compiler->template->source->handler->recompiled;
+        if ($merge_compiled_includes) {
+            // variable template name ?
+            if ($variable_template) {
+                $merge_compiled_includes = false;
+            }
+            // variable compile_id?
+            if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
+                $merge_compiled_includes = false;
+            }
+        }
         /*
-        * if the {include} tag provides individual parameter for caching
-        * it will not be included into the common cache file and treated like
-        * a nocache section
+        * if the {include} tag provides individual parameter for caching or compile_id
+        * the subtemplate must not be included into the common cache file and is treated like
+        * a call in nocache mode.
+        *
         */
-        if (isset($_attr['cache_lifetime'])) {
-            $_cache_lifetime = $_attr['cache_lifetime'];
-            $this->compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
+            $_caching = $_new_caching = (int)$_attr[ 'caching' ];
+            $call_nocache = true;
+        } else {
+            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
+        if (isset($_attr[ 'cache_lifetime' ])) {
+            $_cache_lifetime = $_attr[ 'cache_lifetime' ];
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
-            $_cache_lifetime = 'null';
-        } 
-        if (isset($_attr['cache_id'])) {
-            $_cache_id = $_attr['cache_id'];
-            $this->compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
+        }
+        if (isset($_attr[ 'cache_id' ])) {
+            $_cache_id = $_attr[ 'cache_id' ];
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
             $_cache_id = '$_smarty_tpl->cache_id';
-        } 
-        if (isset($_attr['compile_id'])) {
-            $_compile_id = $_attr['compile_id'];
+        }
+        if (isset($_attr[ 'compile_id' ])) {
+            $_compile_id = $_attr[ 'compile_id' ];
         } else {
             $_compile_id = '$_smarty_tpl->compile_id';
-        } 
-        if ($_attr['caching'] === true) {
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        } 
-        if ($_attr['nocache'] === true) {
-            $this->compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_OFF;
-        } 
-        // create template object
-        $_output = "<?php \$_template = new {$compiler->smarty->template_class}($include_file, \$_smarty_tpl->smarty, \$_smarty_tpl, $_cache_id, $_compile_id, $_caching, $_cache_lifetime);\n"; 
+        }
+        // if subtemplate will be called in nocache mode do not merge
+        if ($compiler->template->caching && $call_nocache) {
+            $merge_compiled_includes = false;
+        }
+        // assign attribute
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
+                $_assign = "'{$_assign}'";
+                if ($compiler->tag_nocache || $compiler->nocache || $call_nocache) {
+                    // create nocache var to make it know for further compiling
+                    $compiler->setNocacheInVariable($_attr[ 'assign' ]);
+                }
+            } else {
+                $_assign = $_attr[ 'assign' ];
+            }
+        }
+        $has_compiled_template = false;
+        if ($merge_compiled_includes) {
+            $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
+            // we must observe different compile_id and caching
+            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
+            $compiler->smarty->allow_ambiguous_resources = true;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $compiler->smarty->template_class(
+                trim($fullResourceName, '"\''),
+                $compiler->smarty,
+                $compiler->template,
+                $compiler->template->cache_id,
+                $c_id,
+                $_caching
+            );
+            $uid = $tpl->source->type . $tpl->source->uid;
+            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
+                $has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
+            } else {
+                $has_compiled_template = true;
+            }
+            unset($tpl);
+        }
         // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']); 
+        unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
         // remaining attributes must be assigned as smarty variable
+        $_vars = 'array()';
         if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
-                // create variables
-                foreach ($_attr as $_key => $_value) {
-                    $_output .= "\$_template->assign('$_key',$_value);";
-                } 
-            } else {
-                $this->compiler->trigger_template_error('variable passing not allowed in parent/global scope', $this->compiler->lex->taglineno);
-            } 
-        } 
+            $_pairs = array();
+            // create variables
+            foreach ($_attr as $key => $value) {
+                $_pairs[] = "'$key'=>$value";
+            }
+            $_vars = 'array(' . join(',', $_pairs) . ')';
+        }
+        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
+                             $_compile_id !== '$_smarty_tpl->compile_id';
+        if ($has_compiled_template && !$call_nocache) {
+            $_output = "<?php\n";
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
+            }
+            if (!empty($_attr) && $_caching === 9999 && $compiler->template->caching) {
+                $_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
+                $_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] =  new Smarty_Variable(\$iv);\n";
+                $_vars_nc .= "}\n";
+                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, -3);
+            }
+            if (isset($_assign)) {
+                $_output .= "ob_start();\n";
+            }
+            $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func']}');\n";
+            if (isset($_assign)) {
+                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+            }
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
+            }
+            $_output .= "?>";
+            return $_output;
+        }
+        if ($call_nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $_output = "<?php ";
+        if ($update_compile_id) {
+            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
+        }
         // was there an assign attribute
         if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());?>";
-        } else {
-            if ($has_compiled_template && !($compiler->template->caching && ($this->compiler->tag_nocache || $this->compiler->nocache))) {
-                $_output .= "\$_template->properties['nocache_hash']  = '{$compiler->template->properties['nocache_hash']}';\n";
-                $_output .= "\$_tpl_stack[] = \$_smarty_tpl; \$_smarty_tpl = \$_template;?>\n";
-                $_output .= $compiled_tpl;
-                $_output .= "<?php \$_smarty_tpl->updateParentVariables($_parent_scope);?>\n";
-                $_output .= "<?php /*  End of included template \"" . $tpl->getTemplateFilepath() . "\" */ ?>\n";
-                $_output .= "<?php \$_smarty_tpl = array_pop(\$_tpl_stack);?>";
-            } else {
-                $_output .= " echo \$_template->getRenderedTemplate();?>";
-                if ($_parent_scope != Smarty::SCOPE_LOCAL) {
-                	$_output .= "<?php \$_template->updateParentVariables($_parent_scope);?>";
-            	}
-            } 
-        } 
-        $_output .= "<?php unset(\$_template);?>";
+            $_output .= "ob_start();\n";
+        }
+        $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        if ($update_compile_id) {
+            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
+        }
+        $_output .= "?>";
         return $_output;
-    } 
-} 
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Compile inline sub template
+     *
+     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
+     * @param \Smarty_Internal_Template               $tpl
+     * @param string                                  $t_hash
+     *
+     * @return bool
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function compileInlineTemplate(
+        Smarty_Internal_SmartyTemplateCompiler $compiler,
+        Smarty_Internal_Template $tpl,
+        $t_hash
+    ) {
+        $uid = $tpl->source->type . $tpl->source->uid;
+        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] = $tpl->source->uid;
+            if (isset($compiler->template->inheritance)) {
+                $tpl->inheritance = clone $compiler->template->inheritance;
+            }
+            $tpl->compiled = new Smarty_Template_Compiled();
+            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
+            $tpl->loadCompiler();
+            // save unique function name
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
+            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+            // make sure whole chain gets compiled
+            $tpl->mustCompile = true;
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
+                $tpl->compiled->nocache_hash;
+            if ($tpl->source->type === 'file') {
+                $sourceInfo = $tpl->source->filepath;
+            } else {
+                $basename = $tpl->source->handler->getBasename($tpl->source);
+                $sourceInfo = $tpl->source->type . ':' .
+                              ($basename ? $basename : $tpl->source->name);
+            }
+            // get compiled code
+            $compiled_code = "<?php\n\n";
+            $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
+            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
+            $compiled_code .= "<?php\n";
+            $compiled_code .= "}\n?>\n";
+            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
+            $compiled_code .= "<?php\n\n";
+            $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= '?>';
+            unset($tpl->compiler);
+            if ($tpl->compiled->has_nocache_code) {
+                // replace nocache_hash
+                $compiled_code =
+                    str_replace(
+                        "{$tpl->compiled->nocache_hash}",
+                        $compiler->template->compiled->nocache_hash,
+                        $compiled_code
+                    );
+                $compiler->template->compiled->has_nocache_code = true;
+            }
+            $compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
index 19ee186bc..1b0fdaad3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
@@ -1,90 +1,110 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Include PHP
- * 
  * Compiles the {include_php} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
-   	public $shorttag_order = array('file');
-    public $optional_attributes = array('once', 'assign'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('once', 'assign');
 
     /**
      * Compiles code for the {include_php} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-    	if (!$compiler->smarty->allow_php_tag) {
-        	throw new SmartyException("{include_php} is deprecated, set allow_php_tag = true to enable");
-    	} 
-        $this->compiler = $compiler;
+        if (!($compiler->smarty instanceof SmartyBC)) {
+            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
+        }
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        $_output = '<?php '; 
-
-        $_smarty_tpl = $compiler->template; 
+        $_attr = $this->getAttributes($compiler, $args);
+        /**
+         *
+         *
+         * @var Smarty_Internal_Template $_smarty_tpl
+         * used in evaluated code
+         */
+        $_smarty_tpl = $compiler->template;
         $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';'); 
-        if (!isset($this->compiler->smarty->security_policy) && file_exists($_file)) {
-        	$_filepath = $_file;
+        $_file = null;
+        eval('$_file = @' . $_attr[ 'file' ] . ';');
+        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
+            $_filepath = $compiler->smarty->_realpath($_file, true);
         } else {
-            if (isset($this->compiler->smarty->security_policy)) {
-                $_dir = $this->compiler->smarty->security_policy->trusted_dir;
+            if (isset($compiler->smarty->security_policy)) {
+                $_dir = $compiler->smarty->security_policy->trusted_dir;
             } else {
-                $_dir = $this->compiler->smarty->trusted_dir;
-            } 
+                $_dir = $compiler->smarty->trusted_dir;
+            }
             if (!empty($_dir)) {
-                foreach((array)$_dir as $_script_dir) {
-                    if (strpos('/\\', substr($_script_dir, -1)) === false) {
-                        $_script_dir .= DS;
-                    } 
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir .  $_file;
+                foreach ((array)$_dir as $_script_dir) {
+                    $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
+                    if (file_exists($_path)) {
+                        $_filepath = $_path;
                         break;
-                    } 
-                } 
-            } 
-        } 
-        if ($_filepath == false) {
-            $this->compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $this->compiler->lex->taglineno);
-        } 
-
-        if (isset($this->compiler->smarty->security_policy)) {
-            $this->compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
-        } 
-
-        if (isset($_attr['assign'])) {
+                    }
+                }
+            }
+        }
+        if ($_filepath === false) {
+            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
+        }
+        if (isset($compiler->smarty->security_policy)) {
+            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
+        }
+        if (isset($_attr[ 'assign' ])) {
             // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        } 
+            $_assign = $_attr[ 'assign' ];
+        }
         $_once = '_once';
-        if (isset($_attr['once'])) {
-            if ($_attr['once'] == 'false') {
+        if (isset($_attr[ 'once' ])) {
+            if ($_attr[ 'once' ] === 'false') {
                 $_once = '';
-            } 
-        } 
-
+            }
+        }
         if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
+            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
         } else {
             return "<?php include{$_once} ('{$_filepath}');?>\n";
-        } 
-    } 
-} 
-
-?>
\ No newline at end of file
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
index 898e5315a..4bdc3952e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -1,123 +1,157 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Insert
- * 
  * Compiles the {insert} tag
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('name');
-   	public $shorttag_order = array('name');
-    public $optional_attributes = array('_any'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
 
     /**
      * Compiles code for the {insert} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        // never compile as nocache code
-        $this->compiler->suppressNocacheProcessing = true;
-        $this->compiler->tag_nocache = true;
+        $_attr = $this->getAttributes($compiler, $args);
+        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
+        if (!$nocacheParam) {
+            // do not compile as nocache code
+            $compiler->suppressNocacheProcessing = true;
+        }
+        $compiler->tag_nocache = true;
         $_smarty_tpl = $compiler->template;
         $_name = null;
         $_script = null;
-
-        $_output = '<?php '; 
-        // save posible attributes
-        eval('$_name = ' . $_attr['name'] . ';');
-        if (isset($_attr['assign'])) {
+        $_output = '<?php ';
+        // save possible attributes
+        eval('$_name = @' . $_attr[ 'name' ] . ';');
+        if (isset($_attr[ 'assign' ])) {
             // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign']; 
-            // create variable to make shure that the compiler knows about its nocache status
-            $this->compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
-        } 
-        if (isset($_attr['script'])) {
+            $_assign = $_attr[ 'assign' ];
+            // create variable to make sure that the compiler knows about its nocache status
+            $var = trim($_attr[ 'assign' ], '\'');
+            if (isset($compiler->template->tpl_vars[ $var ])) {
+                $compiler->template->tpl_vars[ $var ]->nocache = true;
+            } else {
+                $compiler->template->tpl_vars[ $var ] = new Smarty_Variable(null, true);
+            }
+        }
+        if (isset($_attr[ 'script' ])) {
             // script which must be included
             $_function = "smarty_insert_{$_name}";
             $_smarty_tpl = $compiler->template;
             $_filepath = false;
-            eval('$_script = ' . $_attr['script'] . ';');
-            if (!isset($this->compiler->smarty->security_policy) && file_exists($_script)) {
+            eval('$_script = @' . $_attr[ 'script' ] . ';');
+            if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
                 $_filepath = $_script;
             } else {
-                if (isset($this->compiler->smarty->security_policy)) {
-                    $_dir = $this->compiler->smarty->security_policy->trusted_dir;
+                if (isset($compiler->smarty->security_policy)) {
+                    $_dir = $compiler->smarty->security_policy->trusted_dir;
                 } else {
-                    $_dir = $this->compiler->smarty->trusted_dir;
-                } 
+                    $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
+                }
                 if (!empty($_dir)) {
-                    foreach((array)$_dir as $_script_dir) {
-                        if (strpos('/\\', substr($_script_dir, -1)) === false) {
-                            $_script_dir .= DS;
-                        } 
+                    foreach ((array)$_dir as $_script_dir) {
+                        $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
                             break;
-                        } 
-                    } 
-                } 
-            } 
-            if ($_filepath == false) {
-                $this->compiler->trigger_template_error("{insert} missing script file '{$_script}'", $this->compiler->lex->taglineno);
-            } 
+                        }
+                    }
+                }
+            }
+            if ($_filepath === false) {
+                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
+            }
             // code for script file loading
             $_output .= "require_once '{$_filepath}' ;";
-            require_once $_filepath;
+            include_once $_filepath;
             if (!is_callable($_function)) {
-                $this->compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $this->compiler->lex->taglineno);
-            } 
+                $compiler->trigger_template_error(
+                    " {insert} function '{$_function}' is not callable in script file '{$_script}'",
+                    null,
+                    true
+                );
+            }
         } else {
             $_filepath = 'null';
-            $_function = "insert_{$_name}"; 
+            $_function = "insert_{$_name}";
             // function in PHP script ?
             if (!is_callable($_function)) {
                 // try plugin
-                if (!$_function = $this->compiler->getPlugin($_name, 'insert')) {
-                    $this->compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $this->compiler->lex->taglineno);
-                } 
-            } 
-        } 
+                if (!$_function = $compiler->getPlugin($_name, 'insert')) {
+                    $compiler->trigger_template_error(
+                        "{insert} no function or plugin found for '{$_name}'",
+                        null,
+                        true
+                    );
+                }
+            }
+        }
         // delete {insert} standard attributes
-        unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']); 
+        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'script' ], $_attr[ 'nocache' ]);
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
             $_paramsArray[] = "'$_key' => $_value";
-        } 
-        $_params = 'array(' . implode(", ", $_paramsArray) . ')'; 
+        }
+        $_params = 'array(' . implode(", ", $_paramsArray) . ')';
         // call insert
         if (isset($_assign)) {
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
             } else {
                 $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
-            } 
+            }
         } else {
-            $this->compiler->has_output = true;
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
             } else {
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
-            } 
-        } 
+            }
+        }
+        $compiler->template->compiled->has_nocache_code = true;
         return $_output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
index bdf86de4c..5493d4ecc 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
@@ -1,37 +1,37 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Ldelim
+ * Compiles the {ldelim} tag
  *
- * Compiles the {ldelim} tag 
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Ldelim Class
- */ 
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {ldelim} tag
+     * This tag does output the left delimiter
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * This tag does output the left delimiter 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        $_attr = $this->_get_attributes($args);
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
-        // this tag does not return compiled code
-        $this->compiler->has_code = true;
-        return $this->compiler->smarty->left_delimiter;
-    } 
+        return $compiler->smarty->left_delimiter;
+    }
 }
-
-?>
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_make_nocache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_make_nocache.php
new file mode 100644
index 000000000..8a34ccd0a
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_make_nocache.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Make_Nocache
+ * Compiles the {make_nocache} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Make_Nocache Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array();
+
+    /**
+     * Array of names of required attribute required by tag
+     *
+     * @var array
+     */
+    public $required_attributes = array('var');
+
+    /**
+     * Shorttag attribute order defined by its names
+     *
+     * @var array
+     */
+    public $shorttag_order = array('var');
+
+    /**
+     * Compiles code for the {make_nocache} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($compiler->template->caching) {
+            $output = "<?php \$_smarty_tpl->smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n";
+            $compiler->template->compiled->has_nocache_code = true;
+            $compiler->suppressNocacheProcessing = true;
+            return $output;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_nocache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
index 0c88b14bd..12f64ed2e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
@@ -1,63 +1,73 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Nocache
+ * Compiles the {nocache} {/nocache} tags.
  *
- * Compiles the {nocache} {/nocache} tags 
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Nocache Class
- */ 
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
+{
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array();
+
     /**
      * Compiles code for the {nocache} tag
+     * This tag does not generate compiled output. It only sets a compiler flag.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * This tag does not generate compiled output. It only sets a compiler flag 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        $_attr = $this->_get_attributes($args);
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
-        }
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'nocache', array($compiler->nocache));
         // enter nocache mode
-        $this->compiler->nocache = true;
+        $compiler->nocache = true;
         // this tag does not return compiled code
-        $this->compiler->has_code = false;
+        $compiler->has_code = false;
         return true;
-    } 
-} 
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Nocacheclose Class
- */ 
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/nocache} tag
+     * This tag does not generate compiled output. It only sets a compiler flag.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * This tag does not generate compiled output. It only sets a compiler flag 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        $_attr = $this->_get_attributes($args);
+        $_attr = $this->getAttributes($compiler, $args);
         // leave nocache mode
-        $this->compiler->nocache = false;
+        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
         // this tag does not return compiled code
-        $this->compiler->has_code = false;
+        $compiler->has_code = false;
         return true;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_parent.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_parent.php
new file mode 100644
index 000000000..ff23edf73
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_parent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Parent extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'parent';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Parent';
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
index f61ff4909..199a296c8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -1,78 +1,124 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Block Plugin
- * 
  * Compiles code for the execution of block plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Block Plugin Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $optional_attributes = array('_any'); 
+class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * nesting level
+     *
+     * @var int
+     */
+    public $nesting = 0;
 
     /**
      * Compiles code for the execution of block plugin
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of block plugin
-     * @param string $function PHP function name
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of block plugin
+     * @param string                                $function  PHP function name
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function = null)
     {
-        $this->compiler = $compiler;
-        if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+        if (!isset($tag[ 5 ]) || substr($tag, -5) !== 'close') {
             // opening tag of block plugin
-        	// check and get attributes
-        	$_attr = $this->_get_attributes($args); 
-        	if ($_attr['nocache'] === true) {
-            	$this->compiler->tag_nocache = true;
-        	}
-       		unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                } 
-            } 
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->_open_tag($tag, array($_params, $this->compiler->nocache)); 
-            // maybe nocache because of nocache variables or nocache plugin
-            $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
+            // check and get attributes
+            $_attr = $this->getAttributes($compiler, $args);
+            $this->nesting++;
+            unset($_attr[ 'nocache' ]);
+            list($callback, $_paramsArray, $callable) = $this->setup($compiler, $_attr, $tag, $function);
+            $_params = 'array(' . implode(',', $_paramsArray) . ')';
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output = "<?php ";
+            if (is_array($callback)) {
+                $output .= "\$_block_plugin{$this->nesting} = isset({$callback[0]}) ? {$callback[0]} : null;\n";
+                $callback = "\$_block_plugin{$this->nesting}{$callback[1]}";
+            }
+            if (isset($callable)) {
+                $output .= "if (!is_callable({$callable})) {\nthrow new SmartyException('block tag \'{$tag}\' not callable or registered');\n}\n";
+            }
+            $output .= "\$_smarty_tpl->smarty->_cache['_tag_stack'][] = array('{$tag}', {$_params});\n";
+            $output .= "\$_block_repeat=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat);\nwhile (\$_block_repeat) {\nob_start();?>";
+            $this->openTag($compiler, $tag, array($_params, $compiler->nocache, $callback));
+            // maybe nocache because of nocache variables or nocache plugin
+            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
         } else {
             // must endblock be nocache?
-            if ($this->compiler->nocache) {
-                $this->compiler->tag_nocache = true;
-            } 
+            if ($compiler->nocache) {
+                $compiler->tag_nocache = true;
+            }
             // closing tag of block plugin, restore nocache
-            list($_params, $this->compiler->nocache) = $this->_close_tag(substr($tag, 0, -5)); 
-            // This tag does create output
-            $this->compiler->has_output = true; 
+            list($_params, $compiler->nocache, $callback) = $this->closeTag($compiler, substr($tag, 0, -5));
             // compile code
-            if (!isset($parameter['modifier_list'])) {
-            	$mod_pre = $mod_post ='';
+            if (!isset($parameter[ 'modifier_list' ])) {
+                $mod_pre = $mod_post = $mod_content = '';
+                $mod_content2 = 'ob_get_clean()';
             } else {
-            	$mod_pre = ' ob_start(); ';
-            	$mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $mod_content2 = "\$_block_content{$this->nesting}";
+                $mod_content = "\$_block_content{$this->nesting} = ob_get_clean();\n";
+                $mod_pre = "ob_start();\n";
+                $mod_post = 'echo ' . $compiler->compileTag(
+                        'private_modifier',
+                        array(),
+                        array(
+                            'modifierlist' => $parameter[ 'modifier_list' ],
+                            'value'        => 'ob_get_clean()'
+                        )
+                    ) . ";\n";
             }
-            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        } 
-        return $output . "\n";
-    } 
-} 
+            $output =
+                "<?php {$mod_content}\$_block_repeat=false;\n{$mod_pre}echo {$callback}({$_params}, {$mod_content2}, \$_smarty_tpl, \$_block_repeat);\n{$mod_post}}\n";
+            $output .= 'array_pop($_smarty_tpl->smarty->_cache[\'_tag_stack\']);?>';
+        }
+        return $output;
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Setup callback and parameter array
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param array                                 $_attr attributes
+     * @param string                                $tag
+     * @param string                                $function
+     *
+     * @return array
+     */
+    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $function)
+    {
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        return array($function, $_paramsArray, null);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
new file mode 100644
index 000000000..d3aab24bb
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
+{
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = '';
+
+    /**
+     * Valid properties of $smarty.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array();
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
+     * @var array
+     */
+    public $matchResults = array();
+
+    /**
+     * Preg search pattern
+     *
+     * @var string
+     */
+    private $propertyPreg = '';
+
+    /**
+     * Offsets in preg match result
+     *
+     * @var array
+     */
+    private $resultOffsets = array();
+
+    /**
+     * Start offset
+     *
+     * @var int
+     */
+    private $startOffset = 0;
+
+    /**
+     * Scan sources for used tag attributes
+     *
+     * @param array                                 $attributes
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @throws \SmartyException
+     */
+    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->propertyPreg = '~(';
+        $this->startOffset = 1;
+        $this->resultOffsets = array();
+        $this->matchResults = array('named' => array(), 'item' => array());
+        if (isset($attributes[ 'name' ])) {
+            $this->buildPropertyPreg(true, $attributes);
+        }
+        if (isset($this->itemProperties)) {
+            if ($this->isNamed) {
+                $this->propertyPreg .= '|';
+            }
+            $this->buildPropertyPreg(false, $attributes);
+        }
+        $this->propertyPreg .= ')\W~i';
+        // Template source
+        $this->matchTemplateSource($compiler);
+        // Parent template source
+        $this->matchParentTemplateSource($compiler);
+        // {block} source
+        $this->matchBlockSource($compiler);
+    }
+
+    /**
+     * Build property preg string
+     *
+     * @param bool  $named
+     * @param array $attributes
+     */
+    public function buildPropertyPreg($named, $attributes)
+    {
+        if ($named) {
+            $this->resultOffsets[ 'named' ] = $this->startOffset = $this->startOffset + 3;
+            $this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" .
+                                   ($this->tagName === 'section' ? "|[\[]\s*" : '') .
+                                   "){$attributes['name']}[.](";
+            $properties = $this->nameProperties;
+        } else {
+            $this->resultOffsets[ 'item' ] = $this->startOffset = $this->startOffset + 2;
+            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+            $properties = $this->itemProperties;
+        }
+        $propName = reset($properties);
+        while ($propName) {
+            $this->propertyPreg .= "{$propName}";
+            $propName = next($properties);
+            if ($propName) {
+                $this->propertyPreg .= '|';
+            }
+        }
+        $this->propertyPreg .= '))';
+    }
+
+    /**
+     * Find matches in source string
+     *
+     * @param string $source
+     */
+    public function matchProperty($source)
+    {
+        preg_match_all($this->propertyPreg, $source, $match);
+        foreach ($this->resultOffsets as $key => $offset) {
+            foreach ($match[ $offset ] as $m) {
+                if (!empty($m)) {
+                    $this->matchResults[ $key ][ strtolower($m) ] = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->matchProperty($compiler->parser->lex->data);
+    }
+
+    /**
+     * Find matches in all parent template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @throws \SmartyException
+     */
+    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // search parent compiler template source
+        $nextCompiler = $compiler;
+        while ($nextCompiler !== $nextCompiler->parent_compiler) {
+            $nextCompiler = $nextCompiler->parent_compiler;
+            if ($compiler !== $nextCompiler) {
+                // get template source
+                $_content = $nextCompiler->template->source->getContent();
+                if ($_content !== '') {
+                    // run pre filter if required
+                    if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
+                         isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
+                    ) {
+                        $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter(
+                            'pre',
+                            $_content,
+                            $nextCompiler->template
+                        );
+                    }
+                    $this->matchProperty($_content);
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in {block} tag source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+    }
+
+    /**
+     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        if (!$name) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        if (!$property || !in_array($property, $this->nameProperties)) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+        }
+        $tagVar = "'__smarty_{$tag}_{$name}'";
+        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
index 965d696ef..055823423 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -1,44 +1,55 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function Plugin
- * 
  * Compiles code for the execution of function plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function Plugin Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array();
-    public $optional_attributes = array('_any'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
 
     /**
      * Compiles code for the execution of function plugin
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of function plugin
-     * @param string $function PHP function name
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of function plugin
+     * @param string                                $function  PHP function name
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
     {
-        $this->compiler = $compiler; 
-        // This tag does create output
-        $this->compiler->has_output = true;
-
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        if ($_attr['nocache'] === true) {
-            $this->compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
+        $_attr = $this->getAttributes($compiler, $args);
+        unset($_attr[ 'nocache' ]);
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
@@ -46,13 +57,22 @@ public function compile($args, $compiler, $parameter, $tag, $function)
                 $_paramsArray[] = "$_key=>$_value";
             } else {
                 $_paramsArray[] = "'$_key'=>$_value";
-            } 
-        } 
-        $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
+            }
+        }
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
         // compile code
-        $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+        $output = "{$function}({$_params},\$_smarty_tpl)";
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array(
+                    'modifierlist' => $parameter[ 'modifierlist' ],
+                    'value'        => $output
+                )
+            );
+        }
+        $output = "<?php echo {$output};?>\n";
         return $output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
index 49daf9ef4..72773fff8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
@@ -1,69 +1,158 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Modifier
- * 
  * Compiles code for modifier execution
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Modifier Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for modifier execution
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
-        $this->smarty = $this->compiler->smarty;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        $output = $parameter['value']; 
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = $parameter[ 'value' ];
         // loop over list of modifiers
-        foreach ($parameter['modifierlist'] as $single_modifier) {
-            $modifier = $single_modifier[0];
-	   $single_modifier[0] = $output;
-            $params = implode(',', $single_modifier); 
-            // check for registered modifier
-            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) {
-                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
-                if (!is_array($function)) {
-                    $output = "{$function}({$params})";
-                } else {
-                    if (is_object($function[0])) {
-                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
-                    } else {
-                        $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
-                    } 
-                } 
-                // check for plugin modifiercompiler
-            } else if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
-                $plugin = 'smarty_modifiercompiler_' . $modifier;
-                $output = $plugin($single_modifier, $compiler); 
-                // check for plugin modifier
-            } else if ($function = $this->compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
-                $output = "{$function}({$params})"; 
-                // check if trusted PHP function
-            } else if (is_callable($modifier)) {
-                // check if modifier allowed
-                if (!is_object($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedModifier($modifier, $this->compiler)) {
-                    $output = "{$modifier}({$params})";
-                } 
+        foreach ($parameter[ 'modifierlist' ] as $single_modifier) {
+            /* @var string $modifier */
+            $modifier = $single_modifier[ 0 ];
+            $single_modifier[ 0 ] = $output;
+            $params = implode(',', $single_modifier);
+            // check if we know already the type of modifier
+            if (isset($compiler->known_modifier_type[ $modifier ])) {
+                $modifier_types = array($compiler->known_modifier_type[ $modifier ]);
             } else {
-                $this->compiler->trigger_template_error ("unknown modifier \"" . $modifier . "\"", $this->compiler->lex->taglineno);
-            } 
-        } 
+                $modifier_types = array(1, 2, 3, 4, 5, 6);
+            }
+            foreach ($modifier_types as $type) {
+                switch ($type) {
+                    case 1:
+                        // registered modifier
+                        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])) {
+                            if (is_callable($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ])) {
+                                $output =
+                                    sprintf(
+                                        'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
+                                        Smarty::PLUGIN_MODIFIER,
+                                        var_export($modifier, true),
+                                        $params
+                                    );
+                                $compiler->known_modifier_type[ $modifier ] = $type;
+                                break 2;
+                            }
+                        }
+                        break;
+                    case 2:
+                        // registered modifier compiler
+                        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ])) {
+                            $output =
+                                call_user_func(
+                                    $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ],
+                                    $single_modifier,
+                                    $compiler->smarty
+                                );
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 3:
+                        // modifiercompiler plugin
+                        if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
+                                $plugin = 'smarty_modifiercompiler_' . $modifier;
+                                $output = $plugin($single_modifier, $compiler);
+                            }
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 4:
+                        // modifier plugin
+                        if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
+                                $output = "{$function}({$params})";
+                            }
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 5:
+                        // PHP function
+                        if (is_callable($modifier)) {
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
+                            ) {
+                                $output = "{$modifier}({$params})";
+                            }
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 6:
+                        // default plugin handler
+                        if (isset($compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])
+                            || (is_callable($compiler->smarty->default_plugin_handler_func)
+                                && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
+                        ) {
+                            $function = $compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ];
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
+                                if (!is_array($function)) {
+                                    $output = "{$function}({$params})";
+                                } else {
+                                    if (is_object($function[ 0 ])) {
+                                        $output = $function[ 0 ] . '->' . $function[ 1 ] . '(' . $params . ')';
+                                    } else {
+                                        $output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')';
+                                    }
+                                }
+                            }
+                            if (isset($compiler->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
+                                ||
+                                isset($compiler->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
+                            ) {
+                                // was a plugin
+                                $compiler->known_modifier_type[ $modifier ] = 4;
+                            } else {
+                                $compiler->known_modifier_type[ $modifier ] = $type;
+                            }
+                            break 2;
+                        }
+                }
+            }
+            if (!isset($compiler->known_modifier_type[ $modifier ])) {
+                $compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true);
+            }
+        }
         return $output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
index 97737e8d2..baac51b28 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -1,80 +1,42 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Object Block Function
- * 
  * Compiles code for registered objects as block function
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Object Block Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $required_attributes = array();
-    public $optional_attributes = array('_any'); 
-
+class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_Compile_Private_Block_Plugin
+{
     /**
-     * Compiles code for the execution of block plugin
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of block object
-     * @param string $methode name of methode to call
-     * @return string compiled code
+     * Setup callback and parameter array
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param array                                 $_attr attributes
+     * @param string                                $tag
+     * @param string                                $method
+     *
+     * @return array
      */
-    public function compile($args, $compiler, $parameter, $tag, $methode)
+    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $method)
     {
-        $this->compiler = $compiler;
-        if (strlen($tag) < 5 || substr($tag, -5) != 'close') {
-            // opening tag of block plugin
-        	// check and get attributes
-        	$_attr = $this->_get_attributes($args); 
-        	if ($_attr['nocache'] === true) {
-            	$this->compiler->tag_nocache = true;
-        	}
-       		unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                } 
-            } 
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->_open_tag($tag . '->' . $methode, array($_params, $this->compiler->nocache)); 
-            // maybe nocache because of nocache variables or nocache plugin
-            $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
-            // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$methode}', {$_params}); \$_block_repeat=true; \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-        } else {
-            $base_tag = substr($tag, 0, -5); 
-            // must endblock be nocache?
-            if ($this->compiler->nocache) {
-                $this->compiler->tag_nocache = true;
-            } 
-            // closing tag of block plugin, restore nocache
-            list($_params, $this->compiler->nocache) = $this->_close_tag($base_tag . '->' . $methode); 
-            // This tag does create output
-            $this->compiler->has_output = true; 
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-            	$mod_pre = $mod_post ='';
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
             } else {
-            	$mod_pre = ' ob_start(); ';
-            	$mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $_paramsArray[] = "'$_key'=>$_value";
             }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$methode}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        } 
-        return $output."\n";
-    } 
-} 
-
-?>
\ No newline at end of file
+        }
+        $callback = array("\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]", "->{$method}");
+        return array($callback, $_paramsArray, "array(\$_block_plugin{$this->nesting}, '{$method}')");
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
index f0755f062..2a763c6e3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
@@ -1,71 +1,85 @@
 <?php
 /**
- * Smarty Internal Plugin Compile Object Funtion
- * 
+ * Smarty Internal Plugin Compile Object Function
  * Compiles code for registered objects as function
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Object Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $required_attributes = array();
-    public $optional_attributes = array('_any'); 
+class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
 
     /**
      * Compiles code for the execution of function plugin
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of function
-     * @param string $methode name of methode to call
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of function
+     * @param string                                $method    name of method to call
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter, $tag, $methode)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        if ($_attr['nocache'] === true) {
-            $this->compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
+        $_attr = $this->getAttributes($compiler, $args);
+        unset($_attr[ 'nocache' ]);
         $_assign = null;
-        if (isset($_attr['assign'])) {
-            $_assign = $_attr['assign'];
-            unset($_attr['assign']);
-        } 
-        // convert attributes into parameter array string
-        if ($this->compiler->smarty->registered_objects[$tag][2]) {
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                } 
-            } 
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl)";
+        if (isset($_attr[ 'assign' ])) {
+            $_assign = $_attr[ 'assign' ];
+            unset($_attr[ 'assign' ]);
+        }
+        // method or property ?
+        if (is_callable(array($compiler->smarty->registered_objects[ $tag ][ 0 ], $method))) {
+            // convert attributes into parameter array string
+            if ($compiler->smarty->registered_objects[ $tag ][ 2 ]) {
+                $_paramsArray = array();
+                foreach ($_attr as $_key => $_value) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    }
+                }
+                $_params = 'array(' . implode(',', $_paramsArray) . ')';
+                $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
+            } else {
+                $_params = implode(',', $_attr);
+                $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
+            }
         } else {
-            $_params = implode(",", $_attr);
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params})";
-        } 
+            // object property
+            $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
+        }
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)
+            );
+        }
         if (empty($_assign)) {
-            // This tag does create output
-            $this->compiler->has_output = true;
-            $output = "<?php echo {$return};?>\n";
+            return "<?php echo {$output};?>\n";
         } else {
-            $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
+            return "<?php \$_smarty_tpl->assign({$_assign},{$output});?>\n";
+        }
     }
-        return $output;
-    } 
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php
new file mode 100644
index 000000000..ff48c6fbc
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile PHP Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile PHP Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('code', 'type');
+
+    /**
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->has_code = false;
+        if ($_attr[ 'type' ] === 'xml') {
+            $compiler->tag_nocache = true;
+            $output = addcslashes($_attr[ 'code' ], "'\\");
+            $compiler->parser->current_buffer->append_subtree(
+                $compiler->parser,
+                new Smarty_Internal_ParseTree_Tag(
+                    $compiler->parser,
+                    $compiler->processNocacheCode(
+                        "<?php echo '{$output}';?>\n",
+                        true
+                    )
+                )
+            );
+            return '';
+        }
+        if ($_attr[ 'type' ] !== 'tag') {
+            if ($compiler->php_handling === Smarty::PHP_REMOVE) {
+                return '';
+            } elseif ($compiler->php_handling === Smarty::PHP_QUOTE) {
+                $output =
+                    preg_replace_callback(
+                        '#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
+                        array($this, 'quote'),
+                        $_attr[ 'code' ]
+                    );
+                $compiler->parser->current_buffer->append_subtree(
+                    $compiler->parser,
+                    new Smarty_Internal_ParseTree_Text($output)
+                );
+                return '';
+            } elseif ($compiler->php_handling === Smarty::PHP_PASSTHRU || $_attr[ 'type' ] === 'unmatched') {
+                $compiler->tag_nocache = true;
+                $output = addcslashes($_attr[ 'code' ], "'\\");
+                $compiler->parser->current_buffer->append_subtree(
+                    $compiler->parser,
+                    new Smarty_Internal_ParseTree_Tag(
+                        $compiler->parser,
+                        $compiler->processNocacheCode(
+                            "<?php echo '{$output}';?>\n",
+                            true
+                        )
+                    )
+                );
+                return '';
+            } elseif ($compiler->php_handling === Smarty::PHP_ALLOW) {
+                if (!($compiler->smarty instanceof SmartyBC)) {
+                    $compiler->trigger_template_error(
+                        '$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
+                        null,
+                        true
+                    );
+                }
+                $compiler->has_code = true;
+                return $_attr[ 'code' ];
+            } else {
+                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+            }
+        } else {
+            $compiler->has_code = true;
+            if (!($compiler->smarty instanceof SmartyBC)) {
+                $compiler->trigger_template_error(
+                    '{php}{/php} tags not allowed. Use SmartyBC to enable them',
+                    null,
+                    true
+                );
+            }
+            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
+            if (!empty($match[ 2 ])) {
+                if ('nocache' === trim($match[ 2 ])) {
+                    $compiler->tag_nocache = true;
+                } else {
+                    $compiler->trigger_template_error("illegal value of option flag '{$match[2]}'", null, true);
+                }
+            }
+            return preg_replace(
+                array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
+                array('<?php ', '?>'),
+                $_attr[ 'code' ]
+            );
+        }
+    }
+
+    /**
+     * Lexer code for PHP tags
+     *
+     * This code has been moved from lexer here fo easier debugging and maintenance
+     *
+     * @param Smarty_Internal_Templatelexer $lex
+     *
+     * @throws \SmartyCompilerException
+     */
+    public function parsePhp(Smarty_Internal_Templatelexer $lex)
+    {
+        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
+        $close = 0;
+        $lex->taglineno = $lex->line;
+        $closeTag = '?>';
+        if (strpos($lex->value, '<?xml') === 0) {
+            $lex->is_xml = true;
+            $lex->phpType = 'xml';
+            return;
+        } elseif (strpos($lex->value, '<?') === 0) {
+            $lex->phpType = 'php';
+        } elseif (strpos($lex->value, '<%') === 0) {
+            $lex->phpType = 'asp';
+            $closeTag = '%>';
+        } elseif (strpos($lex->value, '%>') === 0) {
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '?>') === 0) {
+            if ($lex->is_xml) {
+                $lex->is_xml = false;
+                $lex->phpType = 'xml';
+                return;
+            }
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '<s') === 0) {
+            $lex->phpType = 'script';
+            $closeTag = '</script>';
+        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+            if ($lex->isAutoLiteral()) {
+                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+                return;
+            }
+            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+            if ($lex->value === $closeTag) {
+                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+            }
+            $lex->phpType = 'tag';
+        }
+        if ($lex->phpType === 'unmatched') {
+            return;
+        }
+        if (($lex->phpType === 'php' || $lex->phpType === 'asp')
+            &&
+            ($lex->compiler->php_handling === Smarty::PHP_PASSTHRU ||
+             $lex->compiler->php_handling === Smarty::PHP_QUOTE)
+        ) {
+            return;
+        }
+        $start = $lex->counter + strlen($lex->value);
+        $body = true;
+        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+            $close = $match[ 0 ][ 1 ];
+        } else {
+            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+        }
+        while ($body) {
+            if (preg_match(
+                '~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
+                $lex->data,
+                $match,
+                PREG_OFFSET_CAPTURE,
+                $start
+            )
+            ) {
+                $value = $match[ 0 ][ 0 ];
+                $from = $pos = $match[ 0 ][ 1 ];
+                if ($pos > $close) {
+                    $body = false;
+                } else {
+                    $start = $pos + strlen($value);
+                    $phpCommentStart = $value === '/*';
+                    if ($phpCommentStart) {
+                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+                        if ($phpCommentEnd) {
+                            $pos2 = $match[ 0 ][ 1 ];
+                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
+                        }
+                    }
+                    while ($close > $pos && $close < $start) {
+                        if (preg_match(
+                            '~' . preg_quote($closeTag, '~') . '~i',
+                            $lex->data,
+                            $match,
+                            PREG_OFFSET_CAPTURE,
+                            $from
+                        )
+                        ) {
+                            $close = $match[ 0 ][ 1 ];
+                            $from = $close + strlen($match[ 0 ][ 0 ]);
+                        } else {
+                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+                        }
+                    }
+                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+                    }
+                }
+            } else {
+                $body = false;
+            }
+        }
+        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+    }
+
+    /*
+     * Call back function for $php_handling = PHP_QUOTE
+     *
+     */
+    /**
+     * @param $match
+     *
+     * @return string
+     */
+    private function quote($match)
+    {
+        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
index 5a9c93191..23cae8aef 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -1,77 +1,161 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Print Expression
- * 
  * Compiles any tag which will output an expression or variable
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Print Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $optional_attributes = array('assign'); 
-    public $option_flags = array('nocache', 'nofilter'); 
+class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'nofilter');
 
     /**
-     * Compiles code for gererting output from any expression
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return string compiled code
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        // nocache option
-        if ($_attr['nocache'] === true) {
-            $this->compiler->tag_nocache = true;
-        } 
-        // filter handling
-        if ($_attr['nofilter'] === true) {
-            $_filter = 'false';
-        } else {
-            $_filter = 'true';
-        } 
-        // compiled output
-        // compiled output
-        if (isset($_attr['assign'])) {
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = $parameter[ 'value' ];
+        // tag modifier
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array(
+                    'modifierlist' => $parameter[ 'modifierlist' ],
+                    'value'        => $output
+                )
+            );
+        }
+        if (isset($_attr[ 'assign' ])) {
             // assign output to variable
-            $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
+            return "<?php \$_smarty_tpl->assign({$_attr['assign']},{$output});?>";
         } else {
             // display value
-            if (!$_attr['nofilter'] && isset($this->compiler->smarty->registered_filters['variable'])) {
-                $output = "Smarty_Internal_Filter_Handler::runFilter('variable', {$parameter['value']}, \$_smarty_tpl, {$_filter})";
-            } else {
-                $output = $parameter['value'];
-            } 
-            if (!$_attr['nofilter'] && !empty($this->compiler->smarty->default_modifiers)) {
-                $modifierlist = array();
-                foreach ($this->compiler->smarty->default_modifiers as $key => $single_default_modifier) {
-                    preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
-                    for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) {
-                        if ($mod_array[0][$i] != ':') {
-                            $modifierlist[$key][] = $mod_array[0][$i];
-                        } 
-                    } 
-                } 
-                $output = $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $modifierlist, 'value' => $output));
-            } 
-            if (!empty($parameter['modifierlist'])) {
-                $output = $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
-            } 
-            $this->compiler->has_output = true;
-            $output = "<?php echo {$output};?>";
-        } 
+            if (!$_attr[ 'nofilter' ]) {
+                // default modifier
+                if (!empty($compiler->smarty->default_modifiers)) {
+                    if (empty($compiler->default_modifier_list)) {
+                        $modifierlist = array();
+                        foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
+                            preg_match_all(
+                                '/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
+                                $single_default_modifier,
+                                $mod_array
+                            );
+                            for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i++) {
+                                if ($mod_array[ 0 ][ $i ] !== ':') {
+                                    $modifierlist[ $key ][] = $mod_array[ 0 ][ $i ];
+                                }
+                            }
+                        }
+                        $compiler->default_modifier_list = $modifierlist;
+                    }
+                    $output = $compiler->compileTag(
+                        'private_modifier',
+                        array(),
+                        array(
+                            'modifierlist' => $compiler->default_modifier_list,
+                            'value'        => $output
+                        )
+                    );
+                }
+                // autoescape html
+                if ($compiler->template->smarty->escape_html) {
+                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                }
+                // loop over registered filters
+                if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
+                    foreach ($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ] as $key =>
+                        $function) {
+                        if (!is_array($function)) {
+                            $output = "{$function}({$output},\$_smarty_tpl)";
+                        } elseif (is_object($function[ 0 ])) {
+                            $output =
+                                "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
+                        } else {
+                            $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
+                        }
+                    }
+                }
+                // auto loaded filters
+                if (isset($compiler->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ])) {
+                    foreach ((array)$compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name) {
+                        $result = $this->compile_variable_filter($compiler, $name, $output);
+                        if ($result !== false) {
+                            $output = $result;
+                        } else {
+                            // not found, throw exception
+                            throw new SmartyException("Unable to load variable filter '{$name}'");
+                        }
+                    }
+                }
+                foreach ($compiler->variable_filters as $filter) {
+                    if (count($filter) === 1
+                        && ($result = $this->compile_variable_filter($compiler, $filter[ 0 ], $output)) !== false
+                    ) {
+                        $output = $result;
+                    } else {
+                        $output = $compiler->compileTag(
+                            'private_modifier',
+                            array(),
+                            array('modifierlist' => array($filter), 'value' => $output)
+                        );
+                    }
+                }
+            }
+            $output = "<?php echo {$output};?>\n";
+        }
         return $output;
-    } 
-} 
+    }
 
-?>
\ No newline at end of file
+    /**
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $name     name of variable filter
+     * @param string                                $output   embedded output
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    private function compile_variable_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
+    {
+        $function = $compiler->getPlugin($name, 'variablefilter');
+        if ($function) {
+            return "{$function}({$output},\$_smarty_tpl)";
+        } else {
+            // not found
+            return false;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
index b8f239d81..0f818d1b3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -1,95 +1,72 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Registered Block
- * 
  * Compiles code for the execution of a registered block function
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Registered Block Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $optional_attributes = array('_any'); 
-
+class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_Compile_Private_Block_Plugin
+{
     /**
-     * Compiles code for the execution of a block function
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of block function
-     * @return string compiled code
+     * Setup callback, parameter array and nocache mode
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param array                                 $_attr attributes
+     * @param string                                $tag
+     * @param null                                  $function
+     *
+     * @return array
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $function)
     {
-        $this->compiler = $compiler;
-        if (strlen($tag) < 6 || substr($tag,-5) != 'close') {
-            // opening tag of block plugin
-        	// check and get attributes
-        	$_attr = $this->_get_attributes($args); 
-        	if ($_attr['nocache']) {
-            	$this->compiler->tag_nocache = true;
-        	}
-       		unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-            	} elseif ($this->compiler->template->caching && in_array($_key,$compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][2])) {
-					$_value = str_replace("'","^#^",$_value);
-                	$_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ])) {
+            $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ];
+            $callback = $tag_info[ 0 ];
+            if (is_array($callback)) {
+                if (is_object($callback[ 0 ])) {
+                    $callable = "array(\$_block_plugin{$this->nesting}, '{$callback[1]}')";
+                    $callback =
+                        array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]", "->{$callback[1]}");
                 } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                } 
-            } 
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->_open_tag($tag, array($_params, $this->compiler->nocache)); 
-            // maybe nocache because of nocache variables or nocache plugin
-            $this->compiler->nocache = !$compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][1] | $this->compiler->nocache | $this->compiler->tag_nocache;
-            $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][0]; 
-            // compile code
-            if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                    $callable = "array(\$_block_plugin{$this->nesting}, '{$callback[1]}')";
+                    $callback =
+                        array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]", "::{$callback[1]}");
+                }
             } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } 
+                $callable = "\$_block_plugin{$this->nesting}";
+                $callback = array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0]", '');
+            }
         } else {
-            // must endblock be nocache?
-            if ($this->compiler->nocache) {
-                $this->compiler->tag_nocache = true;
-            } 
-            $base_tag = substr($tag, 0, -5); 
-            // closing tag of block plugin, restore nocache
-            list($_params, $this->compiler->nocache) = $this->_close_tag($base_tag); 
-            // This tag does create output
-            $this->compiler->has_output = true;
-            $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; 
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-            	$mod_pre = $mod_post ='';
+            $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ];
+            $callback = $tag_info[ 0 ];
+            if (is_array($callback)) {
+                $callable = "array('{$callback[0]}', '{$callback[1]}')";
+                $callback = "{$callback[1]}::{$callback[1]}";
             } else {
-            	$mod_pre = ' ob_start(); ';
-            	$mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $callable = null;
             }
-            if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+        }
+        $compiler->tag_nocache = !$tag_info[ 1 ] | $compiler->tag_nocache;
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
+                $_value = str_replace('\'', "^#^", $_value);
+                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
             } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } 
-        } 
-        return $output."\n";
-    } 
-} 
-
-?>
\ No newline at end of file
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        return array($callback, $_paramsArray, $callable);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
index 96236fa9b..2591107d2 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -1,67 +1,91 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Registered Function
- * 
  * Compiles code for the execution of a registered function
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
- 
+
 /**
  * Smarty Internal Plugin Compile Registered Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase {
-	// attribute definitions
-    public $optional_attributes = array('_any'); 
+class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
 
     /**
      * Compiles code for the execution of a registered function
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of function
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of function
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
-        $this->compiler = $compiler; 
-        // This tag does create output
-        $this->compiler->has_output = true;
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
-        if ($_attr['nocache']) {
-            $this->compiler->tag_nocache = true;
+        $_attr = $this->getAttributes($compiler, $args);
+        unset($_attr[ 'nocache' ]);
+        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+            $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
+            $is_registered = true;
+        } else {
+            $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
+            $is_registered = false;
         }
-        unset($_attr['nocache']);
-        // not cachable?
-        $this->compiler->tag_nocache =  $this->compiler->tag_nocache || !$compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][1]; 
+        // not cacheable?
+        $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ];
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
             if (is_int($_key)) {
                 $_paramsArray[] = "$_key=>$_value";
-            } elseif ($this->compiler->template->caching && in_array($_key,$compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][2])) {
-				$_value = str_replace("'","^#^",$_value);
+            } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
+                $_value = str_replace('\'', "^#^", $_value);
                 $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
             } else {
                 $_paramsArray[] = "'$_key'=>$_value";
-            } 
-        } 
-        $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
-        $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][0]; 
+            }
+        }
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
         // compile code
-        if (!is_array($function)) {
-            $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-        } else if (is_object($function[0])) {
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
+        if ($is_registered) {
+            $output =
+                "call_user_func_array( \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0], array( {$_params},\$_smarty_tpl ) )";
         } else {
-            $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-        } 
+            $function = $tag_info[ 0 ];
+            if (!is_array($function)) {
+                $output = "{$function}({$_params},\$_smarty_tpl)";
+            } else {
+                $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)";
+            }
+        }
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array(
+                    'modifierlist' => $parameter[ 'modifierlist' ],
+                    'value'        => $output
+                )
+            );
+        }
+        $output = "<?php echo {$output};?>\n";
         return $output;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
index 5d6ae8015..b317c9f33 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -1,99 +1,126 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Special Smarty Variable
- * 
  * Compiles the special $smarty variables
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile special Smarty Variable Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
+{
     /**
-     * Compiles code for the speical $smarty variables
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     * Compiles code for the special $smarty variables
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param                                       $parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        switch ($variable) {
-            case 'foreach':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'section':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'capture':
-                return "Smarty::\$_smarty_vars$parameter";
-            case 'now':
-                return 'time()';
-            case 'cookies':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
+        $variable = strtolower($compiler->getId($_index[ 0 ]));
+        if ($variable === false) {
+            $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
+        }
+        if (!isset($compiler->smarty->security_policy)
+            || $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+        ) {
+            switch ($variable) {
+                case 'foreach':
+                case 'section':
+                    if (!isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ])) {
+                        $class = 'Smarty_Internal_Compile_' . ucfirst($variable);
+                        Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
+                    }
+                    return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
+                        array(),
+                        $compiler,
+                        $_index
+                    );
+                case 'capture':
+                    if (class_exists('Smarty_Internal_Compile_Capture')) {
+                        return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
+                    }
+                    return '';
+                case 'now':
+                    return 'time()';
+                case 'cookies':
+                    if (isset($compiler->smarty->security_policy)
+                        && !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_COOKIE';
                     break;
-                } 
-                $compiled_ref = '$_COOKIE';
-                break;
-
-            case 'get':
-            case 'post':
-            case 'env':
-            case 'server':
-            case 'session':
-            case 'request':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                case 'get':
+                case 'post':
+                case 'env':
+                case 'server':
+                case 'session':
+                case 'request':
+                    if (isset($compiler->smarty->security_policy)
+                        && !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_' . strtoupper($variable);
                     break;
-                } 
-                $compiled_ref = '$_'.strtoupper($variable);
-                break;
-
-            case 'template':
-                return 'basename($_smarty_tpl->getTemplateFilepath())';
-
-            case 'current_dir':
-                return 'dirname($_smarty_tpl->getTemplateFilepath())';
-
-            case 'version':
-                $_version = Smarty::SMARTY_VERSION;
-                return "'$_version'";
-
-            case 'const':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                    $compiler->trigger_template_error("(secure mode) constants not permitted");
+                case 'template':
+                    return 'basename($_smarty_tpl->source->filepath)';
+                case 'template_object':
+                    return '$_smarty_tpl';
+                case 'current_dir':
+                    return 'dirname($_smarty_tpl->source->filepath)';
+                case 'version':
+                    return "Smarty::SMARTY_VERSION";
+                case 'const':
+                    if (isset($compiler->smarty->security_policy)
+                        && !$compiler->smarty->security_policy->allow_constants
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) constants not permitted");
+                        break;
+                    }
+                    if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
+                        return "@constant('{$_index[1]}')";
+                    } else {
+                        return "@constant({$_index[1]})";
+                    }
+                // no break
+                case 'config':
+                    if (isset($_index[ 2 ])) {
+                        return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
+                    } else {
+                        return "\$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])";
+                    }
+                // no break
+                case 'ldelim':
+                    return "\$_smarty_tpl->smarty->left_delimiter";
+                case 'rdelim':
+                    return "\$_smarty_tpl->smarty->right_delimiter";
+                default:
+                    $compiler->trigger_template_error('$smarty.' . trim($_index[ 0 ], "'") . ' is not defined');
                     break;
-                } 
-                return '@' . trim($_index[1], "'");
-
-            case 'config':
-                return "\$_smarty_tpl->getConfigVariable($_index[1])";
-            case 'ldelim':
-                $_ldelim = $compiler->smarty->left_delimiter;
-                return "'$_ldelim'";
-
-            case 'rdelim':
-                $_rdelim = $compiler->smarty->right_delimiter;
-                return "'$_rdelim'";
-
-            default:
-                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                break;
-        } 
-        if (isset($_index[1])) {
-            array_shift($_index);
-            foreach ($_index as $_ind) {
-                $compiled_ref = $compiled_ref . "[$_ind]";
-            } 
-        } 
-        return $compiled_ref;
-    } 
-} 
-
-?>
\ No newline at end of file
+            }
+            if (isset($_index[ 1 ])) {
+                array_shift($_index);
+                foreach ($_index as $_ind) {
+                    $compiled_ref = $compiled_ref . "[$_ind]";
+                }
+            }
+            return $compiled_ref;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
index 6436bfd16..1cc340c18 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
@@ -1,37 +1,34 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Rdelim
+ * Compiles the {rdelim} tag
  *
- * Compiles the {rdelim} tag 
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Rdelim Class
- */ 
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_Compile_Ldelim
+{
     /**
      * Compiles code for the {rdelim} tag
+     * This tag does output the right delimiter.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * This tag does output the right delimiter 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        $_attr = $this->_get_attributes($args);
-        if ($_attr['nocache'] === true) {
-        	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
-        }
-        // this tag does not return compiled code
-        $this->compiler->has_code = true;
-        return $this->compiler->smarty->right_delimiter;
-    } 
+        parent::compile($args, $compiler);
+        return $compiler->smarty->right_delimiter;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_section.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_section.php
index 0768b026e..0dee20820 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_section.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_section.php
@@ -1,173 +1,462 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Section
- * 
  * Compiles the {section} {sectionelse} {/section} tags
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Section Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
-	// attribute definitions
+class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('name', 'loop');
-   	public $shorttag_order = array('name', 'loop');
-    public $optional_attributes = array('start', 'step', 'max', 'show'); 
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name', 'loop');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('start', 'step', 'max', 'show', 'properties');
+
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'section';
+
+    /**
+     * Valid properties of $smarty.section.name.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array(
+        'first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
+        'index_next', 'loop'
+    );
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
 
     /**
      * Compiles code for the {section} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler;
+        $compiler->loopNesting++;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        $this->_open_tag('section', array('section',$this->compiler->nocache));
+        $_attr = $this->getAttributes($compiler, $args);
+        $attributes = array('name' => $compiler->getId($_attr[ 'name' ]));
+        unset($_attr[ 'name' ]);
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $local = "\$__section_{$attributes['name']}_" . $this->counter++ . '_';
+        $sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+        $this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
         // maybe nocache because of nocache variables
-        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
-
-        $output = "<?php ";
-
-        $section_name = $_attr['name'];
-        
-        $output .= "unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
-
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $initLocal = array();
+        $initNamedProperty = array();
+        $initFor = array();
+        $incFor = array();
+        $cmpFor = array();
+        $propValue = array(
+            'index'     => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+            'iteration' => "{$local}iteration",
+        );
+        $propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
+        // search for used tag attributes
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults[ 'named' ])) {
+            $namedAttr = $this->matchResults[ 'named' ];
+        }
+        if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
+            foreach ($match[ 1 ] as $prop) {
+                if (in_array($prop, $this->nameProperties)) {
+                    $namedAttr[ $prop ] = true;
+                } else {
+                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+                }
+            }
+        }
+        $namedAttr[ 'index' ] = true;
+        $output = "<?php\n";
         foreach ($_attr as $attr_name => $attr_value) {
             switch ($attr_name) {
                 case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int)$attr_value;
+                        $t = 0;
+                    } else {
+                        $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+                        $t = 1;
+                    }
+                    if ($t === 1) {
+                        $initLocal[ 'loop' ] = $v;
+                        $v = "{$local}loop";
+                    }
                     break;
-
                 case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
+                    if (is_bool($attr_value)) {
+                        $v = $attr_value ? 'true' : 'false';
+                        $t = 0;
+                    } else {
+                        $v = "(bool) $attr_value";
+                        $t = 3;
+                    }
                     break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
+                case 'step':
+                    if (is_numeric($attr_value)) {
+                        $v = (int)$attr_value;
+                        $v = ($v === 0) ? 1 : $v;
+                        $t = 0;
+                        break;
+                    }
+                    $initLocal[ 'step' ] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value";
+                    $v = "{$local}step";
+                    $t = 2;
                     break;
-
                 case 'max':
                 case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int)$attr_value;
+                        $t = 0;
+                        break;
+                    }
+                    $v = "(int)@$attr_value";
+                    $t = 3;
                     break;
-            } 
-        } 
-
-        if (!isset($_attr['show']))
-            $output .= "{$section_props}['show'] = true;\n";
-
-        if (!isset($_attr['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
-
-        if (!isset($_attr['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
-
-        if (!isset($_attr['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
-
-        if (!isset($_attr['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
-            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-        } 
-
-        $output .= "if ({$section_props}['show']) {\n";
-        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
+            }
+            if ($t === 3 && $compiler->getId($attr_value)) {
+                $t = 1;
+            }
+            $propValue[ $attr_name ] = $v;
+            $propType[ $attr_name ] = $t;
+        }
+        if (isset($namedAttr[ 'step' ])) {
+            $initNamedProperty[ 'step' ] = $propValue[ 'step' ];
+        }
+        if (isset($namedAttr[ 'iteration' ])) {
+            $propValue[ 'iteration' ] = "{$sectionVar}->value['iteration']";
+        }
+        $incFor[ 'iteration' ] = "{$propValue['iteration']}++";
+        $initFor[ 'iteration' ] = "{$propValue['iteration']} = 1";
+        if ($propType[ 'step' ] === 0) {
+            if ($propValue[ 'step' ] === 1) {
+                $incFor[ 'index' ] = "{$sectionVar}->value['index']++";
+            } elseif ($propValue[ 'step' ] > 1) {
+                $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+            } else {
+                $incFor[ 'index' ] = "{$sectionVar}->value['index'] -= " . -$propValue[ 'step' ];
+            }
         } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
-        } 
-        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
-
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
-
-        $output .= "?>";
+            $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+        }
+        if (!isset($propValue[ 'max' ])) {
+            $propValue[ 'max' ] = $propValue[ 'loop' ];
+            $propType[ 'max' ] = $propType[ 'loop' ];
+        } elseif ($propType[ 'max' ] !== 0) {
+            $propValue[ 'max' ] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+            $propType[ 'max' ] = 1;
+        } else {
+            if ($propValue[ 'max' ] < 0) {
+                $propValue[ 'max' ] = $propValue[ 'loop' ];
+                $propType[ 'max' ] = $propType[ 'loop' ];
+            }
+        }
+        if (!isset($propValue[ 'start' ])) {
+            $start_code =
+                array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue[ 'loop' ], 5 => ' - 1');
+            if ($propType[ 'loop' ] === 0) {
+                $start_code[ 5 ] = '';
+                $start_code[ 4 ] = $propValue[ 'loop' ] - 1;
+            }
+            if ($propType[ 'step' ] === 0) {
+                if ($propValue[ 'step' ] > 0) {
+                    $start_code = array(1 => '0');
+                    $propType[ 'start' ] = 0;
+                } else {
+                    $start_code[ 1 ] = $start_code[ 2 ] = $start_code[ 3 ] = '';
+                    $propType[ 'start' ] = $propType[ 'loop' ];
+                }
+            } else {
+                $propType[ 'start' ] = 1;
+            }
+            $propValue[ 'start' ] = join('', $start_code);
+        } else {
+            $start_code =
+                array(
+                    1  => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
+                    5  => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
+                    11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ',
+                    15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ',
+                    18 => $propType[ 'loop' ] === 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1",
+                    19 => ')'
+                );
+            if ($propType[ 'step' ] === 0) {
+                $start_code[ 3 ] = $start_code[ 5 ] = $start_code[ 15 ] = $start_code[ 17 ] = '';
+                if ($propValue[ 'step' ] > 0) {
+                    $start_code[ 6 ] = $start_code[ 18 ] = '';
+                } else {
+                    $start_code[ 4 ] = $start_code[ 16 ] = '';
+                }
+            }
+            if ($propType[ 'start' ] === 0) {
+                if ($propType[ 'loop' ] === 0) {
+                    $start_code[ 8 ] = $propValue[ 'start' ] + $propValue[ 'loop' ];
+                }
+                $propType[ 'start' ] = $propType[ 'step' ] + $propType[ 'loop' ];
+                $start_code[ 1 ] = '';
+                if ($propValue[ 'start' ] < 0) {
+                    for ($i = 11; $i <= 19; $i++) {
+                        $start_code[ $i ] = '';
+                    }
+                    if ($propType[ 'start' ] === 0) {
+                        $start_code = array(
+                            max(
+                                $propValue[ 'step' ] > 0 ? 0 : -1,
+                                $propValue[ 'start' ] + $propValue[ 'loop' ]
+                            )
+                        );
+                    }
+                } else {
+                    for ($i = 1; $i <= 11; $i++) {
+                        $start_code[ $i ] = '';
+                    }
+                    if ($propType[ 'start' ] === 0) {
+                        $start_code =
+                            array(
+                                min(
+                                    $propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1,
+                                    $propValue[ 'start' ]
+                                )
+                            );
+                    }
+                }
+            }
+            $propValue[ 'start' ] = join('', $start_code);
+        }
+        if ($propType[ 'start' ] !== 0) {
+            $initLocal[ 'start' ] = $propValue[ 'start' ];
+            $propValue[ 'start' ] = "{$local}start";
+        }
+        $initFor[ 'index' ] = "{$sectionVar}->value['index'] = {$propValue['start']}";
+        if (!isset($_attr[ 'start' ]) && !isset($_attr[ 'step' ]) && !isset($_attr[ 'max' ])) {
+            $propValue[ 'total' ] = $propValue[ 'loop' ];
+            $propType[ 'total' ] = $propType[ 'loop' ];
+        } else {
+            $propType[ 'total' ] =
+                $propType[ 'start' ] + $propType[ 'loop' ] + $propType[ 'step' ] + $propType[ 'max' ];
+            if ($propType[ 'total' ] === 0) {
+                $propValue[ 'total' ] =
+                    min(
+                        ceil(
+                            ($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] :
+                                (int)$propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])
+                        ),
+                        $propValue[ 'max' ]
+                    );
+            } else {
+                $total_code = array(
+                    1  => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+                    5  => $propValue[ 'loop' ], 6 => ' - ', 7 => $propValue[ 'start' ], 8 => ' : ',
+                    9  => $propValue[ 'start' ], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+                    14 => $propValue[ 'step' ], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",
+                );
+                if (!isset($propValue[ 'max' ])) {
+                    $total_code[ 1 ] = $total_code[ 17 ] = '';
+                }
+                if ($propType[ 'loop' ] + $propType[ 'start' ] === 0) {
+                    $total_code[ 5 ] = $propValue[ 'loop' ] - $propValue[ 'start' ];
+                    $total_code[ 6 ] = $total_code[ 7 ] = '';
+                }
+                if ($propType[ 'start' ] === 0) {
+                    $total_code[ 9 ] = (int)$propValue[ 'start' ] + 1;
+                    $total_code[ 10 ] = '';
+                }
+                if ($propType[ 'step' ] === 0) {
+                    $total_code[ 13 ] = $total_code[ 15 ] = '';
+                    if ($propValue[ 'step' ] === 1 || $propValue[ 'step' ] === -1) {
+                        $total_code[ 2 ] = $total_code[ 12 ] = $total_code[ 14 ] = $total_code[ 16 ] = '';
+                    } elseif ($propValue[ 'step' ] < 0) {
+                        $total_code[ 14 ] = -$propValue[ 'step' ];
+                    }
+                    $total_code[ 4 ] = '';
+                    if ($propValue[ 'step' ] > 0) {
+                        $total_code[ 8 ] = $total_code[ 9 ] = $total_code[ 10 ] = '';
+                    } else {
+                        $total_code[ 5 ] = $total_code[ 6 ] = $total_code[ 7 ] = $total_code[ 8 ] = '';
+                    }
+                }
+                $propValue[ 'total' ] = join('', $total_code);
+            }
+        }
+        if (isset($namedAttr[ 'loop' ])) {
+            $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['loop']}";
+        }
+        if (isset($namedAttr[ 'total' ])) {
+            $initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}";
+            if ($propType[ 'total' ] > 0) {
+                $propValue[ 'total' ] = "{$sectionVar}->value['total']";
+            }
+        } elseif ($propType[ 'total' ] > 0) {
+            $initLocal[ 'total' ] = $propValue[ 'total' ];
+            $propValue[ 'total' ] = "{$local}total";
+        }
+        $cmpFor[ 'iteration' ] = "{$propValue['iteration']} <= {$propValue['total']}";
+        foreach ($initLocal as $key => $code) {
+            $output .= "{$local}{$key} = {$code};\n";
+        }
+        $_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+        $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
+        $cond_code = "{$propValue['total']} !== 0";
+        if ($propType[ 'total' ] === 0) {
+            if ($propValue[ 'total' ] === 0) {
+                $cond_code = 'false';
+            } else {
+                $cond_code = 'true';
+            }
+        }
+        if ($propType[ 'show' ] > 0) {
+            $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+            $output .= "if ({$local}show) {\n";
+        } elseif ($propValue[ 'show' ] === 'true') {
+            $output .= "if ({$cond_code}) {\n";
+        } else {
+            $output .= "if (false) {\n";
+        }
+        $jinit = join(', ', $initFor);
+        $jcmp = join(', ', $cmpFor);
+        $jinc = join(', ', $incFor);
+        $output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+        if (isset($namedAttr[ 'rownum' ])) {
+            $output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+        }
+        if (isset($namedAttr[ 'index_prev' ])) {
+            $output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+        }
+        if (isset($namedAttr[ 'index_next' ])) {
+            $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+        }
+        if (isset($namedAttr[ 'first' ])) {
+            $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n";
+        }
+        if (isset($namedAttr[ 'last' ])) {
+            $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
+        }
+        $output .= '?>';
         return $output;
-    } 
-} 
+    }
+}
 
 /**
-* Smarty Internal Plugin Compile Sectionelse Class
-*/
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
+ * Smarty Internal Plugin Compile Sectionelse Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {sectionelse} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-        list($_open_tag, $nocache) = $this->_close_tag(array('section'));
-        $this->_open_tag('sectionelse',array('sectionelse', $nocache));
-
-        return "<?php endfor; else: ?>";
-    } 
-} 
+        $_attr = $this->getAttributes($compiler, $args);
+        list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
+        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
+        return "<?php }} else {\n ?>";
+    }
+}
 
 /**
  * Smarty Internal Plugin Compile Sectionclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/section} tag
-     * 
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
-        // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
+        $compiler->loopNesting--;
         // must endblock be nocache?
-        if ($this->compiler->nocache) {
-                 $this->compiler->tag_nocache = true;
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
         }
-
-        list($_open_tag, $this->compiler->nocache) = $this->_close_tag(array('section', 'sectionelse'));
-
-        if ($_open_tag == 'sectionelse')
-            return "<?php endif; ?>";
-        else
-            return "<?php endfor; endif; ?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+        list($openTag, $compiler->nocache, $local, $sectionVar) =
+            $this->closeTag($compiler, array('section', 'sectionelse'));
+        $output = "<?php\n";
+        if ($openTag === 'sectionelse') {
+            $output .= "}\n";
+        } else {
+            $output .= "}\n}\n";
+        }
+        $output .= '?>';
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
new file mode 100644
index 000000000..70e2e2f9f
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Setfilter
+ * Compiles code for setfilter tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Setfilter Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for setfilter tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $compiler->variable_filter_stack[] = $compiler->variable_filters;
+        $compiler->variable_filters = $parameter[ 'modifier_list' ];
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Setfilterclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/setfilter} tag
+     * This tag does not generate compiled output. It resets variable filter.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        // reset variable filter to previous state
+        if (count($compiler->variable_filter_stack)) {
+            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
+        } else {
+            $compiler->variable_filters = array();
+        }
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_shared_inheritance.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_shared_inheritance.php
new file mode 100644
index 000000000..d90262e60
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_shared_inheritance.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance
+ * Shared methods for {extends} and {block} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compile inheritance initialization code as prefix
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
+                                         var_export($initChildSequence, true) . ");\n?>\n";
+    }
+
+    /**
+     * Register post compile callback to compile inheritance initialization code
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
+            $compiler->registerPostCompileCallback(
+                array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+                array($initChildSequence),
+                'inheritanceInit',
+                $initChildSequence
+            );
+            $compiler->_cache[ 'inheritanceInit' ] = true;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_while.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_while.php
index 7e87a2291..5aa3a7330 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_while.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_while.php
@@ -1,82 +1,100 @@
 <?php
 /**
-* Smarty Internal Plugin Compile While
-* 
-* Compiles the {while} tag
-* 
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Compile While
+ * Compiles the {while} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile While Class
-*/
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
+ * Smarty Internal Plugin Compile While Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {while} tag
-    * 
-    * @param array $args array with attributes from parser
-    * @param object $compiler compiler object
-    * @param array $parameter array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {while} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $this->compiler = $compiler;
+        $compiler->loopNesting++;
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-        $this->_open_tag('while', $this->compiler->nocache);
-
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'while', $compiler->nocache);
+        if (!array_key_exists('if condition', $parameter)) {
+            $compiler->trigger_template_error('missing while condition', null, true);
+        }
         // maybe nocache because of nocache variables
-        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
-        if (is_array($parameter['if condition'])) {
-        	if ($this->compiler->nocache) {
-        		$_nocache = ',true';
-            	// create nocache var to make it know for further compiling
-            	if (is_array($parameter['if condition']['var'])) {
-            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-            	} else {
-            		$this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-            	}
-        	} else {
-        		$_nocache = '';
-        	}
-            if (is_array($parameter['if condition']['var'])) {
-            	$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
-	            $_output .= "while (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        if (is_array($parameter[ 'if condition' ])) {
+            if ($compiler->nocache) {
+                // create nocache var to make it know for further compiling
+                if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                    $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                } else {
+                    $var = $parameter[ 'if condition' ][ 'var' ];
+                }
+                $compiler->setNocacheInVariable($var);
+            }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            $assignAttr = array();
+            $assignAttr[][ 'value' ] = $prefixVar;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+                $_output .= $assignCompiler->compile(
+                    $assignAttr,
+                    $compiler,
+                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+                );
             } else {
-	            $_output = "<?php \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});";            
-	            $_output .= "while (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
-	        }
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
+                $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
+            }
             return $_output;
         } else {
-            return "<?php while ({$parameter['if condition']}){?>";
-        } 
-    } 
-} 
+            return "<?php\n while ({$parameter['if condition']}) {?>";
+        }
+    }
+}
 
 /**
-* Smarty Internal Plugin Compile Whileclose Class
-*/
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
+ * Smarty Internal Plugin Compile Whileclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {/while} tag
-    * 
-    * @param array $args array with attributes from parser
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
-    public function compile($args, $compiler)
+     * Compiles code for the {/while} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->compiler = $compiler; 
+        $compiler->loopNesting--;
         // must endblock be nocache?
-        if ($this->compiler->nocache) {
-                 $this->compiler->tag_nocache = true;
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
         }
-        $this->compiler->nocache = $this->_close_tag(array('while'));
-        return "<?php }?>";
-    } 
-} 
-
-?>
\ No newline at end of file
+        $compiler->nocache = $this->closeTag($compiler, array('while'));
+        return "<?php }?>\n";
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compilebase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compilebase.php
index 6418acceb..2a32e4373 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compilebase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compilebase.php
@@ -1,150 +1,203 @@
 <?php
-
 /**
  * Smarty Internal Plugin CompileBase
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * This class does extend all internal compile plugins
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-// abstract class Smarty_Internal_CompileBase implements TagCompilerInterface
-class Smarty_Internal_CompileBase {
-	public $required_attributes = array();
+abstract class Smarty_Internal_CompileBase
+{
+    /**
+     * Array of names of required attribute required by tag
+     *
+     * @var array
+     */
+    public $required_attributes = array();
+
+    /**
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
     public $optional_attributes = array();
+
+    /**
+     * Shorttag attribute order defined by its names
+     *
+     * @var array
+     */
     public $shorttag_order = array();
+
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
     public $option_flags = array('nocache');
 
+    /**
+     * Mapping array for boolean option value
+     *
+     * @var array
+     */
+    public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
+
+    /**
+     * Mapping array with attributes as key
+     *
+     * @var array
+     */
+    public $mapCache = array();
 
     /**
      * This function checks if the attributes passed are valid
-     * 
-     * The attributes passed for the tag to compile are checked against the list of required and 
+     * The attributes passed for the tag to compile are checked against the list of required and
      * optional attributes. Required attributes must be present. Optional attributes are check against
-     * against the corresponding list. The keyword '_any' specifies that any attribute will be accepted 
+     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
      * as valid
-     * 
-     * @param array $attributes attributes applied to the tag
-     * @return array of mapped attributes for further processing
+     *
+     * @param object $compiler   compiler object
+     * @param array  $attributes attributes applied to the tag
+     *
+     * @return array  of mapped attributes for further processing
      */
-    function _get_attributes ($attributes)
+    public function getAttributes($compiler, $attributes)
     {
-        $_indexed_attr = array(); 
-        // loop over attributes
+        $_indexed_attr = array();
+        if (!isset($this->mapCache[ 'option' ])) {
+            $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
+        }
         foreach ($attributes as $key => $mixed) {
             // shorthand ?
             if (!is_array($mixed)) {
                 // option flag ?
-                if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
-                    $_indexed_attr[trim($mixed, '\'"')] = true; 
+                if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
+                    $_indexed_attr[ trim($mixed, '\'"') ] = true;
                     // shorthand attribute ?
-                } else if (isset($this->shorttag_order[$key])) {
-                    $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
+                } elseif (isset($this->shorttag_order[ $key ])) {
+                    $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
                 } else {
                     // too many shorthands
-                    $this->compiler->trigger_template_error('too many shorthand attributes', $this->compiler->lex->taglineno);
-                } 
+                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
+                }
                 // named attribute
             } else {
-                $kv = each($mixed); 
-                // option flag?
-                if (in_array($kv['key'], $this->option_flags)) {
-                    if (is_bool($kv['value'])) {
-                        $_indexed_attr[$kv['key']] = $kv['value'];
-                    } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
-                        if (trim($kv['value']) == 'true') {
-                            $_indexed_attr[$kv['key']] = true;
-                        } else {
-                            $_indexed_attr[$kv['key']] = false;
-                        } 
-                    } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
-                        if ($kv['value'] == 1) {
-                            $_indexed_attr[$kv['key']] = true;
+                foreach ($mixed as $k => $v) {
+                    // option flag?
+                    if (isset($this->mapCache[ 'option' ][ $k ])) {
+                        if (is_bool($v)) {
+                            $_indexed_attr[ $k ] = $v;
                         } else {
-                            $_indexed_attr[$kv['key']] = false;
-                        } 
+                            if (is_string($v)) {
+                                $v = trim($v, '\'" ');
+                            }
+                            if (isset($this->optionMap[ $v ])) {
+                                $_indexed_attr[ $k ] = $this->optionMap[ $v ];
+                            } else {
+                                $compiler->trigger_template_error(
+                                    "illegal value '" . var_export($v, true) .
+                                    "' for option flag '{$k}'",
+                                    null,
+                                    true
+                                );
+                            }
+                        }
+                        // must be named attribute
                     } else {
-                        $this->compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $this->compiler->lex->taglineno);
-                    } 
-                    // must be named attribute
-                } else {
-                	reset($mixed);
-                    $_indexed_attr[key($mixed)] = $mixed[key($mixed)];
-                } 
-            } 
-        } 
+                        $_indexed_attr[ $k ] = $v;
+                    }
+                }
+            }
+        }
         // check if all required attributes present
         foreach ($this->required_attributes as $attr) {
-            if (!array_key_exists($attr, $_indexed_attr)) {
-                $this->compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $this->compiler->lex->taglineno);
-            } 
-        } 
-        // check for unallowed attributes
-        if ($this->optional_attributes != array('_any')) {
-            $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
+            if (!isset($_indexed_attr[ $attr ])) {
+                $compiler->trigger_template_error("missing '{$attr}' attribute", null, true);
+            }
+        }
+        // check for not allowed attributes
+        if ($this->optional_attributes !== array('_any')) {
+            if (!isset($this->mapCache[ 'all' ])) {
+                $this->mapCache[ 'all' ] =
+                    array_fill_keys(
+                        array_merge(
+                            $this->required_attributes,
+                            $this->optional_attributes,
+                            $this->option_flags
+                        ),
+                        true
+                    );
+            }
             foreach ($_indexed_attr as $key => $dummy) {
-                if (!in_array($key, $tmp_array) && $key !== 0) {
-                    $this->compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $this->compiler->lex->taglineno);
-                } 
-            } 
-        } 
+                if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
+                    $compiler->trigger_template_error("unexpected '{$key}' attribute", null, true);
+                }
+            }
+        }
         // default 'false' for all option flags not set
         foreach ($this->option_flags as $flag) {
-            if (!isset($_indexed_attr[$flag])) {
-                $_indexed_attr[$flag] = false;
-            } 
-        } 
-
+            if (!isset($_indexed_attr[ $flag ])) {
+                $_indexed_attr[ $flag ] = false;
+            }
+        }
+        if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
+            $compiler->tag_nocache = true;
+        }
         return $_indexed_attr;
-    } 
+    }
 
     /**
      * Push opening tag name on stack
-     * 
      * Optionally additional data can be saved on stack
-     * 
-     * @param string $open_tag the opening tag's name
-     * @param anytype $data optional data which shall be saved on stack
+     *
+     * @param object $compiler compiler object
+     * @param string $openTag  the opening tag's name
+     * @param mixed  $data     optional data saved
      */
-    function _open_tag($open_tag, $data = null)
+    public function openTag($compiler, $openTag, $data = null)
     {
-        array_push($this->compiler->_tag_stack, array($open_tag, $data));
-    } 
+        array_push($compiler->_tag_stack, array($openTag, $data));
+    }
 
     /**
      * Pop closing tag
-     * 
      * Raise an error if this stack-top doesn't match with expected opening tags
-     * 
-     * @param array $ |string $expected_tag the expected opening tag names
-     * @return anytype the opening tag's name or saved data
+     *
+     * @param object       $compiler    compiler object
+     * @param array|string $expectedTag the expected opening tag names
+     *
+     * @return mixed        any type the opening tag's name or saved data
      */
-    function _close_tag($expected_tag)
+    public function closeTag($compiler, $expectedTag)
     {
-        if (count($this->compiler->_tag_stack) > 0) {
+        if (count($compiler->_tag_stack) > 0) {
             // get stacked info
-            list($_open_tag, $_data) = array_pop($this->compiler->_tag_stack); 
+            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
             // open tag must match with the expected ones
-            if (in_array($_open_tag, (array)$expected_tag)) {
+            if (in_array($_openTag, (array)$expectedTag)) {
                 if (is_null($_data)) {
                     // return opening tag
-                    return $_open_tag;
+                    return $_openTag;
                 } else {
                     // return restored data
                     return $_data;
-                } 
-            } 
+                }
+            }
             // wrong nesting of tags
-            $this->compiler->trigger_template_error("unclosed {" . $_open_tag . "} tag");
+            $compiler->trigger_template_error("unclosed '{$compiler->smarty->left_delimiter}{$_openTag}{$compiler->smarty->right_delimiter}' tag");
             return;
-        } 
+        }
         // wrong nesting of tags
-        $this->compiler->trigger_template_error("unexpected closing tag", $this->compiler->lex->taglineno);
+        $compiler->trigger_template_error('unexpected closing tag', null, true);
         return;
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config.php
deleted file mode 100644
index 06ae70ba9..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config
- * 
- * Main class for config variables
- * 
- * @ignore 
- * @package Smarty
- * @subpackage Config
- * @author Uwe Tews 
- */
-class Smarty_Internal_Config {
-    static $config_objects = array();
-
-    public function __construct($config_resource, $smarty, $data = null)
-    {
-        $this->data = $data;
-        $this->smarty = $smarty;
-        $this->config_resource = $config_resource;
-        $this->config_resource_type = null;
-        $this->config_resource_name = null;
-        $this->config_filepath = null;
-        $this->config_timestamp = null;
-        $this->config_source = null;
-        $this->compiled_config = null;
-        $this->compiled_filepath = null;
-        $this->compiled_timestamp = null;
-        $this->mustCompile = null;
-        $this->compiler_object = null; 
-        // parse config resource name
-        if (!$this->parseConfigResourceName ($config_resource)) {
-            throw new SmartyException ("Unable to parse config resource '{$config_resource}'");
-        } 
-    } 
-
-    public function getConfigFilepath ()
-    {
-        return $this->config_filepath === null ?
-        $this->config_filepath = $this->buildConfigFilepath() :
-        $this->config_filepath;
-    } 
-
-    public function getTimestamp ()
-    {
-        return $this->config_timestamp === null ?
-        $this->config_timestamp = filemtime($this->getConfigFilepath()) :
-        $this->config_timestamp;
-    } 
-
-    private function parseConfigResourceName($config_resource)
-    {
-        if (empty($config_resource))
-            return false;
-        if (strpos($config_resource, ':') === false) {
-            // no resource given, use default
-            $this->config_resource_type = $this->smarty->default_config_type;
-            $this->config_resource_name = $config_resource;
-        } else {
-            // get type and name from path
-            list($this->config_resource_type, $this->config_resource_name) = explode(':', $config_resource, 2);
-            if (strlen($this->config_resource_type) == 1) {
-                // 1 char is not resource type, but part of filepath
-                $this->config_resource_type = $this->smarty->default_config_type;
-                $this->config_resource_name = $config_resource;
-            } else {
-                $this->config_resource_type = strtolower($this->config_resource_type);
-            } 
-        } 
-        return true;
-    } 
-
-    /*
-     * get system filepath to config
-     */
-    public function buildConfigFilepath ()
-    {
-        foreach((array)$this->smarty->config_dir as $_config_dir) {
-            if (strpos('/\\', substr($_config_dir, -1)) === false) {
-                $_config_dir .= DS;
-            } 
-
-            $_filepath = $_config_dir . $this->config_resource_name;
-            if (file_exists($_filepath))
-                return $_filepath;
-        } 
-        // check for absolute path
-        if (file_exists($this->config_resource_name))
-            return $this->config_resource_name; 
-        // no tpl file found
-        throw new SmartyException("Unable to load config file \"{$this->config_resource_name}\"");
-        return false;
-    } 
-    /**
-     * Read config file source
-     * 
-     * @return string content of source file
-     */
-    /**
-     * Returns the template source code
-     * 
-     * The template source is being read by the actual resource handler
-     * 
-     * @return string the template source
-     */
-    public function getConfigSource ()
-    {
-        if ($this->config_source === null) {
-            if ($this->readConfigSource($this) === false) {
-                throw new SmartyException("Unable to load config file \"{$this->config_resource_name}\"");
-            } 
-        } 
-        return $this->config_source;
-    } 
-    public function readConfigSource()
-    { 
-        // read source file
-        if (file_exists($this->getConfigFilepath())) {
-            $this->config_source = file_get_contents($this->getConfigFilepath());
-            return true;
-        } else {
-            return false;
-        } 
-    } 
-
-    /**
-     * Returns the compiled  filepath
-     * 
-     * @return string the compiled filepath
-     */
-    public function getCompiledFilepath ()
-    {
-        return $this->compiled_filepath === null ?
-        ($this->compiled_filepath = $this->buildCompiledFilepath()) :
-        $this->compiled_filepath;
-    } 
-    public function buildCompiledFilepath()
-    {
-        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
-        $_flag = (int)$this->smarty->config_read_hidden + (int)$this->smarty->config_booleanize * 2 +
-        (int)$this->smarty->config_overwrite * 4;
-        $_filepath = sha1($this->config_resource_name . $_flag); 
-        // if use_sub_dirs, break file into directories
-        if ($this->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        } 
-        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        } 
-        $_compile_dir = $this->smarty->compile_dir;
-        if (substr($_compile_dir, -1) != DS) {
-            $_compile_dir .= DS;
-        } 
-        return $_compile_dir . $_filepath . '.' . basename($this->config_resource_name) . '.config' . '.php';
-    } 
-    /**
-     * Returns the timpestamp of the compiled file
-     * 
-     * @return integer the file timestamp
-     */
-    public function getCompiledTimestamp ()
-    {
-        return $this->compiled_timestamp === null ?
-        ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) :
-        $this->compiled_timestamp;
-    } 
-    /**
-     * Returns if the current config file must be compiled 
-     * 
-     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
-     * 
-     * @return boolean true if the file must be compiled
-     */
-    public function mustCompile ()
-    {
-        return $this->mustCompile === null ?
-        $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTimestamp ()):
-        $this->mustCompile;
-    } 
-    /**
-     * Returns the compiled config file 
-     * 
-     * It checks if the config file must be compiled or just read the compiled version
-     * 
-     * @return string the compiled config file
-     */
-    public function getCompiledConfig ()
-    {
-        if ($this->compiled_config === null) {
-            // see if template needs compiling.
-            if ($this->mustCompile()) {
-                $this->compileConfigSource();
-            } else {
-                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
-            } 
-        } 
-        return $this->compiled_config;
-    } 
-
-    /**
-     * Compiles the config files
-     */
-    public function compileConfigSource ()
-    { 
-        // compile template
-        if (!is_object($this->compiler_object)) {
-            // load compiler
-            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
-        } 
-        // compile locking
-        if ($this->smarty->compile_locking) {
-            if ($saved_timestamp = $this->getCompiledTimestamp()) {
-                touch($this->getCompiledFilepath());
-            } 
-        } 
-        // call compiler
-        try {
-            $this->compiler_object->compileSource($this);
-        } 
-        catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && $saved_timestamp) {
-                touch($this->getCompiledFilepath(), $saved_timestamp);
-            } 
-            throw $e;
-        } 
-        // compiling succeded
-        // write compiled template
-        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
-    } 
-
-    /*
-     * load config variables
-    *
-    * @param mixed $sections array of section names, single section or null
-    * @param object $scope global,parent or local
-    */
-    public function loadConfigVars ($sections = null, $scope = 'local')
-    {
-        if ($this->data instanceof Smarty_Internal_Template) {
-            $this->data->properties['file_dependency'][sha1($this->getConfigFilepath())] = array($this->getConfigFilepath(), $this->getTimestamp(),'file');
-        } 
-        if ($this->mustCompile()) {
-            $this->compileConfigSource();
-        }
-        // pointer to scope
-        if ($scope == 'local') {
-        	$scope_ptr = $this->data;
-        } elseif ($scope == 'parent') {
-        	if (isset($this->data->parent)) {
-        		$scope_ptr = $this->data->parent;
-        	} else {
-        		$scope_ptr = $this->data;
-        	}        		
-        } elseif ($scope == 'root' || $scope == 'global') {
-        	$scope_ptr = $this->data;
-        	while (isset($scope_ptr->parent)) {
-        		$scope_ptr = $scope_ptr->parent;
-        	} 
-        }
-        $_config_vars = array();
-        include($this->getCompiledFilepath ());
-        // copy global config vars
-        foreach ($_config_vars['vars'] as $variable => $value) {
-            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                $scope_ptr->config_vars[$variable] = $value;
-            } else {
-                $scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value);
-            } 
-        } 
-        // scan sections
-        foreach ($_config_vars['sections'] as $this_section => $dummy) {
-            if ($sections == null || in_array($this_section, (array)$sections)) {
-                foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
-                    if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                        $scope_ptr->config_vars[$variable] = $value;
-                    } else {
-                        $scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value);
-                    } 
-                } 
-            } 
-        }
-    } 
-} 
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
index e9dfbdb02..a842fa8f3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -1,106 +1,209 @@
 <?php
-
 /**
  * Smarty Internal Plugin Config File Compiler
- * 
  * This is the config file compiler class. It calls the lexer and parser to
  * perform the compiling.
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Config
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
- 
+
 /**
  * Main config file compiler class
+ *
+ * @package    Smarty
+ * @subpackage Config
  */
-class Smarty_Internal_Config_File_Compiler {
+class Smarty_Internal_Config_File_Compiler
+{
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
+
+    /**
+     * Lexer object
+     *
+     * @var object
+     */
+    public $lex;
+
+    /**
+     * Parser object
+     *
+     * @var object
+     */
+    public $parser;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty object
+     */
+    public $smarty;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty_Internal_Template object
+     */
+    public $template;
+
+    /**
+     * Compiled config data sections and variables
+     *
+     * @var array
+     */
+    public $config_data = array();
+
+    /**
+     * compiled config data must always be written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
     /**
      * Initialize compiler
+     *
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
      */
-    public function __construct($smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
-        $this->smarty = $smarty; 
+        $this->smarty = $smarty;
         // get required plugins
-        $this->smarty->loadPlugin('Smarty_Internal_Configfilelexer');
-		$this->smarty->loadPlugin('Smarty_Internal_Configfileparser');
-        $this->config_data['sections'] = array();
-        $this->config_data['vars'] = array();
-    } 
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+        $this->smarty = $smarty;
+        $this->config_data[ 'sections' ] = array();
+        $this->config_data[ 'vars' ] = array();
+    }
 
     /**
-     * Methode to compile a Smarty template
-     * 
-     * @param  $template template object to compile
+     * Method to compile Smarty config source.
+     *
+     * @param Smarty_Internal_Template $template
+     *
      * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyException
      */
-    public function compileSource($config)
+    public function compileTemplate(Smarty_Internal_Template $template)
     {
-        /* here is where the compiling takes place. Smarty
-       tags in the templates are replaces with PHP code,
-       then written to compiled files. */
-        $this->config = $config; 
-        // get config file source
-        $_content = $config->getConfigSource() . "\n"; 
-        // on empty template just return
-        if ($_content == '') {
-            return true;
-        } 
+        $this->template = $template;
+        $this->template->compiled->file_dependency[ $this->template->source->uid ] =
+            array(
+                $this->template->source->filepath,
+                $this->template->source->getTimeStamp(),
+                $this->template->source->type
+            );
+        if ($this->smarty->debugging) {
+            if (!isset($this->smarty->_debug)) {
+                $this->smarty->_debug = new Smarty_Internal_Debug();
+            }
+            $this->smarty->_debug->start_compile($this->template);
+        }
         // init the lexer/parser to compile the config file
-        $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
-        $parser = new Smarty_Internal_Configfileparser($lex, $this);
-        if (isset($this->smarty->_parserdebug)) $parser->PrintTrace(); 
+        /* @var Smarty_Internal_ConfigFileLexer $this ->lex */
+        $this->lex = new $this->lexer_class(
+            str_replace(
+                array(
+                    "\r\n",
+                    "\r"
+                ),
+                "\n",
+                $template->source->getContent()
+            ) . "\n",
+            $this
+        );
+        /* @var Smarty_Internal_ConfigFileParser $this ->parser */
+        $this->parser = new $this->parser_class($this->lex, $this);
+        if (function_exists('mb_internal_encoding')
+            && function_exists('ini_get')
+            && ((int)ini_get('mbstring.func_overload')) & 2
+        ) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+        if ($this->smarty->_parserdebug) {
+            $this->parser->PrintTrace();
+        }
         // get tokens from lexer and parse them
-        while ($lex->yylex()) {
-            if (isset($this->smarty->_parserdebug)) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
-            $parser->doParse($lex->token, $lex->value);
-        } 
+        while ($this->lex->yylex()) {
+            if ($this->smarty->_parserdebug) {
+                echo "<br>Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token {$this->lex->value} Line {$this->lex->line} \n";
+            }
+            $this->parser->doParse($this->lex->token, $this->lex->value);
+        }
         // finish parsing process
-        $parser->doParse(0, 0);
-        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
-    } 
+        $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        // template header code
+        $template_header =
+            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+            "\n";
+        $template_header .= "         compiled from '{$this->template->source->filepath}' */ ?>\n";
+        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
+                var_export($this->config_data, true) . '); ?>';
+        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
+    }
+
     /**
      * display compiler error messages without dying
-     * 
      * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about exspected tokens.
-     * 
+     * In this case the parser is called to obtain information about expected tokens.
      * If parameter $args contains a string this is used as error message
-     * 
-     * @todo output exact position of parse error in source line
-     * @param  $args string individual error message or null
+     *
+     * @param string $args individual error message or null
+     *
+     * @throws SmartyCompilerException
      */
     public function trigger_config_file_error($args = null)
     {
-        $this->lex = Smarty_Internal_Configfilelexer::instance();
-        $this->parser = Smarty_Internal_Configfileparser::instance(); 
-        // get template source line which has error
+        // get config source line which has error
         $line = $this->lex->line;
         if (isset($args)) {
             // $line--;
-        } 
+        }
         $match = preg_split("/\n/", $this->lex->data);
-        $error_text = "Syntax error in config file '{$this->config->getConfigFilepath()}' on line {$line} '{$match[$line-1]}' ";
+        $error_text =
+            "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
         } else {
-            // exspected token from parser
+            // expected token from parser
             foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                $exp_token = $this->parser->yyTokenName[$token];
-                if (isset($this->lex->smarty_token_names[$exp_token])) {
+                $exp_token = $this->parser->yyTokenName[ $token ];
+                if (isset($this->lex->smarty_token_names[ $exp_token ])) {
                     // token type from lexer
-                    $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                    $expect[] = '"' . $this->lex->smarty_token_names[ $exp_token ] . '"';
                 } else {
                     // otherwise internal token name
-                    $expect[] = $this->parser->yyTokenName[$token];
-                } 
-            } 
+                    $expect[] = $this->parser->yyTokenName[ $token ];
+                }
+            }
             // output parser error message
             $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
-        } 
+        }
         throw new SmartyCompilerException($error_text);
-    } 
-} 
-
-?>
\ No newline at end of file
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfilelexer.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
index 9186fe22f..afb3efcb0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
@@ -1,111 +1,278 @@
 <?php
 /**
-* Smarty Internal Plugin Configfilelexer
-*
-* This is the lexer to break the config file source into tokens 
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Configfilelexer
+ *
+ * This is the lexer to break the config file source into tokens
+ *
+ * @package    Smarty
+ * @subpackage Config
+ * @author     Uwe Tews
+ */
+
 /**
-* Smarty Internal Plugin Configfilelexer
-*/
+ * Smarty_Internal_Configfilelexer
+ *
+ * This is the config file lexer.
+ * It is generated from the smarty_internal_configfilelexer.plex file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 class Smarty_Internal_Configfilelexer
 {
-
+    const START              = 1;
+    const VALUE              = 2;
+    const NAKED_STRING_VALUE = 3;
+    const COMMENT            = 4;
+    const SECTION            = 5;
+    const TRIPPLE            = 6;
+
+    /**
+     * Source
+     *
+     * @var string
+     */
     public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
     public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
     public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
     public $value;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
-    private $state = 1;
-    public $smarty_token_names = array (		// Text for parser error messages
-   				);
-    				
-    				
-    function __construct($data, $smarty)
-    {
-        // set instance object
-        self::instance($this); 
+
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(
+        1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'
+    );
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    private $compiler = null;
+
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    private $yy_global_pattern6 = null;
+
+    private $_yy_state          = 1;
+
+    private $_yy_stack          = array();
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    {
         $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
         $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[ 0 ]);
+        }
         $this->line = 1;
-        $this->smarty = $smarty; 
-     }
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
-            $instance = $new_instance;
-        return $instance;
-    } 
-
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
 
+    public function replace($input)
+    {
+        return $input;
+    } // end function
 
-    private $_yy_state = 1;
-    private $_yy_stack = array();
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
 
-    function yylex()
+    public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
     }
 
-    function yypushstate($state)
+    public function yypushstate($state)
     {
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sState push %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%snew State %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
     }
 
-    function yypopstate()
+    public function yypopstate()
     {
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sState pop %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
         $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%snew State %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
     }
 
-    function yybegin($state)
+    public function yybegin($state)
     {
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sState set %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
     }
 
-
-
-
-    function yylex1()
+    public function yylex1()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 =
+                $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(#)|^(\\[)|^(\\])|^(=)|^([ \t\r]+)|^(\n)|^([0-9]*[a-zA-Z_]\\w*)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state START');
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state START');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -118,101 +285,94 @@ function yylex1()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const START = 1;
-    function yy_r1_1($yy_subpatterns)
+    public function yy_r1_1()
     {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-    $this->yypushstate(self::COMMENT);
+        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+        $this->yypushstate(self::COMMENT);
     }
-    function yy_r1_2($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-    $this->yypushstate(self::SECTION);
-    }
-    function yy_r1_3($yy_subpatterns)
+    public function yy_r1_2()
     {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+        $this->yypushstate(self::SECTION);
     }
-    function yy_r1_4($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-    $this->yypushstate(self::VALUE);
-    }
-    function yy_r1_5($yy_subpatterns)
+    public function yy_r1_3()
     {
-
-    return false;
+        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
     }
-    function yy_r1_6($yy_subpatterns)
+
+    public function yy_r1_4()
     {
+        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+        $this->yypushstate(self::VALUE);
+    } // end function
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    }
-    function yy_r1_7($yy_subpatterns)
+    public function yy_r1_5()
     {
+        return false;
+    }
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    public function yy_r1_6()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
     }
 
+    public function yy_r1_7()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    }
 
+    public function yy_r1_8()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+    }
 
-    function yylex2()
+    public function yylex2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 =
+                $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^([ \t\r]+)|^(\\d+\\.\\d+(?=[ \t\r]*[\n#]))|^(\\d+(?=[ \t\r]*[\n#]))|^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#]))|^(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#]))|^(\"\"\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"\"\"(?=[ \t\r]*[\n#]))|^([a-zA-Z]+(?=[ \t\r]*[\n#]))|^([^\n]+?(?=[ \t\r]*\n))|^(\n)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state VALUE');
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -225,115 +385,111 @@ function yylex2()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const VALUE = 2;
-    function yy_r2_1($yy_subpatterns)
+    public function yy_r2_1()
     {
-
-    return false;
+        return false;
     }
-    function yy_r2_2($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-    $this->yypopstate();
-    }
-    function yy_r2_3($yy_subpatterns)
+    public function yy_r2_2()
     {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+        $this->yypopstate();
     }
-    function yy_r2_4($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_5($yy_subpatterns)
+    public function yy_r2_3()
     {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+        $this->yypopstate();
     }
-    function yy_r2_6($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_DOUBLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_7($yy_subpatterns)
+    public function yy_r2_4()
     {
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+        $this->yypushstate(self::TRIPPLE);
+    }
 
-    if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
-        $this->yypopstate();
-        $this->yypushstate(self::NAKED_STRING_VALUE);
-        return true; //reprocess in new state
-    } else {
-        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+    public function yy_r2_5()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
         $this->yypopstate();
     }
-    }
-    function yy_r2_8($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_9($yy_subpatterns)
+    public function yy_r2_6()
     {
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+        $this->yypopstate();
+    } // end function
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->value = "";
-    $this->yypopstate();
+    public function yy_r2_7()
+    {
+        if (!$this->configBooleanize ||
+            !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no'))) {
+            $this->yypopstate();
+            $this->yypushstate(self::NAKED_STRING_VALUE);
+            return true; //reprocess in new state
+        } else {
+            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+            $this->yypopstate();
+        }
     }
 
+    public function yy_r2_8()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
+    }
 
+    public function yy_r2_9()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->value = '';
+        $this->yypopstate();
+    } // end function
 
-    function yylex3()
+    public function yylex3()
     {
-        $tokenMap = array (
-              1 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^([^\n]+?(?=[ \t\r]*\n))/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state NAKED_STRING_VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r3_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -346,63 +502,56 @@ function yylex3()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const NAKED_STRING_VALUE = 3;
-    function yy_r3_1($yy_subpatterns)
+    public function yy_r3_1()
     {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
     }
 
-
-
-    function yylex4()
+    public function yylex4()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^([ \t\r]+)|^([^\n]+?(?=[ \t\r]*\n))|^(\n)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state COMMENT');
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state COMMENT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -415,72 +564,66 @@ function yylex4()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const COMMENT = 4;
-    function yy_r4_1($yy_subpatterns)
+    public function yy_r4_1()
     {
-
-    return false;
+        return false;
     }
-    function yy_r4_2($yy_subpatterns)
-    {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    }
-    function yy_r4_3($yy_subpatterns)
+    public function yy_r4_2()
     {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    } // end function
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    $this->yypopstate();
+    public function yy_r4_3()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        $this->yypopstate();
     }
 
-
-
-    function yylex5()
+    public function yylex5()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(\\.)|^(.*?(?=[\.=[\]\r\n]))/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SECTION');
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state SECTION');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -493,34 +636,104 @@ function yylex5()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const SECTION = 5;
-    function yy_r5_1($yy_subpatterns)
+    public function yy_r5_1()
     {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
     }
-    function yy_r5_2($yy_subpatterns)
+
+    public function yy_r5_2()
     {
+        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+        $this->yypopstate();
+    } // end function
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-    $this->yypopstate();
+    public function yylex6()
+    {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state TRIPPLE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r6_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
     }
 
+    public function yy_r6_1()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+        $this->yypopstate();
+        $this->yypushstate(self::START);
+    }
 
+    public function yy_r6_2()
+    {
+        $to = strlen($this->data);
+        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        } else {
+            $this->compiler->trigger_config_file_error('missing or misspelled literal closing tag');
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+    }
 }
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfileparser.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfileparser.php
index 0b5a57343..36fdb76ee 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfileparser.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_configfileparser.php
@@ -1,77 +1,4 @@
 <?php
-/**
-* Smarty Internal Plugin Configfileparser
-*
-* This is the config file parser.
-* It is generated from the internal.configfileparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-class TPC_yyToken implements ArrayAccess
-{
-    public $string = '';
-    public $metadata = array();
-
-    function __construct($s, $m = array())
-    {
-        if ($s instanceof TPC_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TPC_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    function __toString()
-    {
-        return $this->_string;
-    }
-
-    function offsetExists($offset)
-    {
-        return isset($this->metadata[$offset]);
-    }
-
-    function offsetGet($offset)
-    {
-        return $this->metadata[$offset];
-    }
-
-    function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TPC_yyToken) ?
-                    $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TPC_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[$offset] = $value;
-        }
-    }
-
-    function offsetUnset($offset)
-    {
-        unset($this->metadata[$offset]);
-    }
-}
 
 class TPC_yyStackEntry
 {
@@ -80,284 +7,408 @@ class TPC_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
 
+// line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-#line 12 "smarty_internal_configfileparser.y"
-class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
+/**
+ * Smarty Internal Plugin Configfileparse
+ *
+ * This is the config file parser.
+ * It is generated from the smarty_internal_configfileparser.y file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Configfileparser
 {
-#line 14 "smarty_internal_configfileparser.y"
+    // line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
+    const TPC_OPENB                = 1;
+    const TPC_SECTION              = 2;
+    const TPC_CLOSEB               = 3;
+    const TPC_DOT                  = 4;
+    const TPC_ID                   = 5;
+    const TPC_EQUAL                = 6;
+    const TPC_FLOAT                = 7;
+    const TPC_INT                  = 8;
+    const TPC_BOOL                 = 9;
+    const TPC_SINGLE_QUOTED_STRING = 10;
+    const TPC_DOUBLE_QUOTED_STRING = 11;
+    const TPC_TRIPPLE_QUOTES       = 12;
+    const TPC_TRIPPLE_TEXT         = 13;
+    const TPC_TRIPPLE_QUOTES_END   = 14;
+    const TPC_NAKED_STRING         = 15;
+    const TPC_OTHER                = 16;
+    const TPC_NEWLINE              = 17;
+    const TPC_COMMENTSTART         = 18;
+    const YY_NO_ACTION             = 60;
+    const YY_ACCEPT_ACTION         = 59;
+    const YY_ERROR_ACTION          = 58;
+    const YY_SZ_ACTTAB             = 38;
+    const YY_SHIFT_USE_DFLT        = -8;
+    const YY_SHIFT_MAX             = 19;
+    const YY_REDUCE_USE_DFLT       = -17;
+    const YY_REDUCE_MAX            = 10;
+    const YYNOCODE                 = 29;
+    const YYSTACKDEPTH             = 100;
+    const YYNSTATE                 = 36;
+    const YYNRULE                  = 22;
+    const YYERRORSYMBOL            = 19;
+    const YYERRSYMDT               = 'yy0';
+    const YYFALLBACK               = 0;
+
+    public static $yy_action        = array(
+        32, 31, 30, 29, 35, 13, 19, 3, 24, 26,
+        59, 9, 14, 1, 16, 25, 11, 28, 25, 11,
+        17, 27, 34, 20, 18, 15, 23, 5, 6, 22,
+        10, 8, 4, 12, 2, 33, 7, 21,
+    );
+
+    public static $yy_lookahead     = array(
+        7, 8, 9, 10, 11, 12, 5, 23, 15, 16,
+        20, 21, 2, 23, 4, 17, 18, 14, 17, 18,
+        13, 14, 25, 26, 15, 2, 17, 3, 3, 17,
+        25, 25, 6, 1, 23, 27, 22, 24,
+    );
+
+    public static $yy_shift_ofst    = array(
+        -8, 1, 1, 1, -7, -2, -2, 32, -8, -8,
+        -8, 9, 10, 7, 25, 24, 23, 3, 12, 26,
+    );
+
+    public static $yy_reduce_ofst   = array(
+        -10, -3, -3, -3, 8, 6, 5, 13, 11, 14,
+        -16,
+    );
+
+    public static $yyExpectedTokens = array(
+        array(),
+        array(5, 17, 18,),
+        array(5, 17, 18,),
+        array(5, 17, 18,),
+        array(7, 8, 9, 10, 11, 12, 15, 16,),
+        array(17, 18,),
+        array(17, 18,),
+        array(1,),
+        array(),
+        array(),
+        array(),
+        array(15, 17,),
+        array(2, 4,),
+        array(13, 14,),
+        array(3,),
+        array(3,),
+        array(2,),
+        array(14,),
+        array(17,),
+        array(6,),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+    );
+
+    public static $yy_default       = array(
+        44, 37, 41, 40, 58, 58, 58, 36, 44, 39,
+        44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+        43, 38, 57, 56, 53, 55, 54, 52, 51, 49,
+        48, 47, 46, 45, 42, 50,
+    );
+
+    public static $yyFallback       = array();
 
-    // states whether the parse was successful or not
+    public static $yyRuleName       = array(
+        'start ::= global_vars sections',
+        'global_vars ::= var_list',
+        'sections ::= sections section',
+        'sections ::=',
+        'section ::= OPENB SECTION CLOSEB newline var_list',
+        'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+        'var_list ::= var_list newline',
+        'var_list ::= var_list var',
+        'var_list ::=',
+        'var ::= ID EQUAL value',
+        'value ::= FLOAT',
+        'value ::= INT',
+        'value ::= BOOL',
+        'value ::= SINGLE_QUOTED_STRING',
+        'value ::= DOUBLE_QUOTED_STRING',
+        'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+        'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+        'value ::= NAKED_STRING',
+        'value ::= OTHER',
+        'newline ::= NEWLINE',
+        'newline ::= COMMENTSTART NEWLINE',
+        'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
+    );
+
+    public static $yyRuleInfo       = array(
+        array(0 => 20, 1 => 2),
+        array(0 => 21, 1 => 1),
+        array(0 => 22, 1 => 2),
+        array(0 => 22, 1 => 0),
+        array(0 => 24, 1 => 5),
+        array(0 => 24, 1 => 6),
+        array(0 => 23, 1 => 2),
+        array(0 => 23, 1 => 2),
+        array(0 => 23, 1 => 0),
+        array(0 => 26, 1 => 3),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 3),
+        array(0 => 27, 1 => 2),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 25, 1 => 1),
+        array(0 => 25, 1 => 2),
+        array(0 => 25, 1 => 3),
+    );
+
+    public static $yyReduceMap      = array(
+        0  => 0,
+        2  => 0,
+        3  => 0,
+        19 => 0,
+        20 => 0,
+        21 => 0,
+        1  => 1,
+        4  => 4,
+        5  => 5,
+        6  => 6,
+        7  => 7,
+        8  => 8,
+        9  => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 17,
+    );
+
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array(
+        '\\' => '\\',
+        '\'' => '\''
+    );
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
     public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
     public $retvalue = 0;
-    private $lex;
-    private $internalError = false;
 
-    function __construct($lex, $compiler) {
-        // set instance object
-        self::instance($this); 
-        $this->lex = $lex;
-        $this->smarty = $compiler->smarty; 
-        $this->compiler = $compiler;
-    }
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
-            $instance = $new_instance;
-        return $instance;
-    }
+    /**
+     * @var
+     */
+    public $yymajor;
 
-    private function parse_bool($str) {
-        if (in_array(strtolower($str) ,array('on','yes','true'))) {
-            $res = true;
-        } else {
-            $res = false;
-        }
-        return $res;
-    }
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
 
-    private static $escapes_single = Array('\\' => '\\',
-                                          '\'' => '\'');
-    private static function parse_single_quoted_string($qstr) {
-        $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty      = null;
 
-        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+    public $yyTraceFILE;
 
-        $str = "";
-        foreach ($ss as $s) {
-            if (strlen($s) === 2 && $s[0] === '\\') {
-                if (isset(self::$escapes_single[$s[1]])) {
-                    $s = self::$escapes_single[$s[1]];
-                }
-             }
+    public $yyTracePrompt;
 
-             $str .= $s;
-        }
+    public $yyidx;
 
-        return $str;
-    }
+    public $yyerrcnt;
 
-    private static function parse_double_quoted_string($qstr) {
-        $inner_str = substr($qstr, 1, strlen($qstr)-2);
-        return stripcslashes($inner_str);
-    }
+    public $yystack     = array();
 
-    private static function parse_tripple_double_quoted_string($qstr) {
-        $inner_str = substr($qstr, 3, strlen($qstr)-6);
-        return stripcslashes($inner_str);
-    }
+    public $yyTokenName = array(
+        '$', 'OPENB', 'SECTION', 'CLOSEB',
+        'DOT', 'ID', 'EQUAL', 'FLOAT',
+        'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
+        'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
+        'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
+        'start', 'global_vars', 'sections', 'var_list',
+        'section', 'newline', 'var', 'value',
+    );
 
-    private function set_var(Array $var, Array &$target_array) {
-        $key = $var["key"];
-        $value = $var["value"];
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
+    private $lex;
 
-        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
-            $target_array['vars'][$key] = $value;
-        } else {
-            settype($target_array['vars'][$key], 'array');
-            $target_array['vars'][$key][] = $value;
-        }
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+
+    private $_retvalue;
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
     }
 
-    private function add_global_vars(Array $vars) {
-        if (!isset($this->compiler->config_data['vars'])) {
-	    $this->compiler->config_data['vars'] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data);
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:
+                break;   /* If no destructor action specified: do nothing */
         }
     }
 
-    private function add_section_vars($section_name, Array $vars) {
-        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
-            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[ 0 ] === '\\') {
+                if (isset(self::$escapes_single[ $s[ 1 ] ])) {
+                    $s = self::$escapes_single[ $s[ 1 ] ];
+                }
+            }
+            $str .= $s;
         }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
-        }
-    }
-#line 174 "smarty_internal_configfileparser.php"
-
-    const TPC_OPENB                          =  1;
-    const TPC_SECTION                        =  2;
-    const TPC_CLOSEB                         =  3;
-    const TPC_DOT                            =  4;
-    const TPC_ID                             =  5;
-    const TPC_EQUAL                          =  6;
-    const TPC_FLOAT                          =  7;
-    const TPC_INT                            =  8;
-    const TPC_BOOL                           =  9;
-    const TPC_SINGLE_QUOTED_STRING           = 10;
-    const TPC_DOUBLE_QUOTED_STRING           = 11;
-    const TPC_TRIPPLE_DOUBLE_QUOTED_STRING   = 12;
-    const TPC_NAKED_STRING                   = 13;
-    const TPC_NEWLINE                        = 14;
-    const TPC_COMMENTSTART                   = 15;
-    const YY_NO_ACTION = 54;
-    const YY_ACCEPT_ACTION = 53;
-    const YY_ERROR_ACTION = 52;
-
-    const YY_SZ_ACTTAB = 35;
-static public $yy_action = array(
- /*     0 */    26,   27,   21,   30,   29,   28,   31,   16,   53,    8,
- /*    10 */    19,    2,   20,   11,   24,   23,   20,   11,   17,   15,
- /*    20 */     3,   14,   13,   18,    4,    6,    5,    1,   12,   22,
- /*    30 */     9,   47,   10,   25,    7,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     7,    8,    9,   10,   11,   12,   13,    5,   17,   18,
- /*    10 */    14,   20,   14,   15,   22,   23,   14,   15,    2,    2,
- /*    20 */    20,    4,   13,   14,    6,    3,    3,   20,    1,   24,
- /*    30 */    22,   25,   22,   21,   19,
-);
-    const YY_SHIFT_USE_DFLT = -8;
-    const YY_SHIFT_MAX = 17;
-    static public $yy_shift_ofst = array(
- /*     0 */    -8,    2,    2,    2,   -7,   -2,   -2,   27,   -8,   -8,
- /*    10 */    -8,    9,   17,   -4,   16,   23,   18,   22,
-);
-    const YY_REDUCE_USE_DFLT = -10;
-    const YY_REDUCE_MAX = 10;
-    static public $yy_reduce_ofst = array(
- /*     0 */    -9,   -8,   -8,   -8,    5,   10,    8,   12,   15,    0,
- /*    10 */     7,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(),
-        /* 1 */ array(5, 14, 15, ),
-        /* 2 */ array(5, 14, 15, ),
-        /* 3 */ array(5, 14, 15, ),
-        /* 4 */ array(7, 8, 9, 10, 11, 12, 13, ),
-        /* 5 */ array(14, 15, ),
-        /* 6 */ array(14, 15, ),
-        /* 7 */ array(1, ),
-        /* 8 */ array(),
-        /* 9 */ array(),
-        /* 10 */ array(),
-        /* 11 */ array(13, 14, ),
-        /* 12 */ array(2, 4, ),
-        /* 13 */ array(14, ),
-        /* 14 */ array(2, ),
-        /* 15 */ array(3, ),
-        /* 16 */ array(6, ),
-        /* 17 */ array(3, ),
-        /* 18 */ array(),
-        /* 19 */ array(),
-        /* 20 */ array(),
-        /* 21 */ array(),
-        /* 22 */ array(),
-        /* 23 */ array(),
-        /* 24 */ array(),
-        /* 25 */ array(),
-        /* 26 */ array(),
-        /* 27 */ array(),
-        /* 28 */ array(),
-        /* 29 */ array(),
-        /* 30 */ array(),
-        /* 31 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */    40,   36,   33,   37,   52,   52,   52,   32,   35,   40,
- /*    10 */    40,   52,   52,   52,   52,   52,   52,   52,   50,   51,
- /*    20 */    49,   44,   41,   39,   38,   34,   42,   43,   47,   46,
- /*    30 */    45,   48,
-);
-    const YYNOCODE = 26;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 32;
-    const YYNRULE = 20;
-    const YYERRORSYMBOL = 16;
-    const YYERRSYMDT = 'yy0';
-    const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
+        return $str;
+    }                    /* Index of top element in stack */
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }                 /* Shifts left before out of the error */
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }  /* The parser's stack */
+    public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
             $zTracePrompt = 0;
         } elseif (!$zTracePrompt) {
             $TraceFILE = 0;
         }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
     }
 
-    static function PrintTrace()
+    public function PrintTrace()
     {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
     }
 
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array( 
-  '$',             'OPENB',         'SECTION',       'CLOSEB',      
-  'DOT',           'ID',            'EQUAL',         'FLOAT',       
-  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
-  'TRIPPLE_DOUBLE_QUOTED_STRING',  'NAKED_STRING',  'NEWLINE',       'COMMENTSTART',
-  'error',         'start',         'global_vars',   'sections',    
-  'var_list',      'section',       'newline',       'var',         
-  'value',       
-    );
-
-    static public $yyRuleName = array(
- /*   0 */ "start ::= global_vars sections",
- /*   1 */ "global_vars ::= var_list",
- /*   2 */ "sections ::= sections section",
- /*   3 */ "sections ::=",
- /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
- /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
- /*   6 */ "var_list ::= var_list newline",
- /*   7 */ "var_list ::= var_list var",
- /*   8 */ "var_list ::=",
- /*   9 */ "var ::= ID EQUAL value",
- /*  10 */ "value ::= FLOAT",
- /*  11 */ "value ::= INT",
- /*  12 */ "value ::= BOOL",
- /*  13 */ "value ::= SINGLE_QUOTED_STRING",
- /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
- /*  15 */ "value ::= TRIPPLE_DOUBLE_QUOTED_STRING",
- /*  16 */ "value ::= NAKED_STRING",
- /*  17 */ "newline ::= NEWLINE",
- /*  18 */ "newline ::= COMMENTSTART NEWLINE",
- /*  19 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-    );
-
-    function tokenName($tokenType)
+    public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
         }
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
+            return $this->yyTokenName[ $tokenType ];
         } else {
-            return "Unknown";
-        }
-    }
-
-    static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
+            return 'Unknown';
         }
     }
 
-    function yy_pop_parser_stack()
+    public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite(
+                $this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
+                "\n"
+            );
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
@@ -365,22 +416,30 @@ function yy_pop_parser_stack()
         return $yymajor;
     }
 
-    function __destruct()
+    public function __destruct()
     {
-        while ($this->yystack !== Array()) {
+        while ($this->yystack !== array()) {
             $this->yy_pop_parser_stack();
         }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
         }
     }
 
-    function yy_get_expected_tokens($token)
+    public function yy_get_expected_tokens($token)
     {
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        $expected = self::$yyExpectedTokens[ $state ];
+        if (isset($res3[ $state ][ $token ])) {
+            if ($res3[ $state ][ $token ]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -390,7 +449,7 @@ function yy_get_expected_tokens($token)
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done++ === 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -398,17 +457,26 @@ function yy_get_expected_tokens($token)
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return array_unique($expected);
+                        $this->yystack[ $this->yyidx ]->stateno,
+                        self::$yyRuleInfo[ $yyruleno ][ 0 ]
+                    );
+                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+                        if (isset($res4[ $nextstate ][ $token ])) {
+                            if ($res4[ $nextstate ][ $token ]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[ $nextstate ][ $token ] =
+                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
@@ -416,10 +484,10 @@ function yy_get_expected_tokens($token)
                         $this->yyidx++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
                         continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // the last token was just ignored, we can't accept
@@ -438,19 +506,27 @@ function yy_get_expected_tokens($token)
             }
             break;
         } while (true);
-	$this->yyidx = $yyidx;
-	$this->yystack = $stack;
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
         return array_unique($expected);
     }
 
-    function yy_is_expected_token($token)
+    public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        if (isset($res[ $state ][ $token ])) {
+            if ($res[ $state ][ $token ]) {
+                return true;
+            }
+        } else {
+            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -460,7 +536,7 @@ function yy_is_expected_token($token)
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done++ === 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -468,25 +544,35 @@ function yy_is_expected_token($token)
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
+                        $this->yystack[ $this->yyidx ]->stateno,
+                        self::$yyRuleInfo[ $yyruleno ][ 0 ]
+                    );
+                    if (isset($res2[ $nextstate ][ $token ])) {
+                        if ($res2[ $nextstate ][ $token ]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[ $nextstate ][ $token ] =
+                            (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+                             in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
                         $this->yyidx++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
                         continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         if (!$token) {
@@ -514,273 +600,288 @@ function yy_is_expected_token($token)
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-     
+        $stateno = $this->yystack[ $this->yyidx ]->stateno;
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
+        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
             // no shift actions
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
-        $i = self::$yy_shift_ofst[$stateno];
+        $i = self::$yy_shift_ofst[ $stateno ];
         if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
-        if ($iLookAhead == self::YYNOCODE) {
+        if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
+            self::$yy_lookahead[ $i ] != $iLookAhead) {
             if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+                && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                                               $this->yyTokenName[ $iLookAhead ] . ' => ' .
+                                               $this->yyTokenName[ $iFallback ] . "\n");
                 }
                 return $this->yy_find_shift_action($iFallback);
             }
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         } else {
-            return self::$yy_action[$i];
+            return self::$yy_action[ $i ];
         }
     }
 
-    function yy_find_reduce_action($stateno, $iLookAhead)
+    public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
+        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+            return self::$yy_default[ $stateno ];
         }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
+        $i = self::$yy_reduce_ofst[ $stateno ];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[ $stateno ];
         }
-        if ($iLookAhead == self::YYNOCODE) {
+        if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
+            self::$yy_lookahead[ $i ] != $iLookAhead) {
+            return self::$yy_default[ $stateno ];
         } else {
-            return self::$yy_action[$i];
+            return self::$yy_action[ $i ];
         }
     }
 
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
         $this->yyidx++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
             $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 126 "smarty_internal_configfileparser.y"
-
-    $this->internalError = true;
-    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-#line 585 "smarty_internal_configfileparser.php"
+            // line 239 "../smarty/lexer/smarty_internal_configfileparser.y"
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
             return;
         }
         $yytos = new TPC_yyStackEntry;
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sShift %d\n",
+                $this->yyTracePrompt,
+                $yyNewState
+            );
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf(
+                    $this->yyTraceFILE,
+                    " %s",
+                    $this->yyTokenName[ $this->yystack[ $i ]->major ]
+                );
             }
-            fwrite(self::$yyTraceFILE,"\n");
-        }
-    }
-
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 17, 'rhs' => 2 ),
-  array( 'lhs' => 18, 'rhs' => 1 ),
-  array( 'lhs' => 19, 'rhs' => 2 ),
-  array( 'lhs' => 19, 'rhs' => 0 ),
-  array( 'lhs' => 21, 'rhs' => 5 ),
-  array( 'lhs' => 21, 'rhs' => 6 ),
-  array( 'lhs' => 20, 'rhs' => 2 ),
-  array( 'lhs' => 20, 'rhs' => 2 ),
-  array( 'lhs' => 20, 'rhs' => 0 ),
-  array( 'lhs' => 23, 'rhs' => 3 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 24, 'rhs' => 1 ),
-  array( 'lhs' => 22, 'rhs' => 1 ),
-  array( 'lhs' => 22, 'rhs' => 2 ),
-  array( 'lhs' => 22, 'rhs' => 3 ),
-    );
+            fwrite($this->yyTraceFILE, "\n");
+        }
+    }
 
-    static public $yyReduceMap = array(
-        0 => 0,
-        2 => 0,
-        3 => 0,
-        17 => 0,
-        18 => 0,
-        19 => 0,
-        1 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-    );
-#line 132 "smarty_internal_configfileparser.y"
-    function yy_r0(){ $this->_retvalue = null;     }
-#line 652 "smarty_internal_configfileparser.php"
-#line 135 "smarty_internal_configfileparser.y"
-    function yy_r1(){ $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;     }
-#line 655 "smarty_internal_configfileparser.php"
-#line 141 "smarty_internal_configfileparser.y"
-    function yy_r4(){ $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;     }
-#line 658 "smarty_internal_configfileparser.php"
-#line 142 "smarty_internal_configfileparser.y"
-    function yy_r5(){ if ($this->smarty->config_read_hidden) { $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); } $this->_retvalue = null;     }
-#line 661 "smarty_internal_configfileparser.php"
-#line 145 "smarty_internal_configfileparser.y"
-    function yy_r6(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
-#line 664 "smarty_internal_configfileparser.php"
-#line 146 "smarty_internal_configfileparser.y"
-    function yy_r7(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));     }
-#line 667 "smarty_internal_configfileparser.php"
-#line 147 "smarty_internal_configfileparser.y"
-    function yy_r8(){ $this->_retvalue = Array();     }
-#line 670 "smarty_internal_configfileparser.php"
-#line 151 "smarty_internal_configfileparser.y"
-    function yy_r9(){ $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);     }
-#line 673 "smarty_internal_configfileparser.php"
-#line 153 "smarty_internal_configfileparser.y"
-    function yy_r10(){ $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;     }
-#line 676 "smarty_internal_configfileparser.php"
-#line 154 "smarty_internal_configfileparser.y"
-    function yy_r11(){ $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;     }
-#line 679 "smarty_internal_configfileparser.php"
-#line 155 "smarty_internal_configfileparser.y"
-    function yy_r12(){ $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);     }
-#line 682 "smarty_internal_configfileparser.php"
-#line 156 "smarty_internal_configfileparser.y"
-    function yy_r13(){ $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);     }
-#line 685 "smarty_internal_configfileparser.php"
-#line 157 "smarty_internal_configfileparser.y"
-    function yy_r14(){ $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);     }
-#line 688 "smarty_internal_configfileparser.php"
-#line 158 "smarty_internal_configfileparser.y"
-    function yy_r15(){ $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);     }
-#line 691 "smarty_internal_configfileparser.php"
-#line 159 "smarty_internal_configfileparser.y"
-    function yy_r16(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 694 "smarty_internal_configfileparser.php"
+    public function yy_r0()
+    {
+        $this->_retvalue = null;
+    }
 
-    private $_retvalue;
+    public function yy_r1()
+    {
+        $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = null;
+    }
+
+    public function yy_r4()
+    {
+        $this->add_section_vars($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = null;
+    }
 
-    function yy_reduce($yyruleno)
+    // line 245 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r5()
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0 
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
+        if ($this->configReadHidden) {
+            $this->add_section_vars(
+                $this->yystack[ $this->yyidx + -3 ]->minor,
+                $this->yystack[ $this->yyidx + 0 ]->minor
+            );
         }
+        $this->_retvalue = null;
+    }
+
+    // line 250 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r6()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 264 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r7()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + -1 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 269 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r8()
+    {
+        $this->_retvalue = array();
+    }
 
+    // line 277 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r9()
+    {
+        $this->_retvalue =
+            array(
+                'key'   => $this->yystack[ $this->yyidx + -2 ]->minor,
+                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+    }
+
+    // line 281 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r10()
+    {
+        $this->_retvalue = (float)$this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r11()
+    {
+        $this->_retvalue = (int)$this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 291 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r12()
+    {
+        $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 296 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r13()
+    {
+        $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 300 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r14()
+    {
+        $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 304 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r15()
+    {
+        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + -1 ]->minor);
+    }
+
+    // line 308 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r16()
+    {
+        $this->_retvalue = '';
+    }
+
+    // line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r17()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+            && $yyruleno < count(self::$yyRuleName)) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt,
+                $yyruleno,
+                self::$yyRuleName[ $yyruleno ]
+            );
+        }
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[ $yyruleno ])) {
             // call the action
             $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
         $this->yyidx -= $yysize;
-        for($i = $yysize; $i; $i--) {
+        for ($i = $yysize; $i; $i--) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
+            if (!$this->yyTraceFILE && $yysize) {
                 $this->yyidx++;
                 $x = new TPC_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
                 $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
+                $this->yystack[ $this->yyidx ] = $x;
             } else {
                 $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
             }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
             $this->yy_accept();
         }
     }
 
-    function yy_parse_failed()
+    // line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
-    function yy_syntax_error($yymajor, $TOKEN)
+    // line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 119 "smarty_internal_configfileparser.y"
-
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_config_file_error();
-#line 757 "smarty_internal_configfileparser.php"
+        // line 232 "../smarty/lexer/smarty_internal_configfileparser.y"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_config_file_error();
     }
 
-    function yy_accept()
+    public function yy_accept()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-#line 111 "smarty_internal_configfileparser.y"
-
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 775 "smarty_internal_configfileparser.php"
+        // line 225 "../smarty/lexer/smarty_internal_configfileparser.y"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
     }
 
-    function doParse($yymajor, $yytokenvalue)
+    public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-        
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
             $this->yyerrcnt = -1;
@@ -788,19 +889,21 @@ function doParse($yymajor, $yytokenvalue)
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor==0);
-        
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        $yyendofinput = ($yymajor == 0);
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sInput %s\n",
+                $this->yyTracePrompt,
+                $this->yyTokenName[ $yymajor ]
+            );
         }
-        
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
             if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
+                !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -814,35 +917,42 @@ function doParse($yymajor, $yytokenvalue)
                 }
             } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf(
+                        $this->yyTraceFILE,
+                        "%sSyntax Error!\n",
+                        $this->yyTracePrompt
+                    );
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf(
+                                $this->yyTraceFILE,
+                                "%sDiscard input token %s\n",
+                                $this->yyTracePrompt,
+                                $this->yyTokenName[ $yymajor ]
+                            );
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
                         while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
+                               $yymx !== self::YYERRORSYMBOL &&
+                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                        ) {
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor==0) {
+                        if ($this->yyidx < 0 || $yymajor == 0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
                             $u2 = 0;
                             $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
                         }
@@ -863,8 +973,74 @@ function doParse($yymajor, $yytokenvalue)
             } else {
                 $this->yy_accept();
                 $yymajor = self::YYNOCODE;
-            }            
-        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var[ 'key' ];
+        $value = $var[ 'value' ];
+        if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
+            $target_array[ 'vars' ][ $key ] = $value;
+        } else {
+            settype($target_array[ 'vars' ][ $key ], 'array');
+            $target_array[ 'vars' ][ $key ][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data[ 'vars' ])) {
+            $this->compiler->config_data[ 'vars' ] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
+            $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
+        }
     }
 }
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
index 609376ecb..98e3e57b3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
@@ -1,479 +1,292 @@
 <?php
-
 /**
  * Smarty Internal Plugin Data
- * 
- * This file contains the basic classes and methodes for template and variable creation
- * 
- * @package Smarty
- * @subpackage Templates
- * @author Uwe Tews 
+ * This file contains the basic classes and methods for template and variable creation
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
  */
 
 /**
- * Base class with template and variable methodes
+ * Base class with template and variable methods
+ *
+ * @package    Smarty
+ * @subpackage Template
+ *
+ * @property int    $scope
+ * @property Smarty $smarty
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method mixed _getConfigVariable(string $varName, bool $errorEnable = true)
+ * @method mixed getConfigVariable(string $varName, bool $errorEnable = true)
+ * @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
+ * @method mixed getGlobal(string $varName = null)
+ * @method mixed getStreamVariable(string $variable)
+ * @method Smarty_Internal_Data clearAssign(mixed $tpl_var)
+ * @method Smarty_Internal_Data clearAllAssign()
+ * @method Smarty_Internal_Data clearConfig(string $varName = null)
+ * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
  */
-class Smarty_Internal_Data {
-    // class used for templates
+abstract class Smarty_Internal_Data
+{
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 4;
+
+    /**
+     * name of class used for templates
+     *
+     * @var string
+     */
     public $template_class = 'Smarty_Internal_Template';
 
     /**
-     * assigns a Smarty variable
-     * 
-     * @param array $ |string $tpl_var the template variable name(s)
-     * @param mixed $value the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param boolean $scope the scope the variable will have  (local,parent or root)
+     * template variables
+     *
+     * @var Smarty_Variable[]
      */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
-                } 
-            } 
-        } else {
-            if ($tpl_var != '') {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
-            } 
-        } 
-    } 
+    public $tpl_vars = array();
+
     /**
-     * assigns a global Smarty variable
-     * 
-     * @param string $varname the global variable name
-     * @param mixed $value the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
+     * parent template (if any)
+     *
+     * @var Smarty|Smarty_Internal_Template|Smarty_Data
      */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-        } 
-    } 
+    public $parent = null;
+
     /**
-     * assigns values to template variables by reference
-     * 
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
+     * configuration settings
+     *
+     * @var string[]
      */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        if ($tpl_var != '') {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-            $this->tpl_vars[$tpl_var]->value = &$value;
-        } 
-    } 
+    public $config_vars = array();
+
+    /**
+     * extension handler
+     *
+     * @var Smarty_Internal_Extension_Handler
+     */
+    public $ext = null;
 
     /**
-     * wrapper function for Smarty 2 BC
-     * 
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to assign
+     * Smarty_Internal_Data constructor.
+     *
+     * Install extension handler
      */
-    public function assign_by_ref($tpl_var, &$value)
+    public function __construct()
     {
-       	if($this->smarty->deprecation_notices)
-        	trigger_error("function call 'assign_by_ref' is unknown or deprecated, use 'assignByRef'", E_USER_NOTICE);
-        $this->assignByRef($tpl_var, $value);
-    } 
+        $this->ext = new Smarty_Internal_Extension_Handler();
+        $this->ext->objType = $this->_objType;
+    }
+
     /**
-     * appends values to template variables
-     * 
-     * @param array $ |string $tpl_var the template variable name(s)
-     * @param mixed $value the value to append
-     * @param boolean $merge flag if array elements shall be merged
-     * @param boolean $nocache if true any output of this variable will be not cached
+     * assigns a Smarty variable
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to assign
+     * @param boolean      $nocache if true any output of this variable will be not cached
+     *
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+     *                              chaining
      */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+    public function assign($tpl_var, $value = null, $nocache = false)
     {
         if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
             foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    if (!isset($this->tpl_vars[$_key])) {
-                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
-                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
-                        } else {
-                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
-                        } 
-                    } 
-                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-                        settype($this->tpl_vars[$_key]->value, 'array');
-                    } 
-                    if ($merge && is_array($_val)) {
-                        foreach($_val as $_mkey => $_mval) {
-                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-                        } 
-                    } else {
-                        $this->tpl_vars[$_key]->value[] = $_val;
-                    } 
-                } 
-            } 
+                $this->assign($_key, $_val, $nocache);
+            }
         } else {
-            if ($tpl_var != '' && isset($value)) {
-                if (!isset($this->tpl_vars[$tpl_var])) {
-                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-                    } else {
-                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                    } 
-                } 
-                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                    settype($this->tpl_vars[$tpl_var]->value, 'array');
-                } 
-                if ($merge && is_array($value)) {
-                    foreach($value as $_mkey => $_mval) {
-                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-                    } 
+            if ($tpl_var !== '') {
+                if ($this->_objType === 2) {
+                    /**
+                     *
+                     *
+                     * @var Smarty_Internal_Template $this
+                     */
+                    $this->_assignInScope($tpl_var, $value, $nocache);
                 } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
-                } 
-            } 
-        } 
-    } 
+                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+                }
+            }
+        }
+        return $this;
+    }
 
     /**
-     * appends values to template variables by reference
-     * 
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to append
-     * @param boolean $merge flag if array elements shall be merged
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if (!isset($this->tpl_vars[$tpl_var])) {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable();
-            } 
-            if (!@is_array($this->tpl_vars[$tpl_var]->value)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            } 
-            if ($merge && is_array($value)) {
-                foreach($value as $_key => $_val) {
-                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
-                } 
-            } else {
-                $this->tpl_vars[$tpl_var]->value[] = &$value;
-            } 
-        } 
-    } 
- 
-     /**
-     * 
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to append
-     * @param boolean $merge flag if array elements shall be merged
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to append
+     * @param bool         $merge   flag if array elements shall be merged
+     * @param bool         $nocache if true any output of this variable will
+     *                              be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
     {
-       	if($this->smarty->deprecation_notices)
-        	trigger_error("function call 'append_by_ref' is unknown or deprecated, use 'appendByRef'", E_USER_NOTICE);
-        $this->appendByRef($tpl_var, $value, $merge);
-    } 
+        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
+    }
+
     /**
-     * Returns a single or all template variables
-     * 
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
+     * assigns a global Smarty variable
+     *
+     * @param string  $varName the global variable name
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
+    public function assignGlobal($varName, $value = null, $nocache = false)
     {
-        if (isset($varname)) {
-            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            } 
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $this;
-            } while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                } 
-                // not found, try at parent
-                if ($search_parents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                } 
-            } 
-            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                } 
-            } 
-            return $_result;
-        } 
-    } 
+        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
+    }
 
     /**
-     * clear the given assigned template variable.
-     * 
-     * @param string $ |array $tpl_var the template variable(s) to clear
+     * appends values to template variables by reference
+     *
+     * @param string  $tpl_var the template variable name
+     * @param mixed   &$value  the referenced value to append
+     * @param boolean $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function clearAssign($tpl_var)
+    public function appendByRef($tpl_var, &$value, $merge = false)
     {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            } 
-        } else {
-            unset($this->tpl_vars[$tpl_var]);
-        } 
-    } 
+        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
+    }
 
     /**
-     * clear all the assigned template variables.
+     * assigns values to template variables by reference
+     *
+     * @param string  $tpl_var the template variable name
+     * @param         $value
+     * @param boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function clearAllAssign()
+    public function assignByRef($tpl_var, &$value, $nocache = false)
     {
-        $this->tpl_vars = array();
-    } 
+        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
+    }
 
     /**
-     * load a config file, optionally load just selected sections
-     * 
-     * @param string $config_file filename
-     * @param mixed $sections array of section names, single section or null
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param string                                                  $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param bool                                                    $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
      */
-    public function configLoad($config_file, $sections = null)
-    { 
-        // load Config class
-        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
-        $config->loadConfigVars($sections);
-    } 
+    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+    {
+        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
+    }
 
     /**
      * gets the object of a Smarty variable
-     * 
-     * @param string $variable the name of the Smarty variable
-     * @param object $_ptr optional pointer to data object
-     * @param boolean $search_parents search also in parent data
-     * @return object the object of the variable
+     *
+     * @param string               $variable      the name of the Smarty variable
+     * @param Smarty_Internal_Data $_ptr          optional pointer to data object
+     * @param boolean              $searchParents search also in parent data
+     * @param bool                 $error_enable
+     *
+     * @return     Smarty_Variable|Smarty_Undefined_Variable the object of the variable
+     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
      */
-    public function getVariable($_variable, $_ptr = null, $search_parents = true, $error_enable = true)
-    {
-        if ($_ptr === null) {
-            $_ptr = $this;
-        } while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[$_variable])) {
-                // found it, return it
-                return $_ptr->tpl_vars[$_variable];
-            } 
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            } 
-        } 
-        if (isset(Smarty::$global_tpl_vars[$_variable])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[$_variable];
-        } 
-        if ($this->smarty->error_unassigned && $error_enable) {
-            throw new SmartyException('Undefined Smarty variable "' . $_variable . '"');
-        } else {
-        	if ($error_enable) {
-				// force a notice
-				$x = $$_variable;
-        	}
-            return new Undefined_Smarty_Variable;
-        } 
-    } 
+    public function getVariable(
+        $variable = null,
+        Smarty_Internal_Data $_ptr = null,
+        $searchParents = true,
+        $error_enable = true
+    ) {
+        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
+    }
+
     /**
-     * gets  a config variable
-     * 
-     * @param string $variable the name of the config variable
-     * @return mixed the value of the config variable
+     * Follow the parent chain an merge template and config variables
+     *
+     * @param \Smarty_Internal_Data|null $data
      */
-    public function getConfigVariable($_variable)
+    public function _mergeVars(Smarty_Internal_Data $data = null)
     {
-        $_ptr = $this;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[$_variable])) {
-                // found it, return it
-                return $_ptr->config_vars[$_variable];
-            } 
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        } 
-        if ($this->smarty->error_unassigned) {
-            throw new SmartyException('Undefined config variable "' . $_variable . '"');
+        if (isset($data)) {
+            if (!empty($this->tpl_vars)) {
+                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
+            }
+            if (!empty($this->config_vars)) {
+                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
+            }
         } else {
-			// force a notice
-			$x = $$_variable;
-            return null;
-        } 
-    } 
+            $data = $this;
+        }
+        if (isset($this->parent)) {
+            $this->parent->_mergeVars($data);
+        }
+    }
 
     /**
-     * gets  a stream variable
-     * 
-     * @param string $variable the stream of the variable
-     * @return mixed the value of the stream variable
+     * Return true if this instance is a Data obj
+     *
+     * @return bool
      */
-    public function getStreamVariable($variable)
+    public function _isDataObj()
     {
-        $_result = '';
-        if ($fp = fopen($variable, 'r+')) {
-            while (!feof($fp)) {
-                $_result .= fgets($fp);
-            } 
-            fclose($fp);
-            return $_result;
-        } 
-
-        if ($this->smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
-        } else {
-            return null;
-        } 
-    } 
+        return $this->_objType === 4;
+    }
 
     /**
-     * Returns a single or all config variables
-     * 
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
+     * Return true if this instance is a template obj
+     *
+     * @return bool
      */
-    function getConfigVars($varname = null, $search_parents = true)
+    public function _isTplObj()
     {
- //   	var_dump($this);
-        $_ptr = $this;
-        $var_array = array();
-        while ($_ptr !== null) {
-        	if (isset($varname)) {
-            	if (isset($_ptr->config_vars[$varname])) {
-                	return $_ptr->config_vars[$varname];
-                }
-            } else {
-            	$var_array = array_merge($_ptr->config_vars, $var_array);
-        	} 
-             // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            } 
-    	} 
-        if (isset($varname)) {
-    		return '';
-        } else {
-            return $var_array;
-        } 
-    } 
+        return $this->_objType === 2;
+    }
 
     /**
-     * Deassigns a single or all config variables
-     * 
-     * @param string $varname variable name or null
+     * Return true if this instance is a Smarty obj
+     *
+     * @return bool
      */
-    function clearConfig($varname = null)
+    public function _isSmartyObj()
     {
-        if (isset($varname)) {
-            unset($this->config_vars[$varname]);
-            return;
-        } else {
-            $this->config_vars = array();
-            return;
-        } 
-    } 
-
-} 
+        return $this->_objType === 1;
+    }
 
-/**
- * class for the Smarty data object
- * 
- * The Smarty data object will hold Smarty variables in the current scope
- * 
- * @param object $parent tpl_vars next higher level of Smarty variables
- */
-class Smarty_Data extends Smarty_Internal_Data {
-    // array of variable objects
-    public $tpl_vars = array(); 
-    // back pointer to parent object
-    public $parent = null; 
-    // config vars
-    public $config_vars = array(); 
-    // Smarty object
-    public $smarty = null;
     /**
-     * create Smarty data object
+     * Get Smarty object
+     *
+     * @return Smarty
      */
-    public function __construct ($_parent = null, $smarty = null)
+    public function _getSmartyObj()
     {
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[$_key] = new Smarty_variable($_val);
-            } 
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
-        } 
-    } 
-} 
-/**
- * class for the Smarty variable object
- * 
- * This class defines the Smarty variable object
- */
-class Smarty_Variable {
-    // template variable
-    public $value;
-    public $nocache;
-    public $scope;
+        return $this->smarty;
+    }
+
     /**
-     * create Smarty variable object
-     * 
-     * @param mixed $value the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param boolean $scope the scope the variable will have  (local,parent or root)
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
      */
-    public function __construct ($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    } 
-
-    public function __toString ()
+    public function __call($name, $args)
     {
-        return $this->value;
-    } 
-} 
-
-/**
- * class for undefined variable object
- * 
- * This class defines an object for undefined variable handling
- */
-class Undefined_Smarty_Variable {
-    // return always false
-    public function __get ($name)
-    {
-        if ($name == 'nocache') {
-            return false;
-        } else {
-            return null;
-        } 
-    } 
-} 
-
-?>
\ No newline at end of file
+        return $this->ext->_callExternalMethod($this, $name, $args);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
index 0fd22a6a6..24b233e26 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
@@ -1,170 +1,425 @@
 <?php
-
 /**
-* Smarty Internal Plugin Debug
-*
-* Class to collect data for the Smarty Debugging Consol
-*
-* @package Smarty
-* @subpackage Debug
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Debug
+ * Class to collect data for the Smarty Debugging Console
+ *
+ * @package    Smarty
+ * @subpackage Debug
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Debug Class
-*/
-class Smarty_Internal_Debug extends Smarty_Internal_Data {
-	// template data
-	static $template_data = array();
-
-	/**
-	* Start logging of compile time
-	*/
-	public static function start_compile($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['start_time'] = microtime(true);
-	}
-
-	/**
-	* End logging of compile time
-	*/
-	public static function end_compile($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-	}
-
-	/**
-	* Start logging of render time
-	*/
-	public static function start_render($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['start_time'] = microtime(true);
-	}
-
-	/**
-	* End logging of compile time
-	*/
-	public static function end_render($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-	}
-
-	/**
-	* Start logging of cache time
-	*/
-	public static function start_cache($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['start_time'] = microtime(true);
-	}
-
-	/**
-	* End logging of cache time
-	*/
-	public static function end_cache($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-	}
-	/**
-	* Opens a window for the Smarty Debugging Consol and display the data
-	*/
-	public static function display_debug($obj)
-	{
-		// prepare information of assigned variables
-		$ptr = self::get_debug_vars($obj);
-		if ($obj instanceof Smarty) {
-			$smarty = $obj;
-		} else {
-			$smarty = $obj->smarty;
-		}
-		$_assigned_vars = $ptr->tpl_vars;
-		ksort($_assigned_vars);
-		$_config_vars = $ptr->config_vars;
-		ksort($_config_vars);
-		$ldelim = $smarty->left_delimiter;
-		$rdelim = $smarty->right_delimiter;
-		$smarty->left_delimiter = '{';
-		$smarty->right_delimiter = '}';
-		$_template = new Smarty_Internal_Template ($smarty->debug_tpl, $smarty);
-		$_template->caching = false;
-		$_template->force_compile = false;
-		$_template->disableSecurity();
-		$_template->cache_id = null;
-		$_template->compile_id = null;
-		if ($obj instanceof Smarty_Internal_Template) {
-			$_template->assign('template_name',$obj->resource_type.':'.$obj->resource_name);
-		}
-		if ($obj instanceof Smarty) {
-			$_template->assign('template_data', self::$template_data);
-		} else {
-			$_template->assign('template_data', null);
-		}
-		$_template->assign('assigned_vars', $_assigned_vars);
-		$_template->assign('config_vars', $_config_vars);
-		$_template->assign('execution_time', microtime(true) - $smarty->start_time);
-		echo $_template->getRenderedTemplate();
-		$smarty->left_delimiter = $ldelim;
-		$smarty->right_delimiter = $rdelim;
-	}
-	/*
-	* Recursively gets variables from all template/data scopes
-	*/
-	public static function get_debug_vars($obj)
-	{
-		$config_vars = $obj->config_vars;
-		$tpl_vars = array();
-		foreach ($obj->tpl_vars as $key => $var) {
-			$tpl_vars[$key] = clone $var;
-			if ($obj instanceof Smarty_Internal_Template) {
-				$tpl_vars[$key]->scope = $obj->resource_type.':'.$obj->resource_name;
-			} elseif ($obj instanceof Smarty_Data) {
-				$tpl_vars[$key]->scope = 'Data object';
-			} else {
-				$tpl_vars[$key]->scope = 'Smarty root';
-			}
-		}
-
-		if (isset($obj->parent)) {
-			$parent = self::get_debug_vars($obj->parent);
-			$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
-			$config_vars = array_merge($parent->config_vars, $config_vars);
-		} else {
-			foreach (Smarty::$global_tpl_vars as $name => $var) {
-				if (!array_key_exists($name, $tpl_vars)) {
-					$clone = clone $var;
-					$clone->scope = 'Global';
-					$tpl_vars[$name] = $clone;
-				}
-			}
-		}
-		return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
-	}
-
-	/**
-	* get_key
-	*/
-	static function get_key($template)
-	{
-		// calculate Uid if not already done
-		if ($template->templateUid == '') {
-			$template->getTemplateFilepath();
-		}
-		$key = $template->templateUid;
-		if (isset(self::$template_data[$key])) {
-			return $key;
-		} else {
-			self::$template_data[$key]['name'] = $template->getTemplateFilepath();
-			self::$template_data[$key]['compile_time'] = 0;
-			self::$template_data[$key]['render_time'] = 0;
-			self::$template_data[$key]['cache_time'] = 0;
-			return $key;
-		}
-	}
-}
+ * Smarty Internal Plugin Debug Class
+ *
+ * @package    Smarty
+ * @subpackage Debug
+ */
+class Smarty_Internal_Debug extends Smarty_Internal_Data
+{
+    /**
+     * template data
+     *
+     * @var array
+     */
+    public $template_data = array();
+
+    /**
+     * List of uid's which shall be ignored
+     *
+     * @var array
+     */
+    public $ignore_uid = array();
+
+    /**
+     * Index of display() and fetch() calls
+     *
+     * @var int
+     */
+    public $index = 0;
+
+    /**
+     * Counter for window offset
+     *
+     * @var int
+     */
+    public $offset = 0;
+
+    /**
+     * Start logging template
+     *
+     * @param \Smarty_Internal_Template $template template
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
+     */
+    public function start_template(Smarty_Internal_Template $template, $mode = null)
+    {
+        if (isset($mode) && !$template->_isSubTpl()) {
+            $this->index++;
+            $this->offset++;
+            $this->template_data[ $this->index ] = null;
+        }
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_template(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+        //$this->template_data[$this->index][$key]['properties'] = $template->properties;
+    }
+
+    /**
+     * Start logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function start_compile(Smarty_Internal_Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+            if (!isset($this->template_data[ $this->index ][ $key ])) {
+                if (isset($_is_stringy[ $template->source->type ])) {
+                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
+                        '\'' . substr($template->source->name, 0, 25) . '...\'';
+                } else {
+                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+                }
+                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+            }
+        } else {
+            if (isset($this->ignore_uid[ $template->source->uid ])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function end_compile(Smarty_Internal_Template $template)
+    {
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+        } else {
+            if (isset($this->ignore_uid[ $template->source->uid ])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Start logging of render time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function start_render(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
 
-?>
\ No newline at end of file
+    /**
+     * End logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function end_render(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Start logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function start_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Register template object
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function register_template(Smarty_Internal_Template $template)
+    {
+    }
+
+    /**
+     * Register data object
+     *
+     * @param \Smarty_Data $data data object
+     */
+    public static function register_data(Smarty_Data $data)
+    {
+    }
+
+    /**
+     * Opens a window for the Smarty Debugging Console and display the data
+     *
+     * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param bool                            $full
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function display_debug($obj, $full = false)
+    {
+        if (!$full) {
+            $this->offset++;
+            $savedIndex = $this->index;
+            $this->index = 9999;
+        }
+        $smarty = $obj->_getSmartyObj();
+        // create fresh instance of smarty for displaying the debug console
+        // to avoid problems if the application did overload the Smarty class
+        $debObj = new Smarty();
+        // copy the working dirs from application
+        $debObj->setCompileDir($smarty->getCompileDir());
+        // init properties by hand as user may have edited the original Smarty class
+        $debObj->setPluginsDir(is_dir(dirname(__FILE__) . '/../plugins') ? dirname(__FILE__) .
+                                                                           '/../plugins' : $smarty->getPluginsDir());
+        $debObj->force_compile = false;
+        $debObj->compile_check = Smarty::COMPILECHECK_ON;
+        $debObj->left_delimiter = '{';
+        $debObj->right_delimiter = '}';
+        $debObj->security_policy = null;
+        $debObj->debugging = false;
+        $debObj->debugging_ctrl = 'NONE';
+        $debObj->error_reporting = E_ALL & ~E_NOTICE;
+        $debObj->debug_tpl =
+            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . dirname(__FILE__) . '/../debug.tpl';
+        $debObj->registered_plugins = array();
+        $debObj->registered_resources = array();
+        $debObj->registered_filters = array();
+        $debObj->autoload_filters = array();
+        $debObj->default_modifiers = array();
+        $debObj->escape_html = true;
+        $debObj->caching = Smarty::CACHING_OFF;
+        $debObj->compile_id = null;
+        $debObj->cache_id = null;
+        // prepare information of assigned variables
+        $ptr = $this->get_debug_vars($obj);
+        $_assigned_vars = $ptr->tpl_vars;
+        ksort($_assigned_vars);
+        $_config_vars = $ptr->config_vars;
+        ksort($_config_vars);
+        $debugging = $smarty->debugging;
+        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+        if ($obj->_isTplObj()) {
+            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
+        }
+        if ($obj->_objType === 1 || $full) {
+            $_template->assign('template_data', $this->template_data[ $this->index ]);
+        } else {
+            $_template->assign('template_data', null);
+        }
+        $_template->assign('assigned_vars', $_assigned_vars);
+        $_template->assign('config_vars', $_config_vars);
+        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
+        $_template->assign('display_mode', $debugging === 2 || !$full);
+        $_template->assign('offset', $this->offset * 50);
+        echo $_template->fetch();
+        if (isset($full)) {
+            $this->index--;
+        }
+        if (!$full) {
+            $this->index = $savedIndex;
+        }
+    }
+
+    /**
+     * Recursively gets variables from all template/data scopes
+     *
+     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+     *
+     * @return StdClass
+     */
+    public function get_debug_vars($obj)
+    {
+        $config_vars = array();
+        foreach ($obj->config_vars as $key => $var) {
+            $config_vars[ $key ][ 'value' ] = $var;
+            if ($obj->_isTplObj()) {
+                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_isDataObj()) {
+                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+            } else {
+                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
+            }
+        }
+        $tpl_vars = array();
+        foreach ($obj->tpl_vars as $key => $var) {
+            foreach ($var as $varkey => $varvalue) {
+                if ($varkey === 'value') {
+                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                } else {
+                    if ($varkey === 'nocache') {
+                        if ($varvalue === true) {
+                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                        }
+                    } else {
+                        if ($varkey !== 'scope' || $varvalue !== 0) {
+                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                        }
+                    }
+                }
+            }
+            if ($obj->_isTplObj()) {
+                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_isDataObj()) {
+                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+            } else {
+                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
+            }
+        }
+        if (isset($obj->parent)) {
+            $parent = $this->get_debug_vars($obj->parent);
+            foreach ($parent->tpl_vars as $name => $pvar) {
+                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                }
+            }
+            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+            foreach ($parent->config_vars as $name => $pvar) {
+                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                }
+            }
+            $config_vars = array_merge($parent->config_vars, $config_vars);
+        } else {
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                if (!array_key_exists($key, $tpl_vars)) {
+                    foreach ($var as $varkey => $varvalue) {
+                        if ($varkey === 'value') {
+                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                        } else {
+                            if ($varkey === 'nocache') {
+                                if ($varvalue === true) {
+                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                                }
+                            } else {
+                                if ($varkey !== 'scope' || $varvalue !== 0) {
+                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                                }
+                            }
+                        }
+                    }
+                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
+                }
+            }
+        }
+        return (object)array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+    }
+
+    /**
+     * Return key into $template_data for template
+     *
+     * @param \Smarty_Internal_Template $template template object
+     *
+     * @return string key into $template_data
+     */
+    private function get_key(Smarty_Internal_Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        // calculate Uid if not already done
+        if ($template->source->uid === '') {
+            $template->source->filepath;
+        }
+        $key = $template->source->uid;
+        if (isset($this->template_data[ $this->index ][ $key ])) {
+            return $key;
+        } else {
+            if (isset($_is_stringy[ $template->source->type ])) {
+                $this->template_data[ $this->index ][ $key ][ 'name' ] =
+                    '\'' . substr($template->source->name, 0, 25) . '...\'';
+            } else {
+                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+            }
+            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+            return $key;
+        }
+    }
+
+    /**
+     * Ignore template
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function ignore(Smarty_Internal_Template $template)
+    {
+        // calculate Uid if not already done
+        if ($template->source->uid === '') {
+            $template->source->filepath;
+        }
+        $this->ignore_uid[ $template->source->uid ] = true;
+    }
+
+    /**
+     * handle 'URL' debugging mode
+     *
+     * @param Smarty $smarty
+     */
+    public function debugUrl(Smarty $smarty)
+    {
+        if (isset($_SERVER[ 'QUERY_STRING' ])) {
+            $_query_string = $_SERVER[ 'QUERY_STRING' ];
+        } else {
+            $_query_string = '';
+        }
+        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+                // enable debugging for this browser session
+                setcookie('SMARTY_DEBUG', true);
+                $smarty->debugging = true;
+            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+                // disable debugging for this browser session
+                setcookie('SMARTY_DEBUG', false);
+                $smarty->debugging = false;
+            } else {
+                // enable debugging for this page
+                $smarty->debugging = true;
+            }
+        } else {
+            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+                $smarty->debugging = true;
+            }
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
new file mode 100644
index 000000000..0ba00659d
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * Smarty error handler
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ * @deprecated
+Smarty does no longer use @filemtime()
+ */
+class Smarty_Internal_ErrorHandler
+{
+    /**
+     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
+     */
+    public static $mutedDirectories = array();
+
+    /**
+     * error handler returned by set_error_handler() in self::muteExpectedErrors()
+     */
+    private static $previousErrorHandler = null;
+
+    /**
+     * Enable error handler to mute expected messages
+     *
+     */
+    public static function muteExpectedErrors()
+    {
+        /*
+            error muting is done because some people implemented custom error_handlers using
+            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
+
+                It is important to remember that the standard PHP error handler is completely bypassed for the
+                error types specified by error_types unless the callback function returns FALSE.
+                error_reporting() settings will have no effect and your error handler will be called regardless -
+                however you are still able to read the current value of error_reporting and act appropriately.
+                Of particular note is that this value will be 0 if the statement that caused the error was
+                prepended by the @ error-control operator.
+
+            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
+                - @filemtime() is almost twice as fast as using an additional file_exists()
+                - between file_exists() and filemtime() a possible race condition is opened,
+                  which does not exist using the simple @filemtime() approach.
+        */
+        $error_handler = array('Smarty_Internal_ErrorHandler', 'mutingErrorHandler');
+        $previous = set_error_handler($error_handler);
+        // avoid dead loops
+        if ($previous !== $error_handler) {
+            self::$previousErrorHandler = $previous;
+        }
+    }
+
+    /**
+     * Error Handler to mute expected messages
+     *
+     * @link http://php.net/set_error_handler
+     *
+     * @param integer $errno Error level
+     * @param         $errstr
+     * @param         $errfile
+     * @param         $errline
+     * @param         $errcontext
+     *
+     * @return bool
+     */
+    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+    {
+        $_is_muted_directory = false;
+        // add the SMARTY_DIR to the list of muted directories
+        if (!isset(self::$mutedDirectories[ SMARTY_DIR ])) {
+            $smarty_dir = realpath(SMARTY_DIR);
+            if ($smarty_dir !== false) {
+                self::$mutedDirectories[ SMARTY_DIR ] =
+                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
+            }
+        }
+        // walk the muted directories and test against $errfile
+        foreach (self::$mutedDirectories as $key => &$dir) {
+            if (!$dir) {
+                // resolve directory and length for speedy comparisons
+                $file = realpath($key);
+                if ($file === false) {
+                    // this directory does not exist, remove and skip it
+                    unset(self::$mutedDirectories[ $key ]);
+                    continue;
+                }
+                $dir = array('file' => $file, 'length' => strlen($file),);
+            }
+            if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
+                $_is_muted_directory = true;
+                break;
+            }
+        }
+        // pass to next error handler if this error did not occur inside SMARTY_DIR
+        // or the error was within smarty but masked to be ignored
+        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
+            if (self::$previousErrorHandler) {
+                return call_user_func(
+                    self::$previousErrorHandler,
+                    $errno,
+                    $errstr,
+                    $errfile,
+                    $errline,
+                    $errcontext
+                );
+            } else {
+                return false;
+            }
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
new file mode 100644
index 000000000..b07615526
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * Smarty Extension handler
+ *
+ * Load extensions dynamically
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ * Runtime extensions
+ * @property   Smarty_Internal_Runtime_CacheModify       $_cacheModify
+ * @property   Smarty_Internal_Runtime_CacheResourceFile $_cacheResourceFile
+ * @property   Smarty_Internal_Runtime_Capture           $_capture
+ * @property   Smarty_Internal_Runtime_CodeFrame         $_codeFrame
+ * @property   Smarty_Internal_Runtime_FilterHandler     $_filterHandler
+ * @property   Smarty_Internal_Runtime_Foreach           $_foreach
+ * @property   Smarty_Internal_Runtime_GetIncludePath    $_getIncludePath
+ * @property   Smarty_Internal_Runtime_Make_Nocache      $_make_nocache
+ * @property   Smarty_Internal_Runtime_UpdateCache       $_updateCache
+ * @property   Smarty_Internal_Runtime_UpdateScope       $_updateScope
+ * @property   Smarty_Internal_Runtime_TplFunction       $_tplFunction
+ * @property   Smarty_Internal_Runtime_WriteFile         $_writeFile
+ *
+ * Method extensions
+ * @property   Smarty_Internal_Method_GetTemplateVars    $getTemplateVars
+ * @property   Smarty_Internal_Method_Append             $append
+ * @property   Smarty_Internal_Method_AppendByRef        $appendByRef
+ * @property   Smarty_Internal_Method_AssignGlobal       $assignGlobal
+ * @property   Smarty_Internal_Method_AssignByRef        $assignByRef
+ * @property   Smarty_Internal_Method_LoadFilter         $loadFilter
+ * @property   Smarty_Internal_Method_LoadPlugin         $loadPlugin
+ * @property   Smarty_Internal_Method_RegisterFilter     $registerFilter
+ * @property   Smarty_Internal_Method_RegisterObject     $registerObject
+ * @property   Smarty_Internal_Method_RegisterPlugin     $registerPlugin
+ * @property   mixed|\Smarty_Template_Cached             configLoad
+ */
+class Smarty_Internal_Extension_Handler
+{
+    public $objType = null;
+
+    /**
+     * Cache for property information from generic getter/setter
+     * Preloaded with names which should not use with generic getter/setter
+     *
+     * @var array
+     */
+    private $_property_info     = array(
+        'AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+        'DebugTemplate'   => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+        'TemplateVars'    => 0, 'Literals' => 'Literals',
+    );//
+
+    private $resolvedProperties = array();
+
+    /**
+     * Call external Method
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $name external method names
+     * @param array                 $args argument array
+     *
+     * @return mixed
+     */
+    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
+    {
+        /* @var Smarty $data ->smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if (!isset($smarty->ext->$name)) {
+            if (preg_match('/^((set|get)|(.*?))([A-Z].*)$/', $name, $match)) {
+                $basename = $this->upperCase($match[ 4 ]);
+                if (!isset($smarty->ext->$basename) && isset($this->_property_info[ $basename ])
+                    && is_string($this->_property_info[ $basename ])
+                ) {
+                    $class = 'Smarty_Internal_Method_' . $this->_property_info[ $basename ];
+                    if (class_exists($class)) {
+                        $classObj = new $class();
+                        $methodes = get_class_methods($classObj);
+                        foreach ($methodes as $method) {
+                            $smarty->ext->$method = $classObj;
+                        }
+                    }
+                }
+                if (!empty($match[ 2 ]) && !isset($smarty->ext->$name)) {
+                    $class = 'Smarty_Internal_Method_' . $this->upperCase($name);
+                    if (!class_exists($class)) {
+                        $objType = $data->_objType;
+                        $propertyType = false;
+                        if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
+                            $property = isset($this->resolvedProperties[ 'property' ][ $basename ]) ?
+                                $this->resolvedProperties[ 'property' ][ $basename ] :
+                                $property = $this->resolvedProperties[ 'property' ][ $basename ] = strtolower(
+                                    join(
+                                        '_',
+                                        preg_split(
+                                            '/([A-Z][^A-Z]*)/',
+                                            $basename,
+                                            -1,
+                                            PREG_SPLIT_NO_EMPTY |
+                                            PREG_SPLIT_DELIM_CAPTURE
+                                        )
+                                    )
+                                );
+                            if ($property !== false) {
+                                if (property_exists($data, $property)) {
+                                    $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
+                                } elseif (property_exists($smarty, $property)) {
+                                    $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 2;
+                                } else {
+                                    $this->resolvedProperties[ 'property' ][ $basename ] = $property = false;
+                                }
+                            }
+                        } else {
+                            $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ];
+                            $property = $this->resolvedProperties[ 'property' ][ $basename ];
+                        }
+                        if ($propertyType) {
+                            $obj = $propertyType === 1 ? $data : $smarty;
+                            if ($match[ 2 ] === 'get') {
+                                return $obj->$property;
+                            } elseif ($match[ 2 ] === 'set') {
+                                return $obj->$property = $args[ 0 ];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        $callback = array($smarty->ext->$name, $name);
+        array_unshift($args, $data);
+        if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
+            return call_user_func_array($callback, $args);
+        }
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+    /**
+     * Make first character of name parts upper case
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public function upperCase($name)
+    {
+        $_name = explode('_', $name);
+        $_name = array_map('ucfirst', $_name);
+        return implode('_', $_name);
+    }
+
+    /**
+     * get extension object
+     *
+     * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     */
+    public function __get($property_name)
+    {
+        // object properties of runtime template extensions will start with '_'
+        if ($property_name[ 0 ] === '_') {
+            $class = 'Smarty_Internal_Runtime' . $this->upperCase($property_name);
+        } else {
+            $class = 'Smarty_Internal_Method_' . $this->upperCase($property_name);
+        }
+        if (!class_exists($class)) {
+            return $this->$property_name = new Smarty_Internal_Undefined($class);
+        }
+        return $this->$property_name = new $class();
+    }
+
+    /**
+     * set extension property
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     */
+    public function __set($property_name, $value)
+    {
+        $this->$property_name = $value;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     */
+    public function __call($name, $args)
+    {
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), array($this));
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_filter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_filter.php
deleted file mode 100644
index 90214ad42..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_filter.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Filter
- * 
- * External Smarty filter methods
- * 
- * @package Smarty
- * @author Uwe Tews 
- */
-
-/**
- * Class for filter methods
- */
-class Smarty_Internal_Filter {
-
-    function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-    /**
-     * Registers a filter function
-     * 
-     * @param string $type filter type
-     * @param callback $callback 
-     */
-	public function registerFilter($type, $callback)
-	{
-   		$this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-	}
-
-    /**
-     * Unregisters a filter function
-     * 
-     * @param string $type filter type
-     * @param callback $callback 
-     */
-	public function unregisterFilter($type, $callback)
-	{
-   		$name = $this->_get_filter_name($callback);
-   		if(isset($this->smarty->registered_filters[$type][$name])) {
-      		unset($this->smarty->registered_filters[$type][$name]);
-   		}
-	}
-
-
-    /**
-     * Return internal filter name
-     * 
-     * @param callback $function_name 
-     */
-    public function _get_filter_name($function_name)
-    {
-        if (is_array($function_name)) {
-            $_class_name = (is_object($function_name[0]) ?
-                get_class($function_name[0]) : $function_name[0]);
-            return $_class_name . '_' . $function_name[1];
-        } else {
-            return $function_name;
-        } 
-    } 
-
-
-    /**
-     * load a filter of specified type and name
-     * 
-     * @param string $type filter type
-     * @param string $name filter name
-     * @return bool 
-     */
-    function loadFilter($type, $name)
-    {
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if ($this->smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            } 
-            if (is_callable($_plugin)) {
-                return $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
-            } 
-        } 
-        throw new SmartyException("{$type}filter \"{$name}\" not callable");
-        return false;
-    } 
-
-
-}
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_filter_handler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_filter_handler.php
deleted file mode 100644
index fbd884602..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_filter_handler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Filter Handler
- * 
- * Smarty filter handler class
- * 
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews 
- */
-
-/**
- * Class for filter processing
- */
-class Smarty_Internal_Filter_Handler {
-    /**
-     * Run filters over content
-     * 
-     * The filters will be lazy loaded if required
-     * class name format: Smarty_FilterType_FilterName
-     * plugin filename format: filtertype.filtername.php
-     * Smarty2 filter plugins could be used
-     * 
-     * @param string $type the type of filter ('pre','post','output' or 'variable') which shall run
-     * @param string $content the content which shall be processed by the filters
-     * @return string the filtered content
-     */
-    static function runFilter($type, $content, $template, $flag = null)
-    {
-        $output = $content;
-        if ($type != 'variable' || ($template->smarty->variable_filter && $flag !== false) || $flag === true) {
-            // loop over autoload filters of specified type
-            if (!empty($template->smarty->autoload_filters[$type])) {
-                foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
-                    $plugin_name = "Smarty_{$type}filter_{$name}";
-                    if ($template->smarty->loadPlugin($plugin_name)) {
-                        if (function_exists($plugin_name)) {
-                            // use loaded Smarty2 style plugin
-                            $output = $plugin_name($output, $template);
-                        } elseif (class_exists($plugin_name, false)) {
-                            // loaded class of filter plugin
-                            $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
-                        } 
-                    } else {
-                        // nothing found, throw exception
-                        throw new SmartyException("Unable to load filter {$plugin_name}");
-                    } 
-                } 
-            } 
-            // loop over registerd filters of specified type
-            if (!empty($template->smarty->registered_filters[$type])) {
-                foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-                    if (is_array($template->smarty->registered_filters[$type][$key])) {
-                        $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-                    } else {
-                        $output = $template->smarty->registered_filters[$type][$key]($output, $template);
-                    } 
-                } 
-            } 
-        } 
-        // return filtered output
-        return $output;
-    } 
-} 
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_function_call_handler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index f9860dce3..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- * 
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews 
- */
-
-/**
- * This class does call function defined with the {function} tag
- */
-class Smarty_Internal_Function_Call_Handler extends Smarty_Internal_Template {
-    static function call ($_name, $_template, $_params, $_hash, $_nocache)
-    {
-        if ($_nocache) {
-            $_function = "smarty_template_function_{$_name}_nocache";
-            $_template->smarty->template_functions[$_name]['called_nocache'] = true;
-        } else {
-            $_function = "smarty_template_function_{$_hash}_{$_name}";
-        } 
-        if (!is_callable($_function)) {
-            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(trim(\$value,'\''));};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-            if ($_nocache) {
-                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
-                        "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
-            } else {
-                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-            } 
-            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
-            eval($_code);
-        } 
-        $_function($_template, $_params);
-    } 
-} 
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_get_include_path.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index 23c85a2c3..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Smarty read include path plugin
- * 
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Monte Ohrt 
- */
-
-/**
- * Smarty Internal Read Include Path Class
- */
-class Smarty_Internal_Get_Include_Path {
-    /**
-     * Return full file path from PHP include_path
-     * 
-     * @param string $filepath filepath
-     * @return mixed full filepath or false
-     */
-    public static function getIncludePath($filepath)
-    {
-    static $_path_array = null;
-
-    if(!isset($_path_array)) {
-        $_ini_include_path = ini_get('include_path');
-
-        if(strstr($_ini_include_path,';')) {
-            // windows pathnames
-            $_path_array = explode(';',$_ini_include_path);
-        } else {
-            $_path_array = explode(':',$_ini_include_path);
-        }
-    }
-    foreach ($_path_array as $_include_path) {
-        if (file_exists($_include_path . DS . $filepath)) {
-            return $_include_path . DS . $filepath;
-        }
-    }
-    return false;
-    } 
-} 
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_addautoloadfilters.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_addautoloadfilters.php
new file mode 100644
index 000000000..a05f55a82
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_addautoloadfilters.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Smarty Method AddAutoloadFilters
+ *
+ * Smarty::addAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Add autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array                                                           $filters filters to load automatically
+     * @param string                                                          $type    "pre", "output", … specify
+     *                                                                                 the filter type to set.
+     *                                                                                 Defaults to none treating
+     *                                                                                 $filters' keys as the
+     *                                                                                 appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            if (!empty($smarty->autoload_filters[ $type ])) {
+                $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array)$filters);
+            } else {
+                $smarty->autoload_filters[ $type ] = (array)$filters;
+            }
+        } else {
+            foreach ((array)$filters as $type => $value) {
+                $this->_checkFilterType($type);
+                if (!empty($smarty->autoload_filters[ $type ])) {
+                    $smarty->autoload_filters[ $type ] =
+                        array_merge($smarty->autoload_filters[ $type ], (array)$value);
+                } else {
+                    $smarty->autoload_filters[ $type ] = (array)$value;
+                }
+            }
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_adddefaultmodifiers.php
new file mode 100644
index 000000000..c3feb3d8b
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_adddefaultmodifiers.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method AddDefaultModifiers
+ *
+ * Smarty::addDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Add default modifiers
+     *
+     * @api Smarty::addDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $modifiers modifier or list of modifiers
+     *                                                                                   to add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_array($modifiers)) {
+            $smarty->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
+        } else {
+            $smarty->default_modifiers[] = $modifiers;
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php
new file mode 100644
index 000000000..881375efe
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Smarty Method Append
+ *
+ * Smarty::append() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Append
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param array|string                                            $tpl_var the template variable name(s)
+     * @param mixed                                                   $value   the value to append
+     * @param bool                                                    $merge   flag if array elements shall be merged
+     * @param bool                                                    $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function append(Smarty_Internal_Data $data, $tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key !== '') {
+                    $this->append($data, $_key, $_val, $merge, $nocache);
+                }
+            }
+        } else {
+            if ($tpl_var !== '' && isset($value)) {
+                if (!isset($data->tpl_vars[ $tpl_var ])) {
+                    $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
+                        $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
+                    } else {
+                        $data->tpl_vars[ $tpl_var ] = clone $tpl_var_inst;
+                    }
+                }
+                if (!(is_array($data->tpl_vars[ $tpl_var ]->value)
+                      || $data->tpl_vars[ $tpl_var ]->value instanceof ArrayAccess)
+                ) {
+                    settype($data->tpl_vars[ $tpl_var ]->value, 'array');
+                }
+                if ($merge && is_array($value)) {
+                    foreach ($value as $_mkey => $_mval) {
+                        $data->tpl_vars[ $tpl_var ]->value[ $_mkey ] = $_mval;
+                    }
+                } else {
+                    $data->tpl_vars[ $tpl_var ]->value[] = $value;
+                }
+            }
+            if ($data->_isTplObj() && $data->scope) {
+                $data->ext->_updateScope->_updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php
new file mode 100644
index 000000000..c95904460
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AppendByRef
+{
+    /**
+     * appends values to template variables by reference
+     *
+     * @api  Smarty::appendByRef()
+     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param mixed                                                   &$value  the referenced value to append
+     * @param bool                                                    $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var !== '' && isset($value)) {
+            if (!isset($data->tpl_vars[ $tpl_var ])) {
+                $data->tpl_vars[ $tpl_var ] = new Smarty_Variable();
+            }
+            if (!is_array($data->tpl_vars[ $tpl_var ]->value)) {
+                settype($data->tpl_vars[ $tpl_var ]->value, 'array');
+            }
+            if ($merge && is_array($value)) {
+                foreach ($value as $_key => $_val) {
+                    $data->tpl_vars[ $tpl_var ]->value[ $_key ] = &$value[ $_key ];
+                }
+            } else {
+                $data->tpl_vars[ $tpl_var ]->value[] = &$value;
+            }
+            if ($data->_isTplObj() && $data->scope) {
+                $data->ext->_updateScope->_updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignbyref.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignbyref.php
new file mode 100644
index 000000000..fa705bb80
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignbyref.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method AssignByRef
+ *
+ * Smarty::assignByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignByRef
+{
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param                                                         $value
+     * @param boolean                                                 $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
+    {
+        if ($tpl_var !== '') {
+            $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
+            $data->tpl_vars[ $tpl_var ]->value = &$value;
+            if ($data->_isTplObj() && $data->scope) {
+                $data->ext->_updateScope->_updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignglobal.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignglobal.php
new file mode 100644
index 000000000..08cfa4693
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_assignglobal.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method AssignGlobal
+ *
+ * Smarty::assignGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varName the global variable name
+     * @param mixed                                                   $value   the value to assign
+     * @param boolean                                                 $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
+    {
+        if ($varName !== '') {
+            Smarty::$global_tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache);
+            $ptr = $data;
+            while ($ptr->_isTplObj()) {
+                $ptr->tpl_vars[ $varName ] = clone Smarty::$global_tpl_vars[ $varName ];
+                $ptr = $ptr->parent;
+            }
+        }
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php
new file mode 100644
index 000000000..29ff2ffb0
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method ClearAllAssign
+ *
+ * Smarty::clearAllAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear all the assigned template variables.
+     *
+     * @api  Smarty::clearAllAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAllAssign(Smarty_Internal_Data $data)
+    {
+        $data->tpl_vars = array();
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php
new file mode 100644
index 000000000..30d55f7d2
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearAllCache
+ *
+ * Smarty::clearAllCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache folder
+     *
+     * @api  Smarty::clearAllCache()
+     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     *
+     * @param \Smarty $smarty
+     * @param integer $exp_time expiration time
+     * @param string  $type     resource type
+     *
+     * @return int number of cache files deleted
+     * @throws \SmartyException
+     */
+    public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
+    {
+        $smarty->_clearTemplateCache();
+        // load cache resource and call clearAll
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        return $_cache_resource->clearAll($smarty, $exp_time);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php
new file mode 100644
index 000000000..22bfa2d31
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method ClearAssign
+ *
+ * Smarty::clearAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear the given assigned template variable(s).
+     *
+     * @api  Smarty::clearAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string|array                                            $tpl_var the template variable(s) to clear
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAssign(Smarty_Internal_Data $data, $tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($data->tpl_vars[ $curr_var ]);
+            }
+        } else {
+            unset($data->tpl_vars[ $tpl_var ]);
+        }
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php
new file mode 100644
index 000000000..a5dd4e26e
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method ClearCache
+ *
+ * Smarty::clearCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @api  Smarty::clearCache()
+     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
+     *
+     * @param \Smarty $smarty
+     * @param string  $template_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time
+     * @param string  $type          resource type
+     *
+     * @return int number of cache files deleted
+     * @throws \SmartyException
+     */
+    public function clearCache(
+        Smarty $smarty,
+        $template_name,
+        $cache_id = null,
+        $compile_id = null,
+        $exp_time = null,
+        $type = null
+    ) {
+        $smarty->_clearTemplateCache();
+        // load cache resource and call clear
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php
new file mode 100644
index 000000000..bf4929807
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Smarty Method ClearCompiledTemplate
+ *
+ * Smarty::clearCompiledTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCompiledTemplate
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Delete compiled template file
+     *
+     * @api  Smarty::clearCompiledTemplate()
+     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     *
+     * @param \Smarty $smarty
+     * @param string  $resource_name template name
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time
+     *
+     * @return int number of template files deleted
+     * @throws \SmartyException
+     */
+    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
+    {
+        // clear template objects cache
+        $smarty->_clearTemplateCache();
+        $_compile_dir = $smarty->getCompileDir();
+        if ($_compile_dir === '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = Smarty::CACHING_OFF;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = $smarty->createTemplate($resource_name);
+            $smarty->caching = $_save_stat;
+            if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) {
+                $_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->compiled->filepath));
+                $_resource_part_1_length = strlen($_resource_part_1);
+            } else {
+                return 0;
+            }
+            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+            $_resource_part_2_length = strlen($_resource_part_2);
+        }
+        $_dir = $_compile_dir;
+        if ($smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        }
+        if (isset($_compile_id)) {
+            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+            $_compile_id_part_length = strlen($_compile_id_part);
+        }
+        $_count = 0;
+        try {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
+        } catch (Exception $e) {
+            return 0;
+        }
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+                continue;
+            }
+            $_filepath = (string)$_file;
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                }
+            } else {
+                // delete only php files
+                if (substr($_filepath, -4) !== '.php') {
+                    continue;
+                }
+                $unlink = false;
+                if ((!isset($_compile_id) ||
+                     (isset($_filepath[ $_compile_id_part_length ]) &&
+                      $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
+                    && (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ])
+                                                   && substr_compare(
+                                                          $_filepath,
+                                                          $_resource_part_1,
+                                                          -$_resource_part_1_length,
+                                                          $_resource_part_1_length
+                                                      ) === 0) || (isset($_filepath[ $_resource_part_2_length ])
+                                                                   && substr_compare(
+                                                                          $_filepath,
+                                                                          $_resource_part_2,
+                                                                          -$_resource_part_2_length,
+                                                                          $_resource_part_2_length
+                                                                      ) === 0))
+                ) {
+                    if (isset($exp_time)) {
+                        if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) {
+                            $unlink = true;
+                        }
+                    } else {
+                        $unlink = true;
+                    }
+                }
+                if ($unlink && is_file($_filepath) && @unlink($_filepath)) {
+                    $_count++;
+                    if (function_exists('opcache_invalidate')
+                        && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1)
+                    ) {
+                        opcache_invalidate($_filepath, true);
+                    } elseif (function_exists('apc_delete_file')) {
+                        apc_delete_file($_filepath);
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php
new file mode 100644
index 000000000..15bf492a1
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearConfig
+ *
+ * Smarty::clearConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearConfig
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear a single or all config variables
+     *
+     * @api  Smarty::clearConfig()
+     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string|null                                             $name variable name or null
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearConfig(Smarty_Internal_Data $data, $name = null)
+    {
+        if (isset($name)) {
+            unset($data->config_vars[ $name ]);
+        } else {
+            $data->config_vars = array();
+        }
+        return $data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compileallconfig.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compileallconfig.php
new file mode 100644
index 000000000..3934ca042
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compileallconfig.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method CompileAllConfig
+ *
+ * Smarty::compileAllConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Compile all config files
+     *
+     * @api Smarty::compileAllConfig()
+     *
+     * @param \Smarty $smarty        passed smarty object
+     * @param string  $extension     file extension
+     * @param bool    $force_compile force all to recompile
+     * @param int     $time_limit
+     * @param int     $max_errors
+     *
+     * @return int number of template files recompiled
+     */
+    public function compileAllConfig(
+        Smarty $smarty,
+        $extension = '.conf',
+        $force_compile = false,
+        $time_limit = 0,
+        $max_errors = null
+    ) {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compilealltemplates.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compilealltemplates.php
new file mode 100644
index 000000000..5c046da40
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Smarty Method CompileAllTemplates
+ *
+ * Smarty::compileAllTemplates() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Compile all template files
+     *
+     * @api Smarty::compileAllTemplates()
+     *
+     * @param \Smarty $smarty        passed smarty object
+     * @param string  $extension     file extension
+     * @param bool    $force_compile force all to recompile
+     * @param int     $time_limit
+     * @param int     $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllTemplates(
+        Smarty $smarty,
+        $extension = '.tpl',
+        $force_compile = false,
+        $time_limit = 0,
+        $max_errors = null
+    ) {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
+    }
+
+    /**
+     * Compile all template or config files
+     *
+     * @param \Smarty $smarty
+     * @param string  $extension     template file name extension
+     * @param bool    $force_compile force all to recompile
+     * @param int     $time_limit    set maximum execution time
+     * @param int     $max_errors    set maximum allowed errors
+     * @param bool    $isConfig      flag true if called for config files
+     *
+     * @return int number of template files compiled
+     */
+    protected function compileAll(
+        Smarty $smarty,
+        $extension,
+        $force_compile,
+        $time_limit,
+        $max_errors,
+        $isConfig = false
+    ) {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $_count = 0;
+        $_error_count = 0;
+        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
+        // loop over array of source directories
+        foreach ($sourceDir as $_dir) {
+            $_dir_1 = new RecursiveDirectoryIterator(
+                $_dir,
+                defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
+                    FilesystemIterator::FOLLOW_SYMLINKS : 0
+            );
+            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
+            foreach ($_dir_2 as $_fileinfo) {
+                $_file = $_fileinfo->getFilename();
+                if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                if (substr_compare($_file, $extension, -strlen($extension)) !== 0) {
+                    continue;
+                }
+                if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
+                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
+                }
+                echo "\n<br>", $_dir, '---', $_file;
+                flush();
+                $_start_time = microtime(true);
+                $_smarty = clone $smarty;
+                //
+                $_smarty->_cache = array();
+                $_smarty->ext = new Smarty_Internal_Extension_Handler();
+                $_smarty->ext->objType = $_smarty->_objType;
+                $_smarty->force_compile = $force_compile;
+                try {
+                    /* @var Smarty_Internal_Template $_tpl */
+                    $_tpl = new $smarty->template_class($_file, $_smarty);
+                    $_tpl->caching = Smarty::CACHING_OFF;
+                    $_tpl->source =
+                        $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        $_count++;
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                } catch (Exception $e) {
+                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
+                    $_error_count++;
+                }
+                // free memory
+                unset($_tpl);
+                $_smarty->_clearTemplateCache();
+                if ($max_errors !== null && $_error_count === $max_errors) {
+                    echo "\n<br><br>too many errors\n";
+                    exit(1);
+                }
+            }
+        }
+        echo "\n<br>";
+        return $_count;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php
new file mode 100644
index 000000000..2e6254880
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Smarty Method ConfigLoad
+ *
+ * Smarty::configLoad() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ConfigLoad
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $config_file filename
+     * @param mixed                                                   $sections    array of section names, single
+     *                                                                             section or null
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \Exception
+     */
+    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
+    {
+        $this->_loadConfigFile($data, $config_file, $sections, null);
+        return $data;
+    }
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param string                                                  $config_file filename
+     * @param mixed                                                   $sections    array of section names, single
+     *                                                                             section or null
+     * @param int                                                     $scope       scope into which config variables
+     *                                                                             shall be loaded
+     *
+     * @throws \Exception
+     */
+    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
+    {
+        /* @var \Smarty $smarty */
+        $smarty = $data->_getSmartyObj();
+        /* @var \Smarty_Internal_Template $confObj */
+        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data, null, null, null, null, true);
+        $confObj->caching = Smarty::CACHING_OFF;
+        $confObj->source->config_sections = $sections;
+        $confObj->source->scope = $scope;
+        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
+        $confObj->compiled->render($confObj);
+        if ($data->_isTplObj()) {
+            $data->compiled->file_dependency[ $confObj->source->uid ] =
+                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
+        }
+    }
+
+    /**
+     * load config variables into template object
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $new_config_vars
+     */
+    public function _loadConfigVars(Smarty_Internal_Template $tpl, $new_config_vars)
+    {
+        $this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars);
+        $tagScope = $tpl->source->scope;
+        if ($tagScope >= 0) {
+            if ($tagScope === Smarty::SCOPE_LOCAL) {
+                $this->_updateVarStack($tpl, $new_config_vars);
+                $tagScope = 0;
+                if (!$tpl->scope) {
+                    return;
+                }
+            }
+            if ($tpl->parent->_isTplObj() && ($tagScope || $tpl->parent->scope)) {
+                $mergedScope = $tagScope | $tpl->scope;
+                if ($mergedScope) {
+                    // update scopes
+                    /* @var \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $ptr */
+                    foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
+                        $this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
+                        if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
+                            $this->_updateVarStack($tpl, $new_config_vars);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Assign all config variables in given scope
+     *
+     * @param array                     $config_vars     config variables in scope
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $new_config_vars loaded config variables
+     */
+    public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
+    {
+        // copy global config vars
+        foreach ($new_config_vars[ 'vars' ] as $variable => $value) {
+            if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
+                $config_vars[ $variable ] = $value;
+            } else {
+                $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
+            }
+        }
+        // scan sections
+        $sections = $tpl->source->config_sections;
+        if (!empty($sections)) {
+            foreach ((array)$sections as $tpl_section) {
+                if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
+                    foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
+                        if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
+                            $config_vars[ $variable ] = $value;
+                        } else {
+                            $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Update config variables in template local variable stack
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $config_vars
+     */
+    public function _updateVarStack(Smarty_Internal_Template $tpl, $config_vars)
+    {
+        $i = 0;
+        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
+            $this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
+            $i++;
+        }
+    }
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param string                                                  $varName the name of the config variable
+     * @param bool                                                    $errorEnable
+     *
+     * @return null|string  the value of the config variable
+     */
+    public function _getConfigVariable(Smarty_Internal_Data $data, $varName, $errorEnable = true)
+    {
+        $_ptr = $data;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[ $varName ])) {
+                // found it, return it
+                return $_ptr->config_vars[ $varName ];
+            }
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        }
+        if ($data->smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+        return null;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php
new file mode 100644
index 000000000..f95097519
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method CreateData
+ *
+ * Smarty::createData() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CreateData
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * creates a data object
+     *
+     * @api  Smarty::createData()
+     * @link http://www.smarty.net/docs/en/api.create.data.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
+     * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
+     *                                                                                     variables
+     * @param string                                                               $name   optional data block name
+     *
+     * @return \Smarty_Data data object
+     */
+    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = $obj->_getSmartyObj();
+        $dataObj = new Smarty_Data($parent, $smarty, $name);
+        if ($smarty->debugging) {
+            Smarty_Internal_Debug::register_data($dataObj);
+        }
+        return $dataObj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getautoloadfilters.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getautoloadfilters.php
new file mode 100644
index 000000000..4145db10b
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getautoloadfilters.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method GetAutoloadFilters
+ *
+ * Smarty::getAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Get autoload filters
+     *
+     * @api Smarty::getAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type type of filter to get auto loads
+     *                                                                              for. Defaults to all autoload
+     *                                                                              filters
+     *
+     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+     *                was specified
+     * @throws \SmartyException
+     */
+    public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            return isset($smarty->autoload_filters[ $type ]) ? $smarty->autoload_filters[ $type ] : array();
+        }
+        return $smarty->autoload_filters;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvariable.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvariable.php
new file mode 100644
index 000000000..b54815123
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvariable.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVariable
+ *
+ * Smarty::getConfigVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param string                                                  $varName the name of the config variable
+     * @param bool                                                    $errorEnable
+     *
+     * @return null|string  the value of the config variable
+     */
+    public function getConfigVariable(Smarty_Internal_Data $data, $varName = null, $errorEnable = true)
+    {
+        return $data->ext->configLoad->_getConfigVariable($data, $varName, $errorEnable);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php
new file mode 100644
index 000000000..1d11e44c1
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVars
+ *
+ * Smarty::getConfigVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all config variables
+     *
+     * @api  Smarty::getConfigVars()
+     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varname        variable name or null
+     * @param bool                                                    $search_parents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getConfigVars(Smarty_Internal_Data $data, $varname = null, $search_parents = true)
+    {
+        $_ptr = $data;
+        $var_array = array();
+        while ($_ptr !== null) {
+            if (isset($varname)) {
+                if (isset($_ptr->config_vars[ $varname ])) {
+                    return $_ptr->config_vars[ $varname ];
+                }
+            } else {
+                $var_array = array_merge($_ptr->config_vars, $var_array);
+            }
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset($varname)) {
+            return '';
+        } else {
+            return $var_array;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdebugtemplate.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdebugtemplate.php
new file mode 100644
index 000000000..77d908c15
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdebugtemplate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDebugTemplate
+ *
+ * Smarty::getDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return name of debugging template
+     *
+     * @api Smarty::getDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return string
+     */
+    public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = $obj->_getSmartyObj();
+        return $smarty->debug_tpl;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdefaultmodifiers.php
new file mode 100644
index 000000000..57da85c49
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getdefaultmodifiers.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDefaultModifiers
+ *
+ * Smarty::getDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get default modifiers
+     *
+     * @api Smarty::getDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of default modifiers
+     */
+    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = $obj->_getSmartyObj();
+        return $smarty->default_modifiers;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getglobal.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getglobal.php
new file mode 100644
index 000000000..2be11d7e8
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getglobal.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Smarty Method GetGlobal
+ *
+ * Smarty::getGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all global  variables
+     *
+     * @api Smarty::getGlobal()
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $varName variable name or null
+     *
+     * @return string|array variable value or or array of variables
+     */
+    public function getGlobal(Smarty_Internal_Data $data, $varName = null)
+    {
+        if (isset($varName)) {
+            if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+                return Smarty::$global_tpl_vars[ $varName ]->value;
+            } else {
+                return '';
+            }
+        } else {
+            $_result = array();
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                $_result[ $key ] = $var->value;
+            }
+            return $_result;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php
new file mode 100644
index 000000000..df6ede130
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method GetRegisteredObject
+ *
+ * Smarty::getRegisteredObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetRegisteredObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return a reference to a registered object
+     *
+     * @api  Smarty::getRegisteredObject()
+     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $object_name object name
+     *
+     * @return object
+     * @throws \SmartyException if no such object is found
+     */
+    public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (!isset($smarty->registered_objects[ $object_name ])) {
+            throw new SmartyException("'$object_name' is not a registered object");
+        }
+        if (!is_object($smarty->registered_objects[ $object_name ][ 0 ])) {
+            throw new SmartyException("registered '$object_name' is not an object");
+        }
+        return $smarty->registered_objects[ $object_name ][ 0 ];
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getstreamvariable.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getstreamvariable.php
new file mode 100644
index 000000000..8db39c525
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getstreamvariable.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method GetStreamVariable
+ *
+ * Smarty::getStreamVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetStreamVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a stream variable
+     *
+     * @api Smarty::getStreamVariable()
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $variable the stream of the variable
+     *
+     * @return mixed
+     * @throws \SmartyException
+     */
+    public function getStreamVariable(Smarty_Internal_Data $data, $variable)
+    {
+        $_result = '';
+        $fp = fopen($variable, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $_result .= $current_line;
+            }
+            fclose($fp);
+            return $_result;
+        }
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php
new file mode 100644
index 000000000..c07ae07ec
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Smarty Method GetTags
+ *
+ * Smarty::getTags() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTags
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @api  Smarty::getTags()
+     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param null|string|Smarty_Internal_Template                            $template
+     *
+     * @return array of tag/attributes
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = $obj->_getSmartyObj();
+        if ($obj->_isTplObj() && !isset($template)) {
+            $tpl = clone $obj;
+        } elseif (isset($template) && $template->_isTplObj()) {
+            $tpl = clone $template;
+        } elseif (isset($template) && is_string($template)) {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($template, $smarty);
+            // checks if template exists
+            if (!$tpl->source->exists) {
+                throw new SmartyException("Unable to load template {$tpl->source->type} '{$tpl->source->name}'");
+            }
+        }
+        if (isset($tpl)) {
+            $tpl->smarty = clone $tpl->smarty;
+            $tpl->smarty->_cache[ 'get_used_tags' ] = true;
+            $tpl->_cache[ 'used_tags' ] = array();
+            $tpl->smarty->merge_compiled_includes = false;
+            $tpl->smarty->disableSecurity();
+            $tpl->caching = Smarty::CACHING_OFF;
+            $tpl->loadCompiler();
+            $tpl->compiler->compileTemplate($tpl);
+            return $tpl->_cache[ 'used_tags' ];
+        }
+        throw new SmartyException('Missing template specification');
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php
new file mode 100644
index 000000000..9ef7d46bb
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * Smarty Method GetTemplateVars
+ *
+ * Smarty::getTemplateVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTemplateVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param bool                                                    $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getTemplateVars(
+        Smarty_Internal_Data $data,
+        $varName = null,
+        Smarty_Internal_Data $_ptr = null,
+        $searchParents = true
+    ) {
+        if (isset($varName)) {
+            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            }
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $data;
+            }
+            while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars as $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[ $key ] = $var->value;
+                    }
+                }
+                // not found, try at parent
+                if ($searchParents && isset($_ptr->parent)) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                }
+            }
+            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars as $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[ $key ] = $var->value;
+                    }
+                }
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varName       the name of the Smarty variable
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param bool                                                    $searchParents search also in parent data
+     * @param bool                                                    $errorEnable
+     *
+     * @return \Smarty_Variable
+     */
+    public function _getVariable(
+        Smarty_Internal_Data $data,
+        $varName,
+        Smarty_Internal_Data $_ptr = null,
+        $searchParents = true,
+        $errorEnable = true
+    ) {
+        if ($_ptr === null) {
+            $_ptr = $data;
+        }
+        while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[ $varName ])) {
+                // found it, return it
+                return $_ptr->tpl_vars[ $varName ];
+            }
+            // not found, try at parent
+            if ($searchParents && isset($_ptr->parent)) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[ $varName ];
+        }
+        if ($errorEnable && $data->_getSmartyObj()->error_unassigned) {
+            // force a notice
+            $x = $$varName;
+        }
+        return new Smarty_Undefined_Variable;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_literals.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_literals.php
new file mode 100644
index 000000000..bfa3f58ec
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_literals.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Smarty Method GetLiterals
+ *
+ * Smarty::getLiterals() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Literals
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get literals
+     *
+     * @api Smarty::getLiterals()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of literals
+     */
+    public function getLiterals(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = $obj->_getSmartyObj();
+        return (array)$smarty->literals;
+    }
+
+    /**
+     * Add literals
+     *
+     * @api Smarty::addLiterals()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $literals literal or list of literals
+     *                                                                                  to addto add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function addLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
+    {
+        if (isset($literals)) {
+            $this->set($obj->_getSmartyObj(), (array)$literals);
+        }
+        return $obj;
+    }
+
+    /**
+     * Set literals
+     *
+     * @api Smarty::setLiterals()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $literals literal or list of literals
+     *                                                                                  to setto set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function setLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->literals = array();
+        if (!empty($literals)) {
+            $this->set($smarty, (array)$literals);
+        }
+        return $obj;
+    }
+
+    /**
+     * common setter for literals for easier handling of duplicates the
+     * Smarty::$literals array gets filled with identical key values
+     *
+     * @param \Smarty $smarty
+     * @param array   $literals
+     *
+     * @throws \SmartyException
+     */
+    private function set(Smarty $smarty, $literals)
+    {
+        $literals = array_combine($literals, $literals);
+        $error = isset($literals[ $smarty->left_delimiter ]) ? array($smarty->left_delimiter) : array();
+        $error = isset($literals[ $smarty->right_delimiter ]) ? $error[] = $smarty->right_delimiter : $error;
+        if (!empty($error)) {
+            throw new SmartyException(
+                'User defined literal(s) "' . $error .
+                '" may not be identical with left or right delimiter'
+            );
+        }
+        $smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php
new file mode 100644
index 000000000..66d80d474
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Smarty Method LoadFilter
+ *
+ * Smarty::loadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param string                                                          $name filter name
+     *
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if (is_callable($_plugin)) {
+            $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+            return true;
+        }
+        if ($smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            }
+            if (is_callable($_plugin)) {
+                $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+                return true;
+            }
+        }
+        throw new SmartyException("{$type}filter '{$name}' not found or callable");
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[ $type ])) {
+            throw new SmartyException("Illegal filter type '{$type}'");
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
new file mode 100644
index 000000000..3bd659cb8
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Extension Loadplugin
+ *
+ * $smarty->loadPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadPlugin
+{
+    /**
+     * Cache of searched plugin files
+     *
+     * @var array
+     */
+    public $plugin_files = array();
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param \Smarty $smarty
+     * @param string  $plugin_name class plugin name to load
+     * @param bool    $check       check if already loaded
+     *
+     * @return bool|string
+     * @throws \SmartyException
+     */
+    public function loadPlugin(Smarty $smarty, $plugin_name, $check)
+    {
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
+            return true;
+        }
+        if (!preg_match('#^smarty_((internal)|([^_]+))_(.+)$#i', $plugin_name, $match)) {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+        }
+        if (!empty($match[ 2 ])) {
+            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            if (isset($this->plugin_files[ $file ])) {
+                if ($this->plugin_files[ $file ] !== false) {
+                    return $this->plugin_files[ $file ];
+                } else {
+                    return false;
+                }
+            } else {
+                if (is_file($file)) {
+                    $this->plugin_files[ $file ] = $file;
+                    include_once $file;
+                    return $file;
+                } else {
+                    $this->plugin_files[ $file ] = false;
+                    return false;
+                }
+            }
+        }
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$match[1]}.{$match[4]}.php";
+        $_lower_filename = strtolower($_plugin_filename);
+        if (isset($this->plugin_files)) {
+            if (isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
+                if (!$smarty->use_include_path || $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] !== false) {
+                    return $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ];
+                }
+            }
+            if (!$smarty->use_include_path || $smarty->ext->_getIncludePath->isNewIncludePath($smarty)) {
+                unset($this->plugin_files[ 'include_path' ]);
+            } else {
+                if (isset($this->plugin_files[ 'include_path' ][ $_lower_filename ])) {
+                    return $this->plugin_files[ 'include_path' ][ $_lower_filename ];
+                }
+            }
+        }
+        $_file_names = array($_plugin_filename);
+        if ($_lower_filename !== $_plugin_filename) {
+            $_file_names[] = $_lower_filename;
+        }
+        $_p_dirs = $smarty->getPluginsDir();
+        if (!isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
+            // loop through plugin dirs and find the plugin
+            foreach ($_p_dirs as $_plugin_dir) {
+                foreach ($_file_names as $name) {
+                    $file = $_plugin_dir . $name;
+                    if (is_file($file)) {
+                        $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = $file;
+                        include_once $file;
+                        return $file;
+                    }
+                    $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = false;
+                }
+            }
+        }
+        if ($smarty->use_include_path) {
+            foreach ($_file_names as $_file_name) {
+                // try PHP include_path
+                $file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
+                $this->plugin_files[ 'include_path' ][ $_lower_filename ] = $file;
+                if ($file !== false) {
+                    include_once $file;
+                    return $file;
+                }
+            }
+        }
+        // no plugin loaded
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
new file mode 100644
index 000000000..39318838e
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method MustCompile
+ *
+ * Smarty_Internal_Template::mustCompile() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_MustCompile
+{
+    /**
+     * Valid for template object
+     *
+     * @var int
+     */
+    public $objMap = 2;
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile
+     * configuration
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function mustCompile(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->exists) {
+            if ($_template->_isSubTpl()) {
+                $parent_resource = " in '$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
+        }
+        if ($_template->mustCompile === null) {
+            $_template->mustCompile = (!$_template->source->handler->uncompiled &&
+                                       ($_template->smarty->force_compile || $_template->source->handler->recompiled ||
+                                        !$_template->compiled->exists || ($_template->compile_check &&
+                                                                          $_template->compiled->getTimeStamp() <
+                                                                          $_template->source->getTimeStamp())));
+        }
+        return $_template->mustCompile;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php
new file mode 100644
index 000000000..648365619
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterCacheResource
+ *
+ * Smarty::registerCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerCacheResource()
+     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $name name of resource type
+     * @param \Smarty_CacheResource                                           $resource_handler
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerCacheResource(
+        Smarty_Internal_TemplateBase $obj,
+        $name,
+        Smarty_CacheResource $resource_handler
+    ) {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->registered_cache_resources[ $name ] = $resource_handler;
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php
new file mode 100644
index 000000000..8d18547e2
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method RegisterClass
+ *
+ * Smarty::registerClass() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterClass
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers static classes to be used in templates
+     *
+     * @api  Smarty::registerClass()
+     * @link http://www.smarty.net/docs/en/api.register.class.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $class_name
+     * @param string                                                          $class_impl the referenced PHP class to
+     *                                                                                    register
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
+    {
+        $smarty = $obj->_getSmartyObj();
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        }
+        // register the class
+        $smarty->registered_classes[ $class_name ] = $class_impl;
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
new file mode 100644
index 000000000..b340f178d
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultConfigHandler
+ *
+ * Smarty::registerDefaultConfigHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultConfigHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register config default handler
+     *
+     * @api Smarty::registerDefaultConfigHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param callable                                                        $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_callable($callback)) {
+            $smarty->default_config_handler_func = $callback;
+        } else {
+            throw new SmartyException('Default config handler not callable');
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
new file mode 100644
index 000000000..a9fb78dc6
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultPluginHandler
+ *
+ * Smarty::registerDefaultPluginHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultPluginHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a default plugin handler
+     *
+     * @api  Smarty::registerDefaultPluginHandler()
+     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param callable                                                        $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_callable($callback)) {
+            $smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
new file mode 100644
index 000000000..cbc133ccd
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultTemplateHandler
+ *
+ * Smarty::registerDefaultTemplateHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultTemplateHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register template default handler
+     *
+     * @api Smarty::registerDefaultTemplateHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param callable                                                        $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_callable($callback)) {
+            $smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException('Default template handler not callable');
+        }
+        return $obj;
+    }
+
+    /**
+     * get default content from template or config resource handler
+     *
+     * @param Smarty_Template_Source $source
+     *
+     * @throws \SmartyException
+     */
+    public static function _getDefaultTemplate(Smarty_Template_Source $source)
+    {
+        if ($source->isConfig) {
+            $default_handler = $source->smarty->default_config_handler_func;
+        } else {
+            $default_handler = $source->smarty->default_template_handler_func;
+        }
+        $_content = $_timestamp = null;
+        $_return = call_user_func_array(
+            $default_handler,
+            array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)
+        );
+        if (is_string($_return)) {
+            $source->exists = is_file($_return);
+            if ($source->exists) {
+                $source->timestamp = filemtime($_return);
+            } else {
+                throw new SmartyException(
+                    'Default handler: Unable to load ' .
+                    ($source->isConfig ? 'config' : 'template') .
+                    " default file '{$_return}' for '{$source->type}:{$source->name}'"
+                );
+            }
+            $source->name = $source->filepath = $_return;
+            $source->uid = sha1($source->filepath);
+        } elseif ($_return === true) {
+            $source->content = $_content;
+            $source->exists = true;
+            $source->uid = $source->name = sha1($_content);
+            $source->handler = Smarty_Resource::load($source->smarty, 'eval');
+        } else {
+            $source->exists = false;
+            throw new SmartyException(
+                'Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
+                " default content for '{$source->type}:{$source->name}'"
+            );
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php
new file mode 100644
index 000000000..c0f9fff10
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Smarty Method RegisterFilter
+ *
+ * Smarty::registerFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param callback                                                        $callback
+     * @param string|null                                                     $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        $name = isset($name) ? $name : $this->_getFilterName($callback);
+        if (!is_callable($callback)) {
+            throw new SmartyException("{$type}filter '{$name}' not callable");
+        }
+        $smarty->registered_filters[ $type ][ $name ] = $callback;
+        return $obj;
+    }
+
+    /**
+     * Return internal filter name
+     *
+     * @param callback $function_name
+     *
+     * @return string   internal filter name
+     */
+    public function _getFilterName($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[ 0 ]) ? get_class($function_name[ 0 ]) : $function_name[ 0 ]);
+            return $_class_name . '_' . $function_name[ 1 ];
+        } elseif (is_string($function_name)) {
+            return $function_name;
+        } else {
+            return 'closure';
+        }
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[ $type ])) {
+            throw new SmartyException("Illegal filter type '{$type}'");
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php
new file mode 100644
index 000000000..4646e4f22
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Smarty Method RegisterObject
+ *
+ * Smarty::registerObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $object_name
+     * @param object                                                          $object                     the
+     *                                                                                                    referenced
+     *                                                                                                    PHP
+     *                                                                                                    object
+     *                                                                                                    to
+     *                                                                                                    register
+     *
+     * @param array                                                           $allowed_methods_properties list of
+     *                                                                                                    allowed
+     *                                                                                                    methods
+     *                                                                                                    (empty
+     *                                                                                                    = all)
+     *
+     * @param bool                                                            $format                     smarty
+     *                                                                                                    argument
+     *                                                                                                    format,
+     *                                                                                                    else
+     *                                                                                                    traditional
+     *
+     * @param array                                                           $block_methods              list of
+     *                                                                                                    block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(
+        Smarty_Internal_TemplateBase $obj,
+        $object_name,
+        $object,
+        $allowed_methods_properties = array(),
+        $format = true,
+        $block_methods = array()
+    ) {
+        $smarty = $obj->_getSmartyObj();
+        // test if allowed methods callable
+        if (!empty($allowed_methods_properties)) {
+            foreach ((array)$allowed_methods_properties as $method) {
+                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
+                    throw new SmartyException("Undefined method or property '$method' in registered object");
+                }
+            }
+        }
+        // test if block methods callable
+        if (!empty($block_methods)) {
+            foreach ((array)$block_methods as $method) {
+                if (!is_callable(array($object, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // register the object
+        $smarty->registered_objects[ $object_name ] =
+            array($object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods);
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php
new file mode 100644
index 000000000..ed18d84bb
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method RegisterPlugin
+ *
+ * Smarty::registerPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type       plugin type
+     * @param string                                                          $name       name of template tag
+     * @param callback                                                        $callback   PHP callback to register
+     * @param bool                                                            $cacheable  if true (default) this
+     *                                                                                    function is cache able
+     * @param mixed                                                           $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
+     */
+    public function registerPlugin(
+        Smarty_Internal_TemplateBase $obj,
+        $type,
+        $name,
+        $callback,
+        $cacheable = true,
+        $cache_attr = null
+    ) {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_plugins[ $type ][ $name ])) {
+            throw new SmartyException("Plugin tag '{$name}' already registered");
+        } elseif (!is_callable($callback)) {
+            throw new SmartyException("Plugin '{$name}' not callable");
+        } elseif ($cacheable && $cache_attr) {
+            throw new SmartyException("Cannot set caching attributes for plugin '{$name}' when it is cacheable.");
+        } else {
+            $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool)$cacheable, (array)$cache_attr);
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
new file mode 100644
index 000000000..7c7d0f78a
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method RegisterResource
+ *
+ * Smarty::registerResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerResource()
+     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $name             name of resource type
+     * @param Smarty_Resource|array                                           $resource_handler or instance of
+     *                                                                                          Smarty_Resource,
+     *                                                                                          or array of
+     *                                                                                          callbacks to
+     *                                                                                          handle
+     *                                                                                          resource
+     *                                                                                          (deprecated)
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->registered_resources[ $name ] =
+            $resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setautoloadfilters.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setautoloadfilters.php
new file mode 100644
index 000000000..2972f3ce1
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setautoloadfilters.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Smarty Method SetAutoloadFilters
+ *
+ * Smarty::setAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Set autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array                                                           $filters filters to load automatically
+     * @param string                                                          $type    "pre", "output", … specify
+     *                                                                                 the filter type to set.
+     *                                                                                 Defaults to none treating
+     *                                                                                 $filters' keys as the
+     *                                                                                 appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            $smarty->autoload_filters[ $type ] = (array)$filters;
+        } else {
+            foreach ((array)$filters as $type => $value) {
+                $this->_checkFilterType($type);
+            }
+            $smarty->autoload_filters = (array)$filters;
+        }
+        return $obj;
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[ $type ])) {
+            throw new SmartyException("Illegal filter type '{$type}'");
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdebugtemplate.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdebugtemplate.php
new file mode 100644
index 000000000..cc9d23e2a
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdebugtemplate.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method SetDebugTemplate
+ *
+ * Smarty::setDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * set the debug template
+     *
+     * @api Smarty::setDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $tpl_name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException if file is not readable
+     */
+    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (!is_readable($tpl_name)) {
+            throw new SmartyException("Unknown file '{$tpl_name}'");
+        }
+        $smarty->debug_tpl = $tpl_name;
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdefaultmodifiers.php
new file mode 100644
index 000000000..eadc2de1b
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_setdefaultmodifiers.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Smarty Method SetDefaultModifiers
+ *
+ * Smarty::setDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Set default modifiers
+     *
+     * @api Smarty::setDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $modifiers modifier or list of modifiers
+     *                                                                                   to set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->default_modifiers = (array)$modifiers;
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php
new file mode 100644
index 000000000..55e1596be
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty::unloadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::unloadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param string                                                          $name filter name
+     *
+     * @return Smarty_Internal_TemplateBase
+     * @throws \SmartyException
+     */
+    public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[ $type ])) {
+            $_filter_name = "smarty_{$type}filter_{$name}";
+            if (isset($smarty->registered_filters[ $type ][ $_filter_name ])) {
+                unset($smarty->registered_filters[ $type ][ $_filter_name ]);
+                if (empty($smarty->registered_filters[ $type ])) {
+                    unset($smarty->registered_filters[ $type ]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php
new file mode 100644
index 000000000..b99903867
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterCacheResource
+ *
+ * Smarty::unregisterCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterCacheResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param                                                                 $name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_cache_resources[ $name ])) {
+            unset($smarty->registered_cache_resources[ $name ]);
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php
new file mode 100644
index 000000000..9cb494a52
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method UnregisterFilter
+ *
+ * Smarty::unregisterFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Unregisters a filter function
+     *
+     * @api  Smarty::unregisterFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param callback|string                                                 $callback
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[ $type ])) {
+            $name = is_string($callback) ? $callback : $this->_getFilterName($callback);
+            if (isset($smarty->registered_filters[ $type ][ $name ])) {
+                unset($smarty->registered_filters[ $type ][ $name ]);
+                if (empty($smarty->registered_filters[ $type ])) {
+                    unset($smarty->registered_filters[ $type ]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php
new file mode 100644
index 000000000..1e592b339
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterObject
+ *
+ * Smarty::unregisterObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterObject()
+     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $object_name name of object
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_objects[ $object_name ])) {
+            unset($smarty->registered_objects[ $object_name ]);
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php
new file mode 100644
index 000000000..f39e31678
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method UnregisterPlugin
+ *
+ * Smarty::unregisterPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterPlugin()
+     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type plugin type
+     * @param string                                                          $name name of template tag
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_plugins[ $type ][ $name ])) {
+            unset($smarty->registered_plugins[ $type ][ $name ]);
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php
new file mode 100644
index 000000000..a79db4299
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterResource
+ *
+ * Smarty::unregisterResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type name of resource type
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_resources[ $type ])) {
+            unset($smarty->registered_resources[ $type ]);
+        }
+        return $obj;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_nocache_insert.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
index 1b25e8071..88694dcfd 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
@@ -1,49 +1,51 @@
 <?php
-
 /**
  * Smarty Internal Plugin Nocache Insert
- * 
  * Compiles the {insert} tag into the cache file
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_Nocache_Insert {
+class Smarty_Internal_Nocache_Insert
+{
     /**
      * Compiles code for the {insert} tag into cache file
-     * 
-     * @param string $_function insert function name
-     * @param array $_attr array with paramter
-     * @param object $template template object
-     * @param string $_script script name to load or 'null'
-     * @param string $_assign soptinal variable name
-     * @return string compiled code
+     *
+     * @param string                   $_function insert function name
+     * @param array                    $_attr     array with parameter
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $_script   script name to load or 'null'
+     * @param string                   $_assign   optional variable name
+     *
+     * @return string                   compiled code
      */
-    static function compile($_function, $_attr, $_template, $_script, $_assign = null)
+    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
     {
         $_output = '<?php ';
-        if ($_script != 'null') {
+        if ($_script !== 'null') {
             // script which must be included
             // code for script file loading
             $_output .= "require_once '{$_script}';";
-        } 
+        }
         // call insert
         if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>";
+            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) .
+                        ',\$_smarty_tpl), true);?>';
         } else {
-            $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
-        } 
+            $_output .= "echo {$_function}(" . var_export($_attr, true) . ',$_smarty_tpl);?>';
+        }
         $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
+        while ($_tpl->_isSubTpl()) {
             $_tpl = $_tpl->parent;
-        } 
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
-    } 
-} 
-
-?>
\ No newline at end of file
+        }
+        return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree.php
index 9eba5944c..9f7678526 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree.php
@@ -1,236 +1,50 @@
 <?php
 /**
- * Smarty Internal Plugin Templateparser Parsetrees
- * 
- * These are classes to build parsetrees in the template parser
- * 
- * @package Smarty
+ * Smarty Internal Plugin Templateparser Parsetree
+ * These are classes to build parsetree in the template parser
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Thue Kristensen 
- * @author Uwe Tews 
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
  */
- 
-abstract class _smarty_parsetree {
-  abstract public function to_smarty_php();
-}
 
 /**
- * A complete smarty tag.
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
  */
-class _smarty_tag extends _smarty_parsetree
+abstract class Smarty_Internal_ParseTree
 {
-    public $parser;
-    public $data;
-    public $saved_block_nesting;
-    function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    } 
-
-    public function to_smarty_php()
-    {
-        return $this->data;
-    } 
-
-    public function assign_to_var()
-    {
-        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>',
-            $this->data, $var);
-        return $var;
-    } 
-} 
-
-/**
- * Code fragment inside a tag.
- */
-class _smarty_code extends _smarty_parsetree {
-    public $parser;
+    /**
+     * Buffer content
+     *
+     * @var mixed
+     */
     public $data;
-    function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    } 
-
-    public function to_smarty_php()
-    {
-        return sprintf("(%s)", $this->data);
-    } 
-} 
 
-/**
- * Double quoted string inside a tag.
- */
-class _smarty_doublequoted extends _smarty_parsetree {
-    public $parser;
-    public $subtrees = Array();
-    function __construct($parser, _smarty_parsetree $subtree)
-    {
-        $this->parser = $parser;
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        } 
-    } 
-
-    function append_subtree(_smarty_parsetree $subtree)
-    {
-        $last_subtree = count($this->subtrees)-1;
-        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-            if ($subtree instanceof _smarty_code) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
-            } elseif ($subtree instanceof _smarty_dq_content) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
-            } else {
-                $this->subtrees[$last_subtree]->data .= $subtree->data;
-            } 
-        } else {
-            $this->subtrees[] = $subtree;
-        } 
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        } 
-    } 
-
-    public function to_smarty_php()
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            } 
-            if ($subtree instanceof _smarty_tag) {
-                $more_php = $subtree->assign_to_var();
-            } else {
-                $more_php = $subtree->to_smarty_php();
-            } 
-
-            $code .= $more_php;
-
-            if (!$subtree instanceof _smarty_dq_content) {
-                $this->parser->compiler->has_variable_string = true;
-            } 
-        } 
-        return $code;
-    } 
-} 
-
-/**
- * Raw chars as part of a double quoted string.
- */
-class _smarty_dq_content extends _smarty_parsetree {
-    public $data;
-    function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    } 
-
-    public function to_smarty_php()
-    {
-        return '"' . $this->data . '"';
-    } 
-} 
-
-/**
- * Template element
- */
-class _smarty_template_buffer extends _smarty_parsetree {
-    public $subtrees = Array();
-    function __construct($parser)
-    {
-        $this->parser = $parser;
-    } 
-
-    function append_subtree(_smarty_parsetree $subtree)
-    {
-        $this->subtrees[] = $subtree;
-    } 
-
-    public function to_smarty_php()
-    {
-        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-            if ($key + 2 < $cnt) {
-                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
-                    $key = $key + 1;
-                    continue;
-                } 
-                if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
-                    $key = $key + 2;
-                    continue;
-                } 
-            } 
-            if (substr($code, -1) == '<') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '?') {
-                    $code = substr($code, 0, strlen($code)-1) . '<<?php ?>?' . substr($subtree, 1);
-                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
-                    $code = substr($code, 0, strlen($code)-1) . '<<?php ?>%' . substr($subtree, 1);
-           } else {
-                    $code .= $subtree;
-                } 
-                continue;
-            } 
-            if ($this->parser->asp_tags && substr($code, -1) == '%') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code)-1) . '%<?php ?>>' . substr($subtree, 1);
-           } else {
-                    $code .= $subtree;
-                } 
-                continue;
-            } 
-            if (substr($code, -1) == '?') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code)-1) . '?<?php ?>>' . substr($subtree, 1);
-           } else {
-                    $code .= $subtree;
-                } 
-                continue;
-            } 
-            $code .= $this->subtrees[$key]->to_smarty_php();
-        } 
-        return $code;
-    } 
+    /**
+     * Subtree array
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Return buffer
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string buffer content
+     */
+    abstract public function to_smarty_php(Smarty_Internal_Templateparser $parser);
+
+    /**
+     * Template data object destructor
+     */
+    public function __destruct()
+    {
+        $this->data = null;
+        $this->subtrees = null;
+    }
 }
-
-/**
- * template text
- */
-class _smarty_text extends _smarty_parsetree {
-    public $data;
-    function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    } 
-
-    public function to_smarty_php()
-    {
-        return $this->data;
-    } 
-} 
-
-/**
- * template linebreaks
- */
-class _smarty_linebreak extends _smarty_parsetree {
-    public $data;
-    function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    } 
-
-    public function to_smarty_php()
-    {
-        return $this->data;
-    } 
-} 
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_code.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_code.php
new file mode 100644
index 000000000..7bd0bc45c
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_code.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Code fragment inside a tag .
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param string $data content
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return sprintf('(%s)', $this->data);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dq.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dq.php
new file mode 100644
index 000000000..8655f5869
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dq.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for double quoted string subtrees
+     *
+     * @param object                    $parser  parser object
+     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
+     */
+    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $last_subtree = count($this->subtrees) - 1;
+        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag
+            && $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
+        ) {
+            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode(
+                        $this->subtrees[ $last_subtree ]->data,
+                        '<?php echo ' . $subtree->data . ';?>'
+                    );
+            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode(
+                        $this->subtrees[ $last_subtree ]->data,
+                        '<?php echo "' . $subtree->data . '";?>'
+                    );
+            } else {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string compiled template code
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== '') {
+                $code .= '.';
+            }
+            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+                $more_php = $subtree->assign_to_var($parser);
+            } else {
+                $more_php = $subtree->to_smarty_php($parser);
+            }
+            $code .= $more_php;
+            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $parser->compiler->has_variable_string = true;
+            }
+        }
+        return $code;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php
new file mode 100644
index 000000000..a8ca389d9
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_dqcontent.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Raw chars as part of a double quoted string.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param string $data string section
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double quoted string
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return '"' . $this->data . '"';
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_tag.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_tag.php
new file mode 100644
index 000000000..e6c755604
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_tag.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * A complete smarty tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
+{
+    /**
+     * Saved block nesting level
+     *
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param \Smarty_Internal_Templateparser $parser parser object
+     * @param string                          $data   content
+     */
+    public function __construct(Smarty_Internal_Templateparser $parser, $data)
+    {
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated output of buffer content into a temporary variable
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code
+     */
+    public function assign_to_var(Smarty_Internal_Templateparser $parser)
+    {
+        $var = $parser->compiler->getNewPrefixVariable();
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $parser->compiler->prefix_code[] = sprintf('%s', $tmp);
+        return $var;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
new file mode 100644
index 000000000..477232ef8
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Template element
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
+{
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Create root of parse tree for template elements
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        if (!empty($subtree->subtrees)) {
+            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
+        }
+    }
+
+    /**
+     * Append array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge($this->subtrees, (array)$array);
+        }
+    }
+
+    /**
+     * Prepend array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge((array)$array, $this->subtrees);
+        }
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+
+        foreach ($this->getChunkedSubtrees() as $chunk) {
+	        $text = '';
+	        switch ($chunk['mode']) {
+		        case 'textstripped':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text .= $subtree->to_smarty_php($parser);
+			        }
+			        $code .= preg_replace(
+				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+				        "<?php echo '\$1'; ?>\n",
+				        $parser->compiler->processText($text)
+			        );
+			        break;
+		        case 'text':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text .= $subtree->to_smarty_php($parser);
+			        }
+			        $code .= preg_replace(
+				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+				        "<?php echo '\$1'; ?>\n",
+				        $text
+			        );
+			        break;
+		        case 'tag':
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
+			        }
+			        $code .= $text;
+			        break;
+		        default:
+			        foreach ($chunk['subtrees'] as $subtree) {
+				        $text = $subtree->to_smarty_php($parser);
+			        }
+			        $code .= $text;
+
+	        }
+        }
+        return $code;
+    }
+
+    private function getChunkedSubtrees() {
+    	$chunks = [];
+    	$currentMode = null;
+    	$currentChunk = [];
+	    for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+
+	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, ['textstripped', 'text', 'tag'])) {
+	    		continue;
+	    	}
+
+		    if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
+			    && $this->subtrees[ $key ]->isToBeStripped()) {
+		    	$newMode = 'textstripped';
+		    } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
+			    $newMode = 'text';
+		    } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
+			    $newMode = 'tag';
+		    } else {
+			    $newMode = 'other';
+		    }
+
+		    if ($newMode == $currentMode) {
+			    $currentChunk[] = $this->subtrees[ $key ];
+		    } else {
+		    	$chunks[] = [
+		    		'mode' => $currentMode,
+				    'subtrees' => $currentChunk
+			    ];
+		    	$currentMode = $newMode;
+			    $currentChunk = [$this->subtrees[ $key ]];
+		    }
+	    }
+	    if ($currentMode && $currentChunk) {
+		    $chunks[] = [
+			    'mode' => $currentMode,
+			    'subtrees' => $currentChunk
+		    ];
+	    }
+		return $chunks;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php
new file mode 100644
index 000000000..399e84941
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ *             *
+ *             template text
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
+{
+
+	/**
+	 * Wether this section should be stripped on output to smarty php
+	 * @var bool
+	 */
+	private $toBeStripped = false;
+
+	/**
+	 * Create template text buffer
+	 *
+	 * @param string $data text
+	 * @param bool $toBeStripped wether this section should be stripped on output to smarty php
+	 */
+    public function __construct($data, $toBeStripped = false)
+    {
+        $this->data = $data;
+        $this->toBeStripped = $toBeStripped;
+    }
+
+	/**
+	 * Wether this section should be stripped on output to smarty php
+	 * @return bool
+	 */
+	public function isToBeStripped() {
+    	return $this->toBeStripped;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string text
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_register.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_register.php
deleted file mode 100644
index edaa7ff13..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_register.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Register
- * 
- * External Smarty methods register/unregister
- * 
- * @package Smarty
- * @author Uwe Tews 
- */
-
-/**
- * Class for register/unregister methods
- */
-class Smarty_Internal_Register {
-
-    function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-    /**
-     * Registers plugin to be used in templates
-     * 
-     * @param string $type plugin type
-     * @param string $tag name of template tag
-     * @param callback $callback PHP callback to register
-     * @param boolean $cacheable if true (default) this fuction is cachable
-     * @param array $cache_attr caching attributes if any
-     */
-
-	public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
-	{
-		if (isset($this->smarty->registered_plugins[$type][$tag])) {
-        	throw new Exception("Plugin tag \"{$tag}\" already registered");
-    	} elseif (!is_callable($callback)) {
-        	throw new Exception("Plugin \"{$tag}\" not callable");
-    	} else {
-       		$this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
-    	}
-	} 
-
-    /**
-     * Unregister Plugin
-     * 
-     * @param string $type of plugin
-     * @param string $tag name of plugin
-     */
-    function unregisterPlugin($type, $tag)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            unset($this->smarty->registered_plugins[$type][$tag]);
-        } 
-    } 
- 
-    /**
-     * Registers a resource to fetch a template
-     * 
-     * @param string $type name of resource type
-     * @param array $callback array of callbacks to handle resource
-     */
- 	public function registerResource($type, $callback)
-	{
-       	$this->smarty->registered_resources[$type] = array($callback, false);
-    }
-
-    /**
-     * Unregisters a resource 
-     * 
-     * @param string $type name of resource type
-     */
-   function unregisterResource($type)
-    {
-        if (isset($this->smarty->registered_resources[$type])) {
-            unset($this->smarty->registered_resources[$type]);
-        } 
-    } 
-
-
-    /**
-     * Registers object to be used in templates
-     * 
-     * @param string $object name of template object
-     * @param object $ &$object_impl the referenced PHP object to register
-     * @param mixed $ null | array $allowed list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
-     * @param mixed $ null | array $block_functs list of methods that are block format
-     */
-    function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    { 
-        // test if allowed methodes callable
-        if (!empty($allowed)) {
-            foreach ((array)$allowed as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                } 
-            } 
-        } 
-        // test if block methodes callable
-        if (!empty($block_methods)) {
-            foreach ((array)$block_methods as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                } 
-            } 
-        } 
-        // register the object
-        $this->smarty->registered_objects[$object_name] =
-        array($object_impl, (array)$allowed, (boolean)$smarty_args, (array)$block_methods);
-    } 
-
-    /**
-     * Registers static classes to be used in templates
-     * 
-     * @param string $class name of template class
-     * @param string $class_impl the referenced PHP class to register
-     */
-    function registerClass($class_name, $class_impl)
-    { 
-        // test if exists
-        if (!class_exists($class_impl)) {
-            throw new SmartyException("Undefined class '$class_impl' in register template class");
-        } 
-        // register the class
-        $this->smarty->registered_classes[$class_name] = $class_impl;
-    } 
-
-    /**
-     * Registers a default plugin handler
-     * 
-     * @param  $callback mixed string | array $plugin class/methode name
-     */
-    function registerDefaultPluginHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_plugin_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default plugin handler '$callback' not callable");
-        } 
-    } 
-
-    /**
-     * Registers a default template handler
-     * 
-     * @param  $callback mixed string | array class/method name
-     */
-    function registerDefaultTemplateHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_template_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default template handler '$callback' not callable");
-        } 
-    } 
-
-}
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_eval.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_eval.php
index a3acf71d0..3b552a589 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_eval.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_eval.php
@@ -1,89 +1,94 @@
 <?php
-
 /**
  * Smarty Internal Plugin Resource Eval
- * 
- * Implements the strings as resource for Smarty template
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
- 
+
 /**
  * Smarty Internal Plugin Resource Eval
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_Eval {
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-    // classes used for compiling Smarty templates from file resource
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-    // properties
-    public $usesCompiler = true;
-    public $isEvaluated = true;
-
+class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
+{
     /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
      */
-    public function isExisting($template)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        return true;
-    } 
+        $source->uid = $source->filepath = sha1($source->name);
+        $source->timestamp = $source->exists = true;
+    }
 
     /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string return 'string' as template source is not a file
+     * Load template's source from $resource_name into current template object
+     *
+     * @uses decode() to decode base64 and urlencoded template_resources
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
      */
-    public function getTemplateFilepath($_template)
-    { 
-        // no filepath for evaluated strings
-        // return "string" for compiler error messages
-        return 'eval:';
-    } 
+    public function getContent(Smarty_Template_Source $source)
+    {
+        return $this->decode($source->name);
+    }
 
     /**
-     * Get timestamp to template source
-     * 
-     * @param object $_template template object
-     * @return boolean false as string resources have no timestamp
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     *
+     * @return string decoded template_resource
      */
-    public function getTemplateTimestamp($_template)
-    { 
-        // evaluated strings must always be compiled and have no timestamp
-        return false;
-    } 
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
+        }
+        return $string;
+    }
 
     /**
-     * Retuen template source from resource name
-     * 
-     * @param object $_template template object
-     * @return string content of template source
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
      */
-    public function getTemplateSource($_template)
-    { 
-        // return template string
-        $_template->template_source = $_template->resource_name;
-        return true;
-    } 
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        return get_class($this) . '#' . $this->decode($resource_name);
+    }
 
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return boolean return false as compiled template is not stored
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    public function getCompiledFilepath($_template)
-    { 
-        // no filepath for strings
-        return false;
-    } 
-} 
-?>
\ No newline at end of file
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return '';
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_extends.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_extends.php
index 74dc0f9b6..80946932e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_extends.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_extends.php
@@ -1,176 +1,126 @@
 <?php
-
 /**
  * Smarty Internal Plugin Resource Extends
- * 
- * Implements the file system as resource for Smarty which does extend a chain of template files templates
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource Extends
+ * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_Extends {
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-        $this->_rdl = preg_quote($smarty->right_delimiter);
-        $this->_ldl = preg_quote($smarty->left_delimiter);
-    } 
-    // classes used for compiling Smarty templates from file resource
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-    public $template_parser_class = 'Smarty_Internal_Templateparser'; 
-    // properties
-    public $usesCompiler = true;
-    public $isEvaluated = false;
-    public $allFilepaths = array();
+class Smarty_Internal_Resource_Extends extends Smarty_Resource
+{
+    /**
+     * mbstring.overload flag
+     *
+     * @var int
+     */
+    public $mbstring_overload = 0;
 
     /**
-     * Return flag if template source is existing
-     * 
-     * @param object $_template template object
-     * @return boolean result
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws SmartyException
      */
-    public function isExisting($_template)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-    	  $_template->getTemplateFilepath();
-    	  foreach ($this->allFilepaths as $_filepath) {
-        	if ($_filepath === false) {
-            return false;
-          }
+        $uid = '';
+        $sources = array();
+        $components = explode('|', $source->name);
+        $smarty = &$source->smarty;
+        $exists = true;
+        foreach ($components as $component) {
+            /* @var \Smarty_Template_Source $_s */
+            $_s = Smarty_Template_Source::load(null, $smarty, $component);
+            if ($_s->type === 'php') {
+                throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
+            }
+            $sources[ $_s->uid ] = $_s;
+            $uid .= $_s->filepath;
+            if ($_template) {
+                $exists = $exists && $_s->exists;
+            }
+        }
+        $source->components = $sources;
+        $source->filepath = $_s->filepath;
+        $source->uid = sha1($uid . $source->smarty->_joined_template_dir);
+        $source->exists = $exists;
+        if ($_template) {
+            $source->timestamp = $_s->timestamp;
         }
-        return true;
-    } 
+    }
+
     /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string filepath to template source file
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
      */
-    public function getTemplateFilepath($_template)
+    public function populateTimestamp(Smarty_Template_Source $source)
     {
-        $sha1String = '';
-        $_files = explode('|', $_template->resource_name);
-        foreach ($_files as $_file) {
-            $_filepath = $_template->buildTemplateFilepath ($_file);
-            if ($_filepath !== false) {
-            	if (is_object($_template->smarty->security_policy)) {
-                	$_template->smarty->security_policy->isTrustedResourceDir($_filepath);
-            	} 
-            } 
-            $sha1String .= $_filepath;
-            $this->allFilepaths[$_file] = $_filepath;
-        } 
-        $_template->templateUid = sha1($sha1String);
-        return $_filepath;
-    } 
+        $source->exists = true;
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($source->components as $_s) {
+            $source->exists = $source->exists && $_s->exists;
+        }
+        $source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
+    }
 
     /**
-     * Get timestamp to template source
-     * 
-     * @param object $_template template object
-     * @return integer timestamp of template source file
+     * Load template's source from files into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
      */
-    public function getTemplateTimestamp($_template)
+    public function getContent(Smarty_Template_Source $source)
     {
-        return filemtime($_template->getTemplateFilepath());
-    } 
+        if (!$source->exists) {
+            throw new SmartyException("Unable to load template '{$source->type}:{$source->name}'");
+        }
+        $_components = array_reverse($source->components);
+        $_content = '';
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($_components as $_s) {
+            // read content
+            $_content .= $_s->getContent();
+        }
+        return $_content;
+    }
 
     /**
-     * Read template source from file
-     * 
-     * @param object $_template template object
-     * @return string content of template source file
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string resource's basename
      */
-    public function getTemplateSource($_template)
+    public function getBasename(Smarty_Template_Source $source)
     {
-        $this->template = $_template;
-        $_files = array_reverse($this->allFilepaths);
-    		$_first = reset($_files);
-    		$_last = end($_files);
-        foreach ($_files as $_file => $_filepath) {
-        		if ($_filepath === false) {
-            		throw new SmartyException("Unable to load template 'file : {$_file}'");
-        		}
-            // read template file
-            if ($_filepath != $_first) {
-                $_template->properties['file_dependency'][sha1($_filepath)] = array($_filepath, filemtime($_filepath),'file');
-            } 
-            $_template->template_filepath = $_filepath;
-            $_content = file_get_contents($_filepath);
-            if ($_filepath != $_last) {
-                if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $_open) !=
-                        preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $_close)) {
-                    $this->smarty->triggerError("unmatched {block} {/block} pairs in file '$_filepath'");
-                } 
-                preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-                $_result_count = count($_result[0]);
-                $_start = 0;
-                while ($_start < $_result_count) {
-                    $_end = 0;
-                    $_level = 1;
-                    while ($_level != 0) {
-                        $_end++;
-                        if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                            $_level++;
-                        } else {
-                            $_level--;
-                        } 
-                    } 
-                    $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.block.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-                        substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])));
-                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $_template, $_filepath);
-                    $_start = $_start + $_end + 1;
-                } 
-            } else {
-                $_template->template_source = $_content;
-                return true;
-            } 
-        } 
+        return str_replace(':', '.', basename($source->filepath));
     }
-    
 
+    /*
+      * Disable timestamp checks for extends resource.
+      * The individual source components will be checked.
+      *
+      * @return bool
+      */
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return string return path to compiled template
+     * @return bool
      */
-    public function getCompiledFilepath($_template)
+    public function checkTimestamps()
     {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_files = explode('|', $_template->resource_name); 
-        // calculate Uid if not already done
-        if ($_template->templateUid == '') {
-            $_template->getTemplateFilepath();
-        } 
-        $_filepath = $_template->templateUid; 
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        } 
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        } 
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        } 
-        $_compile_dir = $_template->smarty->compile_dir;
-        if (substr($_compile_dir, -1) != DS) {
-            $_compile_dir .= DS;
-        } 
-        return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_files[count($_files)-1]) . $_cache . '.php';
-    } 
-} 
-
-?>
\ No newline at end of file
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_file.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_file.php
index 79decc599..ae2060673 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_file.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_file.php
@@ -1,128 +1,180 @@
 <?php
-
 /**
  * Smarty Internal Plugin Resource File
- * 
- * Implements the file system as resource for Smarty templates
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
-/** 
+/**
  * Smarty Internal Plugin Resource File
+ * Implements the file system as resource for Smarty templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_File {
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-    // classes used for compiling Smarty templates from file resource
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-    public $template_parser_class = 'Smarty_Internal_Templateparser'; 
-    // properties
-    public $usesCompiler = true;
-    public $isEvaluated = false;
-
+class Smarty_Internal_Resource_File extends Smarty_Resource
+{
     /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws \SmartyException
      */
-    public function isExisting($template)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        if ($template->getTemplateFilepath() === false) {
-            return false;
+        $source->filepath = $this->buildFilepath($source, $_template);
+        if ($source->filepath !== false) {
+            if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
+            }
+            $source->exists = true;
+            $source->uid = sha1(
+                $source->filepath . ($source->isConfig ? $source->smarty->_joined_config_dir :
+                    $source->smarty->_joined_template_dir)
+            );
+            $source->timestamp = filemtime($source->filepath);
         } else {
-            return true;
-        } 
-    } 
+            $source->timestamp = $source->exists = false;
+        }
+    }
 
     /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string filepath to template source file
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
      */
-    public function getTemplateFilepath($_template)
+    public function populateTimestamp(Smarty_Template_Source $source)
     {
-        $_filepath = $_template->buildTemplateFilepath ();
-
-        if ($_filepath !== false) {
-            if (is_object($_template->smarty->security_policy)) {
-                $_template->smarty->security_policy->isTrustedResourceDir($_filepath);
-            } 
-        } 
-        $_template->templateUid = sha1($_filepath);
-        return $_filepath;
-    } 
+        if (!$source->exists) {
+            $source->timestamp = $source->exists = is_file($source->filepath);
+        }
+        if ($source->exists) {
+            $source->timestamp = filemtime($source->filepath);
+        }
+    }
 
     /**
-     * Get timestamp to template source
-     * 
-     * @param object $_template template object
-     * @return integer timestamp of template source file
+     * Load template's source from file into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
-    public function getTemplateTimestamp($_template)
+    public function getContent(Smarty_Template_Source $source)
     {
-        return filemtime($_template->getTemplateFilepath());
-    } 
+        if ($source->exists) {
+            return file_get_contents($source->filepath);
+        }
+        throw new SmartyException(
+            'Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+            " {$source->type} '{$source->name}'"
+        );
+    }
 
     /**
-     * Read template source from file
-     * 
-     * @param object $_template template object
-     * @return string content of template source file
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    public function getTemplateSource($_template)
-    { 
-        // read template file
-        if (file_exists($_tfp = $_template->getTemplateFilepath())) {
-            $_template->template_source = file_get_contents($_tfp);
-            return true;
-        } else {
-            return false;
-        } 
-    } 
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename($source->filepath);
+    }
 
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return string return path to compiled template
+     * build template filepath by traversing the template_dir array
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string fully qualified filepath
+     * @throws SmartyException
      */
-    public function getCompiledFilepath($_template)
+    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        // calculate Uid if not already done
-        if ($_template->templateUid == '') {
-            $_template->getTemplateFilepath();
-        } 
-        $_filepath = $_template->templateUid; 
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        } 
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        } 
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        } 
-        $_compile_dir = $_template->smarty->compile_dir;
-        if (strpos('/\\', substr($_compile_dir, -1)) === false) {
-            $_compile_dir .= DS;
-        } 
-        return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php';
-    } 
-} 
-
-?>
\ No newline at end of file
+        $file = $source->name;
+        // absolute file ?
+        if ($file[ 0 ] === '/' || $file[ 1 ] === ':') {
+            $file = $source->smarty->_realpath($file, true);
+            return is_file($file) ? $file : false;
+        }
+        // go relative to a given template?
+        if ($file[ 0 ] === '.' && $_template && $_template->_isSubTpl()
+            && preg_match('#^[.]{1,2}[\\\/]#', $file)
+        ) {
+            if ($_template->parent->source->type !== 'file' && $_template->parent->source->type !== 'extends'
+                && !isset($_template->parent->_cache[ 'allow_relative_path' ])
+            ) {
+                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
+            }
+            // normalize path
+            $path =
+                $source->smarty->_realpath(dirname($_template->parent->source->filepath) . DIRECTORY_SEPARATOR . $file);
+            // files relative to a template only get one shot
+            return is_file($path) ? $path : false;
+        }
+        // normalize DIRECTORY_SEPARATOR
+        if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) {
+            $file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file);
+        }
+        $_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
+        // template_dir index?
+        if ($file[ 0 ] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+            $file = $fileMatch[ 2 ];
+            $_indices = explode(',', $fileMatch[ 1 ]);
+            $_index_dirs = array();
+            foreach ($_indices as $index) {
+                $index = trim($index);
+                // try string indexes
+                if (isset($_directories[ $index ])) {
+                    $_index_dirs[] = $_directories[ $index ];
+                } elseif (is_numeric($index)) {
+                    // try numeric index
+                    $index = (int)$index;
+                    if (isset($_directories[ $index ])) {
+                        $_index_dirs[] = $_directories[ $index ];
+                    } else {
+                        // try at location index
+                        $keys = array_keys($_directories);
+                        if (isset($_directories[ $keys[ $index ] ])) {
+                            $_index_dirs[] = $_directories[ $keys[ $index ] ];
+                        }
+                    }
+                }
+            }
+            if (empty($_index_dirs)) {
+                // index not found
+                return false;
+            } else {
+                $_directories = $_index_dirs;
+            }
+        }
+        // relative file name?
+        foreach ($_directories as $_directory) {
+            $path = $_directory . $file;
+            if (is_file($path)) {
+                return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $source->smarty->_realpath($path) : $path;
+            }
+        }
+        if (!isset($_index_dirs)) {
+            // Could be relative to cwd
+            $path = $source->smarty->_realpath($file, true);
+            if (is_file($path)) {
+                return $path;
+            }
+        }
+        // Use include path ?
+        if ($source->smarty->use_include_path) {
+            return $source->smarty->ext->_getIncludePath->getIncludePath($_directories, $file, $source->smarty);
+        }
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_php.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_php.php
index 16c77446e..9d98ae181 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_php.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_php.php
@@ -2,126 +2,115 @@
 
 /**
  * Smarty Internal Plugin Resource PHP
- * 
  * Implements the file system as resource for PHP templates
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
-
-/**
- * Smarty Internal Plugin Resource PHP
- */
-class Smarty_Internal_Resource_PHP {
+class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
+{
     /**
-     * Class constructor, enable short open tags
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
      */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-        ini_set('short_open_tag', '1');
-    } 
-    // properties
-    public $usesCompiler = false;
-    public $isEvaluated = false;
+    public $uncompiled = true;
 
     /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
      */
-    public function isExisting($template)
-    {
-        if ($template->getTemplateFilepath() === false) {
-            return false;
-        } else {
-            return true;
-        } 
-    } 
+    public $hasCompiledHandler = true;
 
     /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string filepath to template source file
+     * container for short_open_tag directive's value before executing PHP templates
+     *
+     * @var string
      */
-    public function getTemplateFilepath($_template)
-    {
-        $_filepath = $_template->buildTemplateFilepath ();
-
-        if (is_object($_template->smarty->security_policy)) {
-            $_template->smarty->security_policy->isTrustedResourceDir($_filepath);
-        } 
-        $_template->templateUid = sha1($_filepath);
-        return $_filepath;
-    } 
+    protected $short_open_tag;
 
     /**
-     * Get timestamp to template source
-     * 
-     * @param object $_template template object
-     * @return integer timestamp of template source file
+     * Create a new PHP Resource
      */
-    public function getTemplateTimestamp($_template)
+    public function __construct()
     {
-        return filemtime($_template->getTemplateFilepath());
-    } 
+        $this->short_open_tag = function_exists('ini_get') ? ini_get('short_open_tag') : 1;
+    }
 
     /**
-     * Read template source from file
-     * 
-     * @param object $_template template object
-     * @return string content of template source file
+     * Load template's source from file into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
-    public function getTemplateSource($_template)
+    public function getContent(Smarty_Template_Source $source)
     {
-        if (file_exists($_tfp = $_template->getTemplateFilepath())) {
-            $_template->template_source = file_get_contents($_tfp);
-            return true;
-        } else {
-            return false;
-        } 
-    } 
+        if ($source->exists) {
+            return '';
+        }
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
 
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return boolean return false as compiled template is not stored
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object (is ignored)
      */
-    public function getCompiledFilepath($_template)
-    { 
-        // no filepath for PHP templates
-        return false;
-    } 
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = $_template->source->filepath;
+        $compiled->timestamp = $_template->source->timestamp;
+        $compiled->exists = $_template->source->exists;
+        $compiled->file_dependency[ $_template->source->uid ] =
+            array(
+                $compiled->filepath,
+                $compiled->timestamp,
+                $_template->source->type,
+            );
+    }
 
     /**
-     * renders the PHP template
+     * Render and output the template (without using the compiler)
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
      */
-    public function renderUncompiled($_smarty_template)
+    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
     {
-        if (!$this->smarty->allow_php_templates) {
-            throw new SmartyException("PHP templates are disabled");
-        } 
-        if ($this->getTemplateFilepath($_smarty_template) === false) {
-            throw new SmartyException("Unable to load template \"{$_smarty_template->resource_type} : {$_smarty_template->resource_name}\"");
-        } 
+        if (!$source->smarty->allow_php_templates) {
+            throw new SmartyException('PHP templates are disabled');
+        }
+        if (!$source->exists) {
+            throw new SmartyException(
+                "Unable to load template '{$source->type}:{$source->name}'" .
+                ($_template->_isSubTpl() ? " in '{$_template->parent->template_resource}'" : '')
+            );
+        }
         // prepare variables
-        $_smarty_ptr = $_smarty_template;
-        do {
-            foreach ($_smarty_ptr->tpl_vars as $_smarty_var => $_smarty_var_object) {
-                if (isset($_smarty_var_object->value)) {
-                    $$_smarty_var = $_smarty_var_object->value;
-                } 
-            } 
-            $_smarty_ptr = $_smarty_ptr->parent;
-        } while ($_smarty_ptr != null);
-        unset ($_smarty_var, $_smarty_var_object, $_smarty_ptr); 
-        // include PHP template
-        include($this->getTemplateFilepath($_smarty_template));
-        return;
-    } 
-} 
-
-?>
\ No newline at end of file
+        extract($_template->getTemplateVars());
+        // include PHP template with short open tags enabled
+        if (function_exists('ini_set')) {
+            ini_set('short_open_tag', '1');
+        }
+        /**
+         *
+         *
+         * @var Smarty_Internal_Template $_smarty_template
+         * used in included file
+         */
+        $_smarty_template = $_template;
+        include $source->filepath;
+        if (function_exists('ini_set')) {
+            ini_set('short_open_tag', $this->short_open_tag);
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php
index 467da11a8..df526101f 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php
@@ -1,143 +1,101 @@
 <?php
-
 /**
  * Smarty Internal Plugin Resource Registered
- * 
- * Implements the registered resource for Smarty template
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
- 
+
 /**
  * Smarty Internal Plugin Resource Registered
+ * Implements the registered resource for Smarty template
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @deprecated
  */
-class Smarty_Internal_Resource_Registered {
-    public function __construct($template, $resource_type = null)
-    {
-        $this->smarty = $template->smarty;
-        if (isset($resource_type)) {
-        	$template->smarty->registerResource($resource_type,
-        		array("smarty_resource_{$resource_type}_source",
-            		"smarty_resource_{$resource_type}_timestamp",
-                	"smarty_resource_{$resource_type}_secure",
-                	"smarty_resource_{$resource_type}_trusted"));
-        }
-    } 
-    // classes used for compiling Smarty templates from file resource
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-    // properties
-    public $usesCompiler = true;
-    public $isEvaluated = false;
-
+class Smarty_Internal_Resource_Registered extends Smarty_Resource
+{
     /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
      */
-    public function isExisting($_template)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        if (is_integer($_template->getTemplateTimestamp())) {
-            return true;
-        } else {
-            return false;
-        } 
-    } 
-    /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string return 'string' as template source is not a file
-     */
-    public function getTemplateFilepath($_template)
-    { 
-        $_filepath = $_template->resource_type .':'.$_template->resource_name;
-        $_template->templateUid = sha1($_filepath);
-        return $_filepath;
-    } 
+        $source->filepath = $source->type . ':' . $source->name;
+        $source->uid = sha1($source->filepath . $source->smarty->_joined_template_dir);
+        $source->timestamp = $this->getTemplateTimestamp($source);
+        $source->exists = !!$source->timestamp;
+    }
 
     /**
-     * Get timestamp of template source
-     * 
-     * @param object $_template template object
-     * @return int  timestamp
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return void
      */
-    public function getTemplateTimestamp($_template)
-    { 
-        // return timestamp
-        $time_stamp = false;
-        call_user_func_array($this->smarty->registered_resources[$_template->resource_type][0][1],
-            array($_template->resource_name, &$time_stamp, $this->smarty));
-        return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        $source->timestamp = $this->getTemplateTimestamp($source);
+        $source->exists = !!$source->timestamp;
     }
-     
+
     /**
-     * Get timestamp of template source by type and name
-     * 
-     * @param object $_template template object
-     * @return int  timestamp
+     * Get timestamp (epoch) the template source was modified
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
      */
-    public function getTemplateTimestampTypeName($_resource_type, $_resource_name)
-    { 
+    public function getTemplateTimestamp(Smarty_Template_Source $source)
+    {
         // return timestamp
         $time_stamp = false;
-        call_user_func_array($this->smarty->registered_resources[$_resource_type][0][1],
-            array($_resource_name, &$time_stamp, $this->smarty));
+        call_user_func_array(
+            $source->smarty->registered_resources[ $source->type ][ 0 ][ 1 ],
+            array($source->name, &$time_stamp, $source->smarty)
+        );
         return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
-    } 
+    }
 
     /**
-     * Retuen template source from resource name
-     * 
-     * @param object $_template template object
-     * @return string content of template source
+     * Load template's source by invoking the registered callback into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
-    public function getTemplateSource($_template)
-    { 
+    public function getContent(Smarty_Template_Source $source)
+    {
         // return template string
-        return call_user_func_array($this->smarty->registered_resources[$_template->resource_type][0][0],
-            array($_template->resource_name, &$_template->template_source, $this->smarty));
-    } 
+        $content = null;
+        $t = call_user_func_array(
+            $source->smarty->registered_resources[ $source->type ][ 0 ][ 0 ],
+            array($source->name, &$content, $source->smarty)
+        );
+        if (is_bool($t) && !$t) {
+            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+        }
+        return $content;
+    }
 
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return boolean return false as compiled template is not stored
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    public function getCompiledFilepath($_template)
-    { 
-        $_compile_id =  isset($_template->compile_id) ? preg_replace('![^\w\|]+!','_',$_template->compile_id) : null;
-        // calculate Uid if not already done
-        if ($_template->templateUid == '') {
-            $_template->getTemplateFilepath();
-        } 
-        $_filepath = $_template->templateUid; 
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        } 
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        } 
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        } 
-        $_compile_dir = $_template->smarty->compile_dir;
-        if (strpos('/\\', substr($_compile_dir, -1)) === false) {
-            $_compile_dir .= DS;
-        } 
-        return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php';
-    } 
-} 
-
-?>
\ No newline at end of file
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename($source->name);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php
index de2996e93..9956bd073 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php
@@ -1,99 +1,78 @@
 <?php
-
 /**
  * Smarty Internal Plugin Resource Stream
- * 
  * Implements the streams as resource for Smarty template
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
- 
+
 /**
  * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @link       http://php.net/streams
+ * @package    Smarty
+ * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_Stream {
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-    // classes used for compiling Smarty templates from file resource
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-    // properties
-    public $usesCompiler = true;
-    public $isEvaluated = true;
-
+class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
+{
     /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
      */
-    public function isExisting($template)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        if ($template->getTemplateSource() == '') {
-            return false;
+        if (strpos($source->resource, '://') !== false) {
+            $source->filepath = $source->resource;
         } else {
-            return true;
-        } 
-    } 
-    /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string return 'string' as template source is not a file
-     */
-    public function getTemplateFilepath($_template)
-    { 
-        // no filepath for strings
-        // return resource name for compiler error messages
-        return str_replace(':', '://', $_template->template_resource);
-    } 
+            $source->filepath = str_replace(':', '://', $source->resource);
+        }
+        $source->uid = false;
+        $source->content = $this->getContent($source);
+        $source->timestamp = $source->exists = !!$source->content;
+    }
 
     /**
-     * Get timestamp to template source
-     * 
-     * @param object $_template template object
-     * @return boolean false as string resources have no timestamp
+     * Load template's source from stream into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
      */
-    public function getTemplateTimestamp($_template)
-    { 
-        // strings must always be compiled and have no timestamp
-        return false;
-    } 
-
-    /**
-     * Retuen template source from resource name
-     * 
-     * @param object $_template template object
-     * @return string content of template source
-     */
-    public function getTemplateSource($_template)
-    { 
-        // return template string
-        $_template->template_source = '';
-        $fp = fopen(str_replace(':', '://', $_template->template_resource),'r+');
-        while (!feof($fp)) {
-            $_template->template_source .= fgets($fp);
-        } 
-        fclose($fp);
-
-        return true;
-    } 
+    public function getContent(Smarty_Template_Source $source)
+    {
+        $t = '';
+        // the availability of the stream has already been checked in Smarty_Resource::fetch()
+        $fp = fopen($source->filepath, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $t .= $current_line;
+            }
+            fclose($fp);
+            return $t;
+        } else {
+            return false;
+        }
+    }
 
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return boolean return false as compiled template is not stored
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
      */
-    public function getCompiledFilepath($_template)
-    { 
-        // no filepath for strings
-        return false;
-    } 
-} 
-
-?>
\ No newline at end of file
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        return get_class($this) . '#' . $resource_name;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_string.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_string.php
index 9368f0406..3fecbb7ef 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_string.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_string.php
@@ -1,133 +1,108 @@
 <?php
-
 /**
  * Smarty Internal Plugin Resource String
- * 
- * Implements the strings as resource for Smarty template
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews 
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
- 
+
 /**
  * Smarty Internal Plugin Resource String
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_String {
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-    // classes used for compiling Smarty templates from file resource
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-    // properties
-    public $usesCompiler = true;
-    public $isEvaluated = false;
-
+class Smarty_Internal_Resource_String extends Smarty_Resource
+{
     /**
-     * Return flag if template source is existing
-     * 
-     * @return boolean true
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
      */
-    public function isExisting($template)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        return true;
-    } 
+        $source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
+        $source->timestamp = $source->exists = true;
+    }
 
     /**
-     * Get filepath to template source
-     * 
-     * @param object $_template template object
-     * @return string return 'string' as template source is not a file
+     * Load template's source from $resource_name into current template object
+     *
+     * @uses decode() to decode base64 and urlencoded template_resources
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
      */
-    public function getTemplateFilepath($_template)
-    { 
-        $_template->templateUid = sha1($_template->resource_name);
-        // no filepath for strings
-        // return "string" for compiler error messages
-        return 'string:';
-    } 
+    public function getContent(Smarty_Template_Source $source)
+    {
+        return $this->decode($source->name);
+    }
 
     /**
-     * Get timestamp to template source
-     * 
-     * @param object $_template template object
-     * @return boolean false as string resources have no timestamp
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     *
+     * @return string decoded template_resource
      */
-    public function getTemplateTimestamp($_template)
-    { 
-        if ($this->isEvaluated) {
-        	//must always be compiled and have no timestamp
-        	return false;
-        } else {
-        	return 0;
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
         }
-    } 
+        return $string;
+    }
 
     /**
-     * Get timestamp of template source by type and name
-     * 
-     * @param object $_template template object
-     * @return int  timestamp (always 0)
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
      */
-    public function getTemplateTimestampTypeName($_resource_type, $_resource_name)
-    { 
-        // return timestamp 0
-        return 0;
-    } 
-
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        return get_class($this) . '#' . $this->decode($resource_name);
+    }
 
     /**
-     * Retuen template source from resource name
-     * 
-     * @param object $_template template object
-     * @return string content of template source
+     * Determine basename for compiled filename
+     * Always returns an empty string.
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    public function getTemplateSource($_template)
-    { 
-        // return template string
-        $_template->template_source = $_template->resource_name;
-        return true;
-    } 
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return '';
+    }
 
+    /*
+        * Disable timestamp checks for string resource.
+        *
+        * @return bool
+        */
     /**
-     * Get filepath to compiled template
-     * 
-     * @param object $_template template object
-     * @return boolean return false as compiled template is not stored
+     * @return bool
      */
-    public function getCompiledFilepath($_template)
+    public function checkTimestamps()
     {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        // calculate Uid if not already done
-        if ($_template->templateUid == '') {
-            $_template->getTemplateFilepath();
-        } 
-        $_filepath = $_template->templateUid; 
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        } 
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        } 
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        } 
-        $_compile_dir = $_template->smarty->compile_dir;
-        if (strpos('/\\', substr($_compile_dir, -1)) === false) {
-            $_compile_dir .= DS;
-        } 
-        return $_compile_dir . $_filepath . '.' . $_template->resource_type . $_cache . '.php';
-    } 
-} 
-
-?>
\ No newline at end of file
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cachemodify.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cachemodify.php
new file mode 100644
index 000000000..6e12d2ae1
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cachemodify.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_CacheModify
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $content
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
+        $_last_modified_date =
+            @substr($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ], 0, strpos($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ], 'GMT') + 3);
+        if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+            switch (PHP_SAPI) {
+                case 'cgi': // php-cgi < 5.3
+                case 'cgi-fcgi': // php-cgi >= 5.3
+                case 'fpm-fcgi': // php-fpm >= 5.3.3
+                    header('Status: 304 Not Modified');
+                    break;
+                case 'cli':
+                    if (/* ^phpunit */
+                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
+                    ) {
+                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
+                    }
+                    break;
+                default:
+                    if (/* ^phpunit */
+                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
+                    ) {
+                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
+                    } else {
+                        header($_SERVER[ 'SERVER_PROTOCOL' ] . ' 304 Not Modified');
+                    }
+                    break;
+            }
+        } else {
+            switch (PHP_SAPI) {
+                case 'cli':
+                    if (/* ^phpunit */
+                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
+                    ) {
+                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] =
+                            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+                    }
+                    break;
+                default:
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+                    break;
+            }
+            echo $content;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cacheresourcefile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cacheresourcefile.php
new file mode 100644
index 000000000..287096438
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_cacheresourcefile.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Smarty cache resource file clear method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Runtime Cache Resource File Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_CacheResourceFile
+{
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+        $_dir = $smarty->getCacheDir();
+        if ($_dir === '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . '/';
+                }
+            }
+        }
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+            if ($tpl->source->exists) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+            } else {
+                return 0;
+            }
+        }
+        $_count = 0;
+        $_time = time();
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+                    continue;
+                }
+                $_filepath = (string)$_file;
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    }
+                } else {
+                    // delete only php files
+                    if (substr($_filepath, -4) !== '.php') {
+                        continue;
+                    }
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
+                    $_parts_count = count($_parts);
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
+                            continue;
+                        }
+                    }
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
+                                                || $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
+                    ) {
+                        continue;
+                    }
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+                            $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        }
+                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+                            if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
+                                continue 2;
+                            }
+                        }
+                    }
+                    if (is_file($_filepath)) {
+                        // expired ?
+                        if (isset($exp_time)) {
+                            if ($exp_time < 0) {
+                                preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
+                                if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
+                                    continue;
+                                }
+                            } else {
+                                if ($_time - filemtime($_filepath) < $exp_time) {
+                                    continue;
+                                }
+                            }
+                        }
+                        $_count += @unlink($_filepath) ? 1 : 0;
+                        if (function_exists('opcache_invalidate')
+                            && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+                        ) {
+                            opcache_invalidate($_filepath, true);
+                        } elseif (function_exists('apc_delete_file')) {
+                            apc_delete_file($_filepath);
+                        }
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_capture.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_capture.php
new file mode 100644
index 000000000..c9dca83d9
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_capture.php
@@ -0,0 +1,174 @@
+<?php
+
+/**
+ * Runtime Extension Capture
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Capture
+{
+    /**
+     * Flag that this instance  will not be cached
+     *
+     * @var bool
+     */
+    public $isPrivateExtension = true;
+
+    /**
+     * Stack of capture parameter
+     *
+     * @var array
+     */
+    private $captureStack = array();
+
+    /**
+     * Current open capture sections
+     *
+     * @var int
+     */
+    private $captureCount = 0;
+
+    /**
+     * Count stack
+     *
+     * @var int[]
+     */
+    private $countStack = array();
+
+    /**
+     * Named buffer
+     *
+     * @var string[]
+     */
+    private $namedBuffer = array();
+
+    /**
+     * Flag if callbacks are registered
+     *
+     * @var bool
+     */
+    private $isRegistered = false;
+
+    /**
+     * Open capture section
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $buffer capture name
+     * @param string                    $assign variable name
+     * @param string                    $append variable name
+     */
+    public function open(Smarty_Internal_Template $_template, $buffer, $assign, $append)
+    {
+        if (!$this->isRegistered) {
+            $this->register($_template);
+        }
+        $this->captureStack[] = array(
+            $buffer,
+            $assign,
+            $append
+        );
+        $this->captureCount++;
+        ob_start();
+    }
+
+    /**
+     * Register callbacks in template class
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    private function register(Smarty_Internal_Template $_template)
+    {
+        $_template->startRenderCallbacks[] = array(
+            $this,
+            'startRender'
+        );
+        $_template->endRenderCallbacks[] = array(
+            $this,
+            'endRender'
+        );
+        $this->startRender($_template);
+        $this->isRegistered = true;
+    }
+
+    /**
+     * Start render callback
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    public function startRender(Smarty_Internal_Template $_template)
+    {
+        $this->countStack[] = $this->captureCount;
+        $this->captureCount = 0;
+    }
+
+    /**
+     * Close capture section
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @throws \SmartyException
+     */
+    public function close(Smarty_Internal_Template $_template)
+    {
+        if ($this->captureCount) {
+            list($buffer, $assign, $append) = array_pop($this->captureStack);
+            $this->captureCount--;
+            if (isset($assign)) {
+                $_template->assign($assign, ob_get_contents());
+            }
+            if (isset($append)) {
+                $_template->append($append, ob_get_contents());
+            }
+            $this->namedBuffer[ $buffer ] = ob_get_clean();
+        } else {
+            $this->error($_template);
+        }
+    }
+
+    /**
+     * Error exception on not matching {capture}{/capture}
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @throws \SmartyException
+     */
+    public function error(Smarty_Internal_Template $_template)
+    {
+        throw new SmartyException("Not matching {capture}{/capture} in '{$_template->template_resource}'");
+    }
+
+    /**
+     * Return content of named capture buffer by key or as array
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string|null               $name
+     *
+     * @return string|string[]|null
+     */
+    public function getBuffer(Smarty_Internal_Template $_template, $name = null)
+    {
+        if (isset($name)) {
+            return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null;
+        } else {
+            return $this->namedBuffer;
+        }
+    }
+
+    /**
+     * End render callback
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @throws \SmartyException
+     */
+    public function endRender(Smarty_Internal_Template $_template)
+    {
+        if ($this->captureCount) {
+            $this->error($_template);
+        } else {
+            $this->captureCount = array_pop($this->countStack);
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
new file mode 100644
index 000000000..983ca6180
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class Smarty_Internal_Extension_CodeFrame
+ * Create code frame for compiled and cached templates
+ */
+class Smarty_Internal_Runtime_CodeFrame
+{
+    /**
+     * Create code frame for compiled and cached templates
+     *
+     * @param Smarty_Internal_Template              $_template
+     * @param string                                $content   optional template content
+     * @param string                                $functions compiled template function and block code
+     * @param bool                                  $cache     flag for cache file
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @return string
+     */
+    public function create(
+        Smarty_Internal_Template $_template,
+        $content = '',
+        $functions = '',
+        $cache = false,
+        Smarty_Internal_TemplateCompilerBase $compiler = null
+    ) {
+        // build property code
+        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
+            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
+            $properties[ 'includes' ] = $_template->compiled->includes;
+        } else {
+            $properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
+            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
+            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+        }
+        $output = "<?php\n";
+        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . strftime("%Y-%m-%d %H:%M:%S") .
+                   "\n  from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
+        $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
+        $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
+               ($cache ? 'true' : 'false') . ')';
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n";
+        if (!$cache && !empty($compiler->tpl_function)) {
+            $output .= '$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions($_smarty_tpl, ';
+            $output .= var_export($compiler->tpl_function, true);
+            $output .= ");\n";
+        }
+        if ($cache && isset($_template->smarty->ext->_tplFunction)) {
+            $output .= "\$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
+                       var_export($_template->smarty->ext->_tplFunction->getTplFunction($_template), true) . ");\n";
+        }
+        $output .= "?>";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
+            $curr_split = preg_split(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output
+            );
+            preg_match_all(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output,
+                $curr_parts
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+                if (isset($curr_parts[ 0 ][ $idx ])) {
+                    $output .= "\n";
+                }
+            }
+        }
+        if (preg_match('/\?>\s*$/', $output)) {
+            $curr_split = preg_split(
+                '/\?>\s*$/',
+                $output
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+            }
+        }
+        return $output;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_filterhandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_filterhandler.php
new file mode 100644
index 000000000..9f868e1a4
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_filterhandler.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Smarty Internal Plugin Filter Handler
+ * Smarty filter handler class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class for filter processing
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_FilterHandler
+{
+    /**
+     * Run filters over content
+     * The filters will be lazy loaded if required
+     * class name format: Smarty_FilterType_FilterName
+     * plugin filename format: filtertype.filtername.php
+     * Smarty2 filter plugins could be used
+     *
+     * @param string                   $type     the type of filter ('pre','post','output') which shall run
+     * @param string                   $content  the content which shall be processed by the filters
+     * @param Smarty_Internal_Template $template template object
+     *
+     * @throws SmartyException
+     * @return string                   the filtered content
+     */
+    public function runFilter($type, $content, Smarty_Internal_Template $template)
+    {
+        // loop over autoload filters of specified type
+        if (!empty($template->smarty->autoload_filters[ $type ])) {
+            foreach ((array)$template->smarty->autoload_filters[ $type ] as $name) {
+                $plugin_name = "Smarty_{$type}filter_{$name}";
+                if (function_exists($plugin_name)) {
+                    $callback = $plugin_name;
+                } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                    $callback = array($plugin_name, 'execute');
+                } elseif ($template->smarty->loadPlugin($plugin_name, false)) {
+                    if (function_exists($plugin_name)) {
+                        // use loaded Smarty2 style plugin
+                        $callback = $plugin_name;
+                    } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                        // loaded class of filter plugin
+                        $callback = array($plugin_name, 'execute');
+                    } else {
+                        throw new SmartyException("Auto load {$type}-filter plugin method '{$plugin_name}::execute' not callable");
+                    }
+                } else {
+                    // nothing found, throw exception
+                    throw new SmartyException("Unable to auto load {$type}-filter plugin '{$plugin_name}'");
+                }
+                $content = call_user_func($callback, $content, $template);
+            }
+        }
+        // loop over registered filters of specified type
+        if (!empty($template->smarty->registered_filters[ $type ])) {
+            foreach ($template->smarty->registered_filters[ $type ] as $key => $name) {
+                $content = call_user_func($template->smarty->registered_filters[ $type ][ $key ], $content, $template);
+            }
+        }
+        // return filtered output
+        return $content;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_foreach.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_foreach.php
new file mode 100644
index 000000000..badead165
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_foreach.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * Foreach Runtime Methods count(), init(), restore()
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Foreach
+{
+    /**
+     * Stack of saved variables
+     *
+     * @var array
+     */
+    private $stack = array();
+
+    /**
+     * Init foreach loop
+     *  - save item and key variables, named foreach property data if defined
+     *  - init item and key variables, named foreach property data if required
+     *  - count total if required
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param mixed                     $from       values to loop over
+     * @param string                    $item       variable name
+     * @param bool                      $needTotal  flag if we need to count values
+     * @param null|string               $key        variable name
+     * @param null|string               $name       of named foreach
+     * @param array                     $properties of named foreach
+     *
+     * @return mixed $from
+     */
+    public function init(
+        Smarty_Internal_Template $tpl,
+        $from,
+        $item,
+        $needTotal = false,
+        $key = null,
+        $name = null,
+        $properties = array()
+    ) {
+        $needTotal = $needTotal || isset($properties[ 'total' ]);
+        $saveVars = array();
+        $total = null;
+        if (!is_array($from)) {
+            if (is_object($from)) {
+                if ($needTotal) {
+                    $total = $this->count($from);
+                }
+            } else {
+                settype($from, 'array');
+            }
+        }
+        if (!isset($total)) {
+            $total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
+        }
+        if (isset($tpl->tpl_vars[ $item ])) {
+            $saveVars[ 'item' ] = array(
+                $item,
+                $tpl->tpl_vars[ $item ]
+            );
+        }
+        $tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
+        if ($total === 0) {
+            $from = null;
+        } else {
+            if ($key) {
+                if (isset($tpl->tpl_vars[ $key ])) {
+                    $saveVars[ 'key' ] = array(
+                        $key,
+                        $tpl->tpl_vars[ $key ]
+                    );
+                }
+                $tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
+            }
+        }
+        if ($needTotal) {
+            $tpl->tpl_vars[ $item ]->total = $total;
+        }
+        if ($name) {
+            $namedVar = "__smarty_foreach_{$name}";
+            if (isset($tpl->tpl_vars[ $namedVar ])) {
+                $saveVars[ 'named' ] = array(
+                    $namedVar,
+                    $tpl->tpl_vars[ $namedVar ]
+                );
+            }
+            $namedProp = array();
+            if (isset($properties[ 'total' ])) {
+                $namedProp[ 'total' ] = $total;
+            }
+            if (isset($properties[ 'iteration' ])) {
+                $namedProp[ 'iteration' ] = 0;
+            }
+            if (isset($properties[ 'index' ])) {
+                $namedProp[ 'index' ] = -1;
+            }
+            if (isset($properties[ 'show' ])) {
+                $namedProp[ 'show' ] = ($total > 0);
+            }
+            $tpl->tpl_vars[ $namedVar ] = new Smarty_Variable($namedProp);
+        }
+        $this->stack[] = $saveVars;
+        return $from;
+    }
+
+    /**
+     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+     *
+     * @param mixed $value
+     *
+     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+     *               for empty elements
+     */
+    public function count($value)
+    {
+        if ($value instanceof IteratorAggregate) {
+            // Note: getIterator() returns a Traversable, not an Iterator
+            // thus rewind() and valid() methods may not be present
+            return iterator_count($value->getIterator());
+        } elseif ($value instanceof Iterator) {
+            return $value instanceof Generator ? 1 : iterator_count($value);
+        } elseif ($value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        }
+        return count((array)$value);
+    }
+
+    /**
+     * Restore saved variables
+     *
+     * will be called by {break n} or {continue n} for the required number of levels
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param int                       $levels number of levels
+     */
+    public function restore(Smarty_Internal_Template $tpl, $levels = 1)
+    {
+        while ($levels) {
+            $saveVars = array_pop($this->stack);
+            if (!empty($saveVars)) {
+                if (isset($saveVars[ 'item' ])) {
+                    $item = &$saveVars[ 'item' ];
+                    $tpl->tpl_vars[ $item[ 0 ] ]->value = $item[ 1 ]->value;
+                }
+                if (isset($saveVars[ 'key' ])) {
+                    $tpl->tpl_vars[ $saveVars[ 'key' ][ 0 ] ] = $saveVars[ 'key' ][ 1 ];
+                }
+                if (isset($saveVars[ 'named' ])) {
+                    $tpl->tpl_vars[ $saveVars[ 'named' ][ 0 ] ] = $saveVars[ 'named' ][ 1 ];
+                }
+            }
+            $levels--;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_getincludepath.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_getincludepath.php
new file mode 100644
index 000000000..5ae98304e
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_getincludepath.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Smarty read include path plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_GetIncludePath
+{
+    /**
+     * include path cache
+     *
+     * @var string
+     */
+    public $_include_path = '';
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_include_dirs = array();
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_user_dirs = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[][]
+     */
+    public $isFile = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isPath = array();
+
+    /**
+     * stream cache
+     *
+     * @var int[]
+     */
+    public $number = array();
+
+    /**
+     * status cache
+     *
+     * @var bool
+     */
+    public $_has_stream_include = null;
+
+    /**
+     * Number for array index
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Check if include path was updated
+     *
+     * @param \Smarty $smarty
+     *
+     * @return bool
+     */
+    public function isNewIncludePath(Smarty $smarty)
+    {
+        $_i_path = get_include_path();
+        if ($this->_include_path !== $_i_path) {
+            $this->_include_dirs = array();
+            $this->_include_path = $_i_path;
+            $_dirs = (array)explode(PATH_SEPARATOR, $_i_path);
+            foreach ($_dirs as $_path) {
+                if (is_dir($_path)) {
+                    $this->_include_dirs[] = $smarty->_realpath($_path . DIRECTORY_SEPARATOR, true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * return array with include path directories
+     *
+     * @param \Smarty $smarty
+     *
+     * @return array
+     */
+    public function getIncludePathDirs(Smarty $smarty)
+    {
+        $this->isNewIncludePath($smarty);
+        return $this->_include_dirs;
+    }
+
+    /**
+     * Return full file path from PHP include_path
+     *
+     * @param string[] $dirs
+     * @param string   $file
+     * @param \Smarty  $smarty
+     *
+     * @return bool|string full filepath or false
+     */
+    public function getIncludePath($dirs, $file, Smarty $smarty)
+    {
+        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
+        if (!(isset($this->_has_stream_include) ? $this->_has_stream_include :
+            $this->_has_stream_include = function_exists('stream_resolve_include_path'))
+        ) {
+            $this->isNewIncludePath($smarty);
+        }
+        // try PHP include_path
+        foreach ($dirs as $dir) {
+            $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter++;
+            if (isset($this->isFile[ $dir_n ][ $file ])) {
+                if ($this->isFile[ $dir_n ][ $file ]) {
+                    return $this->isFile[ $dir_n ][ $file ];
+                } else {
+                    continue;
+                }
+            }
+            if (isset($this->_user_dirs[ $dir_n ])) {
+                if (false === $this->_user_dirs[ $dir_n ]) {
+                    continue;
+                } else {
+                    $dir = $this->_user_dirs[ $dir_n ];
+                }
+            } else {
+                if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
+                    $dir = str_ireplace(getcwd(), '.', $dir);
+                    if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
+                        $this->_user_dirs[ $dir_n ] = false;
+                        continue;
+                    }
+                }
+                $dir = substr($dir, 2);
+                $this->_user_dirs[ $dir_n ] = $dir;
+            }
+            if ($this->_has_stream_include) {
+                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
+                if ($path) {
+                    return $this->isFile[ $dir_n ][ $file ] = $path;
+                }
+            } else {
+                foreach ($this->_include_dirs as $key => $_i_path) {
+                    $path = isset($this->isPath[ $key ][ $dir_n ]) ? $this->isPath[ $key ][ $dir_n ] :
+                        $this->isPath[ $key ][ $dir_n ] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
+                    if ($path === false) {
+                        continue;
+                    }
+                    if (isset($file)) {
+                        $_file = $this->isFile[ $dir_n ][ $file ] = (is_file($path . $file)) ? $path . $file : false;
+                        if ($_file) {
+                            return $_file;
+                        }
+                    } else {
+                        // no file was given return directory path
+                        return $path;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_inheritance.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_inheritance.php
new file mode 100644
index 000000000..8f7f02d59
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_inheritance.php
@@ -0,0 +1,251 @@
+<?php
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_Inheritance
+{
+    /**
+     * State machine
+     * - 0 idle next extends will create a new inheritance tree
+     * - 1 processing child template
+     * - 2 wait for next inheritance template
+     * - 3 assume parent template, if child will loaded goto state 1
+     *     a call to a sub template resets the state to 0
+     *
+     * @var int
+     */
+    public $state = 0;
+
+    /**
+     * Array of root child {block} objects
+     *
+     * @var Smarty_Internal_Block[]
+     */
+    public $childRoot = array();
+
+    /**
+     * inheritance template nesting level
+     *
+     * @var int
+     */
+    public $inheritanceLevel = 0;
+
+    /**
+     * inheritance template index
+     *
+     * @var int
+     */
+    public $tplIndex = -1;
+
+    /**
+     * Array of template source objects
+     *
+     * @var Smarty_Template_Source[]
+     */
+    public $sources = array();
+
+    /**
+     * Stack of source objects while executing block code
+     *
+     * @var Smarty_Template_Source[]
+     */
+    public $sourceStack = array();
+
+    /**
+     * Initialize inheritance
+     *
+     * @param \Smarty_Internal_Template $tpl        template object of caller
+     * @param bool                      $initChild  if true init for child template
+     * @param array                     $blockNames outer level block name
+     */
+    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
+    {
+        // if called while executing parent template it must be a sub-template with new inheritance root
+        if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
+            $tpl->inheritance = new Smarty_Internal_Runtime_Inheritance();
+            $tpl->inheritance->init($tpl, $initChild, $blockNames);
+            return;
+        }
+        ++$this->tplIndex;
+        $this->sources[ $this->tplIndex ] = $tpl->source;
+        // start of child sub template(s)
+        if ($initChild) {
+            $this->state = 1;
+            if (!$this->inheritanceLevel) {
+                //grab any output of child templates
+                ob_start();
+            }
+            ++$this->inheritanceLevel;
+            //           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
+            //           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
+        }
+        // if state was waiting for parent change state to parent
+        if ($this->state === 2) {
+            $this->state = 3;
+        }
+    }
+
+    /**
+     * End of child template(s)
+     * - if outer level is reached flush output buffer and switch to wait for parent template state
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param null|string               $template optional name of inheritance parent template
+     * @param null|string               $uid      uid of inline template
+     * @param null|string               $func     function call name of inline template
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function endChild(Smarty_Internal_Template $tpl, $template = null, $uid = null, $func = null)
+    {
+        --$this->inheritanceLevel;
+        if (!$this->inheritanceLevel) {
+            ob_end_clean();
+            $this->state = 2;
+        }
+        if (isset($template) && (($tpl->parent->_isTplObj() && $tpl->parent->source->type !== 'extends')
+                                 || $tpl->smarty->extends_recursion)
+        ) {
+            $tpl->_subTemplateRender(
+                $template,
+                $tpl->cache_id,
+                $tpl->compile_id,
+                $tpl->caching ? 9999 : 0,
+                $tpl->cache_lifetime,
+                array(),
+                2,
+                false,
+                $uid,
+                $func
+            );
+        }
+    }
+
+    /**
+     * Smarty_Internal_Block constructor.
+     * - if outer level {block} of child template ($state === 1) save it as child root block
+     * - otherwise process inheritance and render
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param                           $className
+     * @param string                    $name
+     * @param int|null                  $tplIndex index of outer level {block} if nested
+     *
+     * @throws \SmartyException
+     */
+    public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
+    {
+        $block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex);
+        if (isset($this->childRoot[ $name ])) {
+            $block->child = $this->childRoot[ $name ];
+        }
+        if ($this->state === 1) {
+            $this->childRoot[ $name ] = $block;
+            return;
+        }
+        // make sure we got child block of child template of current block
+        while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
+            $block->child = $block->child->child;
+        }
+        $this->process($tpl, $block);
+    }
+
+    /**
+     * Goto child block or render this
+     *
+     * @param \Smarty_Internal_Template   $tpl
+     * @param \Smarty_Internal_Block      $block
+     * @param \Smarty_Internal_Block|null $parent
+     *
+     * @throws \SmartyException
+     */
+    public function process(
+        Smarty_Internal_Template $tpl,
+        Smarty_Internal_Block $block,
+        Smarty_Internal_Block $parent = null
+    ) {
+        if ($block->hide && !isset($block->child)) {
+            return;
+        }
+        if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
+            $block->child = null;
+        }
+        $block->parent = $parent;
+        if ($block->append && !$block->prepend && isset($parent)) {
+            $this->callParent($tpl, $block, '\'{block append}\'');
+        }
+        if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
+            $this->callBlock($block, $tpl);
+        } else {
+            $this->process($tpl, $block->child, $block);
+        }
+        if ($block->prepend && isset($parent)) {
+            $this->callParent($tpl, $block, '{block prepend}');
+            if ($block->append) {
+                if ($block->callsChild || !isset($block->child)
+                    || ($block->child->hide && !isset($block->child->child))
+                ) {
+                    $this->callBlock($block, $tpl);
+                } else {
+                    $this->process($tpl, $block->child, $block);
+                }
+            }
+        }
+        $block->parent = null;
+    }
+
+    /**
+     * Render child on \$smarty.block.child
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param \Smarty_Internal_Block    $block
+     *
+     * @return null|string block content
+     * @throws \SmartyException
+     */
+    public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
+    {
+        if (isset($block->child)) {
+            $this->process($tpl, $block->child, $block);
+        }
+    }
+
+    /**
+     * Render parent block on \$smarty.block.parent or {block append/prepend}
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param \Smarty_Internal_Block    $block
+     * @param string                    $tag
+     *
+     * @return null|string  block content
+     * @throws \SmartyException
+     */
+    public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block, $tag)
+    {
+        if (isset($block->parent)) {
+            $this->callBlock($block->parent, $tpl);
+        } else {
+            throw new SmartyException("inheritance: illegal '{$tag}' used in child template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
+        }
+    }
+
+    /**
+     * render block
+     *
+     * @param \Smarty_Internal_Block    $block
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function callBlock(Smarty_Internal_Block $block, Smarty_Internal_Template $tpl)
+    {
+        $this->sourceStack[] = $tpl->source;
+        $tpl->source = $this->sources[ $block->tplIndex ];
+        $block->callBlock($tpl);
+        $tpl->source = array_pop($this->sourceStack);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
new file mode 100644
index 000000000..53069148d
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * {make_nocache} Runtime Methods save(), store()
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Make_Nocache
+{
+    /**
+     * Save current variable value while rendering compiled template and inject nocache code to
+     * assign variable value in cahed template
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $var variable name
+     *
+     * @throws \SmartyException
+     */
+    public function save(Smarty_Internal_Template $tpl, $var)
+    {
+        if (isset($tpl->tpl_vars[ $var ])) {
+            $export =
+                preg_replace('/^Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
+            if (preg_match('/(\w+)::__set_state/', $export, $match)) {
+                throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
+            }
+            echo "/*%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/<?php " .
+                 addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', ", '\\') .
+                 $export . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
+        }
+    }
+
+    /**
+     * Store variable value saved while rendering compiled template in cached template context
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $var variable name
+     * @param array                     $properties
+     */
+    public function store(Smarty_Internal_Template $tpl, $var, $properties)
+    {
+        // do not overwrite existing nocache variables
+        if (!isset($tpl->tpl_vars[ $var ]) || !$tpl->tpl_vars[ $var ]->nocache) {
+            $newVar = new Smarty_Variable();
+            unset($properties[ 'nocache' ]);
+            foreach ($properties as $k => $v) {
+                $newVar->$k = $v;
+            }
+            $tpl->tpl_vars[ $var ] = $newVar;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_tplfunction.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_tplfunction.php
new file mode 100644
index 000000000..e5f8e48f7
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_tplfunction.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * TplFunction Runtime Methods callTemplateFunction
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_TplFunction
+{
+    /**
+     * Call template function
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $name    template function name
+     * @param array                     $params  parameter array
+     * @param bool                      $nocache true if called nocache
+     *
+     * @throws \SmartyException
+     */
+    public function callTemplateFunction(Smarty_Internal_Template $tpl, $name, $params, $nocache)
+    {
+        $funcParam = isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
+            (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : null);
+        if (isset($funcParam)) {
+            if (!$tpl->caching || ($tpl->caching && $nocache)) {
+                $function = $funcParam[ 'call_name' ];
+            } else {
+                if (isset($funcParam[ 'call_name_caching' ])) {
+                    $function = $funcParam[ 'call_name_caching' ];
+                } else {
+                    $function = $funcParam[ 'call_name' ];
+                }
+            }
+            if (function_exists($function)) {
+                $this->saveTemplateVariables($tpl, $name);
+                $function($tpl, $params);
+                $this->restoreTemplateVariables($tpl, $name);
+                return;
+            }
+            // try to load template function dynamically
+            if ($this->addTplFuncToCache($tpl, $name, $function)) {
+                $this->saveTemplateVariables($tpl, $name);
+                $function($tpl, $params);
+                $this->restoreTemplateVariables($tpl, $name);
+                return;
+            }
+        }
+        throw new SmartyException("Unable to find template function '{$name}'");
+    }
+
+    /**
+     * Register template functions defined by template
+     *
+     * @param \Smarty|\Smarty_Internal_Template|\Smarty_Internal_TemplateBase $obj
+     * @param array                                                           $tplFunctions source information array of
+     *                                                                                      template functions defined
+     *                                                                                      in template
+     * @param bool                                                            $override     if true replace existing
+     *                                                                                      functions with same name
+     */
+    public function registerTplFunctions(Smarty_Internal_TemplateBase $obj, $tplFunctions, $override = true)
+    {
+        $obj->tplFunctions =
+            $override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions);
+        // make sure that the template functions are known in parent templates
+        if ($obj->_isSubTpl()) {
+            $obj->smarty->ext->_tplFunction->registerTplFunctions($obj->parent, $tplFunctions, false);
+        } else {
+            $obj->smarty->tplFunctions = $override ? array_merge($obj->smarty->tplFunctions, $tplFunctions) :
+                array_merge($tplFunctions, $obj->smarty->tplFunctions);
+        }
+    }
+
+    /**
+     * Return source parameter array for single or all template functions
+     *
+     * @param \Smarty_Internal_Template $tpl  template object
+     * @param null|string               $name template function name
+     *
+     * @return array|bool|mixed
+     */
+    public function getTplFunction(Smarty_Internal_Template $tpl, $name = null)
+    {
+        if (isset($name)) {
+            return isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
+                (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : false);
+        } else {
+            return empty($tpl->tplFunctions) ? $tpl->smarty->tplFunctions : $tpl->tplFunctions;
+        }
+    }
+
+    /**
+     * Add template function to cache file for nocache calls
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param string                   $_name     template function name
+     * @param string                   $_function PHP function name
+     *
+     * @return bool
+     */
+    public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
+    {
+        $funcParam = $tpl->tplFunctions[ $_name ];
+        if (is_file($funcParam[ 'compiled_filepath' ])) {
+            // read compiled file
+            $code = file_get_contents($funcParam[ 'compiled_filepath' ]);
+            // grab template function
+            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+                // grab source info from file dependency
+                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+                unset($code);
+                // make PHP function known
+                eval($match[ 0 ]);
+                if (function_exists($_function)) {
+                    // search cache file template
+                    $tplPtr = $tpl;
+                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
+                        $tplPtr = $tplPtr->parent;
+                    }
+                    // add template function code to cache file
+                    if (isset($tplPtr->cached)) {
+                        $content = $tplPtr->cached->read($tplPtr);
+                        if ($content) {
+                            // check if we must update file dependency
+                            if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+                                $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+                            }
+                            $tplPtr->smarty->ext->_updateCache->write(
+                                $tplPtr,
+                                preg_replace('/\s*\?>\s*$/', "\n", $content) .
+                                "\n" . preg_replace(
+                                    array(
+                                        '/^\s*<\?php\s+/',
+                                        '/\s*\?>\s*$/',
+                                    ),
+                                    "\n",
+                                    $match[ 0 ]
+                                )
+                            );
+                        }
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Save current template variables on stack
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $name stack name
+     */
+    public function saveTemplateVariables(Smarty_Internal_Template $tpl, $name)
+    {
+        $tpl->_cache[ 'varStack' ][] =
+            array('tpl' => $tpl->tpl_vars, 'config' => $tpl->config_vars, 'name' => "_tplFunction_{$name}");
+    }
+
+    /**
+     * Restore saved variables into template objects
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $name stack name
+     */
+    public function restoreTemplateVariables(Smarty_Internal_Template $tpl, $name)
+    {
+        if (isset($tpl->_cache[ 'varStack' ])) {
+            $vars = array_pop($tpl->_cache[ 'varStack' ]);
+            $tpl->tpl_vars = $vars[ 'tpl' ];
+            $tpl->config_vars = $vars[ 'config' ];
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatecache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatecache.php
new file mode 100644
index 000000000..c1abbb321
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatecache.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_UpdateCache
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+    }
+
+    /**
+     * Cache was invalid , so render from compiled and write to cache
+     *
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param                           $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter)
+    {
+        ob_start();
+        if (!isset($_template->compiled)) {
+            $_template->loadCompiled();
+        }
+        $_template->compiled->render($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_cache($_template);
+        }
+        $this->removeNoCacheHash($cached, $_template, $no_output_filter);
+        $compile_check = (int)$_template->compile_check;
+        $_template->compile_check = Smarty::COMPILECHECK_OFF;
+        if ($_template->_isSubTpl()) {
+            $_template->compiled->unifunc = $_template->parent->compiled->unifunc;
+        }
+        if (!$_template->cached->processed) {
+            $_template->cached->process($_template, true);
+        }
+        $_template->compile_check = $compile_check;
+        $cached->getRenderedTemplateCode($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_cache($_template);
+        }
+    }
+
+    /**
+     * Sanitize content and write it to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param bool                     $no_output_filter
+     *
+     * @throws \SmartyException
+     */
+    public function removeNoCacheHash(
+        Smarty_Template_Cached $cached,
+        Smarty_Internal_Template $_template,
+        $no_output_filter
+    ) {
+        $php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
+        $content = ob_get_clean();
+        $hash_array = $cached->hashes;
+        $hash_array[ $_template->compiled->nocache_hash ] = true;
+        $hash_array = array_keys($hash_array);
+        $nocache_hash = '(' . implode('|', $hash_array) . ')';
+        $_template->cached->has_nocache_code = false;
+        // get text between non-cached items
+        $cache_split =
+            preg_split(
+                "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+                $content
+            );
+        // get non-cached items
+        preg_match_all(
+            "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+            $content,
+            $cache_parts
+        );
+        $content = '';
+        // loop over items, stitch back together
+        foreach ($cache_split as $curr_idx => $curr_split) {
+            if (preg_match($php_pattern, $curr_split)) {
+                // escape PHP tags in template content
+                $php_split = preg_split(
+                    $php_pattern,
+                    $curr_split
+                );
+                preg_match_all(
+                    $php_pattern,
+                    $curr_split,
+                    $php_parts
+                );
+                foreach ($php_split as $idx_php => $curr_php) {
+                    $content .= $curr_php;
+                    if (isset($php_parts[ 0 ][ $idx_php ])) {
+                        $content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
+                    }
+                }
+            } else {
+                $content .= $curr_split;
+            }
+            if (isset($cache_parts[ 0 ][ $curr_idx ])) {
+                $_template->cached->has_nocache_code = true;
+                $content .= $cache_parts[ 2 ][ $curr_idx ];
+            }
+        }
+        if (!$no_output_filter && !$_template->cached->has_nocache_code
+            && (isset($_template->smarty->autoload_filters[ 'output' ])
+                || isset($_template->smarty->registered_filters[ 'output' ]))
+        ) {
+            $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
+        }
+        // write cache file content
+        $this->writeCachedContent($_template, $content);
+    }
+
+    /**
+     * Writes the content to cache resource
+     *
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     *
+     * @return bool
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        if ($_template->source->handler->recompiled || !$_template->caching
+        ) {
+            // don't write cache file
+            return false;
+        }
+        if (!isset($_template->cached)) {
+            $_template->loadCached();
+        }
+        $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
+        return $this->write($_template, $content);
+    }
+
+    /**
+     * Write this cache object to handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     */
+    public function write(Smarty_Internal_Template $_template, $content)
+    {
+        if (!$_template->source->handler->recompiled) {
+            $cached = $_template->cached;
+            if ($cached->handler->writeCachedContent($_template, $content)) {
+                $cached->content = null;
+                $cached->timestamp = time();
+                $cached->exists = true;
+                $cached->valid = true;
+                $cached->cache_lifetime = $_template->cache_lifetime;
+                $cached->processed = false;
+                if ($_template->smarty->cache_locking) {
+                    $cached->handler->releaseLock($_template->smarty, $cached);
+                }
+                return true;
+            }
+            $cached->content = null;
+            $cached->timestamp = false;
+            $cached->exists = false;
+            $cached->valid = false;
+            $cached->processed = false;
+        }
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatescope.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatescope.php
new file mode 100644
index 000000000..2240f97ca
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_updatescope.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Runtime Extension updateScope
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_UpdateScope
+{
+    /**
+     * Update new assigned template or config variable in other effected scopes
+     *
+     * @param Smarty_Internal_Template $tpl      data object
+     * @param string|null              $varName  variable name
+     * @param int                      $tagScope tag scope to which bubble up variable value
+     */
+    public function _updateScope(Smarty_Internal_Template $tpl, $varName, $tagScope = 0)
+    {
+        if ($tagScope) {
+            $this->_updateVarStack($tpl, $varName);
+            $tagScope = $tagScope & ~Smarty::SCOPE_LOCAL;
+            if (!$tpl->scope && !$tagScope) {
+                return;
+            }
+        }
+        $mergedScope = $tagScope | $tpl->scope;
+        if ($mergedScope) {
+            if ($mergedScope & Smarty::SCOPE_GLOBAL && $varName) {
+                Smarty::$global_tpl_vars[ $varName ] = $tpl->tpl_vars[ $varName ];
+            }
+            // update scopes
+            foreach ($this->_getAffectedScopes($tpl, $mergedScope) as $ptr) {
+                $this->_updateVariableInOtherScope($ptr->tpl_vars, $tpl, $varName);
+                if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
+                    $this->_updateVarStack($ptr, $varName);
+                }
+            }
+        }
+    }
+
+    /**
+     * Get array of objects which needs to be updated  by given scope value
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param int                      $mergedScope merged tag and template scope to which bubble up variable value
+     *
+     * @return array
+     */
+    public function _getAffectedScopes(Smarty_Internal_Template $tpl, $mergedScope)
+    {
+        $_stack = array();
+        $ptr = $tpl->parent;
+        if ($mergedScope && isset($ptr) && $ptr->_isTplObj()) {
+            $_stack[] = $ptr;
+            $mergedScope = $mergedScope & ~Smarty::SCOPE_PARENT;
+            if (!$mergedScope) {
+                // only parent was set, we are done
+                return $_stack;
+            }
+            $ptr = $ptr->parent;
+        }
+        while (isset($ptr) && $ptr->_isTplObj()) {
+            $_stack[] = $ptr;
+            $ptr = $ptr->parent;
+        }
+        if ($mergedScope & Smarty::SCOPE_SMARTY) {
+            if (isset($tpl->smarty)) {
+                $_stack[] = $tpl->smarty;
+            }
+        } elseif ($mergedScope & Smarty::SCOPE_ROOT) {
+            while (isset($ptr)) {
+                if (!$ptr->_isTplObj()) {
+                    $_stack[] = $ptr;
+                    break;
+                }
+                $ptr = $ptr->parent;
+            }
+        }
+        return $_stack;
+    }
+
+    /**
+     * Update variable in other scope
+     *
+     * @param array                     $tpl_vars template variable array
+     * @param \Smarty_Internal_Template $from
+     * @param string                    $varName  variable name
+     */
+    public function _updateVariableInOtherScope(&$tpl_vars, Smarty_Internal_Template $from, $varName)
+    {
+        if (!isset($tpl_vars[ $varName ])) {
+            $tpl_vars[ $varName ] = clone $from->tpl_vars[ $varName ];
+        } else {
+            $tpl_vars[ $varName ] = clone $tpl_vars[ $varName ];
+            $tpl_vars[ $varName ]->value = $from->tpl_vars[ $varName ]->value;
+        }
+    }
+
+    /**
+     * Update variable in template local variable stack
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string|null               $varName variable name or null for config variables
+     */
+    public function _updateVarStack(Smarty_Internal_Template $tpl, $varName)
+    {
+        $i = 0;
+        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
+            $this->_updateVariableInOtherScope($tpl->_cache[ 'varStack' ][ $i ][ 'tpl' ], $tpl, $varName);
+            $i++;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
new file mode 100644
index 000000000..4383e6f38
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Smarty write file plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Write File Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_WriteFile
+{
+    /**
+     * Writes file in a safe way to disk
+     *
+     * @param string $_filepath complete filepath
+     * @param string $_contents file content
+     * @param Smarty $smarty    smarty instance
+     *
+     * @throws SmartyException
+     * @return boolean true
+     */
+    public function writeFile($_filepath, $_contents, Smarty $smarty)
+    {
+        $_error_reporting = error_reporting();
+        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
+        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
+        $_dir_perms =
+            property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777) : 0771;
+        if ($_file_perms !== null) {
+            $old_umask = umask(0);
+        }
+        $_dirpath = dirname($_filepath);
+        // if subdirs, create dir structure
+        if ($_dirpath !== '.') {
+            $i = 0;
+            // loop if concurrency problem occurs
+            // see https://bugs.php.net/bug.php?id=35326
+            while (!is_dir($_dirpath)) {
+                if (@mkdir($_dirpath, $_dir_perms, true)) {
+                    break;
+                }
+                clearstatcache();
+                if (++$i === 3) {
+                    error_reporting($_error_reporting);
+                    throw new SmartyException("unable to create directory {$_dirpath}");
+                }
+                sleep(1);
+            }
+        }
+        // write to tmp file, then move to overt file lock race condition
+        $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(array('.', ','), '_', uniqid('wrt', true));
+        if (!file_put_contents($_tmp_file, $_contents)) {
+            error_reporting($_error_reporting);
+            throw new SmartyException("unable to write file {$_tmp_file}");
+        }
+        /*
+         * Windows' rename() fails if the destination exists,
+         * Linux' rename() properly handles the overwrite.
+         * Simply unlink()ing a file might cause other processes
+         * currently reading that file to fail, but linux' rename()
+         * seems to be smart enough to handle that for us.
+         */
+        if (Smarty::$_IS_WINDOWS) {
+            // remove original file
+            if (is_file($_filepath)) {
+                @unlink($_filepath);
+            }
+            // rename tmp file
+            $success = @rename($_tmp_file, $_filepath);
+        } else {
+            // rename tmp file
+            $success = @rename($_tmp_file, $_filepath);
+            if (!$success) {
+                // remove original file
+                if (is_file($_filepath)) {
+                    @unlink($_filepath);
+                }
+                // rename tmp file
+                $success = @rename($_tmp_file, $_filepath);
+            }
+        }
+        if (!$success) {
+            error_reporting($_error_reporting);
+            throw new SmartyException("unable to write file {$_filepath}");
+        }
+        if ($_file_perms !== null) {
+            // set file permissions
+            chmod($_filepath, $_file_perms);
+            umask($old_umask);
+        }
+        error_reporting($_error_reporting);
+        return true;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
index dcc89c673..21f4e3fdd 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -1,72 +1,184 @@
 <?php
-
 /**
  * Smarty Internal Plugin Smarty Template Compiler Base
- * 
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- * 
- * @package Smarty
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
-require_once("smarty_internal_parsetree.php");
-
 /**
  * Class SmartyTemplateCompiler
+ *
+ * @package    Smarty
+ * @subpackage Compiler
  */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
-    // array of vars which can be compiled in local scope
+class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
+{
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
+
+    /**
+     * array of vars which can be compiled in local scope
+     *
+     * @var array
+     */
     public $local_var = array();
+
+    /**
+     * array of callbacks called when the normal compile process of template is finished
+     *
+     * @var array
+     */
+    public $postCompileCallbacks = array();
+
+    /**
+     * prefix code
+     *
+     * @var string
+     */
+    public $prefixCompiledCode = '';
+
+    /**
+     * postfix code
+     *
+     * @var string
+     */
+    public $postfixCompiledCode = '';
+
     /**
      * Initialize compiler
+     *
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
      */
-    public function __construct($lexer_class, $parser_class, $smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
-        $this->smarty = $smarty;
-        parent::__construct(); 
+        parent::__construct($smarty);
         // get required plugins
         $this->lexer_class = $lexer_class;
         $this->parser_class = $parser_class;
-    } 
+    }
 
     /**
-     * Methode to compile a Smarty template
-     * 
-     * @param  $_content template source
+     * method to compile a Smarty template
+     *
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
+     *
      * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyCompilerException
      */
-    protected function doCompile($_content)
+    protected function doCompile($_content, $isTemplateSource = false)
     {
         /* here is where the compiling takes place. Smarty
-       tags in the templates are replaces with PHP code,
-       then written to compiled files. */ 
+          tags in the templates are replaces with PHP code,
+          then written to compiled files. */
         // init the lexer/parser to compile the template
-        $this->lex = new $this->lexer_class($_content, $this);
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if (isset($this->smarty->_parserdebug)) $this->parser->PrintTrace(); 
+        $this->parser =
+            new $this->parser_class(
+                new $this->lexer_class(
+                    str_replace(
+                        array(
+                            "\r\n",
+                            "\r"
+                        ),
+                        "\n",
+                        $_content
+                    ),
+                    $this
+                ),
+                $this
+            );
+        if ($isTemplateSource && $this->template->caching) {
+            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
+        }
+        if (function_exists('mb_internal_encoding')
+            && function_exists('ini_get')
+            && ((int)ini_get('mbstring.func_overload')) & 2
+        ) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+        if ($this->smarty->_parserdebug) {
+            $this->parser->PrintTrace();
+            $this->parser->lex->PrintTrace();
+        }
         // get tokens from lexer and parse them
-        while ($this->lex->yylex() && !$this->abort_and_recompile) {
-            if (isset($this->smarty->_parserdebug)) echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " . htmlentities($this->lex->value) . "</pre>";
-            $this->parser->doParse($this->lex->token, $this->lex->value);
-        } 
-
-        if ($this->abort_and_recompile) {
-            // exit here on abort
-            return false;
-        } 
+        while ($this->parser->lex->yylex()) {
+            if ($this->smarty->_parserdebug) {
+                echo "<pre>Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+                     htmlentities($this->parser->lex->value) . "</pre>";
+            }
+            $this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
+        }
         // finish parsing process
-        $this->parser->doParse(0, 0); 
+        $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
         // check for unclosed tags
         if (count($this->_tag_stack) > 0) {
             // get stacked info
-            list($_open_tag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error("unclosed {" . $_open_tag . "} tag");
-        } 
+            list($openTag, $_data) = array_pop($this->_tag_stack);
+            $this->trigger_template_error(
+                "unclosed {$this->smarty->left_delimiter}" . $openTag .
+                "{$this->smarty->right_delimiter} tag"
+            );
+        }
+        // call post compile callbacks
+        foreach ($this->postCompileCallbacks as $cb) {
+            $parameter = $cb;
+            $parameter[ 0 ] = $this;
+            call_user_func_array($cb[ 0 ], $parameter);
+        }
         // return compiled code
-        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-        return $this->parser->retvalue;
-    } 
-} 
+        return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Register a post compile callback
+     * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+     *
+     * @param callback $callback
+     * @param array    $parameter optional parameter array
+     * @param string   $key       optional key for callback
+     * @param bool     $replace   if true replace existing keyed callback
+     */
+    public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+    {
+        array_unshift($parameter, $callback);
+        if (isset($key)) {
+            if ($replace || !isset($this->postCompileCallbacks[ $key ])) {
+                $this->postCompileCallbacks[ $key ] = $parameter;
+            }
+        } else {
+            $this->postCompileCallbacks[] = $parameter;
+        }
+    }
+
+    /**
+     * Remove a post compile callback
+     *
+     * @param string $key callback key
+     */
+    public function unregisterPostCompileCallback($key)
+    {
+        unset($this->postCompileCallbacks[ $key ]);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
index 070fb840d..bae22a7d5 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
@@ -1,998 +1,740 @@
 <?php
-
 /**
  * Smarty Internal Plugin Template
- * 
  * This file contains the Smarty template engine
- * 
- * @package Smarty
- * @subpackage Templates
- * @author Uwe Tews 
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
  */
 
 /**
  * Main class with template data structures and methods
+ *
+ * @package    Smarty
+ * @subpackage Template
+ *
+ * @property Smarty_Template_Compiled             $compiled
+ * @property Smarty_Template_Cached               $cached
+ * @property Smarty_Internal_TemplateCompilerBase $compiler
+ * @property mixed|\Smarty_Template_Cached        registered_plugins
+ *
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method bool mustCompile()
  */
-class Smarty_Internal_Template extends Smarty_Internal_Data {
-    // object cache
-    public $compiler_object = null;
-    public $cacher_object = null; 
-    // Smarty parameter
-    public $cache_id = null;
-    public $compile_id = null;
-    public $caching = null;
-    public $cache_lifetime = null;
-    public $cacher_class = null;
-    public $caching_type = null;
-    public $forceNocache = false; 
-    // Template resource
+class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
+{
+    /**
+     * Template object cache
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public static $tplObjCache = array();
+
+    /**
+     * Template object cache for Smarty::isCached() === true
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public static $isCacheTplObj = array();
+
+    /**
+     * Sub template Info Cache
+     * - index name
+     * - value use count
+     *
+     * @var int[]
+     */
+    public static $subTplInfo = array();
+
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 2;
+
+    /**
+     * Global smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Source instance
+     *
+     * @var Smarty_Template_Source|Smarty_Template_Config
+     */
+    public $source = null;
+
+    /**
+     * Inheritance runtime extension
+     *
+     * @var Smarty_Internal_Runtime_Inheritance
+     */
+    public $inheritance = null;
+
+    /**
+     * Template resource
+     *
+     * @var string
+     */
     public $template_resource = null;
-    public $resource_type = null;
-    public $resource_name = null;
-//    public $resource_object = null;
-    private $isExisting = null;
-    public $templateUid = ''; 
-    // Template source
-    public $template_filepath = null;
-    public $template_source = null;
-    private $template_timestamp = null; 
-    // Compiled template
-    private $compiled_filepath = null;
-    public $compiled_template = null;
-    private $compiled_timestamp = null;
+
+    /**
+     * flag if compiled template is invalid and must be (re)compiled
+     *
+     * @var bool
+     */
     public $mustCompile = null;
-    public $suppressHeader = false;
-    public $suppressFileDependency = false;
-    public $has_nocache_code = false; 
-    public $write_compiled_code = true; 
-    // Rendered content
-    public $rendered_content = null; 
-    // Cache file
-    private $cached_filepath = null;
-    public $cached_timestamp = null;
-    private $isCached = null;
-//    private $cache_resource_object = null;
-    private $cacheFileChecked = false; 
-    // template variables
-    public $tpl_vars = array();
-    public $parent = null;
-    public $config_vars = array(); 
-    // storage for plugin
-    public $plugin_data = array(); 
-    // special properties
-    public $properties = array ('file_dependency' => array(),
-        'nocache_hash' => '',
-        'function' => array()); 
-    // required plugins
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
-    public $saved_modifier = null;
-    public $smarty = null;
-    // blocks for template inheritance
-    public $block_data = array();
-    public $wrapper = null;
+
+    /**
+     * Template Id
+     *
+     * @var null|string
+     */
+    public $templateId = null;
+
+    /**
+     * Scope in which variables shall be assigned
+     *
+     * @var int
+     */
+    public $scope = 0;
+
+    /**
+     * Flag which is set while rending a cache file
+     *
+     * @var bool
+     */
+    public $isRenderingCache = false;
+
+    /**
+     * Callbacks called before rendering template
+     *
+     * @var callback[]
+     */
+    public $startRenderCallbacks = array();
+
+    /**
+     * Callbacks called after rendering template
+     *
+     * @var callback[]
+     */
+    public $endRenderCallbacks = array();
+
     /**
      * Create template data object
-     * 
      * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and cacher plugins
-     * 
-     * @param string $template_resource template resource string
-     * @param object $_parent back pointer to parent object with variables or null
-     * @param mixed $_cache_id cache id or null
-     * @param mixed $_compile_id compile id or null
-     */
-    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
-    {
-        $this->smarty = &$smarty; 
+     * It load the required template resources and caching plugins
+     *
+     * @param string                                                       $template_resource template resource string
+     * @param Smarty                                                       $smarty            Smarty instance
+     * @param null|\Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent           back pointer to parent
+     *                                                                                        object with variables or
+     *                                                                                        null
+     * @param mixed                                                        $_cache_id         cache   id or null
+     * @param mixed                                                        $_compile_id       compile id or null
+     * @param bool|int|null                                                $_caching          use caching?
+     * @param int|null                                                     $_cache_lifetime   cache life-time in
+     *                                                                                        seconds
+     * @param bool                                                         $_isConfig
+     *
+     * @throws \SmartyException
+     */
+    public function __construct(
+        $template_resource,
+        Smarty $smarty,
+        Smarty_Internal_Data $_parent = null,
+        $_cache_id = null,
+        $_compile_id = null,
+        $_caching = null,
+        $_cache_lifetime = null,
+        $_isConfig = false
+    ) {
+        $this->smarty = $smarty;
         // Smarty parameter
         $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
         $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
-        $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
-        if ($this->caching === true) $this->caching =  Smarty::CACHING_LIFETIME_CURRENT;
-        $this->cache_lifetime = $_cache_lifetime === null ?$this->smarty->cache_lifetime : $_cache_lifetime;
-        $this->parent = $_parent; 
-        // dummy local smarty variable
-        $this->tpl_vars['smarty'] = new Smarty_Variable; 
+        $this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
+        $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
+        $this->compile_check = (int)$smarty->compile_check;
+        $this->parent = $_parent;
         // Template resource
-        $this->template_resource = $template_resource; 
-        // copy block data of template inheritance
-        if ($this->parent instanceof Smarty_Internal_Template) {
-        	$this->block_data = $this->parent->block_data;
+        $this->template_resource = $template_resource;
+        $this->source = $_isConfig ? Smarty_Template_Config::load($this) : Smarty_Template_Source::load($this);
+        parent::__construct();
+        if ($smarty->security_policy && method_exists($smarty->security_policy, 'registerCallBacks')) {
+            $smarty->security_policy->registerCallBacks($this);
         }
- 
-    } 
+    }
 
     /**
-     * Returns the template filepath
-     * 
-     * The template filepath is determined by the actual resource handler
-     * 
-     * @return string the template filepath
+     * render template
+     *
+     * @param bool      $no_output_filter if true do not run output filter
+     * @param null|bool $display          true: display, false: fetch null: sub-template
+     *
+     * @return string
+     * @throws \Exception
+     * @throws \SmartyException
      */
-    public function getTemplateFilepath ()
+    public function render($no_output_filter = true, $display = null)
     {
-        return $this->template_filepath === null ?
-        $this->template_filepath = $this->resource_object->getTemplateFilepath($this) :
-        $this->template_filepath;
-    } 
+        if ($this->smarty->debugging) {
+            if (!isset($this->smarty->_debug)) {
+                $this->smarty->_debug = new Smarty_Internal_Debug();
+            }
+            $this->smarty->_debug->start_template($this, $display);
+        }
+        // checks if template exists
+        if (!$this->source->exists) {
+            throw new SmartyException(
+                "Unable to load template '{$this->source->type}:{$this->source->name}'" .
+                ($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
+            );
+        }
+        // disable caching for evaluated code
+        if ($this->source->handler->recompiled) {
+            $this->caching = Smarty::CACHING_OFF;
+        }
+        // read from cache or render
+        if ($this->caching === Smarty::CACHING_LIFETIME_CURRENT || $this->caching === Smarty::CACHING_LIFETIME_SAVED) {
+            if (!isset($this->cached) || $this->cached->cache_id !== $this->cache_id
+                || $this->cached->compile_id !== $this->compile_id
+            ) {
+                $this->loadCached(true);
+            }
+            $this->cached->render($this, $no_output_filter);
+        } else {
+            if (!isset($this->compiled) || $this->compiled->compile_id !== $this->compile_id) {
+                $this->loadCompiled(true);
+            }
+            $this->compiled->render($this);
+        }
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->smarty->cache_modified_check) {
+                $this->smarty->ext->_cacheModify->cacheModifiedCheck(
+                    $this->cached,
+                    $this,
+                    isset($content) ? $content : ob_get_clean()
+                );
+            } else {
+                if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
+                    && !$no_output_filter && (isset($this->smarty->autoload_filters[ 'output' ])
+                                              || isset($this->smarty->registered_filters[ 'output' ]))
+                ) {
+                    echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+                } else {
+                    echo ob_get_clean();
+                }
+            }
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                // debug output
+                $this->smarty->_debug->display_debug($this, true);
+            }
+            return '';
+        } else {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                if ($this->smarty->debugging === 2 && $display === false) {
+                    $this->smarty->_debug->display_debug($this, true);
+                }
+            }
+            if (!$no_output_filter
+                && (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
+                && (isset($this->smarty->autoload_filters[ 'output' ])
+                    || isset($this->smarty->registered_filters[ 'output' ]))
+            ) {
+                return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+            }
+            // return cache content
+            return null;
+        }
+    }
 
     /**
-     * Returns the timpestamp of the template source
-     * 
-     * The template timestamp is determined by the actual resource handler
-     * 
-     * @return integer the template timestamp
+     * Runtime function to render sub-template
+     *
+     * @param string  $template       template name
+     * @param mixed   $cache_id       cache id
+     * @param mixed   $compile_id     compile id
+     * @param integer $caching        cache mode
+     * @param integer $cache_lifetime life time of cache data
+     * @param array   $data           passed parameter template variables
+     * @param int     $scope          scope in which {include} should execute
+     * @param bool    $forceTplCache  cache template object
+     * @param string  $uid            file dependency uid
+     * @param string  $content_func   function name
+     *
+     * @throws \Exception
+     * @throws \SmartyException
      */
-    public function getTemplateTimestamp ()
-    {
-        return $this->template_timestamp === null ?
-        $this->template_timestamp = $this->resource_object->getTemplateTimestamp($this) :
-        $this->template_timestamp;
-    } 
+    public function _subTemplateRender(
+        $template,
+        $cache_id,
+        $compile_id,
+        $caching,
+        $cache_lifetime,
+        $data,
+        $scope,
+        $forceTplCache,
+        $uid = null,
+        $content_func = null
+    ) {
+        $tpl = clone $this;
+        $tpl->parent = $this;
+        $smarty = &$this->smarty;
+        $_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl);
+        // recursive call ?
+        if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() !== $_templateId) {
+            // already in template cache?
+            if (isset(self::$tplObjCache[ $_templateId ])) {
+                // copy data from cached object
+                $cachedTpl = &self::$tplObjCache[ $_templateId ];
+                $tpl->templateId = $cachedTpl->templateId;
+                $tpl->template_resource = $cachedTpl->template_resource;
+                $tpl->cache_id = $cachedTpl->cache_id;
+                $tpl->compile_id = $cachedTpl->compile_id;
+                $tpl->source = $cachedTpl->source;
+                if (isset($cachedTpl->compiled)) {
+                    $tpl->compiled = $cachedTpl->compiled;
+                } else {
+                    unset($tpl->compiled);
+                }
+                if ($caching !== 9999 && isset($cachedTpl->cached)) {
+                    $tpl->cached = $cachedTpl->cached;
+                } else {
+                    unset($tpl->cached);
+                }
+            } else {
+                $tpl->templateId = $_templateId;
+                $tpl->template_resource = $template;
+                $tpl->cache_id = $cache_id;
+                $tpl->compile_id = $compile_id;
+                if (isset($uid)) {
+                    // for inline templates we can get all resource information from file dependency
+                    list($filepath, $timestamp, $type) = $tpl->compiled->file_dependency[ $uid ];
+                    $tpl->source = new Smarty_Template_Source($smarty, $filepath, $type, $filepath);
+                    $tpl->source->filepath = $filepath;
+                    $tpl->source->timestamp = $timestamp;
+                    $tpl->source->exists = true;
+                    $tpl->source->uid = $uid;
+                } else {
+                    $tpl->source = Smarty_Template_Source::load($tpl);
+                    unset($tpl->compiled);
+                }
+                if ($caching !== 9999) {
+                    unset($tpl->cached);
+                }
+            }
+        } else {
+            // on recursive calls force caching
+            $forceTplCache = true;
+        }
+        $tpl->caching = $caching;
+        $tpl->cache_lifetime = $cache_lifetime;
+        // set template scope
+        $tpl->scope = $scope;
+        if (!isset(self::$tplObjCache[ $tpl->templateId ]) && !$tpl->source->handler->recompiled) {
+            // check if template object should be cached
+            if ($forceTplCache || (isset(self::$subTplInfo[ $tpl->template_resource ])
+                                   && self::$subTplInfo[ $tpl->template_resource ] > 1)
+                || ($tpl->_isSubTpl() && isset(self::$tplObjCache[ $tpl->parent->templateId ]))
+            ) {
+                self::$tplObjCache[ $tpl->templateId ] = $tpl;
+            }
+        }
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val, $this->isRenderingCache);
+            }
+        }
+        if ($tpl->caching === 9999) {
+            if (!isset($tpl->compiled)) {
+                $this->loadCompiled(true);
+            }
+            if ($tpl->compiled->has_nocache_code) {
+                $this->cached->hashes[ $tpl->compiled->nocache_hash ] = true;
+            }
+        }
+        $tpl->_cache = array();
+        if (isset($uid)) {
+            if ($smarty->debugging) {
+                if (!isset($smarty->_debug)) {
+                    $smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $smarty->_debug->start_template($tpl);
+                $smarty->_debug->start_render($tpl);
+            }
+            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
+            if ($smarty->debugging) {
+                $smarty->_debug->end_template($tpl);
+                $smarty->_debug->end_render($tpl);
+            }
+        } else {
+            if (isset($tpl->compiled)) {
+                $tpl->compiled->render($tpl);
+            } else {
+                $tpl->render();
+            }
+        }
+    }
 
     /**
-     * Returns the template source code
-     * 
-     * The template source is being read by the actual resource handler
-     * 
-     * @return string the template source
+     * Get called sub-templates and save call count
      */
-    public function getTemplateSource ()
-    {
-        if ($this->template_source === null) {
-            if (!$this->resource_object->getTemplateSource($this)) {
-                throw new SmartyException("Unable to read template {$this->resource_type} '{$this->resource_name}'");
-            } 
-        } 
-        return $this->template_source;
-    } 
-
-    /**
-     * Returns if the  template is existing
-     * 
-     * The status is determined by the actual resource handler
-     * 
-     * @return boolean true if the template exists
-     */
-    public function isExisting ($error = false)
+    public function _subTemplateRegister()
     {
-        if ($this->isExisting === null) {
-            $this->isExisting = $this->resource_object->isExisting($this);
-        } 
-        if (!$this->isExisting && $error) {
-            throw new SmartyException("Unable to load template {$this->resource_type} '{$this->resource_name}'");
-        } 
-        return $this->isExisting;
-    } 
-
-    /**
-     * Returns if the current template must be compiled by the Smarty compiler
-     * 
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
-     * 
-     * @return boolean true if the template must be compiled
-     */
-    public function mustCompile ()
+        foreach ($this->compiled->includes as $name => $count) {
+            if (isset(self::$subTplInfo[ $name ])) {
+                self::$subTplInfo[ $name ] += $count;
+            } else {
+                self::$subTplInfo[ $name ] = $count;
+            }
+        }
+    }
+
+    /**
+     * Check if this is a sub template
+     *
+     * @return bool true is sub template
+     */
+    public function _isSubTpl()
     {
-        $this->isExisting(true);
-        if ($this->mustCompile === null) {
-            $this->mustCompile = ($this->resource_object->usesCompiler && ($this->smarty->force_compile || $this->resource_object->isEvaluated || $this->getCompiledTimestamp () === false || 
-                    // ($this->smarty->compile_check && $this->getCompiledTimestamp () !== $this->getTemplateTimestamp ())));
-                    ($this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTemplateTimestamp ())));
-        } 
-        return $this->mustCompile;
-    } 
+        return isset($this->parent) && $this->parent->_isTplObj();
+    }
 
     /**
-     * Returns the compiled template filepath
-     * 
-     * @return string the template filepath
+     * Assign variable in scope
+     *
+     * @param string $varName variable name
+     * @param mixed  $value   value
+     * @param bool   $nocache nocache flag
+     * @param int    $scope   scope into which variable shall be assigned
      */
-    public function getCompiledFilepath ()
+    public function _assignInScope($varName, $value, $nocache = false, $scope = 0)
     {
-        return $this->compiled_filepath === null ?
-        ($this->compiled_filepath = !$this->resource_object->isEvaluated ? $this->resource_object->getCompiledFilepath($this) : false) :
-        $this->compiled_filepath;
-    } 
+        if (isset($this->tpl_vars[ $varName ])) {
+            $this->tpl_vars[ $varName ] = clone $this->tpl_vars[ $varName ];
+            $this->tpl_vars[ $varName ]->value = $value;
+            if ($nocache || $this->isRenderingCache) {
+                $this->tpl_vars[ $varName ]->nocache = true;
+            }
+        } else {
+            $this->tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache || $this->isRenderingCache);
+        }
+        if ($scope >= 0) {
+            if ($scope > 0 || $this->scope > 0) {
+                $this->smarty->ext->_updateScope->_updateScope($this, $varName, $scope);
+            }
+        }
+    }
 
     /**
-     * Returns the timpestamp of the compiled template
-     * 
-     * @return integer the template timestamp
+     * Check if plugins are callable require file otherwise
+     *
+     * @param array $plugins required plugins
+     *
+     * @throws \SmartyException
      */
-    public function getCompiledTimestamp ()
+    public function _checkPlugins($plugins)
     {
-        return $this->compiled_timestamp === null ?
-        ($this->compiled_timestamp = (!$this->resource_object->isEvaluated && file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) :
-        $this->compiled_timestamp;
-    } 
+        static $checked = array();
+        foreach ($plugins as $plugin) {
+            $name = join('::', (array)$plugin[ 'function' ]);
+            if (!isset($checked[ $name ])) {
+                if (!is_callable($plugin[ 'function' ])) {
+                    if (is_file($plugin[ 'file' ])) {
+                        include_once $plugin[ 'file' ];
+                        if (is_callable($plugin[ 'function' ])) {
+                            $checked[ $name ] = true;
+                        }
+                    }
+                } else {
+                    $checked[ $name ] = true;
+                }
+            }
+            if (!isset($checked[ $name ])) {
+                if (false !== $this->smarty->loadPlugin($name)) {
+                    $checked[ $name ] = true;
+                } else {
+                    throw new SmartyException("Plugin '{$name}' not callable");
+                }
+            }
+        }
+    }
 
     /**
-     * Returns the compiled template 
-     * 
-     * It checks if the template must be compiled or just read from the template resource
-     * 
-     * @return string the compiled template
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $properties special template properties
+     * @param bool                      $cache      flag if called from cache file
+     *
+     * @return bool flag if compiled or cache file is valid
+     * @throws \SmartyException
      */
-    public function getCompiledTemplate ()
+    public function _decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
     {
-        if ($this->compiled_template === null) {
-            // see if template needs compiling.
-            if ($this->mustCompile()) {
-                $this->compileTemplateSource();
+        // on cache resources other than file check version stored in cache code
+        if (!isset($properties[ 'version' ]) || Smarty::SMARTY_VERSION !== $properties[ 'version' ]) {
+            if ($cache) {
+                $tpl->smarty->clearAllCache();
             } else {
-                if ($this->compiled_template === null) {
-                    $this->compiled_template = !$this->resource_object->isEvaluated && $this->resource_object->usesCompiler ? file_get_contents($this->getCompiledFilepath()) : false;
-                } 
-            } 
-        } 
-        return $this->compiled_template;
-    } 
+                $tpl->smarty->clearCompiledTemplate();
+            }
+            return false;
+        }
+        $is_valid = true;
+        if (!empty($properties[ 'file_dependency' ])
+            && ((!$cache && $tpl->compile_check) || $tpl->compile_check === Smarty::COMPILECHECK_ON)
+        ) {
+            // check file dependencies at compiled code
+            foreach ($properties[ 'file_dependency' ] as $_file_to_check) {
+                if ($_file_to_check[ 2 ] === 'file' || $_file_to_check[ 2 ] === 'php') {
+                    if ($tpl->source->filepath === $_file_to_check[ 0 ]) {
+                        // do not recheck current template
+                        continue;
+                        //$mtime = $tpl->source->getTimeStamp();
+                    } else {
+                        // file and php types can be checked without loading the respective resource handlers
+                        $mtime = is_file($_file_to_check[ 0 ]) ? filemtime($_file_to_check[ 0 ]) : false;
+                    }
+                } else {
+                    $handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[ 2 ]);
+                    if ($handler->checkTimestamps()) {
+                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
+                        $mtime = $source->getTimeStamp();
+                    } else {
+                        continue;
+                    }
+                }
+                if ($mtime === false || $mtime > $_file_to_check[ 1 ]) {
+                    $is_valid = false;
+                    break;
+                }
+            }
+        }
+        if ($cache) {
+            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties[ 'cache_lifetime' ] >= 0
+                && (time() > ($tpl->cached->timestamp + $properties[ 'cache_lifetime' ]))
+            ) {
+                $is_valid = false;
+            }
+            $tpl->cached->cache_lifetime = $properties[ 'cache_lifetime' ];
+            $tpl->cached->valid = $is_valid;
+            $resource = $tpl->cached;
+        } else {
+            $tpl->mustCompile = !$is_valid;
+            $resource = $tpl->compiled;
+            $resource->includes = isset($properties[ 'includes' ]) ? $properties[ 'includes' ] : array();
+        }
+        if ($is_valid) {
+            $resource->unifunc = $properties[ 'unifunc' ];
+            $resource->has_nocache_code = $properties[ 'has_nocache_code' ];
+            //            $tpl->compiled->nocache_hash = $properties['nocache_hash'];
+            $resource->file_dependency = $properties[ 'file_dependency' ];
+        }
+        return $is_valid && !function_exists($properties[ 'unifunc' ]);
+    }
 
     /**
      * Compiles the template
-     * 
      * If the template is not evaluated the compiled template is saved on disk
+     *
+     * @throws \Exception
      */
-    public function compileTemplateSource ()
-    {
-        if (!$this->resource_object->isEvaluated) {
-            $this->properties['file_dependency'] = array();
-            $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type);
-        } 
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this);
-        } 
-        // compile template
-        if (!is_object($this->compiler_object)) {
-            // load compiler
-            $this->smarty->loadPlugin($this->resource_object->compiler_class);
-            $this->compiler_object = new $this->resource_object->compiler_class($this->resource_object->template_lexer_class, $this->resource_object->template_parser_class, $this->smarty);
-        } 
-        // compile locking
-        if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated) {
-            if ($saved_timestamp = $this->getCompiledTimestamp()) {
-                touch($this->getCompiledFilepath());
-            } 
-        } 
-        // call compiler
-        try {
-            $this->compiler_object->compileTemplate($this);
-        } 
-        catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated && $saved_timestamp) {
-                touch($this->getCompiledFilepath(), $saved_timestamp);
-            } 
-            throw $e;
-        } 
-        // compiling succeded
-        if (!$this->resource_object->isEvaluated && $this->write_compiled_code) {
-            // write compiled template
-            Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty);
-        } 
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this);
-        }
-        // release objects to free memory
-		Smarty_Internal_TemplateCompilerBase::$_tag_objects = array();	
-        unset($this->compiler_object->parser->root_buffer,
-        	$this->compiler_object->parser->current_buffer,
-        	$this->compiler_object->parser,
-        	$this->compiler_object->lex,
-        	$this->compiler_object->template,
-        	$this->compiler_object
-        	); 
-    } 
-
-    /**
-     * Returns the filepath of the cached template output
-     * 
-     * The filepath is determined by the actual cache resource
-     * 
-     * @return string the cache filepath
-     */
-    public function getCachedFilepath ()
+    public function compileTemplateSource()
     {
-        return $this->cached_filepath === null ?
-        $this->cached_filepath = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedFilepath($this) :
-        $this->cached_filepath;
-    } 
+        return $this->compiled->compileTemplateSource($this);
+    }
 
     /**
-     * Returns the timpestamp of the cached template output
-     * 
-     * The timestamp is determined by the actual cache resource
-     * 
-     * @return integer the template timestamp
+     * Writes the content to cache resource
+     *
+     * @param string $content
+     *
+     * @return bool
      */
-    public function getCachedTimestamp ()
+    public function writeCachedContent($content)
     {
-        return $this->cached_timestamp === null ?
-        $this->cached_timestamp = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedTimestamp($this) :
-        $this->cached_timestamp;
-    } 
+        return $this->smarty->ext->_updateCache->writeCachedContent($this, $content);
+    }
 
     /**
-     * Returns the cached template output
-     * 
-     * @return string |booelan the template content or false if the file does not exist
+     * Get unique template id
+     *
+     * @return string
+     * @throws \SmartyException
      */
-    public function getCachedContent ()
+    public function _getTemplateId()
     {
-        return $this->rendered_content === null ?
-        $this->rendered_content = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedContents($this) :
-        $this->rendered_content;
-    } 
+        return isset($this->templateId) ? $this->templateId : $this->templateId =
+            $this->smarty->_getTemplateId($this->template_resource, $this->cache_id, $this->compile_id);
+    }
 
     /**
-     * Writes the cached template output
+     * runtime error not matching capture tags
+     *
+     * @throws \SmartyException
      */
-    public function writeCachedContent ($content)
+    public function capture_error()
     {
-        if ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-            // don't write cache file
-            return false;
-        } 
-        $this->properties['cache_lifetime'] = $this->cache_lifetime;
-        return $this->cache_resource_object->writeCachedContent($this, $this->createPropertyHeader(true) .$content);
-    } 
+        throw new SmartyException("Not matching {capture} open/close in '{$this->template_resource}'");
+    }
 
     /**
-     * Checks of a valid version redered HTML output is in the cache
-     * 
-     * If the cache is valid the contents is stored in the template object
-     * 
-     * @return boolean true if cache is valid
+     * Load compiled object
+     *
+     * @param bool $force force new compiled object
      */
-    public function isCached ($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-    	if ($template === null) {    		
- 			$no_render = true;
- 		} elseif ($template === false) {
-			$no_render = false;
-  		} else {
-  			if ($parent === null) {
-  				$parent = $this;
-  			}
-			$this->smarty->isCached ($template, $cache_id, $compile_id, $parent);
-  		}
-        if ($this->isCached === null) {
-            $this->isCached = false;
-            if (($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED) && !$this->resource_object->isEvaluated) {
-                $cachedTimestamp = $this->getCachedTimestamp();
-                if ($cachedTimestamp === false || $this->smarty->force_compile || $this->smarty->force_cache) {
-                    return $this->isCached;
-                } 
-                if ($this->caching === Smarty::CACHING_LIFETIME_SAVED || ($this->caching == Smarty::CACHING_LIFETIME_CURRENT && (time() <= ($cachedTimestamp + $this->cache_lifetime) || $this->cache_lifetime < 0))) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($this);
-                    } 
-                    $this->rendered_content = $this->cache_resource_object->getCachedContents($this, $no_render);
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($this);
-                    } 
-                    if ($this->cacheFileChecked) {
-                        $this->isCached = true;
-                        return $this->isCached;
-                    } 
-                    $this->cacheFileChecked = true;
-                    if ($this->caching === Smarty::CACHING_LIFETIME_SAVED && $this->properties['cache_lifetime'] >= 0 && (time() > ($this->getCachedTimestamp() + $this->properties['cache_lifetime']))) {
-                        $this->tpl_vars = array();
-                        $this->rendered_content = null;
-                        return $this->isCached;
-                    } 
-                    if (!empty($this->properties['file_dependency']) && $this->smarty->compile_check) {
-                        $resource_type = null;
-                        $resource_name = null;
-                        foreach ($this->properties['file_dependency'] as $_file_to_check) {
-                            If ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
-                                $mtime = filemtime($_file_to_check[0]);
-                            } else {
-                                $this->getResourceTypeName($_file_to_check[0], $resource_type, $resource_name);
-                                $resource_handler = $this->loadTemplateResourceHandler($resource_type);
-                                $mtime = $resource_handler->getTemplateTimestampTypeName($resource_type, $resource_name);
-                            } 
-                            // If ($mtime > $this->getCachedTimestamp()) {
-                            If ($mtime > $_file_to_check[1]) {
-                                $this->tpl_vars = array();
-                                $this->rendered_content = null;
-                                return $this->isCached;
-                            } 
-                        } 
-                    } 
-                    $this->isCached = true;
-                } 
-            } 
-        } 
-        return $this->isCached;
-    } 
-
-    /**
-     * Render the output using the compiled template or the PHP template source
-     * 
-     * The rendering process is accomplished by just including the PHP files.
-     * The only exceptions are evaluated templates (string template). Their code has 
-     * to be evaluated
-     */
-    public function renderTemplate ()
-    {
-        if ($this->resource_object->usesCompiler) {
-            if ($this->mustCompile() && $this->compiled_template === null) {
-                $this->compileTemplateSource();
-            } 
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_render($this);
-            } 
-            $_smarty_tpl = $this;
-            ob_start();
-            if ($this->resource_object->isEvaluated) {
-                eval("?>" . $this->compiled_template);
-            } else {
-                include($this->getCompiledFilepath ()); 
-                // check file dependencies at compiled code
-                if ($this->smarty->compile_check) {
-                    if (!empty($this->properties['file_dependency'])) {
-                        $this->mustCompile = false;
-                        $resource_type = null;
-                        $resource_name = null;
-                        foreach ($this->properties['file_dependency'] as $_file_to_check) {
-                            If ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
-                                $mtime = filemtime($_file_to_check[0]);
-                            } else {
-                            	$this->getResourceTypeName($_file_to_check[0], $resource_type, $resource_name);
-                                $resource_handler = $this->loadTemplateResourceHandler($resource_type);
-                                $mtime = $resource_handler->getTemplateTimestampTypeName($resource_type, $resource_name);
-                            } 
-                            // If ($mtime != $_file_to_check[1]) {
-                            If ($mtime > $_file_to_check[1]) {
-                                $this->mustCompile = true;
-                                break;
-                            } 
-                        } 
-                        if ($this->mustCompile) {
-                            // recompile and render again
-                            ob_get_clean();
-                            $this->compileTemplateSource();
-                            ob_start();
-                            include($this->getCompiledFilepath ());
-                        } 
-                    } 
-                } 
-            } 
-        } else {
-            if (is_callable(array($this->resource_object, 'renderUncompiled'))) {
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::start_render($this);
-                } 
-                ob_start();
-                $this->resource_object->renderUncompiled($this);
-            } else {
-                throw new SmartyException("Resource '$this->resource_type' must have 'renderUncompiled' methode");
-            } 
-        } 
-        $this->rendered_content = ob_get_clean();
-        if (!$this->resource_object->isEvaluated && empty($this->properties['file_dependency'][$this->templateUid])) {
-            $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type);
-        } 
-        if ($this->parent instanceof Smarty_Internal_Template) {
-            $this->parent->properties['file_dependency'] = array_merge($this->parent->properties['file_dependency'], $this->properties['file_dependency']);
-            foreach($this->required_plugins as $code => $tmp1) {
-                foreach($tmp1 as $name => $tmp) {
-                    foreach($tmp as $type => $data) {
-                        $this->parent->required_plugins[$code][$name][$type] = $data;
-                    } 
-                } 
-            } 
-        } 
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_render($this);
-        } 
-        // write to cache when nessecary
-        if (!$this->resource_object->isEvaluated && ($this->caching == Smarty::CACHING_LIFETIME_SAVED || $this->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_cache($this);
-            } 
-            $this->properties['has_nocache_code'] = false; 
-            // get text between non-cached items
-            $cache_split = preg_split("!/\*%%SmartyNocache:{$this->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!s", $this->rendered_content); 
-            // get non-cached items
-            preg_match_all("!/\*%%SmartyNocache:{$this->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!s", $this->rendered_content, $cache_parts);
-            $output = ''; 
-            // loop over items, stitch back together
-            foreach($cache_split as $curr_idx => $curr_split) {
-                // escape PHP tags in template content
-                $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split);
-                if (isset($cache_parts[0][$curr_idx])) {
-                    $this->properties['has_nocache_code'] = true; 
-                    // remove nocache tags from cache output
-                    $output .= preg_replace("!/\*/?%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
-                } 
-            } 
-            if (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output'])) {
-            	$output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $this);
-        	}
-            // rendering (must be done before writing cache file because of {function} nocache handling)
-            $_smarty_tpl = $this;
-            ob_start();
-            eval("?>" . $output);
-            $this->rendered_content = ob_get_clean(); 
-            // write cache file content
-            $this->writeCachedContent('<?php if (!$no_render) {?>'. $output. '<?php } ?>');
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_cache($this);
-            } 
-        } else {
-            // var_dump('renderTemplate', $this->has_nocache_code, $this->template_resource, $this->properties['nocache_hash'], $this->parent->properties['nocache_hash'], $this->rendered_content);
-            if ($this->has_nocache_code && !empty($this->properties['nocache_hash']) && !empty($this->parent->properties['nocache_hash'])) {
-                // replace nocache_hash
-                $this->rendered_content = preg_replace("/{$this->properties['nocache_hash']}/", $this->parent->properties['nocache_hash'], $this->rendered_content);
-                $this->parent->has_nocache_code = $this->has_nocache_code;
-            } 
-        } 
-    } 
-
-    /**
-     * Returns the rendered HTML output 
-     * 
-     * If the cache is valid the cached content is used, otherwise
-     * the output is rendered from the compiled template or PHP template source
-     * 
-     * @return string rendered HTML output
-     */
-    public function getRenderedTemplate ()
-    { 
-        // disable caching for evaluated code
-        if ($this->resource_object->isEvaluated) {
-            $this->caching = false;
-        } 
-        // checks if template exists
-        $this->isExisting(true); 
-        // read from cache or render
-        if ($this->rendered_content === null) {
-        	if ($this->isCached) {
-        		if ($this->smarty->debugging) {
-            	Smarty_Internal_Debug::start_cache($this);
-            } 
-            $this->rendered_content = $this->cache_resource_object->getCachedContents($this, false);
-            if ($this->smarty->debugging) {
-            	Smarty_Internal_Debug::end_cache($this);
-            }
-          } 
-          if ($this->isCached === null) { 
-            $this->isCached(false); 
-          }
-          if (!$this->isCached) {          
-            // render template (not loaded and not in cache)
-            $this->renderTemplate();
-          }
-        } 
-        $this->updateParentVariables();
-        $this->isCached = null;
-        return $this->rendered_content;
-    } 
-
-    /**
-     * Parse a template resource in its name and type
-     * Load required resource handler
-     * 
-     * @param string $template_resource template resource specification
-     * @param string $resource_type return resource type
-     * @param string $resource_name return resource name
-     * @param object $resource_handler return resource handler object
-     */
-    public function parseResourceName($template_resource, &$resource_type, &$resource_name, &$resource_handler)
+    public function loadCompiled($force = false)
     {
-        if (empty($template_resource))
-            return false;
-        $this->getResourceTypeName($template_resource, $resource_type, $resource_name);
-        $resource_handler = $this->loadTemplateResourceHandler($resource_type); 
-        // cache template object under a unique ID
-        // do not cache eval resources
-        if ($resource_type != 'eval') {
-            $this->smarty->template_objects[sha1($this->template_resource . $this->cache_id . $this->compile_id)] = $this;
-        } 
-        return true;
-    } 
+        if ($force || !isset($this->compiled)) {
+            $this->compiled = Smarty_Template_Compiled::load($this);
+        }
+    }
 
     /**
-     * get system filepath to template
+     * Load cached object
+     *
+     * @param bool $force force new cached object
      */
-    public function buildTemplateFilepath ($file = null)
+    public function loadCached($force = false)
     {
-        if ($file == null) {
-            $file = $this->resource_name;
+        if ($force || !isset($this->cached)) {
+            $this->cached = Smarty_Template_Cached::load($this);
         }
-        // relative file name? 
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-	        foreach((array)$this->smarty->template_dir as $_template_dir) {
-           		if (strpos('/\\', substr($_template_dir, -1)) === false) {
-                	$_template_dir .= DS;
-            	} 
-            	$_filepath = $_template_dir . $file;
-            	if (file_exists($_filepath)) {
-                	return $_filepath;
-            	}
-        		if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-        			// try PHP include_path
-        			if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) {
-        				return $_filepath;
-        			}
-        		}
-       		}
-       	}
-        // try absolute filepath
-        if (file_exists($file)) return $file;
-        // no tpl file found
-        if (!empty($this->smarty->default_template_handler_func)) {
-            if (!is_callable($this->smarty->default_template_handler_func)) {
-                throw new SmartyException("Default template handler not callable");
-            } else {
-                $_return = call_user_func_array($this->smarty->default_template_handler_func,
-                    array($this->resource_type, $this->resource_name, &$this->template_source, &$this->template_timestamp, $this));
-                if (is_string($_return)) {
-                    return $_return;
-                } elseif ($_return === true) {
-                    return $file;
-                } 
-            } 
-        } 
-        return false;
-    } 
-
-    /**
-     * Update Smarty variables in other scopes
-     */
-    public function updateParentVariables ($scope = Smarty::SCOPE_LOCAL)
-    {
-        $has_root = false;
-        foreach ($this->tpl_vars as $_key => $_variable) {
-            $_variable_scope = $this->tpl_vars[$_key]->scope;
-            if ($scope == Smarty::SCOPE_LOCAL && $_variable_scope == Smarty::SCOPE_LOCAL) {
-                continue;
-            } 
-            if (isset($this->parent) && ($scope == Smarty::SCOPE_PARENT || $_variable_scope == Smarty::SCOPE_PARENT)) {
-                if (isset($this->parent->tpl_vars[$_key])) {
-                    // variable is already defined in parent, copy value
-                    $this->parent->tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value;
-                } else {
-                    // create variable in parent
-                    $this->parent->tpl_vars[$_key] = clone $_variable;
-                    $this->parent->tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL;
-                } 
-            } 
-            if ($scope == Smarty::SCOPE_ROOT || $_variable_scope == Smarty::SCOPE_ROOT) {
-                if ($this->parent == null) {
-                    continue;
-                } 
-                if (!$has_root) {
-                    // find  root
-                    $root_ptr = $this;
-                    while ($root_ptr->parent != null) {
-                        $root_ptr = $root_ptr->parent;
-                        $has_root = true;
-                    } 
-                } 
-                if (isset($root_ptr->tpl_vars[$_key])) {
-                    // variable is already defined in root, copy value
-                    $root_ptr->tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value;
-                } else {
-                    // create variable in root
-                    $root_ptr->tpl_vars[$_key] = clone $_variable;
-                    $root_ptr->tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL;
-                } 
-            } 
-            if ($scope == Smarty::SCOPE_GLOBAL || $_variable_scope == Smarty::SCOPE_GLOBAL) {
-                if (isset(Smarty::$global_tpl_vars[$_key])) {
-                    // variable is already defined in root, copy value
-                    Smarty::$global_tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value;
-                } else {
-                    // create global variable
-                   Smarty::$global_tpl_vars[$_key] = clone $_variable;
-                } 
-               Smarty::$global_tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL;
-            } 
-        } 
-    } 
-
-    /**
-     * Split a template resource in its name and type
-     * 
-     * @param string $template_resource template resource specification
-     * @param string $resource_type return resource type
-     * @param string $resource_name return resource name
-     */
-    protected function getResourceTypeName ($template_resource, &$resource_type, &$resource_name)
-    {
-        if (strpos($template_resource, ':') === false) {
-            // no resource given, use default
-            $resource_type = $this->smarty->default_resource_type;
-            $resource_name = $template_resource;
-        } else {
-            // get type and name from path
-            list($resource_type, $resource_name) = explode(':', $template_resource, 2);
-            if (strlen($resource_type) == 1) {
-                // 1 char is not resource type, but part of filepath
-                $resource_type = 'file';
-                $resource_name = $template_resource;
-            }
-        } 
-    } 
+    }
 
     /**
-     * Load template resource handler by type
-     * 
-     * @param string $resource_type template resource type
-     * @return object resource handler object
+     * Load inheritance object
      */
-    protected function loadTemplateResourceHandler ($resource_type)
-    { 
-        // try registered resource
-        if (isset($this->smarty->registered_resources[$resource_type])) {
-            return new Smarty_Internal_Resource_Registered($this);
-        } else {
-            // try sysplugins dir
-            if (in_array($resource_type, array('file', 'string', 'extends', 'php', 'stream', 'eval'))) {
-                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($resource_type);
-                return new $_resource_class($this->smarty);
-            } else {
-                // try plugins dir
-                $_resource_class = 'Smarty_Resource_' . ucfirst($resource_type);
-                if ($this->smarty->loadPlugin($_resource_class)) {
-                    if (class_exists($_resource_class, false)) {
-                        return new $_resource_class($this->smarty);
-                    } else {
-                        return new Smarty_Internal_Resource_Registered($this, $resource_type);
-                    } 
-                } else {
-                    // try streams
-                    $_known_stream = stream_get_wrappers();
-                    if (in_array($resource_type, $_known_stream)) {
-                        // is known stream
-                        if (is_object($this->smarty->security_policy)) {
-                            $this->smarty->security_policy->isTrustedStream($resource_type);
-                        } 
-                        return new Smarty_Internal_Resource_Stream($this->smarty);
-                    } else {
-                        throw new SmartyException('Unkown resource type \'' . $resource_type . '\'');
-                    } 
-                } 
-            } 
-        } 
-    } 
+    public function _loadInheritance()
+    {
+        if (!isset($this->inheritance)) {
+            $this->inheritance = new Smarty_Internal_Runtime_Inheritance();
+        }
+    }
 
     /**
-     * Create property header
+     * Unload inheritance object
      */
-    public function createPropertyHeader ($cache = false)
+    public function _cleanUp()
     {
-        $plugins_string = ''; 
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($this->required_plugins['compiled'])) {
-                $plugins_string = '<?php ';
-                foreach($this->required_plugins['compiled'] as $tmp) {
-                    foreach($tmp as $data) {
-                        $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-                    } 
-                } 
-                $plugins_string .= '?>';
-            } 
-            if (!empty($this->required_plugins['nocache'])) {
-                $this->has_nocache_code = true;
-                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php ";
-                foreach($this->required_plugins['nocache'] as $tmp) {
-                    foreach($tmp as $data) {
-                        $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
-                    } 
-                } 
-                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
-            } 
-        } 
-        // build property code
-        $this->properties['has_nocache_code'] = $this->has_nocache_code;
-        $properties_string = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/" ;
-        if ($this->smarty->direct_access_security) {
-            $properties_string .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-        } 
-        if ($cache) {
-            // remove compiled code of{function} definition
-            unset($this->properties['function']);
-            if (!empty($this->smarty->template_functions)) {
-                // copy code of {function} tags called in nocache mode
-                foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        unset($function_data['called_nocache'], $this->smarty->template_functions[$name]['called_nocache']);
-                        $this->properties['function'][$name] = $function_data;
-                    } 
-                } 
-            } 
-        } 
-        $properties_string .= "\$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . "); /*/%%SmartyHeaderCode%%*/?>\n";
-        return $properties_string . $plugins_string;
-    } 
-
-    /**
-     * Decode saved properties from compiled template and cache files
-     */
-    public function decodeProperties ($properties)
-    {
-        $this->has_nocache_code = $properties['has_nocache_code'];
-        $this->properties['nocache_hash'] = $properties['nocache_hash'];
-        if (isset($properties['cache_lifetime'])) {
-            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-        } 
-        if (isset($properties['file_dependency'])) {
-            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-        } 
-        if (!empty($properties['function'])) {
-            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
-            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
-        } 
-    } 
-
-    /**
-     * creates a local Smarty variable for array assignments
-     */
-    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        if (!isset($this->tpl_vars[$tpl_var])) {
-            $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-            if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
-            } else {
-                $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                if ($scope != Smarty::SCOPE_LOCAL) {
-                    $this->tpl_vars[$tpl_var]->scope = $scope;
-                } 
-            } 
-        } 
-        if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-            settype($this->tpl_vars[$tpl_var]->value, 'array');
-        } 
-    } 
-
-    /**
-     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
-     * @param mixed $value
-     * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
-     */
-    public function _count($value)
-    {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof Iterator) {
-            $value->rewind();
-            if ($value->valid()) {
-                return iterator_count($value);
-            }
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return 1;
-            }
-       } elseif (is_object($value)) {
-            return count($value);
-       }
-       return 0;
+        $this->startRenderCallbacks = array();
+        $this->endRenderCallbacks = array();
+        $this->inheritance = null;
     }
 
     /**
-     * wrapper for fetch
+     * Load compiler object
+     *
+     * @throws \SmartyException
      */
-    public function fetch ($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false)
+    public function loadCompiler()
     {
- 		if ($template == null) {
-        	return $this->smarty->fetch($this);
-        } else {
-        	if (!isset($parent)) {
-        		$parent = $this;
-        	}
-         	return $this->smarty->fetch($template, $cache_id, $compile_id, $parent, $display);
+        if (!class_exists($this->source->compiler_class)) {
+            $this->smarty->loadPlugin($this->source->compiler_class);
         }
-        
-    } 
- 
-     /**
-     * wrapper for display
+        $this->compiler =
+            new $this->source->compiler_class(
+                $this->source->template_lexer_class,
+                $this->source->template_parser_class,
+                $this->smarty
+            );
+    }
+
+    /**
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
      */
-    public function display ($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    public function __call($name, $args)
     {
- 		if ($template == null) {
-        	return $this->smarty->display($this);
-        } else {
-        	if (!isset($parent)) {
-        		$parent = $this;
-        	}
-       		return $this->smarty->display($template, $cache_id, $compile_id, $parent);
+        // method of Smarty object?
+        if (method_exists($this->smarty, $name)) {
+            return call_user_func_array(array($this->smarty, $name), $args);
         }
-       
-    } 
+        // parent
+        return parent::__call($name, $args);
+    }
 
     /**
-     * set Smarty property in template context      
+     * get Smarty property in template context
+     *
      * @param string $property_name property name
-     * @param mixed $value value
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
      */
-    public function __set($property_name, $value)
+    public function __get($property_name)
     {
-    	if ($property_name == 'resource_object' || $property_name == 'cache_resource_object') {
-    		$this->$property_name = $value;
-    	} elseif (property_exists($this->smarty, $property_name)) {
-    		$this->smarty->$property_name = $value;
-    	} else {
-        	throw new SmartyException("invalid template property '$property_name'.");
+        switch ($property_name) {
+            case 'compiled':
+                $this->loadCompiled();
+                return $this->compiled;
+            case 'cached':
+                $this->loadCached();
+                return $this->cached;
+            case 'compiler':
+                $this->loadCompiler();
+                return $this->compiler;
+            default:
+                // Smarty property ?
+                if (property_exists($this->smarty, $property_name)) {
+                    return $this->smarty->$property_name;
+                }
         }
+        throw new SmartyException("template property '$property_name' does not exist.");
     }
 
     /**
-     * get Smarty property in template context      
+     * set Smarty property in template context
+     *
      * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     * @throws SmartyException
      */
-    public function __get($property_name)
+    public function __set($property_name, $value)
     {
-    	if ($property_name == 'resource_object') {
-    		// load template resource
-    		$this->resource_object = null;
-        	if (!$this->parseResourceName ($this->template_resource, $this->resource_type, $this->resource_name, $this->resource_object)) {
-            	throw new SmartyException ("Unable to parse resource name \"{$template_resource}\"");
-        	}
-        	return $this->resource_object;
-        }
-        if ($property_name == 'cache_resource_object') { 
-        	// load cache resource
-            $this->cache_resource_object = $this->loadCacheResource();
-            return $this->cache_resource_object;
-    	}
-    	if (property_exists($this->smarty, $property_name)) {
-    		return $this->smarty->$property_name;
-    	} else {
-        	throw new SmartyException("template property '$property_name' does not exist.");
+        switch ($property_name) {
+            case 'compiled':
+            case 'cached':
+            case 'compiler':
+                $this->$property_name = $value;
+                return;
+            default:
+                // Smarty property ?
+                if (property_exists($this->smarty, $property_name)) {
+                    $this->smarty->$property_name = $value;
+                    return;
+                }
         }
+        throw new SmartyException("invalid template property '$property_name'.");
     }
 
-
     /**
-     * Takes unknown class methods and lazy loads sysplugin files for them
-     * class name format: Smarty_Method_MethodName
-     * plugin filename format: method.methodname.php
-     * 
-     * @param string $name unknown methode name
-     * @param array $args aurgument array
+     * Template data object destructor
      */
-    public function __call($name, $args)
+    public function __destruct()
     {
-        static $camel_func;
-        if (!isset($camel_func))
-            $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); 
-        // see if this is a set/get for a property
-        $first3 = strtolower(substr($name, 0, 3));
-        if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') {
-            // try to keep case correct for future PHP 6.0 case-sensitive class methods
-            // lcfirst() not available < PHP 5.3.0, so improvise
-            $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4); 
-            // convert camel case to underscored name
-            $property_name = preg_replace_callback('/([A-Z])/', $camel_func, $property_name);
-    		if (property_exists($this, $property_name)) {
-            	if ($first3 == 'get')
-                	return $this->$property_name;
-            	else
-                	return $this->$property_name = $args[0];
-        	}
+        if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
+            $this->cached->handler->releaseLock($this->smarty, $this->cached);
         }
-        // Smarty Backward Compatible wrapper
-		if (strpos($name,'_') !== false) {
-        	if (!isset($this->wrapper)) {
-           	 $this->wrapper = new Smarty_Internal_Wrapper($this);
-        	} 
-        	return $this->wrapper->convert($name, $args);
-        }
-        // pass call to Smarty object 	
-        return call_user_func_array(array($this->smarty,$name),$args);
-    } 
-
+    }
 }
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
new file mode 100644
index 000000000..200c11bb5
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
@@ -0,0 +1,386 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class with shared smarty/template methods
+ *
+ * @package    Smarty
+ * @subpackage Template
+ *
+ * @property int $_objType
+ *
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase addDefaultModifiers(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addLiterals(mixed $literals)
+ * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
+ * @method array getAutoloadFilters(string $type = null)
+ * @method string getDebugTemplate()
+ * @method array getDefaultModifier()
+ * @method array getLiterals()
+ * @method array getTags(mixed $template = null)
+ * @method object getRegisteredObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
+ * @method Smarty_Internal_TemplateBase registerClass(string $class_name, string $class_impl)
+ * @method Smarty_Internal_TemplateBase registerDefaultConfigHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerDefaultPluginHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerDefaultTemplateHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerResource(string $name, mixed $resource_handler)
+ * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
+ * @method Smarty_Internal_TemplateBase setDefaultModifiers(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase setLiterals(mixed $literals)
+ * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
+ * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
+ * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
+ */
+abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
+{
+    /**
+     * Set this if you want different sets of cache files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * Set this if you want different sets of compiled files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * caching enabled
+     *
+     * @var int
+     */
+    public $caching = Smarty::CACHING_OFF;
+
+    /**
+     * check template for modifications?
+     *
+     * @var int
+     */
+    public $compile_check = Smarty::COMPILECHECK_ON;
+
+    /**
+     * cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 3600;
+
+    /**
+     * Array of source information for known template functions
+     *
+     * @var array
+     */
+    public $tplFunctions = array();
+
+    /**
+     * universal cache
+     *
+     * @var array()
+     */
+    public $_cache = array();
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     *
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
+     */
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        $result = $this->_execute($template, $cache_id, $compile_id, $parent, 0);
+        return $result === null ? ob_get_clean() : $result;
+    }
+
+    /**
+     * displays a Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        // display template
+        $this->_execute($template, $cache_id, $compile_id, $parent, 1);
+    }
+
+    /**
+     * test if cache is valid
+     *
+     * @api  Smarty::isCached()
+     * @link http://www.smarty.net/docs/en/api.is.cached.tpl
+     *
+     * @param null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template
+     *                                                          object
+     * @param mixed                                 $cache_id   cache id to be used with this template
+     * @param mixed                                 $compile_id compile id to be used with this template
+     * @param object                                $parent     next higher level of Smarty variables
+     *
+     * @return bool cache status
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        return $this->_execute($template, $cache_id, $compile_id, $parent, 2);
+    }
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     * @param string $function   function type 0 = fetch,  1 = display, 2 = isCache
+     *
+     * @return mixed
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    private function _execute($template, $cache_id, $compile_id, $parent, $function)
+    {
+        $smarty = $this->_getSmartyObj();
+        $saveVars = true;
+        if ($template === null) {
+            if (!$this->_isTplObj()) {
+                throw new SmartyException($function . '():Missing \'$template\' parameter');
+            } else {
+                $template = $this;
+            }
+        } elseif (is_object($template)) {
+            /* @var Smarty_Internal_Template $template */
+            if (!isset($template->_objType) || !$template->_isTplObj()) {
+                throw new SmartyException($function . '():Template object expected');
+            }
+        } else {
+            // get template object
+            $saveVars = false;
+            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent ? $parent : $this, false);
+            if ($this->_objType === 1) {
+                // set caching in template object
+                $template->caching = $this->caching;
+            }
+        }
+        // make sure we have integer values
+        $template->caching = (int)$template->caching;
+        // fetch template content
+        $level = ob_get_level();
+        try {
+            $_smarty_old_error_level =
+                isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
+            if ($this->_objType === 2) {
+                /* @var Smarty_Internal_Template $this */
+                $template->tplFunctions = $this->tplFunctions;
+                $template->inheritance = $this->inheritance;
+            }
+            /* @var Smarty_Internal_Template $parent */
+            if (isset($parent->_objType) && ($parent->_objType === 2) && !empty($parent->tplFunctions)) {
+                $template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions);
+            }
+            if ($function === 2) {
+                if ($template->caching) {
+                    // return cache status of template
+                    if (!isset($template->cached)) {
+                        $template->loadCached();
+                    }
+                    $result = $template->cached->isCached($template);
+                    Smarty_Internal_Template::$isCacheTplObj[ $template->_getTemplateId() ] = $template;
+                } else {
+                    return false;
+                }
+            } else {
+                if ($saveVars) {
+                    $savedTplVars = $template->tpl_vars;
+                    $savedConfigVars = $template->config_vars;
+                }
+                ob_start();
+                $template->_mergeVars();
+                if (!empty(Smarty::$global_tpl_vars)) {
+                    $template->tpl_vars = array_merge(Smarty::$global_tpl_vars, $template->tpl_vars);
+                }
+                $result = $template->render(false, $function);
+                $template->_cleanUp();
+                if ($saveVars) {
+                    $template->tpl_vars = $savedTplVars;
+                    $template->config_vars = $savedConfigVars;
+                } else {
+                    if (!$function && !isset(Smarty_Internal_Template::$tplObjCache[ $template->templateId ])) {
+                        $template->parent = null;
+                        $template->tpl_vars = $template->config_vars = array();
+                        Smarty_Internal_Template::$tplObjCache[ $template->templateId ] = $template;
+                    }
+                }
+            }
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            return $result;
+        } catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param string   $type       plugin type
+     * @param string   $name       name of template tag
+     * @param callable $callback   PHP callback to register
+     * @param bool     $cacheable  if true (default) this function is cache able
+     * @param mixed    $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
+    {
+        return $this->ext->registerPlugin->registerPlugin($this, $type, $name, $callback, $cacheable, $cache_attr);
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function loadFilter($type, $name)
+    {
+        return $this->ext->loadFilter->loadFilter($this, $type, $name);
+    }
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param string      $type filter type
+     * @param callable    $callback
+     * @param string|null $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter($type, $callback, $name = null)
+    {
+        return $this->ext->registerFilter->registerFilter($this, $type, $callback, $name);
+    }
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param string $object_name
+     * @param object $object                     the referenced PHP object to register
+     * @param array  $allowed_methods_properties list of allowed methods (empty = all)
+     * @param bool   $format                     smarty argument format, else traditional
+     * @param array  $block_methods              list of block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(
+        $object_name,
+        $object,
+        $allowed_methods_properties = array(),
+        $format = true,
+        $block_methods = array()
+    ) {
+        return $this->ext->registerObject->registerObject(
+            $this,
+            $object_name,
+            $object,
+            $allowed_methods_properties,
+            $format,
+            $block_methods
+        );
+    }
+
+    /**
+     * @param int $compile_check
+     */
+    public function setCompileCheck($compile_check)
+    {
+        $this->compile_check = (int)$compile_check;
+    }
+
+    /**
+     * @param int $caching
+     */
+    public function setCaching($caching)
+    {
+        $this->caching = (int)$caching;
+    }
+
+    /**
+     * @param int $cache_lifetime
+     */
+    public function setCacheLifetime($cache_lifetime)
+    {
+        $this->cache_lifetime = $cache_lifetime;
+    }
+
+    /**
+     * @param string $compile_id
+     */
+    public function setCompileId($compile_id)
+    {
+        $this->compile_id = $compile_id;
+    }
+
+    /**
+     * @param string $cache_id
+     */
+    public function setCacheId($cache_id)
+    {
+        $this->cache_id = $cache_id;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
index 2a95eca4d..3cc957dec 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -1,435 +1,1760 @@
 <?php
 /**
  * Smarty Internal Plugin Smarty Template Compiler Base
- * 
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- * 
- * @package Smarty
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews 
+ * @author     Uwe Tews
  */
 
 /**
- * Main compiler class
+ * Main abstract compiler class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ *
+ * @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode  = ''
+ * @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
+ * @method   registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+ * @method   unregisterPostCompileCallback($key)
  */
-class Smarty_Internal_TemplateCompilerBase {
-    // hash for nocache sections
-    private $nocache_hash = null; 
-    // suppress generation of nocache code
-    public $suppressNocacheProcessing = false; 
-    // compile tag objects
-    static $_tag_objects = array(); 
-    // tag stack
-    public $_tag_stack = array(); 
-    // current template
+abstract class Smarty_Internal_TemplateCompilerBase
+{
+    /**
+     * compile tag objects cache
+     *
+     * @var array
+     */
+    public static $_tag_objects = array();
+
+    /**
+     * counter for prefix variable number
+     *
+     * @var int
+     */
+    public static $prefixVariableNumber = 0;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Parser object
+     *
+     * @var Smarty_Internal_Templateparser
+     */
+    public $parser = null;
+
+    /**
+     * hash for nocache sections
+     *
+     * @var mixed
+     */
+    public $nocache_hash = null;
+
+    /**
+     * suppress generation of nocache code
+     *
+     * @var bool
+     */
+    public $suppressNocacheProcessing = false;
+
+    /**
+     * caching enabled (copied from template object)
+     *
+     * @var int
+     */
+    public $caching = 0;
+
+    /**
+     * tag stack
+     *
+     * @var array
+     */
+    public $_tag_stack = array();
+
+    /**
+     * tag stack count
+     *
+     * @var array
+     */
+    public $_tag_stack_count = array();
+
+    /**
+     * Plugins used by template
+     *
+     * @var array
+     */
+    public $required_plugins = array('compiled' => array(), 'nocache' => array());
+
+    /**
+     * Required plugins stack
+     *
+     * @var array
+     */
+    public $required_plugins_stack = array();
+
+    /**
+     * current template
+     *
+     * @var Smarty_Internal_Template
+     */
     public $template = null;
-    // optional log of tag/attributes
-    public $used_tags = array();
+
+    /**
+     * merged included sub template data
+     *
+     * @var array
+     */
+    public $mergedSubTemplatesData = array();
+
+    /**
+     * merged sub template code
+     *
+     * @var array
+     */
+    public $mergedSubTemplatesCode = array();
+
+    /**
+     * collected template properties during compilation
+     *
+     * @var array
+     */
+    public $templateProperties = array();
+
+    /**
+     * source line offset for error messages
+     *
+     * @var int
+     */
+    public $trace_line_offset = 0;
+
+    /**
+     * trace uid
+     *
+     * @var string
+     */
+    public $trace_uid = '';
+
+    /**
+     * trace file path
+     *
+     * @var string
+     */
+    public $trace_filepath = '';
+
+    /**
+     * stack for tracing file and line of nested {block} tags
+     *
+     * @var array
+     */
+    public $trace_stack = array();
+
+    /**
+     * plugins loaded by default plugin handler
+     *
+     * @var array
+     */
+    public $default_handler_plugins = array();
+
+    /**
+     * saved preprocessed modifier list
+     *
+     * @var mixed
+     */
+    public $default_modifier_list = null;
+
+    /**
+     * force compilation of complete template as nocache
+     *
+     * @var boolean
+     */
+    public $forceNocache = false;
+
+    /**
+     * flag if compiled template file shall we written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
+    /**
+     * Template functions
+     *
+     * @var array
+     */
+    public $tpl_function = array();
+
+    /**
+     * called sub functions from template function
+     *
+     * @var array
+     */
+    public $called_functions = array();
+
+    /**
+     * compiled template or block function code
+     *
+     * @var string
+     */
+    public $blockOrFunctionCode = '';
+
+    /**
+     * php_handling setting either from Smarty or security
+     *
+     * @var int
+     */
+    public $php_handling = 0;
+
+    /**
+     * flags for used modifier plugins
+     *
+     * @var array
+     */
+    public $modifier_plugins = array();
+
+    /**
+     * type of already compiled modifier
+     *
+     * @var array
+     */
+    public $known_modifier_type = array();
+
+    /**
+     * parent compiler object for merged subtemplates and template functions
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $parent_compiler = null;
+
+    /**
+     * Flag true when compiling nocache section
+     *
+     * @var bool
+     */
+    public $nocache = false;
+
+    /**
+     * Flag true when tag is compiled as nocache
+     *
+     * @var bool
+     */
+    public $tag_nocache = false;
+
+    /**
+     * Compiled tag prefix code
+     *
+     * @var array
+     */
+    public $prefix_code = array();
+
+    /**
+     * used prefix variables by current compiled tag
+     *
+     * @var array
+     */
+    public $usedPrefixVariables = array();
+
+    /**
+     * Prefix code  stack
+     *
+     * @var array
+     */
+    public $prefixCodeStack = array();
+
+    /**
+     * Tag has compiled code
+     *
+     * @var bool
+     */
+    public $has_code = false;
+
+    /**
+     * A variable string was compiled
+     *
+     * @var bool
+     */
+    public $has_variable_string = false;
+
+    /**
+     * Stack for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filter_stack = array();
+
+    /**
+     * variable filters for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filters = array();
+
+    /**
+     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+     *
+     * @var int
+     */
+    public $loopNesting = 0;
+
+    /**
+     * Strip preg pattern
+     *
+     * @var string
+     */
+    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+    /**
+     * plugin search order
+     *
+     * @var array
+     */
+    public $plugin_search_order = array(
+        'function',
+        'block',
+        'compiler',
+        'class'
+    );
+
+    /**
+     * General storage area for tag compiler plugins
+     *
+     * @var array
+     */
+    public $_cache = array();
+
+    /**
+     * Lexer preg pattern for left delimiter
+     *
+     * @var string
+     */
+    private $ldelPreg = '[{]';
+
+    /**
+     * Lexer preg pattern for right delimiter
+     *
+     * @var string
+     */
+    private $rdelPreg = '[}]';
+
+    /**
+     * Length of right delimiter
+     *
+     * @var int
+     */
+    private $rdelLength = 0;
+
+    /**
+     * Length of left delimiter
+     *
+     * @var int
+     */
+    private $ldelLength = 0;
+
+    /**
+     * Lexer preg pattern for user literals
+     *
+     * @var string
+     */
+    private $literalPreg = '';
 
     /**
      * Initialize compiler
+     *
+     * @param Smarty $smarty global instance
      */
-    public function __construct()
+    public function __construct(Smarty $smarty)
     {
-        $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true));
-    } 
+        $this->smarty = $smarty;
+        $this->nocache_hash = str_replace(
+            array(
+                '.',
+                ','
+            ),
+            '_',
+            uniqid(mt_rand(), true)
+        );
+    }
 
     /**
-     * Methode to compile a Smarty template
-     * 
-     * @param  $template template object to compile
+     * Method to compile a Smarty template
+     *
+     * @param Smarty_Internal_Template                  $template template object to compile
+     * @param bool                                      $nocache  true is shall be compiled in nocache mode
+     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
      * @return bool true if compiling succeeded, false if it failed
+     * @throws \Exception
      */
-    public function compileTemplate($template)
+    public function compileTemplate(
+        Smarty_Internal_Template $template,
+        $nocache = null,
+        Smarty_Internal_TemplateCompilerBase $parent_compiler = null
+    ) {
+        // get code frame of compiled template
+        $_compiled_code = $template->smarty->ext->_codeFrame->create(
+            $template,
+            $this->compileTemplateSource(
+                $template,
+                $nocache,
+                $parent_compiler
+            ),
+            $this->postFilter($this->blockOrFunctionCode) .
+            join('', $this->mergedSubTemplatesCode),
+            false,
+            $this
+        );
+        return $_compiled_code;
+    }
+
+    /**
+     * Compile template source and run optional post filter
+     *
+     * @param \Smarty_Internal_Template             $template
+     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
+     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function compileTemplateSource(
+        Smarty_Internal_Template $template,
+        $nocache = null,
+        Smarty_Internal_TemplateCompilerBase $parent_compiler = null
+    ) {
+        try {
+            // save template object in compiler class
+            $this->template = $template;
+            if (property_exists($this->template->smarty, 'plugin_search_order')) {
+                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
+            }
+            if ($this->smarty->debugging) {
+                if (!isset($this->smarty->_debug)) {
+                    $this->smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $this->smarty->_debug->start_compile($this->template);
+            }
+            if (isset($this->template->smarty->security_policy)) {
+                $this->php_handling = $this->template->smarty->security_policy->php_handling;
+            } else {
+                $this->php_handling = $this->template->smarty->php_handling;
+            }
+            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+            $nocache = isset($nocache) ? $nocache : false;
+            if (empty($template->compiled->nocache_hash)) {
+                $template->compiled->nocache_hash = $this->nocache_hash;
+            } else {
+                $this->nocache_hash = $template->compiled->nocache_hash;
+            }
+            $this->caching = $template->caching;
+            // flag for nocache sections
+            $this->nocache = $nocache;
+            $this->tag_nocache = false;
+            // reset has nocache code flag
+            $this->template->compiled->has_nocache_code = false;
+            $this->has_variable_string = false;
+            $this->prefix_code = array();
+            // add file dependency
+            if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
+                $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
+                    array(
+                        $this->template->source->filepath,
+                        $this->template->source->getTimeStamp(),
+                        $this->template->source->type,
+                    );
+            }
+            $this->smarty->_current_file = $this->template->source->filepath;
+            // get template source
+            if (!empty($this->template->source->components)) {
+                // we have array of inheritance templates by extends: resource
+                // generate corresponding source code sequence
+                $_content =
+                    Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template);
+            } else {
+                // get template source
+                $_content = $this->template->source->getContent();
+            }
+            $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
+            if (!empty($this->required_plugins[ 'compiled' ]) || !empty($this->required_plugins[ 'nocache' ])) {
+                $_compiled_code = '<?php ' . $this->compileRequiredPlugins() . "?>\n" . $_compiled_code;
+            }
+        } catch (Exception $e) {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_compile($this->template);
+            }
+            $this->_tag_stack = array();
+            // free memory
+            $this->parent_compiler = null;
+            $this->template = null;
+            $this->parser = null;
+            throw $e;
+        }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        $this->parent_compiler = null;
+        $this->parser = null;
+        return $_compiled_code;
+    }
+
+    /**
+     * Optionally process compiled code by post filter
+     *
+     * @param string $code compiled code
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function postFilter($code)
     {
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
+        // run post filter if on code
+        if (!empty($code)
+            && (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
         } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        } 
-        // flag for nochache sections
-        $this->nocache = false;
-        $this->tag_nocache = false; 
-        // save template object in compiler class
-        $this->template = $template;
-        $this->smarty->_current_file = $this->template->getTemplateFilepath(); 
-        // template header code
-        $template_header = '';
-        if (!$template->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->getTemplateFilepath() . "\" */ ?>\n";
-        } 
-
-        do {
-            // flag for aborting current and start recompile
-            $this->abort_and_recompile = false; 
-            // get template source
-            $_content = $template->getTemplateSource(); 
-            // run prefilter if required
-            if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
-                $template->template_source = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
-            } 
-            // on empty template just return header
-            if ($_content == '') {
-                if ($template->suppressFileDependency) {
-                    $template->compiled_template = '';
-                } else {
-                    $template->compiled_template = $template_header . $template->createPropertyHeader();
-                } 
-                return true;
-            } 
-            // call compiler
-            $_compiled_code = $this->doCompile($_content);
-        } while ($this->abort_and_recompile); 
-        // return compiled code to template object
-        if ($template->suppressFileDependency) {
-            $template->compiled_template = $_compiled_code;
+            return $code;
+        }
+    }
+
+    /**
+     * Run optional prefilter
+     *
+     * @param string $_content template source
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function preFilter($_content)
+    {
+        // run pre filter if required
+        if ($_content !== ''
+            && ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
         } else {
-            $template->compiled_template = $template_header . $template->createPropertyHeader() . $_compiled_code;
-        } 
-        // run postfilter if required
-        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-            $template->compiled_template = Smarty_Internal_Filter_Handler::runFilter('post', $template->compiled_template, $template);
-        } 
-    } 
+            return $_content;
+        }
+    }
 
     /**
      * Compile Tag
-     * 
      * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
-     * 
-     * @param string $tag tag name
-     * @param array $args array with tag attributes
-     * @param array $parameter array with compilation parameter
+     *
+     * Save current prefix code
+     * Compile tag
+     * Merge tag prefix code with saved one
+     * (required nested tags in attributes)
+     *
+     * @param string $tag       tag name
+     * @param array  $args      array with tag attributes
+     * @param array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
      * @return string compiled code
      */
     public function compileTag($tag, $args, $parameter = array())
-    { 
+    {
+        $this->prefixCodeStack[] = $this->prefix_code;
+        $this->prefix_code = array();
+        $result = $this->compileTag2($tag, $args, $parameter);
+        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        return $result;
+    }
+
+    /**
+     * compile variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileVariable($variable)
+    {
+        if (!strpos($variable, '(')) {
+            // not a variable variable
+            $var = trim($variable, '\'');
+            $this->tag_nocache = $this->tag_nocache |
+                                 $this->template->ext->getTemplateVars->_getVariable(
+                                     $this->template,
+                                     $var,
+                                     null,
+                                     true,
+                                     false
+                                 )->nocache;
+            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
+        }
+        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+    }
+
+    /**
+     * compile config variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileConfigVariable($variable)
+    {
+        // return '$_smarty_tpl->config_vars[' . $variable . ']';
+        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
+    }
+
+    /**
+     * compile PHP function call
+     *
+     * @param string $name
+     * @param array  $parameter
+     *
+     * @return string
+     * @throws \SmartyCompilerException
+     */
+    public function compilePHPFunctionCall($name, $parameter)
+    {
+        if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
+            if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
+                || strcasecmp($name, 'array') === 0 || is_callable($name)
+            ) {
+                $func_name = strtolower($name);
+
+                if ($func_name === 'isset') {
+                    if (count($parameter) === 0) {
+                        $this->trigger_template_error('Illegal number of parameter in "isset()"');
+                    }
+
+	                $pa = array();
+	                foreach ($parameter as $p) {
+		                $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
+	                }
+	                return '(' . implode(' && ', $pa) . ')';
+
+                } elseif (in_array(
+                    $func_name,
+                    array(
+                        'empty',
+                        'reset',
+                        'current',
+                        'end',
+                        'prev',
+                        'next'
+                    )
+                )
+                ) {
+                    if (count($parameter) !== 1) {
+                        $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
+                    }
+                    if ($func_name === 'empty') {
+                        if (!$this->syntaxMatchesVariable($parameter[0]) && version_compare(PHP_VERSION, '5.5.0', '<')) {
+                            return '(' . $parameter[ 0 ] . ' === false )';
+                        } else {
+                            return $func_name . '(' .
+                                   str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
+                        }
+                    } else {
+                        return $func_name . '(' . $parameter[ 0 ] . ')';
+                    }
+                } else {
+                    return $name . '(' . implode(',', $parameter) . ')';
+                }
+            } else {
+                $this->trigger_template_error("unknown function '{$name}'");
+            }
+        }
+    }
+
+	/**
+	 * Determines whether the passed string represents a valid (PHP) variable.
+	 * This is important, because `isset()` only works on variables and `empty()` can only be passed
+	 * a variable prior to php5.5
+	 * @param $string
+	 * @return bool
+	 */
+	private function syntaxMatchesVariable($string) {
+    	static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
+    	return 1 === preg_match($regex_pattern, trim($string));
+    }
+
+    /**
+     * This method is called from parser to process a text content section if strip is enabled
+     * - remove text from inheritance child templates as they may generate output
+     *
+     * @param string $text
+     *
+     * @return string
+     */
+    public function processText($text)
+    {
+
+        if (strpos($text, '<') === false) {
+        	return preg_replace($this->stripRegEx, '', $text);
+        }
+
+	    $store = array();
+	    $_store = 0;
+
+        // capture html elements not to be messed with
+        $_offset = 0;
+        if (preg_match_all(
+            '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+            $text,
+            $matches,
+            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+        )
+        ) {
+            foreach ($matches as $match) {
+                $store[] = $match[ 0 ][ 0 ];
+                $_length = strlen($match[ 0 ][ 0 ]);
+                $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+                $_offset += $_length - strlen($replace);
+                $_store++;
+            }
+        }
+        $expressions = array(// replace multiple spaces between tags by a single space
+                             '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
+                             // remove newline between tags
+                             '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s'                     => '\1\2',
+                             // remove multiple spaces between attributes (but not in attribute values!)
+                             '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                             '#>[\040\011]+$#Ss'                                                       => '> ',
+                             '#>[\040\011]*[\n]\s*$#Ss'                                                => '>',
+                             $this->stripRegEx                                                         => '',
+        );
+        $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+        $_offset = 0;
+        if (preg_match_all(
+            '#@!@SMARTY:([0-9]+):SMARTY@!@#is',
+            $text,
+            $matches,
+            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+        )
+        ) {
+            foreach ($matches as $match) {
+                $_length = strlen($match[ 0 ][ 0 ]);
+                $replace = $store[ $match[ 1 ][ 0 ] ];
+                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+                $_offset += strlen($replace) - $_length;
+                $_store++;
+            }
+        }
+        return $text;
+    }
+
+    /**
+     * lazy loads internal compile plugin for tag and calls the compile method
+     * compile objects cached for reuse.
+     * class name format:  Smarty_Internal_Compile_TagName
+     * plugin filename format: Smarty_Internal_TagName.php
+     *
+     * @param string $tag    tag name
+     * @param array  $args   list of tag attributes
+     * @param mixed  $param1 optional parameter
+     * @param mixed  $param2 optional parameter
+     * @param mixed  $param3 optional parameter
+     *
+     * @return bool|string compiled code or false
+     * @throws \SmartyCompilerException
+     */
+    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+    {
+        /* @var Smarty_Internal_CompileBase $tagCompiler */
+        $tagCompiler = $this->getTagCompiler($tag);
+        // compile this tag
+        return $tagCompiler === false ? false : $tagCompiler->compile($args, $this, $param1, $param2, $param3);
+    }
+
+    /**
+     * lazy loads internal compile plugin for tag compile objects cached for reuse.
+     *
+     * class name format:  Smarty_Internal_Compile_TagName
+     * plugin filename format: Smarty_Internal_TagName.php
+     *
+     * @param string $tag tag name
+     *
+     * @return bool|\Smarty_Internal_CompileBase tag compiler object or false if not found
+     */
+    public function getTagCompiler($tag)
+    {
+        // re-use object if already exists
+        if (!isset(self::$_tag_objects[ $tag ])) {
+            // lazy load internal compiler plugin
+            $_tag = explode('_', $tag);
+            $_tag = array_map('ucfirst', $_tag);
+            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
+            if (class_exists($class_name)
+                && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+            ) {
+                self::$_tag_objects[ $tag ] = new $class_name;
+            } else {
+                self::$_tag_objects[ $tag ] = false;
+            }
+        }
+        return self::$_tag_objects[ $tag ];
+    }
+
+    /**
+     * Check for plugins and return function name
+     *
+     * @param        $plugin_name
+     * @param string $plugin_type type of plugin
+     *
+     * @return string call name of function
+     * @throws \SmartyException
+     */
+    public function getPlugin($plugin_name, $plugin_type)
+    {
+        $function = null;
+        if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+            if (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+                $function =
+                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            } elseif (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
+                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
+                $function =
+                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            }
+        } else {
+            if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+                $function =
+                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            } elseif (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
+                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
+                $function =
+                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            }
+        }
+        if (isset($function)) {
+            if ($plugin_type === 'modifier') {
+                $this->modifier_plugins[ $plugin_name ] = true;
+            }
+            return $function;
+        }
+        // loop through plugin dirs and find the plugin
+        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
+        $file = $this->smarty->loadPlugin($function, false);
+        if (is_string($file)) {
+            if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                    $file;
+                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                    $function;
+            } else {
+                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                    $file;
+                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                    $function;
+            }
+            if ($plugin_type === 'modifier') {
+                $this->modifier_plugins[ $plugin_name ] = true;
+            }
+            return $function;
+        }
+        if (is_callable($function)) {
+            // plugin function is defined in the script
+            return $function;
+        }
+        return false;
+    }
+
+    /**
+     * Check for plugins by default plugin handler
+     *
+     * @param string $tag         name of tag
+     * @param string $plugin_type type of plugin
+     *
+     * @return bool true if found
+     * @throws \SmartyCompilerException
+     */
+    public function getPluginFromDefaultHandler($tag, $plugin_type)
+    {
+        $callback = null;
+        $script = null;
+        $cacheable = true;
+        $result = call_user_func_array(
+            $this->smarty->default_plugin_handler_func,
+            array(
+                $tag,
+                $plugin_type,
+                $this->template,
+                &$callback,
+                &$script,
+                &$cacheable,
+            )
+        );
+        if ($result) {
+            $this->tag_nocache = $this->tag_nocache || !$cacheable;
+            if ($script !== null) {
+                if (is_file($script)) {
+                    if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+                        $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
+                            $script;
+                        $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
+                            $callback;
+                    } else {
+                        $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
+                            $script;
+                        $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
+                            $callback;
+                    }
+                    include_once $script;
+                } else {
+                    $this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found");
+                }
+            }
+            if (is_callable($callback)) {
+                $this->default_handler_plugins[ $plugin_type ][ $tag ] = array(
+                    $callback,
+                    true,
+                    array()
+                );
+                return true;
+            } else {
+                $this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable");
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Append code segments and remove unneeded ?> <?php transitions
+     *
+     * @param string $left
+     * @param string $right
+     *
+     * @return string
+     */
+    public function appendCode($left, $right)
+    {
+        if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) {
+            $left = preg_replace('/\s*\?>\s?$/D', "\n", $left);
+            $left .= preg_replace('/^<\?php\s+/', '', $right);
+        } else {
+            $left .= $right;
+        }
+        return $left;
+    }
+
+    /**
+     * Inject inline code for nocache template sections
+     * This method gets the content of each template element from the parser.
+     * If the content is compiled code and it should be not cached the code is injected
+     * into the rendered output.
+     *
+     * @param string  $content content of template element
+     * @param boolean $is_code true if content is compiled code
+     *
+     * @return string  content
+     */
+    public function processNocacheCode($content, $is_code)
+    {
+        // If the template is not evaluated and we have a nocache section and or a nocache tag
+        if ($is_code && !empty($content)) {
+            // generate replacement code
+            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->caching
+                && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
+            ) {
+                $this->template->compiled->has_nocache_code = true;
+                $_output = addcslashes($content, '\'\\');
+                $_output = str_replace('^#^', '\'', $_output);
+                $_output =
+                    "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+                // make sure we include modifier plugins for nocache code
+                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
+                    if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
+                        $this->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
+                            $this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
+                    }
+                }
+            } else {
+                $_output = $content;
+            }
+        } else {
+            $_output = $content;
+        }
+        $this->modifier_plugins = array();
+        $this->suppressNocacheProcessing = false;
+        $this->tag_nocache = false;
+        return $_output;
+    }
+
+    /**
+     * Get Id
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getId($input)
+    {
+        if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
+            return $match[ 2 ];
+        }
+        return false;
+    }
+
+    /**
+     * Get variable name from string
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getVariableName($input)
+    {
+        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
+            return $match[ 1 ];
+        }
+        return false;
+    }
+
+    /**
+     * Set nocache flag in variable or create new variable
+     *
+     * @param string $varName
+     */
+    public function setNocacheInVariable($varName)
+    {
+        // create nocache var to make it know for further compiling
+        if ($_var = $this->getId($varName)) {
+            if (isset($this->template->tpl_vars[ $_var ])) {
+                $this->template->tpl_vars[ $_var ] = clone $this->template->tpl_vars[ $_var ];
+                $this->template->tpl_vars[ $_var ]->nocache = true;
+            } else {
+                $this->template->tpl_vars[ $_var ] = new Smarty_Variable(null, true);
+            }
+        }
+    }
+
+    /**
+     * @param array $_attr tag attributes
+     * @param array $validScopes
+     *
+     * @return int|string
+     * @throws \SmartyCompilerException
+     */
+    public function convertScope($_attr, $validScopes)
+    {
+        $_scope = 0;
+        if (isset($_attr[ 'scope' ])) {
+            $_scopeName = trim($_attr[ 'scope' ], '\'"');
+            if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
+                $_scope = $_scopeName;
+            } elseif (is_string($_scopeName)) {
+                $_scopeName = trim($_scopeName, '\'"');
+                $_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
+            } else {
+                $_scope = false;
+            }
+            if ($_scope === false) {
+                $err = var_export($_scopeName, true);
+                $this->trigger_template_error("illegal value '{$err}' for \"scope\" attribute", null, true);
+            }
+        }
+        return $_scope;
+    }
+
+    /**
+     * Generate nocache code string
+     *
+     * @param string $code PHP code
+     *
+     * @return string
+     */
+    public function makeNocacheCode($code)
+    {
+        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
+               str_replace('^#^', '\'', addcslashes($code, '\'\\')) .
+               "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
+    }
+
+    /**
+     * display compiler error messages without dying
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about expected tokens.
+     * If parameter $args contains a string this is used as error message
+     *
+     * @param string    $args    individual error message or null
+     * @param string    $line    line-number
+     * @param null|bool $tagline if true the line number of last tag
+     *
+     * @throws \SmartyCompilerException when an unexpected token is found
+     */
+    public function trigger_template_error($args = null, $line = null, $tagline = null)
+    {
+        $lex = $this->parser->lex;
+        if ($tagline === true) {
+            // get line number of Tag
+            $line = $lex->taglineno;
+        } elseif (!isset($line)) {
+            // get template source line which has error
+            $line = $lex->line;
+        } else {
+            $line = (int)$line;
+        }
+        if (in_array(
+            $this->template->source->type,
+            array(
+                'eval',
+                'string'
+            )
+        )
+        ) {
+            $templateName = $this->template->source->type . ':' . trim(
+                    preg_replace(
+                        '![\t\r\n]+!',
+                        ' ',
+                        strlen($lex->data) > 40 ?
+                            substr($lex->data, 0, 40) .
+                            '...' : $lex->data
+                    )
+                );
+        } else {
+            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
+        }
+        //        $line += $this->trace_line_offset;
+        $match = preg_split("/\n/", $lex->data);
+        $error_text =
+            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+            trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            $expect = array();
+            // expected token from parser
+            $error_text .= ' - Unexpected "' . $lex->value . '"';
+            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
+                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+                    $exp_token = $this->parser->yyTokenName[ $token ];
+                    if (isset($lex->smarty_token_names[ $exp_token ])) {
+                        // token type from lexer
+                        $expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
+                    } else {
+                        // otherwise internal token name
+                        $expect[] = $this->parser->yyTokenName[ $token ];
+                    }
+                }
+                $error_text .= ', expected one of: ' . implode(' , ', $expect);
+            }
+        }
+        if ($this->smarty->_parserdebug) {
+            $this->parser->errorRunDown();
+            echo ob_get_clean();
+            flush();
+        }
+        $e = new SmartyCompilerException($error_text);
+        $e->line = $line;
+        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
+        $e->desc = $args;
+        $e->template = $this->template->source->filepath;
+        throw $e;
+    }
+
+    /**
+     * Return var_export() value with all white spaces removed
+     *
+     * @param mixed $value
+     *
+     * @return string
+     */
+    public function getVarExport($value)
+    {
+        return preg_replace('/\s/', '', var_export($value, true));
+    }
+
+    /**
+     *  enter double quoted string
+     *  - save tag stack count
+     */
+    public function enterDoubleQuote()
+    {
+        array_push($this->_tag_stack_count, $this->getTagStackCount());
+    }
+
+    /**
+     * Return tag stack count
+     *
+     * @return int
+     */
+    public function getTagStackCount()
+    {
+        return count($this->_tag_stack);
+    }
+
+    /**
+     * @param $lexerPreg
+     *
+     * @return mixed
+     */
+    public function replaceDelimiter($lexerPreg)
+    {
+        return str_replace(
+            array('SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'),
+            array(
+                $this->ldelPreg, $this->literalPreg, $this->rdelPreg,
+                $this->smarty->getAutoLiteral() ? '{1,}' : '{9}',
+                $this->smarty->getAutoLiteral() ? '' : '\\s*'
+            ),
+            $lexerPreg
+        );
+    }
+
+    /**
+     * Build lexer regular expressions for left and right delimiter and user defined literals
+     */
+    public function initDelimiterPreg()
+    {
+        $ldel = $this->smarty->getLeftDelimiter();
+        $this->ldelLength = strlen($ldel);
+        $this->ldelPreg = '';
+        foreach (str_split($ldel, 1) as $chr) {
+            $this->ldelPreg .= '[' . preg_quote($chr,'/') . ']';
+        }
+        $rdel = $this->smarty->getRightDelimiter();
+        $this->rdelLength = strlen($rdel);
+        $this->rdelPreg = '';
+        foreach (str_split($rdel, 1) as $chr) {
+            $this->rdelPreg .= '[' . preg_quote($chr,'/') . ']';
+        }
+        $literals = $this->smarty->getLiterals();
+        if (!empty($literals)) {
+            foreach ($literals as $key => $literal) {
+                $literalPreg = '';
+                foreach (str_split($literal, 1) as $chr) {
+                    $literalPreg .= '[' . preg_quote($chr,'/') . ']';
+                }
+                $literals[ $key ] = $literalPreg;
+            }
+            $this->literalPreg = '|' . implode('|', $literals);
+        } else {
+            $this->literalPreg = '';
+        }
+    }
+
+    /**
+     *  leave double quoted string
+     *  - throw exception if block in string was not closed
+     *
+     * @throws \SmartyCompilerException
+     */
+    public function leaveDoubleQuote()
+    {
+        if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) {
+            $tag = $this->getOpenBlockTag();
+            $this->trigger_template_error(
+                "unclosed '{{$tag}}' in doubled quoted string",
+                null,
+                true
+            );
+        }
+    }
+
+    /**
+     * Get left delimiter preg
+     *
+     * @return string
+     */
+    public function getLdelPreg()
+    {
+        return $this->ldelPreg;
+    }
+
+    /**
+     * Get right delimiter preg
+     *
+     * @return string
+     */
+    public function getRdelPreg()
+    {
+        return $this->rdelPreg;
+    }
+
+    /**
+     * Get length of left delimiter
+     *
+     * @return int
+     */
+    public function getLdelLength()
+    {
+        return $this->ldelLength;
+    }
+
+    /**
+     * Get length of right delimiter
+     *
+     * @return int
+     */
+    public function getRdelLength()
+    {
+        return $this->rdelLength;
+    }
+
+    /**
+     * Get name of current open block tag
+     *
+     * @return string|boolean
+     */
+    public function getOpenBlockTag()
+    {
+        $tagCount = $this->getTagStackCount();
+        if ($tagCount) {
+            return $this->_tag_stack[ $tagCount - 1 ][ 0 ];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if $value contains variable elements
+     *
+     * @param mixed $value
+     *
+     * @return bool|int
+     */
+    public function isVariable($value)
+    {
+        if (is_string($value)) {
+            return preg_match('/[$(]/', $value);
+        }
+        if (is_bool($value) || is_numeric($value)) {
+            return false;
+        }
+        if (is_array($value)) {
+            foreach ($value as $k => $v) {
+                if ($this->isVariable($k) || $this->isVariable($v)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * Get new prefix variable name
+     *
+     * @return string
+     */
+    public function getNewPrefixVariable()
+    {
+        ++self::$prefixVariableNumber;
+        return $this->getPrefixVariable();
+    }
+
+    /**
+     * Get current prefix variable name
+     *
+     * @return string
+     */
+    public function getPrefixVariable()
+    {
+        return '$_prefixVariable' . self::$prefixVariableNumber;
+    }
+
+    /**
+     * append  code to prefix buffer
+     *
+     * @param string $code
+     */
+    public function appendPrefixCode($code)
+    {
+        $this->prefix_code[] = $code;
+    }
+
+    /**
+     * get prefix code string
+     *
+     * @return string
+     */
+    public function getPrefixCode()
+    {
+        $code = '';
+        $prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        $this->prefixCodeStack[] = array();
+        foreach ($prefixArray as $c) {
+            $code = $this->appendCode($code, $c);
+        }
+        $this->prefix_code = array();
+        return $code;
+    }
+
+    /**
+     * Save current required plugins
+     *
+     * @param bool $init if true init required plugins
+     */
+    public function saveRequiredPlugins($init = false)
+    {
+        $this->required_plugins_stack[] = $this->required_plugins;
+        if ($init) {
+            $this->required_plugins = array('compiled' => array(), 'nocache' => array());
+        }
+    }
+
+    /**
+     * Restore required plugins
+     */
+    public function restoreRequiredPlugins()
+    {
+        $this->required_plugins = array_pop($this->required_plugins_stack);
+    }
+
+    /**
+     * Compile code to call Smarty_Internal_Template::_checkPlugins()
+     * for required plugins
+     *
+     * @return string
+     */
+    public function compileRequiredPlugins()
+    {
+        $code = $this->compileCheckPlugins($this->required_plugins[ 'compiled' ]);
+        if ($this->caching && !empty($this->required_plugins[ 'nocache' ])) {
+            $code .= $this->makeNocacheCode($this->compileCheckPlugins($this->required_plugins[ 'nocache' ]));
+        }
+        return $code;
+    }
+
+    /**
+     * Compile code to call Smarty_Internal_Template::_checkPlugins
+     *   - checks if plugin is callable require otherwise
+     *
+     * @param $requiredPlugins
+     *
+     * @return string
+     */
+    public function compileCheckPlugins($requiredPlugins)
+    {
+        if (!empty($requiredPlugins)) {
+            $plugins = array();
+            foreach ($requiredPlugins as $plugin) {
+                foreach ($plugin as $data) {
+                    $plugins[] = $data;
+                }
+            }
+            return '$_smarty_tpl->_checkPlugins(' . $this->getVarExport($plugins) . ');' . "\n";
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * method to compile a Smarty template
+     *
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
+     *
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    abstract protected function doCompile($_content, $isTemplateSource = false);
+
+    /**
+     * Compile Tag
+     *
+     * @param string $tag       tag name
+     * @param array  $args      array with tag attributes
+     * @param array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    private function compileTag2($tag, $args, $parameter)
+    {
+        $plugin_type = '';
         // $args contains the attributes parsed and compiled by the lexer/parser
         // assume that tag does compile into code, but creates no HTML output
         $this->has_code = true;
-        $this->has_output = false;
         // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-        	$this->used_tags[] = array($tag,$args);
-        } 
-		// check nocache option flag
-        if (in_array("'nocache'",$args) || in_array(array('nocache'=>'true'),$args)
-        		|| in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) {
-        	$this->tag_nocache = true;
-        }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
+        if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
+            $this->template->_cache[ 'used_tags' ][] = array(
+                $tag,
+                $args
+            );
+        }
+        // check nocache option flag
+        foreach ($args as $arg) {
+            if (!is_array($arg)) {
+                if ($arg === "'nocache'" || $arg === 'nocache') {
+                    $this->tag_nocache = true;
+                }
+            } else {
+                foreach ($arg as $k => $v) {
+                    if (($k === "'nocache'" || $k === 'nocache') && (trim($v, "'\" ") === 'true')) {
+                        $this->tag_nocache = true;
+                    }
+                }
+            }
+        }
+        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
         if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->smarty->template_functions[$tag])) {
+            if (isset($this->parent_compiler->tpl_function[ $tag ])
+                || (isset($this->template->smarty->ext->_tplFunction)
+                    && $this->template->smarty->ext->_tplFunction->getTplFunction($this->template, $tag) !== false)
+            ) {
                 // template defined by {template} tag
-                $args['_attr']['name'] = "'" . $tag . "'";
+                $args[ '_attr' ][ 'name' ] = "'{$tag}'";
                 $_output = $this->callTagCompiler('call', $args, $parameter);
-            } 
-        } 
+            }
+        }
         if ($_output !== false) {
             if ($_output !== true) {
                 // did we get compiled code
                 if ($this->has_code) {
-                    // Does it create output?
-                    if ($this->has_output) {
-                        $_output .= "\n";
-                    } 
                     // return compiled code
                     return $_output;
-                } 
-            } 
+                }
+            }
             // tag did not produce compiled code
-            return '';
+            return null;
         } else {
             // map_named attributes
-            if (isset($args['_attr'])) {
-                foreach ($args['_attr'] as $key => $attribute) {
+            if (isset($args[ '_attr' ])) {
+                foreach ($args[ '_attr' ] as $key => $attribute) {
                     if (is_array($attribute)) {
                         $args = array_merge($args, $attribute);
-                    } 
-                } 
-            } 
+                    }
+                }
+            }
             // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+            if (strlen($tag) < 6 || substr($tag, -5) !== 'close') {
                 // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) &&
-                            (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode);
-                    } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
+                    $method = $parameter[ 'object_method' ];
+                    if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])
+                        && (empty($this->smarty->registered_objects[ $tag ][ 1 ])
+                            || in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
+                    ) {
+                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
+                    } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
+                        return $this->callTagCompiler(
+                            'private_object_block_function',
+                            $args,
+                            $parameter,
+                            $tag,
+                            $method
+                        );
                     } else {
-                        return $this->trigger_template_error ('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno);
-                    } 
-                } 
+                        // throw exception
+                        $this->trigger_template_error(
+                            'not allowed method "' . $method . '" in registered object "' .
+                            $tag . '"',
+                            null,
+                            true
+                        );
+                    }
+                }
                 // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $type) {
-                    if (isset($this->smarty->registered_plugins[$type][$tag])) {
+                foreach (array(
+                    Smarty::PLUGIN_COMPILER,
+                    Smarty::PLUGIN_FUNCTION,
+                    Smarty::PLUGIN_BLOCK,
+                ) as $plugin_type) {
+                    if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
                         // if compiler function plugin call it now
-                        if ($type == Smarty::PLUGIN_COMPILER) {
+                        if ($plugin_type === Smarty::PLUGIN_COMPILER) {
                             $new_args = array();
-                            foreach ($args as $mixed) {
-                                $new_args = array_merge($new_args, $mixed);
-                            } 
-                            if (!$this->smarty->registered_plugins[$type][$tag][1]) {
+                            foreach ($args as $key => $mixed) {
+                                if (is_array($mixed)) {
+                                    $new_args = array_merge($new_args, $mixed);
+                                } else {
+                                    $new_args[ $key ] = $mixed;
+                                }
+                            }
+                            if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
                                 $this->tag_nocache = true;
-                            } 
-                            $function = $this->smarty->registered_plugins[$type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($this->smarty->registered_plugins[$type][$tag][0], array($new_args, $this));
-                            } 
-                        } 
+                            }
+                            return call_user_func_array(
+                                $this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
+                                array(
+                                    $new_args,
+                                    $this
+                                )
+                            );
+                        }
                         // compile registered function or block function
-                        if ($type == Smarty::PLUGIN_FUNCTION || $type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $type, $args, $parameter, $tag);
-                        } 
-                    } 
-                } 
+                        if ($plugin_type === Smarty::PLUGIN_FUNCTION || $plugin_type === Smarty::PLUGIN_BLOCK) {
+                            return $this->callTagCompiler(
+                                'private_registered_' . $plugin_type,
+                                $args,
+                                $parameter,
+                                $tag
+                            );
+                        }
+                    }
+                }
                 // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+                foreach ($this->plugin_search_order as $plugin_type) {
+                    if ($plugin_type === Smarty::PLUGIN_COMPILER
+                        && $this->smarty->loadPlugin('smarty_compiler_' . $tag)
+                        && (!isset($this->smarty->security_policy)
+                            || $this->smarty->security_policy->isTrustedTag($tag, $this))
+                    ) {
                         $plugin = 'smarty_compiler_' . $tag;
                         if (is_callable($plugin)) {
-                        	// convert arguments format for old compiler plugins
+                            // convert arguments format for old compiler plugins
                             $new_args = array();
-                            foreach ($args as $mixed) {
-                                $new_args = array_merge($new_args, $mixed);
-                            } 
+                            foreach ($args as $key => $mixed) {
+                                if (is_array($mixed)) {
+                                    $new_args = array_merge($new_args, $mixed);
+                                } else {
+                                    $new_args[ $key ] = $mixed;
+                                }
+                            }
                             return $plugin($new_args, $this->smarty);
-                        } 
+                        }
                         if (class_exists($plugin, false)) {
                             $plugin_object = new $plugin;
                             if (method_exists($plugin_object, 'compile')) {
                                 return $plugin_object->compile($args, $this);
-                            } 
-                        } 
-                        throw new SmartyException("Plugin \"{$tag}\" not callable");
+                            }
+                        }
+                        throw new SmartyException("Plugin '{$tag}' not callable");
                     } else {
                         if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
-                        } 
-                    } 
-                } 
+                            if (!isset($this->smarty->security_policy)
+                                || $this->smarty->security_policy->isTrustedTag($tag, $this)
+                            ) {
+                                return $this->callTagCompiler(
+                                    'private_' . $plugin_type . '_plugin',
+                                    $args,
+                                    $parameter,
+                                    $tag,
+                                    $function
+                                );
+                            }
+                        }
+                    }
+                }
+                if (is_callable($this->smarty->default_plugin_handler_func)) {
+                    $found = false;
+                    // look for already resolved tags
+                    foreach ($this->plugin_search_order as $plugin_type) {
+                        if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
+                            $found = true;
+                            break;
+                        }
+                    }
+                    if (!$found) {
+                        // call default handler
+                        foreach ($this->plugin_search_order as $plugin_type) {
+                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                    }
+                    if ($found) {
+                        // if compiler function plugin call it now
+                        if ($plugin_type === Smarty::PLUGIN_COMPILER) {
+                            $new_args = array();
+                            foreach ($args as $key => $mixed) {
+                                if (is_array($mixed)) {
+                                    $new_args = array_merge($new_args, $mixed);
+                                } else {
+                                    $new_args[ $key ] = $mixed;
+                                }
+                            }
+                            return call_user_func_array(
+                                $this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
+                                array(
+                                    $new_args,
+                                    $this
+                                )
+                            );
+                        } else {
+                            return $this->callTagCompiler(
+                                'private_registered_' . $plugin_type,
+                                $args,
+                                $parameter,
+                                $tag
+                            );
+                        }
+                    }
+                }
             } else {
                 // compile closing tag of block function
-                $base_tag = substr($tag, 0, -5); 
+                $base_tag = substr($tag, 0, -5);
                 // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
+                    $method = $parameter[ 'object_method' ];
+                    if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
+                        return $this->callTagCompiler(
+                            'private_object_block_function',
+                            $args,
+                            $parameter,
+                            $tag,
+                            $method
+                        );
                     } else {
-                        return $this->trigger_template_error ('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
-                    } 
-                } 
+                        // throw exception
+                        $this->trigger_template_error(
+                            'not allowed closing tag method "' . $method .
+                            '" in registered object "' . $base_tag . '"',
+                            null,
+                            true
+                        );
+                    }
+                }
                 // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+                    || isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+                ) {
                     return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
-                } 
+                }
+                // registered function tag ?
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+                }
                 // block plugin?
                 if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
                     return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
-                } 
+                }
+                // function plugin?
+                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+                    if (!isset($this->smarty->security_policy)
+                        || $this->smarty->security_policy->isTrustedTag($tag, $this)
+                    ) {
+                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+                    }
+                }
+                // registered compiler plugin ?
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
+                    // if compiler function plugin call it now
+                    $args = array();
+                    if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
+                        $this->tag_nocache = true;
+                    }
+                    return call_user_func_array(
+                        $this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
+                        array(
+                            $args,
+                            $this
+                        )
+                    );
+                }
                 if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
                     $plugin = 'smarty_compiler_' . $tag;
                     if (is_callable($plugin)) {
                         return $plugin($args, $this->smarty);
-                    } 
+                    }
                     if (class_exists($plugin, false)) {
                         $plugin_object = new $plugin;
                         if (method_exists($plugin_object, 'compile')) {
                             return $plugin_object->compile($args, $this);
-                        } 
-                    } 
-                    throw new SmartyException("Plugin \"{$tag}\" not callable");
-                } 
-            } 
-            $this->trigger_template_error ("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
-        } 
-    } 
-
-    /**
-     * lazy loads internal compile plugin for tag and calls the compile methode
-     * 
-     * compile objects cached for reuse.
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
-     * 
-     * @param  $tag string tag name
-     * @param  $args array with tag attributes
-     * @param  $param1 optional parameter
-     * @param  $param2 optional parameter
-     * @param  $param3 optional parameter
-     * @return string compiled code
-     */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
-    { 
-        // re-use object if already exists
-        if (isset(self::$_tag_objects[$tag])) {
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        } 
-        // lazy load internal compiler plugin
-        $class_name = 'Smarty_Internal_Compile_' . $tag;
-        if ($this->smarty->loadPlugin($class_name)) {
-            // use plugin if found
-            self::$_tag_objects[$tag] = new $class_name; 
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        } 
-        // no internal compile plugin for this tag
-        return false;
-    } 
-
-    /**
-     * Check for plugins and return function name
-     * 
-     * @param  $pugin_name string name of plugin or function
-     * @param  $type string type of plugin
-     * @return string call name of function
-     */
-    public function getPlugin($plugin_name, $type)
-    {
-        $function = null;
-        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$type]['function'];
-            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$type] = $this->template->required_plugins['compiled'][$plugin_name][$type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$type]['function'];
-            } 
-        } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function'];
-            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$type] = $this->template->required_plugins['nocache'][$plugin_name][$type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function'];
-            } 
-        } 
-        if (isset($function)) {
-            if ($type == 'modifier') {
-                $this->template->saved_modifier[$plugin_name] = true;
-            } 
-            return $function;
-        } 
-        // loop through plugin dirs and find the plugin
-        $function = 'smarty_' . $type . '_' . $plugin_name;
-        $found = false;
-        foreach((array)$this->smarty->plugins_dir as $_plugin_dir) {
-            $file = rtrim($_plugin_dir, '/\\') . DS . $type . '.' . $plugin_name . '.php';
-            if (file_exists($file)) {
-                // require_once($file);
-                $found = true;
-                break;
-            } 
-        } 
-        if ($found) {
-            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$type]['function'] = $function;
-            } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$type]['function'] = $function;
-            } 
-            if ($type == 'modifier') {
-                $this->template->saved_modifier[$plugin_name] = true;
-            } 
-            return $function;
-        } 
-        if (is_callable($function)) {
-            // plugin function is defined in the script
-            return $function;
-        } 
-        return false;
-    } 
-    /**
-     * Inject inline code for nocache template sections
-     * 
-     * This method gets the content of each template element from the parser.
-     * If the content is compiled code and it should be not cached the code is injected
-     * into the rendered output.
-     * 
-     * @param string $content content of template element
-     * @param boolean $tag_nocache true if the parser detected a nocache situation
-     * @param boolean $is_code true if content is compiled code
-     * @return string content
-     */
-    public function processNocacheCode ($content, $is_code)
-    { 
-        // If the template is not evaluated and we have a nocache section and or a nocache tag
-        if ($is_code && !empty($content)) {
-            // generate replacement code
-            if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
-                    ($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) {
-                $this->template->has_nocache_code = true;
-                $_output = str_replace("'", "\'", $content);
-                $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>"; 
-                // make sure we include modifer plugins for nocache code
-                if (isset($this->template->saved_modifier)) {
-                    foreach ($this->template->saved_modifier as $plugin_name => $dummy) {
-                        if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                            $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
-                        } 
-                    } 
-                    $this->template->saved_modifier = null;
-                } 
-            } else {
-                $_output = $content;
-            } 
-        } else {
-            $_output = $content;
-        } 
-        $this->suppressNocacheProcessing = false;
-        $this->tag_nocache = false;
-        return $_output;
-    } 
-    /**
-     * display compiler error messages without dying
-     * 
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * 
-     * If parameter $args contains a string this is used as error message
-     * 
-     * @param  $args string individual error message or null
-     */
-    public function trigger_template_error($args = null, $line = null)
-    { 
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
-        } 
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax Error in template "' . $this->template->getTemplateFilepath() . '"  on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" ';
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value.'"';
-            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4 ) {
-            	foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-            	    $exp_token = $this->parser->yyTokenName[$token];
-            	    if (isset($this->lex->smarty_token_names[$exp_token])) {
-            	        // token type from lexer
-            	        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-            	    } else {
-            	        // otherwise internal token name
-            	        $expect[] = $this->parser->yyTokenName[$token];
-            	    } 
-            	} 
-            	$error_text .= ', expected one of: ' . implode(' , ', $expect);
-        	}
-        } 
-        throw new SmartyCompilerException($error_text);
-    } 
-} 
-
-?>
\ No newline at end of file
+                        }
+                    }
+                    throw new SmartyException("Plugin '{$tag}' not callable");
+                }
+            }
+            $this->trigger_template_error("unknown tag '{$tag}'", null, true);
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
index 5e0e496a3..867a31d26 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -1,176 +1,362 @@
 <?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
-* Smarty Internal Plugin Templatelexer
-*
-* This is the lexer to break the template source into tokens 
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews 
-*/
-/**
-* Smarty Internal Plugin Templatelexer
-*/
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
 class Smarty_Internal_Templatelexer
 {
+    const TEXT               = 1;
+    const TAG                = 2;
+    const TAGBODY            = 3;
+    const LITERAL            = 4;
+    const DOUBLEQUOTEDSTRING = 5;
+
+    /**
+     * Source
+     *
+     * @var string
+     */
     public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
     public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
     public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
     public $value;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
     public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+    /**
+     * state number
+     *
+     * @var int
+     */
     public $state = 1;
-    public $strip = false;
-    private $heredoc_id_stack = Array();
-    public $smarty_token_names = array (		// Text for parser error messages
-    				'IDENTITY'	=> '===',
-    				'NONEIDENTITY'	=> '!==',
-    				'EQUALS'	=> '==',
-    				'NOTEQUALS'	=> '!=',
-    				'GREATEREQUAL' => '(>=,ge)',
-    				'LESSEQUAL' => '(<=,le)',
-    				'GREATERTHAN' => '(>,gt)',
-    				'LESSTHAN' => '(<,lt)',
-    				'MOD' => '(%,mod)',
-    				'NOT'			=> '(!,not)',
-    				'LAND'		=> '(&&,and)',
-    				'LOR'			=> '(||,or)',
-    				'LXOR'			=> 'xor',
-    				'OPENP'		=> '(',
-    				'CLOSEP'	=> ')',
-    				'OPENB'		=> '[',
-    				'CLOSEB'	=> ']',
-    				'PTR'			=> '->',
-    				'APTR'		=> '=>',
-    				'EQUAL'		=> '=',
-    				'NUMBER'	=> 'number',
-    				'UNIMATH'	=> '+" , "-',
-    				'MATH'		=> '*" , "/" , "%',
-    				'INCDEC'	=> '++" , "--',
-    				'SPACE'		=> ' ',
-    				'DOLLAR'	=> '$',
-    				'SEMICOLON' => ';',
-    				'COLON'		=> ':',
-    				'DOUBLECOLON'		=> '::',
-    				'AT'		=> '@',
-    				'HATCH'		=> '#',
-    				'QUOTE'		=> '"',
-    				'BACKTICK'		=> '`',
-    				'VERT'		=> '|',
-    				'DOT'			=> '.',
-    				'COMMA'		=> '","',
-    				'ANDSYM'		=> '"&"',
-    				'QMARK'		=> '"?"',
-    				'ID'			=> 'identifier',
-    				'OTHER'		=> 'text',
-    				'LINEBREAK'		=> 'newline',
-     				'FAKEPHPSTARTTAG'	=> 'Fake PHP start tag',
-     				'PHPSTARTTAG'	=> 'PHP start tag',
-     				'PHPENDTAG'	=> 'PHP end tag',
- 						'LITERALSTART'  => 'Literal start',
- 						'LITERALEND'    => 'Literal end',
-    				'LDELSLASH' => 'closing tag',
-    				'COMMENT' => 'comment',
-     				'LITERALEND' => 'literal close',
-    				'AS' => 'as',
-    				'TO' => 'to',
-    				);
-    				
-    				
-    function __construct($data,$compiler)
-    {
-//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
-        $this->data = $data;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)',
+                                               'OPENP'       => '(',
+                                               'CLOSEP'      => ')',
+                                               'OPENB'       => '[',
+                                               'CLOSEB'      => ']',
+                                               'PTR'         => '->',
+                                               'APTR'        => '=>',
+                                               'EQUAL'       => '=',
+                                               'NUMBER'      => 'number',
+                                               'UNIMATH'     => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%',
+                                               'INCDEC'      => '++" , "--',
+                                               'SPACE'       => ' ',
+                                               'DOLLAR'      => '$',
+                                               'SEMICOLON'   => ';',
+                                               'COLON'       => ':',
+                                               'DOUBLECOLON' => '::',
+                                               'AT'          => '@',
+                                               'HATCH'       => '#',
+                                               'QUOTE'       => '"',
+                                               'BACKTICK'    => '`',
+                                               'VERT'        => '"|" modifier',
+                                               'DOT'         => '.',
+                                               'COMMA'       => '","',
+                                               'QMARK'       => '"?"',
+                                               'ID'          => 'id, name',
+                                               'TEXT'        => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag',
+                                               'LDEL'        => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment',
+                                               'AS'          => 'as',
+                                               'TO'          => 'to',
+                                               'PHP'         => '"<?php", "<%", "{php}" tag',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',
+    );
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * preg token pattern for state TEXT
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    /**
+     * preg token pattern for state TAG
+     *
+     * @var string
+     */
+    private $yy_global_pattern2 = null;
+
+    /**
+     * preg token pattern for state TAGBODY
+     *
+     * @var string
+     */
+    private $yy_global_pattern3 = null;
+
+    /**
+     * preg token pattern for state LITERAL
+     *
+     * @var string
+     */
+    private $yy_global_pattern4 = null;
+
+    /**
+     * preg token pattern for state DOUBLEQUOTEDSTRING
+     *
+     * @var null
+     */
+    private $yy_global_pattern5 = null;
+
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    private $_yy_state         = 1;
+
+    private $_yy_stack         = array();
+
+    /**
+     * constructor
+     *
+     * @param   string                             $source template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->data = $source;
+        $this->dataLength = strlen($this->data);
         $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
+            $this->counter += strlen($match[ 0 ]);
+        }
         $this->line = 1;
-        $this->smarty = $compiler->smarty;
+        $this->smarty = $compiler->template->smarty;
         $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter,'/'); 
-        $this->ldel_length = strlen($this->smarty->left_delimiter); 
-        $this->rdel = preg_quote($this->smarty->right_delimiter,'/');
-        $this->smarty_token_names['LDEL'] =	$this->smarty->left_delimiter;
-        $this->smarty_token_names['RDEL'] =	$this->smarty->right_delimiter;
-     }
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names[ 'LDEL' ] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names[ 'RDEL' ] = $this->smarty->getRightDelimiter();
+    }
 
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+    public function replace($preg)
+    {
+        return $this->compiler->replaceDelimiter($preg);
+    }
 
-    private $_yy_state = 1;
-    private $_yy_stack = array();
+    /**
+     * check if current value is an autoliteral left delimiter
+     *
+     * @return bool
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+            strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+    } // end function
 
-    function yylex()
+    public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
     }
 
-    function yypushstate($state)
+    public function yypushstate($state)
     {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+        }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+        }
     }
 
-    function yypopstate()
+    public function yypopstate()
     {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+        }
         $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+        }
     }
 
-    function yybegin($state)
+    public function yybegin($state)
     {
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+        }
     }
 
-
-
-    function yylex1()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 1,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 0,
-              21 => 0,
-              22 => 0,
-              23 => 2,
-              26 => 0,
-              27 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 =
+                $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[\/]phpSMARTYrdel)|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>])|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|^(\\{\\})|^(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|^([\t ]*[\r\n]+[\t ]*)|^(".$this->ldel."strip".$this->rdel.")|^(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|^(".$this->ldel."\/strip".$this->rdel.")|^(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|^(".$this->ldel."\\s*literal\\s*".$this->rdel.")|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)(?![^\s]))|^(".$this->ldel."\\s*for(?![^\s]))|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(<%)|^(%>)|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."|<\\?|\\?>|<%|%>)))|^([\S\s]+)|^(.)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state TEXT');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -183,293 +369,253 @@ function yylex1()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line ' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const TEXT = 1;
-    function yy_r1_1($yy_subpatterns)
+    public function yy_r1_1()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r1_2($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r1_3($yy_subpatterns)
+    public function yy_r1_2()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
+        $to = $this->dataLength;
+        preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/", $this->data, $match, PREG_OFFSET_CAPTURE,
+            $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        return false;
     }
-    function yy_r1_5($yy_subpatterns)
-    {
 
-  if ($this->strip) {
-     return false;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LINEBREAK;
-  }
-    }
-    function yy_r1_6($yy_subpatterns)
+    public function yy_r1_4()
     {
-
-  $this->strip = true;
-  return false;
+        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
     }
-    function yy_r1_7($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-    $this->strip = true;
-    return false;
-  }
-    }
-    function yy_r1_8($yy_subpatterns)
+    public function yy_r1_8()
     {
-
-  $this->strip = false;
-  return false;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r1_9($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-    $this->strip = false;
-    return false;
-  }
-    }
-    function yy_r1_10($yy_subpatterns)
+    public function yy_r1_10()
     {
-
-   $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-   $this->yypushstate(self::LITERAL);
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
     }
-    function yy_r1_11($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_12($yy_subpatterns)
+    public function yy_r1_12()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+    } // end function
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+    public function yy_r1_14()
+    {
+        $this->yypushstate(self::TAG);
+        return true;
     }
-    function yy_r1_14($yy_subpatterns)
+
+    public function yy_r1_16()
     {
+        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
+    }
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+    public function yy_r1_19()
+    {
+        if (!isset($this->yy_global_text)) {
+            $this->yy_global_text =
+                $this->replace('/(SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*[>]|[?][>]|[%][>]SMARTYliteral/isS');
+        }
+        $to = $this->dataLength;
+        preg_match($this->yy_global_text, $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r1_15($yy_subpatterns)
+
+    public function yylex2()
     {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 =
+                $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state TAG');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line ' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+    public function yy_r2_1()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r1_16($yy_subpatterns)
+
+    public function yy_r2_4()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+    public function yy_r2_6()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r1_17($yy_subpatterns)
+
+    public function yy_r2_8()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+    public function yy_r2_10()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r1_18($yy_subpatterns)
+
+    public function yy_r2_12()
     {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+    public function yy_r2_15()
+    {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->taglineno = $this->line;
     }
-    function yy_r1_19($yy_subpatterns)
+
+    public function yy_r2_18()
     {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+    }
 
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-  } elseif ($this->value == '<?xml') {
-      $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-  }
-     }
-    function yy_r1_20($yy_subpatterns)
+    public function yy_r2_20()
     {
+        if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] === self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->getLeftDelimiter();
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
+    } // end function
 
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r1_21($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r1_22($yy_subpatterns)
+    public function yy_r2_23()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+    public function yy_r2_25()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r1_23($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r1_26($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-    function yy_r1_27($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-    }
-
-
-    function yylex2()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 0,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 1,
-              22 => 1,
-              24 => 1,
-              26 => 0,
-              27 => 0,
-              28 => 0,
-              29 => 0,
-              30 => 0,
-              31 => 0,
-              32 => 0,
-              33 => 0,
-              34 => 0,
-              35 => 0,
-              36 => 0,
-              37 => 0,
-              38 => 0,
-              39 => 0,
-              40 => 0,
-              41 => 0,
-              42 => 0,
-              43 => 3,
-              47 => 0,
-              48 => 0,
-              49 => 0,
-              50 => 0,
-              51 => 0,
-              52 => 0,
-              53 => 0,
-              54 => 0,
-              55 => 1,
-              57 => 1,
-              59 => 0,
-              60 => 0,
-              61 => 0,
-              62 => 0,
-              63 => 0,
-              64 => 0,
-              65 => 0,
-              66 => 0,
-              67 => 0,
-              68 => 0,
-              69 => 0,
-              70 => 0,
-              71 => 0,
-              72 => 0,
-              73 => 0,
-              74 => 0,
-              75 => 0,
-              76 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 =
+                $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)(?![^\s]))|^(".$this->ldel."\\s*for(?![^\s]))|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+as\\s+)|^(\\s+to\\s+)|^(\\s+step\\s+)|^(\\s+instanceof\\s+)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+eq\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(le|lte)\\s+)|^(\\s*>\\s*|\\s+gt\\s+)|^(\\s*<\\s*|\\s+lt\\s+)|^(\\s+mod\\s+)|^(!\\s*|not\\s+)|^(\\s*&&\\s*|\\s*and\\s+)|^(\\s*\\|\\|\\s*|\\s*or\\s+)|^(\\s*xor\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^(\\+\\+|--)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^(0[xX][0-9a-fA-F]+)|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SMARTY');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state TAGBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r3_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -482,440 +628,286 @@ function yylex2()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line ' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const SMARTY = 2;
-    function yy_r2_1($yy_subpatterns)
+    public function yy_r3_1()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
     }
-    function yy_r2_2($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_3($yy_subpatterns)
+    public function yy_r3_2()
     {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->yypushstate(self::TAG);
+        return true;
     }
-    function yy_r2_5($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_6($yy_subpatterns)
+    public function yy_r3_4()
     {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
     }
-    function yy_r2_7($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_8($yy_subpatterns)
+    public function yy_r3_5()
     {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
     }
-    function yy_r2_9($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_10($yy_subpatterns)
+    public function yy_r3_6()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
-    function yy_r2_11($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-    }
-    function yy_r2_12($yy_subpatterns)
+    public function yy_r3_7()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
     }
-    function yy_r2_13($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-    function yy_r2_14($yy_subpatterns)
+    public function yy_r3_8()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TO;
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
     }
-    function yy_r2_15($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-    function yy_r2_16($yy_subpatterns)
+    public function yy_r3_9()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
     }
-    function yy_r2_17($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-    }
-    function yy_r2_18($yy_subpatterns)
+    public function yy_r3_10()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
     }
-    function yy_r2_19($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
-    }
-    function yy_r2_20($yy_subpatterns)
+    public function yy_r3_11()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
     }
-    function yy_r2_22($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-    }
-    function yy_r2_24($yy_subpatterns)
+    public function yy_r3_12()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
     }
-    function yy_r2_26($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-    }
-    function yy_r2_27($yy_subpatterns)
+    public function yy_r3_13()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
     }
-    function yy_r2_28($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_MOD;
-    }
-    function yy_r2_29($yy_subpatterns)
+    public function yy_r3_15()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NOT;
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
     }
-    function yy_r2_30($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LAND;
-    }
-    function yy_r2_31($yy_subpatterns)
+    public function yy_r3_17()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LOR;
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
     }
-    function yy_r2_32($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
-    }
-    function yy_r2_33($yy_subpatterns)
+    public function yy_r3_20()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
     }
-    function yy_r2_34($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
-    }
-    function yy_r2_35($yy_subpatterns)
+    public function yy_r3_23()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
     }
-    function yy_r2_36($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
-    }
-    function yy_r2_37($yy_subpatterns)
+    public function yy_r3_24()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
     }
-    function yy_r2_38($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
-    }
-    function yy_r2_39($yy_subpatterns)
+    public function yy_r3_28()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
     }
-    function yy_r2_40($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
-    }
-    function yy_r2_41($yy_subpatterns)
+    public function yy_r3_29()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
     }
-    function yy_r2_42($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
-    }
-    function yy_r2_43($yy_subpatterns)
+    public function yy_r3_30()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
     }
-    function yy_r2_47($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
-    function yy_r2_48($yy_subpatterns)
+    public function yy_r3_31()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
     }
-    function yy_r2_49($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
-    function yy_r2_50($yy_subpatterns)
+    public function yy_r3_32()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
     }
-    function yy_r2_51($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_PTR; 
-    }
-    function yy_r2_52($yy_subpatterns)
+    public function yy_r3_33()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_APTR;
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
     }
-    function yy_r2_53($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
-    function yy_r2_54($yy_subpatterns)
+    public function yy_r3_34()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
     }
-    function yy_r2_55($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
-    function yy_r2_57($yy_subpatterns)
+    public function yy_r3_35()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_MATH;
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
     }
-    function yy_r2_59($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
-    function yy_r2_60($yy_subpatterns)
+    public function yy_r3_37()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
     }
-    function yy_r2_61($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-    function yy_r2_62($yy_subpatterns)
+    public function yy_r3_39()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COLON;
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
     }
-    function yy_r2_63($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
-    function yy_r2_64($yy_subpatterns)
+    public function yy_r3_41()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
     }
-    function yy_r2_65($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-    function yy_r2_66($yy_subpatterns)
+    public function yy_r3_42()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
     }
-    function yy_r2_67($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
-    function yy_r2_68($yy_subpatterns)
+    public function yy_r3_43()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOT;
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
     }
-    function yy_r2_69($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-    function yy_r2_70($yy_subpatterns)
+    public function yy_r3_44()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) ===
+            $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/', $this->value, $match);
+            $this->value = $match[ 0 ];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+        }
     }
-    function yy_r2_71($yy_subpatterns)
+
+    public function yy_r3_45()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+    public function yy_r3_48()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
     }
-    function yy_r2_72($yy_subpatterns)
+
+    public function yy_r3_49()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_HEX;
+    public function yy_r3_50()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
     }
-    function yy_r2_73($yy_subpatterns)
+
+    public function yy_r3_51()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_ID;
+    public function yy_r3_52()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
     }
-    function yy_r2_74($yy_subpatterns)
+
+    public function yy_r3_53()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+    public function yy_r3_54()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
     }
-    function yy_r2_75($yy_subpatterns)
+
+    public function yy_r3_55()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+    public function yy_r3_56()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
     }
-    function yy_r2_76($yy_subpatterns)
+
+    public function yy_r3_57()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    public function yy_r3_58()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
     }
 
+    public function yy_r3_59()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+    } // end function
 
+    public function yy_r3_60()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
 
-    function yylex3()
+    public function yylex4()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 2,
-              11 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 =
+                $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(".$this->ldel."\\s*literal\\s*".$this->rdel.")|^(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|^([\t ]*[\r\n]+[\t ]*)|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(<%)|^(%>)|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."\/?literal".$this->rdel."|<\\?|<%)))|^(.)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state LITERAL');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -928,119 +920,81 @@ function yylex3()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line ' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
-
-    } // end function
-
-
-    const LITERAL = 3;
-    function yy_r3_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-  $this->yypushstate(self::LITERAL);
     }
-    function yy_r3_2($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-  $this->yypopstate();
-    }
-    function yy_r3_3($yy_subpatterns)
+    public function yy_r4_1()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-    function yy_r3_4($yy_subpatterns)
-    {
-
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-   } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-   }
-    }
-    function yy_r3_5($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
+        $this->literal_cnt++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
-    function yy_r3_6($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r3_7($yy_subpatterns)
+    public function yy_r4_3()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+        if ($this->literal_cnt) {
+            $this->literal_cnt--;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
     }
-    function yy_r3_8($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-    function yy_r3_11($yy_subpatterns)
+    public function yy_r4_5()
     {
+        if (!isset($this->yy_global_literal)) {
+            $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+        }
+        $to = $this->dataLength;
+        preg_match($this->yy_global_literal, $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    } // end function
 
-  $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-    }
-
-
-    function yylex4()
+    public function yylex5()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 1,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 3,
-              17 => 0,
-              18 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 =
+                $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)(?![^\s]))|^(".$this->ldel."\\s*for(?![^\s]))|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$[0-9]*[a-zA-Z_]\\w*)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)|^(.)/iS";
-
         do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                        'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                                        ' an empty string.  Input "' . substr($this->data,
+                            $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1053,130 +1007,89 @@ function yylex4()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
+                    if ($this->counter >= $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line ' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
+    }
 
-    } // end function
-
-
-    const DOUBLEQUOTEDSTRING = 4;
-    function yy_r4_1($yy_subpatterns)
+    public function yy_r5_1()
     {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_2($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_4($yy_subpatterns)
+    public function yy_r5_3()
     {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_5($yy_subpatterns)
-    {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_6($yy_subpatterns)
+    public function yy_r5_5()
     {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_7($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r4_8($yy_subpatterns)
+    public function yy_r5_7()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        $this->yypushstate(self::TAG);
+        return true;
     }
-    function yy_r4_9($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypopstate();
-    }
-    function yy_r4_10($yy_subpatterns)
+    public function yy_r5_9()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->value = substr($this->value,0,-1);
-  $this->yypushstate(self::SMARTY);
-  $this->taglineno = $this->line;
+        $this->yypushstate(self::TAG);
+        return true;
     }
-    function yy_r4_11($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-    function yy_r4_12($yy_subpatterns)
+    public function yy_r5_11()
     {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
     }
-    function yy_r4_13($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    public function yy_r5_13()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
     }
-    function yy_r4_17($yy_subpatterns)
+
+    public function yy_r5_14()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value, 0, -1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    public function yy_r5_15()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
-    function yy_r4_18($yy_subpatterns)
+
+    public function yy_r5_16()
     {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
 
-  $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+    public function yy_r5_17()
+    {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
+    public function yy_r5_22()
+    {
+        $to = $this->dataLength;
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
 }
-?>
\ No newline at end of file
+
+     
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php
index 90e1c9762..aaeae63b7 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php
@@ -1,77 +1,4 @@
 <?php
-/**
-* Smarty Internal Plugin Templateparser
-*
-* This is the template parser.
-* It is generated from the internal.templateparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-class TP_yyToken implements ArrayAccess
-{
-    public $string = '';
-    public $metadata = array();
-
-    function __construct($s, $m = array())
-    {
-        if ($s instanceof TP_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TP_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    function __toString()
-    {
-        return $this->_string;
-    }
-
-    function offsetExists($offset)
-    {
-        return isset($this->metadata[$offset]);
-    }
-
-    function offsetGet($offset)
-    {
-        return $this->metadata[$offset];
-    }
-
-    function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TP_yyToken) ?
-                    $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TP_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[$offset] = $value;
-        }
-    }
-
-    function offsetUnset($offset)
-    {
-        unset($this->metadata[$offset]);
-    }
-}
 
 class TP_yyStackEntry
 {
@@ -80,1430 +7,1861 @@ class TP_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
 
+// line 11 "../smarty/lexer/smarty_internal_templateparser.y"
 
-#line 12 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
+/**
+ * Smarty Template Parser Class
+ *
+ * This is the template parser.
+ * It is generated from the smarty_internal_templateparser.y file
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templateparser
 {
-#line 14 "smarty_internal_templateparser.y"
+    // line 23 "../smarty/lexer/smarty_internal_templateparser.y"
+    const ERR1                      = 'Security error: Call to private object member not allowed';
+    const ERR2                      = 'Security error: Call to dynamic object member not allowed';
+    const ERR3                      = 'PHP in template not allowed. Use SmartyBC to enable it';
+    const TP_VERT                   = 1;
+    const TP_COLON                  = 2;
+    const TP_PHP                    = 3;
+    const TP_TEXT                   = 4;
+    const TP_STRIPON                = 5;
+    const TP_STRIPOFF               = 6;
+    const TP_LITERALSTART           = 7;
+    const TP_LITERALEND             = 8;
+    const TP_LITERAL                = 9;
+    const TP_SIMPELOUTPUT           = 10;
+    const TP_SIMPLETAG              = 11;
+    const TP_SMARTYBLOCKCHILDPARENT = 12;
+    const TP_LDEL                   = 13;
+    const TP_RDEL                   = 14;
+    const TP_DOLLARID               = 15;
+    const TP_EQUAL                  = 16;
+    const TP_ID                     = 17;
+    const TP_PTR                    = 18;
+    const TP_LDELMAKENOCACHE        = 19;
+    const TP_LDELIF                 = 20;
+    const TP_LDELFOR                = 21;
+    const TP_SEMICOLON              = 22;
+    const TP_INCDEC                 = 23;
+    const TP_TO                     = 24;
+    const TP_STEP                   = 25;
+    const TP_LDELFOREACH            = 26;
+    const TP_SPACE                  = 27;
+    const TP_AS                     = 28;
+    const TP_APTR                   = 29;
+    const TP_LDELSETFILTER          = 30;
+    const TP_CLOSETAG               = 31;
+    const TP_LDELSLASH              = 32;
+    const TP_ATTR                   = 33;
+    const TP_INTEGER                = 34;
+    const TP_COMMA                  = 35;
+    const TP_OPENP                  = 36;
+    const TP_CLOSEP                 = 37;
+    const TP_MATH                   = 38;
+    const TP_UNIMATH                = 39;
+    const TP_ISIN                   = 40;
+    const TP_QMARK                  = 41;
+    const TP_NOT                    = 42;
+    const TP_TYPECAST               = 43;
+    const TP_HEX                    = 44;
+    const TP_DOT                    = 45;
+    const TP_INSTANCEOF             = 46;
+    const TP_SINGLEQUOTESTRING      = 47;
+    const TP_DOUBLECOLON            = 48;
+    const TP_NAMESPACE              = 49;
+    const TP_AT                     = 50;
+    const TP_HATCH                  = 51;
+    const TP_OPENB                  = 52;
+    const TP_CLOSEB                 = 53;
+    const TP_DOLLAR                 = 54;
+    const TP_LOGOP                  = 55;
+    const TP_SLOGOP                 = 56;
+    const TP_TLOGOP                 = 57;
+    const TP_SINGLECOND             = 58;
+    const TP_ARRAYOPEN              = 59;
+    const TP_QUOTE                  = 60;
+    const TP_BACKTICK               = 61;
+    const YY_NO_ACTION              = 516;
+    const YY_ACCEPT_ACTION          = 515;
+    const YY_ERROR_ACTION           = 514;
+    const YY_SZ_ACTTAB              = 2071;
+    const YY_SHIFT_USE_DFLT         = -31;
+    const YY_SHIFT_MAX              = 230;
+    const YY_REDUCE_USE_DFLT        = -91;
+    const YY_REDUCE_MAX             = 178;
+    const YYNOCODE                  = 110;
+    const YYSTACKDEPTH              = 500;
+    const YYNSTATE                  = 327;
+    const YYNRULE                   = 187;
+    const YYERRORSYMBOL             = 62;
+    const YYERRSYMDT                = 'yy0';
+    const YYFALLBACK                = 0;
+
+    public static $yy_action        = array(
+        251, 234, 237, 1, 144, 127, 428, 184, 199, 212,
+        10, 54, 19, 175, 282, 215, 109, 389, 428, 428,
+        224, 321, 223, 303, 203, 389, 13, 389, 281, 43,
+        389, 428, 41, 40, 266, 225, 389, 213, 389, 194,
+        389, 52, 4, 308, 301, 383, 34, 209, 222, 3,
+        50, 153, 251, 234, 237, 1, 199, 131, 383, 198,
+        305, 212, 10, 54, 383, 16, 199, 428, 109, 385,
+        132, 18, 224, 321, 223, 222, 221, 12, 32, 428,
+        116, 43, 385, 262, 41, 40, 266, 225, 385, 233,
+        95, 194, 16, 52, 4, 131, 301, 252, 18, 265,
+        164, 3, 50, 324, 251, 234, 237, 1, 23, 130,
+        229, 198, 150, 212, 10, 54, 326, 11, 170, 284,
+        109, 42, 22, 239, 224, 321, 223, 193, 221, 261,
+        13, 52, 157, 43, 301, 286, 41, 40, 266, 225,
+        205, 233, 5, 194, 96, 52, 4, 263, 301, 301,
+        99, 349, 96, 3, 50, 199, 251, 234, 237, 1,
+        238, 130, 241, 181, 349, 212, 10, 54, 382, 240,
+        349, 36, 109, 185, 104, 256, 224, 321, 223, 132,
+        191, 382, 13, 49, 91, 43, 12, 382, 41, 40,
+        266, 225, 257, 233, 152, 194, 457, 52, 4, 457,
+        301, 301, 228, 457, 282, 3, 50, 285, 251, 234,
+        237, 1, 301, 131, 441, 198, 238, 212, 10, 54,
+        349, 441, 325, 175, 109, 30, 349, 273, 224, 321,
+        223, 20, 221, 295, 32, 211, 457, 39, 166, 49,
+        41, 40, 266, 225, 87, 233, 205, 194, 279, 52,
+        4, 24, 301, 204, 200, 280, 99, 3, 50, 199,
+        251, 234, 237, 1, 31, 130, 96, 198, 205, 212,
+        10, 54, 350, 55, 293, 207, 109, 283, 99, 96,
+        224, 321, 223, 199, 180, 350, 13, 134, 230, 43,
+        222, 350, 41, 40, 266, 225, 104, 233, 316, 194,
+        279, 52, 4, 24, 301, 165, 284, 280, 85, 3,
+        50, 25, 251, 234, 237, 1, 131, 129, 210, 198,
+        14, 212, 10, 54, 269, 270, 301, 116, 109, 295,
+        216, 211, 224, 321, 223, 171, 221, 95, 13, 28,
+        219, 43, 323, 9, 41, 40, 266, 225, 151, 233,
+        324, 194, 52, 52, 4, 301, 301, 30, 282, 302,
+        178, 3, 50, 7, 251, 234, 237, 1, 136, 130,
+        304, 179, 238, 212, 10, 54, 279, 175, 282, 24,
+        109, 238, 429, 280, 224, 321, 223, 177, 221, 270,
+        13, 255, 281, 43, 429, 49, 41, 40, 266, 225,
+        275, 233, 318, 194, 49, 52, 4, 276, 301, 163,
+        26, 199, 8, 3, 50, 119, 251, 234, 237, 1,
+        11, 93, 291, 51, 107, 212, 10, 54, 226, 428,
+        206, 201, 109, 148, 178, 322, 224, 321, 223, 441,
+        221, 428, 13, 282, 9, 43, 441, 115, 41, 40,
+        266, 225, 167, 233, 227, 194, 457, 52, 4, 457,
+        301, 96, 158, 457, 101, 3, 50, 271, 251, 234,
+        237, 1, 282, 130, 235, 186, 135, 212, 10, 54,
+        199, 37, 119, 315, 109, 165, 284, 176, 224, 321,
+        223, 104, 221, 149, 13, 281, 146, 43, 281, 300,
+        41, 40, 266, 225, 30, 233, 289, 194, 21, 52,
+        4, 272, 301, 211, 18, 301, 161, 3, 50, 110,
+        251, 234, 237, 1, 137, 128, 282, 198, 268, 212,
+        10, 54, 222, 169, 515, 92, 109, 172, 284, 31,
+        224, 321, 223, 29, 221, 238, 6, 260, 53, 43,
+        232, 139, 41, 40, 266, 225, 154, 233, 178, 194,
+        168, 52, 4, 214, 301, 145, 99, 33, 49, 3,
+        50, 245, 208, 211, 320, 282, 90, 111, 311, 183,
+        98, 70, 309, 297, 236, 178, 95, 319, 142, 258,
+        247, 267, 249, 264, 250, 195, 231, 199, 246, 324,
+        317, 253, 254, 259, 126, 137, 133, 251, 234, 237,
+        1, 326, 290, 105, 143, 156, 212, 10, 54, 88,
+        84, 83, 484, 109, 322, 282, 37, 224, 321, 223,
+        245, 208, 211, 320, 281, 90, 111, 298, 182, 98,
+        56, 245, 298, 211, 178, 95, 103, 147, 258, 197,
+        102, 75, 141, 250, 195, 231, 95, 246, 324, 258,
+        279, 242, 89, 24, 250, 195, 231, 280, 246, 324,
+        298, 298, 298, 298, 298, 298, 298, 16, 298, 192,
+        277, 298, 298, 18, 294, 44, 45, 38, 298, 298,
+        251, 234, 237, 2, 298, 296, 298, 298, 298, 212,
+        10, 54, 310, 312, 313, 314, 109, 162, 298, 298,
+        224, 321, 223, 298, 298, 298, 294, 282, 298, 42,
+        22, 239, 251, 234, 237, 2, 298, 296, 298, 298,
+        298, 212, 10, 54, 298, 159, 298, 298, 109, 298,
+        298, 17, 224, 321, 223, 282, 298, 42, 22, 239,
+        298, 298, 245, 298, 211, 278, 298, 103, 111, 298,
+        183, 98, 70, 298, 298, 298, 298, 95, 298, 298,
+        258, 298, 292, 17, 298, 250, 195, 231, 279, 246,
+        324, 24, 298, 395, 245, 280, 211, 298, 298, 103,
+        298, 298, 197, 102, 75, 16, 298, 140, 298, 95,
+        298, 18, 258, 298, 298, 298, 298, 250, 195, 231,
+        298, 246, 324, 298, 298, 298, 298, 428, 298, 395,
+        395, 395, 202, 277, 298, 245, 298, 211, 298, 428,
+        103, 298, 298, 197, 120, 69, 395, 395, 395, 395,
+        95, 298, 298, 258, 298, 298, 298, 160, 250, 195,
+        231, 86, 246, 324, 245, 16, 211, 282, 298, 103,
+        196, 18, 197, 120, 69, 298, 44, 45, 38, 95,
+        298, 298, 258, 298, 298, 298, 178, 250, 195, 231,
+        298, 246, 324, 310, 312, 313, 314, 298, 298, 190,
+        245, 298, 211, 298, 298, 103, 298, 298, 197, 102,
+        75, 298, 298, 298, 298, 95, 298, 298, 258, 298,
+        298, 298, 298, 250, 195, 231, 298, 246, 324, 298,
+        298, 298, 245, 298, 211, 298, 199, 100, 298, 288,
+        197, 120, 47, 298, 106, 298, 298, 95, 298, 353,
+        258, 155, 298, 218, 298, 250, 195, 231, 298, 246,
+        324, 282, 16, 42, 22, 239, 298, 245, 18, 211,
+        298, 428, 103, 298, 298, 197, 120, 69, 298, 298,
+        298, 298, 95, 428, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 100, 189, 298, 197, 120, 59, 245, 207, 211,
+        298, 95, 103, 298, 258, 197, 120, 81, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 120, 80, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 67, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 120, 57, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 120, 58, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 82, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 97, 76, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 120, 71, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 187, 120, 61, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 120, 63, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 94, 79, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 59, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 120, 77, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 188, 108, 64, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 65, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 97, 66, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 120, 68, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 62, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 120, 60, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 120, 74, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 72, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 120, 48, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 120, 46, 298, 298,
+        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 120, 78, 245, 298, 211,
+        298, 95, 103, 298, 258, 197, 120, 73, 298, 250,
+        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 125, 298, 298, 298,
+        298, 298, 95, 298, 298, 298, 298, 298, 298, 244,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 114, 298, 245, 298, 211,
+        298, 95, 103, 298, 298, 197, 122, 298, 243, 250,
+        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 117, 298, 298, 298,
+        298, 298, 95, 298, 298, 298, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 121, 298, 245, 298, 211,
+        298, 95, 103, 298, 298, 197, 124, 298, 298, 250,
+        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
+        298, 298, 103, 298, 298, 197, 118, 298, 298, 298,
+        298, 298, 95, 298, 298, 298, 298, 298, 298, 298,
+        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
+        298, 103, 298, 298, 197, 123, 298, 245, 298, 211,
+        298, 95, 103, 298, 298, 197, 113, 298, 298, 250,
+        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
+        250, 195, 231, 220, 246, 324, 298, 27, 298, 16,
+        298, 457, 298, 298, 457, 18, 298, 26, 457, 441,
+        44, 45, 38, 217, 44, 45, 38, 298, 298, 298,
+        298, 298, 298, 298, 298, 298, 298, 310, 312, 313,
+        314, 310, 312, 313, 314, 298, 441, 298, 298, 441,
+        298, 457, 220, 441, 457, 298, 298, 457, 298, 298,
+        457, 457, 441, 457, 298, 298, 220, 457, 441, 298,
+        298, 298, 298, 298, 457, 298, 298, 457, 298, 298,
+        5, 457, 441, 298, 298, 298, 298, 298, 298, 441,
+        298, 298, 441, 298, 457, 441, 441, 298, 441, 298,
+        457, 298, 441, 306, 298, 298, 298, 298, 298, 441,
+        298, 298, 441, 298, 457, 220, 441, 298, 298, 298,
+        298, 298, 298, 457, 298, 298, 457, 298, 298, 15,
+        457, 441, 35, 274, 44, 45, 38, 457, 298, 298,
+        457, 298, 298, 298, 457, 441, 298, 298, 298, 298,
+        298, 310, 312, 313, 314, 298, 298, 298, 441, 298,
+        298, 441, 298, 457, 298, 441, 287, 298, 44, 45,
+        38, 298, 441, 298, 298, 441, 298, 457, 298, 441,
+        248, 298, 298, 298, 298, 310, 312, 313, 314, 298,
+        44, 45, 38, 298, 298, 112, 298, 44, 45, 38,
+        298, 173, 298, 298, 44, 45, 38, 310, 312, 313,
+        314, 44, 45, 38, 310, 312, 313, 314, 298, 298,
+        299, 310, 312, 313, 314, 44, 45, 38, 310, 312,
+        313, 314, 174, 298, 298, 298, 138, 298, 298, 298,
+        298, 298, 310, 312, 313, 314, 44, 45, 38, 298,
+        298, 298, 44, 45, 38, 298, 44, 45, 38, 298,
+        44, 45, 38, 310, 312, 313, 314, 307, 298, 310,
+        312, 313, 314, 310, 312, 313, 314, 310, 312, 313,
+        314,
+    );
+
+    public static $yy_lookahead     = array(
+        10, 11, 12, 13, 74, 15, 36, 17, 1, 19,
+        20, 21, 29, 103, 84, 45, 26, 14, 48, 36,
+        30, 31, 32, 53, 34, 22, 36, 24, 98, 39,
+        27, 48, 42, 43, 44, 45, 33, 47, 35, 49,
+        37, 51, 52, 53, 54, 14, 16, 16, 45, 59,
+        60, 96, 10, 11, 12, 13, 1, 15, 27, 17,
+        53, 19, 20, 21, 33, 27, 1, 36, 26, 14,
+        45, 33, 30, 31, 32, 45, 34, 52, 36, 48,
+        72, 39, 27, 75, 42, 43, 44, 45, 33, 47,
+        82, 49, 27, 51, 52, 15, 54, 17, 33, 91,
+        83, 59, 60, 95, 10, 11, 12, 13, 13, 15,
+        15, 17, 17, 19, 20, 21, 97, 35, 99, 100,
+        26, 86, 87, 88, 30, 31, 32, 66, 34, 49,
+        36, 51, 96, 39, 54, 53, 42, 43, 44, 45,
+        72, 47, 16, 49, 18, 51, 52, 79, 54, 54,
+        82, 14, 18, 59, 60, 1, 10, 11, 12, 13,
+        23, 15, 15, 17, 27, 19, 20, 21, 14, 17,
+        33, 13, 26, 15, 48, 17, 30, 31, 32, 45,
+        34, 27, 36, 46, 83, 39, 52, 33, 42, 43,
+        44, 45, 34, 47, 74, 49, 10, 51, 52, 13,
+        54, 54, 50, 17, 84, 59, 60, 14, 10, 11,
+        12, 13, 54, 15, 45, 17, 23, 19, 20, 21,
+        27, 52, 100, 103, 26, 35, 33, 37, 30, 31,
+        32, 22, 34, 67, 36, 69, 50, 39, 83, 46,
+        42, 43, 44, 45, 35, 47, 72, 49, 10, 51,
+        52, 13, 54, 79, 80, 17, 82, 59, 60, 1,
+        10, 11, 12, 13, 16, 15, 18, 17, 72, 19,
+        20, 21, 14, 107, 108, 79, 26, 71, 82, 18,
+        30, 31, 32, 1, 34, 27, 36, 15, 50, 39,
+        45, 33, 42, 43, 44, 45, 48, 47, 53, 49,
+        10, 51, 52, 13, 54, 99, 100, 17, 36, 59,
+        60, 29, 10, 11, 12, 13, 15, 15, 17, 17,
+        13, 19, 20, 21, 8, 9, 54, 72, 26, 67,
+        75, 69, 30, 31, 32, 78, 34, 82, 36, 24,
+        50, 39, 17, 36, 42, 43, 44, 45, 74, 47,
+        95, 49, 51, 51, 52, 54, 54, 35, 84, 37,
+        103, 59, 60, 36, 10, 11, 12, 13, 74, 15,
+        108, 17, 23, 19, 20, 21, 10, 103, 84, 13,
+        26, 23, 36, 17, 30, 31, 32, 7, 34, 9,
+        36, 17, 98, 39, 48, 46, 42, 43, 44, 45,
+        17, 47, 53, 49, 46, 51, 52, 93, 54, 78,
+        16, 1, 36, 59, 60, 101, 10, 11, 12, 13,
+        35, 15, 37, 17, 48, 19, 20, 21, 18, 36,
+        65, 66, 26, 74, 103, 104, 30, 31, 32, 45,
+        34, 48, 36, 84, 36, 39, 52, 17, 42, 43,
+        44, 45, 15, 47, 17, 49, 10, 51, 52, 13,
+        54, 18, 74, 17, 82, 59, 60, 34, 10, 11,
+        12, 13, 84, 15, 93, 17, 15, 19, 20, 21,
+        1, 2, 101, 101, 26, 99, 100, 17, 30, 31,
+        32, 48, 34, 96, 36, 98, 96, 39, 98, 71,
+        42, 43, 44, 45, 35, 47, 37, 49, 27, 51,
+        52, 67, 54, 69, 33, 54, 74, 59, 60, 17,
+        10, 11, 12, 13, 96, 15, 84, 17, 34, 19,
+        20, 21, 45, 78, 63, 64, 26, 99, 100, 16,
+        30, 31, 32, 16, 34, 23, 36, 17, 17, 39,
+        23, 51, 42, 43, 44, 45, 72, 47, 103, 49,
+        78, 51, 52, 17, 54, 74, 82, 41, 46, 59,
+        60, 67, 68, 69, 70, 84, 72, 73, 53, 75,
+        76, 77, 53, 61, 15, 103, 82, 14, 51, 85,
+        14, 37, 17, 8, 90, 91, 92, 1, 94, 95,
+        3, 4, 5, 6, 7, 96, 82, 10, 11, 12,
+        13, 97, 84, 81, 96, 74, 19, 20, 21, 78,
+        82, 82, 1, 26, 104, 84, 2, 30, 31, 32,
+        67, 68, 69, 70, 98, 72, 73, 109, 75, 76,
+        77, 67, 109, 69, 103, 82, 72, 96, 85, 75,
+        76, 77, 96, 90, 91, 92, 82, 94, 95, 85,
+        10, 14, 96, 13, 90, 91, 92, 17, 94, 95,
+        109, 109, 109, 109, 109, 109, 109, 27, 109, 105,
+        106, 109, 109, 33, 4, 38, 39, 40, 109, 109,
+        10, 11, 12, 13, 109, 15, 109, 109, 109, 19,
+        20, 21, 55, 56, 57, 58, 26, 74, 109, 109,
+        30, 31, 32, 109, 109, 109, 4, 84, 109, 86,
+        87, 88, 10, 11, 12, 13, 109, 15, 109, 109,
+        109, 19, 20, 21, 109, 74, 109, 109, 26, 109,
+        60, 61, 30, 31, 32, 84, 109, 86, 87, 88,
+        109, 109, 67, 109, 69, 70, 109, 72, 73, 109,
+        75, 76, 77, 109, 109, 109, 109, 82, 109, 109,
+        85, 109, 60, 61, 109, 90, 91, 92, 10, 94,
+        95, 13, 109, 2, 67, 17, 69, 109, 109, 72,
+        109, 109, 75, 76, 77, 27, 109, 29, 109, 82,
+        109, 33, 85, 109, 109, 109, 109, 90, 91, 92,
+        109, 94, 95, 109, 109, 109, 109, 36, 109, 38,
+        39, 40, 105, 106, 109, 67, 109, 69, 109, 48,
+        72, 109, 109, 75, 76, 77, 55, 56, 57, 58,
+        82, 109, 109, 85, 109, 109, 109, 74, 90, 91,
+        92, 78, 94, 95, 67, 27, 69, 84, 109, 72,
+        102, 33, 75, 76, 77, 109, 38, 39, 40, 82,
+        109, 109, 85, 109, 109, 109, 103, 90, 91, 92,
+        109, 94, 95, 55, 56, 57, 58, 109, 109, 102,
+        67, 109, 69, 109, 109, 72, 109, 109, 75, 76,
+        77, 109, 109, 109, 109, 82, 109, 109, 85, 109,
+        109, 109, 109, 90, 91, 92, 109, 94, 95, 109,
+        109, 109, 67, 109, 69, 109, 1, 72, 109, 106,
+        75, 76, 77, 109, 79, 109, 109, 82, 109, 14,
+        85, 74, 109, 18, 109, 90, 91, 92, 109, 94,
+        95, 84, 27, 86, 87, 88, 109, 67, 33, 69,
+        109, 36, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 48, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 102, 109, 75, 76, 77, 67, 79, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
+        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
+        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
+        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
+        109, 109, 82, 109, 109, 109, 109, 109, 109, 89,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
+        109, 82, 72, 109, 109, 75, 76, 109, 89, 90,
+        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
+        109, 109, 82, 109, 109, 109, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
+        109, 82, 72, 109, 109, 75, 76, 109, 109, 90,
+        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
+        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
+        109, 109, 82, 109, 109, 109, 109, 109, 109, 109,
+        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
+        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
+        109, 82, 72, 109, 109, 75, 76, 109, 109, 90,
+        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
+        90, 91, 92, 2, 94, 95, 109, 25, 109, 27,
+        109, 10, 109, 109, 13, 33, 109, 16, 17, 18,
+        38, 39, 40, 37, 38, 39, 40, 109, 109, 109,
+        109, 109, 109, 109, 109, 109, 109, 55, 56, 57,
+        58, 55, 56, 57, 58, 109, 45, 109, 109, 48,
+        109, 50, 2, 52, 10, 109, 109, 13, 109, 109,
+        10, 17, 18, 13, 109, 109, 2, 17, 18, 109,
+        109, 109, 109, 109, 10, 109, 109, 13, 109, 109,
+        16, 17, 18, 109, 109, 109, 109, 109, 109, 45,
+        109, 109, 48, 109, 50, 45, 52, 109, 48, 109,
+        50, 109, 52, 53, 109, 109, 109, 109, 109, 45,
+        109, 109, 48, 109, 50, 2, 52, 109, 109, 109,
+        109, 109, 109, 10, 109, 109, 13, 109, 109, 2,
+        17, 18, 2, 37, 38, 39, 40, 10, 109, 109,
+        13, 109, 109, 109, 17, 18, 109, 109, 109, 109,
+        109, 55, 56, 57, 58, 109, 109, 109, 45, 109,
+        109, 48, 109, 50, 109, 52, 14, 109, 38, 39,
+        40, 109, 45, 109, 109, 48, 109, 50, 109, 52,
+        14, 109, 109, 109, 109, 55, 56, 57, 58, 109,
+        38, 39, 40, 109, 109, 22, 109, 38, 39, 40,
+        109, 14, 109, 109, 38, 39, 40, 55, 56, 57,
+        58, 38, 39, 40, 55, 56, 57, 58, 109, 109,
+        61, 55, 56, 57, 58, 38, 39, 40, 55, 56,
+        57, 58, 14, 109, 109, 109, 28, 109, 109, 109,
+        109, 109, 55, 56, 57, 58, 38, 39, 40, 109,
+        109, 109, 38, 39, 40, 109, 38, 39, 40, 109,
+        38, 39, 40, 55, 56, 57, 58, 53, 109, 55,
+        56, 57, 58, 55, 56, 57, 58, 55, 56, 57,
+        58,
+    );
+
+    public static $yy_shift_ofst    = array(
+        -31, 406, 406, 458, 458, 94, 510, 94, 94, 94,
+        510, 458, -10, 94, 94, 354, 146, 94, 94, 94,
+        94, 146, 94, 94, 94, 94, 250, 94, 94, 94,
+        94, 94, 94, 302, 94, 94, 94, 198, 42, 42,
+        42, 42, 42, 42, 42, 42, 1772, 828, 828, 80,
+        712, 925, 301, 65, 272, 680, 1942, 1920, 1886, 1776,
+        647, 1949, 1977, 2008, 2004, 1963, 1998, 1956, 2012, 2012,
+        2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012,
+        2012, 2012, 2012, 768, 650, 272, 65, 272, 65, 134,
+        126, 479, 597, 1854, 154, 290, 95, 55, 258, 366,
+        248, 366, 282, 443, 437, 38, 38, 437, 7, 481,
+        410, 38, 461, 621, 596, 596, 261, 596, 596, 261,
+        596, 596, 596, 596, 596, -31, -31, 1840, 1791, 1917,
+        1903, 1834, 158, 238, 394, 446, 38, 25, 147, 169,
+        147, 25, 169, 25, 38, 38, 25, 25, 38, 25,
+        307, 38, 38, 25, 527, 38, 38, 25, 38, 38,
+        38, 38, 38, 596, 624, 261, 624, 327, 596, 596,
+        261, 596, 261, -31, -31, -31, -31, -31, -31, 781,
+        3, 31, 193, 137, -30, 186, -17, 522, 349, 469,
+        322, 30, 82, 316, 346, 376, 190, 358, 393, 152,
+        209, 380, 385, 245, 315, 523, 585, 554, 576, 575,
+        537, 573, 569, 529, 525, 546, 500, 526, 531, 325,
+        530, 487, 494, 502, 470, 433, 430, 408, 383, 327,
+        374,
+    );
+
+    public static $yy_reduce_ofst   = array(
+        471, 504, 563, 717, 574, 685, 919, 890, 787, 758,
+        855, 823, 1240, 1199, 1140, 1100, 1070, 1129, 1170, 1210,
+        1269, 1280, 1310, 1339, 1350, 1380, 1409, 1420, 1450, 1479,
+        1490, 1059, 1030, 1000, 930, 960, 989, 1520, 1549, 1700,
+        1619, 1689, 1660, 1630, 1590, 1560, 633, 661, 867, 8,
+        166, 773, 255, 541, 174, 262, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 294, -70, 196, 120, 68, 274, 19,
+        206, 331, 444, 428, 257, 400, 382, 257, 257, 400,
+        386, 397, 257, 386, 381, 388, 359, 314, 257, 442,
+        482, 491, 484, 257, 257, 455, 386, 257, 257, 438,
+        257, 257, 257, 257, 257, 257, 365, 509, 509, 509,
+        509, 509, 524, 536, 509, 509, 528, 514, 539, 551,
+        538, 514, 556, 514, 528, 528, 514, 514, 528, 514,
+        518, 528, 528, 514, 532, 528, 528, 514, 528, 528,
+        528, 528, 528, -90, 520, 122, 520, 566, -90, -90,
+        122, -90, 122, -45, 36, 155, 101, 61, 17,
+    );
+
+    public static $yyExpectedTokens = array(
+        array(),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 53, 54, 59,
+            60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(
+            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
+        ),
+        array(25, 27, 33, 38, 39, 40, 55, 56, 57, 58,),
+        array(27, 33, 38, 39, 40, 55, 56, 57, 58,),
+        array(27, 33, 38, 39, 40, 55, 56, 57, 58,),
+        array(15, 17, 49, 51, 54,),
+        array(4, 10, 11, 12, 13, 15, 19, 20, 21, 26, 30, 31, 32, 60, 61,),
+        array(1, 14, 18, 27, 33, 36, 48,),
+        array(15, 17, 51, 54,),
+        array(1, 27, 33,),
+        array(15, 36, 54,),
+        array(4, 10, 11, 12, 13, 15, 19, 20, 21, 26, 30, 31, 32, 60, 61,),
+        array(14, 38, 39, 40, 55, 56, 57, 58,),
+        array(2, 38, 39, 40, 55, 56, 57, 58,),
+        array(37, 38, 39, 40, 55, 56, 57, 58,),
+        array(37, 38, 39, 40, 55, 56, 57, 58,),
+        array(14, 38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58, 61,),
+        array(14, 38, 39, 40, 55, 56, 57, 58,),
+        array(14, 38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 53, 55, 56, 57, 58,),
+        array(22, 38, 39, 40, 55, 56, 57, 58,),
+        array(28, 38, 39, 40, 55, 56, 57, 58,),
+        array(14, 38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(38, 39, 40, 55, 56, 57, 58,),
+        array(10, 13, 17, 27, 29, 33,),
+        array(10, 13, 17, 27, 33,),
+        array(15, 36, 54,),
+        array(1, 27, 33,),
+        array(15, 36, 54,),
+        array(1, 27, 33,),
+        array(18, 45, 52,),
+        array(16, 18, 48,),
+        array(1, 2,),
+        array(3, 4, 5, 6, 7, 10, 11, 12, 13, 19, 20, 21, 26, 30, 31, 32,),
+        array(2, 10, 13, 16, 17, 18, 45, 48, 50, 52,),
+        array(1, 14, 27, 33,),
+        array(10, 13, 17, 50,),
+        array(13, 15, 17, 54,),
+        array(1, 14, 27, 33,),
+        array(1, 14, 27, 33,),
+        array(10, 13, 17,),
+        array(16, 18, 48,),
+        array(10, 13, 17,),
+        array(1, 29,),
+        array(18, 48,),
+        array(15, 17,),
+        array(27, 33,),
+        array(27, 33,),
+        array(15, 17,),
+        array(1, 53,),
+        array(27, 33,),
+        array(1, 18,),
+        array(27, 33,),
+        array(15, 54,),
+        array(1,),
+        array(1,),
+        array(1,),
+        array(18,),
+        array(1,),
+        array(1,),
+        array(18,),
+        array(1,),
+        array(1,),
+        array(1,),
+        array(1,),
+        array(1,),
+        array(),
+        array(),
+        array(2, 10, 13, 17, 18, 45, 48, 50, 52, 53,),
+        array(2, 10, 13, 16, 17, 18, 45, 48, 50, 52,),
+        array(2, 10, 13, 17, 18, 45, 48, 50, 52,),
+        array(2, 10, 13, 17, 18, 45, 48, 50, 52,),
+        array(10, 13, 17, 18, 45, 48, 50, 52,),
+        array(13, 15, 17, 34, 54,),
+        array(10, 13, 17, 50,),
+        array(16, 45, 52,),
+        array(10, 13, 17,),
+        array(27, 33,),
+        array(45, 52,),
+        array(15, 54,),
+        array(45, 52,),
+        array(15, 54,),
+        array(45, 52,),
+        array(45, 52,),
+        array(45, 52,),
+        array(27, 33,),
+        array(27, 33,),
+        array(45, 52,),
+        array(45, 52,),
+        array(27, 33,),
+        array(45, 52,),
+        array(13, 36,),
+        array(27, 33,),
+        array(27, 33,),
+        array(45, 52,),
+        array(16, 23,),
+        array(27, 33,),
+        array(27, 33,),
+        array(45, 52,),
+        array(27, 33,),
+        array(27, 33,),
+        array(27, 33,),
+        array(27, 33,),
+        array(27, 33,),
+        array(1,),
+        array(2,),
+        array(18,),
+        array(2,),
+        array(36,),
+        array(1,),
+        array(1,),
+        array(18,),
+        array(1,),
+        array(18,),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(2, 36, 38, 39, 40, 48, 55, 56, 57, 58,),
+        array(14, 22, 24, 27, 33, 35, 37, 45,),
+        array(14, 16, 27, 33, 36, 48,),
+        array(14, 23, 27, 33, 46,),
+        array(14, 23, 27, 33, 46,),
+        array(36, 45, 48, 53,),
+        array(10, 13, 17, 50,),
+        array(29, 36, 48,),
+        array(23, 46, 61,),
+        array(23, 46, 53,),
+        array(35, 37,),
+        array(35, 37,),
+        array(16, 45,),
+        array(35, 53,),
+        array(8, 9,),
+        array(36, 48,),
+        array(36, 48,),
+        array(35, 37,),
+        array(23, 46,),
+        array(36, 48,),
+        array(17, 50,),
+        array(22, 35,),
+        array(7, 9,),
+        array(35, 37,),
+        array(45, 53,),
+        array(24,),
+        array(16,),
+        array(8,),
+        array(37,),
+        array(14,),
+        array(17,),
+        array(51,),
+        array(14,),
+        array(15,),
+        array(53,),
+        array(53,),
+        array(17,),
+        array(51,),
+        array(41,),
+        array(17,),
+        array(17,),
+        array(17,),
+        array(45,),
+        array(34,),
+        array(17,),
+        array(17,),
+        array(34,),
+        array(17,),
+        array(36,),
+        array(17,),
+        array(36,),
+        array(17,),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+    );
+
+    public static $yy_default       = array(
+        338, 514, 514, 499, 499, 514, 514, 476, 476, 476,
+        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
+        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
+        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
+        514, 514, 514, 514, 514, 514, 379, 358, 379, 514,
+        514, 415, 514, 379, 514, 514, 351, 514, 514, 514,
+        514, 514, 514, 514, 514, 514, 384, 514, 399, 475,
+        351, 403, 390, 474, 500, 502, 384, 501, 363, 381,
+        404, 386, 391, 379, 379, 514, 379, 514, 379, 489,
+        431, 370, 327, 430, 393, 441, 514, 393, 393, 441,
+        431, 441, 393, 431, 514, 379, 360, 514, 393, 379,
+        373, 379, 514, 406, 402, 375, 431, 396, 398, 486,
+        393, 408, 397, 407, 406, 483, 336, 430, 430, 430,
+        430, 430, 514, 443, 457, 441, 367, 438, 514, 436,
+        514, 435, 434, 466, 368, 348, 439, 437, 361, 467,
+        441, 356, 354, 468, 514, 366, 355, 469, 362, 359,
+        352, 369, 365, 371, 478, 463, 477, 441, 374, 376,
+        490, 424, 487, 441, 441, 482, 482, 336, 482, 415,
+        411, 415, 405, 405, 415, 442, 415, 405, 405, 514,
+        514, 411, 514, 514, 425, 514, 514, 405, 415, 514,
+        514, 334, 514, 411, 387, 514, 514, 514, 514, 514,
+        514, 514, 514, 420, 514, 514, 514, 417, 514, 514,
+        514, 411, 413, 514, 514, 514, 514, 488, 514, 457,
+        514, 421, 364, 420, 340, 422, 357, 341, 409, 400,
+        480, 457, 462, 401, 485, 423, 426, 342, 447, 380,
+        416, 339, 428, 329, 330, 444, 445, 446, 394, 331,
+        395, 429, 419, 388, 332, 418, 410, 392, 412, 333,
+        335, 414, 337, 472, 417, 479, 427, 497, 347, 461,
+        460, 459, 378, 346, 464, 510, 495, 511, 498, 473,
+        377, 496, 503, 506, 513, 512, 509, 507, 504, 508,
+        345, 458, 471, 448, 505, 454, 452, 455, 456, 450,
+        491, 449, 492, 493, 494, 470, 451, 328, 453, 343,
+        344, 372, 481, 432, 433, 465, 440,
+    );
+
+    public static $yyFallback       = array();
+
+    public static $yyRuleName       = array(
+        'start ::= template',
+        'template ::= template PHP',
+        'template ::= template TEXT',
+        'template ::= template STRIPON',
+        'template ::= template STRIPOFF',
+        'template ::= template LITERALSTART literal_e2 LITERALEND',
+        'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+        'literal_e2 ::= literal_e1',
+        'literal_e1 ::= literal_e1 LITERAL',
+        'literal_e1 ::=',
+        'template ::= template smartytag',
+        'template ::=',
+        'smartytag ::= SIMPELOUTPUT',
+        'smartytag ::= SIMPLETAG',
+        'smartytag ::= SMARTYBLOCKCHILDPARENT',
+        'smartytag ::= LDEL tagbody RDEL',
+        'smartytag ::= tag RDEL',
+        'tagbody ::= outattr',
+        'tagbody ::= DOLLARID eqoutattr',
+        'tagbody ::= varindexed eqoutattr',
+        'eqoutattr ::= EQUAL outattr',
+        'outattr ::= output attributes',
+        'output ::= variable',
+        'output ::= value',
+        'output ::= expr',
+        'tag ::= LDEL ID attributes',
+        'tag ::= LDEL ID',
+        'tag ::= LDEL ID modifierlist attributes',
+        'tag ::= LDEL ID PTR ID attributes',
+        'tag ::= LDEL ID PTR ID modifierlist attributes',
+        'tag ::= LDELMAKENOCACHE DOLLARID',
+        'tag ::= LDELIF expr',
+        'tag ::= LDELIF expr attributes',
+        'tag ::= LDELIF statement',
+        'tag ::= LDELIF statement attributes',
+        'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+        'foraction ::= EQUAL expr',
+        'foraction ::= INCDEC',
+        'tag ::= LDELFOR statement TO expr attributes',
+        'tag ::= LDELFOR statement TO expr STEP expr attributes',
+        'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+        'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+        'tag ::= LDELFOREACH attributes',
+        'tag ::= LDELSETFILTER ID modparameters',
+        'tag ::= LDELSETFILTER ID modparameters modifierlist',
+        'smartytag ::= CLOSETAG',
+        'tag ::= LDELSLASH ID',
+        'tag ::= LDELSLASH ID modifierlist',
+        'tag ::= LDELSLASH ID PTR ID',
+        'tag ::= LDELSLASH ID PTR ID modifierlist',
+        'attributes ::= attributes attribute',
+        'attributes ::= attribute',
+        'attributes ::=',
+        'attribute ::= SPACE ID EQUAL ID',
+        'attribute ::= ATTR expr',
+        'attribute ::= ATTR value',
+        'attribute ::= SPACE ID',
+        'attribute ::= SPACE expr',
+        'attribute ::= SPACE value',
+        'attribute ::= SPACE INTEGER EQUAL expr',
+        'statements ::= statement',
+        'statements ::= statements COMMA statement',
+        'statement ::= DOLLARID EQUAL INTEGER',
+        'statement ::= DOLLARID EQUAL expr',
+        'statement ::= varindexed EQUAL expr',
+        'statement ::= OPENP statement CLOSEP',
+        'expr ::= value',
+        'expr ::= ternary',
+        'expr ::= DOLLARID COLON ID',
+        'expr ::= expr MATH value',
+        'expr ::= expr UNIMATH value',
+        'expr ::= expr tlop value',
+        'expr ::= expr lop expr',
+        'expr ::= expr scond',
+        'expr ::= expr ISIN array',
+        'expr ::= expr ISIN value',
+        'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+        'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
+        'value ::= variable',
+        'value ::= UNIMATH value',
+        'value ::= NOT value',
+        'value ::= TYPECAST value',
+        'value ::= variable INCDEC',
+        'value ::= HEX',
+        'value ::= INTEGER',
+        'value ::= INTEGER DOT INTEGER',
+        'value ::= INTEGER DOT',
+        'value ::= DOT INTEGER',
+        'value ::= ID',
+        'value ::= function',
+        'value ::= OPENP expr CLOSEP',
+        'value ::= variable INSTANCEOF ns1',
+        'value ::= variable INSTANCEOF variable',
+        'value ::= SINGLEQUOTESTRING',
+        'value ::= doublequoted_with_quotes',
+        'value ::= varindexed DOUBLECOLON static_class_access',
+        'value ::= smartytag',
+        'value ::= value modifierlist',
+        'value ::= NAMESPACE',
+        'value ::= arraydef',
+        'value ::= ns1 DOUBLECOLON static_class_access',
+        'ns1 ::= ID',
+        'ns1 ::= NAMESPACE',
+        'variable ::= DOLLARID',
+        'variable ::= varindexed',
+        'variable ::= varvar AT ID',
+        'variable ::= object',
+        'variable ::= HATCH ID HATCH',
+        'variable ::= HATCH ID HATCH arrayindex',
+        'variable ::= HATCH variable HATCH',
+        'variable ::= HATCH variable HATCH arrayindex',
+        'varindexed ::= DOLLARID arrayindex',
+        'varindexed ::= varvar arrayindex',
+        'arrayindex ::= arrayindex indexdef',
+        'arrayindex ::=',
+        'indexdef ::= DOT DOLLARID',
+        'indexdef ::= DOT varvar',
+        'indexdef ::= DOT varvar AT ID',
+        'indexdef ::= DOT ID',
+        'indexdef ::= DOT INTEGER',
+        'indexdef ::= DOT LDEL expr RDEL',
+        'indexdef ::= OPENB ID CLOSEB',
+        'indexdef ::= OPENB ID DOT ID CLOSEB',
+        'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+        'indexdef ::= OPENB INTEGER CLOSEB',
+        'indexdef ::= OPENB DOLLARID CLOSEB',
+        'indexdef ::= OPENB variable CLOSEB',
+        'indexdef ::= OPENB value CLOSEB',
+        'indexdef ::= OPENB expr CLOSEB',
+        'indexdef ::= OPENB CLOSEB',
+        'varvar ::= DOLLARID',
+        'varvar ::= DOLLAR',
+        'varvar ::= varvar varvarele',
+        'varvarele ::= ID',
+        'varvarele ::= SIMPELOUTPUT',
+        'varvarele ::= LDEL expr RDEL',
+        'object ::= varindexed objectchain',
+        'objectchain ::= objectelement',
+        'objectchain ::= objectchain objectelement',
+        'objectelement ::= PTR ID arrayindex',
+        'objectelement ::= PTR varvar arrayindex',
+        'objectelement ::= PTR LDEL expr RDEL arrayindex',
+        'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+        'objectelement ::= PTR method',
+        'function ::= ns1 OPENP params CLOSEP',
+        'method ::= ID OPENP params CLOSEP',
+        'method ::= DOLLARID OPENP params CLOSEP',
+        'params ::= params COMMA expr',
+        'params ::= expr',
+        'params ::=',
+        'modifierlist ::= modifierlist modifier modparameters',
+        'modifierlist ::= modifier modparameters',
+        'modifier ::= VERT AT ID',
+        'modifier ::= VERT ID',
+        'modparameters ::= modparameters modparameter',
+        'modparameters ::=',
+        'modparameter ::= COLON value',
+        'modparameter ::= COLON UNIMATH value',
+        'modparameter ::= COLON array',
+        'static_class_access ::= method',
+        'static_class_access ::= method objectchain',
+        'static_class_access ::= ID',
+        'static_class_access ::= DOLLARID arrayindex',
+        'static_class_access ::= DOLLARID arrayindex objectchain',
+        'lop ::= LOGOP',
+        'lop ::= SLOGOP',
+        'tlop ::= TLOGOP',
+        'scond ::= SINGLECOND',
+        'arraydef ::= OPENB arrayelements CLOSEB',
+        'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
+        'arrayelements ::= arrayelement',
+        'arrayelements ::= arrayelements COMMA arrayelement',
+        'arrayelements ::=',
+        'arrayelement ::= value APTR expr',
+        'arrayelement ::= ID APTR expr',
+        'arrayelement ::= expr',
+        'doublequoted_with_quotes ::= QUOTE QUOTE',
+        'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+        'doublequoted ::= doublequoted doublequotedcontent',
+        'doublequoted ::= doublequotedcontent',
+        'doublequotedcontent ::= BACKTICK variable BACKTICK',
+        'doublequotedcontent ::= BACKTICK expr BACKTICK',
+        'doublequotedcontent ::= DOLLARID',
+        'doublequotedcontent ::= LDEL variable RDEL',
+        'doublequotedcontent ::= LDEL expr RDEL',
+        'doublequotedcontent ::= smartytag',
+        'doublequotedcontent ::= TEXT',
+    );
+
+    public static $yyRuleInfo       = array(
+        array(0 => 63, 1 => 1),
+        array(0 => 64, 1 => 2),
+        array(0 => 64, 1 => 2),
+        array(0 => 64, 1 => 2),
+        array(0 => 64, 1 => 2),
+        array(0 => 64, 1 => 4),
+        array(0 => 65, 1 => 4),
+        array(0 => 65, 1 => 1),
+        array(0 => 66, 1 => 2),
+        array(0 => 66, 1 => 0),
+        array(0 => 64, 1 => 2),
+        array(0 => 64, 1 => 0),
+        array(0 => 67, 1 => 1),
+        array(0 => 67, 1 => 1),
+        array(0 => 67, 1 => 1),
+        array(0 => 67, 1 => 3),
+        array(0 => 67, 1 => 2),
+        array(0 => 68, 1 => 1),
+        array(0 => 68, 1 => 2),
+        array(0 => 68, 1 => 2),
+        array(0 => 71, 1 => 2),
+        array(0 => 70, 1 => 2),
+        array(0 => 73, 1 => 1),
+        array(0 => 73, 1 => 1),
+        array(0 => 73, 1 => 1),
+        array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 2),
+        array(0 => 69, 1 => 4),
+        array(0 => 69, 1 => 5),
+        array(0 => 69, 1 => 6),
+        array(0 => 69, 1 => 2),
+        array(0 => 69, 1 => 2),
+        array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 2),
+        array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 8),
+        array(0 => 81, 1 => 2),
+        array(0 => 81, 1 => 1),
+        array(0 => 69, 1 => 5),
+        array(0 => 69, 1 => 7),
+        array(0 => 69, 1 => 6),
+        array(0 => 69, 1 => 8),
+        array(0 => 69, 1 => 2),
+        array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 4),
+        array(0 => 67, 1 => 1),
+        array(0 => 69, 1 => 2),
+        array(0 => 69, 1 => 3),
+        array(0 => 69, 1 => 4),
+        array(0 => 69, 1 => 5),
+        array(0 => 74, 1 => 2),
+        array(0 => 74, 1 => 1),
+        array(0 => 74, 1 => 0),
+        array(0 => 84, 1 => 4),
+        array(0 => 84, 1 => 2),
+        array(0 => 84, 1 => 2),
+        array(0 => 84, 1 => 2),
+        array(0 => 84, 1 => 2),
+        array(0 => 84, 1 => 2),
+        array(0 => 84, 1 => 4),
+        array(0 => 80, 1 => 1),
+        array(0 => 80, 1 => 3),
+        array(0 => 79, 1 => 3),
+        array(0 => 79, 1 => 3),
+        array(0 => 79, 1 => 3),
+        array(0 => 79, 1 => 3),
+        array(0 => 77, 1 => 1),
+        array(0 => 77, 1 => 1),
+        array(0 => 77, 1 => 3),
+        array(0 => 77, 1 => 3),
+        array(0 => 77, 1 => 3),
+        array(0 => 77, 1 => 3),
+        array(0 => 77, 1 => 3),
+        array(0 => 77, 1 => 2),
+        array(0 => 77, 1 => 3),
+        array(0 => 77, 1 => 3),
+        array(0 => 85, 1 => 7),
+        array(0 => 85, 1 => 7),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 3),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 3),
+        array(0 => 76, 1 => 3),
+        array(0 => 76, 1 => 3),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 3),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 2),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 1),
+        array(0 => 76, 1 => 3),
+        array(0 => 91, 1 => 1),
+        array(0 => 91, 1 => 1),
+        array(0 => 75, 1 => 1),
+        array(0 => 75, 1 => 1),
+        array(0 => 75, 1 => 3),
+        array(0 => 75, 1 => 1),
+        array(0 => 75, 1 => 3),
+        array(0 => 75, 1 => 4),
+        array(0 => 75, 1 => 3),
+        array(0 => 75, 1 => 4),
+        array(0 => 72, 1 => 2),
+        array(0 => 72, 1 => 2),
+        array(0 => 96, 1 => 2),
+        array(0 => 96, 1 => 0),
+        array(0 => 97, 1 => 2),
+        array(0 => 97, 1 => 2),
+        array(0 => 97, 1 => 4),
+        array(0 => 97, 1 => 2),
+        array(0 => 97, 1 => 2),
+        array(0 => 97, 1 => 4),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 5),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 3),
+        array(0 => 97, 1 => 2),
+        array(0 => 82, 1 => 1),
+        array(0 => 82, 1 => 1),
+        array(0 => 82, 1 => 2),
+        array(0 => 98, 1 => 1),
+        array(0 => 98, 1 => 1),
+        array(0 => 98, 1 => 3),
+        array(0 => 95, 1 => 2),
+        array(0 => 99, 1 => 1),
+        array(0 => 99, 1 => 2),
+        array(0 => 100, 1 => 3),
+        array(0 => 100, 1 => 3),
+        array(0 => 100, 1 => 5),
+        array(0 => 100, 1 => 6),
+        array(0 => 100, 1 => 2),
+        array(0 => 90, 1 => 4),
+        array(0 => 101, 1 => 4),
+        array(0 => 101, 1 => 4),
+        array(0 => 102, 1 => 3),
+        array(0 => 102, 1 => 1),
+        array(0 => 102, 1 => 0),
+        array(0 => 78, 1 => 3),
+        array(0 => 78, 1 => 2),
+        array(0 => 103, 1 => 3),
+        array(0 => 103, 1 => 2),
+        array(0 => 83, 1 => 2),
+        array(0 => 83, 1 => 0),
+        array(0 => 104, 1 => 2),
+        array(0 => 104, 1 => 3),
+        array(0 => 104, 1 => 2),
+        array(0 => 93, 1 => 1),
+        array(0 => 93, 1 => 2),
+        array(0 => 93, 1 => 1),
+        array(0 => 93, 1 => 2),
+        array(0 => 93, 1 => 3),
+        array(0 => 87, 1 => 1),
+        array(0 => 87, 1 => 1),
+        array(0 => 86, 1 => 1),
+        array(0 => 88, 1 => 1),
+        array(0 => 94, 1 => 3),
+        array(0 => 94, 1 => 3),
+        array(0 => 105, 1 => 1),
+        array(0 => 105, 1 => 3),
+        array(0 => 105, 1 => 0),
+        array(0 => 106, 1 => 3),
+        array(0 => 106, 1 => 3),
+        array(0 => 106, 1 => 1),
+        array(0 => 92, 1 => 2),
+        array(0 => 92, 1 => 3),
+        array(0 => 107, 1 => 2),
+        array(0 => 107, 1 => 1),
+        array(0 => 108, 1 => 3),
+        array(0 => 108, 1 => 3),
+        array(0 => 108, 1 => 1),
+        array(0 => 108, 1 => 3),
+        array(0 => 108, 1 => 3),
+        array(0 => 108, 1 => 1),
+        array(0 => 108, 1 => 1),
+    );
+
+    public static $yyReduceMap      = array(
+        0   => 0,
+        1   => 1,
+        2   => 2,
+        3   => 3,
+        4   => 4,
+        5   => 5,
+        6   => 6,
+        7   => 7,
+        22  => 7,
+        23  => 7,
+        24  => 7,
+        37  => 7,
+        57  => 7,
+        58  => 7,
+        66  => 7,
+        67  => 7,
+        78  => 7,
+        83  => 7,
+        84  => 7,
+        89  => 7,
+        93  => 7,
+        94  => 7,
+        98  => 7,
+        99  => 7,
+        101 => 7,
+        106 => 7,
+        170 => 7,
+        175 => 7,
+        8   => 8,
+        9   => 9,
+        10  => 10,
+        12  => 12,
+        13  => 13,
+        14  => 14,
+        15  => 15,
+        16  => 16,
+        17  => 17,
+        18  => 18,
+        19  => 19,
+        20  => 20,
+        21  => 21,
+        25  => 25,
+        26  => 26,
+        27  => 27,
+        28  => 28,
+        29  => 29,
+        30  => 30,
+        31  => 31,
+        32  => 32,
+        34  => 32,
+        33  => 33,
+        35  => 35,
+        36  => 36,
+        38  => 38,
+        39  => 39,
+        40  => 40,
+        41  => 41,
+        42  => 42,
+        43  => 43,
+        44  => 44,
+        45  => 45,
+        46  => 46,
+        47  => 47,
+        48  => 48,
+        49  => 49,
+        50  => 50,
+        51  => 51,
+        60  => 51,
+        148 => 51,
+        152 => 51,
+        156 => 51,
+        158 => 51,
+        52  => 52,
+        149 => 52,
+        155 => 52,
+        53  => 53,
+        54  => 54,
+        55  => 54,
+        56  => 56,
+        133 => 56,
+        59  => 59,
+        61  => 61,
+        62  => 62,
+        63  => 62,
+        64  => 64,
+        65  => 65,
+        68  => 68,
+        69  => 69,
+        70  => 69,
+        71  => 71,
+        72  => 72,
+        73  => 73,
+        74  => 74,
+        75  => 75,
+        76  => 76,
+        77  => 77,
+        79  => 79,
+        81  => 79,
+        82  => 79,
+        113 => 79,
+        80  => 80,
+        85  => 85,
+        86  => 86,
+        87  => 87,
+        88  => 88,
+        90  => 90,
+        91  => 91,
+        92  => 91,
+        95  => 95,
+        96  => 96,
+        97  => 97,
+        100 => 100,
+        102 => 102,
+        103 => 103,
+        104 => 104,
+        105 => 105,
+        107 => 107,
+        108 => 108,
+        109 => 109,
+        110 => 110,
+        111 => 111,
+        112 => 112,
+        114 => 114,
+        172 => 114,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        118 => 118,
+        119 => 119,
+        120 => 120,
+        128 => 120,
+        121 => 121,
+        122 => 122,
+        123 => 123,
+        124 => 123,
+        126 => 123,
+        127 => 123,
+        125 => 125,
+        129 => 129,
+        130 => 130,
+        131 => 131,
+        176 => 131,
+        132 => 132,
+        134 => 134,
+        135 => 135,
+        136 => 136,
+        137 => 137,
+        138 => 138,
+        139 => 139,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        147 => 147,
+        150 => 150,
+        151 => 151,
+        153 => 153,
+        154 => 154,
+        157 => 157,
+        159 => 159,
+        160 => 160,
+        161 => 161,
+        162 => 162,
+        163 => 163,
+        164 => 164,
+        165 => 165,
+        166 => 166,
+        167 => 167,
+        168 => 168,
+        169 => 168,
+        171 => 171,
+        173 => 173,
+        174 => 174,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        180 => 180,
+        183 => 180,
+        181 => 181,
+        184 => 181,
+        182 => 182,
+        185 => 185,
+        186 => 186,
+    );
 
-	  const Err1 = "Security error: Call to private object member not allowed";
-	  const Err2 = "Security error: Call to dynamic object member not allowed";
-    // states whether the parse was successful or not
+    /**
+     * result status
+     *
+     * @var bool
+     */
     public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
     public $retvalue = 0;
-    private $lex;
-    private $internalError = false;
 
-    function __construct($lex, $compiler) {
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var Smarty_Internal_ParseTree_Template
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Templatelexer
+     */
+    public $lex;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    public $yyTraceFILE;
+
+    public $yyTracePrompt;
+
+    public $yyidx;
+
+    public $yyerrcnt;
+
+    public $yystack          = array();
+
+    public $yyTokenName      = array(
+        '$', 'VERT', 'COLON', 'PHP',
+        'TEXT', 'STRIPON', 'STRIPOFF', 'LITERALSTART',
+        'LITERALEND', 'LITERAL', 'SIMPELOUTPUT', 'SIMPLETAG',
+        'SMARTYBLOCKCHILDPARENT', 'LDEL', 'RDEL', 'DOLLARID',
+        'EQUAL', 'ID', 'PTR', 'LDELMAKENOCACHE',
+        'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC',
+        'TO', 'STEP', 'LDELFOREACH', 'SPACE',
+        'AS', 'APTR', 'LDELSETFILTER', 'CLOSETAG',
+        'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA',
+        'OPENP', 'CLOSEP', 'MATH', 'UNIMATH',
+        'ISIN', 'QMARK', 'NOT', 'TYPECAST',
+        'HEX', 'DOT', 'INSTANCEOF', 'SINGLEQUOTESTRING',
+        'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH',
+        'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP',
+        'SLOGOP', 'TLOGOP', 'SINGLECOND', 'ARRAYOPEN',
+        'QUOTE', 'BACKTICK', 'error', 'start',
+        'template', 'literal_e2', 'literal_e1', 'smartytag',
+        'tagbody', 'tag', 'outattr', 'eqoutattr',
+        'varindexed', 'output', 'attributes', 'variable',
+        'value', 'expr', 'modifierlist', 'statement',
+        'statements', 'foraction', 'varvar', 'modparameters',
+        'attribute', 'ternary', 'tlop', 'lop',
+        'scond', 'array', 'function', 'ns1',
+        'doublequoted_with_quotes', 'static_class_access', 'arraydef', 'object',
+        'arrayindex', 'indexdef', 'varvarele', 'objectchain',
+        'objectelement', 'method', 'params', 'modifier',
+        'modparameter', 'arrayelements', 'arrayelement', 'doublequoted',
+        'doublequotedcontent',
+    );
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;                    /* Index of top element in stack */
+    private $_retvalue;                 /* Shifts left before out of the error */
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
         $this->lex = $lex;
         $this->compiler = $compiler;
-        $this->smarty = $this->compiler->smarty;
         $this->template = $this->compiler->template;
-        $this->compiler->has_variable_string = false;
-				$this->compiler->prefix_code = array();
-				$this->prefix_number = 0;
-				$this->block_nesting_level = 0;
-				if ($this->security = isset($this->smarty->security_policy)) {
-              $this->php_handling = $this->smarty->security_policy->php_handling;
-        } else {
-              $this->php_handling = $this->smarty->php_handling;
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+    }  /* The parser's stack */
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:
+                break;   /* If no destructor action specified: do nothing */
         }
-				$this->is_xml = false;
-				$this->asp_tags = (ini_get('asp_tags') != '0');
-				$this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
-    }
-
-    public static function escape_start_tag($tag_text) {
-       $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
-       return $tag;
-    }
-
-    public static function escape_end_tag($tag_text) {
-       return '?<?php ?>>';
-    }
-
-    
-#line 121 "smarty_internal_templateparser.php"
-
-    const TP_VERT                           =  1;
-    const TP_COLON                          =  2;
-    const TP_COMMENT                        =  3;
-    const TP_PHPSTARTTAG                    =  4;
-    const TP_PHPENDTAG                      =  5;
-    const TP_ASPSTARTTAG                    =  6;
-    const TP_ASPENDTAG                      =  7;
-    const TP_FAKEPHPSTARTTAG                =  8;
-    const TP_XMLTAG                         =  9;
-    const TP_OTHER                          = 10;
-    const TP_LINEBREAK                      = 11;
-    const TP_LITERALSTART                   = 12;
-    const TP_LITERALEND                     = 13;
-    const TP_LITERAL                        = 14;
-    const TP_LDEL                           = 15;
-    const TP_RDEL                           = 16;
-    const TP_DOLLAR                         = 17;
-    const TP_ID                             = 18;
-    const TP_EQUAL                          = 19;
-    const TP_PTR                            = 20;
-    const TP_LDELIF                         = 21;
-    const TP_SPACE                          = 22;
-    const TP_LDELFOR                        = 23;
-    const TP_SEMICOLON                      = 24;
-    const TP_INCDEC                         = 25;
-    const TP_TO                             = 26;
-    const TP_STEP                           = 27;
-    const TP_LDELFOREACH                    = 28;
-    const TP_AS                             = 29;
-    const TP_APTR                           = 30;
-    const TP_SMARTYBLOCKCHILD               = 31;
-    const TP_LDELSLASH                      = 32;
-    const TP_INTEGER                        = 33;
-    const TP_COMMA                          = 34;
-    const TP_OPENP                          = 35;
-    const TP_CLOSEP                         = 36;
-    const TP_MATH                           = 37;
-    const TP_UNIMATH                        = 38;
-    const TP_ANDSYM                         = 39;
-    const TP_ISIN                           = 40;
-    const TP_ISDIVBY                        = 41;
-    const TP_ISNOTDIVBY                     = 42;
-    const TP_ISEVEN                         = 43;
-    const TP_ISNOTEVEN                      = 44;
-    const TP_ISEVENBY                       = 45;
-    const TP_ISNOTEVENBY                    = 46;
-    const TP_ISODD                          = 47;
-    const TP_ISNOTODD                       = 48;
-    const TP_ISODDBY                        = 49;
-    const TP_ISNOTODDBY                     = 50;
-    const TP_INSTANCEOF                     = 51;
-    const TP_QMARK                          = 52;
-    const TP_NOT                            = 53;
-    const TP_TYPECAST                       = 54;
-    const TP_HEX                            = 55;
-    const TP_DOT                            = 56;
-    const TP_SINGLEQUOTESTRING              = 57;
-    const TP_DOUBLECOLON                    = 58;
-    const TP_AT                             = 59;
-    const TP_HATCH                          = 60;
-    const TP_OPENB                          = 61;
-    const TP_CLOSEB                         = 62;
-    const TP_EQUALS                         = 63;
-    const TP_NOTEQUALS                      = 64;
-    const TP_GREATERTHAN                    = 65;
-    const TP_LESSTHAN                       = 66;
-    const TP_GREATEREQUAL                   = 67;
-    const TP_LESSEQUAL                      = 68;
-    const TP_IDENTITY                       = 69;
-    const TP_NONEIDENTITY                   = 70;
-    const TP_MOD                            = 71;
-    const TP_LAND                           = 72;
-    const TP_LOR                            = 73;
-    const TP_LXOR                           = 74;
-    const TP_QUOTE                          = 75;
-    const TP_BACKTICK                       = 76;
-    const TP_DOLLARID                       = 77;
-    const YY_NO_ACTION = 584;
-    const YY_ACCEPT_ACTION = 583;
-    const YY_ERROR_ACTION = 582;
-
-    const YY_SZ_ACTTAB = 2566;
-static public $yy_action = array(
- /*     0 */   218,  272,  271,  275,  274,  278,  277,  276,  270,  262,
- /*    10 */   260,  264,  268,  196,  298,  285,   42,   22,  159,  265,
- /*    20 */    19,   29,  222,  374,  237,   29,  294,   29,  280,  149,
- /*    30 */   243,   19,  378,  225,  374,  244,   52,   47,   50,   45,
- /*    40 */    38,   37,  331,  332,   40,   39,  340,  337,   30,   25,
- /*    50 */   292,  299,  291,  290,  295,  190,  123,  342,  196,  279,
- /*    60 */   293,  135,  335,  322,  321,  308,  309,  310,  307,  306,
- /*    70 */   302,  303,  304,  305,  218,  242,  319,  175,  199,  133,
- /*    80 */   138,   19,  248,   72,  374,  124,   19,  288,  448,  374,
- /*    90 */    41,   14,  339,  311,  448,   29,  348,  329,  376,  320,
- /*   100 */    34,  583,   95,  273,  271,  275,  219,    3,  301,    3,
- /*   110 */    52,   47,   50,   45,   38,   37,  331,  332,   40,   39,
- /*   120 */   340,  337,   30,   25,    7,  231,   17,  108,  134,  167,
- /*   130 */   140,   35,  140,  143,  336,  192,  335,  322,  321,  308,
- /*   140 */   309,  310,  307,  306,  302,  303,  304,  305,  218,  334,
- /*   150 */   319,  193,  353,   10,  138,    3,  248,   55,    3,  119,
- /*   160 */   136,   36,   31,  371,  218,   19,  339,  311,  374,   29,
- /*   170 */   348,  329,   29,  320,  199,   27,  223,  258,  140,  372,
- /*   180 */   224,  140,  254,  220,   52,   47,   50,   45,   38,   37,
- /*   190 */   331,  332,   40,   39,  340,  337,   30,   25,  341,  179,
- /*   200 */    32,  159,  106,  323,   29,  194,  379,  342,  218,  288,
- /*   210 */   335,  322,  321,  308,  309,  310,  307,  306,  302,  303,
- /*   220 */   304,  305,  218,  366,  319,  199,  186,  218,  138,  190,
- /*   230 */   248,   72,  445,  124,  218,  266,  288,  364,  445,  123,
- /*   240 */   339,  311,  447,   29,  348,  329,   19,  320,  447,  374,
- /*   250 */    23,    3,  199,   16,  211,   29,  297,  170,   52,   47,
- /*   260 */    50,   45,   38,   37,  331,  332,   40,   39,  340,  337,
- /*   270 */    30,   25,  218,  172,  140,  183,  104,   46,   19,  189,
- /*   280 */   379,  374,   41,  288,  335,  322,  321,  308,  309,  310,
- /*   290 */   307,  306,  302,  303,  304,  305,  344,  188,  444,  199,
- /*   300 */   218,  235,  249,  216,   29,  191,  379,  342,   52,   47,
- /*   310 */    50,   45,   38,   37,  331,  332,   40,   39,  340,  337,
- /*   320 */    30,   25,  242,   19,  142,   43,  374,  130,  245,   28,
- /*   330 */    29,  159,  107,  346,  335,  322,  321,  308,  309,  310,
- /*   340 */   307,  306,  302,  303,  304,  305,  218,  347,  319,   27,
- /*   350 */    46,  257,  138,  198,  248,   62,  164,  119,  240,  218,
- /*   360 */   267,  252,  228,  126,  339,  311,  288,  205,  348,  329,
- /*   370 */   103,  320,    8,  261,  444,  357,  180,  376,  376,   29,
- /*   380 */    29,   29,   52,   47,   50,   45,   38,   37,  331,  332,
- /*   390 */    40,   39,  340,  337,   30,   25,  184,  349,  361,  365,
- /*   400 */    27,  284,  358,   29,   29,   29,  288,   29,  335,  322,
- /*   410 */   321,  308,  309,  310,  307,  306,  302,  303,  304,  305,
- /*   420 */   218,  319,  202,  221,  181,  138,  154,  248,   72,  171,
- /*   430 */   124,  313,    9,  162,  288,  289,  163,  339,  311,  288,
- /*   440 */   320,  348,  329,  288,  320,  376,  288,  281,  269,  370,
- /*   450 */   376,  214,    6,   29,   29,   29,   52,   47,   50,   45,
- /*   460 */    38,   37,  331,  332,   40,   39,  340,  337,   30,   25,
- /*   470 */   218,  178,  239,  283,  373,   19,  226,  238,  374,   29,
- /*   480 */    29,  288,  335,  322,  321,  308,  309,  310,  307,  306,
- /*   490 */   302,  303,  304,  305,  177,  205,  286,  202,  227,  377,
- /*   500 */     8,  166,   29,  376,  288,   29,   52,   47,   50,   45,
- /*   510 */    38,   37,  331,  332,   40,   39,  340,  337,   30,   25,
- /*   520 */   202,  218,  363,  375,  380,  315,  235,  296,   29,   29,
- /*   530 */    29,   29,  335,  322,  321,  308,  309,  310,  307,  306,
- /*   540 */   302,  303,  304,  305,  197,  369,  352,   19,  327,  218,
- /*   550 */   236,   29,   29,  165,  234,  156,  174,   52,   47,   50,
- /*   560 */    45,   38,   37,  331,  332,   40,   39,  340,  337,   30,
- /*   570 */    25,   26,  344,    5,   19,  314,  199,  212,   19,  199,
- /*   580 */   159,  241,  218,  335,  322,  321,  308,  309,  310,  307,
- /*   590 */   306,  302,  303,  304,  305,  218,  319,  300,  100,   46,
- /*   600 */   138,   19,  248,   76,  233,  124,    6,  218,  110,  351,
- /*   610 */   201,  338,  339,  311,  115,  168,  348,  329,  123,  320,
- /*   620 */   182,  338,  287,  234,  105,  288,  324,  338,  235,  240,
- /*   630 */   288,   52,   47,   50,   45,   38,   37,  331,  332,   40,
- /*   640 */    39,  340,  337,   30,   25,  218,  333,  144,  263,   33,
- /*   650 */    13,  342,  312,  156,   29,  355,   97,  335,  322,  321,
- /*   660 */   308,  309,  310,  307,  306,  302,  303,  304,  305,  338,
- /*   670 */   141,   32,  325,  121,  195,  131,  356,  229,  127,    2,
- /*   680 */   250,   52,   47,   50,   45,   38,   37,  331,  332,   40,
- /*   690 */    39,  340,  337,   30,   25,  318,  228,   11,  330,   94,
- /*   700 */   129,  282,  218,  253,  159,   29,  323,  335,  322,  321,
- /*   710 */   308,  309,  310,  307,  306,  302,  303,  304,  305,  218,
- /*   720 */   218,  319,   18,  101,  148,  122,  114,  248,   54,   44,
- /*   730 */   124,  202,   99,  158,  316,  367,  376,  339,  311,  338,
- /*   740 */    29,  348,  329,  376,  320,  338,  338,  354,  169,  368,
- /*   750 */   321,  321,  321,  321,  321,   52,   47,   50,   45,   38,
- /*   760 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  218,
- /*   770 */    46,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*   780 */   113,  335,  322,  321,  308,  309,  310,  307,  306,  302,
- /*   790 */   303,  304,  305,  338,  321,  321,  321,  321,  321,  321,
- /*   800 */   321,  321,  321,  321,  256,   52,   47,   50,   45,   38,
- /*   810 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  218,
- /*   820 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*   830 */   321,  335,  322,  321,  308,  309,  310,  307,  306,  302,
- /*   840 */   303,  304,  305,  321,  321,  321,  321,  321,  321,  321,
- /*   850 */   321,  321,  321,  321,  321,   52,   47,   50,   45,   38,
- /*   860 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  218,
- /*   870 */    12,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*   880 */   382,  335,  322,  321,  308,  309,  310,  307,  306,  302,
- /*   890 */   303,  304,  305,  321,  321,  321,  321,  321,  321,  321,
- /*   900 */   321,  321,  321,  321,  321,   52,   47,   50,   45,   38,
- /*   910 */    37,  331,  332,   40,   39,  340,  337,   30,   25,  321,
- /*   920 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*   930 */   321,  335,  322,  321,  308,  309,  310,  307,  306,  302,
- /*   940 */   303,  304,  305,  218,  319,  321,  321,  321,  138,  321,
- /*   950 */   248,   61,  321,  124,  321,   98,  132,  321,  200,  321,
- /*   960 */   339,  311,  321,  321,  348,  329,  321,  320,  338,  338,
- /*   970 */   321,  321,  321,  321,  321,  321,  321,  321,  321,   52,
- /*   980 */    47,   50,   45,   38,   37,  331,  332,   40,   39,  340,
- /*   990 */   337,   30,   25,  218,  321,  321,  321,  321,  321,  321,
- /*  1000 */   321,  321,  321,  321,  321,  335,  322,  321,  308,  309,
- /*  1010 */   310,  307,  306,  302,  303,  304,  305,  321,  321,  321,
- /*  1020 */   321,  321,  321,  321,  321,  321,  321,  321,  321,   52,
- /*  1030 */    47,   50,   45,   38,   37,  331,  332,   40,   39,  340,
- /*  1040 */   337,   30,   25,  321,  321,  321,  321,  321,  321,  321,
- /*  1050 */   321,  321,  321,  321,  321,  335,  322,  321,  308,  309,
- /*  1060 */   310,  307,  306,  302,  303,  304,  305,   52,   47,   50,
- /*  1070 */    45,   38,   37,  331,  332,   40,   39,  340,  337,   30,
- /*  1080 */    25,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*  1090 */   321,  321,  321,  335,  322,  321,  308,  309,  310,  307,
- /*  1100 */   306,  302,  303,  304,  305,  321,  321,  321,  321,   42,
- /*  1110 */   321,  139,  207,  321,  319,  222,  321,  237,  138,  321,
- /*  1120 */   248,   78,  149,  124,  321,  378,  225,  232,  321,   15,
- /*  1130 */   339,  311,   49,  321,  348,  329,  321,  320,  321,  321,
- /*  1140 */   321,  321,  321,  321,  321,  321,  321,   51,   48,  317,
- /*  1150 */   247,  328,  321,  319,  103,    1,  255,  145,  321,  248,
- /*  1160 */   321,  321,  124,  321,   42,  321,  139,  209,  321,   96,
- /*  1170 */   222,  321,  237,  348,  329,  321,  320,  149,  345,  321,
- /*  1180 */   378,  225,  232,   24,   15,  321,  321,   49,  321,  222,
- /*  1190 */   321,  237,  321,  321,  321,  321,  149,  321,  321,  378,
- /*  1200 */   225,  321,   51,   48,  317,  247,  328,  321,  319,  103,
- /*  1210 */     1,  321,  146,  321,  248,  321,  321,  124,  321,   42,
- /*  1220 */   161,  130,  209,  193,   96,  222,  321,  237,  348,  329,
- /*  1230 */   288,  320,  149,   36,   31,  378,  225,  232,  321,   21,
- /*  1240 */   321,  321,   49,  350,   20,  343,  199,  319,  218,  321,
- /*  1250 */   321,  155,  321,  248,  321,  321,  124,   51,   48,  317,
- /*  1260 */   247,  328,  321,  450,  103,    1,  321,  348,  329,  450,
- /*  1270 */   320,  321,  321,  321,   42,  321,  125,  209,  321,   96,
- /*  1280 */   222,  321,  237,  321,  321,  321,  321,  149,  345,  321,
- /*  1290 */   378,  225,  232,   24,    4,  321,  321,   49,   46,  222,
- /*  1300 */   321,  237,  321,  321,  321,  321,  149,  321,  321,  378,
- /*  1310 */   225,  321,   51,   48,  317,  247,  328,  321,  319,  103,
- /*  1320 */     1,  321,  151,  321,  248,  321,  321,  124,  321,   42,
- /*  1330 */   176,  139,  204,  193,   96,  222,  321,  237,  348,  329,
- /*  1340 */   288,  320,  149,   36,   31,  378,  225,  215,  321,   15,
- /*  1350 */   321,  321,   49,  362,   20,  343,  199,  319,  218,  321,
- /*  1360 */   321,  150,  321,  248,  321,  321,  124,   51,   48,  317,
- /*  1370 */   247,  328,  321,  259,  103,    1,  321,  348,  329,   29,
- /*  1380 */   320,  321,  321,  321,   42,  173,  128,   92,  193,   96,
- /*  1390 */   222,  321,  237,  321,  218,  288,  321,  149,   36,   31,
- /*  1400 */   378,  225,  232,  321,   15,  321,  321,   49,   46,  381,
- /*  1410 */   321,  199,  319,  230,  321,   29,  152,  321,  248,  321,
- /*  1420 */   321,  124,   51,   48,  317,  247,  328,  321,    3,  103,
- /*  1430 */     1,  321,  348,  329,  321,  320,  321,  321,  321,   42,
- /*  1440 */   185,  139,  208,  102,   96,  222,  321,  237,  321,  321,
- /*  1450 */   288,  140,  149,   36,   31,  378,  225,  232,  321,   15,
- /*  1460 */   321,  321,   49,  321,  321,  321,  199,  319,  321,  321,
- /*  1470 */   321,  147,  321,  248,  321,  321,  124,   51,   48,  317,
- /*  1480 */   247,  328,  321,  321,  103,    1,  321,  348,  329,  321,
- /*  1490 */   320,  321,  321,  321,   42,  187,  139,  203,  193,   96,
- /*  1500 */   222,  321,  237,  321,  321,  288,  321,  149,   36,   31,
- /*  1510 */   378,  225,  232,  321,   15,  321,  160,   49,  321,  193,
- /*  1520 */   321,  199,  321,  321,  321,  321,  288,  321,  321,   36,
- /*  1530 */    31,  321,   51,   48,  317,  247,  328,  321,  321,  103,
- /*  1540 */     1,  321,  199,  321,  321,  321,  321,  321,  321,   42,
- /*  1550 */   321,  139,  206,  218,   96,  222,  321,  237,  321,  321,
- /*  1560 */   321,  321,  149,  321,  321,  378,  225,  232,  450,   15,
- /*  1570 */   321,  321,   49,  321,  450,  321,  321,  321,  321,  321,
- /*  1580 */   321,  246,  321,  321,  321,  321,  321,   51,   48,  317,
- /*  1590 */   247,  328,  321,  321,  103,    1,  321,  321,  321,  321,
- /*  1600 */   321,  321,  321,   46,   42,  321,  137,  209,  321,   96,
- /*  1610 */   222,  321,  237,  321,  321,  321,  321,  149,  321,  321,
- /*  1620 */   378,  225,  232,  321,   15,  321,  321,   49,  321,  321,
- /*  1630 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*  1640 */   321,  321,   51,   48,  317,  247,  328,  321,  321,  103,
- /*  1650 */     1,  321,  321,  321,  321,  321,  321,  321,  321,   42,
- /*  1660 */   321,  130,  210,  321,   96,  222,  321,  237,  321,  321,
- /*  1670 */   321,  321,  149,  321,  321,  378,  225,  232,  321,   21,
- /*  1680 */   321,  321,   49,  321,  321,  321,  321,  321,  321,  321,
- /*  1690 */   321,  321,  321,  321,  321,  321,  321,   51,   48,  317,
- /*  1700 */   247,  328,  321,  321,  103,  321,  321,  321,  321,  321,
- /*  1710 */   321,  321,  321,  321,   42,  321,  130,  209,  321,   96,
- /*  1720 */   222,  321,  237,  321,  321,  321,  321,  149,  321,  321,
- /*  1730 */   378,  225,  232,  321,   21,  321,  321,   49,  321,  321,
- /*  1740 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*  1750 */   321,  321,   51,   48,  317,  247,  328,  321,  321,  103,
- /*  1760 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  493,
- /*  1770 */   321,  321,  321,  321,   96,  493,  321,  493,  321,  493,
- /*  1780 */   493,  321,  493,  321,  321,  321,  321,  493,    3,  493,
- /*  1790 */   321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
- /*  1800 */   321,  321,  321,  319,  493,  321,  321,  117,  321,  248,
- /*  1810 */    82,  140,  124,  321,  321,  493,  321,  321,  321,  339,
- /*  1820 */   311,  321,  321,  348,  329,  321,  320,  321,  321,  493,
- /*  1830 */   321,  321,  321,  321,  321,  321,  319,  217,  360,  321,
- /*  1840 */   117,  321,  248,   82,  321,  124,  321,  321,  321,  321,
- /*  1850 */   321,  321,  339,  311,  321,  321,  348,  329,  319,  320,
- /*  1860 */   321,  321,  138,  321,  248,   90,  321,  124,  321,  321,
- /*  1870 */   321,  359,  321,  321,  339,  311,  321,  321,  348,  329,
- /*  1880 */   321,  320,  321,  321,  321,  321,  319,  321,  321,  321,
- /*  1890 */   138,  321,  248,   69,  321,  124,  321,  321,  321,  321,
- /*  1900 */   321,  321,  339,  311,  321,  321,  348,  329,  321,  320,
- /*  1910 */   321,  321,  319,  321,  321,  321,  138,  321,  248,   67,
- /*  1920 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
- /*  1930 */   321,  321,  348,  329,  321,  320,  319,  321,  321,  321,
- /*  1940 */   138,  321,  248,   58,  321,  124,  321,  321,  321,  321,
- /*  1950 */   321,  321,  339,  311,  319,  321,  348,  329,  138,  320,
- /*  1960 */   248,   62,  321,  124,  321,  321,  321,  321,  321,  321,
- /*  1970 */   339,  311,  321,  321,  348,  329,  319,  320,  321,  321,
- /*  1980 */   138,  321,  248,   56,  321,  124,  321,  321,  321,  321,
- /*  1990 */   321,  321,  339,  311,  321,  321,  348,  329,  321,  320,
- /*  2000 */   321,  319,  321,  321,  321,  112,  321,  248,   71,  321,
- /*  2010 */   124,  321,  321,  321,  321,  321,  321,  339,  311,  319,
- /*  2020 */   321,  348,  329,  111,  320,  248,   81,  321,  124,  321,
- /*  2030 */   321,  321,  321,  321,  321,  339,  311,  319,  321,  348,
- /*  2040 */   329,  138,  320,  248,   74,  321,  124,  321,  321,  321,
- /*  2050 */   321,  321,  321,  339,  311,  321,  321,  348,  329,  319,
- /*  2060 */   320,  321,  321,  138,  321,  248,   91,  321,  124,  321,
- /*  2070 */   321,  321,  321,  321,  321,  339,  311,  321,  321,  348,
- /*  2080 */   329,  321,  320,  321,  319,  321,  321,  321,  138,  321,
- /*  2090 */   248,   64,  321,  124,  321,  321,  321,  321,  321,  321,
- /*  2100 */   339,  311,  319,  321,  348,  329,  138,  320,  248,   63,
- /*  2110 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
- /*  2120 */   319,  321,  348,  329,  138,  320,  248,   83,  321,  124,
- /*  2130 */   321,  321,  321,  321,  321,  321,  339,  311,  321,  321,
- /*  2140 */   348,  329,  319,  320,  321,  321,  138,  321,  248,   79,
- /*  2150 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
- /*  2160 */   321,  321,  348,  329,  321,  320,  321,  319,  321,  321,
- /*  2170 */   321,  138,  321,  248,   75,  321,  124,  321,  321,  321,
- /*  2180 */   321,  321,  321,  339,  311,  319,  321,  348,  329,  138,
- /*  2190 */   320,  248,   70,  321,  124,  321,  321,  321,  321,  321,
- /*  2200 */   321,  339,  311,  319,  321,  348,  329,  109,  320,  248,
- /*  2210 */    68,  321,  124,  321,  321,  321,  321,  321,  321,  339,
- /*  2220 */   311,  321,  321,  348,  329,  319,  320,  321,  321,  138,
- /*  2230 */   321,  248,   77,  321,  124,  321,  321,  321,  321,  321,
- /*  2240 */   321,  339,  311,  321,  321,  348,  329,  321,  320,  321,
- /*  2250 */   319,  321,  321,  321,  138,  321,  248,   73,  321,  124,
- /*  2260 */   321,  321,  321,  321,  321,  321,  339,  311,  319,  321,
- /*  2270 */   348,  329,  138,  320,  213,   65,  321,  124,  321,  321,
- /*  2280 */   321,  321,  321,  321,  339,  311,  319,  321,  348,  329,
- /*  2290 */   138,  320,  248,   86,  321,  124,  321,  321,  321,  321,
- /*  2300 */   321,  321,  339,  311,  321,  321,  348,  329,  319,  320,
- /*  2310 */   321,  321,  138,  321,  248,   88,  321,  124,  321,  321,
- /*  2320 */   321,  321,  321,  321,  339,  311,  321,  321,  348,  329,
- /*  2330 */   321,  320,  321,  319,  321,  321,  321,   93,  321,  120,
- /*  2340 */    59,  321,  116,  321,  321,  321,  321,  321,  321,  339,
- /*  2350 */   311,  319,  321,  348,  329,  138,  320,  248,   57,  321,
- /*  2360 */   124,  321,  321,  321,  321,  321,  321,  339,  311,  319,
- /*  2370 */   321,  348,  329,  138,  320,  248,   60,  321,  124,  321,
- /*  2380 */   321,  321,  321,  321,  321,  339,  311,  321,  321,  348,
- /*  2390 */   329,  319,  320,  321,  321,  138,  321,  248,   89,  321,
- /*  2400 */   124,  321,  321,  321,  321,  321,  321,  339,  311,  321,
- /*  2410 */   321,  348,  329,  321,  320,  321,  319,  321,  321,  321,
- /*  2420 */   138,  321,  248,   85,  321,  124,  321,  321,  321,  321,
- /*  2430 */   321,  321,  339,  311,  319,  321,  348,  329,  138,  320,
- /*  2440 */   248,   80,  321,  124,  321,  321,  321,  321,  321,  321,
- /*  2450 */   339,  311,  319,  321,  348,  329,  138,  320,  248,   84,
- /*  2460 */   321,  124,  321,  321,  321,  321,  321,  321,  339,  311,
- /*  2470 */   321,  321,  348,  329,  319,  320,  321,  321,  138,  321,
- /*  2480 */   248,   66,  321,  124,  321,  321,  321,  321,  321,  321,
- /*  2490 */   339,  311,  321,  321,  348,  329,  321,  320,  321,  319,
- /*  2500 */   321,  321,  321,  138,  321,  248,   87,  321,  124,  321,
- /*  2510 */   321,  321,  321,  321,  321,  339,  311,  319,  321,  348,
- /*  2520 */   329,   93,  320,  118,   53,  321,  116,  321,  321,  321,
- /*  2530 */   321,  321,  321,  339,  311,  319,  321,  348,  329,  153,
- /*  2540 */   320,  248,  319,  321,  124,  321,  157,  321,  248,  321,
- /*  2550 */   321,  124,  326,  321,  321,  348,  329,  321,  320,  251,
- /*  2560 */   321,  321,  348,  329,  321,  320,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     1,   81,   82,   83,    3,    4,    5,    6,    7,    8,
- /*    10 */     9,   10,   11,   12,   22,   16,   15,   19,   20,   16,
- /*    20 */    15,   22,   21,   18,   23,   22,   83,   22,   85,   28,
- /*    30 */    94,   15,   31,   32,   18,   30,   37,   38,   39,   40,
- /*    40 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*    50 */     4,    5,    6,    7,    8,   90,   58,   25,   12,   13,
- /*    60 */    14,   17,   63,   64,   65,   66,   67,   68,   69,   70,
- /*    70 */    71,   72,   73,   74,    1,   59,   82,   87,  113,   35,
- /*    80 */    86,   15,   88,   89,   18,   91,   15,   97,   16,   18,
- /*    90 */    19,   19,   98,   99,   22,   22,  102,  103,  108,  105,
- /*   100 */    27,   79,   80,   81,   82,   83,  112,   35,   76,   35,
- /*   110 */    37,   38,   39,   40,   41,   42,   43,   44,   45,   46,
- /*   120 */    47,   48,   49,   50,   34,   59,   15,   84,   17,   18,
- /*   130 */    58,   15,   58,   17,   18,  114,   63,   64,   65,   66,
- /*   140 */    67,   68,   69,   70,   71,   72,   73,   74,    1,   33,
- /*   150 */    82,   90,   62,   30,   86,   35,   88,   89,   35,   91,
- /*   160 */    92,  100,  101,   16,    1,   15,   98,   99,   18,   22,
- /*   170 */   102,  103,   22,  105,  113,   34,   56,   36,   58,   16,
- /*   180 */    30,   58,   62,   20,   37,   38,   39,   40,   41,   42,
- /*   190 */    43,   44,   45,   46,   47,   48,   49,   50,   16,   87,
- /*   200 */    19,   20,   90,  107,   22,  109,  110,   25,    1,   97,
- /*   210 */    63,   64,   65,   66,   67,   68,   69,   70,   71,   72,
- /*   220 */    73,   74,    1,   16,   82,  113,   87,    1,   86,   90,
- /*   230 */    88,   89,   16,   91,    1,   13,   97,   16,   22,   58,
- /*   240 */    98,   99,   16,   22,  102,  103,   15,  105,   22,   18,
- /*   250 */    19,   35,  113,   94,  112,   22,   25,  106,   37,   38,
- /*   260 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
- /*   270 */    49,   50,    1,   87,   58,  106,   90,   51,   15,  109,
- /*   280 */   110,   18,   19,   97,   63,   64,   65,   66,   67,   68,
- /*   290 */    69,   70,   71,   72,   73,   74,   82,  114,   16,  113,
- /*   300 */     1,   91,   92,   93,   22,  109,  110,   25,   37,   38,
- /*   310 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
- /*   320 */    49,   50,   59,   15,   17,   19,   18,   17,   18,   30,
- /*   330 */    22,   20,  118,  119,   63,   64,   65,   66,   67,   68,
- /*   340 */    69,   70,   71,   72,   73,   74,    1,   76,   82,   34,
- /*   350 */    51,   36,   86,   24,   88,   89,   87,   91,   92,    1,
- /*   360 */    36,   16,   56,   34,   98,   99,   97,   56,  102,  103,
- /*   370 */    60,  105,   61,   16,   16,   16,  106,  108,  108,   22,
- /*   380 */    22,   22,   37,   38,   39,   40,   41,   42,   43,   44,
- /*   390 */    45,   46,   47,   48,   49,   50,   87,   16,   16,   16,
- /*   400 */    34,   16,   36,   22,   22,   22,   97,   22,   63,   64,
- /*   410 */    65,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   420 */     1,   82,  113,   88,   87,   86,   91,   88,   89,   87,
- /*   430 */    91,   18,   15,   87,   97,   16,   87,   98,   99,   97,
- /*   440 */   105,  102,  103,   97,  105,  108,   97,   16,   16,   16,
- /*   450 */   108,  112,   35,   22,   22,   22,   37,   38,   39,   40,
- /*   460 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   470 */     1,   87,   59,   16,   16,   15,   17,   18,   18,   22,
- /*   480 */    22,   97,   63,   64,   65,   66,   67,   68,   69,   70,
- /*   490 */    71,   72,   73,   74,   87,   56,   16,  113,   29,   16,
- /*   500 */    61,  106,   22,  108,   97,   22,   37,   38,   39,   40,
- /*   510 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   520 */   113,    1,   16,   16,   16,   16,   91,   92,   22,   22,
- /*   530 */    22,   22,   63,   64,   65,   66,   67,   68,   69,   70,
- /*   540 */    71,   72,   73,   74,   24,   16,   16,   15,  104,    1,
- /*   550 */    18,   22,   22,   90,    2,  111,   90,   37,   38,   39,
- /*   560 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*   570 */    50,   19,   82,   35,   15,   18,  113,   18,   15,  113,
- /*   580 */    20,   18,    1,   63,   64,   65,   66,   67,   68,   69,
- /*   590 */    70,   71,   72,   73,   74,    1,   82,   16,   95,   51,
- /*   600 */    86,   15,   88,   89,   18,   91,   35,    1,   95,  119,
- /*   610 */    16,  108,   98,   99,   95,   87,  102,  103,   58,  105,
- /*   620 */    87,  108,   16,    2,   22,   97,   18,  108,   91,   92,
- /*   630 */    97,   37,   38,   39,   40,   41,   42,   43,   44,   45,
- /*   640 */    46,   47,   48,   49,   50,    1,  104,   17,   16,   26,
- /*   650 */    52,   25,   33,  111,   22,   60,   95,   63,   64,   65,
- /*   660 */    66,   67,   68,   69,   70,   71,   72,   73,   74,  108,
- /*   670 */    17,   19,   18,   18,   18,   17,   60,   18,   17,   22,
- /*   680 */    36,   37,   38,   39,   40,   41,   42,   43,   44,   45,
- /*   690 */    46,   47,   48,   49,   50,   33,   56,    2,   18,   18,
- /*   700 */    18,   97,    1,   62,   20,   22,  107,   63,   64,   65,
- /*   710 */    66,   67,   68,   69,   70,   71,   72,   73,   74,    1,
- /*   720 */     1,   82,   22,  106,   96,   86,   95,   88,   89,    2,
- /*   730 */    91,  113,   95,   95,  110,   16,  108,   98,   99,  108,
- /*   740 */    22,  102,  103,  108,  105,  108,  108,  111,  106,  115,
- /*   750 */   120,  120,  120,  120,  120,   37,   38,   39,   40,   41,
- /*   760 */    42,   43,   44,   45,   46,   47,   48,   49,   50,    1,
- /*   770 */    51,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*   780 */    95,   63,   64,   65,   66,   67,   68,   69,   70,   71,
- /*   790 */    72,   73,   74,  108,  120,  120,  120,  120,  120,  120,
- /*   800 */   120,  120,  120,  120,   36,   37,   38,   39,   40,   41,
- /*   810 */    42,   43,   44,   45,   46,   47,   48,   49,   50,    1,
- /*   820 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*   830 */   120,   63,   64,   65,   66,   67,   68,   69,   70,   71,
- /*   840 */    72,   73,   74,  120,  120,  120,  120,  120,  120,  120,
- /*   850 */   120,  120,  120,  120,  120,   37,   38,   39,   40,   41,
- /*   860 */    42,   43,   44,   45,   46,   47,   48,   49,   50,    1,
- /*   870 */     2,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*   880 */    62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
- /*   890 */    72,   73,   74,  120,  120,  120,  120,  120,  120,  120,
- /*   900 */   120,  120,  120,  120,  120,   37,   38,   39,   40,   41,
- /*   910 */    42,   43,   44,   45,   46,   47,   48,   49,   50,  120,
- /*   920 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*   930 */   120,   63,   64,   65,   66,   67,   68,   69,   70,   71,
- /*   940 */    72,   73,   74,    1,   82,  120,  120,  120,   86,  120,
- /*   950 */    88,   89,  120,   91,  120,   95,   95,  120,   16,  120,
- /*   960 */    98,   99,  120,  120,  102,  103,  120,  105,  108,  108,
- /*   970 */   120,  120,  120,  120,  120,  120,  120,  120,  120,   37,
- /*   980 */    38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   990 */    48,   49,   50,    1,  120,  120,  120,  120,  120,  120,
- /*  1000 */   120,  120,  120,  120,  120,   63,   64,   65,   66,   67,
- /*  1010 */    68,   69,   70,   71,   72,   73,   74,  120,  120,  120,
- /*  1020 */   120,  120,  120,  120,  120,  120,  120,  120,  120,   37,
- /*  1030 */    38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
- /*  1040 */    48,   49,   50,  120,  120,  120,  120,  120,  120,  120,
- /*  1050 */   120,  120,  120,  120,  120,   63,   64,   65,   66,   67,
- /*  1060 */    68,   69,   70,   71,   72,   73,   74,   37,   38,   39,
- /*  1070 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*  1080 */    50,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*  1090 */   120,  120,  120,   63,   64,   65,   66,   67,   68,   69,
- /*  1100 */    70,   71,   72,   73,   74,  120,  120,  120,  120,   15,
- /*  1110 */   120,   17,   18,  120,   82,   21,  120,   23,   86,  120,
- /*  1120 */    88,   89,   28,   91,  120,   31,   32,   33,  120,   35,
- /*  1130 */    98,   99,   38,  120,  102,  103,  120,  105,  120,  120,
- /*  1140 */   120,  120,  120,  120,  120,  120,  120,   53,   54,   55,
- /*  1150 */    56,   57,  120,   82,   60,   61,   62,   86,  120,   88,
- /*  1160 */   120,  120,   91,  120,   15,  120,   17,   18,  120,   75,
- /*  1170 */    21,  120,   23,  102,  103,  120,  105,   28,   10,  120,
- /*  1180 */    31,   32,   33,   15,   35,  120,  120,   38,  120,   21,
- /*  1190 */   120,   23,  120,  120,  120,  120,   28,  120,  120,   31,
- /*  1200 */    32,  120,   53,   54,   55,   56,   57,  120,   82,   60,
- /*  1210 */    61,  120,   86,  120,   88,  120,  120,   91,  120,   15,
- /*  1220 */    87,   17,   18,   90,   75,   21,  120,   23,  102,  103,
- /*  1230 */    97,  105,   28,  100,  101,   31,   32,   33,  120,   35,
- /*  1240 */   120,  120,   38,   75,   76,   77,  113,   82,    1,  120,
- /*  1250 */   120,   86,  120,   88,  120,  120,   91,   53,   54,   55,
- /*  1260 */    56,   57,  120,   16,   60,   61,  120,  102,  103,   22,
- /*  1270 */   105,  120,  120,  120,   15,  120,   17,   18,  120,   75,
- /*  1280 */    21,  120,   23,  120,  120,  120,  120,   28,   10,  120,
- /*  1290 */    31,   32,   33,   15,   35,  120,  120,   38,   51,   21,
- /*  1300 */   120,   23,  120,  120,  120,  120,   28,  120,  120,   31,
- /*  1310 */    32,  120,   53,   54,   55,   56,   57,  120,   82,   60,
- /*  1320 */    61,  120,   86,  120,   88,  120,  120,   91,  120,   15,
- /*  1330 */    87,   17,   18,   90,   75,   21,  120,   23,  102,  103,
- /*  1340 */    97,  105,   28,  100,  101,   31,   32,   33,  120,   35,
- /*  1350 */   120,  120,   38,   75,   76,   77,  113,   82,    1,  120,
- /*  1360 */   120,   86,  120,   88,  120,  120,   91,   53,   54,   55,
- /*  1370 */    56,   57,  120,   16,   60,   61,  120,  102,  103,   22,
- /*  1380 */   105,  120,  120,  120,   15,   87,   17,   18,   90,   75,
- /*  1390 */    21,  120,   23,  120,    1,   97,  120,   28,  100,  101,
- /*  1400 */    31,   32,   33,  120,   35,  120,  120,   38,   51,   16,
- /*  1410 */   120,  113,   82,   20,  120,   22,   86,  120,   88,  120,
- /*  1420 */   120,   91,   53,   54,   55,   56,   57,  120,   35,   60,
- /*  1430 */    61,  120,  102,  103,  120,  105,  120,  120,  120,   15,
- /*  1440 */    87,   17,   18,   90,   75,   21,  120,   23,  120,  120,
- /*  1450 */    97,   58,   28,  100,  101,   31,   32,   33,  120,   35,
- /*  1460 */   120,  120,   38,  120,  120,  120,  113,   82,  120,  120,
- /*  1470 */   120,   86,  120,   88,  120,  120,   91,   53,   54,   55,
- /*  1480 */    56,   57,  120,  120,   60,   61,  120,  102,  103,  120,
- /*  1490 */   105,  120,  120,  120,   15,   87,   17,   18,   90,   75,
- /*  1500 */    21,  120,   23,  120,  120,   97,  120,   28,  100,  101,
- /*  1510 */    31,   32,   33,  120,   35,  120,   87,   38,  120,   90,
- /*  1520 */   120,  113,  120,  120,  120,  120,   97,  120,  120,  100,
- /*  1530 */   101,  120,   53,   54,   55,   56,   57,  120,  120,   60,
- /*  1540 */    61,  120,  113,  120,  120,  120,  120,  120,  120,   15,
- /*  1550 */   120,   17,   18,    1,   75,   21,  120,   23,  120,  120,
- /*  1560 */   120,  120,   28,  120,  120,   31,   32,   33,   16,   35,
- /*  1570 */   120,  120,   38,  120,   22,  120,  120,  120,  120,  120,
- /*  1580 */   120,   29,  120,  120,  120,  120,  120,   53,   54,   55,
- /*  1590 */    56,   57,  120,  120,   60,   61,  120,  120,  120,  120,
- /*  1600 */   120,  120,  120,   51,   15,  120,   17,   18,  120,   75,
- /*  1610 */    21,  120,   23,  120,  120,  120,  120,   28,  120,  120,
- /*  1620 */    31,   32,   33,  120,   35,  120,  120,   38,  120,  120,
- /*  1630 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*  1640 */   120,  120,   53,   54,   55,   56,   57,  120,  120,   60,
- /*  1650 */    61,  120,  120,  120,  120,  120,  120,  120,  120,   15,
- /*  1660 */   120,   17,   18,  120,   75,   21,  120,   23,  120,  120,
- /*  1670 */   120,  120,   28,  120,  120,   31,   32,   33,  120,   35,
- /*  1680 */   120,  120,   38,  120,  120,  120,  120,  120,  120,  120,
- /*  1690 */   120,  120,  120,  120,  120,  120,  120,   53,   54,   55,
- /*  1700 */    56,   57,  120,  120,   60,  120,  120,  120,  120,  120,
- /*  1710 */   120,  120,  120,  120,   15,  120,   17,   18,  120,   75,
- /*  1720 */    21,  120,   23,  120,  120,  120,  120,   28,  120,  120,
- /*  1730 */    31,   32,   33,  120,   35,  120,  120,   38,  120,  120,
- /*  1740 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*  1750 */   120,  120,   53,   54,   55,   56,   57,  120,  120,   60,
- /*  1760 */   120,  120,  120,  120,  120,  120,  120,  120,  120,   16,
- /*  1770 */   120,  120,  120,  120,   75,   22,  120,   24,  120,   26,
- /*  1780 */    27,  120,   29,  120,  120,  120,  120,   34,   35,   36,
- /*  1790 */   120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
- /*  1800 */   120,  120,  120,   82,   51,  120,  120,   86,  120,   88,
- /*  1810 */    89,   58,   91,  120,  120,   62,  120,  120,  120,   98,
- /*  1820 */    99,  120,  120,  102,  103,  120,  105,  120,  120,   76,
- /*  1830 */   120,  120,  120,  120,  120,  120,   82,  116,  117,  120,
- /*  1840 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
- /*  1850 */   120,  120,   98,   99,  120,  120,  102,  103,   82,  105,
- /*  1860 */   120,  120,   86,  120,   88,   89,  120,   91,  120,  120,
- /*  1870 */   120,  117,  120,  120,   98,   99,  120,  120,  102,  103,
- /*  1880 */   120,  105,  120,  120,  120,  120,   82,  120,  120,  120,
- /*  1890 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
- /*  1900 */   120,  120,   98,   99,  120,  120,  102,  103,  120,  105,
- /*  1910 */   120,  120,   82,  120,  120,  120,   86,  120,   88,   89,
- /*  1920 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
- /*  1930 */   120,  120,  102,  103,  120,  105,   82,  120,  120,  120,
- /*  1940 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
- /*  1950 */   120,  120,   98,   99,   82,  120,  102,  103,   86,  105,
- /*  1960 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
- /*  1970 */    98,   99,  120,  120,  102,  103,   82,  105,  120,  120,
- /*  1980 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
- /*  1990 */   120,  120,   98,   99,  120,  120,  102,  103,  120,  105,
- /*  2000 */   120,   82,  120,  120,  120,   86,  120,   88,   89,  120,
- /*  2010 */    91,  120,  120,  120,  120,  120,  120,   98,   99,   82,
- /*  2020 */   120,  102,  103,   86,  105,   88,   89,  120,   91,  120,
- /*  2030 */   120,  120,  120,  120,  120,   98,   99,   82,  120,  102,
- /*  2040 */   103,   86,  105,   88,   89,  120,   91,  120,  120,  120,
- /*  2050 */   120,  120,  120,   98,   99,  120,  120,  102,  103,   82,
- /*  2060 */   105,  120,  120,   86,  120,   88,   89,  120,   91,  120,
- /*  2070 */   120,  120,  120,  120,  120,   98,   99,  120,  120,  102,
- /*  2080 */   103,  120,  105,  120,   82,  120,  120,  120,   86,  120,
- /*  2090 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
- /*  2100 */    98,   99,   82,  120,  102,  103,   86,  105,   88,   89,
- /*  2110 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
- /*  2120 */    82,  120,  102,  103,   86,  105,   88,   89,  120,   91,
- /*  2130 */   120,  120,  120,  120,  120,  120,   98,   99,  120,  120,
- /*  2140 */   102,  103,   82,  105,  120,  120,   86,  120,   88,   89,
- /*  2150 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
- /*  2160 */   120,  120,  102,  103,  120,  105,  120,   82,  120,  120,
- /*  2170 */   120,   86,  120,   88,   89,  120,   91,  120,  120,  120,
- /*  2180 */   120,  120,  120,   98,   99,   82,  120,  102,  103,   86,
- /*  2190 */   105,   88,   89,  120,   91,  120,  120,  120,  120,  120,
- /*  2200 */   120,   98,   99,   82,  120,  102,  103,   86,  105,   88,
- /*  2210 */    89,  120,   91,  120,  120,  120,  120,  120,  120,   98,
- /*  2220 */    99,  120,  120,  102,  103,   82,  105,  120,  120,   86,
- /*  2230 */   120,   88,   89,  120,   91,  120,  120,  120,  120,  120,
- /*  2240 */   120,   98,   99,  120,  120,  102,  103,  120,  105,  120,
- /*  2250 */    82,  120,  120,  120,   86,  120,   88,   89,  120,   91,
- /*  2260 */   120,  120,  120,  120,  120,  120,   98,   99,   82,  120,
- /*  2270 */   102,  103,   86,  105,   88,   89,  120,   91,  120,  120,
- /*  2280 */   120,  120,  120,  120,   98,   99,   82,  120,  102,  103,
- /*  2290 */    86,  105,   88,   89,  120,   91,  120,  120,  120,  120,
- /*  2300 */   120,  120,   98,   99,  120,  120,  102,  103,   82,  105,
- /*  2310 */   120,  120,   86,  120,   88,   89,  120,   91,  120,  120,
- /*  2320 */   120,  120,  120,  120,   98,   99,  120,  120,  102,  103,
- /*  2330 */   120,  105,  120,   82,  120,  120,  120,   86,  120,   88,
- /*  2340 */    89,  120,   91,  120,  120,  120,  120,  120,  120,   98,
- /*  2350 */    99,   82,  120,  102,  103,   86,  105,   88,   89,  120,
- /*  2360 */    91,  120,  120,  120,  120,  120,  120,   98,   99,   82,
- /*  2370 */   120,  102,  103,   86,  105,   88,   89,  120,   91,  120,
- /*  2380 */   120,  120,  120,  120,  120,   98,   99,  120,  120,  102,
- /*  2390 */   103,   82,  105,  120,  120,   86,  120,   88,   89,  120,
- /*  2400 */    91,  120,  120,  120,  120,  120,  120,   98,   99,  120,
- /*  2410 */   120,  102,  103,  120,  105,  120,   82,  120,  120,  120,
- /*  2420 */    86,  120,   88,   89,  120,   91,  120,  120,  120,  120,
- /*  2430 */   120,  120,   98,   99,   82,  120,  102,  103,   86,  105,
- /*  2440 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
- /*  2450 */    98,   99,   82,  120,  102,  103,   86,  105,   88,   89,
- /*  2460 */   120,   91,  120,  120,  120,  120,  120,  120,   98,   99,
- /*  2470 */   120,  120,  102,  103,   82,  105,  120,  120,   86,  120,
- /*  2480 */    88,   89,  120,   91,  120,  120,  120,  120,  120,  120,
- /*  2490 */    98,   99,  120,  120,  102,  103,  120,  105,  120,   82,
- /*  2500 */   120,  120,  120,   86,  120,   88,   89,  120,   91,  120,
- /*  2510 */   120,  120,  120,  120,  120,   98,   99,   82,  120,  102,
- /*  2520 */   103,   86,  105,   88,   89,  120,   91,  120,  120,  120,
- /*  2530 */   120,  120,  120,   98,   99,   82,  120,  102,  103,   86,
- /*  2540 */   105,   88,   82,  120,   91,  120,   86,  120,   88,  120,
- /*  2550 */   120,   91,   99,  120,  120,  102,  103,  120,  105,   99,
- /*  2560 */   120,  120,  102,  103,  120,  105,
-);
-    const YY_SHIFT_USE_DFLT = -9;
-    const YY_SHIFT_MAX = 250;
-    static public $yy_shift_ofst = array(
- /*     0 */     1, 1424, 1259, 1149, 1259, 1149, 1149, 1424, 1094, 1149,
- /*    10 */  1149, 1479, 1149, 1589, 1534, 1149, 1149, 1149, 1314, 1149,
- /*    20 */  1149, 1149, 1149, 1149, 1369, 1149, 1149, 1149, 1149, 1314,
- /*    30 */  1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149,
- /*    40 */  1149, 1149, 1369, 1149, 1204, 1204, 1644, 1699, 1699, 1699,
- /*    50 */  1699, 1699, 1699,  147,  221,   -1,   73,  718,  718,  718,
- /*    60 */   768,  818,  644,  594,  345,  271,  419,  942,  469,  520,
- /*    70 */   868,  992,  992,  992,  992,  992,  992,  992,  992,  992,
- /*    80 */   992,  992,  992,  992,  992,  992,  992,  992,  992,  992,
- /*    90 */  1030, 1030, 1393, 1357,  233,    1, 1278,  150,    5,  308,
- /*   100 */   308,  311,  358,  310,  233,   44,  233, 1168,   46, 1552,
- /*   110 */   263, 1247,  226,  231,   71,   16,   -2,  299,  182,  181,
- /*   120 */   282,  163,  719,  459,  560,  532,   44,  460,  559,  581,
- /*   130 */   460,  460,  460,   44,  563,  460,  632,  586,  548,  532,
- /*   140 */   459,  460,  460,  460,  460,  701,  701,  701,  683,  700,
- /*   150 */   701,  701,  701,  701,  684,  701,  684,   -9,   66,  111,
- /*   160 */     3,  357,  359,  382,  381,  606,  439,  417,  509,  439,
- /*   170 */   439,  530,  508,  458,  207,  431,  480,  507,  506,  483,
- /*   180 */   439,  457,  432,  439,  529,  433,  385,  383,  727,  684,
- /*   190 */   701,  684,  727,  701,  684,  538,  222,   -8,   -8,   -9,
- /*   200 */    -9,   -9,   -9, 1753,   72,  116,  216,  120,  123,   74,
- /*   210 */    74,  141,  552,   32,  315,  306,  329,   90,  413,  366,
- /*   220 */   682,  616,  657,  659,  658,  655,  656,  661,  662,  641,
- /*   230 */   681,  680,  640,  695,  654,  652,  621,  602,  571,  557,
- /*   240 */   324,  538,  608,  307,  630,  595,  653,  619,  626,  623,
- /*   250 */   598,
-);
-    const YY_REDUCE_USE_DFLT = -81;
-    const YY_REDUCE_MAX = 202;
-    static public $yy_reduce_ofst = array(
- /*     0 */    22, 1721,   68,  339,  266,   -6,  142, 1754,  862, 2020,
- /*    10 */   514, 1977, 1776, 2103, 1919, 1872, 1804, 1830, 2121, 2392,
- /*    20 */  2186, 2287, 2269, 2168, 2435, 2143,  639, 1955, 2085, 1937,
- /*    30 */  1032, 2060, 2038, 1894, 1854, 2002, 2352, 2417, 2370, 2334,
- /*    40 */  2204, 2226, 2251, 2309, 2460, 2453, 1071, 1126, 1275, 1385,
- /*    50 */  1330, 1236, 1165, 1353, 1408, 1243, 1429, 1298, 1133, 1353,
- /*    60 */    61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
- /*    70 */    61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
- /*    80 */    61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
- /*    90 */    61,   61,  186,  139,  112,  -80,  214,  -10,  342,  337,
- /*   100 */   269,   96,  309,  335,  384,  210,  407,  490,  -57,  -35,
- /*   110 */   270,  -35,  -35,  628,  270,  270,  170,  -35,  528,  170,
- /*   120 */   528,  466,  -35,  444,  170,  513,  435,  561,  519,  463,
- /*   130 */   519,  637,  395,  537,  861,  631,  533,  519,  -35,  519,
- /*   140 */   542,  860,  685,  638,  503,  -35,  -35,  -35,  346,  349,
- /*   150 */   -35,  -35,  -35,  -35,  170,  -35,  196,  -35,  635,  636,
- /*   160 */   604,  604,  604,  604,  604,  618,  599,  642,  604,  599,
- /*   170 */   599,  604,  604,  604,  618,  604,  604,  604,  604,  604,
- /*   180 */   599,  604,  604,  599,  604,  604,  604,  604,  634,  624,
- /*   190 */   618,  624,  634,  618,  624,  617,   43,  -64,  159,   21,
- /*   200 */   169,  151,  183,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 23, 28, 31, 32, ),
-        /* 1 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 2 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 3 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 4 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 5 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 6 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 7 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 8 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 62, 75, ),
-        /* 9 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 10 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 11 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 12 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 13 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 14 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 15 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 16 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 17 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 18 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 19 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 20 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 21 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 22 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 23 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 24 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 25 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 26 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 27 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 28 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 29 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 30 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 31 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 32 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 33 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 34 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 35 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 36 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 37 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 38 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 39 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 40 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 41 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 42 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 43 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 44 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 45 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ),
-        /* 46 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 47 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 48 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 49 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 50 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 51 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 52 */ array(15, 17, 18, 21, 23, 28, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ),
-        /* 53 */ array(1, 16, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 54 */ array(1, 16, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 55 */ array(1, 16, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 56 */ array(1, 22, 27, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 57 */ array(1, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 58 */ array(1, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 59 */ array(1, 22, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 60 */ array(1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 61 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 62 */ array(1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 63 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 64 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 65 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 76, ),
-        /* 66 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 67 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 68 */ array(1, 29, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 69 */ array(1, 24, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 70 */ array(1, 2, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 71 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 72 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 73 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 74 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 75 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 76 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 77 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 78 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 79 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 80 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 81 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 82 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 83 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 84 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 85 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 86 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 87 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 88 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 89 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 90 */ array(37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 91 */ array(37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ),
-        /* 92 */ array(1, 16, 20, 22, 35, 58, ),
-        /* 93 */ array(1, 16, 22, 51, ),
-        /* 94 */ array(1, 22, ),
-        /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 23, 28, 31, 32, ),
-        /* 96 */ array(10, 15, 21, 23, 28, 31, 32, 75, 76, 77, ),
-        /* 97 */ array(15, 18, 22, 30, ),
-        /* 98 */ array(15, 18, 22, 30, ),
-        /* 99 */ array(15, 18, 22, ),
-        /* 100 */ array(15, 18, 22, ),
-        /* 101 */ array(20, 56, 61, ),
-        /* 102 */ array(1, 16, 22, ),
-        /* 103 */ array(17, 18, 60, ),
-        /* 104 */ array(1, 22, ),
-        /* 105 */ array(17, 35, ),
-        /* 106 */ array(1, 22, ),
-        /* 107 */ array(10, 15, 21, 23, 28, 31, 32, 75, 76, 77, ),
-        /* 108 */ array(4, 5, 6, 7, 8, 12, 13, 14, ),
-        /* 109 */ array(1, 16, 22, 29, 51, ),
-        /* 110 */ array(15, 18, 19, 59, ),
-        /* 111 */ array(1, 16, 22, 51, ),
-        /* 112 */ array(1, 16, 22, 51, ),
-        /* 113 */ array(15, 18, 19, 25, ),
-        /* 114 */ array(15, 18, 19, ),
-        /* 115 */ array(15, 18, 59, ),
-        /* 116 */ array(19, 20, 58, ),
-        /* 117 */ array(1, 30, 51, ),
-        /* 118 */ array(16, 22, 25, ),
-        /* 119 */ array(19, 20, 58, ),
-        /* 120 */ array(16, 22, 25, ),
-        /* 121 */ array(1, 16, 20, ),
-        /* 122 */ array(1, 16, 51, ),
-        /* 123 */ array(17, 18, ),
-        /* 124 */ array(20, 58, ),
-        /* 125 */ array(15, 18, ),
-        /* 126 */ array(17, 35, ),
-        /* 127 */ array(15, 18, ),
-        /* 128 */ array(15, 18, ),
-        /* 129 */ array(1, 16, ),
-        /* 130 */ array(15, 18, ),
-        /* 131 */ array(15, 18, ),
-        /* 132 */ array(15, 18, ),
-        /* 133 */ array(17, 35, ),
-        /* 134 */ array(15, 18, ),
-        /* 135 */ array(15, 18, ),
-        /* 136 */ array(16, 22, ),
-        /* 137 */ array(15, 18, ),
-        /* 138 */ array(1, 51, ),
-        /* 139 */ array(15, 18, ),
-        /* 140 */ array(17, 18, ),
-        /* 141 */ array(15, 18, ),
-        /* 142 */ array(15, 18, ),
-        /* 143 */ array(15, 18, ),
-        /* 144 */ array(15, 18, ),
-        /* 145 */ array(1, ),
-        /* 146 */ array(1, ),
-        /* 147 */ array(1, ),
-        /* 148 */ array(22, ),
-        /* 149 */ array(22, ),
-        /* 150 */ array(1, ),
-        /* 151 */ array(1, ),
-        /* 152 */ array(1, ),
-        /* 153 */ array(1, ),
-        /* 154 */ array(20, ),
-        /* 155 */ array(1, ),
-        /* 156 */ array(20, ),
-        /* 157 */ array(),
-        /* 158 */ array(15, 18, 59, ),
-        /* 159 */ array(15, 17, 18, ),
-        /* 160 */ array(16, 22, ),
-        /* 161 */ array(16, 22, ),
-        /* 162 */ array(16, 22, ),
-        /* 163 */ array(16, 22, ),
-        /* 164 */ array(16, 22, ),
-        /* 165 */ array(1, 16, ),
-        /* 166 */ array(56, 61, ),
-        /* 167 */ array(15, 35, ),
-        /* 168 */ array(16, 22, ),
-        /* 169 */ array(56, 61, ),
-        /* 170 */ array(56, 61, ),
-        /* 171 */ array(16, 22, ),
-        /* 172 */ array(16, 22, ),
-        /* 173 */ array(16, 22, ),
-        /* 174 */ array(1, 16, ),
-        /* 175 */ array(16, 22, ),
-        /* 176 */ array(16, 22, ),
-        /* 177 */ array(16, 22, ),
-        /* 178 */ array(16, 22, ),
-        /* 179 */ array(16, 22, ),
-        /* 180 */ array(56, 61, ),
-        /* 181 */ array(16, 22, ),
-        /* 182 */ array(16, 22, ),
-        /* 183 */ array(56, 61, ),
-        /* 184 */ array(16, 22, ),
-        /* 185 */ array(16, 22, ),
-        /* 186 */ array(16, 22, ),
-        /* 187 */ array(16, 22, ),
-        /* 188 */ array(2, ),
-        /* 189 */ array(20, ),
-        /* 190 */ array(1, ),
-        /* 191 */ array(20, ),
-        /* 192 */ array(2, ),
-        /* 193 */ array(1, ),
-        /* 194 */ array(20, ),
-        /* 195 */ array(35, ),
-        /* 196 */ array(13, ),
-        /* 197 */ array(22, ),
-        /* 198 */ array(22, ),
-        /* 199 */ array(),
-        /* 200 */ array(),
-        /* 201 */ array(),
-        /* 202 */ array(),
-        /* 203 */ array(16, 22, 24, 26, 27, 29, 34, 35, 36, 51, 58, 62, 76, ),
-        /* 204 */ array(16, 19, 22, 35, 58, ),
-        /* 205 */ array(15, 17, 18, 33, ),
-        /* 206 */ array(16, 22, 35, 58, ),
-        /* 207 */ array(35, 56, 58, 62, ),
-        /* 208 */ array(30, 35, 58, ),
-        /* 209 */ array(35, 58, ),
-        /* 210 */ array(35, 58, ),
-        /* 211 */ array(34, 36, ),
-        /* 212 */ array(2, 19, ),
-        /* 213 */ array(25, 76, ),
-        /* 214 */ array(34, 36, ),
-        /* 215 */ array(19, 56, ),
-        /* 216 */ array(24, 34, ),
-        /* 217 */ array(34, 62, ),
-        /* 218 */ array(18, 59, ),
-        /* 219 */ array(34, 36, ),
-        /* 220 */ array(18, ),
-        /* 221 */ array(60, ),
-        /* 222 */ array(22, ),
-        /* 223 */ array(18, ),
-        /* 224 */ array(17, ),
-        /* 225 */ array(18, ),
-        /* 226 */ array(18, ),
-        /* 227 */ array(17, ),
-        /* 228 */ array(33, ),
-        /* 229 */ array(62, ),
-        /* 230 */ array(18, ),
-        /* 231 */ array(18, ),
-        /* 232 */ array(56, ),
-        /* 233 */ array(2, ),
-        /* 234 */ array(18, ),
-        /* 235 */ array(19, ),
-        /* 236 */ array(2, ),
-        /* 237 */ array(22, ),
-        /* 238 */ array(35, ),
-        /* 239 */ array(18, ),
-        /* 240 */ array(36, ),
-        /* 241 */ array(35, ),
-        /* 242 */ array(18, ),
-        /* 243 */ array(17, ),
-        /* 244 */ array(17, ),
-        /* 245 */ array(60, ),
-        /* 246 */ array(17, ),
-        /* 247 */ array(33, ),
-        /* 248 */ array(25, ),
-        /* 249 */ array(26, ),
-        /* 250 */ array(52, ),
-        /* 251 */ array(),
-        /* 252 */ array(),
-        /* 253 */ array(),
-        /* 254 */ array(),
-        /* 255 */ array(),
-        /* 256 */ array(),
-        /* 257 */ array(),
-        /* 258 */ array(),
-        /* 259 */ array(),
-        /* 260 */ array(),
-        /* 261 */ array(),
-        /* 262 */ array(),
-        /* 263 */ array(),
-        /* 264 */ array(),
-        /* 265 */ array(),
-        /* 266 */ array(),
-        /* 267 */ array(),
-        /* 268 */ array(),
-        /* 269 */ array(),
-        /* 270 */ array(),
-        /* 271 */ array(),
-        /* 272 */ array(),
-        /* 273 */ array(),
-        /* 274 */ array(),
-        /* 275 */ array(),
-        /* 276 */ array(),
-        /* 277 */ array(),
-        /* 278 */ array(),
-        /* 279 */ array(),
-        /* 280 */ array(),
-        /* 281 */ array(),
-        /* 282 */ array(),
-        /* 283 */ array(),
-        /* 284 */ array(),
-        /* 285 */ array(),
-        /* 286 */ array(),
-        /* 287 */ array(),
-        /* 288 */ array(),
-        /* 289 */ array(),
-        /* 290 */ array(),
-        /* 291 */ array(),
-        /* 292 */ array(),
-        /* 293 */ array(),
-        /* 294 */ array(),
-        /* 295 */ array(),
-        /* 296 */ array(),
-        /* 297 */ array(),
-        /* 298 */ array(),
-        /* 299 */ array(),
-        /* 300 */ array(),
-        /* 301 */ array(),
-        /* 302 */ array(),
-        /* 303 */ array(),
-        /* 304 */ array(),
-        /* 305 */ array(),
-        /* 306 */ array(),
-        /* 307 */ array(),
-        /* 308 */ array(),
-        /* 309 */ array(),
-        /* 310 */ array(),
-        /* 311 */ array(),
-        /* 312 */ array(),
-        /* 313 */ array(),
-        /* 314 */ array(),
-        /* 315 */ array(),
-        /* 316 */ array(),
-        /* 317 */ array(),
-        /* 318 */ array(),
-        /* 319 */ array(),
-        /* 320 */ array(),
-        /* 321 */ array(),
-        /* 322 */ array(),
-        /* 323 */ array(),
-        /* 324 */ array(),
-        /* 325 */ array(),
-        /* 326 */ array(),
-        /* 327 */ array(),
-        /* 328 */ array(),
-        /* 329 */ array(),
-        /* 330 */ array(),
-        /* 331 */ array(),
-        /* 332 */ array(),
-        /* 333 */ array(),
-        /* 334 */ array(),
-        /* 335 */ array(),
-        /* 336 */ array(),
-        /* 337 */ array(),
-        /* 338 */ array(),
-        /* 339 */ array(),
-        /* 340 */ array(),
-        /* 341 */ array(),
-        /* 342 */ array(),
-        /* 343 */ array(),
-        /* 344 */ array(),
-        /* 345 */ array(),
-        /* 346 */ array(),
-        /* 347 */ array(),
-        /* 348 */ array(),
-        /* 349 */ array(),
-        /* 350 */ array(),
-        /* 351 */ array(),
-        /* 352 */ array(),
-        /* 353 */ array(),
-        /* 354 */ array(),
-        /* 355 */ array(),
-        /* 356 */ array(),
-        /* 357 */ array(),
-        /* 358 */ array(),
-        /* 359 */ array(),
-        /* 360 */ array(),
-        /* 361 */ array(),
-        /* 362 */ array(),
-        /* 363 */ array(),
-        /* 364 */ array(),
-        /* 365 */ array(),
-        /* 366 */ array(),
-        /* 367 */ array(),
-        /* 368 */ array(),
-        /* 369 */ array(),
-        /* 370 */ array(),
-        /* 371 */ array(),
-        /* 372 */ array(),
-        /* 373 */ array(),
-        /* 374 */ array(),
-        /* 375 */ array(),
-        /* 376 */ array(),
-        /* 377 */ array(),
-        /* 378 */ array(),
-        /* 379 */ array(),
-        /* 380 */ array(),
-        /* 381 */ array(),
-        /* 382 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */   386,  565,  582,  536,  582,  536,  536,  582,  582,  582,
- /*    10 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
- /*    20 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
- /*    30 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
- /*    40 */   582,  582,  582,  582,  582,  582,  582,  582,  582,  582,
- /*    50 */   582,  582,  582,  582,  582,  582,  444,  444,  444,  444,
- /*    60 */   582,  582,  582,  582,  582,  582,  582,  582,  449,  582,
- /*    70 */   582,  446,  535,  428,  534,  566,  567,  478,  477,  468,
- /*    80 */   465,  449,  568,  455,  469,  474,  473,  470,  454,  451,
- /*    90 */   482,  481,  493,  457,  444,  383,  582,  444,  444,  444,
- /*   100 */   444,  548,  464,  582,  444,  582,  444,  582,  582,  457,
- /*   110 */   509,  457,  457,  582,  509,  509,  502,  457,  483,  502,
- /*   120 */   483,  582,  457,  582,  502,  582,  582,  582,  582,  582,
- /*   130 */   582,  582,  509,  582,  582,  582,  582,  582,  457,  582,
- /*   140 */   582,  582,  582,  582,  582,  480,  461,  484,  444,  444,
- /*   150 */   486,  485,  462,  467,  502,  460,  545,  543,  510,  582,
- /*   160 */   582,  582,  582,  582,  582,  582,  527,  509,  582,  526,
- /*   170 */   529,  582,  582,  582,  582,  582,  582,  582,  582,  582,
- /*   180 */   507,  582,  582,  528,  582,  582,  582,  582,  537,  523,
- /*   190 */   501,  546,  538,  464,  549,  509,  401,  581,  581,  542,
- /*   200 */   509,  509,  542,  459,  493,  582,  493,  493,  493,  493,
- /*   210 */   479,  582,  521,  483,  582,  489,  582,  582,  582,  582,
- /*   220 */   582,  582,  582,  582,  582,  582,  582,  582,  491,  582,
- /*   230 */   582,  582,  489,  521,  582,  582,  521,  582,  547,  582,
- /*   240 */   582,  521,  582,  582,  582,  582,  582,  582,  483,  452,
- /*   250 */   495,  544,  514,  516,  515,  518,  495,  531,  532,  409,
- /*   260 */   395,  431,  394,  425,  396,  430,  398,  456,  397,  426,
- /*   270 */   393,  387,  385,  384,  388,  389,  392,  391,  390,  399,
- /*   280 */   400,  435,  442,  436,  410,  423,  424,  441,  443,  522,
- /*   290 */   408,  407,  404,  403,  402,  405,  453,  429,  580,  406,
- /*   300 */   440,  573,  558,  559,  560,  561,  557,  556,  553,  554,
- /*   310 */   555,  463,  492,  540,  539,  411,  525,  488,  490,  500,
- /*   320 */   504,  552,  551,  508,  503,  459,  466,  499,  496,  497,
- /*   330 */   511,  471,  472,  498,  513,  550,  512,  476,  519,  458,
- /*   340 */   475,  576,  487,  575,  578,  579,  572,  574,  494,  434,
- /*   350 */   570,  571,  433,  562,  530,  505,  506,  427,  533,  564,
- /*   360 */   563,  432,  569,  421,  415,  416,  439,  414,  541,  412,
- /*   370 */   413,  577,  438,  417,  521,  422,  520,  420,  437,  524,
- /*   380 */   418,  419,  517,
-);
-    const YYNOCODE = 121;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 383;
-    const YYNRULE = 199;
-    const YYERRORSYMBOL = 78;
-    const YYERRSYMDT = 'yy0';
-    const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
+    }
+
+    /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+    }
+
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+    }
+
+    public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
             $zTracePrompt = 0;
         } elseif (!$zTracePrompt) {
             $TraceFILE = 0;
         }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
-    }
-
-    static function PrintTrace()
-    {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
-    }
-
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array( 
-  '$',             'VERT',          'COLON',         'COMMENT',     
-  'PHPSTARTTAG',   'PHPENDTAG',     'ASPSTARTTAG',   'ASPENDTAG',   
-  'FAKEPHPSTARTTAG',  'XMLTAG',        'OTHER',         'LINEBREAK',   
-  'LITERALSTART',  'LITERALEND',    'LITERAL',       'LDEL',        
-  'RDEL',          'DOLLAR',        'ID',            'EQUAL',       
-  'PTR',           'LDELIF',        'SPACE',         'LDELFOR',     
-  'SEMICOLON',     'INCDEC',        'TO',            'STEP',        
-  'LDELFOREACH',   'AS',            'APTR',          'SMARTYBLOCKCHILD',
-  'LDELSLASH',     'INTEGER',       'COMMA',         'OPENP',       
-  'CLOSEP',        'MATH',          'UNIMATH',       'ANDSYM',      
-  'ISIN',          'ISDIVBY',       'ISNOTDIVBY',    'ISEVEN',      
-  'ISNOTEVEN',     'ISEVENBY',      'ISNOTEVENBY',   'ISODD',       
-  'ISNOTODD',      'ISODDBY',       'ISNOTODDBY',    'INSTANCEOF',  
-  'QMARK',         'NOT',           'TYPECAST',      'HEX',         
-  'DOT',           'SINGLEQUOTESTRING',  'DOUBLECOLON',   'AT',          
-  'HATCH',         'OPENB',         'CLOSEB',        'EQUALS',      
-  'NOTEQUALS',     'GREATERTHAN',   'LESSTHAN',      'GREATEREQUAL',
-  'LESSEQUAL',     'IDENTITY',      'NONEIDENTITY',  'MOD',         
-  'LAND',          'LOR',           'LXOR',          'QUOTE',       
-  'BACKTICK',      'DOLLARID',      'error',         'start',       
-  'template',      'template_element',  'smartytag',     'literal',     
-  'literal_elements',  'literal_element',  'value',         'attributes',  
-  'variable',      'expr',          'modifierlist',  'varindexed',  
-  'statement',     'statements',    'optspace',      'varvar',      
-  'foraction',     'attribute',     'ternary',       'array',       
-  'ifcond',        'lop',           'function',      'doublequoted_with_quotes',
-  'static_class_access',  'object',        'arrayindex',    'indexdef',    
-  'varvarele',     'objectchain',   'objectelement',  'method',      
-  'params',        'modifier',      'modparameters',  'modparameter',
-  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
-    );
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
 
-    static public $yyRuleName = array(
- /*   0 */ "start ::= template",
- /*   1 */ "template ::= template_element",
- /*   2 */ "template ::= template template_element",
- /*   3 */ "template ::=",
- /*   4 */ "template_element ::= smartytag",
- /*   5 */ "template_element ::= COMMENT",
- /*   6 */ "template_element ::= literal",
- /*   7 */ "template_element ::= PHPSTARTTAG",
- /*   8 */ "template_element ::= PHPENDTAG",
- /*   9 */ "template_element ::= ASPSTARTTAG",
- /*  10 */ "template_element ::= ASPENDTAG",
- /*  11 */ "template_element ::= FAKEPHPSTARTTAG",
- /*  12 */ "template_element ::= XMLTAG",
- /*  13 */ "template_element ::= OTHER",
- /*  14 */ "template_element ::= LINEBREAK",
- /*  15 */ "literal ::= LITERALSTART LITERALEND",
- /*  16 */ "literal ::= LITERALSTART literal_elements LITERALEND",
- /*  17 */ "literal_elements ::= literal_elements literal_element",
- /*  18 */ "literal_elements ::=",
- /*  19 */ "literal_element ::= literal",
- /*  20 */ "literal_element ::= LITERAL",
- /*  21 */ "literal_element ::= PHPSTARTTAG",
- /*  22 */ "literal_element ::= FAKEPHPSTARTTAG",
- /*  23 */ "literal_element ::= PHPENDTAG",
- /*  24 */ "literal_element ::= ASPSTARTTAG",
- /*  25 */ "literal_element ::= ASPENDTAG",
- /*  26 */ "smartytag ::= LDEL value RDEL",
- /*  27 */ "smartytag ::= LDEL value attributes RDEL",
- /*  28 */ "smartytag ::= LDEL variable attributes RDEL",
- /*  29 */ "smartytag ::= LDEL expr modifierlist attributes RDEL",
- /*  30 */ "smartytag ::= LDEL expr attributes RDEL",
- /*  31 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
- /*  32 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
- /*  33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
- /*  34 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
- /*  35 */ "smartytag ::= LDEL ID attributes RDEL",
- /*  36 */ "smartytag ::= LDEL ID RDEL",
- /*  37 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
- /*  38 */ "smartytag ::= LDEL ID modifierlist attributes RDEL",
- /*  39 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL",
- /*  40 */ "smartytag ::= LDELIF SPACE expr RDEL",
- /*  41 */ "smartytag ::= LDELIF SPACE expr attributes RDEL",
- /*  42 */ "smartytag ::= LDELIF SPACE statement RDEL",
- /*  43 */ "smartytag ::= LDELIF SPACE statement attributes RDEL",
- /*  44 */ "smartytag ::= LDELFOR SPACE statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL",
- /*  45 */ "foraction ::= EQUAL expr",
- /*  46 */ "foraction ::= INCDEC",
- /*  47 */ "smartytag ::= LDELFOR SPACE statement TO expr attributes RDEL",
- /*  48 */ "smartytag ::= LDELFOR SPACE statement TO expr STEP expr attributes RDEL",
- /*  49 */ "smartytag ::= LDELFOREACH attributes RDEL",
- /*  50 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL",
- /*  51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  52 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL",
- /*  53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  54 */ "smartytag ::= SMARTYBLOCKCHILD",
- /*  55 */ "smartytag ::= LDELSLASH ID RDEL",
- /*  56 */ "smartytag ::= LDELSLASH ID modifierlist RDEL",
- /*  57 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
- /*  58 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL",
- /*  59 */ "attributes ::= attributes attribute",
- /*  60 */ "attributes ::= attribute",
- /*  61 */ "attributes ::=",
- /*  62 */ "attribute ::= SPACE ID EQUAL ID",
- /*  63 */ "attribute ::= SPACE ID EQUAL expr",
- /*  64 */ "attribute ::= SPACE ID EQUAL value",
- /*  65 */ "attribute ::= SPACE ID",
- /*  66 */ "attribute ::= SPACE expr",
- /*  67 */ "attribute ::= SPACE value",
- /*  68 */ "attribute ::= SPACE INTEGER EQUAL expr",
- /*  69 */ "statements ::= statement",
- /*  70 */ "statements ::= statements COMMA statement",
- /*  71 */ "statement ::= DOLLAR varvar EQUAL expr",
- /*  72 */ "statement ::= varindexed EQUAL expr",
- /*  73 */ "statement ::= OPENP statement CLOSEP",
- /*  74 */ "expr ::= value",
- /*  75 */ "expr ::= ternary",
- /*  76 */ "expr ::= DOLLAR ID COLON ID",
- /*  77 */ "expr ::= expr MATH value",
- /*  78 */ "expr ::= expr UNIMATH value",
- /*  79 */ "expr ::= expr ANDSYM value",
- /*  80 */ "expr ::= array",
- /*  81 */ "expr ::= expr modifierlist",
- /*  82 */ "expr ::= expr ifcond expr",
- /*  83 */ "expr ::= expr ISIN array",
- /*  84 */ "expr ::= expr ISIN value",
- /*  85 */ "expr ::= expr lop expr",
- /*  86 */ "expr ::= expr ISDIVBY expr",
- /*  87 */ "expr ::= expr ISNOTDIVBY expr",
- /*  88 */ "expr ::= expr ISEVEN",
- /*  89 */ "expr ::= expr ISNOTEVEN",
- /*  90 */ "expr ::= expr ISEVENBY expr",
- /*  91 */ "expr ::= expr ISNOTEVENBY expr",
- /*  92 */ "expr ::= expr ISODD",
- /*  93 */ "expr ::= expr ISNOTODD",
- /*  94 */ "expr ::= expr ISODDBY expr",
- /*  95 */ "expr ::= expr ISNOTODDBY expr",
- /*  96 */ "expr ::= value INSTANCEOF ID",
- /*  97 */ "expr ::= value INSTANCEOF value",
- /*  98 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
- /*  99 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
- /* 100 */ "value ::= variable",
- /* 101 */ "value ::= UNIMATH value",
- /* 102 */ "value ::= NOT value",
- /* 103 */ "value ::= TYPECAST value",
- /* 104 */ "value ::= variable INCDEC",
- /* 105 */ "value ::= HEX",
- /* 106 */ "value ::= INTEGER",
- /* 107 */ "value ::= INTEGER DOT INTEGER",
- /* 108 */ "value ::= INTEGER DOT",
- /* 109 */ "value ::= DOT INTEGER",
- /* 110 */ "value ::= ID",
- /* 111 */ "value ::= function",
- /* 112 */ "value ::= OPENP expr CLOSEP",
- /* 113 */ "value ::= SINGLEQUOTESTRING",
- /* 114 */ "value ::= doublequoted_with_quotes",
- /* 115 */ "value ::= ID DOUBLECOLON static_class_access",
- /* 116 */ "value ::= varindexed DOUBLECOLON static_class_access",
- /* 117 */ "value ::= smartytag",
- /* 118 */ "value ::= value modifierlist",
- /* 119 */ "variable ::= varindexed",
- /* 120 */ "variable ::= DOLLAR varvar AT ID",
- /* 121 */ "variable ::= object",
- /* 122 */ "variable ::= HATCH ID HATCH",
- /* 123 */ "variable ::= HATCH variable HATCH",
- /* 124 */ "varindexed ::= DOLLAR varvar arrayindex",
- /* 125 */ "arrayindex ::= arrayindex indexdef",
- /* 126 */ "arrayindex ::=",
- /* 127 */ "indexdef ::= DOT DOLLAR varvar",
- /* 128 */ "indexdef ::= DOT DOLLAR varvar AT ID",
- /* 129 */ "indexdef ::= DOT ID",
- /* 130 */ "indexdef ::= DOT INTEGER",
- /* 131 */ "indexdef ::= DOT LDEL expr RDEL",
- /* 132 */ "indexdef ::= OPENB ID CLOSEB",
- /* 133 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
- /* 134 */ "indexdef ::= OPENB expr CLOSEB",
- /* 135 */ "indexdef ::= OPENB CLOSEB",
- /* 136 */ "varvar ::= varvarele",
- /* 137 */ "varvar ::= varvar varvarele",
- /* 138 */ "varvarele ::= ID",
- /* 139 */ "varvarele ::= LDEL expr RDEL",
- /* 140 */ "object ::= varindexed objectchain",
- /* 141 */ "objectchain ::= objectelement",
- /* 142 */ "objectchain ::= objectchain objectelement",
- /* 143 */ "objectelement ::= PTR ID arrayindex",
- /* 144 */ "objectelement ::= PTR DOLLAR varvar arrayindex",
- /* 145 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
- /* 146 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
- /* 147 */ "objectelement ::= PTR method",
- /* 148 */ "function ::= ID OPENP params CLOSEP",
- /* 149 */ "method ::= ID OPENP params CLOSEP",
- /* 150 */ "method ::= DOLLAR ID OPENP params CLOSEP",
- /* 151 */ "params ::= params COMMA expr",
- /* 152 */ "params ::= expr",
- /* 153 */ "params ::=",
- /* 154 */ "modifierlist ::= modifierlist modifier modparameters",
- /* 155 */ "modifierlist ::= modifier modparameters",
- /* 156 */ "modifier ::= VERT AT ID",
- /* 157 */ "modifier ::= VERT ID",
- /* 158 */ "modparameters ::= modparameters modparameter",
- /* 159 */ "modparameters ::=",
- /* 160 */ "modparameter ::= COLON value",
- /* 161 */ "modparameter ::= COLON array",
- /* 162 */ "static_class_access ::= method",
- /* 163 */ "static_class_access ::= method objectchain",
- /* 164 */ "static_class_access ::= ID",
- /* 165 */ "static_class_access ::= DOLLAR ID arrayindex",
- /* 166 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
- /* 167 */ "ifcond ::= EQUALS",
- /* 168 */ "ifcond ::= NOTEQUALS",
- /* 169 */ "ifcond ::= GREATERTHAN",
- /* 170 */ "ifcond ::= LESSTHAN",
- /* 171 */ "ifcond ::= GREATEREQUAL",
- /* 172 */ "ifcond ::= LESSEQUAL",
- /* 173 */ "ifcond ::= IDENTITY",
- /* 174 */ "ifcond ::= NONEIDENTITY",
- /* 175 */ "ifcond ::= MOD",
- /* 176 */ "lop ::= LAND",
- /* 177 */ "lop ::= LOR",
- /* 178 */ "lop ::= LXOR",
- /* 179 */ "array ::= OPENB arrayelements CLOSEB",
- /* 180 */ "arrayelements ::= arrayelement",
- /* 181 */ "arrayelements ::= arrayelements COMMA arrayelement",
- /* 182 */ "arrayelements ::=",
- /* 183 */ "arrayelement ::= value APTR expr",
- /* 184 */ "arrayelement ::= ID APTR expr",
- /* 185 */ "arrayelement ::= expr",
- /* 186 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
- /* 187 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
- /* 188 */ "doublequoted ::= doublequoted doublequotedcontent",
- /* 189 */ "doublequoted ::= doublequotedcontent",
- /* 190 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
- /* 191 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
- /* 192 */ "doublequotedcontent ::= DOLLARID",
- /* 193 */ "doublequotedcontent ::= LDEL variable RDEL",
- /* 194 */ "doublequotedcontent ::= LDEL expr RDEL",
- /* 195 */ "doublequotedcontent ::= smartytag",
- /* 196 */ "doublequotedcontent ::= OTHER",
- /* 197 */ "optspace ::= SPACE",
- /* 198 */ "optspace ::=",
-    );
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
 
-    function tokenName($tokenType)
+    public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
         }
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
+            return $this->yyTokenName[ $tokenType ];
         } else {
-            return "Unknown";
-        }
-    }
-
-    static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
+            return 'Unknown';
         }
     }
 
-    function yy_pop_parser_stack()
+    public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
+                "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
@@ -1511,22 +1869,30 @@ function yy_pop_parser_stack()
         return $yymajor;
     }
 
-    function __destruct()
+    public function __destruct()
     {
-        while ($this->yystack !== Array()) {
+        while ($this->yystack !== array()) {
             $this->yy_pop_parser_stack();
         }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
         }
     }
 
-    function yy_get_expected_tokens($token)
+    public function yy_get_expected_tokens($token)
     {
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        $expected = self::$yyExpectedTokens[ $state ];
+        if (isset($res3[ $state ][ $token ])) {
+            if ($res3[ $state ][ $token ]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -1536,7 +1902,7 @@ function yy_get_expected_tokens($token)
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done++ === 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -1544,17 +1910,25 @@ function yy_get_expected_tokens($token)
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return array_unique($expected);
+                        $this->yystack[ $this->yyidx ]->stateno,
+                        self::$yyRuleInfo[ $yyruleno ][ 0 ]);
+                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+                        if (isset($res4[ $nextstate ][ $token ])) {
+                            if ($res4[ $nextstate ][ $token ]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[ $nextstate ][ $token ] =
+                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
@@ -1562,10 +1936,10 @@ function yy_get_expected_tokens($token)
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
                         continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // the last token was just ignored, we can't accept
@@ -1584,19 +1958,27 @@ function yy_get_expected_tokens($token)
             }
             break;
         } while (true);
-	$this->yyidx = $yyidx;
-	$this->yystack = $stack;
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
         return array_unique($expected);
     }
 
-    function yy_is_expected_token($token)
+    public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        if (isset($res[ $state ][ $token ])) {
+            if ($res[ $state ][ $token ]) {
+                return true;
+            }
+        } else {
+            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -1606,7 +1988,7 @@ function yy_is_expected_token($token)
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done++ === 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -1614,25 +1996,34 @@ function yy_is_expected_token($token)
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
+                        $this->yystack[ $this->yyidx ]->stateno,
+                        self::$yyRuleInfo[ $yyruleno ][ 0 ]);
+                    if (isset($res2[ $nextstate ][ $token ])) {
+                        if ($res2[ $nextstate ][ $token ]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[ $nextstate ][ $token ] =
+                            (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+                             in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
                         continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         if (!$token) {
@@ -1660,1223 +2051,1491 @@ function yy_is_expected_token($token)
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-     
+        $stateno = $this->yystack[ $this->yyidx ]->stateno;
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
+        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
             // no shift actions
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
-        $i = self::$yy_shift_ofst[$stateno];
+        $i = self::$yy_shift_ofst[ $stateno ];
         if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
-        if ($iLookAhead == self::YYNOCODE) {
+        if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
+            self::$yy_lookahead[ $i ] != $iLookAhead) {
             if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+                && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                                               $this->yyTokenName[ $iLookAhead ] . ' => ' .
+                                               $this->yyTokenName[ $iFallback ] . "\n");
                 }
                 return $this->yy_find_shift_action($iFallback);
             }
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         } else {
-            return self::$yy_action[$i];
+            return self::$yy_action[ $i ];
         }
     }
 
-    function yy_find_reduce_action($stateno, $iLookAhead)
+    public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
+        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+            return self::$yy_default[ $stateno ];
         }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
+        $i = self::$yy_reduce_ofst[ $stateno ];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[ $stateno ];
         }
-        if ($iLookAhead == self::YYNOCODE) {
+        if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
+            self::$yy_lookahead[ $i ] != $iLookAhead) {
+            return self::$yy_default[ $stateno ];
         } else {
-            return self::$yy_action[$i];
+            return self::$yy_action[ $i ];
         }
     }
 
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    // line 234 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
         $this->yyidx++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
             $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 73 "smarty_internal_templateparser.y"
-
-    $this->internalError = true;
-    $this->compiler->trigger_template_error("Stack overflow in template parser");
-#line 1731 "smarty_internal_templateparser.php"
+            // line 221 "../smarty/lexer/smarty_internal_templateparser.y"
+            $this->internalError = true;
+            $this->compiler->trigger_template_error('Stack overflow in template parser');
             return;
         }
         $yytos = new TP_yyStackEntry;
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
                 $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[ $this->yystack[ $i ]->major ]);
             }
-            fwrite(self::$yyTraceFILE,"\n");
+            fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 79, 'rhs' => 1 ),
-  array( 'lhs' => 80, 'rhs' => 1 ),
-  array( 'lhs' => 80, 'rhs' => 2 ),
-  array( 'lhs' => 80, 'rhs' => 0 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 2 ),
-  array( 'lhs' => 83, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 2 ),
-  array( 'lhs' => 84, 'rhs' => 0 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 82, 'rhs' => 3 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 5 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 6 ),
-  array( 'lhs' => 82, 'rhs' => 6 ),
-  array( 'lhs' => 82, 'rhs' => 7 ),
-  array( 'lhs' => 82, 'rhs' => 6 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 3 ),
-  array( 'lhs' => 82, 'rhs' => 6 ),
-  array( 'lhs' => 82, 'rhs' => 5 ),
-  array( 'lhs' => 82, 'rhs' => 7 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 5 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 5 ),
-  array( 'lhs' => 82, 'rhs' => 13 ),
-  array( 'lhs' => 96, 'rhs' => 2 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 82, 'rhs' => 7 ),
-  array( 'lhs' => 82, 'rhs' => 9 ),
-  array( 'lhs' => 82, 'rhs' => 3 ),
-  array( 'lhs' => 82, 'rhs' => 8 ),
-  array( 'lhs' => 82, 'rhs' => 11 ),
-  array( 'lhs' => 82, 'rhs' => 8 ),
-  array( 'lhs' => 82, 'rhs' => 11 ),
-  array( 'lhs' => 82, 'rhs' => 1 ),
-  array( 'lhs' => 82, 'rhs' => 3 ),
-  array( 'lhs' => 82, 'rhs' => 4 ),
-  array( 'lhs' => 82, 'rhs' => 5 ),
-  array( 'lhs' => 82, 'rhs' => 6 ),
-  array( 'lhs' => 87, 'rhs' => 2 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 0 ),
-  array( 'lhs' => 97, 'rhs' => 4 ),
-  array( 'lhs' => 97, 'rhs' => 4 ),
-  array( 'lhs' => 97, 'rhs' => 4 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 4 ),
-  array( 'lhs' => 93, 'rhs' => 1 ),
-  array( 'lhs' => 93, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 4 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 98, 'rhs' => 8 ),
-  array( 'lhs' => 98, 'rhs' => 7 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 3 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 3 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 3 ),
-  array( 'lhs' => 86, 'rhs' => 3 ),
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 4 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 3 ),
-  array( 'lhs' => 88, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 106, 'rhs' => 2 ),
-  array( 'lhs' => 106, 'rhs' => 0 ),
-  array( 'lhs' => 107, 'rhs' => 3 ),
-  array( 'lhs' => 107, 'rhs' => 5 ),
-  array( 'lhs' => 107, 'rhs' => 2 ),
-  array( 'lhs' => 107, 'rhs' => 2 ),
-  array( 'lhs' => 107, 'rhs' => 4 ),
-  array( 'lhs' => 107, 'rhs' => 3 ),
-  array( 'lhs' => 107, 'rhs' => 5 ),
-  array( 'lhs' => 107, 'rhs' => 3 ),
-  array( 'lhs' => 107, 'rhs' => 2 ),
-  array( 'lhs' => 95, 'rhs' => 1 ),
-  array( 'lhs' => 95, 'rhs' => 2 ),
-  array( 'lhs' => 108, 'rhs' => 1 ),
-  array( 'lhs' => 108, 'rhs' => 3 ),
-  array( 'lhs' => 105, 'rhs' => 2 ),
-  array( 'lhs' => 109, 'rhs' => 1 ),
-  array( 'lhs' => 109, 'rhs' => 2 ),
-  array( 'lhs' => 110, 'rhs' => 3 ),
-  array( 'lhs' => 110, 'rhs' => 4 ),
-  array( 'lhs' => 110, 'rhs' => 5 ),
-  array( 'lhs' => 110, 'rhs' => 6 ),
-  array( 'lhs' => 110, 'rhs' => 2 ),
-  array( 'lhs' => 102, 'rhs' => 4 ),
-  array( 'lhs' => 111, 'rhs' => 4 ),
-  array( 'lhs' => 111, 'rhs' => 5 ),
-  array( 'lhs' => 112, 'rhs' => 3 ),
-  array( 'lhs' => 112, 'rhs' => 1 ),
-  array( 'lhs' => 112, 'rhs' => 0 ),
-  array( 'lhs' => 90, 'rhs' => 3 ),
-  array( 'lhs' => 90, 'rhs' => 2 ),
-  array( 'lhs' => 113, 'rhs' => 3 ),
-  array( 'lhs' => 113, 'rhs' => 2 ),
-  array( 'lhs' => 114, 'rhs' => 2 ),
-  array( 'lhs' => 114, 'rhs' => 0 ),
-  array( 'lhs' => 115, 'rhs' => 2 ),
-  array( 'lhs' => 115, 'rhs' => 2 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 2 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 3 ),
-  array( 'lhs' => 104, 'rhs' => 4 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 101, 'rhs' => 1 ),
-  array( 'lhs' => 101, 'rhs' => 1 ),
-  array( 'lhs' => 101, 'rhs' => 1 ),
-  array( 'lhs' => 99, 'rhs' => 3 ),
-  array( 'lhs' => 116, 'rhs' => 1 ),
-  array( 'lhs' => 116, 'rhs' => 3 ),
-  array( 'lhs' => 116, 'rhs' => 0 ),
-  array( 'lhs' => 117, 'rhs' => 3 ),
-  array( 'lhs' => 117, 'rhs' => 3 ),
-  array( 'lhs' => 117, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 2 ),
-  array( 'lhs' => 103, 'rhs' => 3 ),
-  array( 'lhs' => 118, 'rhs' => 2 ),
-  array( 'lhs' => 118, 'rhs' => 1 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 1 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 1 ),
-  array( 'lhs' => 119, 'rhs' => 1 ),
-  array( 'lhs' => 94, 'rhs' => 1 ),
-  array( 'lhs' => 94, 'rhs' => 0 ),
-    );
-
-    static public $yyReduceMap = array(
-        0 => 0,
-        1 => 1,
-        2 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        18 => 15,
-        16 => 16,
-        17 => 17,
-        101 => 17,
-        103 => 17,
-        104 => 17,
-        163 => 17,
-        19 => 19,
-        20 => 19,
-        74 => 19,
-        75 => 19,
-        100 => 19,
-        105 => 19,
-        106 => 19,
-        111 => 19,
-        113 => 19,
-        114 => 19,
-        121 => 19,
-        162 => 19,
-        180 => 19,
-        21 => 21,
-        22 => 21,
-        23 => 23,
-        24 => 24,
-        25 => 25,
-        26 => 26,
-        27 => 27,
-        28 => 27,
-        30 => 27,
-        29 => 29,
-        31 => 31,
-        32 => 31,
-        33 => 33,
-        34 => 34,
-        35 => 35,
-        36 => 36,
-        37 => 37,
-        38 => 38,
-        39 => 39,
-        40 => 40,
-        42 => 40,
-        41 => 41,
-        43 => 41,
-        44 => 44,
-        45 => 45,
-        46 => 46,
-        66 => 46,
-        67 => 46,
-        164 => 46,
-        185 => 46,
-        47 => 47,
-        48 => 48,
-        49 => 49,
-        50 => 50,
-        51 => 51,
-        52 => 52,
-        53 => 53,
-        54 => 54,
-        55 => 55,
-        56 => 56,
-        57 => 57,
-        58 => 58,
-        59 => 59,
-        60 => 60,
-        69 => 60,
-        152 => 60,
-        156 => 60,
-        61 => 61,
-        153 => 61,
-        62 => 62,
-        63 => 63,
-        64 => 63,
-        65 => 65,
-        68 => 68,
-        70 => 70,
-        71 => 71,
-        72 => 71,
-        73 => 73,
-        76 => 76,
-        77 => 77,
-        78 => 77,
-        79 => 77,
-        80 => 80,
-        136 => 80,
-        197 => 80,
-        81 => 81,
-        118 => 81,
-        82 => 82,
-        85 => 82,
-        96 => 82,
-        83 => 83,
-        84 => 84,
-        86 => 86,
-        87 => 87,
-        88 => 88,
-        93 => 88,
-        89 => 89,
-        92 => 89,
-        90 => 90,
-        95 => 90,
-        91 => 91,
-        94 => 91,
-        97 => 97,
-        98 => 98,
-        99 => 99,
-        102 => 102,
-        107 => 107,
-        108 => 108,
-        109 => 109,
-        110 => 110,
-        112 => 112,
-        115 => 115,
-        116 => 116,
-        117 => 117,
-        119 => 119,
-        120 => 120,
-        122 => 122,
-        123 => 123,
-        124 => 124,
-        125 => 125,
-        126 => 126,
-        127 => 127,
-        128 => 128,
-        129 => 129,
-        130 => 130,
-        131 => 131,
-        134 => 131,
-        132 => 132,
-        133 => 133,
-        135 => 135,
-        137 => 137,
-        138 => 138,
-        139 => 139,
-        140 => 140,
-        141 => 141,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        148 => 148,
-        149 => 149,
-        150 => 150,
-        151 => 151,
-        154 => 154,
-        155 => 155,
-        157 => 157,
-        158 => 158,
-        159 => 159,
-        160 => 160,
-        161 => 160,
-        165 => 165,
-        166 => 166,
-        167 => 167,
-        168 => 168,
-        169 => 169,
-        170 => 170,
-        171 => 171,
-        172 => 172,
-        173 => 173,
-        174 => 174,
-        175 => 175,
-        176 => 176,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        181 => 181,
-        182 => 182,
-        183 => 183,
-        184 => 184,
-        186 => 186,
-        187 => 187,
-        188 => 188,
-        189 => 189,
-        190 => 190,
-        191 => 190,
-        193 => 190,
-        192 => 192,
-        194 => 194,
-        195 => 195,
-        196 => 196,
-        198 => 198,
-    );
-#line 84 "smarty_internal_templateparser.y"
-    function yy_r0(){ $this->_retvalue = $this->root_buffer->to_smarty_php();     }
-#line 2155 "smarty_internal_templateparser.php"
-#line 90 "smarty_internal_templateparser.y"
-    function yy_r1(){ $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);     }
-#line 2158 "smarty_internal_templateparser.php"
-#line 102 "smarty_internal_templateparser.y"
-    function yy_r4(){
-                                          if ($this->compiler->has_code) {
-                                            $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
-                                            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true));
-                                         } else { 
-                                           $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-                                         }  
-                                         $this->compiler->has_variable_string = false;
-                                         $this->block_nesting_level = count($this->compiler->_tag_stack);
-                                            }
-#line 2170 "smarty_internal_templateparser.php"
-#line 114 "smarty_internal_templateparser.y"
-    function yy_r5(){ $this->_retvalue = new _smarty_tag($this, '');    }
-#line 2173 "smarty_internal_templateparser.php"
-#line 117 "smarty_internal_templateparser.y"
-    function yy_r6(){ $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 2176 "smarty_internal_templateparser.php"
-#line 120 "smarty_internal_templateparser.y"
-    function yy_r7(){
-                                      if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-					                             $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                                       $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
-                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-                                       $this->_retvalue = new _smarty_text($this, '');
-                                      }
-                                         }
-#line 2189 "smarty_internal_templateparser.php"
-#line 132 "smarty_internal_templateparser.y"
-    function yy_r8(){if ($this->is_xml) {
-                                       $this->compiler->tag_nocache = true; 
-                                       $this->is_xml = true; 
-                                       $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>", $this->compiler, true));
-                                      }elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-					                             $this->_retvalue = new _smarty_text($this, '?<?php ?>>');
-                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
-                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                                       $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
-                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-                                       $this->_retvalue = new _smarty_text($this, '');
-                                      }
-                                         }
-#line 2205 "smarty_internal_templateparser.php"
-#line 148 "smarty_internal_templateparser.y"
-    function yy_r9(){
-                                      if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-					                             $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                                        if ($this->asp_tags) {
-                                          $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
-                                        } else {
-                                         $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-                                        }
-                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-                                        if ($this->asp_tags) {
-                                         $this->_retvalue = new _smarty_text($this, '');
-                                        } else {
-                                         $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-                                        }
-                                      }
-                                        }
-#line 2226 "smarty_internal_templateparser.php"
-#line 169 "smarty_internal_templateparser.y"
-    function yy_r10(){
-                                      if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-					                             $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-                                      } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-                                       $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
-                                      }elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                                        if ($this->asp_tags) {
-                                          $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
-                                        } else {
-                                         $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-                                        }
-                                      }elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-                                        if ($this->asp_tags) {
-                                         $this->_retvalue = new _smarty_text($this, '');
-                                        } else {
-                                         $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-                                        }
-                                      }
-                                        }
-#line 2247 "smarty_internal_templateparser.php"
-#line 189 "smarty_internal_templateparser.y"
-    function yy_r11(){if ($this->lex->strip) {
-                                       $this->_retvalue = new _smarty_text($this, preg_replace('![\$this->yystack[$this->yyidx + 0]->minor ]*[\r\n]+[\$this->yystack[$this->yyidx + 0]->minor ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));	
-                                     } else {
-                                       $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));	
-                                     }
-                                        }
-#line 2255 "smarty_internal_templateparser.php"
-#line 197 "smarty_internal_templateparser.y"
-    function yy_r12(){ $this->compiler->tag_nocache = true; $this->is_xml = true; $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));    }
-#line 2258 "smarty_internal_templateparser.php"
-#line 200 "smarty_internal_templateparser.y"
-    function yy_r13(){if ($this->lex->strip) {
-                                       $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));	
-                                     } else {
-                                       $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);	
-                                     }
-                                        }
-#line 2266 "smarty_internal_templateparser.php"
-#line 206 "smarty_internal_templateparser.y"
-    function yy_r14(){
-                                     $this->_retvalue = new _smarty_linebreak($this, $this->yystack[$this->yyidx + 0]->minor);
-                                       }
-#line 2271 "smarty_internal_templateparser.php"
-#line 211 "smarty_internal_templateparser.y"
-    function yy_r15(){ $this->_retvalue = '';     }
-#line 2274 "smarty_internal_templateparser.php"
-#line 212 "smarty_internal_templateparser.y"
-    function yy_r16(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
-#line 2277 "smarty_internal_templateparser.php"
-#line 214 "smarty_internal_templateparser.y"
-    function yy_r17(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2280 "smarty_internal_templateparser.php"
-#line 217 "smarty_internal_templateparser.y"
-    function yy_r19(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2283 "smarty_internal_templateparser.php"
-#line 219 "smarty_internal_templateparser.y"
-    function yy_r21(){ $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);     }
-#line 2286 "smarty_internal_templateparser.php"
-#line 221 "smarty_internal_templateparser.y"
-    function yy_r23(){ $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);     }
-#line 2289 "smarty_internal_templateparser.php"
-#line 222 "smarty_internal_templateparser.y"
-    function yy_r24(){ $this->_retvalue = '<<?php ?>%';     }
-#line 2292 "smarty_internal_templateparser.php"
-#line 223 "smarty_internal_templateparser.y"
-    function yy_r25(){ $this->_retvalue = '%<?php ?>>';     }
-#line 2295 "smarty_internal_templateparser.php"
-#line 231 "smarty_internal_templateparser.y"
-    function yy_r26(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2298 "smarty_internal_templateparser.php"
-#line 232 "smarty_internal_templateparser.y"
-    function yy_r27(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor));    }
-#line 2301 "smarty_internal_templateparser.php"
-#line 234 "smarty_internal_templateparser.y"
-    function yy_r29(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));    }
-#line 2304 "smarty_internal_templateparser.php"
-#line 242 "smarty_internal_templateparser.y"
-    function yy_r31(){ $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'")));    }
-#line 2307 "smarty_internal_templateparser.php"
-#line 244 "smarty_internal_templateparser.y"
-    function yy_r33(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2310 "smarty_internal_templateparser.php"
-#line 245 "smarty_internal_templateparser.y"
-    function yy_r34(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index']));    }
-#line 2313 "smarty_internal_templateparser.php"
-#line 247 "smarty_internal_templateparser.y"
-    function yy_r35(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);    }
-#line 2316 "smarty_internal_templateparser.php"
-#line 248 "smarty_internal_templateparser.y"
-    function yy_r36(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());    }
-#line 2319 "smarty_internal_templateparser.php"
-#line 250 "smarty_internal_templateparser.y"
-    function yy_r37(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor));    }
-#line 2322 "smarty_internal_templateparser.php"
-#line 252 "smarty_internal_templateparser.y"
-    function yy_r38(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
-                                                                                    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-                                                                                     }
-#line 2327 "smarty_internal_templateparser.php"
-#line 256 "smarty_internal_templateparser.y"
-    function yy_r39(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo ';
-                                                                                               $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-                                                                                                }
-#line 2332 "smarty_internal_templateparser.php"
-#line 260 "smarty_internal_templateparser.y"
-    function yy_r40(){ $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length)); $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2335 "smarty_internal_templateparser.php"
-#line 261 "smarty_internal_templateparser.y"
-    function yy_r41(){ $tag = trim(substr($this->yystack[$this->yyidx + -4]->minor,$this->lex->ldel_length)); $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor));    }
-#line 2338 "smarty_internal_templateparser.php"
-#line 265 "smarty_internal_templateparser.y"
-    function yy_r44(){
-                                                             $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1);    }
-#line 2342 "smarty_internal_templateparser.php"
-#line 268 "smarty_internal_templateparser.y"
-    function yy_r45(){ $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2345 "smarty_internal_templateparser.php"
-#line 269 "smarty_internal_templateparser.y"
-    function yy_r46(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2348 "smarty_internal_templateparser.php"
-#line 270 "smarty_internal_templateparser.y"
-    function yy_r47(){ $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0);    }
-#line 2351 "smarty_internal_templateparser.php"
-#line 271 "smarty_internal_templateparser.y"
-    function yy_r48(){ $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0);    }
-#line 2354 "smarty_internal_templateparser.php"
-#line 273 "smarty_internal_templateparser.y"
-    function yy_r49(){ $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor);    }
-#line 2357 "smarty_internal_templateparser.php"
-#line 275 "smarty_internal_templateparser.y"
-    function yy_r50(){
-                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));    }
-#line 2361 "smarty_internal_templateparser.php"
-#line 277 "smarty_internal_templateparser.y"
-    function yy_r51(){
-                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));    }
-#line 2365 "smarty_internal_templateparser.php"
-#line 279 "smarty_internal_templateparser.y"
-    function yy_r52(){ 
-                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));    }
-#line 2369 "smarty_internal_templateparser.php"
-#line 281 "smarty_internal_templateparser.y"
-    function yy_r53(){ 
-                                                            $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));    }
-#line 2373 "smarty_internal_templateparser.php"
-#line 285 "smarty_internal_templateparser.y"
-    function yy_r54(){ $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);    }
-#line 2376 "smarty_internal_templateparser.php"
-#line 289 "smarty_internal_templateparser.y"
-    function yy_r55(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());    }
-#line 2379 "smarty_internal_templateparser.php"
-#line 291 "smarty_internal_templateparser.y"
-    function yy_r56(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-                                                                                          }
-#line 2383 "smarty_internal_templateparser.php"
-#line 294 "smarty_internal_templateparser.y"
-    function yy_r57(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2386 "smarty_internal_templateparser.php"
-#line 295 "smarty_internal_templateparser.y"
-    function yy_r58(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2389 "smarty_internal_templateparser.php"
-#line 301 "smarty_internal_templateparser.y"
-    function yy_r59(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2392 "smarty_internal_templateparser.php"
-#line 303 "smarty_internal_templateparser.y"
-    function yy_r60(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
-#line 2395 "smarty_internal_templateparser.php"
-#line 305 "smarty_internal_templateparser.y"
-    function yy_r61(){ $this->_retvalue = array();    }
-#line 2398 "smarty_internal_templateparser.php"
-#line 308 "smarty_internal_templateparser.y"
-    function yy_r62(){ if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true');
-                                                 } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false');
-                                                 } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null');
-                                                 } else
-                                                  $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");    }
-#line 2408 "smarty_internal_templateparser.php"
-#line 316 "smarty_internal_templateparser.y"
-    function yy_r63(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2411 "smarty_internal_templateparser.php"
-#line 318 "smarty_internal_templateparser.y"
-    function yy_r65(){ $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";    }
-#line 2414 "smarty_internal_templateparser.php"
-#line 321 "smarty_internal_templateparser.y"
-    function yy_r68(){$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2417 "smarty_internal_templateparser.php"
-#line 328 "smarty_internal_templateparser.y"
-    function yy_r70(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;    }
-#line 2420 "smarty_internal_templateparser.php"
-#line 330 "smarty_internal_templateparser.y"
-    function yy_r71(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2423 "smarty_internal_templateparser.php"
-#line 332 "smarty_internal_templateparser.y"
-    function yy_r73(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;    }
-#line 2426 "smarty_internal_templateparser.php"
-#line 343 "smarty_internal_templateparser.y"
-    function yy_r76(){$this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';    }
-#line 2429 "smarty_internal_templateparser.php"
-#line 345 "smarty_internal_templateparser.y"
-    function yy_r77(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2432 "smarty_internal_templateparser.php"
-#line 351 "smarty_internal_templateparser.y"
-    function yy_r80(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2435 "smarty_internal_templateparser.php"
-#line 354 "smarty_internal_templateparser.y"
-    function yy_r81(){  $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));     }
-#line 2438 "smarty_internal_templateparser.php"
-#line 358 "smarty_internal_templateparser.y"
-    function yy_r82(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2441 "smarty_internal_templateparser.php"
-#line 359 "smarty_internal_templateparser.y"
-    function yy_r83(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2444 "smarty_internal_templateparser.php"
-#line 360 "smarty_internal_templateparser.y"
-    function yy_r84(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2447 "smarty_internal_templateparser.php"
-#line 362 "smarty_internal_templateparser.y"
-    function yy_r86(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2450 "smarty_internal_templateparser.php"
-#line 363 "smarty_internal_templateparser.y"
-    function yy_r87(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2453 "smarty_internal_templateparser.php"
-#line 364 "smarty_internal_templateparser.y"
-    function yy_r88(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2456 "smarty_internal_templateparser.php"
-#line 365 "smarty_internal_templateparser.y"
-    function yy_r89(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2459 "smarty_internal_templateparser.php"
-#line 366 "smarty_internal_templateparser.y"
-    function yy_r90(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2462 "smarty_internal_templateparser.php"
-#line 367 "smarty_internal_templateparser.y"
-    function yy_r91(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2465 "smarty_internal_templateparser.php"
-#line 373 "smarty_internal_templateparser.y"
-    function yy_r97(){$this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;    }
-#line 2468 "smarty_internal_templateparser.php"
-#line 379 "smarty_internal_templateparser.y"
-    function yy_r98(){ $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? $_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'\')->value : '.$this->yystack[$this->yyidx + 0]->minor;  $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + -2]->minor', null, true, false)->nocache;    }
-#line 2471 "smarty_internal_templateparser.php"
-#line 380 "smarty_internal_templateparser.y"
-    function yy_r99(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2474 "smarty_internal_templateparser.php"
-#line 387 "smarty_internal_templateparser.y"
-    function yy_r102(){ $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2477 "smarty_internal_templateparser.php"
-#line 393 "smarty_internal_templateparser.y"
-    function yy_r107(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2480 "smarty_internal_templateparser.php"
-#line 394 "smarty_internal_templateparser.y"
-    function yy_r108(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';     }
-#line 2483 "smarty_internal_templateparser.php"
-#line 395 "smarty_internal_templateparser.y"
-    function yy_r109(){ $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2486 "smarty_internal_templateparser.php"
-#line 397 "smarty_internal_templateparser.y"
-    function yy_r110(){ if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-                                $this->_retvalue = 'true';
-                               } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-                                $this->_retvalue = 'false';
-                               } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-                                $this->_retvalue = 'null';
-                               } else
-                               $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";     }
-#line 2496 "smarty_internal_templateparser.php"
-#line 408 "smarty_internal_templateparser.y"
-    function yy_r112(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";     }
-#line 2499 "smarty_internal_templateparser.php"
-#line 414 "smarty_internal_templateparser.y"
-    function yy_r115(){if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
-                      																				   if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
-                                                                  $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor;
-                      																				   } else {
-                                                                  $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;
-                                                                 } 
-                                                                } else {
-                                                                 $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
-                                                                }
-                                                                   }
-#line 2511 "smarty_internal_templateparser.php"
-#line 424 "smarty_internal_templateparser.y"
-    function yy_r116(){ if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;} else {
-                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor['var'],"'"), null, true, false)->nocache;}    }
-#line 2515 "smarty_internal_templateparser.php"
-#line 427 "smarty_internal_templateparser.y"
-    function yy_r117(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number;     }
-#line 2518 "smarty_internal_templateparser.php"
-#line 437 "smarty_internal_templateparser.y"
-    function yy_r119(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
-																				$smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
-																				$this->_retvalue = $smarty_var;
-                                      } else {
-                                      	// used for array reset,next,prev,end,current 
-                                      	$this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-                                      	$this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-                                      	if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + 0]->minor['var']])) {
-                                          $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + 0]->minor['var'] .']->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-                                      	} else {
-                                          $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor['var'] .')->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-                                      	}
-                                      	$this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor['var'],"'"), null, true, false)->nocache;
-                                     }
-                                        }
-#line 2535 "smarty_internal_templateparser.php"
-#line 453 "smarty_internal_templateparser.y"
-    function yy_r120(){if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + -2]->minor])) {
-                                                  $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
-                                                 } else {
-                                                  $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor;
-                                                 }
-                                                  $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
-#line 2543 "smarty_internal_templateparser.php"
-#line 462 "smarty_internal_templateparser.y"
-    function yy_r122(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';    }
-#line 2546 "smarty_internal_templateparser.php"
-#line 463 "smarty_internal_templateparser.y"
-    function yy_r123(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';    }
-#line 2549 "smarty_internal_templateparser.php"
-#line 466 "smarty_internal_templateparser.y"
-    function yy_r124(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2552 "smarty_internal_templateparser.php"
-#line 472 "smarty_internal_templateparser.y"
-    function yy_r125(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2555 "smarty_internal_templateparser.php"
-#line 474 "smarty_internal_templateparser.y"
-    function yy_r126(){return;    }
-#line 2558 "smarty_internal_templateparser.php"
-#line 478 "smarty_internal_templateparser.y"
-    function yy_r127(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor .')->value]'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + 0]->minor', null, true, false)->nocache;    }
-#line 2561 "smarty_internal_templateparser.php"
-#line 479 "smarty_internal_templateparser.y"
-    function yy_r128(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor.']'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
-#line 2564 "smarty_internal_templateparser.php"
-#line 480 "smarty_internal_templateparser.y"
-    function yy_r129(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";    }
-#line 2567 "smarty_internal_templateparser.php"
-#line 481 "smarty_internal_templateparser.y"
-    function yy_r130(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";    }
-#line 2570 "smarty_internal_templateparser.php"
-#line 482 "smarty_internal_templateparser.y"
-    function yy_r131(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";    }
-#line 2573 "smarty_internal_templateparser.php"
-#line 484 "smarty_internal_templateparser.y"
-    function yy_r132(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';    }
-#line 2576 "smarty_internal_templateparser.php"
-#line 485 "smarty_internal_templateparser.y"
-    function yy_r133(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';    }
-#line 2579 "smarty_internal_templateparser.php"
-#line 489 "smarty_internal_templateparser.y"
-    function yy_r135(){$this->_retvalue = '[]';    }
-#line 2582 "smarty_internal_templateparser.php"
-#line 497 "smarty_internal_templateparser.y"
-    function yy_r137(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2585 "smarty_internal_templateparser.php"
-#line 499 "smarty_internal_templateparser.y"
-    function yy_r138(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
-#line 2588 "smarty_internal_templateparser.php"
-#line 501 "smarty_internal_templateparser.y"
-    function yy_r139(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2591 "smarty_internal_templateparser.php"
-#line 506 "smarty_internal_templateparser.y"
-    function yy_r140(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;} else {
-                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"), null, true, false)->nocache;}    }
-#line 2595 "smarty_internal_templateparser.php"
-#line 509 "smarty_internal_templateparser.y"
-    function yy_r141(){$this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2598 "smarty_internal_templateparser.php"
-#line 511 "smarty_internal_templateparser.y"
-    function yy_r142(){$this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2601 "smarty_internal_templateparser.php"
-#line 513 "smarty_internal_templateparser.y"
-    function yy_r143(){if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
-                                                      $this->compiler->trigger_template_error (self::Err1);
-																									   }
-                                                     $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-                                                         }
-#line 2608 "smarty_internal_templateparser.php"
-#line 518 "smarty_internal_templateparser.y"
-    function yy_r144(){if ($this->security) {
-                                                                 $this->compiler->trigger_template_error (self::Err2);
-																															 }
-                                                               $this->_retvalue = '->{$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor .')->value'.$this->yystack[$this->yyidx + 0]->minor.'}'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor,"'"), null, true, false)->nocache;
-                                                                   }
-#line 2615 "smarty_internal_templateparser.php"
-#line 523 "smarty_internal_templateparser.y"
-    function yy_r145(){if ($this->security) {
-                                                                 $this->compiler->trigger_template_error (self::Err2);
-																															   }
-                     																						 $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-                     																						    }
-#line 2622 "smarty_internal_templateparser.php"
-#line 528 "smarty_internal_templateparser.y"
-    function yy_r146(){if ($this->security) {
-                                                                         $this->compiler->trigger_template_error (self::Err2);
-																															         }
-                                                                       $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-                                                                          }
-#line 2629 "smarty_internal_templateparser.php"
-#line 534 "smarty_internal_templateparser.y"
-    function yy_r147(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2632 "smarty_internal_templateparser.php"
-#line 540 "smarty_internal_templateparser.y"
-    function yy_r148(){if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
-																					            if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
-																					                $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
-																					                if ($func_name == 'isset') {
-																					                  if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
-																					                   $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
-																					                  }
-																					                  $isset_par=str_replace("')->value","',null,true,false)->value",implode(',',$this->yystack[$this->yyidx + -1]->minor));
-																					                  $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
-																						              } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
-																					                  if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
-																					                   $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
-																					                  }
-																					                  if ($func_name == 'empty') {
-																					                  	$this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
-																					                  } else {
-																					                  	$this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
-																					                  }
-																					                } else {
-																					                  $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
-																					                }
-																					            } else {
-                                                       $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
-                                                      }
-                                                     }
-                                                        }
-#line 2660 "smarty_internal_templateparser.php"
-#line 570 "smarty_internal_templateparser.y"
-    function yy_r149(){if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
-                                                      $this->compiler->trigger_template_error (self::Err1);
-																									 }
-                                                   $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
-                                                      }
-#line 2667 "smarty_internal_templateparser.php"
-#line 575 "smarty_internal_templateparser.y"
-    function yy_r150(){if ($this->security) {
-                                                              $this->compiler->trigger_template_error (self::Err2);
-																													 }
-                                                           $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
-                                                              }
-#line 2674 "smarty_internal_templateparser.php"
-#line 583 "smarty_internal_templateparser.y"
-    function yy_r151(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));    }
-#line 2677 "smarty_internal_templateparser.php"
-#line 592 "smarty_internal_templateparser.y"
-    function yy_r154(){$this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));    }
-#line 2680 "smarty_internal_templateparser.php"
-#line 593 "smarty_internal_templateparser.y"
-    function yy_r155(){$this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));    }
-#line 2683 "smarty_internal_templateparser.php"
-#line 596 "smarty_internal_templateparser.y"
-    function yy_r157(){ $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);    }
-#line 2686 "smarty_internal_templateparser.php"
-#line 601 "smarty_internal_templateparser.y"
-    function yy_r158(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2689 "smarty_internal_templateparser.php"
-#line 603 "smarty_internal_templateparser.y"
-    function yy_r159(){$this->_retvalue = array();    }
-#line 2692 "smarty_internal_templateparser.php"
-#line 605 "smarty_internal_templateparser.y"
-    function yy_r160(){$this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
-#line 2695 "smarty_internal_templateparser.php"
-#line 615 "smarty_internal_templateparser.y"
-    function yy_r165(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2698 "smarty_internal_templateparser.php"
-#line 617 "smarty_internal_templateparser.y"
-    function yy_r166(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2701 "smarty_internal_templateparser.php"
-#line 626 "smarty_internal_templateparser.y"
-    function yy_r167(){$this->_retvalue = '==';    }
-#line 2704 "smarty_internal_templateparser.php"
-#line 627 "smarty_internal_templateparser.y"
-    function yy_r168(){$this->_retvalue = '!=';    }
-#line 2707 "smarty_internal_templateparser.php"
-#line 628 "smarty_internal_templateparser.y"
-    function yy_r169(){$this->_retvalue = '>';    }
-#line 2710 "smarty_internal_templateparser.php"
-#line 629 "smarty_internal_templateparser.y"
-    function yy_r170(){$this->_retvalue = '<';    }
-#line 2713 "smarty_internal_templateparser.php"
-#line 630 "smarty_internal_templateparser.y"
-    function yy_r171(){$this->_retvalue = '>=';    }
-#line 2716 "smarty_internal_templateparser.php"
-#line 631 "smarty_internal_templateparser.y"
-    function yy_r172(){$this->_retvalue = '<=';    }
-#line 2719 "smarty_internal_templateparser.php"
-#line 632 "smarty_internal_templateparser.y"
-    function yy_r173(){$this->_retvalue = '===';    }
-#line 2722 "smarty_internal_templateparser.php"
-#line 633 "smarty_internal_templateparser.y"
-    function yy_r174(){$this->_retvalue = '!==';    }
-#line 2725 "smarty_internal_templateparser.php"
-#line 634 "smarty_internal_templateparser.y"
-    function yy_r175(){$this->_retvalue = '%';    }
-#line 2728 "smarty_internal_templateparser.php"
-#line 636 "smarty_internal_templateparser.y"
-    function yy_r176(){$this->_retvalue = '&&';    }
-#line 2731 "smarty_internal_templateparser.php"
-#line 637 "smarty_internal_templateparser.y"
-    function yy_r177(){$this->_retvalue = '||';    }
-#line 2734 "smarty_internal_templateparser.php"
-#line 638 "smarty_internal_templateparser.y"
-    function yy_r178(){$this->_retvalue = ' XOR ';    }
-#line 2737 "smarty_internal_templateparser.php"
-#line 643 "smarty_internal_templateparser.y"
-    function yy_r179(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2740 "smarty_internal_templateparser.php"
-#line 645 "smarty_internal_templateparser.y"
-    function yy_r181(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2743 "smarty_internal_templateparser.php"
-#line 646 "smarty_internal_templateparser.y"
-    function yy_r182(){ return;     }
-#line 2746 "smarty_internal_templateparser.php"
-#line 647 "smarty_internal_templateparser.y"
-    function yy_r183(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2749 "smarty_internal_templateparser.php"
-#line 648 "smarty_internal_templateparser.y"
-    function yy_r184(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2752 "smarty_internal_templateparser.php"
-#line 655 "smarty_internal_templateparser.y"
-    function yy_r186(){ $this->_retvalue = "''";     }
-#line 2755 "smarty_internal_templateparser.php"
-#line 656 "smarty_internal_templateparser.y"
-    function yy_r187(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();     }
-#line 2758 "smarty_internal_templateparser.php"
-#line 658 "smarty_internal_templateparser.y"
-    function yy_r188(){ $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
-#line 2761 "smarty_internal_templateparser.php"
-#line 659 "smarty_internal_templateparser.y"
-    function yy_r189(){ $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 2764 "smarty_internal_templateparser.php"
-#line 661 "smarty_internal_templateparser.y"
-    function yy_r190(){ $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor);     }
-#line 2767 "smarty_internal_templateparser.php"
-#line 663 "smarty_internal_templateparser.y"
-    function yy_r192(){if (isset($this->compiler->local_var["'".substr($this->yystack[$this->yyidx + 0]->minor,1)."'"])) {
-                                                       $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
-                                                      } else {
-                                                       $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->value');
-                                                      }
-                                                      $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"), null, true, false)->nocache;
-      }
-#line 2776 "smarty_internal_templateparser.php"
-#line 671 "smarty_internal_templateparser.y"
-    function yy_r194(){ $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')');     }
-#line 2779 "smarty_internal_templateparser.php"
-#line 672 "smarty_internal_templateparser.y"
-    function yy_r195(){
-   $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-      }
-#line 2784 "smarty_internal_templateparser.php"
-#line 675 "smarty_internal_templateparser.y"
-    function yy_r196(){ $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 2787 "smarty_internal_templateparser.php"
-#line 682 "smarty_internal_templateparser.y"
-    function yy_r198(){$this->_retvalue = '';    }
-#line 2790 "smarty_internal_templateparser.php"
-
-    private $_retvalue;
-
-    function yy_reduce($yyruleno)
-    {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0 
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
-        }
+    // line 242 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r0()
+    {
+        $this->root_buffer->prepend_array($this, $this->template_prefix);
+        $this->root_buffer->append_array($this, $this->template_postfix);
+        $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    }
 
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
-        $this->yyidx -= $yysize;
-        for($i = $yysize; $i; $i--) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
-                $x = new TP_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+    // line 251 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r1()
+    {
+        $code =
+            $this->compiler->compileTag('private_php',
+                array(array('code' => $this->yystack[ $this->yyidx + 0 ]->minor), array('type' => $this->lex->phpType)),
+                array());
+        if ($this->compiler->has_code && !empty($code)) {
+            $tmp = '';
+            foreach ($this->compiler->prefix_code as $code) {
+                $tmp .= $code;
             }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
+            $this->compiler->prefix_code = array();
+            $this->current_buffer->append_subtree($this,
+                new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true)));
         }
     }
 
-    function yy_parse_failed()
+    // line 255 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r2()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
+    	$text = $this->yystack[ $this->yyidx + 0 ]->minor;
+
+	    if ((string)$text == '') {
+	    	$this->current_buffer->append_subtree($this, null);
+	    }
+
+	    $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
+    }
+
+    // line 259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r3()
+    {
+        $this->strip = true;
+    }
+
+    // line 264 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r4()
+    {
+        $this->strip = false;
+    }
+
+    // line 269 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r5()
+    {
+        $this->current_buffer->append_subtree($this,
+            new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + -1 ]->minor));
+    }
+
+    // line 272 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r6()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -3 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 276 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r7()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 281 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r8()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 285 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r9()
+    {
+        $this->_retvalue = '';
+    }
+
+    // line 297 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r10()
+    {
+        if ($this->compiler->has_code) {
+            $this->current_buffer->append_subtree($this,
+                $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor));
+        }
+        $this->compiler->has_variable_string = false;
+        $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+
+    // line 307 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r12()
+    {
+        $var =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+                -$this->compiler->getRdelLength()), ' $');
+        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', array('nocache'),
+                    array('value' => $this->compiler->compileVariable('\'' . $match[ 1 ] . '\'')));
+        } else {
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', array(),
+                    array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
+        }
+    }
+
+    // line 328 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r13()
+    {
+        $tag =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+                -$this->compiler->getRdelLength()));
+        if ($tag == 'strip') {
+            $this->strip = true;
+            $this->_retvalue = null;
+        } else {
+            if (defined($tag)) {
+                if ($this->security) {
+                    $this->security->isTrustedConstant($tag, $this->compiler);
+                }
+                $this->_retvalue =
+                    $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
+            } else {
+                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                    $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array('\'nocache\''));
+                } else {
+                    $this->_retvalue = $this->compiler->compileTag($tag, array());
+                }
+            }
+        }
+    }
+
+    // line 339 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r14()
+    {
+        $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.');
+        if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') {
+            // {$smarty.block.child}
+            $this->_retvalue =
+                $this->compiler->compileTag('child', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
+        } else {
+            // {$smarty.block.parent}
+            $this->_retvalue =
+                $this->compiler->compileTag('parent', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
+        }
+    }
+
+    // line 343 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r15()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 347 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r16()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 356 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r17()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ],
+                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]));
+    }
+
+    // line 360 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r18()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('assign', array_merge(array(
+                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
+                array('var' => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'')
+            ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]));
+    }
+
+    // line 364 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r19()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('assign', array_merge(array(
+                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
+                array('var' => $this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ])
+            ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]), array(
+                'smarty_internal_index' => $this->yystack[ $this->yyidx +
+                                                           -1 ]->minor[ 'smarty_internal_index' ]
+            ));
+    }
+
+    // line 368 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r20()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 383 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r21()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 393 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r25()
+    {
+        if (defined($this->yystack[ $this->yyidx + -1 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+                    array('value' => $this->yystack[ $this->yyidx + -1 ]->minor));
+        } else {
+            $this->_retvalue =
+                $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor,
+                    $this->yystack[ $this->yyidx + 0 ]->minor);
+        }
+    }
+
+    // line 406 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r26()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', array(),
+                    array('value' => $this->yystack[ $this->yyidx + 0 ]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor, array());
+        }
+    }
+
+    // line 418 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r27()
+    {
+        if (defined($this->yystack[ $this->yyidx + -2 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+                    array(
+                        'value'        => $this->yystack[ $this->yyidx + -2 ]->minor,
+                        'modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor
+                    ));
+        } else {
+            $this->_retvalue =
+                $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor,
+                    $this->yystack[ $this->yyidx + 0 ]->minor,
+                    array('modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor));
+        }
+    }
+
+    // line 423 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r28()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor,
+                $this->yystack[ $this->yyidx + 0 ]->minor,
+                array('object_method' => $this->yystack[ $this->yyidx + -1 ]->minor));
+    }
+
+    // line 428 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r29()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag($this->yystack[ $this->yyidx + -4 ]->minor,
+                $this->yystack[ $this->yyidx + 0 ]->minor, array(
+                    'modifierlist'  => $this->yystack[ $this->yyidx + -1 ]->minor,
+                    'object_method' => $this->yystack[ $this->yyidx + -2 ]->minor
+                ));
+    }
+
+    // line 433 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r30()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('make_nocache',
+                array(array('var' => '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'')));
+    }
+
+    // line 438 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r31()
+    {
+        $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
+        $this->_retvalue =
+            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
+                array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 443 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r32()
+    {
+        $tag = trim(substr($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler->getLdelLength()));
+        $this->_retvalue =
+            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag,
+                $this->yystack[ $this->yyidx + 0 ]->minor,
+                array('if condition' => $this->yystack[ $this->yyidx + -1 ]->minor));
+    }
+
+    // line 454 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r33()
+    {
+        $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
+        $this->_retvalue =
+            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
+                array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 458 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r35()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+                array('start' => $this->yystack[ $this->yyidx + -6 ]->minor),
+                array('ifexp' => $this->yystack[ $this->yyidx + -4 ]->minor),
+                array('var' => $this->yystack[ $this->yyidx + -2 ]->minor),
+                array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
+            )), 1);
+    }
+
+    // line 466 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r36()
+    {
+        $this->_retvalue = '=' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 470 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r38()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+                array('start' => $this->yystack[ $this->yyidx + -3 ]->minor),
+                array('to' => $this->yystack[ $this->yyidx + -1 ]->minor)
+            )), 0);
+    }
+
+    // line 475 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r39()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+                array('start' => $this->yystack[ $this->yyidx + -5 ]->minor),
+                array('to' => $this->yystack[ $this->yyidx + -3 ]->minor),
+                array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
+            )), 0);
+    }
+
+    // line 479 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r40()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+                array('from' => $this->yystack[ $this->yyidx + -3 ]->minor),
+                array('item' => $this->yystack[ $this->yyidx + -1 ]->minor)
+            )));
+    }
+
+    // line 482 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r41()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+                array('from' => $this->yystack[ $this->yyidx + -5 ]->minor),
+                array('item' => $this->yystack[ $this->yyidx + -1 ]->minor),
+                array('key' => $this->yystack[ $this->yyidx + -3 ]->minor)
+            )));
+    }
+
+    // line 487 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r42()
+    {
+        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 491 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r43()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('setfilter', array(), array(
+                'modifier_list' => array(
+                    array_merge(array($this->yystack[ $this->yyidx + -1 ]->minor),
+                        $this->yystack[ $this->yyidx + 0 ]->minor)
+                )
+            ));
+    }
+
+    // line 497 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r44()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('setfilter', array(), array(
+                'modifier_list' => array_merge(array(
+                    array_merge(array(
+                        $this->yystack[ $this->yyidx +
+                                        -2 ]->minor
+                    ), $this->yystack[ $this->yyidx + -1 ]->minor)
+                ), $this->yystack[ $this->yyidx + 0 ]->minor)
+            ));
+    }
+
+    // line 506 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r45()
+    {
+        $tag =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+                -$this->compiler->getRdelLength()), ' /');
+        if ($tag === 'strip') {
+            $this->strip = false;
+            $this->_retvalue = null;
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
+        }
+    }
+
+    // line 510 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r46()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor . 'close', array());
+    }
+
+    // line 515 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r47()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor . 'close', array(),
+                array('modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 519 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r48()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor . 'close', array(),
+                array('object_method' => $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 527 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r49()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor . 'close', array(), array(
+                'object_method' => $this->yystack[ $this->yyidx + -1 ]->minor,
+                'modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor
+            ));
+    }
+
+    // line 533 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r50()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+        $this->_retvalue[] = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 538 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r51()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 543 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r52()
+    {
+        $this->_retvalue = array();
+    }
+
+    // line 554 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r53()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
+        } else {
+            $this->_retvalue =
+                array(
+                    $this->yystack[ $this->yyidx + -2 ]->minor => '\'' .
+                                                                  $this->yystack[ $this->yyidx + 0 ]->minor .
+                                                                  '\''
+                );
+        }
+    }
+
+    // line 562 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r54()
+    {
+        $this->_retvalue =
+            array(
+                trim($this->yystack[ $this->yyidx + -1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx +
+                                                                                                0 ]->minor
+            );
+    }
+
+    // line 574 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r56()
+    {
+        $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
+    }
+
+    // line 587 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r59()
+    {
+        $this->_retvalue =
+            array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 592 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r61()
+    {
+        $this->yystack[ $this->yyidx + -2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor;
+        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor;
+    }
+
+    // line 599 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r62()
+    {
+        $this->_retvalue =
+            array(
+                'var'   => '\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'',
+                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+    }
+
+    // line 603 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r64()
+    {
+        $this->_retvalue =
+            array(
+                'var'   => $this->yystack[ $this->yyidx + -2 ]->minor,
+                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+    }
+
+    // line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r65()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 628 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r68()
+    {
+        $this->_retvalue =
+            '$_smarty_tpl->getStreamVariable(\'' .
+            substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) .
+            '://' .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            '\')';
+    }
+
+    // line 638 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r69()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            trim($this->yystack[ $this->yyidx + -1 ]->minor) .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 642 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r71()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -1 ]->minor[ 'pre' ] .
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            $this->yystack[ $this->yyidx + -1 ]->minor[ 'op' ] .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            ')';
+    }
+
+    // line 646 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r72()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            $this->yystack[ $this->yyidx + -1 ]->minor .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 650 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r73()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+    }
+
+    // line 654 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r74()
+    {
+        $this->_retvalue =
+            'in_array(' .
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            ',' .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            ')';
+    }
+
+    // line 662 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r75()
+    {
+        $this->_retvalue =
+            'in_array(' .
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            ',(array)' .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            ')';
+    }
+
+    // line 666 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r76()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -5 ]->minor .
+            ' ? ' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'') .
+            ' : ' .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 676 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r77()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -5 ]->minor .
+            ' ? ' .
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            ' : ' .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 681 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r79()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 702 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r80()
+    {
+        $this->_retvalue = '!' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 706 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r85()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 710 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r86()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.';
+    }
+
+    // line 715 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r87()
+    {
+        $this->_retvalue = '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 732 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r88()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+        } else {
+            $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
+        }
+    }
+
+    // line 736 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r90()
+    {
+        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+    }
+
+    // line 754 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r91()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            $this->yystack[ $this->yyidx + -1 ]->minor .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 765 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r95()
+    {
+        $prefixVar = $this->compiler->getNewPrefixVariable();
+        if ($this->yystack[ $this->yyidx + -2 ]->minor[ 'var' ] === '\'smarty\'') {
+            $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
+                                              $this->compiler->compileTag('private_special_variable', array(),
+                                                  $this->yystack[ $this->yyidx +
+                                                                  -2 ]->minor[ 'smarty_internal_index' ]) .
+                                              ';?>');
+        } else {
+            $this->compiler->appendPrefixCode("<?php  {$prefixVar} = " .
+                                              $this->compiler->compileVariable($this->yystack[ $this->yyidx +
+                                                                                               -2 ]->minor[ 'var' ]) .
+                                              $this->yystack[ $this->yyidx + -2 ]->minor[ 'smarty_internal_index' ] .
+                                              ';?>');
+        }
+        $this->_retvalue =
+            $prefixVar .
+            '::' .
+            $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+            $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+    }
+
+    // line 772 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r96()
+    {
+        $prefixVar = $this->compiler->getNewPrefixVariable();
+        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+        $this->_retvalue = $prefixVar;
+    }
+
+    // line 785 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r97()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('private_modifier', array(), array(
+                'value'        => $this->yystack[ $this->yyidx + -1 ]->minor,
+                'modifierlist' => $this->yystack[ $this->yyidx + 0 ]->minor
+            ));
+    }
+
+    // line 804 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r100()
+    {
+        if (!in_array(strtolower($this->yystack[ $this->yyidx + -2 ]->minor), array('self', 'parent')) &&
+            (!$this->security ||
+             $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + -2 ]->minor,
+                 $this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler))) {
+            if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ])) {
+                $this->_retvalue =
+                    $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ] .
+                    '::' .
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+            } else {
+                $this->_retvalue =
+                    $this->yystack[ $this->yyidx + -2 ]->minor .
+                    '::' .
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+            }
+        } else {
+            $this->compiler->trigger_template_error('static class \'' .
+                                                    $this->yystack[ $this->yyidx + -2 ]->minor .
+                                                    '\' is undefined or not allowed by security setting');
+        }
+    }
+
+    // line 815 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r102()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 818 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r103()
+    {
+        $this->_retvalue =
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'');
+    }
+
+    // line 831 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r104()
+    {
+        if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] === '\'smarty\'') {
+            $smarty_var =
+                $this->compiler->compileTag('private_special_variable', array(),
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ]);
+            $this->_retvalue = $smarty_var;
+        } else {
+            // used for array reset,next,prev,end,current
+            $this->last_variable = $this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ];
+            $this->last_index = $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
+            $this->_retvalue =
+                $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ]) .
+                $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
+        }
+    }
+
+    // line 841 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r105()
+    {
+        $this->_retvalue =
+            '$_smarty_tpl->tpl_vars[' .
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            ']->' .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 845 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r107()
+    {
+        $this->_retvalue =
+            $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'');
+    }
+
+    // line 849 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r108()
+    {
+        $this->_retvalue =
+            '(is_array($tmp = ' .
+            $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'') .
+            ') ? $tmp' .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            ' :null)';
+    }
+
+    // line 853 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r109()
+    {
+        $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -1 ]->minor);
+    }
+
+    // line 857 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r110()
+    {
+        $this->_retvalue =
+            '(is_array($tmp = ' .
+            $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
+            ') ? $tmp' .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            ' : null)';
+    }
+
+    // line 860 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r111()
+    {
+        $this->_retvalue =
+            array(
+                'var'                   => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'',
+                'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+    }
+
+    // line 873 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r112()
+    {
+        $this->_retvalue =
+            array(
+                'var'                   => $this->yystack[ $this->yyidx + -1 ]->minor,
+                'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+    }
+
+    // line 879 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r114()
+    {
+        return;
+    }
+
+    // line 882 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r115()
+    {
+        $this->_retvalue =
+            '[' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'') .
+            ']';
+    }
+
+    // line 886 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r116()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor) . ']';
+    }
+
+    // line 890 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r117()
+    {
+        $this->_retvalue =
+            '[' .
+            $this->compiler->compileVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
+            '->' .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            ']';
+    }
+
+    // line 894 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r118()
+    {
+        $this->_retvalue = '[\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\']';
+    }
+
+    // line 899 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r119()
+    {
+        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']';
+    }
+
+    // line 904 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r120()
+    {
+        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
+    }
+
+    // line 908 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r121()
+    {
+        $this->_retvalue =
+            '[' .
+            $this->compiler->compileTag('private_special_variable', array(),
+                '[\'section\'][\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'][\'index\']') .
+            ']';
+    }
+
+    // line 911 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r122()
+    {
+        $this->_retvalue =
+            '[' .
+            $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                             $this->yystack[ $this->yyidx +
+                                                                                             -3 ]->minor .
+                                                                             '\'][\'' .
+                                                                             $this->yystack[ $this->yyidx +
+                                                                                             -1 ]->minor .
+                                                                             '\']') .
+            ']';
+    }
+
+    // line 917 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r123()
+    {
+        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
+    }
+
+    // line 933 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r125()
+    {
+        $this->_retvalue =
+            '[' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'') .
+            ']';
+    }
+
+    // line 943 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r129()
+    {
+        $this->_retvalue = '[]';
+    }
+
+    // line 947 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r130()
+    {
+        $this->_retvalue = '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'';
+    }
+
+    // line 952 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r131()
+    {
+        $this->_retvalue = '\'\'';
+    }
+
+    // line 960 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r132()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 966 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r134()
+    {
+        $var =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+                -$this->compiler->getRdelLength()), ' $');
+        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
+    }
+
+    // line 973 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r135()
+    {
+        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+    }
+
+    // line 982 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r136()
+    {
+        if ($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ] === '\'smarty\'') {
+            $this->_retvalue =
+                $this->compiler->compileTag('private_special_variable', array(),
+                    $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ]) .
+                $this->yystack[ $this->yyidx + 0 ]->minor;
+        } else {
+            $this->_retvalue =
+                $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ]) .
+                $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ] .
+                $this->yystack[ $this->yyidx + 0 ]->minor;
+        }
+    }
+
+    // line 987 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r137()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 992 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r138()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 999 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r139()
+    {
+        if ($this->security && substr($this->yystack[ $this->yyidx + -1 ]->minor, 0, 1) === '_') {
+            $this->compiler->trigger_template_error(self::ERR1);
+        }
+        $this->_retvalue =
+            '->' . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r140()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::ERR2);
+        }
+        $this->_retvalue =
+            '->{' .
+            $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor) .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            '}';
+    }
+
+    // line 1013 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r141()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::ERR2);
+        }
+        $this->_retvalue =
+            '->{' . $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}';
+    }
+
+    // line 1021 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r142()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::ERR2);
+        }
+        $this->_retvalue =
+            '->{\'' .
+            $this->yystack[ $this->yyidx + -4 ]->minor .
+            '\'.' .
+            $this->yystack[ $this->yyidx + -2 ]->minor .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            '}';
+    }
+
+    // line 1029 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r143()
+    {
+        $this->_retvalue = '->' . $this->yystack[ $this->yyidx + 0 ]->minor;
     }
 
-    function yy_syntax_error($yymajor, $TOKEN)
+    // line 1037 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r144()
     {
-#line 66 "smarty_internal_templateparser.y"
+        $this->_retvalue =
+            $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + -3 ]->minor,
+                $this->yystack[ $this->yyidx + -1 ]->minor);
+    }
+
+    // line 1044 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r145()
+    {
+        if ($this->security && substr($this->yystack[ $this->yyidx + -3 ]->minor, 0, 1) === '_') {
+            $this->compiler->trigger_template_error(self::ERR1);
+        }
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -3 ]->minor .
+            '(' .
+            implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) .
+            ')';
+    }
+
+    // line 1055 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r146()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::ERR2);
+        }
+        $prefixVar = $this->compiler->getNewPrefixVariable();
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
+                                          $this->compiler->compileVariable('\'' .
+                                                                           substr($this->yystack[ $this->yyidx +
+                                                                                                  -3 ]->minor, 1) .
+                                                                           '\'') .
+                                          ';?>');
+        $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) . ')';
+    }
+
+    // line 1072 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r147()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 1076 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r150()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array(
+                array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)
+            ));
+    }
+
+    // line 1084 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r151()
+    {
+        $this->_retvalue =
+            array(array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 1092 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r153()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 1105 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r154()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r157()
+    {
+        $this->_retvalue =
+            array(trim($this->yystack[ $this->yyidx + -1 ]->minor) . $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r159()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method');
+    }
+
+    // line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r160()
+    {
+        $this->_retvalue =
+            array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method');
+    }
+
+    // line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r161()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '');
+    }
+
+    // line 1134 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r162()
+    {
+        $this->_retvalue =
+            array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
+    }
+
+    // line 1140 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r163()
+    {
+        $this->_retvalue =
+            array(
+                $this->yystack[ $this->yyidx + -2 ]->minor,
+                $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor, 'property'
+            );
+    }
+
+    // line 1144 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r164()
+    {
+        $this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' ';
+    }
+
+    // line 1163 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r165()
+    {
+        static $lops = array(
+            'eq'  => ' == ',
+            'ne'  => ' != ',
+            'neq' => ' != ',
+            'gt'  => ' > ',
+            'ge'  => ' >= ',
+            'gte' => ' >= ',
+            'lt'  => ' < ',
+            'le'  => ' <= ',
+            'lte' => ' <= ',
+            'mod' => ' % ',
+            'and' => ' && ',
+            'or'  => ' || ',
+            'xor' => ' xor ',
+        );
+        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+        $this->_retvalue = $lops[ $op ];
+    }
+
+    // line 1176 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r166()
+    {
+        static $tlops = array(
+            'isdivby'     => array('op' => ' % ', 'pre' => '!('),
+            'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
+            'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
+            'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+            'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
+            'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),
+        );
+        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+        $this->_retvalue = $tlops[ $op ];
+    }
+
+    // line 1190 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r167()
+    {
+        static $scond = array(
+            'iseven'    => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd'     => '(1 & ',
+            'isnotodd'  => '!(1 & ',
+        );
+        $op = strtolower(str_replace(' ', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+        $this->_retvalue = $scond[ $op ];
+    }
+
+    // line 1201 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r168()
+    {
+        $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+    }
+
+    // line 1209 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r171()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 1213 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r173()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + -2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 1229 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r174()
+    {
+        $this->_retvalue =
+            '\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r177()
+    {
+        $this->compiler->leaveDoubleQuote();
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor->to_smarty_php($this);
+    }
+
+    // line 1240 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r178()
+    {
+        $this->yystack[ $this->yyidx + -1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 1244 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r179()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 1248 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r180()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + -1 ]->minor);
+    }
 
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_template_error();
-#line 2853 "smarty_internal_templateparser.php"
+    // line 1252 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r181()
+    {
+        $this->_retvalue =
+            new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')');
+    }
+
+    // line 1264 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r182()
+    {
+        $this->_retvalue =
+            new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
+                                               substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) .
+                                               '\']->value');
+    }
+
+    // line 1268 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r185()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    public function yy_r186()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+            && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[ $yyruleno ]);
+        }
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[ $yyruleno ])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TP_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[ $this->yyidx ] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
     }
 
-    function yy_accept()
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-#line 58 "smarty_internal_templateparser.y"
+    }
 
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 2871 "smarty_internal_templateparser.php"
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+        // line 214 "../smarty/lexer/smarty_internal_templateparser.y"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_template_error();
     }
 
-    function doParse($yymajor, $yytokenvalue)
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+        // line 207 "../smarty/lexer/smarty_internal_templateparser.y"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-        
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
             $this->yyerrcnt = -1;
@@ -2884,19 +3543,17 @@ function doParse($yymajor, $yytokenvalue)
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor==0);
-        
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        $yyendofinput = ($yymajor == 0);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
         }
-        
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
             if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
+                !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -2910,35 +3567,35 @@ function doParse($yymajor, $yytokenvalue)
                 }
             } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
                         while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
+                               $yymx !== self::YYERRORSYMBOL &&
+                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                        ) {
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor==0) {
+                        if ($this->yyidx < 0 || $yymajor == 0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
                             $u2 = 0;
                             $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
                         }
@@ -2959,8 +3616,8 @@ function doParse($yymajor, $yytokenvalue)
             } else {
                 $this->yy_accept();
                 $yymajor = self::YYNOCODE;
-            }            
-        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
     }
 }
-?>
\ No newline at end of file
+
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
new file mode 100644
index 000000000..504a4582c
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
@@ -0,0 +1,609 @@
+<?php
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ */
+class Smarty_Internal_TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param \Smarty $smarty
+     * @param array   $errors array to push results into rather than outputting them
+     *
+     * @return bool status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $template_dir = stream_resolve_include_path($_template_dir);
+                    } else {
+                        $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
+                    }
+                    if ($template_dir !== false) {
+                        if ($errors === null) {
+                            echo "$template_dir is OK.\n";
+                        }
+                        continue;
+                    } else {
+                        $status = false;
+                        $message =
+                            "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'template_dir' ] = $message;
+                        }
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_template_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'template_dir' ] = $message;
+                    }
+                    continue;
+                }
+            }
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+        // test if all registered plugins_dir are accessible
+        // and if core plugins directory is still registered
+        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
+        $_core_plugins_available = false;
+        foreach ($smarty->getPluginsDir() as $plugin_dir) {
+            $_plugin_dir = $plugin_dir;
+            $plugin_dir = realpath($plugin_dir);
+            // resolve include_path or fail existence
+            if (!$plugin_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
+                    } else {
+                        $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
+                    }
+                    if ($plugin_dir !== false) {
+                        if ($errors === null) {
+                            echo "$plugin_dir is OK.\n";
+                        }
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'plugins_dir' ] = $message;
+                        }
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_plugin_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'plugins_dir' ] = $message;
+                    }
+                    continue;
+                }
+            }
+            if (!is_dir($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif (!is_readable($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+                $_core_plugins_available = true;
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            }
+        }
+        if (!$_core_plugins_available) {
+            $status = false;
+            $message = "WARNING: Smarty's own libs/plugins is not available";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } elseif (!isset($errors[ 'plugins_dir' ])) {
+                $errors[ 'plugins_dir' ] = $message;
+            }
+        }
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $config_dir = stream_resolve_include_path($_config_dir);
+                    } else {
+                        $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
+                    }
+                    if ($config_dir !== false) {
+                        if ($errors === null) {
+                            echo "$config_dir is OK.\n";
+                        }
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'config_dir' ] = $message;
+                        }
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_config_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'config_dir' ] = $message;
+                    }
+                    continue;
+                }
+            }
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Testing sysplugin files...\n";
+        }
+        // test if sysplugins are available
+        $source = SMARTY_SYSPLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedSysplugins = array(
+                'smartycompilerexception.php'                               => true,
+                'smartyexception.php'                                       => true,
+                'smarty_cacheresource.php'                                  => true,
+                'smarty_cacheresource_custom.php'                           => true,
+                'smarty_cacheresource_keyvaluestore.php'                    => true,
+                'smarty_data.php'                                           => true,
+                'smarty_internal_block.php'                                 => true,
+                'smarty_internal_cacheresource_file.php'                    => true,
+                'smarty_internal_compilebase.php'                           => true,
+                'smarty_internal_compile_append.php'                        => true,
+                'smarty_internal_compile_assign.php'                        => true,
+                'smarty_internal_compile_block.php'                         => true,
+                'smarty_internal_compile_block_child.php'                   => true,
+                'smarty_internal_compile_block_parent.php'                  => true,
+                'smarty_internal_compile_child.php'                         => true,
+                'smarty_internal_compile_parent.php'                        => true,
+                'smarty_internal_compile_break.php'                         => true,
+                'smarty_internal_compile_call.php'                          => true,
+                'smarty_internal_compile_capture.php'                       => true,
+                'smarty_internal_compile_config_load.php'                   => true,
+                'smarty_internal_compile_continue.php'                      => true,
+                'smarty_internal_compile_debug.php'                         => true,
+                'smarty_internal_compile_eval.php'                          => true,
+                'smarty_internal_compile_extends.php'                       => true,
+                'smarty_internal_compile_for.php'                           => true,
+                'smarty_internal_compile_foreach.php'                       => true,
+                'smarty_internal_compile_function.php'                      => true,
+                'smarty_internal_compile_if.php'                            => true,
+                'smarty_internal_compile_include.php'                       => true,
+                'smarty_internal_compile_include_php.php'                   => true,
+                'smarty_internal_compile_insert.php'                        => true,
+                'smarty_internal_compile_ldelim.php'                        => true,
+                'smarty_internal_compile_make_nocache.php'                  => true,
+                'smarty_internal_compile_nocache.php'                       => true,
+                'smarty_internal_compile_private_block_plugin.php'          => true,
+                'smarty_internal_compile_private_foreachsection.php'        => true,
+                'smarty_internal_compile_private_function_plugin.php'       => true,
+                'smarty_internal_compile_private_modifier.php'              => true,
+                'smarty_internal_compile_private_object_block_function.php' => true,
+                'smarty_internal_compile_private_object_function.php'       => true,
+                'smarty_internal_compile_private_php.php'                   => true,
+                'smarty_internal_compile_private_print_expression.php'      => true,
+                'smarty_internal_compile_private_registered_block.php'      => true,
+                'smarty_internal_compile_private_registered_function.php'   => true,
+                'smarty_internal_compile_private_special_variable.php'      => true,
+                'smarty_internal_compile_rdelim.php'                        => true,
+                'smarty_internal_compile_section.php'                       => true,
+                'smarty_internal_compile_setfilter.php'                     => true,
+                'smarty_internal_compile_shared_inheritance.php'            => true,
+                'smarty_internal_compile_while.php'                         => true,
+                'smarty_internal_configfilelexer.php'                       => true,
+                'smarty_internal_configfileparser.php'                      => true,
+                'smarty_internal_config_file_compiler.php'                  => true,
+                'smarty_internal_data.php'                                  => true,
+                'smarty_internal_debug.php'                                 => true,
+                'smarty_internal_errorhandler.php'                          => true,
+                'smarty_internal_extension_handler.php'                     => true,
+                'smarty_internal_method_addautoloadfilters.php'             => true,
+                'smarty_internal_method_adddefaultmodifiers.php'            => true,
+                'smarty_internal_method_append.php'                         => true,
+                'smarty_internal_method_appendbyref.php'                    => true,
+                'smarty_internal_method_assignbyref.php'                    => true,
+                'smarty_internal_method_assignglobal.php'                   => true,
+                'smarty_internal_method_clearallassign.php'                 => true,
+                'smarty_internal_method_clearallcache.php'                  => true,
+                'smarty_internal_method_clearassign.php'                    => true,
+                'smarty_internal_method_clearcache.php'                     => true,
+                'smarty_internal_method_clearcompiledtemplate.php'          => true,
+                'smarty_internal_method_clearconfig.php'                    => true,
+                'smarty_internal_method_compileallconfig.php'               => true,
+                'smarty_internal_method_compilealltemplates.php'            => true,
+                'smarty_internal_method_configload.php'                     => true,
+                'smarty_internal_method_createdata.php'                     => true,
+                'smarty_internal_method_getautoloadfilters.php'             => true,
+                'smarty_internal_method_getconfigvariable.php'              => true,
+                'smarty_internal_method_getconfigvars.php'                  => true,
+                'smarty_internal_method_getdebugtemplate.php'               => true,
+                'smarty_internal_method_getdefaultmodifiers.php'            => true,
+                'smarty_internal_method_getglobal.php'                      => true,
+                'smarty_internal_method_getregisteredobject.php'            => true,
+                'smarty_internal_method_getstreamvariable.php'              => true,
+                'smarty_internal_method_gettags.php'                        => true,
+                'smarty_internal_method_gettemplatevars.php'                => true,
+                'smarty_internal_method_literals.php'                       => true,
+                'smarty_internal_method_loadfilter.php'                     => true,
+                'smarty_internal_method_loadplugin.php'                     => true,
+                'smarty_internal_method_mustcompile.php'                    => true,
+                'smarty_internal_method_registercacheresource.php'          => true,
+                'smarty_internal_method_registerclass.php'                  => true,
+                'smarty_internal_method_registerdefaultconfighandler.php'   => true,
+                'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
+                'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
+                'smarty_internal_method_registerfilter.php'                 => true,
+                'smarty_internal_method_registerobject.php'                 => true,
+                'smarty_internal_method_registerplugin.php'                 => true,
+                'smarty_internal_method_registerresource.php'               => true,
+                'smarty_internal_method_setautoloadfilters.php'             => true,
+                'smarty_internal_method_setdebugtemplate.php'               => true,
+                'smarty_internal_method_setdefaultmodifiers.php'            => true,
+                'smarty_internal_method_unloadfilter.php'                   => true,
+                'smarty_internal_method_unregistercacheresource.php'        => true,
+                'smarty_internal_method_unregisterfilter.php'               => true,
+                'smarty_internal_method_unregisterobject.php'               => true,
+                'smarty_internal_method_unregisterplugin.php'               => true,
+                'smarty_internal_method_unregisterresource.php'             => true,
+                'smarty_internal_nocache_insert.php'                        => true,
+                'smarty_internal_parsetree.php'                             => true,
+                'smarty_internal_parsetree_code.php'                        => true,
+                'smarty_internal_parsetree_dq.php'                          => true,
+                'smarty_internal_parsetree_dqcontent.php'                   => true,
+                'smarty_internal_parsetree_tag.php'                         => true,
+                'smarty_internal_parsetree_template.php'                    => true,
+                'smarty_internal_parsetree_text.php'                        => true,
+                'smarty_internal_resource_eval.php'                         => true,
+                'smarty_internal_resource_extends.php'                      => true,
+                'smarty_internal_resource_file.php'                         => true,
+                'smarty_internal_resource_php.php'                          => true,
+                'smarty_internal_resource_registered.php'                   => true,
+                'smarty_internal_resource_stream.php'                       => true,
+                'smarty_internal_resource_string.php'                       => true,
+                'smarty_internal_runtime_cachemodify.php'                   => true,
+                'smarty_internal_runtime_cacheresourcefile.php'             => true,
+                'smarty_internal_runtime_capture.php'                       => true,
+                'smarty_internal_runtime_codeframe.php'                     => true,
+                'smarty_internal_runtime_filterhandler.php'                 => true,
+                'smarty_internal_runtime_foreach.php'                       => true,
+                'smarty_internal_runtime_getincludepath.php'                => true,
+                'smarty_internal_runtime_inheritance.php'                   => true,
+                'smarty_internal_runtime_make_nocache.php'                  => true,
+                'smarty_internal_runtime_tplfunction.php'                   => true,
+                'smarty_internal_runtime_updatecache.php'                   => true,
+                'smarty_internal_runtime_updatescope.php'                   => true,
+                'smarty_internal_runtime_writefile.php'                     => true,
+                'smarty_internal_smartytemplatecompiler.php'                => true,
+                'smarty_internal_template.php'                              => true,
+                'smarty_internal_templatebase.php'                          => true,
+                'smarty_internal_templatecompilerbase.php'                  => true,
+                'smarty_internal_templatelexer.php'                         => true,
+                'smarty_internal_templateparser.php'                        => true,
+                'smarty_internal_testinstall.php'                           => true,
+                'smarty_internal_undefined.php'                             => true,
+                'smarty_resource.php'                                       => true,
+                'smarty_resource_custom.php'                                => true,
+                'smarty_resource_recompiled.php'                            => true,
+                'smarty_resource_uncompiled.php'                            => true,
+                'smarty_security.php'                                       => true,
+                'smarty_template_cached.php'                                => true,
+                'smarty_template_compiled.php'                              => true,
+                'smarty_template_config.php'                                => true,
+                'smarty_template_resource_base.php'                         => true,
+                'smarty_template_source.php'                                => true,
+                'smarty_undefined_variable.php'                             => true,
+                'smarty_variable.php'                                       => true,
+            );
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedSysplugins[ $filename ])) {
+                        unset($expectedSysplugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedSysplugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expectedSysplugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'sysplugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'sysplugins_dir_constant' ] = $message;
+            }
+        }
+        if ($errors === null) {
+            echo "Testing plugin files...\n";
+        }
+        // test if core plugins are available
+        $source = SMARTY_PLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedPlugins = array(
+                'block.textformat.php'                  => true,
+                'function.counter.php'                  => true,
+                'function.cycle.php'                    => true,
+                'function.fetch.php'                    => true,
+                'function.html_checkboxes.php'          => true,
+                'function.html_image.php'               => true,
+                'function.html_options.php'             => true,
+                'function.html_radios.php'              => true,
+                'function.html_select_date.php'         => true,
+                'function.html_select_time.php'         => true,
+                'function.html_table.php'               => true,
+                'function.mailto.php'                   => true,
+                'function.math.php'                     => true,
+                'modifier.capitalize.php'               => true,
+                'modifier.date_format.php'              => true,
+                'modifier.debug_print_var.php'          => true,
+                'modifier.escape.php'                   => true,
+                'modifier.mb_wordwrap.php'              => true,
+                'modifier.regex_replace.php'            => true,
+                'modifier.replace.php'                  => true,
+                'modifier.spacify.php'                  => true,
+                'modifier.truncate.php'                 => true,
+                'modifiercompiler.cat.php'              => true,
+                'modifiercompiler.count_characters.php' => true,
+                'modifiercompiler.count_paragraphs.php' => true,
+                'modifiercompiler.count_sentences.php'  => true,
+                'modifiercompiler.count_words.php'      => true,
+                'modifiercompiler.default.php'          => true,
+                'modifiercompiler.escape.php'           => true,
+                'modifiercompiler.from_charset.php'     => true,
+                'modifiercompiler.indent.php'           => true,
+                'modifiercompiler.lower.php'            => true,
+                'modifiercompiler.noprint.php'          => true,
+                'modifiercompiler.string_format.php'    => true,
+                'modifiercompiler.strip.php'            => true,
+                'modifiercompiler.strip_tags.php'       => true,
+                'modifiercompiler.to_charset.php'       => true,
+                'modifiercompiler.unescape.php'         => true,
+                'modifiercompiler.upper.php'            => true,
+                'modifiercompiler.wordwrap.php'         => true,
+                'outputfilter.trimwhitespace.php'       => true,
+                'shared.escape_special_chars.php'       => true,
+                'shared.literal_compiler_param.php'     => true,
+                'shared.make_timestamp.php'             => true,
+                'shared.mb_str_replace.php'             => true,
+                'shared.mb_unicode.php'                 => true,
+                'variablefilter.htmlspecialchars.php'   => true,
+            );
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedPlugins[ $filename ])) {
+                        unset($expectedPlugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedPlugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expectedPlugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'plugins_dir_constant' ] = $message;
+            }
+        }
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+        return $status;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_undefined.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_undefined.php
new file mode 100644
index 000000000..7df0acc2d
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_undefined.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Smarty Internal Undefined
+ *
+ * Class to handle undefined method calls or calls to obsolete runtime extensions
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Undefined
+{
+    /**
+     * Name of undefined extension class
+     *
+     * @var string|null
+     */
+    public $class = null;
+
+    /**
+     * Smarty_Internal_Undefined constructor.
+     *
+     * @param null|string $class name of undefined extension class
+     */
+    public function __construct($class = null)
+    {
+        $this->class = $class;
+    }
+
+    /**
+     * Wrapper for obsolete class Smarty_Internal_Runtime_ValidateCompiled
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $properties special template properties
+     * @param bool                      $cache      flag if called from cache file
+     *
+     * @return bool false
+     */
+    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+    {
+        if ($cache) {
+            $tpl->cached->valid = false;
+        } else {
+            $tpl->mustCompile = true;
+        }
+        return false;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        if (isset($this->class)) {
+            throw new SmartyException("undefined extension class '{$this->class}'");
+        } else {
+            throw new SmartyException(get_class($args[ 0 ]) . "->{$name}() undefined method");
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_utility.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index b532e4a1e..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- * 
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
- * @package Smarty
- * @subpackage PluginsInternal
- * @version 3-SVN$Rev: 3286 $
- */
-
-class Smarty_Internal_Utility {
-    protected $smarty;
-
-    function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    } 
-
-    /**
-     * Compile all template files
-     * 
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit 
-     * @param int $max_errors 
-     * @return integer number of template files recompiled
-     */
-    function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    { 
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        } 
-        $this->smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0; 
-        // loop over array of template directories
-        foreach((array)$this->smarty->template_dir as $_dir) {
-            if (strpos('/\\', substr($_dir, -1)) === false) {
-                $_dir .= DS;
-            } 
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                if (strpos($_fileinfo, '.svn') !== false) continue;
-                $_file = $_fileinfo->getFilename();
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                   $_template_file = $_file;
-                } else {
-                   $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_template_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_tpl = $this->smarty->createTemplate($_template_file,null,null,null,false);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                } 
-				// free memory
-                $this->smarty->template_objects = array();
-                $_tpl->smarty->template_objects = array();
-                $_tpl = null;
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                } 
-            } 
-        } 
-        return $_count;
-    } 
-
-    /**
-     * Compile all config files
-     * 
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit 
-     * @param int $max_errors 
-     * @return integer number of template files recompiled
-     */
-    function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
-    { 
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        } 
-        $this->smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0; 
-        // loop over array of template directories
-        foreach((array)$this->smarty->config_dir as $_dir) {
-            if (strpos('/\\', substr($_dir, -1)) === false) {
-                $_dir .= DS;
-            } 
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                if (strpos($_fileinfo, '.svn') !== false) continue;
-                $_file = $_fileinfo->getFilename();
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                    $_config_file = $_file;
-                } else {
-                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                } 
-                echo '<br>', $_dir, '---', $_config_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_config = new Smarty_Internal_Config($_config_file, $this->smarty);
-                    if ($_config->mustCompile()) {
-                        $_config->compileConfigSource();
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    } 
-                } 
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                } 
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                } 
-            } 
-        } 
-        return $_count;
-    } 
-
-    /**
-     * Delete compiled template file
-     * 
-     * @param string $resource_name template name
-     * @param string $compile_id compile id
-     * @param integer $exp_time expiration time
-     * @return integer number of template files deleted
-     */
-    function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($resource_name)) {
-            $_resource_part_1 = $resource_name . '.php';
-            $_resource_part_2 = $resource_name . '.cache' . '.php';
-        } else {
-            $_resource_part = '';
-        } 
-        $_dir = $this->smarty->compile_dir;
-        if ($this->smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        } 
-        if (isset($_compile_id)) {
-            $_compile_id_part = $this->smarty->compile_dir . $_compile_id . $_dir_sep;
-        } 
-        $_count = 0;
-        $_compileDirs = new RecursiveDirectoryIterator($_dir);
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (strpos($_file, '.svn') !== false) continue;
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                } 
-            } else {
-                if ((!isset($_compile_id) || (strlen((string)$_file) > strlen($_compile_id_part) && substr_compare((string)$_file, $_compile_id_part, 0, strlen($_compile_id_part)) == 0)) &&
-                        (!isset($resource_name) || (strlen((string)$_file) > strlen($_resource_part_1) && substr_compare((string)$_file, $_resource_part_1, - strlen($_resource_part_1), strlen($_resource_part_1)) == 0) ||
-                            (strlen((string)$_file) > strlen($_resource_part_2) && substr_compare((string)$_file, $_resource_part_2, - strlen($_resource_part_2), strlen($_resource_part_2)) == 0))) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_file) >= $exp_time) {
-                            $_count += @unlink((string) $_file) ? 1 : 0;
-                        } 
-                    } else {
-                        $_count += @unlink((string) $_file) ? 1 : 0;
-                    } 
-                } 
-            } 
-        } 
-        return $_count;
-    } 
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     * 
-     * @param object $templae template object
-     * @return array of tag/attributes
-     */
-	function getTags(Smarty_Internal_Template $template) 
-	{
-		$template->smarty->get_used_tags = true;
-		$template->compileTemplateSource();
-		return $template->compiler_object->used_tags;
-	}	
-	
-    function testInstall()
-    {
-        echo "<PRE>\n";
-
-        echo "Smarty Installation test...\n";
-
-        echo "Testing template directory...\n";
-
-        foreach((array)$this->smarty->template_dir as $template_dir) {
-            if (!is_dir($template_dir))
-                echo "FAILED: $template_dir is not a directory.\n";
-            elseif (!is_readable($template_dir))
-                echo "FAILED: $template_dir is not readable.\n";
-            else
-                echo "$template_dir is OK.\n";
-        } 
-
-        echo "Testing compile directory...\n";
-
-        if (!is_dir($this->smarty->compile_dir))
-            echo "FAILED: {$this->smarty->compile_dir} is not a directory.\n";
-        elseif (!is_readable($this->smarty->compile_dir))
-            echo "FAILED: {$this->smarty->compile_dir} is not readable.\n";
-        elseif (!is_writable($this->smarty->compile_dir))
-            echo "FAILED: {$this->smarty->compile_dir} is not writable.\n";
-        else
-            echo "{$this->smarty->compile_dir} is OK.\n";
-
-        echo "Testing plugins directory...\n";
-
-        foreach((array)$this->smarty->plugins_dir as $plugin_dir) {
-            if (!is_dir($plugin_dir))
-                echo "FAILED: $plugin_dir is not a directory.\n";
-            elseif (!is_readable($plugin_dir))
-                echo "FAILED: $plugin_dir is not readable.\n";
-            else
-                echo "$plugin_dir is OK.\n";
-        } 
-
-        echo "Testing cache directory...\n";
-
-        if (!is_dir($this->smarty->cache_dir))
-            echo "FAILED: {$this->smarty->cache_dir} is not a directory.\n";
-        elseif (!is_readable($this->smarty->cache_dir))
-            echo "FAILED: {$this->smarty->cache_dir} is not readable.\n";
-        elseif (!is_writable($this->smarty->cache_dir))
-            echo "FAILED: {$this->smarty->cache_dir} is not writable.\n";
-        else
-            echo "{$this->smarty->cache_dir} is OK.\n";
-
-        echo "Testing configs directory...\n";
-
-        if (!is_dir($this->smarty->config_dir))
-            echo "FAILED: {$this->smarty->config_dir} is not a directory.\n";
-        elseif (!is_readable($this->smarty->config_dir))
-            echo "FAILED: {$this->smarty->config_dir} is not readable.\n";
-        else
-            echo "{$this->smarty->config_dir} is OK.\n";
-
-        echo "Tests complete.\n";
-
-        echo "</PRE>\n";
-
-        return true;
-    } 
-}
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_wrapper.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_wrapper.php
deleted file mode 100644
index f45153c34..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_wrapper.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_wrapper.php
- * SVN:         $Id: $
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- * 
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
- * @package Smarty
- * @subpackage PluginsInternal
- * @version 3-SVN$Rev: 3286 $
- */
-
-/*
- * Smarty Backward Compatability Wrapper
- */
-
-class Smarty_Internal_Wrapper {
-  
-    protected $smarty;
-
-    function __construct($smarty) {
-      $this->smarty = $smarty;
-    }
-    
-    /**
-     * Converts smarty2-style function call to smarty 3-style function call
-     * This is expensive, be sure to port your code to Smarty 3!
-     * 
-     * @param string $name Smarty 2 function name
-     * @param array $args Smarty 2 function args
-     */
-    function convert($name, $args) {
-       // throw notice about deprecated function
-       if($this->smarty->deprecation_notices)
-         trigger_error("function call '$name' is unknown or deprecated.",E_USER_NOTICE);
-       // get first and last part of function name
-       $name_parts = explode('_',$name,2);
-       switch($name_parts[0]) {
-         case 'register':
-         case 'unregister':
-           switch($name_parts[1]) {
-              case 'object':
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Object"),$args);
-              case 'compiler_function':
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Plugin"),array_merge(array('compiler'),$args));
-              case 'prefilter':
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Filter"),array_merge(array('pre'),$args));
-              case 'postfilter':
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Filter"),array_merge(array('post'),$args));
-              case 'outputfilter':
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Filter"),array_merge(array('output'),$args));
-             case 'resource':
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Resource"),$args);
-              default:
-                 return call_user_func_array(array($this->smarty,"{$name_parts[0]}Plugin"),array_merge(array($name_parts[1]),$args));
-           }
-           case 'get':
-           switch($name_parts[1]) {
-              case 'template_vars':
-                 return call_user_func_array(array($this->smarty,'getTemplateVars'),$args);
-              case 'config_vars':
-                 return call_user_func_array(array($this->smarty,'getConfigVars'),$args);
-              default:
-                 return call_user_func_array(array($myobj,$name_parts[1]),$args);
-           }
-           case 'clear':
-           switch($name_parts[1]) {
-              case 'all_assign':
-                 return call_user_func_array(array($this->smarty,'clearAllAssign'),$args);
-              case 'assign':
-                 return call_user_func_array(array($this->smarty,'clearAssign'),$args);
-              case 'all_cache':
-                 return call_user_func_array(array($this->smarty,'clearAllCache'),$args);
-              case 'cache':
-                 return call_user_func_array(array($this->smarty,'clearCache'),$args);
-              case 'compiled_template':
-                 return call_user_func_array(array($this->smarty,'clearCompiledTemplate'),$args);
-           }
-           case 'config':
-           switch($name_parts[1]) {
-              case 'load':
-                 return call_user_func_array(array($this->smarty,'configLoad'),$args);
-           }
-           case 'trigger':
-           switch($name_parts[1]) {
-              case 'error':
-                 return call_user_func_array('trigger_error',$args);
-           }
-           case 'load':
-           switch($name_parts[1]) {
-              case 'filter':
-                 return call_user_func_array(array($this->smarty,'loadFilter'),$args);
-           }
-       }
-       throw new SmartyException("unknown method '$name'");
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string $error_msg
-     * @param integer $error_type
-     */
-    function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-}
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_write_file.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_write_file.php
deleted file mode 100644
index 4e34335fb..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_write_file.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Smarty write file plugin
- * 
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Monte Ohrt 
- */
-
-/**
- * Smarty Internal Write File Class
- */
-class Smarty_Internal_Write_File {
-    /**
-     * Writes file in a save way to disk
-     * 
-     * @param string $_filepath complete filepath
-     * @param string $_contents file content
-     * @return boolean true
-     */
-    public static function writeFile($_filepath, $_contents, $smarty)
-    {
-        $old_umask = umask(0);
-        $_dirpath = dirname($_filepath); 
-        // if subdirs, create dir structure
-        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms, true);
-        } 
-        // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = tempnam($_dirpath, 'wrt');
-
-	    if (!($fd = @fopen($_tmp_file, 'wb'))) {
-        	$_tmp_file = $_dirpath . DS . uniqid('wrt');
-        	if (!($fd = @fopen($_tmp_file, 'wb'))) {
-            throw new SmartyException("unable to write file {$_tmp_file}");
-            return false;
-        	}
-   		 }
-
-    	fwrite($fd, $_contents);
-    	fclose($fd);
-
-        // remove original file
-        if (file_exists($_filepath))
-            @unlink($_filepath); 
-        // rename tmp file
-        rename($_tmp_file, $_filepath); 
-        // set file permissions
-        chmod($_filepath, $smarty->_file_perms);
-        umask($old_umask);
-        return true;
-    } 
-} 
-
-?>
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
new file mode 100644
index 000000000..aae7e42f7
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ *
+ * @method renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
+ * @method populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+ * @method process(Smarty_Internal_Template $_smarty_tpl)
+ */
+abstract class Smarty_Resource
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    public static $sysplugins = array(
+        'file'    => 'smarty_internal_resource_file.php',
+        'string'  => 'smarty_internal_resource_string.php',
+        'extends' => 'smarty_internal_resource_extends.php',
+        'stream'  => 'smarty_internal_resource_stream.php',
+        'eval'    => 'smarty_internal_resource_eval.php',
+        'php'     => 'smarty_internal_resource_php.php'
+    );
+
+    /**
+     * Source is bypassing compiler
+     *
+     * @var boolean
+     */
+    public $uncompiled = false;
+
+    /**
+     * Source must be recompiled on every occasion
+     *
+     * @var boolean
+     */
+    public $recompiled = false;
+
+    /**
+     * Flag if resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = false;
+
+    /**
+     * Load Resource Handler
+     *
+     * @param Smarty $smarty smarty object
+     * @param string $type   name of the resource
+     *
+     * @throws SmartyException
+     * @return Smarty_Resource Resource Handler
+     */
+    public static function load(Smarty $smarty, $type)
+    {
+        // try smarty's cache
+        if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
+            return $smarty->_cache[ 'resource_handlers' ][ $type ];
+        }
+        // try registered resource
+        if (isset($smarty->registered_resources[ $type ])) {
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] =
+                $smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
+                    $smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $type ])) {
+            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+        }
+        // try plugins dir
+        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
+        if ($smarty->loadPlugin($_resource_class)) {
+            if (class_exists($_resource_class, false)) {
+                return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+            } else {
+                $smarty->registerResource(
+                    $type,
+                    array(
+                        "smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+                        "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"
+                    )
+                );
+                // give it another try, now that the resource is registered properly
+                return self::load($smarty, $type);
+            }
+        }
+        // try streams
+        $_known_stream = stream_get_wrappers();
+        if (in_array($type, $_known_stream)) {
+            // is known stream
+            if (is_object($smarty->security_policy)) {
+                $smarty->security_policy->isTrustedStream($type);
+            }
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
+        }
+        // TODO: try default_(template|config)_handler
+        // give up
+        throw new SmartyException("Unknown resource type '{$type}'");
+    }
+
+    /**
+     * extract resource_type and resource_name from template_resource and config_resource
+     *
+     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
+     *
+     * @param string $resource_name    template_resource or config_resource to parse
+     * @param string $default_resource the default resource_type defined in $smarty
+     *
+     * @return array with parsed resource name and type
+     */
+    public static function parseResourceName($resource_name, $default_resource)
+    {
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
+            $type = $match[ 1 ];
+            $name = substr($resource_name, strlen($match[ 0 ]));
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $default_resource;
+            $name = $resource_name;
+        }
+        return array($name, $type);
+    }
+
+    /**
+     * modify template_resource according to resource handlers specifications
+     *
+     * @param \Smarty_Internal_Template|\Smarty $obj               Smarty instance
+     * @param string                            $template_resource template_resource to extract resource handler and
+     *                                                             name of
+     *
+     * @return string unique resource name
+     * @throws \SmartyException
+     */
+    public static function getUniqueTemplateName($obj, $template_resource)
+    {
+        $smarty = $obj->_getSmartyObj();
+        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
+        // TODO: optimize for Smarty's internal resource types
+        $resource = Smarty_Resource::load($smarty, $type);
+        // go relative to a given template?
+        $_file_is_dotted = $name[ 0 ] === '.' && ($name[ 1 ] === '.' || $name[ 1 ] === '/');
+        if ($obj->_isTplObj() && $_file_is_dotted
+            && ($obj->source->type === 'file' || $obj->parent->source->type === 'extends')
+        ) {
+            $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DIRECTORY_SEPARATOR . $name);
+        }
+        return $resource->buildUniqueResourceName($smarty, $name);
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * wrapper for backward compatibility to versions < 3.1.22
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     *
+     * @return \Smarty_Template_Source Source Object
+     * @throws \SmartyException
+     */
+    public static function source(
+        Smarty_Internal_Template $_template = null,
+        Smarty $smarty = null,
+        $template_resource = null
+    ) {
+        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
+     */
+    abstract public function getContent(Smarty_Template_Source $source);
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        // intentionally left blank
+    }
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        if ($isConfig) {
+            if (!isset($smarty->_joined_config_dir)) {
+                $smarty->getTemplateDir(null, true);
+            }
+            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
+        } else {
+            if (!isset($smarty->_joined_template_dir)) {
+                $smarty->getTemplateDir();
+            }
+            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
+        }
+    }
+
+    /*
+     * Check if resource must check time stamps when when loading complied or cached templates.
+     * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+     *
+     * @return bool
+     */
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename(preg_replace('![^\w]+!', '_', $source->name));
+    }
+
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return true;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
new file mode 100644
index 000000000..8d66be3ae
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Wrapper Implementation for custom resource plugins
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Custom extends Smarty_Resource
+{
+    /**
+     * fetch template and its modification time from data source
+     *
+     * @param string  $name    template name
+     * @param string  &$source template source
+     * @param integer &$mtime  template modification timestamp (epoch)
+     */
+    abstract protected function fetch($name, &$source, &$mtime);
+
+    /**
+     * Fetch template's modification timestamp from data source
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
+     *
+     * @param string $name template name
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($name)
+    {
+        return null;
+    }
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25);
+        $source->uid = sha1($source->type . ':' . $source->name);
+        $mtime = $this->fetchTimestamp($source->name);
+        if ($mtime !== null) {
+            $source->timestamp = $mtime;
+        } else {
+            $this->fetch($source->name, $content, $timestamp);
+            $source->timestamp = isset($timestamp) ? $timestamp : false;
+            if (isset($content)) {
+                $source->content = $content;
+            }
+        }
+        $source->exists = !!$source->timestamp;
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        $this->fetch($source->name, $content, $timestamp);
+        if (isset($content)) {
+            return $content;
+        }
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename(substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25));
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource_recompiled.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource_recompiled.php
new file mode 100644
index 000000000..760c4dd33
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource_recompiled.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins that don't compile cache
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Recompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an recompiled resource
+     *
+     * @var bool
+     */
+    public $recompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_smarty_tpl)
+    {
+        $compiled = &$_smarty_tpl->compiled;
+        $compiled->file_dependency = array();
+        $compiled->includes = array();
+        $compiled->nocache_hash = null;
+        $compiled->unifunc = null;
+        $level = ob_get_level();
+        ob_start();
+        $_smarty_tpl->loadCompiler();
+        // call compiler
+        try {
+            eval('?>' . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl));
+        } catch (Exception $e) {
+            unset($_smarty_tpl->compiler);
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
+        // release compiler object to free memory
+        unset($_smarty_tpl->compiler);
+        ob_get_clean();
+        $compiled->timestamp = time();
+        $compiled->exists = true;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
+    }
+
+    /*
+       * Disable timestamp checks for recompiled resource.
+       *
+       * @return bool
+       */
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource_uncompiled.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource_uncompiled.php
new file mode 100644
index 000000000..a11e2c14c
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource_uncompiled.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins that don't use the compiler
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = $_template->source->filepath;
+        $compiled->timestamp = $_template->source->timestamp;
+        $compiled->exists = $_template->source->exists;
+        if ($_template->smarty->merge_compiled_includes || $_template->source->handler->checkTimestamps()) {
+            $compiled->file_dependency[ $_template->source->uid ] =
+                array($compiled->filepath, $compiled->timestamp, $_template->source->type,);
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_security.php b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
index cd066fb4e..441a7e284 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_security.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
@@ -1,16 +1,26 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Security
- * @author Uwe Tews 
- */ 
+ * @author     Uwe Tews
+ */
+/**
+ * FIXME: Smarty_Security API
+ *      - getter and setter instead of public properties would allow cultivating an internal cache properly
+ *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir
+ *      are immutable the cache is killed every time either of the variables change. That means that two distinct
+ *      Smarty objects with differing
+ *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
+ */
 
 /**
  * This class does contain the security settings
  */
-class Smarty_Security {
+class Smarty_Security
+{
     /**
      * This determines how Smarty handles "<?php ... ?>" tags in templates.
      * possible values:
@@ -20,210 +30,692 @@ class Smarty_Security {
      *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
      *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
      * </ul>
-     * 
-     * @var integer 
+     *
+     * @var integer
      */
     public $php_handling = Smarty::PHP_PASSTHRU;
 
     /**
      * This is the list of template directories that are considered secure.
      * $template_dir is in this list implicitly.
-     * 
-     * @var array 
+     *
+     * @var array
      */
     public $secure_dir = array();
 
-
     /**
      * This is an array of directories where trusted php scripts reside.
      * {@link $security} is disabled during their inclusion/execution.
-     * 
-     * @var array 
+     *
+     * @var array
      */
     public $trusted_dir = array();
 
+    /**
+     * List of regular expressions (PCRE) that include trusted URIs
+     *
+     * @var array
+     */
+    public $trusted_uri = array();
 
     /**
-     * This is an array of trusted static classes.
+     * List of trusted constants names
      *
+     * @var array
+     */
+    public $trusted_constants = array();
+
+    /**
+     * This is an array of trusted static classes.
      * If empty access to all static classes is allowed.
      * If set to 'none' none is allowed.
-     * @var array 
+     *
+     * @var array
      */
     public $static_classes = array();
 
     /**
-     * This is an array of trusted PHP functions.
+     * This is an nested array of trusted classes and static methods.
+     * If empty access to all static classes and methods is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+     *         'class_2' => array(),                       // all methods of class allowed
+     *       )
+     * If set to null none is allowed.
      *
+     * @var array
+     */
+    public $trusted_static_methods = array();
+
+    /**
+     * This is an array of trusted static properties.
+     * If empty access to all static classes and properties is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+     *         'class_2' => array(),                   // all properties of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_properties = array();
+
+    /**
+     * This is an array of trusted PHP functions.
      * If empty all functions are allowed.
      * To disable all PHP functions set $php_functions = null.
-     * @var array 
+     *
+     * @var array
      */
-    public $php_functions = array('isset', 'empty',
-            'count', 'sizeof','in_array', 'is_array','time','nl2br');
+    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
 
     /**
-     * This is an array of trusted PHP modifers.
-     *
+     * This is an array of trusted PHP modifiers.
      * If empty all modifiers are allowed.
-     * To disable all modifier set $modifiers = null.
-     * @var array 
+     * To disable all modifier set $php_modifiers = null.
+     *
+     * @var array
      */
-    public $php_modifiers = array('escape','count');
+    public $php_modifiers = array('escape', 'count', 'nl2br',);
 
     /**
-     * This is an array of trusted streams.
+     * This is an array of allowed tags.
+     * If empty no restriction by allowed_tags.
+     *
+     * @var array
+     */
+    public $allowed_tags = array();
+
+    /**
+     * This is an array of disabled tags.
+     * If empty no restriction by disabled_tags.
      *
+     * @var array
+     */
+    public $disabled_tags = array();
+
+    /**
+     * This is an array of allowed modifier plugins.
+     * If empty no restriction by allowed_modifiers.
+     *
+     * @var array
+     */
+    public $allowed_modifiers = array();
+
+    /**
+     * This is an array of disabled modifier plugins.
+     * If empty no restriction by disabled_modifiers.
+     *
+     * @var array
+     */
+    public $disabled_modifiers = array();
+
+    /**
+     * This is an array of disabled special $smarty variables.
+     *
+     * @var array
+     */
+    public $disabled_special_smarty_vars = array();
+
+    /**
+     * This is an array of trusted streams.
      * If empty all streams are allowed.
      * To disable all streams set $streams = null.
-     * @var array 
+     *
+     * @var array
      */
     public $streams = array('file');
+
     /**
      * + flag if constants can be accessed from template
+     *
+     * @var boolean
      */
     public $allow_constants = true;
+
     /**
      * + flag if super globals can be accessed from template
+     *
+     * @var boolean
      */
     public $allow_super_globals = true;
+
+    /**
+     * max template nesting level
+     *
+     * @var int
+     */
+    public $max_template_nesting = 0;
+
+    /**
+     * current template nesting level
+     *
+     * @var int
+     */
+    private $_current_template_nesting = 0;
+
+    /**
+     * Cache for $resource_dir lookup
+     *
+     * @var array
+     */
+    protected $_resource_dir = array();
+
     /**
-     * + flag if the {php} and {include_php} tag can be executed
+     * Cache for $template_dir lookup
+     *
+     * @var array
      */
-    public $allow_php_tag = false;
+    protected $_template_dir = array();
 
+    /**
+     * Cache for $config_dir lookup
+     *
+     * @var array
+     */
+    protected $_config_dir = array();
+
+    /**
+     * Cache for $secure_dir lookup
+     *
+     * @var array
+     */
+    protected $_secure_dir = array();
+
+    /**
+     * Cache for $php_resource_dir lookup
+     *
+     * @var array
+     */
+    protected $_php_resource_dir = null;
+
+    /**
+     * Cache for $trusted_dir lookup
+     *
+     * @var array
+     */
+    protected $_trusted_dir = null;
+
+    /**
+     * Cache for include path status
+     *
+     * @var bool
+     */
+    protected $_include_path_status = false;
+
+    /**
+     * Cache for $_include_array lookup
+     *
+     * @var array
+     */
+    protected $_include_dir = array();
+
+    /**
+     * @param Smarty $smarty
+     */
     public function __construct($smarty)
     {
-        $this->smarty = $smarty; 
-	}
+        $this->smarty = $smarty;
+    }
+
     /**
      * Check if PHP function is trusted.
-     * 
-     * @param string $function_name 
+     *
+     * @param string $function_name
      * @param object $compiler compiler object
-     * @return boolean true if function is trusted
+     *
+     * @return boolean                 true if function is trusted
      */
-    function isTrustedPhpFunction($function_name, $compiler)
+    public function isTrustedPhpFunction($function_name, $compiler)
     {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
+        if (isset($this->php_functions)
+            && (empty($this->php_functions) || in_array($function_name, $this->php_functions))
+        ) {
             return true;
-        } else {
-            $compiler->trigger_template_error ("PHP function '{$function_name}' not allowed by security setting");
-            return false;
-        } 
-    } 
+        }
+        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
 
     /**
      * Check if static class is trusted.
-     * 
-     * @param string $class_name 
+     *
+     * @param string $class_name
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if class is trusted
+     */
+    public function isTrustedStaticClass($class_name, $compiler)
+    {
+        if (isset($this->static_classes)
+            && (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+        ) {
+            return true;
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if static class method/property is trusted.
+     *
+     * @param string $class_name
+     * @param string $params
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if class method is trusted
+     */
+    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+    {
+        if (!isset($params[ 2 ])) {
+            // fall back
+            return $this->isTrustedStaticClass($class_name, $compiler);
+        }
+        if ($params[ 2 ] === 'method') {
+            $allowed = $this->trusted_static_methods;
+            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
+        } else {
+            $allowed = $this->trusted_static_properties;
+            // strip '$'
+            $name = substr($params[ 0 ], 1);
+        }
+        if (isset($allowed)) {
+            if (empty($allowed)) {
+                // fall back
+                return $this->isTrustedStaticClass($class_name, $compiler);
+            }
+            if (isset($allowed[ $class_name ])
+                && (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+            ) {
+                return true;
+            }
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if PHP modifier is trusted.
+     *
+     * @param string $modifier_name
      * @param object $compiler compiler object
-     * @return boolean true if class is trusted
+     *
+     * @return boolean                 true if modifier is trusted
      */
-    function isTrustedStaticClass($class_name, $compiler)
+    public function isTrustedPhpModifier($modifier_name, $compiler)
     {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+        if (isset($this->php_modifiers)
+            && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+        ) {
+            return true;
+        }
+        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if tag is trusted.
+     *
+     * @param string $tag_name
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     */
+    public function isTrustedTag($tag_name, $compiler)
+    {
+        // check for internal always required tags
+        if (in_array(
+            $tag_name,
+            array(
+                'assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
+                'private_object_block_function', 'private_object_function', 'private_registered_function',
+                'private_registered_block', 'private_special_variable', 'private_print_expression',
+                'private_modifier'
+            )
+        )
+        ) {
+            return true;
+        }
+        // check security settings
+        if (empty($this->allowed_tags)) {
+            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+                return true;
+            } else {
+                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
+            }
+        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
             return true;
         } else {
-            $compiler->trigger_template_error ("access to static class '{$class_name}' not allowed by security setting");
-            return false;
-        } 
-    } 
-    /**
-     * Check if modifier is trusted.
-     * 
-     * @param string $modifier_name 
+            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if special $smarty variable is trusted.
+     *
+     * @param string $var_name
      * @param object $compiler compiler object
-     * @return boolean true if modifier is trusted
+     *
+     * @return boolean                 true if tag is trusted
      */
-    function isTrustedModifier($modifier_name, $compiler)
+    public function isTrustedSpecialSmartyVar($var_name, $compiler)
     {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
             return true;
         } else {
-            $compiler->trigger_template_error ("modifier '{$modifier_name}' not allowed by security setting");
-            return false;
-        } 
-    } 
+            $compiler->trigger_template_error(
+                "special variable '\$smarty.{$var_name}' not allowed by security setting",
+                null,
+                true
+            );
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
     /**
-     * Check if stream is trusted.
-     * 
-     * @param string $stream_name 
+     * Check if modifier plugin is trusted.
+     *
+     * @param string $modifier_name
      * @param object $compiler compiler object
-     * @return boolean true if stream is trusted
+     *
+     * @return boolean                 true if tag is trusted
      */
-    function isTrustedStream($stream_name)
+    public function isTrustedModifier($modifier_name, $compiler)
     {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+        // check for internal always allowed modifier
+        if (in_array($modifier_name, array('default'))) {
+            return true;
+        }
+        // check security settings
+        if (empty($this->allowed_modifiers)) {
+            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+                return true;
+            } else {
+                $compiler->trigger_template_error(
+                    "modifier '{$modifier_name}' disabled by security setting",
+                    null,
+                    true
+                );
+            }
+        } elseif (in_array($modifier_name, $this->allowed_modifiers)
+                  && !in_array($modifier_name, $this->disabled_modifiers)
+        ) {
             return true;
         } else {
-            throw new SmartyException ("stream '{$stream_name}' not allowed by security setting");
-            return false;
-        } 
-    } 
+            $compiler->trigger_template_error(
+                "modifier '{$modifier_name}' not allowed by security setting",
+                null,
+                true
+            );
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
 
     /**
-     * Check if directory of file resource is trusted.
-     * 
-     * @param string $filepath 
+     * Check if constants are enabled or trusted
+     *
+     * @param string $const    constant name
      * @param object $compiler compiler object
-     * @return boolean true if directory is trusted
+     *
+     * @return bool
      */
-    function isTrustedResourceDir($filepath)
+    public function isTrustedConstant($const, $compiler)
     {
-        $_rp = realpath($filepath);
-        if (isset($this->smarty->template_dir)) {
-            foreach ((array)$this->smarty->template_dir as $curr_dir) {
-                if (($_cd = realpath($curr_dir)) !== false &&
-                        strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                        (strlen($_rp) == strlen($_cd) || substr($_rp, strlen($_cd), 1) == DS)) {
-                    return true;
-                } 
-            } 
-        } 
-        if (!empty($this->smarty->security_policy->secure_dir)) {
-            foreach ((array)$this->smarty->security_policy->secure_dir as $curr_dir) {
-                if (($_cd = realpath($curr_dir)) !== false) {
-                    if ($_cd == $_rp) {
-                        return true;
-                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                            (strlen($_rp) == strlen($_cd) || substr($_rp, strlen($_cd), 1) == DS)) {
-                        return true;
-                    } 
-                } 
-            } 
-        } 
-
-        throw new SmartyException ("directory '{$_rp}' not allowed by security setting");
+        if (in_array($const, array('true', 'false', 'null'))) {
+            return true;
+        }
+        if (!empty($this->trusted_constants)) {
+            if (!in_array(strtolower($const), $this->trusted_constants)) {
+                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+                return false;
+            }
+            return true;
+        }
+        if ($this->allow_constants) {
+            return true;
+        }
+        $compiler->trigger_template_error("Security: access to constants not permitted");
         return false;
-    } 
-    
+    }
+
+    /**
+     * Check if stream is trusted.
+     *
+     * @param string $stream_name
+     *
+     * @return boolean         true if stream is trusted
+     * @throws SmartyException if stream is not trusted
+     */
+    public function isTrustedStream($stream_name)
+    {
+        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+            return true;
+        }
+        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
+    }
+
     /**
      * Check if directory of file resource is trusted.
-     * 
-     * @param string $filepath 
-     * @param object $compiler compiler object
-     * @return boolean true if directory is trusted
-     */
-    function isTrustedPHPDir($filepath)
-    {
-        $_rp = realpath($filepath);
-        if (!empty($this->trusted_dir)) {
-            foreach ((array)$this->trusted_dir as $curr_dir) {
-                if (($_cd = realpath($curr_dir)) !== false) {
-                    if ($_cd == $_rp) {
-                        return true;
-                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                            substr($_rp, strlen($_cd), 1) == DS) {
-                        return true;
-                    } 
-                } 
-            } 
-        } 
-
-        throw new SmartyException ("directory '{$_rp}' not allowed by security setting");
-        return false;
-    } 
-} 
+     *
+     * @param string    $filepath
+     * @param null|bool $isConfig
+     *
+     * @return bool true if directory is trusted
+     * @throws \SmartyException if directory is not trusted
+     */
+    public function isTrustedResourceDir($filepath, $isConfig = null)
+    {
+        if ($this->_include_path_status !== $this->smarty->use_include_path) {
+            $_dir =
+                $this->smarty->use_include_path ? $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty) : array();
+            if ($this->_include_dir !== $_dir) {
+                $this->_updateResourceDir($this->_include_dir, $_dir);
+                $this->_include_dir = $_dir;
+            }
+            $this->_include_path_status = $this->smarty->use_include_path;
+        }
+        $_dir = $this->smarty->getTemplateDir();
+        if ($this->_template_dir !== $_dir) {
+            $this->_updateResourceDir($this->_template_dir, $_dir);
+            $this->_template_dir = $_dir;
+        }
+        $_dir = $this->smarty->getConfigDir();
+        if ($this->_config_dir !== $_dir) {
+            $this->_updateResourceDir($this->_config_dir, $_dir);
+            $this->_config_dir = $_dir;
+        }
+        if ($this->_secure_dir !== $this->secure_dir) {
+            $this->secure_dir = (array)$this->secure_dir;
+            foreach ($this->secure_dir as $k => $d) {
+                $this->secure_dir[ $k ] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true);
+            }
+            $this->_updateResourceDir($this->_secure_dir, $this->secure_dir);
+            $this->_secure_dir = $this->secure_dir;
+        }
+        $addPath = $this->_checkDir($filepath, $this->_resource_dir);
+        if ($addPath !== false) {
+            $this->_resource_dir = array_merge($this->_resource_dir, $addPath);
+        }
+        return true;
+    }
+
+    /**
+     * Check if URI (e.g. {fetch} or {html_image}) is trusted
+     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+     *
+     * @param string $uri
+     *
+     * @return boolean         true if URI is trusted
+     * @throws SmartyException if URI is not trusted
+     * @uses   $trusted_uri for list of patterns to match against $uri
+     */
+    public function isTrustedUri($uri)
+    {
+        $_uri = parse_url($uri);
+        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
+            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
+            foreach ($this->trusted_uri as $pattern) {
+                if (preg_match($pattern, $_uri)) {
+                    return true;
+                }
+            }
+        }
+        throw new SmartyException("URI '{$uri}' not allowed by security setting");
+    }
+
+    /**
+     * Check if directory of file resource is trusted.
+     *
+     * @param string $filepath
+     *
+     * @return boolean         true if directory is trusted
+     * @throws SmartyException if PHP directory is not trusted
+     */
+    public function isTrustedPHPDir($filepath)
+    {
+        if (empty($this->trusted_dir)) {
+            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
+        }
+        // check if index is outdated
+        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
+            $this->_php_resource_dir = array();
+            $this->_trusted_dir = $this->trusted_dir;
+            foreach ((array)$this->trusted_dir as $directory) {
+                $directory = $this->smarty->_realpath($directory . '/', true);
+                $this->_php_resource_dir[ $directory ] = true;
+            }
+        }
+        $addPath = $this->_checkDir($filepath, $this->_php_resource_dir);
+        if ($addPath !== false) {
+            $this->_php_resource_dir = array_merge($this->_php_resource_dir, $addPath);
+        }
+        return true;
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Remove old directories and its sub folders, add new directories
+     *
+     * @param array $oldDir
+     * @param array $newDir
+     */
+    private function _updateResourceDir($oldDir, $newDir)
+    {
+        foreach ($oldDir as $directory) {
+            //           $directory = $this->smarty->_realpath($directory, true);
+            $length = strlen($directory);
+            foreach ($this->_resource_dir as $dir) {
+                if (substr($dir, 0, $length) === $directory) {
+                    unset($this->_resource_dir[ $dir ]);
+                }
+            }
+        }
+        foreach ($newDir as $directory) {
+            //           $directory = $this->smarty->_realpath($directory, true);
+            $this->_resource_dir[ $directory ] = true;
+        }
+    }
+
+    /**
+     * Check if file is inside a valid directory
+     *
+     * @param string $filepath
+     * @param array  $dirs valid directories
+     *
+     * @return array|bool
+     * @throws \SmartyException
+     */
+    private function _checkDir($filepath, $dirs)
+    {
+        $directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR;
+        $_directory = array();
+        if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) {
+            while (true) {
+                // test if the directory is trusted
+                if (isset($dirs[ $directory ])) {
+                    return $_directory;
+                }
+                // abort if we've reached root
+                if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) {
+                    // give up
+                    break;
+                }
+                // remember the directory to add it to _resource_dir in case we're successful
+                $_directory[ $directory ] = true;
+                // bubble up one level
+                $directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory);
+            }
+        }
+        // give up
+        throw new SmartyException(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath));
+    }
+
+    /**
+     * Loads security class and enables security
+     *
+     * @param \Smarty                $smarty
+     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return \Smarty current Smarty instance for chaining
+     * @throws \SmartyException when an invalid class name is provided
+     */
+    public static function enableSecurity(Smarty $smarty, $security_class)
+    {
+        if ($security_class instanceof Smarty_Security) {
+            $smarty->security_policy = $security_class;
+            return $smarty;
+        } elseif (is_object($security_class)) {
+            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+        }
+        if ($security_class === null) {
+            $security_class = $smarty->security_class;
+        }
+        if (!class_exists($security_class)) {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+        } else {
+            $smarty->security_policy = new $security_class($smarty);
+        }
+        return $smarty;
+    }
+
+    /**
+     * Start template processing
+     *
+     * @param $template
+     *
+     * @throws SmartyException
+     */
+    public function startTemplate($template)
+    {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
+            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+        }
+    }
+
+    /**
+     * Exit template processing
+     */
+    public function endTemplate()
+    {
+        if ($this->max_template_nesting > 0) {
+            $this->_current_template_nesting--;
+        }
+    }
+
+    /**
+     * Register callback functions call at start/end of template rendering
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function registerCallBacks(Smarty_Internal_Template $template)
+    {
+        $template->startRenderCallbacks[] = array($this, 'startTemplate');
+        $template->endRenderCallbacks[] = array($this, 'endTemplate');
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_template_cached.php b/WEB-INF/lib/smarty/sysplugins/smarty_template_cached.php
new file mode 100644
index 000000000..508d27f36
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_template_cached.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Uwe Tews
+ * Date: 04.12.2014
+ * Time: 06:08
+ */
+
+/**
+ * Smarty Resource Data Object
+ * Cache Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Cached extends Smarty_Template_Resource_Base
+{
+    /**
+     * Cache Is Valid
+     *
+     * @var boolean
+     */
+    public $valid = null;
+
+    /**
+     * CacheResource Handler
+     *
+     * @var Smarty_CacheResource
+     */
+    public $handler = null;
+
+    /**
+     * Template Cache Id (Smarty_Internal_Template::$cache_id)
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * saved cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 0;
+
+    /**
+     * Id for cache locking
+     *
+     * @var string
+     */
+    public $lock_id = null;
+
+    /**
+     * flag that cache is locked by this instance
+     *
+     * @var bool
+     */
+    public $is_locked = false;
+
+    /**
+     * Source Object
+     *
+     * @var Smarty_Template_Source
+     */
+    public $source = null;
+
+    /**
+     * Nocache hash codes of processed compiled templates
+     *
+     * @var array
+     */
+    public $hashes = array();
+
+    /**
+     * Flag if this is a cache resource
+     *
+     * @var bool
+     */
+    public $isCache = true;
+
+    /**
+     * create Cached Object container
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws \SmartyException
+     */
+    public function __construct(Smarty_Internal_Template $_template)
+    {
+        $this->compile_id = $_template->compile_id;
+        $this->cache_id = $_template->cache_id;
+        $this->source = $_template->source;
+        if (!class_exists('Smarty_CacheResource', false)) {
+            include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+        }
+        $this->handler = Smarty_CacheResource::load($_template->smarty);
+    }
+
+    /**
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return Smarty_Template_Cached
+     */
+    public static function load(Smarty_Internal_Template $_template)
+    {
+        $_template->cached = new Smarty_Template_Cached($_template);
+        $_template->cached->handler->populate($_template->cached, $_template);
+        // caching enabled ?
+        if (!$_template->caching || $_template->source->handler->recompiled
+        ) {
+            $_template->cached->valid = false;
+        }
+        return $_template->cached;
+    }
+
+    /**
+     * Render cache template
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param bool                      $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function render(Smarty_Internal_Template $_template, $no_output_filter = true)
+    {
+        if ($this->isCached($_template)) {
+            if ($_template->smarty->debugging) {
+                if (!isset($_template->smarty->_debug)) {
+                    $_template->smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $_template->smarty->_debug->start_cache($_template);
+            }
+            if (!$this->processed) {
+                $this->process($_template);
+            }
+            $this->getRenderedTemplateCode($_template);
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_cache($_template);
+            }
+            return;
+        } else {
+            $_template->smarty->ext->_updateCache->updateCache($this, $_template, $no_output_filter);
+        }
+    }
+
+    /**
+     * Check if cache is valid, lock cache if required
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool flag true if cache is valid
+     */
+    public function isCached(Smarty_Internal_Template $_template)
+    {
+        if ($this->valid !== null) {
+            return $this->valid;
+        }
+        while (true) {
+            while (true) {
+                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                    $this->valid = false;
+                } else {
+                    $this->valid = true;
+                }
+                if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT
+                    && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+                ) {
+                    // lifetime expired
+                    $this->valid = false;
+                }
+                if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON
+                    && $_template->source->getTimeStamp() > $this->timestamp
+                ) {
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
+                    break;
+                }
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                    break 2;
+                }
+                $this->handler->populate($this, $_template);
+            }
+            if ($this->valid) {
+                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
+                    // load cache file for the following checks
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->start_cache($_template);
+                    }
+                    if ($this->handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->end_cache($_template);
+                    }
+                } else {
+                    $this->is_locked = true;
+                    continue;
+                }
+            } else {
+                return $this->valid;
+            }
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED
+                && $_template->cached->cache_lifetime >= 0
+                && (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
+            ) {
+                $this->valid = false;
+            }
+            if ($_template->smarty->cache_locking) {
+                if (!$this->valid) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                } elseif ($this->is_locked) {
+                    $this->handler->releaseLock($_template->smarty, $this);
+                }
+            }
+            return $this->valid;
+        }
+        return $this->valid;
+    }
+
+    /**
+     * Process cached template
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param bool                     $update    flag if called because cache update
+     */
+    public function process(Smarty_Internal_Template $_template, $update = false)
+    {
+        if ($this->handler->process($_template, $this, $update) === false) {
+            $this->valid = false;
+        }
+        if ($this->valid) {
+            $this->processed = true;
+        } else {
+            $this->processed = false;
+        }
+    }
+
+    /**
+     * Read cache content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|false content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return $this->handler->readCachedContent($_template);
+        }
+        return false;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_template_compiled.php b/WEB-INF/lib/smarty/sysplugins/smarty_template_compiled.php
new file mode 100644
index 000000000..37d8f0a9e
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_template_compiled.php
@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ * @property   string $content compiled content
+ */
+class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
+{
+    /**
+     * nocache hash
+     *
+     * @var string|null
+     */
+    public $nocache_hash = null;
+
+    /**
+     * get a Compiled Object of this source
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return Smarty_Template_Compiled compiled object
+     */
+    public static function load($_template)
+    {
+        $compiled = new Smarty_Template_Compiled();
+        if ($_template->source->handler->hasCompiledHandler) {
+            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
+        } else {
+            $compiled->populateCompiledFilepath($_template);
+        }
+        return $compiled;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Internal_Template $_template template object
+     **/
+    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
+    {
+        $source = &$_template->source;
+        $smarty = &$_template->smarty;
+        $this->filepath = $smarty->getCompileDir();
+        if (isset($_template->compile_id)) {
+            $this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
+                               ($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
+        }
+        // if use_sub_dirs, break file into directories
+        if ($smarty->use_sub_dirs) {
+            $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . DIRECTORY_SEPARATOR . $source->uid[ 2 ] .
+                               $source->uid[ 3 ] . DIRECTORY_SEPARATOR . $source->uid[ 4 ] . $source->uid[ 5 ] .
+                               DIRECTORY_SEPARATOR;
+        }
+        $this->filepath .= $source->uid . '_';
+        if ($source->isConfig) {
+            $this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
+                               (int)$smarty->config_overwrite * 4;
+        } else {
+            $this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 +
+                               (($smarty->merge_compiled_includes && $source->type === 'extends') ?
+                                   (int)$smarty->extends_recursion * 4 : 0);
+        }
+        $this->filepath .= '.' . $source->type;
+        $basename = $source->handler->getBasename($source);
+        if (!empty($basename)) {
+            $this->filepath .= '.' . $basename;
+        }
+        if ($_template->caching) {
+            $this->filepath .= '.cache';
+        }
+        $this->filepath .= '.php';
+        $this->timestamp = $this->exists = is_file($this->filepath);
+        if ($this->exists) {
+            $this->timestamp = filemtime($this->filepath);
+        }
+    }
+
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        // checks if template exists
+        if (!$_template->source->exists) {
+            $type = $_template->source->isConfig ? 'config' : 'template';
+            throw new SmartyException("Unable to load {$type} '{$_template->source->type}:{$_template->source->name}'");
+        }
+        if ($_template->smarty->debugging) {
+            if (!isset($_template->smarty->_debug)) {
+                $_template->smarty->_debug = new Smarty_Internal_Debug();
+            }
+            $_template->smarty->_debug->start_render($_template);
+        }
+        if (!$this->processed) {
+            $this->process($_template);
+        }
+        if (isset($_template->cached)) {
+            $_template->cached->file_dependency =
+                array_merge($_template->cached->file_dependency, $this->file_dependency);
+        }
+        if ($_template->source->handler->uncompiled) {
+            $_template->source->handler->renderUncompiled($_template->source, $_template);
+        } else {
+            $this->getRenderedTemplateCode($_template);
+        }
+        if ($_template->caching && $this->has_nocache_code) {
+            $_template->cached->hashes[ $this->nocache_hash ] = true;
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_render($_template);
+        }
+    }
+
+    /**
+     * load compiled template or compile from source
+     *
+     * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_smarty_tpl)
+    {
+        $source = &$_smarty_tpl->source;
+        $smarty = &$_smarty_tpl->smarty;
+        if ($source->handler->recompiled) {
+            $source->handler->process($_smarty_tpl);
+        } elseif (!$source->handler->uncompiled) {
+            if (!$this->exists || $smarty->force_compile
+                || ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
+            ) {
+                $this->compileTemplateSource($_smarty_tpl);
+                $compileCheck = $_smarty_tpl->compile_check;
+                $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
+                $this->loadCompiledTemplate($_smarty_tpl);
+                $_smarty_tpl->compile_check = $compileCheck;
+            } else {
+                $_smarty_tpl->mustCompile = true;
+                @include $this->filepath;
+                if ($_smarty_tpl->mustCompile) {
+                    $this->compileTemplateSource($_smarty_tpl);
+                    $compileCheck = $_smarty_tpl->compile_check;
+                    $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
+                    $this->loadCompiledTemplate($_smarty_tpl);
+                    $_smarty_tpl->compile_check = $compileCheck;
+                }
+            }
+            $_smarty_tpl->_subTemplateRegister();
+            $this->processed = true;
+        }
+    }
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @throws Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $_template)
+    {
+        $this->file_dependency = array();
+        $this->includes = array();
+        $this->nocache_hash = null;
+        $this->unifunc = null;
+        // compile locking
+        if ($saved_timestamp = (!$_template->source->handler->recompiled && is_file($this->filepath))) {
+            $saved_timestamp = $this->getTimeStamp();
+            touch($this->filepath);
+        }
+        // compile locking
+        try {
+            // call compiler
+            $_template->loadCompiler();
+            $this->write($_template, $_template->compiler->compileTemplate($_template));
+        } catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($saved_timestamp && is_file($this->filepath)) {
+                touch($this->filepath, $saved_timestamp);
+            }
+            unset($_template->compiler);
+            throw $e;
+        }
+        // release compiler object to free memory
+        unset($_template->compiler);
+    }
+
+    /**
+     * Write compiled code by handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $code      compiled code
+     *
+     * @return bool success
+     * @throws \SmartyException
+     */
+    public function write(Smarty_Internal_Template $_template, $code)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($_template->smarty->ext->_writeFile->writeFile($this->filepath, $code, $_template->smarty) === true) {
+                $this->timestamp = $this->exists = is_file($this->filepath);
+                if ($this->exists) {
+                    $this->timestamp = filemtime($this->filepath);
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Read compiled content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return file_get_contents($this->filepath);
+        }
+        return isset($this->content) ? $this->content : false;
+    }
+
+    /**
+     * Load fresh compiled template by including the PHP file
+     * HHVM requires a work around because of a PHP incompatibility
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     */
+    private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl)
+    {
+        if (function_exists('opcache_invalidate')
+            && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+        ) {
+            opcache_invalidate($this->filepath, true);
+        } elseif (function_exists('apc_compile_file')) {
+            apc_compile_file($this->filepath);
+        }
+        if (defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($this->filepath));
+        } else {
+            include $this->filepath;
+        }
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_template_config.php b/WEB-INF/lib/smarty/sysplugins/smarty_template_config.php
new file mode 100644
index 000000000..850ae32e7
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_template_config.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Smarty Config Source Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Config Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+class Smarty_Template_Config extends Smarty_Template_Source
+{
+    /**
+     * array of section names, single section or null
+     *
+     * @var null|string|array
+     */
+    public $config_sections = null;
+
+    /**
+     * scope into which the config variables shall be loaded
+     *
+     * @var int
+     */
+    public $scope = 0;
+
+    /**
+     * Flag that source is a config file
+     *
+     * @var bool
+     */
+    public $isConfig = true;
+
+    /**
+     * Name of the Class to compile this resource's contents with
+     *
+     * @var string
+     */
+    public $compiler_class = 'Smarty_Internal_Config_File_Compiler';
+
+    /**
+     * Name of the Class to tokenize this resource's contents with
+     *
+     * @var string
+     */
+    public $template_lexer_class = 'Smarty_Internal_Configfilelexer';
+
+    /**
+     * Name of the Class to parse this resource's contents with
+     *
+     * @var string
+     */
+    public $template_parser_class = 'Smarty_Internal_Configfileparser';
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Config Source Object
+     * @throws SmartyException
+     */
+    public static function load(
+        Smarty_Internal_Template $_template = null,
+        Smarty $smarty = null,
+        $template_resource = null
+    ) {
+        static $_incompatible_resources = array('extends' => true, 'php' => true);
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Source: Missing  name');
+        }
+        // parse resource_name, load resource handler
+        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type);
+        // make sure configs are not loaded via anything smarty can't handle
+        if (isset($_incompatible_resources[ $type ])) {
+            throw new SmartyException("Unable to use resource '{$type}' for config");
+        }
+        $source = new Smarty_Template_Config($smarty, $template_resource, $type, $name);
+        $source->handler->populate($source, $_template);
+        if (!$source->exists && isset($smarty->default_config_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+            $source->handler->populate($source, $_template);
+        }
+        return $source;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_template_resource_base.php b/WEB-INF/lib/smarty/sysplugins/smarty_template_resource_base.php
new file mode 100644
index 000000000..52bfba252
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_template_resource_base.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * Smarty Template Resource Base Object
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_Template_Resource_Base
+{
+    /**
+     * Compiled Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Compiled Timestamp
+     *
+     * @var integer|bool
+     */
+    public $timestamp = false;
+
+    /**
+     * Compiled Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Template Compile Id (Smarty_Internal_Template::$compile_id)
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * Compiled Content Loaded
+     *
+     * @var boolean
+     */
+    public $processed = false;
+
+    /**
+     * unique function name for compiled template code
+     *
+     * @var string
+     */
+    public $unifunc = '';
+
+    /**
+     * flag if template does contain nocache code sections
+     *
+     * @var bool
+     */
+    public $has_nocache_code = false;
+
+    /**
+     * resource file dependency
+     *
+     * @var array
+     */
+    public $file_dependency = array();
+
+    /**
+     * Content buffer
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * Included sub templates
+     * - index name
+     * - value use count
+     *
+     * @var int[]
+     */
+    public $includes = array();
+
+    /**
+     * Flag if this is a cache resource
+     *
+     * @var bool
+     */
+    public $isCache = false;
+
+    /**
+     * Process resource
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function process(Smarty_Internal_Template $_template);
+
+    /**
+     * get rendered template content by calling compiled or cached template code
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $unifunc function with template code
+     *
+     * @throws \Exception
+     */
+    public function getRenderedTemplateCode(Smarty_Internal_Template $_template, $unifunc = null)
+    {
+        $smarty = &$_template->smarty;
+        $_template->isRenderingCache = $this->isCache;
+        $level = ob_get_level();
+        try {
+            if (!isset($unifunc)) {
+                $unifunc = $this->unifunc;
+            }
+            if (empty($unifunc) || !function_exists($unifunc)) {
+                throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
+            }
+            if ($_template->startRenderCallbacks) {
+                foreach ($_template->startRenderCallbacks as $callback) {
+                    call_user_func($callback, $_template);
+                }
+            }
+            $unifunc($_template);
+            foreach ($_template->endRenderCallbacks as $callback) {
+                call_user_func($callback, $_template);
+            }
+            $_template->isRenderingCache = false;
+        } catch (Exception $e) {
+            $_template->isRenderingCache = false;
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            if (isset($smarty->security_policy)) {
+                $smarty->security_policy->endTemplate();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Get compiled time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if ($this->exists && !$this->timestamp) {
+            $this->timestamp = filemtime($this->filepath);
+        }
+        return $this->timestamp;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_template_source.php b/WEB-INF/lib/smarty/sysplugins/smarty_template_source.php
new file mode 100644
index 000000000..16b47f23c
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_template_source.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Source
+{
+    /**
+     * Unique Template ID
+     *
+     * @var string
+     */
+    public $uid = null;
+
+    /**
+     * Template Resource (Smarty_Internal_Template::$template_resource)
+     *
+     * @var string
+     */
+    public $resource = null;
+
+    /**
+     * Resource Type
+     *
+     * @var string
+     */
+    public $type = null;
+
+    /**
+     * Resource Name
+     *
+     * @var string
+     */
+    public $name = null;
+
+    /**
+     * Source Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Source Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Source Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Source File Base name
+     *
+     * @var string
+     */
+    public $basename = null;
+
+    /**
+     * The Components an extended template is made of
+     *
+     * @var \Smarty_Template_Source[]
+     */
+    public $components = null;
+
+    /**
+     * Resource Handler
+     *
+     * @var \Smarty_Resource
+     */
+    public $handler = null;
+
+    /**
+     * Smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Resource is source
+     *
+     * @var bool
+     */
+    public $isConfig = false;
+
+    /**
+     * Template source content eventually set by default handler
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * Name of the Class to compile this resource's contents with
+     *
+     * @var string
+     */
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+
+    /**
+     * Name of the Class to tokenize this resource's contents with
+     *
+     * @var string
+     */
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+
+    /**
+     * Name of the Class to parse this resource's contents with
+     *
+     * @var string
+     */
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty $smarty   Smarty instance this source object belongs to
+     * @param string $resource full template_resource
+     * @param string $type     type of resource
+     * @param string $name     resource name
+     *
+     * @throws   \SmartyException
+     * @internal param \Smarty_Resource $handler Resource Handler this source object communicates with
+     */
+    public function __construct(Smarty $smarty, $resource, $type, $name)
+    {
+        $this->handler =
+            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
+                Smarty_Resource::load($smarty, $type);
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Source Source Object
+     * @throws SmartyException
+     */
+    public static function load(
+        Smarty_Internal_Template $_template = null,
+        Smarty $smarty = null,
+        $template_resource = null
+    ) {
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Source: Missing  name');
+        }
+        // parse resource_name, load resource handler, identify unique resource name
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+            $type = $match[ 1 ];
+            $name = $match[ 2 ];
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $smarty->default_resource_type;
+            $name = $template_resource;
+        }
+        // create new source  object
+        $source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
+        $source->handler->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+            $source->handler->populate($source, $_template);
+        }
+        return $source;
+    }
+
+    /**
+     * Get source time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if (!isset($this->timestamp)) {
+            $this->handler->populateTimestamp($this);
+        }
+        return $this->timestamp;
+    }
+
+    /**
+     * Get source content
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function getContent()
+    {
+        return isset($this->content) ? $this->content : $this->handler->getContent($this);
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_undefined_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_undefined_variable.php
new file mode 100644
index 000000000..6d31a8a05
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_undefined_variable.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Undefined_Variable extends Smarty_Variable
+{
+    /**
+     * Returns null for not existing properties
+     *
+     * @param string $name
+     *
+     * @return null
+     */
+    public function __get($name)
+    {
+        return null;
+    }
+
+    /**
+     * Always returns an empty string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return '';
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
new file mode 100644
index 000000000..914d99bd7
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    public $nocache = false;
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string)$this->value;
+    }
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
new file mode 100644
index 000000000..f7ad39b93
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Smarty compiler exception class
+ *
+ * @package Smarty
+ */
+class SmartyCompilerException extends SmartyException
+{
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+
+    /**
+     * The line number of the template error
+     *
+     * @type int|null
+     */
+    public $line = null;
+
+    /**
+     * The template source snippet relating to the error
+     *
+     * @type string|null
+     */
+    public $source = null;
+
+    /**
+     * The raw text of the error message
+     *
+     * @type string|null
+     */
+    public $desc = null;
+
+    /**
+     * The resource identifier or template name
+     *
+     * @type string|null
+     */
+    public $template = null;
+}
diff --git a/WEB-INF/lib/smarty/sysplugins/smartyexception.php b/WEB-INF/lib/smarty/sysplugins/smartyexception.php
new file mode 100644
index 000000000..7f7b9aa43
--- /dev/null
+++ b/WEB-INF/lib/smarty/sysplugins/smartyexception.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Smarty exception class
+ *
+ * @package Smarty
+ */
+class SmartyException extends Exception
+{
+    public static $escape = false;
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
+    }
+}

From 3ee662bebf8081b7dc65efcb24342943e55313fc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Oct 2020 21:20:10 +0000
Subject: [PATCH 1335/1848] Some fixes for no longer supported libchart library
 to remove PHP warnings.

---
 WEB-INF/lib/libchart/classes/libchart.php                 | 2 +-
 WEB-INF/lib/libchart/classes/model/Point.php              | 6 +++---
 WEB-INF/lib/libchart/classes/model/XYDataSet.php          | 6 +++---
 WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php    | 6 +++---
 WEB-INF/lib/libchart/classes/view/axis/Axis.php           | 6 +++---
 WEB-INF/lib/libchart/classes/view/caption/Caption.php     | 6 +++---
 WEB-INF/lib/libchart/classes/view/chart/BarChart.php      | 8 ++++----
 WEB-INF/lib/libchart/classes/view/chart/Chart.php         | 6 +++---
 .../libchart/classes/view/chart/HorizontalBarChart.php    | 8 ++++----
 WEB-INF/lib/libchart/classes/view/chart/LineChart.php     | 8 ++++----
 WEB-INF/lib/libchart/classes/view/chart/PieChart.php      | 8 +++-----
 .../lib/libchart/classes/view/chart/VerticalBarChart.php  | 8 ++++----
 WEB-INF/lib/libchart/classes/view/color/Color.php         | 6 +++---
 WEB-INF/lib/libchart/classes/view/color/ColorSet.php      | 6 +++---
 WEB-INF/lib/libchart/classes/view/color/Palette.php       | 6 +++---
 WEB-INF/lib/libchart/classes/view/plot/Plot.php           | 6 +++---
 WEB-INF/lib/libchart/classes/view/primitive/Padding.php   | 6 +++---
 WEB-INF/lib/libchart/classes/view/primitive/Primitive.php | 6 +++---
 WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php | 6 +++---
 WEB-INF/lib/libchart/classes/view/text/Text.php           | 6 +++---
 initialize.php                                            | 2 +-
 21 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/WEB-INF/lib/libchart/classes/libchart.php b/WEB-INF/lib/libchart/classes/libchart.php
index f84210fbb..5fc668d79 100644
--- a/WEB-INF/lib/libchart/classes/libchart.php
+++ b/WEB-INF/lib/libchart/classes/libchart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
diff --git a/WEB-INF/lib/libchart/classes/model/Point.php b/WEB-INF/lib/libchart/classes/model/Point.php
index 79d6cac40..e6c64a8cf 100644
--- a/WEB-INF/lib/libchart/classes/model/Point.php
+++ b/WEB-INF/lib/libchart/classes/model/Point.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 	 * Point of coordinates (X,Y).
 	 * The value of X isn't really of interest, but X is used as a label to display on the horizontal axis.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class Point {
 		private $x;
@@ -33,7 +33,7 @@ class Point {
 		 * @param integer x coordinate (label)
 		 * @param integer y coordinate (value)
 		 */
-		public function Point($x, $y) {
+		public function __construct($x, $y) {
 			$this->x = $x;
 			$this->y = $y;
 		}
diff --git a/WEB-INF/lib/libchart/classes/model/XYDataSet.php b/WEB-INF/lib/libchart/classes/model/XYDataSet.php
index 2713c2985..3190e16c7 100644
--- a/WEB-INF/lib/libchart/classes/model/XYDataSet.php
+++ b/WEB-INF/lib/libchart/classes/model/XYDataSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Set of data in the form of (x, y) items.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * Created on 10 may 2007
 	 */
 	class XYDataSet extends DataSet {
@@ -30,7 +30,7 @@ class XYDataSet extends DataSet {
 		 * Constructor of XYDataSet.
 		 *
 		 */
-		public function XYDataSet() {
+		public function __construct() {
 			$this->pointList = array();
 		}
 	
diff --git a/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php b/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php
index 45f961c5f..8b8d88699 100644
--- a/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php
+++ b/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 	 * This dataset comprises several series of points and is used to plot multiple lines charts.
 	 * Each serie is a XYDataSet.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * Created on 20 july 2007
 	 */
 	class XYSeriesDataSet extends DataSet {
@@ -39,7 +39,7 @@ class XYSeriesDataSet extends DataSet {
 		 * Constructor of XYSeriesDataSet.
 		 *
 		 */
-		public function XYSeriesDataSet() {
+		public function __construct() {
 			$this->titleList = array();
 			$this->serieList = array();
 		}
diff --git a/WEB-INF/lib/libchart/classes/view/axis/Axis.php b/WEB-INF/lib/libchart/classes/view/axis/Axis.php
index 885019639..fe14671b3 100644
--- a/WEB-INF/lib/libchart/classes/view/axis/Axis.php
+++ b/WEB-INF/lib/libchart/classes/view/axis/Axis.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Automatic axis boundaries and ticks calibration
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class Axis {
 		private $min;
@@ -38,7 +38,7 @@ class Axis {
 		 * @param integer minimum value on the axis
 		 * @param integer maximum value on the axis
 		 */
-		public function Axis($min, $max) {
+		public function __construct($min, $max) {
 			$this->min = $min;
 			$this->max = $max;
 
diff --git a/WEB-INF/lib/libchart/classes/view/caption/Caption.php b/WEB-INF/lib/libchart/classes/view/caption/Caption.php
index 9a48b49d0..4b5c40192 100644
--- a/WEB-INF/lib/libchart/classes/view/caption/Caption.php
+++ b/WEB-INF/lib/libchart/classes/view/caption/Caption.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Caption.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * Created on 30 july 2007
 	 */
 	class Caption {
@@ -39,7 +39,7 @@ class Caption {
 		/**
 		 * Constructor of Caption
 		 */
-		public function Caption() {
+		public function __construct() {
 			$this->labelBoxWidth = 15;
 			$this->labelBoxHeight = 15;
 		}
diff --git a/WEB-INF/lib/libchart/classes/view/chart/BarChart.php b/WEB-INF/lib/libchart/classes/view/chart/BarChart.php
index c5d9b82a0..b14b45e36 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/BarChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/BarChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Base abstract class for rendering both horizontal and vertical bar charts.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	abstract class BarChart extends Chart {
 		protected $bound;
@@ -33,8 +33,8 @@ abstract class BarChart extends Chart {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		protected function BarChart($width, $height) {
-			parent::Chart($width, $height);
+		protected function __construct($width, $height) {
+			parent::__construct($width, $height);
 
 			// Initialize the bounds
 			$this->bound = new Bound();
diff --git a/WEB-INF/lib/libchart/classes/view/chart/Chart.php b/WEB-INF/lib/libchart/classes/view/chart/Chart.php
index 599b98fec..99cbde161 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/Chart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/Chart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 	/**
 	 * Base chart class.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	abstract class Chart {
 		/**
@@ -46,7 +46,7 @@ abstract class Chart {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		protected function Chart($width, $height) {
+		protected function __construct($width, $height) {
 			// Creates the plot
 			$this->plot = new Plot($width, $height);
 			$this->plot->setTitle("Untitled chart");
diff --git a/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php b/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php
index 5faad4997..a4bd644d5 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Horizontal bar chart
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class HorizontalBarChart extends BarChart {
 		/**
@@ -34,8 +34,8 @@ class HorizontalBarChart extends BarChart {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		public function HorizontalBarChart($width = 600, $height = 250) {
-			parent::BarChart($width, $height);
+		public function __construct($width = 600, $height = 250) {
+			parent::__construct($width, $height);
 
 			$this->emptyToFullRatio = 1 / 5;
 			$this->plot->setGraphPadding(new Padding(5, 30, 30, 50));
diff --git a/WEB-INF/lib/libchart/classes/view/chart/LineChart.php b/WEB-INF/lib/libchart/classes/view/chart/LineChart.php
index 811a060cc..b3a22cf06 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/LineChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/LineChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Line chart.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class LineChart extends BarChart {
 		/**
@@ -30,8 +30,8 @@ class LineChart extends BarChart {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		public function LineChart($width = 600, $height = 250) {
-			parent::BarChart($width, $height);
+		public function __construct($width = 600, $height = 250) {
+			parent::__contruct($width, $height);
 
 			$this->plot->setGraphPadding(new Padding(5, 30, 50, 50));
 		}
diff --git a/WEB-INF/lib/libchart/classes/view/chart/PieChart.php b/WEB-INF/lib/libchart/classes/view/chart/PieChart.php
index 108b5927e..7d87782cd 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/PieChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/PieChart.php
@@ -32,8 +32,8 @@ class PieChart extends Chart {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		public function PieChart($width = 600, $height = 250) {
-			parent::Chart($width, $height);
+		public function __construct($width = 600, $height = 250) {
+			parent::__construct($width, $height);
 			$this->plot->setGraphPadding(new Padding(15, 10, 30, 30));
 		}
 
@@ -64,9 +64,7 @@ protected function computeLayout($hasCaption = true) {
 		 * @return integer result of the comparison
 		 */
 		protected function sortPie($v1, $v2) {
-			return $v1[0] == $v2[0] ? 0 :
-				$v1[0] > $v2[0] ? -1 :
-				1;
+			return $v1[0] == $v2[0] ? 0 : ($v1[0] > $v2[0] ? -1 : 1);
 		}
 
 		/**
diff --git a/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php b/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php
index 65adcf2ad..8bfeed047 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Chart composed of vertical bars.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class VerticalBarChart extends BarChart {
 		/**
@@ -34,8 +34,8 @@ class VerticalBarChart extends BarChart {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		public function VerticalBarChart($width = 600, $height = 250) {
-			parent::BarChart($width, $height);
+		public function __construct($width = 600, $height = 250) {
+			parent::__contruct($width, $height);
 
 			$this->emptyToFullRatio = 1 / 5;
 			$this->plot->setGraphPadding(new Padding(5, 30, 50, 50));
diff --git a/WEB-INF/lib/libchart/classes/view/color/Color.php b/WEB-INF/lib/libchart/classes/view/color/Color.php
index d97c7007f..d39159143 100644
--- a/WEB-INF/lib/libchart/classes/view/color/Color.php
+++ b/WEB-INF/lib/libchart/classes/view/color/Color.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Color.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class Color {
 		private $red;
@@ -37,7 +37,7 @@ class Color {
 		 * @param integer blue [0..255]
 		 * @param integer alpha [0..255]
 		 */
-		public function Color($red, $green, $blue, $alpha = 0) {
+		public function __construct($red, $green, $blue, $alpha = 0) {
 			$this->red = (int) $red;
 			$this->green = (int) $green;
 			$this->blue = (int) $blue;
diff --git a/WEB-INF/lib/libchart/classes/view/color/ColorSet.php b/WEB-INF/lib/libchart/classes/view/color/ColorSet.php
index 9876ef08c..d72a8d987 100644
--- a/WEB-INF/lib/libchart/classes/view/color/ColorSet.php
+++ b/WEB-INF/lib/libchart/classes/view/color/ColorSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * A set of colors, used for drawing series of data.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * Created on 26 july 2007
 	 */
 	class ColorSet {
@@ -33,7 +33,7 @@ class ColorSet {
 		 * @param $shadowFactor Shadow factor
 		 * @param $colorArray Colors as an array
 		 */
-		public function ColorSet($colorList, $shadowFactor) {
+		public function __construct($colorList, $shadowFactor) {
 			$this->colorList = $colorList;
 			$this->shadowColorList = array();
 
diff --git a/WEB-INF/lib/libchart/classes/view/color/Palette.php b/WEB-INF/lib/libchart/classes/view/color/Palette.php
index 48189b971..1998b3996 100644
--- a/WEB-INF/lib/libchart/classes/view/color/Palette.php
+++ b/WEB-INF/lib/libchart/classes/view/color/Palette.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Color palette shared by all chart types.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * Created on 25 july 2007
 	 */
 	class Palette {
@@ -35,7 +35,7 @@ class Palette {
 		/**
 		 * Palette constructor.
 		 */
-		public function Palette() {
+		public function __construct() {
 			$this->red = new Color(255, 0, 0);
 		
 			// Colors for the horizontal and vertical axis
diff --git a/WEB-INF/lib/libchart/classes/view/plot/Plot.php b/WEB-INF/lib/libchart/classes/view/plot/Plot.php
index a57d4ffbb..acda4309d 100644
--- a/WEB-INF/lib/libchart/classes/view/plot/Plot.php
+++ b/WEB-INF/lib/libchart/classes/view/plot/Plot.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 	 *
 	 * All area dimensions are known in advance , and the optional logo is drawn in absolute coordinates.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * Created on 27 july 2007
 	 */
 	class Plot {
@@ -117,7 +117,7 @@ class Plot {
 		 * @param integer width of the image
 		 * @param integer height of the image
 		 */
-		public function Plot($width, $height) {
+		public function __construct($width, $height) {
 			$this->width = $width;
 			$this->height = $height;
 
diff --git a/WEB-INF/lib/libchart/classes/view/primitive/Padding.php b/WEB-INF/lib/libchart/classes/view/primitive/Padding.php
index 9cade66c9..bed6b3d17 100644
--- a/WEB-INF/lib/libchart/classes/view/primitive/Padding.php
+++ b/WEB-INF/lib/libchart/classes/view/primitive/Padding.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Primitive geometric object representing a padding. 
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * @Created on 27 july 2007
 	 */
 	class Padding {
@@ -52,7 +52,7 @@ class Padding {
 		 * @param integer Bottom padding
 		 * @param integer Left padding
 		 */
-		public function Padding($top, $right = null, $bottom = null, $left = null) {
+		public function __construct($top, $right = null, $bottom = null, $left = null) {
 			$this->top = $top;
 			if ($right == null) {
 				$this->right = $top;
diff --git a/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php b/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php
index b6b26bd80..05b8ac420 100644
--- a/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php
+++ b/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Graphic primitives, extends GD with chart related primitives.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class Primitive {
 		private $img;
@@ -30,7 +30,7 @@ class Primitive {
 		 *
 		 * @param	resource	GD image resource
 		 */
-		public function Primitive($img) {
+		public function __construct($img) {
 			$this->img = $img;
 		}
 		
diff --git a/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php b/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php
index 402214ea7..265c572ca 100644
--- a/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php
+++ b/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * A rectangle identified by the top-left and the bottom-right corners.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * @Created on 27 july 2007
 	 */
 	class Rectangle {
@@ -52,7 +52,7 @@ class Rectangle {
 		 * @param x2 Right edge coordinate
 		 * @param y2 Bottom edge coordinate
 		 */
-		public function Rectangle($x1, $y1, $x2, $y2) {
+		public function __construct($x1, $y1, $x2, $y2) {
 			$this->x1 = $x1;
 			$this->y1 = $y1;
 			$this->x2 = $x2;
diff --git a/WEB-INF/lib/libchart/classes/view/text/Text.php b/WEB-INF/lib/libchart/classes/view/text/Text.php
index eeef1cfb0..ad745e0e5 100644
--- a/WEB-INF/lib/libchart/classes/view/text/Text.php
+++ b/WEB-INF/lib/libchart/classes/view/text/Text.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Text drawing helper
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
 	 */
 	class Text {
 		public $HORIZONTAL_LEFT_ALIGN = 1;
@@ -33,7 +33,7 @@ class Text {
 		/**
 		 * Creates a new text drawing helper.
 		 */
-		public function Text() {
+		public function __construct() {
 			$baseDir = dirname(__FILE__) . "/../../../";
 		
 			// Free low-res fonts based on Bitstream Vera <http://dejavu.sourceforge.net/wiki/>
diff --git a/initialize.php b/initialize.php
index 04c61f5a5..5cba1fda8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5331");
+define("APP_VERSION", "1.19.23.5332");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From cd6ea8fe075b7891b081ff9b3532c7d1c0627fd6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Oct 2020 21:29:47 +0000
Subject: [PATCH 1336/1848] Cosmetic. Fixed encoding in libchart comments.

---
 WEB-INF/lib/libchart/classes/libchart.php                     | 2 +-
 WEB-INF/lib/libchart/classes/model/DataSet.php                | 4 ++--
 WEB-INF/lib/libchart/classes/model/Point.php                  | 4 ++--
 WEB-INF/lib/libchart/classes/model/XYDataSet.php              | 4 ++--
 WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php        | 4 ++--
 WEB-INF/lib/libchart/classes/view/axis/Axis.php               | 4 ++--
 WEB-INF/lib/libchart/classes/view/axis/Bound.php              | 4 ++--
 WEB-INF/lib/libchart/classes/view/caption/Caption.php         | 4 ++--
 WEB-INF/lib/libchart/classes/view/chart/BarChart.php          | 4 ++--
 WEB-INF/lib/libchart/classes/view/chart/Chart.php             | 4 ++--
 .../lib/libchart/classes/view/chart/HorizontalBarChart.php    | 4 ++--
 WEB-INF/lib/libchart/classes/view/chart/LineChart.php         | 4 ++--
 WEB-INF/lib/libchart/classes/view/chart/PieChart.php          | 4 ++--
 WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php  | 4 ++--
 WEB-INF/lib/libchart/classes/view/color/Color.php             | 4 ++--
 WEB-INF/lib/libchart/classes/view/color/ColorSet.php          | 4 ++--
 WEB-INF/lib/libchart/classes/view/color/Palette.php           | 4 ++--
 WEB-INF/lib/libchart/classes/view/plot/Plot.php               | 4 ++--
 WEB-INF/lib/libchart/classes/view/primitive/Padding.php       | 4 ++--
 WEB-INF/lib/libchart/classes/view/primitive/Primitive.php     | 4 ++--
 WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php     | 4 ++--
 WEB-INF/lib/libchart/classes/view/text/Text.php               | 4 ++--
 22 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/WEB-INF/lib/libchart/classes/libchart.php b/WEB-INF/lib/libchart/classes/libchart.php
index 5fc668d79..3d1cd5369 100644
--- a/WEB-INF/lib/libchart/classes/libchart.php
+++ b/WEB-INF/lib/libchart/classes/libchart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
diff --git a/WEB-INF/lib/libchart/classes/model/DataSet.php b/WEB-INF/lib/libchart/classes/model/DataSet.php
index 295a9ecd0..8a5e67df1 100644
--- a/WEB-INF/lib/libchart/classes/model/DataSet.php
+++ b/WEB-INF/lib/libchart/classes/model/DataSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Superclass of all data sets.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 10 may 2007
 	 */
 	abstract class DataSet {
diff --git a/WEB-INF/lib/libchart/classes/model/Point.php b/WEB-INF/lib/libchart/classes/model/Point.php
index e6c64a8cf..a6a0122b1 100644
--- a/WEB-INF/lib/libchart/classes/model/Point.php
+++ b/WEB-INF/lib/libchart/classes/model/Point.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 	 * Point of coordinates (X,Y).
 	 * The value of X isn't really of interest, but X is used as a label to display on the horizontal axis.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class Point {
 		private $x;
diff --git a/WEB-INF/lib/libchart/classes/model/XYDataSet.php b/WEB-INF/lib/libchart/classes/model/XYDataSet.php
index 3190e16c7..619012545 100644
--- a/WEB-INF/lib/libchart/classes/model/XYDataSet.php
+++ b/WEB-INF/lib/libchart/classes/model/XYDataSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Set of data in the form of (x, y) items.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 10 may 2007
 	 */
 	class XYDataSet extends DataSet {
diff --git a/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php b/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php
index 8b8d88699..ff26c600a 100644
--- a/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php
+++ b/WEB-INF/lib/libchart/classes/model/XYSeriesDataSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 	 * This dataset comprises several series of points and is used to plot multiple lines charts.
 	 * Each serie is a XYDataSet.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 20 july 2007
 	 */
 	class XYSeriesDataSet extends DataSet {
diff --git a/WEB-INF/lib/libchart/classes/view/axis/Axis.php b/WEB-INF/lib/libchart/classes/view/axis/Axis.php
index fe14671b3..e0dabb7a3 100644
--- a/WEB-INF/lib/libchart/classes/view/axis/Axis.php
+++ b/WEB-INF/lib/libchart/classes/view/axis/Axis.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Automatic axis boundaries and ticks calibration
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class Axis {
 		private $min;
diff --git a/WEB-INF/lib/libchart/classes/view/axis/Bound.php b/WEB-INF/lib/libchart/classes/view/axis/Bound.php
index 5497b70c1..f71ee05b4 100644
--- a/WEB-INF/lib/libchart/classes/view/axis/Bound.php
+++ b/WEB-INF/lib/libchart/classes/view/axis/Bound.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 	 * The bounds are automatically calculated from a XYDataSet or XYSeriesDataSet.
 	 * Default (calculated) bounds can be overriden using the setLowerBound() and setUpperBound() methods.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 25 july 2007
 	 */
 	 class Bound {
diff --git a/WEB-INF/lib/libchart/classes/view/caption/Caption.php b/WEB-INF/lib/libchart/classes/view/caption/Caption.php
index 4b5c40192..c526a65eb 100644
--- a/WEB-INF/lib/libchart/classes/view/caption/Caption.php
+++ b/WEB-INF/lib/libchart/classes/view/caption/Caption.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Caption.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 30 july 2007
 	 */
 	class Caption {
diff --git a/WEB-INF/lib/libchart/classes/view/chart/BarChart.php b/WEB-INF/lib/libchart/classes/view/chart/BarChart.php
index b14b45e36..1b1ef2f5d 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/BarChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/BarChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Base abstract class for rendering both horizontal and vertical bar charts.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	abstract class BarChart extends Chart {
 		protected $bound;
diff --git a/WEB-INF/lib/libchart/classes/view/chart/Chart.php b/WEB-INF/lib/libchart/classes/view/chart/Chart.php
index 99cbde161..685b901b3 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/Chart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/Chart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 	/**
 	 * Base chart class.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	abstract class Chart {
 		/**
diff --git a/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php b/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php
index a4bd644d5..5cfc86a2b 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/HorizontalBarChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Horizontal bar chart
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class HorizontalBarChart extends BarChart {
 		/**
diff --git a/WEB-INF/lib/libchart/classes/view/chart/LineChart.php b/WEB-INF/lib/libchart/classes/view/chart/LineChart.php
index b3a22cf06..a7642a70c 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/LineChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/LineChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Line chart.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class LineChart extends BarChart {
 		/**
diff --git a/WEB-INF/lib/libchart/classes/view/chart/PieChart.php b/WEB-INF/lib/libchart/classes/view/chart/PieChart.php
index 7d87782cd..0b5c417a4 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/PieChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/PieChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 *
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Pie chart.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class PieChart extends Chart {
 		protected $pieCenterX;
diff --git a/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php b/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php
index 8bfeed047..668047bb9 100644
--- a/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php
+++ b/WEB-INF/lib/libchart/classes/view/chart/VerticalBarChart.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Chart composed of vertical bars.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class VerticalBarChart extends BarChart {
 		/**
diff --git a/WEB-INF/lib/libchart/classes/view/color/Color.php b/WEB-INF/lib/libchart/classes/view/color/Color.php
index d39159143..e316c2022 100644
--- a/WEB-INF/lib/libchart/classes/view/color/Color.php
+++ b/WEB-INF/lib/libchart/classes/view/color/Color.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Color.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class Color {
 		private $red;
diff --git a/WEB-INF/lib/libchart/classes/view/color/ColorSet.php b/WEB-INF/lib/libchart/classes/view/color/ColorSet.php
index d72a8d987..fc6e9f694 100644
--- a/WEB-INF/lib/libchart/classes/view/color/ColorSet.php
+++ b/WEB-INF/lib/libchart/classes/view/color/ColorSet.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * A set of colors, used for drawing series of data.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 26 july 2007
 	 */
 	class ColorSet {
diff --git a/WEB-INF/lib/libchart/classes/view/color/Palette.php b/WEB-INF/lib/libchart/classes/view/color/Palette.php
index 1998b3996..4f3d9d360 100644
--- a/WEB-INF/lib/libchart/classes/view/color/Palette.php
+++ b/WEB-INF/lib/libchart/classes/view/color/Palette.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Color palette shared by all chart types.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 25 july 2007
 	 */
 	class Palette {
diff --git a/WEB-INF/lib/libchart/classes/view/plot/Plot.php b/WEB-INF/lib/libchart/classes/view/plot/Plot.php
index acda4309d..88e42dfb3 100644
--- a/WEB-INF/lib/libchart/classes/view/plot/Plot.php
+++ b/WEB-INF/lib/libchart/classes/view/plot/Plot.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 	 *
 	 * All area dimensions are known in advance , and the optional logo is drawn in absolute coordinates.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * Created on 27 july 2007
 	 */
 	class Plot {
diff --git a/WEB-INF/lib/libchart/classes/view/primitive/Padding.php b/WEB-INF/lib/libchart/classes/view/primitive/Padding.php
index bed6b3d17..6c7c634fb 100644
--- a/WEB-INF/lib/libchart/classes/view/primitive/Padding.php
+++ b/WEB-INF/lib/libchart/classes/view/primitive/Padding.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Primitive geometric object representing a padding. 
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * @Created on 27 july 2007
 	 */
 	class Padding {
diff --git a/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php b/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php
index 05b8ac420..f88c99e02 100644
--- a/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php
+++ b/WEB-INF/lib/libchart/classes/view/primitive/Primitive.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Graphic primitives, extends GD with chart related primitives.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class Primitive {
 		private $img;
diff --git a/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php b/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php
index 265c572ca..5e31e29a0 100644
--- a/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php
+++ b/WEB-INF/lib/libchart/classes/view/primitive/Rectangle.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * A rectangle identified by the top-left and the bottom-right corners.
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * @Created on 27 july 2007
 	 */
 	class Rectangle {
diff --git a/WEB-INF/lib/libchart/classes/view/text/Text.php b/WEB-INF/lib/libchart/classes/view/text/Text.php
index ad745e0e5..f66ea7d3e 100644
--- a/WEB-INF/lib/libchart/classes/view/text/Text.php
+++ b/WEB-INF/lib/libchart/classes/view/text/Text.php
@@ -1,6 +1,6 @@
 <?php
 	/* Libchart - PHP chart library
-	 * Copyright (C) 2005-2008 Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * Copyright (C) 2005-2008 Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 * 
 	 * This program is free software: you can redistribute it and/or modify
 	 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 	/**
 	 * Text drawing helper
 	 *
-	 * @author Jean-Marc Tr�meaux (jm.tremeaux at gmail.com)
+	 * @author Jean-Marc Trémeaux (jm.tremeaux at gmail.com)
 	 */
 	class Text {
 		public $HORIZONTAL_LEFT_ALIGN = 1;

From 825a3ebbb8d21a10594350b8dc612b36a22a9374 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Oct 2020 19:51:36 +0000
Subject: [PATCH 1337/1848] Removed a PHP warning on reports.php for 0 inactive
 users.

---
 initialize.php | 2 +-
 reports.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 5cba1fda8..56deb3b7a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5332");
+define("APP_VERSION", "1.19.23.5333");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 94b837cc1..5a4977b7a 100644
--- a/reports.php
+++ b/reports.php
@@ -229,7 +229,7 @@
       }
     }
   }
-  $row_count = ceil(count($user_list_active)/3);
+  $row_count = is_array($user_list_active) ? ceil(count($user_list_active)/3) : 1;
   $form->addInput(array('type'=>'checkboxgroup',
     'name'=>'users_active',
     'data'=>$user_list_active,
@@ -246,7 +246,7 @@
       }
     }
   }
-  $row_count = ceil(count($user_list_inactive)/3);
+  $row_count = is_array($user_list_inactive) ? ceil(count($user_list_inactive)/3) : 1;
   $form->addInput(array('type'=>'checkboxgroup',
     'name'=>'users_inactive',
     'data'=>$user_list_inactive,

From e4863b6338a4d6aad4fd7f779e54d9f01d6c9901 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Oct 2020 20:38:43 +0000
Subject: [PATCH 1338/1848] Defined a default value in TTUser::getConfigInt()
 function.

---
 WEB-INF/lib/ttUser.class.php | 4 ++--
 initialize.php               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index c1b771a2d..72b829d31 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -297,8 +297,8 @@ function getConfigOption($name) {
     return $config->getDefinedValue($name);
   }
 
-  // getConfigInt retruns an integer value defined in a group, or false.
-  function getConfigInt($name, $defaultVal) {
+  // getConfigInt returns an integer value defined in a group, or false.
+  function getConfigInt($name, $defaultVal = 0) {
     $config = new ttConfigHelper($this->getConfig());
     return $config->getIntValue($name, $defaultVal);
   }
diff --git a/initialize.php b/initialize.php
index 56deb3b7a..5e00b1a9e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5333");
+define("APP_VERSION", "1.19.23.5334");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9637ca6a2b3c3f7c69b1026ea1e8353049f7570a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Oct 2020 20:49:57 +0000
Subject: [PATCH 1339/1848] Some more progress on fixing PHP warnings.

---
 WEB-INF/lib/form/DateField.class.php | 2 +-
 initialize.php                       | 2 +-
 password_reset.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 18a3ec475..f3513c480 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,7 +406,7 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      if (DIR_NAME)
+      if (defined('DIR_NAME'))
         $app_root = '/'.DIR_NAME;
 
       $html .= "&nbsp;<img src=\"".$app_root."/img/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
diff --git a/initialize.php b/initialize.php
index 5e00b1a9e..f1164ff3b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5334");
+define("APP_VERSION", "1.19.23.5335");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/password_reset.php b/password_reset.php
index 01e04f3a1..ba3547132 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -105,7 +105,7 @@
         $http = 'http';
 
       $cl_subject = $user_i18n->get('form.reset_password.email_subject');
-      if (DIR_NAME)
+      if (defined('DIR_NAME'))
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/'.DIR_NAME.'/password_change.php?ref='.$temp_ref;
       else
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;

From 47747a5be6169bb6b4722229bdefc5bb59deca5c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Oct 2020 21:15:01 +0000
Subject: [PATCH 1340/1848] More progress on removing conditions for PHP
 warnings.

---
 initialize.php        | 2 +-
 notification_add.php  | 2 +-
 notification_edit.php | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/initialize.php b/initialize.php
index f1164ff3b..398fc4f0b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5335");
+define("APP_VERSION", "1.19.23.5336");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/notification_add.php b/notification_add.php
index 8b0f96b56..b7f743256 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -97,7 +97,7 @@
 
   if ($err->no()) {
     // Calculate next execution time.
-    $next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); 
+    $next = tdCron::getNextOccurrence($cl_cron_spec, time());
 
     if (ttNotificationHelper::insert(array(
         'cron_spec' => $cl_cron_spec,
diff --git a/notification_edit.php b/notification_edit.php
index 975b313a8..a07d25d8e 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -110,8 +110,7 @@
 
   if ($err->no()) {
     // Calculate next execution time.
-    $next = tdCron::getNextOccurrence($cl_cron_spec, mktime());
-
+    $next = tdCron::getNextOccurrence($cl_cron_spec, time());
     if (ttNotificationHelper::update(array(
         'id' => $notification_id,
         'cron_spec' => $cl_cron_spec,

From 65be2016ceb19b366a9bea9c92001cab7c71ba14 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Oct 2020 13:36:21 +0000
Subject: [PATCH 1341/1848] Fixed division by zero problem in pie charts.

---
 WEB-INF/lib/ttChartHelper.class.php | 4 ++--
 initialize.php                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 31d35e3fd..60c9897cb 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -86,8 +86,8 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
-        if ($val['time'] >= 0) // Only positive totals make sense in pie charts. Skip negatives entirely.
-          $result[] = array('name'=>$val['name'],'time'=>$val['time']); // name - project name, time - total for project in seconds.
+        if ($val['time'] > 0) // Only positive totals make sense in pie charts. Skip negatives entirely.
+          $result[] = array('name'=>$val['name'],'time'=>$val['time']); // name - entity name, time - total for entity in seconds.
       }
     }
 
diff --git a/initialize.php b/initialize.php
index 398fc4f0b..8a771556b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5336");
+define("APP_VERSION", "1.19.23.5337");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e0093c5c4bd0ac8d9d6a6aadfc101c5deb3ab50e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Oct 2020 14:06:56 +0000
Subject: [PATCH 1342/1848] Addressed a condition for PHP warning.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 32 ++++---------------------
 initialize.php                          |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 2707fd2b1..bf2309dcf 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttGroupHelper');
 
@@ -589,7 +565,9 @@ static function makeReportSpec($bean) {
       }
     }
 
-    $reportSpec = implode(',', $reportSpecArray);
+    $reportSpec = null;
+    if (is_array($reportSpecArray))
+      $reportSpec = implode(',', $reportSpecArray);
     return $reportSpec;
   }
 
diff --git a/initialize.php b/initialize.php
index 8a771556b..a69cc1447 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5337");
+define("APP_VERSION", "1.19.23.5338");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d5276a4af862581b492e49600cffa6d11a54a6e6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Oct 2020 14:17:26 +0000
Subject: [PATCH 1343/1848] Addressed a PHP warning.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 3 ++-
 initialize.php                          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index bf2309dcf..b4f917a4a 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -416,7 +416,8 @@ static function loadReport(&$bean) {
           $custom_field_attrs[$checkbox_field_name] = null;
         }
       }
-      $attrs = array_merge($attrs, $custom_field_attrs);
+      if (is_array($custom_field_attrs))
+        $attrs = array_merge($attrs, $custom_field_attrs);
       $bean->setAttributes($attrs);
     }
   }
diff --git a/initialize.php b/initialize.php
index a69cc1447..2e8f5dc23 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5338");
+define("APP_VERSION", "1.19.23.5339");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f008878420aa3031e9369654eba5d2af978e3ae6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 13:28:41 +0000
Subject: [PATCH 1344/1848] Removed a redirect to mobile pages as we now have
 mobile time entry working.

---
 index.php      | 28 +---------------------------
 initialize.php |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/index.php b/index.php
index cabc7060b..8c4471d1e 100644
--- a/index.php
+++ b/index.php
@@ -38,29 +38,7 @@
     exit();
   }
 }
-
-// Redirect to time.php or mobile/time.php for other roles.
-
-// Regexp to determine mobile browser was taken from detectmobilebrowsers.com on Aug 24, 2012. 
-$useragent = $_SERVER['HTTP_USER_AGENT'];
-$mobileBrowser = preg_match('/android.+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|meego.+mobile|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$useragent)||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($useragent,0,4));
-
-if ($mobileBrowser) {
-?>
-
-<html>
-  <script src="js/strftime.js"></script>
-  <script>
-    location.href = "mobile/time.php?date="+(new Date()).strftime('<?php print DB_DATEFORMAT;?>');
-  </script>
-  <noscript>
-    <p>Anuko Time Tracker is a simple, easy to use, open source, web-based time tracking system.</p>
-    <p>Your browser does not support JavaScript. Time Tracker will not work without it.</p>
-  </noscript>
-</html>
-
-<?php 
-} else {
+// html below redirects to time.php for today in browser timezone.
 ?>
 
 <html>
@@ -73,7 +51,3 @@
     <p>Your browser does not support JavaScript. Time Tracker will not work without it.</p>
   </noscript>
 </html>
-
-<?php 
-}
-?>
diff --git a/initialize.php b/initialize.php
index 2e8f5dc23..02aaa37a4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5339");
+define("APP_VERSION", "1.19.23.5340");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 26a6ddc4e3f5e904a807149c3aeea98b4fa09a8f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 13:40:23 +0000
Subject: [PATCH 1345/1848] Cosmetic.

---
 index.php | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/index.php b/index.php
index 8c4471d1e..e2f13c2a3 100644
--- a/index.php
+++ b/index.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 

From b591655e8ee4027b4b93009000e7ca646e48ee95 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 13:58:22 +0000
Subject: [PATCH 1346/1848] Cosmetic change to noscript output message.

---
 index.php      | 3 +--
 initialize.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index e2f13c2a3..c74f2688b 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,6 @@
     location.href = "time.php?date="+(new Date()).strftime('<?php print DB_DATEFORMAT;?>');
   </script>
   <noscript>
-    <p>Anuko Time Tracker is a simple, easy to use, open source, web-based time tracking system.</p>
-    <p>Your browser does not support JavaScript. Time Tracker will not work without it.</p>
+    <p>Your browser does not support JavaScript. This application will not work without it.</p>
   </noscript>
 </html>
diff --git a/initialize.php b/initialize.php
index 02aaa37a4..964246e27 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5340");
+define("APP_VERSION", "1.19.23.5341");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 70fec9233dc81524441d2bb19abbf9375b89599e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 15:34:51 +0000
Subject: [PATCH 1347/1848] Made projects.php page mobile-friendly.

---
 WEB-INF/templates/projects2.tpl | 93 +++++++++++++++++++++++++++++++++
 default.css                     |  8 ++-
 initialize.php                  |  2 +-
 projects.php                    | 32 ++----------
 projects1.php                   | 58 ++++++++++++++++++++
 5 files changed, 163 insertions(+), 30 deletions(-)
 create mode 100644 WEB-INF/templates/projects2.tpl
 create mode 100644 projects1.php

diff --git a/WEB-INF/templates/projects2.tpl b/WEB-INF/templates/projects2.tpl
new file mode 100644
index 000000000..9b8de40c4
--- /dev/null
+++ b/WEB-INF/templates/projects2.tpl
@@ -0,0 +1,93 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{if $user->can('manage_projects')}
+  {if $inactive_projects}
+<div class="section-header">{$i18n.form.projects.active_projects}</div>
+  {/if}
+  {if $active_projects}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    {if $show_files}
+    <th></th>
+    {/if}
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $active_projects as $project}
+  <tr>
+    <td class="text-cell">{$project.name|escape}</td>
+    <td class="text-cell">{$project.description|escape}</td>
+      {if $show_files}
+        {if $project.has_files}
+    <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+        {else}
+    <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+        {/if}
+      {/if}
+    <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+</table>
+  {/if}
+<div class="button-set"><form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form></div>
+  {if $inactive_projects}
+<div class="section-header">{$i18n.form.projects.inactive_projects}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    {if $show_files}
+    <th></th>
+    {/if}
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $inactive_projects as $project}
+  <tr>
+    <td class="text-cell">{$project.name|escape}</td>
+    <td class="text-cell">{$project.description|escape}</td>
+      {if $show_files}
+        {if $project.has_files}
+    <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+        {else}
+    <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+        {/if}
+      {/if}
+    <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form></div>
+  {/if}
+{else}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    {if $show_files}
+    <th></th>
+    {/if}
+  </tr>
+  {if $active_projects}
+    {foreach $active_projects as $project}
+  <tr>
+    <td class="text-cell">{$project.name|escape}</td>
+    <td class="text-cell">{$project.description|escape}</td>
+      {if $show_files}
+        {if $project.has_files}
+    <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+        {else}
+    <td>&nbsp;</td>
+        {/if}
+      {/if}
+  </tr>
+    {/foreach}
+  {/if}
+</table>
+{/if}
diff --git a/default.css b/default.css
index 278305591..4a8782cac 100644
--- a/default.css
+++ b/default.css
@@ -253,7 +253,7 @@ input.password-field {
   width: 210px;
   margin-top: 1rem;
   margin-left: auto;
-  margin-right: auto
+  margin-right: auto;
 }
 
 .large-screen-calendar {
@@ -315,6 +315,12 @@ input.password-field {
   margin-bottom: 1rem;
 }
 
+.section-header {
+  font-weight: bold;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index 964246e27..e33fd924c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5341");
+define("APP_VERSION", "1.19.23.5342");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/projects.php b/projects.php
index 0075c038f..e9a0b5dcf 100644
--- a/projects.php
+++ b/projects.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttGroupHelper');
@@ -54,5 +30,5 @@
 $smarty->assign('inactive_projects', $inactive_projects);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('title.projects'));
-$smarty->assign('content_page_name', 'projects.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'projects2.tpl');
+$smarty->display('index2.tpl');
diff --git a/projects1.php b/projects1.php
new file mode 100644
index 000000000..0075c038f
--- /dev/null
+++ b/projects1.php
@@ -0,0 +1,58 @@
+<?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('ttGroupHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$showFiles = $user->isPluginEnabled('at');
+
+if($user->can('manage_projects')) {
+  $active_projects = ttGroupHelper::getActiveProjects($showFiles);
+  $inactive_projects = ttGroupHelper::getInactiveProjects($showFiles);
+} else {
+  $options['include_files'] = $showFiles;
+  $active_projects = $user->getAssignedProjects($options);
+}
+
+$smarty->assign('active_projects', $active_projects);
+$smarty->assign('inactive_projects', $inactive_projects);
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('title', $i18n->get('title.projects'));
+$smarty->assign('content_page_name', 'projects.tpl');
+$smarty->display('index.tpl');

From e059663ffec3db4c7ec8eacfa19689b3a1dbf7b1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 16:42:05 +0000
Subject: [PATCH 1348/1848] A style fix for buttons.

---
 default.css    | 6 ++++++
 initialize.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index 4a8782cac..804a06a66 100644
--- a/default.css
+++ b/default.css
@@ -221,6 +221,12 @@ input[type=submit] {
   appearance: none;
 }
 
+input[type=button] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+}
+
 input.text-field {
   width: 220px;
 }
diff --git a/initialize.php b/initialize.php
index e33fd924c..7ef3d111b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5342");
+define("APP_VERSION", "1.19.23.5343");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 931f93dc014e76520ecafa38a67c5da185c6adce Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 16:54:42 +0000
Subject: [PATCH 1349/1848] Made project_delete.php mobile-friendly.

---
 WEB-INF/templates/project_delete2.tpl |  4 ++++
 initialize.php                        |  2 +-
 project_delete.php                    | 32 ++++-----------------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/project_delete2.tpl

diff --git a/WEB-INF/templates/project_delete2.tpl b/WEB-INF/templates/project_delete2.tpl
new file mode 100644
index 000000000..7c84c0223
--- /dev/null
+++ b/WEB-INF/templates/project_delete2.tpl
@@ -0,0 +1,4 @@
+{$forms.projectDeleteForm.open}
+<div class="section-header">{$project_to_delete|escape}</div>
+<div class="button-set">{$forms.projectDeleteForm.btn_delete.control}&nbsp;{$forms.projectDeleteForm.btn_cancel.control}</div>
+{$forms.projectDeleteForm.close}
diff --git a/initialize.php b/initialize.php
index 7ef3d111b..83b50b327 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5343");
+define("APP_VERSION", "1.19.23.5344");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_delete.php b/project_delete.php
index 3b165a33d..2d6ca2895 100644
--- a/project_delete.php
+++ b/project_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -71,5 +47,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_project'));
-$smarty->assign('content_page_name', 'project_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'project_delete2.tpl');
+$smarty->display('index2.tpl');

From 1350cb94ee1015611396771d560a0204ce500175 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 18:28:21 +0000
Subject: [PATCH 1350/1848] Recoded project_add.php to be mobile friendly.

---
 WEB-INF/templates/project_add2.tpl |  46 +++++++++++
 WEB-INF/templates/register2.tpl    |   1 +
 initialize.php                     |   2 +-
 project_add.php                    |  36 ++-------
 project_add1.php                   | 118 +++++++++++++++++++++++++++++
 5 files changed, 172 insertions(+), 31 deletions(-)
 create mode 100644 WEB-INF/templates/project_add2.tpl
 create mode 100644 project_add1.php

diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add2.tpl
new file mode 100644
index 000000000..401fd26ac
--- /dev/null
+++ b/WEB-INF/templates/project_add2.tpl
@@ -0,0 +1,46 @@
+{$forms.projectForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="project_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.projectForm.project_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.description.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{if $show_files}
+  <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.newfile.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+{if $show_users}
+  <tr class = "small-screen-label"><td><label for="users">{$i18n.label.users}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="users">{$i18n.label.users}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.users.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+{if $show_tasks}
+  <tr class = "small-screen-label"><td><label for="tasks">{$i18n.label.tasks}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="tasks">{$i18n.label.tasks}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.projectForm.btn_add.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+</table>
+{$forms.projectForm.close}
diff --git a/WEB-INF/templates/register2.tpl b/WEB-INF/templates/register2.tpl
index 5584fde39..1262a4c02 100644
--- a/WEB-INF/templates/register2.tpl
+++ b/WEB-INF/templates/register2.tpl
@@ -55,5 +55,6 @@
   <tr>
     <td colspan="2">{$forms.groupForm.btn_submit.control}</td>
   </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
 </table>
 {$forms.groupForm.close}
\ No newline at end of file
diff --git a/initialize.php b/initialize.php
index 83b50b327..9bd298cb8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5344");
+define("APP_VERSION", "1.19.23.5345");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_add.php b/project_add.php
index 5768d5fb5..1b326b627 100644
--- a/project_add.php
+++ b/project_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -66,8 +42,8 @@
 }
 
 $form = new Form('projectForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
@@ -114,5 +90,5 @@
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_project'));
-$smarty->assign('content_page_name', 'project_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'project_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/project_add1.php b/project_add1.php
new file mode 100644
index 000000000..5768d5fb5
--- /dev/null
+++ b/project_add1.php
@@ -0,0 +1,118 @@
+<?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('ttProjectHelper');
+import('ttGroupHelper');
+import('ttFileHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$showFiles = $user->isPluginEnabled('at');
+$users = ttGroupHelper::getActiveUsers();
+foreach ($users as $user_item)
+  $all_users[$user_item['id']] = $user_item['name'];
+
+$tasks = ttGroupHelper::getActiveTasks();
+foreach ($tasks as $task_item)
+  $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('project_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_users = $request->getParameter('users', array());
+  $cl_tasks = $request->getParameter('tasks', array());
+} else {
+  foreach ($users as $user_item)
+    $cl_users[] = $user_item['id'];
+  foreach ($tasks as $task_item)
+    $cl_tasks[] = $task_item['id'];
+}
+
+$form = new Form('projectForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
+if ($show_tasks)
+  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
+
+  if ($err->no()) {
+    if (!ttProjectHelper::getProjectByName($cl_name)) {
+      $id = ttProjectHelper::insert(array('name' => $cl_name,
+        'description' => $cl_description,
+        'users' => $cl_users,
+        'tasks' => $cl_tasks,
+        'status' => ACTIVE));
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'project',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+      if ($id) {
+        header('Location: projects.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.object_exists'));
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
+$smarty->assign('title', $i18n->get('title.add_project'));
+$smarty->assign('content_page_name', 'project_add.tpl');
+$smarty->display('index.tpl');

From d768f2767e22ae1bca4af601143ba4f3c65e174c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 18:34:18 +0000
Subject: [PATCH 1351/1848] Removed not needed label tags.

---
 WEB-INF/templates/project_add2.tpl | 8 ++++----
 initialize.php                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add2.tpl
index 401fd26ac..9eba40d90 100644
--- a/WEB-INF/templates/project_add2.tpl
+++ b/WEB-INF/templates/project_add2.tpl
@@ -21,17 +21,17 @@
   <tr><td><div class="form-control-separator"></div></td></tr>
 {/if}
 {if $show_users}
-  <tr class = "small-screen-label"><td><label for="users">{$i18n.label.users}:</label></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
   <tr>
-    <td class="large-screen-label"><label for="users">{$i18n.label.users}:</label></td>
+    <td class="large-screen-label">{$i18n.label.users}:</td>
     <td class="td-with-input">{$forms.projectForm.users.control}</td>
   </tr>
   <tr><td><div class="form-control-separator"></div></td></tr>
 {/if}
 {if $show_tasks}
-  <tr class = "small-screen-label"><td><label for="tasks">{$i18n.label.tasks}:</label></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
   <tr>
-    <td class="large-screen-label"><label for="tasks">{$i18n.label.tasks}:</label></td>
+    <td class="large-screen-label">{$i18n.label.tasks}:</td>
     <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
   </tr>
   <tr><td><div class="form-control-separator"></div></td></tr>
diff --git a/initialize.php b/initialize.php
index 9bd298cb8..4b39a7fa2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5345");
+define("APP_VERSION", "1.19.23.5346");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e0addd52441a610995f52c21046db220bb5ec76f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 19:00:49 +0000
Subject: [PATCH 1352/1848] Made project_edit.php mobile friendly.

---
 WEB-INF/templates/project_edit2.tpl |  40 ++++++++
 initialize.php                      |   2 +-
 project_edit.php                    |  36 ++------
 project_edit1.php                   | 136 ++++++++++++++++++++++++++++
 4 files changed, 183 insertions(+), 31 deletions(-)
 create mode 100644 WEB-INF/templates/project_edit2.tpl
 create mode 100644 project_edit1.php

diff --git a/WEB-INF/templates/project_edit2.tpl b/WEB-INF/templates/project_edit2.tpl
new file mode 100644
index 000000000..8bffb048d
--- /dev/null
+++ b/WEB-INF/templates/project_edit2.tpl
@@ -0,0 +1,40 @@
+{$forms.projectForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="project_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.projectForm.project_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.description.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.status.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{if $show_users}
+  <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.users}:</td>
+    <td class="td-with-input">{$forms.projectForm.users.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+{if $show_tasks}
+  <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.tasks}:</td>
+    <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.projectForm.btn_save.control} {$forms.projectForm.btn_copy.control}</div>
+{$forms.projectForm.close}
diff --git a/initialize.php b/initialize.php
index 4b39a7fa2..50887d050 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5346");
+define("APP_VERSION", "1.19.23.5347");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_edit.php b/project_edit.php
index e1792e48c..cbb2c1f9b 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -73,8 +49,8 @@
 
 $form = new Form('projectForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
@@ -132,5 +108,5 @@
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.edit_project'));
-$smarty->assign('content_page_name', 'project_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'project_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/project_edit1.php b/project_edit1.php
new file mode 100644
index 000000000..e1792e48c
--- /dev/null
+++ b/project_edit1.php
@@ -0,0 +1,136 @@
+<?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('ttProjectHelper');
+import('ttGroupHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_projects')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_project_id = (int)$request->getParameter('id');
+$project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$users = ttGroupHelper::getActiveUsers();
+foreach ($users as $user_item)
+  $all_users[$user_item['id']] = $user_item['name'];
+
+$tasks = ttGroupHelper::getActiveTasks();
+foreach ($tasks as $task_item)
+  $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('project_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_status = $request->getParameter('status');
+  $cl_users = $request->getParameter('users', array());
+  $cl_tasks = $request->getParameter('tasks', array());
+} else {
+  $cl_name = $project['name'];
+  $cl_description = $project['description'];
+  $cl_status = $project['status'];
+  $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
+  $cl_tasks = explode(',', $project['tasks']);
+}
+
+$form = new Form('projectForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
+if ($show_tasks)
+  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      $existing_project = ttProjectHelper::getProjectByName($cl_name);
+      if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
+        // Update project information.
+        if (ttProjectHelper::update(array(
+          'id' => $cl_project_id,
+          'name' => $cl_name,
+          'description' => $cl_description,
+          'status' => $cl_status,
+          'users' => $cl_users,
+          'tasks' => $cl_tasks))) {
+          header('Location: projects.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }
+
+    if ($request->getParameter('btn_copy')) {
+      if (!ttProjectHelper::getProjectByName($cl_name)) {
+        if (ttProjectHelper::insert(array('name' => $cl_name,
+          'description' => $cl_description,
+          'users' => $cl_users,
+          'tasks' => $cl_tasks,
+          'status' => ACTIVE))) {
+          header('Location: projects.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
+$smarty->assign('title', $i18n->get('title.edit_project'));
+$smarty->assign('content_page_name', 'project_edit.tpl');
+$smarty->display('index.tpl');

From c034f76bfe0c5fa14c90eb03ce27930b305f6524 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Oct 2020 19:14:17 +0000
Subject: [PATCH 1353/1848] Eliminated one more PHP warning.

---
 WEB-INF/lib/ttReportHelper.class.php | 28 +++++++++++++++-------------
 initialize.php                       |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index e090af6f4..294225e0c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -635,19 +635,21 @@ static function putInSession($report_items) {
     unset($_SESSION['report_item_ids']);
     unset($_SESSION['report_item_expense_ids']);
 
-    // Iterate through records and build 2 comma-separated lists.
-    foreach($report_items as $item) {
-      if ($item['type'] == 1)
-        $report_item_ids .= ','.$item['id'];
-      else if ($item['type'] == 2)
-         $report_item_expense_ids .= ','.$item['id'];
-    }
-    $report_item_ids = trim($report_item_ids, ',');
-    $report_item_expense_ids = trim($report_item_expense_ids, ',');
-
-    // The lists are ready. Put them in session.
-    if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids;
-    if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids;
+    if (is_array($report_items)) {
+      // Iterate through records and build 2 comma-separated lists.
+      foreach($report_items as $item) {
+        if ($item['type'] == 1)
+          $report_item_ids .= ','.$item['id'];
+        else if ($item['type'] == 2)
+          $report_item_expense_ids .= ','.$item['id'];
+      }
+      $report_item_ids = trim($report_item_ids, ',');
+      $report_item_expense_ids = trim($report_item_expense_ids, ',');
+
+      // The lists are ready. Put them in session.
+      if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids;
+      if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids;
+    }
   }
 
   // getFromSession obtains tt_log and tt_expense_items ids stored in user session.
diff --git a/initialize.php b/initialize.php
index 50887d050..79679dbce 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5347");
+define("APP_VERSION", "1.19.23.5348");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d645c848d129a0dc9a7e35dc449996ee4fae63e2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Nov 2020 17:56:07 +0000
Subject: [PATCH 1354/1848] Made users.php page mobile-friendly.

---
 WEB-INF/templates/projects2.tpl |  4 +-
 WEB-INF/templates/users2.tpl    | 97 +++++++++++++++++++++++++++++++++
 initialize.php                  |  2 +-
 users.php                       | 32 ++---------
 users1.php                      | 69 +++++++++++++++++++++++
 5 files changed, 172 insertions(+), 32 deletions(-)
 create mode 100644 WEB-INF/templates/users2.tpl
 create mode 100644 users1.php

diff --git a/WEB-INF/templates/projects2.tpl b/WEB-INF/templates/projects2.tpl
index 9b8de40c4..bb40d1430 100644
--- a/WEB-INF/templates/projects2.tpl
+++ b/WEB-INF/templates/projects2.tpl
@@ -3,9 +3,7 @@
 </script>
 
 {if $user->can('manage_projects')}
-  {if $inactive_projects}
-<div class="section-header">{$i18n.form.projects.active_projects}</div>
-  {/if}
+  {if $inactive_projects}<div class="section-header">{$i18n.form.projects.active_projects}</div>{/if}
   {if $active_projects}
 <table class="x-scrollable-table">
   <tr>
diff --git a/WEB-INF/templates/users2.tpl b/WEB-INF/templates/users2.tpl
new file mode 100644
index 000000000..816490da4
--- /dev/null
+++ b/WEB-INF/templates/users2.tpl
@@ -0,0 +1,97 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{if $user->can('manage_users')}
+  {if $inactive_users}<div class="section-header">{$i18n.label.active_users}</div>{/if}
+  {if $active_users}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.person_name}</th>
+    <th>{$i18n.label.login}</th>
+    <th>{$i18n.form.users.role}</th>
+    {if $show_quota}
+     <th>{$i18n.label.quota}</th>
+    {/if}
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $active_users as $u}
+  <tr>
+    <td class="text-cell">
+      {if $uncompleted_indicators}
+      <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
+      {/if}
+      {$u.name|escape}
+    </td>
+    <td class="text-cell">{$u.login|escape}</td>
+    <td class="text-cell">{$u.role_name|escape}</td>
+      {if $show_quota}
+    <td class="time-cell">{$u.quota_percent}</td>
+      {/if}
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
+    <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>{else}<td></td>{/if}
+      {else}
+    <td></td>
+    <td></td>
+      {/if}
+  </tr>
+    {/foreach}
+  {/if}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form></div>
+  {if $inactive_users}
+<div class="section-header">{$i18n.label.inactive_users}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.person_name}</th>
+    <th>{$i18n.label.login}</th>
+    <th>{$i18n.form.users.role}</th>
+    {if $show_quota}
+    <th>{$i18n.label.quota}</th>
+    {/if}
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $inactive_users as $u}
+  <tr>
+    <td class="text-cell">{$u.name|escape}</td>
+    <td class="text-cell">{$u.login|escape}</td>
+    <td class="text-cell">{$u.role_name|escape}</td>
+      {if $show_quota}
+    <td class="time-cell">{$u.quota_percent}</td>
+      {/if}
+      {if $u.group_id != $user->group_id || $u.rank < $user->rank}
+    <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+      {else}
+    <td></td>
+    <td></td>
+      {/if}
+  </tr>
+    {/foreach}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form></div>
+  {/if}
+{else}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.person_name}</th>
+    <th>{$i18n.label.login}</th>
+    <th>{$i18n.form.users.role}</th>
+  </tr>
+  {foreach $active_users as $u}
+  <tr>
+    <td class="text-cell">
+    {if $uncompleted_indicators}
+      <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
+    {/if}
+      {$u.name|escape}
+    </td>
+    <td class="text-cell">{$u.login|escape}</td>
+    <td class="text-cell">{$u.role_name|escape}</td>
+  </tr>
+  {/foreach}
+</table>
+{/if}
diff --git a/initialize.php b/initialize.php
index 79679dbce..9e4e77c91 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5348");
+define("APP_VERSION", "1.19.23.5349");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/users.php b/users.php
index 2fbcb5d20..a0ccdc3c1 100644
--- a/users.php
+++ b/users.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -65,5 +41,5 @@
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('show_quota', $user->isPluginEnabled('mq'));
 $smarty->assign('title', $i18n->get('title.users'));
-$smarty->assign('content_page_name', 'users.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'users2.tpl');
+$smarty->display('index2.tpl');
diff --git a/users1.php b/users1.php
new file mode 100644
index 000000000..2fbcb5d20
--- /dev/null
+++ b/users1.php
@@ -0,0 +1,69 @@
+<?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('ttTimeHelper');
+import('ttRoleHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Prepare a list of active users.
+$rank = $user->getMaxRankForGroup($user->getGroup());
+if ($user->can('view_users'))
+  $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+else /* if ($user->can('manage_users')) */
+  $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
+$active_users = $user->getUsers($options);
+
+// Prepare a list of inactive users.
+if($user->can('manage_users')) {
+  $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+  $inactive_users = $user->getUsers($options);
+}
+
+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
+if ($uncompleted_indicators) {
+  // Check each active user if they have an uncompleted time entry.
+  foreach ($active_users as $key => $active_user) {
+    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
+  }
+  $smarty->assign('uncompleted_indicators', true);
+}
+
+$smarty->assign('active_users', $active_users);
+$smarty->assign('inactive_users', $inactive_users);
+$smarty->assign('show_quota', $user->isPluginEnabled('mq'));
+$smarty->assign('title', $i18n->get('title.users'));
+$smarty->assign('content_page_name', 'users.tpl');
+$smarty->display('index.tpl');

From 513d272520a6f807de02f961b7a0b2fef13a5468 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Nov 2020 18:18:37 +0000
Subject: [PATCH 1355/1848] Made user_delete.php mobile friendly.

---
 WEB-INF/templates/user_delete2.tpl |  4 ++++
 initialize.php                     |  2 +-
 user_delete.php                    | 32 ++++--------------------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/user_delete2.tpl

diff --git a/WEB-INF/templates/user_delete2.tpl b/WEB-INF/templates/user_delete2.tpl
new file mode 100644
index 000000000..3e089d29d
--- /dev/null
+++ b/WEB-INF/templates/user_delete2.tpl
@@ -0,0 +1,4 @@
+{$forms.userDeleteForm.open}
+<div class="section-header">{$user_to_delete|escape}</div>
+<div class="button-set">{$forms.userDeleteForm.btn_delete.control}&nbsp;{$forms.userDeleteForm.btn_cancel.control}</div>
+{$forms.userDeleteForm.close}
diff --git a/initialize.php b/initialize.php
index 9e4e77c91..8e626e50b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5349");
+define("APP_VERSION", "1.19.23.5350");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_delete.php b/user_delete.php
index 24f84010f..99378fda4 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -83,5 +59,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_user'));
-$smarty->assign('content_page_name', 'user_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'user_delete2.tpl');
+$smarty->display('index2.tpl');

From 9ab973e980f79c18ce4c0634d3e485d122aaaaa4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Nov 2020 20:40:29 +0000
Subject: [PATCH 1356/1848] Refactored user_add.php for mobile access.

---
 WEB-INF/templates/user_add2.tpl | 159 +++++++++++++++++++++
 initialize.php                  |   2 +-
 user_add.php                    |  39 +----
 user_add1.php                   | 244 ++++++++++++++++++++++++++++++++
 4 files changed, 411 insertions(+), 33 deletions(-)
 create mode 100644 WEB-INF/templates/user_add2.tpl
 create mode 100644 user_add1.php

diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
new file mode 100644
index 000000000..983784f7b
--- /dev/null
+++ b/WEB-INF/templates/user_add2.tpl
@@ -0,0 +1,159 @@
+<script>
+// Prepare an array of available roles. We need it for "is_client" property.
+// It is used to selectively display client selector for client roles.
+roles = new Array();
+var idx = 0;
+{foreach $active_roles as $active_role}
+roles[idx] = new Array({$active_role.id}, '{$active_role.is_client}');
+idx++;
+{/foreach}
+
+// The setDefaultRate function sets / unsets default rate for a project
+// when a corresponding checkbox is ticked.
+function setDefaultRate(element) {
+  var default_rate = document.userForm.rate.value;
+  if (default_rate == '') {
+    // No default rate, nothing to do!
+    return;
+  }
+  // Iterate through elements of the form to find and set the project rate.
+  for (var i = 0; i < userForm.elements.length; i++) {
+    if ((userForm.elements[i].type == 'text') && (userForm.elements[i].name == ('rate_'+element.value))) {
+      if (element.checked) {
+        userForm.elements[i].value = default_rate;
+      } else {
+        userForm.elements[i].value = '';
+      }
+      break; // Element is found and set, nothing more to do, break out of the loop.
+    }
+  }
+}
+
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.
+function handleClientControl() {
+  var selectedRoleId = document.getElementById("role").value;
+  var clientControl = document.getElementById("client");
+  var nonClientBlock = document.getElementById("non_client_block");
+  var projectsControl = document.getElementById("projects_control");
+
+  var len = roles.length;
+  for (var i = 0; i < len; i++) {
+    if (selectedRoleId == roles[i][0]) {
+      var isClient = roles[i][1];
+      if (isClient == 1) {
+        clientControl.style.visibility = "visible";
+        nonClientBlock.style.display = "none";
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";
+        clientControl.style.visibility = "hidden";
+        nonClientBlock.style.display = "";
+        projectsControl.style.display = "";
+      }
+      break;
+    }
+  }
+}
+</script>
+
+{$forms.userForm.open}
+{$forms.projectForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.person_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.person_name} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if !$auth_external}
+  <tr class = "small-screen-label"><td><label for="pas1">{$i18n.label.password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="pas1">{$i18n.label.password} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.pas1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="pas2">{$i18n.label.confirm_password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="pas2">{$i18n.label.confirm_password} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.pas2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="email">{$i18n.label.email}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="email">{$i18n.label.email}:</label></td>
+    <td class="td-with-input">{$forms.userForm.email.control}</td>
+  </tr>
+{if $show_quota}
+  <tr class = "small-screen-label"><td><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td>
+    <td class="td-with-input">{$forms.userForm.quota_percent.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="role">{$i18n.form.users.role}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="role">{$i18n.form.users.role}:</label></td>
+    <td class="td-with-input">{$forms.userForm.role.control}</td>
+  </tr>
+  <tr>
+    <td class="large-screen-label"></td>
+    <td class="td-with-input">{$forms.userForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+<tbody id="non_client_block">
+{if $custom_fields && $custom_fields->userFields}
+  {foreach $custom_fields->userFields as $userField}
+        {assign var="control_name" value='user_field_'|cat:$userField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$userField['label']|escape}{if $userField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$userField['label']|escape}{if $userField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.userForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+  <tr class = "small-screen-label"><td><label for="rate">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="rate">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</label></td>
+    <td class="td-with-input">{$forms.userForm.rate.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</tbody>
+{if $show_projects}
+<tbody id="projects_control">
+  <tr class = "small-screen-label"><td><label for="projects">{$i18n.label.projects}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="projects">{$i18n.label.projects}:</label></td>
+    <td class="td-with-input">{$forms.userForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</tbody>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.userForm.btn_submit.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+</table>
+{$forms.userForm.close}
diff --git a/initialize.php b/initialize.php
index 8e626e50b..32ba423e9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5350");
+define("APP_VERSION", "1.19.23.5351");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_add.php b/user_add.php
index 0cd71b0a4..327ee8702 100644
--- a/user_add.php
+++ b/user_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -86,7 +62,7 @@
   if (is_array($cl_projects)) {
     foreach ($cl_projects as $p) {
       if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
-      	$project_with_rate = array();
+        $project_with_rate = array();
         $project_with_rate['id'] = $p;
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
@@ -97,8 +73,8 @@
 }
 
 $form = new Form('userForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
 if (!$auth->isPasswordExternal()) {
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
@@ -118,7 +94,6 @@
       $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($userField['id']),
       'value'=>$userCustomFields[$userField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -240,5 +215,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_quota', $show_quota);
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_user'));
-$smarty->assign('content_page_name', 'user_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'user_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/user_add1.php b/user_add1.php
new file mode 100644
index 000000000..b7c2bc7a6
--- /dev/null
+++ b/user_add1.php
@@ -0,0 +1,244 @@
+<?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('ttTeamHelper');
+import('ttGroupHelper');
+import('ttUserHelper');
+import('form.Table');
+import('form.TableColumn');
+import('ttRoleHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_users')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+// Use the "limit" plugin if we have one. Ignore include errors.
+// The "limit" plugin is not required for normal operation of Time Tracker.
+@include('plugins/limit/user_add.php');
+
+$show_quota = $user->isPluginEnabled('mq');
+if ($user->isPluginEnabled('cl'))
+  $clients = ttGroupHelper::getActiveClients();
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+$assigned_projects = array();
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_login = trim($request->getParameter('login'));
+  if (!$auth->isPasswordExternal()) {
+    $cl_password1 = $request->getParameter('pas1');
+    $cl_password2 = $request->getParameter('pas2');
+  }
+  $cl_email = trim($request->getParameter('email'));
+  $cl_role_id = $request->getParameter('role');
+  $cl_client_id = $request->getParameter('client');
+  $cl_quota_percent = $request->getParameter('quota_percent');
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+  $cl_rate = $request->getParameter('rate');
+  $cl_projects = $request->getParameter('projects');
+  if (is_array($cl_projects)) {
+    foreach ($cl_projects as $p) {
+      if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
+        $project_with_rate = array();
+        $project_with_rate['id'] = $p;
+        $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
+        $assigned_projects[] = $project_with_rate;
+      } else
+        $err->add($i18n->get('error.field'), 'rate_'.$p);
+    }
+  }
+}
+
+$form = new Form('userForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
+if (!$auth->isPasswordExternal()) {
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
+}
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
+
+$active_roles = ttTeamHelper::getActiveRolesForUser();
+$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
+if ($user->isPluginEnabled('cl'))
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+// If we have custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'value'=>$userCustomFields[$userField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
+
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}
+
+// Define classes for the projects table.
+class NameCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    $this->setOptions(array('width'=>200));
+    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
+    return $this->toString();
+  }
+}
+class RateCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    global $assigned_projects;
+    $field = new FloatField('rate_'.$table->getValueAtName($row, 'id'));
+    $field->setFormName($table->getFormName());
+    $field->setSize(5);
+    $field->setFormat('.2');
+    foreach ($assigned_projects as $p) {
+      if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
+    }
+    $this->setValue($field->getHtml());
+    return $this->toString();
+  }
+}
+// Create projects table.
+$table = new Table('projects');
+$table->setIAScript('setDefaultRate');
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
+$table->setData($projects);
+$table->setKeyField('id');
+$table->setValue($cl_projects);
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
+$form->addInputElement($table);
+
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  if (!$auth->isPasswordExternal()) {
+    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
+    if ($cl_password1 !== $cl_password2)
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  }
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+  // Require selection of a client for a client role.
+  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+  // Validate input in user custom fields.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($userCustomFields as $userField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
+    }
+  }
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
+  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));
+
+  if ($err->no()) {
+    if (!ttUserHelper::getUserByLogin($cl_login)) {
+      $fields = array(
+        'name' => $cl_name,
+        'login' => $cl_login,
+        'password' => $cl_password1,
+        'rate' => $cl_rate,
+        'quota_percent' => $cl_quota_percent,
+        'group_id' => $user->getGroup(),
+        'org_id' => $user->org_id,
+        'role_id' => $cl_role_id,
+        'client_id' => $cl_client_id,
+        'projects' => $assigned_projects,
+        'email' => $cl_email);
+      $user_id = ttUserHelper::insert($fields);
+
+      // Insert user custom fields if we have them.
+      $result = true;
+      if ($user_id && $custom_fields && $custom_fields->userFields) {
+        $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
+      }
+
+      if ($user_id && $result) {
+        if (!$user->exists()) {
+          // We added a user to an empty subgroup. Set new user as on behalf user.
+          // Needed for user-based things to work (such as notifications config).
+          $user->setOnBehalfUser($user_id);
+        }
+        header('Location: users.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.user_exists'));
+  }
+} // isPost
+
+$smarty->assign('auth_external', $auth->isPasswordExternal());
+$smarty->assign('active_roles', $active_roles);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
+$smarty->assign('title', $i18n->get('title.add_user'));
+$smarty->assign('content_page_name', 'user_add.tpl');
+$smarty->display('index.tpl');

From c2ccfd3379ff6702126583fb272b9b4dddaac4b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Nov 2020 21:03:18 +0000
Subject: [PATCH 1357/1848] Usability improvements on user_add.php.

---
 WEB-INF/templates/user_add2.tpl | 10 ++++++++--
 initialize.php                  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index 983784f7b..b1ae40d1b 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -34,6 +34,7 @@ function setDefaultRate(element) {
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
+  var clientBlock = document.getElementById("client_block");
   var nonClientBlock = document.getElementById("non_client_block");
   var projectsControl = document.getElementById("projects_control");
 
@@ -43,6 +44,7 @@ function handleClientControl() {
       var isClient = roles[i][1];
       if (isClient == 1) {
         clientControl.style.visibility = "visible";
+        clientBlock.style.display = "";
         nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
 
@@ -55,6 +57,7 @@ function handleClientControl() {
       } else {
         clientControl.value = "";
         clientControl.style.visibility = "hidden";
+        clientBlock.style.display = "none";
         nonClientBlock.style.display = "";
         projectsControl.style.display = "";
       }
@@ -109,17 +112,20 @@ function handleClientControl() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="role">{$i18n.form.users.role}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="role">{$i18n.form.users.role}:</label></td>
     <td class="td-with-input">{$forms.userForm.role.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+<tbody id="client_block">
+  <tr class = "small-screen-label"><td><label for="role">{$i18n.label.client}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"></td>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client} (*):</label></td>
     <td class="td-with-input">{$forms.userForm.client.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</tbody>
 <tbody id="non_client_block">
 {if $custom_fields && $custom_fields->userFields}
   {foreach $custom_fields->userFields as $userField}
diff --git a/initialize.php b/initialize.php
index 32ba423e9..c50180255 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5351");
+define("APP_VERSION", "1.19.23.5352");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c1be12e38a181c77447056040d1cfdda6a2dc7bb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 7 Nov 2020 15:54:26 +0000
Subject: [PATCH 1358/1848] Made user_edit.php mobile friendly.

---
 WEB-INF/templates/user_add2.tpl  |  23 ++-
 WEB-INF/templates/user_edit2.tpl | 202 ++++++++++++++++++++
 initialize.php                   |   2 +-
 user_edit.php                    |  39 +---
 user_edit1.php                   | 308 +++++++++++++++++++++++++++++++
 5 files changed, 529 insertions(+), 45 deletions(-)
 create mode 100644 WEB-INF/templates/user_edit2.tpl
 create mode 100644 user_edit1.php

diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index b1ae40d1b..370fb08f3 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -68,7 +68,6 @@ function handleClientControl() {
 </script>
 
 {$forms.userForm.open}
-{$forms.projectForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="name">{$i18n.label.person_name} (*):</label></td></tr>
   <tr>
@@ -101,17 +100,6 @@ function handleClientControl() {
     <td class="large-screen-label"><label for="email">{$i18n.label.email}:</label></td>
     <td class="td-with-input">{$forms.userForm.email.control}</td>
   </tr>
-{if $show_quota}
-  <tr class = "small-screen-label"><td><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td></tr>
-  <tr>
-    <td class="large-screen-label"><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td>
-    <td class="td-with-input">{$forms.userForm.quota_percent.control}
-      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
-      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
-    </td>
-  </tr>
-  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{/if}
   <tr class = "small-screen-label"><td><label for="role">{$i18n.form.users.role}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="role">{$i18n.form.users.role}:</label></td>
@@ -127,6 +115,17 @@ function handleClientControl() {
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </tbody>
 <tbody id="non_client_block">
+{if $show_quota}
+  <tr class = "small-screen-label"><td><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td>
+    <td class="td-with-input">{$forms.userForm.quota_percent.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
 {if $custom_fields && $custom_fields->userFields}
   {foreach $custom_fields->userFields as $userField}
         {assign var="control_name" value='user_field_'|cat:$userField['id']}
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
new file mode 100644
index 000000000..6339b9734
--- /dev/null
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -0,0 +1,202 @@
+<script>
+// Prepare an array of available roles. We need it for "is_client" property.
+// It is used to selectively display client selector for client roles.
+roles = new Array();
+var idx = 0;
+{foreach $active_roles as $active_role}
+roles[idx] = new Array({$active_role.id}, '{$active_role.is_client}');
+idx++;
+{/foreach}
+
+// Prepare an array of rates.
+// Format: project_rates[0] = Array(100, '25.00'), project_rates[1] = Array(120, '30.00'), etc...
+// First element = project_id, second element = rate for project. Quotes needed for string representation of rates.
+project_rates = new Array();
+var idx = 0;
+{foreach $rates as $rate}
+project_rates[idx] = new Array({$rate.id}, '{$rate.rate}');
+idx++;
+{/foreach}
+
+// getRate - returns a rate for the project. If rate was set for user previously we'll get this old rate
+// if project time entries for user exists. Otherwise return user default rate.
+function getRate(project_id) {
+  var length = project_rates.length;
+  for(var i = 0; i < length; i++) {
+    if(project_rates[i][0] == project_id) {
+      return project_rates[i][1];
+    }
+  }
+  var default_rate = document.userForm.rate.value;
+  return default_rate;
+}
+
+// The setRate function sets / unsets user rate for a project when a corresponding checkbox is ticked.
+function setRate(element) {
+  var default_rate = document.userForm.rate.value;
+  if (default_rate == '') {
+    // No default rate, nothing to do!
+    return;
+  }
+  // Iterate through elements of the form to find and set the project rate.
+  for (var i = 0; i < userForm.elements.length; i++) {
+    if ((userForm.elements[i].type == 'text') && (userForm.elements[i].name == ('rate_'+element.value))) {
+      if (element.checked) {
+        userForm.elements[i].value = getRate(element.value);
+      } else {
+        userForm.elements[i].value = '';
+      }
+      break; // Element is found and set, nothing more to do, break out of the loop.
+    }
+  }
+}
+
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.
+function handleClientControl() {
+  var selectedRoleId = document.getElementById("role").value;
+  var clientControl = document.getElementById("client");
+  var clientBlock = document.getElementById("client_block");
+  var nonClientBlock = document.getElementById("non_client_block");
+  var projectsControl = document.getElementById("projects_control");
+
+  var len = roles.length;
+  for (var i = 0; i < len; i++) {
+    if (selectedRoleId == roles[i][0]) {
+      var isClient = roles[i][1];
+      if (isClient == 1) {
+        clientControl.style.visibility = "visible";
+        clientBlock.style.display = "";
+        nonClientBlock.style.display = "none";
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";
+        clientControl.style.visibility = "hidden";
+        clientBlock.style.display = "none";
+        nonClientBlock.style.display = "";
+        projectsControl.style.display = "";
+      }
+      break;
+    }
+  }
+}
+</script>
+
+{$forms.userForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.person_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.person_name} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if !$auth_external}
+  <tr class = "small-screen-label"><td><label for="pas1">{$i18n.label.password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="pas1">{$i18n.label.password} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.pas1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="pas2">{$i18n.label.confirm_password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="pas2">{$i18n.label.confirm_password} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.pas2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="email">{$i18n.label.email}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="email">{$i18n.label.email}:</label></td>
+    <td class="td-with-input">{$forms.userForm.email.control}</td>
+  </tr>
+{if $user->id != $user_id}
+  <tr class = "small-screen-label"><td><label for="role">{$i18n.form.users.role}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="role">{$i18n.form.users.role}:</label></td>
+    <td class="td-with-input">{$forms.userForm.role.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+<tbody id="client_block">
+  <tr class = "small-screen-label"><td><label for="role">{$i18n.label.client}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client} (*):</label></td>
+    <td class="td-with-input">{$forms.userForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</tbody>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.userForm.status.control}</td>
+  </tr>
+  <tr><td><div class="small-screenform-control-separator"></div></td></tr>
+{/if}
+{if $user->id == $user_id}
+  <tr class = "small-screen-label"><td><label for="role">{$i18n.form.users.role}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="role">{$i18n.form.users.role}:</label></td>
+    <td class="text-cell">{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.user_edit.swap_roles}</a>{/if}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+<tbody id="non_client_block">
+{if $show_quota}
+  <tr class = "small-screen-label"><td><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td>
+    <td class="td-with-input">{$forms.userForm.quota_percent.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $custom_fields && $custom_fields->userFields}
+  {foreach $custom_fields->userFields as $userField}
+        {assign var="control_name" value='user_field_'|cat:$userField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$userField['label']|escape}{if $userField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$userField['label']|escape}{if $userField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.userForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+  <tr class = "small-screen-label"><td><label for="rate">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="rate">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</label></td>
+    <td class="td-with-input">{$forms.userForm.rate.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</tbody>
+{if $show_projects}
+<tbody id="projects_control">
+  <tr class = "small-screen-label"><td><label for="projects">{$i18n.label.projects}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="projects">{$i18n.label.projects}:</label></td>
+    <td class="td-with-input">{$forms.userForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</tbody>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.userForm.btn_submit.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+</table>
+{$forms.userForm.close}
diff --git a/initialize.php b/initialize.php
index c50180255..553382e95 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5352");
+define("APP_VERSION", "1.19.23.5353");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_edit.php b/user_edit.php
index d74ae2785..493cb8d4d 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -133,13 +109,13 @@
 }
 
 $form = new Form('userForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
 if (!$auth->isPasswordExternal()) {
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
 }
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 300px;','value'=>$cl_email));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
 
 $active_roles = ttTeamHelper::getActiveRolesForUser();
 $form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
@@ -154,7 +130,6 @@
       $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($userField['id']),
       'value'=>$userCustomFields[$userField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
@@ -304,5 +279,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('user_id', $user_id);
 $smarty->assign('title', $i18n->get('title.edit_user'));
-$smarty->assign('content_page_name', 'user_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'user_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/user_edit1.php b/user_edit1.php
new file mode 100644
index 000000000..d74ae2785
--- /dev/null
+++ b/user_edit1.php
@@ -0,0 +1,308 @@
+<?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('ttProjectHelper');
+import('ttTeamHelper');
+import('ttGroupHelper');
+import('ttUserHelper');
+import('form.Table');
+import('form.TableColumn');
+import('ttRoleHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_users')) {
+  header('Location: access_denied.php');
+  exit();
+}
+$user_id = (int)$request->getParameter('id');
+$user_details = $user->getUserDetails($user_id);
+if (!$user_details) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$show_quota = $user->isPluginEnabled('mq');
+if ($user->isPluginEnabled('cl'))
+  $clients = ttGroupHelper::getActiveClients();
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}
+$assigned_projects = array();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_login = trim($request->getParameter('login'));
+  if (!$auth->isPasswordExternal()) {
+    $cl_password1 = $request->getParameter('pas1');
+    $cl_password2 = $request->getParameter('pas2');
+  }
+  $cl_email = trim($request->getParameter('email'));
+  $cl_role_id = $request->getParameter('role');
+  $cl_client_id = $request->getParameter('client');
+  $cl_status = $request->getParameter('status');
+  $cl_quota_percent = $request->getParameter('quota_percent');
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+  $cl_rate = $request->getParameter('rate');
+  $cl_projects = $request->getParameter('projects');
+  if (is_array($cl_projects)) {
+    foreach ($cl_projects as $p) {
+      if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
+        $project_with_rate = array();
+        $project_with_rate['id'] = $p;
+        $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
+        $assigned_projects[] = $project_with_rate;
+      } else
+        $err->add($i18n->get('error.field'), 'rate_'.$p);
+    }
+  }
+} else {
+  $cl_name = $user_details['name'];
+  $cl_login = $user_details['login'];
+  $cl_email = $user_details['email'];
+  $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
+  // If we have user custom fields - collect values from database.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => $custom_fields->getEntityFieldValue(CustomFields::ENTITY_USER, $user_id, $userField['id'], $userField['type']));
+    }
+  }
+  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
+  $cl_role_id = $user_details['role_id'];
+  $cl_client_id = $user_details['client_id'];
+  $cl_status = $user_details['status'];
+  $cl_projects = array();
+  $assigned_projects = ttProjectHelper::getAssignedProjects($user_id);
+  foreach($assigned_projects as $p) {
+    $cl_projects[] = $p['id'];
+  }
+}
+
+$form = new Form('userForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
+if (!$auth->isPasswordExternal()) {
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
+}
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 300px;','value'=>$cl_email));
+
+$active_roles = ttTeamHelper::getActiveRolesForUser();
+$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
+if ($user->isPluginEnabled('cl'))
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+// If we have custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'value'=>$userCustomFields[$userField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
+
+// Define classes for the projects table.
+class NameCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    $this->setOptions(array('width'=>200));
+    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
+    return $this->toString();
+  }
+}
+class RateCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    global $assigned_projects;
+
+    $field = new FloatField('rate_'.$table->getValueAtName($row,'id'));
+    $field->setFormName($table->getFormName());
+    $field->setSize(5);
+    $field->setFormat('.2');
+    foreach ($assigned_projects as $p) {
+      if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
+    }
+    $this->setValue($field->getHtml());
+    return $this->toString();
+  }
+}
+// Create projects table.
+$table = new Table('projects');
+$table->setIAScript('setRate');
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
+$table->setData($projects);
+$table->setKeyField('id');
+$table->setValue($cl_projects);
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
+$form->addInputElement($table);
+
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
+    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
+    if ($cl_password1 !== $cl_password2)
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  }
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+  // Require selection of a client for a client role.
+  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+    // Validate input in user custom fields.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($userCustomFields as $userField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
+    }
+  }
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
+
+  if ($err->no()) {
+    $existing_user = ttUserHelper::getUserByLogin($cl_login);
+    if (!$existing_user || ($user_id == $existing_user['id'])) {
+
+        $fields = array(
+        'name' => $cl_name,
+        'login' => $cl_login,
+        'password' => $cl_password1,
+        'email' => $cl_email,
+        'status' => $cl_status,
+        'rate' => $cl_rate,
+        'quota_percent' => $cl_quota_percent,
+        'projects' => $assigned_projects);
+      if (in_array('manage_users', $user->rights) && $cl_role_id) {
+        $fields['role_id'] = $cl_role_id;
+        $fields['client_id'] = $cl_client_id;
+      }
+
+      $result = ttUserHelper::update($user_id, $fields);
+      // Update user custom fields if we have them.
+      if ($result && $custom_fields && $custom_fields->userFields) {
+        $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
+      }
+
+      if ($result) {
+        // If our own login changed, set new one in cookie to remember it.
+        if (($user_id == $user->id) && ($user->login != $cl_login)) {
+          setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
+        }
+
+        // In case the name of the "on behalf" user has changed - set it in session.
+        if (($user->behalf_id == $user_id) && ($user->behalf_name != $cl_name)) {
+          $_SESSION['behalf_name'] = $cl_name;
+        }
+
+        // If we deactivated our own account, do housekeeping and logout.
+        if ($user->id == $user_id && !is_null($cl_status) && $cl_status == INACTIVE) {
+          // Remove LOGIN_COOKIE_NAME cookie that stores login name.
+          unset($_COOKIE[LOGIN_COOKIE_NAME]);
+          setcookie(LOGIN_COOKIE_NAME, NULL, -1);
+
+          $auth->doLogout();
+          header('Location: login.php');
+          exit();
+        }
+
+        header('Location: users.php');
+        exit();
+
+      } else
+        $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.user_exists'));
+  }
+} // isPost
+
+$can_swap = false;
+if ($user->id == $user_id && $user->can('swap_roles')) {
+  $users_for_swap = ttTeamHelper::getUsersForSwap();
+  if (is_array($users_for_swap) && sizeof($users_for_swap) > 0)
+    $can_swap = true;
+}
+
+$rates = ttProjectHelper::getRates($user_id);
+$smarty->assign('rates', $rates);
+
+$smarty->assign('auth_external', $auth->isPasswordExternal());
+$smarty->assign('active_roles', $active_roles);
+$smarty->assign('can_swap', $can_swap);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
+$smarty->assign('user_id', $user_id);
+$smarty->assign('title', $i18n->get('title.edit_user'));
+$smarty->assign('content_page_name', 'user_edit.tpl');
+$smarty->display('index.tpl');

From 96487108634653cab85a047e425096e9a28e1517 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 10 Nov 2020 22:05:00 +0000
Subject: [PATCH 1359/1848] Made tasks.php page mobile-friendly.

---
 WEB-INF/templates/tasks2.tpl | 70 ++++++++++++++++++++++++++++++++
 initialize.php               |  2 +-
 tasks.php                    | 32 ++-------------
 tasks1.php                   | 77 ++++++++++++++++++++++++++++++++++++
 4 files changed, 152 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/tasks2.tpl
 create mode 100644 tasks1.php

diff --git a/WEB-INF/templates/tasks2.tpl b/WEB-INF/templates/tasks2.tpl
new file mode 100644
index 000000000..ac53362eb
--- /dev/null
+++ b/WEB-INF/templates/tasks2.tpl
@@ -0,0 +1,70 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.tasksForm.open}
+{if $user->can('manage_tasks')}
+<table class="centered-table">
+  <tr>
+    <td>{$forms.tasksForm.task_required.control}</td>
+    <td><label for="task_required">{$i18n.label.required}</label> <a href="https://www.anuko.com/lp/tt_46.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+    <td>{$forms.tasksForm.btn_save.control}</td>
+  </tr>
+</table>
+  {if $inactive_tasks}<div class="section-header">{$i18n.form.tasks.active_tasks}</div>{/if}
+  {if $active_tasks}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $active_tasks as $task}
+  <tr>
+    <td class="text-cell">{$task.name|escape}</td>
+    <td class="text-cell">{$task.description|escape}</td>
+    <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+</table>
+  {/if}
+<div class="button-set"><form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form></div>
+  {if $inactive_tasks}
+<div class="section-header">{$i18n.form.tasks.inactive_tasks}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $inactive_tasks as $task}
+  <tr>
+    <td class="text-cell">{$task.name|escape}</td>
+    <td class="text-cell">{$task.description|escape}</td>
+    <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form></div>
+  {/if}
+{else}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+  </tr>
+  {if $active_tasks}
+    {foreach $active_tasks as $task}
+  <tr>
+    <td class="text-cell">{$task.name|escape}</td>
+    <td class="text-cell">{$task.description|escape}</td>
+  </tr>
+    {/foreach}
+  {/if}
+</table>
+{/if}
+{$forms.tasksForm.close}
diff --git a/initialize.php b/initialize.php
index 553382e95..966061772 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5353");
+define("APP_VERSION", "1.19.23.5354");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/tasks.php b/tasks.php
index 2e13ead5c..464af6159 100644
--- a/tasks.php
+++ b/tasks.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -73,5 +49,5 @@
 $smarty->assign('active_tasks', $active_tasks);
 $smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));
-$smarty->assign('content_page_name', 'tasks.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'tasks2.tpl');
+$smarty->display('index2.tpl');
diff --git a/tasks1.php b/tasks1.php
new file mode 100644
index 000000000..2e13ead5c
--- /dev/null
+++ b/tasks1.php
@@ -0,0 +1,77 @@
+<?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('ttGroupHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$config = $user->getConfigHelper();
+
+if ($request->isPost()) {
+  $cl_task_required = $request->getParameter('task_required');
+} else {
+  $cl_task_required = $config->getDefinedValue('task_required');
+}
+
+if($user->can('manage_tasks')) {
+  $active_tasks = ttGroupHelper::getActiveTasks();
+  $inactive_tasks = ttGroupHelper::getInactiveTasks();
+} else
+  $active_tasks = $user->getAssignedTasks();
+
+$form = new Form('tasksForm');
+$form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_save')) {
+    // Save button clicked. Update config.
+    $config->setDefinedValue('task_required', $cl_task_required);
+    if (!$user->updateGroup(array('config' => $config->getConfig()))) {
+      $err->add($i18n->get('error.db'));
+    }
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('active_tasks', $active_tasks);
+$smarty->assign('inactive_tasks', $inactive_tasks);
+$smarty->assign('title', $i18n->get('title.tasks'));
+$smarty->assign('content_page_name', 'tasks.tpl');
+$smarty->display('index.tpl');

From adb4472cfd550a4a8fdd9fd7327b9673fac6f862 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Nov 2020 17:47:23 +0000
Subject: [PATCH 1360/1848] Made task_delete.php mobile-friendly.

---
 WEB-INF/templates/task_delete2.tpl |  4 ++++
 initialize.php                     |  2 +-
 task_delete.php                    | 32 ++++--------------------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/task_delete2.tpl

diff --git a/WEB-INF/templates/task_delete2.tpl b/WEB-INF/templates/task_delete2.tpl
new file mode 100644
index 000000000..70044b74a
--- /dev/null
+++ b/WEB-INF/templates/task_delete2.tpl
@@ -0,0 +1,4 @@
+{$forms.taskDeleteForm.open}
+<div class="section-header">{$task_to_delete|escape}</div>
+<div class="button-set">{$forms.taskDeleteForm.btn_delete.control}&nbsp;{$forms.taskDeleteForm.btn_cancel.control}</div>
+{$forms.taskDeleteForm.close}
diff --git a/initialize.php b/initialize.php
index 966061772..d14e50d59 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5354");
+define("APP_VERSION", "1.19.23.5355");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/task_delete.php b/task_delete.php
index bd0eec717..61f5e23ff 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttTaskHelper');
@@ -74,5 +50,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_task'));
-$smarty->assign('content_page_name', 'task_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'task_delete2.tpl');
+$smarty->display('index2.tpl');

From 5ccad87a6c07d30981f10f3519eb85306b8eda33 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Nov 2020 19:26:20 +0000
Subject: [PATCH 1361/1848] Made task_add.php mobile-friendly.

---
 WEB-INF/templates/task_add2.tpl | 30 +++++++++++
 initialize.php                  |  2 +-
 task_add.php                    | 36 +++----------
 task_add1.php                   | 89 +++++++++++++++++++++++++++++++++
 4 files changed, 126 insertions(+), 31 deletions(-)
 create mode 100644 WEB-INF/templates/task_add2.tpl
 create mode 100644 task_add1.php

diff --git a/WEB-INF/templates/task_add2.tpl b/WEB-INF/templates/task_add2.tpl
new file mode 100644
index 000000000..4bede3e31
--- /dev/null
+++ b/WEB-INF/templates/task_add2.tpl
@@ -0,0 +1,30 @@
+{$forms.taskForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.taskForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.taskForm.description.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{if $show_projects}
+  <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.projects}:</td>
+    <td class="td-with-input">{$forms.taskForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.taskForm.btn_submit.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+</table>
+{$forms.taskForm.close}
diff --git a/initialize.php b/initialize.php
index d14e50d59..6b404d998 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5355");
+define("APP_VERSION", "1.19.23.5356");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/task_add.php b/task_add.php
index 078bd5ca1..852ac378e 100644
--- a/task_add.php
+++ b/task_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -55,8 +31,8 @@
 }
 
 $form = new Form('taskForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
@@ -85,5 +61,5 @@
 $smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_task'));
-$smarty->assign('content_page_name', 'task_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'task_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/task_add1.php b/task_add1.php
new file mode 100644
index 000000000..078bd5ca1
--- /dev/null
+++ b/task_add1.php
@@ -0,0 +1,89 @@
+<?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('form.ActionForm');
+import('ttGroupHelper');
+import('ttTaskHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+$projects = ttGroupHelper::getActiveProjects();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_projects = $request->getParameter('projects');
+} else {
+  foreach ($projects as $project_item)
+    $cl_projects[] = $project_item['id'];
+}
+
+$form = new Form('taskForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+
+  if ($err->no()) {
+    if (!ttTaskHelper::getTaskByName($cl_name)) {
+      if (ttTaskHelper::insert(array(
+        'name' => $cl_name,
+        'description' => $cl_description,
+        'status' => ACTIVE,
+        'projects' => $cl_projects))) {
+          header('Location: tasks.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.object_exists'));
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
+$smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_task'));
+$smarty->assign('content_page_name', 'task_add.tpl');
+$smarty->display('index.tpl');

From 8824bd2332368f1d463d72f95e6b085cdea49138 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Nov 2020 19:45:49 +0000
Subject: [PATCH 1362/1848] Made task_edit.php mobile-friendly.

---
 WEB-INF/templates/task_edit2.tpl |  33 +++++++++
 initialize.php                   |   2 +-
 task_edit.php                    |  36 ++-------
 task_edit1.php                   | 122 +++++++++++++++++++++++++++++++
 4 files changed, 162 insertions(+), 31 deletions(-)
 create mode 100644 WEB-INF/templates/task_edit2.tpl
 create mode 100644 task_edit1.php

diff --git a/WEB-INF/templates/task_edit2.tpl b/WEB-INF/templates/task_edit2.tpl
new file mode 100644
index 000000000..0ec709851
--- /dev/null
+++ b/WEB-INF/templates/task_edit2.tpl
@@ -0,0 +1,33 @@
+{$forms.taskForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.taskForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.taskForm.description.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.taskForm.status.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{if $show_projects}
+  <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.projects}:</td>
+    <td class="td-with-input">{$forms.taskForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.taskForm.btn_save.control} {$forms.taskForm.btn_copy.control}</div>
+{$forms.taskForm.close}
diff --git a/initialize.php b/initialize.php
index 6b404d998..12427a800 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5356");
+define("APP_VERSION", "1.19.23.5357");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/task_edit.php b/task_edit.php
index 10410c4b3..307beb0b5 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -66,8 +42,8 @@
 
 $form = new Form('taskForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
@@ -118,5 +94,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.edit_task'));
-$smarty->assign('content_page_name', 'task_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'task_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/task_edit1.php b/task_edit1.php
new file mode 100644
index 000000000..10410c4b3
--- /dev/null
+++ b/task_edit1.php
@@ -0,0 +1,122 @@
+<?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('ttGroupHelper');
+import('ttTaskHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_task_id = (int)$request->getParameter('id');
+$task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$projects = ttGroupHelper::getActiveProjects();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_status = $request->getParameter('status');
+  $cl_projects = $request->getParameter('projects');
+} else {
+  $cl_name = $task['name'];
+  $cl_description = $task['description'];
+  $cl_status = $task['status'];
+  $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
+  foreach ($assigned_projects as $project_item)
+    $cl_projects[] = $project_item['id'];
+}
+
+$form = new Form('taskForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      $existing_task = ttTaskHelper::getTaskByName($cl_name);
+      if (!$existing_task || ($cl_task_id == $existing_task['id'])) {
+        // Update task information.
+        if (ttTaskHelper::update(array(
+          'task_id' => $cl_task_id,
+          'name' => $cl_name,
+          'description' => $cl_description,
+          'status' => $cl_status,
+          'projects' => $cl_projects))) {
+          header('Location: tasks.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }
+
+    if ($request->getParameter('btn_copy')) {
+      if (!ttTaskHelper::getTaskByName($cl_name)) {
+        if (ttTaskHelper::insert(array(
+          'name' => $cl_name,
+          'description' => $cl_description,
+          'status' => $cl_status,
+          'projects' => $cl_projects))) {
+          header('Location: tasks.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
+$smarty->assign('title', $i18n->get('title.edit_task'));
+$smarty->assign('content_page_name', 'task_edit.tpl');
+$smarty->display('index.tpl');

From 39ad8ee6a434ab91f5e0751f02fa5b6f4bc4fb3a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 12 Nov 2020 21:07:45 +0000
Subject: [PATCH 1363/1848] Made clients.php mobile-friendly.

---
 WEB-INF/templates/clients2.tpl | 59 ++++++++++++++++++++++++++++++++++
 clients.php                    | 32 +++---------------
 clients1.php                   | 55 +++++++++++++++++++++++++++++++
 initialize.php                 |  2 +-
 4 files changed, 119 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/clients2.tpl
 create mode 100644 clients1.php

diff --git a/WEB-INF/templates/clients2.tpl b/WEB-INF/templates/clients2.tpl
new file mode 100644
index 000000000..1ec69df2f
--- /dev/null
+++ b/WEB-INF/templates/clients2.tpl
@@ -0,0 +1,59 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{if $user->can('manage_clients')}
+  {if $inactive_clients}<div class="section-header">{$i18n.form.clients.active_clients}</div>{/if}
+  {if $active_clients}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.person_name}</th>
+    <th>{$i18n.label.address}</th>
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $active_clients as $client}
+  <tr>
+    <td class="text-cell">{$client.name|escape}</td>
+    <td class="text-cell">{$client.address|escape}</td>
+    <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+  {/if}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></div>
+  {if $inactive_clients}
+<div class="section-header">{$i18n.form.clients.inactive_clients}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.person_name}</th>
+    <th>{$i18n.label.address}</th>
+    <th></th>
+    <th></th>
+  </tr>
+    {foreach $inactive_clients as $client}
+  <tr>
+    <td class="text-cell">{$client.name|escape}</td>
+    <td class="text-cell">{$client.address|escape}</td>
+    <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></div>
+  {/if}
+{else}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.person_name}</th>
+    <th>{$i18n.label.address}</th>
+  </tr>
+  {foreach $active_clients as $client}
+  <tr>
+    <td class="text-cell">{$client.name|escape}</td>
+    <td class="text-cell">{$client.address|escape}</td>
+  </tr>
+  {/foreach}
+</table>
+{/if}
diff --git a/clients.php b/clients.php
index a299d3061..77ade9c7b 100644
--- a/clients.php
+++ b/clients.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -51,5 +27,5 @@
 $smarty->assign('active_clients', $active_clients);
 $smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));
-$smarty->assign('content_page_name', 'clients.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'clients2.tpl');
+$smarty->display('index2.tpl');
diff --git a/clients1.php b/clients1.php
new file mode 100644
index 000000000..a299d3061
--- /dev/null
+++ b/clients1.php
@@ -0,0 +1,55 @@
+<?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('ttTeamHelper');
+import('ttGroupHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if($user->can('manage_clients')) {
+  $active_clients = ttGroupHelper::getActiveClients(true);
+  $inactive_clients = ttGroupHelper::getInactiveClients(true);
+} else
+  $active_clients = $user->getAssignedClients();
+
+$smarty->assign('active_clients', $active_clients);
+$smarty->assign('inactive_clients', $inactive_clients);
+$smarty->assign('title', $i18n->get('title.clients'));
+$smarty->assign('content_page_name', 'clients.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index 12427a800..576a3c2ad 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5357");
+define("APP_VERSION", "1.19.23.5358");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From adb3536504bf9859d9e40657bd879da92437e924 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 16:10:51 +0000
Subject: [PATCH 1364/1848] Made client_delete.php mobile-friendly.

---
 WEB-INF/templates/client_delete2.tpl | 16 ++++++
 client_delete.php                    | 32 ++----------
 client_delete1.php                   | 78 ++++++++++++++++++++++++++++
 default.css                          |  1 +
 initialize.php                       |  2 +-
 5 files changed, 100 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/client_delete2.tpl
 create mode 100644 client_delete1.php

diff --git a/WEB-INF/templates/client_delete2.tpl b/WEB-INF/templates/client_delete2.tpl
new file mode 100644
index 000000000..bc583ea66
--- /dev/null
+++ b/WEB-INF/templates/client_delete2.tpl
@@ -0,0 +1,16 @@
+{$forms.clientDeleteForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td>{$i18n.form.client.client_to_delete}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.form.client.client_to_delete}:</td>
+    <td class="text-cell"><div class="section-header">{$client_to_delete|escape}</div></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.form.client.client_entries}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.form.client.client_entries}:</td>
+    <td>{$forms.clientDeleteForm.delete_client_entries.control}</td>
+  </tr>
+</table>
+<div class="button-set">{$forms.clientDeleteForm.btn_delete.control}&nbsp;{$forms.clientDeleteForm.btn_cancel.control}</div>
+{$forms.clientDeleteForm.close}
diff --git a/client_delete.php b/client_delete.php
index a5f00656e..147f2db54 100644
--- a/client_delete.php
+++ b/client_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -74,5 +50,5 @@
 $smarty->assign('client_to_delete', $client_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_client'));
-$smarty->assign('content_page_name', 'client_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'client_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/client_delete1.php b/client_delete1.php
new file mode 100644
index 000000000..a5f00656e
--- /dev/null
+++ b/client_delete1.php
@@ -0,0 +1,78 @@
+<?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('ttClientHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$id = (int)$request->getParameter('id');
+$client = ttClientHelper::getClient($id);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$client_to_delete = $client['name'];
+
+$form = new Form('clientDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
+$form->addInput(array('type'=>'combobox','name'=>'delete_client_entries',
+  'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
+      header('Location: clients.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
+
+  if ($request->getParameter('btn_cancel')) {
+    header('Location: clients.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('client_to_delete', $client_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.delete_client'));
+$smarty->assign('content_page_name', 'client_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/default.css b/default.css
index 804a06a66..fdf1d168f 100644
--- a/default.css
+++ b/default.css
@@ -323,6 +323,7 @@ input.password-field {
 
 .section-header {
   font-weight: bold;
+  text-align: center;
   margin-left: auto;
   margin-right: auto;
 }
diff --git a/initialize.php b/initialize.php
index 576a3c2ad..aae530f1f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5358");
+define("APP_VERSION", "1.19.23.5359");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ea7fdda737e3f00350025971031845259c71244d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 17:12:51 +0000
Subject: [PATCH 1365/1848] Made client_add.php mobile-friendly.

---
 WEB-INF/templates/client_add2.tpl | 36 ++++++++++++
 client_add.php                    | 36 ++----------
 client_add1.php                   | 94 +++++++++++++++++++++++++++++++
 initialize.php                    |  2 +-
 4 files changed, 137 insertions(+), 31 deletions(-)
 create mode 100644 WEB-INF/templates/client_add2.tpl
 create mode 100644 client_add1.php

diff --git a/WEB-INF/templates/client_add2.tpl b/WEB-INF/templates/client_add2.tpl
new file mode 100644
index 000000000..9ffdfa203
--- /dev/null
+++ b/WEB-INF/templates/client_add2.tpl
@@ -0,0 +1,36 @@
+{$forms.clientForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.client_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.client_name} (*):</label></td>
+    <td class="td-with-input">{$forms.clientForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="address">{$i18n.label.client_address}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="address">{$i18n.label.client_address}:</label></td>
+    <td class="td-with-input">{$forms.clientForm.address.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="tax">{$i18n.label.tax}, %:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="tax">{$i18n.label.tax}, %:</label></td>
+    <td class="td-with-input">{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{if $show_projects}
+  <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.projects}:</td>
+    <td class="td-with-input">{$forms.clientForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr>
+    <td colspan="2">{$forms.clientForm.btn_submit.control}</td>
+  </tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+</table>
+{$forms.clientForm.close}
diff --git a/client_add.php b/client_add.php
index 820a32fde..114e89ea0 100644
--- a/client_add.php
+++ b/client_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -57,8 +33,8 @@
 $show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
 
 $form = new Form('clientForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 if ($show_projects)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
@@ -90,5 +66,5 @@
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_client'));
-$smarty->assign('content_page_name', 'client_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'client_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/client_add1.php b/client_add1.php
new file mode 100644
index 000000000..820a32fde
--- /dev/null
+++ b/client_add1.php
@@ -0,0 +1,94 @@
+<?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('ttClientHelper');
+import('ttGroupHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+
+$projects = ttGroupHelper::getActiveProjects();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_address = trim($request->getParameter('address'));
+  $cl_tax = $request->getParameter('tax');
+  $cl_projects = $request->getParameter('projects');
+} else {
+  // Do not assign all projects to a new client by default. This should help to reduce clutter.
+  // foreach ($projects as $project_item)
+  //   $cl_projects[] = $project_item['id'];
+}
+
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
+$form = new Form('clientForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
+$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
+if ($show_projects)
+  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
+
+  if ($err->no()) {
+    if (!ttClientHelper::getClientByName($cl_name)) {
+      if (ttClientHelper::insert(array('name' => $cl_name,
+        'address' => $cl_address,
+        'tax' => $cl_tax,
+        'projects' => $cl_projects,
+        'status' => ACTIVE))) {
+        header('Location: clients.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+     } else
+       $err->add($i18n->get('error.object_exists'));
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
+$smarty->assign('show_projects', $show_projects);
+$smarty->assign('title', $i18n->get('title.add_client'));
+$smarty->assign('content_page_name', 'client_add.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index aae530f1f..f55ede5ae 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5359");
+define("APP_VERSION", "1.19.23.5360");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ae6d97fb4d813a58cb073b501a4e643d91882ea9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 17:57:09 +0000
Subject: [PATCH 1366/1848] Made client_edit.php mobile-friendly.

---
 WEB-INF/templates/client_edit2.tpl |  39 +++++++++
 client_edit.php                    |  36 ++------
 client_edit1.php                   | 131 +++++++++++++++++++++++++++++
 initialize.php                     |   2 +-
 4 files changed, 177 insertions(+), 31 deletions(-)
 create mode 100644 WEB-INF/templates/client_edit2.tpl
 create mode 100644 client_edit1.php

diff --git a/WEB-INF/templates/client_edit2.tpl b/WEB-INF/templates/client_edit2.tpl
new file mode 100644
index 000000000..d29635de4
--- /dev/null
+++ b/WEB-INF/templates/client_edit2.tpl
@@ -0,0 +1,39 @@
+{$forms.clientForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.client_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.client_name} (*):</label></td>
+    <td class="td-with-input">{$forms.clientForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="address">{$i18n.label.client_address}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="address">{$i18n.label.client_address}:</label></td>
+    <td class="td-with-input">{$forms.clientForm.address.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="tax">{$i18n.label.tax}, %:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="tax">{$i18n.label.tax}, %:</label></td>
+    <td class="td-with-input">{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.clientForm.status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+{if $show_projects}
+  <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.projects}:</td>
+    <td class="td-with-input">{$forms.clientForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+</table>
+<div class="button-set">{$forms.clientForm.btn_save.control} {$forms.clientForm.btn_copy.control}</div>
+{$forms.clientForm.close}
diff --git a/client_edit.php b/client_edit.php
index 7b572ea7c..2924346bf 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -72,8 +48,8 @@
 
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','style'=>'width: 350px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
+$form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
@@ -127,5 +103,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.edit_client'));
-$smarty->assign('content_page_name', 'client_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'client_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/client_edit1.php b/client_edit1.php
new file mode 100644
index 000000000..7b572ea7c
--- /dev/null
+++ b/client_edit1.php
@@ -0,0 +1,131 @@
+<?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('ttClientHelper');
+import('ttTeamHelper');
+import('ttGroupHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_id = (int)$request->getParameter('id');
+$client = ttClientHelper::getClient($cl_id, true);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$projects = ttGroupHelper::getActiveProjects();
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('name'));
+  $cl_address = trim($request->getParameter('address'));
+  $cl_tax = trim($request->getParameter('tax'));
+  $cl_status = $request->getParameter('status');
+  $cl_projects = $request->getParameter('projects');
+} else {
+  $cl_name = $client['name'];
+  $cl_address = $client['address'];
+  $cl_tax = $client['tax'];
+  $cl_status = $client['status'];
+  $assigned_projects = ttClientHelper::getAssignedProjects($cl_id);
+  foreach($assigned_projects as $project_item) {
+    $cl_projects[] = $project_item['id'];
+  }
+}
+
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
+$form = new Form('clientForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+$form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','style'=>'width: 350px;','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
+$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+if ($show_projects)
+  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_save')) {
+      $client = ttClientHelper::getClientByName($cl_name);
+      if (($client && ($cl_id == $client['id'])) || !$client) {
+        if (ttClientHelper::update(array(
+          'id' => $cl_id,
+          'name' => $cl_name,
+          'address' => $cl_address,
+          'tax' => $cl_tax,
+          'status' => $cl_status,
+          'projects' => $cl_projects))) {
+          header('Location: clients.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }
+
+    if ($request->getParameter('btn_copy')) {
+      if (!ttClientHelper::getClientByName($cl_name)) {
+        if (ttClientHelper::insert(array('name' => $cl_name,
+          'address' => $cl_address,
+          'tax' => $cl_tax,
+          'status' => $cl_status,
+          'projects' => $cl_projects))) {
+          header('Location: clients.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+      } else
+        $err->add($i18n->get('error.object_exists'));
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', $show_projects);
+$smarty->assign('title', $i18n->get('title.edit_client'));
+$smarty->assign('content_page_name', 'client_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index f55ede5ae..deaefa540 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5360");
+define("APP_VERSION", "1.19.23.5361");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ec328a91e21844d6e6e6923bd25d6521ebef16f8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 20:20:22 +0000
Subject: [PATCH 1367/1848] Refactored expenses.php for mobile access.

---
 WEB-INF/templates/expenses2.tpl | 238 ++++++++++++++++++++++++++++++
 default.css                     |  10 ++
 expenses.php                    |  59 +++-----
 expenses1.php                   | 251 ++++++++++++++++++++++++++++++++
 initialize.php                  |   2 +-
 5 files changed, 521 insertions(+), 39 deletions(-)
 create mode 100644 WEB-INF/templates/expenses2.tpl
 create mode 100644 expenses1.php

diff --git a/WEB-INF/templates/expenses2.tpl b/WEB-INF/templates/expenses2.tpl
new file mode 100644
index 000000000..7af327838
--- /dev/null
+++ b/WEB-INF/templates/expenses2.tpl
@@ -0,0 +1,238 @@
+<script>
+// We need a few arrays to populate project dropdown.
+// When client selection changes, the project dropdown must be re-populated with only relevant projects.
+// Format:
+// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
+// project_names[325] = "Time Tracker";   // Project name.
+
+// Prepare an array of project ids for clients.
+var project_ids = new Array();
+{foreach $client_list as $client}
+  project_ids[{$client.id}] = "{$client.projects}";
+{/foreach}
+// Prepare an array of project names.
+var project_names = new Array();
+{foreach $project_list as $project}
+  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
+{/foreach}
+// We'll use this array to populate project dropdown when client is not selected.
+var idx = 0;
+var projects = new Array();
+{foreach $project_list as $project}
+  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
+  idx++;
+{/foreach}
+
+// Mandatory top option for project dropdown.
+var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}";
+
+// Prepare an array of predefined expenses.
+idx = 0;
+var defined_expenses = new Array();
+{foreach $predefined_expenses as $predefined_expense}
+  defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}");
+  idx++;
+{/foreach}
+
+// The fillProjectDropdown function populates the project combo box with
+// projects associated with a selected client (client id is passed here as id).
+function fillProjectDropdown(id) {
+  var str_ids = project_ids[id];
+  var dropdown = document.getElementById("project");
+  // Determine previously selected item.
+  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+
+  // Remove existing content.
+  dropdown.length = 0;
+  // Add mandatory top option.
+  dropdown.options[0] = new Option(empty_label_project, '', true);
+
+  // Populate project dropdown.
+  if (!id) {
+    // If we are here, client is not selected.
+    var len = projects.length;
+    for (var i = 0; i < len; i++) {
+      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
+      if (dropdown.options[i+1].value == selected_item)
+        dropdown.options[i+1].selected = true;
+    }
+  } else if (str_ids) {
+    var ids = new Array();
+    ids = str_ids.split(",");
+    var len = ids.length;
+
+    for (var i = 0; i < len; i++) {
+      var p_id = ids[i];
+      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
+      if (dropdown.options[i+1].value == selected_item)
+        dropdown.options[i+1].selected = true;
+    }
+  }
+}
+
+function get_date() {
+  var date = new Date();
+  return date.strftime("%Y-%m-%d");
+}
+
+// The recalculateCost function recalculates cost based on the current selection
+// of predefined expense and quantity and also changes the comment accordingly.
+function recalculateCost() {
+  var quantity_control = document.getElementById("quantity");
+  // Set quantity to 1 if it is not set already.
+  if (!quantity_control.value) {
+     quantity_control.value = "1";
+  }
+
+  var comment_control = document.getElementById("item_name");
+  var cost_control = document.getElementById("cost");
+  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
+
+  // Calculate cost.
+  var dropdown = document.getElementById("predefined_expense");
+  if (dropdown.selectedIndex == 0) {
+    quantity_control.value = "";
+    comment_control.value = "";
+    cost_control.value = "";
+  } else {
+    comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value;
+    var quantity = quantity_control.value;
+    if (isNaN(quantity))
+      cost_control.value = "";
+    else {
+      var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
+      if (replaceDecimalMark)
+        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
+      var newCost = (quantity_control.value * expenseCost).toFixed(2);
+      if (replaceDecimalMark)
+        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
+      cost_control.value = newCost;
+    }
+  }
+}
+</script>
+
+{$forms.expensesForm.open}
+<div class="small-screen-calendar">{$forms.expensesForm.date.control}</div>
+<table class="centered-table">
+  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.expensesForm.date.control}</div></td></tr>
+{if $user_dropdown}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.expensesForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $user->isPluginEnabled('cl')}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.expensesForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+    <td class="td-with-input">{$forms.expensesForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $predefined_expenses}
+  <tr class = "small-screen-label"><td><label for="predefined_expense">{$i18n.label.expense}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="predefined_expense">{$i18n.label.expense}:</label></td>
+    <td class="td-with-input">{$forms.expensesForm.predefined_expense.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="quantity">{$i18n.label.quantity}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="quantity">{$i18n.label.quantity}:</label></td>
+    <td class="td-with-input">{$forms.expensesForm.quantity.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="item_name">{$i18n.label.comment}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="item_name">{$i18n.label.comment}:</label></td>
+    <td class="td-with-input">{$forms.expensesForm.item_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cost">{$i18n.label.cost} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cost">{$i18n.label.cost} (*):</label></td>
+    <td class="td-with-input">{$forms.expensesForm.cost.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $show_files}
+  <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
+    <td class="td-with-input">{$forms.expensesForm.newfile.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr>
+    <td align="center" colspan="3">{$forms.expensesForm.btn_submit.control}</td>
+  </tr>
+</table>
+{$forms.expensesForm.close}
+
+{if $expense_items}
+<div class="record-list">
+<table class="x-scrollable-table">
+  <tr>
+  {if $user->isPluginEnabled('cl')}
+    <th>{$i18n.label.client}</th>
+  {/if}
+  {if $show_project}
+    <th>{$i18n.label.project}</th>
+  {/if}
+    <th>{$i18n.label.item}</th>
+    <th>{$i18n.label.cost}</th>
+  {if $show_files}
+    <th></th>
+  {/if}
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $expense_items as $item}
+  <tr>
+    {if $user->isPluginEnabled('cl')}
+    <td class="text-cell">{$item.client|escape}</td>
+    {/if}
+    {if $show_project}
+    <td class="text-cell">{$item.project|escape}</td>
+    {/if}
+    <td class="text-cell">{$item.item|escape}</td>
+    <td class="time-cell">{$item.cost}</td>
+    {if $show_files}
+      {if $item.has_files}
+        <td><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+        <td><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+    <td>
+    {if $item.approved || $item.invoice_id}
+      &nbsp;
+    {else}
+      <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
+    {/if}
+    </td>
+    <td>
+    {if $item.approved || $item.invoice_id}
+      &nbsp;
+    {else}
+      <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
+    {/if}
+    </td>
+  </tr>
+  {/foreach}
+</table>
+</div>
+<div class="day-totals">{$i18n.label.day_total}: {$user->getCurrency()|escape} {$day_total}</div>
+{/if}
+
diff --git a/default.css b/default.css
index fdf1d168f..1d0f4c1e4 100644
--- a/default.css
+++ b/default.css
@@ -280,6 +280,16 @@ input.password-field {
   resize: none;
 }
 
+.day-totals {
+  margin-bottom: 1rem;
+}
+
+.day-totals-col2 {
+  padding-left: .5rem;
+  padding-right: .5rem;
+  text-align: right;
+}
+
 .day-totals-col1 {
   text-align: left;
   padding-left: .5rem;
diff --git a/expenses.php b/expenses.php
index 7959bb311..170f0cd3b 100644
--- a/expenses.php
+++ b/expenses.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -96,6 +72,7 @@
 
 // Elements of expensesForm.
 $form = new Form('expensesForm');
+$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 if ($user->can('track_expenses')) {
   $rank = $user->getMaxRankForGroup($user->getGroup());
@@ -108,11 +85,11 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
       'name'=>'user',
-      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
     $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -123,12 +100,12 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$active_clients,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
+    $largeScreenCalendarRowSpan += 2;
 }
 
 if ($show_project) {
@@ -136,16 +113,16 @@
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming. 
+    // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
 
@@ -162,11 +139,11 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 // If predefined expenses are configured, add controls to select an expense and quantity.
@@ -175,17 +152,22 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
     'name'=>'predefined_expense',
-    'style'=>'width: 250px;',
     'value'=>$cl_predefined_expense,
     'data'=>$predefined_expenses,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
+  $largeScreenCalendarRowSpan += 2;
+  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','value'=>$cl_quantity));
+  $largeScreenCalendarRowSpan += 2;
 }
-$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-if ($showFiles)
+$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','value'=>$cl_item_name));
+$largeScreenCalendarRowSpan += 2;
+$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
+$largeScreenCalendarRowSpan += 2;
+if ($showFiles) {
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+  $largeScreenCalendarRowSpan += 2;
+}
 $form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
@@ -237,6 +219,7 @@
   }
 }
 
+$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_project', $show_project);
 $smarty->assign('show_files', $showFiles);
@@ -247,5 +230,5 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.expenses'));
-$smarty->assign('content_page_name', 'expenses.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'expenses2.tpl');
+$smarty->display('index2.tpl');
diff --git a/expenses1.php b/expenses1.php
new file mode 100644
index 000000000..cd930a8b8
--- /dev/null
+++ b/expenses1.php
@@ -0,0 +1,251 @@
+<?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('ttGroupHelper');
+import('DateAndTime');
+import('ttTimeHelper');
+import('ttExpenseHelper');
+import('ttFileHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // Nobody to enter expenses for.
+  exit();
+}
+if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_expenses') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
+if ($request->isPost() && $request->getParameter('user')) {
+  if (!$user->isUserValid($request->getParameter('user'))) {
+    header('Location: access_denied.php'); // Wrong user id on post.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for which we display this page.
+$userChanged = $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged) {
+  $user_id = $request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+// Initialize and store date in session.
+$cl_date = $request->getParameter('date', @$_SESSION['date']);
+$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
+if($selected_date->isError())
+  $selected_date = new DateAndTime(DB_DATEFORMAT);
+if(!$cl_date)
+  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+$_SESSION['date'] = $cl_date;
+
+$tracking_mode = $user->getTrackingMode();
+$show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
+$showFiles = $user->isPluginEnabled('at');
+
+// Initialize variables.
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
+$_SESSION['client'] = $cl_client;
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
+$_SESSION['project'] = $cl_project;
+$cl_item_name = $request->getParameter('item_name');
+$cl_cost = $request->getParameter('cost');
+
+// Elements of expensesForm.
+$form = new Form('expensesForm');
+
+if ($user->can('track_expenses')) {
+  $rank = $user->getMaxRankForGroup($user->getGroup());
+  if ($user->can('track_own_expenses'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
+      'name'=>'user',
+      'style'=>'width: 250px;',
+      'value'=>$user_id,
+      'data'=>$user_list,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $smarty->assign('user_dropdown', 1);
+  }
+}
+
+// Dropdown for clients in MODE_TIME. Use all active clients.
+if (MODE_TIME == $tracking_mode && $user->isPluginEnabled('cl')) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'style'=>'width: 250px;',
+      'value'=>$cl_client,
+      'data'=>$active_clients,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  // Note: in other modes the client list is filtered to relevant clients only. See below.
+}
+
+if ($show_project) {
+  // Dropdown for projects assigned to user.
+  $project_list = $user->getAssignedProjects();
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'project',
+    'style'=>'width: 250px;',
+    'value'=>$cl_project,
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+  // Dropdown for clients if the clients plugin is enabled.
+  if ($user->isPluginEnabled('cl')) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    // We need an array of assigned project ids to do some trimming.
+    foreach($project_list as $project)
+      $projects_assigned_to_user[] = $project['id'];
+
+    // Build a client list out of active clients. Use only clients that are relevant to user.
+    // Also trim their associated project list to only assigned projects (to user).
+    foreach($active_clients as $client) {
+      $projects_assigned_to_client = explode(',', $client['projects']);
+      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
+      if ($intersection) {
+        $client['projects'] = implode(',', $intersection);
+        $client_list[] = $client;
+      }
+    }
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'style'=>'width: 250px;',
+      'value'=>$cl_client,
+      'data'=>$client_list,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  }
+}
+// If predefined expenses are configured, add controls to select an expense and quantity.
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
+if ($predefined_expenses) {
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'recalculateCost();',
+    'name'=>'predefined_expense',
+    'style'=>'width: 250px;',
+    'value'=>$cl_predefined_expense,
+    'data'=>$predefined_expenses,
+    'datakeys'=>array('id', 'name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
+}
+$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
+$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+if ($showFiles)
+  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
+$form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
+
+// Submit.
+if ($request->isPost()) {
+  if ($request->getParameter('btn_submit')) {
+    // Validate user input.
+    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+      $err->add($i18n->get('error.client'));
+    if ($show_project && !$cl_project)
+      $err->add($i18n->get('error.project'));
+    if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+    if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
+
+    // Prohibit creating entries in future.
+    if (!$user->isOptionEnabled('future_entries')) {
+      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+      if ($selected_date->after($browser_today))
+        $err->add($i18n->get('error.future_date'));
+    }
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
+    // Finished validating input data.
+
+    // Prohibit creating entries in locked range.
+    if ($user->isDateLocked($selected_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    // Insert record.
+    if ($err->no()) {
+      $id = ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1));
+
+      // Put a new file in storage if we have it.
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
+        $fileHelper = new ttFileHelper($err);
+        $fields = array('entity_type'=>'expense',
+          'entity_id' => $id,
+          'file_name' => $_FILES['newfile']['name']);
+        $fileHelper->putFile($fields);
+      }
+
+      if ($id) {
+        header('Location: expenses.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_project', $show_project);
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date, $showFiles));
+$smarty->assign('predefined_expenses', $predefined_expenses);
+$smarty->assign('client_list', $client_list);
+$smarty->assign('project_list', $project_list);
+$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
+$smarty->assign('title', $i18n->get('title.expenses'));
+$smarty->assign('content_page_name', 'expenses.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index deaefa540..6fb811b4d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5361");
+define("APP_VERSION", "1.19.23.5362");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f334b09b00b1cbd97d41ef9a656c8b6c209e1fd5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 21:03:12 +0000
Subject: [PATCH 1368/1848] Made expense_delete.php mobile-friendly.

---
 WEB-INF/templates/expense_delete2.tpl | 25 ++++++++
 WEB-INF/templates/time_delete2.tpl    |  2 +-
 expense_delete.php                    | 32 ++--------
 expense_delete1.php                   | 88 +++++++++++++++++++++++++++
 initialize.php                        |  2 +-
 5 files changed, 119 insertions(+), 30 deletions(-)
 create mode 100644 WEB-INF/templates/expense_delete2.tpl
 create mode 100644 expense_delete1.php

diff --git a/WEB-INF/templates/expense_delete2.tpl b/WEB-INF/templates/expense_delete2.tpl
new file mode 100644
index 000000000..9b9bab838
--- /dev/null
+++ b/WEB-INF/templates/expense_delete2.tpl
@@ -0,0 +1,25 @@
+{$forms.expenseItemForm.open}
+<table class="centered-table">
+  <tr>
+{if $user->isPluginEnabled('cl')}
+    <th>{$i18n.label.client}</th>
+{/if}
+{if $show_project}
+    <th>{$i18n.label.project}</th>
+{/if}
+    <th>{$i18n.label.item}</th>
+    <th>{$i18n.label.cost}</th>
+  </tr>
+  <tr>
+{if $user->isPluginEnabled('cl')}
+    <td class="text-cell">{$expense_item.client_name|escape}</td>
+{/if}
+{if $show_project}
+    <td class="text-cell">{$expense_item.project_name|escape}</td>
+{/if}
+    <td class="text-cell">{$expense_item.name|escape}</td>
+    <td class="time-cell">{$expense_item.cost}</td>
+  </tr>
+</table>
+<div class="button-set">{$forms.expenseItemForm.delete_button.control}&nbsp;{$forms.expenseItemForm.cancel_button.control}</div>
+{$forms.expenseItemForm.close}
diff --git a/WEB-INF/templates/time_delete2.tpl b/WEB-INF/templates/time_delete2.tpl
index 9d51fcc62..20acb783c 100644
--- a/WEB-INF/templates/time_delete2.tpl
+++ b/WEB-INF/templates/time_delete2.tpl
@@ -8,7 +8,7 @@
     <th>{$i18n.label.task}</th>
 {/if}
 {if $show_start}
-    <th>{$i18n.label.start}</td>
+    <th>{$i18n.label.start}</th>
     <th>{$i18n.label.finish}</th>
 {/if}
 {if $show_duration}
diff --git a/expense_delete.php b/expense_delete.php
index 788fb59fa..7ecd2c6d3 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -84,5 +60,5 @@
 $smarty->assign('expense_item', $expense_item);
 $smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.delete_expense'));
-$smarty->assign('content_page_name', 'expense_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'expense_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/expense_delete1.php b/expense_delete1.php
new file mode 100644
index 000000000..788fb59fa
--- /dev/null
+++ b/expense_delete1.php
@@ -0,0 +1,88 @@
+<?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('DateAndTime');
+import('ttExpenseHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_id = (int)$request->getParameter('id');
+// Get the expense item we are deleting.
+$expense_item = ttExpenseHelper::getItem($cl_id);
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit deleting not ours, approved, or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  if ($request->getParameter('delete_button')) { // Delete button pressed.
+
+    // Determine if it is okay to delete the record.
+    $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+    if ($user->isDateLocked($item_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    if ($err->no()) {
+      // Mark the record as deleted.
+      if (ttExpenseHelper::markDeleted($cl_id)) {
+        header('Location: expenses.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
+  }
+  if ($request->getParameter('cancel_button')) { // Cancel button pressed.
+    header('Location: expenses.php');
+    exit();
+  }
+} // isPost
+
+$form = new Form('expenseItemForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
+
+$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+
+$smarty->assign('forms', array($form->getName() => $form->toArray()));
+$smarty->assign('expense_item', $expense_item);
+$smarty->assign('show_project', $show_project);
+$smarty->assign('title', $i18n->get('title.delete_expense'));
+$smarty->assign('content_page_name', 'expense_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index 6fb811b4d..e6fc238e5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5362");
+define("APP_VERSION", "1.19.23.5363");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d9d5c3b7106cdefa4d56826658308f15a233a5b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 21:47:35 +0000
Subject: [PATCH 1369/1848] Made expense_edit.php mobile-friendly.

---
 WEB-INF/templates/expense_edit2.tpl | 186 +++++++++++++++++++++
 WEB-INF/templates/expenses2.tpl     |   4 +-
 expense_edit.php                    |  44 +----
 expense_edit1.php                   | 243 ++++++++++++++++++++++++++++
 initialize.php                      |   2 +-
 5 files changed, 440 insertions(+), 39 deletions(-)
 create mode 100644 WEB-INF/templates/expense_edit2.tpl
 create mode 100644 expense_edit1.php

diff --git a/WEB-INF/templates/expense_edit2.tpl b/WEB-INF/templates/expense_edit2.tpl
new file mode 100644
index 000000000..3cea79482
--- /dev/null
+++ b/WEB-INF/templates/expense_edit2.tpl
@@ -0,0 +1,186 @@
+<script>
+// We need a few arrays to populate project dropdown.
+// When client selection changes, the project dropdown must be re-populated with only relevant projects.
+// Format:
+// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
+// project_names[325] = "Time Tracker";   // Project name.
+
+// Prepare an array of project ids for clients.
+var project_ids = new Array();
+{foreach $client_list as $client}
+  project_ids[{$client.id}] = "{$client.projects}";
+{/foreach}
+// Prepare an array of project names.
+var project_names = new Array();
+{foreach $project_list as $project}
+  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
+{/foreach}
+// We'll use this array to populate project dropdown when client is not selected.
+var idx = 0;
+var projects = new Array();
+{foreach $project_list as $project}
+  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
+  idx++;
+{/foreach}
+
+// Mandatory top option for project dropdown.
+var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}";
+
+// Prepare an array of predefined expenses.
+idx = 0;
+var defined_expenses = new Array();
+{foreach $predefined_expenses as $predefined_expense}
+  defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}");
+  idx++;
+{/foreach}
+
+{* Conditional include of confirmSave handler. *}
+{if $confirm_save}
+var original_date = "{$entry_date}";
+
+function confirmSave() {
+  var date_on_save = document.getElementById("date").value;
+  if (original_date != date_on_save) {
+    return confirm("{$i18n.warn.confirm_save}");
+  }
+}
+{/if}
+
+// The fillProjectDropdown function populates the project combo box with
+// projects associated with a selected client (client id is passed here as id).
+function fillProjectDropdown(id) {
+  var str_ids = project_ids[id];
+  var dropdown = document.getElementById("project");
+  // Determine previously selected item.
+  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+
+  // Remove existing content.
+  dropdown.length = 0;
+  // Add mandatory top option.
+  dropdown.options[0] = new Option(empty_label_project, '', true);
+
+  // Populate project dropdown.
+  if (!id) {
+    // If we are here, client is not selected.
+    var len = projects.length;
+    for (var i = 0; i < len; i++) {
+      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
+      if (dropdown.options[i+1].value == selected_item)
+        dropdown.options[i+1].selected = true;
+    }
+  } else if (str_ids) {
+    var ids = new Array();
+    ids = str_ids.split(",");
+    var len = ids.length;
+
+    for (var i = 0; i < len; i++) {
+      var p_id = ids[i];
+      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
+      if (dropdown.options[i+1].value == selected_item)
+        dropdown.options[i+1].selected = true;
+    }
+  }
+}
+
+function get_date() {
+  var date = new Date();
+  return date.strftime("%Y-%m-%d");
+}
+
+// The recalculateCost function recalculates cost based on the current selection
+// of predefined expense and quantity and also changes the comment accordingly.
+function recalculateCost() {
+  var quantity_control = document.getElementById("quantity");
+  // Set quantity to 1 if it is not set already.
+  if (!quantity_control.value) {
+     quantity_control.value = "1";
+  }
+
+  var comment_control = document.getElementById("item_name");
+  var cost_control = document.getElementById("cost");
+  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
+
+  // Calculate cost.
+  var dropdown = document.getElementById("predefined_expense");
+  if (dropdown.selectedIndex == 0) {
+    quantity_control.value = "";
+    comment_control.value = "";
+    cost_control.value = "";
+  } else {
+    comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value;
+    var quantity = quantity_control.value;
+    if (isNaN(quantity))
+      cost_control.value = "";
+    else {
+      var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
+      if (replaceDecimalMark)
+        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
+      var newCost = (quantity_control.value * expenseCost).toFixed(2);
+      if (replaceDecimalMark)
+        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
+      cost_control.value = newCost;
+    }
+  }
+}
+</script>
+
+{$forms.expenseItemForm.open}
+<table class="centered-table">
+  <tr>
+{if $user->isPluginEnabled('cl')}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $predefined_expenses}
+  <tr class = "small-screen-label"><td><label for="predefined_expense">{$i18n.label.expense}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="predefined_expense">{$i18n.label.expense}:</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.predefined_expense.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="quantity">{$i18n.label.quantity}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="quantity">{$i18n.label.quantity}:</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.quantity.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="item_name">{$i18n.label.comment} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="item_name">{$i18n.label.comment}(*):</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.item_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cost">{$i18n.label.cost} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cost">{$i18n.label.cost} (*):</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.cost.control} {$user->getCurrency()|escape}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
+  <tr>
+    <td class="large-screen-label"></td>
+    <td class="td-with-input"><label>{$forms.expenseItemForm.paid.control}{$i18n.label.paid}</label></td>
+  </tr>
+{/if}
+  <tr class="small-screen-label"><td><label for="date">{$i18n.label.date}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="date">{$i18n.label.date}:</label></td>
+    <td class="td-with-input">{$forms.expenseItemForm.date.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.expenseItemForm.btn_save.control} {$forms.expenseItemForm.btn_copy.control} {$forms.expenseItemForm.btn_delete.control}</div>
+{$forms.expenseItemForm.close}
diff --git a/WEB-INF/templates/expenses2.tpl b/WEB-INF/templates/expenses2.tpl
index 7af327838..d996bca19 100644
--- a/WEB-INF/templates/expenses2.tpl
+++ b/WEB-INF/templates/expenses2.tpl
@@ -154,9 +154,9 @@ function recalculateCost() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-  <tr class = "small-screen-label"><td><label for="item_name">{$i18n.label.comment}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="item_name">{$i18n.label.comment} (*):</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="item_name">{$i18n.label.comment}:</label></td>
+    <td class="large-screen-label"><label for="item_name">{$i18n.label.comment} (*):</label></td>
     <td class="td-with-input">{$forms.expensesForm.item_name.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
diff --git a/expense_edit.php b/expense_edit.php
index f736f2132..092f33c11 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -85,7 +61,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
@@ -98,7 +73,6 @@
   $project_list = $user->getAssignedProjects();
   $form->addInput(array('type'=>'combobox',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
@@ -107,7 +81,7 @@
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming. 
+    // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
 
@@ -124,7 +98,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
@@ -137,15 +110,14 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'recalculateCost();',
       'name'=>'predefined_expense',
-      'style'=>'width: 250px;',
       'value'=>$cl_predefined_expense,
       'data'=>$predefined_expenses,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
+    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','value'=>$cl_quantity));
 }
-$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','value'=>$cl_item_name));
+$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
 if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
@@ -239,5 +211,5 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
 $smarty->assign('title', $i18n->get('title.edit_expense'));
-$smarty->assign('content_page_name', 'expense_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'expense_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/expense_edit1.php b/expense_edit1.php
new file mode 100644
index 000000000..d8b452d56
--- /dev/null
+++ b/expense_edit1.php
@@ -0,0 +1,243 @@
+<?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('ttGroupHelper');
+import('DateAndTime');
+import('ttTimeHelper');
+import('ttExpenseHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_id = (int)$request->getParameter('id');
+// Get the expense item we are editing.
+$expense_item = ttExpenseHelper::getItem($cl_id);
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit editing not ours, approved, or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+$confirm_save = $user->getConfigOption('confirm_save');
+$trackingMode = $user->getTrackingMode();
+$show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+
+// Initialize variables.
+$cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
+if ($request->isPost()) {
+  $cl_date = trim($request->getParameter('date'));
+  $cl_client = $request->getParameter('client');
+  $cl_project = $request->getParameter('project');
+  $cl_item_name = trim($request->getParameter('item_name'));
+  $cl_cost = trim($request->getParameter('cost'));
+  if ($user->isPluginEnabled('ps'))
+    $cl_paid = $request->getParameter('paid');
+} else {
+  $cl_date = $item_date->toString($user->getDateFormat());
+  $cl_client = $expense_item['client_id'];
+  $cl_project = $expense_item['project_id'];
+  $cl_item_name = $expense_item['name'];
+  $cl_cost = $expense_item['cost'];
+  $cl_paid = $expense_item['paid'];
+}
+
+// Initialize elements of 'expenseItemForm'.
+$form = new Form('expenseItemForm');
+
+// Dropdown for clients in MODE_TIME. Use all active clients.
+if (MODE_TIME == $trackingMode && $user->isPluginEnabled('cl')) {
+  $active_clients = ttGroupHelper::getActiveClients(true);
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillProjectDropdown(this.value);',
+    'name'=>'client',
+    'style'=>'width: 250px;',
+    'value'=>$cl_client,
+    'data'=>$active_clients,
+    'datakeys'=>array('id', 'name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  // Note: in other modes the client list is filtered to relevant clients only. See below.
+}
+
+if ($show_project) {
+  // Dropdown for projects assigned to user.
+  $project_list = $user->getAssignedProjects();
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'project',
+    'style'=>'width: 250px;',
+    'value'=>$cl_project,
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+  // Dropdown for clients if the clients plugin is enabled.
+  if ($user->isPluginEnabled('cl')) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    // We need an array of assigned project ids to do some trimming.
+    foreach($project_list as $project)
+      $projects_assigned_to_user[] = $project['id'];
+
+    // Build a client list out of active clients. Use only clients that are relevant to user.
+    // Also trim their associated project list to only assigned projects (to user).
+    foreach($active_clients as $client) {
+      $projects_assigned_to_client = explode(',', $client['projects']);
+      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
+      if ($intersection) {
+        $client['projects'] = implode(',', $intersection);
+        $client_list[] = $client;
+      }
+    }
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'style'=>'width: 250px;',
+      'value'=>$cl_client,
+      'data'=>$client_list,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  }
+}
+// If predefined expenses are configured, add controls to select an expense and quantity.
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
+if ($predefined_expenses) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'recalculateCost();',
+      'name'=>'predefined_expense',
+      'style'=>'width: 250px;',
+      'value'=>$cl_predefined_expense,
+      'data'=>$predefined_expenses,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
+}
+$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
+$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
+  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
+$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
+// Hidden control for record id.
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
+$on_click_action = 'browser_today.value=get_date();';
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
+if ($confirm_save) $on_click_action .= 'return(confirmSave());';
+$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
+    $err->add($i18n->get('error.client'));
+  if ($show_project && !$cl_project)
+    $err->add($i18n->get('error.project'));
+  if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
+
+  // This is a new date for the expense item.
+  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
+
+  // Prohibit creating entries in future.
+  if (!$user->isOptionEnabled('future_entries')) {
+    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+    if ($new_date->after($browser_today))
+      $err->add($i18n->get('error.future_date'));
+  }
+  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
+  // Finished validating user input.
+
+  // Save record.
+  if ($request->getParameter('btn_save')) {
+    // We need to:
+    // 1) Prohibit updating locked entries (that are in locked range).
+    // 2) Prohibit saving unlocked entries into locked range.
+
+    // Now, step by step.
+    // 1) Prohibit saving locked entries in any form.
+    if ($user->isDateLocked($item_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    // 2) Prohibit saving unlocked entries into locked range.
+    if ($err->no() && $user->isDateLocked($new_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    // Now, an update.
+    if ($err->no()) {
+      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),
+          'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'paid'=>$cl_paid))) {
+        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
+        exit();
+      }
+    }
+  }
+
+  // Save as new record.
+  if ($request->getParameter('btn_copy')) {
+    // We need to prohibit saving into locked interval.
+    if ($user->isDateLocked($new_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    // Now, a new insert.
+    if ($err->no()) {
+      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'client_id'=>$cl_client,
+          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
+        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
+  }
+
+  if ($request->getParameter('btn_delete')) {
+    header("Location: expense_delete.php?id=$cl_id");
+    exit();
+  }
+} // isPost
+
+if ($confirm_save) {
+  $smarty->assign('confirm_save', true);
+  $smarty->assign('entry_date', $cl_date);
+}
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_project', $show_project);
+$smarty->assign('predefined_expenses', $predefined_expenses);
+$smarty->assign('client_list', $client_list);
+$smarty->assign('project_list', $project_list);
+$smarty->assign('task_list', $task_list);
+$smarty->assign('title', $i18n->get('title.edit_expense'));
+$smarty->assign('content_page_name', 'expense_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index e6fc238e5..a6bea1735 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5363");
+define("APP_VERSION", "1.19.23.5364");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2a3c243eb57e2a41f319be331e001a23a2828372 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 21:59:57 +0000
Subject: [PATCH 1370/1848] Fixed calendar icon presentation for empty DIR_NAME
 condition.

---
 WEB-INF/lib/form/DateField.class.php | 2 +-
 initialize.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index f3513c480..5eb217bac 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,7 +406,7 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      if (defined('DIR_NAME'))
+      if (defined('DIR_NAME') && !empty(DIR_NAME))
         $app_root = '/'.DIR_NAME;
 
       $html .= "&nbsp;<img src=\"".$app_root."/img/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
diff --git a/initialize.php b/initialize.php
index a6bea1735..e1b70c7b2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5364");
+define("APP_VERSION", "1.19.23.5365");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b13c5b01c6bc514bd075df969eb4f054523a75b3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Nov 2020 22:29:05 +0000
Subject: [PATCH 1371/1848] Rolling back a previous commit, something is wrong.

---
 WEB-INF/lib/form/DateField.class.php | 2 +-
 initialize.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 5eb217bac..f3513c480 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,7 +406,7 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      if (defined('DIR_NAME') && !empty(DIR_NAME))
+      if (defined('DIR_NAME'))
         $app_root = '/'.DIR_NAME;
 
       $html .= "&nbsp;<img src=\"".$app_root."/img/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
diff --git a/initialize.php b/initialize.php
index e1b70c7b2..f138dff08 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5365");
+define("APP_VERSION", "1.19.23.5366");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9398c60f4f9b9b13bcc0617e9de38bb9599680df Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Nov 2020 13:37:57 +0000
Subject: [PATCH 1372/1848] Fixed path to calendar icon for some DIR_NAME
 situations.

---
 WEB-INF/lib/form/DateField.class.php | 5 +++--
 initialize.php                       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index f3513c480..8ff06af5f 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,8 +406,9 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      if (defined('DIR_NAME'))
-        $app_root = '/'.DIR_NAME;
+      $dir_name = trim(constant('DIR_NAME'), '/');
+      if (!empty($dir_name))
+        $app_root = '/'.$dir_name;
 
       $html .= "&nbsp;<img src=\"".$app_root."/img/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->name."');\">\n";
     }
diff --git a/initialize.php b/initialize.php
index f138dff08..be4ad934b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5366");
+define("APP_VERSION", "1.19.23.5367");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a9d1256cd4d7a5158ec1c499fd1df02e6f5303f9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Nov 2020 13:49:39 +0000
Subject: [PATCH 1373/1848] Disabled logging a warning when DIR_NAME is not
 defined.

---
 WEB-INF/lib/form/DateField.class.php | 2 +-
 initialize.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 8ff06af5f..01c14f2e6 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,7 +406,7 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      $dir_name = trim(constant('DIR_NAME'), '/');
+      $dir_name = trim(@constant('DIR_NAME'), '/');
       if (!empty($dir_name))
         $app_root = '/'.$dir_name;
 
diff --git a/initialize.php b/initialize.php
index be4ad934b..4405f89db 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5367");
+define("APP_VERSION", "1.19.23.5368");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 61e9d2d2e88bef94f8392f7a6b2a3ae9085e9c45 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 13:27:44 +0000
Subject: [PATCH 1374/1848] Removed redundant forward slash in password reset
 URL.

---
 WEB-INF/config.php.dist |  1 -
 password_reset.php      | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 4db71fad4..4a0fff710 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -60,7 +60,6 @@ define('EMAIL_REQUIRED', false);
 //
 // define('DIR_NAME', 'timetracker');
 //
-define('DIR_NAME', '');
 
 
 // WEEKEND_START_DAY
diff --git a/password_reset.php b/password_reset.php
index ba3547132..0ef5e32a5 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -105,10 +105,12 @@
         $http = 'http';
 
       $cl_subject = $user_i18n->get('form.reset_password.email_subject');
-      if (defined('DIR_NAME'))
-        $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/'.DIR_NAME.'/password_change.php?ref='.$temp_ref;
-      else
-        $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
+
+      $dir_name = trim(@constant('DIR_NAME'), '/');
+      if (!empty($dir_name))
+        $app_root = '/'.$dir_name;
+
+      $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].$app_root.'/password_change.php?ref='.$temp_ref;
 
       $mailer->setMailMode(MAIL_MODE);
       if ($mailer->send($cl_subject, sprintf($user_i18n->get('form.reset_password.email_body'), $_SERVER['REMOTE_ADDR'], $pass_edit_url)))

From 926a2de4528984fd0091209e367e4ecfa16c364d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 13:40:12 +0000
Subject: [PATCH 1375/1848] Cosmetic.

---
 WEB-INF/config.php.dist | 28 ++--------------------------
 password_reset.php      | 28 ++--------------------------
 2 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 4a0fff710..7b6eabbd2 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 
 // Set include path for PEAR and its modules, which we include in the distribution.
diff --git a/password_reset.php b/password_reset.php
index 0ef5e32a5..5beafb7fc 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');

From 1aa197b13d37b6150605a4d67c3b39df06574330 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 14:04:27 +0000
Subject: [PATCH 1376/1848] Removed unnecessary assignments from JavaScript.

---
 WEB-INF/templates/user_add2.tpl  | 2 --
 WEB-INF/templates/user_edit2.tpl | 2 --
 initialize.php                   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index 370fb08f3..d125f2feb 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -43,7 +43,6 @@ function handleClientControl() {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
       if (isClient == 1) {
-        clientControl.style.visibility = "visible";
         clientBlock.style.display = "";
         nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
@@ -56,7 +55,6 @@ function handleClientControl() {
         }
       } else {
         clientControl.value = "";
-        clientControl.style.visibility = "hidden";
         clientBlock.style.display = "none";
         nonClientBlock.style.display = "";
         projectsControl.style.display = "";
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
index 6339b9734..5cec542f2 100644
--- a/WEB-INF/templates/user_edit2.tpl
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -65,7 +65,6 @@ function handleClientControl() {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
       if (isClient == 1) {
-        clientControl.style.visibility = "visible";
         clientBlock.style.display = "";
         nonClientBlock.style.display = "none";
         projectsControl.style.display = "none";
@@ -78,7 +77,6 @@ function handleClientControl() {
         }
       } else {
         clientControl.value = "";
-        clientControl.style.visibility = "hidden";
         clientBlock.style.display = "none";
         nonClientBlock.style.display = "";
         projectsControl.style.display = "";
diff --git a/initialize.php b/initialize.php
index 4405f89db..66bcaa4dd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5368");
+define("APP_VERSION", "1.19.23.5369");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bc2c67dbd3e354d9d441aa349f3a7cd5af31e307 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 14:24:00 +0000
Subject: [PATCH 1377/1848] Renamed a function for clarity.

---
 WEB-INF/templates/user_add2.tpl  | 6 +++---
 WEB-INF/templates/user_edit2.tpl | 6 +++---
 initialize.php                   | 2 +-
 user_add.php                     | 4 ++--
 user_edit.php                    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index d125f2feb..6adc5f7cd 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -29,9 +29,9 @@ function setDefaultRate(element) {
   }
 }
 
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
-// also hides and unselects projects when "Client" user role is selected.
-function handleClientControl() {
+// handleClientRole - manages visibility and content of controls related to client role,
+// also hides and unselects projects when client role is selected.
+function handleClientRole() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
   var clientBlock = document.getElementById("client_block");
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
index 5cec542f2..ecc0a838e 100644
--- a/WEB-INF/templates/user_edit2.tpl
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -51,9 +51,9 @@ function setRate(element) {
   }
 }
 
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
-// also hides and unselects projects when "Client" user role is selected.
-function handleClientControl() {
+// handleClientRole - manages visibility and content of controls related to client role,
+// also hides and unselects projects when client role is selected.
+function handleClientRole() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
   var clientBlock = document.getElementById("client_block");
diff --git a/initialize.php b/initialize.php
index 66bcaa4dd..76635a4a5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5369");
+define("APP_VERSION", "1.19.23.5370");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_add.php b/user_add.php
index 327ee8702..e87fed752 100644
--- a/user_add.php
+++ b/user_add.php
@@ -82,7 +82,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
 
 $active_roles = ttTeamHelper::getActiveRolesForUser();
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
+$form->addInput(array('type'=>'combobox','onchange'=>'handleClientRole()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
@@ -211,7 +211,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientRole();"');
 $smarty->assign('show_quota', $show_quota);
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_user'));
diff --git a/user_edit.php b/user_edit.php
index 493cb8d4d..17c8292e3 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -118,7 +118,7 @@
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
 
 $active_roles = ttTeamHelper::getActiveRolesForUser();
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
+$form->addInput(array('type'=>'combobox','onchange'=>'handleClientRole()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
 if ($user->isPluginEnabled('cl'))
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
@@ -274,7 +274,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('can_swap', $can_swap);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientRole();"');
 $smarty->assign('show_quota', $show_quota);
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('user_id', $user_id);

From 016dd166540c7f8754b588cad9e01f55357595b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 14:30:20 +0000
Subject: [PATCH 1378/1848] Made access_denied.php page mobile friendly.

---
 access_denied.php | 2 +-
 initialize.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/access_denied.php b/access_denied.php
index 72a28d192..7d804f550 100644
--- a/access_denied.php
+++ b/access_denied.php
@@ -33,4 +33,4 @@
 
 $smarty->assign('title', $i18n->get('label.error'));
 $smarty->assign('content_page_name', 'access_denied.tpl');
-$smarty->display('index.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 76635a4a5..c26d92d08 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5370");
+define("APP_VERSION", "1.19.23.5371");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 32c1ced1ae5cf2df327ad896df0a4d1aa6c98860 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 14:55:33 +0000
Subject: [PATCH 1379/1848] Made swap_roles.php page mobile-friendly.

---
 WEB-INF/templates/swap_roles2.tpl | 11 ++++++++++
 access_denied.php                 | 28 ++-----------------------
 initialize.php                    |  2 +-
 swap_roles.php                    | 34 +++++--------------------------
 4 files changed, 19 insertions(+), 56 deletions(-)
 create mode 100644 WEB-INF/templates/swap_roles2.tpl

diff --git a/WEB-INF/templates/swap_roles2.tpl b/WEB-INF/templates/swap_roles2.tpl
new file mode 100644
index 000000000..804b07a4d
--- /dev/null
+++ b/WEB-INF/templates/swap_roles2.tpl
@@ -0,0 +1,11 @@
+<div class="page-hint">{$i18n.form.swap.hint}</div>
+{$forms.swapForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="swap_with">{$i18n.form.swap.swap_with}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="swap_with">{$i18n.form.swap.swap_with}:</label></td>
+    <td class="td-with-input">{$forms.swapForm.swap_with.control}</td>
+  </tr>
+</table>
+<div class="button-set">{$forms.swapForm.btn_submit.control} {$forms.swapForm.btn_cancel.control}</div>
+{$forms.swapForm.close}
diff --git a/access_denied.php b/access_denied.php
index 7d804f550..7025d8739 100644
--- a/access_denied.php
+++ b/access_denied.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 
diff --git a/initialize.php b/initialize.php
index c26d92d08..5cb71612b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5371");
+define("APP_VERSION", "1.19.23.5372");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/swap_roles.php b/swap_roles.php
index 1652ae2a8..e49bed75b 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -51,7 +27,7 @@
 // End of access checks.
 
 $form = new Form('swapForm');
-$form->addInput(array('type'=>'combobox','name'=>'swap_with','style'=>'width: 250px;','data'=>$users_for_swap,'datakeys'=>array('id','name')));
+$form->addInput(array('type'=>'combobox','name'=>'swap_with','data'=>$users_for_swap,'datakeys'=>array('id','name')));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
@@ -73,5 +49,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.swapForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.swap_roles'));
-$smarty->assign('content_page_name', 'swap_roles.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'swap_roles2.tpl');
+$smarty->display('index2.tpl');

From 625469926ef09b25833cb89ced879a3e636355e7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 15:16:47 +0000
Subject: [PATCH 1380/1848] Added redirects for legacy mobile pages.

---
 initialize.php   | 2 +-
 mobile/login.php | 6 ++++++
 mobile/time.php  | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 5cb71612b..dadd4e831 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5372");
+define("APP_VERSION", "1.19.23.5373");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/login.php b/mobile/login.php
index fb574767a..4d5b7d5ea 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -31,6 +31,12 @@
 import('ttOrgHelper');
 import('ttUser');
 
+// Mobile pages are no longer separate. Redirect to main page.
+header('Location: ../login.php');
+exit();
+// Below is no longer used code.
+
+
 if ($request->isPost()) {
   $cl_login = $request->getParameter('login');
 } else {
diff --git a/mobile/time.php b/mobile/time.php
index 0bdfcfaa4..ee4d81883 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -35,6 +35,10 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
+header('Location: ../time.php');
+exit();
+
+
 // Access checks.
 if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');

From 3f65e97f033387892f98618b772043a77dc6d4b1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 17:46:53 +0000
Subject: [PATCH 1381/1848] Fixed presentation of controls on tasks.php page.

---
 WEB-INF/templates/tasks2.tpl | 2 ++
 default.css                  | 6 ------
 initialize.php               | 2 +-
 mobile/time.php              | 3 ++-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/templates/tasks2.tpl b/WEB-INF/templates/tasks2.tpl
index ac53362eb..9c206bcc7 100644
--- a/WEB-INF/templates/tasks2.tpl
+++ b/WEB-INF/templates/tasks2.tpl
@@ -4,6 +4,7 @@
 
 {$forms.tasksForm.open}
 {if $user->can('manage_tasks')}
+<div>
 <table class="centered-table">
   <tr>
     <td>{$forms.tasksForm.task_required.control}</td>
@@ -11,6 +12,7 @@
     <td>{$forms.tasksForm.btn_save.control}</td>
   </tr>
 </table>
+</div>
   {if $inactive_tasks}<div class="section-header">{$i18n.form.tasks.active_tasks}</div>{/if}
   {if $active_tasks}
 <table class="x-scrollable-table">
diff --git a/default.css b/default.css
index 1d0f4c1e4..3873051e6 100644
--- a/default.css
+++ b/default.css
@@ -284,12 +284,6 @@ input.password-field {
   margin-bottom: 1rem;
 }
 
-.day-totals-col2 {
-  padding-left: .5rem;
-  padding-right: .5rem;
-  text-align: right;
-}
-
 .day-totals-col1 {
   text-align: left;
   padding-left: .5rem;
diff --git a/initialize.php b/initialize.php
index dadd4e831..3aa3ec314 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5373");
+define("APP_VERSION", "1.19.23.5374");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/time.php b/mobile/time.php
index ee4d81883..d623de564 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -35,9 +35,10 @@
 import('ttTimeHelper');
 import('DateAndTime');
 
+// Mobile pages are no longer separate. Redirect to main page.
 header('Location: ../time.php');
 exit();
-
+// Below is no longer used code.
 
 // Access checks.
 if (!ttAccessAllowed('track_own_time')) {

From c94a0cbc3a0ad58464e3e3fe1861ab605a383877 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 24 Nov 2020 19:04:22 +0000
Subject: [PATCH 1382/1848] Refactored time_files.php for mobile access.

---
 WEB-INF/templates/entity_files2.tpl | 43 +++++++++++++++++++++++++++++
 initialize.php                      |  2 +-
 time.php                            | 28 ++-----------------
 time_delete.php                     | 28 ++-----------------
 time_edit.php                       | 28 ++-----------------
 time_files.php                      | 34 ++++-------------------
 6 files changed, 55 insertions(+), 108 deletions(-)
 create mode 100644 WEB-INF/templates/entity_files2.tpl

diff --git a/WEB-INF/templates/entity_files2.tpl b/WEB-INF/templates/entity_files2.tpl
new file mode 100644
index 000000000..9d48e24c1
--- /dev/null
+++ b/WEB-INF/templates/entity_files2.tpl
@@ -0,0 +1,43 @@
+{if $files}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $files as $file}
+  <tr>
+    <td class="text-cell"><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
+    <td class="text-cell">{$file.description|escape}</td>
+    {if $can_edit}
+    <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+    {/if}
+  </tr>
+  {/foreach}
+</table>
+{/if}
+
+{if $can_edit}
+{$forms.fileUploadForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
+    <td class="td-with-input">{$forms.fileUploadForm.newfile.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.fileUploadForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.fileUploadForm.btn_submit.control}</div>
+{$forms.fileUploadForm.close}
+{/if}
+
+
+
diff --git a/initialize.php b/initialize.php
index 3aa3ec314..1b0d371db 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5374");
+define("APP_VERSION", "1.19.23.5375");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index af9df005f..27c21d431 100644
--- a/time.php
+++ b/time.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/time_delete.php b/time_delete.php
index f1ec7b575..5b3849525 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/time_edit.php b/time_edit.php
index 75b9018f7..89988409b 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/time_files.php b/time_files.php
index 33273da45..18489aa98 100644
--- a/time_files.php
+++ b/time_files.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -58,7 +34,7 @@
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -85,5 +61,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.time_files'));
-$smarty->assign('content_page_name', 'entity_files.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'entity_files2.tpl');
+$smarty->display('index2.tpl');

From 9dd5a7bd035b5dc59b8ab1c6094306b31e99e5ed Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 14:53:01 +0000
Subject: [PATCH 1383/1848] Some style improvements.

---
 WEB-INF/templates/client_add2.tpl      |  4 ++--
 WEB-INF/templates/client_edit2.tpl     |  2 +-
 WEB-INF/templates/login.db2.tpl        |  2 +-
 WEB-INF/templates/login.ldap2.tpl      |  2 +-
 WEB-INF/templates/password_change2.tpl |  4 ++--
 WEB-INF/templates/project_add2.tpl     | 12 +++++------
 WEB-INF/templates/project_edit2.tpl    |  8 ++++----
 WEB-INF/templates/register2.tpl        |  5 +++--
 WEB-INF/templates/task_add2.tpl        |  8 ++++----
 WEB-INF/templates/task_edit2.tpl       |  8 ++++----
 WEB-INF/templates/user_add2.tpl        |  4 ++--
 WEB-INF/templates/user_edit2.tpl       |  4 ++--
 initialize.php                         |  2 +-
 register.php                           | 28 ++------------------------
 14 files changed, 35 insertions(+), 58 deletions(-)

diff --git a/WEB-INF/templates/client_add2.tpl b/WEB-INF/templates/client_add2.tpl
index 9ffdfa203..e22081ef4 100644
--- a/WEB-INF/templates/client_add2.tpl
+++ b/WEB-INF/templates/client_add2.tpl
@@ -19,7 +19,7 @@
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
@@ -31,6 +31,6 @@
   <tr>
     <td colspan="2">{$forms.clientForm.btn_submit.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.clientForm.close}
diff --git a/WEB-INF/templates/client_edit2.tpl b/WEB-INF/templates/client_edit2.tpl
index d29635de4..935c6a1e5 100644
--- a/WEB-INF/templates/client_edit2.tpl
+++ b/WEB-INF/templates/client_edit2.tpl
@@ -25,7 +25,7 @@
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
diff --git a/WEB-INF/templates/login.db2.tpl b/WEB-INF/templates/login.db2.tpl
index 4ab3ad2c0..9b0b02679 100644
--- a/WEB-INF/templates/login.db2.tpl
+++ b/WEB-INF/templates/login.db2.tpl
@@ -13,7 +13,7 @@
   <tr>
     <td colspan="2"><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.loginForm.btn_login.control}</td>
   </tr>
diff --git a/WEB-INF/templates/login.ldap2.tpl b/WEB-INF/templates/login.ldap2.tpl
index 7fd32ed2e..26201ce1a 100644
--- a/WEB-INF/templates/login.ldap2.tpl
+++ b/WEB-INF/templates/login.ldap2.tpl
@@ -16,7 +16,7 @@
   <tr>
     <td colspan="2"><a href ="password_reset.php">{$i18n.form.login.forgot_password}</a></td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.loginForm.btn_login.control}</td>
   </tr>
diff --git a/WEB-INF/templates/password_change2.tpl b/WEB-INF/templates/password_change2.tpl
index 703c46aaa..62a70ceab 100644
--- a/WEB-INF/templates/password_change2.tpl
+++ b/WEB-INF/templates/password_change2.tpl
@@ -1,6 +1,6 @@
 {$forms.newPasswordForm.open}
 <div class="page-hint">{$i18n.form.change_password.tip}</div>
-<div class="form-control-separator"></div>
+<div class="small-screen-form-control-separator"></div>
 <table class="centered-table">
     <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
   <tr>
@@ -14,7 +14,7 @@
     <td class="td-with-input">{$forms.newPasswordForm.password2.control}</td>
   </tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.newPasswordForm.btn_save.control}</td>
   </tr>
diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add2.tpl
index 9eba40d90..c0385423b 100644
--- a/WEB-INF/templates/project_add2.tpl
+++ b/WEB-INF/templates/project_add2.tpl
@@ -11,14 +11,14 @@
     <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
     <td class="td-with-input">{$forms.projectForm.description.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_files}
   <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="newfile">{$i18n.label.file}:</label></td>
     <td class="td-with-input">{$forms.projectForm.newfile.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_users}
   <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
@@ -26,7 +26,7 @@
     <td class="large-screen-label">{$i18n.label.users}:</td>
     <td class="td-with-input">{$forms.projectForm.users.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_tasks}
   <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
@@ -34,13 +34,13 @@
     <td class="large-screen-label">{$i18n.label.tasks}:</td>
     <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.projectForm.btn_add.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.projectForm.close}
diff --git a/WEB-INF/templates/project_edit2.tpl b/WEB-INF/templates/project_edit2.tpl
index 8bffb048d..6a7b034c7 100644
--- a/WEB-INF/templates/project_edit2.tpl
+++ b/WEB-INF/templates/project_edit2.tpl
@@ -11,20 +11,20 @@
     <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
     <td class="td-with-input">{$forms.projectForm.description.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
     <td class="td-with-input">{$forms.projectForm.status.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_users}
   <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.users}:</td>
     <td class="td-with-input">{$forms.projectForm.users.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_tasks}
   <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
@@ -32,7 +32,7 @@
     <td class="large-screen-label">{$i18n.label.tasks}:</td>
     <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
 </table>
diff --git a/WEB-INF/templates/register2.tpl b/WEB-INF/templates/register2.tpl
index 1262a4c02..35309f855 100644
--- a/WEB-INF/templates/register2.tpl
+++ b/WEB-INF/templates/register2.tpl
@@ -45,16 +45,17 @@
     <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
     <td class="td-with-input">{$forms.groupForm.password2.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="manager_email">{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="manager_email">{$i18n.label.email}{if isTrue('EMAIL_REQUIRED')} (*){/if}:</label></td>
     <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
   </tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.groupForm.btn_submit.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.groupForm.close}
\ No newline at end of file
diff --git a/WEB-INF/templates/task_add2.tpl b/WEB-INF/templates/task_add2.tpl
index 4bede3e31..9de211172 100644
--- a/WEB-INF/templates/task_add2.tpl
+++ b/WEB-INF/templates/task_add2.tpl
@@ -11,20 +11,20 @@
     <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
     <td class="td-with-input">{$forms.taskForm.description.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
     <td class="td-with-input">{$forms.taskForm.projects.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.taskForm.btn_submit.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.taskForm.close}
diff --git a/WEB-INF/templates/task_edit2.tpl b/WEB-INF/templates/task_edit2.tpl
index 0ec709851..e0a15e693 100644
--- a/WEB-INF/templates/task_edit2.tpl
+++ b/WEB-INF/templates/task_edit2.tpl
@@ -11,23 +11,23 @@
     <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
     <td class="td-with-input">{$forms.taskForm.description.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
     <td class="td-with-input">{$forms.taskForm.status.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
     <td class="td-with-input">{$forms.taskForm.projects.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 <div class="button-set">{$forms.taskForm.btn_save.control} {$forms.taskForm.btn_copy.control}</div>
 {$forms.taskForm.close}
diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index 6adc5f7cd..dfb4bfa19 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -153,10 +153,10 @@ function handleClientRole() {
 </tbody>
 {/if}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.userForm.btn_submit.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.userForm.close}
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
index ecc0a838e..8a3507e7b 100644
--- a/WEB-INF/templates/user_edit2.tpl
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -191,10 +191,10 @@ function handleClientRole() {
 </tbody>
 {/if}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr>
     <td colspan="2">{$forms.userForm.btn_submit.control}</td>
   </tr>
-  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.userForm.close}
diff --git a/initialize.php b/initialize.php
index 1b0d371db..d50b940b3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5375");
+define("APP_VERSION", "1.19.23.5376");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/register.php b/register.php
index a036c26d4..3430d4366 100644
--- a/register.php
+++ b/register.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');

From 74fc81b33a3034bdcd901989c47ca33deb70e302 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 15:08:27 +0000
Subject: [PATCH 1384/1848] Improved styling of the description field.

---
 default.css    | 13 +++++++++++++
 initialize.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index 3873051e6..a1784c5bc 100644
--- a/default.css
+++ b/default.css
@@ -239,6 +239,19 @@ input.password-field {
   width: 237px;
 }
 
+#description {
+  width: 220px;
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
+}
+
+#description:focus {
+  background-color: yellow;
+  border: 1px solid black;
+  outline: none;
+}
+
 .chart-image {
   width: 300px;
   height: 300px;
diff --git a/initialize.php b/initialize.php
index d50b940b3..3de6ba486 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5376");
+define("APP_VERSION", "1.19.23.5377");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ccd704eabdc20299faffe089feeb555b292ca7b4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 15:47:43 +0000
Subject: [PATCH 1385/1848] Improving style of file upload control.

---
 default.css    | 7 +++++++
 initialize.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index a1784c5bc..5e1334bc8 100644
--- a/default.css
+++ b/default.css
@@ -235,6 +235,13 @@ input.password-field {
   width: 220px;
 }
 
+input[type=file] {
+  width: 220px;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+}
+
 .dropdown-field {
   width: 237px;
 }
diff --git a/initialize.php b/initialize.php
index 3de6ba486..092bf840f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5377");
+define("APP_VERSION", "1.19.23.5378");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1bbfcb4c137b50a8019151aeeef9b51c711409d4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 16:25:29 +0000
Subject: [PATCH 1386/1848] Some more progress on styles.

---
 WEB-INF/lib/form/PasswordField.class.php | 28 ++----------------------
 default.css                              | 13 +++++------
 initialize.php                           |  2 +-
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/lib/form/PasswordField.class.php b/WEB-INF/lib/form/PasswordField.class.php
index 579be5edb..ff6802c90 100644
--- a/WEB-INF/lib/form/PasswordField.class.php
+++ b/WEB-INF/lib/form/PasswordField.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('form.FormElement');
 
diff --git a/default.css b/default.css
index 5e1334bc8..e2b634693 100644
--- a/default.css
+++ b/default.css
@@ -215,31 +215,28 @@ div.page-hint {
   display: inline-block;
 }
 
-input[type=submit] {
+input[type="submit"] {
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
 }
 
-input[type=button] {
+input[type="button"] {
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
 }
 
-input.text-field {
+input[type="text"] {
   width: 220px;
 }
 
-input.password-field {
+input[type="password"] {
   width: 220px;
 }
 
-input[type=file] {
+input[type="file"] {
   width: 220px;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
 }
 
 .dropdown-field {
diff --git a/initialize.php b/initialize.php
index 092bf840f..5b6cc1cb3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5378");
+define("APP_VERSION", "1.19.23.5379");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9b97ff57bffae6ab734b668def8b5dd156e84c96 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 16:41:48 +0000
Subject: [PATCH 1387/1848] Improved style of the note field.

---
 default.css    | 9 +++++++++
 initialize.php | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index e2b634693..da21649f7 100644
--- a/default.css
+++ b/default.css
@@ -295,6 +295,15 @@ input[type="file"] {
   margin: 0;
   height: 4rem;
   resize: none;
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
+}
+
+#note:focus {
+  background-color: yellow;
+  border: 1px solid black;
+  outline: none;
 }
 
 .day-totals {
diff --git a/initialize.php b/initialize.php
index 5b6cc1cb3..c98543252 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5379");
+define("APP_VERSION", "1.19.23.5380");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 7322bce85707960781c50df141e1c78cac7b675f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 17:26:45 +0000
Subject: [PATCH 1388/1848] Improved spacing between menu items on
 site-map.php.

---
 WEB-INF/templates/site_map.tpl | 76 +++++++++++++++++-----------------
 default.css                    |  9 ++++
 initialize.php                 |  2 +-
 3 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
index 48b8d40c1..c951f2b99 100644
--- a/WEB-INF/templates/site_map.tpl
+++ b/WEB-INF/templates/site_map.tpl
@@ -1,90 +1,90 @@
 {if $authenticated}
   {if $user->can('administer_site')}
   {* sub menu for admin *}
-<p>
-  <a href="admin_groups.php">{$i18n.menu.groups}</a><br>
-  <a href="admin_options.php">{$i18n.menu.options}</a><br>
+<div class="sitemap-item-group">
+  <div class="sitemap-item"><a href="admin_groups.php">{$i18n.menu.groups}</a></div>
+  <div class="sitemap-item"><a href="admin_options.php">{$i18n.menu.options}</a></div>
     {if isTrue('WORK_SERVER_ADMINISTRATION')}
-  <a href="work/admin_work.php">{$i18n.label.work}</a><br>
+  <div class="sitemap-item"><a href="work/admin_work.php">{$i18n.label.work}</a></div>
     {/if}
-</p>
+</div>
   {* end of sub menu for admin *}
   {* main menu for admin *}
-<p>
-  <a href="logout.php">{$i18n.menu.logout}</a><br>
-  <a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a><br>
-  <a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a><br>
-</p>
+<div class="sitemap-item-group">
+  <div class="sitemap-item"><a href="logout.php">{$i18n.menu.logout}</a></div>
+  <div class="sitemap-item"><a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a></div>
+  <div class="sitemap-item"><a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a></div>
+</div>
   {* end of main menu for admin *}
   {else}
   {* sub menu for authorized user *}
-<p>
+<div class="sitemap-item-group">
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
-        <a href="time.php">{$i18n.menu.time}</a><br>
+  <div class="sitemap-item"><a href="time.php">{$i18n.menu.time}</a></div>
       {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
-  <a href="week.php">{$i18n.menu.week}</a><br>
+  <div class="sitemap-item"><a href="week.php">{$i18n.menu.week}</a></div>
       {/if}
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
-  <a href="expenses.php">{$i18n.menu.expenses}</a><br>
+  <div class="sitemap-item"><a href="expenses.php">{$i18n.menu.expenses}</a></div>
     {/if}
     {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
-  <a href="reports.php">{$i18n.menu.reports}</a><br>
+  <div class="sitemap-item"><a href="reports.php">{$i18n.menu.reports}</a></div>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
-  <a href="timesheets.php">{$i18n.menu.timesheets}</a><br>
+  <div class="sitemap-item"><a href="timesheets.php">{$i18n.menu.timesheets}</a></div>
     {/if}
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
-  <a href="invoices.php">{$i18n.title.invoices}</a><br>
+  <div class="sitemap-item"><a href="invoices.php">{$i18n.title.invoices}</a></div>
     {/if}
     {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
         (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
-  <a href="charts.php">{$i18n.menu.charts}</a><br>
+  <div class="sitemap-item"><a href="charts.php">{$i18n.menu.charts}</a></div>
     {/if}
     {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
-  <a href="projects.php">{$i18n.menu.projects}</a><br>
+  <div class="sitemap-item"><a href="projects.php">{$i18n.menu.projects}</a></div>
     {/if}
     {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
-  <a href="tasks.php">{$i18n.menu.tasks}</a><br>
+  <div class="sitemap-item"><a href="tasks.php">{$i18n.menu.tasks}</a></div>
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
-  <a href="users.php">{$i18n.menu.users}</a><br>
+  <div class="sitemap-item"><a href="users.php">{$i18n.menu.users}</a></div>
     {/if}
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
-  <a href="clients.php">{$i18n.menu.clients}</a><br>
+  <div class="sitemap-item"><a href="clients.php">{$i18n.menu.clients}</a></div>
     {/if}
     {if $user->can('export_data')}
-  <a href="export.php">{$i18n.menu.export}</a><br>
+  <div class="sitemap-item"><a href="export.php">{$i18n.menu.export}</a></div>
     {/if}
-</p>
+</div>
   {* end of sub menu for authorized user *}
   {* main menu for authorized user *}
-<p>
-  <a href="logout.php">{$i18n.menu.logout}</a><br>
+<div class="sitemap-item-group">
+  <div class="sitemap-item"><a href="logout.php">{$i18n.menu.logout}</a></div>
     {if $user->exists() && $user->can('manage_own_settings')}
-  <a href="profile_edit.php">{$i18n.menu.profile}</a><br>
+  <div class="sitemap-item"><a href="profile_edit.php">{$i18n.menu.profile}</a></div>
     {/if}
     {if $user->can('manage_basic_settings')}
-  <a href="group_edit.php">{$i18n.menu.group}</a><br>
+  <div class="sitemap-item"><a href="group_edit.php">{$i18n.menu.group}</a></div>
     {/if}
     {if $user->can('manage_features')}
-  <a href="plugins.php">{$i18n.menu.plugins}</a><br>
+  <div class="sitemap-item"><a href="plugins.php">{$i18n.menu.plugins}</a></div>
     {/if}
-  <a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a><br>
-  <a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a><br>
-</p>
+  <div class="sitemap-item"><a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a></div>
+  <div class="sitemap-item"><a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a></div>
+</div>
   {* end of main menu for authorized user *}
   {/if}
 {else}
   {* main menu for non authorized user *}
-<p>
-  <a href="login.php">{$i18n.menu.login}</a><br>
+<div class="sitemap-item-group">
+  <div class="sitemap-item"><a href="login.php">{$i18n.menu.login}</a></div>
   {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
-  <a href="register.php">{$i18n.menu.register}</a><br>
+  <div class="sitemap-item"><a href="register.php">{$i18n.menu.register}</a></div>
   {/if}
-  <a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a><br>
-  <a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a><br>
-</p>
+  <div class="sitemap-item"><a href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a></div>
+  <div class="sitemap-item"><a href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a></div>
+</div>
   {* end of main menu for non authorized user *}
 {/if}
diff --git a/default.css b/default.css
index da21649f7..820382bdf 100644
--- a/default.css
+++ b/default.css
@@ -358,6 +358,15 @@ input[type="file"] {
   margin-right: auto;
 }
 
+.sitemap-item-group {
+  margin-top: 2rem;
+  margin-bottom: 2rem;
+}
+
+.sitemap-item {
+  margin: .4rem;
+}
+
 @media screen and (max-width: 600px) {
 
   .large-screen-label {
diff --git a/initialize.php b/initialize.php
index c98543252..f2b193e74 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5380");
+define("APP_VERSION", "1.19.23.5381");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 56c1de5a9c853ad16a350c36669901f3acfa26c9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 18:17:27 +0000
Subject: [PATCH 1389/1848] Cosmetic. Added copytight notices on refactored
 templates.

---
 WEB-INF/templates/client_add2.tpl      | 3 +++
 WEB-INF/templates/client_delete2.tpl   | 3 +++
 WEB-INF/templates/client_edit2.tpl     | 3 +++
 WEB-INF/templates/clients2.tpl         | 3 +++
 WEB-INF/templates/entity_files2.tpl    | 3 +++
 WEB-INF/templates/expense_delete2.tpl  | 3 +++
 WEB-INF/templates/expense_edit2.tpl    | 3 +++
 WEB-INF/templates/expenses2.tpl        | 3 +++
 WEB-INF/templates/login.db2.tpl        | 3 +++
 WEB-INF/templates/login.ldap2.tpl      | 3 +++
 WEB-INF/templates/login2.tpl           | 3 +++
 WEB-INF/templates/password_change2.tpl | 3 +++
 WEB-INF/templates/password_reset2.tpl  | 3 +++
 WEB-INF/templates/project_add2.tpl     | 3 +++
 WEB-INF/templates/project_delete2.tpl  | 3 +++
 WEB-INF/templates/project_edit2.tpl    | 3 +++
 WEB-INF/templates/register2.tpl        | 3 +++
 WEB-INF/templates/swap_roles2.tpl      | 3 +++
 WEB-INF/templates/task_add2.tpl        | 3 +++
 WEB-INF/templates/task_delete2.tpl     | 3 +++
 WEB-INF/templates/task_edit2.tpl       | 3 +++
 WEB-INF/templates/tasks2.tpl           | 3 +++
 WEB-INF/templates/time2.tpl            | 3 +++
 WEB-INF/templates/time_delete2.tpl     | 3 +++
 WEB-INF/templates/time_edit2.tpl       | 3 +++
 WEB-INF/templates/user_add2.tpl        | 3 +++
 WEB-INF/templates/user_delete2.tpl     | 3 +++
 WEB-INF/templates/user_edit2.tpl       | 3 +++
 WEB-INF/templates/users2.tpl           | 3 +++
 initialize.php                         | 2 +-
 30 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/client_add2.tpl b/WEB-INF/templates/client_add2.tpl
index e22081ef4..5fe001b23 100644
--- a/WEB-INF/templates/client_add2.tpl
+++ b/WEB-INF/templates/client_add2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.clientForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="name">{$i18n.label.client_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/client_delete2.tpl b/WEB-INF/templates/client_delete2.tpl
index bc583ea66..47506f79b 100644
--- a/WEB-INF/templates/client_delete2.tpl
+++ b/WEB-INF/templates/client_delete2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.clientDeleteForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td>{$i18n.form.client.client_to_delete}:</td></tr>
diff --git a/WEB-INF/templates/client_edit2.tpl b/WEB-INF/templates/client_edit2.tpl
index 935c6a1e5..91f2b1c39 100644
--- a/WEB-INF/templates/client_edit2.tpl
+++ b/WEB-INF/templates/client_edit2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.clientForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="name">{$i18n.label.client_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/clients2.tpl b/WEB-INF/templates/clients2.tpl
index 1ec69df2f..9f7d4064b 100644
--- a/WEB-INF/templates/clients2.tpl
+++ b/WEB-INF/templates/clients2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
diff --git a/WEB-INF/templates/entity_files2.tpl b/WEB-INF/templates/entity_files2.tpl
index 9d48e24c1..d6b892b38 100644
--- a/WEB-INF/templates/entity_files2.tpl
+++ b/WEB-INF/templates/entity_files2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {if $files}
 <table class="x-scrollable-table">
   <tr>
diff --git a/WEB-INF/templates/expense_delete2.tpl b/WEB-INF/templates/expense_delete2.tpl
index 9b9bab838..a9ea04d10 100644
--- a/WEB-INF/templates/expense_delete2.tpl
+++ b/WEB-INF/templates/expense_delete2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.expenseItemForm.open}
 <table class="centered-table">
   <tr>
diff --git a/WEB-INF/templates/expense_edit2.tpl b/WEB-INF/templates/expense_edit2.tpl
index 3cea79482..ec921e007 100644
--- a/WEB-INF/templates/expense_edit2.tpl
+++ b/WEB-INF/templates/expense_edit2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
 // We need a few arrays to populate project dropdown.
 // When client selection changes, the project dropdown must be re-populated with only relevant projects.
diff --git a/WEB-INF/templates/expenses2.tpl b/WEB-INF/templates/expenses2.tpl
index d996bca19..5b1da05fc 100644
--- a/WEB-INF/templates/expenses2.tpl
+++ b/WEB-INF/templates/expenses2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
 // We need a few arrays to populate project dropdown.
 // When client selection changes, the project dropdown must be re-populated with only relevant projects.
diff --git a/WEB-INF/templates/login.db2.tpl b/WEB-INF/templates/login.db2.tpl
index 9b0b02679..3d5aa9667 100644
--- a/WEB-INF/templates/login.db2.tpl
+++ b/WEB-INF/templates/login.db2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
   <tr>
diff --git a/WEB-INF/templates/login.ldap2.tpl b/WEB-INF/templates/login.ldap2.tpl
index 26201ce1a..e60d954ee 100644
--- a/WEB-INF/templates/login.ldap2.tpl
+++ b/WEB-INF/templates/login.ldap2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {if $show_hint}
 <div class="page-hint">{$i18n.label.ldap_hint}</div>
 {/if}
diff --git a/WEB-INF/templates/login2.tpl b/WEB-INF/templates/login2.tpl
index fa4237dbf..755763c35 100644
--- a/WEB-INF/templates/login2.tpl
+++ b/WEB-INF/templates/login2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
 function get_date() {
   var date = new Date();
diff --git a/WEB-INF/templates/password_change2.tpl b/WEB-INF/templates/password_change2.tpl
index 62a70ceab..bc2517a25 100644
--- a/WEB-INF/templates/password_change2.tpl
+++ b/WEB-INF/templates/password_change2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.newPasswordForm.open}
 <div class="page-hint">{$i18n.form.change_password.tip}</div>
 <div class="small-screen-form-control-separator"></div>
diff --git a/WEB-INF/templates/password_reset2.tpl b/WEB-INF/templates/password_reset2.tpl
index 45a0d5051..72664dbbc 100644
--- a/WEB-INF/templates/password_reset2.tpl
+++ b/WEB-INF/templates/password_reset2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.resetPasswordForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add2.tpl
index c0385423b..4f2c14286 100644
--- a/WEB-INF/templates/project_add2.tpl
+++ b/WEB-INF/templates/project_add2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.projectForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="project_name">{$i18n.label.thing_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/project_delete2.tpl b/WEB-INF/templates/project_delete2.tpl
index 7c84c0223..86a4cab3f 100644
--- a/WEB-INF/templates/project_delete2.tpl
+++ b/WEB-INF/templates/project_delete2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.projectDeleteForm.open}
 <div class="section-header">{$project_to_delete|escape}</div>
 <div class="button-set">{$forms.projectDeleteForm.btn_delete.control}&nbsp;{$forms.projectDeleteForm.btn_cancel.control}</div>
diff --git a/WEB-INF/templates/project_edit2.tpl b/WEB-INF/templates/project_edit2.tpl
index 6a7b034c7..8ce9ae9c7 100644
--- a/WEB-INF/templates/project_edit2.tpl
+++ b/WEB-INF/templates/project_edit2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.projectForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="project_name">{$i18n.label.thing_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/register2.tpl b/WEB-INF/templates/register2.tpl
index 35309f855..b8a92e2a9 100644
--- a/WEB-INF/templates/register2.tpl
+++ b/WEB-INF/templates/register2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.groupForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/swap_roles2.tpl b/WEB-INF/templates/swap_roles2.tpl
index 804b07a4d..23633db55 100644
--- a/WEB-INF/templates/swap_roles2.tpl
+++ b/WEB-INF/templates/swap_roles2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <div class="page-hint">{$i18n.form.swap.hint}</div>
 {$forms.swapForm.open}
 <table class="centered-table">
diff --git a/WEB-INF/templates/task_add2.tpl b/WEB-INF/templates/task_add2.tpl
index 9de211172..534c9525e 100644
--- a/WEB-INF/templates/task_add2.tpl
+++ b/WEB-INF/templates/task_add2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.taskForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/task_delete2.tpl b/WEB-INF/templates/task_delete2.tpl
index 70044b74a..88a33966c 100644
--- a/WEB-INF/templates/task_delete2.tpl
+++ b/WEB-INF/templates/task_delete2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.taskDeleteForm.open}
 <div class="section-header">{$task_to_delete|escape}</div>
 <div class="button-set">{$forms.taskDeleteForm.btn_delete.control}&nbsp;{$forms.taskDeleteForm.btn_cancel.control}</div>
diff --git a/WEB-INF/templates/task_edit2.tpl b/WEB-INF/templates/task_edit2.tpl
index e0a15e693..e66a93e10 100644
--- a/WEB-INF/templates/task_edit2.tpl
+++ b/WEB-INF/templates/task_edit2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.taskForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/tasks2.tpl b/WEB-INF/templates/tasks2.tpl
index 9c206bcc7..6bf29d418 100644
--- a/WEB-INF/templates/tasks2.tpl
+++ b/WEB-INF/templates/tasks2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 33aa428e7..487bff7cf 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {include file="time_script.tpl"}
 
 {if $show_navigation}
diff --git a/WEB-INF/templates/time_delete2.tpl b/WEB-INF/templates/time_delete2.tpl
index 20acb783c..59d9039d1 100644
--- a/WEB-INF/templates/time_delete2.tpl
+++ b/WEB-INF/templates/time_delete2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.timeRecordForm.open}
 <table class="centered-table">
   <tr>
diff --git a/WEB-INF/templates/time_edit2.tpl b/WEB-INF/templates/time_edit2.tpl
index dc3d78cd0..8a25c43cf 100644
--- a/WEB-INF/templates/time_edit2.tpl
+++ b/WEB-INF/templates/time_edit2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {include file="time_script.tpl"}
 
 {* Conditional include of confirmSave handler. *}
diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index dfb4bfa19..ad421b9e8 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
 // Prepare an array of available roles. We need it for "is_client" property.
 // It is used to selectively display client selector for client roles.
diff --git a/WEB-INF/templates/user_delete2.tpl b/WEB-INF/templates/user_delete2.tpl
index 3e089d29d..63e9f795f 100644
--- a/WEB-INF/templates/user_delete2.tpl
+++ b/WEB-INF/templates/user_delete2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 {$forms.userDeleteForm.open}
 <div class="section-header">{$user_to_delete|escape}</div>
 <div class="button-set">{$forms.userDeleteForm.btn_delete.control}&nbsp;{$forms.userDeleteForm.btn_cancel.control}</div>
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
index 8a3507e7b..107891777 100644
--- a/WEB-INF/templates/user_edit2.tpl
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
 // Prepare an array of available roles. We need it for "is_client" property.
 // It is used to selectively display client selector for client roles.
diff --git a/WEB-INF/templates/users2.tpl b/WEB-INF/templates/users2.tpl
index 816490da4..96e5c7e6d 100644
--- a/WEB-INF/templates/users2.tpl
+++ b/WEB-INF/templates/users2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
diff --git a/initialize.php b/initialize.php
index f2b193e74..42b94a865 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5381");
+define("APP_VERSION", "1.19.23.5382");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 25202d51cbcbe494fb4a5a30cf90687736d64342 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 25 Nov 2020 18:25:02 +0000
Subject: [PATCH 1390/1848] Cleanup. Removed no longer used legacy mobile
 client pages and templates.

---
 WEB-INF/templates/mobile/client_add.tpl    |  37 ------
 WEB-INF/templates/mobile/client_delete.tpl |  25 ----
 WEB-INF/templates/mobile/client_edit.tpl   |  41 -------
 WEB-INF/templates/mobile/clients.tpl       |  66 ----------
 WEB-INF/templates/mobile/header.tpl        |   3 -
 initialize.php                             |   2 +-
 mobile/client_add.php                      |  94 --------------
 mobile/client_delete.php                   |  78 ------------
 mobile/client_edit.php                     | 135 ---------------------
 mobile/clients.php                         |  54 ---------
 10 files changed, 1 insertion(+), 534 deletions(-)
 delete mode 100644 WEB-INF/templates/mobile/client_add.tpl
 delete mode 100644 WEB-INF/templates/mobile/client_delete.tpl
 delete mode 100644 WEB-INF/templates/mobile/client_edit.tpl
 delete mode 100644 WEB-INF/templates/mobile/clients.tpl
 delete mode 100644 mobile/client_add.php
 delete mode 100644 mobile/client_delete.php
 delete mode 100644 mobile/client_edit.php
 delete mode 100644 mobile/clients.php

diff --git a/WEB-INF/templates/mobile/client_add.tpl b/WEB-INF/templates/mobile/client_add.tpl
deleted file mode 100644
index db10ede45..000000000
--- a/WEB-INF/templates/mobile/client_add.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{$forms.clientForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.client_name} (*):</td>
-          <td>{$forms.clientForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.client_address}:</td>
-          <td>{$forms.clientForm.address.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{if $show_projects}
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.clientForm.projects.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.clientForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.clientForm.close}
diff --git a/WEB-INF/templates/mobile/client_delete.tpl b/WEB-INF/templates/mobile/client_delete.tpl
deleted file mode 100644
index f40b94c12..000000000
--- a/WEB-INF/templates/mobile/client_delete.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{$forms.clientDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="2" border="0">
-        <tr>
-          <td>{$i18n.form.client.client_to_delete}:</td>
-          <th>{$client_to_delete|escape}</th>
-        </tr>
-        <tr>
-          <td>{$i18n.form.client.client_entries}:</td>
-          <td>{$forms.clientDeleteForm.delete_client_entries.control}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.clientDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.clientDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.clientDeleteForm.close}
diff --git a/WEB-INF/templates/mobile/client_edit.tpl b/WEB-INF/templates/mobile/client_edit.tpl
deleted file mode 100644
index 4f70ced7a..000000000
--- a/WEB-INF/templates/mobile/client_edit.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{$forms.clientForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.client_name} (*):</td>
-          <td>{$forms.clientForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.client_address}:</td>
-          <td>{$forms.clientForm.address.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->decimal_mark}00)</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.clientForm.status.control}</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{if $show_projects}
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.clientForm.projects.control}</td>
-        </tr>
-{/if}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.clientForm.btn_save.control} {$forms.clientForm.btn_copy.control} {$forms.clientForm.btn_delete.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.clientForm.close}
diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl
deleted file mode 100644
index 34f53a919..000000000
--- a/WEB-INF/templates/mobile/clients.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table class="mobile-table">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_clients')}
-      <table class="mobile-table-details">
-  {if $inactive_clients}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.active_clients}</td></tr>
-  {/if}
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-        </tr>
-  {foreach $active_clients as $client}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape}</a></td>
-          <td>{$client.address|escape}</td>
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-
-  {if $inactive_clients}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.inactive_clients}</td></tr>
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-        </tr>
-    {foreach $inactive_clients as $client}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape}</a></td>
-          <td>{$client.address|escape}</td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.address}</td>
-        </tr>
-  {if $active_clients}
-    {foreach $active_clients as $client}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$client.name|escape}</td>
-          <td>{$client.address|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index ccea5e7e1..d4cf2c53b 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -91,9 +91,6 @@
     {/if}
     {if $user->can('view_users') || $user->can('manage_users')}
            <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
-    {/if}
-    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
-           <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
     {/if}
           </td>
         </tr>
diff --git a/initialize.php b/initialize.php
index 42b94a865..4e41c7ea3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5382");
+define("APP_VERSION", "1.19.23.5383");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/client_add.php b/mobile/client_add.php
deleted file mode 100644
index 2050204a6..000000000
--- a/mobile/client_add.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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('ttClientHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_clients')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_address = trim($request->getParameter('address'));
-  $cl_tax = $request->getParameter('tax');
-  $cl_projects = $request->getParameter('projects');
-} else {
-  // Do not assign all projects to a new client by default. This should help to reduce clutter.
-  // foreach ($projects as $project_item)
-  //   $cl_projects[] = $project_item['id'];
-}
-
-$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
-
-$form = new Form('clientForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','class'=>'mobile-textarea','value'=>$cl_address));
-$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if ($show_projects)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
-
-  if ($err->no()) {
-    if (!ttClientHelper::getClientByName($cl_name)) {
-      if (ttClientHelper::insert(array('name' => $cl_name,
-        'address' => $cl_address,
-        'tax' => $cl_tax,
-        'projects' => $cl_projects,
-        'status' => ACTIVE))) {
-        header('Location: clients.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-     } else
-       $err->add($i18n->get('error.object_exists'));
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
-$smarty->assign('show_projects',$show_projects);
-$smarty->assign('title', $i18n->get('title.add_client'));
-$smarty->assign('content_page_name', 'mobile/client_add.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/client_delete.php b/mobile/client_delete.php
deleted file mode 100644
index 8e05ccde8..000000000
--- a/mobile/client_delete.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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('ttClientHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_clients')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$id = (int)$request->getParameter('id');
-$client = ttClientHelper::getClient($id);
-if (!$client) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$client_to_delete = $client['name'];
-
-$form = new Form('clientDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
-$form->addInput(array('type'=>'combobox','name'=>'delete_client_entries',
-  'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
-      header('Location: clients.php');
-      exit();
-    } else
-      $err->add($i18n->get('error.db'));
-  }
-
-  if ($request->getParameter('btn_cancel')) {
-    header('Location: clients.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('client_to_delete', $client_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.delete_client'));
-$smarty->assign('content_page_name', 'mobile/client_delete.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/client_edit.php b/mobile/client_edit.php
deleted file mode 100644
index ab8686509..000000000
--- a/mobile/client_edit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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('ttClientHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_clients')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-$client = ttClientHelper::getClient($cl_id, true);
-if (!$client) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_address = trim($request->getParameter('address'));
-  $cl_tax = trim($request->getParameter('tax'));
-  $cl_status = $request->getParameter('status');
-  $cl_projects = $request->getParameter('projects');
-} else {
-  $cl_name = $client['name'];
-  $cl_address = $client['address'];
-  $cl_tax = $client['tax'];
-  $cl_status = $client['status'];
-  $assigned_projects = ttClientHelper::getAssignedProjects($cl_id);
-  foreach($assigned_projects as $project_item) {
-    $cl_projects[] = $project_item['id'];
-  }
-}
-
-$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
-
-$form = new Form('clientForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','class'=>'mobile-textarea','value'=>$cl_address));
-$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if ($show_projects)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $client = ttClientHelper::getClientByName($cl_name);
-      if (($client && ($cl_id == $client['id'])) || !$client) {
-        if (ttClientHelper::update(array('id' => $cl_id,
-          'name' => $cl_name,
-          'address' => $cl_address,
-          'tax' => $cl_tax,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: clients.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-
-    if ($request->getParameter('btn_copy')) {
-      if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array('name' => $cl_name,
-          'address' => $cl_address,
-          'tax' => $cl_tax,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: clients.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-    
-    if ($request->getParameter('btn_delete')) {
-      header("Location: client_delete.php?id=$cl_id");
-      exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('title', $i18n->get('title.edit_client'));
-$smarty->assign('content_page_name', 'mobile/client_edit.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/clients.php b/mobile/clients.php
deleted file mode 100644
index d1e6b38f3..000000000
--- a/mobile/clients.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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('ttGroupHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-if($user->can('manage_clients')) {
-  $active_clients = ttGroupHelper::getActiveClients(true);
-  $inactive_clients = ttGroupHelper::getInactiveClients(true);
-} else
-  $active_clients = $user->getAssignedClients();
-
-$smarty->assign('active_clients', $active_clients);
-$smarty->assign('inactive_clients', $inactive_clients);
-$smarty->assign('title', $i18n->get('title.clients'));
-$smarty->assign('content_page_name', 'mobile/clients.tpl');
-$smarty->display('mobile/index.tpl');

From fa0a08caa353fd5e2667780c7bb42eb763ad1b02 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Nov 2020 16:36:43 +0000
Subject: [PATCH 1391/1848] Cosmetic changes in translation files.

---
 README.md                        |  2 +-
 WEB-INF/resources/ca.lang.php    | 34 +++++-------------------------
 WEB-INF/resources/cs.lang.php    | 34 +++++-------------------------
 WEB-INF/resources/da.lang.php    | 34 +++++-------------------------
 WEB-INF/resources/de.lang.php    | 28 ++-----------------------
 WEB-INF/resources/en.lang.php    | 34 +++++-------------------------
 WEB-INF/resources/es.lang.php    | 36 ++++++--------------------------
 WEB-INF/resources/et.lang.php    | 28 ++-----------------------
 WEB-INF/resources/fa.lang.php    | 34 +++++-------------------------
 WEB-INF/resources/fi.lang.php    | 33 +++++------------------------
 WEB-INF/resources/fr.lang.php    | 32 ++++------------------------
 WEB-INF/resources/gr.lang.php    | 28 ++-----------------------
 WEB-INF/resources/he.lang.php    | 28 ++-----------------------
 WEB-INF/resources/hu.lang.php    | 28 ++-----------------------
 WEB-INF/resources/it.lang.php    | 28 ++-----------------------
 WEB-INF/resources/ja.lang.php    | 28 ++-----------------------
 WEB-INF/resources/ko.lang.php    | 28 ++-----------------------
 WEB-INF/resources/nl.lang.php    | 28 ++-----------------------
 WEB-INF/resources/no.lang.php    | 28 ++-----------------------
 WEB-INF/resources/pl.lang.php    | 28 ++-----------------------
 WEB-INF/resources/pt-br.lang.php | 28 ++-----------------------
 WEB-INF/resources/pt.lang.php    | 28 ++-----------------------
 WEB-INF/resources/ro.lang.php    | 28 ++-----------------------
 WEB-INF/resources/ru.lang.php    | 28 ++-----------------------
 WEB-INF/resources/sk.lang.php    | 28 ++-----------------------
 WEB-INF/resources/sl.lang.php    | 28 ++-----------------------
 WEB-INF/resources/sr.lang.php    | 28 ++-----------------------
 WEB-INF/resources/sv.lang.php    | 28 ++-----------------------
 WEB-INF/resources/tr.lang.php    | 28 ++-----------------------
 WEB-INF/resources/zh-cn.lang.php | 28 ++-----------------------
 WEB-INF/resources/zh-tw.lang.php | 34 +++++-------------------------
 initialize.php                   |  2 +-
 mobile/index.php                 |  5 ++---
 33 files changed, 91 insertions(+), 811 deletions(-)

diff --git a/README.md b/README.md
index f3b7987ef..cf2f8601f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Anuko Time Tracker
 
 ## About
-Anuko [Time Tracker](https://www.anuko.com/time-tracker/index.htm) is a simple, easy to use, open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
+Anuko [Time Tracker](https://www.anuko.com/time-tracker/index.htm) is an open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
 
 ## Free Hosting
 [Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time-tracker/free-hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index de6e0df96..34421e73d 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -472,13 +448,13 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Ha oblidat la seva paraula de pas?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'S\\\'ha enviat la petició de restablir paraula de pas.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Sol·licitud de restabliment de la paraula de pas de Anuko Time Tracker',
 // TODO: translate the following.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Per restablir la paraula de pas, si us plau escrigui-la i faci clic en guardar.',
@@ -649,7 +625,7 @@
 'form.mail.to' => 'Per a',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Factura enviada.',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 92411b33b..199a96faf 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -480,13 +456,13 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zapomenuté heslo?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Zaslán požadavek k vymazání hesla.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker požadavek na vymazání hesla',
 // TODO: translate the following.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
@@ -662,7 +638,7 @@
 'form.mail.to' => 'Komu',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Faktura odeslána.',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3ab49c39e..88b5324fb 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -461,9 +437,9 @@
 'form.reset_password.message' => 'Nulstilling af adgangskode er sendt på email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker - Anmodning om nulstilling af adgangskode',
 // TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Hej\n\nNogen, IP %s, har bedt om at få nulstillet din adgangskode. Tryk på linket hvis du vil have nulstillet din adgangskode.\n\n%s\n\nAnuko Time Tracker er et nemt, let at bruge, open source tidsregistrerings system. Besøg https://www.anuko.com for mere information.\n\n",
+'form.reset_password.email_body' => "Hej\n\nNogen, IP %s, har bedt om at få nulstillet din adgangskode. Tryk på linket hvis du vil have nulstillet din adgangskode.\n\n%s\n\nAnuko Time Tracker er et open source tidsregistrerings system. Besøg https://www.anuko.com for mere information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Skriv en ny adgangskode og tryk Gem.',
@@ -626,7 +602,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Til',
 'form.mail.report_subject' => 'Tidsregistrerings Rapport',
-'form.mail.footer' => 'Anuko Time Tracker er et simpelt, let at bruge, open source<br>tidsregistrerings system. Besøg <a href="https://www.anuko.com">www.anuko.com</a> for mere information.',
+'form.mail.footer' => 'Anuko Time Tracker er et open source<br>tidsregistrerings system. Besøg <a href="https://www.anuko.com">www.anuko.com</a> for mere information.',
 'form.mail.report_sent' => 'Rapport sendt.',
 'form.mail.invoice_sent' => 'Faktura sendt.',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 7db6f93bb..be1ede828 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index d17ba4dc9..37aae4cae 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -429,12 +405,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Forgot password?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Password reset request sent by email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
-'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Type new password and click on Save.',
@@ -587,7 +563,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'To',
 'form.mail.report_subject' => 'Time Tracker Report',
-'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Invoice sent.',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0c1d2c6b9..e7df23ad6 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -476,7 +452,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Olvido su contraseña?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: check / improve translation of form.reset_password.message.
@@ -486,9 +462,9 @@
 'form.reset_password.email_subject' => 'Solicitud de reestablecimiento de la contraseña de Anuko Time Tracker',
 // Note to translators: the ending of this string needs to be translated.
 // TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Querido usuario, Alguien, IP %s, solicitó reestablecer su contraseña de Anuko Time Tracker. Por favor visite este enlace si quiere reestablecer su contraseña.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.email_body' => "Querido usuario, Alguien, IP %s, solicitó reestablecer su contraseña de Anuko Time Tracker. Por favor visite este enlace si quiere reestablecer su contraseña.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: improve translation of form.change_password.tip.
@@ -664,7 +640,7 @@
 // TODO: translate form.mail.report_subject.
 // 'form.mail.report_subject' => 'Time Tracker Report',
 // Note to translators: the following strings need to be translated.
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Factura enviada.',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b6b442441..e2c63ef91 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 35fb9feff..0d578b64c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -473,7 +449,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'بازیابی رمز عبور؟',
 // TODO: translate form.login.about.
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'درخواست بازیابی رمزعبور به ایمیل فرستاده شد.',
@@ -481,7 +457,7 @@
 // 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
 'form.reset_password.email_subject' => 'درخواست بازیابی رمزعبور فرستاده شد',
 // TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // Older translation is below.
 // 'form.reset_password.email_body' => "کاربران گرامی\n\n یک نفر، شاید خودتان، درخواست بازیابی رمزعبور نرم افزار رهگیری زمان شما را داشته است.لطفا برای تغییر رمزعبور روی لینک زیر کلیک کنید: \n\n%s\n\n",
 
@@ -649,7 +625,7 @@
 'form.mail.to' => 'به',
 'form.mail.report_subject' => 'گزارش تایم شیت',
 // TODO: translate form.mail.footer.
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.report_sent' => 'گزارش ارسال شد.',
 'form.mail.invoice_sent' => 'فاکتور ارسال شد.',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 753dcf8ce..42af8047e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -465,8 +441,8 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Salasanan nollauspyyntöviesti lähetetty.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker -salasanan nollauspyyntö',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Hyvä käyttäjä,\n\nJoku, IP %s, on pyytänyt nollaamaan Anuko Time Tracker -ohjelman salasanasi. Jos haluat nollata salasanasi, käy sivulla \n\n%s\n\nAnuko Time Tracker on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto. Lisätietoja sivulla https://www.anuko.com.\n\n",
 
@@ -631,6 +607,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Vastaanottaja',
 'form.mail.report_subject' => 'Time Tracker -raportti',
+// TODO: English string for form.mail.footer changed. Re-translate.
 'form.mail.footer' => 'Anuko Time Tracker on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto. Lisätietoja sivulla <a href="https://www.anuko.com">www.anuko.com</a>.',
 'form.mail.report_sent' => 'Raportti lähetetty.',
 'form.mail.invoice_sent' => 'Lasku lähetetty.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ca00e9471..46116db12 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -457,8 +433,8 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Une demande de réinitialisation du mot de passe a été envoyé par courriel.',
 'form.reset_password.email_subject' => 'Demande de réinitialisation de mot de passe Anuko Time Tracker',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Cher utilisateur,\n\nQuelqu\'un, IP %s, avez demandé une réinitialisation de votre mot de passe. Veuillez de suivre ce lien pour le réinitialiser\n\n%s\n\nAnuko Time Tracker est un système de gestion du temps, open source, simple et facile à utiliser. Visitez https://www.anuko.com pour plus d\'informations.\n\n",
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index ba630f269..5e3ee8ee8 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 296e82b1b..1460943e2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 6328f330f..509034524 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e3bc6a31d..1626913ec 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 26d222ebd..b73f3ea83 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index fbfd6794b..e7430b6ee 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 1705e2cd3..959822057 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 81aff4489..ed392d932 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2000584e9..5f67ff40f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 61afec796..3fb2f3aed 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b4aa0cc02..fab8af4cf 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 419b26467..32edb49e9 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 49ee3edeb..3268f0878 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index eceb1e521..90f500e0c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8ee642e54..2e1004810 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8bc2e7223..f67e81334 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index dd3981f36..fc1c7bd62 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9475ad0d2..f1c164c62 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index ed76b599a..c10942223 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 913c12cf1..66dc7099f 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
@@ -471,13 +447,13 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘記密碼？',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '密碼重設請求已經發送。', // TODO: Add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko時間追蹤器密碼重設請求',
 // TODO: translate the following.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
@@ -647,7 +623,7 @@
 'form.mail.to' => '到',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '發票已送出。',
 
diff --git a/initialize.php b/initialize.php
index 4e41c7ea3..ae59bd0db 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5383");
+define("APP_VERSION", "1.19.23.5384");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/index.php b/mobile/index.php
index fa3f04c46..8fc64b35e 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -44,10 +44,9 @@
 <html>
   <script src="../js/strftime.js"></script>
   <script>
-    location.href = "time.php?date="+(new Date()).strftime('<?php print DB_DATEFORMAT;?>');
+    location.href = "../time.php?date="+(new Date()).strftime('<?php print DB_DATEFORMAT;?>');
   </script>
   <noscript>
-    <p>Anuko Time Tracker is a simple, easy to use, open source, web-based time tracking system.</p>
-    <p>Your browser does not support JavaScript. Time Tracker will not work without it.</p>
+    <p>Your browser does not support JavaScript. This application will not work without it.</p>
   </noscript>
 </html>

From 6f4cf24936570945a4809d8cfc33acb42c952813 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Nov 2020 17:17:34 +0000
Subject: [PATCH 1392/1848] Cosmetic improvements in translation files.

---
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 3 ++-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 initialize.php                   | 2 +-
 25 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 88b5324fb..040405503 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -431,7 +431,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Har du glemt din adgangskode?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et nemt, let at bruge, open source tidsregistrerings system.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et open source tidsregistrerings system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Nulstilling af adgangskode er sendt på email.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index be1ede828..2268692bb 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -422,7 +422,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Passwort vergessen?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein einfaches, leicht zu bedienendes, Open-Source Zeiterfassungssystem.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein Open-Source Zeiterfassungssystem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e2c63ef91..30f697cbd 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -439,7 +439,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Unustasid salasõna?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga ajaarvestussüsteem.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on avatud lähtekoodiga ajaarvestussüsteem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Salasõna tühistamise teade on saadetud e-postile.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 42af8047e..034ea6ae0 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -436,7 +436,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Salasana unohtunut?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto.',
+ // TODO: check translation of form.login.about - is open source "vapaan koodin"?
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on vapaan koodin tuntiseurantaohjelmisto.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Salasanan nollauspyyntöviesti lähetetty.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 46116db12..44ba9b2bb 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -428,7 +428,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Mot de passe oublié?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> est un système de gestion du temps, open source, simple et facile à utiliser.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> est un système de gestion du temps, open source.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Une demande de réinitialisation du mot de passe a été envoyé par courriel.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5e3ee8ee8..29404a831 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -428,7 +428,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Ξεχάσατε τον κωδικό πρόσβασης;',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> είναι ένα απλό, εύχρηστο, ανοικτού κώδικα σύστημα παρακολούθησης χρόνου.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> είναι ένα ανοικτού κώδικα σύστημα παρακολούθησης χρόνου.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Το αίτημα  επαναφοράς κωδικού πρόσβασης αποστέλλεται μέσω ηλεκτρονικού ταχυδρομείου.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 1460943e2..2bc6129d9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -453,6 +453,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'שכחת סיסמה?',
+ // TODO: re-translate form.login.about as it has changed.
+ // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 509034524..98a566d10 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -450,7 +450,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Elfelejtetted a jelszót?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1626913ec..1b7f56e46 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -438,7 +438,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Password dimenticata?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> è un sistema semplice e open source per registrare i tempi di lavoro.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> è un sistema open source per registrare i tempi di lavoro.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Richiesta di reset password inviata via mail.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b73f3ea83..aae1528cc 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -451,7 +451,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'パスワードを忘れましたか？',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '送信したパスワードの初期化の要求。', // TODO: add "by email" to match the English string.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index e7430b6ee..6794c57e7 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -455,7 +455,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '암호를 잊으셨습니까?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '송신한 암호 재설정 요청.', // TODO: add "by email" to match the English string.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 959822057..8b2e557ea 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -390,6 +390,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Wachtwoord vergeten?',
+ // TODO: re-translate form.login.about as it has changed.
+ // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ed392d932..77d43637f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -450,6 +450,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glemt passordet?',
+ // TODO: re-translate form.login.about as it has changed.
+ // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et enkelt, brukervennlig tidsregistreringssystem basert på åpen kildekode.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 5f67ff40f..b617314db 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -439,7 +439,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Nie pamiętasz hasła?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> jest prostym, łatwym w użyciu, otwartoźródłowym systemem śledzenia czasu.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> jest otwartoźródłowym systemem śledzenia czasu.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Instrukcje zmiany hasła zostały wysłane na adres e-mail połączony z kontem.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3fb2f3aed..95e9d1060 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -434,7 +434,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> é um sistema, simples, de fácil uso, de código aberto, de rastreamento do tempo.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> é um sistema de código aberto de rastreamento do tempo.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Pedido para resetar a senha enviado por e-mail.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fab8af4cf..dd72ab4b6 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -434,7 +434,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 32edb49e9..55731aa05 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -454,7 +454,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parola pierduta?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Cererea de resetare a parolei a fost trimisa.', // TODO: add "by email" to match the English string.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3268f0878..dd6c1e1c8 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -391,7 +391,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Забыли пароль?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> - это открытая (open source), простая и лёгкая в использовании система трекинга рабочего времени.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> - это открытая (open source) система трекинга рабочего времени.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Запрос на сброс пароля отослан по e-mail.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 90f500e0c..95a025a7a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -443,7 +443,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zabudnuté heslo?',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je jednoduchý a ľahko použiteľný systém na sledovanie času s otvoreným zdrojovým kódom.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je systém na sledovanie času s otvoreným zdrojovým kódom.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Žiadosť o obnovenie hesla bola odoslaná e-mailom.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2e1004810..eb8bd99dd 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -426,7 +426,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 // TODO: translate the following.
 // 'form.login.forgot_password' => 'Forgot password?',
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Zahteva za razveljavitev gesla je bila poslana.', // TODO: add "by email" to match the English string.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f67e81334..a80f0e67a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -437,6 +437,8 @@
 
 // Forma prijave. Pogledajte primer na https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zaboravili ste lozinku?',
+ // TODO: re-translate form.login.about as it has changed.
+ // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je jednostavan i lak za korišćenje za praćenje radnog vremena.',
 
 // Izmena forme za lozinku. Pogledajte primer na https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index fc1c7bd62..6bae583a7 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -436,6 +436,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glömt lösenordet?',
+ // TODO: re-translate form.login.about as it has changed.
+ // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> är en lättanvänd applikation byggd med öppen källkod som enkelt låter dig spåra och hålla koll på arbetstider.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index f1c164c62..3ba51a116 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -462,7 +462,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parolanızı unuttunuz mu?',
 // TODO: translate the following.
-// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Parola sıfırlama talebi yollandı.', // TODO: add "by email" to match the English string.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index c10942223..7eb54073a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -442,6 +442,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘记密码？',
+// TODO: re-translate form.login.about as it has changed.
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> 是一种简单、易用、开放源代码的实时跟踪系统。',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/initialize.php b/initialize.php
index ae59bd0db..1f219134f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5384");
+define("APP_VERSION", "1.19.23.5385");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2de5567b129e8190b9c1f9d80d9cedc5b6c5d37d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Nov 2020 18:10:00 +0000
Subject: [PATCH 1393/1848] Some more refactoring in translation files.

---
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fa.lang.php    | 2 +-
 WEB-INF/resources/fi.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 4 ++--
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/ja.lang.php    | 6 +++---
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 4 ++--
 WEB-INF/resources/pl.lang.php    | 4 ++--
 WEB-INF/resources/pt-br.lang.php | 4 ++--
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 6 +++---
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 4 ++--
 WEB-INF/resources/sl.lang.php    | 6 +++---
 WEB-INF/resources/sr.lang.php    | 4 ++--
 WEB-INF/resources/sv.lang.php    | 4 ++--
 WEB-INF/resources/tr.lang.php    | 6 +++---
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 initialize.php                   | 2 +-
 25 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 2268692bb..13626d9e6 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -427,7 +427,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker Anfrage zur Zurücksetzung des Passwortes',
-'form.reset_password.email_body' => "Sehr geehrter Nutzer,\n\nEin Benutzer mit der IP %s hat vor Kurzem die Zurücksetzung Ihres Passworts für Anuko Time Tracker Passwort angefordert. Bitte rufen Sie diesen Link auf wenn Sie Ihr Passwort zurücksetzen möchten.\n\n%s\n\nAnuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source Zeiterfassungs-System. Besuchen Sie https://www.anuko.com für weitere Informationen.\n\n",
+'form.reset_password.email_body' => "Sehr geehrter Nutzer,\n\nEin Benutzer mit der IP %s hat vor Kurzem die Zurücksetzung Ihres Passworts für Anuko Time Tracker Passwort angefordert. Bitte rufen Sie diesen Link auf wenn Sie Ihr Passwort zurücksetzen möchten.\n\n%s\n\nAnuko Time Tracker ist ein Open-Source Zeiterfassungs-System. Besuchen Sie https://www.anuko.com für weitere Informationen.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Um das Passwort zurückzusetzen, geben Sie ein Neues ein und klicken dann auf Speichern.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e7df23ad6..05c24948c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -461,7 +461,7 @@
 'form.reset_password.message' => 'Se ha enviado la petición de reestablecer contraseña.',
 'form.reset_password.email_subject' => 'Solicitud de reestablecimiento de la contraseña de Anuko Time Tracker',
 // Note to translators: the ending of this string needs to be translated.
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
+// TODO: English string has changed. "from IP added. Re-translate.
 // 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Querido usuario, Alguien, IP %s, solicitó reestablecer su contraseña de Anuko Time Tracker. Por favor visite este enlace si quiere reestablecer su contraseña.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 30f697cbd..d938cf079 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -444,7 +444,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Salasõna tühistamise teade on saadetud e-postile.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker, parooli tühistamise nõue',
-'form.reset_password.email_body' => "Lugupeetud Kasutaja,\n\nIP-lt %s on nõutud Teie salasõna lähtestamist. Palun avage allolev link, kui soovite oma parooli lähtestada.\n\n%s\n\nAnuko Time Tracker on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga ajaarvestussüsteem. Lisainfo saamiseks külastage https://www.anuko.com lehekülge.\n\n",
+'form.reset_password.email_body' => "Lugupeetud Kasutaja,\n\nIP-lt %s on nõutud Teie salasõna lähtestamist. Palun avage allolev link, kui soovite oma parooli lähtestada.\n\n%s\n\nAnuko Time Tracker on avatud lähtekoodiga ajaarvestussüsteem. Lisainfo saamiseks külastage https://www.anuko.com lehekülge.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Kirjuta siia oma uus parool ja salvesta.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0d578b64c..0fca34586 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -456,7 +456,7 @@
 // TODO: check translation of form.reset_password.email_subject. This is the subject for email message for password reset. Below is the English original.
 // 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
 'form.reset_password.email_subject' => 'درخواست بازیابی رمزعبور فرستاده شد',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
+// TODO: English string has changed. Re-translate.
 // 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // Older translation is below.
 // 'form.reset_password.email_body' => "کاربران گرامی\n\n یک نفر، شاید خودتان، درخواست بازیابی رمزعبور نرم افزار رهگیری زمان شما را داشته است.لطفا برای تغییر رمزعبور روی لینک زیر کلیک کنید: \n\n%s\n\n",
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 034ea6ae0..eaad8a293 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -445,7 +445,7 @@
 // TODO: English string has changed. Re-translate.
 // 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Hyvä käyttäjä,\n\nJoku, IP %s, on pyytänyt nollaamaan Anuko Time Tracker -ohjelman salasanasi. Jos haluat nollata salasanasi, käy sivulla \n\n%s\n\nAnuko Time Tracker on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto. Lisätietoja sivulla https://www.anuko.com.\n\n",
+'form.reset_password.email_body' => "Hyvä käyttäjä,\n\nJoku, IP %s, on pyytänyt nollaamaan Anuko Time Tracker -ohjelman salasanasi. Jos haluat nollata salasanasi, käy sivulla \n\n%s\n\nAnuko Time Tracker on vapaan koodin tuntiseurantaohjelmisto. Lisätietoja sivulla https://www.anuko.com.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Syötä uusi salasana ja osoita Tallenna.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 44ba9b2bb..3d4845cc0 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -436,7 +436,7 @@
 // TODO: English string has changed. Re-translate.
 // 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Cher utilisateur,\n\nQuelqu\'un, IP %s, avez demandé une réinitialisation de votre mot de passe. Veuillez de suivre ce lien pour le réinitialiser\n\n%s\n\nAnuko Time Tracker est un système de gestion du temps, open source, simple et facile à utiliser. Visitez https://www.anuko.com pour plus d\'informations.\n\n",
+'form.reset_password.email_body' => "Cher utilisateur,\n\nQuelqu\'un, IP %s, avez demandé une réinitialisation de votre mot de passe. Veuillez de suivre ce lien pour le réinitialiser\n\n%s\n\nAnuko Time Tracker est un système de gestion du temps, open source. Visitez https://www.anuko.com pour plus d\'informations.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Saisissez votre nouveau mot de passe et cliquez sur Sauvegarder.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 29404a831..61b06f6bd 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -433,7 +433,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Το αίτημα  επαναφοράς κωδικού πρόσβασης αποστέλλεται μέσω ηλεκτρονικού ταχυδρομείου.',
 'form.reset_password.email_subject' => 'Αίτημα επαναφοράς κωδικού Anuko Time Tracker',
-'form.reset_password.email_body' => "Αγαπητέ χρήστη,\n\nΚάποιος από την IP %s ζήτησε επαναφορά του κωδικού πρόσβασης στο Anuko Time Tracker. Πατήστε στον ακόλουθο σύνδεσμο για επαναφορά του κωδικού σας.\n\n%s\n\nΤο Anuko Time Tracker είναι ένα απλό, εύχρηστο, ανοικτού κώδικα σύστημα παρακολούθησης χρόνου. Επισκεφθείτε τη διεύθυνση https://www.anuko.com για περισσότερες πληροφορίες.\n\n",
+'form.reset_password.email_body' => "Αγαπητέ χρήστη,\n\nΚάποιος από την IP %s ζήτησε επαναφορά του κωδικού πρόσβασης στο Anuko Time Tracker. Πατήστε στον ακόλουθο σύνδεσμο για επαναφορά του κωδικού σας.\n\n%s\n\nΤο Anuko Time Tracker είναι ένα ανοικτού κώδικα σύστημα παρακολούθησης χρόνου. Επισκεφθείτε τη διεύθυνση https://www.anuko.com για περισσότερες πληροφορίες.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Πληκτρολογήστε νέο κωδικό πρόσβασης και κάντε κλικ στην επιλογή Αποθήκευση.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2bc6129d9..b8459e8b7 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -460,8 +460,8 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'הבקשה לאיפוס בסיסמה נשלחה בדואר אלקטרוני.',
 'form.reset_password.email_subject' => 'בקשה לאיפוס סיסמה למערכת Anuko Time Tracker',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // Older translation is below.
 // 'form.reset_password.email_body' => "משתמש יקר,\n\n התקבלה בקשה לאיפוס סיסמתך. נא ללחוץ על קישור זה אם ברצונך לאפס את הסיסמה.\n\n%s\n\n. Anuko Time Tracker הינה מערכת לניהול זמן פשוטה וחינמית. בקר באתרנו בכתובת https://www.anuko.com לפרטים נוספים.\n\n",
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 98a566d10..a4fe12023 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -456,7 +456,7 @@
 // TODO: translate the following.
 // 'form.reset_password.message' => 'Password reset request sent by email.',
 // 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index aae1528cc..07db51091 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -457,10 +457,10 @@
 'form.reset_password.message' => '送信したパスワードの初期化の要求。', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Trackerのパスワードの初期化の要求',
 // TODO: translate the ending of this string.
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // Older translation is below.
-// 'form.reset_password.email_body' => "尊敬なるお客様、\n\n誰から（多分あなた）あなたのAnuko Time Trackerのパスワードの初期化が要求されました。あなたのパスワードを初期化しようとこのリンクを押してください。\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "尊敬なるお客様、\n\n誰から（多分あなた）あなたのAnuko Time Trackerのパスワードの初期化が要求されました。あなたのパスワードを初期化しようとこのリンクを押してください。\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6794c57e7..975719ebd 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -461,7 +461,7 @@
 'form.reset_password.message' => '송신한 암호 재설정 요청.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker 암호 재설정 요청',
 // TODO: translate the following.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8b2e557ea..ac8431264 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -397,6 +397,8 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Het verzoek om het wachtwoord te herstellen is verzonden per email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker wachtwoord herstel verzoek',
+// TODO: retranslate form.reset_password.email_body as the string has changed.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 'form.reset_password.email_body' => "Geachte medewerker,\n\nIemand, met IP adres %s, heeft verzocht uw wachtwoord in Anuko Time Tracker te herstellen. Klik op deze link als u uw wachtwoord wil wijzigen.\n\n%s\n\nAnuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek https://www.anuko.com voor meer informatie.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 77d43637f..eb406d0f9 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -458,8 +458,8 @@
 // TODO: translate the following.
 // 'form.reset_password.message' => 'Password reset request sent by email.',
 // 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Kjære bruker,\n\nNoen, IP %s, bad om å få ditt Anuko Time Tracker password resatt. Vær vennlig å besøk denne lenken dersom du ønsker at passordet ditt skal resettes.\n\n%s\n\nAnuko Time Tracker er et enkelt og brukervennlig system for tidsregistrering basert på åpen kildekode. Les mer på https://www.anuko.com.\n\n",
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b617314db..79952ff56 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -445,9 +445,9 @@
 'form.reset_password.message' => 'Instrukcje zmiany hasła zostały wysłane na adres e-mail połączony z kontem.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker - żądanie zmiany hasła',
 // TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Drogi Użytkowniku,\n\nktoś, IP %s, poprosił o zmianę hasła w aplikacji Anuko Time Tracker. Aby ustawić nowe hasło, proszę kliknąć na poniższy link lub go skopiować i otworzyć w oknie przeglądarki WWW.\n\n%s\n\nJeśli to nie Ty poprosiłeś o zmianę hasła, zignoruj tą wiadomość.\n\nAnuko Time Tracker jest prostym, łatwym w użyciu, otwartoźródłowym systemem do śledzenia czasu. Odwiedź https://www.anuko.com aby uzyskać więcej informacji.\n\n",
+'form.reset_password.email_body' => "Drogi Użytkowniku,\n\nktoś, IP %s, poprosił o zmianę hasła w aplikacji Anuko Time Tracker. Aby ustawić nowe hasło, proszę kliknąć na poniższy link lub go skopiować i otworzyć w oknie przeglądarki WWW.\n\n%s\n\nJeśli to nie Ty poprosiłeś o zmianę hasła, zignoruj tą wiadomość.\n\nAnuko Time Tracker jest otwartoźródłowym systemem do śledzenia czasu. Odwiedź https://www.anuko.com aby uzyskać więcej informacji.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Wpisz nowe hasło i kliknij Zapisz.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 95e9d1060..9f446ce5f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -440,9 +440,9 @@
 'form.reset_password.message' => 'Pedido para resetar a senha enviado por e-mail.',
 'form.reset_password.email_subject' => 'Pedido de alteração de senha no Anuko Time Tracker',
 // TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Prezado usuário,\n\nAlguém, IP %s, solicitou o reset da sua senha do Anuko Time Tracker. Entre nete link para resetar a sua senha.\n\n%s\n\nAnuko Time Tracker é um sistema, simples, de fácil uso, de código abertois, de rastreamento do tempo. Visite https://www.anuko.com para mais informações.\n\n",
+'form.reset_password.email_body' => "Prezado usuário,\n\nAlguém, IP %s, solicitou o reset da sua senha do Anuko Time Tracker. Entre nete link para resetar a sua senha.\n\n%s\n\nAnuko Time Tracker é um sistema de código abertois, de rastreamento do tempo. Visite https://www.anuko.com para mais informações.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Entre com a nova senha e clique em Salvar.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index dd72ab4b6..b0ae4794a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -440,7 +440,7 @@
 // TODO: translate the following.
 // 'form.reset_password.message' => 'Password reset request sent by email.',
 // 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 55731aa05..2ca785263 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -459,10 +459,10 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Cererea de resetare a parolei a fost trimisa.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker - cerere de resetare a parolei',
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Draga Utilizator,\n\nCineva, IP %s, a cerut resetarea parolei pentru contul Anuko Time Tracker. Te rog, viziteaza acesta legatura daca doresti sa iti resetezi parola.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.email_body' => "Draga Utilizator,\n\nCineva, IP %s, a cerut resetarea parolei pentru contul Anuko Time Tracker. Te rog, viziteaza acesta legatura daca doresti sa iti resetezi parola.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index dd6c1e1c8..53cb89b10 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -396,7 +396,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Запрос на сброс пароля отослан по e-mail.',
 'form.reset_password.email_subject' => 'Сброс пароля к Anuko Time Tracker',
-'form.reset_password.email_body' => "Уважаемый пользователь,\n\nКто-то c IP %s попросил сбросить ваш пароль к системе Anuko Time Tracker. Пройдите по данной ссылке для сброса пароля.\n\n%s\n\nAnuko Time Tracker - это открытая (open source), простая и лёгкая в использовании система трекинга рабочего времени. Подробности - на сайте https://www.anuko.com.",
+'form.reset_password.email_body' => "Уважаемый пользователь,\n\nКто-то c IP %s попросил сбросить ваш пароль к системе Anuko Time Tracker. Пройдите по данной ссылке для сброса пароля.\n\n%s\n\nAnuko Time Tracker - это открытая (open source) система трекинга рабочего времени. Подробности - на сайте https://www.anuko.com.",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Впечатайте новый пароль и нажмите Cохранить.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 95a025a7a..56023db5a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -449,9 +449,9 @@
 'form.reset_password.message' => 'Žiadosť o obnovenie hesla bola odoslaná e-mailom.',
 'form.reset_password.email_subject' => 'Žiadosť o obnovenie hesla do Anuko Time Tracker',
 // TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Vážený používateľ,\n\nniekto, IP %s, si vyžiadal obnovenie vášho hesla do Anuko Time Tracker. Prosím kliknite na nasledujúcu linku, ak si prajete obnoviť heslo.\n\n%s\n\nAnuko Time Tracker je jednoduchý a ľahko použiteľný systém na sledovanie času s otvoreným zdrojovým kódom. Navštívte https://www.anuko.com pre viac informácií.\n\n",
+'form.reset_password.email_body' => "Vážený používateľ,\n\nniekto, IP %s, si vyžiadal obnovenie vášho hesla do Anuko Time Tracker. Prosím kliknite na nasledujúcu linku, ak si prajete obnoviť heslo.\n\n%s\n\nAnuko Time Tracker je systém na sledovanie času s otvoreným zdrojovým kódom. Navštívte https://www.anuko.com pre viac informácií.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Zadajte nové heslo a kliknite na Uložiť.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index eb8bd99dd..ae6ec81c3 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -432,10 +432,10 @@
 'form.reset_password.message' => 'Zahteva za razveljavitev gesla je bila poslana.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker zahteva za razveljavitev gesla',
 // TODO: translate the ending of this string properly.
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. "from IP" added. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Spoštovani uporabnik,\n\nNekdo, IP %s, je zahteval razveljavitev vašega Anuko Time Tracker gesla. Prosimo obiščite to povezavo, če želite razveljaviti vaše geslo.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.email_body' => "Spoštovani uporabnik,\n\nNekdo, IP %s, je zahteval razveljavitev vašega Anuko Time Tracker gesla. Prosimo obiščite to povezavo, če želite razveljaviti vaše geslo.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a80f0e67a..abfb0d7bd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -444,8 +444,8 @@
 // Izmena forme za lozinku. Pogledajte primer na https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Zahtev za izmenu lozinke je poslat mejlom.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker zahtev za izmenu lozinke',
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Poštovani korisniče,\n\nneko, IP %s, ste poslali zahtev za izmenu lozinke na Anuko Time Tracker nalogu. Molimo da pratite link ako želite da izmenite lozinku.\n\n%s\n\nAnuko Time Tracker je jednostavan i lak za korišćenje za praćenje radnog vremena. Posetite nas na https://www.anuko.com za više informacija.\n\n",
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 6bae583a7..17af93fd8 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -443,8 +443,8 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Begäran om att återställa lösenordet skickades via e-post.',
 'form.reset_password.email_subject' => 'Återställning av lösenord för Anuko Time Tracker begärd',
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Kära användare,\n\Någon, IP %s, begärde att ditt lösenord för Anuko Time Tracker skulle återställas. Vänligen besök den här länken ifall du vill återställa ditt lösenord.\n\n%s\n\nAnuko Time Tracker är en lättanvänd applikation byggd med öppen källkod som enkelt låter dig spåra och hålla koll på arbetstider. Besök https://www.anuko.com för mer information.\n\n",
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 3ba51a116..3b98e0a50 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -468,10 +468,10 @@
 'form.reset_password.message' => 'Parola sıfırlama talebi yollandı.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker parola sıfırlama talebi',
 // TODO: translate the ending of the following.
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Sayın Kullanıcı,\n\nBirisi, IP %s, Anuko Time Tracker parolanızın sıfırlanmasını istedi. Parolanızı sıfırlamak isterseniz lütfen bu bağlantıyı takip edin.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.email_body' => "Sayın Kullanıcı,\n\nBirisi, IP %s, Anuko Time Tracker parolanızın sıfırlanmasını istedi. Parolanızı sıfırlamak isterseniz lütfen bu bağlantıyı takip edin.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7eb54073a..5500155fc 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -450,7 +450,7 @@
 'form.reset_password.message' => '密码重设请求已经发送。', // TODO: Add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko时间追踪器密码重设请求',
 // TODO: translate the following.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 // TODO: translate the following.
diff --git a/initialize.php b/initialize.php
index 1f219134f..6384b0dad 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5385");
+define("APP_VERSION", "1.19.23.5386");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ad140616820e9fae649e4adeef3663ddee6e48ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 26 Nov 2020 19:19:45 +0000
Subject: [PATCH 1394/1848] Minor improvements in translation files.

---
 WEB-INF/resources/da.lang.php    | 2 +-
 WEB-INF/resources/de.lang.php    | 2 +-
 WEB-INF/resources/es.lang.php    | 2 +-
 WEB-INF/resources/et.lang.php    | 2 +-
 WEB-INF/resources/fr.lang.php    | 2 +-
 WEB-INF/resources/gr.lang.php    | 2 +-
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 +-
 WEB-INF/resources/it.lang.php    | 8 ++++----
 WEB-INF/resources/ja.lang.php    | 2 +-
 WEB-INF/resources/ko.lang.php    | 2 +-
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 +-
 WEB-INF/resources/pl.lang.php    | 2 +-
 WEB-INF/resources/pt-br.lang.php | 2 +-
 WEB-INF/resources/pt.lang.php    | 2 +-
 WEB-INF/resources/ro.lang.php    | 2 +-
 WEB-INF/resources/ru.lang.php    | 2 +-
 WEB-INF/resources/sk.lang.php    | 2 +-
 WEB-INF/resources/sl.lang.php    | 2 +-
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 +-
 WEB-INF/resources/zh-cn.lang.php | 2 +-
 initialize.php                   | 2 +-
 25 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 040405503..efdacc370 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -436,7 +436,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Nulstilling af adgangskode er sendt på email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker - Anmodning om nulstilling af adgangskode',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
+// TODO: English string has changed. Re-translate the beginning.
 // 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Hej\n\nNogen, IP %s, har bedt om at få nulstillet din adgangskode. Tryk på linket hvis du vil have nulstillet din adgangskode.\n\n%s\n\nAnuko Time Tracker er et open source tidsregistrerings system. Besøg https://www.anuko.com for mere information.\n\n",
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 13626d9e6..e41d92b09 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -580,7 +580,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'An',
 'form.mail.report_subject' => 'Time Tracker Bericht',
-'form.mail.footer' => 'Anuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source<br>Zeitverwaltungs-System. Besuchen Sie <a href="https://www.anuko.com">www.anuko.com</a> für weitere Informationen.',
+'form.mail.footer' => 'Anuko Time Tracker ist ein Open-Source<br>Zeitverwaltungs-System. Besuchen Sie <a href="https://www.anuko.com">www.anuko.com</a> für weitere Informationen.',
 'form.mail.report_sent' => 'Der Bericht wurde gesendet.',
 'form.mail.invoice_sent' => 'Die Rechnung wurde gesendet.',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 05c24948c..9df814845 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -461,7 +461,7 @@
 'form.reset_password.message' => 'Se ha enviado la petición de reestablecer contraseña.',
 'form.reset_password.email_subject' => 'Solicitud de reestablecimiento de la contraseña de Anuko Time Tracker',
 // Note to translators: the ending of this string needs to be translated.
-// TODO: English string has changed. "from IP added. Re-translate.
+// TODO: English string has changed. Re-translate.
 // 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
 'form.reset_password.email_body' => "Querido usuario, Alguien, IP %s, solicitó reestablecer su contraseña de Anuko Time Tracker. Por favor visite este enlace si quiere reestablecer su contraseña.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d938cf079..7638ade63 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -610,7 +610,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Kellele',
 'form.mail.report_subject' => 'Time Tracker raport',
-'form.mail.footer' => 'Anuko Time Tracker on lihtne, lihtsalt kasutatav ja avatud lähtekoodiga <br>ajaarvestussüsteem. Lisainfo saamiseks külastage <a href="https://www.anuko.com">www.anuko.com</a> lehekülge.',
+'form.mail.footer' => 'Anuko Time Tracker on avatud lähtekoodiga <br>ajaarvestussüsteem. Lisainfo saamiseks külastage <a href="https://www.anuko.com">www.anuko.com</a> lehekülge.',
 'form.mail.report_sent' => 'Raport on saadetud.',
 'form.mail.invoice_sent' => 'Arve on saadetud.',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3d4845cc0..771ed18e3 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -598,7 +598,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'À',
 'form.mail.report_subject' => 'Rapport Time Tracker',
-'form.mail.footer' => 'Anuko Time Tracker est un système de gestion du temps, open source, simple et facile à utiliser. Visitez <a href="https://www.anuko.com">www.anuko.com</a> pour plus d\\\'informations.',
+'form.mail.footer' => 'Anuko Time Tracker est un système de gestion du temps, open source. Visitez <a href="https://www.anuko.com">www.anuko.com</a> pour plus d\\\'informations.',
 'form.mail.report_sent' => 'Le rapport a été envoyé.',
 'form.mail.invoice_sent' => 'La facture a été envoyée.',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 61b06f6bd..e9003045c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -590,7 +590,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Προς',
 'form.mail.report_subject' => 'Time Tracker αναφορά',
-'form.mail.footer' => 'Το Anuko Time Tracker είναι ένα απλό, εύχρηστο, ανοικτού κώδικα σύστημα παρακολούθησης χρόνου. Επισκεφθείτε τη διεύθυνση <a href="https://www.anuko.com">www.anuko.com</a> για περισσότερες πληροφορίες.',
+'form.mail.footer' => 'Το Anuko Time Tracker είναι ένα ανοικτού κώδικα σύστημα παρακολούθησης χρόνου. Επισκεφθείτε τη διεύθυνση <a href="https://www.anuko.com">www.anuko.com</a> για περισσότερες πληροφορίες.',
 'form.mail.report_sent' => 'Η αναφορά στάλθηκε.',
 'form.mail.invoice_sent' => 'Το τιμολόγιο στάλθηκε.',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index b8459e8b7..032e01bf0 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -628,6 +628,8 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'אל',
 'form.mail.report_subject' => 'דוח Time Tracker',
+// TODO: retranslate form.mail.footer as the English string has changed.
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.footer' => 'Anuko Time Tracker הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן. בקר באתר <a href="https://www.anuko.com">www.anuko.com</a> לפרטים נוספים.',
 'form.mail.report_sent' => 'הדוח נשלח.',
 'form.mail.invoice_sent' => 'החשבונית נשלחה.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a4fe12023..1909682fb 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -630,7 +630,7 @@
 'form.mail.to' => 'Címzett',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'A számla elküldve.',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1b7f56e46..35035d3e9 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -443,10 +443,10 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Richiesta di reset password inviata via mail.',
 'form.reset_password.email_subject' => 'Richiesta reset password per Anuko Time Tracker',
-// TODO: English string has changed. "from IP added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+// TODO: English string has changed. Re-translate the beginning.
+// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
 // "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Caro utente,\n\n qualcuno, IP %s, ha richiesto di reimpostare la tua password per Anuko Time Tracker. Per favore visita questo link per reimpostare la tua password.\n\n%s\n\nAnuko Time Tracker è un sistema semplice e open source per registrare i tempi di lavoro. Visita https://www.anuko.com per maggiori informazioni.\n\n",
+'form.reset_password.email_body' => "Caro utente,\n\n qualcuno, IP %s, ha richiesto di reimpostare la tua password per Anuko Time Tracker. Per favore visita questo link per reimpostare la tua password.\n\n%s\n\nAnuko Time Tracker è un sistema open source per registrare i tempi di lavoro. Visita https://www.anuko.com per maggiori informazioni.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Digita una nuova password e clicca su Salva.',
@@ -605,7 +605,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'A',
 'form.mail.report_subject' => 'Rapporto Time Tracker',
-'form.mail.footer' => 'Anuko Time Tracker è un sistema semplice e open source <br>per registrare i tempi di lavoro. Visita <a href="https://www.anuko.com">www.anuko.com</a> per maggiori informazioni.',
+'form.mail.footer' => 'Anuko Time Tracker è un sistema open source <br>per registrare i tempi di lavoro. Visita <a href="https://www.anuko.com">www.anuko.com</a> per maggiori informazioni.',
 'form.mail.report_sent' => 'Rapporto inviato.',
 'form.mail.invoice_sent' => 'Fattura inviata.',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 07db51091..0ba848ba0 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -633,7 +633,7 @@
 'form.mail.to' => 'まで',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '送信した送り状。',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 975719ebd..975e42169 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -631,7 +631,7 @@
 'form.mail.to' => '까지', // TODO: is this correct? The meaning is that we send an email TO this person.
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '송신한 송장.',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ac8431264..6d51082c7 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -546,6 +546,8 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Aan',
 'form.mail.report_subject' => 'Time Tracker rapport',
+// TODO: retranslate form.mail.footer as the English string has changed.
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.footer' => 'Anuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek <a href="https://www.anuko.com">www.anuko.com</a> voor meer informatie.',
 'form.mail.report_sent' => 'Rapport is verzonden.',
 'form.mail.invoice_sent' => 'Factuur is verzonden.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index eb406d0f9..cfaf305b5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -632,7 +632,7 @@
 'form.mail.to' => 'Til',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 // 'form.mail.invoice_sent' => 'Invoice sent.',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 79952ff56..24664d693 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -610,7 +610,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Do',
 'form.mail.report_subject' => 'Raport Time Tracker',
-'form.mail.footer' => 'Anuko Time Tracker jest prostym, łatwym w użyciu, otwartoźródłowym<br>systemem śledzenia czasu. Odwiedź <a href="https://www.anuko.com">www.anuko.com</a>, aby uzyskać więcej informacji.',
+'form.mail.footer' => 'Anuko Time Tracker jest otwartoźródłowym<br>systemem śledzenia czasu. Odwiedź <a href="https://www.anuko.com">www.anuko.com</a>, aby uzyskać więcej informacji.',
 'form.mail.report_sent' => 'Wysłano raport',
 'form.mail.invoice_sent' => 'Wysłano fakturę',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 9f446ce5f..e41cf26c3 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -605,7 +605,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Para',
 'form.mail.report_subject' => 'Relatório do Time Tracker',
-'form.mail.footer' => 'Anuko Time Tracker é um sistema, simples, de fácil uso, de código aberto,<br>de rastreamento do tempo. Visite <a href="https://www.anuko.com">www.anuko.com</a> para mais informações.',
+'form.mail.footer' => 'Anuko Time Tracker é um sistema de código aberto,<br>de rastreamento do tempo. Visite <a href="https://www.anuko.com">www.anuko.com</a> para mais informações.',
 'form.mail.report_sent' => 'Relatório enviado.',
 'form.mail.invoice_sent' => 'Fatura enviada.',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b0ae4794a..13912a44d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -612,7 +612,7 @@
 'form.mail.to' => 'Para',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 // 'form.mail.invoice_sent' => 'Invoice sent.',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 2ca785263..0c531ad11 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -633,7 +633,7 @@
 'form.mail.to' => 'Catre',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Factura trimisa.',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 53cb89b10..835b90048 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -543,7 +543,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Кому',
 'form.mail.report_subject' => 'Time Tracker отчёт',
-'form.mail.footer' => 'Anuko Time Tracker - это открытая (open source), простая и лёгкая в использовании система трекинга рабочего времени. Подробности на сайте <a href="https://www.anuko.com">www.anuko.com</a>.',
+'form.mail.footer' => 'Anuko Time Tracker - это открытая (open source) система трекинга рабочего времени. Подробности на сайте <a href="https://www.anuko.com">www.anuko.com</a>.',
 'form.mail.report_sent' => 'Отчёт отправлен.',
 'form.mail.invoice_sent' => 'Счёт отправлен.',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 56023db5a..57c14a7db 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -615,7 +615,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Komu',
 'form.mail.report_subject' => 'Time Tracker zostava',
-'form.mail.footer' => 'Anuko Time Tracker je jednoduchý a ľahko použiteľný systém na sledovanie času s otvoreným zdrojovým kódom.<br> Navštívte <a href="https://www.anuko.com">www.anuko.com</a> pre viac informácií.',
+'form.mail.footer' => 'Anuko Time Tracker je systém na sledovanie času s otvoreným zdrojovým kódom.<br> Navštívte <a href="https://www.anuko.com">www.anuko.com</a> pre viac informácií.',
 'form.mail.report_sent' => 'Zostava odoslaná.',
 'form.mail.invoice_sent' => 'Faktúra odoslaná.',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ae6ec81c3..32e200f81 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -606,7 +606,7 @@
 'form.mail.to' => 'Za',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 // 'form.mail.invoice_sent' => 'Invoice sent.',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index abfb0d7bd..38cf8565b 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -610,6 +610,8 @@
 // Forma mejla. Pogledajte primer na https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Za',
 'form.mail.report_subject' => 'Evidencija vremena',
+// TODO: retranslate form.mail.footer as the English string has changed.
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.footer' => 'Anuko Time Tracker je jednostavan i lak za korišćenje za praćenje <br>radnog vremena. Posetite <a href="https://www.anuko.com">www.anuko.com</a> za više informacija.',
 'form.mail.report_sent' => 'Izveštaj poslat.',
 'form.mail.invoice_sent' => 'Račun poslat.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 17af93fd8..fe05e89a7 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -609,6 +609,8 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Till',
 'form.mail.report_subject' => 'Tidsrapport',
+// TODO: retranslate form.mail.footer as the English string has changed.
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.footer' => 'Anuko Time Tracker är en lättanvänd applikation byggd med öppen källkod för att enkelt spåra och hålla koll på arbetstider. Besök <a href="https://www.anuko.com">www.anuko.com</a> för mer information.',
 'form.mail.report_sent' => 'Rapporten skickades.',
 'form.mail.invoice_sent' => 'Fakturan skickades.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 3b98e0a50..777440e88 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -646,7 +646,7 @@
 'form.mail.to' => 'Kime',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Fatura yollandı.',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5500155fc..01e639bdd 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -620,7 +620,7 @@
 'form.mail.to' => '到',
 // TODO: translate the following.
 // 'form.mail.report_subject' => 'Time Tracker Report',
-// 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
+// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 // 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => '发票已送出。',
 
diff --git a/initialize.php b/initialize.php
index 6384b0dad..52148e8b1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5386");
+define("APP_VERSION", "1.19.23.5387");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0ac7c8645b11b61d51a1da55685112c8ba7d97b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 15:29:40 +0000
Subject: [PATCH 1395/1848] Added separators on some forms to improve UI.

---
 WEB-INF/templates/client_add2.tpl   | 1 +
 WEB-INF/templates/client_edit2.tpl  | 1 +
 WEB-INF/templates/project_add2.tpl  | 2 ++
 WEB-INF/templates/project_edit2.tpl | 2 ++
 WEB-INF/templates/task_add2.tpl     | 1 +
 WEB-INF/templates/task_edit2.tpl    | 1 +
 initialize.php                      | 2 +-
 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/client_add2.tpl b/WEB-INF/templates/client_add2.tpl
index 5fe001b23..2704a133c 100644
--- a/WEB-INF/templates/client_add2.tpl
+++ b/WEB-INF/templates/client_add2.tpl
@@ -24,6 +24,7 @@ License: See license.txt *}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
diff --git a/WEB-INF/templates/client_edit2.tpl b/WEB-INF/templates/client_edit2.tpl
index 91f2b1c39..67b79ecdf 100644
--- a/WEB-INF/templates/client_edit2.tpl
+++ b/WEB-INF/templates/client_edit2.tpl
@@ -30,6 +30,7 @@ License: See license.txt *}
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add2.tpl
index 4f2c14286..cd900cf36 100644
--- a/WEB-INF/templates/project_add2.tpl
+++ b/WEB-INF/templates/project_add2.tpl
@@ -24,6 +24,7 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_users}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.users}:</td>
@@ -32,6 +33,7 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_tasks}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.tasks}:</td>
diff --git a/WEB-INF/templates/project_edit2.tpl b/WEB-INF/templates/project_edit2.tpl
index 8ce9ae9c7..f7b23a9ac 100644
--- a/WEB-INF/templates/project_edit2.tpl
+++ b/WEB-INF/templates/project_edit2.tpl
@@ -22,6 +22,7 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_users}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.users}:</td>
@@ -30,6 +31,7 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_tasks}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.tasks}:</td>
diff --git a/WEB-INF/templates/task_add2.tpl b/WEB-INF/templates/task_add2.tpl
index 534c9525e..1b1c4e42e 100644
--- a/WEB-INF/templates/task_add2.tpl
+++ b/WEB-INF/templates/task_add2.tpl
@@ -16,6 +16,7 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
diff --git a/WEB-INF/templates/task_edit2.tpl b/WEB-INF/templates/task_edit2.tpl
index e66a93e10..9292ad151 100644
--- a/WEB-INF/templates/task_edit2.tpl
+++ b/WEB-INF/templates/task_edit2.tpl
@@ -22,6 +22,7 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_projects}
+  <tr><td><div class="form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
diff --git a/initialize.php b/initialize.php
index 52148e8b1..2d5f9964d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5387");
+define("APP_VERSION", "1.19.23.5388");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1a9ec2adbc3adb32a857f2300ade94da1af8a37f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 16:19:46 +0000
Subject: [PATCH 1396/1848] Styles client address field.

---
 default.css    | 4 ++--
 initialize.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.css b/default.css
index 820382bdf..40d085f01 100644
--- a/default.css
+++ b/default.css
@@ -243,14 +243,14 @@ input[type="file"] {
   width: 237px;
 }
 
-#description {
+#description, #address {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
   padding: .4rem;
 }
 
-#description:focus {
+#description:focus, #address:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/initialize.php b/initialize.php
index 2d5f9964d..472e4f37f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5388");
+define("APP_VERSION", "1.19.23.5389");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 706fa5628098a513ab667ed8f3261e89310ad3b1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 16:25:15 +0000
Subject: [PATCH 1397/1848] Styled item_name field for expenses.

---
 default.css    | 4 ++--
 initialize.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.css b/default.css
index 40d085f01..fea2e8da5 100644
--- a/default.css
+++ b/default.css
@@ -243,14 +243,14 @@ input[type="file"] {
   width: 237px;
 }
 
-#description, #address {
+#description, #address, #item_name {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
   padding: .4rem;
 }
 
-#description:focus, #address:focus {
+#description:focus, #address:focus, #item_name:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/initialize.php b/initialize.php
index 472e4f37f..837759f2b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5389");
+define("APP_VERSION", "1.19.23.5390");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From fef326c0478e77feff6a5b14dad4450b172e8017 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 16:58:05 +0000
Subject: [PATCH 1398/1848] Improved x-scrollable-table styles to alternate
 rows background.

---
 WEB-INF/templates/entity_files2.tpl | 3 ++-
 default.css                         | 6 ++++--
 initialize.php                      | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/entity_files2.tpl b/WEB-INF/templates/entity_files2.tpl
index d6b892b38..07a46443d 100644
--- a/WEB-INF/templates/entity_files2.tpl
+++ b/WEB-INF/templates/entity_files2.tpl
@@ -23,6 +23,7 @@ License: See license.txt *}
 {/if}
 
 {if $can_edit}
+<div class="form-control-separator"></div>
 {$forms.fileUploadForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
@@ -37,8 +38,8 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.fileUploadForm.description.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$forms.fileUploadForm.btn_submit.control}</td></tr>
 </table>
-<div class="button-set">{$forms.fileUploadForm.btn_submit.control}</div>
 {$forms.fileUploadForm.close}
 {/if}
 
diff --git a/default.css b/default.css
index fea2e8da5..8079296aa 100644
--- a/default.css
+++ b/default.css
@@ -128,8 +128,7 @@ div.page-hint {
   margin-top: .5rem;
   margin-left: auto;
   margin-right: auto;
-  padding: .5rem;
-  background-color: #f0f0f0;
+  border-collapse: collapse;
 }
 
 .x-scrollable-table th {
@@ -140,6 +139,9 @@ div.page-hint {
   padding: .25rem;
 }
 
+.x-scrollable-table tr:nth-child(even) {background: #ffffff}
+.x-scrollable-table tr:nth-child(odd) {background: #f5f5f5}
+
 .text-cell {
   text-align: left;
 }
diff --git a/initialize.php b/initialize.php
index 837759f2b..2cd8198bb 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5390");
+define("APP_VERSION", "1.19.23.5391");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 83fc6da0ea7e7e2ef1e23653e9d442efa303c32e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 18:36:05 +0000
Subject: [PATCH 1399/1848] Some style fixes for calendar and
 x-scrollable-table.

---
 default.css    | 5 +++++
 initialize.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index 8079296aa..c4f8ac542 100644
--- a/default.css
+++ b/default.css
@@ -133,6 +133,7 @@ div.page-hint {
 
 .x-scrollable-table th {
   white-space: nowrap;
+  padding: .25rem;
 }
 
 .x-scrollable-table td {
@@ -281,6 +282,10 @@ input[type="file"] {
   margin-right: auto;
 }
 
+.small-screen-calendar a:focus, .large-screen-calendar a:focus {
+  outline: none;
+}
+
 .large-screen-calendar {
   display: block;
   width: 210px;
diff --git a/initialize.php b/initialize.php
index 2cd8198bb..627153414 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5391");
+define("APP_VERSION", "1.19.23.5392");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ad9d244216139d0c9e0aec21a00905eb3198a897 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 20:35:20 +0000
Subject: [PATCH 1400/1848] Fixed an issue with incorrect column span.

---
 initialize.php | 2 +-
 time.php       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 627153414..79d1105fe 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5392");
+define("APP_VERSION", "1.19.23.5393");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 27c21d431..6bd10ad53 100644
--- a/time.php
+++ b/time.php
@@ -86,8 +86,7 @@
   }
   if ($showProject) $colspan++;
   if ($showTask) $colspan++;
-  if ($showStart) $colspan++;
-  if ($showFinish) $colspan++;
+  if ($showStart) $colspan += 2; // Another for show finish.
   $colspan++; // There is always a duration.
   if ($showFiles) $colspan++;
   $colspan++; // There is always an edit column.

From 9d37ef6efab76fa1f94cb7b534f6c31cb2d227f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 27 Nov 2020 21:02:08 +0000
Subject: [PATCH 1401/1848] Improved UI for user pages.

---
 WEB-INF/templates/user_add2.tpl  | 1 +
 WEB-INF/templates/user_edit2.tpl | 1 +
 default.css                      | 4 ++++
 initialize.php                   | 2 +-
 user_add.php                     | 1 +
 user_edit.php                    | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index ad421b9e8..7413fd2a2 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -147,6 +147,7 @@ function handleClientRole() {
 </tbody>
 {if $show_projects}
 <tbody id="projects_control">
+  <tr><td><div class="form-control-separator"></div></id></tr>
   <tr class = "small-screen-label"><td><label for="projects">{$i18n.label.projects}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="projects">{$i18n.label.projects}:</label></td>
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
index 107891777..5adad2e9f 100644
--- a/WEB-INF/templates/user_edit2.tpl
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -185,6 +185,7 @@ function handleClientRole() {
 </tbody>
 {if $show_projects}
 <tbody id="projects_control">
+  <tr><td><div class="form-control-separator"></div></id></tr>
   <tr class = "small-screen-label"><td><label for="projects">{$i18n.label.projects}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="projects">{$i18n.label.projects}:</label></td>
diff --git a/default.css b/default.css
index c4f8ac542..8159cab08 100644
--- a/default.css
+++ b/default.css
@@ -234,6 +234,10 @@ input[type="text"] {
   width: 220px;
 }
 
+input[type="text"].project-rate-field {
+  width: 100px;
+}
+
 input[type="password"] {
   width: 220px;
 }
diff --git a/initialize.php b/initialize.php
index 79d1105fe..68f36434c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5393");
+define("APP_VERSION", "1.19.23.5394");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_add.php b/user_add.php
index e87fed752..046ecdb87 100644
--- a/user_add.php
+++ b/user_add.php
@@ -123,6 +123,7 @@ class RateCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     global $assigned_projects;
     $field = new FloatField('rate_'.$table->getValueAtName($row, 'id'));
+    $field->setCssClass('project-rate-field');
     $field->setFormName($table->getFormName());
     $field->setSize(5);
     $field->setFormat('.2');
diff --git a/user_edit.php b/user_edit.php
index 17c8292e3..be0f13e26 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -156,6 +156,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     global $assigned_projects;
 
     $field = new FloatField('rate_'.$table->getValueAtName($row,'id'));
+    $field->setCssClass('project-rate-field');
     $field->setFormName($table->getFormName());
     $field->setSize(5);
     $field->setFormat('.2');

From 26058d1c778fba9ecdbef81453eaf64ed13f3607 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 29 Nov 2020 23:36:30 +0000
Subject: [PATCH 1402/1848] Improved presentation of project rates table.

---
 WEB-INF/lib/form/Table.class.php | 9 ++++-----
 default.css                      | 6 +++++-
 initialize.php                   | 2 +-
 user_edit.php                    | 5 +++--
 week.php                         | 3 ++-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index 7bcd78be8..1995b7dea 100644
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -47,10 +47,9 @@ class Table extends FormElement {
   var $mHeaderOptions = array();
   var $mProccessed    = false;
 	
-  function __construct($name, $cssClass = null) {
+  function __construct($name) {
     $this->class = 'Table';
     $this->name = $name;
-    $this->cssClass = $cssClass;
   }
   
   function setKeyField($value) {
@@ -123,15 +122,15 @@ function getHtml() {
     if ($this->mInteractive) $html .= $this->_addJavaScript();
 
     $html .= "<table";
-    if ($this->cssClass) {
-      $html .= " class=\"".$this->cssClass."\"";
+    if ($this->css_class) {
+      $html .= " class=\"".$this->css_class."\"";
     }
     if (count($this->mTableOptions) > 0) {
       foreach ($this->mTableOptions as $k=>$v) {
         $html .= " $k=\"$v\"";
       }
     } else {
-      $html .= " border=\"1\"";
+      // $html .= " border=\"1\"";
     }
     if ($this->mWidth!="") $html .= " width=\"".$this->mWidth."\"";
     $html .= ">\n";
diff --git a/default.css b/default.css
index 8159cab08..2a6b06382 100644
--- a/default.css
+++ b/default.css
@@ -108,6 +108,10 @@ div.page-hint {
   margin-top: 1rem;
 }
 
+.project-rate-table {
+  width: 300px;
+}
+
 .centered-table {
   margin-top: .5rem;
   margin-left: auto;
@@ -235,7 +239,7 @@ input[type="text"] {
 }
 
 input[type="text"].project-rate-field {
-  width: 100px;
+  width: 50px;
 }
 
 input[type="password"] {
diff --git a/initialize.php b/initialize.php
index 68f36434c..ca81befef 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5394");
+define("APP_VERSION", "1.19.23.5395");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_edit.php b/user_edit.php
index be0f13e26..b0868c4e5 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -146,7 +146,7 @@
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200));
+    //$this->setOptions(array('width'=>200));
     $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
     return $this->toString();
   }
@@ -169,8 +169,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 // Create projects table.
 $table = new Table('projects');
+$table->setCssClass('project-rate-table');
 $table->setIAScript('setRate');
-$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+//$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
diff --git a/week.php b/week.php
index d86e0c99c..fee395d66 100644
--- a/week.php
+++ b/week.php
@@ -275,7 +275,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 // Create week_durations table.
-$table = new Table('week_durations', 'week_view_table');
+$table = new Table('week_durations');
+// $table->setCssClass('week_view_table'); // Currently not used. Fix this.
 $table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('class'=>'tableHeaderCentered'));
 $table->setData($dataArray);

From 374853526cac28b5b38fc96638601eb550058564 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 1 Dec 2020 18:23:14 +0000
Subject: [PATCH 1403/1848] Resuming work on styles.

---
 WEB-INF/lib/form/Table.class.php | 3 +--
 initialize.php                   | 2 +-
 user_edit.php                    | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index 1995b7dea..c83d90bd8 100644
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -129,9 +129,8 @@ function getHtml() {
       foreach ($this->mTableOptions as $k=>$v) {
         $html .= " $k=\"$v\"";
       }
-    } else {
-      // $html .= " border=\"1\"";
     }
+
     if ($this->mWidth!="") $html .= " width=\"".$this->mWidth."\"";
     $html .= ">\n";
     
diff --git a/initialize.php b/initialize.php
index ca81befef..daa1b0522 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5395");
+define("APP_VERSION", "1.19.23.5396");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_edit.php b/user_edit.php
index b0868c4e5..c270243ad 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -171,8 +171,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table = new Table('projects');
 $table->setCssClass('project-rate-table');
 $table->setIAScript('setRate');
-//$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);

From 5d1667d8de0bf0583234d750d2123f5c40962246 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 1 Dec 2020 18:33:13 +0000
Subject: [PATCH 1404/1848] Improved styles on user_add.php.

---
 default.css    | 5 +++++
 initialize.php | 2 +-
 user_add.php   | 4 +---
 user_edit.php  | 2 --
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/default.css b/default.css
index 2a6b06382..2aa8335f8 100644
--- a/default.css
+++ b/default.css
@@ -110,6 +110,11 @@ div.page-hint {
 
 .project-rate-table {
   width: 300px;
+  border-collapse: collapse;
+}
+
+.project-rate-table td {
+  padding: .2rem;
 }
 
 .centered-table {
diff --git a/initialize.php b/initialize.php
index daa1b0522..aced0690c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5396");
+define("APP_VERSION", "1.19.23.5397");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_add.php b/user_add.php
index 046ecdb87..7b7b72ed8 100644
--- a/user_add.php
+++ b/user_add.php
@@ -114,7 +114,6 @@
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200));
     $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
     return $this->toString();
   }
@@ -136,9 +135,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 // Create projects table.
 $table = new Table('projects');
+$table->setCssClass('project-rate-table');
 $table->setIAScript('setDefaultRate');
-$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
diff --git a/user_edit.php b/user_edit.php
index c270243ad..b1f1e65e2 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -146,7 +146,6 @@
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
-    //$this->setOptions(array('width'=>200));
     $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
     return $this->toString();
   }
@@ -154,7 +153,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 class RateCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     global $assigned_projects;
-
     $field = new FloatField('rate_'.$table->getValueAtName($row,'id'));
     $field->setCssClass('project-rate-field');
     $field->setFormName($table->getFormName());

From 529edc11b2f3476cae0a976ff40bdd5b62e4cbd2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 1 Dec 2020 22:03:35 +0000
Subject: [PATCH 1405/1848] Some cleanup and commenting in css.

---
 WEB-INF/templates/charts2.tpl |  4 +-
 default.css                   | 92 ++++++++++++++++++++++-------------
 initialize.php                |  2 +-
 3 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts2.tpl
index 7f4c3844a..6e9f1756d 100644
--- a/WEB-INF/templates/charts2.tpl
+++ b/WEB-INF/templates/charts2.tpl
@@ -53,7 +53,7 @@ function adjustTodayLinks() {
 <table class="centered-table">
   <tr>
     <td><img class="chart-image" src="{$img_file_name}"></td>
-    <td class="large-screen-chart-list">
+    <td class="large-screen-chart-items-list">
       <table class="chart-list">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
@@ -68,7 +68,7 @@ function adjustTodayLinks() {
 <div class="chart">
 <table class="centered-table">
   <tr>
-    <td class="small-screen-chart-list">
+    <td class="small-screen-chart-items-list">
       <table class="chart-list">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
diff --git a/default.css b/default.css
index 2aa8335f8..2262acf67 100644
--- a/default.css
+++ b/default.css
@@ -8,57 +8,53 @@ body {
   background-color: white;
 }
 
+/* logo on top of pages */
 div.logo {
   padding: .5rem;
   text-align: center;
   background-color: #a6ccf7;
 }
 
+/* top menu bar for large screens */
 div.top-menu-large-screen {
   background-color: black;
   display: block;
 }
 
-.top-submenu-large-screen {
+/* submenu for large screens */
+div.top-submenu-large-screen {
   background-color: #d9d9d9;
   display: block;
 }
 
+/* top menu for small screens */
 div.top-menu-small-screen {
   background-color: black;
   display: none;
 }
 
-div.top-menu-small-screen a {
+/* top menu items */
+div.top-menu-large-screen a, div.top-menu-small-screen a {
   font-size: 1rem;
   font-weight: bold;
   color: white;
   margin: .1rem .2rem .1rem .2rem;
 }
 
-div.top-menu-large-screen a {
-  font-size: 1rem;
-  font-weight: bold;
-  color: white;
-  margin: .1rem .2rem .1rem .2rem;
-}
-
-.top-menu-table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.top-submenu-table {
+/* top menu tables */
+.top-menu-table, .top-submenu-table {
   margin-left: auto;
   margin-right: auto;
 }
 
+/* top submenu items */
 .top-submenu-large-screen a {
   font-size: 1rem;
   color: #444444;
   margin: .1rem .2rem .1rem .2rem;
 }
 
+/* page title div */
 div.page-title {
   font-size: 12pt;
   font-weight: bold;
@@ -69,45 +65,60 @@ div.page-title {
   margin-bottom: .2rem;
 }
 
+/* user details div */
 div.user-details {
   text-align: center;
   padding: .2rem;
 }
 
+/* page errors div */
 .page-errors {
   margin-top: .5rem;
   text-align: center;
   color: red;
 }
 
+/* page messages div */
 .page-messages {
   margin-top: .5rem;
   text-align: center;
   color: blue;
 }
 
+/* page content div */
 .page-content {
   text-align: center;
 }
 
+/* vertical separator for controls on forms for both large and small screens */
 .form-control-separator {
   height: .5rem;
 }
 
+/* vertical separator for controls on small screens */
+.small-screen-form-control-separator {
+  height: .25rem;
+  display: none;
+}
+
+/* "about" text div on login page */
 div#LoginAboutText {
   padding: 1rem;
   margin-left:auto;
   margin-right:auto;
 }
 
+/* default domain text div for ldap login */
 #ldapDefaultDomain {
   color: #777777;
 }
 
+/* page hint div to display on top of some pages to clarify things */
 div.page-hint {
   margin-top: 1rem;
 }
 
+/* project rate table for user add and user edit pages */
 .project-rate-table {
   width: 300px;
   border-collapse: collapse;
@@ -117,21 +128,15 @@ div.page-hint {
   padding: .2rem;
 }
 
+/* a table to display controls centered horizontally */
 .centered-table {
+  display: inline-block;
   margin-top: .5rem;
   margin-left: auto;
   margin-right: auto;
-  display: inline-block;
-}
-
-.chart-list {
-  border-spacing: .2rem;
-}
-
-.record-list {
-  margin: 1rem;
 }
 
+/* a table to hold things that may not fit into available screen width */
 .x-scrollable-table {
   display: inline-block;
   margin-top: .5rem;
@@ -152,40 +157,59 @@ div.page-hint {
 .x-scrollable-table tr:nth-child(even) {background: #ffffff}
 .x-scrollable-table tr:nth-child(odd) {background: #f5f5f5}
 
+/* a text cell in tables */
 .text-cell {
   text-align: left;
 }
 
+/* time cell in tables */
 .time-cell {
   text-align: right;
 }
 
+/* text cell for note header when we display notes on separate rows */
 .note-header-cell {
   text-align: right;
 }
 
+/* control labels for large screens */
 .large-screen-label {
   text-align: right;
   vertical-align: middle;
   display: table-cell;
 }
 
-.large-screen-chart-list {
+/* control labels for small screens */
+.small-screen-label {
+  text-align: left;
+  display: none;
+}
+
+/* list of items displayed in a chart on large screens */
+.large-screen-chart-items-list {
   display: table-cell;
 }
 
-.small-screen-chart-list {
+/* list of items displayed in a chart on small screens */
+.small-screen-chart-items-list {
   display: none;
 }
 
-.small-screen-label {
-  text-align: left;
-  display: none;
+/* a div to display a chart in */
+div.chart {
+  padding-left: 1rem;
+  padding-right: 1rem;
 }
 
-.small-screen-form-control-separator {
-  height: .25rem;
-  display: none;
+
+
+/* TODO: work in progress below... */
+.chart-list {
+  border-spacing: .2rem;
+}
+
+.record-list {
+  margin: 1rem;
 }
 
 .page-content input {
@@ -393,11 +417,11 @@ input[type="file"] {
     display: none;
   }
 
-  .large-screen-chart-list {
+  .large-screen-chart-items-list {
     display: none;
   }
 
-  .small-screen-chart-list {
+  .small-screen-chart-items-list {
     display: table-cell;
   }
 
diff --git a/initialize.php b/initialize.php
index aced0690c..c33acb839 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5397");
+define("APP_VERSION", "1.19.23.5398");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 13bc4e28d73abdc10b4c02f264161719b6bc7866 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 2 Dec 2020 18:32:30 +0000
Subject: [PATCH 1406/1848] Some cleanup and commenting in styles.

---
 WEB-INF/templates/charts2.tpl |  4 ++--
 default.css                   | 10 ++++++----
 initialize.php                |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts2.tpl
index 6e9f1756d..ff15ea8f2 100644
--- a/WEB-INF/templates/charts2.tpl
+++ b/WEB-INF/templates/charts2.tpl
@@ -54,7 +54,7 @@ function adjustTodayLinks() {
   <tr>
     <td><img class="chart-image" src="{$img_file_name}"></td>
     <td class="large-screen-chart-items-list">
-      <table class="chart-list">
+      <table class="chart-items-list-table">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
         <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
@@ -69,7 +69,7 @@ function adjustTodayLinks() {
 <table class="centered-table">
   <tr>
     <td class="small-screen-chart-items-list">
-      <table class="chart-list">
+      <table class="chart-items-list-table">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
         <tr><td class="chart-color-cell" style="background-color:{$totals[i].color_html};"></td><td class="chart-description-cell">{$totals[i].name|escape}</td></tr>
diff --git a/default.css b/default.css
index 2262acf67..518f200db 100644
--- a/default.css
+++ b/default.css
@@ -145,15 +145,18 @@ div.page-hint {
   border-collapse: collapse;
 }
 
+/* th in x-scrollable-table */
 .x-scrollable-table th {
   white-space: nowrap;
   padding: .25rem;
 }
 
+/* td in x-scrollable-table */
 .x-scrollable-table td {
   padding: .25rem;
 }
 
+/* alternating row background in x-scrollable-table */
 .x-scrollable-table tr:nth-child(even) {background: #ffffff}
 .x-scrollable-table tr:nth-child(odd) {background: #f5f5f5}
 
@@ -201,13 +204,12 @@ div.chart {
   padding-right: 1rem;
 }
 
-
-
-/* TODO: work in progress below... */
-.chart-list {
+/* a table to annotate items from chart picture */
+.chart-items-list-table {
   border-spacing: .2rem;
 }
 
+/* TODO: work in progress below */
 .record-list {
   margin: 1rem;
 }
diff --git a/initialize.php b/initialize.php
index c33acb839..0f49c474f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5398");
+define("APP_VERSION", "1.19.23.5399");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 000093299c75e46866bcccc6fd42a4092dd8a0ef Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 15:22:32 +0000
Subject: [PATCH 1407/1848] Put some more comments in default.css.

---
 default.css    | 26 ++++++++++++++++++--------
 initialize.php |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/default.css b/default.css
index 518f200db..619426ef1 100644
--- a/default.css
+++ b/default.css
@@ -209,38 +209,48 @@ div.chart {
   border-spacing: .2rem;
 }
 
-/* TODO: work in progress below */
-.record-list {
+/* a div to display a list of records in */
+div.record-list {
   margin: 1rem;
 }
 
+/* input controls */
 .page-content input {
   border-radius: 4px;
   border: 1px solid #c9c9c9;
   padding: .4rem;
 }
 
-.td-with-input {
-  text-align: left;
-}
-
+/* input controls with focus on them */
 .page-content input:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
 }
 
-.contribute-msg {
+/* a table cell containing input control */
+.td-with-input {
+  text-align: left;
+}
+
+/* div containing how to contribute message */
+div.contribute-msg {
   text-align: center;
   margin-top: 2rem;
   padding: .2rem;
   background-color: #eeeeee;
 }
-.version-and-copyright {
+
+/* div containing app version and copyright info */
+div.version-and-copyright {
   text-align: center;
   padding: .5rem;
 }
 
+
+
+
+/* TODO: work in progress below */
 .centered-table td img {
   vertical-align: middle;
 }
diff --git a/initialize.php b/initialize.php
index 0f49c474f..82cc5d7df 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5399");
+define("APP_VERSION", "1.19.23.5400");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 82fa8f93e9a8c5cffd16db0303b9ca18ec6cd25b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 16:59:01 +0000
Subject: [PATCH 1408/1848] Added more comments in default.css.

---
 default.css    | 131 ++++++++++++++++++++++++++++++-------------------
 initialize.php |   2 +-
 2 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/default.css b/default.css
index 619426ef1..30160902b 100644
--- a/default.css
+++ b/default.css
@@ -247,82 +247,95 @@ div.version-and-copyright {
   padding: .5rem;
 }
 
-
-
-
-/* TODO: work in progress below */
+/* img in td in centered-table, ex: now icons */
 .centered-table td img {
   vertical-align: middle;
 }
 
-.what-is-it-img {
+/* span for what is it icon image */
+span.what-is-it-img {
   display: none;
 }
 
-.what-is-it-text {
+/* span for what is it text */
+span.what-is-it-text {
   display: inline-block;
 }
 
-input[type="submit"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-}
-
-input[type="button"] {
+/* buttons */
+input[type="submit"], input[type="button"] {
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
 }
 
-input[type="text"] {
+/* input controls */
+input[type="text"], input[type="password"], input[type="file"] {
   width: 220px;
 }
 
+/* project rate input control */
 input[type="text"].project-rate-field {
   width: 50px;
 }
 
-input[type="password"] {
-  width: 220px;
+/* dropdown control */
+.dropdown-field {
+  width: 236px;
 }
 
-input[type="file"] {
+/* textareas for fields */
+#description, #address, #item_name {
   width: 220px;
+  border-radius: 4px;
+  border: 1px solid #c9c9c9;
+  padding: .4rem;
 }
 
-.dropdown-field {
-  width: 237px;
+/* textareas with focus */
+#description:focus, #address:focus, #item_name:focus {
+  background-color: yellow;
+  border: 1px solid black;
+  outline: none;
 }
 
-#description, #address, #item_name {
-  width: 220px;
+/* textarea for note field */
+#note {
+  width: 100%;
+  margin: 0;
+  height: 4rem;
+  resize: none;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
   padding: .4rem;
 }
 
-#description:focus, #address:focus, #item_name:focus {
+/* note field with focus */
+#note:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
 }
 
+/* chart image */
 .chart-image {
   width: 300px;
   height: 300px;
 }
 
+/* chart color cell for annotations */
 .chart-color-cell {
   width: .4rem;
   height: 1rem;
 }
 
+/* chart description cell for annotations */
 .chart-description-cell {
   text-align: left;
   padding-left: .25rem;
 }
 
+/* calendar for small screens */
 .small-screen-calendar {
   display: none;
   width: 210px;
@@ -331,10 +344,12 @@ input[type="file"] {
   margin-right: auto;
 }
 
+/* calendars with focus */
 .small-screen-calendar a:focus, .large-screen-calendar a:focus {
   outline: none;
 }
 
+/* calendar for large screens */
 .large-screen-calendar {
   display: block;
   width: 210px;
@@ -342,143 +357,159 @@ input[type="file"] {
   margin-top: 1rem;
 }
 
+/* label for checkboxes */
 .checkbox-label {
   float: left;
 }
 
-#note {
-  width: 100%;
-  margin: 0;
-  height: 4rem;
-  resize: none;
-  border-radius: 4px;
-  border: 1px solid #c9c9c9;
-  padding: .4rem;
-}
-
-#note:focus {
-  background-color: yellow;
-  border: 1px solid black;
-  outline: none;
-}
-
-.day-totals {
+/* div for day totals */
+div.day-totals {
   margin-bottom: 1rem;
+  width: 100%;
 }
 
+/* column 1 for day totals */
 .day-totals-col1 {
   text-align: left;
   padding-left: .5rem;
   padding-right: .5rem;
 }
 
+/* column 2 for day totals */
 .day-totals-col2 {
   padding-left: .5rem;
   padding-right: .5rem;
   text-align: right;
 }
 
+/* not billable items */
 .not-billable {
-  color: #ff6666;
+  color: red;
 }
 
-.remaining-quota {
+/* remaining quota span */
+span.remaining-quota {
   color: red;
 }
 
-.remaining-quota-balance {
+/* remaining quota balance span */
+span.remaining-quota-balance {
   color: red;
 }
 
-.over-quota {
+/* over quota span */
+span.over-quota {
   color: green;
 }
 
-.over-quota-balance {
+/* over quota balance span */
+span.over-quota-balance {
   color: green;
 }
 
-.optional-nav {
+/* div for optional navigation, ex: week view */
+div.optional-nav {
   margin-top: .5rem;
 }
 
+/* div for a set of buttons, ex: save, copy, delete */
 .button-set {
   margin-top: .5rem;
   margin-bottom: 1rem;
 }
 
-.section-header {
+/* section header div */
+div.section-header {
   font-weight: bold;
   text-align: center;
   margin-left: auto;
   margin-right: auto;
 }
 
-.sitemap-item-group {
+/* div for a group of items in site map */
+div.sitemap-item-group {
   margin-top: 2rem;
   margin-bottom: 2rem;
 }
 
-.sitemap-item {
+/* div for a single item in site map */
+div.sitemap-item {
   margin: .4rem;
 }
 
+/* media rules for small screens */
 @media screen and (max-width: 600px) {
 
+  /* hide large screen labels */
   .large-screen-label {
     display: none;
   }
 
+  /* hide large screen chart annotations */
   .large-screen-chart-items-list {
     display: none;
   }
 
+  /* show small screen chart annotations */
   .small-screen-chart-items-list {
     display: table-cell;
   }
 
+  /* show small screen labels */
   .small-screen-label {
     display: block;
   }
 
+  /* show small screen calendar */
   .small-screen-calendar {
     display: block;
   }
 
+  /* hide large screen calendar */
   .large-screen-calendar {
     display: none;
   }
 
+  /* show small screen form control separators */
   .small-screen-form-control-separator {
     display: block;
   }
 
-  .what-is-it-img {
+  /* show what is it icons */
+  span.what-is-it-img {
     display: inline-block;
   }
 
-  .what-is-it-text {
+  /* hide what is it text */
+  span.what-is-it-text {
     display: none;
   }
 
+  /* hide how to contribute message */
   div.contribute-msg {
     display: none;
   }
 
+  /* hide version and copyright */
   div.version-and-copyright {
     display: none;
   }
 }
 
+/* media rules for menus on small screens */
 @media screen and (max-width: 1170px) {
+
+  /* show small screen menu */
   div.top-menu-small-screen {
     display: block;
   }
 
+  /* hide large screen menu */
   div.top-menu-large-screen {
     display: none;
   }
 
+  /* hide large screen submenu */
   div.top-submenu-large-screen {
     display: none;
   }
diff --git a/initialize.php b/initialize.php
index 82cc5d7df..2978e7a1b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5400");
+define("APP_VERSION", "1.19.23.5401");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 05988b6d9bf9be8fc5f64f55cc9c61e602058638 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 17:43:38 +0000
Subject: [PATCH 1409/1848] Removed no longer used files.

---
 charts1.php         | 227 --------------------
 clients1.php        |  55 -----
 default.css         |   4 -
 expense_delete1.php |  88 --------
 expense_edit1.php   | 243 ---------------------
 expenses1.php       | 251 ----------------------
 initialize.php      |   2 +-
 project_add1.php    | 118 -----------
 project_edit1.php   | 136 ------------
 projects1.php       |  58 -----
 task_add1.php       |  89 --------
 task_edit1.php      | 122 -----------
 tasks1.php          |  77 -------
 time1.php           | 506 --------------------------------------------
 user_add1.php       | 244 ---------------------
 user_edit1.php      | 308 ---------------------------
 users1.php          |  69 ------
 17 files changed, 1 insertion(+), 2596 deletions(-)
 delete mode 100644 charts1.php
 delete mode 100644 clients1.php
 delete mode 100644 expense_delete1.php
 delete mode 100644 expense_edit1.php
 delete mode 100644 expenses1.php
 delete mode 100644 project_add1.php
 delete mode 100644 project_edit1.php
 delete mode 100644 projects1.php
 delete mode 100644 task_add1.php
 delete mode 100644 task_edit1.php
 delete mode 100644 tasks1.php
 delete mode 100644 time1.php
 delete mode 100644 user_add1.php
 delete mode 100644 user_edit1.php
 delete mode 100644 users1.php

diff --git a/charts1.php b/charts1.php
deleted file mode 100644
index 3b4ce15a1..000000000
--- a/charts1.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-// Note: This script uses Lichart PHP library and requires GD 2.0.1 or later.
-
-require_once('initialize.php');
-import('form.Form');
-import('DateAndTime');
-import('ttChartHelper');
-import('ttUserConfig');
-import('PieChartEx');
-import('ttUserHelper');
-import('ttTeamHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_charts') || ttAccessAllowed('view_charts'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ch')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!$user->exists()) {
-  header('Location: access_denied.php'); // Nobody to display a chart for.
-  exit();
-}
-if ($user->behalf_id && (!$user->can('view_charts') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('view_own_charts') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
-  exit();
-}
-if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($request->getParameter('user'))) {
-    header('Location: access_denied.php'); // Wrong user id on post.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for which we display this page.
-$userChanged = $request->getParameter('user_changed');
-if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-$uc = new ttUserConfig();
-$tracking_mode = $user->getTrackingMode();
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-if(!$cl_date) {
-  $now = new DateAndTime(DB_DATEFORMAT);
-  $cl_date = $now->toString(DB_DATEFORMAT);
-}
-$_SESSION['date'] = $cl_date;
-
-if ($request->isPost()) {
-  $cl_interval = $request->getParameter('interval');
-  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
-  $_SESSION['chart_interval'] = $cl_interval;
-  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
-
-  $cl_type = $request->getParameter('type');
-  if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
-  $_SESSION['chart_type'] = $cl_type;
-  $uc->setValue(SYSC_CHART_TYPE, $cl_type);
-} else {
-  // Initialize chart interval.
-  $cl_interval = $_SESSION['chart_interval'];
-  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
-  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
-  $_SESSION['chart_interval'] = $cl_interval;
-
-  // Initialize chart type.
-  $cl_type = $_SESSION['chart_type'];
-  if (!$cl_type) $cl_type = $uc->getValue(SYSC_CHART_TYPE);
-  $cl_type = ttChartHelper::adjustType($cl_type);
-  $_SESSION['chart_type'] = $cl_type;
-}
-
-// Elements of chartForm.
-$chart_form = new Form('chartForm');
-
-// User dropdown. Changes the user "on behalf" of whom we are working.
-if ($user->can('view_charts')) {
-  $rank = $user->getMaxRankForGroup($user->getGroup());
-  if ($user->can('view_own_charts'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
-  if (count($user_list) >= 1) {
-    $chart_form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
-      'name'=>'user',
-      'value'=>$user_id,
-      'data'=>$user_list,
-      'datakeys'=>array('id','name'),
-    ));
-    $chart_form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $smarty->assign('user_dropdown', 1);
-  }
-}
-
-// Chart interval options.
-$intervals = array();
-$intervals[INTERVAL_THIS_DAY] = $i18n->get('dropdown.selected_day');
-$intervals[INTERVAL_THIS_WEEK] = $i18n->get('dropdown.selected_week');
-$intervals[INTERVAL_THIS_MONTH] = $i18n->get('dropdown.selected_month');
-$intervals[INTERVAL_THIS_YEAR] = $i18n->get('dropdown.selected_year');
-$intervals[INTERVAL_ALL_TIME] = $i18n->get('dropdown.all_time');
-
-// Chart interval dropdown.
-$chart_form->addInput(array('type' => 'combobox',
-  'onchange' => 'this.form.submit();',
-  'name' => 'interval',
-  'value' => $cl_interval,
-  'data' => $intervals
-));
-
-// Chart type options.
-$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
-if ($chart_selector) {
-  $types = array();
-  if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
-    $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
-  if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
-    $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
-  if ($user->isPluginEnabled('cl'))
-    $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
-
-  // Add chart type dropdown.
-  $chart_form->addInput(array('type' => 'combobox',
-    'onchange' => 'this.form.submit();',
-    'name' => 'type',
-    'value' => $cl_type,
-    'data' => $types
-  ));
-}
-
-// Calendar.
-$chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
-
-// Get data for our chart.
-$totals = ttChartHelper::getTotals($user_id, $cl_type, $cl_date, $cl_interval);
-$smarty->assign('totals', $totals);
-
-// Prepare chart for drawing.
-/*
- * We use libchart.php library to draw chart images. It can draw chart labels, too (embed in the image).
- * But quality of such auto-scaled text is not good. Therefore, we only use libchart to draw a pie-chart picture with
- * auto-calculated percentage markers around it. We print labels (to the side of the picture) ourselves,
- * using the same colors libchart is using. For labels printout, the $totals array (which is used for picture points)
- * is also passed to charts.tpl Smarty template.
- *
- * To make all of the above possible with only one database call to obtain $totals we have to print the chart image
- * to a file here (see code below). Once the image is available as a .png file, the charts.tpl can render it.
- *
- * PieChartEx class is a little extension to libchart-provided PieChart class. It allows us to print the chart
- * without title, logo, and labels.
- */
-$chart = new PieChartEx(300, 300);
-$data_set = new XYDataSet();
-foreach($totals as $total) {
-  $data_set->addPoint(new Point( $total['name'], $total['time']));
-}
-$chart->setDataSet($data_set);
-
-// Prepare a file name.
-$img_dir = TEMPLATE_DIR.'_c/'; // Directory.
-$file_name = uniqid('chart_').'.png'; // Short file name. Unique ID here is to avoid problems with browser caching.
-$img_ref = 'WEB-INF/templates_c/'.$file_name; // Image reference for html.
-$file_name = $img_dir.$file_name; // Full file name.
-
-// Clean up the file system from older images.
-$img_files = glob($img_dir.'chart_*.png');
-if (is_array($img_files)) {
-  foreach($img_files as $file) {
-    // If file creation time is older than 1 minute, delete it.
-    if (filemtime($file) < (time() - 60)) {
-      unlink($file);
-    }
-  }
-}
-
-// Write chart image to file system.
-$chart->renderEx(array('fileName'=>$file_name,'hideLogo'=>true,'hideTitle'=>true,'hideLabel'=>true));
-// At this point libchart usage is complete and we have chart image on disk.
-
-$smarty->assign('img_file_name', $img_ref);
-$smarty->assign('chart_selector', $chart_selector);
-$smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
-$smarty->assign('title', $i18n->get('title.charts'));
-$smarty->assign('content_page_name', 'charts.tpl');
-$smarty->display('index.tpl');
diff --git a/clients1.php b/clients1.php
deleted file mode 100644
index a299d3061..000000000
--- a/clients1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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('ttTeamHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_clients') || ttAccessAllowed('manage_clients'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-if($user->can('manage_clients')) {
-  $active_clients = ttGroupHelper::getActiveClients(true);
-  $inactive_clients = ttGroupHelper::getInactiveClients(true);
-} else
-  $active_clients = $user->getAssignedClients();
-
-$smarty->assign('active_clients', $active_clients);
-$smarty->assign('inactive_clients', $inactive_clients);
-$smarty->assign('title', $i18n->get('title.clients'));
-$smarty->assign('content_page_name', 'clients.tpl');
-$smarty->display('index.tpl');
diff --git a/default.css b/default.css
index 30160902b..595967e64 100644
--- a/default.css
+++ b/default.css
@@ -515,10 +515,6 @@ div.sitemap-item {
   }
 }
 
-
-
-
-
 /* TODO: below are legacy styles. Review as work on mobile-friendly pages continues. */
 a { color: blue; text-decoration: none; }
 
diff --git a/expense_delete1.php b/expense_delete1.php
deleted file mode 100644
index 788fb59fa..000000000
--- a/expense_delete1.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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('DateAndTime');
-import('ttExpenseHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ex')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-// Get the expense item we are deleting.
-$expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
-  // Prohibit deleting not ours, approved, or invoiced items.
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-if ($request->isPost()) {
-  if ($request->getParameter('delete_button')) { // Delete button pressed.
-
-    // Determine if it is okay to delete the record.
-    $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
-    if ($user->isDateLocked($item_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    if ($err->no()) {
-      // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id)) {
-        header('Location: expenses.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  }
-  if ($request->getParameter('cancel_button')) { // Cancel button pressed.
-    header('Location: expenses.php');
-    exit();
-  }
-} // isPost
-
-$form = new Form('expenseItemForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
-
-$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
-
-$smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('expense_item', $expense_item);
-$smarty->assign('show_project', $show_project);
-$smarty->assign('title', $i18n->get('title.delete_expense'));
-$smarty->assign('content_page_name', 'expense_delete.tpl');
-$smarty->display('index.tpl');
diff --git a/expense_edit1.php b/expense_edit1.php
deleted file mode 100644
index d8b452d56..000000000
--- a/expense_edit1.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?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('ttGroupHelper');
-import('DateAndTime');
-import('ttTimeHelper');
-import('ttExpenseHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ex')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-// Get the expense item we are editing.
-$expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
-  // Prohibit editing not ours, approved, or invoiced items.
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
-$confirm_save = $user->getConfigOption('confirm_save');
-$trackingMode = $user->getTrackingMode();
-$show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-
-// Initialize variables.
-$cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
-if ($request->isPost()) {
-  $cl_date = trim($request->getParameter('date'));
-  $cl_client = $request->getParameter('client');
-  $cl_project = $request->getParameter('project');
-  $cl_item_name = trim($request->getParameter('item_name'));
-  $cl_cost = trim($request->getParameter('cost'));
-  if ($user->isPluginEnabled('ps'))
-    $cl_paid = $request->getParameter('paid');
-} else {
-  $cl_date = $item_date->toString($user->getDateFormat());
-  $cl_client = $expense_item['client_id'];
-  $cl_project = $expense_item['project_id'];
-  $cl_item_name = $expense_item['name'];
-  $cl_cost = $expense_item['cost'];
-  $cl_paid = $expense_item['paid'];
-}
-
-// Initialize elements of 'expenseItemForm'.
-$form = new Form('expenseItemForm');
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $trackingMode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttGroupHelper::getActiveClients(true);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillProjectDropdown(this.value);',
-    'name'=>'client',
-    'style'=>'width: 250px;',
-    'value'=>$cl_client,
-    'data'=>$active_clients,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-if ($show_project) {
-  // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming.
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-// If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
-if ($predefined_expenses) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'recalculateCost();',
-      'name'=>'predefined_expense',
-      'style'=>'width: 250px;',
-      'value'=>$cl_predefined_expense,
-      'data'=>$predefined_expenses,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
-}
-$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
-  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
-$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
-// Hidden control for record id.
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$on_click_action = 'browser_today.value=get_date();';
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
-if ($confirm_save) $on_click_action .= 'return(confirmSave());';
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
-    $err->add($i18n->get('error.client'));
-  if ($show_project && !$cl_project)
-    $err->add($i18n->get('error.project'));
-  if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
-  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
-
-  // This is a new date for the expense item.
-  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
-
-  // Prohibit creating entries in future.
-  if (!$user->isOptionEnabled('future_entries')) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
-      $err->add($i18n->get('error.future_date'));
-  }
-  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-  // Finished validating user input.
-
-  // Save record.
-  if ($request->getParameter('btn_save')) {
-    // We need to:
-    // 1) Prohibit updating locked entries (that are in locked range).
-    // 2) Prohibit saving unlocked entries into locked range.
-
-    // Now, step by step.
-    // 1) Prohibit saving locked entries in any form.
-    if ($user->isDateLocked($item_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // 2) Prohibit saving unlocked entries into locked range.
-    if ($err->no() && $user->isDateLocked($new_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Now, an update.
-    if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),
-          'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'paid'=>$cl_paid))) {
-        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
-        exit();
-      }
-    }
-  }
-
-  // Save as new record.
-  if ($request->getParameter('btn_copy')) {
-    // We need to prohibit saving into locked interval.
-    if ($user->isDateLocked($new_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Now, a new insert.
-    if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'client_id'=>$cl_client,
-          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
-        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  }
-
-  if ($request->getParameter('btn_delete')) {
-    header("Location: expense_delete.php?id=$cl_id");
-    exit();
-  }
-} // isPost
-
-if ($confirm_save) {
-  $smarty->assign('confirm_save', true);
-  $smarty->assign('entry_date', $cl_date);
-}
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_project', $show_project);
-$smarty->assign('predefined_expenses', $predefined_expenses);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('title', $i18n->get('title.edit_expense'));
-$smarty->assign('content_page_name', 'expense_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/expenses1.php b/expenses1.php
deleted file mode 100644
index cd930a8b8..000000000
--- a/expenses1.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?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('ttGroupHelper');
-import('DateAndTime');
-import('ttTimeHelper');
-import('ttExpenseHelper');
-import('ttFileHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ex')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!$user->exists()) {
-  header('Location: access_denied.php'); // Nobody to enter expenses for.
-  exit();
-}
-if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('track_own_expenses') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
-  exit();
-}
-if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($request->getParameter('user'))) {
-    header('Location: access_denied.php'); // Wrong user id on post.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for which we display this page.
-$userChanged = $request->getParameter('user_changed');
-if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-
-$tracking_mode = $user->getTrackingMode();
-$show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
-$showFiles = $user->isPluginEnabled('at');
-
-// Initialize variables.
-$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
-$_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
-$_SESSION['project'] = $cl_project;
-$cl_item_name = $request->getParameter('item_name');
-$cl_cost = $request->getParameter('cost');
-
-// Elements of expensesForm.
-$form = new Form('expensesForm');
-
-if ($user->can('track_expenses')) {
-  $rank = $user->getMaxRankForGroup($user->getGroup());
-  if ($user->can('track_own_expenses'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
-  if (count($user_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
-      'name'=>'user',
-      'style'=>'width: 250px;',
-      'value'=>$user_id,
-      'data'=>$user_list,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $smarty->assign('user_dropdown', 1);
-  }
-}
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$active_clients,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-if ($show_project) {
-  // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming.
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-// If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
-if ($predefined_expenses) {
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'recalculateCost();',
-    'name'=>'predefined_expense',
-    'style'=>'width: 250px;',
-    'value'=>$cl_predefined_expense,
-    'data'=>$predefined_expenses,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
-}
-$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-if ($showFiles)
-  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
-
-// Submit.
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-    // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
-      $err->add($i18n->get('error.client'));
-    if ($show_project && !$cl_project)
-      $err->add($i18n->get('error.project'));
-    if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
-    if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
-
-    // Prohibit creating entries in future.
-    if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
-        $err->add($i18n->get('error.future_date'));
-    }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-    // Finished validating input data.
-
-    // Prohibit creating entries in locked range.
-    if ($user->isDateLocked($selected_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Insert record.
-    if ($err->no()) {
-      $id = ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
-          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1));
-
-      // Put a new file in storage if we have it.
-      if ($id && $showFiles && $_FILES['newfile']['name']) {
-        $fileHelper = new ttFileHelper($err);
-        $fields = array('entity_type'=>'expense',
-          'entity_id' => $id,
-          'file_name' => $_FILES['newfile']['name']);
-        $fileHelper->putFile($fields);
-      }
-
-      if ($id) {
-        header('Location: expenses.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  }
-}
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_project', $show_project);
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date, $showFiles));
-$smarty->assign('predefined_expenses', $predefined_expenses);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
-$smarty->assign('title', $i18n->get('title.expenses'));
-$smarty->assign('content_page_name', 'expenses.tpl');
-$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index 2978e7a1b..f176802f5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5401");
+define("APP_VERSION", "1.19.23.5402");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_add1.php b/project_add1.php
deleted file mode 100644
index 5768d5fb5..000000000
--- a/project_add1.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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('ttProjectHelper');
-import('ttGroupHelper');
-import('ttFileHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_projects')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$showFiles = $user->isPluginEnabled('at');
-$users = ttGroupHelper::getActiveUsers();
-foreach ($users as $user_item)
-  $all_users[$user_item['id']] = $user_item['name'];
-
-$tasks = ttGroupHelper::getActiveTasks();
-foreach ($tasks as $task_item)
-  $all_tasks[$task_item['id']] = $task_item['name'];
-$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('project_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_users = $request->getParameter('users', array());
-  $cl_tasks = $request->getParameter('tasks', array());
-} else {
-  foreach ($users as $user_item)
-    $cl_users[] = $user_item['id'];
-  foreach ($tasks as $task_item)
-    $cl_tasks[] = $task_item['id'];
-}
-
-$form = new Form('projectForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-if ($showFiles)
-  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if ($show_tasks)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
-
-  if ($err->no()) {
-    if (!ttProjectHelper::getProjectByName($cl_name)) {
-      $id = ttProjectHelper::insert(array('name' => $cl_name,
-        'description' => $cl_description,
-        'users' => $cl_users,
-        'tasks' => $cl_tasks,
-        'status' => ACTIVE));
-
-      // Put a new file in storage if we have it.
-      if ($id && $showFiles && $_FILES['newfile']['name']) {
-        $fileHelper = new ttFileHelper($err);
-        $fields = array('entity_type'=>'project',
-          'entity_id' => $id,
-          'file_name' => $_FILES['newfile']['name']);
-        $fileHelper->putFile($fields);
-      }
-      if ($id) {
-        header('Location: projects.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.object_exists'));
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', $show_tasks);
-$smarty->assign('title', $i18n->get('title.add_project'));
-$smarty->assign('content_page_name', 'project_add.tpl');
-$smarty->display('index.tpl');
diff --git a/project_edit1.php b/project_edit1.php
deleted file mode 100644
index e1792e48c..000000000
--- a/project_edit1.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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('ttProjectHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_projects')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_project_id = (int)$request->getParameter('id');
-$project = ttProjectHelper::get($cl_project_id);
-if (!$project) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$users = ttGroupHelper::getActiveUsers();
-foreach ($users as $user_item)
-  $all_users[$user_item['id']] = $user_item['name'];
-
-$tasks = ttGroupHelper::getActiveTasks();
-foreach ($tasks as $task_item)
-  $all_tasks[$task_item['id']] = $task_item['name'];
-$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('project_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_status = $request->getParameter('status');
-  $cl_users = $request->getParameter('users', array());
-  $cl_tasks = $request->getParameter('tasks', array());
-} else {
-  $cl_name = $project['name'];
-  $cl_description = $project['description'];
-  $cl_status = $project['status'];
-  $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
-  $cl_tasks = explode(',', $project['tasks']);
-}
-
-$form = new Form('projectForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if ($show_tasks)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $existing_project = ttProjectHelper::getProjectByName($cl_name);
-      if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
-        // Update project information.
-        if (ttProjectHelper::update(array(
-          'id' => $cl_project_id,
-          'name' => $cl_name,
-          'description' => $cl_description,
-          'status' => $cl_status,
-          'users' => $cl_users,
-          'tasks' => $cl_tasks))) {
-          header('Location: projects.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-
-    if ($request->getParameter('btn_copy')) {
-      if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array('name' => $cl_name,
-          'description' => $cl_description,
-          'users' => $cl_users,
-          'tasks' => $cl_tasks,
-          'status' => ACTIVE))) {
-          header('Location: projects.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', $show_tasks);
-$smarty->assign('title', $i18n->get('title.edit_project'));
-$smarty->assign('content_page_name', 'project_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/projects1.php b/projects1.php
deleted file mode 100644
index 0075c038f..000000000
--- a/projects1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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('ttGroupHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$showFiles = $user->isPluginEnabled('at');
-
-if($user->can('manage_projects')) {
-  $active_projects = ttGroupHelper::getActiveProjects($showFiles);
-  $inactive_projects = ttGroupHelper::getInactiveProjects($showFiles);
-} else {
-  $options['include_files'] = $showFiles;
-  $active_projects = $user->getAssignedProjects($options);
-}
-
-$smarty->assign('active_projects', $active_projects);
-$smarty->assign('inactive_projects', $inactive_projects);
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('title', $i18n->get('title.projects'));
-$smarty->assign('content_page_name', 'projects.tpl');
-$smarty->display('index.tpl');
diff --git a/task_add1.php b/task_add1.php
deleted file mode 100644
index 078bd5ca1..000000000
--- a/task_add1.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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('form.ActionForm');
-import('ttGroupHelper');
-import('ttTaskHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_projects = $request->getParameter('projects');
-} else {
-  foreach ($projects as $project_item)
-    $cl_projects[] = $project_item['id'];
-}
-
-$form = new Form('taskForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-
-  if ($err->no()) {
-    if (!ttTaskHelper::getTaskByName($cl_name)) {
-      if (ttTaskHelper::insert(array(
-        'name' => $cl_name,
-        'description' => $cl_description,
-        'status' => ACTIVE,
-        'projects' => $cl_projects))) {
-          header('Location: tasks.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.object_exists'));
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', count($projects) > 0);
-$smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
-$smarty->assign('title', $i18n->get('title.add_task'));
-$smarty->assign('content_page_name', 'task_add.tpl');
-$smarty->display('index.tpl');
diff --git a/task_edit1.php b/task_edit1.php
deleted file mode 100644
index 10410c4b3..000000000
--- a/task_edit1.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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('ttGroupHelper');
-import('ttTaskHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_task_id = (int)$request->getParameter('id');
-$task = ttTaskHelper::get($cl_task_id);
-if (!$task) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_status = $request->getParameter('status');
-  $cl_projects = $request->getParameter('projects');
-} else {
-  $cl_name = $task['name'];
-  $cl_description = $task['description'];
-  $cl_status = $task['status'];
-  $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
-  foreach ($assigned_projects as $project_item)
-    $cl_projects[] = $project_item['id'];
-}
-
-$form = new Form('taskForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $existing_task = ttTaskHelper::getTaskByName($cl_name);
-      if (!$existing_task || ($cl_task_id == $existing_task['id'])) {
-        // Update task information.
-        if (ttTaskHelper::update(array(
-          'task_id' => $cl_task_id,
-          'name' => $cl_name,
-          'description' => $cl_description,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: tasks.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-
-    if ($request->getParameter('btn_copy')) {
-      if (!ttTaskHelper::getTaskByName($cl_name)) {
-        if (ttTaskHelper::insert(array(
-          'name' => $cl_name,
-          'description' => $cl_description,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: tasks.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', count($projects) > 0);
-$smarty->assign('title', $i18n->get('title.edit_task'));
-$smarty->assign('content_page_name', 'task_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/tasks1.php b/tasks1.php
deleted file mode 100644
index 2e13ead5c..000000000
--- a/tasks1.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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('ttGroupHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$config = $user->getConfigHelper();
-
-if ($request->isPost()) {
-  $cl_task_required = $request->getParameter('task_required');
-} else {
-  $cl_task_required = $config->getDefinedValue('task_required');
-}
-
-if($user->can('manage_tasks')) {
-  $active_tasks = ttGroupHelper::getActiveTasks();
-  $inactive_tasks = ttGroupHelper::getInactiveTasks();
-} else
-  $active_tasks = $user->getAssignedTasks();
-
-$form = new Form('tasksForm');
-$form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_save')) {
-    // Save button clicked. Update config.
-    $config->setDefinedValue('task_required', $cl_task_required);
-    if (!$user->updateGroup(array('config' => $config->getConfig()))) {
-      $err->add($i18n->get('error.db'));
-    }
-  }
-}
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('active_tasks', $active_tasks);
-$smarty->assign('inactive_tasks', $inactive_tasks);
-$smarty->assign('title', $i18n->get('title.tasks'));
-$smarty->assign('content_page_name', 'tasks.tpl');
-$smarty->display('index.tpl');
diff --git a/time1.php b/time1.php
deleted file mode 100644
index b249f05b7..000000000
--- a/time1.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?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('ttConfigHelper');
-import('ttUserHelper');
-import('ttGroupHelper');
-import('ttClientHelper');
-import('ttTimeHelper');
-import('ttFileHelper');
-import('DateAndTime');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
-  exit();
-}
-if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for whom we display this page.
-if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-$group_id = $user->getGroup();
-$config = new ttConfigHelper($user->getConfig());
-
-$showClient = $user->isPluginEnabled('cl');
-$showBillable = $user->isPluginEnabled('iv');
-$trackingMode = $user->getTrackingMode();
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
-$recordType = $user->getRecordType();
-$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
-$showFiles = $user->isPluginEnabled('at');
-$showRecordCustomFields = $user->isOptionEnabled('record_custom_fields');
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-$showNoteColumn = !$config->getDefinedValue('time_note_on_separate_row');
-$showNoteRow = $config->getDefinedValue('time_note_on_separate_row');
-if ($showNoteRow) {
-  // Determine column span for note field.
-  $colspan = 0;
-  if ($showClient) $colspan++;
-  if ($showRecordCustomFields && $custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $colspan++;
-    }
-  }
-  if ($showProject) $colspan++;
-  if ($showTask) $colspan++;
-  if ($showStart) $colspan++;
-  if ($showFinish) $colspan++;
-  $colspan++; // There is always a duration.
-  if ($showFiles) $colspan++;
-  $colspan++; // There is always an edit column.
-  // $colspan++; // There is always a delete column.
-  // $colspan--; // Remove one column for label.
-  $smarty->assign('colspan', $colspan);
-}
-
-if ($user->isPluginEnabled('mq')){
-  require_once('plugins/MonthlyQuota.class.php');
-  $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
-  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
-  $month_total_minutes = ttTimeHelper::toMinutes($month_total);
-  $balance_left = $quota_minutes_from_1st - $month_total_minutes;
-  $minutes_left = $month_quota_minutes - $month_total_minutes;
-  
-  $smarty->assign('month_total', $month_total);
-  $smarty->assign('month_quota', ttTimeHelper::toAbsDuration($month_quota_minutes));
-  $smarty->assign('over_balance', $balance_left < 0);
-  $smarty->assign('balance_remaining', ttTimeHelper::toAbsDuration($balance_left));
-  $smarty->assign('over_quota', $minutes_left < 0);
-  $smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
-}
-
-// Initialize variables.
-$cl_start = trim($request->getParameter('start'));
-$cl_finish = trim($request->getParameter('finish'));
-$cl_duration = trim($request->getParameter('duration'));
-$cl_note = trim($request->getParameter('note'));
-$cl_billable = 1;
-if ($showBillable) {
-  if ($request->isPost()) {
-    $cl_billable = $request->getParameter('billable');
-    $_SESSION['billable'] = (int) $cl_billable;
-  } else
-    if (isset($_SESSION['billable']))
-      $cl_billable = $_SESSION['billable'];
-}
-$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
-$_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
-$_SESSION['project'] = $cl_project;
-$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
-$_SESSION['task'] = $cl_task;
-
-// Handle time custom fields.
-$timeCustomFields = array();
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $control_name = 'time_field_'.$timeField['id'];
-    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
-    $_SESSION[$control_name] = $cl_control_name;
-    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-      'control_name' => $control_name,
-      'label' => $timeField['label'],
-      'type' => $timeField['type'],
-      'required' => $timeField['required'],
-      'value' => trim($cl_control_name));
-  }
-}
-
-// Elements of timeRecordForm.
-$form = new Form('timeRecordForm');
-
-// Dropdown for user and a hidden control to indicate user change.
-if ($user->can('track_time')) {
-  $rank = $user->getMaxRankForGroup($group_id);
-  if ($user->can('track_own_time'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
-  if (count($user_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
-      'name'=>'user',
-      'style'=>'width: 250px;',
-      'value'=>$user_id,
-      'data'=>$user_list,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $smarty->assign('user_dropdown', 1);
-  }
-}
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-// Note: for other tracking modes the control is added further below.
-if (MODE_TIME == $trackingMode && $showClient) {
-  $active_clients = ttGroupHelper::getActiveClients(true);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillProjectDropdown(this.value);',
-    'name'=>'client',
-    'style'=>'width: 250px;',
-    'value'=>$cl_client,
-    'data'=>$active_clients,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-// Billable checkbox.
-if ($showBillable)
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-// If we show project dropdown, add controls for project and client.
-if ($showProject) {
-  // Dropdown for projects assigned to user.
-  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
-  $project_list = $user->getAssignedProjects($options);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Client dropdown.
-  if ($showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming.
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user))
-        $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-
-// Task dropdown.
-if ($showTask) {
-  $task_list = ttGroupHelper::getActiveTasks();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'task',
-    'style'=>'width: 250px;',
-    'value'=>$cl_task,
-    'data'=>$task_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-}
-
-// Start and finish controls.
-if ($showStart) {
-  $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
-  $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !$user->canOverridePunchMode()) {
-    // Make the start and finish fields read-only.
-    $form->getElement('start')->setEnabled(false);
-    $form->getElement('finish')->setEnabled(false);
-  }
-}
-
-// Duration control.
-if ($showDuration)
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-
-// File upload control.
-if ($showFiles)
-  $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-
-// If we have templates, add a dropdown to select one.
-if ($user->isPluginEnabled('tp')){
-  $template_list = ttGroupHelper::getActiveTemplates();
-  if (count($template_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillNote(this.value);',
-      'name'=>'template',
-      'style'=>'width: 250px;',
-      'data'=>$template_list,
-      'datakeys'=>array('id','name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $smarty->assign('template_dropdown', 1);
-    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
-    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
-    $smarty->assign('template_list', $template_list);
-  }
-}
-
-// Note control.
-if (!defined('NOTE_INPUT_HEIGHT'))
-  define('NOTE_INPUT_HEIGHT', 40);
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 600px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
-
-// Calendar.
-$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
-
-// A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-
-// Submit button.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-    // Submit button clicked.
-    // Validate user input.
-    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
-      $err->add($i18n->get('error.client'));
-    // Validate input in time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
-      foreach ($timeCustomFields as $timeField) {
-        // Validation is the same for text and dropdown fields.
-        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
-      }
-    }
-    if ($showProject) {
-      if (!$cl_project) $err->add($i18n->get('error.project'));
-    }
-    if ($showTask && $taskRequired) {
-      if (!$cl_task) $err->add($i18n->get('error.task'));
-    }
-    if (strlen($cl_duration) == 0) {
-      if ($cl_start || $cl_finish) {
-        if (!ttTimeHelper::isValidTime($cl_start))
-          $err->add($i18n->get('error.field'), $i18n->get('label.start'));
-        if ($cl_finish) {
-          if (!ttTimeHelper::isValidTime($cl_finish))
-            $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
-          if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
-        }
-      } else {
-        if ($showStart) {
-          $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
-          $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
-        }
-        if ($showDuration)
-          $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
-      }
-    } else {
-      if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-        $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-    }
-    if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
-      $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-    // Finished validating user input.
-
-    // Prohibit creating entries in future.
-    if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
-        $err->add($i18n->get('error.future_date'));
-    }
-
-    // Prohibit creating entries in locked range.
-    if ($user->isDateLocked($selected_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Prohibit creating another uncompleted record.
-    if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user_id)) && (($cl_finish == '') && ($cl_duration == '')))
-        $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
-    }
-
-    // Prohibit creating an overlapping record.
-    if ($err->no()) {
-      if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->get('error.overlap'));
-    }
-
-    // Insert record.
-    if ($err->no()) {
-      $id = ttTimeHelper::insert(array(
-        'date' => $cl_date,
-        'client' => $cl_client,
-        'project' => $cl_project,
-        'task' => $cl_task,
-        'start' => $cl_start,
-        'finish' => $cl_finish,
-        'duration' => $cl_duration,
-        'note' => $cl_note,
-        'billable' => $cl_billable));
-
-      // Insert time custom fields if we have them.
-      $result = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
-        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
-      }
-
-      // Put a new file in storage if we have it.
-      if ($id && $showFiles && $_FILES['newfile']['name']) {
-        $fileHelper = new ttFileHelper($err);
-        $fields = array('entity_type'=>'time',
-          'entity_id' => $id,
-          'file_name' => $_FILES['newfile']['name']);
-        $fileHelper->putFile($fields);
-      }
-
-      if ($id && $result && $err->no()) {
-        header('Location: time.php');
-        exit();
-      }
-      $err->add($i18n->get('error.db'));
-    }
-  } elseif ($request->getParameter('btn_stop')) {
-    // Stop button pressed to finish an uncompleted record.
-    $record_id = $request->getParameter('record_id');
-    $record = ttTimeHelper::getRecord($record_id);
-    $browser_date = $request->getParameter('browser_date');
-    $browser_time = $request->getParameter('browser_time');
-
-    // Can we complete this record?
-    if ($record['date'] == $browser_date                                // closing today's record
-      && ttTimeHelper::isValidInterval($record['start'], $browser_time) // finish time is greater than start time
-      && !ttTimeHelper::overlaps($user_id, $browser_date, $record['start'], $browser_time)) { // no overlap
-      $res = ttTimeHelper::update(array(
-          'id'=>$record['id'],
-          'date'=>$record['date'],
-          'client'=>$record['client_id'],
-          'project'=>$record['project_id'],
-          'task'=>$record['task_id'],
-          'start'=>$record['start'],
-          'finish'=>$browser_time,
-          'note'=>$record['comment'],
-          'billable'=>$record['billable']));
-      if (!$res)
-        $err->add($i18n->get('error.db'));
-    } else {
-      // Cannot complete, redirect for manual edit.
-      header('Location: time_edit.php?id='.$record_id);
-      exit();
-    }
-  }
-} // isPost
-
-$week_total = ttTimeHelper::getTimeForWeek($selected_date);
-$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
-
-$smarty->assign('selected_date', $selected_date);
-$smarty->assign('week_total', $week_total);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
-$smarty->assign('time_records', $timeRecords);
-$smarty->assign('show_record_custom_fields', $showRecordCustomFields);
-$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
-$smarty->assign('show_client', $showClient);
-$smarty->assign('show_billable', $showBillable);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('show_task', $showTask);
-$smarty->assign('task_required', $taskRequired);
-$smarty->assign('show_start', $showStart);
-$smarty->assign('show_duration', $showDuration);
-$smarty->assign('show_note_column', $showNoteColumn);
-$smarty->assign('show_note_row', $showNoteRow);
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
-$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
-$smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'time.tpl');
-$smarty->display('index.tpl');
diff --git a/user_add1.php b/user_add1.php
deleted file mode 100644
index b7c2bc7a6..000000000
--- a/user_add1.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?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('ttTeamHelper');
-import('ttGroupHelper');
-import('ttUserHelper');
-import('form.Table');
-import('form.TableColumn');
-import('ttRoleHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_users')) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Use the "limit" plugin if we have one. Ignore include errors.
-// The "limit" plugin is not required for normal operation of Time Tracker.
-@include('plugins/limit/user_add.php');
-
-$show_quota = $user->isPluginEnabled('mq');
-if ($user->isPluginEnabled('cl'))
-  $clients = ttGroupHelper::getActiveClients();
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-$assigned_projects = array();
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_login = trim($request->getParameter('login'));
-  if (!$auth->isPasswordExternal()) {
-    $cl_password1 = $request->getParameter('pas1');
-    $cl_password2 = $request->getParameter('pas2');
-  }
-  $cl_email = trim($request->getParameter('email'));
-  $cl_role_id = $request->getParameter('role');
-  $cl_client_id = $request->getParameter('client');
-  $cl_quota_percent = $request->getParameter('quota_percent');
-  // If we have user custom fields - collect input.
-  if ($custom_fields && $custom_fields->userFields) {
-    foreach ($custom_fields->userFields as $userField) {
-      $control_name = 'user_field_'.$userField['id'];
-      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
-        'control_name' => $control_name,
-        'label' => $userField['label'],
-        'type' => $userField['type'],
-        'required' => $userField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
-  }
-  $cl_rate = $request->getParameter('rate');
-  $cl_projects = $request->getParameter('projects');
-  if (is_array($cl_projects)) {
-    foreach ($cl_projects as $p) {
-      if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
-        $project_with_rate = array();
-        $project_with_rate['id'] = $p;
-        $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
-        $assigned_projects[] = $project_with_rate;
-      } else
-        $err->add($i18n->get('error.field'), 'rate_'.$p);
-    }
-  }
-}
-
-$form = new Form('userForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
-if (!$auth->isPasswordExternal()) {
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
-}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
-
-$active_roles = ttTeamHelper::getActiveRolesForUser();
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
-if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->userFields) {
-  foreach ($custom_fields->userFields as $userField) {
-    $field_name = 'user_field_'.$userField['id'];
-    if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
-    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($userField['id']),
-      'value'=>$userCustomFields[$userField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
-if ($show_quota)
-  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
-
-$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
-if ($show_projects) {
-  $projects = ttGroupHelper::getActiveProjects();
-  if (count($projects) == 0) $show_projects = false;
-}
-
-// Define classes for the projects table.
-class NameCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200));
-    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
-    return $this->toString();
-  }
-}
-class RateCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    global $assigned_projects;
-    $field = new FloatField('rate_'.$table->getValueAtName($row, 'id'));
-    $field->setFormName($table->getFormName());
-    $field->setSize(5);
-    $field->setFormat('.2');
-    foreach ($assigned_projects as $p) {
-      if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
-    }
-    $this->setValue($field->getHtml());
-    return $this->toString();
-  }
-}
-// Create projects table.
-$table = new Table('projects');
-$table->setIAScript('setDefaultRate');
-$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
-$table->setData($projects);
-$table->setKeyField('id');
-$table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
-$form->addInputElement($table);
-
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
-  if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-    if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-  }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
-  // Require selection of a client for a client role.
-  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
-  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
-  // Validate input in user custom fields.
-  if ($custom_fields && $custom_fields->userFields) {
-    foreach ($userCustomFields as $userField) {
-      // Validation is the same for text and dropdown fields.
-      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
-    }
-  }
-  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
-  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));
-
-  if ($err->no()) {
-    if (!ttUserHelper::getUserByLogin($cl_login)) {
-      $fields = array(
-        'name' => $cl_name,
-        'login' => $cl_login,
-        'password' => $cl_password1,
-        'rate' => $cl_rate,
-        'quota_percent' => $cl_quota_percent,
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'role_id' => $cl_role_id,
-        'client_id' => $cl_client_id,
-        'projects' => $assigned_projects,
-        'email' => $cl_email);
-      $user_id = ttUserHelper::insert($fields);
-
-      // Insert user custom fields if we have them.
-      $result = true;
-      if ($user_id && $custom_fields && $custom_fields->userFields) {
-        $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
-      }
-
-      if ($user_id && $result) {
-        if (!$user->exists()) {
-          // We added a user to an empty subgroup. Set new user as on behalf user.
-          // Needed for user-based things to work (such as notifications config).
-          $user->setOnBehalfUser($user_id);
-        }
-        header('Location: users.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.user_exists'));
-  }
-} // isPost
-
-$smarty->assign('auth_external', $auth->isPasswordExternal());
-$smarty->assign('active_roles', $active_roles);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
-$smarty->assign('show_quota', $show_quota);
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('title', $i18n->get('title.add_user'));
-$smarty->assign('content_page_name', 'user_add.tpl');
-$smarty->display('index.tpl');
diff --git a/user_edit1.php b/user_edit1.php
deleted file mode 100644
index d74ae2785..000000000
--- a/user_edit1.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?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('ttProjectHelper');
-import('ttTeamHelper');
-import('ttGroupHelper');
-import('ttUserHelper');
-import('form.Table');
-import('form.TableColumn');
-import('ttRoleHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_users')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$user_id = (int)$request->getParameter('id');
-$user_details = $user->getUserDetails($user_id);
-if (!$user_details) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$show_quota = $user->isPluginEnabled('mq');
-if ($user->isPluginEnabled('cl'))
-  $clients = ttGroupHelper::getActiveClients();
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
-if ($show_projects) {
-  $projects = ttGroupHelper::getActiveProjects();
-  if (count($projects) == 0) $show_projects = false;
-}
-$assigned_projects = array();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_login = trim($request->getParameter('login'));
-  if (!$auth->isPasswordExternal()) {
-    $cl_password1 = $request->getParameter('pas1');
-    $cl_password2 = $request->getParameter('pas2');
-  }
-  $cl_email = trim($request->getParameter('email'));
-  $cl_role_id = $request->getParameter('role');
-  $cl_client_id = $request->getParameter('client');
-  $cl_status = $request->getParameter('status');
-  $cl_quota_percent = $request->getParameter('quota_percent');
-  // If we have user custom fields - collect input.
-  if ($custom_fields && $custom_fields->userFields) {
-    foreach ($custom_fields->userFields as $userField) {
-      $control_name = 'user_field_'.$userField['id'];
-      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
-        'control_name' => $control_name,
-        'label' => $userField['label'],
-        'type' => $userField['type'],
-        'required' => $userField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
-  }
-  $cl_rate = $request->getParameter('rate');
-  $cl_projects = $request->getParameter('projects');
-  if (is_array($cl_projects)) {
-    foreach ($cl_projects as $p) {
-      if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
-        $project_with_rate = array();
-        $project_with_rate['id'] = $p;
-        $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
-        $assigned_projects[] = $project_with_rate;
-      } else
-        $err->add($i18n->get('error.field'), 'rate_'.$p);
-    }
-  }
-} else {
-  $cl_name = $user_details['name'];
-  $cl_login = $user_details['login'];
-  $cl_email = $user_details['email'];
-  $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
-  // If we have user custom fields - collect values from database.
-  if ($custom_fields && $custom_fields->userFields) {
-    foreach ($custom_fields->userFields as $userField) {
-      $control_name = 'user_field_'.$userField['id'];
-      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
-        'control_name' => $control_name,
-        'label' => $userField['label'],
-        'type' => $userField['type'],
-        'required' => $userField['required'],
-        'value' => $custom_fields->getEntityFieldValue(CustomFields::ENTITY_USER, $user_id, $userField['id'], $userField['type']));
-    }
-  }
-  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
-  $cl_role_id = $user_details['role_id'];
-  $cl_client_id = $user_details['client_id'];
-  $cl_status = $user_details['status'];
-  $cl_projects = array();
-  $assigned_projects = ttProjectHelper::getAssignedProjects($user_id);
-  foreach($assigned_projects as $p) {
-    $cl_projects[] = $p['id'];
-  }
-}
-
-$form = new Form('userForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
-if (!$auth->isPasswordExternal()) {
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
-}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 300px;','value'=>$cl_email));
-
-$active_roles = ttTeamHelper::getActiveRolesForUser();
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles, 'datakeys'=>array('id', 'name')));
-if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-// If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->userFields) {
-  foreach ($custom_fields->userFields as $userField) {
-    $field_name = 'user_field_'.$userField['id'];
-    if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
-    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($userField['id']),
-      'value'=>$userCustomFields[$userField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
-if ($show_quota)
-  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
-
-// Define classes for the projects table.
-class NameCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200));
-    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
-    return $this->toString();
-  }
-}
-class RateCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    global $assigned_projects;
-
-    $field = new FloatField('rate_'.$table->getValueAtName($row,'id'));
-    $field->setFormName($table->getFormName());
-    $field->setSize(5);
-    $field->setFormat('.2');
-    foreach ($assigned_projects as $p) {
-      if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
-    }
-    $this->setValue($field->getHtml());
-    return $this->toString();
-  }
-}
-// Create projects table.
-$table = new Table('projects');
-$table->setIAScript('setRate');
-$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
-$table->setData($projects);
-$table->setKeyField('id');
-$table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
-$form->addInputElement($table);
-
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
-  if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-    if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-  }
-  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
-  // Require selection of a client for a client role.
-  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
-  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
-    // Validate input in user custom fields.
-  if ($custom_fields && $custom_fields->userFields) {
-    foreach ($userCustomFields as $userField) {
-      // Validation is the same for text and dropdown fields.
-      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
-    }
-  }
-  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
-
-  if ($err->no()) {
-    $existing_user = ttUserHelper::getUserByLogin($cl_login);
-    if (!$existing_user || ($user_id == $existing_user['id'])) {
-
-        $fields = array(
-        'name' => $cl_name,
-        'login' => $cl_login,
-        'password' => $cl_password1,
-        'email' => $cl_email,
-        'status' => $cl_status,
-        'rate' => $cl_rate,
-        'quota_percent' => $cl_quota_percent,
-        'projects' => $assigned_projects);
-      if (in_array('manage_users', $user->rights) && $cl_role_id) {
-        $fields['role_id'] = $cl_role_id;
-        $fields['client_id'] = $cl_client_id;
-      }
-
-      $result = ttUserHelper::update($user_id, $fields);
-      // Update user custom fields if we have them.
-      if ($result && $custom_fields && $custom_fields->userFields) {
-        $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
-      }
-
-      if ($result) {
-        // If our own login changed, set new one in cookie to remember it.
-        if (($user_id == $user->id) && ($user->login != $cl_login)) {
-          setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
-        }
-
-        // In case the name of the "on behalf" user has changed - set it in session.
-        if (($user->behalf_id == $user_id) && ($user->behalf_name != $cl_name)) {
-          $_SESSION['behalf_name'] = $cl_name;
-        }
-
-        // If we deactivated our own account, do housekeeping and logout.
-        if ($user->id == $user_id && !is_null($cl_status) && $cl_status == INACTIVE) {
-          // Remove LOGIN_COOKIE_NAME cookie that stores login name.
-          unset($_COOKIE[LOGIN_COOKIE_NAME]);
-          setcookie(LOGIN_COOKIE_NAME, NULL, -1);
-
-          $auth->doLogout();
-          header('Location: login.php');
-          exit();
-        }
-
-        header('Location: users.php');
-        exit();
-
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.user_exists'));
-  }
-} // isPost
-
-$can_swap = false;
-if ($user->id == $user_id && $user->can('swap_roles')) {
-  $users_for_swap = ttTeamHelper::getUsersForSwap();
-  if (is_array($users_for_swap) && sizeof($users_for_swap) > 0)
-    $can_swap = true;
-}
-
-$rates = ttProjectHelper::getRates($user_id);
-$smarty->assign('rates', $rates);
-
-$smarty->assign('auth_external', $auth->isPasswordExternal());
-$smarty->assign('active_roles', $active_roles);
-$smarty->assign('can_swap', $can_swap);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
-$smarty->assign('show_quota', $show_quota);
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('user_id', $user_id);
-$smarty->assign('title', $i18n->get('title.edit_user'));
-$smarty->assign('content_page_name', 'user_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/users1.php b/users1.php
deleted file mode 100644
index 2fbcb5d20..000000000
--- a/users1.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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('ttTimeHelper');
-import('ttRoleHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Prepare a list of active users.
-$rank = $user->getMaxRankForGroup($user->getGroup());
-if ($user->can('view_users'))
-  $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
-else /* if ($user->can('manage_users')) */
-  $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
-$active_users = $user->getUsers($options);
-
-// Prepare a list of inactive users.
-if($user->can('manage_users')) {
-  $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
-  $inactive_users = $user->getUsers($options);
-}
-
-$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
-if ($uncompleted_indicators) {
-  // Check each active user if they have an uncompleted time entry.
-  foreach ($active_users as $key => $active_user) {
-    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
-  }
-  $smarty->assign('uncompleted_indicators', true);
-}
-
-$smarty->assign('active_users', $active_users);
-$smarty->assign('inactive_users', $inactive_users);
-$smarty->assign('show_quota', $user->isPluginEnabled('mq'));
-$smarty->assign('title', $i18n->get('title.users'));
-$smarty->assign('content_page_name', 'users.tpl');
-$smarty->display('index.tpl');

From ba13f2e7523c2913c1af268ff85e3392657872f0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 18:27:09 +0000
Subject: [PATCH 1410/1848] Made file_edit.php page mobile-friendly.

---
 WEB-INF/templates/file_edit2.tpl |  22 ++++++
 client_edit1.php                 | 131 -------------------------------
 file_edit.php                    |  36 ++-------
 initialize.php                   |   2 +-
 4 files changed, 29 insertions(+), 162 deletions(-)
 create mode 100644 WEB-INF/templates/file_edit2.tpl
 delete mode 100644 client_edit1.php

diff --git a/WEB-INF/templates/file_edit2.tpl b/WEB-INF/templates/file_edit2.tpl
new file mode 100644
index 000000000..66f72cc3d
--- /dev/null
+++ b/WEB-INF/templates/file_edit2.tpl
@@ -0,0 +1,22 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.fileForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="file_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="file_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.fileForm.file_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.fileForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.fileForm.btn_save.control}</div>
+{$forms.fileForm.close}
diff --git a/client_edit1.php b/client_edit1.php
deleted file mode 100644
index 7b572ea7c..000000000
--- a/client_edit1.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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('ttClientHelper');
-import('ttTeamHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_clients')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-$client = ttClientHelper::getClient($cl_id, true);
-if (!$client) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_address = trim($request->getParameter('address'));
-  $cl_tax = trim($request->getParameter('tax'));
-  $cl_status = $request->getParameter('status');
-  $cl_projects = $request->getParameter('projects');
-} else {
-  $cl_name = $client['name'];
-  $cl_address = $client['address'];
-  $cl_tax = $client['tax'];
-  $cl_status = $client['status'];
-  $assigned_projects = ttClientHelper::getAssignedProjects($cl_id);
-  foreach($assigned_projects as $project_item) {
-    $cl_projects[] = $project_item['id'];
-  }
-}
-
-$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
-
-$form = new Form('clientForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','style'=>'width: 350px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
-$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if ($show_projects)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $client = ttClientHelper::getClientByName($cl_name);
-      if (($client && ($cl_id == $client['id'])) || !$client) {
-        if (ttClientHelper::update(array(
-          'id' => $cl_id,
-          'name' => $cl_name,
-          'address' => $cl_address,
-          'tax' => $cl_tax,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: clients.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-
-    if ($request->getParameter('btn_copy')) {
-      if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array('name' => $cl_name,
-          'address' => $cl_address,
-          'tax' => $cl_tax,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: clients.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('title', $i18n->get('title.edit_client'));
-$smarty->assign('content_page_name', 'client_edit.tpl');
-$smarty->display('index.tpl');
diff --git a/file_edit.php b/file_edit.php
index d2c8f2990..745293c2e 100644
--- a/file_edit.php
+++ b/file_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -84,9 +60,9 @@
 
 $form = new Form('fileForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_file_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'file_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'file_name','value'=>$cl_name));
 $form->getElement('file_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -120,5 +96,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fileForm.description.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_file'));
-$smarty->assign('content_page_name', 'file_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'file_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index f176802f5..0a7d91412 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5402");
+define("APP_VERSION", "1.19.23.5403");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b72b5fbd56be8cede708844df1fc9d19ce5e84d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 19:46:03 +0000
Subject: [PATCH 1411/1848] Made file_delete.php mobile-friendly.

---
 WEB-INF/templates/file_delete2.tpl |  7 +++++++
 file_delete.php                    | 32 ++++--------------------------
 initialize.php                     |  2 +-
 3 files changed, 12 insertions(+), 29 deletions(-)
 create mode 100644 WEB-INF/templates/file_delete2.tpl

diff --git a/WEB-INF/templates/file_delete2.tpl b/WEB-INF/templates/file_delete2.tpl
new file mode 100644
index 000000000..80abe01ce
--- /dev/null
+++ b/WEB-INF/templates/file_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.fileDeleteForm.open}
+<div class="section-header">{$file_to_delete|escape}</div>
+<div class="button-set">{$forms.fileDeleteForm.btn_delete.control}&nbsp;{$forms.fileDeleteForm.btn_cancel.control}</div>
+{$forms.fileDeleteForm.close}
diff --git a/file_delete.php b/file_delete.php
index ff56f118b..1b415c19b 100644
--- a/file_delete.php
+++ b/file_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -122,5 +98,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fileDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_file'));
-$smarty->assign('content_page_name', 'file_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'file_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 0a7d91412..a863d270f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5403");
+define("APP_VERSION", "1.19.23.5404");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 509a401638a0eaba661196cc38e0b3159e71db7c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 20:36:33 +0000
Subject: [PATCH 1412/1848] Cleanup: removed no longer used templates.

---
 WEB-INF/templates/charts.tpl         |  37 ----
 WEB-INF/templates/client_add.tpl     |  37 ----
 WEB-INF/templates/client_delete.tpl  |  25 ---
 WEB-INF/templates/client_edit.tpl    |  41 -----
 WEB-INF/templates/clients.tpl        |  74 --------
 WEB-INF/templates/entity_files.tpl   |  47 ------
 WEB-INF/templates/expense_delete.tpl |  39 -----
 WEB-INF/templates/expense_edit.tpl   | 189 ---------------------
 WEB-INF/templates/expenses.tpl       | 241 ---------------------------
 WEB-INF/templates/file_delete.tpl    |  18 --
 WEB-INF/templates/file_edit.tpl      |  29 ----
 WEB-INF/templates/project_add.tpl    |  49 ------
 WEB-INF/templates/project_delete.tpl |  18 --
 WEB-INF/templates/project_edit.tpl   |  47 ------
 WEB-INF/templates/projects.tpl       | 114 -------------
 WEB-INF/templates/swap_roles.tpl     |  15 --
 WEB-INF/templates/task_add.tpl       |  36 ----
 WEB-INF/templates/task_delete.tpl    |  20 ---
 WEB-INF/templates/task_edit.tpl      |  40 -----
 WEB-INF/templates/tasks.tpl          |  96 -----------
 WEB-INF/templates/time.tpl           | 234 --------------------------
 WEB-INF/templates/user_add.tpl       | 134 ---------------
 WEB-INF/templates/user_delete.tpl    |  20 ---
 WEB-INF/templates/user_edit.tpl      | 168 -------------------
 WEB-INF/templates/users.tpl          | 121 --------------
 expense_files.php                    |  34 +---
 initialize.php                       |   2 +-
 project_files.php                    |  34 +---
 timesheet_delete.php                 |  28 +---
 timesheet_files.php                  |  34 +---
 30 files changed, 18 insertions(+), 2003 deletions(-)
 delete mode 100644 WEB-INF/templates/charts.tpl
 delete mode 100644 WEB-INF/templates/client_add.tpl
 delete mode 100644 WEB-INF/templates/client_delete.tpl
 delete mode 100644 WEB-INF/templates/client_edit.tpl
 delete mode 100644 WEB-INF/templates/clients.tpl
 delete mode 100644 WEB-INF/templates/entity_files.tpl
 delete mode 100644 WEB-INF/templates/expense_delete.tpl
 delete mode 100644 WEB-INF/templates/expense_edit.tpl
 delete mode 100644 WEB-INF/templates/expenses.tpl
 delete mode 100644 WEB-INF/templates/file_delete.tpl
 delete mode 100644 WEB-INF/templates/file_edit.tpl
 delete mode 100644 WEB-INF/templates/project_add.tpl
 delete mode 100644 WEB-INF/templates/project_delete.tpl
 delete mode 100644 WEB-INF/templates/project_edit.tpl
 delete mode 100644 WEB-INF/templates/projects.tpl
 delete mode 100644 WEB-INF/templates/swap_roles.tpl
 delete mode 100644 WEB-INF/templates/task_add.tpl
 delete mode 100644 WEB-INF/templates/task_delete.tpl
 delete mode 100644 WEB-INF/templates/task_edit.tpl
 delete mode 100644 WEB-INF/templates/tasks.tpl
 delete mode 100644 WEB-INF/templates/time.tpl
 delete mode 100644 WEB-INF/templates/user_add.tpl
 delete mode 100644 WEB-INF/templates/user_delete.tpl
 delete mode 100644 WEB-INF/templates/user_edit.tpl
 delete mode 100644 WEB-INF/templates/users.tpl

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
deleted file mode 100644
index 8e05e1985..000000000
--- a/WEB-INF/templates/charts.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<p></p>
-{$forms.chartForm.open}
-<table border="0" width="720">
-  <tr>
-{if $user_dropdown}
-      <td width="50%" align="center">{$i18n.label.user}: {$forms.chartForm.user.control}</td>
-  {if $chart_selector}
-      <td width="50%" align="left">{$i18n.form.charts.chart}: {$forms.chartForm.type.control}</td>
-  {/if}
-{else}
-  {if $chart_selector}
-      <td width="100%" align="center">{$i18n.form.charts.chart}: {$forms.chartForm.type.control}</td>
-  {/if}
-{/if}
-
-  </tr>
-</table>
-<table border="0" width="720">
-  <tr>
-    <td width="50%" align="center"><img src="{$img_file_name}" height="300" width="300" border="0"/></td>
-    <td>
-      <table border="0" cellspacing="3">
-      {section name=i loop=$totals}
-      {if $smarty.section.i.index <= 12}
-        <tr><td style="width:7px;height:1em;background-color:{$totals[i].color_html};"></td><td>{$totals[i].name|escape}</td></tr>
-      {/if}
-      {/section}
-      </table>
-    </td>
-  </tr>
-</table>
-<p></p>
-<table>
-  <tr><td align="center">{$i18n.form.charts.interval}: {$forms.chartForm.interval.control}</td></tr>
-  <tr><td valign="top">{$forms.chartForm.date.control}</td></tr>
-</table>
-{$forms.chartForm.close}
diff --git a/WEB-INF/templates/client_add.tpl b/WEB-INF/templates/client_add.tpl
deleted file mode 100644
index db10ede45..000000000
--- a/WEB-INF/templates/client_add.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{$forms.clientForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.client_name} (*):</td>
-          <td>{$forms.clientForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.client_address}:</td>
-          <td>{$forms.clientForm.address.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{if $show_projects}
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.clientForm.projects.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.clientForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.clientForm.close}
diff --git a/WEB-INF/templates/client_delete.tpl b/WEB-INF/templates/client_delete.tpl
deleted file mode 100644
index f40b94c12..000000000
--- a/WEB-INF/templates/client_delete.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{$forms.clientDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="2" border="0">
-        <tr>
-          <td>{$i18n.form.client.client_to_delete}:</td>
-          <th>{$client_to_delete|escape}</th>
-        </tr>
-        <tr>
-          <td>{$i18n.form.client.client_entries}:</td>
-          <td>{$forms.clientDeleteForm.delete_client_entries.control}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.clientDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.clientDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.clientDeleteForm.close}
diff --git a/WEB-INF/templates/client_edit.tpl b/WEB-INF/templates/client_edit.tpl
deleted file mode 100644
index 2abf70dc1..000000000
--- a/WEB-INF/templates/client_edit.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{$forms.clientForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.client_name} (*):</td>
-          <td>{$forms.clientForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.client_address}:</td>
-          <td>{$forms.clientForm.address.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.tax}, %:</td>
-          <td>{$forms.clientForm.tax.control}&nbsp;(0{$user->getDecimalMark()}00)</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.clientForm.status.control}</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{if $show_projects}
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.clientForm.projects.control}</td>
-        </tr>
-{/if}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.clientForm.btn_save.control} {$forms.clientForm.btn_copy.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.clientForm.close}
diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
deleted file mode 100644
index 07b835c87..000000000
--- a/WEB-INF/templates/clients.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_clients')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_clients}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.active_clients}</td></tr>
-  {/if}
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $active_clients as $client}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$client.name|escape}</td>
-          <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-
-  {if $inactive_clients}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.inactive_clients}</td></tr>
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.address}</td>
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $inactive_clients as $client}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$client.name|escape}</td>
-          <td>{$client.address|escape}</td>
-          <td><a href="client_edit.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="client_delete.php?id={$client.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('client_add.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.address}</td>
-        </tr>
-  {if $active_clients}
-    {foreach $active_clients as $client}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$client.name|escape}</td>
-          <td>{$client.address|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/entity_files.tpl b/WEB-INF/templates/entity_files.tpl
deleted file mode 100644
index ab9564852..000000000
--- a/WEB-INF/templates/entity_files.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.description}</td>
-{if $can_edit}
-          <td></td>
-          <td></td>
-{/if}
-        </tr>
-{if $files}
-  {foreach $files as $file}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="file_download.php?id={$file.id}">{$file.name|escape}</a></td>
-          <td>{$file.description|escape}</td>
-    {if $can_edit}
-          <td><a href="file_edit.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="file_delete.php?id={$file.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-    {/if}
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-    </td>
-  </tr>
-</table>
-
-{if $can_edit}
-{$forms.fileUploadForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td align="center">
-      <table border="0" width="60%">
-        <tr>
-            <td align="right">{$i18n.label.description}:</td>
-            <td>{$forms.fileUploadForm.description.control}</td>
-            <td align="left">{$forms.fileUploadForm.newfile.control}</td>
-        </tr>
-        <tr><td height="50" align="center" colspan="3">{$forms.fileUploadForm.btn_submit.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.fileUploadForm.close}
-{/if}
diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl
deleted file mode 100644
index 6e5bf12c8..000000000
--- a/WEB-INF/templates/expense_delete.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{$forms.expenseItemForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-<tr>
-  <td>
-  <table border="0" cellpadding="3" cellspacing="1" width="100%">
-  <tr>
-{if $user->isPluginEnabled('cl')}
-    <td class="tableHeader" align="center">{$i18n.label.client}</td>
-{/if}
-
-{if $show_project}
-    <td class="tableHeader" align="center">{$i18n.label.project}</td>
-{/if}
-    <td class="tableHeader" align="center">{$i18n.label.item}</td>
-    <td class="tableHeader" align="center">{$i18n.label.cost}</td>
-  </tr>
-  <tr>
-{if $user->isPluginEnabled('cl')}
-    <td>{$expense_item.client_name|escape}</td>
-{/if}
-{if $show_project}
-    <td>{$expense_item.project_name|escape}</td>
-{/if}
-    <td>{$expense_item.name|escape}</td>
-    <td align="right">{$expense_item.cost}</td>
-  </tr>
-  </table>
-  <table width="100%">
-  <tr>
-    <td align="center">&nbsp;</td>
-  </tr>
-  <tr>
-    <td align="center">{$forms.expenseItemForm.delete_button.control}&nbsp;&nbsp;{$forms.expenseItemForm.cancel_button.control}</td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
-{$forms.expenseItemForm.close}
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
deleted file mode 100644
index 671e868cf..000000000
--- a/WEB-INF/templates/expense_edit.tpl
+++ /dev/null
@@ -1,189 +0,0 @@
-<script>
-// We need a few arrays to populate project dropdown.
-// When client selection changes, the project dropdown must be re-populated with only relevant projects.
-// Format:
-// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
-// project_names[325] = "Time Tracker";   // Project name.
-
-// Prepare an array of project ids for clients.
-var project_ids = new Array();
-{foreach $client_list as $client}
-  project_ids[{$client.id}] = "{$client.projects}";
-{/foreach}
-// Prepare an array of project names.
-var project_names = new Array();
-{foreach $project_list as $project}
-  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
-{/foreach}
-// We'll use this array to populate project dropdown when client is not selected.
-var idx = 0;
-var projects = new Array();
-{foreach $project_list as $project}
-  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
-  idx++;
-{/foreach}
-
-// Mandatory top option for project dropdown.
-var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}";
-
-// Prepare an array of predefined expenses.
-idx = 0;
-var defined_expenses = new Array();
-{foreach $predefined_expenses as $predefined_expense}
-  defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}");
-  idx++;
-{/foreach}
-
-{* Conditional include of confirmSave handler. *}
-{if $confirm_save}
-var original_date = "{$entry_date}";
-
-function confirmSave() {
-  var date_on_save = document.getElementById("date").value;
-  if (original_date != date_on_save) {
-    return confirm("{$i18n.warn.confirm_save}");
-  }
-}
-{/if}
-
-// The fillProjectDropdown function populates the project combo box with
-// projects associated with a selected client (client id is passed here as id).
-function fillProjectDropdown(id) {
-  var str_ids = project_ids[id];
-  var dropdown = document.getElementById("project");
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
-  // Remove existing content.
-  dropdown.length = 0;
-  // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label_project, '', true);
-
-  // Populate project dropdown.
-  if (!id) {
-    // If we are here, client is not selected.
-    var len = projects.length;
-    for (var i = 0; i < len; i++) {
-      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  } else if (str_ids) {
-    var ids = new Array();
-    ids = str_ids.split(",");
-    var len = ids.length;
-
-    for (var i = 0; i < len; i++) {
-      var p_id = ids[i];
-      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  }
-}
-
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-
-// The recalculateCost function recalculates cost based on the current selection
-// of predefined expense and quantity and also changes the comment accordingly.
-function recalculateCost() {
-  var quantity_control = document.getElementById("quantity");
-  // Set quantity to 1 if it is not set already.
-  if (!quantity_control.value) {
-     quantity_control.value = "1";
-  }
-
-  var comment_control = document.getElementById("item_name");
-  var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
-
-  // Calculate cost.
-  var dropdown = document.getElementById("predefined_expense");
-  if (dropdown.selectedIndex == 0) {
-    quantity_control.value = "";
-    comment_control.value = "";
-    cost_control.value = "";
-  } else {
-    comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value;
-    var quantity = quantity_control.value;
-    if (isNaN(quantity))
-      cost_control.value = "";
-    else {
-      var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
-      if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
-      var newCost = (quantity_control.value * expenseCost).toFixed(2);
-      if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
-      cost_control.value = newCost;
-    }
-  }
-}
-</script>
-
-{$forms.expenseItemForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width = "100%">
-  <tr>
-    <td valign="top">
-    <table border="0">
-{if $user->isPluginEnabled('cl')}
-    <tr>
-      <td align="right">{$i18n.label.client} {if $user->isOptionEnabled('client_required')}(*){/if}:</td>
-      <td>{$forms.expenseItemForm.client.control}</td>
-    </tr>
-{/if}
-{if $show_project}
-    <tr>
-      <td align="right">{$i18n.label.project} (*):</td>
-      <td>{$forms.expenseItemForm.project.control}</td>
-    </tr>
-{/if}
-{if $predefined_expenses}
-    <tr>
-      <td align="right">{$i18n.label.expense}:</td>
-      <td>{$forms.expenseItemForm.predefined_expense.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.quantity}:</td>
-      <td>{$forms.expenseItemForm.quantity.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.label.comment}:</td>
-      <td>{$forms.expenseItemForm.item_name.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.cost}:</td>
-      <td>{$forms.expenseItemForm.cost.control} {$user->getCurrency()|escape}</td>
-    </tr>
-{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
-    <tr>
-      <td align="right">&nbsp;</td>
-      <td><label>{$forms.expenseItemForm.paid.control}{$i18n.label.paid}</label></td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.label.date}:</td>
-      <td>{$forms.expenseItemForm.date.control}</td>
-    </tr>
-    <tr>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td align="left">{$forms.expenseItemForm.btn_save.control} {$forms.expenseItemForm.btn_copy.control} {$forms.expenseItemForm.btn_delete.control}</td>
-    </tr>
-    </table>
-    </td>
-    </tr>
-  </table>
-  </td>
-  </tr>
-</table>
-{$forms.expenseItemForm.close}
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
deleted file mode 100644
index 3c5867279..000000000
--- a/WEB-INF/templates/expenses.tpl
+++ /dev/null
@@ -1,241 +0,0 @@
-<script>
-// We need a few arrays to populate project dropdown.
-// When client selection changes, the project dropdown must be re-populated with only relevant projects.
-// Format:
-// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
-// project_names[325] = "Time Tracker";   // Project name.
-
-// Prepare an array of project ids for clients.
-var project_ids = new Array();
-{foreach $client_list as $client}
-  project_ids[{$client.id}] = "{$client.projects}";
-{/foreach}
-// Prepare an array of project names.
-var project_names = new Array();
-{foreach $project_list as $project}
-  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
-{/foreach}
-// We'll use this array to populate project dropdown when client is not selected.
-var idx = 0;
-var projects = new Array();
-{foreach $project_list as $project}
-  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
-  idx++;
-{/foreach}
-
-// Mandatory top option for project dropdown.
-var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}";
-
-// Prepare an array of predefined expenses.
-idx = 0;
-var defined_expenses = new Array();
-{foreach $predefined_expenses as $predefined_expense}
-  defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}");
-  idx++;
-{/foreach}
-
-// The fillProjectDropdown function populates the project combo box with
-// projects associated with a selected client (client id is passed here as id).
-function fillProjectDropdown(id) {
-  var str_ids = project_ids[id];
-  var dropdown = document.getElementById("project");
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
-  // Remove existing content.
-  dropdown.length = 0;
-  // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label_project, '', true);
-
-  // Populate project dropdown.
-  if (!id) {
-    // If we are here, client is not selected.
-    var len = projects.length;
-    for (var i = 0; i < len; i++) {
-      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  } else if (str_ids) {
-    var ids = new Array();
-    ids = str_ids.split(",");
-    var len = ids.length;
-
-    for (var i = 0; i < len; i++) {
-      var p_id = ids[i];
-      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  }
-}
-
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-
-// The recalculateCost function recalculates cost based on the current selection
-// of predefined expense and quantity and also changes the comment accordingly.
-function recalculateCost() {
-  var quantity_control = document.getElementById("quantity");
-  // Set quantity to 1 if it is not set already.
-  if (!quantity_control.value) {
-     quantity_control.value = "1";
-  }
-
-  var comment_control = document.getElementById("item_name");
-  var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
-
-  // Calculate cost.
-  var dropdown = document.getElementById("predefined_expense");
-  if (dropdown.selectedIndex == 0) {
-    quantity_control.value = "";
-    comment_control.value = "";
-    cost_control.value = "";
-  } else {
-    comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value;
-    var quantity = quantity_control.value;
-    if (isNaN(quantity))
-      cost_control.value = "";
-    else {
-      var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
-      if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
-      var newCost = (quantity_control.value * expenseCost).toFixed(2);
-      if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
-      cost_control.value = newCost;
-    }
-  }
-}
-</script>
-
-{$forms.expensesForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-  <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.expensesForm.user.control}</td>
-        </tr>
-{/if}
-{if $user->isPluginEnabled('cl')}
-        <tr>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.expensesForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.expensesForm.project.control}</td>
-        </tr>
-{/if}
-{if $predefined_expenses}
-        <tr>
-          <td align="right">{$i18n.label.expense}:</td>
-          <td>{$forms.expensesForm.predefined_expense.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.quantity}:</td>
-          <td>{$forms.expensesForm.quantity.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.comment} (*):</td>
-          <td>{$forms.expensesForm.item_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.expensesForm.cost.control} {$user->getCurrency()|escape}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.expensesForm.newfile.control}</td>
-        </tr>
-{/if}
-      </table>
-    </td>
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.expensesForm.date.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<table>
-  <tr>
-    <td align="center" colspan="2">{$forms.expensesForm.btn_submit.control}</td>
-  </tr>
-</table>
-
-<table width="720">
-<tr>
-  <td valign="top">
-{if $expense_items}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-  {if $user->isPluginEnabled('cl')}
-        <td class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_project}
-        <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-        <td class="tableHeader">{$i18n.label.item}</td>
-        <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
-  {if $show_files}
-        <td></td>
-  {/if}
-        <td></td>
-        <td></td>
-      </tr>
-  {foreach $expense_items as $item}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    {if $user->isPluginEnabled('cl')}
-        <td valign="top">{$item.client|escape}</td>
-    {/if}
-    {if $show_project}
-        <td valign="top">{$item.project|escape}</td>
-    {/if}
-        <td valign="top">{$item.item|escape}</td>
-        <td valign="top" align="right">{$item.cost}</td>
-    {if $show_files}
-      {if $item.has_files}
-        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-      {else}
-        <td valign="top" align="center"><a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-      {/if}
-    {/if}
-        <td valign="top" align="center">
-    {if $item.approved || $item.invoice_id}
-          &nbsp;
-    {else}
-          <a href='expense_edit.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
-    {/if}
-        </td>
-        <td valign="top" align="center">
-    {if $item.approved || $item.invoice_id}
-          &nbsp;
-    {else}
-          <a href='expense_delete.php?id={$item.id}'><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
-    {/if}
-        </td>
-      </tr>
-  {/foreach}
-    </table>
-    <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-        <td nowrap align="right">{$i18n.label.day_total}: {$user->getCurrency()|escape} {$day_total}</td>
-      </tr>
-    </table>
-{/if}
-  </td>
-</tr>
-</table>
-{$forms.expensesForm.close}
diff --git a/WEB-INF/templates/file_delete.tpl b/WEB-INF/templates/file_delete.tpl
deleted file mode 100644
index 81107daa5..000000000
--- a/WEB-INF/templates/file_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.fileDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$file_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.fileDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.fileDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.fileDeleteForm.close}
diff --git a/WEB-INF/templates/file_edit.tpl b/WEB-INF/templates/file_edit.tpl
deleted file mode 100644
index 697a650ce..000000000
--- a/WEB-INF/templates/file_edit.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{$forms.fileForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align = "right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.fileForm.file_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.fileForm.description.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.fileForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.fileForm.close}
diff --git a/WEB-INF/templates/project_add.tpl b/WEB-INF/templates/project_add.tpl
deleted file mode 100644
index 309b13788..000000000
--- a/WEB-INF/templates/project_add.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{$forms.projectForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.projectForm.project_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.projectForm.description.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.projectForm.newfile.control}</td>
-        </tr>
-{/if}
-{if $show_users}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.users}:</td>
-          <td>{$forms.projectForm.users.control}</td>
-        </tr>
-{/if}
-{if $show_tasks}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.tasks}:</td>
-          <td>{$forms.projectForm.tasks.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.projectForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.projectForm.close}
diff --git a/WEB-INF/templates/project_delete.tpl b/WEB-INF/templates/project_delete.tpl
deleted file mode 100644
index 98d3e836d..000000000
--- a/WEB-INF/templates/project_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.projectDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$project_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.projectDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.projectDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.projectDeleteForm.close}
diff --git a/WEB-INF/templates/project_edit.tpl b/WEB-INF/templates/project_edit.tpl
deleted file mode 100644
index 2a2364f20..000000000
--- a/WEB-INF/templates/project_edit.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{$forms.projectForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align = "right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.projectForm.project_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.projectForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.status}:</td>
-          <td>{$forms.projectForm.status.control}</td>
-        </tr>
-{if $show_users}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.users}:</td>
-          <td>{$forms.projectForm.users.control}</td>
-        </tr>
-{/if}
-{if $show_tasks}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.tasks}:</td>
-          <td>{$forms.projectForm.tasks.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.projectForm.btn_save.control} {$forms.projectForm.btn_copy.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.projectForm.close}
diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
deleted file mode 100644
index 19bbe2373..000000000
--- a/WEB-INF/templates/projects.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_projects')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_projects}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
-  {/if}
-  {if $active_projects}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td></td>
-    {/if}
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-        {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-        {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-        {/if}
-      {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_projects}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.inactive_projects}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td></td>
-    {/if}
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $inactive_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-        {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-        {else}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-        {/if}
-      {/if}
-          <td><a href="project_edit.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="project_delete.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-    {if $show_files}
-          <td></td>
-    {/if}
-        </tr>
-  {if $active_projects}
-    {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-      {if $show_files}
-        {if $project.has_files}
-          <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-        {else}
-          <td>&nbsp;</td>
-        {/if}
-      {/if}
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/swap_roles.tpl b/WEB-INF/templates/swap_roles.tpl
deleted file mode 100644
index 2d3086329..000000000
--- a/WEB-INF/templates/swap_roles.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{$forms.swapForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <table cellspacing="1" cellpadding="2" border="0">
-    <tr><td colspan="2">{$i18n.form.swap.hint}</td></tr
-    <tr><td>&nbsp;</td></tr>
-    <tr>
-      <td align="right">{$i18n.form.swap.swap_with}:</td>
-      <td>{$forms.swapForm.swap_with.control}</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center">{$forms.swapForm.btn_submit.control} {$forms.swapForm.btn_cancel.control}</td>
-    </tr>
-  </table>
-</table>
-{$forms.swapForm.close}
diff --git a/WEB-INF/templates/task_add.tpl b/WEB-INF/templates/task_add.tpl
deleted file mode 100644
index d1892709a..000000000
--- a/WEB-INF/templates/task_add.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{$forms.taskForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.taskForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.taskForm.description.control}</td>
-        </tr>
-{if $show_projects}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.taskForm.projects.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.taskForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.taskForm.close}
diff --git a/WEB-INF/templates/task_delete.tpl b/WEB-INF/templates/task_delete.tpl
deleted file mode 100644
index 9f16d7c3a..000000000
--- a/WEB-INF/templates/task_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.taskDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$task_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.taskDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.taskDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.taskDeleteForm.close}
diff --git a/WEB-INF/templates/task_edit.tpl b/WEB-INF/templates/task_edit.tpl
deleted file mode 100644
index 0c2b1a555..000000000
--- a/WEB-INF/templates/task_edit.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{$forms.taskForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.taskForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.taskForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.taskForm.status.control}</td>
-        </tr>
-{if $show_projects}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.taskForm.projects.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.taskForm.btn_save.control} {$forms.taskForm.btn_copy.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.taskForm.close}
diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
deleted file mode 100644
index 591820199..000000000
--- a/WEB-INF/templates/tasks.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.tasksForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_tasks')}
-      <table width="100%">
-        <tr>
-          <td align="right" width="25%">{$forms.tasksForm.task_required.control}</td>
-          <td><label for="task_required">{$i18n.label.required}</label> <a href="https://www.anuko.com/lp/tt_46.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.tasksForm.btn_save.control}</td>
-        </tr>
-      </table>
-      <div class="table-divider"></div>
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_tasks}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
-  {/if}
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.description}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {if $active_tasks}
-    {foreach $active_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$task.name|escape}</td>
-          <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_tasks}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.inactive_tasks}</td></tr>
-        <tr>
-          <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="40%" class="tableHeader">{$i18n.label.description}</td>
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $inactive_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$task.name|escape}</td>
-          <td>{$task.description|escape}</td>
-          <td><a href="task_edit.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="task_delete.php?id={$task.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-  {if $active_tasks}
-    {foreach $active_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$task.name|escape}</td>
-          <td>{$task.description|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.tasksForm.close}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
deleted file mode 100644
index 69d214127..000000000
--- a/WEB-INF/templates/time.tpl
+++ /dev/null
@@ -1,234 +0,0 @@
-{include file="time_script.tpl"}
-
-<style>
-.not_billable td {
-  color: #ff6666;
-}
-</style>
-
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-{if $show_navigation}
-  <tr>
-    <td align="center" colspan=2">
-      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.timeRecordForm.user.control}</td>
-        </tr>
-{/if}
-{if $show_client}
-        <tr>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.timeRecordForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_billable}
-        <tr>
-          <td align="right">&nbsp;</td>
-          <td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
-        </tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-        <tr>
-          <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
-          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-          <td>{$forms.timeRecordForm.$control_name.control}</td>
-        </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.timeRecordForm.project.control}</td>
-        </tr>
-{/if}
-{if $show_task}
-        <tr>
-          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
-          <td>{$forms.timeRecordForm.task.control}</td>
-        </tr>
-{/if}
-{if $show_start}
-        <tr>
-          <td align="right">{$i18n.label.start}:</td>
-          <td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.finish}:</td>
-          <td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" tabindex="-1" value="{$i18n.button.now}"></td>
-        </tr>
-{/if}
-{if $show_duration}
-        <tr>
-          <td align="right">{$i18n.label.duration}:</td>
-          <td>{$forms.timeRecordForm.duration.control}&nbsp;{if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if}</td>
-        </tr>
-{/if}
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.timeRecordForm.newfile.control}</td>
-        </tr>
-{/if}
-{if $template_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.template}:</td>
-          <td>{$forms.timeRecordForm.template.control}</td>
-        </tr>
-{/if}
-      </table>
-    </td>
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<table>
-  <tr>
-    <td align="right">{$i18n.label.note}:</td>
-    <td align="left">{$forms.timeRecordForm.note.control}</td>
-  </tr>
-  <tr>
-    <td align="center" colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
-  </tr>
-</table>
-
-<table width="720">
-  <tr>
-    <td valign="top">
-{if $time_records}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-        <tr>
-  {if $show_client}
-          <td class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-          <td class="tableHeader">{$timeField['label']|escape}</td>
-      {/foreach}
-  {/if}
-  {if $show_project}
-          <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-  {if $show_task}
-          <td class="tableHeader">{$i18n.label.task}</td>
-  {/if}
-  {if $show_start}
-          <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
-          <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
-  {/if}
-          <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
-  {if $show_note_column}
-          <td class="tableHeader">{$i18n.label.note}</td>
-  {/if}
-  {if $show_files}
-          <td></td>
-  {/if}
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $time_records as $record}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {if $show_client}
-          <td valign="top">{$record.client|escape}</td>
-    {/if}
-    {* record custom fileds *}
-    {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-          <td>{$record.$control_name|escape}</td>
-      {/foreach}
-    {/if}
-    {if $show_project}
-          <td valign="top">{$record.project|escape}</td>
-    {/if}
-    {if $show_task}
-          <td valign="top">{$record.task|escape}</td>
-    {/if}
-    {if $show_start}
-          <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
-          <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
-    {/if}
-          <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
-    {if $show_note_column}
-          <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
-    {/if}
-    {if $show_files}
-      {if $record.has_files}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-      {else}
-          <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-      {/if}
-    {/if}
-          <td valign="top" align="center">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
-    {else}
-            <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
-      {if ($record.duration == '0:00' && $record.start <> '')}
-            <input type="hidden" name="record_id" value="{$record.id}">
-            <input type="hidden" name="browser_date" value="">
-            <input type="hidden" name="browser_time" value="">
-            <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
-      {/if}
-    {/if}
-          </td>
-          <td valign="top" align="center">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-            &nbsp;
-    {else}
-            <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
-    {/if}
-          </td>
-        </tr>
-    {if $show_note_row && $record.comment}
-        <tr>
-          <td align="right" valign="top">{$i18n.label.note}:</td>
-          <td colspan="{$colspan}" align="left" valign="top">{$record.comment|escape}</td>
-        </tr>
-    {/if}
-  {/foreach}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-
-<table cellpadding="3" cellspacing="1" width="720">
-  <tr>
-    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td align="right">{$i18n.label.day_total}: {$day_total}</td>
-  </tr>
-  {if $user->isPluginEnabled('mq')}
-  <tr>
-    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
-    {if $over_balance}
-    <td align="right">{$i18n.form.time.over_balance}: <span style="color: green;">{$balance_remaining}</span></td>
-    {else}
-    <td align="right">{$i18n.form.time.remaining_balance}: <span style="color: red;">{$balance_remaining}</span></td>
-    {/if}
-  </tr>
-  <tr>
-    <td align="left">{$i18n.label.quota}: {$month_quota}</td>
-    {if $over_quota}
-    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
-    {else}
-    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
-    {/if}
-  </tr>
-  {/if}
-</table>
-
-{$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/user_add.tpl b/WEB-INF/templates/user_add.tpl
deleted file mode 100644
index 35040f3c4..000000000
--- a/WEB-INF/templates/user_add.tpl
+++ /dev/null
@@ -1,134 +0,0 @@
-<script>
-// Prepare an array of available roles. We need it for "is_client" property.
-// It is used to selectively display client selector for client roles.
-roles = new Array();
-var idx = 0;
-{foreach $active_roles as $active_role}
-roles[idx] = new Array({$active_role.id}, '{$active_role.is_client}');
-idx++;
-{/foreach}
-
-// The setDefaultRate function sets / unsets default rate for a project
-// when a corresponding checkbox is ticked.
-function setDefaultRate(element) {
-  var default_rate = document.userForm.rate.value;
-  if (default_rate == '') {
-    // No default rate, nothing to do!
-    return;
-  }
-  // Iterate through elements of the form to find and set the project rate. 
-  for (var i = 0; i < userForm.elements.length; i++) {
-    if ((userForm.elements[i].type == 'text') && (userForm.elements[i].name == ('rate_'+element.value))) {
-      if (element.checked) {
-        userForm.elements[i].value = default_rate;
-      } else {
-        userForm.elements[i].value = '';
-      }
-      break; // Element is found and set, nothing more to do, break out of the loop.
-    }
-  }
-}
-
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
-// also hides and unselects projects when "Client" user role is selected.
-function handleClientControl() {
-  var selectedRoleId = document.getElementById("role").value;
-  var clientControl = document.getElementById("client");
-  var nonClientBlock = document.getElementById("non_client_block");
-  var projectsControl = document.getElementById("projects_control");
-
-  var len = roles.length;
-  for (var i = 0; i < len; i++) {
-    if (selectedRoleId == roles[i][0]) {
-      var isClient = roles[i][1];
-      if (isClient == 1) {
-        clientControl.style.visibility = "visible";
-        nonClientBlock.style.display = "none";
-        projectsControl.style.display = "none";
-
-        // Uncheck all project checkboxes.
-        var checkboxes = document.getElementsByName("projects[]");
-        var j;
-        for (j = 0; j < checkboxes.length; j++) {
-          checkboxes[j].checked = false;
-        }
-      } else {
-        clientControl.value = "";
-        clientControl.style.visibility = "hidden";
-        nonClientBlock.style.display = "";
-        projectsControl.style.display = "";
-      }
-      break;
-    }
-  }
-}
-</script>
-
-{$forms.userForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <table cellspacing="1" cellpadding="2" border="0">
-    <tr>
-      <td align="right">{$i18n.label.person_name} (*):</td>
-      <td>{$forms.userForm.name.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.login} (*):</td>
-      <td>{$forms.userForm.login.control}</td>
-    </tr>
-{if !$auth_external}
-    <tr>
-      <td align="right">{$i18n.label.password} (*):</td>
-      <td>{$forms.userForm.pas1.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.confirm_password} (*):</td>
-      <td>{$forms.userForm.pas2.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right" nowrap>{$i18n.label.email}:</td>
-      <td>{$forms.userForm.email.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
-    </tr>
-<tbody id="non_client_block">
-{if $show_quota}
-    <tr>
-      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
-      <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-    </tr>
-{/if}
-{if $custom_fields && $custom_fields->userFields}
-  {foreach $custom_fields->userFields as $userField}
-    <tr>
-      <td align="right">{$userField['label']|escape}{if $userField['required']} (*){/if}:</td>
-      {assign var="control_name" value='user_field_'|cat:$userField['id']}
-      <td>{$forms.userForm.$control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
-</tbody>
-{if $show_projects}
-<tbody id="projects_control">
-    <tr><td>&nbsp;</td></tr>
-    <tr valign="top">
-      <td align="right">{$i18n.label.projects}:</td>
-      <td>{$forms.userForm.projects.control}</td>
-    </tr>
-</tbody>
-{/if}
-    <tr>
-      <td colspan="2" align="center">{$i18n.label.required_fields}</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
-    </tr>
-  </table>
-</table>
-{$forms.userForm.close}
diff --git a/WEB-INF/templates/user_delete.tpl b/WEB-INF/templates/user_delete.tpl
deleted file mode 100644
index e85d97f1f..000000000
--- a/WEB-INF/templates/user_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.userDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$user_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.userDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.userDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.userDeleteForm.close}
diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
deleted file mode 100644
index 49fa4ae50..000000000
--- a/WEB-INF/templates/user_edit.tpl
+++ /dev/null
@@ -1,168 +0,0 @@
-<script>
-// Prepare an array of available roles. We need it for "is_client" property.
-// It is used to selectively display client selector for client roles.
-roles = new Array();
-var idx = 0;
-{foreach $active_roles as $active_role}
-roles[idx] = new Array({$active_role.id}, '{$active_role.is_client}');
-idx++;
-{/foreach}
-
-// Prepare an array of rates.
-// Format: project_rates[0] = Array(100, '25.00'), project_rates[1] = Array(120, '30.00'), etc...
-// First element = project_id, second element = rate for project. Quotes needed for string representation of rates.
-project_rates = new Array();
-var idx = 0;
-{foreach $rates as $rate}
-project_rates[idx] = new Array({$rate.id}, '{$rate.rate}');
-idx++;
-{/foreach}
-
-// getRate - returns a rate for the project. If rate was set for user previously we'll get this old rate
-// if project time entries for user exists. Otherwise return user default rate.
-function getRate(project_id) {
-  var length = project_rates.length;
-  for(var i = 0; i < length; i++) {
-    if(project_rates[i][0] == project_id) {
-      return project_rates[i][1];
-    }
-  }
-  var default_rate = document.userForm.rate.value;
-  return default_rate;
-}
-
-// The setRate function sets / unsets user rate for a project when a corresponding checkbox is ticked.
-function setRate(element) {
-  var default_rate = document.userForm.rate.value;
-  if (default_rate == '') {
-    // No default rate, nothing to do!
-    return;
-  }
-  // Iterate through elements of the form to find and set the project rate. 
-  for (var i = 0; i < userForm.elements.length; i++) {
-    if ((userForm.elements[i].type == 'text') && (userForm.elements[i].name == ('rate_'+element.value))) {
-      if (element.checked) {
-        userForm.elements[i].value = getRate(element.value);
-      } else {
-        userForm.elements[i].value = '';
-      }
-      break; // Element is found and set, nothing more to do, break out of the loop.
-    }
-  }
-}
-
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
-// also hides and unselects projects when "Client" user role is selected.
-function handleClientControl() {
-  var selectedRoleId = document.getElementById("role").value;
-  var clientControl = document.getElementById("client");
-  var nonClientBlock = document.getElementById("non_client_block");
-  var projectsControl = document.getElementById("projects_control");
-
-  var len = roles.length;
-  for (var i = 0; i < len; i++) {
-    if (selectedRoleId == roles[i][0]) {
-      var isClient = roles[i][1];
-      if (isClient == 1) {
-        clientControl.style.visibility = "visible";
-        nonClientBlock.style.display = "none";
-        projectsControl.style.display = "none";
-
-        // Uncheck all project checkboxes.
-        var checkboxes = document.getElementsByName("projects[]");
-        var j;
-        for (j = 0; j < checkboxes.length; j++) {
-          checkboxes[j].checked = false;
-        }
-      } else {
-        clientControl.value = "";
-        clientControl.style.visibility = "hidden";
-        nonClientBlock.style.display = "";
-        projectsControl.style.display = "";
-      }
-      break;
-    }
-  }
-}
-</script>
-
-{$forms.userForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <table cellspacing="1" cellpadding="2" border="0">
-    <tr>
-      <td align="right">{$i18n.label.person_name} (*):</td>
-      <td>{$forms.userForm.name.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.login} (*):</td>
-      <td>{$forms.userForm.login.control}</td>
-    </tr>
-{if !$auth_external}
-    <tr>
-      <td align="right">{$i18n.label.password} (*):</td>
-      <td>{$forms.userForm.pas1.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.confirm_password} (*):</td>
-      <td>{$forms.userForm.pas2.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right" nowrap>{$i18n.label.email}:</td>
-      <td>{$forms.userForm.email.control}</td>
-    </tr>
-{if $user->id != $user_id}
-    <tr>
-      <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.status}:</td>
-      <td>{$forms.userForm.status.control}</td>
-    </tr>
-{/if}
-{if $user->id == $user_id}
-      <tr>
-      <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$user->role_name} {if $can_swap}<a href="swap_roles.php">{$i18n.form.user_edit.swap_roles}</a>{/if}</td>
-    </tr>
-{/if}
-<tbody id="non_client_block">
-{if $show_quota}
-    <tr>
-      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
-      <td>{$forms.userForm.quota_percent.control} <a href="https://www.anuko.com/lp/tt_27.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-    </tr>
-{/if}
-{if $custom_fields && $custom_fields->userFields}
-  {foreach $custom_fields->userFields as $userField}
-    <tr>
-      <td align="right">{$userField['label']|escape}{if $userField['required']} (*){/if}:</td>
-      {assign var="control_name" value='user_field_'|cat:$userField['id']}
-      <td>{$forms.userForm.$control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->getDecimalMark()}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
-</tbody>
-{if $show_projects}
-<tbody id="projects_control">
-    <tr><td>&nbsp;</td></tr>
-    <tr valign="top">
-      <td align="right">{$i18n.label.projects}:</td>
-      <td>{$forms.userForm.projects.control}</td>
-    </tr>
-</tbody>
-{/if}
-    <tr>
-      <td colspan="2" align="center">{$i18n.label.required_fields}</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
-    </tr>
-  </table>
-</table>
-{$forms.userForm.close}
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
deleted file mode 100644
index c3f6861ea..000000000
--- a/WEB-INF/templates/users.tpl
+++ /dev/null
@@ -1,121 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_users')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_users}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
-  {/if}
-  {if $active_users}
-        <tr>
-          <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="30%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
-    {if $show_quota}
-          <td class="tableHeader">{$i18n.label.quota}</td>
-    {/if}
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>
-      {if $uncompleted_indicators}
-            <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
-      {/if}
-            {$u.name|escape}
-          </td>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
-      {if $show_quota}
-          <td class="cellRightAligned">{$u.quota_percent}</td>
-      {/if}
-      {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
-          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-         {if $u.id != $user->id}<td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>{else}<td></td>{/if}
-      {else}
-          <td></td>
-          <td></td>
-      {/if}
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_users}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.label.inactive_users}</td></tr>
-        <tr>
-          <td width="30%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="30%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="20%" class="tableHeader">{$i18n.form.users.role}</td>
-    {if $show_quota}
-          <td class="tableHeader">{$i18n.label.quota}</td>
-    {/if}
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $inactive_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$u.name|escape}</td>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
-      {if $show_quota}
-          <td class="cellRightAligned">{$u.quota_percent}</td>
-      {/if}
-      {if $u.group_id != $user->group_id || $u.rank < $user->rank}
-          <td><a href="user_edit.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="user_delete.php?id={$u.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-      {else}
-          <td></td>
-          <td></td>
-      {/if}
-        </tr>
-    {/foreach}
-
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center" height="50">
-            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td class="tableHeader">{$i18n.form.users.role}</td>
-        </tr>
-  {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>
-    {if $uncompleted_indicators}
-            <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
-    {/if}
-            {$u.name|escape}
-          </td>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/expense_files.php b/expense_files.php
index feab9b611..5642cb383 100644
--- a/expense_files.php
+++ b/expense_files.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -58,7 +34,7 @@
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -85,5 +61,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.expense_files'));
-$smarty->assign('content_page_name', 'entity_files.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'entity_files2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index a863d270f..a222510c9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5404");
+define("APP_VERSION", "1.19.23.5405");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_files.php b/project_files.php
index 6ffe123f1..5dd816d6c 100644
--- a/project_files.php
+++ b/project_files.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -58,7 +34,7 @@
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
 $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -85,5 +61,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
-$smarty->assign('content_page_name', 'entity_files.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'entity_files2.tpl');
+$smarty->display('index2.tpl');
diff --git a/timesheet_delete.php b/timesheet_delete.php
index 5e98a6cc9..ff1e4e180 100644
--- a/timesheet_delete.php
+++ b/timesheet_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/timesheet_files.php b/timesheet_files.php
index d32b2c99f..d09ecd57d 100644
--- a/timesheet_files.php
+++ b/timesheet_files.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -58,7 +34,7 @@
 $form = new Form('fileUploadForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_timesheet_id));
 $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -85,5 +61,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.timesheet_files').': '.$timesheet['name']);
-$smarty->assign('content_page_name', 'entity_files.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'entity_files2.tpl');
+$smarty->display('index2.tpl');

From 4500d03942456a4be84e82635412c0ebacf5d152 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Dec 2020 21:35:10 +0000
Subject: [PATCH 1413/1848] Some more cleanup.

---
 .../{access_denied.tpl => access_denied2.tpl} |  0
 .../{file_download.tpl => file_download2.tpl} |  0
 access_denied.php                             |  2 +-
 client_add1.php                               | 94 -------------------
 client_delete1.php                            | 78 ---------------
 feature_disabled.php                          | 32 +------
 file_download.php                             |  4 +-
 initialize.php                                |  2 +-
 8 files changed, 8 insertions(+), 204 deletions(-)
 rename WEB-INF/templates/{access_denied.tpl => access_denied2.tpl} (100%)
 rename WEB-INF/templates/{file_download.tpl => file_download2.tpl} (100%)
 delete mode 100644 client_add1.php
 delete mode 100644 client_delete1.php

diff --git a/WEB-INF/templates/access_denied.tpl b/WEB-INF/templates/access_denied2.tpl
similarity index 100%
rename from WEB-INF/templates/access_denied.tpl
rename to WEB-INF/templates/access_denied2.tpl
diff --git a/WEB-INF/templates/file_download.tpl b/WEB-INF/templates/file_download2.tpl
similarity index 100%
rename from WEB-INF/templates/file_download.tpl
rename to WEB-INF/templates/file_download2.tpl
diff --git a/access_denied.php b/access_denied.php
index 7025d8739..2aa3c5d77 100644
--- a/access_denied.php
+++ b/access_denied.php
@@ -8,5 +8,5 @@
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->get('label.error'));
-$smarty->assign('content_page_name', 'access_denied.tpl');
+$smarty->assign('content_page_name', 'access_denied2.tpl');
 $smarty->display('index2.tpl');
diff --git a/client_add1.php b/client_add1.php
deleted file mode 100644
index 820a32fde..000000000
--- a/client_add1.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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('ttClientHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_clients')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_address = trim($request->getParameter('address'));
-  $cl_tax = $request->getParameter('tax');
-  $cl_projects = $request->getParameter('projects');
-} else {
-  // Do not assign all projects to a new client by default. This should help to reduce clutter.
-  // foreach ($projects as $project_item)
-  //   $cl_projects[] = $project_item['id'];
-}
-
-$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
-
-$form = new Form('clientForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','value'=>$cl_address));
-$form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-if ($show_projects)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
-  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
-
-  if ($err->no()) {
-    if (!ttClientHelper::getClientByName($cl_name)) {
-      if (ttClientHelper::insert(array('name' => $cl_name,
-        'address' => $cl_address,
-        'tax' => $cl_tax,
-        'projects' => $cl_projects,
-        'status' => ACTIVE))) {
-        header('Location: clients.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-     } else
-       $err->add($i18n->get('error.object_exists'));
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('title', $i18n->get('title.add_client'));
-$smarty->assign('content_page_name', 'client_add.tpl');
-$smarty->display('index.tpl');
diff --git a/client_delete1.php b/client_delete1.php
deleted file mode 100644
index a5f00656e..000000000
--- a/client_delete1.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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('ttClientHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_clients')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('cl')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$id = (int)$request->getParameter('id');
-$client = ttClientHelper::getClient($id);
-if (!$client) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$client_to_delete = $client['name'];
-
-$form = new Form('clientDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
-$form->addInput(array('type'=>'combobox','name'=>'delete_client_entries',
-  'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
-      header('Location: clients.php');
-      exit();
-    } else
-      $err->add($i18n->get('error.db'));
-  }
-
-  if ($request->getParameter('btn_cancel')) {
-    header('Location: clients.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('client_to_delete', $client_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.delete_client'));
-$smarty->assign('content_page_name', 'client_delete.tpl');
-$smarty->display('index.tpl');
diff --git a/feature_disabled.php b/feature_disabled.php
index 7f0bb81f5..c04afe734 100644
--- a/feature_disabled.php
+++ b/feature_disabled.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 
@@ -32,5 +8,5 @@
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->get('label.error'));
-$smarty->assign('content_page_name', 'access_denied.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'access_denied2.tpl');
+$smarty->display('index2.tpl');
diff --git a/file_download.php b/file_download.php
index ac076b27e..0c323f7f3 100644
--- a/file_download.php
+++ b/file_download.php
@@ -83,5 +83,5 @@
 }
 
 $smarty->assign('title', $i18n->get('title.download_file'));
-$smarty->assign('content_page_name', 'file_download.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'file_download2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index a222510c9..0af6f6c3c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5405");
+define("APP_VERSION", "1.19.23.5406");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 684c41fbf421859d01fbd7391d7bbb7fef430bc8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Dec 2020 17:28:19 +0000
Subject: [PATCH 1414/1848] Removed no longer used mobile pages.

---
 WEB-INF/templates/mobile/access_denied.tpl  |   1 -
 WEB-INF/templates/mobile/expense_delete.tpl |  39 --
 WEB-INF/templates/mobile/expense_edit.tpl   | 183 --------
 WEB-INF/templates/mobile/project_add.tpl    |  43 --
 WEB-INF/templates/mobile/project_delete.tpl |  18 -
 WEB-INF/templates/mobile/project_edit.tpl   |  47 --
 WEB-INF/templates/mobile/task_add.tpl       |  33 --
 WEB-INF/templates/mobile/task_delete.tpl    |  20 -
 WEB-INF/templates/mobile/task_edit.tpl      |  37 --
 WEB-INF/templates/mobile/time_delete.tpl    |  32 --
 WEB-INF/templates/mobile/time_edit.tpl      |  76 ---
 WEB-INF/templates/mobile/user_add.tpl       | 124 -----
 WEB-INF/templates/mobile/user_delete.tpl    |  20 -
 WEB-INF/templates/mobile/user_edit.tpl      | 153 ------
 initialize.php                              |   2 +-
 mobile/access_denied.php                    |  36 --
 mobile/expense_delete.php                   |  88 ----
 mobile/expense_edit.php                     | 238 ----------
 mobile/expenses.php                         |   5 +
 mobile/feature_disabled.php                 |  36 --
 mobile/index.php                            |   5 +
 mobile/project_add.php                      | 103 ----
 mobile/project_delete.php                   |  75 ---
 mobile/project_edit.php                     | 142 ------
 mobile/projects.php                         |   5 +
 mobile/task_add.php                         |  87 ----
 mobile/task_delete.php                      |  78 ----
 mobile/task_edit.php                        | 128 -----
 mobile/tasks.php                            |   5 +
 mobile/time_delete.php                      |  89 ----
 mobile/time_edit.php                        | 494 --------------------
 mobile/user_add.php                         | 186 --------
 mobile/user_delete.php                      |  87 ----
 mobile/user_edit.php                        | 245 ----------
 mobile/users.php                            |   5 +
 35 files changed, 26 insertions(+), 2939 deletions(-)
 delete mode 100644 WEB-INF/templates/mobile/access_denied.tpl
 delete mode 100644 WEB-INF/templates/mobile/expense_delete.tpl
 delete mode 100644 WEB-INF/templates/mobile/expense_edit.tpl
 delete mode 100644 WEB-INF/templates/mobile/project_add.tpl
 delete mode 100644 WEB-INF/templates/mobile/project_delete.tpl
 delete mode 100644 WEB-INF/templates/mobile/project_edit.tpl
 delete mode 100644 WEB-INF/templates/mobile/task_add.tpl
 delete mode 100644 WEB-INF/templates/mobile/task_delete.tpl
 delete mode 100644 WEB-INF/templates/mobile/task_edit.tpl
 delete mode 100644 WEB-INF/templates/mobile/time_delete.tpl
 delete mode 100644 WEB-INF/templates/mobile/time_edit.tpl
 delete mode 100644 WEB-INF/templates/mobile/user_add.tpl
 delete mode 100644 WEB-INF/templates/mobile/user_delete.tpl
 delete mode 100644 WEB-INF/templates/mobile/user_edit.tpl
 delete mode 100644 mobile/access_denied.php
 delete mode 100644 mobile/expense_delete.php
 delete mode 100644 mobile/expense_edit.php
 delete mode 100644 mobile/feature_disabled.php
 delete mode 100644 mobile/project_add.php
 delete mode 100644 mobile/project_delete.php
 delete mode 100644 mobile/project_edit.php
 delete mode 100644 mobile/task_add.php
 delete mode 100644 mobile/task_delete.php
 delete mode 100644 mobile/task_edit.php
 delete mode 100644 mobile/time_delete.php
 delete mode 100644 mobile/time_edit.php
 delete mode 100644 mobile/user_add.php
 delete mode 100644 mobile/user_delete.php
 delete mode 100644 mobile/user_edit.php

diff --git a/WEB-INF/templates/mobile/access_denied.tpl b/WEB-INF/templates/mobile/access_denied.tpl
deleted file mode 100644
index c341a4039..000000000
--- a/WEB-INF/templates/mobile/access_denied.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- empty -->
diff --git a/WEB-INF/templates/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl
deleted file mode 100644
index bd14824e2..000000000
--- a/WEB-INF/templates/mobile/expense_delete.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{$forms.expenseItemForm.open}
-<table class="mobile-table">
-<tr>
-  <td>
-  <table border="0" cellpadding="3" cellspacing="1" width="100%">
-  <tr>
-{if $user->isPluginEnabled('cl')}
-    <td class="tableHeader" align="center">{$i18n.label.client}</td>
-{/if}
-
-{if $show_project}
-    <td class="tableHeader" align="center">{$i18n.label.project}</td>
-{/if}
-    <td class="tableHeader" align="center">{$i18n.label.item}</td>
-    <td class="tableHeader" align="center">{$i18n.label.cost}</td>
-  </tr>
-  <tr>
-{if $user->isPluginEnabled('cl')}
-    <td>{$expense_item.client_name|escape}</td>
-{/if}
-{if $show_project}
-    <td>{$expense_item.project_name|escape}</td>
-{/if}
-    <td>{$expense_item.name|escape}</td>
-    <td align="right">{$expense_item.cost}</td>
-  </tr>
-  </table>
-  <table width="100%">
-  <tr>
-    <td align="center">&nbsp;</td>
-  </tr>
-  <tr>
-    <td align="center">{$forms.expenseItemForm.delete_button.control}&nbsp;&nbsp;{$forms.expenseItemForm.cancel_button.control}</td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
-{$forms.expenseItemForm.close}
diff --git a/WEB-INF/templates/mobile/expense_edit.tpl b/WEB-INF/templates/mobile/expense_edit.tpl
deleted file mode 100644
index d4834ae1a..000000000
--- a/WEB-INF/templates/mobile/expense_edit.tpl
+++ /dev/null
@@ -1,183 +0,0 @@
-<script>
-// We need a few arrays to populate project dropdown.
-// When client selection changes, the project dropdown must be re-populated with only relevant projects.
-// Format:
-// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
-// project_names[325] = "Time Tracker";   // Project name.
-
-// Prepare an array of project ids for clients.
-project_ids = new Array();
-{foreach $client_list as $client}
-  project_ids[{$client.id}] = "{$client.projects}";
-{/foreach}
-// Prepare an array of project names.
-project_names = new Array();
-{foreach $project_list as $project}
-  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
-{/foreach}
-// We'll use this array to populate project dropdown when client is not selected.
-var idx = 0;
-projects = new Array();
-{foreach $project_list as $project}
-  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
-  idx++;
-{/foreach}
-
-// Mandatory top option for project dropdown.
-empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}';
-
-// Prepare an array of predefined expenses.
-idx = 0;
-var defined_expenses = new Array();
-{foreach $predefined_expenses as $predefined_expense}
-  defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}");
-  idx++;
-{/foreach}
-
-{* Conditional include of confirmSave handler. *}
-{if $confirm_save}
-var original_date = "{$entry_date}";
-
-function confirmSave() {
-  var date_on_save = document.getElementById("date").value;
-  if (original_date != date_on_save) {
-    return confirm("{$i18n.warn.confirm_save}");
-  }
-}
-{/if}
-
-// The fillProjectDropdown function populates the project combo box with
-// projects associated with a selected client (client id is passed here as id).
-function fillProjectDropdown(id) {
-  var str_ids = project_ids[id];
-  var dropdown = document.getElementById("project");
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
-  // Remove existing content.
-  dropdown.length = 0;
-  // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label_project, '', true);
-
-  // Populate project dropdown.
-  if (!id) {
-    // If we are here, client is not selected.
-    var len = projects.length;
-    for (var i = 0; i < len; i++) {
-      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  } else if (str_ids) {
-    var ids = new Array();
-    ids = str_ids.split(",");
-    var len = ids.length;
-
-    for (var i = 0; i < len; i++) {
-      var p_id = ids[i];
-      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  }
-}
-
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-
-// The recalculateCost function recalculates cost based on the current selection
-// of predefined expense and quantity and also changes the comment accordingly.
-function recalculateCost() {
-  var quantity_control = document.getElementById("quantity");
-  // Set quantity to 1 if it is not set already.
-  if (!quantity_control.value) {
-     quantity_control.value = "1";
-  }
-
-  var comment_control = document.getElementById("item_name");
-  var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
-
-  // Calculate cost.
-  var dropdown = document.getElementById("predefined_expense");
-  if (dropdown.selectedIndex == 0) {
-    quantity_control.value = "";
-    comment_control.value = "";
-    cost_control.value = "";
-  } else {
-    comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value;
-    var quantity = quantity_control.value;
-    if (isNaN(quantity))
-      cost_control.value = "";
-    else {
-      var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
-      if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
-      var newCost = (quantity_control.value * expenseCost).toFixed(2);
-      if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
-      cost_control.value = newCost;
-    }
-  }
-}
-</script>
-
-{$forms.expenseItemForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width = "100%">
-  <tr>
-    <td valign="top">
-    <table border="0">
-{if $user->isPluginEnabled('cl')}
-    <tr>
-      <td align="right">{$i18n.label.client} {if $user->isOptionEnabled('client_required')}(*){/if}:</td>
-      <td>{$forms.expenseItemForm.client.control}</td>
-    </tr>
-{/if}
-{if $show_project}
-    <tr>
-      <td align="right">{$i18n.label.project} (*):</td>
-      <td>{$forms.expenseItemForm.project.control}</td>
-    </tr>
-{/if}
-{if $predefined_expenses}
-    <tr>
-      <td align="right">{$i18n.label.expense}:</td>
-      <td>{$forms.expenseItemForm.predefined_expense.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.quantity}:</td>
-      <td>{$forms.expenseItemForm.quantity.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.label.item}:</td>
-      <td>{$forms.expenseItemForm.item_name.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.cost}:</td>
-      <td>{$forms.expenseItemForm.cost.control} {$user->getCurrency()|escape}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.date}:</td>
-      <td>{$forms.expenseItemForm.date.control}</td>
-    </tr>
-    <tr>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td align="left">{$forms.expenseItemForm.btn_save.control} {$forms.expenseItemForm.btn_copy.control} {$forms.expenseItemForm.btn_delete.control}</td>
-    </tr>
-    </table>
-    </td>
-    </tr>
-  </table>
-  </td>
-  </tr>
-</table>
-{$forms.expenseItemForm.close}
diff --git a/WEB-INF/templates/mobile/project_add.tpl b/WEB-INF/templates/mobile/project_add.tpl
deleted file mode 100644
index d49b9a33e..000000000
--- a/WEB-INF/templates/mobile/project_add.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{$forms.projectForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.projectForm.project_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.projectForm.description.control}</td>
-        </tr>
-{if $show_users}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.users}:</td>
-          <td>{$forms.projectForm.users.control}</td>
-        </tr>
-{/if}
-{if $show_tasks}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.tasks}:</td>
-          <td>{$forms.projectForm.tasks.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.projectForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.projectForm.close}
diff --git a/WEB-INF/templates/mobile/project_delete.tpl b/WEB-INF/templates/mobile/project_delete.tpl
deleted file mode 100644
index 98d3e836d..000000000
--- a/WEB-INF/templates/mobile/project_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.projectDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$project_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.projectDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.projectDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.projectDeleteForm.close}
diff --git a/WEB-INF/templates/mobile/project_edit.tpl b/WEB-INF/templates/mobile/project_edit.tpl
deleted file mode 100644
index 871f5c1dc..000000000
--- a/WEB-INF/templates/mobile/project_edit.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{$forms.projectForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.projectForm.project_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.description}:</td>
-          <td>{$forms.projectForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.status}:</td>
-          <td>{$forms.projectForm.status.control}</td>
-        </tr>
-{if $show_users}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.users}:</td>
-          <td>{$forms.projectForm.users.control}</td>
-        </tr>
-{/if}
-{if $show_tasks}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.tasks}:</td>
-          <td>{$forms.projectForm.tasks.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.projectForm.btn_save.control} {$forms.projectForm.btn_copy.control} {$forms.projectForm.btn_delete.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.projectForm.close}
diff --git a/WEB-INF/templates/mobile/task_add.tpl b/WEB-INF/templates/mobile/task_add.tpl
deleted file mode 100644
index 68e415e1c..000000000
--- a/WEB-INF/templates/mobile/task_add.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{$forms.taskForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.taskForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.description}:</td>
-          <td>{$forms.taskForm.description.control}</td>
-        </tr>
-        <tr valign="top">
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.taskForm.projects.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.taskForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.taskForm.close}
diff --git a/WEB-INF/templates/mobile/task_delete.tpl b/WEB-INF/templates/mobile/task_delete.tpl
deleted file mode 100644
index 9f16d7c3a..000000000
--- a/WEB-INF/templates/mobile/task_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.taskDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$task_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.taskDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.taskDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.taskDeleteForm.close}
diff --git a/WEB-INF/templates/mobile/task_edit.tpl b/WEB-INF/templates/mobile/task_edit.tpl
deleted file mode 100644
index f6672c739..000000000
--- a/WEB-INF/templates/mobile/task_edit.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{$forms.taskForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.taskForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.description}:</td>
-          <td>{$forms.taskForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.taskForm.status.control}</td>
-        </tr>
-        <tr valign="top">
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.taskForm.projects.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.taskForm.btn_save.control} {$forms.taskForm.btn_copy.control} {$forms.taskForm.btn_delete.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.taskForm.close}
diff --git a/WEB-INF/templates/mobile/time_delete.tpl b/WEB-INF/templates/mobile/time_delete.tpl
deleted file mode 100644
index 2e3ac7fea..000000000
--- a/WEB-INF/templates/mobile/time_delete.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table border="0" cellpadding="3" cellspacing="1" width="100%">
-  <tr>
-{if $show_project}
-    <td class="tableHeader" align="center">{$i18n.label.project}</td>
-{/if}
-    <td class="tableHeader" align="center">{$i18n.label.duration}</td>
-    <td class="tableHeader" align="center">{$i18n.label.note}</td>
-  </tr>
-  <tr bgcolor="#f5f5f5">
-{if $show_project}
-    <td>{$time_rec.project_name|escape}</td>
-{/if}
-    <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
-    <td>{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>
-  </tr>
-  </table>
-  <table width="100%">
-  <tr>
-    <td align="center">&nbsp;</td>
-  </tr>
-  <tr>
-    <td align="center">{$forms.timeRecordForm.delete_button.control}&nbsp;&nbsp;{$forms.timeRecordForm.cancel_button.control}</td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
-{$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
deleted file mode 100644
index 3025a63f7..000000000
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{include file="time_script.tpl"}
-
-{* Conditional include of confirmSave handler. *}
-{if $confirm_save}
-<script>
-var original_date = "{$entry_date}";
-
-function confirmSave() {
-  var date_on_save = document.getElementById("date").value;
-  if (original_date != date_on_save) {
-    return confirm("{$i18n.warn.confirm_save}");
-  }
-}
-</script>
-{/if}
-
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width="100%">
-  <tr>
-    <td valign="top">
-    <table border="0">
-{if $show_client}
-    <tr><td>{$i18n.label.client}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
-{/if}
-{if $show_billable}
-    <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
-{/if}
-{if $show_paid_status}
-    <tr><td><label>{$forms.timeRecordForm.paid.control}{$i18n.label.paid}</label></td></tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-    <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
-    {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-    <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
-  {/foreach}
-{/if}
-{if $show_project}
-    <tr><td>{$i18n.label.project}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
-{/if}
-{if $show_task}
-    <tr><td>{$i18n.label.task}{if $task_required} (*){/if}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
-{/if}
-{if $show_start}
-    <tr><td>{$i18n.label.start}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
-    <tr><td>{$i18n.label.finish}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
-{/if}
-{if $show_duration}
-    <tr><td>{$i18n.label.duration}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
-{/if}
-    <tr><td>{$i18n.label.date}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
-{if $template_dropdown}
-    <tr><td>{$i18n.label.template}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.template.control}</td></tr>
-{/if}
-    <tr><td>{$i18n.label.note}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
-    <tr><td align="center">{$forms.timeRecordForm.btn_save.control} {$forms.timeRecordForm.btn_copy.control} {$forms.timeRecordForm.btn_delete.control}</td></tr>
-    </table>
-    </td>
-    </tr>
-  </table>
-  </td>
-  </tr>
-</table>
-{$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/mobile/user_add.tpl b/WEB-INF/templates/mobile/user_add.tpl
deleted file mode 100644
index 9df99ff00..000000000
--- a/WEB-INF/templates/mobile/user_add.tpl
+++ /dev/null
@@ -1,124 +0,0 @@
-<script>
-// Prepare an array of available roles. We need it for "is_client" property.
-// It is used to selectively display client selector for client roles.
-roles = new Array();
-var idx = 0;
-{foreach $active_roles as $active_role}
-roles[idx] = new Array({$active_role.id}, '{$active_role.is_client}');
-idx++;
-{/foreach}
-
-// The setDefaultRate function sets / unsets default rate for a project
-// when a corresponding checkbox is ticked.
-function setDefaultRate(element) {
-  var default_rate = document.userForm.rate.value;
-  if (default_rate == '') {
-    // No default rate, nothing to do!
-    return;
-  }
-  // Iterate through elements of the form to find and set the project rate. 
-  for (var i = 0; i < userForm.elements.length; i++) {
-    if ((userForm.elements[i].type == 'text') && (userForm.elements[i].name == ('rate_'+element.value))) {
-      if (element.checked) {
-        userForm.elements[i].value = default_rate;
-      } else {
-        userForm.elements[i].value = '';
-      }
-      break; // Element is found and set, nothing more to do, break out of the loop.
-    }
-  }
-}
-
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
-// also hides and unselects projects when "Client" user role is selected.
-function handleClientControl() {
-  var selectedRoleId = document.getElementById("role").value;
-  var clientControl = document.getElementById("client");
-  var nonClientBlock = document.getElementById("non_client_block");
-  var projectsControl = document.getElementById("projects_control");
-
-  var len = roles.length;
-  for (var i = 0; i < len; i++) {
-    if (selectedRoleId == roles[i][0]) {
-      var isClient = roles[i][1];
-      if (isClient == 1) {
-        clientControl.style.visibility = "visible";
-        nonClientBlock.style.display = "none";
-        projectsControl.style.display = "none";
-
-        // Uncheck all project checkboxes.
-        var checkboxes = document.getElementsByName("projects[]");
-        var j;
-        for (j = 0; j < checkboxes.length; j++) {
-          checkboxes[j].checked = false;
-        }
-      } else {
-        clientControl.value = "";
-        clientControl.style.visibility = "hidden";
-        nonClientBlock.style.display = "";
-        projectsControl.style.display = "";
-      }
-      break;
-    }
-  }
-}
-</script>
-
-{$forms.userForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <table cellspacing="1" cellpadding="2" border="0">
-    <tr>
-      <td align="right">{$i18n.label.person_name} (*):</td>
-      <td>{$forms.userForm.name.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.login} (*):</td>
-      <td>{$forms.userForm.login.control}</td>
-    </tr>
-{if !$auth_external}
-    <tr>
-      <td align="right">{$i18n.label.password} (*):</td>
-      <td>{$forms.userForm.pas1.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.confirm_password} (*):</td>
-      <td>{$forms.userForm.pas2.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right" nowrap>{$i18n.label.email}:</td>
-      <td>{$forms.userForm.email.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
-    </tr>
-<tbody id="non_client_block">
-{if $show_quota}
-    <tr>
-      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
-      <td>{$forms.userForm.quota_percent.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
-</tbody>
-{if $show_projects}
-<tbody id="projects_control">
-    <tr valign="top">
-      <td align="right">{$i18n.label.projects}:</td>
-      <td>{$forms.userForm.projects.control}</td>
-    </tr>
-</tbody>
-{/if}
-    <tr>
-      <td colspan="2" align="center">{$i18n.label.required_fields}</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control}</td>
-    </tr>
-  </table>
-</table>
-{$forms.userForm.close}
diff --git a/WEB-INF/templates/mobile/user_delete.tpl b/WEB-INF/templates/mobile/user_delete.tpl
deleted file mode 100644
index e85d97f1f..000000000
--- a/WEB-INF/templates/mobile/user_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.userDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$user_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.userDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.userDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.userDeleteForm.close}
diff --git a/WEB-INF/templates/mobile/user_edit.tpl b/WEB-INF/templates/mobile/user_edit.tpl
deleted file mode 100644
index 03c5db2ef..000000000
--- a/WEB-INF/templates/mobile/user_edit.tpl
+++ /dev/null
@@ -1,153 +0,0 @@
-<script>
-// Prepare an array of available roles. We need it for "is_client" property.
-// It is used to selectively display client selector for client roles.
-roles = new Array();
-var idx = 0;
-{foreach $active_roles as $active_role}
-roles[idx] = new Array({$active_role.id}, '{$active_role.is_client}');
-idx++;
-{/foreach}
-
-// Prepare an array of rates.
-// Format: project_rates[0] = Array(100, '25.00'), project_rates[1] = Array(120, '30.00'), etc...
-// First element = project_id, second element = rate for project. Quotes needed for string representation of rates.
-project_rates = new Array();
-var idx = 0;
-{foreach $rates as $rate}
-project_rates[idx] = new Array({$rate.id}, '{$rate.rate}');
-idx++;
-{/foreach}
-
-// getRate - returns a rate for the project. If rate was set for user previously we'll get this old rate
-// if project time entries for user exists. Otherwise return user default rate.
-function getRate(project_id) {
-  var length = project_rates.length;
-  for(var i = 0; i < length; i++) {
-    if(project_rates[i][0] == project_id) {
-      return project_rates[i][1];
-    }
-  }
-  var default_rate = document.userForm.rate.value;
-  return default_rate;
-}
-
-// The setRate function sets / unsets user rate for a project when a corresponding checkbox is ticked.
-function setRate(element) {
-  var default_rate = document.userForm.rate.value;
-  if (default_rate == '') {
-    // No default rate, nothing to do!
-    return;
-  }
-  // Iterate through elements of the form to find and set the project rate. 
-  for (var i = 0; i < userForm.elements.length; i++) {
-    if ((userForm.elements[i].type == 'text') && (userForm.elements[i].name == ('rate_'+element.value))) {
-      if (element.checked) {
-        userForm.elements[i].value = getRate(element.value);
-      } else {
-        userForm.elements[i].value = '';
-      }
-      break; // Element is found and set, nothing more to do, break out of the loop.
-    }
-  }
-}
-
-// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
-// also hides and unselects projects when "Client" user role is selected.
-function handleClientControl() {
-  var selectedRoleId = document.getElementById("role").value;
-  var clientControl = document.getElementById("client");
-  var nonClientBlock = document.getElementById("non_client_block");
-  var projectsControl = document.getElementById("projects_control");
-
-  var len = roles.length;
-  for (var i = 0; i < len; i++) {
-    if (selectedRoleId == roles[i][0]) {
-      var isClient = roles[i][1];
-      if (isClient == 1) {
-        clientControl.style.visibility = "visible";
-        nonClientBlock.style.display = "none";
-        projectsControl.style.display = "none";
-
-        // Uncheck all project checkboxes.
-        var checkboxes = document.getElementsByName("projects[]");
-        var j;
-        for (j = 0; j < checkboxes.length; j++) {
-          checkboxes[j].checked = false;
-        }
-      } else {
-        clientControl.value = "";
-        clientControl.style.visibility = "hidden";
-        nonClientBlock.style.display = "";
-        projectsControl.style.display = "";
-      }
-      break;
-    }
-  }
-}
-</script>
-
-
-{$forms.userForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <table cellspacing="1" cellpadding="2" border="0">
-    <tr>
-      <td align="right">{$i18n.label.person_name} (*):</td>
-      <td>{$forms.userForm.name.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.login} (*):</td>
-      <td>{$forms.userForm.login.control}</td>
-    </tr>
-{if !$auth_external}
-    <tr>
-      <td align="right">{$i18n.label.password} (*):</td>
-      <td>{$forms.userForm.pas1.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.confirm_password} (*):</td>
-      <td>{$forms.userForm.pas2.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right" nowrap>{$i18n.label.email}:</td>
-      <td>{$forms.userForm.email.control}</td>
-    </tr>
-{if $user->id != $user_id}
-    <tr>
-      <td align="right">{$i18n.form.users.role}:</td>
-      <td>{$forms.userForm.role.control} {$forms.userForm.client.control}</td>
-    </tr>
-    <tr>
-      <td align="right">{$i18n.label.status}:</td>
-      <td>{$forms.userForm.status.control}</td>
-    </tr>
-{/if}
-<tbody id="non_client_block">
-{if $show_quota}
-    <tr>
-      <td align="right">{$i18n.label.quota}&nbsp;(%):</td>
-      <td>{$forms.userForm.quota_percent.control}</td>
-    </tr>
-{/if}
-    <tr>
-      <td align="right">{$i18n.form.users.default_rate}&nbsp;(0{$user->decimal_mark}00):</td>
-      <td>{$forms.userForm.rate.control}</td>
-    </tr>
-</tbody>
-{if $show_projects}
-<tbody id="projects_control">
-    <tr valign="top">
-      <td align="right">{$i18n.label.projects}:</td>
-      <td>{$forms.userForm.projects.control}</td>
-    </tr>
-</tbody>
-{/if}
-    <tr>
-      <td colspan="2" align="center">{$i18n.label.required_fields}</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center" height="50">{$forms.userForm.btn_submit.control} {$forms.userForm.btn_delete.control}</td>
-    </tr>
-  </table>
-</table>
-{$forms.userForm.close}
diff --git a/initialize.php b/initialize.php
index 0af6f6c3c..265d13aea 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5406");
+define("APP_VERSION", "1.19.23.5407");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/access_denied.php b/mobile/access_denied.php
deleted file mode 100644
index 6e7174a26..000000000
--- a/mobile/access_denied.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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');
-
-$err->add($i18n->get('error.access_denied'));
-if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
-
-$smarty->assign('title', $i18n->get('label.error'));
-$smarty->assign('content_page_name', 'mobile/access_denied.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
deleted file mode 100644
index 48e74dc0e..000000000
--- a/mobile/expense_delete.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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('DateAndTime');
-import('ttExpenseHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ex')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-// Get the expense item we are deleting.
-$expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
-  // Prohibit deleting not ours, approved, or invoiced items.
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-if ($request->isPost()) {
-  if ($request->getParameter('delete_button')) { // Delete button pressed.
-
-    // Determine if it is okay to delete the record.
-    $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
-    if ($user->isDateLocked($item_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    if ($err->no()) {
-      // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id)) {
-        header('Location: expenses.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  }
-  if ($request->getParameter('cancel_button')) { // Cancel button pressed.
-    header('Location: expenses.php');
-    exit();
-  }
-} // isPost
-
-$form = new Form('expenseItemForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
-
-$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
-
-$smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('expense_item', $expense_item);
-$smarty->assign('show_project', $show_project);
-$smarty->assign('title', $i18n->get('title.delete_expense'));
-$smarty->assign('content_page_name', 'mobile/expense_delete.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
deleted file mode 100644
index 67813a6f1..000000000
--- a/mobile/expense_edit.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?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('ttGroupHelper');
-import('DateAndTime');
-import('ttTimeHelper');
-import('ttExpenseHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ex')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-// Get the expense item we are editing.
-$expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
-  // Prohibit editing not ours, approved, or invoiced items.
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
-$confirm_save = $user->getConfigOption('confirm_save');
-$trackingMode = $user->getTrackingMode();
-$show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-
-// Initialize variables.
-$cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
-if ($request->isPost()) {
-  $cl_date = trim($request->getParameter('date'));
-  $cl_client = $request->getParameter('client');
-  $cl_project = $request->getParameter('project');
-  $cl_item_name = trim($request->getParameter('item_name'));
-  $cl_cost = trim($request->getParameter('cost'));
-} else {
-  $cl_date = $item_date->toString($user->getDateFormat());
-  $cl_client = $expense_item['client_id'];
-  $cl_project = $expense_item['project_id'];
-  $cl_item_name = $expense_item['name'];
-  $cl_cost = $expense_item['cost'];
-}
-
-// Initialize elements of 'expenseItemForm'.
-$form = new Form('expenseItemForm');
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $trackingMode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttGroupHelper::getActiveClients(true);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillProjectDropdown(this.value);',
-    'name'=>'client',
-    'style'=>'width: 250px;',
-    'value'=>$cl_client,
-    'data'=>$active_clients,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-if ($show_project) {
-  // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming. 
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-// If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
-if ($predefined_expenses) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'recalculateCost();',
-      'name'=>'predefined_expense',
-      'style'=>'width: 250px;',
-      'value'=>$cl_predefined_expense,
-      'data'=>$predefined_expenses,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
-}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
-// Hidden control for record id.
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
-$on_click_action = 'browser_today.value=get_date();';
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
-if ($confirm_save) $on_click_action .= 'return(confirmSave());';
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
-    $err->add($i18n->get('error.client'));
-  if ($show_project && !$cl_project)
-    $err->add($i18n->get('error.project'));
-  if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
-  if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
-  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
-
-  // This is a new date for the expense item.
-  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
-
-  // Prohibit creating entries in future.
-  if (!$user->isOptionEnabled('future_entries')) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
-      $err->add($i18n->get('error.future_date'));
-  }
-  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-  // Finished validating input data.
-
-  // Save record.
-  if ($request->getParameter('btn_save')) {
-    // We need to:
-    // 1) Prohibit updating locked entries (that are in locked range).
-    // 2) Prohibit saving unlocked entries into locked range.
-
-    // Now, step by step.
-    // 1) Prohibit saving locked entries in any form.
-    if ($user->isDateLocked($item_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // 2) Prohibit saving unlocked entries into locked range.
-    if ($err->no() && $user->isDateLocked($new_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Now, an update.
-    if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),
-          'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost))) {
-        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
-        exit();
-      }
-    }
-  }
-
-  // Save as new record.
-  if ($request->getParameter('btn_copy')) {
-    // We need to prohibit saving into locked interval.
-    if ($user->isDateLocked($new_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Now, a new insert.
-    if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'client_id'=>$cl_client,
-          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
-        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  }
-
-  if ($request->getParameter('btn_delete')) {
-    header("Location: expense_delete.php?id=$cl_id");
-    exit();
-  }
-} // isPost
-
-if ($confirm_save) {
-  $smarty->assign('confirm_save', true);
-  $smarty->assign('entry_date', $cl_date);
-}
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_project', $show_project);
-$smarty->assign('predefined_expenses', $predefined_expenses);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('title', $i18n->get('title.edit_expense'));
-$smarty->assign('content_page_name', 'mobile/expense_edit.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 05d469985..463671f4a 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -34,6 +34,11 @@
 import('ttTimeHelper');
 import('ttExpenseHelper');
 
+// Mobile pages are no longer separate. Redirect to main page.
+header('Location: ../expenses.php');
+exit();
+// Below is no longer used code.
+
 // Access checks.
 if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
diff --git a/mobile/feature_disabled.php b/mobile/feature_disabled.php
deleted file mode 100644
index cf399568e..000000000
--- a/mobile/feature_disabled.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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');
-
-$err->add($i18n->get('error.feature_disabled'));
-if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
-
-$smarty->assign('title', $i18n->get('label.error'));
-$smarty->assign('content_page_name', 'mobile/access_denied.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/index.php b/mobile/index.php
index 8fc64b35e..88408af23 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -28,6 +28,11 @@
 
 require_once('../initialize.php');
 
+// Mobile pages are no longer separate. Redirect to main page.
+header('Location: ../index.php');
+exit();
+// Below is no longer used code.
+
 // Redirects for admin and client roles.
 if ($auth->isAuthenticated()) {
   if ($user->can('administer_site')) {
diff --git a/mobile/project_add.php b/mobile/project_add.php
deleted file mode 100644
index c152006f3..000000000
--- a/mobile/project_add.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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('ttProjectHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_projects')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$users = ttGroupHelper::getActiveUsers();
-foreach ($users as $user_item)
-  $all_users[$user_item['id']] = $user_item['name'];
-
-$tasks = ttGroupHelper::getActiveTasks();
-foreach ($tasks as $task_item)
-  $all_tasks[$task_item['id']] = $task_item['name'];
-$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('project_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_users = $request->getParameter('users', array());
-  $cl_tasks = $request->getParameter('tasks', array());
-} else {
-  foreach ($users as $user_item)
-    $cl_users[] = $user_item['id'];
-  foreach ($tasks as $task_item)
-    $cl_tasks[] = $task_item['id'];
-}
-
-$form = new Form('projectForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if ($show_tasks)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
-
-  if ($err->no()) {
-    if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array('name' => $cl_name,
-        'description' => $cl_description,
-        'users' => $cl_users,
-        'tasks' => $cl_tasks,
-        'status' => ACTIVE))) {
-          header('Location: projects.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.object_exists'));
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', $show_tasks);
-$smarty->assign('title', $i18n->get('title.add_project'));
-$smarty->assign('content_page_name', 'mobile/project_add.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/project_delete.php b/mobile/project_delete.php
deleted file mode 100644
index ac957e249..000000000
--- a/mobile/project_delete.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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('ttProjectHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_projects')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_project_id = (int)$request->getParameter('id');
-$project = ttProjectHelper::get($cl_project_id);
-if (!$project) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$project_to_delete = $project['name'];
-
-$form = new Form('projectDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if (ttProjectHelper::delete($cl_project_id)) {
-      header('Location: projects.php');
-      exit();
-    } else
-      $err->add($i18n->get('error.db'));
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: projects.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('project_to_delete', $project_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_project'));
-$smarty->assign('content_page_name', 'mobile/project_delete.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/project_edit.php b/mobile/project_edit.php
deleted file mode 100644
index 31da38903..000000000
--- a/mobile/project_edit.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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('ttProjectHelper');
-import('ttGroupHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_projects')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_project_id = (int)$request->getParameter('id');
-$project = ttProjectHelper::get($cl_project_id);
-if (!$project) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$users = ttGroupHelper::getActiveUsers();
-foreach ($users as $user_item)
-  $all_users[$user_item['id']] = $user_item['name'];
-
-$tasks = ttGroupHelper::getActiveTasks();
-foreach ($tasks as $task_item)
-  $all_tasks[$task_item['id']] = $task_item['name'];
-$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('project_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_status = $request->getParameter('status');
-  $cl_users = $request->getParameter('users', array());
-  $cl_tasks = $request->getParameter('tasks', array());
-} else {
-  $cl_name = $project['name'];
-  $cl_description = $project['description'];
-  $cl_status = $project['status'];
-  $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
-  $cl_tasks = explode(',', $project['tasks']);
-}
-
-$form = new Form('projectForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if ($show_tasks)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
-  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $existing_project = ttProjectHelper::getProjectByName($cl_name);
-      if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
-         // Update project information.
-         if (ttProjectHelper::update(array(
-           'id' => $cl_project_id,
-           'name' => $cl_name,
-           'description' => $cl_description,
-           'status' => $cl_status,
-           'users' => $cl_users,
-           'tasks' => $cl_tasks))) {
-           header('Location: projects.php');
-           exit();
-        } else
-           $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-
-    if ($request->getParameter('btn_copy')) {
-      if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array('name' => $cl_name,
-          'description' => $cl_description,
-          'users' => $cl_users,
-          'tasks' => $cl_tasks,
-          'status' => ACTIVE))) {
-          header('Location: projects.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-    
-    if ($request->getParameter('btn_delete')) {
-      header("Location: project_delete.php?id=$cl_project_id");
-      exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
-$smarty->assign('show_users', count($users) > 0);
-$smarty->assign('show_tasks', $show_tasks);
-$smarty->assign('title', $i18n->get('title.edit_project'));
-$smarty->assign('content_page_name', 'mobile/project_edit.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/projects.php b/mobile/projects.php
index 6a5ac572a..ee5d8dc18 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -31,6 +31,11 @@
 import('ttTeamHelper');
 import('ttGroupHelper');
 
+// Mobile pages are no longer separate. Redirect to main page.
+header('Location: ../projects.php');
+exit();
+// Below is no longer used code.
+
 // Access checks.
 if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
diff --git a/mobile/task_add.php b/mobile/task_add.php
deleted file mode 100644
index db73d1c77..000000000
--- a/mobile/task_add.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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('ttGroupHelper');
-import('ttTaskHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_projects = $request->getParameter('projects');
-} else {
-  foreach ($projects as $project_item)
-    $cl_projects[] = $project_item['id'];
-}
-
-$form = new Form('taskForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-
-  if ($err->no()) {
-    if (!ttTaskHelper::getTaskByName($cl_name)) {
-      if (ttTaskHelper::insert(array(
-        'name' => $cl_name,
-        'description' => $cl_description,
-        'status' => ACTIVE,
-        'projects' => $cl_projects))) {
-          header('Location: tasks.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.object_exists'));
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
-$smarty->assign('title', $i18n->get('title.add_task'));
-$smarty->assign('content_page_name', 'mobile/task_add.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/task_delete.php b/mobile/task_delete.php
deleted file mode 100644
index dd0dae935..000000000
--- a/mobile/task_delete.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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('ttTaskHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_task_id = (int)$request->getParameter('id');
-$task = ttTaskHelper::get($cl_task_id);
-if (!$task) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$task_to_delete = $task['name'];
-
-$form = new Form('taskDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if(ttTaskHelper::get($cl_task_id)) {
-      if (ttTaskHelper::delete($cl_task_id)) {
-        header('Location: tasks.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.db'));
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: tasks.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('task_to_delete', $task_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_task'));
-$smarty->assign('content_page_name', 'mobile/task_delete.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/task_edit.php b/mobile/task_edit.php
deleted file mode 100644
index 02a947676..000000000
--- a/mobile/task_edit.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?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('ttGroupHelper');
-import('ttTaskHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_tasks')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-$cl_task_id = (int)$request->getParameter('id');
-$task = ttTaskHelper::get($cl_task_id);
-if (!$task) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$projects = ttGroupHelper::getActiveProjects();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_status = $request->getParameter('status');
-  $cl_projects = $request->getParameter('projects');
-} else {
-  $cl_name = $task['name'];
-  $cl_description = $task['description'];
-  $cl_status = $task['status'];
-  $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
-  foreach ($assigned_projects as $project_item)
-    $cl_projects[] = $project_item['id'];
-}
-
-$form = new Form('taskForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','class'=>'mobile-textarea','value'=>$cl_description));
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $existing_task = ttTaskHelper::getTaskByName($cl_name);
-      if (!$existing_task || ($cl_task_id == $existing_task['id'])) {
-        // Update task information.
-        if (ttTaskHelper::update(array(
-          'task_id' => $cl_task_id,
-          'name' => $cl_name,
-          'description' => $cl_description,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: tasks.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-
-    if ($request->getParameter('btn_copy')) {
-      if (!ttTaskHelper::getTaskByName($cl_name)) {
-        if (ttTaskHelper::insert(array(
-          'name' => $cl_name,
-          'description' => $cl_description,
-          'status' => $cl_status,
-          'projects' => $cl_projects))) {
-          header('Location: tasks.php');
-          exit();
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.object_exists'));
-    }
-    
-    if ($request->getParameter('btn_delete')) {
-      header("Location: task_delete.php?id=$cl_task_id");
-      exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_task'));
-$smarty->assign('content_page_name', 'mobile/task_edit.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/tasks.php b/mobile/tasks.php
index 2745df23a..960990166 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -30,6 +30,11 @@
 import('form.Form');
 import('ttGroupHelper');
 
+// Mobile pages are no longer separate. Redirect to main page.
+header('Location: ../tasks.php');
+exit();
+// Below is no longer used code.
+
 // Access checks.
 if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
   header('Location: access_denied.php');
diff --git a/mobile/time_delete.php b/mobile/time_delete.php
deleted file mode 100644
index e80c5c733..000000000
--- a/mobile/time_delete.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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('ttTimeHelper');
-import('DateAndTime');
-
-// Access checks.
-if (!ttAccessAllowed('track_own_time')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id);
-if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
-  // Prohibit deleting not ours, approved, assigned to timesheet, or invoiced records.
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$trackingMode = $user->getTrackingMode();
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-
-if ($request->isPost()) {
-  if ($request->getParameter('delete_button'))  {  // Delete button pressed.
-
-    // Determine if it's okay to delete the record.
-    $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-
-    // Determine if the record is uncompleted.
-    $uncompleted = ($time_rec['duration'] == '0:00');
-
-    if ($user->isDateLocked($item_date) && !$uncompleted)
-      $err->add($i18n->get('error.range_locked'));
-
-    if ($err->no()) {
-      // Delete the record.
-      if (ttTimeHelper::delete($cl_id)) {
-        header('Location: time.php');
-        exit();
-      } else {
-        $err->add($i18n->get('error.db'));
-      }
-    }
-  }
-  if ($request->getParameter('cancel_button')) { // Cancel button pressed.
-    header('Location: time.php');
-    exit();
-  }
-} // isPost
-
-$form = new Form('timeRecordForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
-$smarty->assign('time_rec', $time_rec);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->get('title.delete_time_record'));
-$smarty->assign('content_page_name', 'mobile/time_delete.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
deleted file mode 100644
index fb3a918dc..000000000
--- a/mobile/time_edit.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?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('ttGroupHelper');
-import('ttClientHelper');
-import('ttTimeHelper');
-import('ttConfigHelper');
-import('DateAndTime');
-
-// Access checks.
-if (!ttAccessAllowed('track_own_time')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id);
-if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
-  // Prohibit editing not ours, approved, assigned to timesheet, or invoiced records.
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$user_id = $user->getUser();
-$config = new ttConfigHelper($user->getConfig());
-
-$showClient = $user->isPluginEnabled('cl');
-$showBillable = $user->isPluginEnabled('iv');
-$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
-$trackingMode = $user->getTrackingMode();
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
-$recordType = $user->getRecordType();
-$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-$item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-$confirm_save = $user->getConfigOption('confirm_save');
-
-// Initialize variables.
-$cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
-if ($request->isPost()) {
-  $cl_start = trim($request->getParameter('start'));
-  $cl_finish = trim($request->getParameter('finish'));
-  $cl_duration = trim($request->getParameter('duration'));
-  $cl_date = $request->getParameter('date');
-  $cl_note = trim($request->getParameter('note'));
-  // If we have user custom fields - collect input.
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
-  }
-  $cl_client = $request->getParameter('client');
-  $cl_project = $request->getParameter('project');
-  $cl_task = $request->getParameter('task');
-  $cl_billable = 1;
-  if ($showBillable)
-    $cl_billable = $request->getParameter('billable');
-  if ($showPaidStatus)
-    $cl_paid = $request->getParameter('paid');
-} else {
-  $cl_client = $time_rec['client_id'];
-  $cl_project = $time_rec['project_id'];
-  $cl_task = $time_rec['task_id'];
-  $cl_start = $time_rec['start'];
-  $cl_finish = $time_rec['finish'];
-  $cl_duration = $time_rec['duration'];
-  $cl_date = $item_date->toString($user->getDateFormat());
-  $cl_note = $time_rec['comment'];
-
-  // If we have time custom fields - collect values from database.
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => $custom_fields->getTimeFieldValue($cl_id, $timeField['id'], $timeField['type']));
-    }
-  }
-
-  $cl_billable = $time_rec['billable'];
-  $cl_paid = $time_rec['paid'];
-
-  // Add an info message to the form if we are editing an uncompleted record.
-  if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
-    $cl_finish = '';
-    $cl_duration = '';
-    $msg->add($i18n->get('form.time_edit.uncompleted'));
-  }
-}
-
-// Initialize elements of 'timeRecordForm'.
-$form = new Form('timeRecordForm');
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-// Note: for other tracking modes the control is added further below.
-if (MODE_TIME == $trackingMode && $showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$active_clients,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-// Billable checkbox.
-if ($showBillable)
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-
-// Paid status checkbox.
-if ($showPaidStatus)
-  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
-
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-// If we show project dropdown, add controls for project and client.
-if ($showProject) {
-  // Dropdown for projects assigned to user.
-  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
-  $project_list = $user->getAssignedProjects($options);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming.
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user))
-        $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-
-// Task dropdown.
-if ($showTask) {
-  $task_list = ttGroupHelper::getActiveTasks();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'task',
-    'style'=>'width: 250px;',
-    'value'=>$cl_task,
-    'data'=>$task_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-}
-
-// Start and finish controls.
-if ($showStart) {
-  $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
-  $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !$user->canOverridePunchMode()) {
-    // Make the start and finish fields read-only.
-    $form->getElement('start')->setEnabled(false);
-    $form->getElement('finish')->setEnabled(false);
-  }
-}
-
-// Duration control.
-if ($showDuration)
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-
-// Date field.
-$form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
-
-// If we have templates, add a dropdown to select one.
-if ($user->isPluginEnabled('tp')){
-  $template_list = ttGroupHelper::getActiveTemplates();
-  if (count($template_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillNote(this.value);',
-      'name'=>'template',
-      'style'=>'width: 250px;',
-      'data'=>$template_list,
-      'datakeys'=>array('id','name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $smarty->assign('template_dropdown', 1);
-    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
-    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
-    $smarty->assign('template_list', $template_list);
-  }
-}
-
-// Note control.
-$form->addInput(array('type'=>'textarea','name'=>'note','class'=>'mobile-textarea','value'=>$cl_note));
-
-// Hidden control for record id.
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-
-// A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save click.
-
-// Copy button.
-$on_click_action = 'browser_today.value=get_date();';
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>$on_click_action,'value'=>$i18n->get('button.copy')));
-
-// Save button.
-if ($confirm_save) $on_click_action .= 'return(confirmSave());';
-$form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>$on_click_action,'value'=>$i18n->get('button.save')));
-
-// Delete button.
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-if ($request->isPost()) {
-
-  // Validate user input.
-  if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
-    $err->add($i18n->get('error.client'));
-  // Validate input in time custom fields.
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($timeCustomFields as $timeField) {
-      // Validation is the same for text and dropdown fields.
-      if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
-    }
-  }
-  if ($showProject) {
-    if (!$cl_project) $err->add($i18n->get('error.project'));
-  }
-  if ($showTask && $task_required) {
-    if (!$cl_task) $err->add($i18n->get('error.task'));
-  }
-  if (!$cl_duration) {
-    if ('0' == $cl_duration)
-      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-    elseif ($cl_start || $cl_finish) {
-      if (!ttTimeHelper::isValidTime($cl_start))
-        $err->add($i18n->get('error.field'), $i18n->get('label.start'));
-      if ($cl_finish) {
-        if (!ttTimeHelper::isValidTime($cl_finish))
-          $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
-        if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
-      }
-    } else {
-      if ($showStart) {
-        $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
-        $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
-      }
-      if ($showDuration)
-        $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
-    }
-  } else {
-    if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-  }
-  if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
-  if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-  if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
-    $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-  }
-  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-  // Finished validating user input.
-
-  // This is a new date for the time record.
-  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
-
-  // Prohibit creating entries in future.
-  if (!$user->isOptionEnabled('future_entries')) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
-      $err->add($i18n->get('error.future_date'));
-  }
-
-  // Save record.
-  if ($request->getParameter('btn_save')) {
-    // We need to:
-    // 1) Prohibit saving locked entries in any form.
-    // 2) Prohibit saving completed unlocked entries into locked range.
-    // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-
-    // Now, step by step.
-    if ($err->no()) {
-      // 1) Prohibit saving locked entries in any form.
-      if ($user->isDateLocked($item_date))
-        $err->add($i18n->get('error.range_locked'));
-
-      // 2) Prohibit saving completed unlocked entries into locked range.
-      if ($err->no() && $user->isDateLocked($new_date))
-        $err->add($i18n->get('error.range_locked'));
-
-      // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-      $uncompleted = ($cl_finish == '' && $cl_duration == '');
-      if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
-        if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
-          // We have another not completed record.
-          $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
-        }
-      }
-    }
-
-    // Prohibit creating an overlapping record.
-    if ($err->no()) {
-      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $err->add($i18n->get('error.overlap'));
-    }
-
-    // Now, an update.
-    if ($err->no()) {
-      $res = ttTimeHelper::update(array(
-          'id'=>$cl_id,  
-          'date'=>$new_date->toString(DB_DATEFORMAT),
-          'client'=>$cl_client,
-          'project'=>$cl_project,
-          'task'=>$cl_task,
-          'start'=>$cl_start,
-          'finish'=>$cl_finish,
-          'duration'=>$cl_duration,
-          'note'=>$cl_note,
-          'billable'=>$cl_billable,
-          'paid'=>$cl_paid));
-
-      // Update time custom fields if we have them.
-      if ($res && $custom_fields && $custom_fields->timeFields) {
-        $res = $custom_fields->updateTimeFields($cl_id, $timeCustomFields);
-      }
-      if ($res)
-      {
-        header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
-        exit();
-      }
-    }
-  }
-
-  // Copy record.
-  if ($request->getParameter('btn_copy')) {
-    // We need to:
-    // 1) Prohibit saving into locked range.
-    // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-
-    // Now, step by step.
-    if ($err->no()) {
-      // 1) Prohibit saving into locked range.
-      if ($user->isDateLocked($new_date))
-        $err->add($i18n->get('error.range_locked'));
-
-      // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-      $uncompleted = ($cl_finish == '' && $cl_duration == '');
-      if ($uncompleted) {
-        $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
-        if ($not_completed_rec) {
-          // We have another not completed record.
-          $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
-        }
-      }
-    }
-
-    // Prohibit creating an overlapping record.
-    if ($err->no()) {
-      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
-        $err->add($i18n->get('error.overlap'));
-    }
-
-    // Now, a new insert.
-    if ($err->no()) {
-
-      $id = ttTimeHelper::insert(array(
-        'date'=>$new_date->toString(DB_DATEFORMAT),
-        'client'=>$cl_client,
-        'project'=>$cl_project,
-        'task'=>$cl_task,
-        'start'=>$cl_start,
-        'finish'=>$cl_finish,
-        'duration'=>$cl_duration,
-        'note'=>$cl_note,
-        'billable'=>$cl_billable,
-        'paid'=>$cl_paid));
-
-      // Insert time custom fields if we have them.
-      $res = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
-        $res = $custom_fields->insertTimeFields($id, $timeCustomFields);
-      }
-      if ($id && $res) {
-        header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
-        exit();
-      }
-      $err->add($i18n->get('error.db'));
-    }
-  }
-
-  if ($request->getParameter('btn_delete')) {
-    header("Location: time_delete.php?id=$cl_id");
-    exit();
-  }
-} // isPost
-
-if ($confirm_save) {
-  $smarty->assign('confirm_save', true);
-  $smarty->assign('entry_date', $cl_date);
-}
-$smarty->assign('show_client', $showClient);
-$smarty->assign('show_billable', $showBillable);+
-$smarty->assign('show_paid_status', $showPaidStatus);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('show_task', $showTask);
-$smarty->assign('task_required', $taskRequired);
-$smarty->assign('show_start', $showStart);
-$smarty->assign('show_duration', $showDuration);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('title', $i18n->get('title.edit_time_record'));
-$smarty->assign('content_page_name', 'mobile/time_edit.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/user_add.php b/mobile/user_add.php
deleted file mode 100644
index ed017de8a..000000000
--- a/mobile/user_add.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?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('ttTeamHelper');
-import('ttGroupHelper');
-import('ttUserHelper');
-import('form.Table');
-import('form.TableColumn');
-
-// Access checks.
-if (!ttAccessAllowed('manage_users')) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Use the "limit" plugin if we have one. Ignore include errors.
-// The "limit" plugin is not required for normal operation of Time Tracker.
-@include('../plugins/limit/user_add.php');
-
-$show_quota = $user->isPluginEnabled('mq');
-if ($user->isPluginEnabled('cl'))
-  $clients = ttGroupHelper::getActiveClients();
-
-$assigned_projects = array();
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_login = trim($request->getParameter('login'));
-  if (!$auth->isPasswordExternal()) {
-    $cl_password1 = $request->getParameter('pas1');
-    $cl_password2 = $request->getParameter('pas2');
-  }
-  $cl_email = trim($request->getParameter('email'));
-  $cl_role_id = $request->getParameter('role');
-  $cl_client_id = $request->getParameter('client');
-  $cl_rate = $request->getParameter('rate');
-  $cl_quota_percent = $request->getParameter('quota_percent');
-  $cl_projects = $request->getParameter('projects');
-  if (is_array($cl_projects)) {
-    foreach ($cl_projects as $p) {
-      if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
-      	$project_with_rate = array();
-        $project_with_rate['id'] = $p;
-        $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
-        $assigned_projects[] = $project_with_rate;
-      } else
-        $err->add($i18n->get('error.field'), 'rate_'.$p);
-    }
-  }
-}
-
-$form = new Form('userForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
-if (!$auth->isPasswordExternal()) {
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
-}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
-
-$active_roles = ttTeamHelper::getActiveRolesForUser();
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
-if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
-if ($show_quota)
-  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
-
-$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
-if ($show_projects) {
-  $projects = ttGroupHelper::getActiveProjects();
-  if (count($projects) == 0) $show_projects = false;
-}
-
-// Define classes for the projects table.
-class NameCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200,'valign'=>'top'));
-    $this->setValue('<label for = "'.$table->getName().'_'.$row.'">'.htmlspecialchars($value).'</label>');
-    return $this->toString();
-  }
-}
-class RateCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    global $assigned_projects;
-    $field = new FloatField('rate_'.$table->getValueAtName($row, 'id'));
-    $field->setFormName($table->getFormName());
-    $field->setSize(5);
-    $field->setFormat('.2');
-    foreach ($assigned_projects as $p) {
-      if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
-    }
-    $this->setValue($field->getHtml());
-    return $this->toString();
-  }
-}
-// Create projects table.
-$table = new Table('projects');
-$table->setIAScript('setDefaultRate');
-$table->setTableOptions(array('width'=>'250','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
-$table->setData($projects);
-$table->setKeyField('id');
-$table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
-$form->addInputElement($table);
-
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
-  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
-  if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
-    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-    if ($cl_password1 !== $cl_password2)
-      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-  }
-  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)) {
-      $fields = array(
-        'name' => $cl_name,
-        'login' => $cl_login,
-        'password' => $cl_password1,
-        'rate' => $cl_rate,
-        'quota_percent' => $cl_quota_percent,
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'role_id' => $cl_role_id,
-        'client_id' => $cl_client_id,
-        'projects' => $assigned_projects,
-        'email' => $cl_email);
-      if (ttUserHelper::insert($fields)) {
-        header('Location: users.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else
-      $err->add($i18n->get('error.user_exists'));
-  }
-} // isPost
-
-$smarty->assign('auth_external', $auth->isPasswordExternal());
-$smarty->assign('active_roles', $active_roles);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
-$smarty->assign('show_quota', $show_quota);
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('title', $i18n->get('title.add_user'));
-$smarty->assign('content_page_name', 'mobile/user_add.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/user_delete.php b/mobile/user_delete.php
deleted file mode 100644
index 132f73022..000000000
--- a/mobile/user_delete.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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('ttUser');
-
-// Access checks.
-if (!ttAccessAllowed('manage_users')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$user_id = (int)$request->getParameter('id');
-$user_details = $user->getUserDetails($user_id);
-if (!$user_details) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$smarty->assign('user_to_delete', $user_details['name']." (".$user_details['login'].")");
-
-// Create confirmation form.
-$form = new Form('userDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($user->markUserDeleted($user_id)) {
-      // If we deleted the "on behalf" user reset its info in session.
-      if ($user_id == $user->behalf_id) {
-        unset($_SESSION['behalf_id']);
-        unset($_SESSION['behalf_name']);
-      }
-      // If we deleted our own account, do housekeeping and logout.
-      if ($user->id == $user_id) {
-        // Remove LOGIN_COOKIE_NAME cookie that stores login name.
-        unset($_COOKIE[LOGIN_COOKIE_NAME]);
-        setcookie(LOGIN_COOKIE_NAME, NULL, -1);
-
-        $auth->doLogout();
-        header('Location: login.php');
-      } else {
-        header('Location: users.php');
-      }
-      exit();
-    } else {
-      $err->add($i18n->get('error.db'));
-    }
-  }
-  if ($request->getParameter('btn_cancel')) {
-    header('Location: users.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.delete_user'));
-$smarty->assign('content_page_name', 'mobile/user_delete.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/user_edit.php b/mobile/user_edit.php
deleted file mode 100644
index 58de5e8ab..000000000
--- a/mobile/user_edit.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?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('ttProjectHelper');
-import('ttTeamHelper');
-import('ttGroupHelper');
-import('ttUserHelper');
-import('form.Table');
-import('form.TableColumn');
-
-// Access checks.
-if (!ttAccessAllowed('manage_users')) {
-  header('Location: access_denied.php');
-  exit();
-}
-$user_id = (int)$request->getParameter('id');
-$user_details = $user->getUserDetails($user_id);
-if (!$user_details) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$show_quota = $user->isPluginEnabled('mq');
-if ($user->isPluginEnabled('cl'))
-  $clients = ttGroupHelper::getActiveClients();
-
-$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
-if ($show_projects) {
-  $projects = ttGroupHelper::getActiveProjects();
-  if (count($projects) == 0) $show_projects = false;
-}
-$assigned_projects = array();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('name'));
-  $cl_login = trim($request->getParameter('login'));
-  if (!$auth->isPasswordExternal()) {
-    $cl_password1 = $request->getParameter('pas1');
-    $cl_password2 = $request->getParameter('pas2');
-  }
-  $cl_email = trim($request->getParameter('email'));
-  $cl_role_id = $request->getParameter('role');
-  $cl_client_id = $request->getParameter('client');
-  $cl_status = $request->getParameter('status');
-  $cl_rate = $request->getParameter('rate');
-  $cl_quota_percent = $request->getParameter('quota_percent');
-  $cl_projects = $request->getParameter('projects');
-  if (is_array($cl_projects)) {
-    foreach ($cl_projects as $p) {
-      if (ttValidFloat($request->getParameter('rate_'.$p), true)) {
-        $project_with_rate = array();
-        $project_with_rate['id'] = $p;
-        $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
-        $assigned_projects[] = $project_with_rate;
-      } else
-        $err->add($i18n->get('error.field'), 'rate_'.$p);
-    }
-  }
-} else {
-  $cl_name = $user_details['name'];
-  $cl_login = $user_details['login'];
-  $cl_email = $user_details['email'];
-  $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']);
-  $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
-  $cl_role_id = $user_details['role_id'];
-  $cl_client_id = $user_details['client_id'];
-  $cl_status = $user_details['status'];
-  $cl_projects = array();
-  $assigned_projects = ttProjectHelper::getAssignedProjects($user_id);
-  foreach($assigned_projects as $p) {
-    $cl_projects[] = $p['id'];
-  }
-}
-
-$form = new Form('userForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
-if (!$auth->isPasswordExternal()) {
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
-  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
-}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
-
-$active_roles = ttTeamHelper::getActiveRolesForUser();
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
-if ($user->isPluginEnabled('cl'))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
-if ($show_quota)
-  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
-
-// Define classes for the projects table.
-class NameCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    $this->setOptions(array('width'=>200,'valign'=>'top'));
-    $this->setValue('<label for = "'.$table->getName().'_'.$row.'">'.htmlspecialchars($value).'</label>');
-    return $this->toString();
-  }
-}
-class RateCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    global $assigned_projects;
-    $field = new FloatField('rate_'.$table->getValueAtName($row,'id'));
-    $field->setFormName($table->getFormName());
-    $field->setSize(5);
-    $field->setFormat('.2');
-    foreach ($assigned_projects as $p) {
-      if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
-    }
-    $this->setValue($field->getHtml());
-    return $this->toString();
-  }
-}
-// Create projects table.
-$table = new Table('projects');
-$table->setIAScript('setRate');
-$table->setTableOptions(array('width'=>'250','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
-$table->setData($projects);
-$table->setKeyField('id');
-$table->setValue($cl_projects);
-$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));
-$form->addInputElement($table);
-
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-    // Validate user input.
-    if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
-    if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
-    if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-      if (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
-      if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-      if ($cl_password1 !== $cl_password2)
-        $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
-    }
-    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 ($err->no()) {
-      $existing_user = ttUserHelper::getUserByLogin($cl_login);
-      if (!$existing_user || ($user_id == $existing_user['id'])) {
-  
-        $fields = array(
-          'name' => $cl_name,
-          'login' => $cl_login,
-          'password' => $cl_password1,
-          'email' => $cl_email,
-          'status' => $cl_status,
-          'rate' => $cl_rate,
-          'quota_percent' => $cl_quota_percent,
-          'projects' => $assigned_projects);
-        if (in_array('manage_users', $user->rights)) {
-          $fields['role_id'] = $cl_role_id;
-          $fields['client_id'] = $cl_client_id;
-        }
-  
-        if (ttUserHelper::update($user_id, $fields)) {
-  
-          // If our own login changed, set new one in cookie to remember it.
-          if (($user_id == $user->id) && ($user->login != $cl_login)) {
-            setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
-          }
-  
-          // In case the name of the "on behalf" user has changed - set it in session.
-          if (($user->behalf_id == $user_id) && ($user->behalf_name != $cl_name)) {
-            $_SESSION['behalf_name'] = $cl_name;
-          }
-  
-          // If we deactivated our own account, do housekeeping and logout.
-          if ($user->id == $user_id && !is_null($cl_status) && $cl_status == INACTIVE) {
-            // Remove LOGIN_COOKIE_NAME cookie that stores login name.
-            unset($_COOKIE[LOGIN_COOKIE_NAME]);
-            setcookie(LOGIN_COOKIE_NAME, NULL, -1);
-  
-            $auth->doLogout();
-            header('Location: login.php');
-            exit();
-          }
-  
-          header('Location: users.php');
-          exit();
-  
-        } else
-          $err->add($i18n->get('error.db'));
-      } else
-        $err->add($i18n->get('error.user_exists'));
-    }
-  }
-  
-  if ($request->getParameter('btn_delete')) {
-    header("Location: user_delete.php?id=$user_id");
-    exit();
-  }
-} // isPost
-
-$rates = ttProjectHelper::getRates($user_id);
-$smarty->assign('rates', $rates);
-
-$smarty->assign('auth_external', $auth->isPasswordExternal());
-$smarty->assign('active_roles', $active_roles);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
-$smarty->assign('show_quota', $show_quota);
-$smarty->assign('show_projects', $show_projects);
-$smarty->assign('user_id', $user_id);
-$smarty->assign('title', $i18n->get('title.edit_user'));
-$smarty->assign('content_page_name', 'mobile/user_edit.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/users.php b/mobile/users.php
index d51cafcab..0e52072fb 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -32,6 +32,11 @@
 import('ttGroupHelper');
 import('ttTimeHelper');
 
+// Mobile pages are no longer separate. Redirect to main page.
+header('Location: ../users.php');
+exit();
+// Below is no longer used code.
+
 // Access checks.
 if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');

From 5ba5e875dcf313422b5ab1ad90fc112218deea40 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Dec 2020 18:13:07 +0000
Subject: [PATCH 1415/1848] Cosmetic style improvement.

---
 default.css    | 2 ++
 initialize.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index 595967e64..95f56094b 100644
--- a/default.css
+++ b/default.css
@@ -424,6 +424,8 @@ div.section-header {
   text-align: center;
   margin-left: auto;
   margin-right: auto;
+  margin-top: .5rem;
+  margin-bottom: .5rem;
 }
 
 /* div for a group of items in site map */
diff --git a/initialize.php b/initialize.php
index 265d13aea..47f069ba8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5407");
+define("APP_VERSION", "1.19.23.5408");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1a4d9c3418ce261883057554887f2b36f0c5425b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 8 Dec 2020 13:00:38 +0000
Subject: [PATCH 1416/1848] Improved mobile presentation of vertically stacked
 checkboxes.

---
 WEB-INF/templates/client_add2.tpl   | 2 +-
 WEB-INF/templates/client_edit2.tpl  | 2 +-
 WEB-INF/templates/project_add2.tpl  | 4 ++--
 WEB-INF/templates/project_edit2.tpl | 4 ++--
 WEB-INF/templates/task_add2.tpl     | 2 +-
 WEB-INF/templates/task_edit2.tpl    | 2 +-
 default.css                         | 6 ++++++
 initialize.php                      | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/templates/client_add2.tpl b/WEB-INF/templates/client_add2.tpl
index 2704a133c..ac7a63efc 100644
--- a/WEB-INF/templates/client_add2.tpl
+++ b/WEB-INF/templates/client_add2.tpl
@@ -28,7 +28,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
-    <td class="td-with-input">{$forms.clientForm.projects.control}</td>
+    <td class="td-with-checkboxes">{$forms.clientForm.projects.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/WEB-INF/templates/client_edit2.tpl b/WEB-INF/templates/client_edit2.tpl
index 67b79ecdf..39c965ae0 100644
--- a/WEB-INF/templates/client_edit2.tpl
+++ b/WEB-INF/templates/client_edit2.tpl
@@ -34,7 +34,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
-    <td class="td-with-input">{$forms.clientForm.projects.control}</td>
+    <td class="td-with-checkboxes">{$forms.clientForm.projects.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add2.tpl
index cd900cf36..8cc43fcaa 100644
--- a/WEB-INF/templates/project_add2.tpl
+++ b/WEB-INF/templates/project_add2.tpl
@@ -28,7 +28,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.users}:</td>
-    <td class="td-with-input">{$forms.projectForm.users.control}</td>
+    <td class="td-with-checkboxes">{$forms.projectForm.users.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
@@ -37,7 +37,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.tasks}:</td>
-    <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
+    <td class="td-with-checkboxes">{$forms.projectForm.tasks.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/WEB-INF/templates/project_edit2.tpl b/WEB-INF/templates/project_edit2.tpl
index f7b23a9ac..3ecc85a84 100644
--- a/WEB-INF/templates/project_edit2.tpl
+++ b/WEB-INF/templates/project_edit2.tpl
@@ -26,7 +26,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.users}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.users}:</td>
-    <td class="td-with-input">{$forms.projectForm.users.control}</td>
+    <td class="td-with-checkboxes">{$forms.projectForm.users.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
@@ -35,7 +35,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.tasks}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.tasks}:</td>
-    <td class="td-with-input">{$forms.projectForm.tasks.control}</td>
+    <td class="td-with-checkboxes">{$forms.projectForm.tasks.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/WEB-INF/templates/task_add2.tpl b/WEB-INF/templates/task_add2.tpl
index 1b1c4e42e..d933160af 100644
--- a/WEB-INF/templates/task_add2.tpl
+++ b/WEB-INF/templates/task_add2.tpl
@@ -20,7 +20,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
-    <td class="td-with-input">{$forms.taskForm.projects.control}</td>
+    <td class="td-with-checkboxes">{$forms.taskForm.projects.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/WEB-INF/templates/task_edit2.tpl b/WEB-INF/templates/task_edit2.tpl
index 9292ad151..c6e433b73 100644
--- a/WEB-INF/templates/task_edit2.tpl
+++ b/WEB-INF/templates/task_edit2.tpl
@@ -26,7 +26,7 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td>{$i18n.label.projects}:</td></tr>
   <tr>
     <td class="large-screen-label">{$i18n.label.projects}:</td>
-    <td class="td-with-input">{$forms.taskForm.projects.control}</td>
+    <td class="td-with-checkboxes">{$forms.taskForm.projects.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/default.css b/default.css
index 95f56094b..377197f28 100644
--- a/default.css
+++ b/default.css
@@ -233,6 +233,12 @@ div.record-list {
   text-align: left;
 }
 
+/* a table cell containing a set ov vertically stacked checkboxes */
+.td-with-checkboxes {
+  text-align: left;
+  width: 300px;
+}
+
 /* div containing how to contribute message */
 div.contribute-msg {
   text-align: center;
diff --git a/initialize.php b/initialize.php
index 47f069ba8..6ccd4533e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5408");
+define("APP_VERSION", "1.19.23.5409");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 7e9111012d54e0feae92598b508f99cb035167d0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Jan 2021 17:26:27 +0000
Subject: [PATCH 1417/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 12 +++---------
 initialize.php                |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 6d51082c7..70750349d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -390,16 +390,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Wachtwoord vergeten?',
- // TODO: re-translate form.login.about as it has changed.
- // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem.',
+'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een open source tijdregistratiesysteem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Het verzoek om het wachtwoord te herstellen is verzonden per email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker wachtwoord herstel verzoek',
-// TODO: retranslate form.reset_password.email_body as the string has changed.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
-'form.reset_password.email_body' => "Geachte medewerker,\n\nIemand, met IP adres %s, heeft verzocht uw wachtwoord in Anuko Time Tracker te herstellen. Klik op deze link als u uw wachtwoord wil wijzigen.\n\n%s\n\nAnuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek https://www.anuko.com voor meer informatie.\n\n",
+'form.reset_password.email_body' => "Beste gebruiker,\n\nIemand, met IP adres %s, heeft verzocht uw wachtwoord in Anuko Time Tracker te herstellen. Klik op deze link als u uw wachtwoord wil wijzigen.\n\n%s\n\nAnuko Time Tracker is een open source tijdregistratiesysteem. Bezoek https://www.anuko.com voor meer informatie.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Voer het nieuwe wachtwoord in en klik op Bewaren.',
@@ -546,9 +542,7 @@
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Aan',
 'form.mail.report_subject' => 'Time Tracker rapport',
-// TODO: retranslate form.mail.footer as the English string has changed.
-// 'form.mail.footer' => 'Anuko Time Tracker is an open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
-'form.mail.footer' => 'Anuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek <a href="https://www.anuko.com">www.anuko.com</a> voor meer informatie.',
+'form.mail.footer' => 'Anuko Time Tracker is een open source tijdregistratiesysteem. Bezoek <a href="https://www.anuko.com">www.anuko.com</a> voor meer informatie.',
 'form.mail.report_sent' => 'Rapport is verzonden.',
 'form.mail.invoice_sent' => 'Factuur is verzonden.',
 
diff --git a/initialize.php b/initialize.php
index 6ccd4533e..f955479f7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5409");
+define("APP_VERSION", "1.19.23.5410");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 13ad968d9729dbff50acdeb652bba5e298633c0e Mon Sep 17 00:00:00 2001
From: Josh Bowers <josh@joshbowers.com>
Date: Wed, 27 Jan 2021 07:06:47 -0800
Subject: [PATCH 1418/1848] extra '+' character and end of line causing error
 (#105)

PHP Fatal error:  Uncaught TypeError: Unsupported operand types: Smarty * int in ./time_edit.php:453
---
 time_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time_edit.php b/time_edit.php
index 89988409b..4065bf08f 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -449,7 +449,7 @@
   $smarty->assign('entry_date', $cl_date);
 }
 $smarty->assign('show_client', $showClient);
-$smarty->assign('show_billable', $showBillable);+
+$smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_paid_status', $showPaidStatus);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);

From 87b5c171f0ddb7ba24e5cf86a5238f1564e12459 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 20 Feb 2021 21:03:38 +0000
Subject: [PATCH 1419/1848] A couple of minor fixes to remove some php8
 warnings.

---
 WEB-INF/lib/DateAndTime.class.php | 3 ++-
 WEB-INF/lib/ttUser.class.php      | 1 +
 initialize.php                    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/DateAndTime.class.php b/WEB-INF/lib/DateAndTime.class.php
index 20f274265..1184bd853 100644
--- a/WEB-INF/lib/DateAndTime.class.php
+++ b/WEB-INF/lib/DateAndTime.class.php
@@ -325,6 +325,7 @@ function preprocessFormatString($format) {
     // replace locale-dependent strings
     $format = str_replace('%a', mb_substr($i18n->getWeekDayName($this->mDay), 0, 3, 'utf-8'), $format);
     $format = str_replace('%A', $i18n->getWeekDayName($this->mDay), $format);
+    /* This block is commented out because we currently do not use these formatters.
     $abbrev_month = mb_substr($i18n->monthNames[$this->mMonth], 0, 3, 'utf-8');
     $format = str_replace('%b', $abbrev_month, $format);
     $format = str_replace('%h', $abbrev_month, $format);
@@ -332,7 +333,7 @@ function preprocessFormatString($format) {
     $format = str_replace('%Z', date('O'), $format); // format as 'O' for consistency with JS strftime
     if (strpos($format, '%c') !== false) {
       $format = str_replace('%c', $this->preprocessFormatString('%a %d %b %Y %T %Z'), $format);
-    }
+    }*/
     return $format;
   }
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 72b829d31..c006350fd 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -488,6 +488,7 @@ function getUsers($options) {
     $includeSelf = isset($options['include_self']);
 
     $select_part = 'select u.id, u.group_id, u.name';
+    $include_quota = false;
     if (isset($options['include_login'])) {
       $select_part .= ', u.login';
       // Piggy-back on include_login to see if we must also include quota_percent.
diff --git a/initialize.php b/initialize.php
index f955479f7..55b1a1034 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5410");
+define("APP_VERSION", "1.19.23.5411");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f3f9921ce9d15b84658b40bf1cefe4870490e0ab Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 20 Feb 2021 21:56:04 +0000
Subject: [PATCH 1420/1848] A couple more fixes for php8.

---
 WEB-INF/lib/form/Calendar.class.php | 2 +-
 WEB-INF/lib/ttUser.class.php        | 4 +++-
 initialize.php                      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index d335e1503..337737f1c 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -80,7 +80,7 @@ function getHtml() {
     $firstOfPreviousMonth = strftime(DB_DATEFORMAT, $firstOfPreviousMonth2AM);
 
     // Print calendar header.
-    $html .= "\n\n<!-- start of calendar -->\n";
+    $html = "\n\n<!-- start of calendar -->\n";
     $html .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">'."\n";
     $html .= '  <tr><td align="center">';
     $html .= '<div class="calendarHeader">';
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index c006350fd..b01ffe687 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -347,7 +347,9 @@ function getAssignedProjects($options = null)
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
-    if ($options['include_files']) {
+    $filePart = '';
+    $fileJoin = '';
+    if (isset($options['include_files'])) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
diff --git a/initialize.php b/initialize.php
index 55b1a1034..1aa264cca 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5411");
+define("APP_VERSION", "1.19.23.5412");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6a5b24018a7c9d5744c84e8135d588b81b9ae6cf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 20 Feb 2021 23:11:47 +0000
Subject: [PATCH 1421/1848] Updated smarty to version 3.1.39 for better php8
 support.

---
 WEB-INF/lib/smarty/Smarty.class.php              |  7 +++----
 WEB-INF/lib/smarty/SmartyBC.class.php            |  2 +-
 .../smarty_internal_compile_function.php         |  5 +++++
 ...internal_compile_private_special_variable.php |  8 ++++++--
 .../smarty_internal_config_file_compiler.php     |  4 ++--
 .../sysplugins/smarty_internal_errorhandler.php  |  2 +-
 .../smarty_internal_parsetree_template.php       | 16 ++++++++--------
 WEB-INF/templates/time2.tpl                      |  2 ++
 initialize.php                                   |  2 +-
 9 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/smarty/Smarty.class.php b/WEB-INF/lib/smarty/Smarty.class.php
index 9e0ca7670..375bab133 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -6,7 +6,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3.0 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,7 +27,6 @@
  * @author    Uwe Tews   <uwe dot tews at gmail dot com>
  * @author    Rodney Rehm
  * @package   Smarty
- * @version   3.1.34-dev
  */
 /**
  * set SMARTY_DIR to absolute path to Smarty library files.
@@ -112,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.36';
+    const SMARTY_VERSION = '3.1.39';
     /**
      * define variable scopes
      */
@@ -800,7 +799,7 @@ public function addTemplateDir($template_dir, $key = null, $isConfig = false)
      * @param mixed $index    index of directory to get, null to get all
      * @param bool  $isConfig true for config_dir
      *
-     * @return array list of template directories, or directory of $index
+     * @return array|string list of template directories, or directory of $index
      */
     public function getTemplateDir($index = null, $isConfig = false)
     {
diff --git a/WEB-INF/lib/smarty/SmartyBC.class.php b/WEB-INF/lib/smarty/SmartyBC.class.php
index 836f98153..0550e46dc 100644
--- a/WEB-INF/lib/smarty/SmartyBC.class.php
+++ b/WEB-INF/lib/smarty/SmartyBC.class.php
@@ -6,7 +6,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3.0 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
index 6e408ca72..d0f2b0f4a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
@@ -58,6 +58,11 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         }
         unset($_attr[ 'nocache' ]);
         $_name = trim($_attr[ 'name' ], '\'"');
+
+        if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+	        $compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
+        }
+
         $compiler->parent_compiler->tpl_function[ $_name ] = array();
         $save = array(
             $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
index b317c9f33..d53ef51ff 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -81,6 +81,10 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 case 'template':
                     return 'basename($_smarty_tpl->source->filepath)';
                 case 'template_object':
+                    if (isset($compiler->smarty->security_policy)) {
+                        $compiler->trigger_template_error("(secure mode) template_object not permitted");
+                        break;
+                    }
                     return '$_smarty_tpl';
                 case 'current_dir':
                     return 'dirname($_smarty_tpl->source->filepath)';
@@ -94,9 +98,9 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                         break;
                     }
                     if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
-                        return "@constant('{$_index[1]}')";
+                        return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
                     } else {
-                        return "@constant({$_index[1]})";
+                        return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
                     }
                 // no break
                 case 'config':
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
index a842fa8f3..90c5dcefa 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -115,7 +115,7 @@ public function compileTemplate(Smarty_Internal_Template $template)
             $this->smarty->_debug->start_compile($this->template);
         }
         // init the lexer/parser to compile the config file
-        /* @var Smarty_Internal_ConfigFileLexer $this ->lex */
+        /* @var Smarty_Internal_ConfigFileLexer $this->lex */
         $this->lex = new $this->lexer_class(
             str_replace(
                 array(
@@ -127,7 +127,7 @@ public function compileTemplate(Smarty_Internal_Template $template)
             ) . "\n",
             $this
         );
-        /* @var Smarty_Internal_ConfigFileParser $this ->parser */
+        /* @var Smarty_Internal_ConfigFileParser $this->parser */
         $this->parser = new $this->parser_class($this->lex, $this);
         if (function_exists('mb_internal_encoding')
             && function_exists('ini_get')
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
index 0ba00659d..56dca18fa 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
@@ -65,7 +65,7 @@ public static function muteExpectedErrors()
      *
      * @return bool
      */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext = array())
     {
         $_is_muted_directory = false;
         // add the SMARTY_DIR to the list of muted directories
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
index 477232ef8..ab4c3ec3b 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
@@ -127,12 +127,12 @@ public function to_smarty_php(Smarty_Internal_Templateparser $parser)
     }
 
     private function getChunkedSubtrees() {
-    	$chunks = [];
+    	$chunks = array();
     	$currentMode = null;
-    	$currentChunk = [];
+    	$currentChunk = array();
 	    for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
 
-	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, ['textstripped', 'text', 'tag'])) {
+	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
 	    		continue;
 	    	}
 
@@ -150,19 +150,19 @@ private function getChunkedSubtrees() {
 		    if ($newMode == $currentMode) {
 			    $currentChunk[] = $this->subtrees[ $key ];
 		    } else {
-		    	$chunks[] = [
+		    	$chunks[] = array(
 		    		'mode' => $currentMode,
 				    'subtrees' => $currentChunk
-			    ];
+			    );
 		    	$currentMode = $newMode;
-			    $currentChunk = [$this->subtrees[ $key ]];
+			    $currentChunk = array($this->subtrees[ $key ]);
 		    }
 	    }
 	    if ($currentMode && $currentChunk) {
-		    $chunks[] = [
+		    $chunks[] = array(
 			    'mode' => $currentMode,
 			    'subtrees' => $currentChunk
-		    ];
+		    );
 	    }
 		return $chunks;
     }
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 487bff7cf..65216efb8 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -234,3 +234,5 @@ License: See license.txt *}
 {/if}
 </table>
 </div>
+
+{$smarty.version}
diff --git a/initialize.php b/initialize.php
index 1aa264cca..771995d88 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5412");
+define("APP_VERSION", "1.19.23.5413");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 85823f48d86f438909af947b57038a1090283030 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 26 Feb 2021 16:24:51 +0000
Subject: [PATCH 1422/1848] A minor fix to dbinstall.php to address a migration
 issue with custom fields.

---
 dbinstall.php  | 4 ++--
 initialize.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dbinstall.php b/dbinstall.php
index 59d3923f8..9960e1ade 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -691,10 +691,10 @@ function ttGenerateKeys() {
     print "Updated $clients_updated clients...<br>\n";
   }
 
-  // The update_custom_fields function updates option_id field field in tt_custom_field_log table.
+  // The update_custom_fields function updates option_id field in tt_custom_field_log table.
   if ($_POST['update_custom_fields']) {
     $mdb2 = getConnection();
-    $sql = "update tt_custom_field_log set option_id = value where field_id in (select id from tt_custom_fields where type = 2)";
+    $sql = "update tt_custom_field_log set option_id = value where option_id is null and value is not null and field_id in (select id from tt_custom_fields where type = 2)";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       die($affected->getMessage());
diff --git a/initialize.php b/initialize.php
index 771995d88..5323d00b8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5413");
+define("APP_VERSION", "1.19.23.5414");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 40f3d9345adc20e6f28eb9f59e2489aff87fecf5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 16:00:53 +0000
Subject: [PATCH 1423/1848] Fixed a critical security vulnerability with
 password resets.

---
 WEB-INF/templates/report.tpl | 4 ++++
 initialize.php               | 2 +-
 password_reset.php           | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index f7ef4ff2e..0a13ea83a 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -117,6 +117,7 @@
         {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
         {if $bean->getAttribute('chfiles')}<td></td>{/if}
         {if $use_checkboxes}<td></td>{/if}
+        {* <td></td>{* column for edit icons *}
       </tr>
       <tr><td>&nbsp;</td></tr>
       {/if}
@@ -171,6 +172,7 @@
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
+     {* <td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{* column for edit icons *}
       </tr>
     {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
       <tr>
@@ -220,6 +222,7 @@
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
+    {* <td></td>{* column for edit icons *}
       </tr>
   {/if}
   <!-- print totals -->
@@ -261,6 +264,7 @@
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
+    {* <td></td>{* column for edit icons *}
       </tr>
 {/if}
     </table>
diff --git a/initialize.php b/initialize.php
index 5323d00b8..e2aeb6c85 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.23.5414");
+define("APP_VERSION", "1.19.24.5415");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/password_reset.php b/password_reset.php
index 5beafb7fc..53099b9af 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -46,7 +46,10 @@
 
   if ($err->no()) {
     // Prepare and save a temporary reference for user.
-    $temp_ref = md5(uniqid());
+    $cryptographically_strong = true;
+    $random_bytes = openssl_random_pseudo_bytes(16, $cryptographically_strong);
+    if ($random_bytes === false) die ("openssl_random_pseudo_bytes function call failed...");
+    $temp_ref = bin2hex($random_bytes);
     ttUserHelper::saveTmpRef($temp_ref, $user->id);
 
     $user_i18n = null;

From 1339c3a043a916cd7f5142c3aec4a956b598f69c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 16:19:09 +0000
Subject: [PATCH 1424/1848] Added protection against brute force guessing of
 random codes used in password resets.

---
 WEB-INF/lib/ttUserHelper.class.php | 5 +++++
 initialize.php                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index eac057304..accabe1fe 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -82,6 +82,11 @@ static function getUserByEmail($email) {
   static function getUserIdByTmpRef($ref) {
     $mdb2 = getConnection();
 
+    // Some protection for brute force attacks to guess a reference for user.
+    // This limits an available window for brute force guessing to 1 hour.
+    $sql = "delete from tt_tmp_refs where created < now() - interval 1 hour";
+    $affected = $mdb2->exec($sql);
+
     $sql = "select user_id from tt_tmp_refs where ref = ".$mdb2->quote($ref);
     $res = $mdb2->query($sql);
 
diff --git a/initialize.php b/initialize.php
index e2aeb6c85..63215b71e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.24.5415");
+define("APP_VERSION", "1.19.24.5416");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9a8ee13a037931d29130379c9ad193613b45998c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 17:35:22 +0000
Subject: [PATCH 1425/1848] Fixed SQL injection vulnerability in
 group_edit.php.

---
 group_edit.php | 6 ++++--
 initialize.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/group_edit.php b/group_edit.php
index c8ad2e142..f60a11331 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -32,15 +32,17 @@
 import('ttRoleHelper');
 import('ttConfigHelper');
 
+$id = (int)$request->getParameter('id');
+
 // Access checks.
 // There are 4 distinct situations:
 //   1) Editing home group in get or post.
 //   2) Editing a subgroup in get or post.
 // We'll check access separately as it is about different right checks.
 if ($request->isGet()) {
-  $group_id = $request->getParameter('id') ? $request->getParameter('id') : $user->getGroup();
+  $group_id = $request->getParameter('id') ? (int)$request->getParameter('id') : $user->getGroup();
 } else {
-  $group_id = $request->getParameter('group') ? $request->getParameter('group') : $user->getGroup();
+  $group_id = $request->getParameter('group') ? (int)$request->getParameter('group') : $user->getGroup();
 }
 $home_group = $user->group_id == $group_id;
 if ($home_group) {
diff --git a/initialize.php b/initialize.php
index 63215b71e..f069495f9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.24.5416");
+define("APP_VERSION", "1.19.25.5417");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2b34dc2006121e466513b50015262c6936c876bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 17:37:58 +0000
Subject: [PATCH 1426/1848] Removed garbage introduced in previous commit.

---
 group_edit.php | 2 --
 initialize.php | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/group_edit.php b/group_edit.php
index f60a11331..49bd1e613 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -32,8 +32,6 @@
 import('ttRoleHelper');
 import('ttConfigHelper');
 
-$id = (int)$request->getParameter('id');
-
 // Access checks.
 // There are 4 distinct situations:
 //   1) Editing home group in get or post.
diff --git a/initialize.php b/initialize.php
index f069495f9..7863d0aba 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.25.5417");
+define("APP_VERSION", "1.19.25.5418");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From fdf67755ae8396162b19332e3b10763c9ea274b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 17:49:19 +0000
Subject: [PATCH 1427/1848] More protection against sql injections.

---
 group_edit.php | 28 ++--------------------------
 groups.php     | 30 +++---------------------------
 initialize.php |  2 +-
 3 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/group_edit.php b/group_edit.php
index 49bd1e613..d972ba387 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/groups.php b/groups.php
index f335153ce..8d99e17fd 100644
--- a/groups.php
+++ b/groups.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttUser');
@@ -42,7 +18,7 @@
 // End of access checks.
 
 if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
+  $group_id = (int)$request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
 } else {
   $group_id = $user->getGroup();
diff --git a/initialize.php b/initialize.php
index 7863d0aba..40ccda78d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.25.5418");
+define("APP_VERSION", "1.19.25.5419");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 00885b9872c31eb3298b047ee2a27b278248d4c5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 18:22:24 +0000
Subject: [PATCH 1428/1848] Added casts to int to sanitize some post
 parameters.

---
 admin_group_add.php     | 28 ++--------------------------
 admin_group_delete.php  | 28 ++--------------------------
 admin_group_edit.php    | 28 ++--------------------------
 admin_groups.php        | 28 ++--------------------------
 admin_options.php       | 28 ++--------------------------
 cf_custom_field_add.php | 36 +++++-------------------------------
 initialize.php          |  2 +-
 7 files changed, 16 insertions(+), 162 deletions(-)

diff --git a/admin_group_add.php b/admin_group_add.php
index c42644f09..45aa32261 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 944500195..0cea02b32 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/admin_group_edit.php b/admin_group_edit.php
index ee639d042..81588ebec 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/admin_groups.php b/admin_groups.php
index ae66d1501..8dffd3931 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttOrgHelper');
diff --git a/admin_options.php b/admin_options.php
index 9448ef788..64b28b9a4 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 961bdd69a..6cfd87256 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
@@ -44,11 +20,9 @@
 
 if ($request->isPost()) {
   $cl_field_name = trim($request->getParameter('name'));
-  $cl_entity_type = $request->getParameter('entity');
-  $cl_field_type = $request->getParameter('type');
-  $cl_required = $request->getParameter('required');
-  if (!$cl_required)
-    $cl_required = 0;
+  $cl_entity_type = (int)$request->getParameter('entity');
+  $cl_field_type = (int)$request->getParameter('type');
+  $cl_required = (int)$request->getParameter('required');
 }
 
 $form = new Form('fieldForm');
diff --git a/initialize.php b/initialize.php
index 40ccda78d..c5edb812a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.25.5419");
+define("APP_VERSION", "1.19.25.5420");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bc006920353e50e27d815a8f5d529269080db40e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 18:50:14 +0000
Subject: [PATCH 1429/1848] More sanitizing of user input.

---
 cf_custom_field_delete.php    | 28 ++--------------------------
 cf_custom_field_edit.php      | 28 ++--------------------------
 cf_custom_fields.php          | 28 ++--------------------------
 cf_dropdown_option_add.php    | 28 ++--------------------------
 cf_dropdown_option_delete.php | 30 +++---------------------------
 cf_dropdown_option_edit.php   | 30 +++---------------------------
 cf_dropdown_options.php       | 28 ++--------------------------
 7 files changed, 16 insertions(+), 184 deletions(-)

diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index c8a133692..ba222c657 100644
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
diff --git a/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 79ce1310b..3f959ee22 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index cf14f25eb..6552bb7f6 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index de598186e..537ad3313 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 999094e53..e6eeeeb75 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
@@ -39,7 +15,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
 $option = CustomFields::getOptionName($cl_id);
 if (!$option) {
   header('Location: access_denied.php');
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 4f1103d7b..4cea7358f 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
@@ -39,7 +15,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$cl_id = $request->getParameter('id');
+$cl_id = (int)$request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
 if (!$cl_name) {
   header('Location: access_denied.php');
diff --git a/cf_dropdown_options.php b/cf_dropdown_options.php
index 3b4663f8c..06f53a7d8 100644
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');

From 3eeb4e0d01a1fe4895fd2ceb478c16d7e4473850 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 27 Feb 2021 23:13:24 +0000
Subject: [PATCH 1430/1848] Added edit icons on reports to allow for quick
 edits.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 66 ++++++++++++++++-----------
 WEB-INF/lib/ttReportHelper.class.php  | 14 +++---
 WEB-INF/lib/ttTimeHelper.class.php    | 66 ++++++++++++++++-----------
 WEB-INF/lib/ttUserHelper.class.php    | 28 +-----------
 WEB-INF/templates/report.tpl          | 13 ++++--
 expense_edit.php                      |  1 +
 initialize.php                        |  2 +-
 time_edit.php                         |  1 +
 8 files changed, 102 insertions(+), 89 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 303ca5767..0de7eca11 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // The ttExpenseHelper is a class to help with expense items.
 class ttExpenseHelper {
@@ -172,6 +148,44 @@ static function getItem($id) {
     return false;
   }
 
+  // getOnBehalfItem - retrieves an expense item on behalf of user.
+  // If such item is found, it also sets on behalf user.
+  static function getOnBehalfItem($id) {
+    global $user;
+
+    // Determine user id for item.
+    $user_id = ttExpenseHelper::getUserForItem($id);
+    $user_valid = $user->isUserValid($user_id);
+
+    if (!$user_valid) return false;
+
+    // Set on behalf user.
+    $user->setOnBehalfUser($user_id);
+    // Get on behalf record.
+    return ttExpenseHelper::getItem($id);
+  }
+
+  // getUserForItem - retrieves user id for an expense item.
+  static function getUserForItem($id) {
+    global $user;
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $mdb2 = getConnection();
+
+    // Obtain user_id for the expense item.
+    $sql = "select ei.user_id from tt_expense_items ei ".
+      " where ei.id = $id and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    if (!$res->numRows()) return false;
+
+    $val = $res->fetchRow();
+    $user_id = $val['user_id'];
+    return $user_id;
+  }
+
   // getItemForFileView - retrieves an expense item identified by its id for
   // attachment view operation.
   //
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 294225e0c..b24890e7d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -350,9 +350,10 @@ static function getItems($options) {
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
       array_push($fields, "null as expense"); 
     }
-    // Add approved.
-    if ($options['show_approved'])
-      array_push($fields, 'l.approved');
+    // Add the fields used to determine if we show an edit icon for record.
+    array_push($fields, 'l.approved');
+    array_push($fields, 'l.timesheet_id');
+    array_push($fields, 'l.invoice_id');
     // Add paid status.
     if ($canViewReports && $options['show_paid'])
       array_push($fields, 'l.paid');
@@ -513,9 +514,10 @@ static function getItems($options) {
         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
-      // Add approved.
-      if ($options['show_approved'])
-        array_push($fields, 'ei.approved');
+      // Add the fields used to determine if we show an edit icon for record.
+      array_push($fields, 'ei.approved');
+      array_push($fields, 'null as timesheet_id');
+      array_push($fields, 'ei.invoice_id');
       // Add paid status.
       if ($canViewReports && $options['show_paid'])
         array_push($fields, 'ei.paid');
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index faa1197cd..f0b1ea100 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('DateAndTime');
 
@@ -747,6 +723,44 @@ static function getRecord($id) {
     return false;
   }
 
+  // getOnBehalfRecord - retrieves a time record on behalf of user.
+  // If such record is found, it also sets on behalf user.
+  static function getOnBehalfRecord($id) {
+    global $user;
+
+    // Determine user id for record.
+    $user_id = ttTimeHelper::getUserForRecord($id);
+    $user_valid = $user->isUserValid($user_id);
+
+    if (!$user_valid) return false;
+
+    // Set on behalf user.
+    $user->setOnBehalfUser($user_id);
+    // Get on behalf record.
+    return ttTimeHelper::getRecord($id);
+  }
+
+  // getUserForRecord - retrieves user id for a time record.
+  static function getUserForRecord($id) {
+    global $user;
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $mdb2 = getConnection();
+
+    // Obtain user_id for the time record.
+    $sql = "select l.user_id from tt_log l ".
+      " where l.id = $id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+    if (!$res->numRows()) return false;
+
+    $val = $res->fetchRow();
+    $user_id = $val['user_id'];
+    return $user_id;
+  }
+
   // getRecordForFileView - retrieves a time record identified by its id for
   // attachment view operation.
   //
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index accabe1fe..d4fc8d804 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttTeamHelper');
 
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 0a13ea83a..6acdf32d3 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -117,7 +117,7 @@
         {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
         {if $bean->getAttribute('chfiles')}<td></td>{/if}
         {if $use_checkboxes}<td></td>{/if}
-        {* <td></td>{* column for edit icons *}
+        <td></td>{* column for edit icons *}
       </tr>
       <tr><td>&nbsp;</td></tr>
       {/if}
@@ -172,7 +172,12 @@
       {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
       {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
-     {* <td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{* column for edit icons *}
+    {if $item.approved || $item.timesheet_id || $item.invoice_id}
+        <td>&nbsp;</td>
+    {else}
+      {if 1 == $item.type}<td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
+      {if 2 == $item.type}<td><a href="expense_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
+    {/if}
       </tr>
     {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
       <tr>
@@ -222,7 +227,7 @@
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
-    {* <td></td>{* column for edit icons *}
+        <td></td>{* column for edit icons *}
       </tr>
   {/if}
   <!-- print totals -->
@@ -264,7 +269,7 @@
     {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
     {if $bean->getAttribute('chfiles')}<td></td>{/if}
     {if $use_checkboxes}<td></td>{/if}
-    {* <td></td>{* column for edit icons *}
+        <td></td>{* column for edit icons *}
       </tr>
 {/if}
     </table>
diff --git a/expense_edit.php b/expense_edit.php
index 092f33c11..5d1e75044 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -21,6 +21,7 @@
 $cl_id = (int)$request->getParameter('id');
 // Get the expense item we are editing.
 $expense_item = ttExpenseHelper::getItem($cl_id);
+if (!$expense_item) $expense_item = ttExpenseHelper::getOnBehalfItem($cl_id);
 if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
   // Prohibit editing not ours, approved, or invoiced items.
   header('Location: access_denied.php');
diff --git a/initialize.php b/initialize.php
index c5edb812a..3a08a9e78 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.25.5420");
+define("APP_VERSION", "1.19.26.5421");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index 4065bf08f..774add2c6 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -18,6 +18,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id);
+if (!$time_rec) $time_rec = ttTimeHelper::getOnBehalfRecord($cl_id);
 if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
   // Prohibit editing not ours, approved, assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');

From 9c9e7d7976fed5b80c0d9dd74b7424f890584fc8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Mar 2021 21:06:24 +0000
Subject: [PATCH 1431/1848] Sanitizing of user input on charts.php.

---
 WEB-INF/templates/time2.tpl | 2 --
 charts.php                  | 4 ++--
 initialize.php              | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 65216efb8..487bff7cf 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -234,5 +234,3 @@ License: See license.txt *}
 {/if}
 </table>
 </div>
-
-{$smarty.version}
diff --git a/charts.php b/charts.php
index d4fb52b3b..026f97463 100644
--- a/charts.php
+++ b/charts.php
@@ -35,7 +35,7 @@
   exit();
 }
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($request->getParameter('user'))) {
+  if (!$user->isUserValid((int)$request->getParameter('user'))) {
     header('Location: access_denied.php'); // Wrong user id on post.
     exit();
   }
@@ -45,7 +45,7 @@
 // Determine user for which we display this page.
 $userChanged = $request->getParameter('user_changed');
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
diff --git a/initialize.php b/initialize.php
index 3a08a9e78..faa912032 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5421");
+define("APP_VERSION", "1.19.26.5422");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d0af0f472a64e19dfb48473cca1c374363fb6471 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 Mar 2021 21:24:18 +0000
Subject: [PATCH 1432/1848] Some more sanitizing of post parameters.

---
 charts.php     | 6 +++---
 initialize.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts.php b/charts.php
index 026f97463..9dc29f588 100644
--- a/charts.php
+++ b/charts.php
@@ -43,7 +43,7 @@
 // End of access checks.
 
 // Determine user for which we display this page.
-$userChanged = $request->getParameter('user_changed');
+$userChanged = (int)$request->getParameter('user_changed');
 if ($request->isPost() && $userChanged) {
   $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
@@ -63,12 +63,12 @@
 $_SESSION['date'] = $cl_date;
 
 if ($request->isPost()) {
-  $cl_interval = $request->getParameter('interval');
+  $cl_interval = (int)$request->getParameter('interval');
   if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
   $_SESSION['chart_interval'] = $cl_interval;
   $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
 
-  $cl_type = $request->getParameter('type');
+  $cl_type = (int)$request->getParameter('type');
   if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
   $_SESSION['chart_type'] = $cl_type;
   $uc->setValue(SYSC_CHART_TYPE, $cl_type);
diff --git a/initialize.php b/initialize.php
index faa912032..f54941375 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5422");
+define("APP_VERSION", "1.19.26.5423");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2eaab13803846b91c90d49680099968731d4718e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Mar 2021 15:12:37 +0000
Subject: [PATCH 1433/1848] A bit more of sanitizing work for posts.

---
 WEB-INF/lib/ttUser.class.php | 14 ++++++++------
 cron.php                     | 28 ++--------------------------
 custom_css.php               | 28 ++--------------------------
 dbinstall.php                | 28 ++--------------------------
 display_options.php          | 36 ++++++------------------------------
 initialize.php               |  2 +-
 6 files changed, 21 insertions(+), 115 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index b01ffe687..fcfc1b9d5 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -617,6 +617,7 @@ function getUserDetails($user_id) {
     $mdb2 = getConnection();
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
+    $uid = (int)$user_id;
 
     // Determine max rank. If we are searching in on behalf group
     // then rank restriction does not apply.
@@ -624,7 +625,7 @@ function getUserDetails($user_id) {
 
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.quota_percent, u.email from tt_users u".
       " left join tt_roles r on (u.role_id = r.id)".
-      " where u.id = $user_id and u.group_id = $group_id and u.org_id = $org_id and u.status is not null".
+      " where u.id = $uid and u.group_id = $group_id and u.org_id = $org_id and u.status is not null".
       " and (r.rank < $max_rank or (r.rank = $max_rank and u.id = $this->id))"; // Users with lesser roles or self.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -897,6 +898,7 @@ function setOnBehalfGroup($group_id) {
 
   // setOnBehalfUser sets on behalf user both the object and the session.
   function setOnBehalfUser($user_id) {
+    $uid = (int)$user_id; // In case we forgot to sanitize $user_id before getting here.
 
     // Unset things first.
     $this->behalf_id = null;
@@ -906,16 +908,16 @@ function setOnBehalfUser($user_id) {
     unset($_SESSION['behalf_name']);
 
     // No need to set if user is us.
-    if ($user_id == $this->id) return;
+    if ($uid == $this->id) return;
 
     // No need to set if user id is not valid.
-    if (!$this->isUserValid($user_id)) return;
+    if (!$this->isUserValid($uid)) return;
 
     // We are good to set on behalf user.
-    $onBehalfUserName = ttUserHelper::getUserName($user_id);
-    $_SESSION['behalf_id'] = $user_id;
+    $onBehalfUserName = ttUserHelper::getUserName($uid);
+    $_SESSION['behalf_id'] = $uid;
     $_SESSION['behalf_name'] = $onBehalfUserName;
-    $this->behalf_id = $user_id;
+    $this->behalf_id = $uid;
     $this->behalf_name = $onBehalfUserName;
 
     $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);
diff --git a/cron.php b/cron.php
index 331b4f36e..5adced71e 100644
--- a/cron.php
+++ b/cron.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 /*
  * cron.php - this file is an entry point to execute scheduled jobs in Time Tracker.
diff --git a/custom_css.php b/custom_css.php
index 979e9a5bd..9aa287321 100644
--- a/custom_css.php
+++ b/custom_css.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // This file outputs custom css for group, if defined.
 
diff --git a/dbinstall.php b/dbinstall.php
index 9960e1ade..322b05663 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('WEB-INF/config.php');
 require_once('WEB-INF/lib/common.lib.php');
diff --git a/display_options.php b/display_options.php
index 8df3ba2b2..1d3948fd9 100644
--- a/display_options.php
+++ b/display_options.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttConfigHelper');
@@ -40,10 +16,10 @@
 $config = $user->getConfigHelper();
 
 if ($request->isPost()) {
-  $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row');
-  $cl_time_not_complete_days = $request->getParameter('time_not_complete_days');
-  $cl_record_custom_fields = $request->getParameter('record_custom_fields');
-  $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row');
+  $cl_time_note_on_separate_row = (bool)$request->getParameter('time_note_on_separate_row');
+  $cl_time_not_complete_days = (bool)$request->getParameter('time_not_complete_days');
+  $cl_record_custom_fields = (bool)$request->getParameter('record_custom_fields');
+  $cl_report_note_on_separate_row = (bool)$request->getParameter('report_note_on_separate_row');
   $cl_custom_css = trim($request->getParameter('custom_css'));
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
diff --git a/initialize.php b/initialize.php
index f54941375..eb9fd4b94 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5423");
+define("APP_VERSION", "1.19.26.5424");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 477f47a63e8e476f6c84edff830bba03c7610667 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Mar 2021 15:55:04 +0000
Subject: [PATCH 1434/1848] Some more sanitizing.

---
 expense_edit.php | 4 ++--
 expenses.php     | 6 +++---
 initialize.php   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/expense_edit.php b/expense_edit.php
index 5d1e75044..9c85bdb79 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -43,14 +43,14 @@
   $cl_item_name = trim($request->getParameter('item_name'));
   $cl_cost = trim($request->getParameter('cost'));
   if ($user->isPluginEnabled('ps'))
-    $cl_paid = $request->getParameter('paid');
+    $cl_paid = (bool)$request->getParameter('paid');
 } else {
   $cl_date = $item_date->toString($user->getDateFormat());
   $cl_client = $expense_item['client_id'];
   $cl_project = $expense_item['project_id'];
   $cl_item_name = $expense_item['name'];
   $cl_cost = $expense_item['cost'];
-  $cl_paid = $expense_item['paid'];
+  $cl_paid = (bool)$expense_item['paid'];
 }
 
 // Initialize elements of 'expenseItemForm'.
diff --git a/expenses.php b/expenses.php
index 170f0cd3b..e82d9d379 100644
--- a/expenses.php
+++ b/expenses.php
@@ -33,7 +33,7 @@
   exit();
 }
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($request->getParameter('user'))) {
+  if (!$user->isUserValid((int)$request->getParameter('user'))) {
     header('Location: access_denied.php'); // Wrong user id on post.
     exit();
   }
@@ -41,9 +41,9 @@
 // End of access checks.
 
 // Determine user for which we display this page.
-$userChanged = $request->getParameter('user_changed');
+$userChanged = (int)$request->getParameter('user_changed');
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
diff --git a/initialize.php b/initialize.php
index eb9fd4b94..344ec8229 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5424");
+define("APP_VERSION", "1.19.26.5425");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3a3c14ffd3a4266aeac52e7da19d7c0fa684792d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Mar 2021 17:57:57 +0000
Subject: [PATCH 1435/1848] A bit more sanitizing of post parameters.

---
 export.php              | 28 ++--------------------------
 file_download.php       | 28 ++--------------------------
 group_add.php           | 28 ++--------------------------
 group_advanced_edit.php | 28 ++--------------------------
 group_delete.php        | 28 ++--------------------------
 group_edit.php          | 12 ++++++------
 import.php              | 28 ++--------------------------
 initialize.php          |  2 +-
 invoice_add.php         | 30 +++---------------------------
 invoice_delete.php      | 28 ++--------------------------
 invoice_send.php        | 28 ++--------------------------
 invoice_view.php        | 28 ++--------------------------
 invoices.php            | 28 ++--------------------------
 13 files changed, 30 insertions(+), 294 deletions(-)

diff --git a/export.php b/export.php
index 2206def2d..2bcba2dce 100644
--- a/export.php
+++ b/export.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttOrgExportHelper');
diff --git a/file_download.php b/file_download.php
index 0c323f7f3..ff7e1633a 100644
--- a/file_download.php
+++ b/file_download.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/group_add.php b/group_add.php
index f39ec016c..408b62168 100644
--- a/group_add.php
+++ b/group_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index 03c7711a2..7ea077183 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/group_delete.php b/group_delete.php
index 2865351a4..377bb80e9 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/group_edit.php b/group_edit.php
index d972ba387..e87f4015e 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -39,7 +39,7 @@
 // End of access checks.
 
 // Set on behalf group accordingly.
-$groupChanged = $request->getParameter('group_changed');
+$groupChanged = (bool)$request->getParameter('group_changed');
 if ($request->isPost() && $groupChanged) {
  $user->setOnBehalfGroup($group_id);
 }
@@ -62,11 +62,11 @@
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');
   $cl_record_type = $request->getParameter('record_type');
-  $cl_punch_mode = $request->getParameter('punch_mode');
-  $cl_allow_overlap = $request->getParameter('allow_overlap');
-  $cl_future_entries = $request->getParameter('future_entries');
-  $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
-  $cl_confirm_save = $request->getParameter('confirm_save');
+  $cl_punch_mode = (bool)$request->getParameter('punch_mode');
+  $cl_allow_overlap = (bool)$request->getParameter('allow_overlap');
+  $cl_future_entries = (bool)$request->getParameter('future_entries');
+  $cl_uncompleted_indicators = (bool)$request->getParameter('uncompleted_indicators');
+  $cl_confirm_save = (bool)$request->getParameter('confirm_save');
 } else {
   $cl_currency = ($group['currency'] == '' ? CURRENCY_DEFAULT : $group['currency']);
   $cl_lang = $group['lang'];
diff --git a/import.php b/import.php
index 938fdb3dd..b743b3f5a 100644
--- a/import.php
+++ b/import.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttOrgImportHelper');
diff --git a/initialize.php b/initialize.php
index 344ec8229..22d73352c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5425");
+define("APP_VERSION", "1.19.26.5426");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_add.php b/invoice_add.php
index 273d761ef..9c5cd641a 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -45,7 +21,7 @@
 
 if ($request->isPost()) {
   $cl_date = $request->getParameter('date');
-  $cl_client = $request->getParameter('client');
+  $cl_client = (int)$request->getParameter('client');
   $cl_project = $request->getParameter('project');
   $cl_number = trim($request->getParameter('number'));
   $cl_start = $request->getParameter('start');
diff --git a/invoice_delete.php b/invoice_delete.php
index 89ea372a3..5b473dfa0 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/invoice_send.php b/invoice_send.php
index c69edbd9d..3a4aa25f9 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/invoice_view.php b/invoice_view.php
index 5e11781c3..a4d0cc50f 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('DateAndTime');
diff --git a/invoices.php b/invoices.php
index 3b6fdc0da..305dcefdc 100644
--- a/invoices.php
+++ b/invoices.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');

From 8f7f1007b7e1bdbe001b51407ee997b07cc4c00b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Mar 2021 21:19:21 +0000
Subject: [PATCH 1436/1848] Some more sanitizing work.

---
 locking.php             | 28 ++----------------
 login.php               | 28 ++----------------
 logout.php              | 28 ++----------------
 notification_add.php    | 28 ++----------------
 notification_delete.php | 28 ++----------------
 notification_edit.php   | 28 ++----------------
 notifications.php       | 28 ++----------------
 password_change.php     | 28 ++----------------
 plugins.php             | 64 +++++++++++++----------------------------
 9 files changed, 36 insertions(+), 252 deletions(-)

diff --git a/locking.php b/locking.php
index 9b23c876a..04c8d9419 100644
--- a/locking.php
+++ b/locking.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/login.php b/login.php
index b4822ac82..31d7f6d19 100644
--- a/login.php
+++ b/login.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/logout.php b/logout.php
index e2c6cfedc..116bbe428 100644
--- a/logout.php
+++ b/logout.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 $auth->doLogout();
diff --git a/notification_add.php b/notification_add.php
index b7f743256..83cd7a538 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php');
diff --git a/notification_delete.php b/notification_delete.php
index c1f0785e2..93820427c 100644
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/notification_edit.php b/notification_edit.php
index a07d25d8e..3043bd8a6 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php');
diff --git a/notifications.php b/notifications.php
index 7fe0e11d1..5945320ef 100644
--- a/notifications.php
+++ b/notifications.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/password_change.php b/password_change.php
index 9876de233..f501a78e5 100644
--- a/password_change.php
+++ b/password_change.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/plugins.php b/plugins.php
index d39f306bb..2a5f2046a 100644
--- a/plugins.php
+++ b/plugins.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -38,24 +14,24 @@
 
 if ($request->isPost()) {
   // Plugins that user wants to save for the current group.
-  $cl_charts = $request->getParameter('charts');
-  $cl_clients = $request->getParameter('clients');
-  $cl_client_required = $request->getParameter('client_required');
-  $cl_invoices = $request->getParameter('invoices');
-  $cl_paid_status = $request->getParameter('paid_status');
-  $cl_custom_fields = $request->getParameter('custom_fields');
-  $cl_expenses = $request->getParameter('expenses');
-  $cl_tax_expenses = $request->getParameter('tax_expenses');
-  $cl_notifications = $request->getParameter('notifications');
-  $cl_locking = $request->getParameter('locking');
-  $cl_quotas = $request->getParameter('quotas');
-  $cl_week_view = $request->getParameter('week_view');
-  $cl_work_units = $request->getParameter('work_units');
-  $cl_approval = $request->getParameter('approval');
-  $cl_timesheets = $request->getParameter('timesheets');
-  $cl_templates = $request->getParameter('templates');
-  $cl_attachments = $request->getParameter('attachments');
-  $cl_work = $request->getParameter('work');
+  $cl_charts = (bool)$request->getParameter('charts');
+  $cl_clients = (bool)$request->getParameter('clients');
+  $cl_client_required = (bool)$request->getParameter('client_required');
+  $cl_invoices = (bool)$request->getParameter('invoices');
+  $cl_paid_status = (bool)$request->getParameter('paid_status');
+  $cl_custom_fields = (bool)$request->getParameter('custom_fields');
+  $cl_expenses = (bool)$request->getParameter('expenses');
+  $cl_tax_expenses = (bool)$request->getParameter('tax_expenses');
+  $cl_notifications = (bool)$request->getParameter('notifications');
+  $cl_locking = (bool)$request->getParameter('locking');
+  $cl_quotas = (bool)$request->getParameter('quotas');
+  $cl_week_view = (bool)$request->getParameter('week_view');
+  $cl_work_units = (bool)$request->getParameter('work_units');
+  $cl_approval = (bool)$request->getParameter('approval');
+  $cl_timesheets = (bool)$request->getParameter('timesheets');
+  $cl_templates = (bool)$request->getParameter('templates');
+  $cl_attachments = (bool)$request->getParameter('attachments');
+  $cl_work = (bool)$request->getParameter('work');
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?

From 5a9248484ea3248963da71b955449ce6f354580b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Mar 2021 21:27:05 +0000
Subject: [PATCH 1437/1848] Some cosmetic refactoring.

---
 initialize.php                |  2 +-
 predefined_expense_add.php    | 28 ++-------------------------
 predefined_expense_delete.php | 36 ++++++-----------------------------
 predefined_expense_edit.php   | 30 +++--------------------------
 predefined_expenses.php       | 28 ++-------------------------
 5 files changed, 14 insertions(+), 110 deletions(-)

diff --git a/initialize.php b/initialize.php
index 22d73352c..c454c8337 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5426");
+define("APP_VERSION", "1.19.26.5427");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 2a0ab6be9..e300fa43e 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index d8fc057fc..e965b0be2 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -39,8 +15,8 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$cl_predefined_expense_id = (int)$request->getParameter('id');
-$predefined_expense = ttPredefinedExpenseHelper::get($cl_predefined_expense_id);
+$predefined_expense_id = (int)$request->getParameter('id');
+$predefined_expense = ttPredefinedExpenseHelper::get($predefined_expense_id);
 if (!$predefined_expense) {
   header('Location: access_denied.php');
   exit();
@@ -51,13 +27,13 @@
 $predefined_expense_to_delete = $predefined_expense['name'];
 
 $form = new Form('predefinedExpenseDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_predefined_expense_id));
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$predefined_expense_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if (ttPredefinedExpenseHelper::delete($cl_predefined_expense_id)) {
+    if (ttPredefinedExpenseHelper::delete($predefined_expense_id)) {
       header('Location: predefined_expenses.php');
       exit();
     } else
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index 3f0cb0c8c..1eca3a2c7 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -39,7 +15,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$predefined_expense_id = (int) $request->getParameter('id');
+$predefined_expense_id = (int)$request->getParameter('id');
 $predefined_expense = ttPredefinedExpenseHelper::get($predefined_expense_id);
 if (!$predefined_expense) {
   header('Location: access_denied.php');
diff --git a/predefined_expenses.php b/predefined_expenses.php
index e1c14d802..9f94bd1cc 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');

From 52fbc6102c666188fb9865d2c183e3d87fe71b1a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 Mar 2021 22:24:50 +0000
Subject: [PATCH 1438/1848] Cosmetic.

---
 WEB-INF/lib/ttRoleHelper.class.php |  2 +-
 initialize.php                     |  2 +-
 profile_edit.php                   | 28 ++------------------------
 quotas.php                         | 28 ++------------------------
 report.php                         | 32 ++++--------------------------
 report_send.php                    | 28 ++------------------------
 reports.php                        | 28 ++------------------------
 role_add.php                       | 28 ++------------------------
 role_delete.php                    | 28 ++------------------------
 role_edit.php                      | 28 ++------------------------
 10 files changed, 20 insertions(+), 212 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 7fa9f8fb2..a3753d238 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -149,7 +149,7 @@ static function delete($role_id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    // Mark the task as deleted.
+    // Mark the role as deleted.
     $sql = "update tt_roles set status = NULL where id = $role_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/initialize.php b/initialize.php
index c454c8337..fc27cbaaa 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5427");
+define("APP_VERSION", "1.19.26.5428");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/profile_edit.php b/profile_edit.php
index d0d3de5fe..26091823f 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/quotas.php b/quotas.php
index b6d63fa3e..95eb894bf 100644
--- a/quotas.php
+++ b/quotas.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 require_once('plugins/MonthlyQuota.class.php');
diff --git a/report.php b/report.php
index 539a897c7..8642aae1f 100644
--- a/report.php
+++ b/report.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttConfigHelper');
@@ -88,7 +64,7 @@
 // Do we need to show checkboxes? We show them in the following 4 situations:
 // - We can approve items.
 // - We can mark items as paid.
-// - We can sssign items to invoices.
+// - We can assign items to invoices.
 // - We can assign items to a timesheet.
 // Determine these conditions separately.
 if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
@@ -199,7 +175,7 @@
     $item_ids = ttReportHelper::getFromSession();
     $time_log_ids = $item_ids['report_item_ids'];
     $expense_item_ids = $item_ids['report_item_expense_ids'];
-    // The above code is here beacues the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
+    // The above code is here because the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
   }
 
   if ($err->no()) {
diff --git a/report_send.php b/report_send.php
index e837f3e50..a2747b957 100644
--- a/report_send.php
+++ b/report_send.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/reports.php b/reports.php
index 5a4977b7a..92a36bd8f 100644
--- a/reports.php
+++ b/reports.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/role_add.php b/role_add.php
index 97883151b..a52d1a38b 100644
--- a/role_add.php
+++ b/role_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/role_delete.php b/role_delete.php
index a3ce2985d..e2f0805eb 100644
--- a/role_delete.php
+++ b/role_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttRoleHelper');
diff --git a/role_edit.php b/role_edit.php
index 972d4540c..bd18fd9cc 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');

From 9b8c249018de7892cf47d9eca7b96d31a55eeaad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Mar 2021 17:35:27 +0000
Subject: [PATCH 1439/1848] Finished work on sanitizing post parameters to
 reduce risk of SQL injections.

---
 initialize.php      |  2 +-
 mobile/expenses.php | 30 +++---------------------------
 mobile/index.php    | 28 ++--------------------------
 mobile/login.php    | 28 ++--------------------------
 mobile/projects.php | 28 ++--------------------------
 mobile/tasks.php    | 28 ++--------------------------
 mobile/time.php     | 34 +++++-----------------------------
 mobile/timer.php    | 28 ++--------------------------
 mobile/users.php    | 28 ++--------------------------
 roles.php           | 28 ++--------------------------
 site_map.php        | 28 ++--------------------------
 success.php         | 28 ++--------------------------
 template_add.php    | 28 ++--------------------------
 template_delete.php | 30 +++---------------------------
 template_edit.php   | 30 +++---------------------------
 templates.php       | 28 ++--------------------------
 time.php            |  6 +++---
 timesheet_add.php   | 28 ++--------------------------
 timesheet_edit.php  | 28 ++--------------------------
 timesheet_view.php  | 28 ++--------------------------
 timesheets.php      | 34 +++++-----------------------------
 tofile.php          | 28 ++--------------------------
 topdf.php           | 28 ++--------------------------
 week.php            | 34 +++++-----------------------------
 week_view.php       | 36 ++++++------------------------------
 work_units.php      | 34 +++++-----------------------------
 26 files changed, 71 insertions(+), 647 deletions(-)

diff --git a/initialize.php b/initialize.php
index fc27cbaaa..fca2f15a5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5428");
+define("APP_VERSION", "1.19.26.5429");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/expenses.php b/mobile/expenses.php
index 463671f4a..4f3b097fd 100644
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
@@ -61,7 +37,7 @@
   exit();
 }
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid($request->getParameter('user'))) {
+  if (!$user->isUserValid((int)$request->getParameter('user'))) {
     header('Location: access_denied.php'); // Wrong user id on post.
     exit();
   }
diff --git a/mobile/index.php b/mobile/index.php
index 88408af23..4da5fab10 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 
diff --git a/mobile/login.php b/mobile/login.php
index 4d5b7d5ea..1375b21ae 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
diff --git a/mobile/projects.php b/mobile/projects.php
index ee5d8dc18..c234d984d 100644
--- a/mobile/projects.php
+++ b/mobile/projects.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
diff --git a/mobile/tasks.php b/mobile/tasks.php
index 960990166..98530477d 100644
--- a/mobile/tasks.php
+++ b/mobile/tasks.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
diff --git a/mobile/time.php b/mobile/time.php
index d623de564..387a56a89 100644
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
@@ -54,8 +30,8 @@
   exit();
 }
 if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
     header('Location: access_denied.php'); // User changed, but no right or wrong user id.
     exit();
   }
@@ -64,7 +40,7 @@
 
 // Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
diff --git a/mobile/timer.php b/mobile/timer.php
index e301716a4..1d870b1ca 100644
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
diff --git a/mobile/users.php b/mobile/users.php
index 0e52072fb..45be3fcdc 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('../initialize.php');
 import('form.Form');
diff --git a/roles.php b/roles.php
index cd17da3c4..569f2649a 100644
--- a/roles.php
+++ b/roles.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/site_map.php b/site_map.php
index 05c6172a8..56a79511b 100644
--- a/site_map.php
+++ b/site_map.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 
diff --git a/success.php b/success.php
index 6af07ef6b..6fbf8ad2a 100644
--- a/success.php
+++ b/success.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 
diff --git a/template_add.php b/template_add.php
index 086baf3b4..e68671478 100644
--- a/template_add.php
+++ b/template_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/template_delete.php b/template_delete.php
index 3eb34876e..a4996e05b 100644
--- a/template_delete.php
+++ b/template_delete.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -39,7 +15,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$cl_template_id = (int) $request->getParameter('id');
+$cl_template_id = (int)$request->getParameter('id');
 $template = ttTemplateHelper::get($cl_template_id);
 if (!$template) {
   header('Location: access_denied.php');
diff --git a/template_edit.php b/template_edit.php
index 117b8166b..e3fa38947 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -39,7 +15,7 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$cl_template_id = (int) $request->getParameter('id');
+$cl_template_id = (int)$request->getParameter('id');
 $template = ttTemplateHelper::get($cl_template_id);
 if (!$template) {
   header('Location: access_denied.php');
diff --git a/templates.php b/templates.php
index 45ea2e477..636d4bc10 100644
--- a/templates.php
+++ b/templates.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/time.php b/time.php
index 6bd10ad53..66cf4da4b 100644
--- a/time.php
+++ b/time.php
@@ -26,8 +26,8 @@
   exit();
 }
 if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
     header('Location: access_denied.php'); // User changed, but no right or wrong user id.
     exit();
   }
@@ -36,7 +36,7 @@
 
 // Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
diff --git a/timesheet_add.php b/timesheet_add.php
index 7c7633c6c..536241d62 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/timesheet_edit.php b/timesheet_edit.php
index b883b20e9..db6897b8a 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/timesheet_view.php b/timesheet_view.php
index a1ee74d26..ff5f169b6 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('ttTimesheetHelper');
diff --git a/timesheets.php b/timesheets.php
index b7ce44b84..88a4a718c 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -49,8 +25,8 @@
   exit();
 }
 if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
     header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
     exit();
   }
@@ -59,7 +35,7 @@
 
 // Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
diff --git a/tofile.php b/tofile.php
index 996ffe9fd..b10bdee02 100644
--- a/tofile.php
+++ b/tofile.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
diff --git a/topdf.php b/topdf.php
index 2ea70ddcc..aa840e106 100644
--- a/topdf.php
+++ b/topdf.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 /*
  * This file generates a report in PDF format using TCPDF library from http://www.tcpdf.org/.
diff --git a/week.php b/week.php
index fee395d66..01597704d 100644
--- a/week.php
+++ b/week.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -56,8 +32,8 @@
   exit();
 }
 if ($request->isPost()) {
-  $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
+  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
     header('Location: access_denied.php'); // User changed, but no right or wrong user id.
     exit();
   }
@@ -66,7 +42,7 @@
 
 // Determine user for whom we display this page.
 if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
+  $user_id = (int)$request->getParameter('user');
   $user->setOnBehalfUser($user_id);
 } else {
   $user_id = $user->getUser();
diff --git a/week_view.php b/week_view.php
index 149842e87..1718afd4b 100644
--- a/week_view.php
+++ b/week_view.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -38,10 +14,10 @@
 $config = $user->getConfigHelper();
 
 if ($request->isPost()) {
-  $cl_week_menu = $request->getParameter('week_menu');
-  $cl_week_note = $request->getParameter('week_note');
-  $cl_week_list = $request->getParameter('week_list');
-  $cl_notes = $request->getParameter('notes');
+  $cl_week_menu = (bool)$request->getParameter('week_menu');
+  $cl_week_note = (bool)$request->getParameter('week_note');
+  $cl_week_list = (bool)$request->getParameter('week_list');
+  $cl_notes = (bool)$request->getParameter('notes');
 } else {
   $cl_week_menu =  $config->getDefinedValue('week_menu');
   $cl_week_note = $config->getDefinedValue('week_note');
diff --git a/work_units.php b/work_units.php
index e4d198d5c..826f899ab 100644
--- a/work_units.php
+++ b/work_units.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 require_once('initialize.php');
 import('form.Form');
@@ -44,9 +20,9 @@
 $config = new ttConfigHelper($user->getConfig());
 
 if ($request->isPost()) {
-  $cl_minutes_in_unit = $request->getParameter('minutes_in_unit');
-  $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold');
-  $cl_totals_only = $request->getParameter('totals_only');
+  $cl_minutes_in_unit = (int)$request->getParameter('minutes_in_unit');
+  $cl_1st_unit_threshold = (int)$request->getParameter('1st_unit_threshold');
+  $cl_totals_only = (bool)$request->getParameter('totals_only');
 } else {
   $cl_minutes_in_unit = $user->getConfigInt('minutes_in_unit', 15);
   $cl_1st_unit_threshold = $user->getConfigInt('1st_unit_threshold', 0);

From 464291697900e30ae782477930ef45a9cb8e4cc0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 7 Mar 2021 18:15:58 +0000
Subject: [PATCH 1440/1848] Removed some more no longer used mobile pages.

---
 WEB-INF/templates/mobile/expenses.tpl | 226 -------------------------
 WEB-INF/templates/mobile/projects.tpl |  76 ---------
 WEB-INF/templates/mobile/tasks.tpl    |  76 ---------
 WEB-INF/templates/mobile/users.tpl    |  95 -----------
 initialize.php                        |   2 +-
 mobile/expenses.php                   | 235 --------------------------
 mobile/projects.php                   |  36 ----
 mobile/tasks.php                      |  35 ----
 mobile/users.php                      |  51 ------
 9 files changed, 1 insertion(+), 831 deletions(-)
 delete mode 100644 WEB-INF/templates/mobile/expenses.tpl
 delete mode 100644 WEB-INF/templates/mobile/projects.tpl
 delete mode 100644 WEB-INF/templates/mobile/tasks.tpl
 delete mode 100644 WEB-INF/templates/mobile/users.tpl
 delete mode 100644 mobile/expenses.php
 delete mode 100644 mobile/projects.php
 delete mode 100644 mobile/tasks.php
 delete mode 100644 mobile/users.php

diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
deleted file mode 100644
index 81d7a214a..000000000
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ /dev/null
@@ -1,226 +0,0 @@
-<script>
-// We need a few arrays to populate project dropdown.
-// When client selection changes, the project dropdown must be re-populated with only relevant projects.
-// Format:
-// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
-// project_names[325] = "Time Tracker";   // Project name.
-
-// Prepare an array of project ids for clients.
-project_ids = new Array();
-{foreach $client_list as $client}
-  project_ids[{$client.id}] = "{$client.projects}";
-{/foreach}
-// Prepare an array of project names.
-project_names = new Array();
-{foreach $project_list as $project}
-  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
-{/foreach}
-// We'll use this array to populate project dropdown when client is not selected.
-var idx = 0;
-projects = new Array();
-{foreach $project_list as $project}
-  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
-  idx++;
-{/foreach}
-
-// Mandatory top option for project dropdown.
-empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}';
-
-// Prepare an array of predefined expenses.
-idx = 0;
-var defined_expenses = new Array();
-{foreach $predefined_expenses as $predefined_expense}
-  defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}");
-  idx++;
-{/foreach}
-
-// The fillProjectDropdown function populates the project combo box with
-// projects associated with a selected client (client id is passed here as id).
-function fillProjectDropdown(id) {
-  var str_ids = project_ids[id];
-  var dropdown = document.getElementById("project");
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
-  // Remove existing content.
-  dropdown.length = 0;
-  // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label_project, '', true);
-
-  // Populate project dropdown.
-  if (!id) {
-    // If we are here, client is not selected.
-    var len = projects.length;
-    for (var i = 0; i < len; i++) {
-      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  } else if (str_ids) {
-    var ids = new Array();
-    ids = str_ids.split(",");
-    var len = ids.length;
-
-    for (var i = 0; i < len; i++) {
-      var p_id = ids[i];
-      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
-      if (dropdown.options[i+1].value == selected_item)
-        dropdown.options[i+1].selected = true;
-    }
-  }
-}
-
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-
-// The recalculateCost function recalculates cost based on the current selection
-// of predefined expense and quantity and also changes the comment accordingly.
-function recalculateCost() {
-  var quantity_control = document.getElementById("quantity");
-  // Set quantity to 1 if it is not set already.
-  if (!quantity_control.value) {
-     quantity_control.value = "1";
-  }
-
-  var comment_control = document.getElementById("item_name");
-  var cost_control = document.getElementById("cost");
-  var replaceDecimalMark = ("." != "{$user->getDecimalMark()}");
-
-  // Calculate cost.
-  var dropdown = document.getElementById("predefined_expense");
-  if (dropdown.selectedIndex == 0) {
-    quantity_control.value = "";
-    comment_control.value = "";
-    cost_control.value = "";
-  } else {
-    comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value;
-    var quantity = quantity_control.value;
-    if (isNaN(quantity))
-      cost_control.value = "";
-    else {
-      var expenseCost = defined_expenses[dropdown.selectedIndex - 1][2];
-      if (replaceDecimalMark)
-        expenseCost = expenseCost.replace("{$user->getDecimalMark()}", ".");
-      var newCost = (quantity_control.value * expenseCost).toFixed(2);
-      if (replaceDecimalMark)
-        newCost = newCost.replace(".", "{$user->getDecimalMark()}");
-      cost_control.value = newCost;
-    }
-  }
-}
-</script>
-
-<!-- Inserted from time.tpl -->
-<table cellspacing="3" cellpadding="0" border="0" width="100%">
-  <tr>
-    <td class="sectionHeaderNoBorder" align="right"><a href="expenses.php?date={$prev_date}">&lt;&lt;</a></td>
-    <td class="sectionHeaderNoBorder" align="center">{$timestring}</td>
-    <td class="sectionHeaderNoBorder" align="left"><a href="expenses.php?date={$next_date}">&gt;&gt;</a></td>
-  </tr>
-</table>
-
-{$forms.expensesForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-  <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.expensesForm.user.control}</td>
-        </tr>
-{/if}
-{if $user->isPluginEnabled('cl')}
-        <tr>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.expensesForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.expensesForm.project.control}</td>
-        </tr>
-{/if}
-{if $predefined_expenses}
-        <tr>
-          <td align="right">{$i18n.label.expense}:</td>
-          <td>{$forms.expensesForm.predefined_expense.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.quantity}:</td>
-          <td>{$forms.expensesForm.quantity.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.item} (*):</td>
-          <td>{$forms.expensesForm.item_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.expensesForm.cost.control} {$user->getCurrency()|escape}</td>
-        </tr>
-      </table>
-    </td>
-    <!--
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.expensesForm.date.control}</td></tr>
-      </table>
-    </td>
-    -->
-  </tr>
-</table>
-
-<table>
-  <tr>
-    <td align="center" colspan="2">{$forms.expensesForm.btn_submit.control}</td>
-  </tr>
-</table>
-
-<table class="mobile-table">
-<tr>
-  <td valign="top">
-{if $expense_items}
-      <table class="mobile-table-details">
-      <tr>
-  {if $user->isPluginEnabled('cl')}
-        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_project}
-        <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-        <td class="tableHeader">{$i18n.label.item}</td>
-        <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
-      </tr>
-  {foreach $expense_items as $item}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    {if $user->isPluginEnabled('cl')}
-        <td valign="top">{$item.client|escape}</td>
-    {/if}
-    {if $show_project}
-        <td valign="top">{$item.project|escape}</td>
-    {/if}
-        <td valign="top">
-    {if $item.approved || $item.invoice_id}
-          {$item.item|escape}
-    {else}
-          <a href="expense_edit.php?id={$item.id}">{$item.item|escape}</a>
-    {/if}
-        </td>
-        <td valign="top" align="right">{$item.cost}</td>
-      </tr>
-  {/foreach}
-    </table>
-    <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-        <td nowrap align="right">{$i18n.label.day_total}: {$user->getCurrency()|escape} {$day_total}</td>
-      </tr>
-    </table>
-{/if}
-  </td>
-</tr>
-</table>
-{$forms.expensesForm.close}
diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl
deleted file mode 100644
index 96d27054f..000000000
--- a/WEB-INF/templates/mobile/projects.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table class="mobile-table">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_projects')}
-      <table class="mobile-table-details">
-  {if $inactive_projects}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
-  {/if}
-  {if $active_projects}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-    {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
-          <td>{$project.description|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_projects}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.inactive_projects}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-    {foreach $inactive_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
-          <td>{$project.description|escape}</td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('project_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-  {if $active_projects}
-    {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$project.name|escape}</td>
-          <td>{$project.description|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl
deleted file mode 100644
index 3fbee1f7d..000000000
--- a/WEB-INF/templates/mobile/tasks.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table class="mobile-table">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_tasks')}
-      <table class="mobile-table-details">
-  {if $inactive_tasks}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.active_tasks}</td></tr>
-  {/if}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-  {if $active_tasks}
-    {foreach $active_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape}</a></td>
-          <td>{$task.description|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_tasks}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.tasks.inactive_tasks}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-    {foreach $inactive_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape}</a></td>
-          <td>{$task.description|escape}</td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('task_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-        </tr>
-  {if $active_tasks}
-    {foreach $active_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$task.name|escape}</td>
-          <td>{$task.description|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-  {/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
deleted file mode 100644
index eaeb4770f..000000000
--- a/WEB-INF/templates/mobile/users.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table class="mobile-table">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_users')}
-      <table class="mobile-table-details">
-  {if $inactive_users}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.label.active_users}</td></tr>
-  {/if}
-  {if $active_users}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
-        </tr>
-      {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>
-            {if $uncompleted_indicators}
-              <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
-            {/if}
-            {if $u.group_id != $user->group_id || $u.rank < $user->rank || ($u.rank == $user->rank && $u.id == $user->id)}
-              <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
-            {else}
-              {$u.name|escape}
-            {/if}
-          </td>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_users}
-      <table class="mobile-table-details">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.label.inactive_users}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td width="10%" class="tableHeader">{$i18n.form.users.role}</td>
-        </tr>
-    {foreach $inactive_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>
-            {if $u.group_id != $user->group_id || $u.rank < $user->rank}
-              <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
-            {else}
-              {$u.name|escape}
-            {/if}
-          </td>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center" height="50">
-            <form><input type="button" onclick="chLocation('user_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-{else}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.person_name}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.login}</td>
-          <td class="tableHeader">{$i18n.form.users.role}</td>
-        </tr>
-  {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$u.name|escape}</td>
-          <td>{$u.login|escape}</td>
-          <td>{$u.role_name|escape}</td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/initialize.php b/initialize.php
index fca2f15a5..cbdfb3cc1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5429");
+define("APP_VERSION", "1.19.26.5430");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/expenses.php b/mobile/expenses.php
deleted file mode 100644
index 4f3b097fd..000000000
--- a/mobile/expenses.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttUserHelper');
-import('ttGroupHelper');
-import('DateAndTime');
-import('ttTimeHelper');
-import('ttExpenseHelper');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../expenses.php');
-exit();
-// Below is no longer used code.
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('ex')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if (!$user->exists()) {
-  header('Location: access_denied.php'); // Nobody to enter expenses for.
-  exit();
-}
-if ($user->behalf_id && (!$user->can('track_expenses') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('track_own_expenses') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
-  exit();
-}
-if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid((int)$request->getParameter('user'))) {
-    header('Location: access_denied.php'); // Wrong user id on post.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for which we display this page.
-$userChanged = $request->getParameter('user_changed');
-if ($request->isPost() && $userChanged) {
-  $user_id = $request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-
-// Determine previous and next dates for simple navigation.
-$prev_date = date('Y-m-d', strtotime('-1 day', strtotime($cl_date)));
-$next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date)));
-
-$tracking_mode = $user->getTrackingMode();
-$show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
-
-// Initialize variables.
-$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
-$_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
-$_SESSION['project'] = $cl_project;
-$cl_item_name = $request->getParameter('item_name');
-$cl_cost = $request->getParameter('cost');
-
-// Elements of expensesForm.
-$form = new Form('expensesForm');
-
-if ($user->can('track_expenses')) {
-  $rank = $user->getMaxRankForGroup($user->getGroup());
-  if ($user->can('track_own_expenses'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
-  if (count($user_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
-      'name'=>'user',
-      'style'=>'width: 250px;',
-      'value'=>$user_id,
-      'data'=>$user_list,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $smarty->assign('user_dropdown', 1);
-  }
-}
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$active_clients,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-if ($show_project) {
-  // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox',
-    // 'onchange'=>'fillTaskDropdown(this.value);',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming. 
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-// If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
-if ($predefined_expenses) {
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'recalculateCost();',
-    'name'=>'predefined_expense',
-    'style'=>'width: 250px;',
-    'value'=>$cl_predefined_expense,
-    'data'=>$predefined_expenses,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity));
-}
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
-$form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
-
-// Submit.
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-    // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
-      $err->add($i18n->get('error.client'));
-    if ($show_project && !$cl_project)
-      $err->add($i18n->get('error.project'));
-    if (!ttValidString($cl_item_name)) $err->add($i18n->get('error.field'), $i18n->get('label.item'));
-    if (!ttValidFloat($cl_cost)) $err->add($i18n->get('error.field'), $i18n->get('label.cost'));
-
-    // Prohibit creating entries in future.
-    if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
-        $err->add($i18n->get('error.future_date'));
-    }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-    // Finished validating input data.
-
-    // Prohibit creating entries in locked range.
-    if ($user->isDateLocked($selected_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Insert record.
-    if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client,
-          'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
-        header('Location: expenses.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    }
-  } elseif ($request->getParameter('onBehalfUser')) {
-    if($user->can('track_expenses')) {
-      unset($_SESSION['behalf_id']);
-      unset($_SESSION['behalf_name']);
-
-      if($on_behalf_id != $user->id) {
-        $_SESSION['behalf_id'] = $on_behalf_id;
-        $_SESSION['behalf_name'] = ttUserHelper::getUserName($on_behalf_id);
-      }
-      header('Location: expenses.php');
-      exit();
-    }
-  }
-}
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_project', $show_project);
-$smarty->assign('next_date', $next_date);
-$smarty->assign('prev_date', $prev_date);
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date));
-$smarty->assign('predefined_expenses', $predefined_expenses);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
-$smarty->assign('title', $i18n->get('title.expenses'));
-$smarty->assign('content_page_name', 'mobile/expenses.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/projects.php b/mobile/projects.php
deleted file mode 100644
index c234d984d..000000000
--- a/mobile/projects.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttTeamHelper');
-import('ttGroupHelper');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../projects.php');
-exit();
-// Below is no longer used code.
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-if($user->can('manage_projects')) {
-  $active_projects = ttGroupHelper::getActiveProjects();
-  $inactive_projects = ttGroupHelper::getInactiveProjects();
-} else
-  $active_projects = $user->getAssignedProjects();
-
-$smarty->assign('active_projects', $active_projects);
-$smarty->assign('inactive_projects', $inactive_projects);
-$smarty->assign('title', $i18n->get('title.projects'));
-$smarty->assign('content_page_name', 'mobile/projects.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/tasks.php b/mobile/tasks.php
deleted file mode 100644
index 98530477d..000000000
--- a/mobile/tasks.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttGroupHelper');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../tasks.php');
-exit();
-// Below is no longer used code.
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-if($user->can('manage_tasks')) {
-  $active_tasks = ttGroupHelper::getActiveTasks();
-  $inactive_tasks = ttGroupHelper::getInactiveTasks();
-} else
-  $active_tasks = $user->getAssignedTasks();
-
-$smarty->assign('active_tasks', $active_tasks);
-$smarty->assign('inactive_tasks', $inactive_tasks);
-$smarty->assign('title', $i18n->get('title.tasks'));
-$smarty->assign('content_page_name', 'mobile/tasks.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/users.php b/mobile/users.php
deleted file mode 100644
index 45be3fcdc..000000000
--- a/mobile/users.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttTeamHelper');
-import('ttGroupHelper');
-import('ttTimeHelper');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../users.php');
-exit();
-// Below is no longer used code.
-
-// Access checks.
-if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Prepare a list of active users.
-$rank = $user->getMaxRankForGroup($user->getGroup());
-if ($user->can('view_users'))
-  $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
-else /* if ($user->can('manage_users')) */
-  $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
-$active_users = $user->getUsers($options);
-
-// Prepare a list of inactive users.
-if($user->can('manage_users')) {
-  $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
-  $inactive_users = $user->getUsers($options);
-}
-
-$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
-if ($uncompleted_indicators) {
-  // Check each active user if they have an uncompleted time entry.
-  foreach ($active_users as $key => $active_user) {
-    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
-  }
-  $smarty->assign('uncompleted_indicators', true);
-}
-
-$smarty->assign('active_users', $active_users);
-$smarty->assign('inactive_users', $inactive_users);
-$smarty->assign('can_delete_manager', $can_delete_manager);
-$smarty->assign('title', $i18n->get('title.users'));
-$smarty->assign('content_page_name', 'mobile/users.tpl');
-$smarty->display('mobile/index.tpl');

From e77be7eea69df5d52e19f9f25b5b89a0e66a5b8e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 11 Apr 2021 21:57:58 +0000
Subject: [PATCH 1441/1848] An attempt to mitigate cross site request forgery
 vulnerability.

---
 WEB-INF/config.php.dist    |  5 +++++
 WEB-INF/lib/common.lib.php | 39 ++++++++++++++++++++++++++++++++++++++
 initialize.php             |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 7b6eabbd2..1b7b32b0a 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -163,6 +163,11 @@ define('AUTH_MODULE', 'db');
 // define('DEBUG', false); // Note: enabling DEBUG breaks redirects as debug output is printed before setting redirect header. Do not enable on production systems.
 
 
+// HTTP_TARGET - defines http target for cross site request forgery protection.
+// It can be used when you access the application via a proxy.
+// define('HTTP_TARGET', 'localhost');
+
+
 // Group managers can set monthly work hour quota for years between the following  values.
 // define('MONTHLY_QUOTA_YEAR_START', 2010); // If nothing is specified, it falls back to 2015.
 // define('MONTHLY_QUOTA_YEAR_END', 2025);   // If nothing is specified, it falls back to 2030.
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 389b29c94..52589c6e0 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -363,6 +363,10 @@ function ttAccessAllowed($required_right)
     exit();
   }
 
+  // Protection against cross site request forgery.
+  if (!ttMitigateCSRF())
+    return false;
+
   // Check IP restriction, if set.
   if ($user->allow_ip && !$user->can('override_allow_ip')) {
     $access_allowed = false;
@@ -388,6 +392,41 @@ function ttAccessAllowed($required_right)
   return false;
 }
 
+// ttMitigateCSRF verifies request headers in an attempt to block cross site request forgery.
+function ttMitigateCSRF() {
+  // No need to do anything for get requests.
+  global $request;
+  if ($request->isGet())
+    return true;
+
+  $origin = $_SERVER['HTTP_ORIGIN'];
+  if ($origin) {
+    $pos = strpos($origin, '//');
+    $origin = substr($origin, $pos+2); // Strip protocol.
+  }
+  if (!$origin) {
+    // Try using referer.
+    $origin = $_SERVER['HTTP_REFERER'];
+    if ($origin) {
+      $pos = strpos($origin, '//');
+      $origin = substr($origin, $pos+2); // Strip protocol.
+      $pos = strpos($origin, '/');
+      $origin = substr($origin, 0, $pos); // Leave host only.
+    }
+  }
+  error_log("origin: ".$origin);
+  $target = defined('HTTP_TARGET') ? HTTP_TARGET : $_SERVER['HTTP_HOST'];
+  error_log("target: ".$target);
+  if (strcmp($origin, $target)) {
+    error_log("Potential cross site request forgery. Origin: '$origin' does not match target: '$target'.");
+    return false; // Origin and target do not match,
+  }
+
+  // TODO: review and improve this function for custom ports.
+  return true;
+}
+
+
 // ttStartsWith functions checks if a string starts with a given substring.
 function ttStartsWith($string, $startString)
 {
diff --git a/initialize.php b/initialize.php
index cbdfb3cc1..aadc0bb07 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.26.5430");
+define("APP_VERSION", "1.19.27.5431");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e3f8222ee308322942bcebcd86b78ecf19382563 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 12 Apr 2021 17:14:30 +0000
Subject: [PATCH 1442/1848] Tested CSRF fix for custom ports - it's working,
 also removed unnecessary logging.

---
 WEB-INF/config.php.dist    | 2 +-
 WEB-INF/lib/common.lib.php | 5 +----
 initialize.php             | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 1b7b32b0a..3787cbc94 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -165,7 +165,7 @@ define('AUTH_MODULE', 'db');
 
 // HTTP_TARGET - defines http target for cross site request forgery protection.
 // It can be used when you access the application via a proxy.
-// define('HTTP_TARGET', 'localhost');
+// define('HTTP_TARGET', 'localhost:8080');
 
 
 // Group managers can set monthly work hour quota for years between the following  values.
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 52589c6e0..d5b43f57f 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -414,15 +414,12 @@ function ttMitigateCSRF() {
       $origin = substr($origin, 0, $pos); // Leave host only.
     }
   }
-  error_log("origin: ".$origin);
   $target = defined('HTTP_TARGET') ? HTTP_TARGET : $_SERVER['HTTP_HOST'];
-  error_log("target: ".$target);
   if (strcmp($origin, $target)) {
     error_log("Potential cross site request forgery. Origin: '$origin' does not match target: '$target'.");
-    return false; // Origin and target do not match,
+    return false; // Origin and target do not match.
   }
 
-  // TODO: review and improve this function for custom ports.
   return true;
 }
 
diff --git a/initialize.php b/initialize.php
index aadc0bb07..e8588857f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.27.5431");
+define("APP_VERSION", "1.19.27.5432");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ee6312e1a278cfbb240ae1419d6c63eeff0913f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 13 Apr 2021 22:12:35 +0000
Subject: [PATCH 1443/1848] Added options for secure ldap authentication.

---
 WEB-INF/config.php.dist              |  4 ++++
 WEB-INF/lib/auth/Auth_ldap.class.php | 10 ++++++++++
 initialize.php                       |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 3787cbc94..bbf647cec 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -144,6 +144,8 @@ define('AUTH_MODULE', 'db');
 //  'base_dn' => 'ou=People,dc=example,dc=com', // Path of user's base distinguished name in LDAP catalog.
 //  'user_login_attribute' => 'uid',            // LDAP attribute used for login.
 //  'default_domain' => 'example.com',          // Default domain.
+//  'tls_cacertdir' => null,                    // Path to a directory containing CA certificates for secure ldap.
+//  'tls_cacertfile' => null,                   // CA certificate file name for secure ldap.
 //  'member_of' => array());                    // List of groups, membership in which is required for user to be authenticated.
 
 
@@ -154,6 +156,8 @@ define('AUTH_MODULE', 'db');
 //  'type' => 'ad',                     // Type of server.
 //  'base_dn' => 'DC=example,DC=com',   // Base distinguished name in LDAP catalog.
 //  'default_domain' => 'example.com',  // Default domain.
+//  'tls_cacertdir' => null,            // Path to a directory containing CA certificates for secure ldap.
+//  'tls_cacertfile' => null,           // CA certificate file name for secure ldap.
 //  'member_of' => array());            // List of groups, membership in which is required for user to be authenticated.
                                         // Leave it empty if membership is not necessary. Otherwise list CN parts only.
                                         // For example:
diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 7f3495737..1ccbb0371 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -105,6 +105,16 @@ function authenticate($login, $password)
     if (isTrue('DEBUG')) {
       ldap_set_option($lc, LDAP_OPT_DEBUG_LEVEL, 7);
     }
+    // Additional options for secure ldap.
+    // This insert is based on https://www.anuko.com/forum/viewtopic.php?f=4&t=2091
+    // I can't test it at the moment. If things break please let us know!
+    if (isset($this->params['tls_cacertdir'])) {
+      ldap_set_option(null, LDAP_OPT_X_TLS_CACERTDIR, $this->params['tls_cacertdir']);
+    }
+    if (isset($this->params['tls_cacertfile'])) {
+      ldap_set_option(null, LDAP_OPT_X_TLS_CACERTFILE, $this->params['tls_cacertfile']);
+    }
+    // End of addiitional options for secure ldap.
 
     // We need to handle Windows AD and OpenLDAP differently.
     if ($this->params['type'] == 'ad') {
diff --git a/initialize.php b/initialize.php
index e8588857f..a739b939e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.27.5432");
+define("APP_VERSION", "1.19.28.5433");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4fdaa18d343d0459391e62b40971843fbd0e5924 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Apr 2021 21:26:18 +0000
Subject: [PATCH 1444/1848] Resuming work on php8 warnings.

---
 WEB-INF/lib/ttTimeHelper.class.php |  2 ++
 WEB-INF/templates/header2.tpl      |  2 +-
 WEB-INF/templates/time2.tpl        |  2 +-
 WEB-INF/templates/time_script.tpl  | 16 +++++++++-------
 initialize.php                     |  2 +-
 time.php                           |  1 +
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f0b1ea100..af2a436a5 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -895,6 +895,8 @@ static function getRecords($date, $includeFiles = false) {
       $time_fields = ", ".join(', ', $time_fields_array);
     }
     
+    $filePart = '';
+    $fileJoin = '';
     if ($includeFiles) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index 6bc5f65fe..74ccb1adc 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -6,7 +6,7 @@
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
   <link href="{constant('DEFAULT_CSS')}" rel="stylesheet">
-{if $i18n.language.rtl}
+{if (isset($i18n.language.rtl) && $i18n.language.rtl)}
   <link href="{constant('RTL_CSS')}" rel="stylesheet">
 {/if}
 {if $user->getCustomCss()}
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 487bff7cf..4a26f9bef 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -93,7 +93,7 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $template_dropdown}
+{if (isset($template_dropdown) && $template_dropdown)}
   <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
   <tr>
     <td class = "large-screen-label"><label for="template">{$i18n.label.template}:</label></td>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 5834ba3cc..67c5062cc 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -46,23 +46,25 @@ var task_names = new Array();
 
 // Prepare an array of template ids for projects.
 var template_ids = new Array();
-{if $bind_templates_with_projects}
+{if (isset($bind_templates_with_projects) && $bind_templates_with_projects)}
   {foreach $project_list as $project}
   template_ids[{$project.id}] = "{$project.templates}";
   {/foreach}
 {/if}
 // Prepare an array of template names.
 var template_names = new Array();
-{if $bind_templates_with_projects}
+{if (isset($bind_templates_with_projects) && $bind_templates_with_projects) && isset($template_list)}
   {foreach $template_list as $template}
   template_names[{$template.id}] = "{$template.name|escape:'javascript'}";
   {/foreach}
 {/if}
 // Prepare an array of template bodies.
 var template_bodies = new Array();
-{foreach $template_list as $template}
-  template_bodies[{$template.id}] = "{$template.content|escape:'javascript'}";
-{/foreach}
+{if isset($template_list)}
+  {foreach $template_list as $template}
+    template_bodies[{$template.id}] = "{$template.content|escape:'javascript'}";
+  {/foreach}
+{/if}
 
 // The fillNote function populates the Note field with a selected template body.
 function fillNote(id) {
@@ -189,7 +191,7 @@ function fillTaskDropdown(id) {
 // The fillTemplateDropdown function populates the template combo box with
 // templates associated with a selected project (project id is passed here as id).
 function fillTemplateDropdown(id) {
-{if !$bind_templates_with_projects}
+{if (!isset($bind_templates_with_projects) || !$bind_templates_with_projects)}
   return; // Do nothing if we are not binding templates with projects,
 {/if}
 
@@ -234,7 +236,7 @@ function fillTemplateDropdown(id) {
 
 // The prepopulateNote function populates the note field with first found template body in Template dropdown.
 function prepopulateNote() {
-  {if !$prepopulate_note}
+  {if (!isset($prepopulate_note) || !$prepopulate_note)}
     return;
   {/if}
   var dropdown = document.getElementById("template");
diff --git a/initialize.php b/initialize.php
index a739b939e..d34aa56d5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5433");
+define("APP_VERSION", "1.19.28.5434");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 66cf4da4b..90d54c0cf 100644
--- a/time.php
+++ b/time.php
@@ -225,6 +225,7 @@
   $largeScreenCalendarRowSpan += 2;
 
   // Client dropdown.
+  $client_list = array();
   if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.

From 1ce02deaaa3f2c66162a55fe0b62acb1dd94739a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Apr 2021 22:11:54 +0000
Subject: [PATCH 1445/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttTimeHelper.class.php | 4 ++--
 WEB-INF/templates/header2.tpl      | 8 ++++----
 WEB-INF/templates/time_edit2.tpl   | 2 +-
 initialize.php                     | 2 +-
 time_edit.php                      | 2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index af2a436a5..78e7a2cf5 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -424,10 +424,10 @@ static function insert($fields)
     $client = $fields['client'];
     $project = $fields['project'];
     $task = $fields['task'];
-    $invoice = $fields['invoice'];
+    $invoice = isset($fields['invoice']) ? $fields['invoice'] : null;
     $note = $fields['note'];
     $billable = $fields['billable'];
-    $paid = $fields['paid'];
+    $paid = isset($fields['paid']) ? $fields['paid'] : null;
 
     $start = ttTimeHelper::to24HourFormat($start);
     if ($finish) {
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index 74ccb1adc..65af554ee 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -21,7 +21,7 @@
   <script src="js/strptime.js"></script>
 </head>
 
-<body {$onload}>
+<body{if isset($onload)} {$onload}{/if}>
 
 <div class="logo">
 {if $user->custom_logo}
@@ -43,7 +43,7 @@
 {* end of top menu for small screens *}
 
 {* top menu for large screens *}
-{if $authenticated}
+{if (isset($authenticated) && $authenticated)}
   {if $user->can('administer_site')}
   {* top menu for admin *}
 <div class="top-menu-large-screen">
@@ -161,8 +161,8 @@
 
 {* page title and user details *}
 {if $title}
-<div class="page-title">{$title}{if $timestring}: {$timestring}{/if}</div>
-  {if $authenticated}
+<div class="page-title">{$title}{if (isset($timestring) && $timestring)}: {$timestring}{/if}</div>
+  {if (isset($authenticated) && $authenticated)}
 <div class="user-details">{$user->getUserPartForHeader()}</div> {* No need to escape as it is done in the class. *}
   {/if}
 {/if}
diff --git a/WEB-INF/templates/time_edit2.tpl b/WEB-INF/templates/time_edit2.tpl
index 8a25c43cf..2f8f9e985 100644
--- a/WEB-INF/templates/time_edit2.tpl
+++ b/WEB-INF/templates/time_edit2.tpl
@@ -97,7 +97,7 @@ function confirmSave() {
     <td class="td-with-input">{$forms.timeRecordForm.date.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{if $template_dropdown}
+{if (isset($template_dropdown) && $template_dropdown)}
   <tr class = "small-screen-label"><td><label for="template">{$i18n.label.template}:</label></td></tr>
   <tr>
     <td class = "large-screen-label"><label for="template">{$i18n.label.template}:</label></td>
diff --git a/initialize.php b/initialize.php
index d34aa56d5..be7ff2576 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5434");
+define("APP_VERSION", "1.19.28.5435");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index 774add2c6..31ee2d137 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -76,6 +76,7 @@
   $cl_billable = 1;
   if ($showBillable)
     $cl_billable = $request->getParameter('billable');
+  $cl_paid = 0;
   if ($showPaidStatus)
     $cl_paid = $request->getParameter('paid');
 } else {
@@ -166,6 +167,7 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Client dropdown.
+  $client_list = array();
   if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.

From 0c78b2191214590d9468be1392b547913ddcb10c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 00:00:57 +0000
Subject: [PATCH 1446/1848] Eliminated a few more php8 warnings.

---
 WEB-INF/lib/ttGroupHelper.class.php | 6 +++++-
 WEB-INF/lib/ttUser.class.php        | 5 ++++-
 WEB-INF/templates/header.tpl        | 6 +++---
 plugins.php                         | 1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 895fa1dc6..6da527085 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -336,6 +336,8 @@ static function getActiveProjects($includeFiles = false)
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $filePart = '';
+    $fileJoin = '';
     if ($includeFiles) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
@@ -364,6 +366,8 @@ static function getInactiveProjects($includeFiles = false)
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $filePart = '';
+    $fileJoin = '';
     if ($includeFiles) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
@@ -502,7 +506,7 @@ static function getActiveUsers($options = null) {
       return false;
     while ($val = $res->fetchRow()) {
       // Localize top manager role name, as it is not localized in db.
-      if ($val['rank'] == 512)
+      if (isset($val['rank']) && $val['rank'] == 512)
         $val['role_name'] = $i18n->get('role.top_manager.label');
       $user_list[] = $val;
     }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index fcfc1b9d5..ca0b759e8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -694,10 +694,13 @@ function adjustBehalfId() {
   function updateGroup($fields) {
     $mdb2 = getConnection();
 
-    $group_id = $fields['group_id'];
+    $group_id = isset($fields['group_id']) ? $fields['group_id'] : null;
     if ($group_id && !$this->isGroupValid($group_id)) return false;
     if (!$group_id) $group_id = $this->getGroup();
 
+    $name_part = $description_part = $currency_part = $lang_part = $decimal_mark_part = $date_format_part = $time_format_part =
+      $week_start_part = $tracking_mode_part = $project_required_part = $record_type_part = $bcc_email_part =  $allow_ip_part =
+      $plugins_part = $config_part = $custom_css_part = $lock_spec_part = $holidays_part = $workday_minutes_part = '';
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 10640cb29..29ec892d3 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -5,7 +5,7 @@
   <link rel="icon" href="favicon.ico" type="image/x-icon">
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
   <link href="{constant('DEFAULT_CSS')}" rel="stylesheet">
-{if $i18n.language.rtl}
+{if (isset($i18n.language.rtl) && $i18n.language.rtl)}
   <link href="{constant('RTL_CSS')}" rel="stylesheet">
 {/if}
 {if $user->getCustomCss()}
@@ -20,7 +20,7 @@
   <script src="js/strptime.js"></script>
 </head>
 
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" {$onload}>
+<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0"{if isset($onload)} {$onload}{/if}>
 
 {assign var="tab_width" value="700"}
 
@@ -176,7 +176,7 @@
       <!-- page title and user details -->
 {if $title}
       <table id="page_title" cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
-        <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
+        <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if (isset($timestring) && $timestring)}: {$timestring}{/if}</div></td></tr>
         <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
       </table>
 {/if}
diff --git a/plugins.php b/plugins.php
index 2a5f2046a..9b3bc1a27 100644
--- a/plugins.php
+++ b/plugins.php
@@ -86,6 +86,7 @@
   // We update plugin list for the current group.
 
   // Prepare plugins string.
+  $plugins = '';
   if ($cl_charts)
     $plugins .= ',ch';
   if ($cl_clients)

From 86bca3c33d430d68a4dd9702b973f67ea12fbb61 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 15:27:02 +0000
Subject: [PATCH 1447/1848] Resuming work on php8 warnings.

---
 WEB-INF/lib/ttAdmin.class.php | 2 +-
 initialize.php                | 2 +-
 register.php                  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 74d789d12..e40e31dba 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -311,7 +311,7 @@ static function createOrgManager($fields) {
 
   // The createOrg function creates an organization in Time Tracker.
   static function createOrg($fields) {
-    // There are 3 steps that we need to 2 when creating a new organization.
+    // There are 3 steps that we need to do when creating a new organization.
     //   1. Create a new group with null parent_id.
     //   2. Create pre-defined roles in it.
     //   3. Create a top manager account for new group.
diff --git a/initialize.php b/initialize.php
index be7ff2576..025e5dcf4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5435");
+define("APP_VERSION", "1.19.28.5436");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/register.php b/register.php
index 3430d4366..220376138 100644
--- a/register.php
+++ b/register.php
@@ -18,6 +18,8 @@
 
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
+$cl_group_name = $cl_currency = $cl_lang = $cl_manager_name = $cl_manager_login =
+$cl_password1 = $cl_password2 = $cl_manager_email = '';
 if ($request->isPost()) {
   $cl_group_name = trim($request->getParameter('group_name'));
   $cl_currency = trim($request->getParameter('currency'));

From ee71238364860fe3d693313cb72ca0f2c87c7be2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 16:15:10 +0000
Subject: [PATCH 1448/1848] Simplified ttRegistrator.class.php.

---
 WEB-INF/lib/ttRegistrator.class.php | 46 +++++------------------------
 initialize.php                      |  2 +-
 2 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index aadd7d14f..ae499a9df 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttUserHelper');
 import('ttRoleHelper');
@@ -38,10 +14,6 @@ class ttRegistrator {
   var $group_name = null; // Group name.
   var $currency = null;   // Currency.
   var $lang = null;       // Language.
-  var $created_by_id = null; // User, who uses the instance.
-                             // Currently, there are 2 possibilities:
-                             // 1) Self-registration, or null here.
-                             // 2) Registration by admin with a user_id.
   var $group_id = null;   // Group id, set after we create a group.
   var $org_id = null;     // Organization id, the same as group_id (top group in org).
   var $role_id = null;    // Role id for top managers.
@@ -60,7 +32,6 @@ function __construct($fields, &$err) {
     $this->currency = $fields['currency'];
     $this->lang = $fields['lang'];
     if (!$this->lang) $this->lang = 'en';
-    $this->created_by_id = (int) $fields['created_by_id'];
     $this->err = $err;
 
     // Validate passed in parameters.
@@ -98,12 +69,10 @@ function register() {
     global $user;
 
     // Protection from too many recent bot registrations from user IP.
-    if (!$this->created_by_id) { // No problems for logged in user (site admin).
-      if ($this->registeredRecently()) {
-        $this->err->add($i18n->get('error.registered_recently'));
-        $this->err->add($i18n->get('error.access_denied'));
-        return false;
-      }
+    if ($this->registeredRecently()) {
+      $this->err->add($i18n->get('error.registered_recently'));
+      $this->err->add($i18n->get('error.access_denied'));
+      return false;
     }
 
     import('ttUserHelper');
@@ -134,8 +103,7 @@ function register() {
     }
 
     // Set created_by appropriately.
-    $created_by = $this->created_by_id ? $this->created_by_id : $this->user_id;
-    if (!$this->setCreatedBy($created_by))
+    if (!$this->setCreatedBy($this->user_id))
       return false;
 
     return true;
diff --git a/initialize.php b/initialize.php
index 025e5dcf4..d83cfe133 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5436");
+define("APP_VERSION", "1.19.28.5437");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3c85735e2f3842d16ed99505e27bfe33de3fd2a5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 17:02:18 +0000
Subject: [PATCH 1449/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttTimeHelper.class.php | 5 +++--
 WEB-INF/templates/time2.tpl        | 2 +-
 initialize.php                     | 2 +-
 time.php                           | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 78e7a2cf5..bd2fb9898 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -881,7 +881,8 @@ static function getRecords($date, $includeFiles = false) {
       $time_fields_array = array();
     }
 
-    if ($custom_fields && $custom_fields->timeFields) {
+    $time_fields = '';
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         if ($timeField['type'] == CustomFields::TYPE_TEXT) {
@@ -909,7 +910,7 @@ static function getRecords($date, $includeFiles = false) {
     if ($user->isPluginEnabled('cl'))
       $left_joins .= " left join tt_clients c on (l.client_id = c.id)";
       
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $cflTable = 'cfl'.$timeField['id'];
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 4a26f9bef..14b8dcc69 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -36,7 +36,7 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $custom_fields && $custom_fields->timeFields}
+{if isset($custom_fields) && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
         {assign var="control_name" value='time_field_'|cat:$timeField['id']}
   <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
diff --git a/initialize.php b/initialize.php
index d83cfe133..f922de080 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5437");
+define("APP_VERSION", "1.19.28.5438");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 90d54c0cf..95ae5cc79 100644
--- a/time.php
+++ b/time.php
@@ -50,6 +50,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$taskRequired = false;
 if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
@@ -136,7 +137,7 @@
 
 // Handle time custom fields.
 $timeCustomFields = array();
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $control_name = 'time_field_'.$timeField['id'];
     $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
@@ -195,7 +196,7 @@
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 
 // If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
@@ -255,6 +256,7 @@
 }
 
 // Task dropdown.
+$task_list = array();
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',

From 6ba6101125b592da256f9561824a9aade059cce4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 18:12:42 +0000
Subject: [PATCH 1450/1848] Addressed a few more php8 issues.

---
 WEB-INF/lib/ttFileHelper.class.php | 8 +++-----
 initialize.php                     | 2 +-
 project_add.php                    | 1 +
 project_files.php                  | 1 +
 time_files.php                     | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 48105e417..d97ec00ee 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -362,7 +362,7 @@ private function entityHasFiles($entity_id, $entity_type) {
       " and entity_type = ".$mdb2->quote($entity_type)." and entity_id = $entity_id limit 1";
     $res = $mdb2->query($sql);
     $val = $res->fetchRow();
-    return $val['id'] > 0;
+    return (isset($val['id']) && $val['id'] > 0);
   }
 
   // getEntityFiles obtains a list of files for an entity.
@@ -446,6 +446,7 @@ function getFile($fields) {
       'file_name' => urlencode($fields['file_name']));
 
     // url-ify the data for the POST.
+    $fields_string = '';
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
 
@@ -461,9 +462,6 @@ function getFile($fields) {
     // Execute a post request.
     $result = curl_exec($ch);
 
-    $error = curl_error();
-    $result_array2 = json_decode($result, true);
-
     // Close connection.
     curl_close($ch);
 
@@ -474,7 +472,7 @@ function getFile($fields) {
 
     $result_array = json_decode($result, true);
     $status = (int) $result_array['status'];
-    $error = $result_array['error'];
+    $error = isset($result_array['error']) ? $result_array['error'] : false;
 
     if ($error) {
       // Add an error from file storage facility if we have it.
diff --git a/initialize.php b/initialize.php
index f922de080..c8acab4ec 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5438");
+define("APP_VERSION", "1.19.28.5439");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_add.php b/project_add.php
index 1b326b627..16af7a8d1 100644
--- a/project_add.php
+++ b/project_add.php
@@ -29,6 +29,7 @@
   $all_tasks[$task_item['id']] = $task_item['name'];
 $show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
+$cl_name = $cl_description = '';
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('project_name'));
   $cl_description = trim($request->getParameter('description'));
diff --git a/project_files.php b/project_files.php
index 5dd816d6c..60fc4d9e3 100644
--- a/project_files.php
+++ b/project_files.php
@@ -24,6 +24,7 @@
 }
 // End of access checks.
 
+$cl_description = '';
 if ($request->isPost()) {
   $cl_description = trim($request->getParameter('description'));
 }
diff --git a/time_files.php b/time_files.php
index 18489aa98..210bd534c 100644
--- a/time_files.php
+++ b/time_files.php
@@ -24,6 +24,7 @@
 }
 // End of access checks.
 
+$cl_description = '';
 if ($request->isPost()) {
   $cl_description = trim($request->getParameter('description'));
 }

From b0dc8fc28c87679721c9817d2606e7938956eac0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 18:51:53 +0000
Subject: [PATCH 1451/1848] Fixed a few more php8 warnings.

---
 WEB-INF/lib/ttFileHelper.class.php | 11 ++++++-----
 WEB-INF/templates/time_edit2.tpl   |  4 ++--
 initialize.php                     |  2 +-
 time.php                           |  4 ++--
 time_edit.php                      | 14 ++++++++------
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index d97ec00ee..859435a2b 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -137,11 +137,12 @@ function putFile($fields) {
       'entity_type' => urlencode($fields['entity_type']),
       'entity_id' => urlencode($fields['entity_id']),
       'file_name' => urlencode($fields['file_name']),
-      'description' => urlencode($fields['description']),
+      'description' => urlencode(isset($fields['description']) ? $fields['description'] : ''),
       'content' => urlencode(base64_encode(file_get_contents($_FILES['newfile']['tmp_name'])))
     );
 
     // url-ify the data for the POST.
+    $fields_string = '';
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
 
@@ -171,7 +172,7 @@ function putFile($fields) {
     $result_array = json_decode($result, true);
     $file_id = (int) $result_array['file_id'];
     $file_key = $result_array['file_key'];
-    $error = $result_array['error'];
+    $error = isset($result_array['error']) ? $result_array['error'] : false;
 
     if ($error || !$file_id || !$file_key) {
       if ($error) {
@@ -186,7 +187,7 @@ function putFile($fields) {
     $entity_type = $mdb2->quote($fields['entity_type']);
     $entity_id = (int) $fields['entity_id'];
     $file_name = $mdb2->quote($fields['file_name']);
-    $description = $mdb2->quote($fields['description']);
+    $description = $mdb2->quote(isset($fields['description']) ? $fields['description'] : '');
     $created = 'now()';
     $created_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by = $user->id;
@@ -295,6 +296,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
       'entity_id' => urlencode($entity_id));
 
     // url-ify the data for the POST.
+    $fields_string = '';
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
 
@@ -320,7 +322,7 @@ function deleteEntityFiles($entity_id, $entity_type) {
 
     $result_array = json_decode($result, true);
     $status = (int) $result_array['status'];
-    $error = $result_array['error'];
+    $error = isset($result_array['error']) ? $result_array['error'] : false;
 
     if ($error) {
       // Add an error from file storage facility if we have it.
@@ -336,7 +338,6 @@ function deleteEntityFiles($entity_id, $entity_type) {
     // records from the database.
 
     // Delete all entity records from the database.
-    $file_id = $fields['id'];
     $sql = "delete from tt_files".
       " where entity_id = $entity_id".
       " and entity_type = ".$mdb2->quote($entity_type).
diff --git a/WEB-INF/templates/time_edit2.tpl b/WEB-INF/templates/time_edit2.tpl
index 2f8f9e985..8425965b9 100644
--- a/WEB-INF/templates/time_edit2.tpl
+++ b/WEB-INF/templates/time_edit2.tpl
@@ -4,7 +4,7 @@ License: See license.txt *}
 {include file="time_script.tpl"}
 
 {* Conditional include of confirmSave handler. *}
-{if $confirm_save}
+{if isset($confirm_save) && $confirm_save}
 <script>
 var original_date = "{$entry_date}";
 
@@ -42,7 +42,7 @@ function confirmSave() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $custom_fields && $custom_fields->timeFields}
+{if isset($custom_fields) && $custom_fields->timeFields}
   {foreach $custom_fields->timeFields as $timeField}
     {assign var="control_name" value='time_field_'|cat:$timeField['id']}
   <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
diff --git a/initialize.php b/initialize.php
index c8acab4ec..3cebd1064 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5439");
+define("APP_VERSION", "1.19.28.5440");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 95ae5cc79..a0e009b68 100644
--- a/time.php
+++ b/time.php
@@ -330,7 +330,7 @@
     if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     // Validate input in time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($timeCustomFields as $timeField) {
         // Validation is the same for text and dropdown fields.
         if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
@@ -409,7 +409,7 @@
 
       // Insert time custom fields if we have them.
       $result = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
+      if ($id && isset($custom_fields) && $custom_fields->timeFields) {
         $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
 
diff --git a/time_edit.php b/time_edit.php
index 31ee2d137..f9fbc2bfe 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -35,6 +35,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$taskRequired = false;
 if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
@@ -58,8 +59,8 @@
   $cl_duration = trim($request->getParameter('duration'));
   $cl_date = $request->getParameter('date');
   $cl_note = trim($request->getParameter('note'));
-  // If we have user custom fields - collect input.
-  if ($custom_fields && $custom_fields->timeFields) {
+  // If we have time custom fields - collect input.
+  if (isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $control_name = 'time_field_'.$timeField['id'];
       $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
@@ -90,7 +91,7 @@
   $cl_note = $time_rec['comment'];
 
   // If we have time custom fields - collect values from database.
-  if ($custom_fields && $custom_fields->timeFields) {
+  if (isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $control_name = 'time_field_'.$timeField['id'];
       $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
@@ -139,7 +140,7 @@
   $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 
 // If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
@@ -196,6 +197,7 @@
 }
 
 // Task dropdown.
+$task_list = array();
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
@@ -269,7 +271,7 @@
   if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
     $err->add($i18n->get('error.client'));
   // Validate input in time custom fields.
-  if ($custom_fields && $custom_fields->timeFields) {
+  if (isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($timeCustomFields as $timeField) {
       // Validation is the same for text and dropdown fields.
       if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
@@ -373,7 +375,7 @@
         'paid'=>$cl_paid));
 
       // Update time custom fields if we have them.
-      if ($res && $custom_fields && $custom_fields->timeFields) {
+      if ($res && isset($custom_fields) && $custom_fields->timeFields) {
         $res = $custom_fields->updateTimeFields($cl_id, $timeCustomFields);
       }
       if ($res)

From 8fd8780c0d1f194c9994b4de9c616e82e2f54e4b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 21:20:24 +0000
Subject: [PATCH 1452/1848] Some more progress adressing php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php | 34 +++++-----------------------
 WEB-INF/lib/ttTaskHelper.class.php   | 30 +++---------------------
 WEB-INF/lib/ttUser.class.php         | 30 ++++--------------------
 initialize.php                       |  2 +-
 report.php                           |  4 ++--
 reports.php                          |  6 +++--
 task_add.php                         |  1 +
 task_edit.php                        |  2 ++
 time_edit.php                        |  2 +-
 9 files changed, 24 insertions(+), 87 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index b24890e7d..993a9ab71 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttClientHelper');
 import('DateAndTime');
@@ -59,7 +35,7 @@ static function getWhere($options) {
     }
 
     // A shortcut for timesheets.
-    if ($options['timesheet_id']) {
+    if (isset($options['timesheet_id']) && $options['timesheet_id']) {
       $where = " where l.timesheet_id = ".$options['timesheet_id']." and l.group_id = $group_id and l.org_id = $org_id";
       return $where;
     }
@@ -257,6 +233,7 @@ static function getItems($options) {
     }
 
     $grouping = ttReportHelper::grouping($options);
+    $grouping_by_date = $grouping_by_client = $grouping_by_project = $grouping_by_task = $grouping_by_user = false;
     if ($grouping) {
       $grouping_by_date = ttReportHelper::groupingBy('date', $options);
       $grouping_by_client = ttReportHelper::groupingBy('client', $options);
@@ -745,6 +722,7 @@ static function getTotals($options)
     $where = ttReportHelper::getWhere($options);
 
     // Prepare parts.
+    $time_part = $units_part = $cost_part = '';
     $time_part = "sum(time_to_sec(l.duration)) as time";
     if ($options['show_work_units']) {
       $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
@@ -893,7 +871,7 @@ static function getTotals($options)
     $totals['end_date'] = $period->getEndDate();
     $totals['time'] = $total_time;
     $totals['minutes'] = $val['time'] / 60;
-    $totals['units'] = $val['units'];
+    $totals['units'] = isset($val['units']) ? $val['units'] : null;
     $totals['cost'] = $total_cost;
     $totals['expenses'] = $total_expenses;
 
diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 015674067..71a520025 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Class ttTaskHelper is used to help with task related operations.
 class ttTaskHelper {
@@ -87,7 +63,7 @@ static function getTaskByName($task_name) {
 
       if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      if ($val['id'])
+      if (isset($val['id']) && $val['id'])
         return $val;
     }
     return false;
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ca0b759e8..b687da618 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttConfigHelper');
 import('ttGroupHelper');
@@ -577,6 +553,7 @@ function getGroupsForDropdown() {
 
   // addGroupToDropdown is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
   function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
+    $name = '';
     // Add indentation markup to indicate subdirectory level.
     for ($i = 0; $i < $subgroup_level; $i++) {
       $name .= '🛑'; // Unicode stop sign.
@@ -594,6 +571,7 @@ function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
 
   // getSubgroups obtains a list of immediate subgroups.
   function getSubgroups($group_id = null) {
+    $groups = array();
     $mdb2 = getConnection();
 
     if (!$group_id) $group_id = $this->getGroup();
diff --git a/initialize.php b/initialize.php
index 3cebd1064..2fe9fa54e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5440");
+define("APP_VERSION", "1.19.28.5441");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 8642aae1f..76b837756 100644
--- a/report.php
+++ b/report.php
@@ -67,6 +67,7 @@
 // - We can assign items to invoices.
 // - We can assign items to a timesheet.
 // Determine these conditions separately.
+$useMarkApproved = $useMarkPaid = $useAssignToInvoice = $useAssignToTimesheet = false;
 if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
   $useMarkApproved = true;
 if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
@@ -79,8 +80,7 @@
 }
 
 $use_checkboxes = $useMarkApproved || $useMarkPaid || $useAssignToInvoice || $useAssignToTimesheet;
-if ($use_checkboxes)
-  $smarty->assign('use_checkboxes', true);
+$smarty->assign('use_checkboxes', $use_checkboxes);
 
 // Controls for "Mark approved" block.
 if ($useMarkApproved) {
diff --git a/reports.php b/reports.php
index 92a36bd8f..62700e9c4 100644
--- a/reports.php
+++ b/reports.php
@@ -51,6 +51,7 @@
 
 // Dropdown for clients if the clients plugin is enabled.
 $showClient = $user->isPluginEnabled('cl') && !$user->isClient();
+$client_list = array();
 if ($showClient) {
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
@@ -213,7 +214,8 @@
     'groupin'=>$row_count,
     'style'=>'width: 100%;'));
 
-    foreach ($inactive_users as $single_user) {
+  $user_list_inactive = array();
+  foreach ($inactive_users as $single_user) {
     $user_list_inactive[$single_user['id']] = $single_user['name'];
     $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
     if ($projects) {
@@ -222,7 +224,7 @@
       }
     }
   }
-  $row_count = is_array($user_list_inactive) ? ceil(count($user_list_inactive)/3) : 1;
+  $row_count = ceil(count($user_list_inactive)/3);
   $form->addInput(array('type'=>'checkboxgroup',
     'name'=>'users_inactive',
     'data'=>$user_list_inactive,
diff --git a/task_add.php b/task_add.php
index 852ac378e..4888677f1 100644
--- a/task_add.php
+++ b/task_add.php
@@ -21,6 +21,7 @@
 
 $projects = ttGroupHelper::getActiveProjects();
 
+$cl_name = $cl_description = '';
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
diff --git a/task_edit.php b/task_edit.php
index 307beb0b5..4b9a72aef 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -31,11 +31,13 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
+  if ($cl_projects == null) $cl_projects = array();
 } else {
   $cl_name = $task['name'];
   $cl_description = $task['description'];
   $cl_status = $task['status'];
   $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
+  $cl_projects = array();
   foreach ($assigned_projects as $project_item)
     $cl_projects[] = $project_item['id'];
 }
diff --git a/time_edit.php b/time_edit.php
index f9fbc2bfe..f4a955776 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -432,7 +432,7 @@
 
       // Insert time custom fields if we have them.
       $res = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
+      if ($id && isset($custom_fields) && $custom_fields->timeFields) {
         $res = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
       if ($id && $res) {

From 2b7462c0d587f39daeb268023d71a78b9d1be851 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Apr 2021 22:30:16 +0000
Subject: [PATCH 1453/1848] Made more progress adressing php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php | 8 ++++++++
 initialize.php                       | 2 +-
 report.php                           | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 993a9ab71..b7ee4f109 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -562,6 +562,7 @@ static function getItems($options) {
     // Determine sort part.
     $sort_part = ' order by ';
     if ($grouping) {
+      $sort_part2 = '';
       $sort_part2 .= ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ? ', '.$options['group_by1'] : '';
       $sort_part2 .= ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') ? ', '.$options['group_by2'] : '';
       $sort_part2 .= ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') ? ', '.$options['group_by3'] : '';
@@ -846,6 +847,7 @@ static function getTotals($options)
 
     $val = $res->fetchRow();
     $total_time = ttTimeHelper::minutesToDuration($val['time'] / 60);
+    $total_cost = $total_expenses = null;
     if ($options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
@@ -1601,6 +1603,7 @@ static function verifyBean($bean) {
   // makeGroupByKey builds a combined group by key from group_by1, group_by2 and group_by3 values
   // (passed in $options) and a row of data ($row obtained from a db query).
   static function makeGroupByKey($options, $row) {
+    $group_by_key = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
@@ -1653,6 +1656,7 @@ static function makeSingleDropdownGroupByPart($dropdown_value, $options) {
   static function makeGroupByPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
+    $group_by_parts = '';
     $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by1'], $options);
     $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by2'], $options);
     $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by3'], $options);
@@ -1870,6 +1874,7 @@ static function makeSingleDropdownGroupByCustomFieldExpensesPart($dropdown_value
   static function makeGroupByFieldsPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
+    $group_by_fields_parts = '';
     $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by1'], $options);
     $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by2'], $options);
     $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by3'], $options);
@@ -1891,6 +1896,7 @@ static function makeGroupByFieldsExpensesPart($options) {
   static function makeConcatPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
+    $concat_part = '';
     $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by1'], $options);
     $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by2'], $options);
     $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by3'], $options);
@@ -2096,6 +2102,7 @@ static function makeJoinPart($options) {
   static function makeWorkUnitPart($options) {
     global $user;
 
+    $work_unit_part = '';
     $workUnits = $options['show_work_units'];
     if ($workUnits) {
       $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
@@ -2113,6 +2120,7 @@ static function makeWorkUnitPart($options) {
   static function makeCostPart($options) {
     global $user;
 
+    $cost_part = '';
     if ($options['show_cost']) {
       if (MODE_TIME == $user->getTrackingMode())
         $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost";
diff --git a/initialize.php b/initialize.php
index 2fe9fa54e..21bf82ac9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5441");
+define("APP_VERSION", "1.19.28.5442");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 76b837756..5e0815d2a 100644
--- a/report.php
+++ b/report.php
@@ -83,6 +83,7 @@
 $smarty->assign('use_checkboxes', $use_checkboxes);
 
 // Controls for "Mark approved" block.
+$smarty->assign('use_mark_approved', false);
 if ($useMarkApproved) {
   $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
@@ -99,6 +100,7 @@
 }
 
 // Controls for "Mark paid" block.
+$smarty->assign('use_mark_paid', false);
 if ($useMarkPaid) {
   $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
@@ -115,6 +117,7 @@
 }
 
 // Controls for "Assign to invoice" block.
+$smarty->assign('use_assign_to_invoice', false);
 if ($useAssignToInvoice) {
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
@@ -136,6 +139,7 @@
 }
 
 // Controls for "Assign to timesheet" block.
+$smarty->assign('use_assign_to_timesheet', false);
 if ($useAssignToTimesheet) {
   $assign_timesheet_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
@@ -248,6 +252,8 @@
 if ($request->isGet() && $use_checkboxes)
   ttReportHelper::putInSession($report_items);
 
+$subtotals = array();
+$smarty->assign('print_subtotals', false);
 if (ttReportHelper::grouping($options)) {
   $subtotals = ttReportHelper::getSubtotals($options);
   $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));

From bb628152d73c8fe639df4f086061a7e51dbd4c51 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Apr 2021 15:37:42 +0000
Subject: [PATCH 1454/1848] Resuming work on addressing php8 issues.

---
 WEB-INF/lib/ttReportHelper.class.php | 22 +++++++++++++++++++---
 initialize.php                       |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index b7ee4f109..5e09d92a3 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -699,9 +699,24 @@ static function getSubtotals($options) {
           $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
           $val['expenses'] = str_replace('.', $decimalMark, $val['expenses']);
         }
-        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
-      } else
-        $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'time'=>$time, 'units'=> $val['units']);
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,
+          'user'=>isset($val['user']) ? $val['user'] : null,
+          'project'=>isset($val['project']) ? $val['project'] : null,
+          'task'=>isset($val['task']) ? $val['task'] : null,
+          'client'=>isset($val['client']) ? $val['client'] : null,
+          'time'=>$time,
+          'units'=>isset($val['units']) ? $val['units'] : null,
+          'cost'=>$val['cost'],
+          'expenses'=>$val['expenses']);
+      } else {
+        $subtotals[$val['group_field']] = array('name'=>$rowLabel,
+          'user'=>isset($val['user']) ? $val['user'] : null,
+          'project'=>isset($val['project']) ? $val['project'] : null,
+          'task'=>isset($val['task']) ? $val['task'] : null,
+          'client'=>isset($val['client']) ? $val['client'] : null,
+          'time'=>$time,
+          'units'=>isset($val['units']) ? $val['units'] : null);
+      }
     }
 
     return $subtotals;
@@ -2238,6 +2253,7 @@ static function makeGroupByHeader($options) {
       ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
     if ($no_grouping) return null;
 
+    $group_by_header = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
diff --git a/initialize.php b/initialize.php
index 21bf82ac9..cc537a062 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5442");
+define("APP_VERSION", "1.19.28.5443");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 46d4098a8820cc884774116378e354889ba5d116 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Apr 2021 16:31:41 +0000
Subject: [PATCH 1455/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttExpenseHelper.class.php |  2 ++
 WEB-INF/lib/ttReportHelper.class.php  | 11 ++++++++---
 WEB-INF/lib/ttUser.class.php          |  4 ++--
 expenses.php                          |  1 +
 initialize.php                        |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 0de7eca11..58b87b749 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -277,6 +277,8 @@ static function getItems($date, $includeFiles = false) {
     if ($user->isPluginEnabled('cl'))
       $client_field = ", c.name as client";
 
+    $filePart = '';
+    $fileJoin = '';
     if ($includeFiles) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5e09d92a3..59e833ee0 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -2215,9 +2215,11 @@ static function makeGroupByHeaderPart($dropdown_value) {
 
     // First, try to get a label from a translation file, which is the most likely scenario
     // such as grouping by date, user, project, or task.
-    $key = 'label.'.$dropdown_value;
-    $part = $i18n->get($key);
-    if ($part) return $part;
+    if (!ttStartsWith($dropdown_value, 'time_field_') && !ttStartsWith($dropdown_value, 'user_field_')) {
+      $key = 'label.'.$dropdown_value;
+      $part = $i18n->get($key);
+      if ($part) return $part;
+    }
 
     // If label is not found in translation file, we may be grouping by a custom field.
     // Obtain custom field label if so.
@@ -2253,6 +2255,9 @@ static function makeGroupByHeader($options) {
       ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
     if ($no_grouping) return null;
 
+    // We only need to do it for a totals only report.
+    if (!$options['show_totals_only']) return null;
+
     $group_by_header = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index b687da618..3a2f1fa49 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -325,7 +325,7 @@ function getAssignedProjects($options = null)
 
     $filePart = '';
     $fileJoin = '';
-    if (isset($options['include_files'])) {
+    if (isset($options['include_files']) && $options['include_files']) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
@@ -338,7 +338,7 @@ function getAssignedProjects($options = null)
       " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
-      $bindTemplatesWithProjects = $options['include_templates'];
+      $bindTemplatesWithProjects = isset($options['include_templates']) && $options['include_templates'];
       while ($val = $res->fetchRow()) {
         // If we have to include templates, get them in a separate query for each project.
         // Although, theoretically, we could use mysql group_concat, but this requires grouping by, which makes
diff --git a/expenses.php b/expenses.php
index e82d9d379..98a63f72b 100644
--- a/expenses.php
+++ b/expenses.php
@@ -120,6 +120,7 @@
   $largeScreenCalendarRowSpan += 2;
 
   // Dropdown for clients if the clients plugin is enabled.
+  $client_list = array();
   if ($user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
diff --git a/initialize.php b/initialize.php
index cc537a062..e60f90c05 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5443");
+define("APP_VERSION", "1.19.28.5444");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 338fc201ed5fd44232b2d0ed64b9077bad3e1494 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Apr 2021 18:31:08 +0000
Subject: [PATCH 1456/1848] Adressed a few more php8 warnings.

---
 WEB-INF/lib/ttExpenseHelper.class.php | 10 ++++------
 WEB-INF/templates/expense_edit2.tpl   |  2 +-
 expense_edit.php                      |  4 ++--
 initialize.php                        |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php
index 58b87b749..0992b786b 100644
--- a/WEB-INF/lib/ttExpenseHelper.class.php
+++ b/WEB-INF/lib/ttExpenseHelper.class.php
@@ -18,15 +18,14 @@ static function insert($fields) {
     $project_id = $fields['project_id'];
     $name = $fields['name'];
     $cost = str_replace(',', '.', $fields['cost']);
-    $invoice_id = $fields['invoice_id'];
     $status = $fields['status'];
-    $paid = (int) $fields['paid'];
+    $paid = isset($fields['paid']) ? (int) $fields['paid'] : 0;
     $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
     $sql = "insert into tt_expense_items".
-      " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)".
+      " (date, user_id, group_id, org_id, client_id, project_id, name, cost, paid, created, created_ip, created_by, status)".
       " values (".$mdb2->quote($date).", $user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).
-      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", ".$mdb2->quote($invoice_id).", $paid $created, ".$mdb2->quote($status).")";
+      ", ".$mdb2->quote($name).", ".$mdb2->quote($cost).", $paid $created, ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -50,7 +49,6 @@ static function update($fields) {
     $project_id = $fields['project_id'];
     $name = $fields['name'];
     $cost = str_replace(',', '.', $fields['cost']);
-    $invoice_id = $fields['invoice_id'];
 
     $paid_part = '';
     if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
@@ -60,7 +58,7 @@ static function update($fields) {
 
     $sql = "update tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id).
       ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).
-      ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part, invoice_id = ".$mdb2->quote($invoice_id).
+      ", cost = ".$mdb2->quote($cost)."$paid_part $modified_part".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
diff --git a/WEB-INF/templates/expense_edit2.tpl b/WEB-INF/templates/expense_edit2.tpl
index ec921e007..fc5cef8cc 100644
--- a/WEB-INF/templates/expense_edit2.tpl
+++ b/WEB-INF/templates/expense_edit2.tpl
@@ -38,7 +38,7 @@ var defined_expenses = new Array();
 {/foreach}
 
 {* Conditional include of confirmSave handler. *}
-{if $confirm_save}
+{if isset($confirm_save) && $confirm_save}
 var original_date = "{$entry_date}";
 
 function confirmSave() {
diff --git a/expense_edit.php b/expense_edit.php
index 9c85bdb79..c930956ab 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -35,7 +35,7 @@
 $show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
 // Initialize variables.
-$cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = null;
+$cl_date = $cl_client = $cl_project = $cl_item_name = $cl_cost = $cl_paid = null;
 if ($request->isPost()) {
   $cl_date = trim($request->getParameter('date'));
   $cl_client = $request->getParameter('client');
@@ -80,6 +80,7 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
+  $client_list = array();
   if ($user->isPluginEnabled('cl')) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
@@ -210,7 +211,6 @@
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
 $smarty->assign('title', $i18n->get('title.edit_expense'));
 $smarty->assign('content_page_name', 'expense_edit2.tpl');
 $smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index e60f90c05..437af3f40 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5444");
+define("APP_VERSION", "1.19.28.5445");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 5c872fc13d6b7dd4165f5cf1aed953e8a77eebe5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Apr 2021 19:00:05 +0000
Subject: [PATCH 1457/1848] Eliminated several more php8 warnings.

---
 WEB-INF/lib/ttFileHelper.class.php   | 31 ++++--------------------
 WEB-INF/lib/ttReportHelper.class.php | 36 ++++++++++++++--------------
 WEB-INF/templates/report.tpl         | 20 ++++++++--------
 WEB-INF/templates/reports.tpl        |  4 ++--
 initialize.php                       |  2 +-
 report.php                           |  4 ++--
 reports.php                          |  8 +++----
 7 files changed, 41 insertions(+), 64 deletions(-)

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index 859435a2b..cfe8e7932 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // ttFileHelper class is used for attachment handling.
 class ttFileHelper {
@@ -221,6 +197,7 @@ function deleteFile($fields) {
       'file_name' => urlencode($fields['file_name']));
 
     // url-ify the data for the POST.
+    $fields_string = '';
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
 
@@ -246,7 +223,7 @@ function deleteFile($fields) {
 
     $result_array = json_decode($result, true);
     $status = (int) $result_array['status'];
-    $error = $result_array['error'];
+    $error = isset($result_array['error']) ? $result_array['error'] : false;
 
     if ($error) {
       // Add an error from file storage facility if we have it.
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 59e833ee0..87264b335 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -60,7 +60,7 @@ static function getWhere($options) {
     if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
 
     // Add time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = $options[$field_name];
@@ -73,7 +73,7 @@ static function getWhere($options) {
 
     // Prepare part for text custom fields using LIKE operator.
     $cf_text_parts = null;
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = $options[$field_name];
@@ -85,7 +85,7 @@ static function getWhere($options) {
     }
 
     // Add user custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -97,7 +97,7 @@ static function getWhere($options) {
     }
 
     // Continue preparing part for text custom fields using LIKE operator.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -141,7 +141,7 @@ static function getExpenseWhere($options) {
 
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) $custom_fields = new CustomFields();
+      if (!isset($custom_fields)) $custom_fields = new CustomFields();
     }
 
     // Prepare dropdown parts.
@@ -166,7 +166,7 @@ static function getExpenseWhere($options) {
     // This means that filtering by time custom fields applies only to time items, not expenses.
 
     // Add user custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -179,7 +179,7 @@ static function getExpenseWhere($options) {
 
     // Prepare part for text custom fields using LIKE operator.
     $cf_text_parts = null;
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -254,7 +254,7 @@ static function getItems($options) {
     if($canViewReports || $isClient)
       array_push($fields, 'u.name as user');
     // Add user custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_field_name = 'show_'.$field_name;
@@ -279,7 +279,7 @@ static function getItems($options) {
     if ($options['show_task'] || $grouping_by_task)
       array_push($fields, 't.name as task');
     // Add time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_field_name = 'show_'.$field_name;
@@ -355,7 +355,7 @@ static function getItems($options) {
     $left_joins = null;
     // Left joins for custom fields.
     // 1 join is required for each text field, 2 joins for each dropdown.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_field_name = 'show_'.$field_name;
@@ -385,7 +385,7 @@ static function getItems($options) {
     if ($options['show_task'] || $grouping_by_task)
       $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
     // Left joins for time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_field_name = 'show_'.$field_name;
@@ -443,7 +443,7 @@ static function getItems($options) {
       if($canViewReports || $isClient)
         array_push($fields, 'u.name as user');
       // Add user custom fields.
-      if ($custom_fields && $custom_fields->userFields) {
+      if (isset($custom_fields) && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
@@ -467,7 +467,7 @@ static function getItems($options) {
       if ($options['show_task'] || $grouping_by_task)
         array_push($fields, 'null'); // null for task name. We need to match column count for union.
       // Add null values for time custom fields.
-      if ($custom_fields && $custom_fields->timeFields) {
+      if (isset($custom_fields) && $custom_fields->timeFields) {
         foreach ($custom_fields->timeFields as $timeField) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_field_name = 'show_'.$field_name;
@@ -517,7 +517,7 @@ static function getItems($options) {
       // Prepare sql query part for left joins.
       $left_joins = null;
       // Left joins for user custom fields.
-      if ($custom_fields && $custom_fields->userFields) {
+      if (isset($custom_fields) && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
@@ -730,7 +730,7 @@ static function getTotals($options)
 
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) $custom_fields = new CustomFields();
+      if (!isset($custom_fields)) $custom_fields = new CustomFields();
     }
 
     $trackingMode = $user->getTrackingMode();
@@ -758,7 +758,7 @@ static function getTotals($options)
     // Prepare left joins.
     $left_joins = null;
     // Left joins for custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = $options[$field_name];
@@ -776,7 +776,7 @@ static function getTotals($options)
         }
       }
     }
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -826,7 +826,7 @@ static function getTotals($options)
       // Prepate left joins.
       $left_joins = null;
       // Left joins for custom fields.
-      if ($custom_fields && $custom_fields->userFields) {
+      if (isset($custom_fields) && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $field_value = $options[$field_name];
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 6acdf32d3..02b59e9ef 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -42,7 +42,7 @@
   {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
 
   {* user custom fileds *}
-  {if $custom_fields && $custom_fields->userFields}
+  {if isset($custom_fields) && $custom_fields->userFields}
     {foreach $custom_fields->userFields as $userField}
       {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
       {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$userField['label']|escape}}</td>{/if}
@@ -54,7 +54,7 @@
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
 
   {* time custom fileds *}
-  {if $custom_fields && $custom_fields->timeFields}
+  {if isset($custom_fields) && $custom_fields->timeFields}
     {foreach $custom_fields->timeFields as $timeField}
       {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
       {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$timeField['label']|escape}}</td>{/if}
@@ -85,7 +85,7 @@
         {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
 
         {* user custom fileds *}
-        {if $custom_fields && $custom_fields->userFields}
+        {if isset($custom_fields) && $custom_fields->userFields}
           {foreach $custom_fields->userFields as $userField}
             {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
             {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
@@ -97,7 +97,7 @@
         {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
 
         {* time custom fileds *}
-          {if $custom_fields && $custom_fields->timeFields}
+          {if isset($custom_fields) && $custom_fields->timeFields}
            {foreach $custom_fields->timeFields as $timeField}
             {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
             {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
@@ -132,7 +132,7 @@
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
 
     {* user custom fileds *}
-    {if $custom_fields && $custom_fields->userFields}
+    {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="control_name" value='user_field_'|cat:$userField['id']}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -145,7 +145,7 @@
     {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
 
     {* time custom fileds *}
-    {if $custom_fields && $custom_fields->timeFields}
+    {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="control_name" value='time_field_'|cat:$timeField['id']}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -195,7 +195,7 @@
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
 
     {* user custom fileds *}
-    {if $custom_fields && $custom_fields->userFields}
+    {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
         {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
@@ -207,7 +207,7 @@
     {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
 
     {* time custom fileds *}
-    {if $custom_fields && $custom_fields->timeFields}
+    {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
         {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
@@ -237,7 +237,7 @@
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
 
     {* user custom fileds *}
-    {if $custom_fields && $custom_fields->userFields}
+    {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
         {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
@@ -249,7 +249,7 @@
     {if $bean->getAttribute('chtask')}<td></td>{/if}
 
     {* time custom fileds *}
-    {if $custom_fields && $custom_fields->timeFields}
+    {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
         {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 41c625602..248584f5b 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -400,7 +400,7 @@ function handleCheckboxes() {
             </table>
           </td>
         </tr>
-{if $custom_fields && $custom_fields->timeFields}
+{if isset($custom_fields) && $custom_fields->timeFields}
     <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
   {foreach $custom_fields->timeFields as $timeField}
     <tr>
@@ -412,7 +412,7 @@ function handleCheckboxes() {
     </tr>
   {/foreach}
 {/if}
-{if $custom_fields && $custom_fields->userFields}
+{if isset($custom_fields) && $custom_fields->userFields}
     <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
   {foreach $custom_fields->userFields as $userField}
     <tr>
diff --git a/initialize.php b/initialize.php
index 437af3f40..e469849bb 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5445");
+define("APP_VERSION", "1.19.28.5446");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 5e0815d2a..a1c4e3a14 100644
--- a/report.php
+++ b/report.php
@@ -270,7 +270,7 @@
 // Determine column span for note field.
 $colspan = 0;
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
-if ($custom_fields && $custom_fields->userFields) {
+if (isset($custom_fields) && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {
     $checkbox_control_name = 'show_user_field_'.$userField['id'];
     if ($bean->getAttribute($checkbox_control_name)) $colspan++;
@@ -279,7 +279,7 @@
 if ($bean->getAttribute('chclient')) $colspan++;
 if ($bean->getAttribute('chproject')) $colspan++;
 if ($bean->getAttribute('chtask')) $colspan++;
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $checkbox_control_name = 'show_time_field_'.$timeField['id'];
     if ($bean->getAttribute($checkbox_control_name)) $colspan++;
diff --git a/reports.php b/reports.php
index 62700e9c4..66b958fb3 100644
--- a/reports.php
+++ b/reports.php
@@ -288,7 +288,7 @@
   $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
 
 // If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     $checkbox_field_name = 'show_'.$field_name;
@@ -306,7 +306,7 @@
 }
 
 // If we have user custom fields - add controls for them.
-if ($custom_fields && $custom_fields->userFields) {
+if (isset($custom_fields) && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {
     $field_name = 'user_field_'.$userField['id'];
     $checkbox_field_name = 'show_'.$field_name;
@@ -335,14 +335,14 @@
 if (MODE_PROJECTS_AND_TASKS == $trackingMode)
   $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
 // If we have time custom fields - add group by options for them.
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     $group_by_options[$field_name] = $timeField['label'];
   }
 }
 // If we have user custom fields - add group by options for them.
-if ($custom_fields && $custom_fields->userFields) {
+if (isset($custom_fields) && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {
     $field_name = 'user_field_'.$userField['id'];
     $group_by_options[$field_name] = $userField['label'];

From 00c0489a28f22d0593971d5bee7cef5bca0d8025 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Apr 2021 19:24:17 +0000
Subject: [PATCH 1458/1848] Some more progress on addressing php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php | 12 ++++++++----
 initialize.php                       |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 87264b335..a4d408e79 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1703,6 +1703,7 @@ static function makeSingleDropdownGroupByExpensesPart($dropdown_value, $options)
   static function makeGroupByExpensesPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
+    $group_by_parts = '';
     $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByExpensesPart($options['group_by1'], $options);
     $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByExpensesPart($options['group_by2'], $options);
     $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByExpensesPart($options['group_by3'], $options);
@@ -1901,6 +1902,7 @@ static function makeGroupByFieldsPart($options) {
   static function makeGroupByFieldsExpensesPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
+    $group_by_fields_parts = '';
     $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by1'], $options);
     $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by2'], $options);
     $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by3'], $options);
@@ -1947,6 +1949,7 @@ static function makeSingleDropdownConcatExpensesPart($dropdown_value, $options)
   static function makeConcatExpensesPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
+    $concat_part = '';
     $concat_part .= ttReportHelper::makeSingleDropdownConcatExpensesPart($options['group_by1'], $options);
     $concat_part .= ttReportHelper::makeSingleDropdownConcatExpensesPart($options['group_by2'], $options);
     $concat_part .= ttReportHelper::makeSingleDropdownConcatExpensesPart($options['group_by3'], $options);
@@ -2036,7 +2039,7 @@ static function makeJoinPart($options) {
 
     if ($user->isPluginEnabled('cf')) {
       global $custom_fields;
-      if (!$custom_fields) $custom_fields = new CustomFields();
+      if (!isset($custom_fields)) $custom_fields = new CustomFields();
     }
 
     $trackingMode = $user->getTrackingMode();
@@ -2057,7 +2060,7 @@ static function makeJoinPart($options) {
       $left_joins .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
     }
     // Left joins for time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = $options[$field_name];
@@ -2076,7 +2079,7 @@ static function makeJoinPart($options) {
       }
     }
     // Left joins for user custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -2166,7 +2169,7 @@ static function makeJoinExpensesPart($options) {
     }
     // Not adding left joins for time custom fiels by design.
     // Left joins for user custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = $options[$field_name];
@@ -2281,6 +2284,7 @@ static function makeGroupByHeader($options) {
   // makeGroupByXmlTag creates an xml tag for a totals only report using group_by1,
   // group_by2, and group_by3 values passed in $options.
   static function makeGroupByXmlTag($options) {
+    $tag = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $tag .= '_'.$options['group_by1'];
diff --git a/initialize.php b/initialize.php
index e469849bb..6764272fd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5446");
+define("APP_VERSION", "1.19.28.5447");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b9b215aeb81014419e6278a8cb569001f45916ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Apr 2021 21:25:35 +0000
Subject: [PATCH 1459/1848] Fixed a presentation issue on user add and edit
 pages, also addressed several php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php |  6 ++++--
 WEB-INF/lib/ttUserHelper.class.php   | 10 ++++------
 WEB-INF/templates/user_add2.tpl      |  4 +++-
 WEB-INF/templates/user_edit2.tpl     |  4 +++-
 WEB-INF/templates/users2.tpl         |  2 +-
 initialize.php                       |  2 +-
 report.php                           |  4 ++--
 user_add.php                         | 11 +++++++----
 user_edit.php                        | 13 +++++++------
 9 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a4d408e79..604f559d8 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -617,6 +617,8 @@ static function putInSession($report_items) {
 
     if (is_array($report_items)) {
       // Iterate through records and build 2 comma-separated lists.
+      $report_item_ids = '';
+      $report_item_expense_ids = '';
       foreach($report_items as $item) {
         if ($item['type'] == 1)
           $report_item_ids .= ','.$item['id'];
@@ -635,10 +637,10 @@ static function putInSession($report_items) {
   // getFromSession obtains tt_log and tt_expense_items ids stored in user session.
   static function getFromSession() {
     $items = array();
-    $report_item_ids = $_SESSION['report_item_ids'];
+    $report_item_ids = @$_SESSION['report_item_ids'];
     if ($report_item_ids)
       $items['report_item_ids'] = explode(',', $report_item_ids);
-    $report_item_expense_ids = $_SESSION['report_item_expense_ids'];
+    $report_item_expense_ids = @$_SESSION['report_item_expense_ids'];
     if ($report_item_expense_ids)
       $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids);
     return $items;
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index d4fc8d804..95be4fbb5 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -88,16 +88,12 @@ static function insert($fields, $hash = true) {
     $quota_percent = str_replace(',', '.', isset($fields['quota_percent']) ? $fields['quota_percent'] : 100);
     if($rate == '')
       $rate = 0;
-    if (array_key_exists('status', $fields)) { // Key exists and may be NULL during migration of deleted acounts.
-      $status_f = ', status';
-      $status_v = ', '.$mdb2->quote($fields['status']);
-    }
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by_v = ', '.$user->id;
 
-    $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, quota_percent, email, created, created_ip, created_by $status_f) values (".
+    $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, quota_percent, email, created, created_ip, created_by) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
-      ", $password, $group_id, $org_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, $quota_percent, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
+      ", $password, $group_id, $org_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, $quota_percent, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v)";
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
@@ -135,6 +131,8 @@ static function update($user_id, $fields) {
     $org_id = $user->org_id;
 
     // Prepare query parts.
+    $login_part = $pass_part = $name_part = $role_part = $client_part =
+    $rate_part = $quota_percent_part = $status_part = '';
     if (isset($fields['login'])) {
       $login_part = ", login = ".$mdb2->quote($fields['login']);
     }
diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add2.tpl
index 7413fd2a2..7275b645e 100644
--- a/WEB-INF/templates/user_add2.tpl
+++ b/WEB-INF/templates/user_add2.tpl
@@ -107,6 +107,7 @@ function handleClientRole() {
     <td class="td-with-input">{$forms.userForm.role.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $user->isPluginEnabled('cl')}
 <tbody id="client_block">
   <tr class = "small-screen-label"><td><label for="role">{$i18n.label.client}:</label></td></tr>
   <tr>
@@ -115,6 +116,7 @@ function handleClientRole() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </tbody>
+{/if}
 <tbody id="non_client_block">
 {if $show_quota}
   <tr class = "small-screen-label"><td><label for="quota_percent">{$i18n.label.quota}&nbsp;(%):</label></td></tr>
@@ -127,7 +129,7 @@ function handleClientRole() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $custom_fields && $custom_fields->userFields}
+{if isset($custom_fields) && $custom_fields->userFields}
   {foreach $custom_fields->userFields as $userField}
         {assign var="control_name" value='user_field_'|cat:$userField['id']}
   <tr class = "small-screen-label"><td><label for="{$control_name}">{$userField['label']|escape}{if $userField['required']} (*){/if}:</label></td></tr>
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit2.tpl
index 5adad2e9f..744e8c40e 100644
--- a/WEB-INF/templates/user_edit2.tpl
+++ b/WEB-INF/templates/user_edit2.tpl
@@ -130,6 +130,7 @@ function handleClientRole() {
     <td class="td-with-input">{$forms.userForm.role.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $user->isPluginEnabled('cl')}
 <tbody id="client_block">
   <tr class = "small-screen-label"><td><label for="role">{$i18n.label.client}:</label></td></tr>
   <tr>
@@ -138,6 +139,7 @@ function handleClientRole() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </tbody>
+{/if}
   <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
@@ -165,7 +167,7 @@ function handleClientRole() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $custom_fields && $custom_fields->userFields}
+{if isset($custom_fields) && $custom_fields->userFields}
   {foreach $custom_fields->userFields as $userField}
         {assign var="control_name" value='user_field_'|cat:$userField['id']}
   <tr class = "small-screen-label"><td><label for="{$control_name}">{$userField['label']|escape}{if $userField['required']} (*){/if}:</label></td></tr>
diff --git a/WEB-INF/templates/users2.tpl b/WEB-INF/templates/users2.tpl
index 96e5c7e6d..c8c2d0046 100644
--- a/WEB-INF/templates/users2.tpl
+++ b/WEB-INF/templates/users2.tpl
@@ -22,7 +22,7 @@ License: See license.txt *}
     {foreach $active_users as $u}
   <tr>
     <td class="text-cell">
-      {if $uncompleted_indicators}
+      {if isset($uncompleted_indicators) && $uncompleted_indicators}
       <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
       {/if}
       {$u.name|escape}
diff --git a/initialize.php b/initialize.php
index 6764272fd..a0da71f73 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5447");
+define("APP_VERSION", "1.19.28.5448");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index a1c4e3a14..e53374138 100644
--- a/report.php
+++ b/report.php
@@ -177,8 +177,8 @@
     // Note: getting from session assures we act only on previously displayed records.
     // Rebuilding from $bean may get us a different set.
     $item_ids = ttReportHelper::getFromSession();
-    $time_log_ids = $item_ids['report_item_ids'];
-    $expense_item_ids = $item_ids['report_item_expense_ids'];
+    $time_log_ids = @$item_ids['report_item_ids'];
+    $expense_item_ids = @$item_ids['report_item_expense_ids'];
     // The above code is here because the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
   }
 
diff --git a/user_add.php b/user_add.php
index 7b7b72ed8..7325682e5 100644
--- a/user_add.php
+++ b/user_add.php
@@ -33,6 +33,9 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
+$cl_name = $cl_login = $cl_password1 = $cl_password2 = $cl_email =
+$cl_role_id = $cl_client_id = $cl_quota_percent = $cl_rate = null;
+$cl_projects = array();
 $assigned_projects = array();
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -46,7 +49,7 @@
   $cl_client_id = $request->getParameter('client');
   $cl_quota_percent = $request->getParameter('quota_percent');
   // If we have user custom fields - collect input.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($custom_fields->userFields as $userField) {
       $control_name = 'user_field_'.$userField['id'];
       $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
@@ -87,7 +90,7 @@
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 // If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->userFields) {
+if (isset($custom_fields) && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {
     $field_name = 'user_field_'.$userField['id'];
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
@@ -161,7 +164,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
   // Validate input in user custom fields.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($userCustomFields as $userField) {
       // Validation is the same for text and dropdown fields.
       if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
@@ -188,7 +191,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
       // Insert user custom fields if we have them.
       $result = true;
-      if ($user_id && $custom_fields && $custom_fields->userFields) {
+      if ($user_id && isset($custom_fields) && $custom_fields->userFields) {
         $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
       }
 
diff --git a/user_edit.php b/user_edit.php
index b1f1e65e2..dc19ad6aa 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -41,8 +41,9 @@
   $projects = ttGroupHelper::getActiveProjects();
   if (count($projects) == 0) $show_projects = false;
 }
+$cl_name = $cl_login = $cl_password1 = $cl_password2 = $cl_email =
+$cl_role_id = $cl_client_id = $cl_quota_percent = $cl_rate = null;
 $assigned_projects = array();
-
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_login = trim($request->getParameter('login'));
@@ -56,7 +57,7 @@
   $cl_status = $request->getParameter('status');
   $cl_quota_percent = $request->getParameter('quota_percent');
   // If we have user custom fields - collect input.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($custom_fields->userFields as $userField) {
       $control_name = 'user_field_'.$userField['id'];
       $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
@@ -86,7 +87,7 @@
   $cl_email = $user_details['email'];
   $cl_quota_percent = str_replace('.', $user->getDecimalMark(), $user_details['quota_percent']);
   // If we have user custom fields - collect values from database.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($custom_fields->userFields as $userField) {
       $control_name = 'user_field_'.$userField['id'];
       $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
@@ -123,7 +124,7 @@
   $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
 // If we have custom fields - add controls for them.
-if ($custom_fields && $custom_fields->userFields) {
+if (isset($custom_fields) && $custom_fields->userFields) {
   foreach ($custom_fields->userFields as $userField) {
     $field_name = 'user_field_'.$userField['id'];
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
@@ -194,7 +195,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
     // Validate input in user custom fields.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($userCustomFields as $userField) {
       // Validation is the same for text and dropdown fields.
       if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
@@ -222,7 +223,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
       $result = ttUserHelper::update($user_id, $fields);
       // Update user custom fields if we have them.
-      if ($result && $custom_fields && $custom_fields->userFields) {
+      if ($result && isset($custom_fields) && $custom_fields->userFields) {
         $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
       }
 

From 2001927413805bdda3214740e1f9675362903277 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 15:12:46 +0000
Subject: [PATCH 1460/1848] Eliminated a few more php8 warnings.

---
 WEB-INF/lib/ttAdmin.class.php | 31 +++++--------------------------
 admin_group_add.php           |  2 ++
 initialize.php                |  2 +-
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index e40e31dba..35a26afbe 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttRoleHelper');
 
@@ -142,6 +118,7 @@ static function updateGroup($fields) {
     // Update group manager.
     $user_id = $fields['user_id'];
     $login_part = 'login = '.$mdb2->quote($fields['new_login']);
+    $password_part = '';
     if ($fields['password1'])
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['user_name']);
@@ -245,6 +222,7 @@ static function markGroupDeletedInTable($group_id, $table_name) {
     $mdb2 = getConnection();
 
     // Add modified info to sql for some tables, depending on table name.
+    $modified_part = '';
     if ($table_name == 'tt_users') {
       global $user;
       $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
@@ -388,6 +366,7 @@ static function deleteGroupFiles($group_id) {
       'group_key' => $group_key);
 
     // url-ify the data for the POST.
+    $fields_string = '';
     foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
     $fields_string = rtrim($fields_string, '&');
 
diff --git a/admin_group_add.php b/admin_group_add.php
index 45aa32261..1865a753e 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -14,6 +14,8 @@
 }
 // End of access checks.
 
+$cl_group_name = $cl_lang = $cl_manager_name = $cl_manager_login =
+$cl_password1 = $cl_password2 = $cl_manager_email = '';
 if ($request->isPost()) {
   $cl_group_name = trim($request->getParameter('group_name'));
   $cl_lang = $request->getParameter('lang');
diff --git a/initialize.php b/initialize.php
index a0da71f73..ae6b9a2e7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5448");
+define("APP_VERSION", "1.19.28.5449");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 67829620d48ec9f97a715f6826daf7ecc60ccd6e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 15:54:58 +0000
Subject: [PATCH 1461/1848] Resuming work on making more pages mobile friendly.

---
 WEB-INF/templates/admin_group_add.tpl  | 49 ----------------------
 WEB-INF/templates/admin_group_add2.tpl | 56 ++++++++++++++++++++++++++
 admin_group_add.php                    |  6 +--
 initialize.php                         |  2 +-
 4 files changed, 60 insertions(+), 53 deletions(-)
 delete mode 100644 WEB-INF/templates/admin_group_add.tpl
 create mode 100644 WEB-INF/templates/admin_group_add2.tpl

diff --git a/WEB-INF/templates/admin_group_add.tpl b/WEB-INF/templates/admin_group_add.tpl
deleted file mode 100644
index 029b52545..000000000
--- a/WEB-INF/templates/admin_group_add.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{$forms.groupForm.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.groupForm.group_name.control}</td>
-        </tr>
-        <tr>
-           <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.groupForm.lang.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.groupForm.manager_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.groupForm.manager_login.control}</td>
-        </tr>
-{if !$auth_external}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.groupForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.groupForm.password2.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.groupForm.manager_email.control}</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.groupForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/WEB-INF/templates/admin_group_add2.tpl b/WEB-INF/templates/admin_group_add2.tpl
new file mode 100644
index 000000000..33b83698c
--- /dev/null
+++ b/WEB-INF/templates/admin_group_add2.tpl
@@ -0,0 +1,56 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.groupForm.open}
+<table class="centered-table">
+    <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="group_name">{$i18n.label.group_name} (*):</label></td>
+        <td class="td-with-input">{$forms.groupForm.group_name.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+    <tr class = "small-screen-label"><td><label for="lang">{$i18n.label.language}:</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="lang">{$i18n.label.language}:</label></td>
+        <td class="td-with-input">{$forms.groupForm.lang.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+    <tr class = "small-screen-label"><td><label for="manager_name">{$i18n.label.manager_name} (*):</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="manager_name">{$i18n.label.manager_name} (*):</label></td>
+        <td class="td-with-input">{$forms.groupForm.manager_name.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+    <tr class = "small-screen-label"><td><label for="manager_login">{$i18n.label.manager_login} (*):</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="manager_login">{$i18n.label.manager_login} (*):</label></td>
+        <td class="td-with-input">{$forms.groupForm.manager_login.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if !$auth_external}
+    <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="password1">{$i18n.label.password} (*):</label></td>
+        <td class="td-with-input">{$forms.groupForm.password1.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+    <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password} (*):</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
+        <td class="td-with-input">{$forms.groupForm.password2.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+    <tr class = "small-screen-label"><td><label for="manager_email">{$i18n.label.email}:</label></td></tr>
+    <tr>
+        <td class="large-screen-label"><label for="manager_email">{$i18n.label.email}:</label></td>
+        <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
+    </tr>
+    <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+    <tr>
+        <td colspan="2">{$forms.groupForm.btn_submit.control}</td>
+    </tr>
+    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+{$forms.groupForm.close}
diff --git a/admin_group_add.php b/admin_group_add.php
index 1865a753e..976b5c6db 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -48,7 +48,7 @@
   $longname_lang[] = array('id'=>I18n::getLangFromFilename($lfile),'name'=>$lname);
 }
 $longname_lang = mu_sort($longname_lang, 'name');
-$form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 200px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
+$form->addInput(array('type'=>'combobox','name'=>'lang','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
 
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_login','value'=>$cl_manager_login));
@@ -101,6 +101,6 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
-$smarty->assign('content_page_name', 'admin_group_add.tpl');
+$smarty->assign('content_page_name', 'admin_group_add2.tpl');
 $smarty->assign('title', $i18n->get('title.add_group'));
-$smarty->display('index.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index ae6b9a2e7..b0ade64f7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5449");
+define("APP_VERSION", "1.19.28.5450");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 06c70db4fd314724bc7678394dc0656543efd042 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 16:28:22 +0000
Subject: [PATCH 1462/1848] Made admin_group_edit.php page mobile friendly.

---
 WEB-INF/templates/admin_group_add2.tpl  | 91 ++++++++++++-------------
 WEB-INF/templates/admin_group_edit.tpl  | 45 ------------
 WEB-INF/templates/admin_group_edit2.tpl | 47 +++++++++++++
 admin_group_edit.php                    |  4 +-
 initialize.php                          |  2 +-
 5 files changed, 94 insertions(+), 95 deletions(-)
 delete mode 100644 WEB-INF/templates/admin_group_edit.tpl
 create mode 100644 WEB-INF/templates/admin_group_edit2.tpl

diff --git a/WEB-INF/templates/admin_group_add2.tpl b/WEB-INF/templates/admin_group_add2.tpl
index 33b83698c..17514e478 100644
--- a/WEB-INF/templates/admin_group_add2.tpl
+++ b/WEB-INF/templates/admin_group_add2.tpl
@@ -3,54 +3,51 @@ License: See license.txt *}
 
 {$forms.groupForm.open}
 <table class="centered-table">
-    <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="group_name">{$i18n.label.group_name} (*):</label></td>
-        <td class="td-with-input">{$forms.groupForm.group_name.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-    <tr class = "small-screen-label"><td><label for="lang">{$i18n.label.language}:</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="lang">{$i18n.label.language}:</label></td>
-        <td class="td-with-input">{$forms.groupForm.lang.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-    <tr class = "small-screen-label"><td><label for="manager_name">{$i18n.label.manager_name} (*):</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="manager_name">{$i18n.label.manager_name} (*):</label></td>
-        <td class="td-with-input">{$forms.groupForm.manager_name.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-    <tr class = "small-screen-label"><td><label for="manager_login">{$i18n.label.manager_login} (*):</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="manager_login">{$i18n.label.manager_login} (*):</label></td>
-        <td class="td-with-input">{$forms.groupForm.manager_login.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="group_name">{$i18n.label.group_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.group_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="lang">{$i18n.label.language}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="lang">{$i18n.label.language}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.lang.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_name">{$i18n.label.manager_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="manager_name">{$i18n.label.manager_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.manager_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_login">{$i18n.label.manager_login} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="manager_login">{$i18n.label.manager_login} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.manager_login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if !$auth_external}
-    <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="password1">{$i18n.label.password} (*):</label></td>
-        <td class="td-with-input">{$forms.groupForm.password1.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-    <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password} (*):</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
-        <td class="td-with-input">{$forms.groupForm.password2.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password1">{$i18n.label.password} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.password1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.password2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-    <tr class = "small-screen-label"><td><label for="manager_email">{$i18n.label.email}:</label></td></tr>
-    <tr>
-        <td class="large-screen-label"><label for="manager_email">{$i18n.label.email}:</label></td>
-        <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
-    </tr>
-    <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-    <tr>
-        <td colspan="2">{$forms.groupForm.btn_submit.control}</td>
-    </tr>
-    <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_email">{$i18n.label.email}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="manager_email">{$i18n.label.email}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
+  </tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
+<div class="button-set">{$forms.groupForm.btn_submit.control}</div>
 {$forms.groupForm.close}
diff --git a/WEB-INF/templates/admin_group_edit.tpl b/WEB-INF/templates/admin_group_edit.tpl
deleted file mode 100644
index 70443e327..000000000
--- a/WEB-INF/templates/admin_group_edit.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{$forms.groupForm.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.groupForm.group_name.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.groupForm.manager_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.groupForm.manager_login.control}</td>
-        </tr>
-{if !$auth_external}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.groupForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.groupForm.password2.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.groupForm.manager_email.control}</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.groupForm.btn_save.control}&nbsp;{$forms.groupForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/WEB-INF/templates/admin_group_edit2.tpl b/WEB-INF/templates/admin_group_edit2.tpl
new file mode 100644
index 000000000..15185163e
--- /dev/null
+++ b/WEB-INF/templates/admin_group_edit2.tpl
@@ -0,0 +1,47 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.groupForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.group_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="group_name">{$i18n.label.group_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.group_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_name">{$i18n.label.manager_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="manager_name">{$i18n.label.manager_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.manager_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="manager_login">{$i18n.label.manager_login} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="manager_login">{$i18n.label.manager_login} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.manager_login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if !$auth_external}
+  <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password1">{$i18n.label.password} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.password1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.password2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="manager_email">{$i18n.label.email}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="manager_email">{$i18n.label.email}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.manager_email.control}</td>
+  </tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.groupForm.btn_save.control} {$forms.groupForm.btn_cancel.control}</div>
+{$forms.groupForm.close}
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 81588ebec..5474ca2c3 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -110,5 +110,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
-$smarty->assign('content_page_name', 'admin_group_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'admin_group_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index b0ade64f7..294f488e3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5450");
+define("APP_VERSION", "1.19.28.5451");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 786fd517cc4f15ebab4a68f8f16d279f76c75dc0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 17:45:29 +0000
Subject: [PATCH 1463/1848] Made admin_group_delete.php mobile friendly.

---
 WEB-INF/templates/admin_group_delete.tpl  | 20 --------------------
 WEB-INF/templates/admin_group_delete2.tpl |  7 +++++++
 admin_group_delete.php                    |  4 ++--
 initialize.php                            |  2 +-
 4 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 WEB-INF/templates/admin_group_delete.tpl
 create mode 100644 WEB-INF/templates/admin_group_delete2.tpl

diff --git a/WEB-INF/templates/admin_group_delete.tpl b/WEB-INF/templates/admin_group_delete.tpl
deleted file mode 100644
index 57164d4a8..000000000
--- a/WEB-INF/templates/admin_group_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.groupForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$group_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.groupForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.groupForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/WEB-INF/templates/admin_group_delete2.tpl b/WEB-INF/templates/admin_group_delete2.tpl
new file mode 100644
index 000000000..a4205036e
--- /dev/null
+++ b/WEB-INF/templates/admin_group_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.groupForm.open}
+<div class="section-header">{$group_to_delete|escape}</div>
+<div class="button-set">{$forms.groupForm.btn_delete.control}&nbsp;{$forms.groupForm.btn_cancel.control}</div>
+{$forms.groupForm.close}
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 0cea02b32..83999da5d 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -42,5 +42,5 @@
 $smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'admin_group_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'admin_group_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 294f488e3..4b118fe69 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5451");
+define("APP_VERSION", "1.19.28.5452");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6a54d78b09130aba190ec4f3677d47edee860718 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 19:33:57 +0000
Subject: [PATCH 1464/1848] Made admin_groups.php page mobile friendly.

---
 WEB-INF/templates/admin_groups.tpl  | 42 -----------------------------
 WEB-INF/templates/admin_groups2.tpl | 36 +++++++++++++++++++++++++
 admin_groups.php                    |  4 +--
 initialize.php                      |  2 +-
 4 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 WEB-INF/templates/admin_groups.tpl
 create mode 100644 WEB-INF/templates/admin_groups2.tpl

diff --git a/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
deleted file mode 100644
index af98c12fd..000000000
--- a/WEB-INF/templates/admin_groups.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr><td valign="top">{$i18n.form.groups.hint}</td></tr>
-</table>
-
-<table cellspacing="1" cellpadding="3" border="0" width="720">
-  <tr>
-    <td width="3%" class="tableHeader">{$i18n.label.id}</td>
-    <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
-    <td class="tableHeader">{$i18n.label.date}</td>
-    <td class="tableHeader">{$i18n.label.language}</td>
-    <td></td>
-    <td></td>
-  </tr>
-{if $groups}
-  {foreach $groups as $group}
-  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    <td>{$group.id}</td>
-    <td>{$group.name|escape}</td>
-    <td nowrap>{$group.date}</td>
-    <td align="center">{$group.lang}</td>
-    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-  </tr>
-  {/foreach}
-{/if}
-</table>
-
-<table width="100%">
-  <tr>
-    <td align="center">
-      <br>
-      <form>
-        <input type="button" onclick="chLocation('admin_group_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
-        <input type="button" onclick="chLocation('import.php');" value="{$i18n.button.import}">
-      </form>
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/admin_groups2.tpl b/WEB-INF/templates/admin_groups2.tpl
new file mode 100644
index 000000000..467bff28b
--- /dev/null
+++ b/WEB-INF/templates/admin_groups2.tpl
@@ -0,0 +1,36 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<div class="page-hint">{$i18n.form.groups.hint}</div>
+{if $groups}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.id}</th>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.date}</th>
+    <th>{$i18n.label.language}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $groups as $group}
+  <tr>
+    <td>{$group.id}</td>
+    <td>{$group.name|escape}</td>
+    <td>{$group.date}</td>
+    <td>{$group.lang}</td>
+    <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+</table>
+{/if}
+<div class="button-set">
+  <form>
+    <input type="button" onclick="chLocation('admin_group_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
+    <input type="button" onclick="chLocation('import.php');" value="{$i18n.button.import}">
+  </form>
+</div>
diff --git a/admin_groups.php b/admin_groups.php
index 8dffd3931..915f7d778 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -14,5 +14,5 @@
 
 $smarty->assign('groups', ttOrgHelper::getOrgs());
 $smarty->assign('title', $i18n->get('title.groups'));
-$smarty->assign('content_page_name', 'admin_groups.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'admin_groups2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 4b118fe69..ba1d0ea68 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5452");
+define("APP_VERSION", "1.19.28.5453");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a17a11f21f4ad0f2df2fc7685aee61f91ac84c91 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 20:41:29 +0000
Subject: [PATCH 1465/1848] Addressed a few more php8 warnings.

---
 WEB-INF/templates/header2.tpl | 6 +++---
 admin_options.php             | 1 +
 initialize.php                | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header2.tpl
index 65af554ee..1d8627a66 100644
--- a/WEB-INF/templates/header2.tpl
+++ b/WEB-INF/templates/header2.tpl
@@ -12,7 +12,7 @@
 {if $user->getCustomCss()}
   <link href="custom_css.php" rel="stylesheet">
 {/if}
-  <title>Time Tracker{if $title} - {$title}{/if}</title>
+  <title>Time Tracker{if isset($title) && $title} - {$title}{/if}</title>
   <script src="js/strftime.js"></script>
   <script>
     {* Setup locale for strftime *}
@@ -160,8 +160,8 @@
 {* end of top menu for large screens *}
 
 {* page title and user details *}
-{if $title}
-<div class="page-title">{$title}{if (isset($timestring) && $timestring)}: {$timestring}{/if}</div>
+{if isset($title) && $title}
+<div class="page-title">{$title}{if isset($timestring) && $timestring}: {$timestring}{/if}</div>
   {if (isset($authenticated) && $authenticated)}
 <div class="user-details">{$user->getUserPartForHeader()}</div> {* No need to escape as it is done in the class. *}
   {/if}
diff --git a/admin_options.php b/admin_options.php
index 64b28b9a4..84a0ed3a5 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -14,6 +14,7 @@
 }
 // End of access checks.
 
+$cl_name = $cl_login = $cl_password1 = $cl_password2 = $cl_email = '';
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_login = trim($request->getParameter('login'));
diff --git a/initialize.php b/initialize.php
index ba1d0ea68..ad7ebf17b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5453");
+define("APP_VERSION", "1.19.28.5454");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f5c6b7d8dbbd775320e729aa4356f1c19fed91af Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Apr 2021 21:23:26 +0000
Subject: [PATCH 1466/1848] Made admin_options.php mobile friendly.

---
 WEB-INF/templates/admin_options.tpl  | 39 --------------------------
 WEB-INF/templates/admin_options2.tpl | 41 ++++++++++++++++++++++++++++
 admin_options.php                    |  4 +--
 initialize.php                       |  2 +-
 4 files changed, 44 insertions(+), 42 deletions(-)
 delete mode 100644 WEB-INF/templates/admin_options.tpl
 create mode 100644 WEB-INF/templates/admin_options2.tpl

diff --git a/WEB-INF/templates/admin_options.tpl b/WEB-INF/templates/admin_options.tpl
deleted file mode 100644
index bff36ff19..000000000
--- a/WEB-INF/templates/admin_options.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{$forms.optionsForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right" nowrap>{$i18n.label.person_name} (*):</td>
-          <td>{$forms.optionsForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.login} (*):</td>
-          <td>{$forms.optionsForm.login.control}</td>
-        </tr>
-{if !$auth_external}
-        <tr>
-          <td align="right">{$i18n.label.password}:</td>
-          <td>{$forms.optionsForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.confirm_password}:</td>
-          <td>{$forms.optionsForm.password2.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.optionsForm.email.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.optionsForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.optionsForm.close}
diff --git a/WEB-INF/templates/admin_options2.tpl b/WEB-INF/templates/admin_options2.tpl
new file mode 100644
index 000000000..be5bc79e5
--- /dev/null
+++ b/WEB-INF/templates/admin_options2.tpl
@@ -0,0 +1,41 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.optionsForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.person_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.person_name} (*):</label></td>
+    <td class="td-with-input">{$forms.optionsForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login} (*):</label></td>
+    <td class="td-with-input">{$forms.optionsForm.login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if !$auth_external}
+  <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password1">{$i18n.label.password}:</label></td>
+    <td class="td-with-input">{$forms.optionsForm.password1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password}:</label></td>
+    <td class="td-with-input">{$forms.optionsForm.password2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="email">{$i18n.label.email}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="email">{$i18n.label.email}:</label></td>
+    <td class="td-with-input">{$forms.optionsForm.email.control}</td>
+  </tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.optionsForm.btn_submit.control}</div>
+{$forms.optionsForm.close}
diff --git a/admin_options.php b/admin_options.php
index 84a0ed3a5..bc1269336 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -72,5 +72,5 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.options'));
-$smarty->assign('content_page_name', 'admin_options.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'admin_options2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index ad7ebf17b..80f15ccb1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5454");
+define("APP_VERSION", "1.19.28.5455");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a985d3b77bb346a5a2096552558c173e80e51bfa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 00:12:47 +0000
Subject: [PATCH 1467/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/auth/Auth_db.class.php   | 34 ++++------------------------
 WEB-INF/lib/auth/Auth_ldap.class.php | 28 ++---------------------
 expenses.php                         |  3 +--
 initialize.php                       |  2 +-
 4 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index a7ae0d3fa..b5fbdaef9 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -1,30 +1,6 @@
 <?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/content/time_tracker/open_source/credits.htm
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 /**
 * Auth_db class is used to authenticate users against internal DB
@@ -53,7 +29,7 @@ function authenticate($login, $password)
     }
 
     $val = $res->fetchRow();
-    if ($val['id'] > 0) {
+    if (isset($val['id']) && $val['id'] > 0) {
       return array('login'=>$login,'id'=>$val['id']);
     } else {
       // If the OLD_PASSWORDS option is defined - set it.
@@ -77,7 +53,7 @@ function authenticate($login, $password)
         // support in November 2018, there were login issues with such users.
       }
       $val = $res->fetchRow();
-      if ($val['id'] > 0) {
+      if (isset($val['id']) && $val['id'] > 0) {
         return array('login'=>$login,'id'=>$val['id']);
       }
     }
@@ -92,7 +68,7 @@ function authenticate($login, $password)
         die($res->getMessage());
       }
       $val = $res->fetchRow();
-      if ($val['id'] > 0) {
+      if (isset($val['id']) && $val['id'] > 0) {
         return array('login'=>$val['login'],'id'=>$val['id']);
       }
     }
diff --git a/WEB-INF/lib/auth/Auth_ldap.class.php b/WEB-INF/lib/auth/Auth_ldap.class.php
index 1ccbb0371..b783276cf 100644
--- a/WEB-INF/lib/auth/Auth_ldap.class.php
+++ b/WEB-INF/lib/auth/Auth_ldap.class.php
@@ -1,30 +1,6 @@
 <?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/content/time_tracker/open_source/credits.htm
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // NOTES:
 //
diff --git a/expenses.php b/expenses.php
index 98a63f72b..d5978228e 100644
--- a/expenses.php
+++ b/expenses.php
@@ -153,12 +153,11 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
     'name'=>'predefined_expense',
-    'value'=>$cl_predefined_expense,
     'data'=>$predefined_expenses,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
   $largeScreenCalendarRowSpan += 2;
-  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','value'=>$cl_quantity));
+  $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity'));
   $largeScreenCalendarRowSpan += 2;
 }
 $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','value'=>$cl_item_name));
diff --git a/initialize.php b/initialize.php
index 80f15ccb1..8c46bdf08 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5455");
+define("APP_VERSION", "1.19.28.5456");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b8c7887eb7707bc43f76612fd20adb8bd778906b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 13:10:57 +0000
Subject: [PATCH 1468/1848] Style improved on admin_groups.php.

---
 WEB-INF/templates/admin_groups2.tpl | 2 +-
 initialize.php                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/admin_groups2.tpl b/WEB-INF/templates/admin_groups2.tpl
index 467bff28b..845216417 100644
--- a/WEB-INF/templates/admin_groups2.tpl
+++ b/WEB-INF/templates/admin_groups2.tpl
@@ -19,7 +19,7 @@ License: See license.txt *}
   {foreach $groups as $group}
   <tr>
     <td>{$group.id}</td>
-    <td>{$group.name|escape}</td>
+    <td class="text-cell">{$group.name|escape}</td>
     <td>{$group.date}</td>
     <td>{$group.lang}</td>
     <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
diff --git a/initialize.php b/initialize.php
index 8c46bdf08..88656fcc1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5456");
+define("APP_VERSION", "1.19.28.5457");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6332c1190ae39d5e70b999752bb4a0b2b881ab79 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 13:56:50 +0000
Subject: [PATCH 1469/1848] Another style improvement on admin_groups.php.

---
 WEB-INF/templates/admin_groups2.tpl | 2 +-
 default.css                         | 5 +++++
 initialize.php                      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/admin_groups2.tpl b/WEB-INF/templates/admin_groups2.tpl
index 845216417..ef9d729ff 100644
--- a/WEB-INF/templates/admin_groups2.tpl
+++ b/WEB-INF/templates/admin_groups2.tpl
@@ -20,7 +20,7 @@ License: See license.txt *}
   <tr>
     <td>{$group.id}</td>
     <td class="text-cell">{$group.name|escape}</td>
-    <td>{$group.date}</td>
+    <td class="date-cell">{$group.date}</td>
     <td>{$group.lang}</td>
     <td><a href="admin_group_edit.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
     <td><a href="admin_group_delete.php?id={$group.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
diff --git a/default.css b/default.css
index 377197f28..696bfd9ac 100644
--- a/default.css
+++ b/default.css
@@ -170,6 +170,11 @@ div.page-hint {
   text-align: right;
 }
 
+/* date cell in tables */
+.date-cell {
+  white-space: nowrap;
+}
+
 /* text cell for note header when we display notes on separate rows */
 .note-header-cell {
   text-align: right;
diff --git a/initialize.php b/initialize.php
index 88656fcc1..c13caaf89 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5457");
+define("APP_VERSION", "1.19.28.5458");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ebc85ddb12ed2385516a773ef3a28c39c532c83c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 14:14:44 +0000
Subject: [PATCH 1470/1848] Another style improvement.

---
 default.css    | 2 +-
 initialize.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.css b/default.css
index 696bfd9ac..6d649b69b 100644
--- a/default.css
+++ b/default.css
@@ -115,7 +115,7 @@ div#LoginAboutText {
 
 /* page hint div to display on top of some pages to clarify things */
 div.page-hint {
-  margin-top: 1rem;
+  margin: .5rem;
 }
 
 /* project rate table for user add and user edit pages */
diff --git a/initialize.php b/initialize.php
index c13caaf89..518f8c28a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5458");
+define("APP_VERSION", "1.19.28.5459");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c8dee1115873a4d90731e327710106c3aa1f0389 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 15:10:05 +0000
Subject: [PATCH 1471/1848] Made cf_custom_fields.php mobile friendly.

---
 WEB-INF/templates/cf_custom_fields.tpl  | 47 -------------------------
 WEB-INF/templates/cf_custom_fields2.tpl | 39 ++++++++++++++++++++
 cf_custom_fields.php                    |  4 +--
 initialize.php                          |  2 +-
 4 files changed, 42 insertions(+), 50 deletions(-)
 delete mode 100644 WEB-INF/templates/cf_custom_fields.tpl
 create mode 100644 WEB-INF/templates/cf_custom_fields2.tpl

diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
deleted file mode 100644
index 6636d79e1..000000000
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{$forms.customFieldsForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.entity}</td>
-          <td class="tableHeader">{$i18n.label.type}</td>
-          <td class="tableHeader">{$i18n.menu.options}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {if $custom_fields}
-    {foreach $custom_fields as $field}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$field['label']|escape}</td>
-      {if CustomFields::ENTITY_TIME == $field['entity_type']}
-          <td>{$i18n.entity.time}</td>
-      {elseif CustomFields::ENTITY_USER == $field['entity_type']}
-          <td>{$i18n.entity.user}</td>
-      {else}
-          <td></td>
-      {/if}
-      {if CustomFields::TYPE_TEXT == $field['type']}
-          <td>{$i18n.label.type_text}</td>
-          <td></td>
-      {elseif CustomFields::TYPE_DROPDOWN == $field['type']}
-          <td>{$i18n.label.type_dropdown}</td>
-          <td><a href="cf_dropdown_options.php?field_id={$field['id']}">{$i18n.label.configure}</a></td>
-      {/if}
-          <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.customFieldsForm.btn_add.control}</td></tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.customFieldsForm.close}
diff --git a/WEB-INF/templates/cf_custom_fields2.tpl b/WEB-INF/templates/cf_custom_fields2.tpl
new file mode 100644
index 000000000..70253cb3f
--- /dev/null
+++ b/WEB-INF/templates/cf_custom_fields2.tpl
@@ -0,0 +1,39 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.customFieldsForm.open}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.entity}</th>
+    <th>{$i18n.label.type}</th>
+    <th>{$i18n.menu.options}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {if isset($custom_fields)}
+    {foreach $custom_fields as $field}
+  <tr>
+    <td class="text-cell">{$field['label']|escape}</td>
+      {if CustomFields::ENTITY_TIME == $field['entity_type']}
+    <td>{$i18n.entity.time}</td>
+      {elseif CustomFields::ENTITY_USER == $field['entity_type']}
+    <td>{$i18n.entity.user}</td>
+      {else}
+    <td></td>
+      {/if}
+      {if CustomFields::TYPE_TEXT == $field['type']}
+    <td>{$i18n.label.type_text}</td>
+    <td></td>
+      {elseif CustomFields::TYPE_DROPDOWN == $field['type']}
+    <td>{$i18n.label.type_dropdown}</td>
+    <td><a href="cf_dropdown_options.php?field_id={$field['id']}">{$i18n.label.configure}</a></td>
+      {/if}
+    <td><a href="cf_custom_field_edit.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="cf_custom_field_delete.php?id={$field['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+    {/foreach}
+  {/if}
+</table>
+<div class="button-set">{$forms.customFieldsForm.btn_add.control}</div>
+{$forms.customFieldsForm.close}
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 6552bb7f6..7d670636e 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -34,5 +34,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('custom_fields', $fields);
 $smarty->assign('title', $i18n->get('title.cf_custom_fields'));
-$smarty->assign('content_page_name', 'cf_custom_fields.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_custom_fields2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 518f8c28a..6c14595a2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5459");
+define("APP_VERSION", "1.19.28.5460");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 5f5439655e61f116c466d9e5b56587f3da17a900 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 17:18:42 +0000
Subject: [PATCH 1472/1848] Made cf_custom_field_add.php mobile friendly.

---
 WEB-INF/templates/cf_custom_field_add.tpl  | 35 ----------------------
 WEB-INF/templates/cf_custom_field_add2.tpl | 35 ++++++++++++++++++++++
 cf_custom_field_add.php                    |  4 +--
 initialize.php                             |  2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 WEB-INF/templates/cf_custom_field_add.tpl
 create mode 100644 WEB-INF/templates/cf_custom_field_add2.tpl

diff --git a/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
deleted file mode 100644
index 089e4b681..000000000
--- a/WEB-INF/templates/cf_custom_field_add.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{$forms.fieldForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.fieldForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.entity}:</td>
-          <td>{$forms.fieldForm.entity.control} <a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.type}:</td>
-          <td>{$forms.fieldForm.type.control}</td>
-        </tr>
-        <tr>
-          <td align="right"><label for="required">{$i18n.label.required}:</label></td>
-          <td>{$forms.fieldForm.required.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.fieldForm.btn_add.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.fieldForm.close}
diff --git a/WEB-INF/templates/cf_custom_field_add2.tpl b/WEB-INF/templates/cf_custom_field_add2.tpl
new file mode 100644
index 000000000..acf1f386c
--- /dev/null
+++ b/WEB-INF/templates/cf_custom_field_add2.tpl
@@ -0,0 +1,35 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.fieldForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.fieldForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="entity">{$i18n.label.entity} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="entity">{$i18n.label.entity} (*):</label></td>
+    <td class="td-with-input">{$forms.fieldForm.entity.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_39.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="type">{$i18n.label.type} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="type">{$i18n.label.type} (*):</label></td>
+    <td class="td-with-input">{$forms.fieldForm.type.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.fieldForm.required.control}{$i18n.label.required}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.fieldForm.btn_add.control}</div>
+{$forms.fieldForm.close}
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 6cfd87256..14b233a52 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -55,5 +55,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_add_custom_field'));
-$smarty->assign('content_page_name', 'cf_custom_field_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_custom_field_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 6c14595a2..e14a22f86 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5460");
+define("APP_VERSION", "1.19.28.5461");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 5ec5d3ad7801f392bdcfcabd0439ae23577c649d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 17:57:04 +0000
Subject: [PATCH 1473/1848] Made cf_custom_field_edit.php mobile friendly.

---
 WEB-INF/templates/cf_custom_field_edit.tpl  | 35 ---------------------
 WEB-INF/templates/cf_custom_field_edit2.tpl | 35 +++++++++++++++++++++
 cf_custom_field_edit.php                    |  4 +--
 initialize.php                              |  2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 WEB-INF/templates/cf_custom_field_edit.tpl
 create mode 100644 WEB-INF/templates/cf_custom_field_edit2.tpl

diff --git a/WEB-INF/templates/cf_custom_field_edit.tpl b/WEB-INF/templates/cf_custom_field_edit.tpl
deleted file mode 100644
index 62e2a267e..000000000
--- a/WEB-INF/templates/cf_custom_field_edit.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{$forms.fieldForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.fieldForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.entity}:</td>
-          <td>{$forms.fieldForm.entity.control} <a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.type}:</td>
-          <td>{$forms.fieldForm.type.control}</td>
-        </tr>
-        <tr>
-          <td align="right"><label for="required">{$i18n.label.required}:</label></td>
-          <td>{$forms.fieldForm.required.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.fieldForm.btn_save.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.fieldForm.close}
diff --git a/WEB-INF/templates/cf_custom_field_edit2.tpl b/WEB-INF/templates/cf_custom_field_edit2.tpl
new file mode 100644
index 000000000..36bbd3dce
--- /dev/null
+++ b/WEB-INF/templates/cf_custom_field_edit2.tpl
@@ -0,0 +1,35 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.fieldForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.fieldForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="entity">{$i18n.label.entity} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="entity">{$i18n.label.entity} (*):</label></td>
+    <td class="td-with-input">{$forms.fieldForm.entity.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_39.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_39.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="type">{$i18n.label.type} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="type">{$i18n.label.type} (*):</label></td>
+    <td class="td-with-input">{$forms.fieldForm.type.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.fieldForm.required.control}{$i18n.label.required}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.fieldForm.btn_save.control}</div>
+{$forms.fieldForm.close}
diff --git a/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 3f959ee22..36e76d4bf 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -68,5 +68,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_edit_custom_field'));
-$smarty->assign('content_page_name', 'cf_custom_field_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_custom_field_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index e14a22f86..768169bb0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5461");
+define("APP_VERSION", "1.19.28.5462");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 46c2d599576a691188e54fb660f4dfa01769996a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 18:04:48 +0000
Subject: [PATCH 1474/1848] Made cf_custom_field_delete.php mobile friendly.

---
 WEB-INF/templates/cf_custom_field_delete.tpl  | 22 -------------------
 WEB-INF/templates/cf_custom_field_delete2.tpl |  7 ++++++
 cf_custom_field_delete.php                    |  4 ++--
 initialize.php                                |  2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 WEB-INF/templates/cf_custom_field_delete.tpl
 create mode 100644 WEB-INF/templates/cf_custom_field_delete2.tpl

diff --git a/WEB-INF/templates/cf_custom_field_delete.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl
deleted file mode 100644
index fae6d804d..000000000
--- a/WEB-INF/templates/cf_custom_field_delete.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{$forms.fieldDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$field|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.fieldDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.fieldDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.fieldDeleteForm.close}
diff --git a/WEB-INF/templates/cf_custom_field_delete2.tpl b/WEB-INF/templates/cf_custom_field_delete2.tpl
new file mode 100644
index 000000000..d8595735a
--- /dev/null
+++ b/WEB-INF/templates/cf_custom_field_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.fieldDeleteForm.open}
+<div class="section-header">{$field|escape}</div>
+<div class="button-set">{$forms.fieldDeleteForm.btn_delete.control}&nbsp;{$forms.fieldDeleteForm.btn_cancel.control}</div>
+{$forms.fieldDeleteForm.close}
diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index ba222c657..7cfd72035 100644
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -50,5 +50,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_delete_custom_field'));
-$smarty->assign('content_page_name', 'cf_custom_field_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_custom_field_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 768169bb0..0e9a60e36 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5462");
+define("APP_VERSION", "1.19.28.5463");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b269f9d108fd5157fa23a5d1defd3f4e330752ad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 18:28:04 +0000
Subject: [PATCH 1475/1848] Made cf_dropdown_options.php mobile friendly.

---
 WEB-INF/templates/cf_dropdown_options.tpl  | 39 ----------------------
 WEB-INF/templates/cf_dropdown_options2.tpl | 26 +++++++++++++++
 cf_dropdown_options.php                    |  4 +--
 initialize.php                             |  2 +-
 4 files changed, 29 insertions(+), 42 deletions(-)
 delete mode 100644 WEB-INF/templates/cf_dropdown_options.tpl
 create mode 100644 WEB-INF/templates/cf_dropdown_options2.tpl

diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
deleted file mode 100644
index 92b2d4dac..000000000
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td width="80%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {if $options}
-    {foreach $options as $key=>$val}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$val|escape}</td>
-          <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center">
-            <br>
-            <form>
-              <input type="button" onclick="chLocation('cf_dropdown_option_add.php?field_id={$field_id}');" value="{$i18n.button.add}">
-            </form>
-          </td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/cf_dropdown_options2.tpl b/WEB-INF/templates/cf_dropdown_options2.tpl
new file mode 100644
index 000000000..f7a6b28b5
--- /dev/null
+++ b/WEB-INF/templates/cf_dropdown_options2.tpl
@@ -0,0 +1,26 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th></th>
+    <th></th>
+  </tr>
+{if isset($options)}
+  {foreach $options as $key=>$val}
+  <tr>
+    <td class="text-cell">{$val|escape}</td>
+    <td><a href="cf_dropdown_option_edit.php?id={$key}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="cf_dropdown_option_delete.php?id={$key}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+{/if}
+</table>
+<div class="button-set">
+  <form><input type="button" onclick="chLocation('cf_dropdown_option_add.php?field_id={$field_id}');" value="{$i18n.button.add}"></form>
+</div>
diff --git a/cf_dropdown_options.php b/cf_dropdown_options.php
index 06f53a7d8..2570f0ee0 100644
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -28,5 +28,5 @@
 $smarty->assign('field_id', $field_id);
 $smarty->assign('options', $options);
 $smarty->assign('title', $i18n->get('title.cf_dropdown_options'));
-$smarty->assign('content_page_name', 'cf_dropdown_options.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_options2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 0e9a60e36..64e508695 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5463");
+define("APP_VERSION", "1.19.28.5464");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 44545ac2977f87dc00ac5a179be97ce89c693a9f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 19:22:38 +0000
Subject: [PATCH 1476/1848] Made all cf_dropdown_option_* pages mobile
 friendly.

---
 WEB-INF/templates/cf_dropdown_option_add.tpl  | 27 -------------------
 WEB-INF/templates/cf_dropdown_option_add2.tpl | 16 +++++++++++
 .../templates/cf_dropdown_option_delete.tpl   | 22 ---------------
 .../templates/cf_dropdown_option_delete2.tpl  |  7 +++++
 WEB-INF/templates/cf_dropdown_option_edit.tpl | 27 -------------------
 .../templates/cf_dropdown_option_edit2.tpl    | 16 +++++++++++
 cf_dropdown_option_add.php                    |  4 +--
 cf_dropdown_option_delete.php                 |  4 +--
 cf_dropdown_option_edit.php                   |  4 +--
 9 files changed, 45 insertions(+), 82 deletions(-)
 delete mode 100644 WEB-INF/templates/cf_dropdown_option_add.tpl
 create mode 100644 WEB-INF/templates/cf_dropdown_option_add2.tpl
 delete mode 100644 WEB-INF/templates/cf_dropdown_option_delete.tpl
 create mode 100644 WEB-INF/templates/cf_dropdown_option_delete2.tpl
 delete mode 100644 WEB-INF/templates/cf_dropdown_option_edit.tpl
 create mode 100644 WEB-INF/templates/cf_dropdown_option_edit2.tpl

diff --git a/WEB-INF/templates/cf_dropdown_option_add.tpl b/WEB-INF/templates/cf_dropdown_option_add.tpl
deleted file mode 100644
index bcc1cee72..000000000
--- a/WEB-INF/templates/cf_dropdown_option_add.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{$forms.optionAddForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.optionAddForm.name.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-           <td colspan="2" align="center" height="50">{$forms.optionAddForm.btn_add.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.optionAddForm.close}
diff --git a/WEB-INF/templates/cf_dropdown_option_add2.tpl b/WEB-INF/templates/cf_dropdown_option_add2.tpl
new file mode 100644
index 000000000..5ba70387b
--- /dev/null
+++ b/WEB-INF/templates/cf_dropdown_option_add2.tpl
@@ -0,0 +1,16 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.optionAddForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.optionAddForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.optionAddForm.btn_add.control}</div>
+{$forms.optionAddForm.close}
diff --git a/WEB-INF/templates/cf_dropdown_option_delete.tpl b/WEB-INF/templates/cf_dropdown_option_delete.tpl
deleted file mode 100644
index bec03cc32..000000000
--- a/WEB-INF/templates/cf_dropdown_option_delete.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{$forms.optionDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$option|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.optionDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.optionDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.optionDeleteForm.close}
diff --git a/WEB-INF/templates/cf_dropdown_option_delete2.tpl b/WEB-INF/templates/cf_dropdown_option_delete2.tpl
new file mode 100644
index 000000000..8fb56d618
--- /dev/null
+++ b/WEB-INF/templates/cf_dropdown_option_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.optionDeleteForm.open}
+<div class="section-header">{$option|escape}</div>
+<div class="button-set">{$forms.optionDeleteForm.btn_delete.control}&nbsp;{$forms.optionDeleteForm.btn_cancel.control}</div>
+{$forms.optionDeleteForm.close}
diff --git a/WEB-INF/templates/cf_dropdown_option_edit.tpl b/WEB-INF/templates/cf_dropdown_option_edit.tpl
deleted file mode 100644
index c2b0bae9c..000000000
--- a/WEB-INF/templates/cf_dropdown_option_edit.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{$forms.optionEditForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-{if $user->can('manage_custom_fields')}
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.optionEditForm.name.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-         <td colspan="2" align="center" height="50">{$forms.optionEditForm.btn_save.control}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.optionEditForm.close}
diff --git a/WEB-INF/templates/cf_dropdown_option_edit2.tpl b/WEB-INF/templates/cf_dropdown_option_edit2.tpl
new file mode 100644
index 000000000..f7f987cd8
--- /dev/null
+++ b/WEB-INF/templates/cf_dropdown_option_edit2.tpl
@@ -0,0 +1,16 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.optionEditForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.optionEditForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.optionEditForm.btn_save.control}</div>
+{$forms.optionEditForm.close}
diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index 537ad3313..c9e168730 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -49,5 +49,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionAddForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_add_dropdown_option'));
-$smarty->assign('content_page_name', 'cf_dropdown_option_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_option_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index e6eeeeb75..e23288bd5 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -53,5 +53,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_delete_dropdown_option'));
-$smarty->assign('content_page_name', 'cf_dropdown_option_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_option_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 4cea7358f..985aab7d3 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -51,5 +51,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionEditForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_edit_dropdown_option'));
-$smarty->assign('content_page_name', 'cf_dropdown_option_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_option_edit2.tpl');
+$smarty->display('index2.tpl');

From b9fe140cc0d5b3f958a5cb5c30abd71c89e03097 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 19:28:40 +0000
Subject: [PATCH 1477/1848] Limited name length for a dropdown option on forms
 to match db limit.

---
 cf_dropdown_option_add.php  | 2 +-
 cf_dropdown_option_edit.php | 2 +-
 initialize.php              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index c9e168730..f1bf00908 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -26,7 +26,7 @@
 $form = new Form('optionAddForm');
 if ($err->no()) {
   $form->addInput(array('type'=>'hidden','name'=>'field_id','value'=>$cl_field_id));
-  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
+  $form->addInput(array('type'=>'text','maxlength'=>'32','name'=>'name','value'=>''));
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 }
 
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 985aab7d3..c73200ffc 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -25,7 +25,7 @@
 
 $form = new Form('optionEditForm');
 if ($err->no()) {
-  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+  $form->addInput(array('type'=>'text','maxlength'=>'32','name'=>'name','value'=>$cl_name));
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
   $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 }
diff --git a/initialize.php b/initialize.php
index 64e508695..247c74c1c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5464");
+define("APP_VERSION", "1.19.28.5465");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9fca36776e184248152923ce5b5f519d0210fe94 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Apr 2021 22:06:50 +0000
Subject: [PATCH 1478/1848] Fixed a php8 error with adding a client without
 projects, also eliminated a few php8 warnings.

---
 WEB-INF/lib/ttClientHelper.class.php | 33 +++++-----------------------
 charts.php                           |  4 ++--
 client_add.php                       |  2 ++
 client_edit.php                      |  3 ++-
 initialize.php                       |  2 +-
 5 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 7105595d8..6264a6bb0 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Class ttClientHelper is used to help with client related tasks.
 class ttClientHelper {
@@ -86,7 +62,7 @@ static function getClientByName($client_name) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      if ($val['id']) {
+      if (isset($val['id']) && $val['id'] > 0) {
         return $val;
       }
     }
@@ -190,6 +166,7 @@ static function insert($fields)
     $address = $fields['address'];
     $tax = $fields['tax'];
     $projects = $fields['projects'];
+    $comma_separated = null;
     if ($projects)
       $comma_separated = implode(',', $projects); // This is a comma-separated list of associated projects ids.
     $status = $fields['status'];
@@ -205,7 +182,7 @@ static function insert($fields)
       return false;
 
     $last_id = $mdb2->lastInsertID('tt_clients', 'id');
-    if (count($projects) > 0)
+    if (isset($projects) && count($projects) > 0)
       foreach ($projects as $p_id) {
         $sql = "insert into tt_client_project_binds (client_id, project_id, group_id, org_id) values($last_id, $p_id, $group_id, $org_id)";
         $affected = $mdb2->exec($sql);
diff --git a/charts.php b/charts.php
index 9dc29f588..25e6695d4 100644
--- a/charts.php
+++ b/charts.php
@@ -74,13 +74,13 @@
   $uc->setValue(SYSC_CHART_TYPE, $cl_type);
 } else {
   // Initialize chart interval.
-  $cl_interval = $_SESSION['chart_interval'];
+  $cl_interval = @$_SESSION['chart_interval'];
   if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
   if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
   $_SESSION['chart_interval'] = $cl_interval;
 
   // Initialize chart type.
-  $cl_type = $_SESSION['chart_type'];
+  $cl_type = @$_SESSION['chart_type'];
   if (!$cl_type) $cl_type = $uc->getValue(SYSC_CHART_TYPE);
   $cl_type = ttChartHelper::adjustType($cl_type);
   $_SESSION['chart_type'] = $cl_type;
diff --git a/client_add.php b/client_add.php
index 114e89ea0..1b91a4080 100644
--- a/client_add.php
+++ b/client_add.php
@@ -19,6 +19,8 @@
 
 $projects = ttGroupHelper::getActiveProjects();
 
+$cl_name = $cl_address = $cl_tax = '';
+$cl_projects = array();
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_address = trim($request->getParameter('address'));
diff --git a/client_edit.php b/client_edit.php
index 2924346bf..c7e0a92e3 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -26,7 +26,8 @@
 // End of access checks.
 
 $projects = ttGroupHelper::getActiveProjects();
-
+$cl_name = $cl_address = $cl_tax = $cl_status = null;
+$cl_projects = array();
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_address = trim($request->getParameter('address'));
diff --git a/initialize.php b/initialize.php
index 247c74c1c..356c05dd2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5465");
+define("APP_VERSION", "1.19.28.5466");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 8861204def014a748638458ae11c708cb68174bf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Apr 2021 17:26:13 +0000
Subject: [PATCH 1479/1848] Made display_options.php mobile friendly.

---
 WEB-INF/lib/ttClientHelper.class.php   |  2 +-
 WEB-INF/templates/display_options.tpl  | 36 ------------------
 WEB-INF/templates/display_options2.tpl | 51 ++++++++++++++++++++++++++
 default.css                            |  2 +-
 display_options.php                    |  6 +--
 initialize.php                         |  2 +-
 6 files changed, 57 insertions(+), 42 deletions(-)
 delete mode 100644 WEB-INF/templates/display_options.tpl
 create mode 100644 WEB-INF/templates/display_options2.tpl

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 6264a6bb0..3c5f0d646 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -207,7 +207,7 @@ static function update($fields)
     $address = $fields['address'];
     $tax = $fields['tax'];
     $status = $fields['status'];
-    $projects = $fields['projects'];
+    $projects = isset($fields['projects']) ? $fields['projects'] : array();
 
     $tax = str_replace(',', '.', $tax);
     if ($tax == '') $tax = 0;
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
deleted file mode 100644
index 025b7d984..000000000
--- a/WEB-INF/templates/display_options.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{$forms.displayOptionsForm.open}
-<table cellspacing="1" cellpadding="2" border="0">
-  <tr><td>&nbsp;</td></tr>
-  <tr><td class="sectionHeaderNoBorder">{$i18n.title.time}</td></tr>
-  <tr>
-    <td><label for="time_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
-    <td nowrap>{$forms.displayOptionsForm.time_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-    <tr>
-    <td><label for="time_not_complete_days">{$i18n.form.display_options.not_complete_days}:</label></td>
-    <td nowrap>{$forms.displayOptionsForm.time_not_complete_days.control} <a href="https://www.anuko.com/lp/tt_44.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td><label for="record_custom_fields">{$i18n.label.custom_fields}:</label></td>
-    <td nowrap>{$forms.displayOptionsForm.record_custom_fields.control} <a href="https://www.anuko.com/lp/tt_48.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-
-  <tr><td>&nbsp;</td></tr>
-  <tr><td class="sectionHeaderNoBorder">{$i18n.title.reports}</td></tr>
-  <tr>
-    <td><label for="report_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
-    <td nowrap>{$forms.displayOptionsForm.report_note_on_separate_row.control} <a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-
-  <tr><td>&nbsp;</td></tr>
-  <tr><td class="sectionHeaderNoBorder">{$i18n.form.display_options.custom_css}</td></tr>
-  <tr>
-    <td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td>
-  </tr>
-
-  <tr><td>&nbsp;</td></tr>
-  <tr>
-    <td colspan="2" height="50" align="center">{$forms.displayOptionsForm.btn_save.control}</td>
-  </tr>
-</table>
-{$forms.displayOptionsForm.close}
diff --git a/WEB-INF/templates/display_options2.tpl b/WEB-INF/templates/display_options2.tpl
new file mode 100644
index 000000000..e4da2cfac
--- /dev/null
+++ b/WEB-INF/templates/display_options2.tpl
@@ -0,0 +1,51 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.displayOptionsForm.open}
+<table class="centered-table">
+  <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.title.time}</td></tr>
+  <tr class = "small-screen-label"><td><label for="time_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="time_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.time_note_on_separate_row.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_32.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="time_not_complete_days">{$i18n.form.display_options.not_complete_days}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="time_not_complete_days">{$i18n.form.display_options.not_complete_days}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.time_not_complete_days.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_44.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_44.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="record_custom_fields">{$i18n.label.custom_fields}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="record_custom_fields">{$i18n.label.custom_fields}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.record_custom_fields.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_48.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_48.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.title.reports}</td></tr>
+  <tr class = "small-screen-label"><td><label for="report_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="report_note_on_separate_row">{$i18n.form.display_options.note_on_separate_row}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.report_note_on_separate_row.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_32.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_css}</td></tr>
+  <tr><td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.displayOptionsForm.btn_save.control}</div>
+{$forms.displayOptionsForm.close}
diff --git a/default.css b/default.css
index 6d649b69b..23098db42 100644
--- a/default.css
+++ b/default.css
@@ -296,7 +296,7 @@ input[type="text"].project-rate-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name {
+#description, #address, #item_name, #custom_css {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
diff --git a/display_options.php b/display_options.php
index 1d3948fd9..53a86ca9e 100644
--- a/display_options.php
+++ b/display_options.php
@@ -48,7 +48,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'report_note_on_separate_row','value'=>$cl_report_note_on_separate_row));
 // TODO: add PDF break controller here.
 
-$form->addInput(array('type'=>'textarea','name'=>'custom_css','style'=>'width: 250px; height: 40px;','value'=>$cl_custom_css));
+$form->addInput(array('type'=>'textarea','name'=>'custom_css','value'=>$cl_custom_css));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
@@ -74,5 +74,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.display_options'));
-$smarty->assign('content_page_name', 'display_options.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'display_options2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 356c05dd2..dd9e8a636 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5466");
+define("APP_VERSION", "1.19.28.5467");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a9894c63fd4d188e74dce2b518e8b225e059839d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Apr 2021 19:27:55 +0000
Subject: [PATCH 1480/1848] Made export.php and success.php mobile friendly.

---
 WEB-INF/lib/ttGroupExportHelper.class.php     | 28 ++-----------------
 WEB-INF/templates/export.tpl                  | 23 ---------------
 WEB-INF/templates/export2.tpl                 | 16 +++++++++++
 .../templates/{success.tpl => success2.tpl}   |  0
 WEB-INF/templates/time2.tpl                   |  4 +--
 expense_edit.php                              |  3 +-
 export.php                                    |  4 +--
 initialize.php                                |  2 +-
 success.php                                   |  4 +--
 time.php                                      |  2 +-
 10 files changed, 27 insertions(+), 59 deletions(-)
 delete mode 100644 WEB-INF/templates/export.tpl
 create mode 100644 WEB-INF/templates/export2.tpl
 rename WEB-INF/templates/{success.tpl => success2.tpl} (100%)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index a510da274..b880ef6d3 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // ttGroupExportHelper - this class is used to write data for a single group
 // to a file. When group contains other groups, it reuses itself recursively.
diff --git a/WEB-INF/templates/export.tpl b/WEB-INF/templates/export.tpl
deleted file mode 100644
index 487f00978..000000000
--- a/WEB-INF/templates/export.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{$forms.exportForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td align="center">
-{if $user->can('export_data')}
-      <table border="0" width="60%">
-        <colgroup>
-          <col width="50%">
-          <col width="50%">
-        </colgroup>
-        <tr><td colspan="2">{$i18n.form.export.hint}<br></td></tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.form.export.compression}:</td>
-          <td>{$forms.exportForm.compression.control}</td>
-        </tr>
-        <tr><td height="50" align="center" colspan="2">{$forms.exportForm.btn_submit.control}</td></tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.exportForm.close}
diff --git a/WEB-INF/templates/export2.tpl b/WEB-INF/templates/export2.tpl
new file mode 100644
index 000000000..171aa9b1b
--- /dev/null
+++ b/WEB-INF/templates/export2.tpl
@@ -0,0 +1,16 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<div class="page-hint">{$i18n.form.export.hint}</div>
+
+{$forms.exportForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="compression">{$i18n.form.export.compression}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="compression">{$i18n.form.export.compression}:</label></td>
+    <td class="td-with-input">{$forms.exportForm.compression.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.exportForm.btn_submit.control}</div>
+{$forms.exportForm.close}
diff --git a/WEB-INF/templates/success.tpl b/WEB-INF/templates/success2.tpl
similarity index 100%
rename from WEB-INF/templates/success.tpl
rename to WEB-INF/templates/success2.tpl
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time2.tpl
index 14b8dcc69..f1ba587dc 100644
--- a/WEB-INF/templates/time2.tpl
+++ b/WEB-INF/templates/time2.tpl
@@ -117,7 +117,7 @@ License: See license.txt *}
   {if $show_client}
     <th>{$i18n.label.client}</th>
   {/if}
-  {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+  {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
     {foreach $custom_fields->timeFields as $timeField}
     <th>{$timeField['label']|escape}</th>
     {/foreach}
@@ -148,7 +148,7 @@ License: See license.txt *}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
     {* record custom fileds *}
-    {if $show_record_custom_fields && $custom_fields && $custom_fields->timeFields}
+    {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
     <td class="text-cell">{$record.$control_name|escape}</td>
diff --git a/expense_edit.php b/expense_edit.php
index c930956ab..f4d3c2216 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -112,11 +112,10 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'recalculateCost();',
       'name'=>'predefined_expense',
-      'value'=>$cl_predefined_expense,
       'data'=>$predefined_expenses,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','value'=>$cl_quantity));
+    $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity'));
 }
 $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','value'=>$cl_item_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
diff --git a/export.php b/export.php
index 2bcba2dce..b5e1206dd 100644
--- a/export.php
+++ b/export.php
@@ -55,5 +55,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.export'));
-$smarty->assign('content_page_name', 'export.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'export2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index dd9e8a636..235e90f0e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5467");
+define("APP_VERSION", "1.19.28.5468");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/success.php b/success.php
index 6fbf8ad2a..eea4687a2 100644
--- a/success.php
+++ b/success.php
@@ -8,5 +8,5 @@
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->get('title.success'));
-$smarty->assign('content_page_name', 'success.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'success2.tpl');
+$smarty->display('index2.tpl');
diff --git a/time.php b/time.php
index a0e009b68..f6cd1daf1 100644
--- a/time.php
+++ b/time.php
@@ -80,7 +80,7 @@
   // Determine column span for note field.
   $colspan = 0;
   if ($showClient) $colspan++;
-  if ($showRecordCustomFields && $custom_fields && $custom_fields->timeFields) {
+  if ($showRecordCustomFields && isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $colspan++;
     }

From d6e6398d13d65f13569cb4628dba6b1c82f58127 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Apr 2021 20:33:38 +0000
Subject: [PATCH 1481/1848] Made group_add.php and group_advanced_edit.php
 mobile friendly.

---
 WEB-INF/lib/ttGroup.class.php              | 30 +++-------------
 WEB-INF/templates/group_add.tpl            | 28 ---------------
 WEB-INF/templates/group_add2.tpl           | 22 ++++++++++++
 WEB-INF/templates/group_advanced_edit.tpl  | 37 --------------------
 WEB-INF/templates/group_advanced_edit2.tpl | 40 ++++++++++++++++++++++
 group_add.php                              |  7 ++--
 group_advanced_edit.php                    |  8 ++---
 initialize.php                             |  2 +-
 8 files changed, 75 insertions(+), 99 deletions(-)
 delete mode 100644 WEB-INF/templates/group_add.tpl
 create mode 100644 WEB-INF/templates/group_add2.tpl
 delete mode 100644 WEB-INF/templates/group_advanced_edit.tpl
 create mode 100644 WEB-INF/templates/group_advanced_edit2.tpl

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index bd0f944e3..bc747e097 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttConfigHelper');
 import('ttGroupHelper');
@@ -55,6 +31,7 @@ class ttGroup {
 
   var $config = null;           // Comma-separated list of miscellaneous config options.
   var $configHelper = null;     // An instance of ttConfigHelper class.
+  var $custom_css = null;       // Custom css.
 
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
@@ -111,6 +88,7 @@ function __construct($id, $org_id) {
       // TODO: refactor this.
       $this->config = $val['config'];
       $this->configHelper = new ttConfigHelper($val['config']);
+      $this->custom_css = $val['custom_css'];
       // Set user config options.
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
diff --git a/WEB-INF/templates/group_add.tpl b/WEB-INF/templates/group_add.tpl
deleted file mode 100644
index 852f1b78b..000000000
--- a/WEB-INF/templates/group_add.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{$forms.groupForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_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></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/WEB-INF/templates/group_add2.tpl b/WEB-INF/templates/group_add2.tpl
new file mode 100644
index 000000000..cc4231ebf
--- /dev/null
+++ b/WEB-INF/templates/group_add2.tpl
@@ -0,0 +1,22 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.groupForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="group_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupForm.group_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.groupForm.btn_add.control}</div>
+{$forms.groupForm.close}
diff --git a/WEB-INF/templates/group_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
deleted file mode 100644
index a9369787e..000000000
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{$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}
diff --git a/WEB-INF/templates/group_advanced_edit2.tpl b/WEB-INF/templates/group_advanced_edit2.tpl
new file mode 100644
index 000000000..1f55adf77
--- /dev/null
+++ b/WEB-INF/templates/group_advanced_edit2.tpl
@@ -0,0 +1,40 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.groupAdvancedForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="group_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.groupAdvancedForm.group_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.groupAdvancedForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="bcc_email">{$i18n.label.bcc}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="bcc_email">{$i18n.label.bcc}:</label></td>
+    <td class="td-with-input">{$forms.groupAdvancedForm.bcc_email.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_10.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_10.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_edit.allow_ip}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="allow_ip">{$i18n.form.group_edit.allow_ip}:</label></td>
+    <td class="td-with-input">{$forms.groupAdvancedForm.allow_ip.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_21.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_21.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.groupAdvancedForm.btn_save.control}</div>
+{$forms.groupAdvancedForm.close}
diff --git a/group_add.php b/group_add.php
index 408b62168..8436acd80 100644
--- a/group_add.php
+++ b/group_add.php
@@ -13,6 +13,7 @@
 }
 // End of access checks.
 
+$cl_name = $cl_description = '';
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('group_name'));
   $cl_description = trim($request->getParameter('description'));
@@ -20,7 +21,7 @@
 
 $form = new Form('groupForm');
 $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -45,5 +46,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_group'));
-$smarty->assign('content_page_name', 'group_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'group_add2.tpl');
+$smarty->display('index2.tpl');
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index 7ea077183..efb7a49e7 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -30,8 +30,8 @@
 }
 
 $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'=>'200','name'=>'group_name','value'=>$cl_group));
+$form->addInput(array('type'=>'textarea','name'=>'description','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));
 
@@ -62,5 +62,5 @@
 
 $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');
+$smarty->assign('content_page_name', 'group_advanced_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 235e90f0e..0b3e606a7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5468");
+define("APP_VERSION", "1.19.28.5469");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2c67b96e2425c21f30c179869a1018ef76c54538 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Apr 2021 20:52:16 +0000
Subject: [PATCH 1482/1848] Made group_delete.php mobile friendly.

---
 WEB-INF/templates/group_delete.tpl  | 22 ----------------------
 WEB-INF/templates/group_delete2.tpl |  8 ++++++++
 group_delete.php                    |  4 ++--
 initialize.php                      |  2 +-
 4 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 WEB-INF/templates/group_delete.tpl
 create mode 100644 WEB-INF/templates/group_delete2.tpl

diff --git a/WEB-INF/templates/group_delete.tpl b/WEB-INF/templates/group_delete.tpl
deleted file mode 100644
index a14373f55..000000000
--- a/WEB-INF/templates/group_delete.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{$forms.groupForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr><td colspan="2">{$i18n.form.group_delete.hint}</td></tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center"><b>{$group_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.groupForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.groupForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/WEB-INF/templates/group_delete2.tpl b/WEB-INF/templates/group_delete2.tpl
new file mode 100644
index 000000000..5a02f29af
--- /dev/null
+++ b/WEB-INF/templates/group_delete2.tpl
@@ -0,0 +1,8 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.groupForm.open}
+<div class="page-hint">{$i18n.form.group_delete.hint}</div>
+<div class="section-header">{$group_to_delete|escape}</div>
+<div class="button-set">{$forms.groupForm.btn_delete.control}&nbsp;{$forms.groupForm.btn_cancel.control}</div>
+{$forms.groupForm.close}
diff --git a/group_delete.php b/group_delete.php
index 377bb80e9..c1e47d02c 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -64,5 +64,5 @@
 $smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'group_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'group_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 0b3e606a7..23a89ec2e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5469");
+define("APP_VERSION", "1.19.28.5470");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3657f7e6c8c58ce520324942cc72f1361a4a13b3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 13:56:08 +0000
Subject: [PATCH 1483/1848] Eliminated a few more php8 warnings.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 30 +++++++++++------------
 initialize.php                            |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index b880ef6d3..a464f2e25 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -292,7 +292,7 @@ function writeData() {
         $user_part .= " login=\"".htmlspecialchars($user_item['login'])."\"";
         $user_part .= " password=\"".$user_item['password']."\"";
         $user_part .= " role_id=\"".$role_id."\"";
-        $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
+        $user_part .= " client_id=\"".@$this->clientMap[$user_item['client_id']]."\"";
         $user_part .= " rate=\"".$user_item['rate']."\"";
         $user_part .= " quota_percent=\"".$user_item['quota_percent']."\"";
         $user_part .= " email=\"".$user_item['email']."\"";
@@ -330,8 +330,8 @@ function writeData() {
       foreach ($timesheets as $timesheet_item) {
         $timesheet_part = $this->indentation.'    '."<timesheet id=\"".$this->timesheetMap[$timesheet_item['id']]."\"";
         $timesheet_part .= " user_id=\"".$this->userMap[$timesheet_item['user_id']]."\"";
-        $timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
-        $timesheet_part .= " project_id=\"".$this->projectMap[$timesheet_item['project_id']]."\"";
+        $timesheet_part .= " client_id=\"".@$this->clientMap[$timesheet_item['client_id']]."\"";
+        $timesheet_part .= " project_id=\"".@$this->projectMap[$timesheet_item['project_id']]."\"";
         $timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
         $timesheet_part .= " comment=\"".htmlspecialchars($timesheet_item['comment'])."\"";
         $timesheet_part .= " start_date=\"".$timesheet_item['start_date']."\"";
@@ -355,7 +355,7 @@ function writeData() {
         $invoice_part = $this->indentation.'    '."<invoice id=\"".$this->invoiceMap[$invoice_item['id']]."\"";
         $invoice_part .= " name=\"".htmlspecialchars($invoice_item['name'])."\"";
         $invoice_part .= " date=\"".$invoice_item['date']."\"";
-        $invoice_part .= " client_id=\"".$this->clientMap[$invoice_item['client_id']]."\"";
+        $invoice_part .= " client_id=\"".@$this->clientMap[$invoice_item['client_id']]."\"";
         $invoice_part .= " status=\"".$invoice_item['status']."\"";
         $invoice_part .= "></invoice>\n";
         fwrite($this->file, $invoice_part);
@@ -380,11 +380,11 @@ function writeData() {
         $log_part .= " date=\"".$record['date']."\"";
         $log_part .= " start=\"".$record['start']."\"";
         $log_part .= " duration=\"".$record['duration']."\"";
-        $log_part .= " client_id=\"".$this->clientMap[$record['client_id']]."\"";
-        $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\"";
-        $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\"";
-        $log_part .= " timesheet_id=\"".$this->timesheetMap[$record['timesheet_id']]."\"";
-        $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
+        $log_part .= " client_id=\"".@$this->clientMap[$record['client_id']]."\"";
+        $log_part .= " project_id=\"".@$this->projectMap[$record['project_id']]."\"";
+        $log_part .= " task_id=\"".@$this->taskMap[$record['task_id']]."\"";
+        $log_part .= " timesheet_id=\"".@$this->timesheetMap[$record['timesheet_id']]."\"";
+        $log_part .= " invoice_id=\"".@$this->invoiceMap[$record['invoice_id']]."\"";
         $log_part .= " comment=\"".$this->encodeLineBreaks($record['comment'])."\"";
         $log_part .= " billable=\"".$record['billable']."\"";
         $log_part .= " approved=\"".$record['approved']."\"";
@@ -440,7 +440,7 @@ function writeData() {
       foreach ($custom_field_log as $entry) {
         $custom_field_log_part = $this->indentation.'    '."<custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\"";
         $custom_field_log_part .= " field_id=\"".$this->customFieldMap[$entry['field_id']]."\"";
-        $custom_field_log_part .= " option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\"";
+        $custom_field_log_part .= " option_id=\"".@$this->customFieldOptionMap[$entry['option_id']]."\"";
         $custom_field_log_part .= " value=\"".htmlspecialchars($entry['value'])."\"";
         $custom_field_log_part .= " status=\"".$entry['status']."\"";
         $custom_field_log_part .= "></custom_field_log_entry>\n";
@@ -460,11 +460,11 @@ function writeData() {
       foreach ($expense_items as $expense_item) {
         $expense_item_part = $this->indentation.'    '."<expense_item date=\"".$expense_item['date']."\"";
         $expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
-        $expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
+        $expense_item_part .= " client_id=\"".@$this->clientMap[$expense_item['client_id']]."\"";
         $expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
         $expense_item_part .= " name=\"".$this->encodeLineBreaks($expense_item['name'])."\"";
         $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
-        $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
+        $expense_item_part .= " invoice_id=\"".@$this->invoiceMap[$expense_item['invoice_id']]."\"";
         $expense_item_part .= " approved=\"".$expense_item['approved']."\"";
         $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
         $expense_item_part .= " status=\"".$expense_item['status']."\"";
@@ -558,9 +558,9 @@ function writeData() {
         $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\"";
         $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\"";
         $fav_report_part .= " report_spec=\"".$this->remapReportSpec($fav_report['report_spec'])."\"";
-        $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\"";
-        $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
-        $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
+        $fav_report_part .= " client_id=\"".@$this->clientMap[$fav_report['client_id']]."\"";
+        $fav_report_part .= " project_id=\"".@$this->projectMap[$fav_report['project_id']]."\"";
+        $fav_report_part .= " task_id=\"".@$this->taskMap[$fav_report['task_id']]."\"";
         $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
         $fav_report_part .= " approved=\"".$fav_report['approved']."\"";
         $fav_report_part .= " invoice=\"".$fav_report['invoice']."\"";
diff --git a/initialize.php b/initialize.php
index 23a89ec2e..242f96743 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5470");
+define("APP_VERSION", "1.19.28.5471");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 43464679be7b99d1f72834f94c18b2f3497b7092 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 14:26:59 +0000
Subject: [PATCH 1484/1848] Addressed a few more of php8 warnings.

---
 WEB-INF/lib/ttGroupHelper.class.php | 29 +++--------------------------
 WEB-INF/lib/ttUser.class.php        |  2 ++
 initialize.php                      |  2 +-
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 6da527085..defdb61d4 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttRoleHelper');
 
@@ -228,6 +204,7 @@ static function markGroupDeletedInTable($group_id, $table_name) {
     $mdb2 = getConnection();
 
     // Add modified info to sql for some tables, depending on table name.
+    $modified_part = '';
     if ($table_name == 'tt_users') {
       $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 3a2f1fa49..cf1065f06 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -842,6 +842,7 @@ function setOnBehalfGroup($group_id) {
     $this->behalf_id = null;
     $this->behalf_name = null;
     unset($this->behalfGroup);
+    $this->behalfGroup = null;
     unset($_SESSION['behalf_group_id']);
     unset($_SESSION['behalf_group_name']);
     unset($_SESSION['behalf_id']);
@@ -849,6 +850,7 @@ function setOnBehalfGroup($group_id) {
 
     // Destroy report bean if it was set in session.
     $form = new Form('dummyForm');
+    global $request;
     $bean = new ActionForm('reportBean', $form, $request);
     if ($bean->isSaved()) {
       $bean->destroyBean();
diff --git a/initialize.php b/initialize.php
index 242f96743..037c86626 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5471");
+define("APP_VERSION", "1.19.28.5472");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e3150e28352c26ad2c7d04faead7830b4096c0f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 17:17:12 +0000
Subject: [PATCH 1485/1848] Made group_edit.php mobile friendly.

---
 WEB-INF/templates/group_edit.tpl  | 123 ---------------------
 WEB-INF/templates/group_edit2.tpl | 171 ++++++++++++++++++++++++++++++
 group_edit.php                    |  13 ++-
 initialize.php                    |   2 +-
 4 files changed, 178 insertions(+), 131 deletions(-)
 delete mode 100644 WEB-INF/templates/group_edit.tpl
 create mode 100644 WEB-INF/templates/group_edit2.tpl

diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
deleted file mode 100644
index e9b6deb56..000000000
--- a/WEB-INF/templates/group_edit.tpl
+++ /dev/null
@@ -1,123 +0,0 @@
-<script>
-function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.groupForm.open}
-{include file="datetime_format_preview.tpl"}
-
-<table cellspacing="4" cellpadding="7" border="0">
-    <tr>
-      <td>
-        <table cellspacing="1" cellpadding="2" border="0">
-{if $user->can('manage_subgroups')}
-  {if $group_dropdown}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.group}:</td>
-            <td>{$forms.groupForm.group.control}</td>
-          </tr>
-  {/if}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.subgroups}:</td>
-            <td><a href="groups.php">{$i18n.label.configure}</a></td>
-          </tr>
-{/if}
-          <tr>
-            <td align="right">{$i18n.label.currency}:</td>
-            <td>{$forms.groupForm.currency.control}</td>
-          </tr>
-{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}
-          <tr>
-           <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.groupForm.lang.control}</td>
-          </tr>
-          <tr>
-            <td align="right">{$i18n.label.decimal_mark}:</td>
-            <td>{$forms.groupForm.decimal_mark.control} <font id="decimal_preview" color="#777777">&nbsp;</font></td>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.date_format}:</td>
-            <td>{$forms.groupForm.date_format.control} <font id="date_format_preview" color="#777777">&nbsp;</font></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.time_format}:</td>
-            <td>{$forms.groupForm.time_format.control} <font id="time_format_preview" color="#777777">&nbsp;</font></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.week_start}:</td>
-            <td>{$forms.groupForm.start_week.control}</td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
-            <td><a href="display_options.php">{$i18n.label.configure}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
-            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_36.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
-            <td>{$forms.groupForm.tracking_mode.control} <a href="https://www.anuko.com/lp/tt_47.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.record_type}:</td>
-            <td>{$forms.groupForm.record_type.control} <a href="https://www.anuko.com/lp/tt_38.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.punch_mode}:</td>
-            <td>{$forms.groupForm.punch_mode.control} <a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.allow_overlap}:</td>
-            <td>{$forms.groupForm.allow_overlap.control} <a href="https://www.anuko.com/lp/tt_16.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.future_entries}:</td>
-            <td>{$forms.groupForm.future_entries.control} <a href="https://www.anuko.com/lp/tt_17.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.uncompleted_indicators}:</td>
-            <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <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.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>
-          {* initialize preview text *}
-          <script>
-            MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
-            MakeFormatPreview("time_format_preview", document.getElementById("time_format"));
-
-            function adjustDecimalPreview()
-            {
-              var mark = document.getElementById("decimal_mark").value;
-              var example = document.getElementById("decimal_preview");
-              example.innerHTML = "<i>3"+mark+"14</i>";
-            }
-            adjustDecimalPreview();
-          </script>
-
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control} {$forms.groupForm.btn_delete.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-</table>
-{$forms.groupForm.close}
diff --git a/WEB-INF/templates/group_edit2.tpl b/WEB-INF/templates/group_edit2.tpl
new file mode 100644
index 000000000..0c44d3915
--- /dev/null
+++ b/WEB-INF/templates/group_edit2.tpl
@@ -0,0 +1,171 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+function chLocation(newLocation) { document.location = newLocation; }
+
+{* initialize preview text *}
+MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
+MakeFormatPreview("time_format_preview", document.getElementById("time_format"));
+
+function adjustDecimalPreview()
+{
+  var mark = document.getElementById("decimal_mark").value;
+  var example = document.getElementById("decimal_preview");
+  example.innerHTML = "<i>3"+mark+"14</i>";
+}
+adjustDecimalPreview();
+</script>
+
+{$forms.groupForm.open}
+{include file="datetime_format_preview.tpl"}
+<table class="centered-table">
+{if $user->can('manage_subgroups')}
+  {if isset($group_dropdown) && $group_dropdown}
+  <tr class = "small-screen-label"><td><label for="group">{$i18n.label.group}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="group">{$i18n.label.group}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.group.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/if}
+  <tr class = "small-screen-label"><td>{$i18n.label.subgroups}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.subgroups}:</td>
+    <td class="td-with-input"><a href="groups.php">{$i18n.label.configure}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="currency">{$i18n.label.currency}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="currency">{$i18n.label.currency}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.currency.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $user->can('manage_roles')}
+  <tr class = "small-screen-label"><td>{$i18n.label.roles}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.label.roles}:</td>
+    <td class="td-with-input"><a href="roles.php">{$i18n.label.configure}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="lang">{$i18n.label.language}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="lang">{$i18n.label.language}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.lang.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="decimal_mark">{$i18n.label.decimal_mark}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="decimal_mark">{$i18n.label.decimal_mark}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.decimal_mark.control} <font id="decimal_preview" color="#777777">&nbsp;</font></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="date_format">{$i18n.label.date_format}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="date_format">{$i18n.label.date_format}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.date_format.control} <font id="date_format_preview" color="#777777">&nbsp;</font></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="time_format">{$i18n.label.time_format}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="time_format">{$i18n.label.time_format}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.time_format.control} <font id="time_format_preview" color="#777777">&nbsp;</font></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="start_week">{$i18n.label.week_start}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="start_week">{$i18n.label.week_start}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.start_week.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td>{$i18n.form.group_edit.display_options}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.form.group_edit.display_options}:</td>
+    <td class="td-with-input"><a href="display_options.php">{$i18n.label.configure}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="holidays">{$i18n.form.group_edit.holidays}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="holidays">{$i18n.form.group_edit.holidays}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.holidays.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_36.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_36.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="tracking_mode">{$i18n.form.group_edit.tracking_mode}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="tracking_mode">{$i18n.form.group_edit.tracking_mode}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.tracking_mode.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_47.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_47.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="record_type">{$i18n.form.group_edit.record_type}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="record_type">{$i18n.form.group_edit.record_type}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.record_type.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_38.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_38.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="punch_mode">{$i18n.form.group_edit.punch_mode}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="punch_mode">{$i18n.form.group_edit.punch_mode}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.punch_mode.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_18.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="allow_overlap">{$i18n.form.group_edit.allow_overlap}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="allow_overlap">{$i18n.form.group_edit.allow_overlap}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.allow_overlap.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_16.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_16.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="future_entries">{$i18n.form.group_edit.future_entries}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="future_entries">{$i18n.form.group_edit.future_entries}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.future_entries.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_17.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_17.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="uncompleted_indicators">{$i18n.form.group_edit.uncompleted_indicators}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="uncompleted_indicators">{$i18n.form.group_edit.uncompleted_indicators}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.uncompleted_indicators.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_15.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="confirm_save">{$i18n.form.group_edit.confirm_save}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="confirm_save">{$i18n.form.group_edit.confirm_save}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.confirm_save.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_26.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_26.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $user->can('manage_advanced_settings')}
+  <tr class = "small-screen-label"><td>{$i18n.form.group_edit.advanced_settings}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.form.group_edit.advanced_settings}:</td>
+    <td class="td-with-input"><a href="group_advanced_edit.php">{$i18n.label.configure}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+</table>
+<div class="button-set">{$forms.groupForm.btn_save.control} {$forms.groupForm.btn_delete.control}</div>
+{$forms.groupForm.close}
diff --git a/group_edit.php b/group_edit.php
index e87f4015e..e1a7a5234 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -91,7 +91,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'document.groupForm.group_changed.value=1;document.groupForm.submit();',
     'name'=>'group',
-    'style'=>'width: 250px;',
     'value'=>$group_id,
     'data'=>$groups,
     'datakeys'=>array('id','name')));
@@ -116,7 +115,7 @@
   $longname_lang[] = array('id'=>I18n::getLangFromFilename($lfile),'name'=>$lname);
 }
 $longname_lang = mu_sort($longname_lang, 'name');
-$form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 200px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
+$form->addInput(array('type'=>'combobox','name'=>'lang','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
 
 $DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
 $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
@@ -141,7 +140,7 @@
 foreach ($i18n->weekdayNames as $id => $week_dn) {
   $week_start_options[] = array('id' => $id, 'name' => $week_dn);
 }
-$form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
+$form->addInput(array('type'=>'combobox','name'=>'start_week','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
 
 // Show holidays control.
 $form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_holidays));
@@ -151,7 +150,7 @@
 $tracking_mode_options[MODE_TIME] = $i18n->get('form.group_edit.mode_time');
 $tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.group_edit.mode_projects');
 $tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.group_edit.mode_projects_and_tasks');
-$form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode));
+$form->addInput(array('type'=>'combobox','name'=>'tracking_mode','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode));
 $form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
 
 // Prepare record type choices.
@@ -159,7 +158,7 @@
 $record_type_options[TYPE_ALL] = $i18n->get('form.group_edit.type_all');
 $record_type_options[TYPE_START_FINISH] = $i18n->get('form.group_edit.type_start_finish');
 $record_type_options[TYPE_DURATION] = $i18n->get('form.group_edit.type_duration');
-$form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
+$form->addInput(array('type'=>'combobox','name'=>'record_type','data'=>$record_type_options,'value'=>$cl_record_type));
 
 // Punch mode checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'punch_mode','value'=>$cl_punch_mode));
@@ -229,5 +228,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
-$smarty->assign('content_page_name', 'group_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'group_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 037c86626..57f1171d6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5472");
+define("APP_VERSION", "1.19.28.5473");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 868be205b73b1ae68715d7aa091623616d8efa72 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 17:24:11 +0000
Subject: [PATCH 1486/1848] Moved script to the bottom of group_edit.php to
 populate format examples.

---
 WEB-INF/templates/group_edit2.tpl | 27 +++++++++++++++------------
 initialize.php                    |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/group_edit2.tpl b/WEB-INF/templates/group_edit2.tpl
index 0c44d3915..e653e6756 100644
--- a/WEB-INF/templates/group_edit2.tpl
+++ b/WEB-INF/templates/group_edit2.tpl
@@ -3,20 +3,9 @@ License: See license.txt *}
 
 <script>
 function chLocation(newLocation) { document.location = newLocation; }
-
-{* initialize preview text *}
-MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
-MakeFormatPreview("time_format_preview", document.getElementById("time_format"));
-
-function adjustDecimalPreview()
-{
-  var mark = document.getElementById("decimal_mark").value;
-  var example = document.getElementById("decimal_preview");
-  example.innerHTML = "<i>3"+mark+"14</i>";
-}
-adjustDecimalPreview();
 </script>
 
+
 {$forms.groupForm.open}
 {include file="datetime_format_preview.tpl"}
 <table class="centered-table">
@@ -169,3 +158,17 @@ adjustDecimalPreview();
 </table>
 <div class="button-set">{$forms.groupForm.btn_save.control} {$forms.groupForm.btn_delete.control}</div>
 {$forms.groupForm.close}
+
+<script>
+{* initialize preview text *}
+MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
+MakeFormatPreview("time_format_preview", document.getElementById("time_format"));
+
+function adjustDecimalPreview()
+{
+  var mark = document.getElementById("decimal_mark").value;
+  var example = document.getElementById("decimal_preview");
+  example.innerHTML = "<i>3"+mark+"14</i>";
+}
+adjustDecimalPreview();
+</script>
diff --git a/initialize.php b/initialize.php
index 57f1171d6..e161a3122 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5473");
+define("APP_VERSION", "1.19.28.5474");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 56646678f4da660c3a5cd94358bc48e614f8c68b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 19:20:41 +0000
Subject: [PATCH 1487/1848] Better separation of styles from code on
 group_edit.php.

---
 WEB-INF/templates/group_edit2.tpl |  6 +++---
 default.css                       | 10 ++++++++++
 group_edit.php                    |  6 +++---
 initialize.php                    |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/group_edit2.tpl b/WEB-INF/templates/group_edit2.tpl
index e653e6756..05a134dd9 100644
--- a/WEB-INF/templates/group_edit2.tpl
+++ b/WEB-INF/templates/group_edit2.tpl
@@ -48,19 +48,19 @@ function chLocation(newLocation) { document.location = newLocation; }
   <tr class = "small-screen-label"><td><label for="decimal_mark">{$i18n.label.decimal_mark}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="decimal_mark">{$i18n.label.decimal_mark}:</label></td>
-    <td class="td-with-input">{$forms.groupForm.decimal_mark.control} <font id="decimal_preview" color="#777777">&nbsp;</font></td>
+    <td class="td-with-input">{$forms.groupForm.decimal_mark.control} <span class="format-example" id="decimal_preview">&nbsp;</span></td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="date_format">{$i18n.label.date_format}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="date_format">{$i18n.label.date_format}:</label></td>
-    <td class="td-with-input">{$forms.groupForm.date_format.control} <font id="date_format_preview" color="#777777">&nbsp;</font></td>
+    <td class="td-with-input">{$forms.groupForm.date_format.control} <span class="format-example" id="date_format_preview">&nbsp;</span></td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="time_format">{$i18n.label.time_format}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="time_format">{$i18n.label.time_format}:</label></td>
-    <td class="td-with-input">{$forms.groupForm.time_format.control} <font id="time_format_preview" color="#777777">&nbsp;</font></td>
+    <td class="td-with-input">{$forms.groupForm.time_format.control} <span class="format-example" id="time_format_preview">&nbsp;</span></td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="start_week">{$i18n.label.week_start}:</label></td></tr>
diff --git a/default.css b/default.css
index 23098db42..65f3be3b9 100644
--- a/default.css
+++ b/default.css
@@ -273,6 +273,11 @@ span.what-is-it-text {
   display: inline-block;
 }
 
+/* span for what format example */
+span.format-example {
+  color: #777777;
+}
+
 /* buttons */
 input[type="submit"], input[type="button"] {
   -webkit-appearance: none;
@@ -295,6 +300,11 @@ input[type="text"].project-rate-field {
   width: 236px;
 }
 
+/* dropdown control with an associated format example */
+.dropdown-field-with-format-example {
+  width: 136px;
+}
+
 /* textareas for fields */
 #description, #address, #item_name, #custom_css {
   width: 220px;
diff --git a/group_edit.php b/group_edit.php
index e1a7a5234..cea5a6a41 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -118,7 +118,7 @@
 $form->addInput(array('type'=>'combobox','name'=>'lang','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
 
 $DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
-$form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
+$form->addInput(array('type'=>'combobox','name'=>'decimal_mark','class'=>'dropdown-field-with-format-example','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
   'onchange'=>'adjustDecimalPreview()'));
 
 $DATE_FORMAT_OPTIONS = array(
@@ -127,12 +127,12 @@
   array('id'=>'%d-%m-%Y','name'=>'d-m-Y'),
   array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
   array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
-$form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
+$form->addInput(array('type'=>'combobox','name'=>'date_format','class'=>'dropdown-field-with-format-example','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
   'onchange'=>'MakeFormatPreview(&quot;date_format_preview&quot;, this);'));
 $TIME_FORMAT_OPTIONS = array(
   array('id'=>'%H:%M','name'=>$i18n->get('form.group_edit.24_hours')),
   array('id'=>'%I:%M %p','name'=>$i18n->get('form.group_edit.12_hours')));
-$form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
+$form->addInput(array('type'=>'combobox','name'=>'time_format','class'=>'dropdown-field-with-format-example','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
   'onchange'=>'MakeFormatPreview(&quot;time_format_preview&quot;, this);'));
 
 // Prepare week start choices.
diff --git a/initialize.php b/initialize.php
index e161a3122..ec49622fe 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5474");
+define("APP_VERSION", "1.19.28.5475");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 524081ff8eab73ed2498a89800a73be31ce4f7a4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 20:10:42 +0000
Subject: [PATCH 1488/1848] Made groups.php mobile friendly and fixed a bug to
 set on behalf group properly when user clicks an edit icon.

---
 WEB-INF/templates/groups.tpl  | 42 --------------------------------
 WEB-INF/templates/groups2.tpl | 45 +++++++++++++++++++++++++++++++++++
 group_edit.php                |  5 +++-
 groups.php                    |  5 ++--
 initialize.php                |  2 +-
 5 files changed, 52 insertions(+), 47 deletions(-)
 delete mode 100644 WEB-INF/templates/groups.tpl
 create mode 100644 WEB-INF/templates/groups2.tpl

diff --git a/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl
deleted file mode 100644
index 636a252b0..000000000
--- a/WEB-INF/templates/groups.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-{$forms.subgroupsForm.open}
-{if $group_dropdown}
-<table cellspacing="1" cellpadding="3" border="0" width="100%">
-  <tr>
-    <td align="center">{$i18n.label.group}: {$forms.subgroupsForm.group.control}</td>
-  </tr>
-  <tr><td>&nbsp;</td></tr>
-</table>
-{/if}
-{if $subgroups}
-<table cellspacing="1" cellpadding="3" border="0" width="720">
-  <tr>
-    <td width="40%" class="tableHeader">{$i18n.label.thing_name}</td>
-    <td width="40%" class="tableHeader">{$i18n.label.description}</td>
-    <td></td>
-    <td></td>
-  </tr>
-  {foreach $subgroups as $subgroup}
-  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    <td>{$subgroup.name|escape}</td>
-    <td>{$subgroup.description|escape}</td>
-    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-  </tr>
-  {/foreach}
-</table>
-{/if}
-{$forms.subgroupsForm.close}
-
-<table width="100%">
-  <tr>
-    <td align="center">
-      <br>
-      <form>
-        <input type="button" onclick="chLocation('group_add.php');" value="{$i18n.button.add}">
-      </form>
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/groups2.tpl b/WEB-INF/templates/groups2.tpl
new file mode 100644
index 000000000..b5ed9a7b2
--- /dev/null
+++ b/WEB-INF/templates/groups2.tpl
@@ -0,0 +1,45 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{$forms.subgroupsForm.open}
+{if isset($group_dropdown) && $group_dropdown}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="group">{$i18n.label.group}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="group">{$i18n.label.group}:</label></td>
+    <td class="td-with-input">{$forms.subgroupsForm.group.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+{/if}
+
+<div class="form-control-separator"></div>
+
+{if $subgroups}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{{$i18n.label.description}}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $subgroups as $subgroup}
+  <tr>
+    <td class="text-cell">{$subgroup.name|escape}</td>
+    <td class="text-cell">{$subgroup.description|escape}</td>
+    <td><a href="group_edit.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="group_delete.php?id={$subgroup.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+</table>
+{/if}
+{$forms.subgroupsForm.close}
+<div class="button-set">
+  <form>
+    <input type="button" onclick="chLocation('group_add.php');" value="{$i18n.button.add}">
+  </form>
+</div>
diff --git a/group_edit.php b/group_edit.php
index cea5a6a41..d639dfeaa 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -41,7 +41,10 @@
 // Set on behalf group accordingly.
 $groupChanged = (bool)$request->getParameter('group_changed');
 if ($request->isPost() && $groupChanged) {
- $user->setOnBehalfGroup($group_id);
+ $user->setOnBehalfGroup($group_id); // User changed the group in a post using group selector on group_edit.php.
+}
+if ($request->isGet() && !$homeGroup) {
+ $user->setOnBehalfGroup($group_id); // User got here in a get by clicking an edit icon for a subgroup on groups.php.
 }
 
 $groups = $user->getGroupsForDropdown();
diff --git a/groups.php b/groups.php
index 8d99e17fd..5773220a2 100644
--- a/groups.php
+++ b/groups.php
@@ -30,7 +30,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',
     'name'=>'group',
-    'style'=>'width: 250px;',
     'value'=>$group_id,
     'data'=>$groups,
     'datakeys'=>array('id','name')));
@@ -40,5 +39,5 @@
 $smarty->assign('subgroups', $user->getSubgroups($group_id));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('label.subgroups'));
-$smarty->assign('content_page_name', 'groups.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'groups2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index ec49622fe..592109c93 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5475");
+define("APP_VERSION", "1.19.28.5476");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1f2ff265c20002d27fb686afd3cd9ffcbb6503ad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Apr 2021 20:23:41 +0000
Subject: [PATCH 1489/1848] Fixed a problem with misspelled variable name.

---
 group_edit.php | 2 +-
 initialize.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/group_edit.php b/group_edit.php
index d639dfeaa..097c34054 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -43,7 +43,7 @@
 if ($request->isPost() && $groupChanged) {
  $user->setOnBehalfGroup($group_id); // User changed the group in a post using group selector on group_edit.php.
 }
-if ($request->isGet() && !$homeGroup) {
+if ($request->isGet() && !$home_group) {
  $user->setOnBehalfGroup($group_id); // User got here in a get by clicking an edit icon for a subgroup on groups.php.
 }
 
diff --git a/initialize.php b/initialize.php
index 592109c93..1e43f4cc4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5476");
+define("APP_VERSION", "1.19.28.5477");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 188d9339bd3ee08a9c4fb52a55d486316d0019b8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Apr 2021 12:45:01 +0000
Subject: [PATCH 1490/1848] Made import.php mobile friendly, eliminated some
 php8 warnings.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 63 ++++++++-----------------
 WEB-INF/templates/import.tpl            | 17 -------
 WEB-INF/templates/import2.tpl           | 15 ++++++
 import.php                              |  4 +-
 initialize.php                          |  2 +-
 5 files changed, 37 insertions(+), 64 deletions(-)
 delete mode 100644 WEB-INF/templates/import.tpl
 create mode 100644 WEB-INF/templates/import2.tpl

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index ac970426f..744b67e4b 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // ttOrgImportHelper class is used to import organization data from an XML file
 // prepared by ttOrgExportHelper and consisting of nested groups with their info.
@@ -249,7 +225,7 @@ function startElement($parser, $name, $attrs) {
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'role_id' => $role_id,
-          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'client_id' => @$this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'name' => $attrs['NAME'],
           'login' => $attrs['LOGIN'],
           'password' => $attrs['PASSWORD'],
@@ -285,8 +261,8 @@ function startElement($parser, $name, $attrs) {
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
-          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
-          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'client_id' => @$this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project_id' => @$this->currentGroupProjectMap[$attrs['PROJECT_ID']],
           'name' => $attrs['NAME'],
           'comment' => $attrs['COMMENT'],
           'start_date' => $attrs['START_DATE'],
@@ -311,7 +287,7 @@ function startElement($parser, $name, $attrs) {
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'date' => $attrs['DATE'],
-          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'client_id' => @$this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'status' => $attrs['STATUS']));
         if ($invoice_id) {
           // Add a mapping.
@@ -330,13 +306,13 @@ function startElement($parser, $name, $attrs) {
           'org_id' => $this->org_id,
           'date' => $attrs['DATE'],
           'start' => $attrs['START'],
-          'finish' => $attrs['FINISH'],
+          'finish' => @$attrs['FINISH'],
           'duration' => $attrs['DURATION'],
-          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
-          'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
-          'task_id' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
-          'timesheet_id' => $this->currentGroupTimesheetMap[$attrs['TIMESHEET_ID']],
-          'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+          'client_id' => @$this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project_id' => @$this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'task_id' => @$this->currentGroupTaskMap[$attrs['TASK_ID']],
+          'timesheet_id' => @$this->currentGroupTimesheetMap[$attrs['TIMESHEET_ID']],
+          'invoice_id' => @$this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
           'comment' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
           'billable' => $attrs['BILLABLE'],
           'approved' => $attrs['APPROVED'],
@@ -387,7 +363,7 @@ function startElement($parser, $name, $attrs) {
           'org_id' => $this->org_id,
           'log_id' => $this->currentGroupLogMap[$attrs['LOG_ID']],
           'field_id' => $this->currentGroupCustomFieldMap[$attrs['FIELD_ID']],
-          'option_id' => $this->currentGroupCustomFieldOptionMap[$attrs['OPTION_ID']],
+          'option_id' => @$this->currentGroupCustomFieldOptionMap[$attrs['OPTION_ID']],
           'value' => $attrs['VALUE'],
           'status' => $attrs['STATUS']))) {
           $this->errors->add($i18n->get('error.db'));
@@ -402,12 +378,12 @@ function startElement($parser, $name, $attrs) {
           'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
-          'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'client_id' => @$this->currentGroupClientMap[$attrs['CLIENT_ID']],
           'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
-          'timesheet_id' => $this->currentGroupTimesheetMap[$attrs['TIMESHEET_ID']],
+          'timesheet_id' => @$this->currentGroupTimesheetMap[$attrs['TIMESHEET_ID']],
           'name' => $attrs['NAME'],
           'cost' => $attrs['COST'],
-          'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+          'invoice_id' => @$this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
           'approved' => $attrs['APPROVED'],
           'paid' => $attrs['PAID'],
           'status' => $attrs['STATUS']));
@@ -477,9 +453,9 @@ function startElement($parser, $name, $attrs) {
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'report_spec' => $this->remapReportSpec($attrs['REPORT_SPEC']),
-          'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
-          'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
-          'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
+          'client' => @$this->currentGroupClientMap[$attrs['CLIENT_ID']],
+          'project' => @$this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+          'task' => @$this->currentGroupTaskMap[$attrs['TASK_ID']],
           'billable' => $attrs['BILLABLE'],
           'approved' => $attrs['APPROVED'],
           'invoice' => $attrs['INVOICE'],
@@ -850,7 +826,6 @@ private function insertTask($fields)
     $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     $description = $fields['description'];
-    $projects = $fields['projects'];
     $status = $fields['status'];
 
     $sql = "insert into tt_tasks (group_id, org_id, name, description, status)
diff --git a/WEB-INF/templates/import.tpl b/WEB-INF/templates/import.tpl
deleted file mode 100644
index d65b64963..000000000
--- a/WEB-INF/templates/import.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{$forms.importForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td align="center">
-      <table border="0" width="60%">
-        <tr><td colspan="2">{$i18n.form.import.hint}<br></td></tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.form.import.file}:</td>
-          <td>{$forms.importForm.xmlfile.control}</td>
-        </tr>
-        <tr><td height="50" align="center" colspan="2">{$forms.importForm.btn_submit.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.importForm.close}
diff --git a/WEB-INF/templates/import2.tpl b/WEB-INF/templates/import2.tpl
new file mode 100644
index 000000000..5d7cd33ac
--- /dev/null
+++ b/WEB-INF/templates/import2.tpl
@@ -0,0 +1,15 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<div class="page-hint">{$i18n.form.import.hint}</div>
+{$forms.importForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="xmlfile">{$i18n.form.import.file}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="xmlfile">{$i18n.form.import.file}:</label></td>
+    <td class="td-with-input">{$forms.importForm.xmlfile.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.importForm.btn_submit.control}</div>
+{$forms.importForm.open}
diff --git a/import.php b/import.php
index b743b3f5a..c4b59c240 100644
--- a/import.php
+++ b/import.php
@@ -25,5 +25,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()) );
 $smarty->assign('title', $i18n->get('title.import'));
-$smarty->assign('content_page_name', 'import.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'import2.tpl');
+$smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 1e43f4cc4..ee1a079f7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5477");
+define("APP_VERSION", "1.19.28.5478");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c330fe620dd9620f71c818a569d183a872fe776e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Apr 2021 13:26:44 +0000
Subject: [PATCH 1491/1848] Fixed conditions for a couple of php8 warnings.

---
 initialize.php | 2 +-
 time.php       | 2 +-
 time_edit.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index ee1a079f7..15416eaed 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5478");
+define("APP_VERSION", "1.19.28.5479");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index f6cd1daf1..d96c497e3 100644
--- a/time.php
+++ b/time.php
@@ -212,6 +212,7 @@
 }
 
 // If we show project dropdown, add controls for project and client.
+$project_list = $client_list = array();
 if ($showProject) {
   // Dropdown for projects assigned to user.
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
@@ -226,7 +227,6 @@
   $largeScreenCalendarRowSpan += 2;
 
   // Client dropdown.
-  $client_list = array();
   if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
diff --git a/time_edit.php b/time_edit.php
index f4a955776..8e9f31e56 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -155,6 +155,7 @@
 }
 
 // If we show project dropdown, add controls for project and client.
+$project_list = $client_list = array();
 if ($showProject) {
   // Dropdown for projects assigned to user.
   $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
@@ -168,7 +169,6 @@
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
 
   // Client dropdown.
-  $client_list = array();
   if ($showClient) {
     $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.

From e7152bc13119a7742c08c27ab1ef1f0033aed455 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Apr 2021 14:07:21 +0000
Subject: [PATCH 1492/1848] Made invoice_add.php mobile friendly.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 32 +++------------
 WEB-INF/templates/invoice_add.tpl     | 53 -------------------------
 WEB-INF/templates/invoice_add2.tpl    | 57 +++++++++++++++++++++++++++
 initialize.php                        |  2 +-
 invoice_add.php                       |  5 ++-
 5 files changed, 66 insertions(+), 83 deletions(-)
 delete mode 100644 WEB-INF/templates/invoice_add.tpl
 create mode 100644 WEB-INF/templates/invoice_add2.tpl

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 0afd0c9aa..8c1e6aafa 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttClientHelper');
 import('DateAndTime');
@@ -65,7 +41,7 @@ static function getInvoiceByName($invoice_name) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      if ($val['id']) {
+      if (isset($val['id']) && $val['id'] > 0) {
         return $val;
       }
     }
@@ -255,6 +231,8 @@ static function invoiceableItemsExist($fields) {
     $end_date = new DateAndTime($user->date_format, $fields['end_date']);
     $end = $end_date->toString(DB_DATEFORMAT);
 
+    $project_id = null;
+    $project_part = '';
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Our query is different depending on tracking mode.
diff --git a/WEB-INF/templates/invoice_add.tpl b/WEB-INF/templates/invoice_add.tpl
deleted file mode 100644
index f5211eeef..000000000
--- a/WEB-INF/templates/invoice_add.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-{$forms.invoiceForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.form.invoice.number} (*):</td>
-          <td>{$forms.invoiceForm.number.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.date} (*):</td>
-          <td>{$forms.invoiceForm.date.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.client} (*):</td>
-          <td>{$forms.invoiceForm.client.control}</td>
-        </tr>
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project}:</td>
-          <td>{$forms.invoiceForm.project.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.start_date} (*):</td>
-          <td>{$forms.invoiceForm.start.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.end_date} (*):</td>
-          <td>{$forms.invoiceForm.finish.control}</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.invoiceForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.invoiceForm.close}
-
-<script>
-// Set the date field to browser today in user date format.
-var dateField = document.getElementById("date");
-if (dateField && !dateField.value) {
-  var today = new Date();
-  dateField.value = today.strftime("{$user->date_format}");
-}
-</script>
diff --git a/WEB-INF/templates/invoice_add2.tpl b/WEB-INF/templates/invoice_add2.tpl
new file mode 100644
index 000000000..78e4f5ba2
--- /dev/null
+++ b/WEB-INF/templates/invoice_add2.tpl
@@ -0,0 +1,57 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.invoiceForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="number">{$i18n.form.invoice.number} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="number">{$i18n.form.invoice.number} (*):</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.number.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="date">{$i18n.label.date}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="date">{$i18n.label.date}:</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.date.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}:</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if isset($show_project) && $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project}:</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start_date} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="start">{$i18n.label.start_date} (*):</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.start.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.end_date} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="finish">{$i18n.label.end_date} (*):</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.finish.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.invoiceForm.btn_submit.control}</div>
+{$forms.invoiceForm.close}
+
+<script>
+// Set the date field to browser today in user date format.
+var dateField = document.getElementById("date");
+if (dateField && !dateField.value) {
+  var today = new Date();
+  dateField.value = today.strftime("{$user->date_format}");
+}
+</script>
diff --git a/initialize.php b/initialize.php
index 15416eaed..2c6863908 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5479");
+define("APP_VERSION", "1.19.28.5480");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_add.php b/invoice_add.php
index 9c5cd641a..9d127cd3d 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -19,6 +19,7 @@
 }
 // End of access checks.
 
+$cl_date = $cl_client = $cl_project = $cl_number = $cl_start = $cl_finish = null;
 if ($request->isPost()) {
   $cl_date = $request->getParameter('date');
   $cl_client = (int)$request->getParameter('client');
@@ -79,5 +80,5 @@
 $smarty->assign('onload', 'onLoad="document.invoiceForm.number.focus()"');
 $smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.add_invoice'));
-$smarty->assign('content_page_name', 'invoice_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'invoice_add2.tpl');
+$smarty->display('index2.tpl');

From a2b54e5b995e6f5df919767b25685dbee3189ac4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Apr 2021 14:42:35 +0000
Subject: [PATCH 1493/1848] Made invoice_delete.php mobile friendly.

---
 WEB-INF/lib/ttGroupHelper.class.php   |  1 +
 WEB-INF/lib/ttInvoiceHelper.class.php |  1 +
 WEB-INF/templates/invoice_delete.tpl  | 34 ---------------------------
 WEB-INF/templates/invoice_delete2.tpl | 31 ++++++++++++++++++++++++
 initialize.php                        |  2 +-
 invoice_add.php                       |  6 ++---
 invoice_delete.php                    |  4 ++--
 invoices.php                          |  1 +
 8 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 WEB-INF/templates/invoice_delete.tpl
 create mode 100644 WEB-INF/templates/invoice_delete2.tpl

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index defdb61d4..0dd3dd412 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -403,6 +403,7 @@ static function getActiveInvoices($sort_options = false)
     $addPaidStatus = $user->isPluginEnabled('ps');
     $result = array();
 
+    $client_part = '';
     if ($user->isClient())
       $client_part = "and i.client_id = $user->client_id";
 
diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 8c1e6aafa..2802b57e7 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -16,6 +16,7 @@ static function getInvoice($invoice_id) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $client_part = '';
     if ($user->isClient()) $client_part = "and client_id = $user->client_id";
 
     $sql = "select * from tt_invoices".
diff --git a/WEB-INF/templates/invoice_delete.tpl b/WEB-INF/templates/invoice_delete.tpl
deleted file mode 100644
index 3e0c0700d..000000000
--- a/WEB-INF/templates/invoice_delete.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<script>
-  function confirm_deleting_entries() {
-    var dropdown = document.getElementById("delete_invoice_entries");
-    if (1 == dropdown.value) {
-      // User selected deleting values. Ask to confirm.
-      return confirm("{$i18n.form.invoice.confirm_deleting_entries}");
-    }
-    return true;
-  }
-</script>
-
-{$forms.invoiceDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="2" border="0">
-        <tr>
-          <td>{$i18n.form.invoice.invoice_to_delete}:</td>
-          <th>{$invoice_to_delete|escape}</th>
-        </tr>
-        <tr>
-          <td>{$i18n.form.invoice.invoice_entries}:</td>
-          <td>{$forms.invoiceDeleteForm.delete_invoice_entries.control}</td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.invoiceDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.invoiceDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.invoiceDeleteForm.close}
diff --git a/WEB-INF/templates/invoice_delete2.tpl b/WEB-INF/templates/invoice_delete2.tpl
new file mode 100644
index 000000000..6fb7cb6c4
--- /dev/null
+++ b/WEB-INF/templates/invoice_delete2.tpl
@@ -0,0 +1,31 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function confirm_deleting_entries() {
+    var dropdown = document.getElementById("delete_invoice_entries");
+    if (1 == dropdown.value) {
+      // User selected deleting values. Ask to confirm.
+      return confirm("{$i18n.form.invoice.confirm_deleting_entries}");
+    }
+    return true;
+  }
+</script>
+
+{$forms.invoiceDeleteForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td>{$i18n.form.invoice.invoice_to_delete}:</td></tr>
+  <tr>
+    <td class="large-screen-label">{$i18n.form.invoice.invoice_to_delete}:</label></td>
+    <th>{$invoice_to_delete|escape}</th>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="delete_invoice_entries">{$i18n.form.invoice.invoice_entries}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="delete_invoice_entries">{$i18n.form.invoice.invoice_entries}:</label></td>
+    <td class="td-with-input">{$forms.invoiceDeleteForm.delete_invoice_entries.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.invoiceDeleteForm.btn_delete.control} {$forms.invoiceDeleteForm.btn_cancel.control}</div>
+{$forms.invoiceDeleteForm.close}
diff --git a/initialize.php b/initialize.php
index 2c6863908..979fec7c0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5480");
+define("APP_VERSION", "1.19.28.5481");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_add.php b/invoice_add.php
index 9d127cd3d..bc337a000 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -35,15 +35,15 @@
 // Dropdown for clients if the clients plugin is enabled.
 if ($user->isPluginEnabled('cl')) {
   $clients = ttGroupHelper::getActiveClients();
-  $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
 $show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
 if ($show_project) {
   $projects = ttGroupHelper::getActiveProjects();
-  $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
+  $form->addInput(array('type'=>'combobox','name'=>'project','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'number','style'=>'width: 250px;','value'=>$cl_number));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'number','value'=>$cl_number));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start','value'=>$cl_start));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'finish','value'=>$cl_finish));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
diff --git a/invoice_delete.php b/invoice_delete.php
index 5b473dfa0..7e80b1265 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -51,5 +51,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_invoice'));
-$smarty->assign('content_page_name', 'invoice_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'invoice_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/invoices.php b/invoices.php
index 305dcefdc..3f5faaf73 100644
--- a/invoices.php
+++ b/invoices.php
@@ -17,6 +17,7 @@
 }
 // End of access checks.
 
+$sort_option_1 = $sort_order_1 = $sort_option_2 = $sort_order_2 = null;
 if ($request->isPost()) {
   $sort_option_1 = $request->getParameter('sort_option_1');
   $sort_order_1 = $request->getParameter('sort_order_1');

From 0f5cf0125c31ac88f541879e8a14efd12c7ecbad Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Apr 2021 18:28:09 +0000
Subject: [PATCH 1494/1848] Made invoice-view.php mobile friendly.

---
 WEB-INF/templates/invoice_view.tpl  |  90 ------------------------
 WEB-INF/templates/invoice_view2.tpl | 104 ++++++++++++++++++++++++++++
 default.css                         |  24 +++++++
 initialize.php                      |   2 +-
 invoice_view.php                    |   6 +-
 rtl.css                             |   8 +++
 6 files changed, 141 insertions(+), 93 deletions(-)
 delete mode 100644 WEB-INF/templates/invoice_view.tpl
 create mode 100644 WEB-INF/templates/invoice_view2.tpl

diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
deleted file mode 100644
index 0d8c31ffe..000000000
--- a/WEB-INF/templates/invoice_view.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$i18n.title.invoice} {$invoice_name|escape} </b></td></tr>
-        <tr><td align="left"><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$client_name|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client_address}:</b> {$client_address|escape}</td></tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-{if $invoice_items}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.date}</td>
-          <td class="tableHeader">{$i18n.form.invoice.person}</td>
-  {if $show_project}
-          <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-  {if $show_task}
-          <td class="tableHeader">{$i18n.label.task}</td>
-  {/if}
-          <td class="tableHeader">{$i18n.label.note}</td>
-          <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
-          <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td class="tableHeader">{$i18n.label.paid}</td>
-  {/if}
-        </tr>
-  {foreach $invoice_items as $invoice_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td valign="top">{$invoice_item.date}</td>
-          <td valign="top">{$invoice_item.user_name|escape}</td>
-    {if $show_project}
-          <td valign="top">{$invoice_item.project_name|escape}</td>
-    {/if}
-    {if $show_task}
-          <td valign="top">{$invoice_item.task_name|escape}</td>
-    {/if}
-          <td valign="top">{$invoice_item.note|escape}</td>
-          <td align="right" valign="top">{$invoice_item.duration}</td>
-          <td align="right" valign="top">{$invoice_item.cost}</td>
-    {if $user->isPluginEnabled('ps')}
-          <td align="right" valign="top">{if $invoice_item.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-    {/if}
-        </tr>
-  {/foreach}
-        <tr><td>&nbsp;</td></tr>
-  {if $tax}
-        <tr>
-          <td align="right" colspan="{$colspan}"><b>{$i18n.label.subtotal}:</b></td>
-          <td align="right"><nobr>{$subtotal|escape}</nobr></td>
-        </tr>
-        <tr>
-          <td align="right" colspan="{$colspan}"><b>{$i18n.label.tax}:</b></td>
-          <td align="right"><nobr>{$tax|escape}</nobr></td>
-        </tr>
-   {/if}
-        <tr>
-          <td align="right" colspan="{$colspan}"><b>{$i18n.label.total}:</b></td>
-          <td align="right"><nobr>{$total|escape}</nobr></td>
-        </tr>
-      </table>
-
-  {if $show_mark_paid}
-  {$forms.invoiceForm.open}
-  <table width="720" cellspacing="0" cellpadding="0" border="0">
-  <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.label.mark_paid}: {$forms.invoiceForm.mark_paid_action_options.control} {$forms.invoiceForm.btn_mark_paid.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  </table>
-  {$forms.invoiceForm.close}
-  {/if}
-{/if}
-    </td>
-  </tr>
-  <tr><td align="center"><br><form>
-    <input type="button" onclick="chLocation('invoice_send.php?id={$invoice_id}');" value="{$i18n.button.send_by_email}">
-  </form></td></tr>
-</table>
diff --git a/WEB-INF/templates/invoice_view2.tpl b/WEB-INF/templates/invoice_view2.tpl
new file mode 100644
index 000000000..64caae8d2
--- /dev/null
+++ b/WEB-INF/templates/invoice_view2.tpl
@@ -0,0 +1,104 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<div class="invoice-header">{$i18n.title.invoice} {$invoice_name|escape}</div>
+<table class="centered-table">
+  <tr>
+    <th class="invoice-label">{$i18n.label.date}:</th>
+    <td class="text-cell">{$invoice_date}</td>
+  </tr>
+  <tr>
+    <th class="invoice-label">{$i18n.label.client}:</th>
+    <td class="text-cell">{$client_name|escape}</td></tr>
+{if isset($client_address)}
+  <tr>
+    <th class="invoice-label">{$i18n.label.client_address}:</th>
+    <td class="text-cell">{$client_address|escape}</td>
+  </tr>
+{/if}
+</table>
+<div class="form-control-separator"></div>
+
+{if $invoice_items}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.date}</th>
+    <th>{$i18n.form.invoice.person}</th>
+  {if $show_project}
+    <th>{$i18n.label.project}</th>
+  {/if}
+  {if $show_task}
+    <th>{$i18n.label.task}</th>
+  {/if}
+    <th>{$i18n.label.note}</th>
+    <th>{$i18n.label.duration}</th>
+    <th>{$i18n.label.cost}</th>
+  {if $user->isPluginEnabled('ps')}
+    <th>{$i18n.label.paid}</th>
+  {/if}
+  </tr>
+  {foreach $invoice_items as $invoice_item}
+  <tr>
+    <td class="date-cell">{$invoice_item.date}</td>
+    <td class="text-cell">{$invoice_item.user_name|escape}</td>
+    {if $show_project}
+    <td class="text-cell">{$invoice_item.project_name|escape}</td>
+    {/if}
+    {if $show_task}
+    <td class="text-cell">{$invoice_item.task_name|escape}</td>
+    {/if}
+     <td class="text-cell">{$invoice_item.note|escape}</td>
+     <td class="time-cell">{$invoice_item.duration}</td>
+     <td class="money-value-cell">{$invoice_item.cost}</td>
+    {if $show_paid_column}
+     <td class="yes-no-cell">{if $invoice_item.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {/if}
+  </tr>
+  {/foreach}
+  {if $tax}
+  <tr>
+    <th class="invoice-label" colspan="{$colspan}">{$i18n.label.subtotal}:</th>
+    <td class="money-value-cell"><nobr>{$subtotal|escape}</nobr></td>
+    {if $show_paid_column}
+    <td></td>
+    {/if}
+  </tr>
+  <tr>
+    <th class="invoice-label" colspan="{$colspan}">{$i18n.label.tax}:</th>
+    <td class="money-value-cell"><nobr>{$tax|escape}</nobr></td>
+    {if $show_paid_column}
+    <td></td>
+    {/if}
+  </tr>
+  {/if}
+  <tr>
+    <th class="invoice-label" colspan="{$colspan}">{$i18n.label.total}:</th>
+    <td class="money-value-cell"><nobr>{$total|escape}</nobr></td>
+    {if $show_paid_column}
+    <td></td>
+    {/if}
+  </tr>
+</table>
+{/if}
+
+{if $show_mark_paid}
+{$forms.invoiceForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="mark_paid_action_options">{$i18n.label.mark_paid}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="mark_paid_action_options">{$i18n.label.mark_paid}:</label></td>
+    <td class="td-with-input">{$forms.invoiceForm.mark_paid_action_options.control} {$forms.invoiceForm.btn_mark_paid.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+{$forms.invoiceForm.close}
+{/if}
+<div class="button-set">
+  <form>
+    <input type="button" onclick="chLocation('invoice_send.php?id={$invoice_id}');" value="{$i18n.button.send_by_email}">
+  </form>
+</div>
diff --git a/default.css b/default.css
index 65f3be3b9..62be70136 100644
--- a/default.css
+++ b/default.css
@@ -175,6 +175,16 @@ div.page-hint {
   white-space: nowrap;
 }
 
+/* money value cell in tables */
+.money-value-cell {
+  text-align: right;
+}
+
+/* yes-no cell in tables */
+.yes-no-cell {
+  text-align: middle;
+}
+
 /* text cell for note header when we display notes on separate rows */
 .note-header-cell {
   text-align: right;
@@ -305,6 +315,11 @@ input[type="text"].project-rate-field {
   width: 136px;
 }
 
+/* dropdown control with an associated button */
+.dropdown-field-with-button {
+  width: 136px;
+}
+
 /* textareas for fields */
 #description, #address, #item_name, #custom_css {
   width: 220px;
@@ -449,6 +464,15 @@ div.section-header {
   margin-bottom: .5rem;
 }
 
+/* invoice-header div */
+div.invoice-header {
+  font-size: 2rem;
+}
+
+th.invoice-label {
+  text-align: right;
+}
+
 /* div for a group of items in site map */
 div.sitemap-item-group {
   margin-top: 2rem;
diff --git a/initialize.php b/initialize.php
index 979fec7c0..a716293b4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5481");
+define("APP_VERSION", "1.19.28.5482");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_view.php b/invoice_view.php
index a4d0cc50f..0e6cf1ebc 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -75,6 +75,7 @@
   $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
+    'class'=>'dropdown-field-with-button',
     'data'=>$mark_paid_action_options,
     'value'=>$cl_mark_paid_action_option));
   $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
@@ -103,8 +104,9 @@
 $smarty->assign('client_address', $client['address']);
 $smarty->assign('show_project', MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode);
 $smarty->assign('show_task', MODE_PROJECTS_AND_TASKS == $trackingMode);
+$smarty->assign('show_paid_column', $user->isPluginEnabled('ps'));
 $smarty->assign('invoice_items', $invoice_items);
 $smarty->assign('colspan', $colspan);
 $smarty->assign('title', $i18n->get('title.view_invoice'));
-$smarty->assign('content_page_name', 'invoice_view.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'invoice_view2.tpl');
+$smarty->display('index2.tpl');
diff --git a/rtl.css b/rtl.css
index b47b925ad..e85b8b5e5 100644
--- a/rtl.css
+++ b/rtl.css
@@ -36,6 +36,14 @@ html {
   text-align: left;
 }
 
+.money-value-cell {
+  text-align: left;
+}
+
 .note-header-cell {
   text-align: left;
 }
+
+th.invoice-label {
+  text-align: left;
+}

From f37182bf1b9c66450058b48466005e544465d110 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 26 Apr 2021 20:07:56 +0000
Subject: [PATCH 1495/1848] Made invoices.php mobile friendly.

---
 WEB-INF/lib/ttInvoiceHelper.class.php |  2 +
 WEB-INF/templates/invoice_view2.tpl   |  2 +-
 WEB-INF/templates/invoices.tpl        | 60 ---------------------------
 WEB-INF/templates/invoices2.tpl       | 56 +++++++++++++++++++++++++
 initialize.php                        |  2 +-
 invoice_view.php                      |  3 +-
 invoices.php                          | 10 +++--
 7 files changed, 67 insertions(+), 68 deletions(-)
 delete mode 100644 WEB-INF/templates/invoices.tpl
 create mode 100644 WEB-INF/templates/invoices2.tpl

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 2802b57e7..9a20730ae 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -313,6 +313,8 @@ static function createInvoice($fields) {
     $end_date = new DateAndTime($user->date_format, $fields['end_date']);
     $end = $end_date->toString(DB_DATEFORMAT);
 
+    $project_id = null;
+    $project_part = '';
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
     // Create a new invoice record.
diff --git a/WEB-INF/templates/invoice_view2.tpl b/WEB-INF/templates/invoice_view2.tpl
index 64caae8d2..afa508724 100644
--- a/WEB-INF/templates/invoice_view2.tpl
+++ b/WEB-INF/templates/invoice_view2.tpl
@@ -59,7 +59,7 @@ License: See license.txt *}
     {/if}
   </tr>
   {/foreach}
-  {if $tax}
+  {if isset($tax)}
   <tr>
     <th class="invoice-label" colspan="{$colspan}">{$i18n.label.subtotal}:</th>
     <td class="money-value-cell"><nobr>{$subtotal|escape}</nobr></td>
diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
deleted file mode 100644
index e27eb3991..000000000
--- a/WEB-INF/templates/invoices.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{if $show_sorting_options}
-  {$forms.invoicesForm.open}
-<div style="padding: 10 0 10 0;">
-  <table border="0" class="divider">
-    <tr>
-      <td>
-        <table cellspacing="1" cellpadding="3" border="0">
-          <tr><td>{$i18n.label.sort}:</td><td>{$forms.invoicesForm.sort_option_1.control}</td><td>{$forms.invoicesForm.sort_order_1.control}</td><td>{$forms.invoicesForm.sort_option_2.control}</td><td>{$forms.invoicesForm.sort_order_2.control}</td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</div>
-  {$forms.invoicesForm.close}
-{/if}
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_invoices') || $user->can('view_client_invoices')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.invoice}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.date}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td class="tableHeader">{$i18n.label.paid}</td>
-  {/if}
-  {if !$user->isClient()}
-          <td></td>
-  {/if}
-        </tr>
-        {foreach $invoices as $invoice}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="invoice_view.php?id={$invoice.id}">{$invoice.name|escape}</a></td>
-          <td>{$invoice.client|escape}</td>
-          <td>{$invoice.date}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
-  {if !$user->isClient()}
-          <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-  {/if}
-        </tr>
-        {/foreach}
-      </table>
-
-  {if !$user->isClient()}
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('invoice_add.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-  {/if}
-{/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/invoices2.tpl b/WEB-INF/templates/invoices2.tpl
new file mode 100644
index 000000000..003266cb0
--- /dev/null
+++ b/WEB-INF/templates/invoices2.tpl
@@ -0,0 +1,56 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{if $show_sorting_options}
+{$forms.invoicesForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="sort_option_1">{$i18n.label.sort}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="sort_option_1">{$i18n.label.sort}:</label></td>
+    <td class="td-with-input">{$forms.invoicesForm.sort_option_1.control} {$forms.invoicesForm.sort_order_1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="sort_option_2">{$i18n.label.sort}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="sort_option_2">{$i18n.label.sort}:</label></td>
+    <td class="td-with-input">{$forms.invoicesForm.sort_option_2.control} {$forms.invoicesForm.sort_order_2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+{$forms.invoicesForm.close}
+{/if}
+
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.invoice}</th>
+    <th>{$i18n.label.client}</th>
+    <th>{$i18n.label.date}</th>
+{if $user->isPluginEnabled('ps')}
+    <th>{$i18n.label.paid}</th>
+{/if}
+{if !$user->isClient()}
+    <th></th>
+{/if}
+  </tr>
+{foreach $invoices as $invoice}
+  <tr>
+    <td class="text-cell"><a href="invoice_view.php?id={$invoice.id}">{$invoice.name|escape}</a></td>
+    <td class="text-cell">{$invoice.client|escape}</td>
+    <td class="date-cell">{$invoice.date}</td>
+  {if $user->isPluginEnabled('ps')}
+    <td class="yes-no-cell">{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+  {if !$user->isClient()}
+    <td><a href="invoice_delete.php?id={$invoice.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  {/if}
+  </tr>
+{/foreach}
+</table>
+
+{if !$user->isClient()}
+<div class="button-set"><form><input type="button" onclick="chLocation('invoice_add.php');" value="{$i18n.button.add}"></form></div>
+{/if}
diff --git a/initialize.php b/initialize.php
index a716293b4..4c84012d6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5482");
+define("APP_VERSION", "1.19.28.5483");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_view.php b/invoice_view.php
index 0e6cf1ebc..621ae4a0c 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -76,8 +76,7 @@
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
     'class'=>'dropdown-field-with-button',
-    'data'=>$mark_paid_action_options,
-    'value'=>$cl_mark_paid_action_option));
+    'data'=>$mark_paid_action_options));
   $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
   $smarty->assign('show_mark_paid', true);
 }
diff --git a/invoices.php b/invoices.php
index 3f5faaf73..bbca99cc7 100644
--- a/invoices.php
+++ b/invoices.php
@@ -36,14 +36,14 @@
 
 $form->addInput(array('type'=>'combobox',
   'name'=>'sort_option_1',
+  'class'=>'dropdown-field-with-button',
   'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
-  //'style'=>'width: 250px;',
   'data'=>$sort_options,
   'value'=>$sort_option_1));
 $form->addInput(array('type'=>'combobox',
   'name'=>'sort_option_2',
+  'class'=>'dropdown-field-with-button',
   'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
-  //'style'=>'width: 250px;',
   'data'=>$sort_options,
   'value'=>$sort_option_2,
   'empty'=>array(''=>$i18n->get('dropdown.no'))));
@@ -54,11 +54,13 @@
 
 $form->addInput(array('type'=>'combobox',
   'name'=>'sort_order_1',
+  'class'=>'dropdown-field-with-button',
   'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
   'data'=>$sort_order,
   'value'=>$sort_order_1));
 $form->addInput(array('type'=>'combobox',
   'name'=>'sort_order_2',
+  'class'=>'dropdown-field-with-button',
   'onchange'=>'this.form.sorting_changed.value=1;this.form.submit();',
   'data'=>$sort_order,
   'value'=>$sort_order_2));
@@ -88,5 +90,5 @@
 $smarty->assign('show_sorting_options', count($invoices) > 1);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.invoices'));
-$smarty->assign('content_page_name', 'invoices.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'invoices2.tpl');
+$smarty->display('index2.tpl');

From 1a5296eb93a70f1c97f183b40e8c2e0b940651af Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Apr 2021 16:39:47 +0000
Subject: [PATCH 1496/1848] Made locking.php mobile friendly.

---
 WEB-INF/templates/locking.tpl  | 20 --------------------
 WEB-INF/templates/locking2.tpl | 17 +++++++++++++++++
 initialize.php                 |  2 +-
 locking.php                    |  4 ++--
 4 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 WEB-INF/templates/locking.tpl
 create mode 100644 WEB-INF/templates/locking2.tpl

diff --git a/WEB-INF/templates/locking.tpl b/WEB-INF/templates/locking.tpl
deleted file mode 100644
index 0d76e46cc..000000000
--- a/WEB-INF/templates/locking.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.lockingForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.schedule}:</td>
-          <td>{$forms.lockingForm.lock_spec.control} <a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.lockingForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.lockingForm.close}
diff --git a/WEB-INF/templates/locking2.tpl b/WEB-INF/templates/locking2.tpl
new file mode 100644
index 000000000..8ecf48cc9
--- /dev/null
+++ b/WEB-INF/templates/locking2.tpl
@@ -0,0 +1,17 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.lockingForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="lock_spec">{$i18n.label.schedule}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="lock_spec">{$i18n.label.schedule}:</label></td>
+    <td class="td-with-input">{$forms.lockingForm.lock_spec.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_6.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.lockingForm.btn_save.control}</div>
+{$forms.lockingForm.close}
diff --git a/initialize.php b/initialize.php
index 4c84012d6..876ecefb9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5483");
+define("APP_VERSION", "1.19.28.5484");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/locking.php b/locking.php
index 04c8d9419..5277ec90d 100644
--- a/locking.php
+++ b/locking.php
@@ -37,5 +37,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.locking'));
-$smarty->assign('content_page_name', 'locking.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'locking2.tpl');
+$smarty->display('index2.tpl');

From ede52c729188fb8129565e906d992b31e4f70806 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Apr 2021 17:05:20 +0000
Subject: [PATCH 1497/1848] Made mail.tpl mobile friendly.

---
 WEB-INF/templates/mail.tpl  | 39 -------------------------------------
 WEB-INF/templates/mail2.tpl | 34 ++++++++++++++++++++++++++++++++
 default.css                 |  4 ++--
 initialize.php              |  2 +-
 invoice_send.php            | 12 ++++++------
 report_send.php             | 12 ++++++------
 6 files changed, 49 insertions(+), 54 deletions(-)
 delete mode 100644 WEB-INF/templates/mail.tpl
 create mode 100644 WEB-INF/templates/mail2.tpl

diff --git a/WEB-INF/templates/mail.tpl b/WEB-INF/templates/mail.tpl
deleted file mode 100644
index 13e2be598..000000000
--- a/WEB-INF/templates/mail.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{$forms.mailForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-    <table cellspacing="4" cellpadding="7" border="0">
-    <tr>
-      <td valign="top" colspan="2">
-        <table>
-        <tr>
-          <td align="right">{$i18n.form.mail.to} (*):</td>
-          <td>{$forms.mailForm.receiver.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cc}:</td>
-          <td>{$forms.mailForm.cc.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.subject} (*):</td>
-          <td>{$forms.mailForm.subject.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.comment}:</td>
-          <td>{$forms.mailForm.comment.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="70">{$forms.mailForm.btn_send.control}</td>
-        </tr>
-        </table>
-      </td>
-    </tr>
-    </table>
-  </td>
-</tr>
-</table>
-{$forms.mailForm.close}
diff --git a/WEB-INF/templates/mail2.tpl b/WEB-INF/templates/mail2.tpl
new file mode 100644
index 000000000..3a3cf132f
--- /dev/null
+++ b/WEB-INF/templates/mail2.tpl
@@ -0,0 +1,34 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.mailForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="receiver">{$i18n.form.mail.to} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="receiver">{$i18n.form.mail.to} (*):</label></td>
+    <td class="td-with-input">{$forms.mailForm.receiver.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cc">{$i18n.label.cc}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cc">{$i18n.label.cc}:</label></td>
+    <td class="td-with-input">{$forms.mailForm.cc.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="subject">{$i18n.label.subject} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="subject">{$i18n.label.subject} (*):</label></td>
+    <td class="td-with-input">{$forms.mailForm.subject.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="comment">{$i18n.label.comment}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="comment">{$i18n.label.comment}:</label></td>
+    <td class="td-with-input">{$forms.mailForm.comment.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.mailForm.btn_send.control}</div>
+{$forms.mailForm.close}
diff --git a/default.css b/default.css
index 62be70136..85ead1d9f 100644
--- a/default.css
+++ b/default.css
@@ -321,7 +321,7 @@ input[type="text"].project-rate-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name, #custom_css {
+#description, #address, #item_name, #comment, #custom_css {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
@@ -329,7 +329,7 @@ input[type="text"].project-rate-field {
 }
 
 /* textareas with focus */
-#description:focus, #address:focus, #item_name:focus {
+#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/initialize.php b/initialize.php
index 876ecefb9..c42cf9cb4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5484");
+define("APP_VERSION", "1.19.28.5485");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_send.php b/invoice_send.php
index 3a4aa25f9..c3126eb9c 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -39,10 +39,10 @@
 
 $form = new Form('mailForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
-$form->addInput(array('type'=>'text','name'=>'receiver','style'=>'width: 300px;','value'=>$cl_receiver));
-$form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
-$form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
-$form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;'));
+$form->addInput(array('type'=>'text','name'=>'receiver','value'=>$cl_receiver));
+$form->addInput(array('type'=>'text','name'=>'cc','value'=>$cl_cc));
+$form->addInput(array('type'=>'text','name'=>'subject','value'=>$cl_subject));
+$form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250'));
 $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('button.send')));
 
 if ($request->isPost()) {
@@ -80,5 +80,5 @@
 $smarty->assign('title', $i18n->get('title.send_invoice'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
-$smarty->assign('content_page_name', 'mail.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'mail2.tpl');
+$smarty->display('index2.tpl');
diff --git a/report_send.php b/report_send.php
index a2747b957..67e7136c6 100644
--- a/report_send.php
+++ b/report_send.php
@@ -28,10 +28,10 @@
 }
 
 $form = new Form('mailForm');
-$form->addInput(array('type'=>'text','name'=>'receiver','style'=>'width: 300px;','value'=>$cl_receiver));
-$form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
-$form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
-$form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;'));
+$form->addInput(array('type'=>'text','name'=>'receiver','value'=>$cl_receiver));
+$form->addInput(array('type'=>'text','name'=>'cc','value'=>$cl_cc));
+$form->addInput(array('type'=>'text','name'=>'subject','value'=>$cl_subject));
+$form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250'));
 $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('button.send')));
 
 if ($request->isPost()) {
@@ -74,5 +74,5 @@
 $smarty->assign('title', $i18n->get('title.send_report'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
-$smarty->assign('content_page_name', 'mail.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'mail2.tpl');
+$smarty->display('index2.tpl');

From 47bed4f70c41b643cc87d74dd17bd3e56dd6958d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Apr 2021 17:15:05 +0000
Subject: [PATCH 1498/1848] Removed a couple of php8 warnings.

---
 WEB-INF/lib/ttUserConfig.class.php  | 30 +++--------------------------
 WEB-INF/templates/invoice_view2.tpl |  2 +-
 initialize.php                      |  2 +-
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttUserConfig.class.php b/WEB-INF/lib/ttUserConfig.class.php
index d0907bb6d..c14430581 100644
--- a/WEB-INF/lib/ttUserConfig.class.php
+++ b/WEB-INF/lib/ttUserConfig.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 define('SYSC_CHART_INTERVAL', 'chart_interval');
 define('SYSC_CHART_TYPE', 'chart_type');
@@ -58,7 +34,7 @@ function getValue($name) {
       " and param_name=".$this->mdb2->quote($name));
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return $val['param_value'];
+      return @$val['param_value'];
     }
     return false;
   }
diff --git a/WEB-INF/templates/invoice_view2.tpl b/WEB-INF/templates/invoice_view2.tpl
index afa508724..801245559 100644
--- a/WEB-INF/templates/invoice_view2.tpl
+++ b/WEB-INF/templates/invoice_view2.tpl
@@ -85,7 +85,7 @@ License: See license.txt *}
 </table>
 {/if}
 
-{if $show_mark_paid}
+{if isset($show_mark_paid)}
 {$forms.invoiceForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="mark_paid_action_options">{$i18n.label.mark_paid}:</label></td></tr>
diff --git a/initialize.php b/initialize.php
index c42cf9cb4..e5dc29655 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5485");
+define("APP_VERSION", "1.19.28.5486");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 392a47b0feb0894dad0497063367270e1c47c648 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Apr 2021 18:11:24 +0000
Subject: [PATCH 1499/1848] Made notification_add.php mobile friendly.

---
 WEB-INF/templates/notification_add.tpl  | 46 -------------------
 WEB-INF/templates/notification_add2.tpl | 59 +++++++++++++++++++++++++
 initialize.php                          |  2 +-
 notification_add.php                    | 17 +++----
 4 files changed, 69 insertions(+), 55 deletions(-)
 delete mode 100644 WEB-INF/templates/notification_add.tpl
 create mode 100644 WEB-INF/templates/notification_add2.tpl

diff --git a/WEB-INF/templates/notification_add.tpl b/WEB-INF/templates/notification_add.tpl
deleted file mode 100644
index b3aaed8e7..000000000
--- a/WEB-INF/templates/notification_add.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-{$forms.notificationForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.fav_report} (*):</td>
-          <td>{$forms.notificationForm.fav_report.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.schedule} (*):</td>
-          <td>{$forms.notificationForm.cron_spec.control} <a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.email} (*):</td>
-          <td>{$forms.notificationForm.email.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cc}:</td>
-          <td>{$forms.notificationForm.cc.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.subject}:</td>
-          <td>{$forms.notificationForm.subject.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.comment}:</td>
-          <td>{$forms.notificationForm.comment.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.condition}:</td>
-          <td>{$forms.notificationForm.report_condition.control} <a href="https://www.anuko.com/lp/tt_9.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.notificationForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.notificationForm.close}
diff --git a/WEB-INF/templates/notification_add2.tpl b/WEB-INF/templates/notification_add2.tpl
new file mode 100644
index 000000000..b7e609126
--- /dev/null
+++ b/WEB-INF/templates/notification_add2.tpl
@@ -0,0 +1,59 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+
+{$forms.notificationForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="fav_report">{$i18n.label.fav_report} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="fav_report">{$i18n.label.fav_report} (*):</label></td>
+    <td class="td-with-input">{$forms.notificationForm.fav_report.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cron_spec">{$i18n.label.schedule} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cron_spec">{$i18n.label.schedule} (*):</label></td>
+    <td class="td-with-input">{$forms.notificationForm.cron_spec.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_6.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="email">{$i18n.label.email} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="email">{$i18n.label.email} (*):</label></td>
+    <td class="td-with-input">{$forms.notificationForm.email.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cc">{$i18n.label.cc}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cc">{$i18n.label.cc}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.cc.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="subject">{$i18n.label.subject}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="subject">{$i18n.label.subject}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.subject.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="comment">{$i18n.label.comment}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="comment">{$i18n.label.comment}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.comment.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="report_condition">{$i18n.label.condition}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="report_condition">{$i18n.label.condition}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.report_condition.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_9.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_9.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.notificationForm.btn_add.control}</div>
+{$forms.notificationForm.close}
diff --git a/initialize.php b/initialize.php
index e5dc29655..95dd0b39d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5486");
+define("APP_VERSION", "1.19.28.5487");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/notification_add.php b/notification_add.php
index 83cd7a538..1290bfa23 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -22,6 +22,7 @@
   header('Location: access_denied.php'); // No users in subgroup.
   exit();
 }
+$cl_fav_report_id = null;
 if ($request->isPost() && $request->getParameter('fav_report')) {
   $cl_fav_report_id = (int) $request->getParameter('fav_report');
   if (!ttFavReportHelper::get($cl_fav_report_id)) {
@@ -33,6 +34,7 @@
 
 $fav_reports = ttFavReportHelper::getReports();
 
+$cl_cron_spec = $cl_email = $cl_cc = $cl_subject = $cl_comment = $cl_report_condition = null;
 if ($request->isPost()) {
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
   $cl_email = trim($request->getParameter('email'));
@@ -47,18 +49,17 @@
 $form = new Form('notificationForm');
 $form->addInput(array('type'=>'combobox',
   'name'=>'fav_report',
-  'style'=>'width: 250px;',
   'value'=>$cl_fav_report_id,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.select'))
 ));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','style'=>'width: 250px;','value'=>$cl_cron_spec));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
-$form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
-$form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','value'=>$cl_cron_spec));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
+$form->addInput(array('type'=>'text','name'=>'cc','value'=>$cl_cc));
+$form->addInput(array('type'=>'text','name'=>'subject','value'=>$cl_subject));
 $form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_comment));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','value'=>$cl_report_condition));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -94,5 +95,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_notification'));
-$smarty->assign('content_page_name', 'notification_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'notification_add2.tpl');
+$smarty->display('index2.tpl');

From cc9b41611784a6e14274cff131aa9b1bba219282 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Apr 2021 19:21:39 +0000
Subject: [PATCH 1500/1848] Made notification_edit.php and
 notification_delete.php mobile friendly.

---
 WEB-INF/templates/notification_delete.tpl  | 18 -------
 WEB-INF/templates/notification_delete2.tpl |  7 +++
 WEB-INF/templates/notification_edit.tpl    | 46 -----------------
 WEB-INF/templates/notification_edit2.tpl   | 59 ++++++++++++++++++++++
 initialize.php                             |  2 +-
 notification_delete.php                    |  4 +-
 notification_edit.php                      | 15 +++---
 7 files changed, 76 insertions(+), 75 deletions(-)
 delete mode 100644 WEB-INF/templates/notification_delete.tpl
 create mode 100644 WEB-INF/templates/notification_delete2.tpl
 delete mode 100644 WEB-INF/templates/notification_edit.tpl
 create mode 100644 WEB-INF/templates/notification_edit2.tpl

diff --git a/WEB-INF/templates/notification_delete.tpl b/WEB-INF/templates/notification_delete.tpl
deleted file mode 100644
index fac015c3a..000000000
--- a/WEB-INF/templates/notification_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.notificationDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$notification_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.notificationDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.notificationDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.notificationDeleteForm.close}
diff --git a/WEB-INF/templates/notification_delete2.tpl b/WEB-INF/templates/notification_delete2.tpl
new file mode 100644
index 000000000..bd413463d
--- /dev/null
+++ b/WEB-INF/templates/notification_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.notificationDeleteForm.open}
+<div class="section-header">{$notification_to_delete|escape}</div>
+<div class="button-set">{$forms.notificationDeleteForm.btn_delete.control}&nbsp;{$forms.notificationDeleteForm.btn_cancel.control}</div>
+{$forms.notificationDeleteForm.close}
diff --git a/WEB-INF/templates/notification_edit.tpl b/WEB-INF/templates/notification_edit.tpl
deleted file mode 100644
index 7c46761ea..000000000
--- a/WEB-INF/templates/notification_edit.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-{$forms.notificationForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.fav_report} (*):</td>
-          <td>{$forms.notificationForm.fav_report.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.schedule} (*):</td>
-          <td>{$forms.notificationForm.cron_spec.control} <a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.email} (*):</td>
-          <td>{$forms.notificationForm.email.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cc}:</td>
-          <td>{$forms.notificationForm.cc.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.subject}:</td>
-          <td>{$forms.notificationForm.subject.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.comment}:</td>
-          <td>{$forms.notificationForm.comment.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.condition}:</td>
-          <td>{$forms.notificationForm.report_condition.control} <a href="https://www.anuko.com/lp/tt_9.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.notificationForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.notificationForm.close}
diff --git a/WEB-INF/templates/notification_edit2.tpl b/WEB-INF/templates/notification_edit2.tpl
new file mode 100644
index 000000000..1a0967cc6
--- /dev/null
+++ b/WEB-INF/templates/notification_edit2.tpl
@@ -0,0 +1,59 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+
+{$forms.notificationForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="fav_report">{$i18n.label.fav_report} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="fav_report">{$i18n.label.fav_report} (*):</label></td>
+    <td class="td-with-input">{$forms.notificationForm.fav_report.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cron_spec">{$i18n.label.schedule} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cron_spec">{$i18n.label.schedule} (*):</label></td>
+    <td class="td-with-input">{$forms.notificationForm.cron_spec.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_6.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="email">{$i18n.label.email} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="email">{$i18n.label.email} (*):</label></td>
+    <td class="td-with-input">{$forms.notificationForm.email.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cc">{$i18n.label.cc}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cc">{$i18n.label.cc}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.cc.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="subject">{$i18n.label.subject}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="subject">{$i18n.label.subject}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.subject.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="comment">{$i18n.label.comment}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="comment">{$i18n.label.comment}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.comment.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="report_condition">{$i18n.label.condition}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="report_condition">{$i18n.label.condition}:</label></td>
+    <td class="td-with-input">{$forms.notificationForm.report_condition.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_9.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_9.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.notificationForm.btn_submit.control}</div>
+{$forms.notificationForm.close}
diff --git a/initialize.php b/initialize.php
index 95dd0b39d..84fbb24b3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5487");
+define("APP_VERSION", "1.19.28.5488");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/notification_delete.php b/notification_delete.php
index 93820427c..741826c03 100644
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -51,5 +51,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.notificationDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_notification'));
-$smarty->assign('content_page_name', 'notification_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'notification_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/notification_edit.php b/notification_edit.php
index 3043bd8a6..43dbabcff 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -61,17 +61,16 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$notification_id));
 $form->addInput(array('type'=>'combobox',
   'name'=>'fav_report',
-  'style'=>'width: 250px;',
   'value'=>$cl_fav_report_id,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.select'))));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','style'=>'width: 250px;','value'=>$cl_cron_spec));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
-$form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
-$form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','value'=>$cl_cron_spec));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
+$form->addInput(array('type'=>'text','name'=>'cc','value'=>$cl_cc));
+$form->addInput(array('type'=>'text','name'=>'subject','value'=>$cl_subject));
 $form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_comment));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','value'=>$cl_report_condition));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
@@ -107,5 +106,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_notification'));
-$smarty->assign('content_page_name', 'notification_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'notification_edit2.tpl');
+$smarty->display('index2.tpl');

From 13eb03fdd263cf11bfe5c9b300205eb53ab81a26 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 27 Apr 2021 19:59:57 +0000
Subject: [PATCH 1501/1848] Made notifications.php mobile friendly.

---
 WEB-INF/templates/notifications.tpl  | 36 ----------------------------
 WEB-INF/templates/notifications2.tpl | 28 ++++++++++++++++++++++
 initialize.php                       |  2 +-
 notifications.php                    |  4 ++--
 4 files changed, 31 insertions(+), 39 deletions(-)
 delete mode 100644 WEB-INF/templates/notifications.tpl
 create mode 100644 WEB-INF/templates/notifications2.tpl

diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
deleted file mode 100644
index d54579027..000000000
--- a/WEB-INF/templates/notifications.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{$forms.notificationsForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $user->can('manage_advanced_settings')}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.schedule}</td>
-          <td class="tableHeader">{$i18n.label.email}</td>
-          <td class="tableHeader">{$i18n.label.condition}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {if $notifications}
-    {foreach $notifications as $notification}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$notification['name']|escape}</td>
-          <td>{$notification['cron_spec']|escape}</td>
-          <td>{$notification['email']|escape}</td>
-          <td>{$notification['report_condition']|escape}</td>
-          <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.notificationsForm.btn_add.control}</td></tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.notificationsForm.close}
diff --git a/WEB-INF/templates/notifications2.tpl b/WEB-INF/templates/notifications2.tpl
new file mode 100644
index 000000000..a1be398ea
--- /dev/null
+++ b/WEB-INF/templates/notifications2.tpl
@@ -0,0 +1,28 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.notificationsForm.open}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.schedule}</th>
+    <th>{$i18n.label.email}</th>
+    <th>{$i18n.label.condition}</th>
+    <th></th>
+    <th></th>
+  </tr>
+{if $notifications}
+  {foreach $notifications as $notification}
+  <tr>
+    <td class="text-cell">{$notification['name']|escape}</td>
+    <td class="text-cell">{$notification['cron_spec']|escape}</td>
+    <td class="text-cell">{$notification['email']|escape}</td>
+    <td class="text-cell">{$notification['report_condition']|escape}</td>
+    <td><a href="notification_edit.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="notification_delete.php?id={$notification['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+{/if}
+</table>
+<div class="button-set">{$forms.notificationsForm.btn_add.control}</div>
+{$forms.notificationsForm.close}
diff --git a/initialize.php b/initialize.php
index 84fbb24b3..685ceaf3d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5488");
+define("APP_VERSION", "1.19.28.5489");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/notifications.php b/notifications.php
index 5945320ef..23d1feb16 100644
--- a/notifications.php
+++ b/notifications.php
@@ -40,5 +40,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('notifications', $notifications);
 $smarty->assign('title', $i18n->get('title.notifications'));
-$smarty->assign('content_page_name', 'notifications.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'notifications2.tpl');
+$smarty->display('index2.tpl');

From 4d15fb0ace9b097e76156a726fe8b7473b349c9d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Apr 2021 14:35:41 +0000
Subject: [PATCH 1502/1848] Made plugins.php mobile friendly.

---
 WEB-INF/templates/plugins.tpl  | 182 -----------------------------
 WEB-INF/templates/plugins2.tpl | 205 +++++++++++++++++++++++++++++++++
 initialize.php                 |   2 +-
 plugins.php                    |   4 +-
 4 files changed, 208 insertions(+), 185 deletions(-)
 delete mode 100644 WEB-INF/templates/plugins.tpl
 create mode 100644 WEB-INF/templates/plugins2.tpl

diff --git a/WEB-INF/templates/plugins.tpl b/WEB-INF/templates/plugins.tpl
deleted file mode 100644
index 6de5ede7b..000000000
--- a/WEB-INF/templates/plugins.tpl
+++ /dev/null
@@ -1,182 +0,0 @@
-<script>
-// handlePluginCheckboxes - controls visibility of controls.
-function handlePluginCheckboxes() {
-  var clientsCheckbox = document.getElementById("clients");
-  var invoicesCheckbox = document.getElementById("invoices");
-  var requiredCheckbox = document.getElementById("client_required");
-  var requiredLabel = document.getElementById("client_required_label");
-  if (clientsCheckbox.checked) {
-    requiredCheckbox.style.visibility = "visible";
-    requiredLabel.style.visibility = "visible";
-    invoicesCheckbox.disabled = false;
-  } else {
-    requiredCheckbox.checked = false;
-    requiredCheckbox.style.visibility = "hidden";
-    requiredLabel.style.visibility = "hidden";
-    invoicesCheckbox.checked = false;
-    invoicesCheckbox.disabled = true;
-  }
-
-  var expensesCheckbox = document.getElementById("expenses");
-  var taxCheckbox = document.getElementById("tax_expenses");
-  var taxLabel = document.getElementById("tax_label");
-  if (expensesCheckbox.checked) {
-    taxCheckbox.style.visibility = "visible";
-    taxLabel.style.visibility = "visible";
-  } else {
-    taxCheckbox.checked = false;
-    taxCheckbox.style.visibility = "hidden";
-    taxLabel.style.visibility = "hidden";
-  }
-  var configureLabel = document.getElementById("expenses_conf");
-  var docLabel = null;
-  if (expensesCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var customFieldsCheckbox = document.getElementById("custom_fields");
-  configureLabel = document.getElementById("cf_conf");
-  if (customFieldsCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var notificationsCheckbox = document.getElementById("notifications");
-  configureLabel = document.getElementById("notifications_conf");
-  docLabel = document.getElementById("notifications_doc");
-  if (notificationsCheckbox.checked) {
-    configureLabel.style.display = "";
-    docLabel.style.display = "none";
-  } else {
-    configureLabel.style.display = "none";
-    docLabel.style.display = "";
-  }
-
-  var lockingCheckbox = document.getElementById("locking");
-  configureLabel = document.getElementById("locking_conf");
-  if (lockingCheckbox.checked) {
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var quotasCheckbox = document.getElementById("quotas");
-  configureLabel = document.getElementById("quotas_conf");
-  if (quotasCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var weekViewCheckbox = document.getElementById("week_view");
-  configureLabel = document.getElementById("week_view_conf");
-  if (weekViewCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var workUnitsCheckbox = document.getElementById("work_units");
-  configureLabel = document.getElementById("work_units_conf");
-  if (workUnitsCheckbox.checked){
-    configureLabel.style.visibility = "visible";
-  } else {
-    configureLabel.style.visibility = "hidden";
-  }
-
-  var templatesCheckbox = document.getElementById("templates");
-  configureLabel = document.getElementById("templates_conf");
-  docLabel = document.getElementById("templates_doc");
-  if (templatesCheckbox.checked){
-    configureLabel.style.display = "";
-    docLabel.style.display = "none";
-  } else {
-    configureLabel.style.display = "none";
-    docLabel.style.display = "";
-  }
-}
-</script>
-
-{$forms.pluginsForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-    <tr>
-      <td>
-        <table cellspacing="1" cellpadding="2" border="0">
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.charts.control}</td>
-            <td><label for="charts">{$i18n.title.charts}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.clients.control}</td>
-            <td><label for="clients">{$i18n.title.clients}</label> {$forms.pluginsForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.invoices.control}</td>
-            <td><label for="invoices">{$i18n.title.invoices}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.paid_status.control}</td>
-            <td><label for="paid_status">{$i18n.label.paid_status}</label></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.custom_fields.control}</td>
-            <td><label for="custom_fields">{$i18n.label.custom_fields}</label> <span id="cf_conf">{if $user->isPluginEnabled('cf')}<a href="cf_custom_fields.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.expenses.control}</td>
-            <td><label for="expenses">{$i18n.title.expenses}</label> {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_conf">{if $user->isPluginEnabled('ex')}<a href="predefined_expenses.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.notifications.control}</td>
-            <td><label for="notifications">{$i18n.title.notifications}</label> <span id="notifications_doc"><a href="https://www.anuko.com/lp/tt_45.htm" target="_blank">{$i18n.label.what_is_it}</a></span><span id="notifications_conf">{if $user_exists && $user->isPluginEnabled('no')}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.locking.control}</td>
-            <td><label for="locking">{$i18n.title.locking}</label> <span id="locking_conf">{if $user->isPluginEnabled('lk')}<a href="locking.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.quotas.control}</td>
-            <td><label for="quotas">{$i18n.label.monthly_quotas}</label> <span id="quotas_conf">{if $user->isPluginEnabled('mq')}<a href="quotas.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.week_view.control}</td>
-            <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_conf">{if $user->isPluginEnabled('wv')}<a href="week_view.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.work_units.control}</td>
-            <td><label for="work_units">{$i18n.label.work_units}</label> <span id="work_units_conf">{if $user->isPluginEnabled('wu')}<a href="work_units.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.approval.control}</td>
-            <td><label for="approval">{$i18n.label.approval}</label> <a href="https://www.anuko.com/lp/tt_28.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
-            <td><label for="timesheets">{$i18n.title.timesheets}</label> <a href="https://www.anuko.com/lp/tt_30.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
-            <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span> <span id="templates_conf">{if $user->isPluginEnabled('tp')}<a href="templates.php">{$i18n.label.configure}</a>{/if}</span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.attachments.control}</td>
-            <td><label for="attachments">{$i18n.label.attachments}</label> <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$forms.pluginsForm.work.control}</td>
-            <td><label for="work">{$i18n.title.work}</label> <span id="work_doc"><a href="https://www.anuko.com/lp/tt_34.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="2" height="50" align="center">{$forms.pluginsForm.btn_save.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-</table>
-{$forms.pluginsForm.close}
diff --git a/WEB-INF/templates/plugins2.tpl b/WEB-INF/templates/plugins2.tpl
new file mode 100644
index 000000000..370c93c59
--- /dev/null
+++ b/WEB-INF/templates/plugins2.tpl
@@ -0,0 +1,205 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+// handlePluginCheckboxes - controls visibility of controls.
+function handlePluginCheckboxes() {
+  var clientsCheckbox = document.getElementById("clients");
+  var invoicesCheckbox = document.getElementById("invoices");
+  var requiredCheckbox = document.getElementById("client_required");
+  var requiredLabel = document.getElementById("client_required_label");
+  if (clientsCheckbox.checked) {
+    requiredCheckbox.style.visibility = "visible";
+    requiredLabel.style.visibility = "visible";
+    invoicesCheckbox.disabled = false;
+  } else {
+    requiredCheckbox.checked = false;
+    requiredCheckbox.style.visibility = "hidden";
+    requiredLabel.style.visibility = "hidden";
+    invoicesCheckbox.checked = false;
+    invoicesCheckbox.disabled = true;
+  }
+
+  var expensesCheckbox = document.getElementById("expenses");
+  var taxCheckbox = document.getElementById("tax_expenses");
+  var taxLabel = document.getElementById("tax_label");
+  if (expensesCheckbox.checked) {
+    taxCheckbox.style.visibility = "visible";
+    taxLabel.style.visibility = "visible";
+  } else {
+    taxCheckbox.checked = false;
+    taxCheckbox.style.visibility = "hidden";
+    taxLabel.style.visibility = "hidden";
+  }
+  var configureLabel = document.getElementById("expenses_conf");
+  var docLabel = null;
+  if (expensesCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var customFieldsCheckbox = document.getElementById("custom_fields");
+  configureLabel = document.getElementById("cf_conf");
+  if (customFieldsCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var notificationsCheckbox = document.getElementById("notifications");
+  configureLabel = document.getElementById("notifications_conf");
+  docLabel = document.getElementById("notifications_doc");
+  if (notificationsCheckbox.checked) {
+    configureLabel.style.display = "";
+    docLabel.style.display = "none";
+  } else {
+    configureLabel.style.display = "none";
+    docLabel.style.display = "";
+  }
+
+  var lockingCheckbox = document.getElementById("locking");
+  configureLabel = document.getElementById("locking_conf");
+  if (lockingCheckbox.checked) {
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var quotasCheckbox = document.getElementById("quotas");
+  configureLabel = document.getElementById("quotas_conf");
+  if (quotasCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var weekViewCheckbox = document.getElementById("week_view");
+  configureLabel = document.getElementById("week_view_conf");
+  if (weekViewCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var workUnitsCheckbox = document.getElementById("work_units");
+  configureLabel = document.getElementById("work_units_conf");
+  if (workUnitsCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
+
+  var templatesCheckbox = document.getElementById("templates");
+  configureLabel = document.getElementById("templates_conf");
+  docLabel = document.getElementById("templates_doc");
+  if (templatesCheckbox.checked){
+    configureLabel.style.display = "";
+    docLabel.style.display = "none";
+  } else {
+    configureLabel.style.display = "none";
+    docLabel.style.display = "";
+  }
+}
+</script>
+
+{$forms.pluginsForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="charts">{$i18n.title.charts}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="charts">{$i18n.title.charts}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.charts.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="clients">{$i18n.title.clients}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="clients">{$i18n.title.clients}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.clients.control} {$forms.pluginsForm.client_required.control} <span id="client_required_label"><label for="client_required">{$i18n.label.required}</label></span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="invoices">{$i18n.title.invoices}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="invoices">{$i18n.title.invoices}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.invoices.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="paid_status">{$i18n.label.paid_status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="paid_status">{$i18n.label.paid_status}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.paid_status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="custom_fields">{$i18n.label.custom_fields}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="custom_fields">{$i18n.label.custom_fields}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.custom_fields.control} <span id="cf_conf">{if $user->isPluginEnabled('cf')}<a href="cf_custom_fields.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr class = "small-screen-label"><td><label for="expenses">{$i18n.title.expenses}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="expenses">{$i18n.title.expenses}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.expenses.control} {$forms.pluginsForm.tax_expenses.control} <span id="tax_label"><label for="tax_expenses">{$i18n.label.tax}</label></span> <span id="expenses_conf">{if $user->isPluginEnabled('ex')}<a href="predefined_expenses.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="notifications">{$i18n.title.notifications}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="notifications">{$i18n.title.notifications}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.notifications.control} <span id="notifications_doc"><a href="https://www.anuko.com/lp/tt_45.htm" target="_blank">{$i18n.label.what_is_it}</a></span><span id="notifications_conf">{if $user_exists && $user->isPluginEnabled('no')}<a href="notifications.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="locking">{$i18n.title.locking}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="locking">{$i18n.title.locking}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.locking.control} <span id="locking_conf">{if $user->isPluginEnabled('lk')}<a href="locking.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="quotas">{$i18n.label.monthly_quotas}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="quotas">{$i18n.label.monthly_quotas}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.quotas.control} <span id="quotas_conf">{if $user->isPluginEnabled('mq')}<a href="quotas.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="week_view">{$i18n.label.week_view}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="week_view">{$i18n.label.week_view}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.week_view.control} <span id="week_view_conf">{if $user->isPluginEnabled('wv')}<a href="week_view.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="work_units">{$i18n.label.work_units}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="work_units">{$i18n.label.work_units}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.work_units.control} <span id="work_units_conf">{if $user->isPluginEnabled('wu')}<a href="work_units.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="approval">{$i18n.label.approval}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="approval">{$i18n.label.approval}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.approval.control} <a href="https://www.anuko.com/lp/tt_28.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="timesheets">{$i18n.title.timesheets}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="timesheets">{$i18n.title.timesheets}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.timesheets.control} <a href="https://www.anuko.com/lp/tt_30.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="templates">{$i18n.title.templates}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="templates">{$i18n.title.templates}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.templates.control} <span id="templates_doc"><a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></span> <span id="templates_conf">{if $user->isPluginEnabled('tp')}<a href="templates.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="attachments">{$i18n.label.attachments}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="attachments">{$i18n.label.attachments}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.attachments.control} <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="work">{$i18n.title.work}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="work">{$i18n.title.work}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.work.control} <span id="work_doc"><a href="https://www.anuko.com/lp/tt_34.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.pluginsForm.btn_save.control}</div>
+{$forms.pluginsForm.close}
diff --git a/initialize.php b/initialize.php
index 685ceaf3d..67ff18007 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5489");
+define("APP_VERSION", "1.19.28.5490");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins.php b/plugins.php
index 9b3bc1a27..730889bc0 100644
--- a/plugins.php
+++ b/plugins.php
@@ -141,5 +141,5 @@
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
 $smarty->assign('user_exists', $user->exists());
 $smarty->assign('title', $i18n->get('title.plugins'));
-$smarty->assign('content_page_name', 'plugins.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'plugins2.tpl');
+$smarty->display('index2.tpl');

From b3eba2ab830fa80bd26eb58a3120b9a015b12b53 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Apr 2021 16:18:20 +0000
Subject: [PATCH 1503/1848] Made predefined_expense_add.php mobile friendly.

---
 WEB-INF/templates/predefined_expense_add.tpl  | 26 -------------------
 WEB-INF/templates/predefined_expense_add2.tpl | 21 +++++++++++++++
 default.css                                   |  5 ++++
 initialize.php                                |  2 +-
 predefined_expense_add.php                    |  9 ++++---
 5 files changed, 32 insertions(+), 31 deletions(-)
 delete mode 100644 WEB-INF/templates/predefined_expense_add.tpl
 create mode 100644 WEB-INF/templates/predefined_expense_add2.tpl

diff --git a/WEB-INF/templates/predefined_expense_add.tpl b/WEB-INF/templates/predefined_expense_add.tpl
deleted file mode 100644
index fd2983a70..000000000
--- a/WEB-INF/templates/predefined_expense_add.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{$forms.predefinedExpenseForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.predefinedExpenseForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.predefinedExpenseForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.predefinedExpenseForm.close}
diff --git a/WEB-INF/templates/predefined_expense_add2.tpl b/WEB-INF/templates/predefined_expense_add2.tpl
new file mode 100644
index 000000000..5e7473848
--- /dev/null
+++ b/WEB-INF/templates/predefined_expense_add2.tpl
@@ -0,0 +1,21 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.predefinedExpenseForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.predefinedExpenseForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cost">{$i18n.label.cost} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cost">{$i18n.label.cost} (*):</label></td>
+    <td class="td-with-input">{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.predefinedExpenseForm.btn_add.control}</div>
+{$forms.predefinedExpenseForm.close}
diff --git a/default.css b/default.css
index 85ead1d9f..da59f9f5f 100644
--- a/default.css
+++ b/default.css
@@ -300,6 +300,11 @@ input[type="text"], input[type="password"], input[type="file"] {
   width: 220px;
 }
 
+/* text field input with an associated hint */
+input.text-field-with-hint[type="text"]  {
+  width: 136px;
+}
+
 /* project rate input control */
 input[type="text"].project-rate-field {
   width: 50px;
diff --git a/initialize.php b/initialize.php
index 67ff18007..86f184b68 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5490");
+define("APP_VERSION", "1.19.28.5491");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index e300fa43e..b3896585f 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -17,14 +17,15 @@
 }
 // End of access checks.
 
+$cl_name = $cl_cost = null;
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_cost = trim($request->getParameter('cost'));
 }
 
 $form = new Form('predefinedExpenseForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('class'=>'text-field-with-hint','type'=>'text','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -44,5 +45,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_predefined_expense'));
-$smarty->assign('content_page_name', 'predefined_expense_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'predefined_expense_add2.tpl');
+$smarty->display('index2.tpl');

From 5d1ee9ce5942920336ba71d2d441801c2dc8f13c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Apr 2021 16:49:48 +0000
Subject: [PATCH 1504/1848] Made all predefined_expense* pages mobile friendly.

---
 .../templates/predefined_expense_delete.tpl   | 18 -----------
 .../templates/predefined_expense_delete2.tpl  |  7 +++++
 WEB-INF/templates/predefined_expense_edit.tpl | 26 ----------------
 .../templates/predefined_expense_edit2.tpl    | 21 +++++++++++++
 WEB-INF/templates/predefined_expenses.tpl     | 30 -------------------
 WEB-INF/templates/predefined_expenses2.tpl    | 24 +++++++++++++++
 initialize.php                                |  2 +-
 predefined_expense_add.php                    |  2 +-
 predefined_expense_delete.php                 |  4 +--
 predefined_expense_edit.php                   |  8 ++---
 predefined_expenses.php                       |  4 +--
 11 files changed, 62 insertions(+), 84 deletions(-)
 delete mode 100644 WEB-INF/templates/predefined_expense_delete.tpl
 create mode 100644 WEB-INF/templates/predefined_expense_delete2.tpl
 delete mode 100644 WEB-INF/templates/predefined_expense_edit.tpl
 create mode 100644 WEB-INF/templates/predefined_expense_edit2.tpl
 delete mode 100644 WEB-INF/templates/predefined_expenses.tpl
 create mode 100644 WEB-INF/templates/predefined_expenses2.tpl

diff --git a/WEB-INF/templates/predefined_expense_delete.tpl b/WEB-INF/templates/predefined_expense_delete.tpl
deleted file mode 100644
index e91692f4c..000000000
--- a/WEB-INF/templates/predefined_expense_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.predefinedExpenseDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$predefined_expense_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.predefinedExpenseDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.predefinedExpenseDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.predefinedExpenseDeleteForm.close}
diff --git a/WEB-INF/templates/predefined_expense_delete2.tpl b/WEB-INF/templates/predefined_expense_delete2.tpl
new file mode 100644
index 000000000..23a7193c8
--- /dev/null
+++ b/WEB-INF/templates/predefined_expense_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.predefinedExpenseDeleteForm.open}
+<div class="section-header">{$predefined_expense_to_delete|escape}</div>
+<div class="button-set">{$forms.predefinedExpenseDeleteForm.btn_delete.control}&nbsp;{$forms.predefinedExpenseDeleteForm.btn_cancel.control}</div>
+{$forms.predefinedExpenseDeleteForm.close}
diff --git a/WEB-INF/templates/predefined_expense_edit.tpl b/WEB-INF/templates/predefined_expense_edit.tpl
deleted file mode 100644
index f53b512ad..000000000
--- a/WEB-INF/templates/predefined_expense_edit.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{$forms.predefinedExpenseForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.predefinedExpenseForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.cost} (*):</td>
-          <td>{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
-        </tr>
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.predefinedExpenseForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.predefinedExpenseForm.close}
diff --git a/WEB-INF/templates/predefined_expense_edit2.tpl b/WEB-INF/templates/predefined_expense_edit2.tpl
new file mode 100644
index 000000000..06af4a315
--- /dev/null
+++ b/WEB-INF/templates/predefined_expense_edit2.tpl
@@ -0,0 +1,21 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.predefinedExpenseForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.predefinedExpenseForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="cost">{$i18n.label.cost} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="cost">{$i18n.label.cost} (*):</label></td>
+    <td class="td-with-input">{$forms.predefinedExpenseForm.cost.control} {$user->getCurrency()|escape}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+</table>
+<div class="button-set">{$forms.predefinedExpenseForm.btn_submit.control}</div>
+{$forms.predefinedExpenseForm.close}
diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
deleted file mode 100644
index d35fac0b4..000000000
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{$forms.predefinedExpensesForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.label.cost}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {if $predefined_expenses}
-    {foreach $predefined_expenses as $predefined_expense}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$predefined_expense['name']|escape}</td>
-          <td>{$predefined_expense['cost']|escape}</td>
-          <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.predefinedExpensesForm.btn_add.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.predefinedExpensesForm.close}
diff --git a/WEB-INF/templates/predefined_expenses2.tpl b/WEB-INF/templates/predefined_expenses2.tpl
new file mode 100644
index 000000000..c0d45af9e
--- /dev/null
+++ b/WEB-INF/templates/predefined_expenses2.tpl
@@ -0,0 +1,24 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.predefinedExpensesForm.open}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.cost}</th>
+    <th></th>
+    <th></th>
+  </tr>
+{if $predefined_expenses}
+  {foreach $predefined_expenses as $predefined_expense}
+  <tr>
+    <td class="text-cell">{$predefined_expense['name']|escape}</td>
+    <td class="money-value-cell">{$predefined_expense['cost']|escape}</td>
+    <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="predefined_expense_delete.php?id={$predefined_expense['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+{/if}
+</table>
+<div class="button-set">{$forms.predefinedExpensesForm.btn_add.control}</div>
+{$forms.predefinedExpensesForm.close}
diff --git a/initialize.php b/initialize.php
index 86f184b68..e8f76c489 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5491");
+define("APP_VERSION", "1.19.28.5492");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index b3896585f..8cac318f1 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -25,7 +25,7 @@
 
 $form = new Form('predefinedExpenseForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
-$form->addInput(array('class'=>'text-field-with-hint','type'=>'text','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
+$form->addInput(array('type'=>'text','class'=>'text-field-with-hint','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index e965b0be2..26b726fc1 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -48,5 +48,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.predefinedExpenseDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_predefined_expense'));
-$smarty->assign('content_page_name', 'predefined_expense_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'predefined_expense_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index 1eca3a2c7..d1b557553 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -33,8 +33,8 @@
 
 $form = new Form('predefinedExpenseForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$predefined_expense_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','class'=>'text-field-with-hint','maxlength'=>'40','name'=>'cost','value'=>$cl_cost));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
@@ -55,5 +55,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_predefined_expense'));
-$smarty->assign('content_page_name', 'predefined_expense_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'predefined_expense_edit2.tpl');
+$smarty->display('index2.tpl');
diff --git a/predefined_expenses.php b/predefined_expenses.php
index 9f94bd1cc..c44aee27b 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -33,5 +33,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('predefined_expenses', $predefinedExpenses);
 $smarty->assign('title', $i18n->get('title.predefined_expenses'));
-$smarty->assign('content_page_name', 'predefined_expenses.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'predefined_expenses2.tpl');
+$smarty->display('index2.tpl');

From 0c78f71bded9c920746b8012ab88541f63795930 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Apr 2021 17:12:00 +0000
Subject: [PATCH 1505/1848] Made profile_edit.php mobile friendly.

---
 WEB-INF/templates/profile_edit.tpl  | 43 -----------------------------
 WEB-INF/templates/profile_edit2.tpl | 43 +++++++++++++++++++++++++++++
 initialize.php                      |  2 +-
 profile_edit.php                    |  5 ++--
 4 files changed, 47 insertions(+), 46 deletions(-)
 delete mode 100644 WEB-INF/templates/profile_edit.tpl
 create mode 100644 WEB-INF/templates/profile_edit2.tpl

diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
deleted file mode 100644
index 1fb040005..000000000
--- a/WEB-INF/templates/profile_edit.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{$forms.profileForm.open}
-
-<table cellspacing="4" cellpadding="7" border="0">
-    <tr>
-      <td>
-        <table cellspacing="1" cellpadding="2" border="0">
-          <tr>
-            <td align="right" nowrap>{$i18n.label.person_name} (*):</td>
-            <td>{$forms.profileForm.name.control}</td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.login} (*):</td>
-            <td>{$forms.profileForm.login.control}</td>
-          </tr>
-{if !$auth_external}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.password} (*):</td>
-            <td>{$forms.profileForm.password1.control}</td>
-          </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-            <td>{$forms.profileForm.password2.control}</td>
-          </tr>
-{/if}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.email}:</td>
-            <td>{$forms.profileForm.email.control}</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.profileForm.btn_save.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-</table>
-{$forms.profileForm.close}
diff --git a/WEB-INF/templates/profile_edit2.tpl b/WEB-INF/templates/profile_edit2.tpl
new file mode 100644
index 000000000..772172485
--- /dev/null
+++ b/WEB-INF/templates/profile_edit2.tpl
@@ -0,0 +1,43 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.profileForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.person_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.person_name} (*):</label></td>
+    <td class="td-with-input">{$forms.profileForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login} (*):</label></td>
+    <td class="td-with-input">{$forms.profileForm.login.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if !$auth_external}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password1">{$i18n.label.password}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password1">{$i18n.label.password}:</label></td>
+    <td class="td-with-input">{$forms.profileForm.password1.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password2">{$i18n.label.confirm_password}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="password2">{$i18n.label.confirm_password}:</label></td>
+    <td class="td-with-input">{$forms.profileForm.password2.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="email">{$i18n.label.email}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="email">{$i18n.label.email}:</label></td>
+    <td class="td-with-input">{$forms.profileForm.email.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.profileForm.btn_save.control}</div>
+{$forms.profileForm.close}
diff --git a/initialize.php b/initialize.php
index e8f76c489..3e27129ac 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5492");
+define("APP_VERSION", "1.19.28.5493");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/profile_edit.php b/profile_edit.php
index 26091823f..f85473fe4 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -22,6 +22,7 @@
 if ($user->behalf_id) $user_details = $user->getUserDetails($user->behalf_id);
 $current_login = $user->behalf_id ? $user_details['login'] : $user->login;
 
+$cl_name = $cl_login = $cl_password1 = $cl_password2 = $cl_email = null;
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_login = trim($request->getParameter('login'));
@@ -86,5 +87,5 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.profile'));
-$smarty->assign('content_page_name', 'profile_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'profile_edit2.tpl');
+$smarty->display('index2.tpl');

From 637d9472cfd46f74f058a6b2c0dc5ca19cb5a965 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Apr 2021 22:11:45 +0000
Subject: [PATCH 1506/1848] Made quotas.php mobile friendly.

---
 WEB-INF/templates/quotas.tpl  | 60 -----------------------------------
 WEB-INF/templates/quotas2.tpl | 50 +++++++++++++++++++++++++++++
 default.css                   | 15 +++++++++
 initialize.php                |  2 +-
 quotas.php                    | 10 +++---
 rtl.css                       |  4 +++
 6 files changed, 75 insertions(+), 66 deletions(-)
 delete mode 100644 WEB-INF/templates/quotas.tpl
 create mode 100644 WEB-INF/templates/quotas2.tpl

diff --git a/WEB-INF/templates/quotas.tpl b/WEB-INF/templates/quotas.tpl
deleted file mode 100644
index 1dba4f239..000000000
--- a/WEB-INF/templates/quotas.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr><td valign="top">{$i18n.form.quota.hint}</td></tr>
-</table>
-
-{$forms.monthlyQuotasForm.open}
-<div style="padding: 0 0 10 0">
-  <table border="0" class="divider">
-    <tr>
-      <td align="center">
-        <table>
-          <tr>
-            <td>{$i18n.form.quota.workday_hours}:</td>
-            <td>{$forms.monthlyQuotasForm.workdayHours.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</div>
-<table>
-  <tr>
-    <td>{$i18n.form.quota.year}:</td>
-    <td>{$forms.monthlyQuotasForm.year.control}</td>
-  </tr>
-  <tr><td>&nbsp;</td></tr>
-  <tr>
-    <td colspan="2">
-      <table>
-        <tr>
-          <td class="tableHeaderCentered">{$i18n.form.quota.month}</td>
-          <td class="tableHeaderCentered">{$i18n.label.quota}</td>
-        </tr>
-{foreach $months as $month}
-        <tr>
-          <td>{$month}:</td>
-          <td>{$forms.monthlyQuotasForm.$month.control}</td>
-        </tr>
-{/foreach}
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr><td colspan="2" style="text-align:center;"><input type="submit" name="btn_submit" value="{$i18n.button.save}"></td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.monthlyQuotasForm.close}
-
-<script>
-function yearChange(value){
-  var url = window.location.href;
-
-  if (url.indexOf('?') > 0){
-    var parameter = url.substring(url.indexOf('?') + 1, url.length);
-    url = url.replace(parameter, 'year=' + value);
-  } else {
-    url = '?year=' + value;
-  }
-
-  window.location = url;
-}
-</script>
diff --git a/WEB-INF/templates/quotas2.tpl b/WEB-INF/templates/quotas2.tpl
new file mode 100644
index 000000000..625fb6d9b
--- /dev/null
+++ b/WEB-INF/templates/quotas2.tpl
@@ -0,0 +1,50 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<div class="page-hint">{$i18n.form.quota.hint}</div>
+
+{$forms.monthlyQuotasForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="workdayHours">{$i18n.form.quota.workday_hours}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="workdayHours">{$i18n.form.quota.workday_hours}:</label></td>
+    <td class="td-with-input">{$forms.monthlyQuotasForm.workdayHours.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="year">{$i18n.form.quota.year}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="year">{$i18n.form.quota.year}:</label></td>
+    <td class="td-with-input">{$forms.monthlyQuotasForm.year.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="form-control-separator"></div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.form.quota.month}</th>
+    <th>{$i18n.label.quota}</th>
+  </tr>
+{foreach $months as $month}
+  <tr>
+    <td class="label-cell">{$month}:</td>
+    <td>{$forms.monthlyQuotasForm.$month.control}</td>
+  </tr>
+{/foreach}
+</table>
+<div class="button-set"><input type="submit" name="btn_submit" value="{$i18n.button.save}"</div>
+{$forms.monthlyQuotasForm.close}
+
+<script>
+function yearChange(value){
+  var url = window.location.href;
+
+  if (url.indexOf('?') > 0){
+    var parameter = url.substring(url.indexOf('?') + 1, url.length);
+    url = url.replace(parameter, 'year=' + value);
+  } else {
+    url = '?year=' + value;
+  }
+
+  window.location = url;
+}
+</script>
diff --git a/default.css b/default.css
index da59f9f5f..6f64eea5c 100644
--- a/default.css
+++ b/default.css
@@ -190,6 +190,11 @@ div.page-hint {
   text-align: right;
 }
 
+/* cell containing text labels */
+.label-cell {
+  text-align: right;
+}
+
 /* control labels for large screens */
 .large-screen-label {
   text-align: right;
@@ -310,6 +315,11 @@ input[type="text"].project-rate-field {
   width: 50px;
 }
 
+/* project rate input control */
+input[type="text"].quota-field {
+  width: 70px;
+}
+
 /* dropdown control */
 .dropdown-field {
   width: 236px;
@@ -325,6 +335,11 @@ input[type="text"].project-rate-field {
   width: 136px;
 }
 
+/* a short dropdown control for small strings */
+.dropdown-field-short {
+  width: 85px;
+}
+
 /* textareas for fields */
 #description, #address, #item_name, #comment, #custom_css {
   width: 220px;
diff --git a/initialize.php b/initialize.php
index 3e27129ac..41719a786 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5493");
+define("APP_VERSION", "1.19.28.5494");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/quotas.php b/quotas.php
index 95eb894bf..c49fbf1f7 100644
--- a/quotas.php
+++ b/quotas.php
@@ -92,8 +92,8 @@
 $workdayHours = ttTimeHelper::toAbsDuration($user->getWorkdayMinutes(), true);
 
 $form = new Form('monthlyQuotasForm');
-$form->addInput(array('type'=>'text', 'name'=>'workdayHours', 'value'=>$workdayHours, 'style'=>'width:60px'));
-$form->addInput(array('type'=>'combobox','name'=>'year','data'=>$years,'datakeys'=>array('id','name'),'value'=>$selectedYear,'onchange'=>'yearChange(this.value);'));
+$form->addInput(array('type'=>'text','class'=>'quota-field','name'=>'workdayHours','value'=>$workdayHours));
+$form->addInput(array('type'=>'combobox','class'=>'dropdown-field-short','name'=>'year','data'=>$years,'datakeys'=>array('id','name'),'value'=>$selectedYear,'onchange'=>'yearChange(this.value);'));
 for ($i=0; $i < count($months); $i++) { 
   $value = "";
   if (array_key_exists($i+1, $monthsData)){
@@ -101,11 +101,11 @@
     $value = ttTimeHelper::toAbsDuration($value, true);
   }
   $name = $months[$i];
-  $form->addInput(array('type'=>'text','name'=>$name,'maxlength'=>6,'value'=> $value,'style'=>'width:70px'));
+  $form->addInput(array('type'=>'text','class'=>'quota-field','name'=>$name,'maxlength'=>6,'value'=> $value));
 }
 
 $smarty->assign('months', $months);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.monthly_quotas'));
-$smarty->assign('content_page_name', 'quotas.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'quotas2.tpl');
+$smarty->display('index2.tpl');
diff --git a/rtl.css b/rtl.css
index e85b8b5e5..310ab1e25 100644
--- a/rtl.css
+++ b/rtl.css
@@ -44,6 +44,10 @@ html {
   text-align: left;
 }
 
+.label-cell {
+  text-align: left;
+}
+
 th.invoice-label {
   text-align: left;
 }

From e96745aebafe236a065494bcf1882f67a92a04e3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Apr 2021 12:18:38 +0000
Subject: [PATCH 1507/1848] Made work_units.php mobile friendly.

---
 WEB-INF/templates/quotas2.tpl     |  1 -
 WEB-INF/templates/work_units.tpl  | 22 -------------------
 WEB-INF/templates/work_units2.tpl | 35 +++++++++++++++++++++++++++++++
 default.css                       |  5 +++++
 initialize.php                    |  2 +-
 work_units.php                    |  8 +++----
 6 files changed, 45 insertions(+), 28 deletions(-)
 delete mode 100644 WEB-INF/templates/work_units.tpl
 create mode 100644 WEB-INF/templates/work_units2.tpl

diff --git a/WEB-INF/templates/quotas2.tpl b/WEB-INF/templates/quotas2.tpl
index 625fb6d9b..1c38bb322 100644
--- a/WEB-INF/templates/quotas2.tpl
+++ b/WEB-INF/templates/quotas2.tpl
@@ -2,7 +2,6 @@
 License: See license.txt *}
 
 <div class="page-hint">{$i18n.form.quota.hint}</div>
-
 {$forms.monthlyQuotasForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="workdayHours">{$i18n.form.quota.workday_hours}:</label></td></tr>
diff --git a/WEB-INF/templates/work_units.tpl b/WEB-INF/templates/work_units.tpl
deleted file mode 100644
index a4fb6b578..000000000
--- a/WEB-INF/templates/work_units.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{$forms.workUnitsForm.open}
-<table cellspacing="1" cellpadding="2" border="0">
-  <tr>
-    <td>{$i18n.form.work_units.minutes_in_unit}:</td>
-    <td>{$forms.workUnitsForm.minutes_in_unit.control} <a href="https://www.anuko.com/lp/tt_23.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td>{$i18n.form.work_units.1st_unit_threshold}:</td>
-    <td>{$forms.workUnitsForm.1st_unit_threshold.control} <a href="https://www.anuko.com/lp/tt_24.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td align="right" nowrap>{$i18n.label.totals_only}:</td>
-    <td>{$forms.workUnitsForm.totals_only.control} <a href="https://www.anuko.com/lp/tt_25.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2" height="50" align="center">{$forms.workUnitsForm.btn_save.control}</td>
-  </tr>
-</table>
-{$forms.weekViewForm.close}
diff --git a/WEB-INF/templates/work_units2.tpl b/WEB-INF/templates/work_units2.tpl
new file mode 100644
index 000000000..a2b5626f5
--- /dev/null
+++ b/WEB-INF/templates/work_units2.tpl
@@ -0,0 +1,35 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.workUnitsForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="minutes_in_unit">{$i18n.form.work_units.minutes_in_unit}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="minutes_in_unit">{$i18n.form.work_units.minutes_in_unit}:</label></td>
+    <td class="td-with-input">{$forms.workUnitsForm.minutes_in_unit.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_23.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_23.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="1st_unit_threshold">{$i18n.form.work_units.1st_unit_threshold}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="1st_unit_threshold">{$i18n.form.work_units.1st_unit_threshold}:</label></td>
+    <td class="td-with-input">{$forms.workUnitsForm.1st_unit_threshold.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_24.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_24.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="totals_only">{$i18n.label.totals_only}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="totals_only">{$i18n.label.totals_only}:</label></td>
+    <td class="td-with-input">{$forms.workUnitsForm.totals_only.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_25.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_25.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.workUnitsForm.btn_save.control}</div>
+{$forms.workUnitsForm.close}
diff --git a/default.css b/default.css
index 6f64eea5c..3b59185c4 100644
--- a/default.css
+++ b/default.css
@@ -320,6 +320,11 @@ input[type="text"].quota-field {
   width: 70px;
 }
 
+/* project rate input control */
+input[type="text"].short-text-field {
+  width: 40px;
+}
+
 /* dropdown control */
 .dropdown-field {
   width: 236px;
diff --git a/initialize.php b/initialize.php
index 41719a786..e38c689a6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5494");
+define("APP_VERSION", "1.19.28.5495");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/work_units.php b/work_units.php
index 826f899ab..ab2ac81af 100644
--- a/work_units.php
+++ b/work_units.php
@@ -30,8 +30,8 @@
 }
 
 $form = new Form('workUnitsForm');
-$form->addInput(array('type'=>'text', 'name'=>'minutes_in_unit', 'value'=>$cl_minutes_in_unit, 'style'=>'width:40px'));
-$form->addInput(array('type'=>'text', 'name'=>'1st_unit_threshold', 'value'=>$cl_1st_unit_threshold, 'style'=>'width:40px'));
+$form->addInput(array('type'=>'text','class'=>'short-text-field','name'=>'minutes_in_unit', 'value'=>$cl_minutes_in_unit));
+$form->addInput(array('type'=>'text','class'=>'short-text-field','name'=>'1st_unit_threshold', 'value'=>$cl_1st_unit_threshold));
 $form->addInput(array('type'=>'checkbox','name'=>'totals_only','value'=>$cl_totals_only));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -53,5 +53,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.work_units'));
-$smarty->assign('content_page_name', 'work_units.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'work_units2.tpl');
+$smarty->display('index2.tpl');

From 058a826464349b6137cf81df8367da7ac00e1d4f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Apr 2021 12:37:56 +0000
Subject: [PATCH 1508/1848] Made week_view.php mobile friendly.

---
 WEB-INF/templates/week_view.tpl  | 27 --------------------
 WEB-INF/templates/week_view2.tpl | 44 ++++++++++++++++++++++++++++++++
 initialize.php                   |  2 +-
 week_view.php                    |  4 +--
 4 files changed, 47 insertions(+), 30 deletions(-)
 delete mode 100644 WEB-INF/templates/week_view.tpl
 create mode 100644 WEB-INF/templates/week_view2.tpl

diff --git a/WEB-INF/templates/week_view.tpl b/WEB-INF/templates/week_view.tpl
deleted file mode 100644
index 17b02cb4e..000000000
--- a/WEB-INF/templates/week_view.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{$forms.weekViewForm.open}
-<table cellspacing="1" cellpadding="2" border="0">
-  <tr>
-    <td align="right" nowrap>{$forms.weekViewForm.week_menu.control}</td>
-    <td><label for="week_note">{$i18n.label.week_menu}</label> <a href="https://www.anuko.com/lp/tt_35.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td align="right" nowrap>{$forms.weekViewForm.week_note.control}</td>
-    <td><label for="week_note">{$i18n.label.week_note}</label> <a href="https://www.anuko.com/lp/tt_11.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td align="right" nowrap>{$forms.weekViewForm.week_list.control}</td>
-    <td><label for="week_list">{$i18n.label.week_list}</label> <a href="https://www.anuko.com/lp/tt_12.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-  <tr>
-    <td align="right" nowrap>{$forms.weekViewForm.notes.control}</td>
-    <td><label for="notes">{$i18n.label.notes}</label> <a href="https://www.anuko.com/lp/tt_13.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-  </tr>
-
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2" height="50" align="center">{$forms.weekViewForm.btn_save.control}</td>
-  </tr>
-</table>
-{$forms.weekViewForm.close}
diff --git a/WEB-INF/templates/week_view2.tpl b/WEB-INF/templates/week_view2.tpl
new file mode 100644
index 000000000..df74b402b
--- /dev/null
+++ b/WEB-INF/templates/week_view2.tpl
@@ -0,0 +1,44 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.weekViewForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="week_menu">{$i18n.label.week_menu}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="week_menu">{$i18n.label.week_menu}:</label></td>
+    <td class="td-with-input">{$forms.weekViewForm.week_menu.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_35.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_35.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="week_note">{$i18n.label.week_note}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="week_note">{$i18n.label.week_note}:</label></td>
+    <td class="td-with-input">{$forms.weekViewForm.week_note.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_11.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_11.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="week_list">{$i18n.label.week_list}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="week_list">{$i18n.label.week_list}:</label></td>
+    <td class="td-with-input">{$forms.weekViewForm.week_list.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_12.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_12.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="notes">{$i18n.label.notes}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="notes">{$i18n.label.notes}:</label></td>
+    <td class="td-with-input">{$forms.weekViewForm.notes.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_13.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_13.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.weekViewForm.btn_save.control}</div>
+{$forms.weekViewForm.close}
diff --git a/initialize.php b/initialize.php
index e38c689a6..d7420664c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5495");
+define("APP_VERSION", "1.19.28.5496");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week_view.php b/week_view.php
index 1718afd4b..d612239b0 100644
--- a/week_view.php
+++ b/week_view.php
@@ -45,5 +45,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.week_view'));
-$smarty->assign('content_page_name', 'week_view.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'week_view2.tpl');
+$smarty->display('index2.tpl');

From edcdf661d0cdc3d0bda8f5174ef4c8cc51e95602 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Apr 2021 14:44:37 +0000
Subject: [PATCH 1509/1848] Made timesheets.php mobile friendly.

---
 WEB-INF/templates/swap_roles2.tpl |   1 +
 WEB-INF/templates/timesheets.tpl  | 107 -----------------------------
 WEB-INF/templates/timesheets2.tpl | 108 ++++++++++++++++++++++++++++++
 timesheets.php                    |   5 +-
 4 files changed, 111 insertions(+), 110 deletions(-)
 delete mode 100644 WEB-INF/templates/timesheets.tpl
 create mode 100644 WEB-INF/templates/timesheets2.tpl

diff --git a/WEB-INF/templates/swap_roles2.tpl b/WEB-INF/templates/swap_roles2.tpl
index 23633db55..a858db84b 100644
--- a/WEB-INF/templates/swap_roles2.tpl
+++ b/WEB-INF/templates/swap_roles2.tpl
@@ -9,6 +9,7 @@ License: See license.txt *}
     <td class="large-screen-label"><label for="swap_with">{$i18n.form.swap.swap_with}:</label></td>
     <td class="td-with-input">{$forms.swapForm.swap_with.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 <div class="button-set">{$forms.swapForm.btn_submit.control} {$forms.swapForm.btn_cancel.control}</div>
 {$forms.swapForm.close}
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
deleted file mode 100644
index 318702a71..000000000
--- a/WEB-INF/templates/timesheets.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.timesheetsForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $user_dropdown}
-  <tr><td align="center">{$i18n.label.user}: {$forms.timesheetsForm.user.control}</td></tr>
-{/if}
-  <tr>
-    <td valign="top">
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-{if $inactive_timesheets}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.active_timesheets}</td></tr>
-{/if}
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-{if $show_client}
-          <td class="tableHeader">{$i18n.label.client}</td>
-{/if}
-          <td class="tableHeader">{$i18n.label.submitted}</td>
-          <td class="tableHeader">{$i18n.label.approved}</td>
-{if $show_files}
-          <td></td>
-{/if}
-          <td></td>
-          <td></td>
-        </tr>
-{foreach $active_timesheets as $timesheet}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
-  {if $show_client}
-          <td>{$timesheet.client_name|escape}</td>
-  {/if}
-          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {if $timesheet.approve_status == null}
-          <td></td>
-  {else}
-          <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
-  {if $show_files}
-        {if $timesheet.has_files}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-        {else}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-        {/if}
-  {/if}
-          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-{/foreach}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-
-{if $inactive_timesheets}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.inactive_timesheets}</td></tr>
-        <tr>
-          <td class="tableHeader">{$i18n.label.thing_name}</td>
-  {if $show_client}
-          <td class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-          <td class="tableHeader">{$i18n.label.submitted}</td>
-          <td class="tableHeader">{$i18n.label.approved}</td>
-  {if $show_files}
-          <td></td>
-  {/if}
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $inactive_timesheets as $timesheet}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-            <td><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
-    {if $show_client}
-          <td>{$timesheet.client_name|escape}</td>
-    {/if}
-          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-    {if $timesheet.approve_status == null}
-          <td></td>
-    {else}
-          <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-    {/if}
-    {if $show_files}
-      {if $timesheet.has_files}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-      {else}
-          <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-      {/if}
-    {/if}
-          <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-{$forms.timesheetsForm.close}
diff --git a/WEB-INF/templates/timesheets2.tpl b/WEB-INF/templates/timesheets2.tpl
new file mode 100644
index 000000000..254162731
--- /dev/null
+++ b/WEB-INF/templates/timesheets2.tpl
@@ -0,0 +1,108 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table class="centered-table">
+{if $user_dropdown}
+  {$forms.timesheetsForm.open}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.timesheetsForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {$forms.timesheetsForm.close}
+{/if}
+</table>
+<div class="form-control-separator"></div>
+{if $active_timesheets}
+  {if $inactive_timesheets}
+<div class="section-header">{$i18n.form.timesheets.active_timesheets}</div>
+  {/if}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+  {if $show_client}
+    <th>{$i18n.label.client}</th>
+  {/if}
+    <th>{$i18n.label.submitted}</td>
+    <th>{$i18n.label.approved}</td>
+  {if $show_files}
+    <th></th>
+  {/if}
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $active_timesheets as $timesheet}
+  <tr>
+    <td class="text-cell"><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
+    {if $show_client}
+    <td class="text-cell">{$timesheet.client_name|escape}</td>
+    {/if}
+    <td class="yes-no-cell">{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {if $timesheet.approve_status == null}
+    <td></td>
+    {else}
+    <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {/if}
+    {if $show_files}
+      {if $timesheet.has_files}
+    <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+    <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+    <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+</table>
+{/if}
+{if !$inactive_timesheets}
+<div class="button-set"><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></div>
+{/if}
+{if $inactive_timesheets}
+<div class="section-header">{$i18n.form.timesheets.inactive_timesheets}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+  {if $show_client}
+    <th>{$i18n.label.client}</th>
+  {/if}
+    <th>{$i18n.label.submitted}</td>
+    <th>{$i18n.label.approved}</td>
+  {if $show_files}
+    <th></th>
+  {/if}
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $inactive_timesheets as $timesheet}
+  <tr>
+    <td class="text-cell"><a href="timesheet_view.php?id={$timesheet.id}">{$timesheet.name|escape}</a></td>
+    {if $show_client}
+    <td class="text-cell">{$timesheet.client_name|escape}</td>
+    {/if}
+    <td class="yes-no-cell">{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {if $timesheet.approve_status == null}
+    <td></td>
+    {else}
+    <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {/if}
+    {if $show_files}
+      {if $timesheet.has_files}
+    <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+    <td><a href="timesheet_files.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+    <td><a href="timesheet_edit.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="timesheet_delete.php?id={$timesheet.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+  </tr>
+  {/foreach}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></div>
+{/if}
diff --git a/timesheets.php b/timesheets.php
index 88a4a718c..54bbc3396 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -59,7 +59,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.timesheetsForm.user_changed.value=1;document.timesheetsForm.submit();',
       'name'=>'user',
-      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
@@ -79,5 +78,5 @@
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
-$smarty->assign('content_page_name', 'timesheets.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'timesheets2.tpl');
+$smarty->display('index2.tpl');

From f20a75bdf5f15420984a4977207cf5296ff62e15 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Apr 2021 17:42:55 +0000
Subject: [PATCH 1510/1848] Made timesheet_add.php mobile friendly.

---
 WEB-INF/templates/timesheet_add.tpl  | 49 ----------------------------
 WEB-INF/templates/timesheet_add2.tpl | 49 ++++++++++++++++++++++++++++
 initialize.php                       |  2 +-
 timesheet_add.php                    | 12 +++----
 4 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 WEB-INF/templates/timesheet_add.tpl
 create mode 100644 WEB-INF/templates/timesheet_add2.tpl

diff --git a/WEB-INF/templates/timesheet_add.tpl b/WEB-INF/templates/timesheet_add.tpl
deleted file mode 100644
index f4becf7f5..000000000
--- a/WEB-INF/templates/timesheet_add.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{$forms.timesheetForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.timesheetForm.timesheet_name.control}</td>
-        </tr>
-{if $show_client}
-        <tr>
-          <td align="right">{$i18n.label.client}:</td>
-          <td>{$forms.timesheetForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project}:</td>
-          <td>{$forms.timesheetForm.project.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.start_date} (*):</td>
-          <td>{$forms.timesheetForm.start.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.end_date} (*):</td>
-          <td>{$forms.timesheetForm.finish.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.comment}:</td>
-          <td>{$forms.timesheetForm.comment.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.timesheetForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.timesheetForm.close}
diff --git a/WEB-INF/templates/timesheet_add2.tpl b/WEB-INF/templates/timesheet_add2.tpl
new file mode 100644
index 000000000..4f2d32d88
--- /dev/null
+++ b/WEB-INF/templates/timesheet_add2.tpl
@@ -0,0 +1,49 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+
+{$forms.timesheetForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.timesheet_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $show_client}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}:</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project}:</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="start">{$i18n.label.start_date} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="start">{$i18n.label.start_date} (*):</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.start.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="finish">{$i18n.label.end_date} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="finish">{$i18n.label.end_date} (*):</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.finish.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="comment">{$i18n.label.comment}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="comment">{$i18n.label.comment}:</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.comment.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.timesheetForm.btn_add.control}</div>
+{$forms.timesheetForm.close}
diff --git a/initialize.php b/initialize.php
index d7420664c..bd82dfbfd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5496");
+define("APP_VERSION", "1.19.28.5497");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timesheet_add.php b/timesheet_add.php
index 536241d62..5fb15df6e 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -29,23 +29,23 @@
 $user_id = $user->getUser();
 
 $form = new Form('timesheetForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','value'=>$cl_name));
 
 // Dropdown for clients if the clients plugin is enabled.
 $showClient = $user->isPluginEnabled('cl');
 if ($showClient) {
   $clients = ttGroupHelper::getActiveClients();
-  $form->addInput(array('type'=>'combobox','name'=>'client','style'=>'width: 250px;','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $form->addInput(array('type'=>'combobox','name'=>'client','data'=>$clients,'datakeys'=>array('id','name'),'value'=>$cl_client,'empty'=>array(''=>$i18n->get('dropdown.select'))));
 }
 // Dropdown for projects.
 $showProject = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
 if ($showProject) {
   $projects = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox','name'=>'project','style'=>'width: 250px;','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
+  $form->addInput(array('type'=>'combobox','name'=>'project','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_project,'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start','value'=>$cl_start));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'finish','value'=>$cl_finish));
-$form->addInput(array('type'=>'textarea','name'=>'comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
+$form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_comment));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
@@ -80,5 +80,5 @@
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('title', $i18n->get('title.add_timesheet'));
-$smarty->assign('content_page_name', 'timesheet_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'timesheet_add2.tpl');
+$smarty->display('index2.tpl');

From 3afdaab6c40a69cdfc1f3ad2099325e6f31fe300 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Apr 2021 18:53:28 +0000
Subject: [PATCH 1511/1848] Made timesheet_edit.php mobile friendly.

---
 WEB-INF/templates/timesheet_add2.tpl  |  1 -
 WEB-INF/templates/timesheet_edit.tpl  | 34 ---------------------------
 WEB-INF/templates/timesheet_edit2.tpl | 28 ++++++++++++++++++++++
 initialize.php                        |  2 +-
 timesheet_edit.php                    |  8 +++----
 5 files changed, 33 insertions(+), 40 deletions(-)
 delete mode 100644 WEB-INF/templates/timesheet_edit.tpl
 create mode 100644 WEB-INF/templates/timesheet_edit2.tpl

diff --git a/WEB-INF/templates/timesheet_add2.tpl b/WEB-INF/templates/timesheet_add2.tpl
index 4f2d32d88..f69a8ff74 100644
--- a/WEB-INF/templates/timesheet_add2.tpl
+++ b/WEB-INF/templates/timesheet_add2.tpl
@@ -1,7 +1,6 @@
 {* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt *}
 
-
 {$forms.timesheetForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td></tr>
diff --git a/WEB-INF/templates/timesheet_edit.tpl b/WEB-INF/templates/timesheet_edit.tpl
deleted file mode 100644
index ec1123608..000000000
--- a/WEB-INF/templates/timesheet_edit.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{$forms.timesheetForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align = "right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.timesheetForm.timesheet_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.comment}:</td>
-          <td>{$forms.timesheetForm.comment.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.status}:</td>
-          <td>{$forms.timesheetForm.status.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td align="center" height="50">{$forms.timesheetForm.btn_save.control} {if $can_delete}{$forms.timesheetForm.btn_delete.control}{/if}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.timesheetForm.close}
diff --git a/WEB-INF/templates/timesheet_edit2.tpl b/WEB-INF/templates/timesheet_edit2.tpl
new file mode 100644
index 000000000..62cf01a8c
--- /dev/null
+++ b/WEB-INF/templates/timesheet_edit2.tpl
@@ -0,0 +1,28 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.timesheetForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="timesheet_name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.timesheet_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="comment">{$i18n.label.comment}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="comment">{$i18n.label.comment}:</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.comment.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.timesheetForm.status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.timesheetForm.btn_save.control} {if $can_delete}{$forms.timesheetForm.btn_delete.control}{/if}</div>
+{$forms.timesheetForm.close}
diff --git a/initialize.php b/initialize.php
index bd82dfbfd..21f1c89b3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5497");
+define("APP_VERSION", "1.19.28.5498");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timesheet_edit.php b/timesheet_edit.php
index db6897b8a..c9676ed5a 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -40,8 +40,8 @@
 
 $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_timesheet_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'comment','style'=>'width: 250px; height: 40px;','value'=>$cl_comment));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'timesheet_name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_comment));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
@@ -81,5 +81,5 @@
 $smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');
 $smarty->assign('can_delete', $canDelete);
 $smarty->assign('title', $i18n->get('title.edit_timesheet'));
-$smarty->assign('content_page_name', 'timesheet_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'timesheet_edit2.tpl');
+$smarty->display('index2.tpl');

From a6c1e3d3615edac1d98b994298feb00e2fa178b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Apr 2021 21:42:14 +0000
Subject: [PATCH 1512/1848] Made timesheet_view and timesheet_delete.php mobile
 friendly.

---
 WEB-INF/lib/ttReportHelper.class.php    |  7 +--
 WEB-INF/templates/timesheet_delete.tpl  | 18 ------
 WEB-INF/templates/timesheet_delete2.tpl |  7 +++
 WEB-INF/templates/timesheet_view.tpl    | 84 -------------------------
 WEB-INF/templates/timesheet_view2.tpl   | 82 ++++++++++++++++++++++++
 initialize.php                          |  2 +-
 timesheet_delete.php                    |  4 +-
 timesheet_view.php                      |  6 +-
 8 files changed, 97 insertions(+), 113 deletions(-)
 delete mode 100644 WEB-INF/templates/timesheet_delete.tpl
 create mode 100644 WEB-INF/templates/timesheet_delete2.tpl
 delete mode 100644 WEB-INF/templates/timesheet_view.tpl
 create mode 100644 WEB-INF/templates/timesheet_view2.tpl

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 604f559d8..d95348e8b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -2252,17 +2252,14 @@ static function makeGroupByHeaderPart($dropdown_value) {
     return null;
   }
 
-  // makeGroupByHeader builds a column header for a totals-only report using group_by1,
-  // group_by2, and group_by3 values passed in $options.
+  // makeGroupByHeader builds a column header for a totals-only report
+  // or a timesheet using group_by1, group_by2, and group_by3 values passed in $options.
   static function makeGroupByHeader($options) {
     $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
       ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
       ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
     if ($no_grouping) return null;
 
-    // We only need to do it for a totals only report.
-    if (!$options['show_totals_only']) return null;
-
     $group_by_header = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
diff --git a/WEB-INF/templates/timesheet_delete.tpl b/WEB-INF/templates/timesheet_delete.tpl
deleted file mode 100644
index 87928052e..000000000
--- a/WEB-INF/templates/timesheet_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.timesheetDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="2" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$timesheet_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.timesheetDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.timesheetDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.timesheetDeleteForm.close}
diff --git a/WEB-INF/templates/timesheet_delete2.tpl b/WEB-INF/templates/timesheet_delete2.tpl
new file mode 100644
index 000000000..a3e7b7312
--- /dev/null
+++ b/WEB-INF/templates/timesheet_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.timesheetDeleteForm.open}
+<div class="section-header">{$timesheet_to_delete|escape}</div>
+<div class="button-set">{$forms.timesheetDeleteForm.btn_delete.control}&nbsp;{$forms.timesheetDeleteForm.btn_cancel.control}</div>
+{$forms.timesheetDeleteForm.close}
diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
deleted file mode 100644
index 77cc78bd5..000000000
--- a/WEB-INF/templates/timesheet_view.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$timesheet['name']|escape} </b></td></tr>
-{if $user->behalfUser}
-        <tr><td align="left"><b>{$i18n.label.user}:</b> {$timesheet['user_name']|escape}</td></tr>
-{/if}
-{if $timesheet['client_id']}
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
-{/if}
-{if $timesheet['project_id']}
-        <tr><td align="left"><b>{$i18n.label.project}:</b> {$timesheet['project_name']|escape}</td></tr>
-{/if}
-{if $timesheet['comment']}
-        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['comment']|escape}</td></tr>
-{/if}
-{if $timesheet['approve_status'] == null}
-        <tr><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
-{/if}
-{if $timesheet['approve_status'] != null}
-        <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
-{/if}
-{if $timesheet['approve_comment']}
-        <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['approve_comment']|escape}</td></tr>
-{/if}
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-        <td class="tableHeader">{$group_by_header|escape}</td>
-        <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
-      </tr>
-  {foreach $subtotals as $subtotal}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
-        <td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>
-      </tr>
-  {/foreach}
-      <tr><td>&nbsp;</td></tr>
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
-        <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>
-      </tr>
-      <tr><td>&nbsp;</td></tr>
-      </table>
-
-{$forms.timesheetForm.open}
-  {if $show_submit}
-  <table width="720" cellspacing="0" cellpadding="0" border="0">
-  <tr>
-    <td align="center">
-      <table>
-        <tr><td>{if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  </table>
-  {/if}
-  {if $show_approve}
-  <table width="720" cellspacing="0" cellpadding="0" border="0">
-  <tr>
-    <td align="center">
-      <table>
-        <tr><td align="center">{$i18n.label.comment}:</td></tr>
-        <tr><td align="center">{$forms.timesheetForm.comment.control}</td></tr>
-        <tr><td align="center">{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  </table>
-  {/if}
-{$forms.timesheetForm.close}
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/timesheet_view2.tpl b/WEB-INF/templates/timesheet_view2.tpl
new file mode 100644
index 000000000..a7d8b0e14
--- /dev/null
+++ b/WEB-INF/templates/timesheet_view2.tpl
@@ -0,0 +1,82 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<div class="invoice-header">{$timesheet['name']|escape}</div>
+<table class="centered-table">
+{if $user->behalfUser}
+  <tr>
+    <th class="invoice-label">{$i18n.label.user}:</th>
+    <td class="text-cell">{$timesheet['user_name']|escape}</td>
+  </tr>
+{/if}
+{if $timesheet['client_id']}
+  <tr>
+    <th class="invoice-label">{$i18n.label.client}:</th>
+    <td class="text-cell">{$timesheet['client_name']|escape}</td>
+  </tr>
+{/if}
+{if $timesheet['project_id']}
+  <tr>
+    <th class="invoice-label">{$i18n.label.project}:</th>
+    <td class="text-cell">{$timesheet['project_name']|escape}</td>
+  </tr>
+{/if}
+{if $timesheet['comment']}
+  <tr>
+    <th class="invoice-label">{$i18n.label.comment}:</th>
+    <td class="text-cell">{$timesheet['comment']|escape}</td>
+  </tr>
+{/if}
+{if $timesheet['approve_status'] == null}
+  <tr>
+    <th class="invoice-label">{$i18n.label.submitted}:</th>
+    <td class="text-cell">{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  </tr>
+{/if}
+{if $timesheet['approve_status'] != null}
+  <tr>
+    <th class="invoice-label">{$i18n.label.approved}:</th>
+    <td class="text-cell">{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  </tr>
+{/if}
+{if $timesheet['approve_comment']}
+  <tr>
+    <th class="invoice-label">{$i18n.label.note}:</th>
+    <td class="text-cell">{$timesheet['approve_comment']|escape}</td>
+  </tr>
+{/if}
+</table>
+<div class="form-control-separator"></div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$group_by_header|escape}</th>
+    <th>{$i18n.label.duration}</th>
+  </tr>
+  {foreach $subtotals as $subtotal}
+  <tr>
+    <td class="text-cell">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{$subtotal['time']}</td>
+  </tr>
+  {/foreach}
+  <tr>
+    <th class="invoice-label">{$i18n.label.total}:</th>
+    <td class="time-cell">{$totals['time']}</td>
+  </tr>
+</table>
+
+{$forms.timesheetForm.open}
+{if $show_submit}
+<div class="button-set">{if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</div>
+{/if}
+{if $show_approve}
+<table class="centered-table">
+    <tr><th><label for="comment">{$i18n.label.comment}:</label></th></tr>
+  <tr><td class="td-with-input">{$forms.timesheetForm.comment.control}</td></tr>
+</table>
+<div class="button-set">{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</div>
+{/if}
+{$forms.timesheetForm.close}
diff --git a/initialize.php b/initialize.php
index 21f1c89b3..7afef50d1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5498");
+define("APP_VERSION", "1.19.28.5499");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timesheet_delete.php b/timesheet_delete.php
index ff1e4e180..b0b847973 100644
--- a/timesheet_delete.php
+++ b/timesheet_delete.php
@@ -47,5 +47,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_timesheet'));
-$smarty->assign('content_page_name', 'timesheet_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'timesheet_delete2.tpl');
+$smarty->display('index2.tpl');
diff --git a/timesheet_view.php b/timesheet_view.php
index ff5f169b6..a74424a6b 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -59,7 +59,7 @@
 }
 
 if ($showApprove) {
-  $form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250','style'=>'width: 300px; height: 60px;'));
+  $form->addInput(array('type'=>'textarea','name'=>'comment','maxlength'=>'250'));
   $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
   $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
 }
@@ -126,5 +126,5 @@
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheet').": ".$timesheet['start_date']." - ".$timesheet['end_date']);
-$smarty->assign('content_page_name', 'timesheet_view.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'timesheet_view2.tpl');
+$smarty->display('index2.tpl');

From 4585b7e2b5b026f44d4ddad35fd6e61e7958c300 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 May 2021 14:56:37 +0000
Subject: [PATCH 1513/1848] Made templates.php mobile friendly.

---
 WEB-INF/templates/templates.tpl   | 68 ------------------------------
 WEB-INF/templates/templates2.tpl  | 69 +++++++++++++++++++++++++++++++
 WEB-INF/templates/timesheets2.tpl |  8 +---
 default.css                       |  1 +
 initialize.php                    |  2 +-
 templates.php                     |  4 +-
 6 files changed, 75 insertions(+), 77 deletions(-)
 delete mode 100644 WEB-INF/templates/templates.tpl
 create mode 100644 WEB-INF/templates/templates2.tpl

diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
deleted file mode 100644
index 282387830..000000000
--- a/WEB-INF/templates/templates.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-{$forms.templatesForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-{if $inactive_templates}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
-{/if}
-        <tr>
-          <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
-          <td class="tableHeader" width="45%">{$i18n.label.description}</td>
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $active_templates as $template}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$template['name']|escape}</td>
-          <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-      </table>
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
-      </table>
-{if $inactive_templates}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.inactive_templates}</td></tr>
-        <tr>
-          <td class="tableHeader" width="45%">{$i18n.label.thing_name}</td>
-          <td class="tableHeader" width="45%">{$i18n.label.description}</td>
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $inactive_templates as $template}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$template['name']|escape}</td>
-          <td>{$template['description']|escape}</td>
-          <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-      </table>
-      <table width="100%">
-        <tr><td align="center"><br>{$forms.templatesForm.btn_add.control}</td></tr>
-      </table>
-{/if}
-      <div class="table-divider"></div>
-      <table width="100%">
-{if $show_bind_with_projects_checkbox}
-        <tr>
-          <td align="right" width="25%">{$forms.templatesForm.bind_templates_with_projects.control}</td>
-          <td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}</label> <a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right" width="25%">{$forms.templatesForm.prepopulate_note.control}</td>
-          <td><label for="prepopulate_note">{$i18n.label.prepopulate_note}</label> <a href="https://www.anuko.com/lp/tt_43.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.templatesForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.templatesForm.close}
diff --git a/WEB-INF/templates/templates2.tpl b/WEB-INF/templates/templates2.tpl
new file mode 100644
index 000000000..b37de3051
--- /dev/null
+++ b/WEB-INF/templates/templates2.tpl
@@ -0,0 +1,69 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.templatesForm.open}
+{if $inactive_templates}
+<div class="section-header">{$i18n.form.templates.active_templates}</div>
+{/if}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $active_templates as $template}
+  <tr>
+    <td class="text-cell">{$template['name']|escape}</td>
+    <td class="text-cell">{$template['description']|escape}</td>
+    <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+   </tr>
+  {/foreach}
+</table>
+<div class="button-set">{$forms.templatesForm.btn_add.control}</div>
+
+{if $inactive_templates}
+<div class="section-header">{$i18n.form.templates.inactive_templates}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $inactive_templates as $template}
+  <tr>
+    <td class="text-cell">{$template['name']|escape}</td>
+    <td class="text-cell">{$template['description']|escape}</td>
+    <td><a href="template_edit.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="template_delete.php?id={$template['id']}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+   </tr>
+  {/foreach}
+</table>
+<div class="button-set">{$forms.templatesForm.btn_add.control}</div>
+{/if}
+<table class="centered-table">
+{if $show_bind_with_projects_checkbox}
+  <tr class = "small-screen-label"><td><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="bind_templates_with_projects">{$i18n.label.bind_templates_with_projects}:</label></td>
+    <td class="td-with-input">{$forms.templatesForm.bind_templates_with_projects.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_42.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_42.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="prepopulate_note">{$i18n.label.prepopulate_note}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="prepopulate_note">{$i18n.label.prepopulate_note}:</label></td>
+    <td class="td-with-input">{$forms.templatesForm.prepopulate_note.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_43.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_43.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.templatesForm.btn_save.control}</div>
+{$forms.templatesForm.close}
diff --git a/WEB-INF/templates/timesheets2.tpl b/WEB-INF/templates/timesheets2.tpl
index 254162731..fe6a9603f 100644
--- a/WEB-INF/templates/timesheets2.tpl
+++ b/WEB-INF/templates/timesheets2.tpl
@@ -18,10 +18,9 @@ License: See license.txt *}
 {/if}
 </table>
 <div class="form-control-separator"></div>
-{if $active_timesheets}
-  {if $inactive_timesheets}
+{if $inactive_timesheets}
 <div class="section-header">{$i18n.form.timesheets.active_timesheets}</div>
-  {/if}
+{/if}
 <table class="x-scrollable-table">
   <tr>
     <th>{$i18n.label.thing_name}</th>
@@ -60,10 +59,7 @@ License: See license.txt *}
   </tr>
   {/foreach}
 </table>
-{/if}
-{if !$inactive_timesheets}
 <div class="button-set"><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></div>
-{/if}
 {if $inactive_timesheets}
 <div class="section-header">{$i18n.form.timesheets.inactive_timesheets}</div>
 <table class="x-scrollable-table">
diff --git a/default.css b/default.css
index 3b59185c4..2304d07b2 100644
--- a/default.css
+++ b/default.css
@@ -286,6 +286,7 @@ span.what-is-it-img {
 /* span for what is it text */
 span.what-is-it-text {
   display: inline-block;
+  vertical-align: middle;
 }
 
 /* span for what format example */
diff --git a/initialize.php b/initialize.php
index 7afef50d1..9cc24fc1b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -13,7 +13,7 @@
 ini_set('display_errors', 'Off');
 
 // require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5499");
+define("APP_VERSION", "1.19.28.5500");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/templates.php b/templates.php
index 636d4bc10..53d57b86f 100644
--- a/templates.php
+++ b/templates.php
@@ -59,5 +59,5 @@
 $smarty->assign('inactive_templates', $inactiveTemplates);
 $smarty->assign('show_bind_with_projects_checkbox', $showBindWithProjectsCheckbox);
 $smarty->assign('title', $i18n->get('title.templates'));
-$smarty->assign('content_page_name', 'templates.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'templates2.tpl');
+$smarty->display('index2.tpl');

From 64bdd80ce896ffc5b2d14d3619068a767437dde4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 May 2021 15:21:25 +0000
Subject: [PATCH 1514/1848] Made template_delete.php mobile friendly.

---
 WEB-INF/templates/template_delete.tpl  | 18 ------------------
 WEB-INF/templates/template_delete2.tpl |  7 +++++++
 initialize.php                         |  3 +--
 template_delete.php                    |  4 ++--
 4 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 WEB-INF/templates/template_delete.tpl
 create mode 100644 WEB-INF/templates/template_delete2.tpl

diff --git a/WEB-INF/templates/template_delete.tpl b/WEB-INF/templates/template_delete.tpl
deleted file mode 100644
index 2dc4114aa..000000000
--- a/WEB-INF/templates/template_delete.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{$forms.templateDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$template_to_delete|escape}</b></td>
-        </tr>
-        <tr><td colspan="2" align="center">&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$forms.templateDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.templateDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.templateDeleteForm.close}
diff --git a/WEB-INF/templates/template_delete2.tpl b/WEB-INF/templates/template_delete2.tpl
new file mode 100644
index 000000000..a7ca2e75f
--- /dev/null
+++ b/WEB-INF/templates/template_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.templateDeleteForm.open}
+<div class="section-header">{$template_to_delete|escape}</div>
+<div class="button-set">{$forms.templateDeleteForm.btn_delete.control}&nbsp;{$forms.templateDeleteForm.btn_cancel.control}</div>
+{$forms.templateDeleteForm.close}
diff --git a/initialize.php b/initialize.php
index 9cc24fc1b..c10e5278f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,8 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-// require_once('init_auth.php');
-define("APP_VERSION", "1.19.28.5500");
+define("APP_VERSION", "1.19.28.5501");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/template_delete.php b/template_delete.php
index a4996e05b..792cadbd0 100644
--- a/template_delete.php
+++ b/template_delete.php
@@ -47,5 +47,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.templateDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_template'));
-$smarty->assign('content_page_name', 'template_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'template_delete2.tpl');
+$smarty->display('index2.tpl');

From e4775fa7fba7660febf591d8fc72339593e2b625 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 May 2021 16:24:21 +0000
Subject: [PATCH 1515/1848] Made template_add.php mobile friendly.

---
 WEB-INF/templates/template_add.tpl  | 37 -----------------------------
 WEB-INF/templates/template_add2.tpl | 37 +++++++++++++++++++++++++++++
 default.css                         |  4 ++--
 initialize.php                      |  2 +-
 template_add.php                    | 10 ++++----
 5 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 WEB-INF/templates/template_add.tpl
 create mode 100644 WEB-INF/templates/template_add2.tpl

diff --git a/WEB-INF/templates/template_add.tpl b/WEB-INF/templates/template_add.tpl
deleted file mode 100644
index bfd624028..000000000
--- a/WEB-INF/templates/template_add.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{$forms.templateForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.templateForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.description}:</td>
-          <td>{$forms.templateForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.template} (*):</td>
-          <td>{$forms.templateForm.content.control}</td>
-        </tr>
-{if $show_projects}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.templateForm.projects.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.templateForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.templateForm.close}
diff --git a/WEB-INF/templates/template_add2.tpl b/WEB-INF/templates/template_add2.tpl
new file mode 100644
index 000000000..554267b20
--- /dev/null
+++ b/WEB-INF/templates/template_add2.tpl
@@ -0,0 +1,37 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.templateForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.templateForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.templateForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="content">{$i18n.label.template} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="content">{$i18n.label.template} (*):</label></td>
+    <td class="td-with-input">{$forms.templateForm.content.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $show_projects}
+  <tr><td><div class="form-control-separator"></div></id></tr>
+  <tr class = "small-screen-label"><td><label for="projects">{$i18n.label.projects}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="projects">{$i18n.label.projects}:</label></td>
+    <td class="td-with-input">{$forms.templateForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.templateForm.btn_add.control}</div>
+{$forms.templateForm.close}
diff --git a/default.css b/default.css
index 2304d07b2..c2c9e1d13 100644
--- a/default.css
+++ b/default.css
@@ -347,7 +347,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name, #comment, #custom_css {
+#description, #address, #item_name, #comment, #custom_css, #content {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
@@ -355,7 +355,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas with focus */
-#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus {
+#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/initialize.php b/initialize.php
index c10e5278f..d3103443c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5501");
+define("APP_VERSION", "1.19.28.5502");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/template_add.php b/template_add.php
index e68671478..6347d22e3 100644
--- a/template_add.php
+++ b/template_add.php
@@ -35,9 +35,9 @@
 }
 
 $form = new Form('templateForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'content','style'=>'width: 250px; height: 80px;','value'=>$cl_content));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'content','value'=>$cl_content));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
@@ -65,5 +65,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.add_template'));
-$smarty->assign('content_page_name', 'template_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'template_add2.tpl');
+$smarty->display('index2.tpl');

From e217bd8b4649f5991df068319fe79673ec8e98ae Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 May 2021 16:36:39 +0000
Subject: [PATCH 1516/1848] Made template_edit.php mobile friendly.

---
 WEB-INF/templates/template_edit.tpl  | 41 --------------------------
 WEB-INF/templates/template_edit2.tpl | 43 ++++++++++++++++++++++++++++
 initialize.php                       |  2 +-
 template_edit.php                    | 10 +++----
 4 files changed, 49 insertions(+), 47 deletions(-)
 delete mode 100644 WEB-INF/templates/template_edit.tpl
 create mode 100644 WEB-INF/templates/template_edit2.tpl

diff --git a/WEB-INF/templates/template_edit.tpl b/WEB-INF/templates/template_edit.tpl
deleted file mode 100644
index f4db77878..000000000
--- a/WEB-INF/templates/template_edit.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{$forms.templateForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.templateForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.description}:</td>
-          <td>{$forms.templateForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.template} (*):</td>
-          <td>{$forms.templateForm.content.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.templateForm.status.control}</td>
-        </tr>
-{if $show_projects}
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right">{$i18n.label.projects}:</td>
-          <td>{$forms.templateForm.projects.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td height="40"></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.templateForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.templateForm.close}
diff --git a/WEB-INF/templates/template_edit2.tpl b/WEB-INF/templates/template_edit2.tpl
new file mode 100644
index 000000000..bdcbb279f
--- /dev/null
+++ b/WEB-INF/templates/template_edit2.tpl
@@ -0,0 +1,43 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.templateForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.templateForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.templateForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="content">{$i18n.label.template} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="content">{$i18n.label.template} (*):</label></td>
+    <td class="td-with-input">{$forms.templateForm.content.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.templateForm.status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $show_projects}
+  <tr><td><div class="form-control-separator"></div></id></tr>
+  <tr class = "small-screen-label"><td><label for="projects">{$i18n.label.projects}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="projects">{$i18n.label.projects}:</label></td>
+    <td class="td-with-input">{$forms.templateForm.projects.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.templateForm.btn_submit.control}</div>
+{$forms.templateForm.close}
diff --git a/initialize.php b/initialize.php
index d3103443c..773abee87 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5502");
+define("APP_VERSION", "1.19.28.5503");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/template_edit.php b/template_edit.php
index e3fa38947..3451ff646 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -49,9 +49,9 @@
 
 $form = new Form('templateForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_template_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'content','style'=>'width: 250px; height: 80px;','value'=>$cl_content));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
+$form->addInput(array('type'=>'textarea','name'=>'content','value'=>$cl_content));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
@@ -83,5 +83,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.edit_template'));
-$smarty->assign('content_page_name', 'template_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'template_edit2.tpl');
+$smarty->display('index2.tpl');

From c63f9daaf1030ad81c544f7be58f11d7b5ee0113 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 May 2021 18:21:27 +0000
Subject: [PATCH 1517/1848] Made roles.php mobile friendly.

---
 WEB-INF/lib/ttTemplateHelper.class.php | 31 ++---------
 WEB-INF/templates/roles.tpl            | 71 --------------------------
 WEB-INF/templates/roles2.tpl           | 56 ++++++++++++++++++++
 initialize.php                         |  2 +-
 roles.php                              |  4 +-
 rtl.css                                |  4 ++
 6 files changed, 66 insertions(+), 102 deletions(-)
 delete mode 100644 WEB-INF/templates/roles.tpl
 create mode 100644 WEB-INF/templates/roles2.tpl

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index cedda1671..6e6ad0a02 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -1,31 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
-
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Class ttTemplateHelper is used to help with template related tasks.
 class ttTemplateHelper {
@@ -129,7 +104,7 @@ static function update($fields) {
     $content = $fields['content'];
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
     $status = (int) $fields['status'];
-    $projects = $fields['projects'];
+    $projects = isset($fields['projects']) ? $fields['projects'] : array();
 
     $sql = "update tt_templates set name = ".$mdb2->quote($name).
       ", description = ".$mdb2->quote($description).
diff --git a/WEB-INF/templates/roles.tpl b/WEB-INF/templates/roles.tpl
deleted file mode 100644
index 227392489..000000000
--- a/WEB-INF/templates/roles.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_roles}
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.roles.active_roles}</td></tr>
-  {/if}
-        <tr>
-          <td width="25%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.form.roles.rank}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {if $active_roles}
-    {foreach $active_roles as $role}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$role.name|escape}</td>
-          <td>{$role.rank}</td>
-          <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-  {/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('role_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-  {if $inactive_roles}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.form.roles.inactive_roles}</td></tr>
-        <tr>
-          <td width="25%" class="tableHeader">{$i18n.label.thing_name}</td>
-          <td class="tableHeader">{$i18n.form.roles.rank}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td></td>
-          <td></td>
-        </tr>
-    {foreach $inactive_roles as $role}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$role.name|escape}</td>
-          <td>{$role.rank}</td>
-          <td>{$role.description|escape}</td>
-          <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
-          <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
-        </tr>
-    {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('role_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-  {/if}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/roles2.tpl b/WEB-INF/templates/roles2.tpl
new file mode 100644
index 000000000..60985c520
--- /dev/null
+++ b/WEB-INF/templates/roles2.tpl
@@ -0,0 +1,56 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+{if $inactive_roles}
+<div class="section-header">{$i18n.form.roles.active_roles}</div>
+{/if}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.form.roles.rank}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {if $active_roles}
+    {foreach $active_roles as $role}
+  <tr>
+    <td class="text-cell">{$role.name|escape}</td>
+    <td class="number-cell">{$role.rank}</td>
+    <td class="text-cell">{$role.description|escape}</td>
+    <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+   </tr>
+    {/foreach}
+  {/if}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('role_add.php');" value="{$i18n.button.add}"></form></div>
+
+{if $inactive_roles}
+<div class="section-header">{$i18n.form.roles.inactive_roles}</div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.thing_name}</th>
+    <th>{$i18n.form.roles.rank}</th>
+    <th>{$i18n.label.description}</th>
+    <th></th>
+    <th></th>
+  </tr>
+  {if $active_roles}
+    {foreach $inactive_roles as $role}
+  <tr>
+    <td class="text-cell">{$role.name|escape}</td>
+    <td class="number-cell">{$role.rank}</td>
+    <td class="text-cell">{$role.description|escape}</td>
+    <td><a href="role_edit.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>
+    <td><a href="role_delete.php?id={$role.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a></td>
+   </tr>
+    {/foreach}
+  {/if}
+</table>
+<div class="button-set"><form><input type="button" onclick="chLocation('role_add.php');" value="{$i18n.button.add}"></form></div>
+{/if}
diff --git a/initialize.php b/initialize.php
index 773abee87..b31e3252c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5503");
+define("APP_VERSION", "1.19.28.5504");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/roles.php b/roles.php
index 569f2649a..f2795fb0f 100644
--- a/roles.php
+++ b/roles.php
@@ -17,5 +17,5 @@
 $smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
 $smarty->assign('title', $i18n->get('title.roles'));
-$smarty->assign('content_page_name', 'roles.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'roles2.tpl');
+$smarty->display('index2.tpl');
diff --git a/rtl.css b/rtl.css
index 310ab1e25..890cdd75c 100644
--- a/rtl.css
+++ b/rtl.css
@@ -32,6 +32,10 @@ html {
   text-align: right;
 }
 
+.number-cell {
+  text-align: left;
+}
+
 .time-cell {
   text-align: left;
 }

From 13264199ec99529322632aa9ccffaae71d3c1029 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 May 2021 18:23:53 +0000
Subject: [PATCH 1518/1848] Forgot to check in one file in previous commit.

---
 default.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/default.css b/default.css
index c2c9e1d13..103468576 100644
--- a/default.css
+++ b/default.css
@@ -170,6 +170,11 @@ div.page-hint {
   text-align: right;
 }
 
+/* number cell in tables */
+.number-cell {
+  text-align: right;
+}
+
 /* date cell in tables */
 .date-cell {
   white-space: nowrap;

From eae83c07267650a8956876373670558c31e3c99c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 May 2021 15:43:19 +0000
Subject: [PATCH 1519/1848] Made role_delete.php mobile friendly.

---
 WEB-INF/templates/role_delete.tpl  | 20 --------------------
 WEB-INF/templates/role_delete2.tpl |  7 +++++++
 initialize.php                     |  2 +-
 role_delete.php                    |  4 ++--
 4 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 WEB-INF/templates/role_delete.tpl
 create mode 100644 WEB-INF/templates/role_delete2.tpl

diff --git a/WEB-INF/templates/role_delete.tpl b/WEB-INF/templates/role_delete.tpl
deleted file mode 100644
index 9c85d2208..000000000
--- a/WEB-INF/templates/role_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.roleDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$role_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.roleDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.roleDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.roleDeleteForm.close}
diff --git a/WEB-INF/templates/role_delete2.tpl b/WEB-INF/templates/role_delete2.tpl
new file mode 100644
index 000000000..56c5dfa07
--- /dev/null
+++ b/WEB-INF/templates/role_delete2.tpl
@@ -0,0 +1,7 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.roleDeleteForm.open}
+<div class="section-header">{$role_to_delete|escape}</div>
+<div class="button-set">{$forms.roleDeleteForm.btn_delete.control}&nbsp;{$forms.roleDeleteForm.btn_cancel.control}</div>
+{$forms.roleDeleteForm.close}
diff --git a/initialize.php b/initialize.php
index b31e3252c..2ecaae624 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5504");
+define("APP_VERSION", "1.19.28.5505");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/role_delete.php b/role_delete.php
index e2f0805eb..805c89dba 100644
--- a/role_delete.php
+++ b/role_delete.php
@@ -46,5 +46,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_role'));
-$smarty->assign('content_page_name', 'role_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'role_delete2.tpl');
+$smarty->display('index2.tpl');

From 564bd846e6fa89e13fc02a4f3da0788549e3d699 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 May 2021 16:00:02 +0000
Subject: [PATCH 1520/1848] Made role_add.php mobile friendly.

---
 WEB-INF/templates/role_add.tpl  | 33 ---------------------------------
 WEB-INF/templates/role_add2.tpl | 31 +++++++++++++++++++++++++++++++
 initialize.php                  |  2 +-
 role_add.php                    | 10 +++++-----
 4 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 WEB-INF/templates/role_add.tpl
 create mode 100644 WEB-INF/templates/role_add2.tpl

diff --git a/WEB-INF/templates/role_add.tpl b/WEB-INF/templates/role_add.tpl
deleted file mode 100644
index 6a56fd253..000000000
--- a/WEB-INF/templates/role_add.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{$forms.roleForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.roleForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.roleForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.form.roles.rank}:</td>
-          <td>{$forms.roleForm.rank.control} <a href="https://www.anuko.com/lp/tt_20.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" align="center" height="50">{$forms.roleForm.btn_submit.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.roleForm.close}
diff --git a/WEB-INF/templates/role_add2.tpl b/WEB-INF/templates/role_add2.tpl
new file mode 100644
index 000000000..3fb24fee0
--- /dev/null
+++ b/WEB-INF/templates/role_add2.tpl
@@ -0,0 +1,31 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.roleForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.roleForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="rank">{$i18n.form.roles.rank}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="rank">{$i18n.form.roles.rank}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.rank.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_20.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_20.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.roleForm.btn_submit.control}</div>
+{$forms.roleForm.close}
diff --git a/initialize.php b/initialize.php
index 2ecaae624..513c45d50 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5505");
+define("APP_VERSION", "1.19.28.5506");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/role_add.php b/role_add.php
index a52d1a38b..54fd9bdb5 100644
--- a/role_add.php
+++ b/role_add.php
@@ -19,12 +19,12 @@
 }
 
 $form = new Form('roleForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 for ($i = 0; $i < $user->rank; $i++) {
   $rank_data[] = $i;
 }
-$form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data));
+$form->addInput(array('type'=>'combobox','class'=>'dropdown-field-short','name'=>'rank','data'=>$rank_data));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
@@ -55,5 +55,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_role'));
-$smarty->assign('content_page_name', 'role_add.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'role_add2.tpl');
+$smarty->display('index2.tpl');

From 0337da14eedd7a3ef4cb23ede2fbd1e423a5e393 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 May 2021 16:22:01 +0000
Subject: [PATCH 1521/1848] Made role_edit.php mobile friendly.

---
 WEB-INF/templates/role_edit.tpl  | 45 ---------------------------
 WEB-INF/templates/role_edit2.tpl | 53 ++++++++++++++++++++++++++++++++
 initialize.php                   |  2 +-
 role_edit.php                    | 10 +++---
 4 files changed, 59 insertions(+), 51 deletions(-)
 delete mode 100644 WEB-INF/templates/role_edit.tpl
 create mode 100644 WEB-INF/templates/role_edit2.tpl

diff --git a/WEB-INF/templates/role_edit.tpl b/WEB-INF/templates/role_edit.tpl
deleted file mode 100644
index 3ad9e6cfe..000000000
--- a/WEB-INF/templates/role_edit.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{$forms.roleForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.thing_name} (*):</td>
-          <td>{$forms.roleForm.name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.roleForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.form.roles.rank}:</td>
-          <td>{$forms.roleForm.rank.control} <a href="https://www.anuko.com/lp/tt_20.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.roleForm.status.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.roleForm.btn_save.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.form.roles.assigned}:</td>
-          <td>{$forms.roleForm.assigned_rights.control}</td><td>{$forms.roleForm.btn_delete.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.form.roles.not_assigned}:</td>
-          <td>{$forms.roleForm.available_rights.control}</td><td>{$forms.roleForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.roleForm.close}
diff --git a/WEB-INF/templates/role_edit2.tpl b/WEB-INF/templates/role_edit2.tpl
new file mode 100644
index 000000000..c44d8826a
--- /dev/null
+++ b/WEB-INF/templates/role_edit2.tpl
@@ -0,0 +1,53 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.roleForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="name">{$i18n.label.thing_name} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="name">{$i18n.label.thing_name} (*):</label></td>
+    <td class="td-with-input">{$forms.roleForm.name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="description">{$i18n.label.description}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="description">{$i18n.label.description}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.description.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="rank">{$i18n.form.roles.rank}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="rank">{$i18n.form.roles.rank}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.rank.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_20.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_20.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.roleForm.btn_save.control}</div>
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="assigned_rights">{$i18n.form.roles.assigned}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="assigned_rights">{$i18n.form.roles.assigned}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.assigned_rights.control}</td>
+    <td class="td-with-input">{$forms.roleForm.btn_delete.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="available_rights">{$i18n.form.roles.not_assigned}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="available_rights">{$i18n.form.roles.not_assigned}:</label></td>
+    <td class="td-with-input">{$forms.roleForm.available_rights.control}</td>
+    <td class="td-with-input">{$forms.roleForm.btn_add.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+{$forms.roleForm.close}
diff --git a/initialize.php b/initialize.php
index 513c45d50..bf735839c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5506");
+define("APP_VERSION", "1.19.28.5507");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/role_edit.php b/role_edit.php
index bd18fd9cc..8f13acc0b 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -36,12 +36,12 @@
 
 $form = new Form('roleForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 for ($i = 0; $i < $user->rank; $i++) {
   $rank_data[] = $i;
 }
-$form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
+$form->addInput(array('type'=>'combobox','class'=>'dropdown-field-short','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
@@ -115,5 +115,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_role'));
-$smarty->assign('content_page_name', 'role_edit.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'role_edit2.tpl');
+$smarty->display('index2.tpl');

From f6947733c46efa27086710424b1bf03b6c9dd289 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 May 2021 16:24:44 +0000
Subject: [PATCH 1522/1848] Removed style elements from role_edit.php.

---
 initialize.php | 2 +-
 role_edit.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index bf735839c..c8f485ef7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5507");
+define("APP_VERSION", "1.19.28.5508");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/role_edit.php b/role_edit.php
index 8f13acc0b..03e1d2473 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -47,9 +47,9 @@
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 // Multiple select controls for assigned and available rights.
-$form->addInput(array('type'=>'combobox','name'=>'assigned_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$assigned_rights));
+$form->addInput(array('type'=>'combobox','name'=>'assigned_rights','multiple'=>true,'data'=>$assigned_rights));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));
-$form->addInput(array('type'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));
+$form->addInput(array('type'=>'combobox','name'=>'available_rights','multiple'=>true,'data'=>$available_rights));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {

From 5ec2c49b85d39d378aaee9fac6684312ac7c270b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 May 2021 15:00:23 +0000
Subject: [PATCH 1523/1848] Improved mobile layout for role_edit.php.

---
 WEB-INF/templates/role_edit2.tpl | 18 ++++++------------
 default.css                      |  5 +++++
 initialize.php                   |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/templates/role_edit2.tpl b/WEB-INF/templates/role_edit2.tpl
index c44d8826a..096716e29 100644
--- a/WEB-INF/templates/role_edit2.tpl
+++ b/WEB-INF/templates/role_edit2.tpl
@@ -35,19 +35,13 @@ License: See license.txt *}
 </table>
 <div class="button-set">{$forms.roleForm.btn_save.control}</div>
 <table class="centered-table">
-  <tr class = "small-screen-label"><td><label for="assigned_rights">{$i18n.form.roles.assigned}:</label></td></tr>
-  <tr>
-    <td class="large-screen-label"><label for="assigned_rights">{$i18n.form.roles.assigned}:</label></td>
-    <td class="td-with-input">{$forms.roleForm.assigned_rights.control}</td>
-    <td class="td-with-input">{$forms.roleForm.btn_delete.control}</td>
-  </tr>
+  <tr><td class="text-cell">{$i18n.form.roles.assigned}:</td></tr>
+  <tr><td class="td-with-input">{$forms.roleForm.assigned_rights.control}</td></tr>
+  <tr><td class="td-with-horizontally-centered-input">{$forms.roleForm.btn_delete.control}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td><label for="available_rights">{$i18n.form.roles.not_assigned}:</label></td></tr>
-  <tr>
-    <td class="large-screen-label"><label for="available_rights">{$i18n.form.roles.not_assigned}:</label></td>
-    <td class="td-with-input">{$forms.roleForm.available_rights.control}</td>
-    <td class="td-with-input">{$forms.roleForm.btn_add.control}</td>
-  </tr>
+  <tr><td class="text-cell">{$i18n.form.roles.not_assigned}:</td></tr>
+  <tr><td class="td-with-input">{$forms.roleForm.available_rights.control}</td></tr>
+  <tr><td class="td-with-horizontally-centered-input">{$forms.roleForm.btn_add.control}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 {$forms.roleForm.close}
diff --git a/default.css b/default.css
index 103468576..48a3fb58a 100644
--- a/default.css
+++ b/default.css
@@ -258,6 +258,11 @@ div.record-list {
   text-align: left;
 }
 
+/* a table cell containing input control */
+.td-with-horizontally-centered-input {
+  text-align: middle;
+}
+
 /* a table cell containing a set ov vertically stacked checkboxes */
 .td-with-checkboxes {
   text-align: left;
diff --git a/initialize.php b/initialize.php
index c8f485ef7..db097d442 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5508");
+define("APP_VERSION", "1.19.28.5509");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 93e6bd31d1c913049894257b2325cf5f161b5651 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 May 2021 21:07:39 +0000
Subject: [PATCH 1524/1848] Moved timer.php from legacy mobile directory to
 root.

---
 WEB-INF/templates/timer2.tpl | 119 ++++++++++++++
 initialize.php               |   2 +-
 timer.php                    | 309 +++++++++++++++++++++++++++++++++++
 3 files changed, 429 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/timer2.tpl
 create mode 100644 timer.php

diff --git a/WEB-INF/templates/timer2.tpl b/WEB-INF/templates/timer2.tpl
new file mode 100644
index 000000000..a8f9b1c97
--- /dev/null
+++ b/WEB-INF/templates/timer2.tpl
@@ -0,0 +1,119 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{include file="time_script.tpl"}
+
+<p><span id="hour">00</span><span id="separator">:</span><span id="min">00</span>
+
+<script>
+var timerID = null;
+var startDate = null;
+var endDate = null;
+var delta = null;
+var separatorVisible = true;
+
+function toggleSeparator() {
+  document.getElementById('separator').style.visibility = separatorVisible ? 'hidden' : 'visible';
+  separatorVisible = !separatorVisible;
+}
+
+function updateTimer() {
+  if (startDate == null) startDate = new Date();
+  endDate = new Date();
+  delta = new Date(endDate - startDate);
+
+  var hours = delta.getUTCHours();
+  if (hours < 10) hours = '0'+hours;
+  document.getElementById('hour').innerHTML = hours;
+
+  var minutes = delta.getUTCMinutes();
+  if (minutes <  10) minutes = '0'+minutes;
+  document.getElementById('min').innerHTML = minutes;
+
+  // Toggle visibility of separator for 100 ms.
+  toggleSeparator();
+  setTimeout('toggleSeparator()', 100);
+}
+
+function startTimer() {
+  if (timerID) return;
+
+  updateTimer();
+  timerID = setInterval('updateTimer()', 1000);
+}
+
+function stopTimer() {
+  clearInterval(timerID);
+  timerID = null;
+}
+</script>
+
+{if $uncompleted}
+<script>
+startDate = new Date();
+startDate.setHours({substr($uncompleted['start'], 0, 2)});
+startDate.setMinutes({substr($uncompleted['start'], 3, 2)});
+startDate.setSeconds(0);
+updateTimer();
+startTimer();
+</script>
+{/if}
+
+{$forms.timeRecordForm.open}
+<table class="centered-table">
+{if $show_client}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_billable}
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if isset($custom_fields) && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+{if $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_task}
+  <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.timeRecordForm.task.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.timeRecordForm.btn_start.control} {$forms.timeRecordForm.btn_stop.control}</div>
+{$forms.timeRecordForm.close}
+
+<div class="day-totals">
+<table class="centered-table">
+  <tr>
+    <td class="day-totals-col1">{$i18n.label.week_total}: {$week_total}</td>
+    <td class="day-totals-col2">{$i18n.label.day_total}: {$day_total}</td>
+  </tr>
+</table>
+</div>
diff --git a/initialize.php b/initialize.php
index db097d442..d658db002 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5509");
+define("APP_VERSION", "1.19.28.5510");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timer.php b/timer.php
new file mode 100644
index 000000000..59c06d89b
--- /dev/null
+++ b/timer.php
@@ -0,0 +1,309 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('form.Form');
+import('ttUserHelper');
+import('ttGroupHelper');
+import('ttClientHelper');
+import('ttTimeHelper');
+import('DateAndTime');
+
+// Access check.
+if (!ttAccessAllowed('track_own_time')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $user->getConfigOption('task_required');
+
+// Initialize and store date in session.
+$cl_date  = $request->getParameter('date', @$_SESSION['date']);
+$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
+if($selected_date->isError())
+  $selected_date = new DateAndTime(DB_DATEFORMAT);
+if(!$cl_date)
+  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+$_SESSION['date'] = $cl_date;
+// TODO: for time page we may limit the day to today only.
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+// Initialize variables.
+$cl_start = trim($request->getParameter('browser_time'));
+$cl_finish = trim($request->getParameter('browser_time'));
+$cl_billable = 1;
+if ($user->isPluginEnabled('iv')) {
+  if ($request->isPost()) {
+    $cl_billable = $request->getParameter('billable');
+    $_SESSION['billable'] = (int) $cl_billable;
+  } else 
+    if (isset($_SESSION['billable']))
+      $cl_billable = $_SESSION['billable'];
+}
+$cl_client = $request->getParameter('client', @$_SESSION['client']);
+$_SESSION['client'] = $cl_client;
+$cl_project = $request->getParameter('project', @$_SESSION['project']);
+$_SESSION['project'] = $cl_project;
+$cl_task = $request->getParameter('task', @$_SESSION['task']);
+$_SESSION['task'] = $cl_task;
+
+// Handle time custom fields.
+$timeCustomFields = array();
+if (isset($custom_fields) && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $control_name = 'time_field_'.$timeField['id'];
+    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+    $_SESSION[$control_name] = $cl_control_name;
+    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+      'control_name' => $control_name,
+      'label' => $timeField['label'],
+      'type' => $timeField['type'],
+      'required' => $timeField['required'],
+      'value' => trim($cl_control_name));
+  }
+}
+
+// Obtain uncompleted record. Assumtion is that only 1 uncompleted record is allowed.
+$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
+$enable_controls = ($uncompleted == null);
+
+// Elements of timeRecordForm.
+$form = new Form('timeRecordForm');
+
+// Dropdown for clients in MODE_TIME. Use all active clients.
+if (MODE_TIME == $trackingMode && $showClient) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'style'=>'width: 250px;',
+      'enable'=>$enable_controls,
+      'value'=>$cl_client,
+      'data'=>$active_clients,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  // Note: in other modes the client list is filtered to relevant clients only. See below.
+}
+
+// Billable checkbox.
+if ($showBillable)
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable,'enable'=>$enable_controls));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text',
+        'name'=>$field_name,
+        'enable'=>$enable_controls,
+        'value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'enable'=>$enable_controls,
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
+  // Dropdown for projects assigned to user.
+  $project_list = $user->getAssignedProjects();
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillTaskDropdown(this.value);',
+    'name'=>'project',
+    'enable'=>$enable_controls,
+    'value'=>$cl_project,
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+  // Client dropdown.
+  if ($showClient) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    // We need an array of assigned project ids to do some trimming.
+    foreach($project_list as $project)
+      $projects_assigned_to_user[] = $project['id'];
+
+    // Build a client list out of active clients. Use only clients that are relevant to user.
+    // Also trim their associated project list to only assigned projects (to user).
+    foreach($active_clients as $client) {
+      $projects_assigned_to_client = explode(',', $client['projects']);
+      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
+      if ($intersection) {
+        $client['projects'] = implode(',', $intersection);
+        $client_list[] = $client;
+      }
+    }
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'enable'=>$enable_controls,
+      'value'=>$cl_client,
+      'data'=>$client_list,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  }
+}
+
+// Task dropdown.
+if ($showTask) {
+  $task_list = ttGroupHelper::getActiveTasks();
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'task',
+    'enable'=>$enable_controls,
+    'value'=>$cl_task,
+    'data'=>$task_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+}
+
+// A hidden control for today's date from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on button click.
+
+// A hidden control for current time from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_time','value'=>''));  // User current time, which gets filled in on button click.
+
+// Start and stop buttons.
+$enable_start = $uncompleted ? false : true;
+if (!$uncompleted)
+  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.start'),'enable'=>$enable_start));
+else
+  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.finish'),'enable'=>!$enable_start));
+
+// Submit.
+if ($request->isPost()) {
+  if ($request->getParameter('btn_start')) {
+    // Start button clicked. We need to create a new uncompleted record with only the start time.
+    $cl_finish = null;
+
+    // Validate user input.
+    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
+      $err->add($i18n->get('error.client'));
+    // Validate input in time custom fields.
+    if ($custom_fields && $custom_fields->timeFields) {
+      foreach ($timeCustomFields as $timeField) {
+        // Validation is the same for text and dropdown fields.
+        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+      }
+    }
+    if ($showProject) {
+      if (!$cl_project) $err->add($i18n->get('error.project'));
+    }
+    if ($showTask && $taskRequired) {
+      if (!$cl_task) $err->add($i18n->get('error.task'));
+    }
+    // Finished validating user input.
+
+    // Prohibit creating entries in future.
+    if (!$user->isOptionEnabled('future_entries')) {
+      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+      if ($selected_date->after($browser_today))
+        $err->add($i18n->get('error.future_date'));
+    }
+
+    // Prohibit creating time entries in locked interval.
+    if ($user->isDateLocked($selected_date))
+      $err->add($i18n->get('error.range_locked'));
+
+    // Prohibit creating another uncompleted record.
+    if ($err->no() && $uncompleted) {
+      $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
+    }
+
+    // Prohibit creating an overlapping record.
+    if ($err->no()) {
+      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
+        $err->add($i18n->get('error.overlap'));
+    }
+
+    if ($err->no()) {
+      $id = ttTimeHelper::insert(array(
+        'date' => $cl_date,
+        'client' => $cl_client,
+        'project' => $cl_project,
+        'task' => $cl_task,
+        'start' => $cl_start,
+        'finish' => $cl_finish,
+        'duration' => $cl_duration,
+        'note' => $cl_note,
+        'billable' => $cl_billable));
+
+      // Insert time custom fields if we have them.
+      $result = true;
+      if ($id && $custom_fields && $custom_fields->timeFields) {
+        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
+      }
+
+      if ($id && $result) {
+        header('Location: timer.php');
+        exit();
+      }
+      $err->add($i18n->get('error.db'));
+    }
+  }
+  if ($request->getParameter('btn_stop')) {
+    // Stop button clicked. We need to finish an uncompleted record in progress.
+    $record = ttTimeHelper::getRecord($uncompleted['id']);
+
+    // Can we complete this record?
+    if (ttTimeHelper::isValidInterval($record['start'], $cl_finish) // finish time is greater than start time
+      && !ttTimeHelper::overlaps($user->getUser(), $cl_date, $record['start'], $cl_finish)) { // no overlap
+      $res = ttTimeHelper::update(array(
+        'id'=>$record['id'],
+        'date'=>$cl_date,
+        'client'=>$record['client_id'],
+        'project'=>$record['project_id'],
+        'task'=>$record['task_id'],
+        'start'=>$record['start'],
+        'finish'=>$cl_finish,
+        'note'=>$record['comment'],
+        'billable'=>$record['billable']));
+      if ($res) {
+        header('Location: timer.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    } else {
+      // Cannot complete, redirect for manual edit.
+      header('Location: time_edit.php?id='.$record['id']);
+      exit();
+    }
+  }
+} // isPost
+
+$week_total = ttTimeHelper::getTimeForWeek($cl_date);
+$smarty->assign('week_total', $week_total);
+$smarty->assign('uncompleted', $uncompleted);
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
+$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
+$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
+$smarty->assign('client_list', $client_list);
+$smarty->assign('project_list', $project_list);
+$smarty->assign('task_list', $task_list);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="fillDropdowns()"');
+$smarty->assign('timestring', $selected_date->toString($user->date_format));
+$smarty->assign('title', $i18n->get('title.time'));
+$smarty->assign('content_page_name', 'timer2.tpl');
+$smarty->display('index2.tpl');

From 8bb32dd4cdd3480a9dfc7f8f6f56fe66d4aa6a21 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 3 May 2021 21:12:24 +0000
Subject: [PATCH 1525/1848] Removed all remaining legacy mobile pages.

---
 WEB-INF/templates/mobile/header.tpl     | 128 --------
 WEB-INF/templates/mobile/index.tpl      |   3 -
 WEB-INF/templates/mobile/login.db.tpl   |   7 -
 WEB-INF/templates/mobile/login.ldap.tpl |   7 -
 WEB-INF/templates/mobile/login.tpl      |  17 -
 WEB-INF/templates/mobile/time.tpl       | 107 -------
 WEB-INF/templates/mobile/timer.tpl      | 119 -------
 initialize.php                          |   2 +-
 mobile/index.php                        |  33 --
 mobile/login.php                        |  76 -----
 mobile/time.php                         | 393 ------------------------
 mobile/timer.php                        | 309 -------------------
 timer.php                               |   1 -
 13 files changed, 1 insertion(+), 1201 deletions(-)
 delete mode 100644 WEB-INF/templates/mobile/header.tpl
 delete mode 100644 WEB-INF/templates/mobile/index.tpl
 delete mode 100644 WEB-INF/templates/mobile/login.db.tpl
 delete mode 100644 WEB-INF/templates/mobile/login.ldap.tpl
 delete mode 100644 WEB-INF/templates/mobile/login.tpl
 delete mode 100644 WEB-INF/templates/mobile/time.tpl
 delete mode 100644 WEB-INF/templates/mobile/timer.tpl
 delete mode 100644 mobile/index.php
 delete mode 100644 mobile/login.php
 delete mode 100644 mobile/time.php
 delete mode 100644 mobile/timer.php

diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
deleted file mode 100644
index d4cf2c53b..000000000
--- a/WEB-INF/templates/mobile/header.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="icon" href="../favicon.ico" type="image/x-icon">
-  <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
-  <link href="../{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
-{if $i18n.language.rtl}
-  <link href="../{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
-{/if}
-{if $user->getCustomCss()}
-  <link href="../custom_css.php" rel="stylesheet" type="text/css">
-{/if}
-  <title>Time Tracker{if $title} - {$title}{/if}</title>
-  <script src="../js/strftime.js"></script>
-  <script>
-    {* Setup locale for strftime *}
-    {$js_date_locale}
-  </script>
-  <script src="../js/strptime.js"></script>
-</head>
-
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" {$onload}>
-
-{assign var="tab_width" value="300"}
-
-<table height="100%" cellspacing="0" cellpadding="0" border="0" style="margin-left: auto; margin-right: auto;">
-  <tr>
-    <td valign="top" align="center"> <!-- This is to centrally align all our content. -->
-
-      <!-- top image -->
-      <table cellspacing="0" cellpadding="0" width="100%" border="0">
-        <tr>
-{if $user->custom_logo}
-          <td align="center">
-{else}
-          <td bgcolor="#a6ccf7" background="../img/top_bg.gif" align="center">
-{/if}
-            <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
-              <tr>
-                <td valign="top">
-                  <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../img/1x1.gif" border="0"></td></tr>
-                    <tr valign="top">
-{if $user->custom_logo}
-                      <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$mobile_custom_logo}" border="0"></td>
-{else}
-                      <td height="55" align="center"><img alt="Anuko Time Tracker" width="300" height="43" src="../img/logo.png" border="0"></td>
-{/if}
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top image -->
-      
-{if $authenticated}
-  {if $user->can('administer_site')}
-  
-      <!-- sub menu for admin -->
-      <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../img/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
-            <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for admin -->
-  {else}
-
-      <!-- sub menu for authorized user -->
-      <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../img/subm_bg.gif">&nbsp;
-    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
-           <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
-           <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
-    {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
-           <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
-    {/if}
-    {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode()}
-           <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
-    {/if}
-    {if $user->can('view_users') || $user->can('manage_users')}
-           <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
-    {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for authorized user -->
-  {/if}
-{/if}
-      
-      <!-- output errors -->
-{if $err->yes()}
-      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="error">
-  {foreach $err->getErrors() as $error}
-            {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
-  {/foreach}
-          </td>
-        </tr>
-      </table>
-{/if}
-      <!-- end of output errors -->
-
-      <!-- output messages -->
-{if $msg->yes()}
-      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="info_message">
-  {foreach $msg->getErrors() as $message}
-            {$message.message}<br> {* No need to escape. *}
-  {/foreach}
-          </td>
-        </tr>
-      </table>
-{/if}
-      <!-- end of output messages -->
diff --git a/WEB-INF/templates/mobile/index.tpl b/WEB-INF/templates/mobile/index.tpl
deleted file mode 100644
index babdac50e..000000000
--- a/WEB-INF/templates/mobile/index.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{include file="mobile/header.tpl"}
-
-{if $content_page_name}{include file="$content_page_name"}{/if}
diff --git a/WEB-INF/templates/mobile/login.db.tpl b/WEB-INF/templates/mobile/login.db.tpl
deleted file mode 100644
index 2968b1dab..000000000
--- a/WEB-INF/templates/mobile/login.db.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<table border="0">
-  <tr><td>{$i18n.label.login}:</td></tr>
-  <tr><td>{$forms.loginForm.login.control}</td></tr>
-  <tr><td>{$i18n.label.password}:</td></tr>
-  <tr><td>{$forms.loginForm.password.control}</td></tr>
-  <tr><td align="center" height="50">{$forms.loginForm.btn_login.control}</td></tr>
-</table>
diff --git a/WEB-INF/templates/mobile/login.ldap.tpl b/WEB-INF/templates/mobile/login.ldap.tpl
deleted file mode 100644
index 2968b1dab..000000000
--- a/WEB-INF/templates/mobile/login.ldap.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<table border="0">
-  <tr><td>{$i18n.label.login}:</td></tr>
-  <tr><td>{$forms.loginForm.login.control}</td></tr>
-  <tr><td>{$i18n.label.password}:</td></tr>
-  <tr><td>{$forms.loginForm.password.control}</td></tr>
-  <tr><td align="center" height="50">{$forms.loginForm.btn_login.control}</td></tr>
-</table>
diff --git a/WEB-INF/templates/mobile/login.tpl b/WEB-INF/templates/mobile/login.tpl
deleted file mode 100644
index 1a2e888e4..000000000
--- a/WEB-INF/templates/mobile/login.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-<!--
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-//-->
-</script>
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      {$forms.loginForm.open}
-      {include file="mobile/login.`$smarty.const.AUTH_MODULE`.tpl"}
-      {$forms.loginForm.close}
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
deleted file mode 100644
index 6b8bca0c6..000000000
--- a/WEB-INF/templates/mobile/time.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-{include file="time_script.tpl"}
-
-<style>
-.not_billable td {
-  color: #ff6666;
-}
-</style>
-
-<table cellspacing="3" cellpadding="0" border="0" width="100%">
-  <tr>
-    <td class="sectionHeaderNoBorder" align="right"><a href="time.php?date={$prev_date}">&lt;&lt;</a></td>
-    <td class="sectionHeaderNoBorder" align="center">{$timestring}</td>
-    <td class="sectionHeaderNoBorder" align="left"><a href="time.php?date={$next_date}">&gt;&gt;</a></td>
-  </tr>
-</table>
-
-<table cellspacing="3" cellpadding="0" border="0" width="100%">
-  <tr>
-    <td align="center">
-{if $time_records}
-      <table class="mobile-table-details">
-  {foreach $time_records as $record}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {if $show_project}
-          <td valign="top">{$record.project|escape}</td>
-    {/if}
-          <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
-          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a>{/if}</td>
-          <td align="center">{if $record.approved || $record.timesheet_id || $record.invoice_id}&nbsp;{else}<a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a>{/if}</td>
-        </tr>
-  {/foreach}
-      </table>
-      <table border="0">
-        <tr>
-          <td align="right">{$i18n.label.day_total}:</td>
-          <td>{$day_total}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.week_total}:</td>
-          <td>{$week_total}</td>
-        </tr>
-      </table>
-{/if}
-    </td>
-  </tr>
-</table>
-
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table width = "100%">
-        <tr>
-          <td valign="top">
-            <table border="0">
-{if $user_dropdown}
-              <tr><td>{$i18n.label.user}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.user.control}</td></tr>
-{/if}
-{if $show_client}
-              <tr><td>{$i18n.label.client}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
-{/if}
-{if $show_billable}
-              <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-              <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
-              {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-              <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
-              </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-              <tr><td>{$i18n.label.project}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
-{/if}
-{if $show_task}
-              <tr><td>{$i18n.label.task}{if $task_required} (*){/if}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
-{/if}
-{if $show_start}
-              <tr><td>{$i18n.label.start}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.start.control}&nbsp;<input onclick="setNow('start');" type="button" value="{$i18n.button.now}"></td></tr>
-              <tr><td>{$i18n.label.finish}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.finish.control}&nbsp;<input onclick="setNow('finish');" type="button" value="{$i18n.button.now}"></td></tr>
-{/if}
-{if $show_duration}
-              <tr><td>{$i18n.label.duration}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.duration.control}</td></tr>
-{/if}
-{if $template_dropdown}
-              <tr><td>{$i18n.label.template}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.template.control}</td></tr>
-{/if}
-              <tr><td>{$i18n.label.note}:</td></tr>
-              <tr><td>{$forms.timeRecordForm.note.control}</td></tr>
-            </table>
-          </td>
-        </tr>
-        <tr><td colspan="2" height="50" align="center">{$forms.timeRecordForm.btn_submit.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.timeRecordForm.close}
diff --git a/WEB-INF/templates/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl
deleted file mode 100644
index 1fee04af3..000000000
--- a/WEB-INF/templates/mobile/timer.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-{include file="time_script.tpl"}
-
-<p><span id="hour">00</span><span id="separator">:</span><span id="min">00</span>
-
-<script>
-var timerID = null;
-var startDate = null;
-var endDate = null;
-var delta = null;
-var separatorVisible = true;
-
-function toggleSeparator() {
-  document.getElementById('separator').style.visibility = separatorVisible ? 'hidden' : 'visible';
-  separatorVisible = !separatorVisible;
-}
-
-function updateTimer() {
-  if (startDate == null) startDate = new Date();
-  endDate = new Date();
-  delta = new Date(endDate - startDate);
-
-  var hours = delta.getUTCHours();
-  if (hours < 10) hours = '0'+hours;
-  document.getElementById('hour').innerHTML = hours;
-
-  var minutes = delta.getUTCMinutes();
-  if (minutes <  10) minutes = '0'+minutes;
-  document.getElementById('min').innerHTML = minutes;
-
-  // Toggle visibility of separator for 100 ms.
-  toggleSeparator();
-  setTimeout('toggleSeparator()', 100);
-}
-
-function startTimer() {
-  if (timerID) return;
-
-  updateTimer();
-  timerID = setInterval('updateTimer()', 1000);
-}
-
-function stopTimer() {
-  clearInterval(timerID);
-  timerID = null;
-}
-</script>
-
-{if $uncompleted}
-<script>
-startDate = new Date();
-startDate.setHours({substr($uncompleted['start'], 0, 2)});
-startDate.setMinutes({substr($uncompleted['start'], 3, 2)});
-startDate.setSeconds(0);
-updateTimer();
-startTimer();
-</script>
-{/if}
-
-{$forms.timeRecordForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-<tr>
-  <td>
-  <table width="100%">
-  <tr>
-    <td valign="top">
-    <table border="0">
-{if $show_client}
-    <tr><td>{$i18n.label.client}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.client.control}</td></tr>
-{/if}
-{if $show_billable}
-    <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-      <tr><td>{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td></tr>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      <tr><td>{$forms.timeRecordForm.$control_name.control}</td></tr>
-    </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-    <tr><td>{$i18n.label.project}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.project.control}</td></tr>
-{/if}
-{if $show_task}
-    <tr><td>{$i18n.label.task}{if $task_required} (*){/if}:</td></tr>
-    <tr><td>{$forms.timeRecordForm.task.control}</td></tr>
-{/if}
-    </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" height="50" align="center">{$forms.timeRecordForm.btn_start.control} {$forms.timeRecordForm.btn_stop.control}</td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
-{$forms.timeRecordForm.close}
-
-<table cellspacing="3" cellpadding="0" border="0" width="100%">
-<tr>
-  <td align="center">
-    {if $time_records}
-    <table border="0">
-      <tr>
-        <td align="right">{$i18n.label.day_total}:</td>
-        <td>{$day_total}</td>
-      </tr>
-      <tr>
-        <td align="right">{$i18n.label.week_total}:</td>
-        <td>{$week_total}</td>
-      </tr>
-    </table>
-    {/if}
-  </td>
-</tr>
-</table>
diff --git a/initialize.php b/initialize.php
index d658db002..745d1e4ae 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5510");
+define("APP_VERSION", "1.19.28.5511");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mobile/index.php b/mobile/index.php
deleted file mode 100644
index 4da5fab10..000000000
--- a/mobile/index.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../index.php');
-exit();
-// Below is no longer used code.
-
-// Redirects for admin and client roles.
-if ($auth->isAuthenticated()) {
-  if ($user->can('administer_site')) {
-    header('Location: ../admin_groups.php');
-    exit();
-  } elseif ($user->isClient()) {
-    header('Location: ../reports.php');
-    exit();
-  }
-}
-// Redirect to time.php or mobile/time.php for other roles.
-?>
-
-<html>
-  <script src="../js/strftime.js"></script>
-  <script>
-    location.href = "../time.php?date="+(new Date()).strftime('<?php print DB_DATEFORMAT;?>');
-  </script>
-  <noscript>
-    <p>Your browser does not support JavaScript. This application will not work without it.</p>
-  </noscript>
-</html>
diff --git a/mobile/login.php b/mobile/login.php
deleted file mode 100644
index 1375b21ae..000000000
--- a/mobile/login.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttOrgHelper');
-import('ttUser');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../login.php');
-exit();
-// Below is no longer used code.
-
-
-if ($request->isPost()) {
-  $cl_login = $request->getParameter('login');
-} else {
-  $cl_login = @$_COOKIE[LOGIN_COOKIE_NAME];
-}
-$cl_password = $request->getParameter('password');
-
-$form = new Form('loginForm');
-$form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'100','name'=>'login','style'=>'width: 220px;','value'=>$cl_login));
-$form->addInput(array('type'=>'password','size'=>'25','maxlength'=>'50','name'=>'password','style'=>'width: 220px;','value'=>$cl_password));
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
-$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.login')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
-  if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
-
-  if ($err->no()) {
-
-    // Use the "limit" plugin if we have one. Ignore include errors.
-    // The "limit" plugin is not required for normal operation of Time Tracker.
-    @include('../plugins/limit/access_check.php');
-
-    if ($auth->doLogin($cl_login, $cl_password)) {
-
-      // Set current user date (as determined by user browser) into session.
-      $current_user_date = $request->getParameter('browser_today', null);
-      if ($current_user_date)
-        $_SESSION['date'] = $current_user_date;
-
-      // Remember user login in a cookie.
-      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
-
-      $user = new ttUser(null, $auth->getUserId());
-      // Redirect, depending on user role.
-      if ($user->can('administer_site')) {
-        header('Location: ../admin_groups.php');
-      } elseif ($user->isClient()) {
-        header('Location: ../reports.php');
-      } else {
-        header('Location: time.php');
-      }
-      exit();
-    } else
-      $err->add($i18n->get('error.auth'));
-  }
-} // isPost
-
-if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())
-  $err->add($i18n->get('error.no_groups'));
-
-// Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
-$show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
-
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_hint', $show_hint);
-$smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
-$smarty->assign('title', $i18n->get('title.login'));
-$smarty->assign('content_page_name', 'mobile/login.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/time.php b/mobile/time.php
deleted file mode 100644
index 387a56a89..000000000
--- a/mobile/time.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttUserHelper');
-import('ttGroupHelper');
-import('ttClientHelper');
-import('ttConfigHelper');
-import('ttTimeHelper');
-import('DateAndTime');
-
-// Mobile pages are no longer separate. Redirect to main page.
-header('Location: ../time.php');
-exit();
-// Below is no longer used code.
-
-// Access checks.
-if (!ttAccessAllowed('track_own_time')) {
-  header('Location: access_denied.php');
-  exit();
-}
-if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
-  exit();
-}
-if ($request->isPost()) {
-  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
-    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for whom we display this page.
-if ($request->isPost() && $userChanged) {
-  $user_id = (int)$request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-$group_id = $user->getGroup();
-$config = new ttConfigHelper($user->getConfig());
-
-$showClient = $user->isPluginEnabled('cl');
-$showBillable = $user->isPluginEnabled('iv');
-$trackingMode = $user->getTrackingMode();
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-if ($showTask) $taskRequired = $config->getDefinedValue('task_required');
-$recordType = $user->getRecordType();
-$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-
-// Determine previous and next dates for simple navigation.
-$prev_date = date('Y-m-d', strtotime('-1 day', strtotime($cl_date)));
-$next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date)));
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-// Initialize variables.
-$cl_start = trim($request->getParameter('start'));
-$cl_finish = trim($request->getParameter('finish'));
-$cl_duration = trim($request->getParameter('duration'));
-$cl_note = trim($request->getParameter('note'));
-$cl_billable = 1;
-if ($showBillable) {
-  if ($request->isPost()) {
-    $cl_billable = $request->getParameter('billable');
-    $_SESSION['billable'] = (int) $cl_billable;
-  } else 
-    if (isset($_SESSION['billable']))
-      $cl_billable = $_SESSION['billable'];
-}
-$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
-$_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
-$_SESSION['project'] = $cl_project;
-$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
-$_SESSION['task'] = $cl_task;
-
-// Handle time custom fields.
-$timeCustomFields = array();
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $control_name = 'time_field_'.$timeField['id'];
-    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
-    $_SESSION[$control_name] = $cl_control_name;
-    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-      'control_name' => $control_name,
-      'label' => $timeField['label'],
-      'type' => $timeField['type'],
-      'required' => $timeField['required'],
-      'value' => trim($cl_control_name));
-  }
-}
-
-// Elements of timeRecordForm.
-$form = new Form('timeRecordForm');
-
-// Dropdown for user and a hidden control to indicate user change.
-if ($user->can('track_time')) {
-  $rank = $user->getMaxRankForGroup($group_id);
-  if ($user->can('track_own_time'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
-  if (count($user_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.timeRecordForm.user_changed.value=1;document.timeRecordForm.submit();',
-      'name'=>'user',
-      'style'=>'width: 250px;',
-      'value'=>$user_id,
-      'data'=>$user_list,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $smarty->assign('user_dropdown', 1);
-  }
-}
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-// Note: for other tracking modes the control is added further below.
-if (MODE_TIME == $trackingMode && $showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$active_clients,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-// Billable checkbox.
-if ($showBillable)
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-// If we show project dropdown, add controls for project and client.
-if ($showProject) {
-  // Dropdown for projects assigned to user.
-  $options['include_templates'] = $user->isPluginEnabled('tp') && $config->getDefinedValue('bind_templates_with_projects');
-  $project_list = $user->getAssignedProjects($options);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);fillTemplateDropdown(this.value);prepopulateNote();',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Client dropdown.
-  if ($showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming. 
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user))
-        $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-
-// Task dropdown.
-if ($showTask) {
-  $task_list = ttGroupHelper::getActiveTasks();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'task',
-    'style'=>'width: 250px;',
-    'value'=>$cl_task,
-    'data'=>$task_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-}
-
-// Start and finish controls.
-if ($showStart) {
-  $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
-  $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !$user->canOverridePunchMode()) {
-    // Make the start and finish fields read-only.
-    $form->getElement('start')->setEnabled(false);
-    $form->getElement('finish')->setEnabled(false);
-  }
-}
-
-// Duration control.
-if ($showDuration)
-  $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
-
-// If we have templates, add a dropdown to select one.
-if ($user->isPluginEnabled('tp')){
-  $template_list = ttGroupHelper::getActiveTemplates();
-  if (count($template_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillNote(this.value);',
-      'name'=>'template',
-      'style'=>'width: 250px;',
-      'data'=>$template_list,
-      'datakeys'=>array('id','name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $smarty->assign('template_dropdown', 1);
-    $smarty->assign('bind_templates_with_projects', $config->getDefinedValue('bind_templates_with_projects'));
-    $smarty->assign('prepopulate_note', $config->getDefinedValue('prepopulate_note'));
-    $smarty->assign('template_list', $template_list);
-  }
-}
-
-// Note control.
-$form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height: 60px;','value'=>$cl_note));
-
-// A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-
-// Submit button.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-    // Submit button clicked.
-    // Validate user input.
-    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
-      $err->add($i18n->get('error.client'));
-    // Validate input in time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
-      foreach ($timeCustomFields as $timeField) {
-        // Validation is the same for text and dropdown fields.
-        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
-      }
-    }
-    if ($showProject) {
-      if (!$cl_project) $err->add($i18n->get('error.project'));
-    }
-    if ($showTask && $taskRequired) {
-      if (!$cl_task) $err->add($i18n->get('error.task'));
-    }
-    if (strlen($cl_duration) == 0) {
-      if ($cl_start || $cl_finish) {
-        if (!ttTimeHelper::isValidTime($cl_start))
-          $err->add($i18n->get('error.field'), $i18n->get('label.start'));
-        if ($cl_finish) {
-          if (!ttTimeHelper::isValidTime($cl_finish))
-            $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
-          if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
-        }
-      } else {
-        if ($showStart) {
-          $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
-          $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
-        }
-        if ($showDuration)
-          $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
-      }
-    } else {
-      if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
-        $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-    }
-    if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
-      $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-    }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
-    // Finished validating user input.
-
-    // Prohibit creating entries in future.
-    if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
-        $err->add($i18n->get('error.future_date'));
-    }
-
-    // Prohibit creating entries in locked range.
-    if ($user->isDateLocked($selected_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Prohibit creating another uncompleted record.
-    if ($err->no()) {
-      if (($not_completed_rec = ttTimeHelper::getUncompleted($user_id)) && (($cl_finish == '') && ($cl_duration == '')))
-        $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
-    }
-
-    // Prohibit creating an overlapping record.
-    if ($err->no()) {
-      if (ttTimeHelper::overlaps($user_id, $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->get('error.overlap'));
-    }
-
-    if ($err->no()) {
-      $id = ttTimeHelper::insert(array(
-        'date' => $cl_date,
-        'client' => $cl_client,
-        'project' => $cl_project,
-        'task' => $cl_task,
-        'start' => $cl_start,
-        'finish' => $cl_finish,
-        'duration' => $cl_duration,
-        'note' => $cl_note,
-        'billable' => $cl_billable));
-
-      // Insert time custom fields if we have them.
-      $result = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
-        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
-      }
-
-      if ($id && $result) {
-        header('Location: time.php');
-        exit();
-      }
-      $err->add($i18n->get('error.db'));
-    }
-  }
-} // isPost
-
-$smarty->assign('next_date', $next_date);
-$smarty->assign('prev_date', $prev_date);
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
-$smarty->assign('week_total', ttTimeHelper::getTimeForWeek($selected_date));
-$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
-$smarty->assign('show_client', $showClient);
-$smarty->assign('show_billable', $showBillable);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('show_task', $showTask);
-$smarty->assign('task_required', $taskRequired);
-$smarty->assign('show_start', $showStart);
-$smarty->assign('show_duration', $showDuration);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();"');
-$smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
-$smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'mobile/time.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/mobile/timer.php b/mobile/timer.php
deleted file mode 100644
index 1d870b1ca..000000000
--- a/mobile/timer.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('../initialize.php');
-import('form.Form');
-import('ttUserHelper');
-import('ttGroupHelper');
-import('ttClientHelper');
-import('ttTimeHelper');
-import('DateAndTime');
-
-// Access check.
-if (!ttAccessAllowed('track_own_time')) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$showClient = $user->isPluginEnabled('cl');
-$showBillable = $user->isPluginEnabled('iv');
-$trackingMode = $user->getTrackingMode();
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-if ($showTask) $taskRequired = $user->getConfigOption('task_required');
-
-// Initialize and store date in session.
-$cl_date  = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-// TODO: for time page we may limit the day to today only.
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('../plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-// Initialize variables.
-$cl_start = trim($request->getParameter('browser_time'));
-$cl_finish = trim($request->getParameter('browser_time'));
-$cl_billable = 1;
-if ($user->isPluginEnabled('iv')) {
-  if ($request->isPost()) {
-    $cl_billable = $request->getParameter('billable');
-    $_SESSION['billable'] = (int) $cl_billable;
-  } else 
-    if (isset($_SESSION['billable']))
-      $cl_billable = $_SESSION['billable'];
-}
-$cl_client = $request->getParameter('client', @$_SESSION['client']);
-$_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', @$_SESSION['project']);
-$_SESSION['project'] = $cl_project;
-$cl_task = $request->getParameter('task', @$_SESSION['task']);
-$_SESSION['task'] = $cl_task;
-
-$timeCustomFields = array();
-// If we have time custom fields - collect input.
-if ($request->isPost()) {
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
-  }
-}
-
-// Obtain uncompleted record. Assumtion is that only 1 uncompleted record is allowed.
-$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
-$enable_controls = ($uncompleted == null);
-
-// Elements of timeRecordForm.
-$form = new Form('timeRecordForm');
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $trackingMode && $showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'enable'=>$enable_controls,
-      'value'=>$cl_client,
-      'data'=>$active_clients,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-// Billable checkbox.
-if ($showBillable)
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable,'enable'=>$enable_controls));
-
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-// If we show project dropdown, add controls for project and client.
-if ($showProject) {
-  // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'enable'=>$enable_controls,
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Client dropdown.
-  if ($showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming. 
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'enable'=>$enable_controls,
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-
-// Task dropdown.
-if ($showTask) {
-  $task_list = ttGroupHelper::getActiveTasks();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'task',
-    'style'=>'width: 250px;',
-    'enable'=>$enable_controls,
-    'value'=>$cl_task,
-    'data'=>$task_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-}
-
-// A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on button click.
-
-// A hidden control for current time from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_time','value'=>''));  // User current time, which gets filled in on button click.
-
-// Start and stop buttons.
-$enable_start = $uncompleted ? false : true;
-if (!$uncompleted)
-  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.start'),'enable'=>$enable_start));
-else
-  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.finish'),'enable'=>!$enable_start));
-
-// Submit.
-if ($request->isPost()) {
-  if ($request->getParameter('btn_start')) {
-    // Start button clicked. We need to create a new uncompleted record with only the start time.
-    $cl_finish = null;
-
-    // Validate user input.
-    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
-      $err->add($i18n->get('error.client'));
-    // Validate input in time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
-      foreach ($timeCustomFields as $timeField) {
-        // Validation is the same for text and dropdown fields.
-        if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
-      }
-    }
-    if ($showProject) {
-      if (!$cl_project) $err->add($i18n->get('error.project'));
-    }
-    if ($showTask && $taskRequired) {
-      if (!$cl_task) $err->add($i18n->get('error.task'));
-    }
-    // Finished validating user input.
-
-    // Prohibit creating entries in future.
-    if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
-        $err->add($i18n->get('error.future_date'));
-    }
-
-    // Prohibit creating time entries in locked interval.
-    if ($user->isDateLocked($selected_date))
-      $err->add($i18n->get('error.range_locked'));
-
-    // Prohibit creating another uncompleted record.
-    if ($err->no() && $uncompleted) {
-      $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
-    }
-
-    // Prohibit creating an overlapping record.
-    if ($err->no()) {
-      if (ttTimeHelper::overlaps($user->getUser(), $cl_date, $cl_start, $cl_finish))
-        $err->add($i18n->get('error.overlap'));
-    }
-
-    if ($err->no()) {
-      $id = ttTimeHelper::insert(array(
-        'date' => $cl_date,
-        'client' => $cl_client,
-        'project' => $cl_project,
-        'task' => $cl_task,
-        'start' => $cl_start,
-        'finish' => $cl_finish,
-        'duration' => $cl_duration,
-        'note' => $cl_note,
-        'billable' => $cl_billable));
-
-      // Insert time custom fields if we have them.
-      $result = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
-        $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
-      }
-
-      if ($id && $result) {
-        header('Location: timer.php');
-        exit();
-      }
-      $err->add($i18n->get('error.db'));
-    }
-  }
-  if ($request->getParameter('btn_stop')) {
-    // Stop button clicked. We need to finish an uncompleted record in progress.
-    $record = ttTimeHelper::getRecord($uncompleted['id']);
-
-    // Can we complete this record?
-    if (ttTimeHelper::isValidInterval($record['start'], $cl_finish) // finish time is greater than start time
-      && !ttTimeHelper::overlaps($user->getUser(), $cl_date, $record['start'], $cl_finish)) { // no overlap
-      $res = ttTimeHelper::update(array(
-        'id'=>$record['id'],
-        'date'=>$cl_date,
-        'client'=>$record['client_id'],
-        'project'=>$record['project_id'],
-        'task'=>$record['task_id'],
-        'start'=>$record['start'],
-        'finish'=>$cl_finish,
-        'note'=>$record['comment'],
-        'billable'=>$record['billable']));
-      if ($res) {
-        header('Location: timer.php');
-        exit();
-      } else
-        $err->add($i18n->get('error.db'));
-    } else {
-      // Cannot complete, redirect for manual edit.
-      header('Location: time_edit.php?id='.$record['id']);
-      exit();
-    }
-  }
-} // isPost
-
-$week_total = ttTimeHelper::getTimeForWeek($cl_date);
-$smarty->assign('week_total', $week_total);
-$smarty->assign('uncompleted', $uncompleted);
-$smarty->assign('show_client', $showClient);
-$smarty->assign('show_billable', $showBillable);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('show_task', $showTask);
-$smarty->assign('task_required', $taskRequired);
-$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
-$smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'mobile/timer.tpl');
-$smarty->display('mobile/index.tpl');
diff --git a/timer.php b/timer.php
index 59c06d89b..e77317d9a 100644
--- a/timer.php
+++ b/timer.php
@@ -89,7 +89,6 @@
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'enable'=>$enable_controls,
       'value'=>$cl_client,
       'data'=>$active_clients,

From 1659eda0051747f5b714e5d693cd44d89a9c4a08 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 May 2021 14:20:40 +0000
Subject: [PATCH 1526/1848] Fixed population of time dropdown on timer.php.

---
 WEB-INF/lib/form/Combobox.class.php    | 30 +++--------------------
 WEB-INF/lib/form/Form.class.php        | 28 ++-------------------
 WEB-INF/lib/form/FormElement.class.php | 34 ++++----------------------
 initialize.php                         |  2 +-
 timer.php                              | 15 +++++++-----
 5 files changed, 20 insertions(+), 89 deletions(-)

diff --git a/WEB-INF/lib/form/Combobox.class.php b/WEB-INF/lib/form/Combobox.class.php
index a0ae0e5a0..d494d0f6d 100644
--- a/WEB-INF/lib/form/Combobox.class.php
+++ b/WEB-INF/lib/form/Combobox.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('form.FormElement');
 	
@@ -86,7 +62,7 @@ function getHtml() {
                 
                 if (!$this->isEnabled())
 		   $html .= " disabled";
-		   
+
 		$html .= ">\n";   
 		if (is_array($this->mOptionsEmpty) && (count($this->mOptionsEmpty) > 0))
 		foreach ($this->mOptionsEmpty as $key=>$value) {
diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index e991f725e..27a36e9ba 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Form class is a container for HTML forms we use in the application.
 // It contains an array of $elements - which are individual input controls
diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index ace22d9af..16b8d76d1 100644
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -1,32 +1,8 @@
 <?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
-// +----------------------------------------------------------------------+
-
-// FromElement is the base class for controls on forms.
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+// FormElement is the base class for controls on forms.
 class FormElement {
   var $id = '';          // control id
   var $name;             // control name
@@ -81,7 +57,7 @@ function getStyle() { return $this->style; }
 
   function setEnabled($flag) { $this->enabled = $flag; }
   function isEnabled() { return $this->enabled; }
-
+  
   function setOnChange($str) { $this->on_change = $str; }
   function setOnClick($str) { $this->on_click = $str; }
   function setPlaceholder($str) { $this->placeholder = $str; }
diff --git a/initialize.php b/initialize.php
index 745d1e4ae..bc2742a8a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5511");
+define("APP_VERSION", "1.19.28.5512");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timer.php b/timer.php
index e77317d9a..67388ce6a 100644
--- a/timer.php
+++ b/timer.php
@@ -60,12 +60,18 @@
 $cl_task = $request->getParameter('task', @$_SESSION['task']);
 $_SESSION['task'] = $cl_task;
 
+// Obtain uncompleted record. Assumption is that only 1 uncompleted record is allowed.
+$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
+$enable_controls = ($uncompleted == null);
+
 // Handle time custom fields.
 $timeCustomFields = array();
 if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $control_name = 'time_field_'.$timeField['id'];
-    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+    // Note: disabled controls are not posted. Therefore, && $enable_controls condition below.
+    // This allows us to get values from session when controls are disabled and reset to null when not.
+    $cl_control_name = $request->getParameter($control_name, ($request->isPost() && $enable_controls ? null : @$_SESSION[$control_name]));
     $_SESSION[$control_name] = $cl_control_name;
     $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
       'control_name' => $control_name,
@@ -76,10 +82,6 @@
   }
 }
 
-// Obtain uncompleted record. Assumtion is that only 1 uncompleted record is allowed.
-$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
-$enable_controls = ($uncompleted == null);
-
 // Elements of timeRecordForm.
 $form = new Form('timeRecordForm');
 
@@ -98,8 +100,9 @@
 }
 
 // Billable checkbox.
-if ($showBillable)
+if ($showBillable) {
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable,'enable'=>$enable_controls));
+}
 
 // If we have time custom fields - add controls for them.
 if ($custom_fields && $custom_fields->timeFields) {

From b17d96f1d73429810d9980d0d3c82646bba635b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 May 2021 14:40:14 +0000
Subject: [PATCH 1527/1848] Fixed some issues with control population on
 timer.php.

---
 initialize.php |  2 +-
 timer.php      | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/initialize.php b/initialize.php
index bc2742a8a..4e19892cb 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5512");
+define("APP_VERSION", "1.19.28.5513");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timer.php b/timer.php
index 67388ce6a..a2afacf9e 100644
--- a/timer.php
+++ b/timer.php
@@ -41,6 +41,10 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
+// Obtain uncompleted record. Assumption is that only 1 uncompleted record is allowed.
+$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
+$enable_controls = ($uncompleted == null);
+
 // Initialize variables.
 $cl_start = trim($request->getParameter('browser_time'));
 $cl_finish = trim($request->getParameter('browser_time'));
@@ -53,16 +57,15 @@
     if (isset($_SESSION['billable']))
       $cl_billable = $_SESSION['billable'];
 }
-$cl_client = $request->getParameter('client', @$_SESSION['client']);
+// Note: disabled controls are not posted. Therefore, && $enable_controls condition below.
+// This allows us to get values from session when controls are disabled and reset to null when not.
+$cl_client = $request->getParameter('client', ($request->isPost() && $enable_controls ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', @$_SESSION['project']);
+$cl_project = $request->getParameter('project', ($request->isPost() && $enable_controls ? null : @$_SESSION['project']));
 $_SESSION['project'] = $cl_project;
-$cl_task = $request->getParameter('task', @$_SESSION['task']);
+$cl_task = $request->getParameter('task', ($request->isPost() && $enable_controls ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
-// Obtain uncompleted record. Assumption is that only 1 uncompleted record is allowed.
-$uncompleted = ttTimeHelper::getUncompleted($user->getUser());
-$enable_controls = ($uncompleted == null);
 
 // Handle time custom fields.
 $timeCustomFields = array();

From 78ad6891ac938c88ffd2b384bf59ecdc66e1aa89 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 May 2021 14:59:58 +0000
Subject: [PATCH 1528/1848] Fixed population of the billable checkbox on
 timer.php.

---
 initialize.php |  2 +-
 timer.php      | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/initialize.php b/initialize.php
index 4e19892cb..1b85357a3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5513");
+define("APP_VERSION", "1.19.28.5514");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timer.php b/timer.php
index a2afacf9e..d343f9294 100644
--- a/timer.php
+++ b/timer.php
@@ -48,17 +48,13 @@
 // Initialize variables.
 $cl_start = trim($request->getParameter('browser_time'));
 $cl_finish = trim($request->getParameter('browser_time'));
+// Disabled controls are not posted. Therefore, && $enable_controls condition in several places below.
+// This allows us to get values from session when controls are disabled and reset to null when not.
 $cl_billable = 1;
 if ($user->isPluginEnabled('iv')) {
-  if ($request->isPost()) {
-    $cl_billable = $request->getParameter('billable');
-    $_SESSION['billable'] = (int) $cl_billable;
-  } else 
-    if (isset($_SESSION['billable']))
-      $cl_billable = $_SESSION['billable'];
+  $cl_billable = $request->getParameter('billable', ($request->isPost() && $enable_controls ? null : @$_SESSION['billable']));
+  $_SESSION['billable'] = $cl_billable;
 }
-// Note: disabled controls are not posted. Therefore, && $enable_controls condition below.
-// This allows us to get values from session when controls are disabled and reset to null when not.
 $cl_client = $request->getParameter('client', ($request->isPost() && $enable_controls ? null : @$_SESSION['client']));
 $_SESSION['client'] = $cl_client;
 $cl_project = $request->getParameter('project', ($request->isPost() && $enable_controls ? null : @$_SESSION['project']));
@@ -66,14 +62,11 @@
 $cl_task = $request->getParameter('task', ($request->isPost() && $enable_controls ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
-
 // Handle time custom fields.
 $timeCustomFields = array();
 if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $control_name = 'time_field_'.$timeField['id'];
-    // Note: disabled controls are not posted. Therefore, && $enable_controls condition below.
-    // This allows us to get values from session when controls are disabled and reset to null when not.
     $cl_control_name = $request->getParameter($control_name, ($request->isPost() && $enable_controls ? null : @$_SESSION[$control_name]));
     $_SESSION[$control_name] = $cl_control_name;
     $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],

From cd6a9f207afd99cf811a2e3de159496f22bc460f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 May 2021 15:48:10 +0000
Subject: [PATCH 1529/1848] Addressed several php8 warnings.

---
 WEB-INF/lib/ttTimeHelper.class.php |  4 ++--
 WEB-INF/templates/timer2.tpl       |  3 ++-
 initialize.php                     |  2 +-
 timer.php                          | 12 ++++++++----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index bd2fb9898..58f2f4222 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -416,7 +416,7 @@ static function insert($fields)
     $date = $fields['date'];
     $start = $fields['start'];
     $finish = $fields['finish'];
-    $duration = $fields['duration'];
+    $duration = isset($fields['duration']) ? $fields['duration'] : null;
     if ($duration) {
       $minutes = ttTimeHelper::postedDurationToMinutes($duration);
       $duration = ttTimeHelper::minutesToDuration($minutes);
@@ -479,7 +479,7 @@ static function update($fields)
     $task = $fields['task'];
     $start = $fields['start'];
     $finish = $fields['finish'];
-    $duration = $fields['duration'];
+    $duration = isset($fields['duration']) ? $fields['duration'] : null;
     if ($duration) {
       $minutes = ttTimeHelper::postedDurationToMinutes($duration);
       $duration = ttTimeHelper::minutesToDuration($minutes);
diff --git a/WEB-INF/templates/timer2.tpl b/WEB-INF/templates/timer2.tpl
index a8f9b1c97..b26e07c1d 100644
--- a/WEB-INF/templates/timer2.tpl
+++ b/WEB-INF/templates/timer2.tpl
@@ -106,7 +106,8 @@ startTimer();
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
-<div class="button-set">{$forms.timeRecordForm.btn_start.control} {$forms.timeRecordForm.btn_stop.control}</div>
+{if isset($forms.timeRecordForm.btn_start.control)}<div class="button-set">{$forms.timeRecordForm.btn_start.control}</div>{/if}
+{if isset($forms.timeRecordForm.btn_stop.control)}<div class="button-set">{$forms.timeRecordForm.btn_stop.control}</div>{/if}
 {$forms.timeRecordForm.close}
 
 <div class="day-totals">
diff --git a/initialize.php b/initialize.php
index 1b85357a3..177770fdf 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5514");
+define("APP_VERSION", "1.19.28.5515");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timer.php b/timer.php
index d343f9294..aa51a4dc4 100644
--- a/timer.php
+++ b/timer.php
@@ -22,6 +22,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$taskRequired = false;
 if ($showTask) $taskRequired = $user->getConfigOption('task_required');
 
 // Initialize and store date in session.
@@ -32,7 +33,7 @@
 if(!$cl_date)
   $cl_date = $selected_date->toString(DB_DATEFORMAT);
 $_SESSION['date'] = $cl_date;
-// TODO: for time page we may limit the day to today only.
+// TODO: for timer page we may limit the day to today only.
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -48,6 +49,7 @@
 // Initialize variables.
 $cl_start = trim($request->getParameter('browser_time'));
 $cl_finish = trim($request->getParameter('browser_time'));
+$cl_duration = $cl_note = null;
 // Disabled controls are not posted. Therefore, && $enable_controls condition in several places below.
 // This allows us to get values from session when controls are disabled and reset to null when not.
 $cl_billable = 1;
@@ -101,7 +103,7 @@
 }
 
 // If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
@@ -120,6 +122,7 @@
 }
 
 // If we show project dropdown, add controls for project and client.
+$project_list = $client_list = array();
 if ($showProject) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
@@ -161,6 +164,7 @@
 }
 
 // Task dropdown.
+$task_list = array();
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
@@ -195,7 +199,7 @@
     if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     // Validate input in time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($timeCustomFields as $timeField) {
         // Validation is the same for text and dropdown fields.
         if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
@@ -245,7 +249,7 @@
 
       // Insert time custom fields if we have them.
       $result = true;
-      if ($id && $custom_fields && $custom_fields->timeFields) {
+      if ($id && isset($custom_fields) && $custom_fields->timeFields) {
         $result = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
 

From e6caf8fb9dc383066604b8623279763593088d0b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 May 2021 16:50:18 +0000
Subject: [PATCH 1530/1848] Work started on mobile friendly reports2.php.

---
 WEB-INF/templates/reports2.tpl | 488 +++++++++++++++++++++++++++++++
 initialize.php                 |   2 +-
 reports.php                    |   2 +
 reports2.php                   | 504 +++++++++++++++++++++++++++++++++
 4 files changed, 995 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/reports2.tpl
 create mode 100644 reports2.php

diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
new file mode 100644
index 000000000..14ccadd20
--- /dev/null
+++ b/WEB-INF/templates/reports2.tpl
@@ -0,0 +1,488 @@
+<script>
+// We need a few arrays to populate project dropdown.
+// When client selection changes, the project dropdown must be re-populated with only relevant projects.
+// Format:
+// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
+// project_names[325] = "Time Tracker";   // Project name.
+
+// Prepare an array of project ids for clients.
+var project_ids = new Array();
+{foreach $client_list as $client}
+  project_ids[{$client.id}] = "{$client.projects}";
+{/foreach}
+// Prepare an array of project names.
+var project_names = new Array();
+{foreach $project_list as $project}
+  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
+{/foreach}
+// We'll use this array to populate project dropdown when client is not selected.
+var idx = 0;
+var projects = new Array();
+{foreach $project_list as $project}
+  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
+  idx++;
+{/foreach}
+
+// We need a couple of array-like objects, one for associated task ids, another for task names.
+// For performance, and because associated arrays are frowned upon in JavaScript, we'll use a simple object
+// with properties for project tasks. Format:
+
+// obj_tasks.p325 = "100,101,302,303,304"; // Tasks ids for project 325 are "100,101,302,303,304".
+// obj_tasks.p408 = "100,302";  // Tasks ids for project 408 are "100,302".
+
+// Create an object for task ids.
+obj_tasks = {};
+var project_prefix = "p"; // Prefix for project property.
+var project_property;
+
+// Populate obj_tasks with task ids for each relevant project.
+{foreach $project_list as $project}
+  project_property = project_prefix + {$project.id};
+  obj_tasks[project_property] = "{$project.tasks}";
+{/foreach}
+
+// Prepare an array of task names.
+// Format: task_names[0] = Array(100, 'Coding'), task_names[1] = Array(302, 'Debugging'), etc...
+// First element = task_id, second element = task name.
+task_names = new Array();
+var idx = 0;
+{foreach $task_list as $task}
+  task_names[idx] = new Array({$task.id}, "{$task.name|escape:'javascript'}");
+  idx++;
+{/foreach}
+
+// empty_label is the mandatory top option in dropdowns.
+empty_label = '{$i18n.dropdown.all|escape:'javascript'}';
+
+// inArray - determines whether needle is in haystack array.
+function inArray(needle, haystack) {
+  var length = haystack.length;
+  for(var i = 0; i < length; i++) {
+    if(haystack[i] == needle) return true;
+  }
+  return false;
+}
+
+// The fillProjectDropdown function populates the project combo box with
+// projects associated with a selected client (client id is passed here as id).
+function fillProjectDropdown(id) {
+  var str_ids = project_ids[id];
+  var dropdown = document.getElementById("project");
+
+  // Determine previously selected item.
+  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+
+  // Remove existing content.
+  dropdown.length = 0;
+  var project_reset = true;
+  // Add mandatory top option.
+  dropdown.options[0] = new Option(empty_label, '', true);
+
+  // Populate project dropdown.
+  if (!id) {
+    // If we are here, client is not selected.
+    var len = projects.length;
+    for (var i = 0; i < len; i++) {
+      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
+      if (dropdown.options[i+1].value == selected_item)  {
+        dropdown.options[i+1].selected = true;
+        project_reset = false;
+      }
+    }
+  } else if (str_ids) {
+    var ids = new Array();
+    ids = str_ids.split(",");
+    var len = ids.length;
+
+    for (var i = 0; i < len; i++) {
+      var p_id = ids[i];
+      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
+      if (dropdown.options[i+1].value == selected_item)  {
+        dropdown.options[i+1].selected = true;
+        project_reset = false;
+      }
+    }
+  }
+
+  // If project selection was reset - clear the tasks dropdown.
+  if (project_reset) {
+    dropdown = document.getElementById("task");
+    dropdown.length = 0;
+    dropdown.options[0] = new Option(empty_label, '', true);
+  }
+}
+
+
+// The fillTaskDropdown function populates the task combo box with
+// tasks associated with a selected project_id.
+function fillTaskDropdown(project_id) {
+  var str_task_ids;
+  // Get a string of comma-separated task ids.
+  if (project_id) {  
+    var property = "p" + project_id;
+    str_task_ids = obj_tasks[property];
+  }
+  if (str_task_ids) {
+    var task_ids = new Array(); // Array of task ids.
+    task_ids = str_task_ids.split(",");
+  }
+
+  var dropdown = document.getElementById("task");
+  // Determine previously selected item.
+  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+
+  // Remove existing content.
+  dropdown.length = 0;
+  // Add mandatory top option.
+  dropdown.options[0] = new Option(empty_label, '', true);
+
+  // Populate the dropdown with associated tasks.
+  len = task_names.length;
+  var dropdown_idx = 0;
+  for (var i = 0; i < len; i++) {
+    if (!project_id) {
+      // No project is selected. Fill in all tasks.
+      dropdown.options[dropdown_idx+1] = new Option(task_names[i][1], task_names[i][0]);
+      dropdown_idx++;
+    } else if (str_task_ids) {
+      // Project is selected and has associated tasks. Fill them in.
+      if (inArray(task_names[i][0], task_ids)) {
+        dropdown.options[dropdown_idx+1] = new Option(task_names[i][1], task_names[i][0]);
+        dropdown_idx++;
+      }
+    }
+  }
+
+  // If a previously selected item is still in dropdown - select it.
+  if (dropdown.options.length > 0) {
+    for (var i = 0; i < dropdown.options.length; i++) {
+      if (dropdown.options[i].value == selected_item)  {
+        dropdown.options[i].selected = true;
+      }
+    }
+  }
+}
+
+// The fillDropdowns function populates the "project" and "task" dropdown controls
+// with relevant values.
+function fillDropdowns() {
+  if(document.body.contains(document.reportForm.client))
+    fillProjectDropdown(document.reportForm.client.value);
+
+  fillTaskDropdown(document.reportForm.project.value);
+}
+
+// Build JavaScript array for assigned projects out of passed in PHP array.
+var assigned_projects = new Array();
+{if $assigned_projects}
+  {foreach $assigned_projects as $user_id => $projects}
+    assigned_projects[{$user_id}] = new Array();
+    {if $projects}
+      {foreach $projects as $idx => $project_id}
+        assigned_projects[{$user_id}][{$idx}] = {$project_id};
+      {/foreach}
+    {/if}
+  {/foreach}
+{/if}
+
+// selectAssignedUsers is called when a project is changed in project dropdown.
+// It selects users on the form who are assigned to this project.
+function selectAssignedUsers(project_id) {
+  var user_id;
+  var len;
+
+  for (var i = 0; i < document.reportForm.elements.length; i++) {
+    if ((document.reportForm.elements[i].type == 'checkbox') && (document.reportForm.elements[i].name == 'users[]')) {
+      user_id = document.reportForm.elements[i].value;
+      if (project_id)
+        document.reportForm.elements[i].checked = false;
+      else
+        document.reportForm.elements[i].checked = true;
+
+      if(assigned_projects[user_id] != undefined)
+        len = assigned_projects[user_id].length;
+      else
+        len = 0;
+
+      if (project_id != '')
+        for (var j = 0; j < len; j++) {
+          if (project_id == assigned_projects[user_id][j]) {
+            document.reportForm.elements[i].checked = true;
+            break;
+          }
+        }
+    }
+  }
+}
+
+// handleCheckboxes - unmarks and hides the "Totals only" checkbox when
+// "no grouping" is selected in the associated group by dropdowns.
+function handleCheckboxes() {
+  var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
+  var totalsOnlyLabel = document.getElementById("totals_only_label");
+  var groupBy1 = document.getElementById("group_by1");
+  var groupBy2 = document.getElementById("group_by2");
+  var groupBy3 = document.getElementById("group_by3");
+  var grouping = false;
+  if ((groupBy1 != null && "no_grouping" != groupBy1.value) ||
+      (groupBy2 != null && "no_grouping" != groupBy2.value) ||
+      (groupBy3 != null && "no_grouping" != groupBy3.value)) {
+    grouping = true;
+  }
+  if (grouping) {
+    // Show the "Totals only" checkbox.
+    totalsOnlyCheckbox.style.visibility = "visible";
+    totalsOnlyLabel.style.visibility = "visible";
+  } else {
+    // Unmark and hide the "Totals only" checkbox.
+    totalsOnlyCheckbox.checked = false;
+    totalsOnlyCheckbox.style.visibility = "hidden";
+    totalsOnlyLabel.style.visibility = "hidden";
+  }
+}
+</script>
+
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.reportForm.open}
+<table class="centered-table">
+  <tr><td class="text-cell">{$i18n.label.fav_report}:</td></tr>
+  <tr><td class="td-with-input">{$forms.reportForm.favorite_report.control}</td></tr>
+  <tr><td class="td-with-horizontally-centered-input">{$forms.reportForm.btn_generate.control}&nbsp;{$forms.reportForm.btn_delete.control}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="form-control-separator"></div>
+<table class="centered-table">
+{if $show_client}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_billable}
+  <tr class = "small-screen-label"><td><label for="include_records">{$i18n.form.time.billable}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="include_records">{$i18n.form.time.billable}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.include_records.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_paid_status}
+  <tr class = "small-screen-label"><td><label for="paid_status">{$i18n.label.paid_status}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="paid_status">{$i18n.label.paid_status}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.paid_status.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_task}
+  <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="task">{$i18n.label.task}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.task.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+</table>
+{$forms.reportForm.close}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{$forms.reportForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td valign="top" colspan="2" align="center">
+      <table border="0" cellpadding="3">
+        <tr>
+          <td></td>
+          <td valign="top">
+            <table border="0" cellpadding="3">
+{if $show_approved}
+              <tr><td><b>{$i18n.label.approved}</b></td></tr>
+              <tr><td>{$forms.reportForm.approved.control}</td></tr>
+{/if}
+{if $show_invoice_dropdown}
+              <tr><td><b>{$i18n.label.invoice}</b></td></tr>
+              <tr><td>{$forms.reportForm.invoice.control}</td></tr>
+{/if}
+{if $show_timesheet_dropdown}
+              <tr><td><b>{$i18n.label.timesheet}</b></td></tr>
+              <tr><td>{$forms.reportForm.timesheet.control}</td></tr>
+{/if}
+            </table>
+          </td>
+        </tr>
+{if $show_active_users}
+        <tr>
+          <td colspan="3"><b>{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</b></td>
+        </tr>
+        <tr>
+          <td colspan="3">{$forms.reportForm.users_active.control}</td>
+        </tr>
+{/if}
+{if $show_inactive_users}
+        <tr>
+          <td colspan="3"><b>{$i18n.label.inactive_users}</b></td>
+        </tr>
+        <tr>
+          <td colspan="3">{$forms.reportForm.users_inactive.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td><b>{$i18n.form.reports.select_period}</b></td>
+          <td>&nbsp;</td>
+          <td><b>{$i18n.form.reports.set_period}</b></td>
+        </tr>
+        <tr valign="top">
+          <td>{$forms.reportForm.period.control}</td>
+          <td align="right">{$i18n.label.start_date}:</td>
+          <td>{$forms.reportForm.start_date.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td align="right">{$i18n.label.end_date}:</td>
+          <td>{$forms.reportForm.end_date.control}</td>
+        </tr>
+        <tr><td colspan="3"><b>{$i18n.form.reports.show_fields}</b></td></tr>
+        <tr>
+          <td colspan="3">
+            <table border="0" width="100%">
+              <tr>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+{if $show_client}
+                    <tr><td><label>{$forms.reportForm.chclient.control}&nbsp;{$i18n.label.client}</label></td></tr>
+{/if}
+{if $show_project}
+                    <tr><td><label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label></td></tr>
+{/if}
+{if $show_timesheet_checkbox}
+                    <tr><td><label>{$forms.reportForm.chtimesheet.control}&nbsp;{$i18n.label.timesheet}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+{if $show_start}
+                    <tr><td><label>{$forms.reportForm.chstart.control}&nbsp;{$i18n.label.start}</label></td></tr>
+{/if}
+{if $show_task}
+                    <tr><td><label>{$forms.reportForm.chtask.control}&nbsp;{$i18n.label.task}</label></td></tr>
+{/if}
+{if $show_ip}
+                    <tr><td><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</label></td></tr>
+{/if}
+{if $show_work_units}
+                    <tr><td><label>{$forms.reportForm.chunits.control}&nbsp;{$i18n.label.work_units}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+{if $show_finish}
+                    <tr><td><label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label></td></tr>
+{/if}
+                    <tr><td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td></tr>
+{if $show_approved}
+                    <tr><td><label>{$forms.reportForm.chapproved.control}&nbsp;{$i18n.label.approved}</label></td></tr>
+{/if}
+{if $show_invoice_checkbox}
+                    <tr><td><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+                <td width="25%" valign="top">
+                  <table border="0" cellpadding="3">
+                    <tr><td><label>{$forms.reportForm.chduration.control}&nbsp;{$i18n.label.duration}</label></td></tr>
+                    <tr><td><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td></tr>
+{if $show_paid_status}
+                    <tr><td><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td></tr>
+{/if}
+{if $show_files}
+                    <tr><td><label>{$forms.reportForm.chfiles.control}&nbsp;{$i18n.label.files}</label></td></tr>
+{/if}
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+{if isset($custom_fields) && $custom_fields->timeFields}
+    <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
+  {foreach $custom_fields->timeFields as $timeField}
+    <tr>
+      <td align="right">{$timeField['label']|escape}:</td>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+      <td>{$forms.reportForm.$control_name.control}</td>
+      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
+    </tr>
+  {/foreach}
+{/if}
+{if isset($custom_fields) && $custom_fields->userFields}
+    <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
+  {foreach $custom_fields->userFields as $userField}
+    <tr>
+      <td align="right">{$userField['label']|escape}:</td>
+      {assign var="control_name" value='user_field_'|cat:$userField['id']}
+      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+      <td>{$forms.reportForm.$control_name.control}</td>
+      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
+    </tr>
+  {/foreach}
+{/if}
+        <tr><td><b>{$i18n.form.reports.group_by}</b></td></tr>
+        <tr valign="top">
+          <td>{$forms.reportForm.group_by1.control}</td>
+          <td>{$forms.reportForm.group_by2.control}</td>
+          <td>{$forms.reportForm.group_by3.control}</td>
+        </tr>
+        <tr>
+            <td><span id="totals_only_label"><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></span></td>
+        </tr>
+      </table>
+
+<div style="padding: 10 0 10 0;">
+  <table border="0" class="divider">
+    <tr>
+      <td align="center">
+        <table cellspacing="1" cellpadding="3" border="0">
+          <tr>
+            <td>{$i18n.form.reports.save_as_favorite}:</td><td>{$forms.reportForm.new_fav_report.control}</td>
+            <td>{$forms.reportForm.btn_save.control}</td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+
+      <table border="0" cellpadding="3" width="100%">
+        <tr><td colspan="3" height="50" align="center">{$forms.reportForm.btn_generate.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.reportForm.close}
diff --git a/initialize.php b/initialize.php
index 177770fdf..14a7712e3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5515");
+define("APP_VERSION", "1.19.28.5516");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 66b958fb3..6e3849584 100644
--- a/reports.php
+++ b/reports.php
@@ -72,6 +72,7 @@
 
 // Add project dropdown.
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$project_list = array();
 if ($showProject) {
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
     $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
@@ -94,6 +95,7 @@
 
 // Add task dropdown.
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$task_list = array();
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   if (count($task_list) == 0) $showTask = false;
diff --git a/reports2.php b/reports2.php
new file mode 100644
index 000000000..b52c0e5aa
--- /dev/null
+++ b/reports2.php
@@ -0,0 +1,504 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('form.Form');
+import('form.ActionForm');
+import('DateAndTime');
+import('ttGroupHelper');
+import('Period');
+import('ttProjectHelper');
+import('ttFavReportHelper');
+import('ttClientHelper');
+import('ttReportHelper');
+
+// Access check.
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}
+// End of access checks.
+
+$trackingMode = $user->getTrackingMode();
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+$form = new Form('reportForm');
+
+// Get saved favorite reports for user.
+$report_list = ttFavReportHelper::getReports();
+$form->addInput(array('type'=>'combobox',
+  'name'=>'favorite_report',
+  'onchange'=>'this.form.fav_report_changed.value=1;this.form.submit();',
+  'data'=>$report_list,
+  'datakeys'=>array('id','name'),
+  'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
+$form->addInput(array('type'=>'hidden','name'=>'fav_report_changed'));
+// Generate and Delete buttons.
+$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
+
+// Dropdown for clients if the clients plugin is enabled.
+$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
+$client_list = array();
+if ($showClient) {
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
+                                                 // by filtering out not relevant clients.
+  } else
+    $client_list = ttClientHelper::getClientsForUser();
+  if (count($client_list) == 0) $showClient = false;
+}
+if ($showClient) {
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillProjectDropdown(this.value);',
+    'name'=>'client',
+    'data'=>$client_list,
+    'datakeys'=>array('id', 'name'),
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add project dropdown.
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$project_list = array();
+if ($showProject) {
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
+  } elseif ($user->isClient()) {
+    $project_list = ttProjectHelper::getProjectsForClient();
+  } else {
+    $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
+  }
+  if (count($project_list) == 0) $showProject = false;
+}
+if ($showProject) {
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
+    'name'=>'project',
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add task dropdown.
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$task_list = array();
+if ($showTask) {
+  $task_list = ttGroupHelper::getActiveTasks();
+  if (count($task_list) == 0) $showTask = false;
+}
+if ($showTask) {
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'task',
+    'data'=>$task_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add billable dropdown.
+$showBillable = $user->isPluginEnabled('iv');
+if ($showBillable) {
+  $include_options = array('1'=>$i18n->get('form.reports.include_billable'),
+    '2'=>$i18n->get('form.reports.include_not_billable'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'include_records', // TODO: how about a better name here?
+    'data'=>$include_options,
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add invoiced / not invoiced selector.
+$showInvoiceDropdown = $user->isPluginEnabled('iv') && $user->can('manage_invoices');
+if ($showInvoiceDropdown) {
+  $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
+    '2'=>$i18n->get('form.reports.include_not_invoiced'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'invoice',
+    'style'=>'width: 250px;',
+    'data'=>$invoice_options,
+    'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+$showInvoiceCheckbox = $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->isClient());
+
+// Add paid status selector.
+$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
+if ($showPaidStatus) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'paid_status',
+   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+
+// Add approved / not approved selector.
+$showApproved = $user->isPluginEnabled('ap') &&
+  ($user->can('view_own_reports') || $user->can('view_reports') ||
+   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
+if ($showApproved) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'approved',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+  ));
+}
+
+// Add timesheet assignment selector.
+$showTimesheetDropdown = $user->isPluginEnabled('ts');
+if ($showTimesheetDropdown) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'timesheet',
+   'style'=>'width: 250px;',
+   'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
+     TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
+     TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
+     TIMESHEET_APPROVED=>$i18n->get('dropdown.approved'),
+     TIMESHEET_NOT_APPROVED=>$i18n->get('dropdown.not_approved')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+  ));
+}
+$showTimesheetCheckbox = $user->isPluginEnabled('ts');
+
+// Add user table.
+$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
+$user_list = array();
+if ($showUsers) {
+  // Prepare user and assigned projects arrays.
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $rank = $user->getMaxRankForGroup($user->getGroup());
+    if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
+    if ($user->can('view_own_reports')) {
+      $options_active = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>ACTIVE);
+      $options_inactive = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>INACTIVE);
+    } else {
+      $options_active = array('max_rank'=>$max_rank,'status'=>ACTIVE);
+      $options_inactive = array('max_rank'=>$max_rank,'status'=>INACTIVE);
+    }
+    $active_users = $user->getUsers($options_active);
+    $inactive_users = $user->getUsers($options_inactive);
+  }
+  elseif ($user->isClient()) {
+    $options_active = array('status'=>ACTIVE);
+    $options_inactive = array('status'=>INACTIVE);
+    $active_users = ttGroupHelper::getUsersForClient($options_active);
+    $inactive_users = ttGroupHelper::getUsersForClient($options_inactive);
+  }
+
+  foreach ($active_users as $single_user) {
+    $user_list_active[$single_user['id']] = $single_user['name'];
+    $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
+    if ($projects) {
+      foreach ($projects as $single_project) {
+        $assigned_projects[$single_user['id']][] = $single_project['id'];
+      }
+    }
+  }
+  $row_count = is_array($user_list_active) ? ceil(count($user_list_active)/3) : 1;
+  $form->addInput(array('type'=>'checkboxgroup',
+    'name'=>'users_active',
+    'data'=>$user_list_active,
+    'layout'=>'V',
+    'groupin'=>$row_count,
+    'style'=>'width: 100%;'));
+
+  $user_list_inactive = array();
+  foreach ($inactive_users as $single_user) {
+    $user_list_inactive[$single_user['id']] = $single_user['name'];
+    $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
+    if ($projects) {
+      foreach ($projects as $single_project) {
+        $assigned_projects[$single_user['id']][] = $single_project['id'];
+      }
+    }
+  }
+  $row_count = ceil(count($user_list_inactive)/3);
+  $form->addInput(array('type'=>'checkboxgroup',
+    'name'=>'users_inactive',
+    'data'=>$user_list_inactive,
+    'layout'=>'V',
+    'groupin'=>$row_count,
+    'style'=>'width: 100%;'));
+}
+
+// Add control for time period.
+$form->addInput(array('type'=>'combobox',
+  'name'=>'period',
+  'style'=>'width: 250px;',
+  'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
+    INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
+    INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
+    INTERVAL_LAST_WEEK=>$i18n->get('dropdown.previous_week'),
+    INTERVAL_THIS_DAY=>$i18n->get('dropdown.current_day'),
+    INTERVAL_LAST_DAY=>$i18n->get('dropdown.previous_day')),
+  'empty'=>array(''=>$i18n->get('dropdown.select'))));
+// Add controls for start and end dates.
+$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
+$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
+
+// Add checkboxes for "Show fields" block.
+if ($showClient)
+  $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
+if ($showProject)
+  $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
+if ($showTask)
+  $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
+if ($showInvoiceCheckbox)
+  $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
+if ($showPaidStatus)
+  $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
+$showIP = $user->can('view_reports') || $user->can('view_all_reports');
+if ($showIP)
+  $form->addInput(array('type'=>'checkbox','name'=>'chip'));
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+if ($showStart)
+  $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
+if ($showFinish)
+  $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
+$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
+$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
+$form->addInput(array('type'=>'checkbox','name'=>'chcost'));
+$showWorkUnits = $user->isPluginEnabled('wu');
+if ($showWorkUnits)
+  $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
+if ($showTimesheetCheckbox)
+  $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
+if ($showApproved)
+  $form->addInput(array('type'=>'checkbox','name'=>'chapproved'));
+$showFiles = $user->isPluginEnabled('at');
+if ($showFiles)
+  $form->addInput(array('type'=>'checkbox','name'=>'chfiles'));
+
+// Add a hidden control for timesheet_user_id (who to generate a timesheet for).
+if ($showTimesheetCheckbox)
+  $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
+
+// If we have time custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    $checkbox_field_name = 'show_'.$field_name;
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'empty'=>array(''=>$i18n->get('dropdown.all'))));
+    }
+    // Also add a checkbox (to print the field or not).
+    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
+  }
+}
+
+// If we have user custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    $checkbox_field_name = 'show_'.$field_name;
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'empty'=>array(''=>$i18n->get('dropdown.all'))));
+    }
+    // Also add a checkbox (to print the field or not).
+    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
+  }
+}
+
+// Add group by control.
+$group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
+$group_by_options['date'] = $i18n->get('form.reports.group_by_date');
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
+  $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
+if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
+  $group_by_options['client'] = $i18n->get('form.reports.group_by_client');
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
+  $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)
+  $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
+// If we have time custom fields - add group by options for them.
+if (isset($custom_fields) && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    $group_by_options[$field_name] = $timeField['label'];
+  }
+}
+// If we have user custom fields - add group by options for them.
+if (isset($custom_fields) && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    $group_by_options[$field_name] = $userField['label'];
+  }
+}
+$group_by_options_size = sizeof($group_by_options);
+$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
+if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
+if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
+$form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
+
+// Add text field for a new favorite report name.
+$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30','style'=>'width: 250px;'));
+// Save button.
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
+
+// Create a bean (which is a mechanism to remember form values in session).
+$bean = new ActionForm('reportBean', $form, $request);
+// At this point form values are obtained from session if they are there.
+
+if ($request->isGet() && !$bean->isSaved()) {
+  // No previous form data were found in session. Use the following default values.
+  $form->setValueByElement('users_active', array_keys((array)$user_list_active));
+  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
+  $form->setValueByElement('start_date', $period->getStartDate());
+  $form->setValueByElement('end_date', $period->getEndDate());
+
+  $form->setValueByElement('chclient', '1');
+  $form->setValueByElement('chstart', '1');
+  $form->setValueByElement('chfinish', '1');
+  $form->setValueByElement('chduration', '1');
+
+  $form->setValueByElement('chproject', '1');
+  $form->setValueByElement('chtask', '1');
+  $form->setValueByElement('chnote', '1');
+  $form->setValueByElement('chcost', '0');
+
+  $form->setValueByElement('chtimesheet', '0');
+  $form->setValueByElement('chip', '0');
+  $form->setValueByElement('chapproved', '0');
+  $form->setValueByElement('chpaid', '0');
+
+  $form->setValueByElement('chunits', '0');
+  $form->setValueByElement('chinvoice', '0');
+  $form->setValueByElement('chfiles', '1');
+
+  $form->setValueByElement('chtotalsonly', '0');
+}
+
+$form->setValueByElement('fav_report_changed','');
+
+// Disable the Delete button when no favorite report is selected.
+if (!$bean->getAttribute('favorite_report') || ($bean->getAttribute('favorite_report') == -1))
+  $form->getElement('btn_delete')->setEnabled(false);
+
+if ($request->isPost()) {
+  if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {
+    // User changed favorite report. We need to load new values into the form.
+    if ($bean->getAttribute('favorite_report')) {
+      // This loads new favorite report options into the bean (into our form).
+      ttFavReportHelper::loadReport($bean);
+
+      // If user selected no favorite report - mark all user checkboxes (most probable scenario).
+      if ($bean->getAttribute('favorite_report') == -1) {
+        $form->setValueByElement('users_active', array_keys($user_list_active));
+        $form->setValueByElement('users_inactive', false);
+      }
+
+      // Save form data in session for future use.
+      $bean->saveBean();
+      header('Location: reports.php');
+      exit();
+    }
+  } elseif ($bean->getAttribute('btn_save')) {
+    // User clicked the Save button. We need to save form options as new favorite report.
+    if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
+
+    if ($err->no()) {
+      $id = ttFavReportHelper::saveReport($bean);
+      if (!$id)
+        $err->add($i18n->get('error.db'));
+      if ($err->no()) {
+        $bean->setAttribute('favorite_report', $id);
+        $bean->saveBean();
+        header('Location: reports.php');
+        exit();
+      }
+    }
+  } elseif($bean->getAttribute('btn_delete')) {
+    // Delete button pressed. User wants to delete a favorite report.
+    if ($bean->getAttribute('favorite_report')) {
+      ttFavReportHelper::deleteReport($bean->getAttribute('favorite_report'));
+      // Load default report.
+      $bean->setAttribute('favorite_report','');
+      $bean->setAttribute('new_fav_report', $report_list[0]['name']);
+      ttFavReportHelper::loadReport($bean);
+      $form->setValueByElement('users', array_keys($user_list));
+      $bean->saveBean();
+      header('Location: reports.php');
+      exit();
+    }
+  } else {
+    // Generate button pressed. Check some values.
+    if (!$bean->getAttribute('period')) {
+      $start_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
+
+      if ($start_date->isError() || !$bean->getAttribute('start_date'))
+        $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
+
+      $end_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
+      if ($end_date->isError() || !$bean->getAttribute('end_date'))
+        $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
+
+      if ($start_date->compare($end_date) > 0)
+        $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+    }
+    $group_by1 = $bean->getAttribute('group_by1');
+    $group_by2 = $bean->getAttribute('group_by2');
+    $group_by3 = $bean->getAttribute('group_by3');
+    if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
+      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+    if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
+      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+    // Check remaining values.
+    if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
+
+    if ($err->no()) {
+      $bean->saveBean();
+      // Now we can go ahead and create a report.
+      header('Location: report.php');
+      exit();
+    }
+  }
+} // isPost
+
+$smarty->assign('client_list', $client_list);
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_approved', $showApproved);
+$smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
+$smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
+$smarty->assign('show_paid_status', $showPaidStatus);
+$smarty->assign('show_timesheet_dropdown', $showTimesheetDropdown);
+$smarty->assign('show_timesheet_checkbox', $showTimesheetCheckbox);
+$smarty->assign('show_active_users', $showUsers && $active_users);
+$smarty->assign('show_inactive_users', $showUsers && $inactive_users);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_work_units', $showWorkUnits);
+$smarty->assign('show_ip', $showIP);
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('project_list', $project_list);
+$smarty->assign('task_list', $task_list);
+$smarty->assign('assigned_projects', $assigned_projects);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="handleCheckboxes();fillDropdowns()"');
+$smarty->assign('title', $i18n->get('title.reports'));
+$smarty->assign('content_page_name', 'reports2.tpl');
+$smarty->display('index2.tpl');

From 0fda49817205ef9e23e14784ec6e1f58b26536e1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 May 2021 18:13:05 +0000
Subject: [PATCH 1531/1848] A bit more progress on making reports2.php mobile
 friendly.

---
 WEB-INF/templates/reports2.tpl | 43 +++++++++++++++++++---------------
 initialize.php                 |  2 +-
 reports2.php                   |  3 ---
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
index 14ccadd20..63b156340 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports2.tpl
@@ -270,6 +270,14 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if $show_invoice_dropdown}
+  <tr class = "small-screen-label"><td><label for="invoice">{$i18n.label.invoice}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="invoice">{$i18n.label.invoice}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.invoice.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
 {if $show_paid_status}
   <tr class = "small-screen-label"><td><label for="paid_status">{$i18n.label.paid_status}:</label></td></tr>
   <tr>
@@ -294,6 +302,22 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if $show_approved}
+  <tr class = "small-screen-label"><td><label for="approved">{$i18n.label.approved}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="approved">{$i18n.label.approved}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.approved.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_timesheet_dropdown}
+  <tr class = "small-screen-label"><td><label for="timesheet">{$i18n.label.timesheet}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="timesheet">{$i18n.label.timesheet}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.timesheet.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
 </table>
 {$forms.reportForm.close}
 
@@ -315,25 +339,6 @@ License: See license.txt *}
   <tr>
     <td valign="top" colspan="2" align="center">
       <table border="0" cellpadding="3">
-        <tr>
-          <td></td>
-          <td valign="top">
-            <table border="0" cellpadding="3">
-{if $show_approved}
-              <tr><td><b>{$i18n.label.approved}</b></td></tr>
-              <tr><td>{$forms.reportForm.approved.control}</td></tr>
-{/if}
-{if $show_invoice_dropdown}
-              <tr><td><b>{$i18n.label.invoice}</b></td></tr>
-              <tr><td>{$forms.reportForm.invoice.control}</td></tr>
-{/if}
-{if $show_timesheet_dropdown}
-              <tr><td><b>{$i18n.label.timesheet}</b></td></tr>
-              <tr><td>{$forms.reportForm.timesheet.control}</td></tr>
-{/if}
-            </table>
-          </td>
-        </tr>
 {if $show_active_users}
         <tr>
           <td colspan="3"><b>{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</b></td>
diff --git a/initialize.php b/initialize.php
index 14a7712e3..b61750b8f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5516");
+define("APP_VERSION", "1.19.28.5517");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports2.php b/reports2.php
index b52c0e5aa..c5ac71ab8 100644
--- a/reports2.php
+++ b/reports2.php
@@ -123,7 +123,6 @@
     '2'=>$i18n->get('form.reports.include_not_invoiced'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'invoice',
-    'style'=>'width: 250px;',
     'data'=>$invoice_options,
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
@@ -146,7 +145,6 @@
 if ($showApproved) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'approved',
-   'style'=>'width: 250px;',
    'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
@@ -157,7 +155,6 @@
 if ($showTimesheetDropdown) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
-   'style'=>'width: 250px;',
    'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
      TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
      TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),

From fa4ef4971d92832a9029f501ca09079ef9e8ea90 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 May 2021 20:42:02 +0000
Subject: [PATCH 1532/1848] A bit more progress on mobile friendly
 reports2.php.

---
 WEB-INF/templates/reports2.tpl | 68 ++++++++++++++++++----------------
 initialize.php                 |  2 +-
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
index 63b156340..3824e3ef2 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports2.tpl
@@ -253,6 +253,43 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 <div class="form-control-separator"></div>
+<table class="centered-table">
+  <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.select_period}</div></td></tr>
+  <tr class = "small-screen-label"><td><label for="period">{$i18n.form.reports.select_period}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="period">{$i18n.form.reports.select_period}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.period.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.set_period}</div></td></tr>
+  <tr class = "small-screen-label"><td><label for="start_date">{$i18n.label.start_date}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="start_date">{$i18n.label.start_date}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.start_date.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="end_date">{$i18n.label.end_date}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="end_date">{$i18n.label.end_date}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.end_date.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="form-control-separator"></div>
+{if $show_active_users}
+<div class="section-header">{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</div>
+<table class="x-scrollable-table">
+  <tr><td class="td-with-input">{$forms.reportForm.users_active.control}</td></tr>
+</table>
+<div class="form-control-separator"></div>
+{/if}
+{if $show_inactive_users}
+<div class="section-header">{$i18n.label.inactive_users}</div>
+<table class="x-scrollable-table">
+  <tr><td class="td-with-input">{$forms.reportForm.users_inactive.control}</td></tr>
+</table>
+<div class="form-control-separator"></div>
+{/if}
 <table class="centered-table">
 {if $show_client}
   <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}:</label></td></tr>
@@ -339,37 +376,6 @@ License: See license.txt *}
   <tr>
     <td valign="top" colspan="2" align="center">
       <table border="0" cellpadding="3">
-{if $show_active_users}
-        <tr>
-          <td colspan="3"><b>{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</b></td>
-        </tr>
-        <tr>
-          <td colspan="3">{$forms.reportForm.users_active.control}</td>
-        </tr>
-{/if}
-{if $show_inactive_users}
-        <tr>
-          <td colspan="3"><b>{$i18n.label.inactive_users}</b></td>
-        </tr>
-        <tr>
-          <td colspan="3">{$forms.reportForm.users_inactive.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td><b>{$i18n.form.reports.select_period}</b></td>
-          <td>&nbsp;</td>
-          <td><b>{$i18n.form.reports.set_period}</b></td>
-        </tr>
-        <tr valign="top">
-          <td>{$forms.reportForm.period.control}</td>
-          <td align="right">{$i18n.label.start_date}:</td>
-          <td>{$forms.reportForm.start_date.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td align="right">{$i18n.label.end_date}:</td>
-          <td>{$forms.reportForm.end_date.control}</td>
-        </tr>
         <tr><td colspan="3"><b>{$i18n.form.reports.show_fields}</b></td></tr>
         <tr>
           <td colspan="3">
diff --git a/initialize.php b/initialize.php
index b61750b8f..d55fd2b71 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5517");
+define("APP_VERSION", "1.19.28.5518");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0327d8ca4bffc65e7fbd8d32f9e9fbfe8335c4f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 May 2021 21:15:32 +0000
Subject: [PATCH 1533/1848] More progress on reports2.tpl.

---
 WEB-INF/templates/reports2.tpl | 176 +++++++++++++++++++++------------
 initialize.php                 |   2 +-
 2 files changed, 113 insertions(+), 65 deletions(-)

diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
index 3824e3ef2..1caa61d6f 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports2.tpl
@@ -356,90 +356,138 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 </table>
-{$forms.reportForm.close}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{$forms.reportForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td valign="top" colspan="2" align="center">
-      <table border="0" cellpadding="3">
-        <tr><td colspan="3"><b>{$i18n.form.reports.show_fields}</b></td></tr>
-        <tr>
-          <td colspan="3">
-            <table border="0" width="100%">
-              <tr>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
+<div class="form-control-separator"></div>
+<table class="centered-table">
+  <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.show_fields}</div></td></tr>
 {if $show_client}
-                    <tr><td><label>{$forms.reportForm.chclient.control}&nbsp;{$i18n.label.client}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chclient">{$i18n.label.client}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chclient">{$i18n.label.client}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chclient.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_project}
-                    <tr><td><label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chproject">{$i18n.label.project}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chproject">{$i18n.label.project}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chproject.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $show_timesheet_checkbox}
-                    <tr><td><label>{$forms.reportForm.chtimesheet.control}&nbsp;{$i18n.label.timesheet}</label></td></tr>
+{if $show_task}
+  <tr class = "small-screen-label"><td><label for="chtask">{$i18n.label.task}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chtask">{$i18n.label.task}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chtask.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-                  </table>
-                </td>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
 {if $show_start}
-                    <tr><td><label>{$forms.reportForm.chstart.control}&nbsp;{$i18n.label.start}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chstart">{$i18n.label.start}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chstart">{$i18n.label.start}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chstart.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $show_task}
-                    <tr><td><label>{$forms.reportForm.chtask.control}&nbsp;{$i18n.label.task}</label></td></tr>
+{if $show_finish}
+  <tr class = "small-screen-label"><td><label for="chfinish">{$i18n.label.finish}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chfinish">{$i18n.label.finish}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chfinish.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="chduration">{$i18n.label.duration}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chduration">{$i18n.label.duration}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chduration.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="chcost">{$i18n.label.cost}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chcost">{$i18n.label.cost}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chcost.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if $show_timesheet_checkbox}
+  <tr class = "small-screen-label"><td><label for="chtimesheet">{$i18n.label.timesheet}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chtimesheet">{$i18n.label.timesheet}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chtimesheet.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_ip}
-                    <tr><td><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chip">{$i18n.label.ip}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chip">{$i18n.label.ip}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chip.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_work_units}
-                    <tr><td><label>{$forms.reportForm.chunits.control}&nbsp;{$i18n.label.work_units}</label></td></tr>
-{/if}
-                  </table>
-                </td>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
-{if $show_finish}
-                    <tr><td><label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chunits">{$i18n.label.work_units}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chunits">{$i18n.label.work_units}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chunits.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-                    <tr><td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td></tr>
 {if $show_approved}
-                    <tr><td><label>{$forms.reportForm.chapproved.control}&nbsp;{$i18n.label.approved}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chapproved">{$i18n.label.approved}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chapproved">{$i18n.label.approved}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chapproved.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_invoice_checkbox}
-                    <tr><td><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chinvoice">{$i18n.label.invoice}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chinvoice">{$i18n.label.invoice}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chinvoice.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-                  </table>
-                </td>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
-                    <tr><td><label>{$forms.reportForm.chduration.control}&nbsp;{$i18n.label.duration}</label></td></tr>
-                    <tr><td><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td></tr>
 {if $show_paid_status}
-                    <tr><td><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chpaid">{$i18n.label.paid}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chpaid">{$i18n.label.paid}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chpaid.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_files}
-                    <tr><td><label>{$forms.reportForm.chfiles.control}&nbsp;{$i18n.label.files}</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="chfiles">{$i18n.label.files}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chfiles">{$i18n.label.files}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chfiles.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
+</table>
+{$forms.reportForm.close}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{$forms.reportForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td valign="top" colspan="2" align="center">
+      <table border="0" cellpadding="3">
 {if isset($custom_fields) && $custom_fields->timeFields}
     <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
   {foreach $custom_fields->timeFields as $timeField}
diff --git a/initialize.php b/initialize.php
index d55fd2b71..be497f91b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5518");
+define("APP_VERSION", "1.19.28.5519");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 15fbcff42d84da9d5089a7b08495e314daad59da Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 May 2021 22:33:03 +0000
Subject: [PATCH 1534/1848] Made mobile friendly reports2.php working.

---
 WEB-INF/resources/ru.lang.php  |   4 +-
 WEB-INF/templates/reports2.tpl | 152 +++++++++++++--------------------
 initialize.php                 |   2 +-
 reports2.php                   |  15 ++--
 4 files changed, 69 insertions(+), 104 deletions(-)

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 835b90048..db94bf685 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -429,8 +429,8 @@
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',
-'form.reports.time_fields' => 'Time fields',
-'form.reports.user_fields' => 'Поля времени',
+'form.reports.time_fields' => 'Поля времени',
+'form.reports.user_fields' => 'Поля пользователя',
 'form.reports.group_by' => 'Группировать по',
 'form.reports.group_by_no' => '--- без группировки ---',
 'form.reports.group_by_date' => 'дате',
diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
index 1caa61d6f..a4c926ad1 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports2.tpl
@@ -405,41 +405,41 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.reportForm.chduration.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td><label for="chcost">{$i18n.label.cost}:</label></td></tr>
+{if $show_work_units}
+  <tr class = "small-screen-label"><td><label for="chunits">{$i18n.label.work_units}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="chcost">{$i18n.label.cost}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.chcost.control}</td>
+    <td class="large-screen-label"><label for="chunits">{$i18n.label.work_units}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chunits.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{if $show_timesheet_checkbox}
-  <tr class = "small-screen-label"><td><label for="chtimesheet">{$i18n.label.timesheet}:</label></td></tr>
+{/if}
+  <tr class = "small-screen-label"><td><label for="chcost">{$i18n.label.cost}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="chtimesheet">{$i18n.label.timesheet}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.chtimesheet.control}</td>
+    <td class="large-screen-label"><label for="chcost">{$i18n.label.cost}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chcost.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{/if}
-{if $show_ip}
-  <tr class = "small-screen-label"><td><label for="chip">{$i18n.label.ip}:</label></td></tr>
+{if $show_approved}
+  <tr class = "small-screen-label"><td><label for="chapproved">{$i18n.label.approved}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="chip">{$i18n.label.ip}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.chip.control}</td>
+    <td class="large-screen-label"><label for="chapproved">{$i18n.label.approved}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chapproved.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $show_work_units}
-  <tr class = "small-screen-label"><td><label for="chunits">{$i18n.label.work_units}:</label></td></tr>
+{if $show_paid_status}
+  <tr class = "small-screen-label"><td><label for="chpaid">{$i18n.label.paid}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="chunits">{$i18n.label.work_units}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.chunits.control}</td>
+    <td class="large-screen-label"><label for="chpaid">{$i18n.label.paid}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chpaid.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $show_approved}
-  <tr class = "small-screen-label"><td><label for="chapproved">{$i18n.label.approved}:</label></td></tr>
+{if $show_ip}
+  <tr class = "small-screen-label"><td><label for="chip">{$i18n.label.ip}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="chapproved">{$i18n.label.approved}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.chapproved.control}</td>
+    <td class="large-screen-label"><label for="chip">{$i18n.label.ip}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chip.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
@@ -451,11 +451,11 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if $show_paid_status}
-  <tr class = "small-screen-label"><td><label for="chpaid">{$i18n.label.paid}:</label></td></tr>
+{if $show_timesheet_checkbox}
+  <tr class = "small-screen-label"><td><label for="chtimesheet">{$i18n.label.timesheet}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="chpaid">{$i18n.label.paid}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.chpaid.control}</td>
+    <td class="large-screen-label"><label for="chtimesheet">{$i18n.label.timesheet}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chtimesheet.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
@@ -468,80 +468,50 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 </table>
-{$forms.reportForm.close}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{$forms.reportForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td valign="top" colspan="2" align="center">
-      <table border="0" cellpadding="3">
+<div class="form-control-separator"></div>
+<table class="centered-table">
 {if isset($custom_fields) && $custom_fields->timeFields}
-    <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
+  <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.time_fields}</div></td></tr>
   {foreach $custom_fields->timeFields as $timeField}
-    <tr>
-      <td align="right">{$timeField['label']|escape}:</td>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-      <td>{$forms.reportForm.$control_name.control}</td>
-      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
-    </tr>
+    {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+    {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}:</label></td>
+    {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+    {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+    <td class="td-with-input">{$forms.reportForm.$control_name.control} {$forms.reportForm.$checkbox_control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
 {if isset($custom_fields) && $custom_fields->userFields}
-    <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
+  <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.user_fields}</div></td></tr>
   {foreach $custom_fields->userFields as $userField}
-    <tr>
-      <td align="right">{$userField['label']|escape}:</td>
-      {assign var="control_name" value='user_field_'|cat:$userField['id']}
-      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-      <td>{$forms.reportForm.$control_name.control}</td>
-      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
-    </tr>
+    {assign var="control_name" value='user_field_'|cat:$userField['id']}
+    {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$userField['label']|escape}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$userField['label']|escape}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.$control_name.control} {$forms.reportForm.$checkbox_control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
-        <tr><td><b>{$i18n.form.reports.group_by}</b></td></tr>
-        <tr valign="top">
-          <td>{$forms.reportForm.group_by1.control}</td>
-          <td>{$forms.reportForm.group_by2.control}</td>
-          <td>{$forms.reportForm.group_by3.control}</td>
-        </tr>
-        <tr>
-            <td><span id="totals_only_label"><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></span></td>
-        </tr>
-      </table>
-
-<div style="padding: 10 0 10 0;">
-  <table border="0" class="divider">
-    <tr>
-      <td align="center">
-        <table cellspacing="1" cellpadding="3" border="0">
-          <tr>
-            <td>{$i18n.form.reports.save_as_favorite}:</td><td>{$forms.reportForm.new_fav_report.control}</td>
-            <td>{$forms.reportForm.btn_save.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</div>
-
-      <table border="0" cellpadding="3" width="100%">
-        <tr><td colspan="3" height="50" align="center">{$forms.reportForm.btn_generate.control}</td></tr>
-      </table>
-    </td>
-  </tr>
 </table>
+<div class="form-control-separator"></div>
+<table class="centered-table">
+  <tr><td><div class="section-header">{$i18n.form.reports.group_by}</div></td></tr>
+  <tr><td class="td-with-input">{$forms.reportForm.group_by1.control}</td></tr>
+  <tr><td class="td-with-input">{$forms.reportForm.group_by2.control}</td></tr>
+  <tr><td class="td-with-input">{$forms.reportForm.group_by3.control}</td></tr>
+  <tr><td class="td-with-input"><span id="totals_only_label"><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></span></td></tr>
+</table>
+<div class="form-control-separator"></div>
+<table class="centered-table">
+  <tr><td class="text-cell"><label for="new_fav_report">{$i18n.form.reports.save_as_favorite}:</label></td></tr>
+  <tr><td class="td-with-input">{$forms.reportForm.new_fav_report.control} {$forms.reportForm.btn_save.control}</td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.reportForm.btn_generate.control}</div>
 {$forms.reportForm.close}
diff --git a/initialize.php b/initialize.php
index be497f91b..72ad717a5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5519");
+define("APP_VERSION", "1.19.28.5520");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports2.php b/reports2.php
index c5ac71ab8..71f455bea 100644
--- a/reports2.php
+++ b/reports2.php
@@ -204,8 +204,7 @@
     'name'=>'users_active',
     'data'=>$user_list_active,
     'layout'=>'V',
-    'groupin'=>$row_count,
-    'style'=>'width: 100%;'));
+    'groupin'=>$row_count));
 
   $user_list_inactive = array();
   foreach ($inactive_users as $single_user) {
@@ -222,14 +221,12 @@
     'name'=>'users_inactive',
     'data'=>$user_list_inactive,
     'layout'=>'V',
-    'groupin'=>$row_count,
-    'style'=>'width: 100%;'));
+    'groupin'=>$row_count));
 }
 
 // Add control for time period.
 $form->addInput(array('type'=>'combobox',
   'name'=>'period',
-  'style'=>'width: 250px;',
   'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
     INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
     INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
@@ -286,10 +283,9 @@
     $field_name = 'time_field_'.$timeField['id'];
     $checkbox_field_name = 'show_'.$field_name;
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
+      $form->addInput(array('type'=>'text','name'=>$field_name));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'empty'=>array(''=>$i18n->get('dropdown.all'))));
     }
@@ -304,10 +300,9 @@
     $field_name = 'user_field_'.$userField['id'];
     $checkbox_field_name = 'show_'.$field_name;
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
+      $form->addInput(array('type'=>'text','name'=>$field_name,));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($userField['id']),
       'empty'=>array(''=>$i18n->get('dropdown.all'))));
     }
@@ -348,7 +343,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.
-$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30','style'=>'width: 250px;'));
+$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30'));
 // Save button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 

From 189a237fdcd6d7c269de1d3a8120bd0d3ca52b60 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 May 2021 13:08:10 +0000
Subject: [PATCH 1535/1848] Switched to using mobile friendly reports.php
 developed earlier.

---
 initialize.php |   2 +-
 reports.php    |  28 +--
 reports2.php   | 496 -------------------------------------------------
 3 files changed, 8 insertions(+), 518 deletions(-)
 delete mode 100644 reports2.php

diff --git a/initialize.php b/initialize.php
index 72ad717a5..6494e97e1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5520");
+define("APP_VERSION", "1.19.28.5521");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 6e3849584..71f455bea 100644
--- a/reports.php
+++ b/reports.php
@@ -40,7 +40,6 @@
 $form->addInput(array('type'=>'combobox',
   'name'=>'favorite_report',
   'onchange'=>'this.form.fav_report_changed.value=1;this.form.submit();',
-  'style'=>'width: 250px;',
   'data'=>$report_list,
   'datakeys'=>array('id','name'),
   'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
@@ -64,7 +63,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'data'=>$client_list,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
@@ -87,7 +85,6 @@
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
@@ -103,7 +100,6 @@
 if ($showTask) {
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
-    'style'=>'width: 250px;',
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
@@ -116,7 +112,6 @@
     '2'=>$i18n->get('form.reports.include_not_billable'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'include_records', // TODO: how about a better name here?
-    'style'=>'width: 250px;',
     'data'=>$include_options,
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
@@ -128,7 +123,6 @@
     '2'=>$i18n->get('form.reports.include_not_invoiced'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'invoice',
-    'style'=>'width: 250px;',
     'data'=>$invoice_options,
     'empty'=>array(''=>$i18n->get('dropdown.all'))));
 }
@@ -139,7 +133,6 @@
 if ($showPaidStatus) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'paid_status',
-   'style'=>'width: 250px;',
    'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
  ));
@@ -152,7 +145,6 @@
 if ($showApproved) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'approved',
-   'style'=>'width: 250px;',
    'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
@@ -163,7 +155,6 @@
 if ($showTimesheetDropdown) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'timesheet',
-   'style'=>'width: 250px;',
    'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
      TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
      TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
@@ -213,8 +204,7 @@
     'name'=>'users_active',
     'data'=>$user_list_active,
     'layout'=>'V',
-    'groupin'=>$row_count,
-    'style'=>'width: 100%;'));
+    'groupin'=>$row_count));
 
   $user_list_inactive = array();
   foreach ($inactive_users as $single_user) {
@@ -231,14 +221,12 @@
     'name'=>'users_inactive',
     'data'=>$user_list_inactive,
     'layout'=>'V',
-    'groupin'=>$row_count,
-    'style'=>'width: 100%;'));
+    'groupin'=>$row_count));
 }
 
 // Add control for time period.
 $form->addInput(array('type'=>'combobox',
   'name'=>'period',
-  'style'=>'width: 250px;',
   'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
     INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
     INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
@@ -295,10 +283,9 @@
     $field_name = 'time_field_'.$timeField['id'];
     $checkbox_field_name = 'show_'.$field_name;
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
+      $form->addInput(array('type'=>'text','name'=>$field_name));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'empty'=>array(''=>$i18n->get('dropdown.all'))));
     }
@@ -313,10 +300,9 @@
     $field_name = 'user_field_'.$userField['id'];
     $checkbox_field_name = 'show_'.$field_name;
     if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;'));
+      $form->addInput(array('type'=>'text','name'=>$field_name,));
     } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($userField['id']),
       'empty'=>array(''=>$i18n->get('dropdown.all'))));
     }
@@ -357,7 +343,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.
-$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30','style'=>'width: 250px;'));
+$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30'));
 // Save button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -506,5 +492,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handleCheckboxes();fillDropdowns()"');
 $smarty->assign('title', $i18n->get('title.reports'));
-$smarty->assign('content_page_name', 'reports.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'reports2.tpl');
+$smarty->display('index2.tpl');
diff --git a/reports2.php b/reports2.php
deleted file mode 100644
index 71f455bea..000000000
--- a/reports2.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('initialize.php');
-import('form.Form');
-import('form.ActionForm');
-import('DateAndTime');
-import('ttGroupHelper');
-import('Period');
-import('ttProjectHelper');
-import('ttFavReportHelper');
-import('ttClientHelper');
-import('ttReportHelper');
-
-// Access check.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->exists()) {
-  header('Location: access_denied.php'); // No users in subgroup.
-  exit();
-}
-// End of access checks.
-
-$trackingMode = $user->getTrackingMode();
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-$form = new Form('reportForm');
-
-// Get saved favorite reports for user.
-$report_list = ttFavReportHelper::getReports();
-$form->addInput(array('type'=>'combobox',
-  'name'=>'favorite_report',
-  'onchange'=>'this.form.fav_report_changed.value=1;this.form.submit();',
-  'data'=>$report_list,
-  'datakeys'=>array('id','name'),
-  'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
-$form->addInput(array('type'=>'hidden','name'=>'fav_report_changed'));
-// Generate and Delete buttons.
-$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
-
-// Dropdown for clients if the clients plugin is enabled.
-$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
-$client_list = array();
-if ($showClient) {
-  if ($user->can('view_reports') || $user->can('view_all_reports')) {
-    $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
-                                                 // by filtering out not relevant clients.
-  } else
-    $client_list = ttClientHelper::getClientsForUser();
-  if (count($client_list) == 0) $showClient = false;
-}
-if ($showClient) {
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillProjectDropdown(this.value);',
-    'name'=>'client',
-    'data'=>$client_list,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.all'))));
-}
-
-// Add project dropdown.
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-$project_list = array();
-if ($showProject) {
-  if ($user->can('view_reports') || $user->can('view_all_reports')) {
-    $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
-  } elseif ($user->isClient()) {
-    $project_list = ttProjectHelper::getProjectsForClient();
-  } else {
-    $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
-  }
-  if (count($project_list) == 0) $showProject = false;
-}
-if ($showProject) {
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
-    'name'=>'project',
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.all'))));
-}
-
-// Add task dropdown.
-$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-$task_list = array();
-if ($showTask) {
-  $task_list = ttGroupHelper::getActiveTasks();
-  if (count($task_list) == 0) $showTask = false;
-}
-if ($showTask) {
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'task',
-    'data'=>$task_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.all'))));
-}
-
-// Add billable dropdown.
-$showBillable = $user->isPluginEnabled('iv');
-if ($showBillable) {
-  $include_options = array('1'=>$i18n->get('form.reports.include_billable'),
-    '2'=>$i18n->get('form.reports.include_not_billable'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'include_records', // TODO: how about a better name here?
-    'data'=>$include_options,
-    'empty'=>array(''=>$i18n->get('dropdown.all'))));
-}
-
-// Add invoiced / not invoiced selector.
-$showInvoiceDropdown = $user->isPluginEnabled('iv') && $user->can('manage_invoices');
-if ($showInvoiceDropdown) {
-  $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
-    '2'=>$i18n->get('form.reports.include_not_invoiced'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'invoice',
-    'data'=>$invoice_options,
-    'empty'=>array(''=>$i18n->get('dropdown.all'))));
-}
-$showInvoiceCheckbox = $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->isClient());
-
-// Add paid status selector.
-$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
-if ($showPaidStatus) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'paid_status',
-   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
- ));
-}
-
-// Add approved / not approved selector.
-$showApproved = $user->isPluginEnabled('ap') &&
-  ($user->can('view_own_reports') || $user->can('view_reports') ||
-   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
-if ($showApproved) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'approved',
-   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
-  ));
-}
-
-// Add timesheet assignment selector.
-$showTimesheetDropdown = $user->isPluginEnabled('ts');
-if ($showTimesheetDropdown) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'timesheet',
-   'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
-     TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
-     TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
-     TIMESHEET_APPROVED=>$i18n->get('dropdown.approved'),
-     TIMESHEET_NOT_APPROVED=>$i18n->get('dropdown.not_approved')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
-  ));
-}
-$showTimesheetCheckbox = $user->isPluginEnabled('ts');
-
-// Add user table.
-$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
-$user_list = array();
-if ($showUsers) {
-  // Prepare user and assigned projects arrays.
-  if ($user->can('view_reports') || $user->can('view_all_reports')) {
-    $rank = $user->getMaxRankForGroup($user->getGroup());
-    if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
-    if ($user->can('view_own_reports')) {
-      $options_active = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>ACTIVE);
-      $options_inactive = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>INACTIVE);
-    } else {
-      $options_active = array('max_rank'=>$max_rank,'status'=>ACTIVE);
-      $options_inactive = array('max_rank'=>$max_rank,'status'=>INACTIVE);
-    }
-    $active_users = $user->getUsers($options_active);
-    $inactive_users = $user->getUsers($options_inactive);
-  }
-  elseif ($user->isClient()) {
-    $options_active = array('status'=>ACTIVE);
-    $options_inactive = array('status'=>INACTIVE);
-    $active_users = ttGroupHelper::getUsersForClient($options_active);
-    $inactive_users = ttGroupHelper::getUsersForClient($options_inactive);
-  }
-
-  foreach ($active_users as $single_user) {
-    $user_list_active[$single_user['id']] = $single_user['name'];
-    $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
-    if ($projects) {
-      foreach ($projects as $single_project) {
-        $assigned_projects[$single_user['id']][] = $single_project['id'];
-      }
-    }
-  }
-  $row_count = is_array($user_list_active) ? ceil(count($user_list_active)/3) : 1;
-  $form->addInput(array('type'=>'checkboxgroup',
-    'name'=>'users_active',
-    'data'=>$user_list_active,
-    'layout'=>'V',
-    'groupin'=>$row_count));
-
-  $user_list_inactive = array();
-  foreach ($inactive_users as $single_user) {
-    $user_list_inactive[$single_user['id']] = $single_user['name'];
-    $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
-    if ($projects) {
-      foreach ($projects as $single_project) {
-        $assigned_projects[$single_user['id']][] = $single_project['id'];
-      }
-    }
-  }
-  $row_count = ceil(count($user_list_inactive)/3);
-  $form->addInput(array('type'=>'checkboxgroup',
-    'name'=>'users_inactive',
-    'data'=>$user_list_inactive,
-    'layout'=>'V',
-    'groupin'=>$row_count));
-}
-
-// Add control for time period.
-$form->addInput(array('type'=>'combobox',
-  'name'=>'period',
-  'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
-    INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
-    INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
-    INTERVAL_LAST_WEEK=>$i18n->get('dropdown.previous_week'),
-    INTERVAL_THIS_DAY=>$i18n->get('dropdown.current_day'),
-    INTERVAL_LAST_DAY=>$i18n->get('dropdown.previous_day')),
-  'empty'=>array(''=>$i18n->get('dropdown.select'))));
-// Add controls for start and end dates.
-$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
-$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
-
-// Add checkboxes for "Show fields" block.
-if ($showClient)
-  $form->addInput(array('type'=>'checkbox','name'=>'chclient'));
-if ($showProject)
-  $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
-if ($showTask)
-  $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ($showInvoiceCheckbox)
-  $form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
-if ($showPaidStatus)
-  $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
-$showIP = $user->can('view_reports') || $user->can('view_all_reports');
-if ($showIP)
-  $form->addInput(array('type'=>'checkbox','name'=>'chip'));
-$recordType = $user->getRecordType();
-$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showFinish = $showStart;
-if ($showStart)
-  $form->addInput(array('type'=>'checkbox','name'=>'chstart'));
-if ($showFinish)
-  $form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
-$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
-$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
-$form->addInput(array('type'=>'checkbox','name'=>'chcost'));
-$showWorkUnits = $user->isPluginEnabled('wu');
-if ($showWorkUnits)
-  $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
-if ($showTimesheetCheckbox)
-  $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
-if ($showApproved)
-  $form->addInput(array('type'=>'checkbox','name'=>'chapproved'));
-$showFiles = $user->isPluginEnabled('at');
-if ($showFiles)
-  $form->addInput(array('type'=>'checkbox','name'=>'chfiles'));
-
-// Add a hidden control for timesheet_user_id (who to generate a timesheet for).
-if ($showTimesheetCheckbox)
-  $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
-
-// If we have time custom fields - add controls for them.
-if (isset($custom_fields) && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    $checkbox_field_name = 'show_'.$field_name;
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'empty'=>array(''=>$i18n->get('dropdown.all'))));
-    }
-    // Also add a checkbox (to print the field or not).
-    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
-  }
-}
-
-// If we have user custom fields - add controls for them.
-if (isset($custom_fields) && $custom_fields->userFields) {
-  foreach ($custom_fields->userFields as $userField) {
-    $field_name = 'user_field_'.$userField['id'];
-    $checkbox_field_name = 'show_'.$field_name;
-    if ($userField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,));
-    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'data'=>CustomFields::getOptions($userField['id']),
-      'empty'=>array(''=>$i18n->get('dropdown.all'))));
-    }
-    // Also add a checkbox (to print the field or not).
-    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
-  }
-}
-
-// Add group by control.
-$group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
-$group_by_options['date'] = $i18n->get('form.reports.group_by_date');
-if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
-  $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
-if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
-  $group_by_options['client'] = $i18n->get('form.reports.group_by_client');
-if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
-  $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
-if (MODE_PROJECTS_AND_TASKS == $trackingMode)
-  $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
-// If we have time custom fields - add group by options for them.
-if (isset($custom_fields) && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    $group_by_options[$field_name] = $timeField['label'];
-  }
-}
-// If we have user custom fields - add group by options for them.
-if (isset($custom_fields) && $custom_fields->userFields) {
-  foreach ($custom_fields->userFields as $userField) {
-    $field_name = 'user_field_'.$userField['id'];
-    $group_by_options[$field_name] = $userField['label'];
-  }
-}
-$group_by_options_size = sizeof($group_by_options);
-$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
-if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
-if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
-$form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
-
-// Add text field for a new favorite report name.
-$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30'));
-// Save button.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
-
-// Create a bean (which is a mechanism to remember form values in session).
-$bean = new ActionForm('reportBean', $form, $request);
-// At this point form values are obtained from session if they are there.
-
-if ($request->isGet() && !$bean->isSaved()) {
-  // No previous form data were found in session. Use the following default values.
-  $form->setValueByElement('users_active', array_keys((array)$user_list_active));
-  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
-  $form->setValueByElement('start_date', $period->getStartDate());
-  $form->setValueByElement('end_date', $period->getEndDate());
-
-  $form->setValueByElement('chclient', '1');
-  $form->setValueByElement('chstart', '1');
-  $form->setValueByElement('chfinish', '1');
-  $form->setValueByElement('chduration', '1');
-
-  $form->setValueByElement('chproject', '1');
-  $form->setValueByElement('chtask', '1');
-  $form->setValueByElement('chnote', '1');
-  $form->setValueByElement('chcost', '0');
-
-  $form->setValueByElement('chtimesheet', '0');
-  $form->setValueByElement('chip', '0');
-  $form->setValueByElement('chapproved', '0');
-  $form->setValueByElement('chpaid', '0');
-
-  $form->setValueByElement('chunits', '0');
-  $form->setValueByElement('chinvoice', '0');
-  $form->setValueByElement('chfiles', '1');
-
-  $form->setValueByElement('chtotalsonly', '0');
-}
-
-$form->setValueByElement('fav_report_changed','');
-
-// Disable the Delete button when no favorite report is selected.
-if (!$bean->getAttribute('favorite_report') || ($bean->getAttribute('favorite_report') == -1))
-  $form->getElement('btn_delete')->setEnabled(false);
-
-if ($request->isPost()) {
-  if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {
-    // User changed favorite report. We need to load new values into the form.
-    if ($bean->getAttribute('favorite_report')) {
-      // This loads new favorite report options into the bean (into our form).
-      ttFavReportHelper::loadReport($bean);
-
-      // If user selected no favorite report - mark all user checkboxes (most probable scenario).
-      if ($bean->getAttribute('favorite_report') == -1) {
-        $form->setValueByElement('users_active', array_keys($user_list_active));
-        $form->setValueByElement('users_inactive', false);
-      }
-
-      // Save form data in session for future use.
-      $bean->saveBean();
-      header('Location: reports.php');
-      exit();
-    }
-  } elseif ($bean->getAttribute('btn_save')) {
-    // User clicked the Save button. We need to save form options as new favorite report.
-    if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
-
-    if ($err->no()) {
-      $id = ttFavReportHelper::saveReport($bean);
-      if (!$id)
-        $err->add($i18n->get('error.db'));
-      if ($err->no()) {
-        $bean->setAttribute('favorite_report', $id);
-        $bean->saveBean();
-        header('Location: reports.php');
-        exit();
-      }
-    }
-  } elseif($bean->getAttribute('btn_delete')) {
-    // Delete button pressed. User wants to delete a favorite report.
-    if ($bean->getAttribute('favorite_report')) {
-      ttFavReportHelper::deleteReport($bean->getAttribute('favorite_report'));
-      // Load default report.
-      $bean->setAttribute('favorite_report','');
-      $bean->setAttribute('new_fav_report', $report_list[0]['name']);
-      ttFavReportHelper::loadReport($bean);
-      $form->setValueByElement('users', array_keys($user_list));
-      $bean->saveBean();
-      header('Location: reports.php');
-      exit();
-    }
-  } else {
-    // Generate button pressed. Check some values.
-    if (!$bean->getAttribute('period')) {
-      $start_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
-
-      if ($start_date->isError() || !$bean->getAttribute('start_date'))
-        $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
-
-      $end_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
-      if ($end_date->isError() || !$bean->getAttribute('end_date'))
-        $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
-
-      if ($start_date->compare($end_date) > 0)
-        $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
-    }
-    $group_by1 = $bean->getAttribute('group_by1');
-    $group_by2 = $bean->getAttribute('group_by2');
-    $group_by3 = $bean->getAttribute('group_by3');
-    if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
-      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
-    if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
-      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
-    // Check remaining values.
-    if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
-
-    if ($err->no()) {
-      $bean->saveBean();
-      // Now we can go ahead and create a report.
-      header('Location: report.php');
-      exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('client_list', $client_list);
-$smarty->assign('show_client', $showClient);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('show_task', $showTask);
-$smarty->assign('show_billable', $showBillable);
-$smarty->assign('show_approved', $showApproved);
-$smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
-$smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
-$smarty->assign('show_paid_status', $showPaidStatus);
-$smarty->assign('show_timesheet_dropdown', $showTimesheetDropdown);
-$smarty->assign('show_timesheet_checkbox', $showTimesheetCheckbox);
-$smarty->assign('show_active_users', $showUsers && $active_users);
-$smarty->assign('show_inactive_users', $showUsers && $inactive_users);
-$smarty->assign('show_start', $showStart);
-$smarty->assign('show_finish', $showFinish);
-$smarty->assign('show_work_units', $showWorkUnits);
-$smarty->assign('show_ip', $showIP);
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('assigned_projects', $assigned_projects);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="handleCheckboxes();fillDropdowns()"');
-$smarty->assign('title', $i18n->get('title.reports'));
-$smarty->assign('content_page_name', 'reports2.tpl');
-$smarty->display('index2.tpl');

From df20820df4a743916596ce8e3d3f1b04182e4adf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 May 2021 13:50:04 +0000
Subject: [PATCH 1536/1848] Starting work on mobile friendly report2.php.

---
 WEB-INF/templates/report2.tpl | 360 ++++++++++++++++++++++++++++++++++
 initialize.php                |   2 +-
 report2.php                   | 313 +++++++++++++++++++++++++++++
 3 files changed, 674 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/report2.tpl
 create mode 100644 report2.php

diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report2.tpl
new file mode 100644
index 000000000..1e0fd466b
--- /dev/null
+++ b/WEB-INF/templates/report2.tpl
@@ -0,0 +1,360 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<div class="section-header">{$i18n.form.report.export} {if file_exists('WEB-INF/lib/tcpdf')}<a href="topdf.php">PDF</a>,{/if} <a href="tofile.php?type=xml">XML</a> {$i18n.label.or} <a href="tofile.php?type=csv">CSV</a></div>
+{$forms.reportViewForm.open}
+<!-- totals only report -->
+{if $bean->getAttribute('chtotalsonly')}
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$group_by_header|escape}</th>
+  {if $bean->getAttribute('chduration')}<th>{$i18n.label.duration}</th>{/if}
+  {if $bean->getAttribute('chunits')}<th>{$i18n.label.work_units_short}</th>{/if}
+  {if $bean->getAttribute('chcost')}<th>{$i18n.label.cost}</th>{/if}
+  </tr>
+  {foreach $subtotals as $subtotal}
+  <tr>
+    <td class="text-cell">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
+    {if $bean->getAttribute('chduration')}<td class="time-cell">{$subtotal['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="number-cell">{$subtotal['units']}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
+  </tr>
+  {/foreach}
+  <!-- print totals -->
+  <tr>
+    <th class="invoice-label">{$i18n.label.total}:</th>
+  {if $bean->getAttribute('chduration')}<td class="time-cell">{$totals['time']}</td>{/if}
+  {if $bean->getAttribute('chunits')}<td class="number-cell">{$totals['units']}</td>{/if}
+  {if $bean->getAttribute('chcost')}<td class="money-value-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+  </tr>
+</table>
+{/if}
+{$forms.reportViewForm.close}
+
+
+
+
+{$forms.reportViewForm.open}
+
+<table width="720">
+  <td valign="top">
+    <table border="0" cellpadding="3" cellspacing="1" width="100%">
+<!-- totals only report -->
+{if $bean->getAttribute('chtotalsonly')}
+      <tr>
+        <td class="tableHeader">{$group_by_header|escape}</td>
+        {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
+      </tr>
+  {foreach $subtotals as $subtotal}
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
+        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotal['units']}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
+      </tr>
+  {/foreach}
+      <!-- print totals -->
+      <tr><td>&nbsp;</td></tr>
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
+        {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td nowrap class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+      </tr>
+{else}
+<!-- normal report -->
+      <tr>
+        <td class="tableHeader">{$i18n.label.date}</td>
+  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
+
+  {* user custom fileds *}
+  {if isset($custom_fields) && $custom_fields->userFields}
+    {foreach $custom_fields->userFields as $userField}
+      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$userField['label']|escape}}</td>{/if}
+    {/foreach}
+  {/if}
+
+  {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
+  {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
+  {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
+
+  {* time custom fileds *}
+  {if isset($custom_fields) && $custom_fields->timeFields}
+    {foreach $custom_fields->timeFields as $timeField}
+      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$timeField['label']|escape}}</td>{/if}
+    {/foreach}
+  {/if}
+
+  {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
+  {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
+  {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
+  {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
+  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="tableHeader">{$i18n.label.note}</td>{/if}
+  {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
+  {if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
+  {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
+  {if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
+  {if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
+  {if $bean->getAttribute('chtimesheet')}<td class="tableHeader">{$i18n.label.timesheet}</td>{/if}
+  {if $bean->getAttribute('chfiles')}<td></td>{/if}
+      </tr>
+  {foreach $report_items as $item}
+    <!-- print subtotal for a block of grouped values -->
+    {$cur_date = $item.date}
+    {if $print_subtotals}
+      {$cur_grouped_by = $item.grouped_by}
+      {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
+        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
+
+        {* user custom fileds *}
+        {if isset($custom_fields) && $custom_fields->userFields}
+          {foreach $custom_fields->userFields as $userField}
+            {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
+
+        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
+        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
+        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
+
+        {* time custom fileds *}
+          {if isset($custom_fields) && $custom_fields->timeFields}
+           {foreach $custom_fields->timeFields as $timeField}
+            {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
+
+        {if $bean->getAttribute('chstart')}<td></td>{/if}
+        {if $bean->getAttribute('chfinish')}<td></td>{/if}
+        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
+        {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chapproved')}<td></td>{/if}
+        {if $bean->getAttribute('chpaid')}<td></td>{/if}
+        {if $bean->getAttribute('chip')}<td></td>{/if}
+        {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+        {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+        {if $bean->getAttribute('chfiles')}<td></td>{/if}
+        {if $use_checkboxes}<td></td>{/if}
+        <td></td>{* column for edit icons *}
+      </tr>
+      <tr><td>&nbsp;</td></tr>
+      {/if}
+    {$first_pass = false}
+    {/if}
+      <!--  print regular row -->
+      {if $cur_date != $prev_date}
+        {if $report_row_class == 'rowReportItem'} {$report_row_class = 'rowReportItemAlt'} {else} {$report_row_class = 'rowReportItem'} {/if}
+      {/if}
+      <tr class="{$report_row_class}">
+        <td class="cellLeftAligned">{$item.date}</td>
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
+
+    {* user custom fileds *}
+    {if isset($custom_fields) && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="control_name" value='user_field_'|cat:$userField['id']}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
+
+    {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
+    {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
+    {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
+
+    {* time custom fileds *}
+    {if isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
+
+    {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
+    {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
+    {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+    {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+    {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
+    {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
+    {if $bean->getAttribute('chfiles')}
+      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
+      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
+    {/if}
+    {if $use_checkboxes}
+      {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
+      {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
+    {/if}
+    {if $item.approved || $item.timesheet_id || $item.invoice_id}
+        <td>&nbsp;</td>
+    {else}
+      {if 1 == $item.type}<td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
+      {if 2 == $item.type}<td><a href="expense_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
+    {/if}
+      </tr>
+    {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
+      <tr>
+        <td class="cellRightAligned">{$i18n.label.note}:</td>
+        <td colspan="{$colspan}">{$item.note|escape}</td>
+      </tr>
+    {/if}
+    {$prev_date = $item.date}
+    {if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
+  {/foreach}
+  <!-- print a terminating subtotal -->
+  {if $print_subtotals}
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
+
+    {* user custom fileds *}
+    {if isset($custom_fields) && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
+    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
+    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
+    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
+
+    {* time custom fileds *}
+    {if isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
+    {if $bean->getAttribute('chstart')}<td></td>{/if}
+    {if $bean->getAttribute('chfinish')}<td></td>{/if}
+    {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td></td>{/if}
+    {if $bean->getAttribute('chpaid')}<td></td>{/if}
+    {if $bean->getAttribute('chip')}<td></td>{/if}
+    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+    {if $bean->getAttribute('chfiles')}<td></td>{/if}
+    {if $use_checkboxes}<td></td>{/if}
+        <td></td>{* column for edit icons *}
+      </tr>
+  {/if}
+  <!-- print totals -->
+      <tr><td>&nbsp;</td></tr>
+      <tr class="rowReportSubtotal">
+        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
+
+    {* user custom fileds *}
+    {if isset($custom_fields) && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
+    {if $bean->getAttribute('chclient')}<td></td>{/if}
+    {if $bean->getAttribute('chproject')}<td></td>{/if}
+    {if $bean->getAttribute('chtask')}<td></td>{/if}
+
+    {* time custom fileds *}
+    {if isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+
+    {if $bean->getAttribute('chstart')}<td></td>{/if}
+    {if $bean->getAttribute('chfinish')}<td></td>{/if}
+    {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
+    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td></td>{/if}
+    {if $bean->getAttribute('chpaid')}<td></td>{/if}
+    {if $bean->getAttribute('chip')}<td></td>{/if}
+    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+    {if $bean->getAttribute('chfiles')}<td></td>{/if}
+    {if $use_checkboxes}<td></td>{/if}
+        <td></td>{* column for edit icons *}
+      </tr>
+{/if}
+    </table>
+  </td>
+</tr>
+</table>
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice || $use_assign_to_timesheet)}
+<table width="720" cellspacing="0" cellpadding="0" border="0">
+  {if $use_mark_approved}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control} {$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
+  {if $use_mark_paid}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.label.mark_paid}: {$forms.reportViewForm.mark_paid_select_options.control} {$forms.reportViewForm.mark_paid_action_options.control} {$forms.reportViewForm.btn_mark_paid.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
+  {if $use_assign_to_invoice}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign_invoice.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
+  {if $use_assign_to_timesheet}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control} {$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
+</table>
+{/if}
+{$forms.reportViewForm.close}
+
+<table width="720" cellspacing="4" cellpadding="4" border="0">
+<tr>
+  <td align="center">
+  <table>
+  <tr>
+    <td><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></td>
+  </tr>
+  </table>
+  </td>
+</tr>
+</table>
diff --git a/initialize.php b/initialize.php
index 6494e97e1..4ace7d553 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5521");
+define("APP_VERSION", "1.19.28.5522");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report2.php b/report2.php
new file mode 100644
index 000000000..d5fd4e165
--- /dev/null
+++ b/report2.php
@@ -0,0 +1,313 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('ttConfigHelper');
+import('form.Form');
+import('form.ActionForm');
+import('ttReportHelper');
+import('ttGroupHelper');
+import('ttTimesheetHelper');
+
+// Access checks.
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$config = new ttConfigHelper($user->getConfig());
+
+if ($user->isPluginEnabled('ap')) {
+  $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
+  $_SESSION['mark_approved_select_option'] = $cl_mark_approved_select_option;
+  $cl_mark_approved_action_option = $request->getParameter('mark_approved_action_options', ($request->isPost() ? null : @$_SESSION['mark_approved_action_option']));
+  $_SESSION['mark_aproved_action_option'] = $cl_mark_approved_action_option;
+}
+if ($user->isPluginEnabled('ps')) {
+  $cl_mark_paid_select_option = $request->getParameter('mark_paid_select_options', ($request->isPost() ? null : @$_SESSION['mark_paid_select_option']));
+  $_SESSION['mark_paid_select_option'] = $cl_mark_paid_select_option;
+  $cl_mark_paid_action_option = $request->getParameter('mark_paid_action_options', ($request->isPost() ? null : @$_SESSION['mark_paid_action_option']));
+  $_SESSION['mark_paid_action_option'] = $cl_mark_paid_action_option;
+}
+if ($user->isPluginEnabled('iv')) {
+  $cl_assign_invoice_select_option = $request->getParameter('assign_invoice_select_options', ($request->isPost() ? null : @$_SESSION['assign_invoice_select_option']));
+  $_SESSION['assign_invoice_select_option'] = $cl_assign_invoice_select_option;
+  $cl_recent_invoice_option = $request->getParameter('recent_invoice', ($request->isPost() ? null : @$_SESSION['recent_invoice_option']));
+  $_SESSION['recent_invoice_option'] = $cl_recent_invoice_option;
+}
+if ($user->isPluginEnabled('ts')) {
+  $cl_assign_timesheet_select_option = $request->getParameter('assign_timesheet_select_options', ($request->isPost() ? null : @$_SESSION['assign_timesheet_select_option']));
+  $_SESSION['assign_timesheet_select_option'] = $cl_assign_timesheet_select_option;
+  $cl_timesheet_option = $request->getParameter('timesheet', ($request->isPost() ? null : @$_SESSION['timesheet_option']));
+  $_SESSION['timesheet_option'] = $cl_timesheet_option;
+}
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+$form = new Form('reportViewForm');
+
+// Report settings are stored in session bean before we get here from reports.php.
+$bean = new ActionForm('reportBean', new Form('reportForm'), $request);
+// If we are in post, load the bean from session, as the constructor does it only in get.
+if ($request->isPost()) $bean->loadBean();
+
+$client_id = $bean->getAttribute('client');
+$options = ttReportHelper::getReportOptions($bean);
+
+// Do we need to show checkboxes? We show them in the following 4 situations:
+// - We can approve items.
+// - We can mark items as paid.
+// - We can assign items to invoices.
+// - We can assign items to a timesheet.
+// Determine these conditions separately.
+$useMarkApproved = $useMarkPaid = $useAssignToInvoice = $useAssignToTimesheet = false;
+if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
+  $useMarkApproved = true;
+if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
+  $useMarkPaid = true;
+if ($bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
+  $useAssignToInvoice = true;
+if ($bean->getAttribute('chtimesheet')) {
+  $timesheets = ttTimesheetHelper::getMatchingTimesheets($options);
+  if ($timesheets) $useAssignToTimesheet = true;
+}
+
+$use_checkboxes = $useMarkApproved || $useMarkPaid || $useAssignToInvoice || $useAssignToTimesheet;
+$smarty->assign('use_checkboxes', $use_checkboxes);
+
+// Controls for "Mark approved" block.
+$smarty->assign('use_mark_approved', false);
+if ($useMarkApproved) {
+  $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_approved_select_options',
+    'data'=>$mark_approved_select_options,
+    'value'=>$cl_mark_approved_select_option));
+  $mark_approved_action_options = array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_approved_action_options',
+    'data'=>$mark_approved_action_options,
+    'value'=>$cl_mark_approved_action_option));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_approved','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_mark_approved', true);
+}
+
+// Controls for "Mark paid" block.
+$smarty->assign('use_mark_paid', false);
+if ($useMarkPaid) {
+  $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_paid_select_options',
+    'data'=>$mark_paid_select_options,
+    'value'=>$cl_mark_paid_select_option));
+  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_paid_action_options',
+    'data'=>$mark_paid_action_options,
+    'value'=>$cl_mark_paid_action_option));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_mark_paid', true);
+}
+
+// Controls for "Assign to invoice" block.
+$smarty->assign('use_assign_to_invoice', false);
+if ($useAssignToInvoice) {
+  // Client is selected and we are displaying the invoice column.
+  $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
+  if ($recent_invoices) {
+    $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+    $form->addInput(array('type'=>'combobox',
+      'name'=>'assign_invoice_select_options',
+      'data'=>$assign_invoice_select_options,
+      'value'=>$cl_assign_invoice_select_option));
+    $form->addInput(array('type'=>'combobox',
+      'name'=>'recent_invoice',
+      'data'=>$recent_invoices,
+      'datakeys'=>array('id','name'),
+      'value'=>$cl_recent_invoice_option,
+      'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
+    $form->addInput(array('type'=>'submit','name'=>'btn_assign_invoice','value'=>$i18n->get('button.submit')));
+    $smarty->assign('use_assign_to_invoice', true);
+  }
+}
+
+// Controls for "Assign to timesheet" block.
+$smarty->assign('use_assign_to_timesheet', false);
+if ($useAssignToTimesheet) {
+  $assign_timesheet_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+  $form->addInput(array('type'=>'combobox',
+      'name'=>'assign_timesheet_select_options',
+      'data'=>$assign_timesheet_select_options,
+      'value'=>$cl_assign_timesheet_select_option));
+  $form->addInput(array('type'=>'combobox',
+      'name'=>'timesheet',
+      'data'=>$timesheets,
+      'datakeys'=>array('id','name'),
+      'value'=>$cl_timesheet_option,
+      'empty'=>array(''=>$i18n->get('dropdown.select_timesheet'))));
+  $form->addInput(array('type'=>'submit','name'=>'btn_assign_timesheet','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_assign_to_timesheet', true);
+}
+
+if ($request->isPost()) {
+
+  // Validate parameters and at the same time build arrays of record ids.
+  if (($request->getParameter('btn_mark_approved') && 2 == $request->getParameter('mark_approved_select_options'))
+       || ($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
+       || ($request->getParameter('btn_assign_invoice') && 2 == $request->getParameter('assign_invoice_select_options'))
+       || ($request->getParameter('btn_assign_timesheet') && 2 == $request->getParameter('assign_timesheet_select_options'))) {
+    // We act on selected records. Are there any?
+    foreach($_POST as $key => $val) {
+      if ('log_id_' == substr($key, 0, 7))
+        $time_log_ids[] = substr($key, 7);
+      if ('item_id_' == substr($key, 0, 8))
+        $expense_item_ids[] = substr($key, 8);
+    }
+    if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->get('error.record')); // There are no selected records.
+    // Validation of parameteres ended here.
+  } else {
+    // We are assigning all report items. Get the arrays from session.
+    // Note: getting from session assures we act only on previously displayed records.
+    // Rebuilding from $bean may get us a different set.
+    $item_ids = ttReportHelper::getFromSession();
+    $time_log_ids = @$item_ids['report_item_ids'];
+    $expense_item_ids = @$item_ids['report_item_expense_ids'];
+    // The above code is here because the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
+  }
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_mark_approved')) {
+      // User clicked the "Mark approved" button to mark some or all items either approved or not approved.
+
+      // Determine user action.
+      $mark_approved = $request->getParameter('mark_approved_action_options') == 1 ? true : false;
+
+      // Mark as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::markApproved($time_log_ids, $expense_item_ids, $mark_approved);
+      }
+
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
+
+    if ($request->getParameter('btn_mark_paid')) {
+      // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
+
+      // Determine user action.
+      $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
+
+      // Mark as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
+      }
+
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
+
+    if ($request->getParameter('btn_assign_invoice')) {
+      // User clicked the Submit button to assign all or some items to a recent invoice.
+
+      // Determine invoice id.
+      $invoice_id = $request->getParameter('recent_invoice');
+
+      // Assign as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+      }
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
+
+    if ($request->getParameter('btn_assign_timesheet')) {
+      // User clicked the Submit button to assign all or some items to a timesheet.
+
+      // Determine invoice id.
+      $timesheet_id = $request->getParameter('timesheet');
+
+      // Assign as requested.
+      if ($time_log_ids) {
+        ttReportHelper::assignToTimesheet($timesheet_id, $time_log_ids);
+      }
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
+  }
+} // isPost
+
+$report_items = ttReportHelper::getItems($options);
+// Store record ids in session in case user wants to act on records such as marking them all paid.
+if ($request->isGet() && $use_checkboxes)
+  ttReportHelper::putInSession($report_items);
+
+$subtotals = array();
+$smarty->assign('print_subtotals', false);
+if (ttReportHelper::grouping($options)) {
+  $subtotals = ttReportHelper::getSubtotals($options);
+  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
+  if ($report_items) {
+    // Assign variables that are used to print subtotals.
+    $smarty->assign('print_subtotals', true);
+    $smarty->assign('first_pass', true);
+    $smarty->assign('prev_grouped_by', '');
+    $smarty->assign('cur_grouped_by', '');
+  }
+}
+$totals = ttReportHelper::getTotals($options);
+
+// Determine column span for note field.
+$colspan = 0;
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
+if (isset($custom_fields) && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $checkbox_control_name = 'show_user_field_'.$userField['id'];
+    if ($bean->getAttribute($checkbox_control_name)) $colspan++;
+  }
+}
+if ($bean->getAttribute('chclient')) $colspan++;
+if ($bean->getAttribute('chproject')) $colspan++;
+if ($bean->getAttribute('chtask')) $colspan++;
+if (isset($custom_fields) && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $checkbox_control_name = 'show_time_field_'.$timeField['id'];
+    if ($bean->getAttribute($checkbox_control_name)) $colspan++;
+  }
+}
+if ($bean->getAttribute('chstart')) $colspan++;
+if ($bean->getAttribute('chfinish')) $colspan++;
+if ($bean->getAttribute('chduration')) $colspan++;
+if ($bean->getAttribute('chunits')) $colspan++;
+if ($bean->getAttribute('chcost')) $colspan++;
+if ($bean->getAttribute('chapproved')) $colspan++;
+if ($bean->getAttribute('chpaid')) $colspan++;
+if ($bean->getAttribute('chip')) $colspan++;
+if ($bean->getAttribute('chinvoice')) $colspan++;
+if ($bean->getAttribute('chtimesheet')) $colspan++;
+if ($bean->getAttribute('chfiles')) $colspan++;
+
+// Assign variables that are used to alternate color of rows for different dates.
+$smarty->assign('prev_date', '');
+$smarty->assign('cur_date', '');
+$smarty->assign('report_row_class', 'rowReportItem');
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('report_items', $report_items);
+$smarty->assign('subtotals', $subtotals);
+$smarty->assign('totals', $totals);
+$smarty->assign('note_on_separate_row', $user->getConfigOption('report_note_on_separate_row'));
+$smarty->assign('colspan', $colspan);
+$smarty->assign('bean', $bean);
+$smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
+$smarty->assign('content_page_name', 'report2.tpl');
+$smarty->display('index2.tpl');

From beca535c23720c04501f1100cff9751517625fb2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 May 2021 14:18:45 +0000
Subject: [PATCH 1537/1848] Fixed a bug on totals only reports with visibility
 of use_mark_approved and similar controls.

---
 initialize.php | 2 +-
 report.php     | 8 ++++----
 report2.php    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/initialize.php b/initialize.php
index 4ace7d553..d2838d03e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5522");
+define("APP_VERSION", "1.19.28.5523");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index e53374138..19f6b8c22 100644
--- a/report.php
+++ b/report.php
@@ -68,13 +68,13 @@
 // - We can assign items to a timesheet.
 // Determine these conditions separately.
 $useMarkApproved = $useMarkPaid = $useAssignToInvoice = $useAssignToTimesheet = false;
-if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
   $useMarkApproved = true;
-if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chpaid') && $user->can('manage_invoices'))
   $useMarkPaid = true;
-if ($bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
   $useAssignToInvoice = true;
-if ($bean->getAttribute('chtimesheet')) {
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chtimesheet')) {
   $timesheets = ttTimesheetHelper::getMatchingTimesheets($options);
   if ($timesheets) $useAssignToTimesheet = true;
 }
diff --git a/report2.php b/report2.php
index d5fd4e165..3776ecb3d 100644
--- a/report2.php
+++ b/report2.php
@@ -68,13 +68,13 @@
 // - We can assign items to a timesheet.
 // Determine these conditions separately.
 $useMarkApproved = $useMarkPaid = $useAssignToInvoice = $useAssignToTimesheet = false;
-if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
   $useMarkApproved = true;
-if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chpaid') && $user->can('manage_invoices'))
   $useMarkPaid = true;
-if ($bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
   $useAssignToInvoice = true;
-if ($bean->getAttribute('chtimesheet')) {
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chtimesheet')) {
   $timesheets = ttTimesheetHelper::getMatchingTimesheets($options);
   if ($timesheets) $useAssignToTimesheet = true;
 }

From caf11264e9ae62724213cb159d745274047fb0ac Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 May 2021 14:33:04 +0000
Subject: [PATCH 1538/1848] Recovered show note option on reports.php.

---
 WEB-INF/templates/reports2.tpl | 6 ++++++
 initialize.php                 | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
index a4c926ad1..3f272e112 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports2.tpl
@@ -405,6 +405,12 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.reportForm.chduration.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="chnote">{$i18n.label.note}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="chnote">{$i18n.label.note}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.chnote.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $show_work_units}
   <tr class = "small-screen-label"><td><label for="chunits">{$i18n.label.work_units}:</label></td></tr>
   <tr>
diff --git a/initialize.php b/initialize.php
index d2838d03e..c6cdd3b6e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5523");
+define("APP_VERSION", "1.19.28.5524");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From fa6b5f9e9cbb5a73cf9ddbb7cc428527f32e84f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 May 2021 23:15:05 +0000
Subject: [PATCH 1539/1848] A bit more progress on making mobile friendly
 report2.php.

---
 WEB-INF/templates/report2.tpl | 112 +++++++++++++++++++++++++++-------
 initialize.php                |   2 +-
 2 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report2.tpl
index 1e0fd466b..21eaa4ed0 100644
--- a/WEB-INF/templates/report2.tpl
+++ b/WEB-INF/templates/report2.tpl
@@ -29,41 +29,107 @@
   {if $bean->getAttribute('chcost')}<td class="money-value-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
   </tr>
 </table>
+{else}
+<!-- normal report -->
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.date}</th>
+  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<th>{$i18n.label.user}</th>{/if}
+  {* user custom fileds *}
+  {if isset($custom_fields) && $custom_fields->userFields}
+    {foreach $custom_fields->userFields as $userField}
+      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<th>{{$userField['label']|escape}}</th>{/if}
+    {/foreach}
+  {/if}
+  {if $bean->getAttribute('chclient')}<th>{$i18n.label.client}</th>{/if}
+  {if $bean->getAttribute('chproject')}<th>{$i18n.label.project}</th>{/if}
+  {if $bean->getAttribute('chtask')}<th>{$i18n.label.task}</th>{/if}
+  {* time custom fileds *}
+  {if isset($custom_fields) && $custom_fields->timeFields}
+    {foreach $custom_fields->timeFields as $timeField}
+      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<th>{{$timeField['label']|escape}}</th>{/if}
+    {/foreach}
+  {/if}
+  {if $bean->getAttribute('chstart')}<th>{$i18n.label.start}</th>{/if}
+  {if $bean->getAttribute('chfinish')}<th>{$i18n.label.finish}</th>{/if}
+  {if $bean->getAttribute('chduration')}<th>{$i18n.label.duration}</th>{/if}
+  {if $bean->getAttribute('chunits')}<th>{$i18n.label.work_units_short}</th>{/if}
+  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<th>{$i18n.label.note}</th>{/if}
+  {if $bean->getAttribute('chcost')}<th>{$i18n.label.cost}</th>{/if}
+  {if $bean->getAttribute('chapproved')}<th>{$i18n.label.approved}</th>{/if}
+  {if $bean->getAttribute('chpaid')}<th>{$i18n.label.paid}</th>{/if}
+  {if $bean->getAttribute('chip')}<th>{$i18n.label.ip}</th>{/if}
+  {if $bean->getAttribute('chinvoice')}<th>{$i18n.label.invoice}</th>{/if}
+  {if $bean->getAttribute('chtimesheet')}<th>{$i18n.label.timesheet}</th>{/if}
+  {if $bean->getAttribute('chfiles')}<th></th>{/if}
+  </tr>
+  {foreach $report_items as $item}
+    <!-- print subtotal for a block of grouped values -->
+    {$cur_date = $item.date}
+    {if $print_subtotals}
+      {$cur_grouped_by = $item.grouped_by}
+      {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
+      <tr>
+        <th class="invoice-label">{$i18n.label.subtotal}</th>
+        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
+
+        {* user custom fileds *}
+        {if isset($custom_fields) && $custom_fields->userFields}
+          {foreach $custom_fields->userFields as $userField}
+            {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
+
+        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
+        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
+        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
+
+        {* time custom fileds *}
+          {if isset($custom_fields) && $custom_fields->timeFields}
+           {foreach $custom_fields->timeFields as $timeField}
+            {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
+
+        {if $bean->getAttribute('chstart')}<td></td>{/if}
+        {if $bean->getAttribute('chfinish')}<td></td>{/if}
+        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
+        {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chapproved')}<td></td>{/if}
+        {if $bean->getAttribute('chpaid')}<td></td>{/if}
+        {if $bean->getAttribute('chip')}<td></td>{/if}
+        {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+        {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+        {if $bean->getAttribute('chfiles')}<td></td>{/if}
+        {if $use_checkboxes}<td></td>{/if}
+        <td></td>{* column for edit icons *}
+      </tr>
+      <tr><td>&nbsp;</td></tr>
+      {/if}
+    {$first_pass = false}
+    {/if}
+  {/foreach}
+</table>
 {/if}
 {$forms.reportViewForm.close}
 
 
 
 
-{$forms.reportViewForm.open}
 
+
+{$forms.reportViewForm.open}
 <table width="720">
   <td valign="top">
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
 <!-- totals only report -->
 {if $bean->getAttribute('chtotalsonly')}
-      <tr>
-        <td class="tableHeader">{$group_by_header|escape}</td>
-        {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
-      </tr>
-  {foreach $subtotals as $subtotal}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
-        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotal['units']}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
-      </tr>
-  {/foreach}
-      <!-- print totals -->
-      <tr><td>&nbsp;</td></tr>
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
-        {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td nowrap class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
-      </tr>
 {else}
 <!-- normal report -->
       <tr>
diff --git a/initialize.php b/initialize.php
index c6cdd3b6e..40135a55a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5524");
+define("APP_VERSION", "1.19.28.5525");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c121f9cb5b9b88cc72d005e23fec1f3376fc7ecd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 May 2021 15:13:15 +0000
Subject: [PATCH 1540/1848] More progress on making mobile friendly report.

---
 WEB-INF/templates/report2.tpl | 168 ++++++++++++++++++++++++++++++----
 default.css                   |   5 +
 initialize.php                |   2 +-
 3 files changed, 155 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report2.tpl
index 21eaa4ed0..db065ac94 100644
--- a/WEB-INF/templates/report2.tpl
+++ b/WEB-INF/templates/report2.tpl
@@ -4,7 +4,7 @@
 
 <div class="section-header">{$i18n.form.report.export} {if file_exists('WEB-INF/lib/tcpdf')}<a href="topdf.php">PDF</a>,{/if} <a href="tofile.php?type=xml">XML</a> {$i18n.label.or} <a href="tofile.php?type=csv">CSV</a></div>
 {$forms.reportViewForm.open}
-<!-- totals only report -->
+{* totals only report *}
 {if $bean->getAttribute('chtotalsonly')}
 <table class="x-scrollable-table">
   <tr>
@@ -21,7 +21,7 @@
     {if $bean->getAttribute('chcost')}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
   </tr>
   {/foreach}
-  <!-- print totals -->
+  {* print totals *}
   <tr>
     <th class="invoice-label">{$i18n.label.total}:</th>
   {if $bean->getAttribute('chduration')}<td class="time-cell">{$totals['time']}</td>{/if}
@@ -30,7 +30,7 @@
   </tr>
 </table>
 {else}
-<!-- normal report -->
+{* normal report *}
 <table class="x-scrollable-table">
   <tr>
     <th>{$i18n.label.date}</th>
@@ -66,15 +66,14 @@
   {if $bean->getAttribute('chfiles')}<th></th>{/if}
   </tr>
   {foreach $report_items as $item}
-    <!-- print subtotal for a block of grouped values -->
+  {* print subtotal for a block of grouped values *}
     {$cur_date = $item.date}
     {if $print_subtotals}
       {$cur_grouped_by = $item.grouped_by}
       {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
-      <tr>
-        <th class="invoice-label">{$i18n.label.subtotal}</th>
-        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
-
+  <tr>
+    <th class="invoice-label">{$i18n.label.subtotal}</th>
+        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
         {* user custom fileds *}
         {if isset($custom_fields) && $custom_fields->userFields}
           {foreach $custom_fields->userFields as $userField}
@@ -82,10 +81,9 @@
             {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
           {/foreach}
         {/if}
-
-        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
-        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
-        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
+        {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
+        {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
+        {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
 
         {* time custom fileds *}
           {if isset($custom_fields) && $custom_fields->timeFields}
@@ -94,13 +92,12 @@
             {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
           {/foreach}
         {/if}
-
         {if $bean->getAttribute('chstart')}<td></td>{/if}
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
-        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
+        {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
+        {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
         {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chapproved')}<td></td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chip')}<td></td>{/if}
@@ -108,13 +105,146 @@
         {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
         {if $bean->getAttribute('chfiles')}<td></td>{/if}
         {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-      <tr><td>&nbsp;</td></tr>
+    <td></td>{* column for edit icons *}
+  </tr>
+  <tr><td>&nbsp;</td></tr>
       {/if}
     {$first_pass = false}
     {/if}
+    {* print regular row *}
+  <tr>
+    <td class="date-cell">{$item.date}</td>
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell">{$item.user|escape}</td>{/if}
+    {* user custom fileds *}
+    {if isset($custom_fields) && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="control_name" value='user_field_'|cat:$userField['id']}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td class="text-cell">{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
+    {if $bean->getAttribute('chclient')}<td class="text-cell">{$item.client|escape}</td>{/if}
+    {if $bean->getAttribute('chproject')}<td class="text-cell">{$item.project|escape}</td>{/if}
+    {if $bean->getAttribute('chtask')}<td class="text-cell">{$item.task|escape}</td>{/if}
+    {* time custom fileds *}
+    {if isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td class="text-cell">{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
+    {if $bean->getAttribute('chstart')}<td class="time-cell">{$item.start}</td>{/if}
+    {if $bean->getAttribute('chfinish')}<td class="time-cell">{$item.finish}</td>{/if}
+    {if $bean->getAttribute('chduration')}<td class="time-cell">{$item.duration}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="number-cell">{$item.units}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="text-cell">{$item.note|escape}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td class="yes-no-cell">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+    {if $bean->getAttribute('chpaid')}<td class="yes-no-cell">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+    {if $bean->getAttribute('chip')}<td class="text-cell">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
+    {if $bean->getAttribute('chinvoice')}<td class="text-cell">{$item.invoice|escape}</td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td class="text-cell">{$item.timesheet_name|escape}</td>{/if}
+    {if $bean->getAttribute('chfiles')}
+      {if 1 == $item.type}<td>{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
+      {if 2 == $item.type}<td>{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
+    {/if}
+    {if $use_checkboxes}
+      {if 1 == $item.type}<td><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
+      {if 2 == $item.type}<td><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
+    {/if}
+    {if $item.approved || $item.timesheet_id || $item.invoice_id}
+    <td>&nbsp;</td>
+    {else}
+      {if 1 == $item.type}<td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
+      {if 2 == $item.type}<td><a href="expense_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
+    {/if}
+  </tr>
+    {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
+  <tr>
+    <th class="invoice-label">{$i18n.label.note}</td>
+    <td colspan="{$colspan}" class="text-cell">{$item.note|escape}</td>
+  </tr>
+    {/if}
+    {$prev_date = $item.date}
+    {if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
   {/foreach}
+  {* print a terminating subtotal *}
+  {if $print_subtotals}
+  <tr>
+    <th class="invoice-label">{$i18n.label.subtotal}</th>
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
+
+    {* user custom fileds *}
+    {if isset($custom_fields) && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+    {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
+    {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
+    {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
+    {* time custom fileds *}
+    {if isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+    {if $bean->getAttribute('chstart')}<td></td>{/if}
+    {if $bean->getAttribute('chfinish')}<td></td>{/if}
+    {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td></td>{/if}
+    {if $bean->getAttribute('chpaid')}<td></td>{/if}
+    {if $bean->getAttribute('chip')}<td></td>{/if}
+    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+    {if $bean->getAttribute('chfiles')}<td></td>{/if}
+    {if $use_checkboxes}<td></td>{/if}
+    <td></td>{* column for edit icons *}
+  </tr>
+  {/if}
+  {* print totals *}
+  <tr><td>&nbsp;</td></tr>
+  <tr>
+    <th class="invoice-label">{$i18n.label.total}</td>
+    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
+    {* user custom fileds *}
+    {if isset($custom_fields) && $custom_fields->userFields}
+      {foreach $custom_fields->userFields as $userField}
+        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+    {if $bean->getAttribute('chclient')}<td></td>{/if}
+    {if $bean->getAttribute('chproject')}<td></td>{/if}
+    {if $bean->getAttribute('chtask')}<td></td>{/if}
+    {* time custom fileds *}
+    {if isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
+    {if $bean->getAttribute('chstart')}<td></td>{/if}
+    {if $bean->getAttribute('chfinish')}<td></td>{/if}
+    {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$totals['time']}</td>{/if}
+    {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$totals['units']}</td>{/if}
+    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
+    {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chapproved')}<td></td>{/if}
+    {if $bean->getAttribute('chpaid')}<td></td>{/if}
+    {if $bean->getAttribute('chip')}<td></td>{/if}
+    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+    {if $bean->getAttribute('chfiles')}<td></td>{/if}
+    {if $use_checkboxes}<td></td>{/if}
+    <td></td>{* column for edit icons *}
+  </tr>
 </table>
 {/if}
 {$forms.reportViewForm.close}
diff --git a/default.css b/default.css
index 48a3fb58a..533b3ff78 100644
--- a/default.css
+++ b/default.css
@@ -200,6 +200,11 @@ div.page-hint {
   text-align: right;
 }
 
+/* cell containign a subtotal */
+.subtotal-cell {
+  font-weight: bold;
+}
+
 /* control labels for large screens */
 .large-screen-label {
   text-align: right;
diff --git a/initialize.php b/initialize.php
index 40135a55a..44c2a02cd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5525");
+define("APP_VERSION", "1.19.28.5526");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 05612acdd7987d0e3d15098ce197ea14284d0d46 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 May 2021 19:25:30 +0000
Subject: [PATCH 1541/1848] Made report.php mobile friendly.

---
 WEB-INF/templates/report.tpl   | 331 ------------------------
 WEB-INF/templates/report2.tpl  | 306 ++--------------------
 WEB-INF/templates/reports.tpl  | 459 ---------------------------------
 WEB-INF/templates/reports2.tpl |   3 +
 default.css                    |   1 +
 initialize.php                 |   2 +-
 report.php                     |  14 +-
 report2.php                    | 313 ----------------------
 8 files changed, 35 insertions(+), 1394 deletions(-)
 delete mode 100644 WEB-INF/templates/report.tpl
 delete mode 100644 WEB-INF/templates/reports.tpl
 delete mode 100644 report2.php

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
deleted file mode 100644
index 02b59e9ef..000000000
--- a/WEB-INF/templates/report.tpl
+++ /dev/null
@@ -1,331 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.reportViewForm.open}
-<table width="720">
-  <td valign="top">
-    <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-        <td valign="top" class="sectionHeaderNoBorder" align="center">{$i18n.form.report.export} {if file_exists('WEB-INF/lib/tcpdf')}<a href="topdf.php">PDF</a>,{/if} <a href="tofile.php?type=xml">XML</a> {$i18n.label.or} <a href="tofile.php?type=csv">CSV</a></td>
-      </tr>
-    </table>
-    <table border="0" cellpadding="3" cellspacing="1" width="100%">
-<!-- totals only report -->
-{if $bean->getAttribute('chtotalsonly')}
-      <tr>
-        <td class="tableHeader">{$group_by_header|escape}</td>
-        {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
-      </tr>
-  {foreach $subtotals as $subtotal}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
-        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotal['units']}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
-      </tr>
-  {/foreach}
-      <!-- print totals -->
-      <tr><td>&nbsp;</td></tr>
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
-        {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td nowrap class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
-        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
-      </tr>
-{else}
-<!-- normal report -->
-      <tr>
-        <td class="tableHeader">{$i18n.label.date}</td>
-  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
-
-  {* user custom fileds *}
-  {if isset($custom_fields) && $custom_fields->userFields}
-    {foreach $custom_fields->userFields as $userField}
-      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$userField['label']|escape}}</td>{/if}
-    {/foreach}
-  {/if}
-
-  {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
-  {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
-  {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
-
-  {* time custom fileds *}
-  {if isset($custom_fields) && $custom_fields->timeFields}
-    {foreach $custom_fields->timeFields as $timeField}
-      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$timeField['label']|escape}}</td>{/if}
-    {/foreach}
-  {/if}
-
-  {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
-  {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
-  {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
-  {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
-  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="tableHeader">{$i18n.label.note}</td>{/if}
-  {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
-  {if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
-  {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
-  {if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
-  {if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
-  {if $bean->getAttribute('chtimesheet')}<td class="tableHeader">{$i18n.label.timesheet}</td>{/if}
-  {if $bean->getAttribute('chfiles')}<td></td>{/if}
-      </tr>
-  {foreach $report_items as $item}
-    <!-- print subtotal for a block of grouped values -->
-    {$cur_date = $item.date}
-    {if $print_subtotals}
-      {$cur_grouped_by = $item.grouped_by}
-      {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
-
-        {* user custom fileds *}
-        {if isset($custom_fields) && $custom_fields->userFields}
-          {foreach $custom_fields->userFields as $userField}
-            {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-          {/foreach}
-        {/if}
-
-        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
-        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
-        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
-
-        {* time custom fileds *}
-          {if isset($custom_fields) && $custom_fields->timeFields}
-           {foreach $custom_fields->timeFields as $timeField}
-            {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-          {/foreach}
-        {/if}
-
-        {if $bean->getAttribute('chstart')}<td></td>{/if}
-        {if $bean->getAttribute('chfinish')}<td></td>{/if}
-        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
-        {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
-        {if $bean->getAttribute('chapproved')}<td></td>{/if}
-        {if $bean->getAttribute('chpaid')}<td></td>{/if}
-        {if $bean->getAttribute('chip')}<td></td>{/if}
-        {if $bean->getAttribute('chinvoice')}<td></td>{/if}
-        {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
-        {if $bean->getAttribute('chfiles')}<td></td>{/if}
-        {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-      <tr><td>&nbsp;</td></tr>
-      {/if}
-    {$first_pass = false}
-    {/if}
-      <!--  print regular row --> 
-      {if $cur_date != $prev_date}
-        {if $report_row_class == 'rowReportItem'} {$report_row_class = 'rowReportItemAlt'} {else} {$report_row_class = 'rowReportItem'} {/if}
-      {/if}
-      <tr class="{$report_row_class}">
-        <td class="cellLeftAligned">{$item.date}</td>
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
-
-    {* user custom fileds *}
-    {if isset($custom_fields) && $custom_fields->userFields}
-      {foreach $custom_fields->userFields as $userField}
-        {assign var="control_name" value='user_field_'|cat:$userField['id']}
-        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
-
-    {* time custom fileds *}
-    {if isset($custom_fields) && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
-    {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
-    {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
-    {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
-    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
-    {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
-    {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
-    {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
-    {if $bean->getAttribute('chfiles')}
-      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
-      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
-    {/if}
-    {if $use_checkboxes}
-      {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
-      {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
-    {/if}
-    {if $item.approved || $item.timesheet_id || $item.invoice_id}
-        <td>&nbsp;</td>
-    {else}
-      {if 1 == $item.type}<td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
-      {if 2 == $item.type}<td><a href="expense_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
-    {/if}
-      </tr>
-    {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
-      <tr>
-        <td class="cellRightAligned">{$i18n.label.note}:</td>
-        <td colspan="{$colspan}">{$item.note|escape}</td>
-      </tr>
-    {/if}
-    {$prev_date = $item.date}
-    {if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
-  {/foreach}
-  <!-- print a terminating subtotal -->
-  {if $print_subtotals}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
-
-    {* user custom fileds *}
-    {if isset($custom_fields) && $custom_fields->userFields}
-      {foreach $custom_fields->userFields as $userField}
-        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
-
-    {* time custom fileds *}
-    {if isset($custom_fields) && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chstart')}<td></td>{/if}
-    {if $bean->getAttribute('chfinish')}<td></td>{/if}
-    {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
-    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
-    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td></td>{/if}
-    {if $bean->getAttribute('chpaid')}<td></td>{/if}
-    {if $bean->getAttribute('chip')}<td></td>{/if}
-    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
-    {if $bean->getAttribute('chfiles')}<td></td>{/if}
-    {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-  {/if}
-  <!-- print totals -->
-      <tr><td>&nbsp;</td></tr>
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
-
-    {* user custom fileds *}
-    {if isset($custom_fields) && $custom_fields->userFields}
-      {foreach $custom_fields->userFields as $userField}
-        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chclient')}<td></td>{/if}
-    {if $bean->getAttribute('chproject')}<td></td>{/if}
-    {if $bean->getAttribute('chtask')}<td></td>{/if}
-
-    {* time custom fileds *}
-    {if isset($custom_fields) && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chstart')}<td></td>{/if}
-    {if $bean->getAttribute('chfinish')}<td></td>{/if}
-    {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
-    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
-    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td></td>{/if}
-    {if $bean->getAttribute('chpaid')}<td></td>{/if}
-    {if $bean->getAttribute('chip')}<td></td>{/if}
-    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
-    {if $bean->getAttribute('chfiles')}<td></td>{/if}
-    {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-{/if}
-    </table>
-  </td>
-</tr>
-</table>
-{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice || $use_assign_to_timesheet)}
-<table width="720" cellspacing="0" cellpadding="0" border="0">
-  {if $use_mark_approved}
-  <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control} {$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  {/if}
-  {if $use_mark_paid}
-  <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.label.mark_paid}: {$forms.reportViewForm.mark_paid_select_options.control} {$forms.reportViewForm.mark_paid_action_options.control} {$forms.reportViewForm.btn_mark_paid.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  {/if}
-  {if $use_assign_to_invoice}
-  <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign_invoice.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  {/if}
-  {if $use_assign_to_timesheet}
-  <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control} {$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-  {/if}
-</table>
-{/if}
-{$forms.reportViewForm.close}
-
-<table width="720" cellspacing="4" cellpadding="4" border="0">
-<tr>
-  <td align="center">
-  <table>
-  <tr>
-    <td><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report2.tpl
index db065ac94..b66d86c05 100644
--- a/WEB-INF/templates/report2.tpl
+++ b/WEB-INF/templates/report2.tpl
@@ -247,310 +247,42 @@
   </tr>
 </table>
 {/if}
-{$forms.reportViewForm.close}
-
-
-
-
-
-
-{$forms.reportViewForm.open}
-<table width="720">
-  <td valign="top">
-    <table border="0" cellpadding="3" cellspacing="1" width="100%">
-<!-- totals only report -->
-{if $bean->getAttribute('chtotalsonly')}
-{else}
-<!-- normal report -->
-      <tr>
-        <td class="tableHeader">{$i18n.label.date}</td>
-  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
-
-  {* user custom fileds *}
-  {if isset($custom_fields) && $custom_fields->userFields}
-    {foreach $custom_fields->userFields as $userField}
-      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$userField['label']|escape}}</td>{/if}
-    {/foreach}
-  {/if}
-
-  {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
-  {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
-  {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
-
-  {* time custom fileds *}
-  {if isset($custom_fields) && $custom_fields->timeFields}
-    {foreach $custom_fields->timeFields as $timeField}
-      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-      {if $bean->getAttribute($checkbox_control_name)}<td class="tableHeader">{{$timeField['label']|escape}}</td>{/if}
-    {/foreach}
-  {/if}
-
-  {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
-  {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
-  {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
-  {if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
-  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="tableHeader">{$i18n.label.note}</td>{/if}
-  {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
-  {if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
-  {if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
-  {if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
-  {if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
-  {if $bean->getAttribute('chtimesheet')}<td class="tableHeader">{$i18n.label.timesheet}</td>{/if}
-  {if $bean->getAttribute('chfiles')}<td></td>{/if}
-      </tr>
-  {foreach $report_items as $item}
-    <!-- print subtotal for a block of grouped values -->
-    {$cur_date = $item.date}
-    {if $print_subtotals}
-      {$cur_grouped_by = $item.grouped_by}
-      {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-        {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
-
-        {* user custom fileds *}
-        {if isset($custom_fields) && $custom_fields->userFields}
-          {foreach $custom_fields->userFields as $userField}
-            {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-          {/foreach}
-        {/if}
-
-        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
-        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
-        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
-
-        {* time custom fileds *}
-          {if isset($custom_fields) && $custom_fields->timeFields}
-           {foreach $custom_fields->timeFields as $timeField}
-            {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-          {/foreach}
-        {/if}
-
-        {if $bean->getAttribute('chstart')}<td></td>{/if}
-        {if $bean->getAttribute('chfinish')}<td></td>{/if}
-        {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
-        {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
-        {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
-        {if $bean->getAttribute('chapproved')}<td></td>{/if}
-        {if $bean->getAttribute('chpaid')}<td></td>{/if}
-        {if $bean->getAttribute('chip')}<td></td>{/if}
-        {if $bean->getAttribute('chinvoice')}<td></td>{/if}
-        {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
-        {if $bean->getAttribute('chfiles')}<td></td>{/if}
-        {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-      <tr><td>&nbsp;</td></tr>
-      {/if}
-    {$first_pass = false}
-    {/if}
-      <!--  print regular row -->
-      {if $cur_date != $prev_date}
-        {if $report_row_class == 'rowReportItem'} {$report_row_class = 'rowReportItemAlt'} {else} {$report_row_class = 'rowReportItem'} {/if}
-      {/if}
-      <tr class="{$report_row_class}">
-        <td class="cellLeftAligned">{$item.date}</td>
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
-
-    {* user custom fileds *}
-    {if isset($custom_fields) && $custom_fields->userFields}
-      {foreach $custom_fields->userFields as $userField}
-        {assign var="control_name" value='user_field_'|cat:$userField['id']}
-        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
-
-    {* time custom fileds *}
-    {if isset($custom_fields) && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-        {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td>{$item.$control_name|escape}</td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
-    {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
-    {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
-    {if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
-    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
-    {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
-    {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
-    {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
-    {if $bean->getAttribute('chfiles')}
-      {if 1 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
-      {if 2 == $item.type}<td class="cellRightAligned">{if $item.has_files}<a href="expense_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a>{/if}</td>{/if}
-    {/if}
-    {if $use_checkboxes}
-      {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
-      {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
-    {/if}
-    {if $item.approved || $item.timesheet_id || $item.invoice_id}
-        <td>&nbsp;</td>
-    {else}
-      {if 1 == $item.type}<td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
-      {if 2 == $item.type}<td><a href="expense_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
-    {/if}
-      </tr>
-    {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
-      <tr>
-        <td class="cellRightAligned">{$i18n.label.note}:</td>
-        <td colspan="{$colspan}">{$item.note|escape}</td>
-      </tr>
-    {/if}
-    {$prev_date = $item.date}
-    {if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
-  {/foreach}
-  <!-- print a terminating subtotal -->
-  {if $print_subtotals}
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
-
-    {* user custom fileds *}
-    {if isset($custom_fields) && $custom_fields->userFields}
-      {foreach $custom_fields->userFields as $userField}
-        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
-
-    {* time custom fileds *}
-    {if isset($custom_fields) && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chstart')}<td></td>{/if}
-    {if $bean->getAttribute('chfinish')}<td></td>{/if}
-    {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
-    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
-    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td></td>{/if}
-    {if $bean->getAttribute('chpaid')}<td></td>{/if}
-    {if $bean->getAttribute('chip')}<td></td>{/if}
-    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
-    {if $bean->getAttribute('chfiles')}<td></td>{/if}
-    {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-  {/if}
-  <!-- print totals -->
-      <tr><td>&nbsp;</td></tr>
-      <tr class="rowReportSubtotal">
-        <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
-    {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
-
-    {* user custom fileds *}
-    {if isset($custom_fields) && $custom_fields->userFields}
-      {foreach $custom_fields->userFields as $userField}
-        {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chclient')}<td></td>{/if}
-    {if $bean->getAttribute('chproject')}<td></td>{/if}
-    {if $bean->getAttribute('chtask')}<td></td>{/if}
-
-    {* time custom fileds *}
-    {if isset($custom_fields) && $custom_fields->timeFields}
-      {foreach $custom_fields->timeFields as $timeField}
-        {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
-      {/foreach}
-    {/if}
-
-    {if $bean->getAttribute('chstart')}<td></td>{/if}
-    {if $bean->getAttribute('chfinish')}<td></td>{/if}
-    {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
-    {if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
-    {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
-    {if $bean->getAttribute('chapproved')}<td></td>{/if}
-    {if $bean->getAttribute('chpaid')}<td></td>{/if}
-    {if $bean->getAttribute('chip')}<td></td>{/if}
-    {if $bean->getAttribute('chinvoice')}<td></td>{/if}
-    {if $bean->getAttribute('chtimesheet')}<td></td>{/if}
-    {if $bean->getAttribute('chfiles')}<td></td>{/if}
-    {if $use_checkboxes}<td></td>{/if}
-        <td></td>{* column for edit icons *}
-      </tr>
-{/if}
-    </table>
-  </td>
-</tr>
-</table>
 {if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice || $use_assign_to_timesheet)}
-<table width="720" cellspacing="0" cellpadding="0" border="0">
+<div class="form-control-separator"></div>
+<table class="centered-table">
   {if $use_mark_approved}
+  <tr class = "small-screen-label"><td><label for="mark_approved_select_options">{$i18n.label.mark_approved}:</label> {$forms.reportViewForm.mark_approved_select_options.control}</td></tr>
   <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control} {$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control}</td></tr>
-      </table>
-    </td>
+    <td class="large-screen-label"><label for="mark_approved_select_options">{$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control}</label></td>
+    <td class="td-with-input">{$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/if}
   {if $use_mark_paid}
+  <tr class = "small-screen-label"><td><label for="mark_paid_select_options">{$i18n.label.mark_paid}:</label> {$forms.reportViewForm.mark_paid_select_options.control}</td></tr>
   <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.label.mark_paid}: {$forms.reportViewForm.mark_paid_select_options.control} {$forms.reportViewForm.mark_paid_action_options.control} {$forms.reportViewForm.btn_mark_paid.control}</td></tr>
-      </table>
-    </td>
+    <td class="large-screen-label"><label for="mark_paid_select_options">{$i18n.label.mark_paid}: {$forms.reportViewForm.mark_paid_select_options.control}</label></td>
+    <td class="td-with-input">{$forms.reportViewForm.mark_paid_action_options.control} {$forms.reportViewForm.btn_mark_paid.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/if}
   {if $use_assign_to_invoice}
+  <tr class = "small-screen-label"><td><label for="assign_invoice_select_options">{$i18n.form.report.assign_to_invoice}:</label> {$forms.reportViewForm.assign_invoice_select_options.control}</td></tr>
   <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign_invoice.control}</td></tr>
-      </table>
-    </td>
+    <td class="large-screen-label"><label for="assign_invoice_select_options">{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control}</label></td>
+    <td class="td-with-input">{$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign_invoice.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/if}
   {if $use_assign_to_timesheet}
+  <tr class = "small-screen-label"><td><label for="assign_timesheet_select_options">{$i18n.form.report.assign_to_timesheet}:</label> {$forms.reportViewForm.assign_timesheet_select_options.control}</td></tr>
   <tr>
-    <td align="right">
-      <table>
-        <tr><td>{$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control} {$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control}</td></tr>
-      </table>
-    </td>
+    <td class="large-screen-label"><label for="assign_timesheet_select_options">{$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control}</label></td>
+    <td class="td-with-input">{$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control}</td>
   </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/if}
 </table>
 {/if}
 {$forms.reportViewForm.close}
-
-<table width="720" cellspacing="4" cellpadding="4" border="0">
-<tr>
-  <td align="center">
-  <table>
-  <tr>
-    <td><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
+<div class="button-set"><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></div>
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
deleted file mode 100644
index 248584f5b..000000000
--- a/WEB-INF/templates/reports.tpl
+++ /dev/null
@@ -1,459 +0,0 @@
-<script>
-// We need a few arrays to populate project dropdown.
-// When client selection changes, the project dropdown must be re-populated with only relevant projects.
-// Format:
-// project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
-// project_names[325] = "Time Tracker";   // Project name.
-
-// Prepare an array of project ids for clients.
-var project_ids = new Array();
-{foreach $client_list as $client}
-  project_ids[{$client.id}] = "{$client.projects}";
-{/foreach}
-// Prepare an array of project names.
-var project_names = new Array();
-{foreach $project_list as $project}
-  project_names[{$project.id}] = "{$project.name|escape:'javascript'}";
-{/foreach}
-// We'll use this array to populate project dropdown when client is not selected.
-var idx = 0;
-var projects = new Array();
-{foreach $project_list as $project}
-  projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}");
-  idx++;
-{/foreach}
-
-// We need a couple of array-like objects, one for associated task ids, another for task names.
-// For performance, and because associated arrays are frowned upon in JavaScript, we'll use a simple object
-// with properties for project tasks. Format:
-
-// obj_tasks.p325 = "100,101,302,303,304"; // Tasks ids for project 325 are "100,101,302,303,304".
-// obj_tasks.p408 = "100,302";  // Tasks ids for project 408 are "100,302".
-
-// Create an object for task ids.
-obj_tasks = {};
-var project_prefix = "p"; // Prefix for project property.
-var project_property;
-
-// Populate obj_tasks with task ids for each relevant project.
-{foreach $project_list as $project}
-  project_property = project_prefix + {$project.id};
-  obj_tasks[project_property] = "{$project.tasks}";
-{/foreach}
-
-// Prepare an array of task names.
-// Format: task_names[0] = Array(100, 'Coding'), task_names[1] = Array(302, 'Debugging'), etc...
-// First element = task_id, second element = task name.
-task_names = new Array();
-var idx = 0;
-{foreach $task_list as $task}
-  task_names[idx] = new Array({$task.id}, "{$task.name|escape:'javascript'}");
-  idx++;
-{/foreach}
-
-// empty_label is the mandatory top option in dropdowns.
-empty_label = '{$i18n.dropdown.all|escape:'javascript'}';
-
-// inArray - determines whether needle is in haystack array.
-function inArray(needle, haystack) {
-  var length = haystack.length;
-  for(var i = 0; i < length; i++) {
-    if(haystack[i] == needle) return true;
-  }
-  return false;
-}
-
-// The fillProjectDropdown function populates the project combo box with
-// projects associated with a selected client (client id is passed here as id).
-function fillProjectDropdown(id) {
-  var str_ids = project_ids[id];
-  var dropdown = document.getElementById("project");
-
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
-  // Remove existing content.
-  dropdown.length = 0;
-  var project_reset = true;
-  // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label, '', true);
-
-  // Populate project dropdown.
-  if (!id) {
-    // If we are here, client is not selected.
-    var len = projects.length;
-    for (var i = 0; i < len; i++) {
-      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
-      if (dropdown.options[i+1].value == selected_item)  {
-        dropdown.options[i+1].selected = true;
-        project_reset = false;
-      }
-    }
-  } else if (str_ids) {
-    var ids = new Array();
-    ids = str_ids.split(",");
-    var len = ids.length;
-
-    for (var i = 0; i < len; i++) {
-      var p_id = ids[i];
-      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
-      if (dropdown.options[i+1].value == selected_item)  {
-        dropdown.options[i+1].selected = true;
-        project_reset = false;
-      }
-    }
-  }
-
-  // If project selection was reset - clear the tasks dropdown.
-  if (project_reset) {
-    dropdown = document.getElementById("task");
-    dropdown.length = 0;
-    dropdown.options[0] = new Option(empty_label, '', true);
-  }
-}
-
-
-// The fillTaskDropdown function populates the task combo box with
-// tasks associated with a selected project_id.
-function fillTaskDropdown(project_id) {
-  var str_task_ids;
-  // Get a string of comma-separated task ids.
-  if (project_id) {  
-    var property = "p" + project_id;
-    str_task_ids = obj_tasks[property];
-  }
-  if (str_task_ids) {
-    var task_ids = new Array(); // Array of task ids.
-    task_ids = str_task_ids.split(",");
-  }
-
-  var dropdown = document.getElementById("task");
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
-  // Remove existing content.
-  dropdown.length = 0;
-  // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label, '', true);
-
-  // Populate the dropdown with associated tasks.
-  len = task_names.length;
-  var dropdown_idx = 0;
-  for (var i = 0; i < len; i++) {
-    if (!project_id) {
-      // No project is selected. Fill in all tasks.
-      dropdown.options[dropdown_idx+1] = new Option(task_names[i][1], task_names[i][0]);
-      dropdown_idx++;
-    } else if (str_task_ids) {
-      // Project is selected and has associated tasks. Fill them in.
-      if (inArray(task_names[i][0], task_ids)) {
-        dropdown.options[dropdown_idx+1] = new Option(task_names[i][1], task_names[i][0]);
-        dropdown_idx++;
-      }
-    }
-  }
-
-  // If a previously selected item is still in dropdown - select it.
-  if (dropdown.options.length > 0) {
-    for (var i = 0; i < dropdown.options.length; i++) {
-      if (dropdown.options[i].value == selected_item)  {
-        dropdown.options[i].selected = true;
-      }
-    }
-  }
-}
-
-// The fillDropdowns function populates the "project" and "task" dropdown controls
-// with relevant values.
-function fillDropdowns() {
-  if(document.body.contains(document.reportForm.client))
-    fillProjectDropdown(document.reportForm.client.value);
-
-  fillTaskDropdown(document.reportForm.project.value);
-}
-
-// Build JavaScript array for assigned projects out of passed in PHP array.
-var assigned_projects = new Array();
-{if $assigned_projects}
-  {foreach $assigned_projects as $user_id => $projects}
-    assigned_projects[{$user_id}] = new Array();
-    {if $projects}
-      {foreach $projects as $idx => $project_id}
-        assigned_projects[{$user_id}][{$idx}] = {$project_id};
-      {/foreach}
-    {/if}
-  {/foreach}
-{/if}
-
-// selectAssignedUsers is called when a project is changed in project dropdown.
-// It selects users on the form who are assigned to this project.
-function selectAssignedUsers(project_id) {
-  var user_id;
-  var len;
-
-  for (var i = 0; i < document.reportForm.elements.length; i++) {
-    if ((document.reportForm.elements[i].type == 'checkbox') && (document.reportForm.elements[i].name == 'users[]')) {
-      user_id = document.reportForm.elements[i].value;
-      if (project_id)
-        document.reportForm.elements[i].checked = false;
-      else
-        document.reportForm.elements[i].checked = true;
-
-      if(assigned_projects[user_id] != undefined)
-        len = assigned_projects[user_id].length;
-      else
-        len = 0;
-
-      if (project_id != '')
-        for (var j = 0; j < len; j++) {
-          if (project_id == assigned_projects[user_id][j]) {
-            document.reportForm.elements[i].checked = true;
-            break;
-          }
-        }
-    }
-  }
-}
-
-// handleCheckboxes - unmarks and hides the "Totals only" checkbox when
-// "no grouping" is selected in the associated group by dropdowns.
-function handleCheckboxes() {
-  var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
-  var totalsOnlyLabel = document.getElementById("totals_only_label");
-  var groupBy1 = document.getElementById("group_by1");
-  var groupBy2 = document.getElementById("group_by2");
-  var groupBy3 = document.getElementById("group_by3");
-  var grouping = false;
-  if ((groupBy1 != null && "no_grouping" != groupBy1.value) ||
-      (groupBy2 != null && "no_grouping" != groupBy2.value) ||
-      (groupBy3 != null && "no_grouping" != groupBy3.value)) {
-    grouping = true;
-  }
-  if (grouping) {
-    // Show the "Totals only" checkbox.
-    totalsOnlyCheckbox.style.visibility = "visible";
-    totalsOnlyLabel.style.visibility = "visible";
-  } else {
-    // Unmark and hide the "Totals only" checkbox.
-    totalsOnlyCheckbox.checked = false;
-    totalsOnlyCheckbox.style.visibility = "hidden";
-    totalsOnlyLabel.style.visibility = "hidden";
-  }
-}
-</script>
-
-{$forms.reportForm.open}
-<div style="padding: 0 0 10 0;">
-  <table border="0" class="divider">
-    <tr>
-      <td>
-        <table cellspacing="1" cellpadding="3" border="0">
-          <tr>
-            <td>{$i18n.label.fav_report}:</td><td>{$forms.reportForm.favorite_report.control}</td>
-            <td>{$forms.reportForm.btn_generate.control}&nbsp;{$forms.reportForm.btn_delete.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</div>
-
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td valign="top" colspan="2" align="center">
-      <table border="0" cellpadding="3">
-        <tr>
-          <td valign="top">
-            <table border="0" cellpadding="3">
-{if $show_client}
-              <tr><td><b>{$i18n.label.client}</b></td></tr>
-              <tr><td>{$forms.reportForm.client.control}</td></tr>
-{/if}
-{if $show_project}
-              <tr><td><b>{$i18n.label.project}</b></td></tr>
-              <tr><td>{$forms.reportForm.project.control}</td></tr>
-{/if}
-{if $show_billable}
-              <tr><td><b>{$i18n.form.time.billable}</b></td></tr>
-              <tr><td>{$forms.reportForm.include_records.control}</td></tr>
-{/if}
-{if $show_paid_status}
-              <tr><td><b>{$i18n.label.paid_status}</b></td></tr>
-              <tr><td>{$forms.reportForm.paid_status.control}</td></tr>
-{/if}
-            </table>
-          </td>
-          <td></td>
-          <td valign="top">
-            <table border="0" cellpadding="3">
-{if $show_task}
-              <tr><td><b>{$i18n.label.task}</b></td></tr>
-              <tr><td>{$forms.reportForm.task.control}</td></tr>
-{/if}
-{if $show_approved}
-              <tr><td><b>{$i18n.label.approved}</b></td></tr>
-              <tr><td>{$forms.reportForm.approved.control}</td></tr>
-{/if}
-{if $show_invoice_dropdown}
-              <tr><td><b>{$i18n.label.invoice}</b></td></tr>
-              <tr><td>{$forms.reportForm.invoice.control}</td></tr>
-{/if}
-{if $show_timesheet_dropdown}
-              <tr><td><b>{$i18n.label.timesheet}</b></td></tr>
-              <tr><td>{$forms.reportForm.timesheet.control}</td></tr>
-{/if}
-            </table>
-          </td>
-        </tr>
-{if $show_active_users}
-        <tr>
-          <td colspan="3"><b>{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</b></td>
-        </tr>
-        <tr>
-          <td colspan="3">{$forms.reportForm.users_active.control}</td>
-        </tr>
-{/if}
-{if $show_inactive_users}
-        <tr>
-          <td colspan="3"><b>{$i18n.label.inactive_users}</b></td>
-        </tr>
-        <tr>
-          <td colspan="3">{$forms.reportForm.users_inactive.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td><b>{$i18n.form.reports.select_period}</b></td>
-          <td>&nbsp;</td>
-          <td><b>{$i18n.form.reports.set_period}</b></td>
-        </tr>
-        <tr valign="top">
-          <td>{$forms.reportForm.period.control}</td>
-          <td align="right">{$i18n.label.start_date}:</td>
-          <td>{$forms.reportForm.start_date.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td align="right">{$i18n.label.end_date}:</td>
-          <td>{$forms.reportForm.end_date.control}</td>
-        </tr>
-        <tr><td colspan="3"><b>{$i18n.form.reports.show_fields}</b></td></tr>
-        <tr>
-          <td colspan="3">
-            <table border="0" width="100%">
-              <tr>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
-{if $show_client}
-                    <tr><td><label>{$forms.reportForm.chclient.control}&nbsp;{$i18n.label.client}</label></td></tr>
-{/if}
-{if $show_project}
-                    <tr><td><label>{$forms.reportForm.chproject.control}&nbsp;{$i18n.label.project}</label></td></tr>
-{/if}
-{if $show_timesheet_checkbox}
-                    <tr><td><label>{$forms.reportForm.chtimesheet.control}&nbsp;{$i18n.label.timesheet}</label></td></tr>
-{/if}
-                  </table>
-                </td>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
-{if $show_start}
-                    <tr><td><label>{$forms.reportForm.chstart.control}&nbsp;{$i18n.label.start}</label></td></tr>
-{/if}
-{if $show_task}
-                    <tr><td><label>{$forms.reportForm.chtask.control}&nbsp;{$i18n.label.task}</label></td></tr>
-{/if}
-{if $show_ip}
-                    <tr><td><label>{$forms.reportForm.chip.control}&nbsp;{$i18n.label.ip}</label></td></tr>
-{/if}
-{if $show_work_units}
-                    <tr><td><label>{$forms.reportForm.chunits.control}&nbsp;{$i18n.label.work_units}</label></td></tr>
-{/if}
-                  </table>
-                </td>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
-{if $show_finish}
-                    <tr><td><label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label></td></tr>
-{/if}
-                    <tr><td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td></tr>
-{if $show_approved}
-                    <tr><td><label>{$forms.reportForm.chapproved.control}&nbsp;{$i18n.label.approved}</label></td></tr>
-{/if}
-{if $show_invoice_checkbox}
-                    <tr><td><label>{$forms.reportForm.chinvoice.control}&nbsp;{$i18n.label.invoice}</label></td></tr>
-{/if}
-                  </table>
-                </td>
-                <td width="25%" valign="top">
-                  <table border="0" cellpadding="3">
-                    <tr><td><label>{$forms.reportForm.chduration.control}&nbsp;{$i18n.label.duration}</label></td></tr>
-                    <tr><td><label>{$forms.reportForm.chcost.control}&nbsp;{$i18n.label.cost}</label></td></tr>
-{if $show_paid_status}
-                    <tr><td><label>{$forms.reportForm.chpaid.control}&nbsp;{$i18n.label.paid}</label></td></tr>
-{/if}
-{if $show_files}
-                    <tr><td><label>{$forms.reportForm.chfiles.control}&nbsp;{$i18n.label.files}</label></td></tr>
-{/if}
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-{if isset($custom_fields) && $custom_fields->timeFields}
-    <tr><td colspan="3"><b>{$i18n.form.reports.time_fields}</b></td></tr>
-  {foreach $custom_fields->timeFields as $timeField}
-    <tr>
-      <td align="right">{$timeField['label']|escape}:</td>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
-      <td>{$forms.reportForm.$control_name.control}</td>
-      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-{if isset($custom_fields) && $custom_fields->userFields}
-    <tr><td colspan="3"><b>{$i18n.form.reports.user_fields}</b></td></tr>
-  {foreach $custom_fields->userFields as $userField}
-    <tr>
-      <td align="right">{$userField['label']|escape}:</td>
-      {assign var="control_name" value='user_field_'|cat:$userField['id']}
-      {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
-      <td>{$forms.reportForm.$control_name.control}</td>
-      <td>{$forms.reportForm.$checkbox_control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-        <tr><td><b>{$i18n.form.reports.group_by}</b></td></tr>
-        <tr valign="top">
-          <td>{$forms.reportForm.group_by1.control}</td>
-          <td>{$forms.reportForm.group_by2.control}</td>
-          <td>{$forms.reportForm.group_by3.control}</td>
-        </tr>
-        <tr>
-            <td><span id="totals_only_label"><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></span></td>
-        </tr>
-      </table>
-
-<div style="padding: 10 0 10 0;">
-  <table border="0" class="divider">
-    <tr>
-      <td align="center">
-        <table cellspacing="1" cellpadding="3" border="0">
-          <tr>
-            <td>{$i18n.form.reports.save_as_favorite}:</td><td>{$forms.reportForm.new_fav_report.control}</td>
-            <td>{$forms.reportForm.btn_save.control}</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</div>
-
-      <table border="0" cellpadding="3" width="100%">
-        <tr><td colspan="3" height="50" align="center">{$forms.reportForm.btn_generate.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.reportForm.close}
diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports2.tpl
index 3f272e112..294d5ea7c 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
 // We need a few arrays to populate project dropdown.
 // When client selection changes, the project dropdown must be re-populated with only relevant projects.
diff --git a/default.css b/default.css
index 533b3ff78..e04cab3d5 100644
--- a/default.css
+++ b/default.css
@@ -183,6 +183,7 @@ div.page-hint {
 /* money value cell in tables */
 .money-value-cell {
   text-align: right;
+  white-space: nowrap;
 }
 
 /* yes-no cell in tables */
diff --git a/initialize.php b/initialize.php
index 44c2a02cd..a991b8fc4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5526");
+define("APP_VERSION", "1.19.28.5527");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 19f6b8c22..527e8ac7f 100644
--- a/report.php
+++ b/report.php
@@ -72,7 +72,7 @@
   $useMarkApproved = true;
 if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chpaid') && $user->can('manage_invoices'))
   $useMarkPaid = true;
-if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
+if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chinvoice') && $client_id && !$user->isClient() && $user->can('manage_invoices'))
   $useAssignToInvoice = true;
 if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chtimesheet')) {
   $timesheets = ttTimesheetHelper::getMatchingTimesheets($options);
@@ -88,11 +88,13 @@
   $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_select_options',
+    'class'=>'dropdown-field-with_button',
     'data'=>$mark_approved_select_options,
     'value'=>$cl_mark_approved_select_option));
   $mark_approved_action_options = array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_action_options',
+    'class'=>'dropdown-field-with-button',
     'data'=>$mark_approved_action_options,
     'value'=>$cl_mark_approved_action_option));
   $form->addInput(array('type'=>'submit','name'=>'btn_mark_approved','value'=>$i18n->get('button.submit')));
@@ -105,11 +107,13 @@
   $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',
+    'class'=>'dropdown-field-with-button',
     'data'=>$mark_paid_select_options,
     'value'=>$cl_mark_paid_select_option));
   $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_action_options',
+    'class'=>'dropdown-field-with-button',
     'data'=>$mark_paid_action_options,
     'value'=>$cl_mark_paid_action_option));
   $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
@@ -125,10 +129,12 @@
     $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
     $form->addInput(array('type'=>'combobox',
       'name'=>'assign_invoice_select_options',
+      'class'=>'dropdown-field-with-button',
       'data'=>$assign_invoice_select_options,
       'value'=>$cl_assign_invoice_select_option));
     $form->addInput(array('type'=>'combobox',
       'name'=>'recent_invoice',
+      'class'=>'dropdown-field-with-button',
       'data'=>$recent_invoices,
       'datakeys'=>array('id','name'),
       'value'=>$cl_recent_invoice_option,
@@ -144,10 +150,12 @@
   $assign_timesheet_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
       'name'=>'assign_timesheet_select_options',
+      'class'=>'dropdown-field-with-button',
       'data'=>$assign_timesheet_select_options,
       'value'=>$cl_assign_timesheet_select_option));
   $form->addInput(array('type'=>'combobox',
       'name'=>'timesheet',
+      'class'=>'dropdown-field-with-button',
       'data'=>$timesheets,
       'datakeys'=>array('id','name'),
       'value'=>$cl_timesheet_option,
@@ -309,5 +317,5 @@
 $smarty->assign('colspan', $colspan);
 $smarty->assign('bean', $bean);
 $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
-$smarty->assign('content_page_name', 'report.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'report2.tpl');
+$smarty->display('index2.tpl');
diff --git a/report2.php b/report2.php
deleted file mode 100644
index 3776ecb3d..000000000
--- a/report2.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('initialize.php');
-import('ttConfigHelper');
-import('form.Form');
-import('form.ActionForm');
-import('ttReportHelper');
-import('ttGroupHelper');
-import('ttTimesheetHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$config = new ttConfigHelper($user->getConfig());
-
-if ($user->isPluginEnabled('ap')) {
-  $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
-  $_SESSION['mark_approved_select_option'] = $cl_mark_approved_select_option;
-  $cl_mark_approved_action_option = $request->getParameter('mark_approved_action_options', ($request->isPost() ? null : @$_SESSION['mark_approved_action_option']));
-  $_SESSION['mark_aproved_action_option'] = $cl_mark_approved_action_option;
-}
-if ($user->isPluginEnabled('ps')) {
-  $cl_mark_paid_select_option = $request->getParameter('mark_paid_select_options', ($request->isPost() ? null : @$_SESSION['mark_paid_select_option']));
-  $_SESSION['mark_paid_select_option'] = $cl_mark_paid_select_option;
-  $cl_mark_paid_action_option = $request->getParameter('mark_paid_action_options', ($request->isPost() ? null : @$_SESSION['mark_paid_action_option']));
-  $_SESSION['mark_paid_action_option'] = $cl_mark_paid_action_option;
-}
-if ($user->isPluginEnabled('iv')) {
-  $cl_assign_invoice_select_option = $request->getParameter('assign_invoice_select_options', ($request->isPost() ? null : @$_SESSION['assign_invoice_select_option']));
-  $_SESSION['assign_invoice_select_option'] = $cl_assign_invoice_select_option;
-  $cl_recent_invoice_option = $request->getParameter('recent_invoice', ($request->isPost() ? null : @$_SESSION['recent_invoice_option']));
-  $_SESSION['recent_invoice_option'] = $cl_recent_invoice_option;
-}
-if ($user->isPluginEnabled('ts')) {
-  $cl_assign_timesheet_select_option = $request->getParameter('assign_timesheet_select_options', ($request->isPost() ? null : @$_SESSION['assign_timesheet_select_option']));
-  $_SESSION['assign_timesheet_select_option'] = $cl_assign_timesheet_select_option;
-  $cl_timesheet_option = $request->getParameter('timesheet', ($request->isPost() ? null : @$_SESSION['timesheet_option']));
-  $_SESSION['timesheet_option'] = $cl_timesheet_option;
-}
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-$form = new Form('reportViewForm');
-
-// Report settings are stored in session bean before we get here from reports.php.
-$bean = new ActionForm('reportBean', new Form('reportForm'), $request);
-// If we are in post, load the bean from session, as the constructor does it only in get.
-if ($request->isPost()) $bean->loadBean();
-
-$client_id = $bean->getAttribute('client');
-$options = ttReportHelper::getReportOptions($bean);
-
-// Do we need to show checkboxes? We show them in the following 4 situations:
-// - We can approve items.
-// - We can mark items as paid.
-// - We can assign items to invoices.
-// - We can assign items to a timesheet.
-// Determine these conditions separately.
-$useMarkApproved = $useMarkPaid = $useAssignToInvoice = $useAssignToTimesheet = false;
-if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports')))
-  $useMarkApproved = true;
-if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chpaid') && $user->can('manage_invoices'))
-  $useMarkPaid = true;
-if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
-  $useAssignToInvoice = true;
-if (!$bean->getAttribute('chtotalsonly') && $bean->getAttribute('chtimesheet')) {
-  $timesheets = ttTimesheetHelper::getMatchingTimesheets($options);
-  if ($timesheets) $useAssignToTimesheet = true;
-}
-
-$use_checkboxes = $useMarkApproved || $useMarkPaid || $useAssignToInvoice || $useAssignToTimesheet;
-$smarty->assign('use_checkboxes', $use_checkboxes);
-
-// Controls for "Mark approved" block.
-$smarty->assign('use_mark_approved', false);
-if ($useMarkApproved) {
-  $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'mark_approved_select_options',
-    'data'=>$mark_approved_select_options,
-    'value'=>$cl_mark_approved_select_option));
-  $mark_approved_action_options = array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'mark_approved_action_options',
-    'data'=>$mark_approved_action_options,
-    'value'=>$cl_mark_approved_action_option));
-  $form->addInput(array('type'=>'submit','name'=>'btn_mark_approved','value'=>$i18n->get('button.submit')));
-  $smarty->assign('use_mark_approved', true);
-}
-
-// Controls for "Mark paid" block.
-$smarty->assign('use_mark_paid', false);
-if ($useMarkPaid) {
-  $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'mark_paid_select_options',
-    'data'=>$mark_paid_select_options,
-    'value'=>$cl_mark_paid_select_option));
-  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'mark_paid_action_options',
-    'data'=>$mark_paid_action_options,
-    'value'=>$cl_mark_paid_action_option));
-  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
-  $smarty->assign('use_mark_paid', true);
-}
-
-// Controls for "Assign to invoice" block.
-$smarty->assign('use_assign_to_invoice', false);
-if ($useAssignToInvoice) {
-  // Client is selected and we are displaying the invoice column.
-  $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
-  if ($recent_invoices) {
-    $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
-    $form->addInput(array('type'=>'combobox',
-      'name'=>'assign_invoice_select_options',
-      'data'=>$assign_invoice_select_options,
-      'value'=>$cl_assign_invoice_select_option));
-    $form->addInput(array('type'=>'combobox',
-      'name'=>'recent_invoice',
-      'data'=>$recent_invoices,
-      'datakeys'=>array('id','name'),
-      'value'=>$cl_recent_invoice_option,
-      'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
-    $form->addInput(array('type'=>'submit','name'=>'btn_assign_invoice','value'=>$i18n->get('button.submit')));
-    $smarty->assign('use_assign_to_invoice', true);
-  }
-}
-
-// Controls for "Assign to timesheet" block.
-$smarty->assign('use_assign_to_timesheet', false);
-if ($useAssignToTimesheet) {
-  $assign_timesheet_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
-  $form->addInput(array('type'=>'combobox',
-      'name'=>'assign_timesheet_select_options',
-      'data'=>$assign_timesheet_select_options,
-      'value'=>$cl_assign_timesheet_select_option));
-  $form->addInput(array('type'=>'combobox',
-      'name'=>'timesheet',
-      'data'=>$timesheets,
-      'datakeys'=>array('id','name'),
-      'value'=>$cl_timesheet_option,
-      'empty'=>array(''=>$i18n->get('dropdown.select_timesheet'))));
-  $form->addInput(array('type'=>'submit','name'=>'btn_assign_timesheet','value'=>$i18n->get('button.submit')));
-  $smarty->assign('use_assign_to_timesheet', true);
-}
-
-if ($request->isPost()) {
-
-  // Validate parameters and at the same time build arrays of record ids.
-  if (($request->getParameter('btn_mark_approved') && 2 == $request->getParameter('mark_approved_select_options'))
-       || ($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
-       || ($request->getParameter('btn_assign_invoice') && 2 == $request->getParameter('assign_invoice_select_options'))
-       || ($request->getParameter('btn_assign_timesheet') && 2 == $request->getParameter('assign_timesheet_select_options'))) {
-    // We act on selected records. Are there any?
-    foreach($_POST as $key => $val) {
-      if ('log_id_' == substr($key, 0, 7))
-        $time_log_ids[] = substr($key, 7);
-      if ('item_id_' == substr($key, 0, 8))
-        $expense_item_ids[] = substr($key, 8);
-    }
-    if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->get('error.record')); // There are no selected records.
-    // Validation of parameteres ended here.
-  } else {
-    // We are assigning all report items. Get the arrays from session.
-    // Note: getting from session assures we act only on previously displayed records.
-    // Rebuilding from $bean may get us a different set.
-    $item_ids = ttReportHelper::getFromSession();
-    $time_log_ids = @$item_ids['report_item_ids'];
-    $expense_item_ids = @$item_ids['report_item_expense_ids'];
-    // The above code is here because the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
-  }
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_mark_approved')) {
-      // User clicked the "Mark approved" button to mark some or all items either approved or not approved.
-
-      // Determine user action.
-      $mark_approved = $request->getParameter('mark_approved_action_options') == 1 ? true : false;
-
-      // Mark as requested.
-      if ($time_log_ids || $expense_item_ids) {
-        ttReportHelper::markApproved($time_log_ids, $expense_item_ids, $mark_approved);
-      }
-
-      // Re-display this form.
-      header('Location: report.php');
-      exit();
-    }
-
-    if ($request->getParameter('btn_mark_paid')) {
-      // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
-
-      // Determine user action.
-      $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
-
-      // Mark as requested.
-      if ($time_log_ids || $expense_item_ids) {
-        ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
-      }
-
-      // Re-display this form.
-      header('Location: report.php');
-      exit();
-    }
-
-    if ($request->getParameter('btn_assign_invoice')) {
-      // User clicked the Submit button to assign all or some items to a recent invoice.
-
-      // Determine invoice id.
-      $invoice_id = $request->getParameter('recent_invoice');
-
-      // Assign as requested.
-      if ($time_log_ids || $expense_item_ids) {
-        ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
-      }
-      // Re-display this form.
-      header('Location: report.php');
-      exit();
-    }
-
-    if ($request->getParameter('btn_assign_timesheet')) {
-      // User clicked the Submit button to assign all or some items to a timesheet.
-
-      // Determine invoice id.
-      $timesheet_id = $request->getParameter('timesheet');
-
-      // Assign as requested.
-      if ($time_log_ids) {
-        ttReportHelper::assignToTimesheet($timesheet_id, $time_log_ids);
-      }
-      // Re-display this form.
-      header('Location: report.php');
-      exit();
-    }
-  }
-} // isPost
-
-$report_items = ttReportHelper::getItems($options);
-// Store record ids in session in case user wants to act on records such as marking them all paid.
-if ($request->isGet() && $use_checkboxes)
-  ttReportHelper::putInSession($report_items);
-
-$subtotals = array();
-$smarty->assign('print_subtotals', false);
-if (ttReportHelper::grouping($options)) {
-  $subtotals = ttReportHelper::getSubtotals($options);
-  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
-  if ($report_items) {
-    // Assign variables that are used to print subtotals.
-    $smarty->assign('print_subtotals', true);
-    $smarty->assign('first_pass', true);
-    $smarty->assign('prev_grouped_by', '');
-    $smarty->assign('cur_grouped_by', '');
-  }
-}
-$totals = ttReportHelper::getTotals($options);
-
-// Determine column span for note field.
-$colspan = 0;
-if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
-if (isset($custom_fields) && $custom_fields->userFields) {
-  foreach ($custom_fields->userFields as $userField) {
-    $checkbox_control_name = 'show_user_field_'.$userField['id'];
-    if ($bean->getAttribute($checkbox_control_name)) $colspan++;
-  }
-}
-if ($bean->getAttribute('chclient')) $colspan++;
-if ($bean->getAttribute('chproject')) $colspan++;
-if ($bean->getAttribute('chtask')) $colspan++;
-if (isset($custom_fields) && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $checkbox_control_name = 'show_time_field_'.$timeField['id'];
-    if ($bean->getAttribute($checkbox_control_name)) $colspan++;
-  }
-}
-if ($bean->getAttribute('chstart')) $colspan++;
-if ($bean->getAttribute('chfinish')) $colspan++;
-if ($bean->getAttribute('chduration')) $colspan++;
-if ($bean->getAttribute('chunits')) $colspan++;
-if ($bean->getAttribute('chcost')) $colspan++;
-if ($bean->getAttribute('chapproved')) $colspan++;
-if ($bean->getAttribute('chpaid')) $colspan++;
-if ($bean->getAttribute('chip')) $colspan++;
-if ($bean->getAttribute('chinvoice')) $colspan++;
-if ($bean->getAttribute('chtimesheet')) $colspan++;
-if ($bean->getAttribute('chfiles')) $colspan++;
-
-// Assign variables that are used to alternate color of rows for different dates.
-$smarty->assign('prev_date', '');
-$smarty->assign('cur_date', '');
-$smarty->assign('report_row_class', 'rowReportItem');
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('report_items', $report_items);
-$smarty->assign('subtotals', $subtotals);
-$smarty->assign('totals', $totals);
-$smarty->assign('note_on_separate_row', $user->getConfigOption('report_note_on_separate_row'));
-$smarty->assign('colspan', $colspan);
-$smarty->assign('bean', $bean);
-$smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
-$smarty->assign('content_page_name', 'report2.tpl');
-$smarty->display('index2.tpl');

From 307b17884a55f615069fc10540d56b6e37e36173 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 May 2021 19:47:02 +0000
Subject: [PATCH 1542/1848] Fixed a few colspan issues on report.php.

---
 WEB-INF/templates/report2.tpl | 11 ++++++++---
 initialize.php                |  2 +-
 report.php                    |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report2.tpl
index b66d86c05..8c491b196 100644
--- a/WEB-INF/templates/report2.tpl
+++ b/WEB-INF/templates/report2.tpl
@@ -1,3 +1,6 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
 <script>
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
@@ -64,6 +67,8 @@
   {if $bean->getAttribute('chinvoice')}<th>{$i18n.label.invoice}</th>{/if}
   {if $bean->getAttribute('chtimesheet')}<th>{$i18n.label.timesheet}</th>{/if}
   {if $bean->getAttribute('chfiles')}<th></th>{/if}
+  {if $use_checkboxes}<th></th>{/if}
+    <th></th>{* column for edit icons *}
   </tr>
   {foreach $report_items as $item}
   {* print subtotal for a block of grouped values *}
@@ -107,7 +112,7 @@
         {if $use_checkboxes}<td></td>{/if}
     <td></td>{* column for edit icons *}
   </tr>
-  <tr><td>&nbsp;</td></tr>
+  <tr><td colspan="{$colspan+1}">&nbsp;</td></tr>
       {/if}
     {$first_pass = false}
     {/if}
@@ -154,7 +159,7 @@
       {if 2 == $item.type}<td><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
     {if $item.approved || $item.timesheet_id || $item.invoice_id}
-    <td>&nbsp;</td>
+    <td colspan="{$colspan}">&nbsp;</td>
     {else}
       {if 1 == $item.type}<td><a href="time_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
       {if 2 == $item.type}<td><a href="expense_edit.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a></td>{/if}
@@ -209,7 +214,7 @@
   </tr>
   {/if}
   {* print totals *}
-  <tr><td>&nbsp;</td></tr>
+  <tr><td colspan="{$colspan+1}">&nbsp;</td></tr>
   <tr>
     <th class="invoice-label">{$i18n.label.total}</td>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
diff --git a/initialize.php b/initialize.php
index a991b8fc4..8155661fa 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5527");
+define("APP_VERSION", "1.19.28.5528");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 527e8ac7f..916b02f8e 100644
--- a/report.php
+++ b/report.php
@@ -304,6 +304,8 @@
 if ($bean->getAttribute('chinvoice')) $colspan++;
 if ($bean->getAttribute('chtimesheet')) $colspan++;
 if ($bean->getAttribute('chfiles')) $colspan++;
+if ($use_checkboxes) $colspan++;
+$colspan++; // One more column for edit icons.
 
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');

From 860ae31a56fc0c3ada3f51f0e43c32d66548fc8e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 May 2021 20:03:13 +0000
Subject: [PATCH 1543/1848] Fixed one more colspan issue on report.php.

---
 initialize.php | 2 +-
 report.php     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 8155661fa..2ff973341 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5528");
+define("APP_VERSION", "1.19.28.5529");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 916b02f8e..cb959d488 100644
--- a/report.php
+++ b/report.php
@@ -275,7 +275,7 @@
 }
 $totals = ttReportHelper::getTotals($options);
 
-// Determine column span for note field.
+// Determine column span for note field and empty rows.
 $colspan = 0;
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
 if (isset($custom_fields) && $custom_fields->userFields) {
@@ -296,6 +296,7 @@
 if ($bean->getAttribute('chstart')) $colspan++;
 if ($bean->getAttribute('chfinish')) $colspan++;
 if ($bean->getAttribute('chduration')) $colspan++;
+if (!$user->getConfigOption('report_note_on_separate_row') && $bean->getAttribute('chnote')) $colspan++;
 if ($bean->getAttribute('chunits')) $colspan++;
 if ($bean->getAttribute('chcost')) $colspan++;
 if ($bean->getAttribute('chapproved')) $colspan++;

From 6cf84621339c2c41c2e8434c3c1ac14d82cd30b9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 7 May 2021 20:29:04 +0000
Subject: [PATCH 1544/1848] Fixe html closing tags on report2.tpl.

---
 WEB-INF/templates/report2.tpl | 4 ++--
 initialize.php                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report2.tpl
index 8c491b196..7224b2983 100644
--- a/WEB-INF/templates/report2.tpl
+++ b/WEB-INF/templates/report2.tpl
@@ -167,7 +167,7 @@ License: See license.txt *}
   </tr>
     {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
   <tr>
-    <th class="invoice-label">{$i18n.label.note}</td>
+    <th class="invoice-label">{$i18n.label.note}</th>
     <td colspan="{$colspan}" class="text-cell">{$item.note|escape}</td>
   </tr>
     {/if}
@@ -216,7 +216,7 @@ License: See license.txt *}
   {* print totals *}
   <tr><td colspan="{$colspan+1}">&nbsp;</td></tr>
   <tr>
-    <th class="invoice-label">{$i18n.label.total}</td>
+    <th class="invoice-label">{$i18n.label.total}</th>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
     {* user custom fileds *}
     {if isset($custom_fields) && $custom_fields->userFields}
diff --git a/initialize.php b/initialize.php
index 2ff973341..e7773d3d7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5529");
+define("APP_VERSION", "1.19.28.5530");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c99954245edfe4bd80b44048afd1c15d67096094 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 May 2021 13:05:15 +0000
Subject: [PATCH 1545/1848] Starting to work on mobile friendly week view.

---
 WEB-INF/templates/week2.tpl | 236 +++++++++++++++
 initialize.php              |   2 +-
 week2.php                   | 559 ++++++++++++++++++++++++++++++++++++
 3 files changed, 796 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/templates/week2.tpl
 create mode 100644 week2.php

diff --git a/WEB-INF/templates/week2.tpl b/WEB-INF/templates/week2.tpl
new file mode 100644
index 000000000..b46e9804f
--- /dev/null
+++ b/WEB-INF/templates/week2.tpl
@@ -0,0 +1,236 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{include file="time_script.tpl"}
+
+<script>
+// This is here because fillDropdowns() in time_script.tpl uses a different form name.
+// Perhaps a better fix would be to provide form name as paramater to fillDropdowns()?
+// TODO: try to fix it properly.
+//
+// The fillDropdowns function populates the "project" and "task" dropdown controls
+// with relevant values.
+function fillDropdowns() {
+  if(document.body.contains(document.weekTimeForm.client))
+    fillProjectDropdown(document.weekTimeForm.client.value);
+
+  fillTaskDropdown(document.weekTimeForm.project.value);
+}
+</script>
+
+
+<style>
+.not_billable td {
+  color: #ff6666;
+}
+</style>
+
+{if $show_navigation}
+<div class="optional-nav">
+  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
+</div>
+{/if}
+
+{$forms.weekTimeForm.open}
+<div class="small-screen-calendar">{$forms.weekTimeForm.date.control}</div>
+<table class="centered-table">
+  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.weekTimeForm.date.control}</div></td></tr>
+{if $user_dropdown}
+  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_client}
+  <tr class = "small-screen-label"><td><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="client">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.client.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+</table>
+{$forms.weekTimeForm.close}
+
+
+
+
+{$forms.weekTimeForm.open}
+<table cellspacing="4" cellpadding="0" border="0">
+{if $show_navigation}
+  <tr>
+    <td align="center" colspan=2">
+      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
+    </td>
+  </tr>
+{/if}
+  <tr>
+    <td valign="top">
+      <table>
+{if $user_dropdown}
+        <tr>
+          <td align="right">{$i18n.label.user}:</td>
+          <td>{$forms.weekTimeForm.user.control}</td>
+        </tr>
+{/if}
+{if $show_client}
+        <tr>
+          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
+          <td>{$forms.weekTimeForm.client.control}</td>
+        </tr>
+{/if}
+{if $show_billable}
+        <tr>
+          <td align="right">&nbsp;</td>
+          <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
+        </tr>
+{/if}
+{if $custom_fields && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+    <tr>
+      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
+      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+      <td>{$forms.weekTimeForm.$control_name.control}</td>
+    </tr>
+  {/foreach}
+{/if}
+{if $show_project}
+        <tr>
+          <td align="right">{$i18n.label.project} (*):</td>
+          <td>{$forms.weekTimeForm.project.control}</td>
+        </tr>
+{/if}
+{if $show_task}
+        <tr>
+          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
+          <td>{$forms.weekTimeForm.task.control}</td>
+        </tr>
+{/if}
+{if $show_week_note}
+        <tr>
+          <td align="right">{$i18n.label.week_note}:</td>
+          <td>{$forms.weekTimeForm.note.control}</td>
+        </tr>
+{/if}
+      </table>
+    </td>
+    <td valign="top">
+      <table>
+        <tr><td>{$forms.weekTimeForm.date.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table width="720">
+  <tr valign="top">
+    <td>{$forms.weekTimeForm.week_durations.control}</td>
+  </tr>
+</table>
+
+<table>
+  <tr>
+    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
+  </tr>
+  <tr><td>&nbsp;</td></tr>
+</table>
+
+{if $show_week_list}
+<table width="720">
+<tr>
+  <td valign="top">
+{if $time_records}
+      <table border="0" cellpadding="3" cellspacing="1" width="100%">
+      <tr>
+        <td width="5%" class="tableHeader">{$i18n.label.date}</td>
+  {if $show_client}
+        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
+  {/if}
+  {if $show_project}
+        <td class="tableHeader">{$i18n.label.project}</td>
+  {/if}
+  {if $show_task}
+        <td class="tableHeader">{$i18n.label.task}</td>
+  {/if}
+  {if $show_start}
+        <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
+        <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
+  {/if}
+        <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
+        <td class="tableHeader">{$i18n.label.note}</td>
+  {if $show_files}
+        <td></td>
+  {/if}
+        <td></td>
+        <td></td>
+      </tr>
+  {foreach $time_records as $record}
+      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
+        <td valign="top">{$record.date}</td>
+    {if $show_client}
+        <td valign="top">{$record.client|escape}</td>
+    {/if}
+    {if $show_project}
+        <td valign="top">{$record.project|escape}</td>
+    {/if}
+    {if $show_task}
+        <td valign="top">{$record.task|escape}</td>
+    {/if}
+    {if $show_start}
+        <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+        <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+    {/if}
+        <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+        <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {if $show_files}
+      {if $record.has_files}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+        <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
+    {/if}
+        </td>
+        <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
+    {/if}
+        </td>
+      </tr>
+  {/foreach}
+    </table>
+{/if}
+  </td>
+</tr>
+</table>
+{/if}
+
+{if $time_records}
+<table cellpadding="3" cellspacing="1" width="720">
+  {if $show_week_list}
+  <tr>
+    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
+    <td></td>
+  </tr>
+  {/if}
+  {if $user->isPluginEnabled('mq')}
+  <tr>
+    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
+    {if $over_quota}
+    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
+    {else}
+    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
+    {/if}
+  </tr>
+  {/if}
+</table>
+{/if}
+{$forms.weekTimeForm.close}
diff --git a/initialize.php b/initialize.php
index e7773d3d7..14c04798b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5530");
+define("APP_VERSION", "1.19.28.5531");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week2.php b/week2.php
new file mode 100644
index 000000000..f97a515dc
--- /dev/null
+++ b/week2.php
@@ -0,0 +1,559 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('form.Form');
+import('form.DefaultCellRenderer');
+import('form.Table');
+import('form.TextField');
+import('ttUserHelper');
+import('ttGroupHelper');
+import('ttWeekViewHelper');
+import('ttClientHelper');
+import('ttTimeHelper');
+import('DateAndTime');
+
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
+  header('Location: access_denied.php');
+  exit();
+}
+if (!$user->isPluginEnabled('wv')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+  exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+  exit();
+}
+if ($request->isPost()) {
+  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
+  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
+    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
+    exit();
+  }
+}
+// End of access checks.
+
+// Determine user for whom we display this page.
+if ($request->isPost() && $userChanged) {
+  $user_id = (int)$request->getParameter('user');
+  $user->setOnBehalfUser($user_id);
+} else {
+  $user_id = $user->getUser();
+}
+
+$group_id = $user->getGroup();
+
+$showClient = $user->isPluginEnabled('cl');
+$showBillable = $user->isPluginEnabled('iv');
+$trackingMode = $user->getTrackingMode();
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) $taskRequired = $user->getConfigOption('task_required');
+$showWeekNote = $user->isOptionEnabled('week_note');
+$showWeekNotes = $user->isOptionEnabled('week_notes');
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFiles = $user->isPluginEnabled('at');
+
+// Initialize and store date in session.
+$cl_date = $request->getParameter('date', @$_SESSION['date']);
+$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
+if($selected_date->isError())
+  $selected_date = new DateAndTime(DB_DATEFORMAT);
+if(!$cl_date)
+  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+$_SESSION['date'] = $cl_date;
+
+// Determine selected week start and end dates.
+$weekStartDay = $user->getWeekStart();
+$t_arr = localtime($selected_date->getTimestamp());
+$t_arr[5] = $t_arr[5] + 1900;
+if ($t_arr[6] < $weekStartDay)
+  $startWeekBias = $weekStartDay - 7;
+else
+  $startWeekBias = $weekStartDay;
+$startDate = new DateAndTime();
+$startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
+$endDate = new DateAndTime();
+$endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
+// The above is needed to set date range (timestring) in page title.
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
+// Use Monthly Quotas plugin, if applicable.
+if ($user->isPluginEnabled('mq')){
+  require_once('plugins/MonthlyQuota.class.php');
+  $quota = new MonthlyQuota();
+  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
+  $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
+
+  $smarty->assign('month_total', $month_total);
+  $smarty->assign('over_quota', $minutes_left < 0);
+  $smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
+}
+
+// Initialize variables.
+$cl_billable = 1;
+if ($showBillable) {
+  if ($request->isPost()) {
+    $cl_billable = $request->getParameter('billable');
+    $_SESSION['billable'] = (int) $cl_billable;
+  } else
+    if (isset($_SESSION['billable']))
+      $cl_billable = $_SESSION['billable'];
+}
+$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
+$_SESSION['client'] = $cl_client;
+$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
+$_SESSION['project'] = $cl_project;
+$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
+$_SESSION['task'] = $cl_task;
+$cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note']));
+$_SESSION['note'] = $cl_note;
+
+$timeCustomFields = array();
+// If we have time custom fields - collect input.
+if ($request->isPost()) {
+  if ($custom_fields && $custom_fields->timeFields) {
+    foreach ($custom_fields->timeFields as $timeField) {
+      $control_name = 'time_field_'.$timeField['id'];
+      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+        'control_name' => $control_name,
+        'label' => $timeField['label'],
+        'type' => $timeField['type'],
+        'required' => $timeField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
+}
+
+// Get the data we need to display week view.
+// Get column headers, which are day numbers in month.
+$dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
+$lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
+// Get already existing records.
+$records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $showFiles);
+// Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function.
+if ($records)
+  $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders);
+else
+  $dataArray = ttWeekViewHelper::prePopulateFromPastWeeks($startDate->toString(DB_DATEFORMAT), $dayHeaders);
+
+// Build day totals (total durations for each day in week).
+$dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders);
+
+// Define rendering class for a label field to the left of durations.
+class LabelCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    global $user;
+    $showNotes = $user->isOptionEnabled('week_notes');
+
+    $this->setOptions(array('width'=>200,'valign'=>'middle'));
+
+    // Special handling for a new week entry (row 0, or 0 and 1 if we show notes).
+    if (0 == $row) {
+      $this->setOptions(array('style'=>'text-align: center; font-weight: bold; vertical-align: top;'));
+    } else if ($showNotes && (1 == $row)) {
+      $this->setOptions(array('style'=>'text-align: right; vertical-align: top;'));
+    } else if ($showNotes && (0 != $row % 2)) {
+      $this->setOptions(array('style'=>'text-align: right;'));
+    }
+    // Special handling for not billable entries.
+    $ignoreRow = $showNotes ? 1 : 0;
+    if ($row > $ignoreRow) {
+      $row_id = $table->getValueAtName($row,'row_id');
+      $billable = ttWeekViewHelper::parseFromWeekViewRow($row_id, 'bl');
+      if (!$billable) {
+        if (($showNotes && (0 == $row % 2)) || !$showNotes) {
+          $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS.
+        }
+      }
+    }
+    $this->setValue(htmlspecialchars($value)); // This escapes HTML for output.
+    return $this->toString();
+  }
+}
+
+// Define rendering class for a single cell for a time or a comment entry in week view table.
+class WeekViewCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    global $user;
+    $showNotes = $user->isOptionEnabled('week_notes');
+
+    $field_name = $table->getValueAt($row,$column)['control_id']; // Our text field names (and ids) are like x_y (row_column).
+    $field = new TextField($field_name);
+    // Disable control if the date is locked.
+    global $lockedDays;
+    if ($lockedDays[$column-1])
+      $field->setEnabled(false);
+    $field->setFormName($table->getFormName());
+    $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually.
+    // Provide visual separation for new entry row.
+    $rowToSeparate = $showNotes ? 1 : 0;
+    if ($rowToSeparate == $row) {
+      $field->setStyle('width: 60px; margin-bottom: 40px');
+    }
+    if ($showNotes) {
+      if (0 == $row % 2) {
+        $field->setValue($table->getValueAt($row,$column)['duration']); // Duration for even rows.
+      } else {
+        $field->setValue($table->getValueAt($row,$column)['note']);     // Comment for odd rows.
+        $field->setTitle($table->getValueAt($row,$column)['note']);     // Tooltip to help view the entire comment.
+      }
+    } else {
+      $field->setValue($table->getValueAt($row,$column)['duration']);
+      // $field->setTitle($table->getValueAt($row,$column)['note']); // Tooltip to see comment. TODO - value not available.
+    }
+    // Disable control when time entry mode is TYPE_START_FINISH and there is no value in control
+    // because we can't supply start and finish times in week view - there are no fields for them.
+    if (!$field->getValue() && TYPE_START_FINISH == $user->getRecordType()) {
+        $field->setEnabled(false);
+    }
+    $this->setValue($field->getHtml());
+    return $this->toString();
+  }
+}
+
+// Elements of weekTimeForm.
+$form = new Form('weekTimeForm');
+$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
+
+if ($user->can('track_time')) {
+  $rank = $user->getMaxRankForGroup($group_id);
+  if ($user->can('track_own_time'))
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+  else
+    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
+  $user_list = $user->getUsers($options);
+  if (count($user_list) >= 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
+      'name'=>'user',
+      'style'=>'width: 250px;',
+      'value'=>$user_id,
+      'data'=>$user_list,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
+    $smarty->assign('user_dropdown', 1);
+  }
+}
+
+// Create week_durations table.
+$table = new Table('week_durations');
+// $table->setCssClass('week_view_table'); // Currently not used. Fix this.
+$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setRowOptions(array('class'=>'tableHeaderCentered'));
+$table->setData($dataArray);
+// Add columns to table.
+$table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label']));
+for ($i = 0; $i < 7; $i++) {
+  $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+}
+$table->setInteractive(false);
+$form->addInputElement($table);
+
+// Dropdown for clients in MODE_TIME. Use all active clients.
+if (MODE_TIME == $trackingMode && $showClient) {
+  $active_clients = ttGroupHelper::getActiveClients(true);
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillProjectDropdown(this.value);',
+    'name'=>'client',
+    'style'=>'width: 250px;',
+    'value'=>$cl_client,
+    'data'=>$active_clients,
+    'datakeys'=>array('id', 'name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
+  // Note: in other modes the client list is filtered to relevant clients only. See below.
+}
+
+// Billable checkbox.
+if ($user->isPluginEnabled('iv'))
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+
+// If we have time custom fields - add controls for them.
+if ($custom_fields && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $field_name = 'time_field_'.$timeField['id'];
+    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($timeField['id']),
+      'value'=>$timeCustomFields[$timeField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
+
+// If we show project dropdown, add controls for project and client.
+if ($showProject) {
+  // Dropdown for projects assigned to user.
+  $project_list = $user->getAssignedProjects();
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillTaskDropdown(this.value);',
+    'name'=>'project',
+    'style'=>'width: 250px;',
+    'value'=>$cl_project,
+    'data'=>$project_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+  // Dropdown for clients if the clients plugin is enabled.
+  if ($showClient) {
+    $active_clients = ttGroupHelper::getActiveClients(true);
+    // We need an array of assigned project ids to do some trimming.
+    foreach($project_list as $project)
+      $projects_assigned_to_user[] = $project['id'];
+
+    // Build a client list out of active clients. Use only clients that are relevant to user.
+    // Also trim their associated project list to only assigned projects (to user).
+    foreach($active_clients as $client) {
+      $projects_assigned_to_client = explode(',', $client['projects']);
+      if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user))
+        $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
+      if ($intersection) {
+        $client['projects'] = implode(',', $intersection);
+        $client_list[] = $client;
+      }
+    }
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'fillProjectDropdown(this.value);',
+      'name'=>'client',
+      'style'=>'width: 250px;',
+      'value'=>$cl_client,
+      'data'=>$client_list,
+      'datakeys'=>array('id', 'name'),
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  }
+}
+
+// Task dropdown.
+if ($showTask) {
+  $task_list = ttGroupHelper::getActiveTasks();
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'task',
+    'style'=>'width: 250px;',
+    'value'=>$cl_task,
+    'data'=>$task_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array(''=>$i18n->get('dropdown.select'))));
+}
+
+// Week note control.
+if ($showWeekNote) {
+  if (!defined('NOTE_INPUT_HEIGHT'))
+    define('NOTE_INPUT_HEIGHT', 40);
+  $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+}
+
+// Calendar.
+$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date));
+
+// A hidden control for today's date from user's browser.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
+
+// Submit button.
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
+
+// Submit.
+if ($request->isPost()) {
+  if ($request->getParameter('btn_submit')) {
+    // Validate user input for row 0.
+    // Determine if a new entry was posted.
+    $newEntryPosted = false;
+    foreach($dayHeaders as $dayHeader) {
+      $control_id = '0_'.$dayHeader;
+      if ($request->getParameter($control_id)) {
+        $newEntryPosted = true;
+        break;
+      }
+    }
+    if ($newEntryPosted) {
+      if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
+        $err->add($i18n->get('error.client'));
+      // Validate input in time custom fields.
+      if ($custom_fields && $custom_fields->timeFields) {
+        foreach ($timeCustomFields as $timeField) {
+          // Validation is the same for text and dropdown fields.
+          if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
+        }
+      }
+      if ($showProject) {
+        if (!$cl_project) $err->add($i18n->get('error.project'));
+      }
+      if ($showTask && $taskRequired) {
+        if (!$cl_task) $err->add($i18n->get('error.task'));
+      }
+    }
+    // Finished validating user input for row 0.
+
+    // Process the table of values.
+    if ($err->no()) {
+
+      // Obtain values. Iterate through posted parameters one by one,
+      // see if value changed, apply one change at a time until we see an error.
+      $result = true;
+      $rowNumber = 0;
+      // Iterate through existing rows.
+      foreach ($dataArray as $row) {
+        // Iterate through days.
+        foreach ($dayHeaders as $key => $dayHeader) {
+          // Do not process locked days.
+          if ($lockedDays[$key]) continue;
+          // Make control id for the cell.
+          $control_id = $rowNumber.'_'.$dayHeader;
+
+          // Handle durations and comments in separate blocks of code.
+          if (!$showWeekNotes || (0 == $rowNumber % 2)) {
+            // Handle durations row here.
+
+            // Obtain existing and posted durations.
+            $postedDuration = $request->getParameter($control_id);
+            $existingDuration = $dataArray[$rowNumber][$dayHeader]['duration'];
+            // If posted value is not null, check and normalize it.
+            if ($postedDuration) {
+              if (false === ttTimeHelper::postedDurationToMinutes($postedDuration)) {
+                $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
+                $result = false; break; // Break out. Stop any further processing.
+              } else {
+                $minutes = ttTimeHelper::postedDurationToMinutes($postedDuration);
+                $postedDuration = ttTimeHelper::minutesToDuration($minutes);
+              }
+            }
+            // Do not process if value has not changed.
+            if ($postedDuration == $existingDuration)
+              continue;
+            // Posted value is different.
+            if ($existingDuration == null) {
+              // Skip inserting 0 duration values.
+              if (0 == ttTimeHelper::toMinutes($postedDuration))
+                continue;
+              // Insert a new record.
+              $fields = array();
+              $fields['row_id'] = $dataArray[$rowNumber]['row_id'];
+              if (!$fields['row_id']) {
+                // Special handling for row 0, a new entry. Need to construct new row_id.
+                $record = array();
+                $record['client_id'] = $cl_client;
+                $record['billable'] = $cl_billable ? '1' : '0';
+                $record['project_id'] = $cl_project;
+                $record['task_id'] = $cl_task;
+                if ($custom_fields && $custom_fields->timeFields) {
+                  foreach ($custom_fields->timeFields as $timeField) {
+                    $field_name = 'time_field_'.$timeField['id'];
+                    if ($timeField['type'] == CustomFields::TYPE_TEXT)
+                      $record[$field_name] = $timeCustomFields[$timeField['id']]['value'];
+                    else if ($timeField['type'] == CustomFields::TYPE_DROPDOWN)
+                      $record[$field_name.'_option_id'] = $timeCustomFields[$timeField['id']]['value'];
+                  }
+                }
+                $fields['row_id'] = ttWeekViewHelper::makeRowIdentifier($record).'_0';
+                // Note: no need to check for a possible conflict with an already existing row
+                // because we are doing an insert that does not affect already existing data.
+
+                if ($showWeekNote) {
+                  $fields['note'] = $request->getParameter('note');
+                }
+              }
+              $fields['day_header'] = $dayHeader;
+              $fields['start_date'] = $startDate->toString(DB_DATEFORMAT); // To be able to determine date for the entry using $dayHeader.
+              $fields['duration'] = $postedDuration;
+              $fields['browser_today'] = $request->getParameter('browser_today', null);
+              if ($showWeekNotes) {
+                // Take note value from the control below duration.
+                $noteRowNumber = $rowNumber + 1;
+                $note_control_id =  $noteRowNumber.'_'.$dayHeader;
+                $fields['note'] = $request->getParameter($note_control_id);
+              }
+              $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
+            } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
+              // Delete an already existing record here.
+              $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id']);
+            } else {
+              $fields = array();
+              $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
+              $fields['duration'] = $postedDuration;
+              $result = ttWeekViewHelper::modifyDurationFromWeekView($fields, $err);
+            }
+            if (!$result) break; // Break out of the loop in case of first error.
+
+          } else if ($showWeekNotes) {
+            // Handle commments row here.
+
+            // Obtain existing and posted comments.
+            $postedComment = $request->getParameter($control_id);
+            $existingComment = $dataArray[$rowNumber][$dayHeader]['note'];
+            // If posted value is not null, check it.
+            if ($postedComment && !ttValidString($postedComment, true)) {
+              $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+              $result = false; break; // Break out. Stop any further processing.
+            }
+            // Do not process if value has not changed.
+            if ($postedComment == $existingComment)
+              continue;
+
+            // Posted value is different.
+            // TODO: handle new entries separately in the durations block above.
+
+            // Here, only update the comment on an already existing record.
+            $fields = array();
+            $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
+            if ($fields['tt_log_id']) {
+              $fields['comment'] = $postedComment;
+              $result = ttWeekViewHelper::modifyCommentFromWeekView($fields);
+            }
+            if (!$result) break; // Break out of the loop on first error.
+          }
+        }
+        if (!$result) break; // Break out of the loop on first error.
+        $rowNumber++;
+      }
+      if ($result) {
+        header('Location: week.php'); // Normal exit.
+        exit();
+      }
+    }
+  }
+} // isPost
+
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
+
+$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
+$smarty->assign('selected_date', $selected_date);
+$smarty->assign('week_total', $week_total);
+$smarty->assign('client_list', $client_list);
+$smarty->assign('project_list', $project_list);
+$smarty->assign('task_list', $task_list);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="fillDropdowns()"');
+$smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
+$smarty->assign('time_records', $records);
+$smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu'));
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('task_required', $taskRequired);
+$smarty->assign('show_week_note', $showWeekNote);
+$smarty->assign('show_week_list', $user->isOptionEnabled('week_list'));
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_files', $showFiles);
+$smarty->assign('title', $i18n->get('menu.week'));
+$smarty->assign('content_page_name', 'week2.tpl');
+$smarty->display('index2.tpl');

From e7ec5231bd04c2d5cc430746cac8572c06bc1653 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 May 2021 13:43:14 +0000
Subject: [PATCH 1546/1848] A bit more progress towards making week view mobile
 friendly.

---
 WEB-INF/templates/week2.tpl | 42 +++++++++++++++++++++++++++++++++++++
 default.css                 |  4 ++--
 initialize.php              |  2 +-
 time.php                    |  4 +++-
 week2.php                   | 27 ++++++++++++------------
 5 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/templates/week2.tpl b/WEB-INF/templates/week2.tpl
index b46e9804f..b09a11988 100644
--- a/WEB-INF/templates/week2.tpl
+++ b/WEB-INF/templates/week2.tpl
@@ -51,6 +51,48 @@ function fillDropdowns() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if $show_billable}
+  <tr>
+    <td class = "large-screen-label">&nbsp;</td>
+    <td><label class="checkbox-label">{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if isset($custom_fields) && $custom_fields->timeFields}
+  {foreach $custom_fields->timeFields as $timeField}
+    {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+{if $show_project}
+  <tr class = "small-screen-label"><td><label for="project">{$i18n.label.project} (*):</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="project">{$i18n.label.project} (*):</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.project.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_task}
+  <tr class = "small-screen-label"><td><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="task">{$i18n.label.task}{if $task_required} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.task.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+{if $show_week_note}
+  <tr class = "small-screen-label"><td><label for="week_note">{$i18n.label.week_note}:</label></td></tr>
+  <tr>
+    <td class = "large-screen-label"><label for="week_note">{$i18n.label.week_note}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.week_note.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
 </table>
 {$forms.weekTimeForm.close}
 
diff --git a/default.css b/default.css
index e04cab3d5..48cd2c4e8 100644
--- a/default.css
+++ b/default.css
@@ -363,7 +363,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name, #comment, #custom_css, #content {
+#description, #address, #item_name, #comment, #custom_css, #content, #week_note {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
@@ -371,7 +371,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas with focus */
-#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus {
+#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus, #week_note:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/initialize.php b/initialize.php
index 14c04798b..09214a387 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5531");
+define("APP_VERSION", "1.19.28.5532");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index d96c497e3..9b366b543 100644
--- a/time.php
+++ b/time.php
@@ -192,8 +192,10 @@
 }
 
 // Billable checkbox.
-if ($showBillable)
+if ($showBillable) {
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+  $largeScreenCalendarRowSpan += 2;
+}
 
 // If we have time custom fields - add controls for them.
 if (isset($custom_fields) && $custom_fields->timeFields) {
diff --git a/week2.php b/week2.php
index f97a515dc..6fccba9cd 100644
--- a/week2.php
+++ b/week2.php
@@ -121,8 +121,8 @@
 $_SESSION['project'] = $cl_project;
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
-$cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note']));
-$_SESSION['note'] = $cl_note;
+$cl_note = $request->getParameter('week_note', ($request->isPost() ? null : @$_SESSION['week_note']));
+$_SESSION['week_note'] = $cl_note;
 
 $timeCustomFields = array();
 // If we have time custom fields - collect input.
@@ -242,7 +242,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
       'name'=>'user',
-      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
@@ -272,7 +271,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
@@ -282,22 +280,24 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 // Billable checkbox.
-if ($user->isPluginEnabled('iv'))
+if ($showBillable) {
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+  $largeScreenCalendarRowSpan += 2;
+}
 
 // If we have time custom fields - add controls for them.
 if ($custom_fields && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -308,11 +308,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($showClient) {
@@ -335,11 +335,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -348,18 +348,17 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
-    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Week note control.
 if ($showWeekNote) {
-  if (!defined('NOTE_INPUT_HEIGHT'))
-    define('NOTE_INPUT_HEIGHT', 40);
-  $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+  $form->addInput(array('type'=>'textarea','name'=>'week_note','value'=>$cl_note));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Calendar.
@@ -468,7 +467,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 // because we are doing an insert that does not affect already existing data.
 
                 if ($showWeekNote) {
-                  $fields['note'] = $request->getParameter('note');
+                  $fields['note'] = $request->getParameter('week_note');
                 }
               }
               $fields['day_header'] = $dayHeader;

From d09c4858e797b620335255e38c84c9e423dc8e4c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 May 2021 15:57:52 +0000
Subject: [PATCH 1547/1848] Made week view mobile friendly.

---
 WEB-INF/templates/week2.tpl | 183 ++++++++++--------------------------
 default.css                 |   4 +-
 initialize.php              |   2 +-
 week.php                    |  39 ++++----
 week2.php => week_old.php   |  35 ++++---
 5 files changed, 90 insertions(+), 173 deletions(-)
 rename week2.php => week_old.php (96%)

diff --git a/WEB-INF/templates/week2.tpl b/WEB-INF/templates/week2.tpl
index b09a11988..7f77b0ad9 100644
--- a/WEB-INF/templates/week2.tpl
+++ b/WEB-INF/templates/week2.tpl
@@ -86,193 +86,108 @@ function fillDropdowns() {
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if $show_week_note}
-  <tr class = "small-screen-label"><td><label for="week_note">{$i18n.label.week_note}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="comment">{$i18n.label.week_note}:</label></td></tr>
   <tr>
-    <td class = "large-screen-label"><label for="week_note">{$i18n.label.week_note}:</label></td>
-    <td class="td-with-input">{$forms.weekTimeForm.week_note.control}</td>
+    <td class = "large-screen-label"><label for="comment">{$i18n.label.week_note}:</label></td>
+    <td class="td-with-input">{$forms.weekTimeForm.comment.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 </table>
-{$forms.weekTimeForm.close}
-
-
-
-
-{$forms.weekTimeForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-{if $show_navigation}
-  <tr>
-    <td align="center" colspan=2">
-      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
-    </td>
-  </tr>
-{/if}
+<div class="form-control-separator"></div>
+<table class="x-scrollable-table">
   <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.weekTimeForm.user.control}</td>
-        </tr>
-{/if}
-{if $show_client}
-        <tr>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.weekTimeForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_billable}
-        <tr>
-          <td align="right">&nbsp;</td>
-          <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
-        </tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-    <tr>
-      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      <td>{$forms.weekTimeForm.$control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.weekTimeForm.project.control}</td>
-        </tr>
-{/if}
-{if $show_task}
-        <tr>
-          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
-          <td>{$forms.weekTimeForm.task.control}</td>
-        </tr>
-{/if}
-{if $show_week_note}
-        <tr>
-          <td align="right">{$i18n.label.week_note}:</td>
-          <td>{$forms.weekTimeForm.note.control}</td>
-        </tr>
-{/if}
-      </table>
-    </td>
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.weekTimeForm.date.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table width="720">
-  <tr valign="top">
     <td>{$forms.weekTimeForm.week_durations.control}</td>
   </tr>
 </table>
-
-<table>
-  <tr>
-    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
-  </tr>
-  <tr><td>&nbsp;</td></tr>
-</table>
+<div class="button-set">{$forms.weekTimeForm.btn_submit.control}</div>
+{$forms.weekTimeForm.close}
 
 {if $show_week_list}
-<table width="720">
-<tr>
-  <td valign="top">
-{if $time_records}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-        <td width="5%" class="tableHeader">{$i18n.label.date}</td>
+<div class="form-control-separator"></div>
+<table class="x-scrollable-table">
+  <tr>
+    <th>{$i18n.label.date}</th>
   {if $show_client}
-        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
+    <th>{$i18n.label.client}</th>
   {/if}
   {if $show_project}
-        <td class="tableHeader">{$i18n.label.project}</td>
+    <th>{$i18n.label.project}</th>
   {/if}
   {if $show_task}
-        <td class="tableHeader">{$i18n.label.task}</td>
+    <th>{$i18n.label.task}</th>
   {/if}
   {if $show_start}
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
+    <th>{$i18n.label.start}</th>
+    <th>{$i18n.label.finish}</th>
   {/if}
-        <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
-        <td class="tableHeader">{$i18n.label.note}</td>
+    <th>{$i18n.label.duration}</th>
+    <th>{$i18n.label.note}</th>
   {if $show_files}
-        <td></td>
+    <th></th>
   {/if}
-        <td></td>
-        <td></td>
-      </tr>
+    <th></th>
+    <th></th>
+  </tr>
   {foreach $time_records as $record}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-        <td valign="top">{$record.date}</td>
+  <tr {if !$record.billable}class="not_billable"{/if}>
+    <td class="date-cell">{$record.date}</td>
     {if $show_client}
-        <td valign="top">{$record.client|escape}</td>
+    <td class="text-cell">{$record.client|escape}</td>
     {/if}
     {if $show_project}
-        <td valign="top">{$record.project|escape}</td>
+    <td class="text-cell">{$record.project|escape}</td>
     {/if}
     {if $show_task}
-        <td valign="top">{$record.task|escape}</td>
+    <td class="text-cell">{$record.task|escape}</td>
     {/if}
     {if $show_start}
-        <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
-        <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
-        <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
-        <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+    <td class="text-cell">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
     {if $show_files}
       {if $record.has_files}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+    <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
       {else}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+    <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
       {/if}
     {/if}
-        <td valign="top" align="center">
+    <td>
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
+      &nbsp;
     {else}
-          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
+      <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
     {/if}
-        </td>
-        <td valign="top" align="center">
+    </td>
+    <td>
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
+      &nbsp;
     {else}
-          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
+      <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
     {/if}
-        </td>
-      </tr>
+    </td>
+  </tr>
   {/foreach}
-    </table>
-{/if}
-  </td>
-</tr>
 </table>
 {/if}
-
 {if $time_records}
-<table cellpadding="3" cellspacing="1" width="720">
-  {if $show_week_list}
+<div class="day-totals">
+<table class="centered-table">
   <tr>
-    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td></td>
+    <td class="day-totals-col1">{$i18n.label.week_total}: {$week_total}</td>
+    <td class="day-totals-col2"></td>
   </tr>
-  {/if}
   {if $user->isPluginEnabled('mq')}
   <tr>
-    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
+    <td class="day-totals-col1">{$i18n.label.month_total}: {$month_total}</td>
     {if $over_quota}
-    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
+    <td class="day-totals-col2">{$i18n.form.time.over_quota}: <span class="over-quota">{$quota_remaining}</span></td>
     {else}
-    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
+    <td class="day-totals-col2">{$i18n.form.time.remaining_quota}: <span class="remaining-quota">{$quota_remaining}</span></td>
     {/if}
   </tr>
   {/if}
 </table>
 {/if}
-{$forms.weekTimeForm.close}
diff --git a/default.css b/default.css
index 48cd2c4e8..e04cab3d5 100644
--- a/default.css
+++ b/default.css
@@ -363,7 +363,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name, #comment, #custom_css, #content, #week_note {
+#description, #address, #item_name, #comment, #custom_css, #content {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
@@ -371,7 +371,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas with focus */
-#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus, #week_note:focus {
+#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/initialize.php b/initialize.php
index 09214a387..dc0c35452 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5532");
+define("APP_VERSION", "1.19.28.5533");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 01597704d..dbb61529a 100644
--- a/week.php
+++ b/week.php
@@ -121,8 +121,8 @@
 $_SESSION['project'] = $cl_project;
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
-$cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note']));
-$_SESSION['note'] = $cl_note;
+$cl_note = $request->getParameter('comment', ($request->isPost() ? null : @$_SESSION['comment']));
+$_SESSION['comment'] = $cl_note;
 
 $timeCustomFields = array();
 // If we have time custom fields - collect input.
@@ -229,6 +229,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
 // Elements of weekTimeForm.
 $form = new Form('weekTimeForm');
+$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
@@ -241,11 +242,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
       'name'=>'user',
-      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
     $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -270,31 +271,33 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
-    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
 // Billable checkbox.
-if ($user->isPluginEnabled('iv'))
+if ($showBillable) {
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+  $largeScreenCalendarRowSpan += 2;
+}
 
 // If we have time custom fields - add controls for them.
 if ($custom_fields && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -305,11 +308,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);',
     'name'=>'project',
-    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($showClient) {
@@ -332,11 +335,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
-      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -345,18 +348,17 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
-    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Week note control.
 if ($showWeekNote) {
-  if (!defined('NOTE_INPUT_HEIGHT'))
-    define('NOTE_INPUT_HEIGHT', 40);
-  $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
+  $form->addInput(array('type'=>'textarea','name'=>'comment','value'=>$cl_note));
+  $largeScreenCalendarRowSpan += 2;
 }
 
 // Calendar.
@@ -465,7 +467,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 // because we are doing an insert that does not affect already existing data.
 
                 if ($showWeekNote) {
-                  $fields['note'] = $request->getParameter('note');
+                  $fields['note'] = $request->getParameter('comment');
                 }
               }
               $fields['day_header'] = $dayHeader;
@@ -476,7 +478,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 // Take note value from the control below duration.
                 $noteRowNumber = $rowNumber + 1;
                 $note_control_id =  $noteRowNumber.'_'.$dayHeader;
-                $fields['note'] = $request->getParameter($note_control_id);
+                if ($request->getParameter($note_control_id)) {
+                  $fields['note'] = $request->getParameter($note_control_id); // This overwrites week note.
+                }
               }
               $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
             } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
@@ -531,6 +535,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
+$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('client_list', $client_list);
@@ -551,5 +556,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('menu.week'));
-$smarty->assign('content_page_name', 'week.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('content_page_name', 'week2.tpl');
+$smarty->display('index2.tpl');
diff --git a/week2.php b/week_old.php
similarity index 96%
rename from week2.php
rename to week_old.php
index 6fccba9cd..01597704d 100644
--- a/week2.php
+++ b/week_old.php
@@ -121,8 +121,8 @@
 $_SESSION['project'] = $cl_project;
 $cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
-$cl_note = $request->getParameter('week_note', ($request->isPost() ? null : @$_SESSION['week_note']));
-$_SESSION['week_note'] = $cl_note;
+$cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note']));
+$_SESSION['note'] = $cl_note;
 
 $timeCustomFields = array();
 // If we have time custom fields - collect input.
@@ -229,7 +229,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
 // Elements of weekTimeForm.
 $form = new Form('weekTimeForm');
-$largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 if ($user->can('track_time')) {
   $rank = $user->getMaxRankForGroup($group_id);
@@ -242,11 +241,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
       'name'=>'user',
+      'style'=>'width: 250px;',
       'value'=>$user_id,
       'data'=>$user_list,
       'datakeys'=>array('id','name')));
     $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $largeScreenCalendarRowSpan += 2;
     $smarty->assign('user_dropdown', 1);
   }
 }
@@ -271,33 +270,31 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
+    'style'=>'width: 250px;',
     'value'=>$cl_client,
     'data'=>$active_clients,
     'datakeys'=>array('id', 'name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $largeScreenCalendarRowSpan += 2;
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
 // Billable checkbox.
-if ($showBillable) {
+if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-  $largeScreenCalendarRowSpan += 2;
-}
 
 // If we have time custom fields - add controls for them.
 if ($custom_fields && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$timeCustomFields[$timeField['id']]['value']));
+      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
     } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
       $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
       'data'=>CustomFields::getOptions($timeField['id']),
       'value'=>$timeCustomFields[$timeField['id']]['value'],
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
     }
-    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -308,11 +305,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillTaskDropdown(this.value);',
     'name'=>'project',
+    'style'=>'width: 250px;',
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $largeScreenCalendarRowSpan += 2;
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($showClient) {
@@ -335,11 +332,11 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
+      'style'=>'width: 250px;',
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    $largeScreenCalendarRowSpan += 2;
   }
 }
 
@@ -348,17 +345,18 @@ function render(&$table, $value, $row, $column, $selected = false) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
+    'style'=>'width: 250px;',
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  $largeScreenCalendarRowSpan += 2;
 }
 
 // Week note control.
 if ($showWeekNote) {
-  $form->addInput(array('type'=>'textarea','name'=>'week_note','value'=>$cl_note));
-  $largeScreenCalendarRowSpan += 2;
+  if (!defined('NOTE_INPUT_HEIGHT'))
+    define('NOTE_INPUT_HEIGHT', 40);
+  $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
 }
 
 // Calendar.
@@ -467,7 +465,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 // because we are doing an insert that does not affect already existing data.
 
                 if ($showWeekNote) {
-                  $fields['note'] = $request->getParameter('week_note');
+                  $fields['note'] = $request->getParameter('note');
                 }
               }
               $fields['day_header'] = $dayHeader;
@@ -533,7 +531,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
-$smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('client_list', $client_list);
@@ -554,5 +551,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('menu.week'));
-$smarty->assign('content_page_name', 'week2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'week.tpl');
+$smarty->display('index.tpl');

From 494d48957f43fc4ab1bb87e7e5b6371901ceb79d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 May 2021 17:43:22 +0000
Subject: [PATCH 1548/1848] It is hard to believe but the entire app is now
 mobile friendly.

---
 WEB-INF/templates/week.tpl  | 200 -------------
 WEB-INF/templates/week2.tpl |   9 +-
 initialize.php              |   2 +-
 week_old.php                | 555 ------------------------------------
 4 files changed, 2 insertions(+), 764 deletions(-)
 delete mode 100644 WEB-INF/templates/week.tpl
 delete mode 100644 week_old.php

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
deleted file mode 100644
index 92ce31d92..000000000
--- a/WEB-INF/templates/week.tpl
+++ /dev/null
@@ -1,200 +0,0 @@
-{include file="time_script.tpl"}
-
-<script>
-// This is here because fillDropdowns() in time_script.tpl uses a different form name.
-// Perhaps a better fix would be to provide form name as paramater to fillDropdowns()?
-// TODO: try to fix it properly.
-//
-// The fillDropdowns function populates the "project" and "task" dropdown controls
-// with relevant values.
-function fillDropdowns() {
-  if(document.body.contains(document.weekTimeForm.client))
-    fillProjectDropdown(document.weekTimeForm.client.value);
-
-  fillTaskDropdown(document.weekTimeForm.project.value);
-}
-</script>
-
-<style>
-.not_billable td {
-  color: #ff6666;
-}
-</style>
-
-{$forms.weekTimeForm.open}
-<table cellspacing="4" cellpadding="0" border="0">
-{if $show_navigation}
-  <tr>
-    <td align="center" colspan=2">
-      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td valign="top">
-      <table>
-{if $user_dropdown}
-        <tr>
-          <td align="right">{$i18n.label.user}:</td>
-          <td>{$forms.weekTimeForm.user.control}</td>
-        </tr>
-{/if}
-{if $show_client}
-        <tr>
-          <td align="right">{$i18n.label.client}{if $user->isOptionEnabled('client_required')} (*){/if}:</td>
-          <td>{$forms.weekTimeForm.client.control}</td>
-        </tr>
-{/if}
-{if $show_billable}
-        <tr>
-          <td align="right">&nbsp;</td>
-          <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
-        </tr>
-{/if}
-{if $custom_fields && $custom_fields->timeFields}
-  {foreach $custom_fields->timeFields as $timeField}
-    <tr>
-      <td align="right">{$timeField['label']|escape}{if $timeField['required']} (*){/if}:</td>
-      {assign var="control_name" value='time_field_'|cat:$timeField['id']}
-      <td>{$forms.weekTimeForm.$control_name.control}</td>
-    </tr>
-  {/foreach}
-{/if}
-{if $show_project}
-        <tr>
-          <td align="right">{$i18n.label.project} (*):</td>
-          <td>{$forms.weekTimeForm.project.control}</td>
-        </tr>
-{/if}
-{if $show_task}
-        <tr>
-          <td align="right">{$i18n.label.task}{if $task_required} (*){/if}:</td>
-          <td>{$forms.weekTimeForm.task.control}</td>
-        </tr>
-{/if}
-{if $show_week_note}
-        <tr>
-          <td align="right">{$i18n.label.week_note}:</td>
-          <td>{$forms.weekTimeForm.note.control}</td>
-        </tr>
-{/if}
-      </table>
-    </td>
-    <td valign="top">
-      <table>
-        <tr><td>{$forms.weekTimeForm.date.control}</td></tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table width="720">
-  <tr valign="top">
-    <td>{$forms.weekTimeForm.week_durations.control}</td>
-  </tr>
-</table>
-
-<table>
-  <tr>
-    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
-  </tr>
-  <tr><td>&nbsp;</td></tr>
-</table>
-
-{if $show_week_list}
-<table width="720">
-<tr>
-  <td valign="top">
-{if $time_records}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-        <td width="5%" class="tableHeader">{$i18n.label.date}</td>
-  {if $show_client}
-        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_project}
-        <td class="tableHeader">{$i18n.label.project}</td>
-  {/if}
-  {if $show_task}
-        <td class="tableHeader">{$i18n.label.task}</td>
-  {/if}
-  {if $show_start}
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
-        <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
-  {/if}
-        <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
-        <td class="tableHeader">{$i18n.label.note}</td>
-  {if $show_files}
-        <td></td>
-  {/if}
-        <td></td>
-        <td></td>
-      </tr>
-  {foreach $time_records as $record}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-        <td valign="top">{$record.date}</td>
-    {if $show_client}
-        <td valign="top">{$record.client|escape}</td>
-    {/if}
-    {if $show_project}
-        <td valign="top">{$record.project|escape}</td>
-    {/if}
-    {if $show_task}
-        <td valign="top">{$record.task|escape}</td>
-    {/if}
-    {if $show_start}
-        <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
-        <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
-    {/if}
-        <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
-        <td valign="top">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
-    {if $show_files}
-      {if $record.has_files}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
-      {else}
-        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
-      {/if}
-    {/if}
-        <td valign="top" align="center">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
-    {else}
-          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
-    {/if}
-        </td>
-        <td valign="top" align="center">
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
-          &nbsp;
-    {else}
-          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
-    {/if}
-        </td>
-      </tr>
-  {/foreach}
-    </table>
-{/if}
-  </td>
-</tr>
-</table>
-{/if}
-
-{if $time_records}
-<table cellpadding="3" cellspacing="1" width="720">
-  {if $show_week_list}
-  <tr>
-    <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td></td>
-  </tr>
-  {/if}
-  {if $user->isPluginEnabled('mq')}
-  <tr>
-    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
-    {if $over_quota}
-    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
-    {else}
-    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
-    {/if}
-  </tr>
-  {/if}
-</table>
-{/if}
-{$forms.weekTimeForm.close}
diff --git a/WEB-INF/templates/week2.tpl b/WEB-INF/templates/week2.tpl
index 7f77b0ad9..7dbf5d1f9 100644
--- a/WEB-INF/templates/week2.tpl
+++ b/WEB-INF/templates/week2.tpl
@@ -18,13 +18,6 @@ function fillDropdowns() {
 }
 </script>
 
-
-<style>
-.not_billable td {
-  color: #ff6666;
-}
-</style>
-
 {if $show_navigation}
 <div class="optional-nav">
   <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
@@ -130,7 +123,7 @@ function fillDropdowns() {
     <th></th>
   </tr>
   {foreach $time_records as $record}
-  <tr {if !$record.billable}class="not_billable"{/if}>
+  <tr {if !$record.billable}class="not-billable"{/if}>
     <td class="date-cell">{$record.date}</td>
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
diff --git a/initialize.php b/initialize.php
index dc0c35452..469d92a7b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5533");
+define("APP_VERSION", "1.19.28.5534");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week_old.php b/week_old.php
deleted file mode 100644
index 01597704d..000000000
--- a/week_old.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-/* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt */
-
-require_once('initialize.php');
-import('form.Form');
-import('form.DefaultCellRenderer');
-import('form.Table');
-import('form.TextField');
-import('ttUserHelper');
-import('ttGroupHelper');
-import('ttWeekViewHelper');
-import('ttClientHelper');
-import('ttTimeHelper');
-import('DateAndTime');
-
-// Access checks.
-if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
-  header('Location: access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wv')) {
-  header('Location: feature_disabled.php');
-  exit();
-}
-if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
-  header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
-  exit();
-}
-if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
-  header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
-  exit();
-}
-if ($request->isPost()) {
-  $userChanged = (bool)$request->getParameter('user_changed'); // Reused in multiple places below.
-  if ($userChanged && !($user->can('track_time') && $user->isUserValid((int)$request->getParameter('user')))) {
-    header('Location: access_denied.php'); // User changed, but no right or wrong user id.
-    exit();
-  }
-}
-// End of access checks.
-
-// Determine user for whom we display this page.
-if ($request->isPost() && $userChanged) {
-  $user_id = (int)$request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
-}
-
-$group_id = $user->getGroup();
-
-$showClient = $user->isPluginEnabled('cl');
-$showBillable = $user->isPluginEnabled('iv');
-$trackingMode = $user->getTrackingMode();
-$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
-$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
-if ($showTask) $taskRequired = $user->getConfigOption('task_required');
-$showWeekNote = $user->isOptionEnabled('week_note');
-$showWeekNotes = $user->isOptionEnabled('week_notes');
-$recordType = $user->getRecordType();
-$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
-$showFiles = $user->isPluginEnabled('at');
-
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-
-// Determine selected week start and end dates.
-$weekStartDay = $user->getWeekStart();
-$t_arr = localtime($selected_date->getTimestamp());
-$t_arr[5] = $t_arr[5] + 1900;
-if ($t_arr[6] < $weekStartDay)
-  $startWeekBias = $weekStartDay - 7;
-else
-  $startWeekBias = $weekStartDay;
-$startDate = new DateAndTime();
-$startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
-$endDate = new DateAndTime();
-$endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
-// The above is needed to set date range (timestring) in page title.
-
-// Use custom fields plugin if it is enabled.
-if ($user->isPluginEnabled('cf')) {
-  require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields();
-  $smarty->assign('custom_fields', $custom_fields);
-}
-
-// Use Monthly Quotas plugin, if applicable.
-if ($user->isPluginEnabled('mq')){
-  require_once('plugins/MonthlyQuota.class.php');
-  $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
-  $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
-
-  $smarty->assign('month_total', $month_total);
-  $smarty->assign('over_quota', $minutes_left < 0);
-  $smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
-}
-
-// Initialize variables.
-$cl_billable = 1;
-if ($showBillable) {
-  if ($request->isPost()) {
-    $cl_billable = $request->getParameter('billable');
-    $_SESSION['billable'] = (int) $cl_billable;
-  } else
-    if (isset($_SESSION['billable']))
-      $cl_billable = $_SESSION['billable'];
-}
-$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
-$_SESSION['client'] = $cl_client;
-$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
-$_SESSION['project'] = $cl_project;
-$cl_task = $request->getParameter('task', ($request->isPost() ? null : @$_SESSION['task']));
-$_SESSION['task'] = $cl_task;
-$cl_note = $request->getParameter('note', ($request->isPost() ? null : @$_SESSION['note']));
-$_SESSION['note'] = $cl_note;
-
-$timeCustomFields = array();
-// If we have time custom fields - collect input.
-if ($request->isPost()) {
-  if ($custom_fields && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
-  }
-}
-
-// Get the data we need to display week view.
-// Get column headers, which are day numbers in month.
-$dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
-$lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
-// Get already existing records.
-$records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $showFiles);
-// Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function.
-if ($records)
-  $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders);
-else
-  $dataArray = ttWeekViewHelper::prePopulateFromPastWeeks($startDate->toString(DB_DATEFORMAT), $dayHeaders);
-
-// Build day totals (total durations for each day in week).
-$dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders);
-
-// Define rendering class for a label field to the left of durations.
-class LabelCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    global $user;
-    $showNotes = $user->isOptionEnabled('week_notes');
-
-    $this->setOptions(array('width'=>200,'valign'=>'middle'));
-
-    // Special handling for a new week entry (row 0, or 0 and 1 if we show notes).
-    if (0 == $row) {
-      $this->setOptions(array('style'=>'text-align: center; font-weight: bold; vertical-align: top;'));
-    } else if ($showNotes && (1 == $row)) {
-      $this->setOptions(array('style'=>'text-align: right; vertical-align: top;'));
-    } else if ($showNotes && (0 != $row % 2)) {
-      $this->setOptions(array('style'=>'text-align: right;'));
-    }
-    // Special handling for not billable entries.
-    $ignoreRow = $showNotes ? 1 : 0;
-    if ($row > $ignoreRow) {
-      $row_id = $table->getValueAtName($row,'row_id');
-      $billable = ttWeekViewHelper::parseFromWeekViewRow($row_id, 'bl');
-      if (!$billable) {
-        if (($showNotes && (0 == $row % 2)) || !$showNotes) {
-          $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS.
-        }
-      }
-    }
-    $this->setValue(htmlspecialchars($value)); // This escapes HTML for output.
-    return $this->toString();
-  }
-}
-
-// Define rendering class for a single cell for a time or a comment entry in week view table.
-class WeekViewCellRenderer extends DefaultCellRenderer {
-  function render(&$table, $value, $row, $column, $selected = false) {
-    global $user;
-    $showNotes = $user->isOptionEnabled('week_notes');
-
-    $field_name = $table->getValueAt($row,$column)['control_id']; // Our text field names (and ids) are like x_y (row_column).
-    $field = new TextField($field_name);
-    // Disable control if the date is locked.
-    global $lockedDays;
-    if ($lockedDays[$column-1])
-      $field->setEnabled(false);
-    $field->setFormName($table->getFormName());
-    $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually.
-    // Provide visual separation for new entry row.
-    $rowToSeparate = $showNotes ? 1 : 0;
-    if ($rowToSeparate == $row) {
-      $field->setStyle('width: 60px; margin-bottom: 40px');
-    }
-    if ($showNotes) {
-      if (0 == $row % 2) {
-        $field->setValue($table->getValueAt($row,$column)['duration']); // Duration for even rows.
-      } else {
-        $field->setValue($table->getValueAt($row,$column)['note']);     // Comment for odd rows.
-        $field->setTitle($table->getValueAt($row,$column)['note']);     // Tooltip to help view the entire comment.
-      }
-    } else {
-      $field->setValue($table->getValueAt($row,$column)['duration']);
-      // $field->setTitle($table->getValueAt($row,$column)['note']); // Tooltip to see comment. TODO - value not available.
-    }
-    // Disable control when time entry mode is TYPE_START_FINISH and there is no value in control
-    // because we can't supply start and finish times in week view - there are no fields for them.
-    if (!$field->getValue() && TYPE_START_FINISH == $user->getRecordType()) {
-        $field->setEnabled(false);
-    }
-    $this->setValue($field->getHtml());
-    return $this->toString();
-  }
-}
-
-// Elements of weekTimeForm.
-$form = new Form('weekTimeForm');
-
-if ($user->can('track_time')) {
-  $rank = $user->getMaxRankForGroup($group_id);
-  if ($user->can('track_own_time'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
-  else
-    $options = array('status'=>ACTIVE,'max_rank'=>$rank);
-  $user_list = $user->getUsers($options);
-  if (count($user_list) >= 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.weekTimeForm.user_changed.value=1;document.weekTimeForm.submit();',
-      'name'=>'user',
-      'style'=>'width: 250px;',
-      'value'=>$user_id,
-      'data'=>$user_list,
-      'datakeys'=>array('id','name')));
-    $form->addInput(array('type'=>'hidden','name'=>'user_changed'));
-    $smarty->assign('user_dropdown', 1);
-  }
-}
-
-// Create week_durations table.
-$table = new Table('week_durations');
-// $table->setCssClass('week_view_table'); // Currently not used. Fix this.
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
-$table->setRowOptions(array('class'=>'tableHeaderCentered'));
-$table->setData($dataArray);
-// Add columns to table.
-$table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label']));
-for ($i = 0; $i < 7; $i++) {
-  $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
-}
-$table->setInteractive(false);
-$form->addInputElement($table);
-
-// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $trackingMode && $showClient) {
-  $active_clients = ttGroupHelper::getActiveClients(true);
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillProjectDropdown(this.value);',
-    'name'=>'client',
-    'style'=>'width: 250px;',
-    'value'=>$cl_client,
-    'data'=>$active_clients,
-    'datakeys'=>array('id', 'name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  // Note: in other modes the client list is filtered to relevant clients only. See below.
-}
-
-// Billable checkbox.
-if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
-
-// If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
-  foreach ($custom_fields->timeFields as $timeField) {
-    $field_name = 'time_field_'.$timeField['id'];
-    if ($timeField['type'] == CustomFields::TYPE_TEXT) {
-      $form->addInput(array('type'=>'text','name'=>$field_name,'style'=>'width: 250px;','value'=>$timeCustomFields[$timeField['id']]['value']));
-    } elseif ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
-      $form->addInput(array('type'=>'combobox','name'=>$field_name,
-      'style'=>'width: 250px;',
-      'data'=>CustomFields::getOptions($timeField['id']),
-      'value'=>$timeCustomFields[$timeField['id']]['value'],
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-    }
-  }
-}
-
-// If we show project dropdown, add controls for project and client.
-if ($showProject) {
-  // Dropdown for projects assigned to user.
-  $project_list = $user->getAssignedProjects();
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);',
-    'name'=>'project',
-    'style'=>'width: 250px;',
-    'value'=>$cl_project,
-    'data'=>$project_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-
-  // Dropdown for clients if the clients plugin is enabled.
-  if ($showClient) {
-    $active_clients = ttGroupHelper::getActiveClients(true);
-    // We need an array of assigned project ids to do some trimming.
-    foreach($project_list as $project)
-      $projects_assigned_to_user[] = $project['id'];
-
-    // Build a client list out of active clients. Use only clients that are relevant to user.
-    // Also trim their associated project list to only assigned projects (to user).
-    foreach($active_clients as $client) {
-      $projects_assigned_to_client = explode(',', $client['projects']);
-      if (is_array($projects_assigned_to_client) && is_array($projects_assigned_to_user))
-        $intersection = array_intersect($projects_assigned_to_client, $projects_assigned_to_user);
-      if ($intersection) {
-        $client['projects'] = implode(',', $intersection);
-        $client_list[] = $client;
-      }
-    }
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$client_list,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->get('dropdown.select'))));
-  }
-}
-
-// Task dropdown.
-if ($showTask) {
-  $task_list = ttGroupHelper::getActiveTasks();
-  $form->addInput(array('type'=>'combobox',
-    'name'=>'task',
-    'style'=>'width: 250px;',
-    'value'=>$cl_task,
-    'data'=>$task_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->get('dropdown.select'))));
-}
-
-// Week note control.
-if ($showWeekNote) {
-  if (!defined('NOTE_INPUT_HEIGHT'))
-    define('NOTE_INPUT_HEIGHT', 40);
-  $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_note));
-}
-
-// Calendar.
-$form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date));
-
-// A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
-
-// Submit button.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
-
-// Submit.
-if ($request->isPost()) {
-  if ($request->getParameter('btn_submit')) {
-    // Validate user input for row 0.
-    // Determine if a new entry was posted.
-    $newEntryPosted = false;
-    foreach($dayHeaders as $dayHeader) {
-      $control_id = '0_'.$dayHeader;
-      if ($request->getParameter($control_id)) {
-        $newEntryPosted = true;
-        break;
-      }
-    }
-    if ($newEntryPosted) {
-      if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
-        $err->add($i18n->get('error.client'));
-      // Validate input in time custom fields.
-      if ($custom_fields && $custom_fields->timeFields) {
-        foreach ($timeCustomFields as $timeField) {
-          // Validation is the same for text and dropdown fields.
-          if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
-        }
-      }
-      if ($showProject) {
-        if (!$cl_project) $err->add($i18n->get('error.project'));
-      }
-      if ($showTask && $taskRequired) {
-        if (!$cl_task) $err->add($i18n->get('error.task'));
-      }
-    }
-    // Finished validating user input for row 0.
-
-    // Process the table of values.
-    if ($err->no()) {
-
-      // Obtain values. Iterate through posted parameters one by one,
-      // see if value changed, apply one change at a time until we see an error.
-      $result = true;
-      $rowNumber = 0;
-      // Iterate through existing rows.
-      foreach ($dataArray as $row) {
-        // Iterate through days.
-        foreach ($dayHeaders as $key => $dayHeader) {
-          // Do not process locked days.
-          if ($lockedDays[$key]) continue;
-          // Make control id for the cell.
-          $control_id = $rowNumber.'_'.$dayHeader;
-
-          // Handle durations and comments in separate blocks of code.
-          if (!$showWeekNotes || (0 == $rowNumber % 2)) {
-            // Handle durations row here.
-
-            // Obtain existing and posted durations.
-            $postedDuration = $request->getParameter($control_id);
-            $existingDuration = $dataArray[$rowNumber][$dayHeader]['duration'];
-            // If posted value is not null, check and normalize it.
-            if ($postedDuration) {
-              if (false === ttTimeHelper::postedDurationToMinutes($postedDuration)) {
-                $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-                $result = false; break; // Break out. Stop any further processing.
-              } else {
-                $minutes = ttTimeHelper::postedDurationToMinutes($postedDuration);
-                $postedDuration = ttTimeHelper::minutesToDuration($minutes);
-              }
-            }
-            // Do not process if value has not changed.
-            if ($postedDuration == $existingDuration)
-              continue;
-            // Posted value is different.
-            if ($existingDuration == null) {
-              // Skip inserting 0 duration values.
-              if (0 == ttTimeHelper::toMinutes($postedDuration))
-                continue;
-              // Insert a new record.
-              $fields = array();
-              $fields['row_id'] = $dataArray[$rowNumber]['row_id'];
-              if (!$fields['row_id']) {
-                // Special handling for row 0, a new entry. Need to construct new row_id.
-                $record = array();
-                $record['client_id'] = $cl_client;
-                $record['billable'] = $cl_billable ? '1' : '0';
-                $record['project_id'] = $cl_project;
-                $record['task_id'] = $cl_task;
-                if ($custom_fields && $custom_fields->timeFields) {
-                  foreach ($custom_fields->timeFields as $timeField) {
-                    $field_name = 'time_field_'.$timeField['id'];
-                    if ($timeField['type'] == CustomFields::TYPE_TEXT)
-                      $record[$field_name] = $timeCustomFields[$timeField['id']]['value'];
-                    else if ($timeField['type'] == CustomFields::TYPE_DROPDOWN)
-                      $record[$field_name.'_option_id'] = $timeCustomFields[$timeField['id']]['value'];
-                  }
-                }
-                $fields['row_id'] = ttWeekViewHelper::makeRowIdentifier($record).'_0';
-                // Note: no need to check for a possible conflict with an already existing row
-                // because we are doing an insert that does not affect already existing data.
-
-                if ($showWeekNote) {
-                  $fields['note'] = $request->getParameter('note');
-                }
-              }
-              $fields['day_header'] = $dayHeader;
-              $fields['start_date'] = $startDate->toString(DB_DATEFORMAT); // To be able to determine date for the entry using $dayHeader.
-              $fields['duration'] = $postedDuration;
-              $fields['browser_today'] = $request->getParameter('browser_today', null);
-              if ($showWeekNotes) {
-                // Take note value from the control below duration.
-                $noteRowNumber = $rowNumber + 1;
-                $note_control_id =  $noteRowNumber.'_'.$dayHeader;
-                $fields['note'] = $request->getParameter($note_control_id);
-              }
-              $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
-            } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
-              // Delete an already existing record here.
-              $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id']);
-            } else {
-              $fields = array();
-              $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
-              $fields['duration'] = $postedDuration;
-              $result = ttWeekViewHelper::modifyDurationFromWeekView($fields, $err);
-            }
-            if (!$result) break; // Break out of the loop in case of first error.
-
-          } else if ($showWeekNotes) {
-            // Handle commments row here.
-
-            // Obtain existing and posted comments.
-            $postedComment = $request->getParameter($control_id);
-            $existingComment = $dataArray[$rowNumber][$dayHeader]['note'];
-            // If posted value is not null, check it.
-            if ($postedComment && !ttValidString($postedComment, true)) {
-              $err->add($i18n->get('error.field'), $i18n->get('label.note'));
-              $result = false; break; // Break out. Stop any further processing.
-            }
-            // Do not process if value has not changed.
-            if ($postedComment == $existingComment)
-              continue;
-
-            // Posted value is different.
-            // TODO: handle new entries separately in the durations block above.
-
-            // Here, only update the comment on an already existing record.
-            $fields = array();
-            $fields['tt_log_id'] = $dataArray[$rowNumber][$dayHeader]['tt_log_id'];
-            if ($fields['tt_log_id']) {
-              $fields['comment'] = $postedComment;
-              $result = ttWeekViewHelper::modifyCommentFromWeekView($fields);
-            }
-            if (!$result) break; // Break out of the loop on first error.
-          }
-        }
-        if (!$result) break; // Break out of the loop on first error.
-        $rowNumber++;
-      }
-      if ($result) {
-        header('Location: week.php'); // Normal exit.
-        exit();
-      }
-    }
-  }
-} // isPost
-
-$week_total = ttTimeHelper::getTimeForWeek($selected_date);
-
-$smarty->assign('selected_date', $selected_date);
-$smarty->assign('week_total', $week_total);
-$smarty->assign('client_list', $client_list);
-$smarty->assign('project_list', $project_list);
-$smarty->assign('task_list', $task_list);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
-$smarty->assign('time_records', $records);
-$smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu'));
-$smarty->assign('show_client', $showClient);
-$smarty->assign('show_billable', $showBillable);
-$smarty->assign('show_project', $showProject);
-$smarty->assign('show_task', $showTask);
-$smarty->assign('task_required', $taskRequired);
-$smarty->assign('show_week_note', $showWeekNote);
-$smarty->assign('show_week_list', $user->isOptionEnabled('week_list'));
-$smarty->assign('show_start', $showStart);
-$smarty->assign('show_files', $showFiles);
-$smarty->assign('title', $i18n->get('menu.week'));
-$smarty->assign('content_page_name', 'week.tpl');
-$smarty->display('index.tpl');

From 89db773dd2810bd5a52049e4c2908a6db4dd7636 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 May 2021 19:50:23 +0000
Subject: [PATCH 1549/1848] Addressed issue #110 for php8.

---
 WEB-INF/lib/form/DateField.class.php | 4 +++-
 initialize.php                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 01c14f2e6..f5d6f8f73 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -406,7 +406,9 @@ function adjustiFrame(pickerDiv, iFrameDiv) {
       $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
       $html .= ">";
       
-      $dir_name = trim(@constant('DIR_NAME'), '/');
+      $dir_name = $app_root = '';
+      if (defined('DIR_NAME'))
+        $dir_name = trim(constant('DIR_NAME'), '/');
       if (!empty($dir_name))
         $app_root = '/'.$dir_name;
 
diff --git a/initialize.php b/initialize.php
index 469d92a7b..7d469b378 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5534");
+define("APP_VERSION", "1.19.28.5535");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6b8482702e23b70f3c54f476888b7efbc7bfee1e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 May 2021 20:21:07 +0000
Subject: [PATCH 1550/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttTimeHelper.class.php     |  4 +--
 WEB-INF/lib/ttWeekViewHelper.class.php | 34 +++++---------------------
 WEB-INF/templates/week2.tpl            |  4 +--
 initialize.php                         |  2 +-
 week.php                               | 11 ++++++---
 5 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 58f2f4222..031ccfb61 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -414,8 +414,8 @@ static function insert($fields)
     $org_id = $user->org_id;
 
     $date = $fields['date'];
-    $start = $fields['start'];
-    $finish = $fields['finish'];
+    $start = isset($fields['start']) ? $fields['start'] : null;
+    $finish = isset($fields['finish']) ? $fields['finish'] : null ;
     $duration = isset($fields['duration']) ? $fields['duration'] : null;
     if ($duration) {
       $minutes = ttTimeHelper::postedDurationToMinutes($duration);
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index aee8c8d61..55e40dc18 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // ttWeekViewHelper class groups together functions used in week view.
 class ttWeekViewHelper {
@@ -369,11 +345,13 @@ static function getDayTotals($dataArray, $dayHeaders) {
     // Insert label.
     global $i18n;
     $dayTotals['label'] = $i18n->get('label.day_total').':';
-
+    foreach($dayHeaders as $dayHeader) {
+      $dayTotals[$dayHeader] = 0;
+    }
     foreach ($dataArray as $row) {
       foreach($dayHeaders as $dayHeader) {
         if (array_key_exists($dayHeader, $row)) {
-          $minutes = ttTimeHelper::toMinutes($row[$dayHeader]['duration']);
+          $minutes = ttTimeHelper::toMinutes(@$row[$dayHeader]['duration']);
           $dayTotals[$dayHeader] += $minutes;
         }
       }
diff --git a/WEB-INF/templates/week2.tpl b/WEB-INF/templates/week2.tpl
index 7dbf5d1f9..99da5ef47 100644
--- a/WEB-INF/templates/week2.tpl
+++ b/WEB-INF/templates/week2.tpl
@@ -148,14 +148,14 @@ function fillDropdowns() {
       {/if}
     {/if}
     <td>
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+    {if (isset($record.approved) && $record.approved) || (isset($record.timesheet_id) && $record.timesheet_id) || (isset($record.invoice_id) && $record.invoice_id)}
       &nbsp;
     {else}
       <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
     {/if}
     </td>
     <td>
-    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+    {if (isset($record.approved) && $record.approved) || (isset($record.timesheet_id) && $record.timesheet_id) || (isset($record.invoice_id) && $record.invoice_id)}
       &nbsp;
     {else}
       <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
diff --git a/initialize.php b/initialize.php
index 7d469b378..69580f622 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5535");
+define("APP_VERSION", "1.19.28.5536");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index dbb61529a..63bd38235 100644
--- a/week.php
+++ b/week.php
@@ -55,6 +55,7 @@
 $trackingMode = $user->getTrackingMode();
 $showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+$taskRequired = false;
 if ($showTask) $taskRequired = $user->getConfigOption('task_required');
 $showWeekNote = $user->isOptionEnabled('week_note');
 $showWeekNotes = $user->isOptionEnabled('week_notes');
@@ -127,7 +128,7 @@
 $timeCustomFields = array();
 // If we have time custom fields - collect input.
 if ($request->isPost()) {
-  if ($custom_fields && $custom_fields->timeFields) {
+  if (isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $control_name = 'time_field_'.$timeField['id'];
       $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
@@ -286,7 +287,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 // If we have time custom fields - add controls for them.
-if ($custom_fields && $custom_fields->timeFields) {
+if (isset($custom_fields) && $custom_fields->timeFields) {
   foreach ($custom_fields->timeFields as $timeField) {
     $field_name = 'time_field_'.$timeField['id'];
     if ($timeField['type'] == CustomFields::TYPE_TEXT) {
@@ -302,6 +303,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 // If we show project dropdown, add controls for project and client.
+$project_list = $client_list = array();
 if ($showProject) {
   // Dropdown for projects assigned to user.
   $project_list = $user->getAssignedProjects();
@@ -344,6 +346,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 }
 
 // Task dropdown.
+$task_list = array();
 if ($showTask) {
   $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
@@ -387,7 +390,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
       if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
         $err->add($i18n->get('error.client'));
       // Validate input in time custom fields.
-      if ($custom_fields && $custom_fields->timeFields) {
+      if (isset($custom_fields) && $custom_fields->timeFields) {
         foreach ($timeCustomFields as $timeField) {
           // Validation is the same for text and dropdown fields.
           if (!ttValidString($timeField['value'], !$timeField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($timeField['label']));
@@ -453,7 +456,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 $record['billable'] = $cl_billable ? '1' : '0';
                 $record['project_id'] = $cl_project;
                 $record['task_id'] = $cl_task;
-                if ($custom_fields && $custom_fields->timeFields) {
+                if (isset($custom_fields) && $custom_fields->timeFields) {
                   foreach ($custom_fields->timeFields as $timeField) {
                     $field_name = 'time_field_'.$timeField['id'];
                     if ($timeField['type'] == CustomFields::TYPE_TEXT)

From c7d7520f3e7ac8de81432256d8ed1c77b776d448 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 9 May 2021 17:19:06 +0000
Subject: [PATCH 1551/1848] Addressed a couple more of php8 issues.

---
 WEB-INF/lib/form/Table.class.php | 38 +++++++++++++++++---------------
 initialize.php                   |  2 +-
 user_edit.php                    |  1 +
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index c83d90bd8..d617f8b39 100644
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -36,7 +36,7 @@ class Table extends FormElement {
   var $mHeaders       = array(); // column headers
   var $mFooters       = array(); // column footers
   var $mInteractive   = true;    // adds a clickable checkbox column to table
-  var $mIAScript      = null;    // sctipt to execute when a checkbox is clicked
+  var $mIAScript      = null;    // script to execute when a checkbox is clicked
   var $mKeyField      = '';      // identifies a column used as key to access row data
   var $mColumnFields  = array(); // field names (from mData) for data in each column
   var $mBgColor       = '#ffffff';
@@ -156,28 +156,30 @@ function getHtml() {
     }
     
     // Print rows.
-    for ($row = 0; $row < count($this->mData); $row++) {
-      $html .= "\n<tr bgcolor=\"".$this->mBgColor."\" onmouseover=\"setRowBackground(this, '".$this->mBgColorOver."')\" onmouseout=\"setRowBackground(this, null)\">\n";
-      for ($col = 0; $col < $this->getColumnCount(); $col++) {
-        if (0 == $col && strtolower(get_class($this->mColumns[$col]->getRenderer())) == 'checkboxcellrenderer') {
-          // Checkbox for the row. Determine if selected.
-          $selected = false;
-          if (is_array($this->value)) {
-            foreach ($this->value as $p) {
-              if ($p == $this->mData[$row][$this->mKeyField]) {
-              	$selected = true;
-              	break;
+    if (is_array($this->mData)) {
+      for ($row = 0; $row < count($this->mData); $row++) {
+        $html .= "\n<tr bgcolor=\"".$this->mBgColor."\" onmouseover=\"setRowBackground(this, '".$this->mBgColorOver."')\" onmouseout=\"setRowBackground(this, null)\">\n";
+        for ($col = 0; $col < $this->getColumnCount(); $col++) {
+          if (0 == $col && strtolower(get_class($this->mColumns[$col]->getRenderer())) == 'checkboxcellrenderer') {
+            // Checkbox for the row. Determine if selected.
+            $selected = false;
+            if (is_array($this->value)) {
+              foreach ($this->value as $p) {
+                if ($p == $this->mData[$row][$this->mKeyField]) {
+                  $selected = true;
+                  break;
+                }
               }
             }
+            // Render control checkbox.
+            $html .= $this->mColumns[$col]->renderCell($this->mData[$row][$this->mKeyField], $row, $col, $selected);
+          } else {
+            // Render regular cell.
+            $html .= $this->mColumns[$col]->renderCell($this->getValueAt($row, $col), $row, $col);
           }
-          // Render control checkbox.
-          $html .= $this->mColumns[$col]->renderCell($this->mData[$row][$this->mKeyField], $row, $col, $selected);
-        } else {
-          // Render regular cell.
-          $html .= $this->mColumns[$col]->renderCell($this->getValueAt($row, $col), $row, $col);
         }
+        $html .= "</tr>\n";
       }
-      $html .= "</tr>\n";
     }
 
     // Print footers.
diff --git a/initialize.php b/initialize.php
index 69580f622..e219033d3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5536");
+define("APP_VERSION", "1.19.28.5537");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_edit.php b/user_edit.php
index dc19ad6aa..bae837c43 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -37,6 +37,7 @@
 }
 
 $show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+$projects = array();
 if ($show_projects) {
   $projects = ttGroupHelper::getActiveProjects();
   if (count($projects) == 0) $show_projects = false;

From cc0928bf1d0b319a42359b44743d04eaaa0fdd05 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 13:20:39 +0000
Subject: [PATCH 1552/1848] Addressed a couple more of php8 issues.

---
 WEB-INF/lib/form/DateField.class.php | 28 ++--------------------------
 initialize.php                       |  2 +-
 password_reset.php                   |  5 ++++-
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index f5d6f8f73..922e8bf5e 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('form.TextField');
 import('DateAndTime');
diff --git a/initialize.php b/initialize.php
index e219033d3..7f27932dd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5537");
+define("APP_VERSION", "1.19.28.5538");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/password_reset.php b/password_reset.php
index 53099b9af..a9dfd1f0a 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -76,6 +76,7 @@
       $mailer->setCharSet(CHARSET);
       $mailer->setSender(SENDER);
       $mailer->setReceiver("$receiver");
+      $secure_connection = false;
       if ((!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) || ($_SERVER['SERVER_PORT'] == 443))
         $secure_connection = true;
       if($secure_connection)
@@ -85,7 +86,9 @@
 
       $cl_subject = $user_i18n->get('form.reset_password.email_subject');
 
-      $dir_name = trim(@constant('DIR_NAME'), '/');
+      $dir_name = $app_root = '';
+      if (defined('DIR_NAME'))
+        $dir_name = trim(constant('DIR_NAME'), '/');
       if (!empty($dir_name))
         $app_root = '/'.$dir_name;
 

From 8e469a82a605b16607d1deca358ba698db4bc165 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 13:46:44 +0000
Subject: [PATCH 1553/1848] Removed no longer used template files.

---
 WEB-INF/templates/header.tpl            | 211 ------------------------
 WEB-INF/templates/index.tpl             |   5 -
 WEB-INF/templates/{ => work}/footer.tpl |   1 +
 WEB-INF/templates/work/index.tpl        |   2 +-
 initialize.php                          |   2 +-
 5 files changed, 3 insertions(+), 218 deletions(-)
 delete mode 100644 WEB-INF/templates/header.tpl
 delete mode 100644 WEB-INF/templates/index.tpl
 rename WEB-INF/templates/{ => work}/footer.tpl (99%)

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
deleted file mode 100644
index 29ec892d3..000000000
--- a/WEB-INF/templates/header.tpl
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html>
-<html lang="{constant('LANG_DEFAULT')}">
-<head>
-  <meta charset="{constant('CHARSET')}">
-  <link rel="icon" href="favicon.ico" type="image/x-icon">
-  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-  <link href="{constant('DEFAULT_CSS')}" rel="stylesheet">
-{if (isset($i18n.language.rtl) && $i18n.language.rtl)}
-  <link href="{constant('RTL_CSS')}" rel="stylesheet">
-{/if}
-{if $user->getCustomCss()}
-  <link href="custom_css.php" rel="stylesheet">
-{/if}
-  <title>Time Tracker{if $title} - {$title}{/if}</title>
-  <script src="js/strftime.js"></script>
-  <script>
-    {* Setup locale for strftime *}
-    {$js_date_locale}
-  </script>
-  <script src="js/strptime.js"></script>
-</head>
-
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0"{if isset($onload)} {$onload}{/if}>
-
-{assign var="tab_width" value="700"}
-
-<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
-  <tr>
-    <td valign="top" align="center"> <!-- This is to centrally align all our content. -->
-
-      <!-- top image -->
-      <table cellspacing="0" cellpadding="0" width="100%" border="0">
-        <tr>
-{if $user->custom_logo}
-          <td align="center">
-{else}
-          <td bgcolor="#a6ccf7" background="img/top_bg.gif" align="center">
-{/if}
-            <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
-              <tr>
-                <td valign="top">
-                  <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr><td height="6" colspan="2"><img width="1" height="6" src="img/1x1.gif" border="0"></td></tr>
-                    <tr valign="top">
-{if $user->custom_logo}
-                      <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="{$custom_logo}" border="0"></td>
-{else}
-                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="img/logo.png" border="0"></a></td>
-{/if}
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top image -->
-
-{if $authenticated}
-  {if $user->can('administer_site')}
-      <!-- top menu for admin -->
-      <table id="top_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a>
-            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top menu for admin -->
-
-      <!-- sub menu for admin -->
-      <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="admin_groups.php">{$i18n.menu.groups}</a>
-            <a class="mainMenu" href="admin_options.php">{$i18n.menu.options}</a>
-    {if isTrue('WORK_SERVER_ADMINISTRATION')}
-            <a class="mainMenu" href="work/admin_work.php">{$i18n.label.work}</a>
-    {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for admin -->
-  {else}
-      <!-- top menu for authorized user -->
-      <table id="top_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="logout.php">{$i18n.menu.logout}</a>
-    {if $user->exists() && $user->can('manage_own_settings')}
-            <a class="systemMenu" href="profile_edit.php">{$i18n.menu.profile}</a>
-    {/if}
-    {if $user->can('manage_basic_settings')}
-            <a class="systemMenu" href="group_edit.php">{$i18n.menu.group}</a>
-    {/if}
-    {if $user->can('manage_features')}
-            <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a>
-    {/if}
-            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top menu for authorized user -->
-
-      <!-- sub menu for authorized user -->
-      <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
-    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
-           <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
-      {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
-           <a class="mainMenu" href="week.php">{$i18n.menu.week}</a>
-      {/if}
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
-           <a class="mainMenu" href="expenses.php">{$i18n.menu.expenses}</a>
-    {/if}
-    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
-           <a class="mainMenu" href="reports.php">{$i18n.menu.reports}</a>
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
-           <a class="mainMenu" href="timesheets.php">{$i18n.menu.timesheets}</a>
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
-           <a class="mainMenu" href="invoices.php">{$i18n.title.invoices}</a>
-    {/if}
-    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
-        (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
-        $user->isPluginEnabled('cl'))}
-           <a class="mainMenu" href="charts.php">{$i18n.menu.charts}</a>
-    {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
-           <a class="mainMenu" href="projects.php">{$i18n.menu.projects}</a>
-    {/if}
-    {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
-           <a class="mainMenu" href="tasks.php">{$i18n.menu.tasks}</a>
-    {/if}
-    {if $user->can('view_users') || $user->can('manage_users')}
-           <a class="mainMenu" href="users.php">{$i18n.menu.users}</a>
-    {/if}
-    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
-           <a class="mainMenu" href="clients.php">{$i18n.menu.clients}</a>
-    {/if}
-    {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
-           <a class="mainMenu" href="work/work.php">{$i18n.title.work}</a>
-    {/if}
-    {if $user->can('export_data')}
-           <a class="mainMenu" href="export.php">{$i18n.menu.export}</a>
-    {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for authorized user -->
-  {/if}
-{else}
-      <!-- top menu for non authorized user -->
-      <table id="top_menu_non_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="login.php">{$i18n.menu.login}</a>
-  {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
-            <a class="systemMenu" href="register.php">{$i18n.menu.register}</a>
-  {/if}
-            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
-          </td>
-        </tr>
-      </table>
-{/if}
-      <br>
-
-      <!-- page title and user details -->
-{if $title}
-      <table id="page_title" cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
-        <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if (isset($timestring) && $timestring)}: {$timestring}{/if}</div></td></tr>
-        <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
-      </table>
-{/if}
-      <!-- end of page title and user details -->
-
-      <!-- output errors -->
-{if $err->yes()}
-      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="error">
-  {foreach $err->getErrors() as $error}
-            {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
-  {/foreach}
-          </td>
-        </tr>
-      </table>
-{/if}
-      <!-- end of output errors -->
-
-      <!-- output messages -->
-{if $msg->yes()}
-      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="info_message">
-  {foreach $msg->getErrors() as $message}
-            {$message.message}<br> {* No need to escape. *}
-  {/foreach}
-          </td>
-        </tr>
-      </table>
-{/if}
-      <!-- end of output messages -->
diff --git a/WEB-INF/templates/index.tpl b/WEB-INF/templates/index.tpl
deleted file mode 100644
index 75a751e08..000000000
--- a/WEB-INF/templates/index.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{include file="header.tpl"}
-
-{if $content_page_name}{include file="$content_page_name"}{/if}
-
-{include file="footer.tpl"}
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/work/footer.tpl
similarity index 99%
rename from WEB-INF/templates/footer.tpl
rename to WEB-INF/templates/work/footer.tpl
index a5ae56f90..611067550 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/work/footer.tpl
@@ -26,3 +26,4 @@
 </table>
 </body>
 </html>
+
diff --git a/WEB-INF/templates/work/index.tpl b/WEB-INF/templates/work/index.tpl
index 6817f3963..3c6500821 100644
--- a/WEB-INF/templates/work/index.tpl
+++ b/WEB-INF/templates/work/index.tpl
@@ -2,4 +2,4 @@
 
 {if $content_page_name}{include file="$content_page_name"}{/if}
 
-{include file="footer.tpl"}
+{include file="work/footer.tpl"}
diff --git a/initialize.php b/initialize.php
index 7f27932dd..6260eb076 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5538");
+define("APP_VERSION", "1.19.28.5539");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ee3dae2396dc3051e9f79825759e57d51beb7985 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 14:00:32 +0000
Subject: [PATCH 1554/1848] Work in progress renaming template files.

---
 WEB-INF/templates/{access_denied2.tpl => access_denied.tpl}     | 0
 WEB-INF/templates/{admin_group_add2.tpl => admin_group_add.tpl} | 0
 .../{admin_group_delete2.tpl => admin_group_delete.tpl}         | 0
 .../templates/{admin_group_edit2.tpl => admin_group_edit.tpl}   | 0
 WEB-INF/templates/{admin_groups2.tpl => admin_groups.tpl}       | 0
 WEB-INF/templates/{admin_options2.tpl => admin_options.tpl}     | 0
 access_denied.php                                               | 2 +-
 admin_group_add.php                                             | 2 +-
 admin_group_delete.php                                          | 2 +-
 admin_group_edit.php                                            | 2 +-
 admin_groups.php                                                | 2 +-
 admin_options.php                                               | 2 +-
 feature_disabled.php                                            | 2 +-
 initialize.php                                                  | 2 +-
 14 files changed, 8 insertions(+), 8 deletions(-)
 rename WEB-INF/templates/{access_denied2.tpl => access_denied.tpl} (100%)
 rename WEB-INF/templates/{admin_group_add2.tpl => admin_group_add.tpl} (100%)
 rename WEB-INF/templates/{admin_group_delete2.tpl => admin_group_delete.tpl} (100%)
 rename WEB-INF/templates/{admin_group_edit2.tpl => admin_group_edit.tpl} (100%)
 rename WEB-INF/templates/{admin_groups2.tpl => admin_groups.tpl} (100%)
 rename WEB-INF/templates/{admin_options2.tpl => admin_options.tpl} (100%)

diff --git a/WEB-INF/templates/access_denied2.tpl b/WEB-INF/templates/access_denied.tpl
similarity index 100%
rename from WEB-INF/templates/access_denied2.tpl
rename to WEB-INF/templates/access_denied.tpl
diff --git a/WEB-INF/templates/admin_group_add2.tpl b/WEB-INF/templates/admin_group_add.tpl
similarity index 100%
rename from WEB-INF/templates/admin_group_add2.tpl
rename to WEB-INF/templates/admin_group_add.tpl
diff --git a/WEB-INF/templates/admin_group_delete2.tpl b/WEB-INF/templates/admin_group_delete.tpl
similarity index 100%
rename from WEB-INF/templates/admin_group_delete2.tpl
rename to WEB-INF/templates/admin_group_delete.tpl
diff --git a/WEB-INF/templates/admin_group_edit2.tpl b/WEB-INF/templates/admin_group_edit.tpl
similarity index 100%
rename from WEB-INF/templates/admin_group_edit2.tpl
rename to WEB-INF/templates/admin_group_edit.tpl
diff --git a/WEB-INF/templates/admin_groups2.tpl b/WEB-INF/templates/admin_groups.tpl
similarity index 100%
rename from WEB-INF/templates/admin_groups2.tpl
rename to WEB-INF/templates/admin_groups.tpl
diff --git a/WEB-INF/templates/admin_options2.tpl b/WEB-INF/templates/admin_options.tpl
similarity index 100%
rename from WEB-INF/templates/admin_options2.tpl
rename to WEB-INF/templates/admin_options.tpl
diff --git a/access_denied.php b/access_denied.php
index 2aa3c5d77..7025d8739 100644
--- a/access_denied.php
+++ b/access_denied.php
@@ -8,5 +8,5 @@
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->get('label.error'));
-$smarty->assign('content_page_name', 'access_denied2.tpl');
+$smarty->assign('content_page_name', 'access_denied.tpl');
 $smarty->display('index2.tpl');
diff --git a/admin_group_add.php b/admin_group_add.php
index 976b5c6db..178b2d1b2 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -101,6 +101,6 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
-$smarty->assign('content_page_name', 'admin_group_add2.tpl');
+$smarty->assign('content_page_name', 'admin_group_add.tpl');
 $smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->display('index2.tpl');
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 83999da5d..1707d5956 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -42,5 +42,5 @@
 $smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'admin_group_delete2.tpl');
+$smarty->assign('content_page_name', 'admin_group_delete.tpl');
 $smarty->display('index2.tpl');
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 5474ca2c3..35b0a531e 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -110,5 +110,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
-$smarty->assign('content_page_name', 'admin_group_edit2.tpl');
+$smarty->assign('content_page_name', 'admin_group_edit.tpl');
 $smarty->display('index2.tpl');
diff --git a/admin_groups.php b/admin_groups.php
index 915f7d778..e3a5559c3 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -14,5 +14,5 @@
 
 $smarty->assign('groups', ttOrgHelper::getOrgs());
 $smarty->assign('title', $i18n->get('title.groups'));
-$smarty->assign('content_page_name', 'admin_groups2.tpl');
+$smarty->assign('content_page_name', 'admin_groups.tpl');
 $smarty->display('index2.tpl');
diff --git a/admin_options.php b/admin_options.php
index bc1269336..00d292b97 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -72,5 +72,5 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.options'));
-$smarty->assign('content_page_name', 'admin_options2.tpl');
+$smarty->assign('content_page_name', 'admin_options.tpl');
 $smarty->display('index2.tpl');
diff --git a/feature_disabled.php b/feature_disabled.php
index c04afe734..42f3e47ae 100644
--- a/feature_disabled.php
+++ b/feature_disabled.php
@@ -8,5 +8,5 @@
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->get('label.error'));
-$smarty->assign('content_page_name', 'access_denied2.tpl');
+$smarty->assign('content_page_name', 'access_denied.tpl');
 $smarty->display('index2.tpl');
diff --git a/initialize.php b/initialize.php
index 6260eb076..87083f8ed 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5539");
+define("APP_VERSION", "1.19.28.5540");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 7e6f9a6e72593d24989acad71929f4187ce6c1e2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 14:48:36 +0000
Subject: [PATCH 1555/1848] A bit more of template file renaming.

---
 .../{cf_custom_field_add2.tpl => cf_custom_field_add.tpl}    | 0
 ...f_custom_field_delete2.tpl => cf_custom_field_delete.tpl} | 0
 .../{cf_custom_field_edit2.tpl => cf_custom_field_edit.tpl}  | 0
 .../{cf_custom_fields2.tpl => cf_custom_fields.tpl}          | 0
 ...f_dropdown_option_add2.tpl => cf_dropdown_option_add.tpl} | 0
 ...down_option_delete2.tpl => cf_dropdown_option_delete.tpl} | 0
 ...dropdown_option_edit2.tpl => cf_dropdown_option_edit.tpl} | 0
 .../{cf_dropdown_options2.tpl => cf_dropdown_options.tpl}    | 0
 WEB-INF/templates/{charts2.tpl => charts.tpl}                | 0
 WEB-INF/templates/index.tpl                                  | 5 +++++
 access_denied.php                                            | 2 +-
 admin_group_add.php                                          | 2 +-
 admin_group_delete.php                                       | 2 +-
 admin_group_edit.php                                         | 2 +-
 admin_groups.php                                             | 2 +-
 admin_options.php                                            | 2 +-
 cf_custom_field_add.php                                      | 4 ++--
 cf_custom_field_delete.php                                   | 4 ++--
 cf_custom_field_edit.php                                     | 4 ++--
 cf_custom_fields.php                                         | 4 ++--
 cf_dropdown_option_add.php                                   | 4 ++--
 cf_dropdown_option_delete.php                                | 4 ++--
 cf_dropdown_option_edit.php                                  | 4 ++--
 cf_dropdown_options.php                                      | 4 ++--
 charts.php                                                   | 4 ++--
 feature_disabled.php                                         | 2 +-
 initialize.php                                               | 2 +-
 27 files changed, 31 insertions(+), 26 deletions(-)
 rename WEB-INF/templates/{cf_custom_field_add2.tpl => cf_custom_field_add.tpl} (100%)
 rename WEB-INF/templates/{cf_custom_field_delete2.tpl => cf_custom_field_delete.tpl} (100%)
 rename WEB-INF/templates/{cf_custom_field_edit2.tpl => cf_custom_field_edit.tpl} (100%)
 rename WEB-INF/templates/{cf_custom_fields2.tpl => cf_custom_fields.tpl} (100%)
 rename WEB-INF/templates/{cf_dropdown_option_add2.tpl => cf_dropdown_option_add.tpl} (100%)
 rename WEB-INF/templates/{cf_dropdown_option_delete2.tpl => cf_dropdown_option_delete.tpl} (100%)
 rename WEB-INF/templates/{cf_dropdown_option_edit2.tpl => cf_dropdown_option_edit.tpl} (100%)
 rename WEB-INF/templates/{cf_dropdown_options2.tpl => cf_dropdown_options.tpl} (100%)
 rename WEB-INF/templates/{charts2.tpl => charts.tpl} (100%)
 create mode 100644 WEB-INF/templates/index.tpl

diff --git a/WEB-INF/templates/cf_custom_field_add2.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
similarity index 100%
rename from WEB-INF/templates/cf_custom_field_add2.tpl
rename to WEB-INF/templates/cf_custom_field_add.tpl
diff --git a/WEB-INF/templates/cf_custom_field_delete2.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl
similarity index 100%
rename from WEB-INF/templates/cf_custom_field_delete2.tpl
rename to WEB-INF/templates/cf_custom_field_delete.tpl
diff --git a/WEB-INF/templates/cf_custom_field_edit2.tpl b/WEB-INF/templates/cf_custom_field_edit.tpl
similarity index 100%
rename from WEB-INF/templates/cf_custom_field_edit2.tpl
rename to WEB-INF/templates/cf_custom_field_edit.tpl
diff --git a/WEB-INF/templates/cf_custom_fields2.tpl b/WEB-INF/templates/cf_custom_fields.tpl
similarity index 100%
rename from WEB-INF/templates/cf_custom_fields2.tpl
rename to WEB-INF/templates/cf_custom_fields.tpl
diff --git a/WEB-INF/templates/cf_dropdown_option_add2.tpl b/WEB-INF/templates/cf_dropdown_option_add.tpl
similarity index 100%
rename from WEB-INF/templates/cf_dropdown_option_add2.tpl
rename to WEB-INF/templates/cf_dropdown_option_add.tpl
diff --git a/WEB-INF/templates/cf_dropdown_option_delete2.tpl b/WEB-INF/templates/cf_dropdown_option_delete.tpl
similarity index 100%
rename from WEB-INF/templates/cf_dropdown_option_delete2.tpl
rename to WEB-INF/templates/cf_dropdown_option_delete.tpl
diff --git a/WEB-INF/templates/cf_dropdown_option_edit2.tpl b/WEB-INF/templates/cf_dropdown_option_edit.tpl
similarity index 100%
rename from WEB-INF/templates/cf_dropdown_option_edit2.tpl
rename to WEB-INF/templates/cf_dropdown_option_edit.tpl
diff --git a/WEB-INF/templates/cf_dropdown_options2.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
similarity index 100%
rename from WEB-INF/templates/cf_dropdown_options2.tpl
rename to WEB-INF/templates/cf_dropdown_options.tpl
diff --git a/WEB-INF/templates/charts2.tpl b/WEB-INF/templates/charts.tpl
similarity index 100%
rename from WEB-INF/templates/charts2.tpl
rename to WEB-INF/templates/charts.tpl
diff --git a/WEB-INF/templates/index.tpl b/WEB-INF/templates/index.tpl
new file mode 100644
index 000000000..410a7616a
--- /dev/null
+++ b/WEB-INF/templates/index.tpl
@@ -0,0 +1,5 @@
+{include file="header2.tpl"}
+
+{if $content_page_name}{include file="$content_page_name"}{/if}
+
+{include file="footer2.tpl"}
diff --git a/access_denied.php b/access_denied.php
index 7025d8739..80900d570 100644
--- a/access_denied.php
+++ b/access_denied.php
@@ -9,4 +9,4 @@
 
 $smarty->assign('title', $i18n->get('label.error'));
 $smarty->assign('content_page_name', 'access_denied.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/admin_group_add.php b/admin_group_add.php
index 178b2d1b2..52850b608 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -103,4 +103,4 @@
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('content_page_name', 'admin_group_add.tpl');
 $smarty->assign('title', $i18n->get('title.add_group'));
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 1707d5956..0cea02b32 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -43,4 +43,4 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
 $smarty->assign('content_page_name', 'admin_group_delete.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 35b0a531e..81588ebec 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -111,4 +111,4 @@
 $smarty->assign('onload', 'onLoad="document.groupForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
 $smarty->assign('content_page_name', 'admin_group_edit.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/admin_groups.php b/admin_groups.php
index e3a5559c3..8dffd3931 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -15,4 +15,4 @@
 $smarty->assign('groups', ttOrgHelper::getOrgs());
 $smarty->assign('title', $i18n->get('title.groups'));
 $smarty->assign('content_page_name', 'admin_groups.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/admin_options.php b/admin_options.php
index 00d292b97..84a0ed3a5 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -73,4 +73,4 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.options'));
 $smarty->assign('content_page_name', 'admin_options.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 14b233a52..6cfd87256 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -55,5 +55,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_add_custom_field'));
-$smarty->assign('content_page_name', 'cf_custom_field_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_custom_field_add.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index 7cfd72035..ba222c657 100644
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -50,5 +50,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_delete_custom_field'));
-$smarty->assign('content_page_name', 'cf_custom_field_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_custom_field_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_custom_field_edit.php b/cf_custom_field_edit.php
index 36e76d4bf..3f959ee22 100644
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -68,5 +68,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_edit_custom_field'));
-$smarty->assign('content_page_name', 'cf_custom_field_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_custom_field_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 7d670636e..6552bb7f6 100644
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -34,5 +34,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('custom_fields', $fields);
 $smarty->assign('title', $i18n->get('title.cf_custom_fields'));
-$smarty->assign('content_page_name', 'cf_custom_fields2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_custom_fields.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index f1bf00908..582794ae5 100644
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -49,5 +49,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionAddForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_add_dropdown_option'));
-$smarty->assign('content_page_name', 'cf_dropdown_option_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_option_add.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index e23288bd5..e6eeeeb75 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -53,5 +53,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_delete_dropdown_option'));
-$smarty->assign('content_page_name', 'cf_dropdown_option_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_option_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index c73200ffc..eee02f63c 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -51,5 +51,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionEditForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.cf_edit_dropdown_option'));
-$smarty->assign('content_page_name', 'cf_dropdown_option_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_option_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/cf_dropdown_options.php b/cf_dropdown_options.php
index 2570f0ee0..06f53a7d8 100644
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -28,5 +28,5 @@
 $smarty->assign('field_id', $field_id);
 $smarty->assign('options', $options);
 $smarty->assign('title', $i18n->get('title.cf_dropdown_options'));
-$smarty->assign('content_page_name', 'cf_dropdown_options2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'cf_dropdown_options.tpl');
+$smarty->display('index.tpl');
diff --git a/charts.php b/charts.php
index 25e6695d4..1bf6d34fa 100644
--- a/charts.php
+++ b/charts.php
@@ -205,5 +205,5 @@
 $smarty->assign('onload', 'onLoad="adjustTodayLinks()"');
 $smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
 $smarty->assign('title', $i18n->get('title.charts'));
-$smarty->assign('content_page_name', 'charts2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'charts.tpl');
+$smarty->display('index.tpl');
diff --git a/feature_disabled.php b/feature_disabled.php
index 42f3e47ae..d15413541 100644
--- a/feature_disabled.php
+++ b/feature_disabled.php
@@ -9,4 +9,4 @@
 
 $smarty->assign('title', $i18n->get('label.error'));
 $smarty->assign('content_page_name', 'access_denied.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index 87083f8ed..378edcba6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5540");
+define("APP_VERSION", "1.19.28.5541");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From edc7f366e8e45096e54bf15c46ea205fbf2867c3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 16:05:40 +0000
Subject: [PATCH 1556/1848] More template files renamed.

---
 WEB-INF/templates/{client_add2.tpl => client_add.tpl}         | 0
 WEB-INF/templates/{client_delete2.tpl => client_delete.tpl}   | 0
 WEB-INF/templates/{client_edit2.tpl => client_edit.tpl}       | 0
 WEB-INF/templates/{clients2.tpl => clients.tpl}               | 0
 .../templates/{display_options2.tpl => display_options.tpl}   | 0
 WEB-INF/templates/{entity_files2.tpl => entity_files.tpl}     | 0
 WEB-INF/templates/{expense_delete2.tpl => expense_delete.tpl} | 0
 WEB-INF/templates/{expense_edit2.tpl => expense_edit.tpl}     | 0
 WEB-INF/templates/{expenses2.tpl => expenses.tpl}             | 0
 WEB-INF/templates/{export2.tpl => export.tpl}                 | 0
 WEB-INF/templates/{file_delete2.tpl => file_delete.tpl}       | 0
 WEB-INF/templates/{file_download2.tpl => file_download.tpl}   | 0
 WEB-INF/templates/{file_edit2.tpl => file_edit.tpl}           | 0
 client_add.php                                                | 4 ++--
 client_delete.php                                             | 4 ++--
 client_edit.php                                               | 4 ++--
 clients.php                                                   | 4 ++--
 display_options.php                                           | 4 ++--
 expense_delete.php                                            | 4 ++--
 expense_edit.php                                              | 4 ++--
 expense_files.php                                             | 4 ++--
 expenses.php                                                  | 4 ++--
 export.php                                                    | 4 ++--
 file_delete.php                                               | 4 ++--
 file_download.php                                             | 4 ++--
 file_edit.php                                                 | 4 ++--
 initialize.php                                                | 2 +-
 project_files.php                                             | 4 ++--
 time_files.php                                                | 4 ++--
 timesheet_files.php                                           | 4 ++--
 30 files changed, 33 insertions(+), 33 deletions(-)
 rename WEB-INF/templates/{client_add2.tpl => client_add.tpl} (100%)
 rename WEB-INF/templates/{client_delete2.tpl => client_delete.tpl} (100%)
 rename WEB-INF/templates/{client_edit2.tpl => client_edit.tpl} (100%)
 rename WEB-INF/templates/{clients2.tpl => clients.tpl} (100%)
 rename WEB-INF/templates/{display_options2.tpl => display_options.tpl} (100%)
 rename WEB-INF/templates/{entity_files2.tpl => entity_files.tpl} (100%)
 rename WEB-INF/templates/{expense_delete2.tpl => expense_delete.tpl} (100%)
 rename WEB-INF/templates/{expense_edit2.tpl => expense_edit.tpl} (100%)
 rename WEB-INF/templates/{expenses2.tpl => expenses.tpl} (100%)
 rename WEB-INF/templates/{export2.tpl => export.tpl} (100%)
 rename WEB-INF/templates/{file_delete2.tpl => file_delete.tpl} (100%)
 rename WEB-INF/templates/{file_download2.tpl => file_download.tpl} (100%)
 rename WEB-INF/templates/{file_edit2.tpl => file_edit.tpl} (100%)

diff --git a/WEB-INF/templates/client_add2.tpl b/WEB-INF/templates/client_add.tpl
similarity index 100%
rename from WEB-INF/templates/client_add2.tpl
rename to WEB-INF/templates/client_add.tpl
diff --git a/WEB-INF/templates/client_delete2.tpl b/WEB-INF/templates/client_delete.tpl
similarity index 100%
rename from WEB-INF/templates/client_delete2.tpl
rename to WEB-INF/templates/client_delete.tpl
diff --git a/WEB-INF/templates/client_edit2.tpl b/WEB-INF/templates/client_edit.tpl
similarity index 100%
rename from WEB-INF/templates/client_edit2.tpl
rename to WEB-INF/templates/client_edit.tpl
diff --git a/WEB-INF/templates/clients2.tpl b/WEB-INF/templates/clients.tpl
similarity index 100%
rename from WEB-INF/templates/clients2.tpl
rename to WEB-INF/templates/clients.tpl
diff --git a/WEB-INF/templates/display_options2.tpl b/WEB-INF/templates/display_options.tpl
similarity index 100%
rename from WEB-INF/templates/display_options2.tpl
rename to WEB-INF/templates/display_options.tpl
diff --git a/WEB-INF/templates/entity_files2.tpl b/WEB-INF/templates/entity_files.tpl
similarity index 100%
rename from WEB-INF/templates/entity_files2.tpl
rename to WEB-INF/templates/entity_files.tpl
diff --git a/WEB-INF/templates/expense_delete2.tpl b/WEB-INF/templates/expense_delete.tpl
similarity index 100%
rename from WEB-INF/templates/expense_delete2.tpl
rename to WEB-INF/templates/expense_delete.tpl
diff --git a/WEB-INF/templates/expense_edit2.tpl b/WEB-INF/templates/expense_edit.tpl
similarity index 100%
rename from WEB-INF/templates/expense_edit2.tpl
rename to WEB-INF/templates/expense_edit.tpl
diff --git a/WEB-INF/templates/expenses2.tpl b/WEB-INF/templates/expenses.tpl
similarity index 100%
rename from WEB-INF/templates/expenses2.tpl
rename to WEB-INF/templates/expenses.tpl
diff --git a/WEB-INF/templates/export2.tpl b/WEB-INF/templates/export.tpl
similarity index 100%
rename from WEB-INF/templates/export2.tpl
rename to WEB-INF/templates/export.tpl
diff --git a/WEB-INF/templates/file_delete2.tpl b/WEB-INF/templates/file_delete.tpl
similarity index 100%
rename from WEB-INF/templates/file_delete2.tpl
rename to WEB-INF/templates/file_delete.tpl
diff --git a/WEB-INF/templates/file_download2.tpl b/WEB-INF/templates/file_download.tpl
similarity index 100%
rename from WEB-INF/templates/file_download2.tpl
rename to WEB-INF/templates/file_download.tpl
diff --git a/WEB-INF/templates/file_edit2.tpl b/WEB-INF/templates/file_edit.tpl
similarity index 100%
rename from WEB-INF/templates/file_edit2.tpl
rename to WEB-INF/templates/file_edit.tpl
diff --git a/client_add.php b/client_add.php
index 1b91a4080..f1f45333e 100644
--- a/client_add.php
+++ b/client_add.php
@@ -68,5 +68,5 @@
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_client'));
-$smarty->assign('content_page_name', 'client_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'client_add.tpl');
+$smarty->display('index.tpl');
diff --git a/client_delete.php b/client_delete.php
index 147f2db54..e832c6bcb 100644
--- a/client_delete.php
+++ b/client_delete.php
@@ -50,5 +50,5 @@
 $smarty->assign('client_to_delete', $client_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_client'));
-$smarty->assign('content_page_name', 'client_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'client_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/client_edit.php b/client_edit.php
index c7e0a92e3..349834181 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -104,5 +104,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.edit_client'));
-$smarty->assign('content_page_name', 'client_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'client_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/clients.php b/clients.php
index 77ade9c7b..309eb155a 100644
--- a/clients.php
+++ b/clients.php
@@ -27,5 +27,5 @@
 $smarty->assign('active_clients', $active_clients);
 $smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));
-$smarty->assign('content_page_name', 'clients2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'clients.tpl');
+$smarty->display('index.tpl');
diff --git a/display_options.php b/display_options.php
index 53a86ca9e..21b488c64 100644
--- a/display_options.php
+++ b/display_options.php
@@ -74,5 +74,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.display_options'));
-$smarty->assign('content_page_name', 'display_options2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'display_options.tpl');
+$smarty->display('index.tpl');
diff --git a/expense_delete.php b/expense_delete.php
index 7ecd2c6d3..6c5cb791f 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -60,5 +60,5 @@
 $smarty->assign('expense_item', $expense_item);
 $smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.delete_expense'));
-$smarty->assign('content_page_name', 'expense_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'expense_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/expense_edit.php b/expense_edit.php
index f4d3c2216..271a588ac 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -211,5 +211,5 @@
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('title', $i18n->get('title.edit_expense'));
-$smarty->assign('content_page_name', 'expense_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'expense_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/expense_files.php b/expense_files.php
index 5642cb383..7fe2a5d1a 100644
--- a/expense_files.php
+++ b/expense_files.php
@@ -61,5 +61,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.expense_files'));
-$smarty->assign('content_page_name', 'entity_files2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'entity_files.tpl');
+$smarty->display('index.tpl');
diff --git a/expenses.php b/expenses.php
index d5978228e..1914a253e 100644
--- a/expenses.php
+++ b/expenses.php
@@ -230,5 +230,5 @@
 $smarty->assign('project_list', $project_list);
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.expenses'));
-$smarty->assign('content_page_name', 'expenses2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'expenses.tpl');
+$smarty->display('index.tpl');
diff --git a/export.php b/export.php
index b5e1206dd..2bcba2dce 100644
--- a/export.php
+++ b/export.php
@@ -55,5 +55,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.export'));
-$smarty->assign('content_page_name', 'export2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'export.tpl');
+$smarty->display('index.tpl');
diff --git a/file_delete.php b/file_delete.php
index 1b415c19b..e6cb53378 100644
--- a/file_delete.php
+++ b/file_delete.php
@@ -98,5 +98,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fileDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_file'));
-$smarty->assign('content_page_name', 'file_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'file_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/file_download.php b/file_download.php
index ff7e1633a..2fb52f79b 100644
--- a/file_download.php
+++ b/file_download.php
@@ -59,5 +59,5 @@
 }
 
 $smarty->assign('title', $i18n->get('title.download_file'));
-$smarty->assign('content_page_name', 'file_download2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'file_download.tpl');
+$smarty->display('index.tpl');
diff --git a/file_edit.php b/file_edit.php
index 745293c2e..aeb8f70c7 100644
--- a/file_edit.php
+++ b/file_edit.php
@@ -96,5 +96,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fileForm.description.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_file'));
-$smarty->assign('content_page_name', 'file_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'file_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index 378edcba6..658b5fb64 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5541");
+define("APP_VERSION", "1.19.28.5542");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_files.php b/project_files.php
index 60fc4d9e3..8b38a8ce6 100644
--- a/project_files.php
+++ b/project_files.php
@@ -62,5 +62,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.project_files').': '.$project['name']);
-$smarty->assign('content_page_name', 'entity_files2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'entity_files.tpl');
+$smarty->display('index.tpl');
diff --git a/time_files.php b/time_files.php
index 210bd534c..c5dce5baa 100644
--- a/time_files.php
+++ b/time_files.php
@@ -62,5 +62,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.time_files'));
-$smarty->assign('content_page_name', 'entity_files2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'entity_files.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheet_files.php b/timesheet_files.php
index d09ecd57d..bca00f28d 100644
--- a/timesheet_files.php
+++ b/timesheet_files.php
@@ -61,5 +61,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('files', $files);
 $smarty->assign('title', $i18n->get('title.timesheet_files').': '.$timesheet['name']);
-$smarty->assign('content_page_name', 'entity_files2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'entity_files.tpl');
+$smarty->display('index.tpl');

From 9f25423fdd777837465ef62d0d8ba97853e725ed Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 16:39:30 +0000
Subject: [PATCH 1557/1848] More templates renamed.

---
 WEB-INF/templates/{footer2.tpl => footer.tpl}                 | 0
 WEB-INF/templates/{group_add2.tpl => group_add.tpl}           | 0
 .../{group_advanced_edit2.tpl => group_advanced_edit.tpl}     | 0
 WEB-INF/templates/{group_delete2.tpl => group_delete.tpl}     | 0
 WEB-INF/templates/{group_edit2.tpl => group_edit.tpl}         | 0
 WEB-INF/templates/{groups2.tpl => groups.tpl}                 | 0
 WEB-INF/templates/{header2.tpl => header.tpl}                 | 0
 WEB-INF/templates/{import2.tpl => import.tpl}                 | 0
 WEB-INF/templates/index.tpl                                   | 4 ++--
 WEB-INF/templates/index2.tpl                                  | 4 ++--
 WEB-INF/templates/{user_add2.tpl => user_add.tpl}             | 0
 WEB-INF/templates/{user_delete2.tpl => user_delete.tpl}       | 0
 WEB-INF/templates/{user_edit2.tpl => user_edit.tpl}           | 0
 WEB-INF/templates/{users2.tpl => users.tpl}                   | 0
 WEB-INF/templates/{week2.tpl => week.tpl}                     | 0
 WEB-INF/templates/{week_view2.tpl => week_view.tpl}           | 0
 WEB-INF/templates/{work_units2.tpl => work_units.tpl}         | 0
 group_add.php                                                 | 4 ++--
 group_advanced_edit.php                                       | 4 ++--
 group_delete.php                                              | 4 ++--
 group_edit.php                                                | 4 ++--
 groups.php                                                    | 4 ++--
 import.php                                                    | 4 ++--
 initialize.php                                                | 2 +-
 user_add.php                                                  | 4 ++--
 user_delete.php                                               | 4 ++--
 user_edit.php                                                 | 4 ++--
 users.php                                                     | 4 ++--
 week.php                                                      | 4 ++--
 week_view.php                                                 | 4 ++--
 work_units.php                                                | 4 ++--
 31 files changed, 31 insertions(+), 31 deletions(-)
 rename WEB-INF/templates/{footer2.tpl => footer.tpl} (100%)
 rename WEB-INF/templates/{group_add2.tpl => group_add.tpl} (100%)
 rename WEB-INF/templates/{group_advanced_edit2.tpl => group_advanced_edit.tpl} (100%)
 rename WEB-INF/templates/{group_delete2.tpl => group_delete.tpl} (100%)
 rename WEB-INF/templates/{group_edit2.tpl => group_edit.tpl} (100%)
 rename WEB-INF/templates/{groups2.tpl => groups.tpl} (100%)
 rename WEB-INF/templates/{header2.tpl => header.tpl} (100%)
 rename WEB-INF/templates/{import2.tpl => import.tpl} (100%)
 rename WEB-INF/templates/{user_add2.tpl => user_add.tpl} (100%)
 rename WEB-INF/templates/{user_delete2.tpl => user_delete.tpl} (100%)
 rename WEB-INF/templates/{user_edit2.tpl => user_edit.tpl} (100%)
 rename WEB-INF/templates/{users2.tpl => users.tpl} (100%)
 rename WEB-INF/templates/{week2.tpl => week.tpl} (100%)
 rename WEB-INF/templates/{week_view2.tpl => week_view.tpl} (100%)
 rename WEB-INF/templates/{work_units2.tpl => work_units.tpl} (100%)

diff --git a/WEB-INF/templates/footer2.tpl b/WEB-INF/templates/footer.tpl
similarity index 100%
rename from WEB-INF/templates/footer2.tpl
rename to WEB-INF/templates/footer.tpl
diff --git a/WEB-INF/templates/group_add2.tpl b/WEB-INF/templates/group_add.tpl
similarity index 100%
rename from WEB-INF/templates/group_add2.tpl
rename to WEB-INF/templates/group_add.tpl
diff --git a/WEB-INF/templates/group_advanced_edit2.tpl b/WEB-INF/templates/group_advanced_edit.tpl
similarity index 100%
rename from WEB-INF/templates/group_advanced_edit2.tpl
rename to WEB-INF/templates/group_advanced_edit.tpl
diff --git a/WEB-INF/templates/group_delete2.tpl b/WEB-INF/templates/group_delete.tpl
similarity index 100%
rename from WEB-INF/templates/group_delete2.tpl
rename to WEB-INF/templates/group_delete.tpl
diff --git a/WEB-INF/templates/group_edit2.tpl b/WEB-INF/templates/group_edit.tpl
similarity index 100%
rename from WEB-INF/templates/group_edit2.tpl
rename to WEB-INF/templates/group_edit.tpl
diff --git a/WEB-INF/templates/groups2.tpl b/WEB-INF/templates/groups.tpl
similarity index 100%
rename from WEB-INF/templates/groups2.tpl
rename to WEB-INF/templates/groups.tpl
diff --git a/WEB-INF/templates/header2.tpl b/WEB-INF/templates/header.tpl
similarity index 100%
rename from WEB-INF/templates/header2.tpl
rename to WEB-INF/templates/header.tpl
diff --git a/WEB-INF/templates/import2.tpl b/WEB-INF/templates/import.tpl
similarity index 100%
rename from WEB-INF/templates/import2.tpl
rename to WEB-INF/templates/import.tpl
diff --git a/WEB-INF/templates/index.tpl b/WEB-INF/templates/index.tpl
index 410a7616a..75a751e08 100644
--- a/WEB-INF/templates/index.tpl
+++ b/WEB-INF/templates/index.tpl
@@ -1,5 +1,5 @@
-{include file="header2.tpl"}
+{include file="header.tpl"}
 
 {if $content_page_name}{include file="$content_page_name"}{/if}
 
-{include file="footer2.tpl"}
+{include file="footer.tpl"}
diff --git a/WEB-INF/templates/index2.tpl b/WEB-INF/templates/index2.tpl
index 410a7616a..75a751e08 100644
--- a/WEB-INF/templates/index2.tpl
+++ b/WEB-INF/templates/index2.tpl
@@ -1,5 +1,5 @@
-{include file="header2.tpl"}
+{include file="header.tpl"}
 
 {if $content_page_name}{include file="$content_page_name"}{/if}
 
-{include file="footer2.tpl"}
+{include file="footer.tpl"}
diff --git a/WEB-INF/templates/user_add2.tpl b/WEB-INF/templates/user_add.tpl
similarity index 100%
rename from WEB-INF/templates/user_add2.tpl
rename to WEB-INF/templates/user_add.tpl
diff --git a/WEB-INF/templates/user_delete2.tpl b/WEB-INF/templates/user_delete.tpl
similarity index 100%
rename from WEB-INF/templates/user_delete2.tpl
rename to WEB-INF/templates/user_delete.tpl
diff --git a/WEB-INF/templates/user_edit2.tpl b/WEB-INF/templates/user_edit.tpl
similarity index 100%
rename from WEB-INF/templates/user_edit2.tpl
rename to WEB-INF/templates/user_edit.tpl
diff --git a/WEB-INF/templates/users2.tpl b/WEB-INF/templates/users.tpl
similarity index 100%
rename from WEB-INF/templates/users2.tpl
rename to WEB-INF/templates/users.tpl
diff --git a/WEB-INF/templates/week2.tpl b/WEB-INF/templates/week.tpl
similarity index 100%
rename from WEB-INF/templates/week2.tpl
rename to WEB-INF/templates/week.tpl
diff --git a/WEB-INF/templates/week_view2.tpl b/WEB-INF/templates/week_view.tpl
similarity index 100%
rename from WEB-INF/templates/week_view2.tpl
rename to WEB-INF/templates/week_view.tpl
diff --git a/WEB-INF/templates/work_units2.tpl b/WEB-INF/templates/work_units.tpl
similarity index 100%
rename from WEB-INF/templates/work_units2.tpl
rename to WEB-INF/templates/work_units.tpl
diff --git a/group_add.php b/group_add.php
index 8436acd80..6f88af205 100644
--- a/group_add.php
+++ b/group_add.php
@@ -46,5 +46,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_group'));
-$smarty->assign('content_page_name', 'group_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'group_add.tpl');
+$smarty->display('index.tpl');
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index efb7a49e7..d08017576 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -62,5 +62,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_group'));
-$smarty->assign('content_page_name', 'group_advanced_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'group_advanced_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/group_delete.php b/group_delete.php
index c1e47d02c..377bb80e9 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -64,5 +64,5 @@
 $smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'group_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'group_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/group_edit.php b/group_edit.php
index 097c34054..ab3065d52 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -231,5 +231,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
-$smarty->assign('content_page_name', 'group_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'group_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/groups.php b/groups.php
index 5773220a2..a7bf2dfe6 100644
--- a/groups.php
+++ b/groups.php
@@ -39,5 +39,5 @@
 $smarty->assign('subgroups', $user->getSubgroups($group_id));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('label.subgroups'));
-$smarty->assign('content_page_name', 'groups2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'groups.tpl');
+$smarty->display('index.tpl');
diff --git a/import.php b/import.php
index c4b59c240..b743b3f5a 100644
--- a/import.php
+++ b/import.php
@@ -25,5 +25,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()) );
 $smarty->assign('title', $i18n->get('title.import'));
-$smarty->assign('content_page_name', 'import2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'import.tpl');
+$smarty->display('index.tpl');
diff --git a/initialize.php b/initialize.php
index 658b5fb64..f69c77a18 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5542");
+define("APP_VERSION", "1.19.28.5543");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_add.php b/user_add.php
index 7325682e5..8d584afb7 100644
--- a/user_add.php
+++ b/user_add.php
@@ -217,5 +217,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_quota', $show_quota);
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.add_user'));
-$smarty->assign('content_page_name', 'user_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'user_add.tpl');
+$smarty->display('index.tpl');
diff --git a/user_delete.php b/user_delete.php
index 99378fda4..e6ec7365e 100644
--- a/user_delete.php
+++ b/user_delete.php
@@ -59,5 +59,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_user'));
-$smarty->assign('content_page_name', 'user_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'user_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/user_edit.php b/user_edit.php
index bae837c43..10aaebbb0 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -279,5 +279,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_projects', $show_projects);
 $smarty->assign('user_id', $user_id);
 $smarty->assign('title', $i18n->get('title.edit_user'));
-$smarty->assign('content_page_name', 'user_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'user_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/users.php b/users.php
index a0ccdc3c1..16a422390 100644
--- a/users.php
+++ b/users.php
@@ -41,5 +41,5 @@
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('show_quota', $user->isPluginEnabled('mq'));
 $smarty->assign('title', $i18n->get('title.users'));
-$smarty->assign('content_page_name', 'users2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'users.tpl');
+$smarty->display('index.tpl');
diff --git a/week.php b/week.php
index 63bd38235..6a2a25e26 100644
--- a/week.php
+++ b/week.php
@@ -559,5 +559,5 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('show_start', $showStart);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('menu.week'));
-$smarty->assign('content_page_name', 'week2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'week.tpl');
+$smarty->display('index.tpl');
diff --git a/week_view.php b/week_view.php
index d612239b0..1718afd4b 100644
--- a/week_view.php
+++ b/week_view.php
@@ -45,5 +45,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.week_view'));
-$smarty->assign('content_page_name', 'week_view2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'week_view.tpl');
+$smarty->display('index.tpl');
diff --git a/work_units.php b/work_units.php
index ab2ac81af..b8a4a747e 100644
--- a/work_units.php
+++ b/work_units.php
@@ -53,5 +53,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.work_units'));
-$smarty->assign('content_page_name', 'work_units2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'work_units.tpl');
+$smarty->display('index.tpl');

From 9358c20bf5a5ff35c17633c093fca9f8a0d84118 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 17:05:44 +0000
Subject: [PATCH 1558/1848] Some more templates renamed.

---
 WEB-INF/templates/{template_add2.tpl => template_add.tpl}     | 0
 .../templates/{template_delete2.tpl => template_delete.tpl}   | 0
 WEB-INF/templates/{template_edit2.tpl => template_edit.tpl}   | 0
 WEB-INF/templates/{templates2.tpl => templates.tpl}           | 0
 WEB-INF/templates/{time2.tpl => time.tpl}                     | 0
 WEB-INF/templates/{time_delete2.tpl => time_delete.tpl}       | 0
 WEB-INF/templates/{time_edit2.tpl => time_edit.tpl}           | 0
 WEB-INF/templates/{timer2.tpl => timer.tpl}                   | 0
 WEB-INF/templates/{timesheet_add2.tpl => timesheet_add.tpl}   | 0
 .../templates/{timesheet_delete2.tpl => timesheet_delete.tpl} | 0
 WEB-INF/templates/{timesheet_edit2.tpl => timesheet_edit.tpl} | 0
 WEB-INF/templates/{timesheet_view2.tpl => timesheet_view.tpl} | 0
 WEB-INF/templates/{timesheets2.tpl => timesheets.tpl}         | 0
 initialize.php                                                | 2 +-
 template_add.php                                              | 4 ++--
 template_delete.php                                           | 4 ++--
 template_edit.php                                             | 4 ++--
 templates.php                                                 | 4 ++--
 time.php                                                      | 4 ++--
 time_delete.php                                               | 4 ++--
 time_edit.php                                                 | 4 ++--
 timer.php                                                     | 4 ++--
 timesheet_add.php                                             | 4 ++--
 timesheet_delete.php                                          | 4 ++--
 timesheet_edit.php                                            | 4 ++--
 timesheet_view.php                                            | 4 ++--
 timesheets.php                                                | 4 ++--
 27 files changed, 27 insertions(+), 27 deletions(-)
 rename WEB-INF/templates/{template_add2.tpl => template_add.tpl} (100%)
 rename WEB-INF/templates/{template_delete2.tpl => template_delete.tpl} (100%)
 rename WEB-INF/templates/{template_edit2.tpl => template_edit.tpl} (100%)
 rename WEB-INF/templates/{templates2.tpl => templates.tpl} (100%)
 rename WEB-INF/templates/{time2.tpl => time.tpl} (100%)
 rename WEB-INF/templates/{time_delete2.tpl => time_delete.tpl} (100%)
 rename WEB-INF/templates/{time_edit2.tpl => time_edit.tpl} (100%)
 rename WEB-INF/templates/{timer2.tpl => timer.tpl} (100%)
 rename WEB-INF/templates/{timesheet_add2.tpl => timesheet_add.tpl} (100%)
 rename WEB-INF/templates/{timesheet_delete2.tpl => timesheet_delete.tpl} (100%)
 rename WEB-INF/templates/{timesheet_edit2.tpl => timesheet_edit.tpl} (100%)
 rename WEB-INF/templates/{timesheet_view2.tpl => timesheet_view.tpl} (100%)
 rename WEB-INF/templates/{timesheets2.tpl => timesheets.tpl} (100%)

diff --git a/WEB-INF/templates/template_add2.tpl b/WEB-INF/templates/template_add.tpl
similarity index 100%
rename from WEB-INF/templates/template_add2.tpl
rename to WEB-INF/templates/template_add.tpl
diff --git a/WEB-INF/templates/template_delete2.tpl b/WEB-INF/templates/template_delete.tpl
similarity index 100%
rename from WEB-INF/templates/template_delete2.tpl
rename to WEB-INF/templates/template_delete.tpl
diff --git a/WEB-INF/templates/template_edit2.tpl b/WEB-INF/templates/template_edit.tpl
similarity index 100%
rename from WEB-INF/templates/template_edit2.tpl
rename to WEB-INF/templates/template_edit.tpl
diff --git a/WEB-INF/templates/templates2.tpl b/WEB-INF/templates/templates.tpl
similarity index 100%
rename from WEB-INF/templates/templates2.tpl
rename to WEB-INF/templates/templates.tpl
diff --git a/WEB-INF/templates/time2.tpl b/WEB-INF/templates/time.tpl
similarity index 100%
rename from WEB-INF/templates/time2.tpl
rename to WEB-INF/templates/time.tpl
diff --git a/WEB-INF/templates/time_delete2.tpl b/WEB-INF/templates/time_delete.tpl
similarity index 100%
rename from WEB-INF/templates/time_delete2.tpl
rename to WEB-INF/templates/time_delete.tpl
diff --git a/WEB-INF/templates/time_edit2.tpl b/WEB-INF/templates/time_edit.tpl
similarity index 100%
rename from WEB-INF/templates/time_edit2.tpl
rename to WEB-INF/templates/time_edit.tpl
diff --git a/WEB-INF/templates/timer2.tpl b/WEB-INF/templates/timer.tpl
similarity index 100%
rename from WEB-INF/templates/timer2.tpl
rename to WEB-INF/templates/timer.tpl
diff --git a/WEB-INF/templates/timesheet_add2.tpl b/WEB-INF/templates/timesheet_add.tpl
similarity index 100%
rename from WEB-INF/templates/timesheet_add2.tpl
rename to WEB-INF/templates/timesheet_add.tpl
diff --git a/WEB-INF/templates/timesheet_delete2.tpl b/WEB-INF/templates/timesheet_delete.tpl
similarity index 100%
rename from WEB-INF/templates/timesheet_delete2.tpl
rename to WEB-INF/templates/timesheet_delete.tpl
diff --git a/WEB-INF/templates/timesheet_edit2.tpl b/WEB-INF/templates/timesheet_edit.tpl
similarity index 100%
rename from WEB-INF/templates/timesheet_edit2.tpl
rename to WEB-INF/templates/timesheet_edit.tpl
diff --git a/WEB-INF/templates/timesheet_view2.tpl b/WEB-INF/templates/timesheet_view.tpl
similarity index 100%
rename from WEB-INF/templates/timesheet_view2.tpl
rename to WEB-INF/templates/timesheet_view.tpl
diff --git a/WEB-INF/templates/timesheets2.tpl b/WEB-INF/templates/timesheets.tpl
similarity index 100%
rename from WEB-INF/templates/timesheets2.tpl
rename to WEB-INF/templates/timesheets.tpl
diff --git a/initialize.php b/initialize.php
index f69c77a18..c57314c26 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5543");
+define("APP_VERSION", "1.19.28.5544");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/template_add.php b/template_add.php
index 6347d22e3..cb84fb33b 100644
--- a/template_add.php
+++ b/template_add.php
@@ -65,5 +65,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.add_template'));
-$smarty->assign('content_page_name', 'template_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'template_add.tpl');
+$smarty->display('index.tpl');
diff --git a/template_delete.php b/template_delete.php
index 792cadbd0..a4996e05b 100644
--- a/template_delete.php
+++ b/template_delete.php
@@ -47,5 +47,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.templateDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_template'));
-$smarty->assign('content_page_name', 'template_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'template_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/template_edit.php b/template_edit.php
index 3451ff646..814eff591 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -83,5 +83,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', $bindTemplatesWithProjects && count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.edit_template'));
-$smarty->assign('content_page_name', 'template_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'template_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/templates.php b/templates.php
index 53d57b86f..636d4bc10 100644
--- a/templates.php
+++ b/templates.php
@@ -59,5 +59,5 @@
 $smarty->assign('inactive_templates', $inactiveTemplates);
 $smarty->assign('show_bind_with_projects_checkbox', $showBindWithProjectsCheckbox);
 $smarty->assign('title', $i18n->get('title.templates'));
-$smarty->assign('content_page_name', 'templates2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'templates.tpl');
+$smarty->display('index.tpl');
diff --git a/time.php b/time.php
index 9b366b543..9bd31127f 100644
--- a/time.php
+++ b/time.php
@@ -488,5 +488,5 @@
 $smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();adjustTodayLinks()"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'time2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'time.tpl');
+$smarty->display('index.tpl');
diff --git a/time_delete.php b/time_delete.php
index 5b3849525..9c028dabb 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -69,5 +69,5 @@
 $smarty->assign('show_duration', $showDuration);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_time_record'));
-$smarty->assign('content_page_name', 'time_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'time_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/time_edit.php b/time_edit.php
index 8e9f31e56..d34ae1ca6 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -467,5 +467,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('title', $i18n->get('title.edit_time_record'));
-$smarty->assign('content_page_name', 'time_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'time_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/timer.php b/timer.php
index aa51a4dc4..cd0081f3d 100644
--- a/timer.php
+++ b/timer.php
@@ -307,5 +307,5 @@
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
 $smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'timer2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'timer.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheet_add.php b/timesheet_add.php
index 5fb15df6e..7361c4f28 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -80,5 +80,5 @@
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('title', $i18n->get('title.add_timesheet'));
-$smarty->assign('content_page_name', 'timesheet_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'timesheet_add.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheet_delete.php b/timesheet_delete.php
index b0b847973..ff1e4e180 100644
--- a/timesheet_delete.php
+++ b/timesheet_delete.php
@@ -47,5 +47,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_timesheet'));
-$smarty->assign('content_page_name', 'timesheet_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'timesheet_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheet_edit.php b/timesheet_edit.php
index c9676ed5a..164cc61bb 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -81,5 +81,5 @@
 $smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');
 $smarty->assign('can_delete', $canDelete);
 $smarty->assign('title', $i18n->get('title.edit_timesheet'));
-$smarty->assign('content_page_name', 'timesheet_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'timesheet_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheet_view.php b/timesheet_view.php
index a74424a6b..905371768 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -126,5 +126,5 @@
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheet').": ".$timesheet['start_date']." - ".$timesheet['end_date']);
-$smarty->assign('content_page_name', 'timesheet_view2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'timesheet_view.tpl');
+$smarty->display('index.tpl');
diff --git a/timesheets.php b/timesheets.php
index 54bbc3396..7dbbb78df 100644
--- a/timesheets.php
+++ b/timesheets.php
@@ -78,5 +78,5 @@
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
-$smarty->assign('content_page_name', 'timesheets2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'timesheets.tpl');
+$smarty->display('index.tpl');

From eea705e1dcf06723cd7f1f334e4f716f8cfaae1a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 17:20:08 +0000
Subject: [PATCH 1559/1848] More work in progress on template renaming.

---
 WEB-INF/templates/{quotas2.tpl => quotas.tpl}           | 0
 WEB-INF/templates/{register2.tpl => register.tpl}       | 0
 WEB-INF/templates/{report2.tpl => report.tpl}           | 0
 WEB-INF/templates/{reports2.tpl => reports.tpl}         | 2 +-
 WEB-INF/templates/{role_add2.tpl => role_add.tpl}       | 0
 WEB-INF/templates/{role_delete2.tpl => role_delete.tpl} | 0
 WEB-INF/templates/{role_edit2.tpl => role_edit.tpl}     | 0
 WEB-INF/templates/{roles2.tpl => roles.tpl}             | 0
 WEB-INF/templates/{success2.tpl => success.tpl}         | 0
 WEB-INF/templates/{swap_roles2.tpl => swap_roles.tpl}   | 0
 WEB-INF/templates/{task_add2.tpl => task_add.tpl}       | 0
 WEB-INF/templates/{task_delete2.tpl => task_delete.tpl} | 0
 WEB-INF/templates/{task_edit2.tpl => task_edit.tpl}     | 0
 WEB-INF/templates/{tasks2.tpl => tasks.tpl}             | 0
 initialize.php                                          | 2 +-
 quotas.php                                              | 4 ++--
 register.php                                            | 4 ++--
 report.php                                              | 4 ++--
 reports.php                                             | 4 ++--
 role_add.php                                            | 4 ++--
 role_delete.php                                         | 4 ++--
 role_edit.php                                           | 4 ++--
 roles.php                                               | 4 ++--
 success.php                                             | 4 ++--
 swap_roles.php                                          | 4 ++--
 task_add.php                                            | 4 ++--
 task_delete.php                                         | 4 ++--
 task_edit.php                                           | 4 ++--
 tasks.php                                               | 4 ++--
 29 files changed, 30 insertions(+), 30 deletions(-)
 rename WEB-INF/templates/{quotas2.tpl => quotas.tpl} (100%)
 rename WEB-INF/templates/{register2.tpl => register.tpl} (100%)
 rename WEB-INF/templates/{report2.tpl => report.tpl} (100%)
 rename WEB-INF/templates/{reports2.tpl => reports.tpl} (99%)
 rename WEB-INF/templates/{role_add2.tpl => role_add.tpl} (100%)
 rename WEB-INF/templates/{role_delete2.tpl => role_delete.tpl} (100%)
 rename WEB-INF/templates/{role_edit2.tpl => role_edit.tpl} (100%)
 rename WEB-INF/templates/{roles2.tpl => roles.tpl} (100%)
 rename WEB-INF/templates/{success2.tpl => success.tpl} (100%)
 rename WEB-INF/templates/{swap_roles2.tpl => swap_roles.tpl} (100%)
 rename WEB-INF/templates/{task_add2.tpl => task_add.tpl} (100%)
 rename WEB-INF/templates/{task_delete2.tpl => task_delete.tpl} (100%)
 rename WEB-INF/templates/{task_edit2.tpl => task_edit.tpl} (100%)
 rename WEB-INF/templates/{tasks2.tpl => tasks.tpl} (100%)

diff --git a/WEB-INF/templates/quotas2.tpl b/WEB-INF/templates/quotas.tpl
similarity index 100%
rename from WEB-INF/templates/quotas2.tpl
rename to WEB-INF/templates/quotas.tpl
diff --git a/WEB-INF/templates/register2.tpl b/WEB-INF/templates/register.tpl
similarity index 100%
rename from WEB-INF/templates/register2.tpl
rename to WEB-INF/templates/register.tpl
diff --git a/WEB-INF/templates/report2.tpl b/WEB-INF/templates/report.tpl
similarity index 100%
rename from WEB-INF/templates/report2.tpl
rename to WEB-INF/templates/report.tpl
diff --git a/WEB-INF/templates/reports2.tpl b/WEB-INF/templates/reports.tpl
similarity index 99%
rename from WEB-INF/templates/reports2.tpl
rename to WEB-INF/templates/reports.tpl
index 294d5ea7c..aa8e9d633 100644
--- a/WEB-INF/templates/reports2.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -121,7 +121,7 @@ function fillProjectDropdown(id) {
 function fillTaskDropdown(project_id) {
   var str_task_ids;
   // Get a string of comma-separated task ids.
-  if (project_id) {  
+  if (project_id) {
     var property = "p" + project_id;
     str_task_ids = obj_tasks[property];
   }
diff --git a/WEB-INF/templates/role_add2.tpl b/WEB-INF/templates/role_add.tpl
similarity index 100%
rename from WEB-INF/templates/role_add2.tpl
rename to WEB-INF/templates/role_add.tpl
diff --git a/WEB-INF/templates/role_delete2.tpl b/WEB-INF/templates/role_delete.tpl
similarity index 100%
rename from WEB-INF/templates/role_delete2.tpl
rename to WEB-INF/templates/role_delete.tpl
diff --git a/WEB-INF/templates/role_edit2.tpl b/WEB-INF/templates/role_edit.tpl
similarity index 100%
rename from WEB-INF/templates/role_edit2.tpl
rename to WEB-INF/templates/role_edit.tpl
diff --git a/WEB-INF/templates/roles2.tpl b/WEB-INF/templates/roles.tpl
similarity index 100%
rename from WEB-INF/templates/roles2.tpl
rename to WEB-INF/templates/roles.tpl
diff --git a/WEB-INF/templates/success2.tpl b/WEB-INF/templates/success.tpl
similarity index 100%
rename from WEB-INF/templates/success2.tpl
rename to WEB-INF/templates/success.tpl
diff --git a/WEB-INF/templates/swap_roles2.tpl b/WEB-INF/templates/swap_roles.tpl
similarity index 100%
rename from WEB-INF/templates/swap_roles2.tpl
rename to WEB-INF/templates/swap_roles.tpl
diff --git a/WEB-INF/templates/task_add2.tpl b/WEB-INF/templates/task_add.tpl
similarity index 100%
rename from WEB-INF/templates/task_add2.tpl
rename to WEB-INF/templates/task_add.tpl
diff --git a/WEB-INF/templates/task_delete2.tpl b/WEB-INF/templates/task_delete.tpl
similarity index 100%
rename from WEB-INF/templates/task_delete2.tpl
rename to WEB-INF/templates/task_delete.tpl
diff --git a/WEB-INF/templates/task_edit2.tpl b/WEB-INF/templates/task_edit.tpl
similarity index 100%
rename from WEB-INF/templates/task_edit2.tpl
rename to WEB-INF/templates/task_edit.tpl
diff --git a/WEB-INF/templates/tasks2.tpl b/WEB-INF/templates/tasks.tpl
similarity index 100%
rename from WEB-INF/templates/tasks2.tpl
rename to WEB-INF/templates/tasks.tpl
diff --git a/initialize.php b/initialize.php
index c57314c26..b2857f6ed 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5544");
+define("APP_VERSION", "1.19.28.5545");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/quotas.php b/quotas.php
index c49fbf1f7..55214093f 100644
--- a/quotas.php
+++ b/quotas.php
@@ -107,5 +107,5 @@
 $smarty->assign('months', $months);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.monthly_quotas'));
-$smarty->assign('content_page_name', 'quotas2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'quotas.tpl');
+$smarty->display('index.tpl');
diff --git a/register.php b/register.php
index 220376138..35fbee9cc 100644
--- a/register.php
+++ b/register.php
@@ -96,5 +96,5 @@
 $smarty->assign('title', $i18n->get('title.add_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"');
-$smarty->assign('content_page_name', 'register2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'register.tpl');
+$smarty->display('index.tpl');
diff --git a/report.php b/report.php
index cb959d488..bd2576f14 100644
--- a/report.php
+++ b/report.php
@@ -320,5 +320,5 @@
 $smarty->assign('colspan', $colspan);
 $smarty->assign('bean', $bean);
 $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
-$smarty->assign('content_page_name', 'report2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'report.tpl');
+$smarty->display('index.tpl');
diff --git a/reports.php b/reports.php
index 71f455bea..059c7d903 100644
--- a/reports.php
+++ b/reports.php
@@ -492,5 +492,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handleCheckboxes();fillDropdowns()"');
 $smarty->assign('title', $i18n->get('title.reports'));
-$smarty->assign('content_page_name', 'reports2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'reports.tpl');
+$smarty->display('index.tpl');
diff --git a/role_add.php b/role_add.php
index 54fd9bdb5..b2879dd8f 100644
--- a/role_add.php
+++ b/role_add.php
@@ -55,5 +55,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_role'));
-$smarty->assign('content_page_name', 'role_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'role_add.tpl');
+$smarty->display('index.tpl');
diff --git a/role_delete.php b/role_delete.php
index 805c89dba..e2f0805eb 100644
--- a/role_delete.php
+++ b/role_delete.php
@@ -46,5 +46,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_role'));
-$smarty->assign('content_page_name', 'role_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'role_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/role_edit.php b/role_edit.php
index 03e1d2473..5192ee62d 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -115,5 +115,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_role'));
-$smarty->assign('content_page_name', 'role_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'role_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/roles.php b/roles.php
index f2795fb0f..569f2649a 100644
--- a/roles.php
+++ b/roles.php
@@ -17,5 +17,5 @@
 $smarty->assign('active_roles', ttTeamHelper::getActiveRolesForUser());
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRolesForUser());
 $smarty->assign('title', $i18n->get('title.roles'));
-$smarty->assign('content_page_name', 'roles2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'roles.tpl');
+$smarty->display('index.tpl');
diff --git a/success.php b/success.php
index eea4687a2..6fbf8ad2a 100644
--- a/success.php
+++ b/success.php
@@ -8,5 +8,5 @@
 if ($auth->isAuthenticated()) $smarty->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->get('title.success'));
-$smarty->assign('content_page_name', 'success2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'success.tpl');
+$smarty->display('index.tpl');
diff --git a/swap_roles.php b/swap_roles.php
index e49bed75b..7a036a777 100644
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -49,5 +49,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.swapForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.swap_roles'));
-$smarty->assign('content_page_name', 'swap_roles2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'swap_roles.tpl');
+$smarty->display('index.tpl');
diff --git a/task_add.php b/task_add.php
index 4888677f1..3d8dcc1c7 100644
--- a/task_add.php
+++ b/task_add.php
@@ -62,5 +62,5 @@
 $smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('onload', 'onLoad="document.taskForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.add_task'));
-$smarty->assign('content_page_name', 'task_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'task_add.tpl');
+$smarty->display('index.tpl');
diff --git a/task_delete.php b/task_delete.php
index 61f5e23ff..04008010f 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -50,5 +50,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_task'));
-$smarty->assign('content_page_name', 'task_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'task_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/task_edit.php b/task_edit.php
index 4b9a72aef..b2b61b80b 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -96,5 +96,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('title', $i18n->get('title.edit_task'));
-$smarty->assign('content_page_name', 'task_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'task_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/tasks.php b/tasks.php
index 464af6159..13787a8ab 100644
--- a/tasks.php
+++ b/tasks.php
@@ -49,5 +49,5 @@
 $smarty->assign('active_tasks', $active_tasks);
 $smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));
-$smarty->assign('content_page_name', 'tasks2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'tasks.tpl');
+$smarty->display('index.tpl');

From 01dfa61fb9f34b4559d6be25e6efee210a2f046d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 18:00:57 +0000
Subject: [PATCH 1560/1848] More templates renamed.

---
 .../templates/{password_change2.tpl => password_change.tpl}   | 0
 WEB-INF/templates/{password_reset2.tpl => password_reset.tpl} | 0
 WEB-INF/templates/{plugins2.tpl => plugins.tpl}               | 0
 ...predefined_expense_add2.tpl => predefined_expense_add.tpl} | 0
 ...ined_expense_delete2.tpl => predefined_expense_delete.tpl} | 0
 ...edefined_expense_edit2.tpl => predefined_expense_edit.tpl} | 0
 .../{predefined_expenses2.tpl => predefined_expenses.tpl}     | 0
 WEB-INF/templates/{profile_edit2.tpl => profile_edit.tpl}     | 0
 WEB-INF/templates/{project_add2.tpl => project_add.tpl}       | 0
 WEB-INF/templates/{project_delete2.tpl => project_delete.tpl} | 0
 WEB-INF/templates/{project_edit2.tpl => project_edit.tpl}     | 0
 WEB-INF/templates/{projects2.tpl => projects.tpl}             | 0
 initialize.php                                                | 2 +-
 password_change.php                                           | 4 ++--
 password_reset.php                                            | 4 ++--
 plugins.php                                                   | 4 ++--
 predefined_expense_add.php                                    | 4 ++--
 predefined_expense_delete.php                                 | 4 ++--
 predefined_expense_edit.php                                   | 4 ++--
 predefined_expenses.php                                       | 4 ++--
 profile_edit.php                                              | 4 ++--
 project_add.php                                               | 4 ++--
 project_delete.php                                            | 4 ++--
 project_edit.php                                              | 4 ++--
 projects.php                                                  | 4 ++--
 25 files changed, 25 insertions(+), 25 deletions(-)
 rename WEB-INF/templates/{password_change2.tpl => password_change.tpl} (100%)
 rename WEB-INF/templates/{password_reset2.tpl => password_reset.tpl} (100%)
 rename WEB-INF/templates/{plugins2.tpl => plugins.tpl} (100%)
 rename WEB-INF/templates/{predefined_expense_add2.tpl => predefined_expense_add.tpl} (100%)
 rename WEB-INF/templates/{predefined_expense_delete2.tpl => predefined_expense_delete.tpl} (100%)
 rename WEB-INF/templates/{predefined_expense_edit2.tpl => predefined_expense_edit.tpl} (100%)
 rename WEB-INF/templates/{predefined_expenses2.tpl => predefined_expenses.tpl} (100%)
 rename WEB-INF/templates/{profile_edit2.tpl => profile_edit.tpl} (100%)
 rename WEB-INF/templates/{project_add2.tpl => project_add.tpl} (100%)
 rename WEB-INF/templates/{project_delete2.tpl => project_delete.tpl} (100%)
 rename WEB-INF/templates/{project_edit2.tpl => project_edit.tpl} (100%)
 rename WEB-INF/templates/{projects2.tpl => projects.tpl} (100%)

diff --git a/WEB-INF/templates/password_change2.tpl b/WEB-INF/templates/password_change.tpl
similarity index 100%
rename from WEB-INF/templates/password_change2.tpl
rename to WEB-INF/templates/password_change.tpl
diff --git a/WEB-INF/templates/password_reset2.tpl b/WEB-INF/templates/password_reset.tpl
similarity index 100%
rename from WEB-INF/templates/password_reset2.tpl
rename to WEB-INF/templates/password_reset.tpl
diff --git a/WEB-INF/templates/plugins2.tpl b/WEB-INF/templates/plugins.tpl
similarity index 100%
rename from WEB-INF/templates/plugins2.tpl
rename to WEB-INF/templates/plugins.tpl
diff --git a/WEB-INF/templates/predefined_expense_add2.tpl b/WEB-INF/templates/predefined_expense_add.tpl
similarity index 100%
rename from WEB-INF/templates/predefined_expense_add2.tpl
rename to WEB-INF/templates/predefined_expense_add.tpl
diff --git a/WEB-INF/templates/predefined_expense_delete2.tpl b/WEB-INF/templates/predefined_expense_delete.tpl
similarity index 100%
rename from WEB-INF/templates/predefined_expense_delete2.tpl
rename to WEB-INF/templates/predefined_expense_delete.tpl
diff --git a/WEB-INF/templates/predefined_expense_edit2.tpl b/WEB-INF/templates/predefined_expense_edit.tpl
similarity index 100%
rename from WEB-INF/templates/predefined_expense_edit2.tpl
rename to WEB-INF/templates/predefined_expense_edit.tpl
diff --git a/WEB-INF/templates/predefined_expenses2.tpl b/WEB-INF/templates/predefined_expenses.tpl
similarity index 100%
rename from WEB-INF/templates/predefined_expenses2.tpl
rename to WEB-INF/templates/predefined_expenses.tpl
diff --git a/WEB-INF/templates/profile_edit2.tpl b/WEB-INF/templates/profile_edit.tpl
similarity index 100%
rename from WEB-INF/templates/profile_edit2.tpl
rename to WEB-INF/templates/profile_edit.tpl
diff --git a/WEB-INF/templates/project_add2.tpl b/WEB-INF/templates/project_add.tpl
similarity index 100%
rename from WEB-INF/templates/project_add2.tpl
rename to WEB-INF/templates/project_add.tpl
diff --git a/WEB-INF/templates/project_delete2.tpl b/WEB-INF/templates/project_delete.tpl
similarity index 100%
rename from WEB-INF/templates/project_delete2.tpl
rename to WEB-INF/templates/project_delete.tpl
diff --git a/WEB-INF/templates/project_edit2.tpl b/WEB-INF/templates/project_edit.tpl
similarity index 100%
rename from WEB-INF/templates/project_edit2.tpl
rename to WEB-INF/templates/project_edit.tpl
diff --git a/WEB-INF/templates/projects2.tpl b/WEB-INF/templates/projects.tpl
similarity index 100%
rename from WEB-INF/templates/projects2.tpl
rename to WEB-INF/templates/projects.tpl
diff --git a/initialize.php b/initialize.php
index b2857f6ed..691f66ed2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5545");
+define("APP_VERSION", "1.19.28.5546");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/password_change.php b/password_change.php
index f501a78e5..992bdd87b 100644
--- a/password_change.php
+++ b/password_change.php
@@ -77,5 +77,5 @@
 
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->get('title.change_password'));
-$smarty->assign('content_page_name', 'password_change2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'password_change.tpl');
+$smarty->display('index.tpl');
diff --git a/password_reset.php b/password_reset.php
index a9dfd1f0a..9645139e4 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -106,5 +106,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.resetPasswordForm.login.focus()"');
 $smarty->assign('title', $i18n->get('title.reset_password'));
-$smarty->assign('content_page_name', 'password_reset2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'password_reset.tpl');
+$smarty->display('index.tpl');
diff --git a/plugins.php b/plugins.php
index 730889bc0..9b3bc1a27 100644
--- a/plugins.php
+++ b/plugins.php
@@ -141,5 +141,5 @@
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
 $smarty->assign('user_exists', $user->exists());
 $smarty->assign('title', $i18n->get('title.plugins'));
-$smarty->assign('content_page_name', 'plugins2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'plugins.tpl');
+$smarty->display('index.tpl');
diff --git a/predefined_expense_add.php b/predefined_expense_add.php
index 8cac318f1..08e395ce2 100644
--- a/predefined_expense_add.php
+++ b/predefined_expense_add.php
@@ -45,5 +45,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_predefined_expense'));
-$smarty->assign('content_page_name', 'predefined_expense_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'predefined_expense_add.tpl');
+$smarty->display('index.tpl');
diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index 26b726fc1..e965b0be2 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -48,5 +48,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.predefinedExpenseDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_predefined_expense'));
-$smarty->assign('content_page_name', 'predefined_expense_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'predefined_expense_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/predefined_expense_edit.php b/predefined_expense_edit.php
index d1b557553..8f4750245 100644
--- a/predefined_expense_edit.php
+++ b/predefined_expense_edit.php
@@ -55,5 +55,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_predefined_expense'));
-$smarty->assign('content_page_name', 'predefined_expense_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'predefined_expense_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/predefined_expenses.php b/predefined_expenses.php
index c44aee27b..9f94bd1cc 100644
--- a/predefined_expenses.php
+++ b/predefined_expenses.php
@@ -33,5 +33,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('predefined_expenses', $predefinedExpenses);
 $smarty->assign('title', $i18n->get('title.predefined_expenses'));
-$smarty->assign('content_page_name', 'predefined_expenses2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'predefined_expenses.tpl');
+$smarty->display('index.tpl');
diff --git a/profile_edit.php b/profile_edit.php
index f85473fe4..a9f11fc2d 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -87,5 +87,5 @@
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.profile'));
-$smarty->assign('content_page_name', 'profile_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'profile_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/project_add.php b/project_add.php
index 16af7a8d1..35b45c97a 100644
--- a/project_add.php
+++ b/project_add.php
@@ -91,5 +91,5 @@
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_project'));
-$smarty->assign('content_page_name', 'project_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'project_add.tpl');
+$smarty->display('index.tpl');
diff --git a/project_delete.php b/project_delete.php
index 2d6ca2895..4f4353b87 100644
--- a/project_delete.php
+++ b/project_delete.php
@@ -47,5 +47,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.projectDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_project'));
-$smarty->assign('content_page_name', 'project_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'project_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/project_edit.php b/project_edit.php
index cbb2c1f9b..917b2e974 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -108,5 +108,5 @@
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.edit_project'));
-$smarty->assign('content_page_name', 'project_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'project_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/projects.php b/projects.php
index e9a0b5dcf..ed4d371df 100644
--- a/projects.php
+++ b/projects.php
@@ -30,5 +30,5 @@
 $smarty->assign('inactive_projects', $inactive_projects);
 $smarty->assign('show_files', $showFiles);
 $smarty->assign('title', $i18n->get('title.projects'));
-$smarty->assign('content_page_name', 'projects2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'projects.tpl');
+$smarty->display('index.tpl');

From 339fea0fc8c13ba9ad30064f9d255b10761184b3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 18:20:47 +0000
Subject: [PATCH 1561/1848] Finished renaming template files.

---
 WEB-INF/templates/index2.tpl                                | 5 -----
 WEB-INF/templates/{invoice_add2.tpl => invoice_add.tpl}     | 0
 .../templates/{invoice_delete2.tpl => invoice_delete.tpl}   | 0
 WEB-INF/templates/{invoice_view2.tpl => invoice_view.tpl}   | 0
 WEB-INF/templates/{invoices2.tpl => invoices.tpl}           | 0
 WEB-INF/templates/{locking2.tpl => locking.tpl}             | 0
 WEB-INF/templates/{login.db2.tpl => login.db.tpl}           | 0
 WEB-INF/templates/{login.ldap2.tpl => login.ldap.tpl}       | 0
 WEB-INF/templates/{login2.tpl => login.tpl}                 | 2 +-
 WEB-INF/templates/{mail2.tpl => mail.tpl}                   | 0
 .../{notification_add2.tpl => notification_add.tpl}         | 0
 .../{notification_delete2.tpl => notification_delete.tpl}   | 0
 .../{notification_edit2.tpl => notification_edit.tpl}       | 0
 WEB-INF/templates/{notifications2.tpl => notifications.tpl} | 0
 initialize.php                                              | 2 +-
 invoice_add.php                                             | 4 ++--
 invoice_delete.php                                          | 4 ++--
 invoice_send.php                                            | 4 ++--
 invoice_view.php                                            | 4 ++--
 invoices.php                                                | 4 ++--
 locking.php                                                 | 4 ++--
 login.php                                                   | 6 +++---
 notification_add.php                                        | 4 ++--
 notification_delete.php                                     | 4 ++--
 notification_edit.php                                       | 4 ++--
 notifications.php                                           | 4 ++--
 report_send.php                                             | 4 ++--
 site_map.php                                                | 2 +-
 28 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 WEB-INF/templates/index2.tpl
 rename WEB-INF/templates/{invoice_add2.tpl => invoice_add.tpl} (100%)
 rename WEB-INF/templates/{invoice_delete2.tpl => invoice_delete.tpl} (100%)
 rename WEB-INF/templates/{invoice_view2.tpl => invoice_view.tpl} (100%)
 rename WEB-INF/templates/{invoices2.tpl => invoices.tpl} (100%)
 rename WEB-INF/templates/{locking2.tpl => locking.tpl} (100%)
 rename WEB-INF/templates/{login.db2.tpl => login.db.tpl} (100%)
 rename WEB-INF/templates/{login.ldap2.tpl => login.ldap.tpl} (100%)
 rename WEB-INF/templates/{login2.tpl => login.tpl} (85%)
 rename WEB-INF/templates/{mail2.tpl => mail.tpl} (100%)
 rename WEB-INF/templates/{notification_add2.tpl => notification_add.tpl} (100%)
 rename WEB-INF/templates/{notification_delete2.tpl => notification_delete.tpl} (100%)
 rename WEB-INF/templates/{notification_edit2.tpl => notification_edit.tpl} (100%)
 rename WEB-INF/templates/{notifications2.tpl => notifications.tpl} (100%)

diff --git a/WEB-INF/templates/index2.tpl b/WEB-INF/templates/index2.tpl
deleted file mode 100644
index 75a751e08..000000000
--- a/WEB-INF/templates/index2.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{include file="header.tpl"}
-
-{if $content_page_name}{include file="$content_page_name"}{/if}
-
-{include file="footer.tpl"}
diff --git a/WEB-INF/templates/invoice_add2.tpl b/WEB-INF/templates/invoice_add.tpl
similarity index 100%
rename from WEB-INF/templates/invoice_add2.tpl
rename to WEB-INF/templates/invoice_add.tpl
diff --git a/WEB-INF/templates/invoice_delete2.tpl b/WEB-INF/templates/invoice_delete.tpl
similarity index 100%
rename from WEB-INF/templates/invoice_delete2.tpl
rename to WEB-INF/templates/invoice_delete.tpl
diff --git a/WEB-INF/templates/invoice_view2.tpl b/WEB-INF/templates/invoice_view.tpl
similarity index 100%
rename from WEB-INF/templates/invoice_view2.tpl
rename to WEB-INF/templates/invoice_view.tpl
diff --git a/WEB-INF/templates/invoices2.tpl b/WEB-INF/templates/invoices.tpl
similarity index 100%
rename from WEB-INF/templates/invoices2.tpl
rename to WEB-INF/templates/invoices.tpl
diff --git a/WEB-INF/templates/locking2.tpl b/WEB-INF/templates/locking.tpl
similarity index 100%
rename from WEB-INF/templates/locking2.tpl
rename to WEB-INF/templates/locking.tpl
diff --git a/WEB-INF/templates/login.db2.tpl b/WEB-INF/templates/login.db.tpl
similarity index 100%
rename from WEB-INF/templates/login.db2.tpl
rename to WEB-INF/templates/login.db.tpl
diff --git a/WEB-INF/templates/login.ldap2.tpl b/WEB-INF/templates/login.ldap.tpl
similarity index 100%
rename from WEB-INF/templates/login.ldap2.tpl
rename to WEB-INF/templates/login.ldap.tpl
diff --git a/WEB-INF/templates/login2.tpl b/WEB-INF/templates/login.tpl
similarity index 85%
rename from WEB-INF/templates/login2.tpl
rename to WEB-INF/templates/login.tpl
index 755763c35..e6a8a4ed3 100644
--- a/WEB-INF/templates/login2.tpl
+++ b/WEB-INF/templates/login.tpl
@@ -9,7 +9,7 @@ function get_date() {
 </script>
 
 {$forms.loginForm.open}
-{include file="login.`$smarty.const.AUTH_MODULE`2.tpl"}
+{include file="login.`$smarty.const.AUTH_MODULE`.tpl"}
 {$forms.loginForm.close}
 
 {if !empty($about_text)}
diff --git a/WEB-INF/templates/mail2.tpl b/WEB-INF/templates/mail.tpl
similarity index 100%
rename from WEB-INF/templates/mail2.tpl
rename to WEB-INF/templates/mail.tpl
diff --git a/WEB-INF/templates/notification_add2.tpl b/WEB-INF/templates/notification_add.tpl
similarity index 100%
rename from WEB-INF/templates/notification_add2.tpl
rename to WEB-INF/templates/notification_add.tpl
diff --git a/WEB-INF/templates/notification_delete2.tpl b/WEB-INF/templates/notification_delete.tpl
similarity index 100%
rename from WEB-INF/templates/notification_delete2.tpl
rename to WEB-INF/templates/notification_delete.tpl
diff --git a/WEB-INF/templates/notification_edit2.tpl b/WEB-INF/templates/notification_edit.tpl
similarity index 100%
rename from WEB-INF/templates/notification_edit2.tpl
rename to WEB-INF/templates/notification_edit.tpl
diff --git a/WEB-INF/templates/notifications2.tpl b/WEB-INF/templates/notifications.tpl
similarity index 100%
rename from WEB-INF/templates/notifications2.tpl
rename to WEB-INF/templates/notifications.tpl
diff --git a/initialize.php b/initialize.php
index 691f66ed2..0df7d7ecf 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5546");
+define("APP_VERSION", "1.19.28.5547");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_add.php b/invoice_add.php
index bc337a000..e7018f009 100644
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -80,5 +80,5 @@
 $smarty->assign('onload', 'onLoad="document.invoiceForm.number.focus()"');
 $smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.add_invoice'));
-$smarty->assign('content_page_name', 'invoice_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'invoice_add.tpl');
+$smarty->display('index.tpl');
diff --git a/invoice_delete.php b/invoice_delete.php
index 7e80b1265..5b473dfa0 100644
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -51,5 +51,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_invoice'));
-$smarty->assign('content_page_name', 'invoice_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'invoice_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/invoice_send.php b/invoice_send.php
index c3126eb9c..5483a09b1 100644
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -80,5 +80,5 @@
 $smarty->assign('title', $i18n->get('title.send_invoice'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
-$smarty->assign('content_page_name', 'mail2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'mail.tpl');
+$smarty->display('index.tpl');
diff --git a/invoice_view.php b/invoice_view.php
index 621ae4a0c..b03b719e4 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -107,5 +107,5 @@
 $smarty->assign('invoice_items', $invoice_items);
 $smarty->assign('colspan', $colspan);
 $smarty->assign('title', $i18n->get('title.view_invoice'));
-$smarty->assign('content_page_name', 'invoice_view2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'invoice_view.tpl');
+$smarty->display('index.tpl');
diff --git a/invoices.php b/invoices.php
index bbca99cc7..3f6438b96 100644
--- a/invoices.php
+++ b/invoices.php
@@ -90,5 +90,5 @@
 $smarty->assign('show_sorting_options', count($invoices) > 1);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.invoices'));
-$smarty->assign('content_page_name', 'invoices2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'invoices.tpl');
+$smarty->display('index.tpl');
diff --git a/locking.php b/locking.php
index 5277ec90d..04c8d9419 100644
--- a/locking.php
+++ b/locking.php
@@ -37,5 +37,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.locking'));
-$smarty->assign('content_page_name', 'locking2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'locking.tpl');
+$smarty->display('index.tpl');
diff --git a/login.php b/login.php
index 31d7f6d19..09c7af141 100644
--- a/login.php
+++ b/login.php
@@ -60,7 +60,7 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
-$smarty->assign('title', $i18n->get('title.login'));
-$smarty->assign('content_page_name', 'login2.tpl');
 $smarty->assign('about_text', $i18n->get('form.login.about'));
-$smarty->display('index2.tpl');
+$smarty->assign('title', $i18n->get('title.login'));
+$smarty->assign('content_page_name', 'login.tpl');
+$smarty->display('index.tpl');
diff --git a/notification_add.php b/notification_add.php
index 1290bfa23..99602fe5d 100644
--- a/notification_add.php
+++ b/notification_add.php
@@ -95,5 +95,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.add_notification'));
-$smarty->assign('content_page_name', 'notification_add2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'notification_add.tpl');
+$smarty->display('index.tpl');
diff --git a/notification_delete.php b/notification_delete.php
index 741826c03..93820427c 100644
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -51,5 +51,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.notificationDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->get('title.delete_notification'));
-$smarty->assign('content_page_name', 'notification_delete2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'notification_delete.tpl');
+$smarty->display('index.tpl');
diff --git a/notification_edit.php b/notification_edit.php
index 43dbabcff..164127e93 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -106,5 +106,5 @@
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.edit_notification'));
-$smarty->assign('content_page_name', 'notification_edit2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'notification_edit.tpl');
+$smarty->display('index.tpl');
diff --git a/notifications.php b/notifications.php
index 23d1feb16..5945320ef 100644
--- a/notifications.php
+++ b/notifications.php
@@ -40,5 +40,5 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('notifications', $notifications);
 $smarty->assign('title', $i18n->get('title.notifications'));
-$smarty->assign('content_page_name', 'notifications2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'notifications.tpl');
+$smarty->display('index.tpl');
diff --git a/report_send.php b/report_send.php
index 67e7136c6..b20dd6dfe 100644
--- a/report_send.php
+++ b/report_send.php
@@ -74,5 +74,5 @@
 $smarty->assign('title', $i18n->get('title.send_report'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.mailForm.'.($cl_receiver?'comment':'receiver').'.focus()"');
-$smarty->assign('content_page_name', 'mail2.tpl');
-$smarty->display('index2.tpl');
+$smarty->assign('content_page_name', 'mail.tpl');
+$smarty->display('index.tpl');
diff --git a/site_map.php b/site_map.php
index 56a79511b..11695f781 100644
--- a/site_map.php
+++ b/site_map.php
@@ -14,4 +14,4 @@
 
 // $smarty->assign('title', $i18n->get('form.label.menu'));
 $smarty->assign('content_page_name', 'site_map.tpl');
-$smarty->display('index2.tpl');
+$smarty->display('index.tpl');

From dc81e09a376196a503bc9ce0c6a0540b3721985f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 10 May 2021 18:31:47 +0000
Subject: [PATCH 1562/1848] Addressed a php warning.

---
 initialize.php | 2 +-
 reports.php    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 0df7d7ecf..daa1667ab 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5547");
+define("APP_VERSION", "1.19.28.5548");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 059c7d903..b71706220 100644
--- a/reports.php
+++ b/reports.php
@@ -167,7 +167,7 @@
 
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
-$user_list = array();
+$user_list = $user_list_active = $user_list_inactive = array();
 if ($showUsers) {
   // Prepare user and assigned projects arrays.
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
@@ -206,7 +206,6 @@
     'layout'=>'V',
     'groupin'=>$row_count));
 
-  $user_list_inactive = array();
   foreach ($inactive_users as $single_user) {
     $user_list_inactive[$single_user['id']] = $single_user['name'];
     $projects = ttProjectHelper::getAssignedProjects($single_user['id']);

From 49e89ce143d21f13c22919bdd8a168db25ec12f8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 11 May 2021 13:02:46 +0000
Subject: [PATCH 1563/1848] Added a what is it link explaning delete invoice
 entries option.

---
 WEB-INF/templates/invoice_delete.tpl | 5 ++++-
 initialize.php                       | 2 +-
 site_map.php                         | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/invoice_delete.tpl b/WEB-INF/templates/invoice_delete.tpl
index 6fb7cb6c4..951e5e816 100644
--- a/WEB-INF/templates/invoice_delete.tpl
+++ b/WEB-INF/templates/invoice_delete.tpl
@@ -23,7 +23,10 @@ License: See license.txt *}
   <tr class = "small-screen-label"><td><label for="delete_invoice_entries">{$i18n.form.invoice.invoice_entries}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="delete_invoice_entries">{$i18n.form.invoice.invoice_entries}:</label></td>
-    <td class="td-with-input">{$forms.invoiceDeleteForm.delete_invoice_entries.control}</td>
+    <td class="td-with-input">{$forms.invoiceDeleteForm.delete_invoice_entries.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_49.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_49.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
diff --git a/initialize.php b/initialize.php
index daa1667ab..90c7b3096 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5548");
+define("APP_VERSION", "1.19.28.5549");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/site_map.php b/site_map.php
index 11695f781..f769edd76 100644
--- a/site_map.php
+++ b/site_map.php
@@ -12,6 +12,5 @@
 global $auth;
 $authenticated = $auth->isAuthenticated(); // This call assigns 'authenticated' to smarty.
 
-// $smarty->assign('title', $i18n->get('form.label.menu'));
 $smarty->assign('content_page_name', 'site_map.tpl');
 $smarty->display('index.tpl');

From b141c562ab1802dc2a3c20a68d2d7254f4bc5def Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 14 May 2021 14:12:52 +0000
Subject: [PATCH 1564/1848] Fixed presentation issue on the login page.

---
 default.css    | 2 --
 initialize.php | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/default.css b/default.css
index e04cab3d5..956c35ed5 100644
--- a/default.css
+++ b/default.css
@@ -799,8 +799,6 @@ input[type=checkbox], label {
 
 div.table-divider { height: 30px; }
 
-div#LoginAboutText { width: 400px; }
-
 .uncompleted-entry {
   display: inline-block;
   height: 8px;
diff --git a/initialize.php b/initialize.php
index 90c7b3096..9c2bae6f8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5549");
+define("APP_VERSION", "1.19.28.5550");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3a89ce9194bd0a38a4a9a854844455367390a72f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 14 May 2021 23:45:36 +0000
Subject: [PATCH 1565/1848] Removed no longer needed NOTE_INPUT_HEIGHT from
 config.php.dist.

---
 WEB-INF/config.php.dist | 2 --
 initialize.php          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index bbf647cec..9d9d90dfd 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -176,8 +176,6 @@ define('AUTH_MODULE', 'db');
 // define('MONTHLY_QUOTA_YEAR_START', 2010); // If nothing is specified, it falls back to 2015.
 // define('MONTHLY_QUOTA_YEAR_END', 2025);   // If nothing is specified, it falls back to 2030.
 
-// Height in pixels for the note input field in time.php. Defaults to 40.
-// define('NOTE_INPUT_HEIGHT', 100);
 
 // A comma-separated list of default plugins for new group registrations.
 // Example below enables charts and attachments.
diff --git a/initialize.php b/initialize.php
index 9c2bae6f8..2942020c1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5550");
+define("APP_VERSION", "1.19.28.5551");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bc04705f7a876c73a68c49a4513acbf161e8741f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 May 2021 13:27:55 +0000
Subject: [PATCH 1566/1848] Introduced a what is it link explaining custom CSS
 in display options.

---
 WEB-INF/templates/display_options.tpl | 1 +
 initialize.php                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index e4da2cfac..8c9db8ea7 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -45,6 +45,7 @@ License: See license.txt *}
   <tr><td><div class="form-control-separator"></div></td></tr>
   <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_css}</td></tr>
   <tr><td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td></tr>
+  <tr><td colspan="2"><a href="https://www.anuko.com/lp/tt_50.htm" target="_blank">{$i18n.label.what_is_it}</a></td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 <div class="button-set">{$forms.displayOptionsForm.btn_save.control}</div>
diff --git a/initialize.php b/initialize.php
index 2942020c1..dca1b42e7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5551");
+define("APP_VERSION", "1.19.28.5552");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From beec12ef1f35549ab44b3f19a3ed5cf4785e0446 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 May 2021 14:54:33 +0000
Subject: [PATCH 1567/1848] Addressed a couple of php8 warnings.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 10 ++++++----
 initialize.php                         |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 55e40dc18..421676312 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -406,8 +406,9 @@ static function getLockedDaysForWeek($start_date) {
   static function makeRowIdentifier($record) {
     global $user;
     // Start with client.
+    $row_identifier = '';
     if ($user->isPluginEnabled('cl'))
-      $row_identifier = $record['client_id'] ? 'cl:'.$record['client_id'] : '';
+      $row_identifier .= $record['client_id'] ? 'cl:'.$record['client_id'] : '';
     // Add billable flag.
     if (!empty($row_identifier)) $row_identifier .= ',';
     $row_identifier .= 'bl:'.$record['billable'];
@@ -417,7 +418,7 @@ static function makeRowIdentifier($record) {
     $row_identifier .= $record['task_id'] ? ',ts:'.$record['task_id'] : '';
     // Add custom field parts.
     global $custom_fields;
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         if ($timeField['type'] == CustomFields::TYPE_TEXT)
@@ -438,8 +439,9 @@ static function makeRowIdentifier($record) {
   static function makeRowLabel($record) {
     global $user;
     // Start with client.
+    $label = '';
     if ($user->isPluginEnabled('cl'))
-      $label = $record['client'];
+      $label .= $record['client'];
 
     // Add project.
     if (!empty($label) && !empty($record['project'])) $label .= ' - ';
@@ -451,7 +453,7 @@ static function makeRowLabel($record) {
 
     // Add custom field parts.
     global $custom_fields;
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = $record[$field_name];
diff --git a/initialize.php b/initialize.php
index dca1b42e7..d3b1ff263 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5552");
+define("APP_VERSION", "1.19.28.5553");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ecb2c17d8d2f482f0112915c82ed7fbd69460479 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 May 2021 17:16:41 +0000
Subject: [PATCH 1568/1848] Improved week view by remembering custom fields and
 also printing them when configured to do so.

---
 WEB-INF/templates/week.tpl | 12 ++++++++++++
 initialize.php             |  2 +-
 week.php                   | 24 +++++++++++++-----------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 99da5ef47..42fa0b34e 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -101,6 +101,11 @@ function fillDropdowns() {
 <table class="x-scrollable-table">
   <tr>
     <th>{$i18n.label.date}</th>
+  {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
+    {foreach $custom_fields->timeFields as $timeField}
+    <th>{$timeField['label']|escape}</th>
+    {/foreach}
+  {/if}
   {if $show_client}
     <th>{$i18n.label.client}</th>
   {/if}
@@ -125,6 +130,13 @@ function fillDropdowns() {
   {foreach $time_records as $record}
   <tr {if !$record.billable}class="not-billable"{/if}>
     <td class="date-cell">{$record.date}</td>
+    {* record custom fileds *}
+    {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+    <td class="text-cell">{$record.$control_name|escape}</td>
+      {/foreach}
+    {/if}
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
diff --git a/initialize.php b/initialize.php
index d3b1ff263..f1c0f038c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5553");
+define("APP_VERSION", "1.19.28.5554");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 6a2a25e26..7687f9598 100644
--- a/week.php
+++ b/week.php
@@ -62,6 +62,7 @@
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
+$showRecordCustomFields = $user->isOptionEnabled('record_custom_fields');
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -127,17 +128,17 @@
 
 $timeCustomFields = array();
 // If we have time custom fields - collect input.
-if ($request->isPost()) {
-  if (isset($custom_fields) && $custom_fields->timeFields) {
-    foreach ($custom_fields->timeFields as $timeField) {
-      $control_name = 'time_field_'.$timeField['id'];
-      $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
-        'control_name' => $control_name,
-        'label' => $timeField['label'],
-        'type' => $timeField['type'],
-        'required' => $timeField['required'],
-        'value' => trim($request->getParameter($control_name)));
-    }
+if (isset($custom_fields) && $custom_fields->timeFields) {
+  foreach ($custom_fields->timeFields as $timeField) {
+    $control_name = 'time_field_'.$timeField['id'];
+    $cl_control_name = $request->getParameter($control_name, ($request->isPost() ? null : @$_SESSION[$control_name]));
+    $_SESSION[$control_name] = $cl_control_name;
+    $timeCustomFields[$timeField['id']] = array('field_id' => $timeField['id'],
+      'control_name' => $control_name,
+      'label' => $timeField['label'],
+      'type' => $timeField['type'],
+      'required' => $timeField['required'],
+      'value' => trim($cl_control_name));
   }
 }
 
@@ -548,6 +549,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
+$smarty->assign('show_record_custom_fields', $showRecordCustomFields);
 $smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);

From bddfeb53d64046ea825477adf6d5a3dcaedac9d2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 15 May 2021 18:00:48 +0000
Subject: [PATCH 1569/1848] Renamed timer.php to puncher.php to implement it as
 a plugin.

---
 WEB-INF/templates/{timer.tpl => puncher.tpl} | 0
 initialize.php                               | 2 +-
 timer.php => puncher.php                     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename WEB-INF/templates/{timer.tpl => puncher.tpl} (100%)
 rename timer.php => puncher.php (99%)

diff --git a/WEB-INF/templates/timer.tpl b/WEB-INF/templates/puncher.tpl
similarity index 100%
rename from WEB-INF/templates/timer.tpl
rename to WEB-INF/templates/puncher.tpl
diff --git a/initialize.php b/initialize.php
index f1c0f038c..2ffd096f9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5554");
+define("APP_VERSION", "1.19.28.5555");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timer.php b/puncher.php
similarity index 99%
rename from timer.php
rename to puncher.php
index cd0081f3d..56292a574 100644
--- a/timer.php
+++ b/puncher.php
@@ -307,5 +307,5 @@
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
 $smarty->assign('title', $i18n->get('title.time'));
-$smarty->assign('content_page_name', 'timer.tpl');
+$smarty->assign('content_page_name', 'puncher.tpl');
 $smarty->display('index.tpl');

From 565b05d323a8983beda56447f82fc6586cd00a69 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 14:35:08 +0000
Subject: [PATCH 1570/1848] Implemented puncher page as a plugin.

---
 WEB-INF/resources/ca.lang.php      |  1 -
 WEB-INF/resources/cs.lang.php      |  1 -
 WEB-INF/resources/da.lang.php      |  1 -
 WEB-INF/resources/de.lang.php      |  1 -
 WEB-INF/resources/en.lang.php      |  4 +++-
 WEB-INF/resources/es.lang.php      |  1 -
 WEB-INF/resources/et.lang.php      |  2 --
 WEB-INF/resources/fa.lang.php      |  1 -
 WEB-INF/resources/fi.lang.php      |  1 -
 WEB-INF/resources/fr.lang.php      |  1 -
 WEB-INF/resources/gr.lang.php      |  2 --
 WEB-INF/resources/he.lang.php      |  1 -
 WEB-INF/resources/hu.lang.php      |  1 -
 WEB-INF/resources/it.lang.php      |  2 --
 WEB-INF/resources/ja.lang.php      |  1 -
 WEB-INF/resources/ko.lang.php      |  1 -
 WEB-INF/resources/nl.lang.php      |  1 -
 WEB-INF/resources/no.lang.php      |  1 -
 WEB-INF/resources/pl.lang.php      |  1 -
 WEB-INF/resources/pt-br.lang.php   |  1 -
 WEB-INF/resources/pt.lang.php      |  1 -
 WEB-INF/resources/ro.lang.php      |  1 -
 WEB-INF/resources/ru.lang.php      |  1 -
 WEB-INF/resources/sk.lang.php      |  1 -
 WEB-INF/resources/sl.lang.php      |  1 -
 WEB-INF/resources/sr.lang.php      |  1 -
 WEB-INF/resources/sv.lang.php      |  1 -
 WEB-INF/resources/tr.lang.php      |  1 -
 WEB-INF/resources/zh-cn.lang.php   |  1 -
 WEB-INF/resources/zh-tw.lang.php   |  1 -
 WEB-INF/templates/header.tpl       |  3 +++
 WEB-INF/templates/plugins.tpl      | 20 ++++++++++++++--
 WEB-INF/templates/puncher_conf.tpl | 17 ++++++++++++++
 WEB-INF/templates/time.tpl         |  4 +++-
 WEB-INF/templates/week_view.tpl    |  4 ++--
 initialize.php                     |  2 +-
 plugins.php                        |  5 ++++
 puncher.php                        |  6 ++---
 puncher_conf.php                   | 37 ++++++++++++++++++++++++++++++
 time.php                           |  4 +++-
 40 files changed, 95 insertions(+), 43 deletions(-)
 create mode 100644 WEB-INF/templates/puncher_conf.tpl
 create mode 100644 puncher_conf.php

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 34421e73d..5d115f9c8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -240,7 +240,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 199a96faf..99d24e05f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -250,7 +250,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index efdacc370..567310f30 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -231,7 +231,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e41d92b09..9c2a35c27 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -222,7 +222,6 @@
 'label.paid_status' => 'Bezahlstatus',
 'label.paid' => 'Bezahlt',
 'label.mark_paid' => 'Als bezahlt setzen',
-'label.week_menu' => 'Wochenansicht im Menü',
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
 'label.work_units' => 'Arbeitseinheiten',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 37aae4cae..1733fe489 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -24,6 +24,7 @@
 'menu.subgroups' => 'Subgroups',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
+'menu.puncher' => 'Punch',
 'menu.week' => 'Week',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
@@ -173,6 +174,7 @@
 'label.select_none' => 'Deselect all',
 'label.day_view' => 'Day view',
 'label.week_view' => 'Week view',
+'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Language',
 'label.decimal_mark' => 'Decimal mark',
@@ -215,7 +217,6 @@
 'label.paid_status' => 'Paid status',
 'label.paid' => 'Paid',
 'label.mark_paid' => 'Mark paid',
-'label.week_menu' => 'Week menu',
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
 'label.work_units' => 'Work units',
@@ -269,6 +270,7 @@
 'title.edit_time_record' => 'Editing Time Record',
 'title.delete_time_record' => 'Deleting Time Record',
 'title.time_files' => 'Time Record Files',
+'title.puncher' => 'Puncher',
 'title.expenses' => 'Expenses',
 'title.edit_expense' => 'Editing Expense Item',
 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9df814845..e8757a7f1 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -243,7 +243,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7638ade63..1bd5ff234 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -238,8 +238,6 @@
 'label.paid_status' => 'Makse olek',
 'label.paid' => 'Makstud',
 'label.mark_paid' => 'Märgi makstuks',
-// TODO: translate the following.
-// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Nädala märge',
 'label.week_list' => 'Nädala nimekiri',
 'label.work_units' => 'Töö ühikud',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0fca34586..96c461865 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -243,7 +243,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index eaad8a293..80220a610 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -235,7 +235,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 771ed18e3..5c11e4224 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -229,7 +229,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e9003045c..a5490a59f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -223,8 +223,6 @@
 'label.paid_status' => 'Κατάσταση πληρωμής',
 'label.paid' => 'Πληρωμένο',
 'label.mark_paid' => 'Σήμανση πληρωμένα',
-// TODO: translate the following.
-// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Σημείωση εβδομάδας',
 'label.week_list' => 'Λίστα εβδομάδων',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 032e01bf0..6112f1f06 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -250,7 +250,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 1909682fb..7425cc9ac 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -247,7 +247,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 35035d3e9..3aeb88a81 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -227,8 +227,6 @@
 'label.paid_status' => 'Stato pagamento',
 'label.paid' => 'Pagato',
 'label.mark_paid' => 'Segna come pagato',
-// TODO: translate the following.
-// 'label.week_menu' => 'Week menu',
 'label.week_note' => 'Nota settimanale',
 'label.week_list' => 'Lista settimanale',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0ba848ba0..c98730d99 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -250,7 +250,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 975e42169..d7edcbf4b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -250,7 +250,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 70750349d..4580c677a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -206,7 +206,6 @@
 'label.paid_status' => 'Status van betaling',
 'label.paid' => 'Betaald',
 'label.mark_paid' => 'Markeer als betaald',
-'label.week_menu' => 'Week menu',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
 'label.work_units' => 'Werk eenheid',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index cfaf305b5..f7e0240df 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -248,7 +248,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 24664d693..e2cb857e6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -236,7 +236,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index e41cf26c3..bf89e0c20 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -233,7 +233,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 13912a44d..1ff1bf992 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -236,7 +236,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 0c531ad11..60d9b1a38 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -247,7 +247,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index db94bf685..82cbce9d4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -206,7 +206,6 @@
 'label.paid_status' => 'Статус оплаты',
 'label.paid' => 'Оплачено',
 'label.mark_paid' => 'Отметить оплату',
-'label.week_menu' => 'Меню недели',
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Список недели',
 'label.work_units' => 'Единицы работы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 57c14a7db..a24317b9b 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -240,7 +240,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 32e200f81..65a3d0a01 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -231,7 +231,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 38cf8565b..7be8bd4f4 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -235,7 +235,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index fe05e89a7..8bab1c086 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -231,7 +231,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 777440e88..61472bf9e 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -254,7 +254,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 01e639bdd..129e21151 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -241,7 +241,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 66dc7099f..19e8800dc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -246,7 +246,6 @@
 // 'label.paid_status' => 'Paid status',
 // 'label.paid' => 'Paid',
 // 'label.mark_paid' => 'Mark paid',
-// 'label.week_menu' => 'Week menu',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
 // 'label.work_units' => 'Work units',
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 1d8627a66..e7df23ea6 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -98,6 +98,9 @@
     <tr>
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
       <td><a href="time.php">{$i18n.menu.time}</a></td>
+      {if $user->isPluginEnabled('pu') && $user->isOptionEnabled('puncher_menu')}
+      <td><a href="puncher.php">{$i18n.menu.puncher}</a></td>
+      {/if}
       {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
       <td><a href="week.php">{$i18n.menu.week}</a></td>
       {/if}
diff --git a/WEB-INF/templates/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 370c93c59..5c1e4c943 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -4,6 +4,17 @@ License: See license.txt *}
 <script>
 // handlePluginCheckboxes - controls visibility of controls.
 function handlePluginCheckboxes() {
+  var puncherCheckbox = document.getElementById("puncher");
+  var configureLabel = document.getElementById("puncher_conf");
+  var docLabel = document.getElementById("puncher_doc");
+  if (puncherCheckbox.checked) {
+    configureLabel.style.display = "";
+    docLabel.style.display = "none";
+  } else {
+    configureLabel.style.display = "none";
+    docLabel.style.display = "";
+  }
+
   var clientsCheckbox = document.getElementById("clients");
   var invoicesCheckbox = document.getElementById("invoices");
   var requiredCheckbox = document.getElementById("client_required");
@@ -31,8 +42,7 @@ function handlePluginCheckboxes() {
     taxCheckbox.style.visibility = "hidden";
     taxLabel.style.visibility = "hidden";
   }
-  var configureLabel = document.getElementById("expenses_conf");
-  var docLabel = null;
+  configureLabel = document.getElementById("expenses_conf");
   if (expensesCheckbox.checked) {
     configureLabel.style.visibility = "visible";
   } else {
@@ -111,6 +121,12 @@ function handlePluginCheckboxes() {
     <td class="td-with-input">{$forms.pluginsForm.charts.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="puncher">{$i18n.label.puncher}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="puncher">{$i18n.label.puncher}:</label></td>
+    <td class="td-with-input">{$forms.pluginsForm.puncher.control} <span id="puncher_doc"><a href="https://www.anuko.com/lp/tt_51.htm" target="_blank">{$i18n.label.what_is_it}</a></span><span id="puncher_conf">{if $user->isPluginEnabled('pu')}<a href="puncher_conf.php">{$i18n.label.configure}</a>{/if}</span></td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="clients">{$i18n.title.clients}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="clients">{$i18n.title.clients}:</label></td>
diff --git a/WEB-INF/templates/puncher_conf.tpl b/WEB-INF/templates/puncher_conf.tpl
new file mode 100644
index 000000000..9dc6169b1
--- /dev/null
+++ b/WEB-INF/templates/puncher_conf.tpl
@@ -0,0 +1,17 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+{$forms.puncherConfigForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="puncher_menu">{$i18n.label.menu}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="puncher_menu">{$i18n.label.menu}:</label></td>
+    <td class="td-with-input">{$forms.puncherConfigForm.puncher_menu.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_52.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_52.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+</table>
+<div class="button-set">{$forms.puncherConfigForm.btn_save.control}</div>
+{$forms.puncherConfigForm.close}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index f1ba587dc..ac4c851be 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -5,7 +5,9 @@ License: See license.txt *}
 
 {if $show_navigation}
 <div class="optional-nav">
-  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
+  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>
+  {if $user->isPluginEnabled('wv')}&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}{/if}</a>
+  {if $user->isPluginEnabled('pu')}&nbsp;/&nbsp;<a href="puncher.php">{$i18n.label.puncher}{/if}</a>
 </div>
 {/if}
 
diff --git a/WEB-INF/templates/week_view.tpl b/WEB-INF/templates/week_view.tpl
index df74b402b..3226e0c44 100644
--- a/WEB-INF/templates/week_view.tpl
+++ b/WEB-INF/templates/week_view.tpl
@@ -3,9 +3,9 @@ License: See license.txt *}
 
 {$forms.weekViewForm.open}
 <table class="centered-table">
-  <tr class = "small-screen-label"><td><label for="week_menu">{$i18n.label.week_menu}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="week_menu">{$i18n.label.menu}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="week_menu">{$i18n.label.week_menu}:</label></td>
+    <td class="large-screen-label"><label for="week_menu">{$i18n.label.menu}:</label></td>
     <td class="td-with-input">{$forms.weekViewForm.week_menu.control}
       <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_35.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_35.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
diff --git a/initialize.php b/initialize.php
index 2ffd096f9..6edfb7596 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5555");
+define("APP_VERSION", "1.19.28.5556");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins.php b/plugins.php
index 9b3bc1a27..95b6d4b9b 100644
--- a/plugins.php
+++ b/plugins.php
@@ -15,6 +15,7 @@
 if ($request->isPost()) {
   // Plugins that user wants to save for the current group.
   $cl_charts = (bool)$request->getParameter('charts');
+  $cl_puncher = (bool)$request->getParameter('puncher');
   $cl_clients = (bool)$request->getParameter('clients');
   $cl_client_required = (bool)$request->getParameter('client_required');
   $cl_invoices = (bool)$request->getParameter('invoices');
@@ -37,6 +38,7 @@
   // Which plugins do we have enabled in currently selected group?
   $plugins = explode(',', $user->getPlugins());
   $cl_charts = in_array('ch', $plugins);
+  $cl_puncher = in_array('pu', $plugins);
   $cl_clients = in_array('cl', $plugins);
   $cl_client_required = $user->isOptionEnabled('client_required');
   $cl_invoices = in_array('iv', $plugins);
@@ -70,6 +72,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'puncher','value'=>$cl_puncher,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'approval','value'=>$cl_approval));
@@ -89,6 +92,8 @@
   $plugins = '';
   if ($cl_charts)
     $plugins .= ',ch';
+  if ($cl_puncher)
+    $plugins .= ',pu';
   if ($cl_clients)
      $plugins .= ',cl';
   if ($cl_invoices)
diff --git a/puncher.php b/puncher.php
index 56292a574..c8d0d6997 100644
--- a/puncher.php
+++ b/puncher.php
@@ -254,7 +254,7 @@
       }
 
       if ($id && $result) {
-        header('Location: timer.php');
+        header('Location: puncher.php');
         exit();
       }
       $err->add($i18n->get('error.db'));
@@ -278,7 +278,7 @@
         'note'=>$record['comment'],
         'billable'=>$record['billable']));
       if ($res) {
-        header('Location: timer.php');
+        header('Location: puncher.php');
         exit();
       } else
         $err->add($i18n->get('error.db'));
@@ -306,6 +306,6 @@
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->get('title.time'));
+$smarty->assign('title', $i18n->get('title.puncher'));
 $smarty->assign('content_page_name', 'puncher.tpl');
 $smarty->display('index.tpl');
diff --git a/puncher_conf.php b/puncher_conf.php
new file mode 100644
index 000000000..6c1dd087c
--- /dev/null
+++ b/puncher_conf.php
@@ -0,0 +1,37 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+
+$config = $user->getConfigHelper();
+
+if ($request->isPost()) {
+  $cl_puncher_menu = (bool)$request->getParameter('puncher_menu');
+} else {
+  $cl_puncher_menu =  $config->getDefinedValue('puncher_menu');
+}
+
+$form = new Form('puncherConfigForm');
+$form->addInput(array('type'=>'checkbox','name'=>'puncher_menu','value'=>$cl_puncher_menu));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()){
+  // Update config.
+  $config->setDefinedValue('puncher_menu', $cl_puncher_menu);
+  if (!$user->updateGroup(array('config' => $config->getConfig()))) {
+    $err->add($i18n->get('error.db'));
+  }
+}
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('label.puncher'));
+$smarty->assign('content_page_name', 'puncher_conf.tpl');
+$smarty->display('index.tpl');
diff --git a/time.php b/time.php
index 9bd31127f..1bee1129c 100644
--- a/time.php
+++ b/time.php
@@ -463,6 +463,8 @@
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
+$showNavigation = ($user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu')) ||
+  ($user->isPluginEnabled('pu') && !$user->isOptionEnabled('puncher_menu'));
 
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);
@@ -470,7 +472,7 @@
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
 $smarty->assign('show_record_custom_fields', $showRecordCustomFields);
-$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
+$smarty->assign('show_navigation', $showNavigation);
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);

From 54c5a728fdbc85771c7dce0f924d1be2976c3969 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 15:45:14 +0000
Subject: [PATCH 1571/1848] Fixed mobile menu for puncher.

---
 WEB-INF/templates/site_map.tpl | 3 +++
 initialize.php                 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
index c951f2b99..6848fc52e 100644
--- a/WEB-INF/templates/site_map.tpl
+++ b/WEB-INF/templates/site_map.tpl
@@ -21,6 +21,9 @@
 <div class="sitemap-item-group">
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
   <div class="sitemap-item"><a href="time.php">{$i18n.menu.time}</a></div>
+      {if $user->isPluginEnabled('pu') && $user->isOptionEnabled('puncher_menu')}
+  <div class="sitemap-item"><a href="puncher.php">{$i18n.menu.puncher}</a></div>
+      {/if}
       {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
   <div class="sitemap-item"><a href="week.php">{$i18n.menu.week}</a></div>
       {/if}
diff --git a/initialize.php b/initialize.php
index 6edfb7596..97d2cf24a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5556");
+define("APP_VERSION", "1.19.28.5557");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From cb0077607fd35859d6f984cc59e901f6a733f6e4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 15:53:57 +0000
Subject: [PATCH 1572/1848] Introduced menu.puncher into all translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 30 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5d115f9c8..dc8ee6005 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -27,6 +27,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Informes',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 99d24e05f..0e54abdbd 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -28,6 +28,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Sestavy',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 567310f30..cadef15ae 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Udgifter',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9c2a35c27..de101e450 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -25,6 +25,8 @@
 'menu.group' => 'Gruppe',
 'menu.plugins' => 'Erweiterungen',
 'menu.time' => 'Zeiten',
+// TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 'menu.week' => 'Woche',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e8757a7f1..ab947e402 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -26,6 +26,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tiempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reportes',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1bd5ff234..a55d94a31 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -27,6 +27,7 @@
 'menu.plugins' => 'Lisad',
 'menu.time' => 'Ajaarvestus',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Kulud',
 'menu.reports' => 'Raportid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 96c461865..e4cf8e656 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -27,6 +27,7 @@
 'menu.plugins' => 'پلاگین ها',
 'menu.time' => 'زمان',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'هزينه ها',
 'menu.reports' => 'گزارشات',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 80220a610..67c1c8a6f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Lisäosat',
 'menu.time' => 'Tunnit',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Kulut',
 'menu.reports' => 'Raportit',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5c11e4224..95aaac583 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Temps',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Dépenses',
 'menu.reports' => 'Rapports',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a5490a59f..869864d67 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -25,6 +25,7 @@
 'menu.plugins' => 'Πρόσθετα',
 'menu.time' => 'Χρόνος',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Έξοδα',
 'menu.reports' => 'Αναφορές',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6112f1f06..dc52c3424 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -27,6 +27,7 @@
 'menu.plugins' => 'תוספים',
 'menu.time' => 'זמן',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'דוחות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 7425cc9ac..af6746e34 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -28,6 +28,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Munkaidő',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Riportok',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 3aeb88a81..9f3746a3a 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -27,6 +27,7 @@
 'menu.plugins' => 'Plugin',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Spese',
 'menu.reports' => 'Rapporti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c98730d99..8c24fda22 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -27,6 +27,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '時間',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'レポート',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d7edcbf4b..f53083404 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -27,6 +27,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '시간',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '보고서',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 4580c677a..f53581e45 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -23,6 +23,8 @@
 'menu.group' => 'Groep',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
+// TODO: translate the following:
+// 'menu.puncher' => 'Punch',
 'menu.week' => 'Week',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index f7e0240df..1441fd4ae 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -28,6 +28,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tid',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e2cb857e6..d770bb1bb 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Moduły',
 'menu.time' => 'Czas',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Wydatki',
 'menu.reports' => 'Raporty',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bf89e0c20..a81399f60 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Gastos',
 'menu.reports' => 'Relatórios',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 1ff1bf992..1b7f7f589 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -29,6 +29,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Relatórios',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 60d9b1a38..9a49293ef 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -29,6 +29,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Timpul',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Rapoarte',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 82cbce9d4..ed729dfc0 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -23,6 +23,7 @@
 'menu.group' => 'Группа',
 'menu.plugins' => 'Плагины',
 'menu.time' => 'Время',
+'menu.puncher' => 'Пробить',
 'menu.week' => 'Неделя',
 'menu.expenses' => 'Расходы',
 'menu.reports' => 'Отчёты',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index a24317b9b..45cfd05af 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Moduly',
 'menu.time' => 'Časový záznam',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Zostavy',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 65a3d0a01..8d42cebda 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -28,6 +28,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Poročila',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7be8bd4f4..649c95f7f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -26,6 +26,7 @@
 'menu.plugins' => 'Dodaci',
 'menu.time' => 'Vreme',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Troškovi',
 'menu.reports' => 'Izveštaji',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 8bab1c086..f8bc48673 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -25,6 +25,7 @@
 'menu.plugins' => 'Tillägg',
 'menu.time' => 'Tider',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => 'Kostnader',
 'menu.reports' => 'Rapporter',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 61472bf9e..978f275c8 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -29,6 +29,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => 'Zaman',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Raporlar',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 129e21151..f8b33a6c9 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -26,6 +26,7 @@
 // 'menu.plugins' => 'Plugins',
 'menu.time' => '时间记录',
 // TODO: translate the following.
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 'menu.expenses' => '费用',
 'menu.reports' => '报告',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 19e8800dc..6c45449ff 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -25,6 +25,7 @@
 // 'menu.group' => 'Group',
 // 'menu.plugins' => 'Plugins',
 // 'menu.time' => 'Time',
+// 'menu.puncher' => 'Punch',
 // 'menu.week' => 'Week',
 // 'menu.expenses' => 'Expenses',
 'menu.reports' => '報告',
diff --git a/initialize.php b/initialize.php
index 97d2cf24a..f30a384c1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5557");
+define("APP_VERSION", "1.19.28.5558");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d467d1ea9003d405be46bc6edc16291b265efa38 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 16:04:24 +0000
Subject: [PATCH 1573/1848] Introduced title.puncher into all translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 30 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index dc8ee6005..c17a98874 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -304,6 +304,7 @@
 'title.delete_time_record' => 'Eliminant l\\\'historial de temps',
 // TODO: translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0e54abdbd..a88f56cc5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -314,6 +314,7 @@
 'title.delete_time_record' => 'Smazat časový záznam',
 // TODO: translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index cadef15ae..857307ec6 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -291,6 +291,7 @@
 'title.delete_time_record' => 'Slet Tidsregistrering',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Udgifter',
 'title.edit_expense' => 'Redigér Udgift',
 'title.delete_expense' => 'Slet Udgift',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index de101e450..c57b2a29d 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -286,6 +286,7 @@
 'title.delete_time_record' => 'Eintrag löschen',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Kostenposition ändern',
 'title.delete_expense' => 'Kostenposition löschen',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index ab947e402..2a63082d3 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -303,6 +303,7 @@
 'title.delete_time_record' => 'Eliminando el historial de tiempo',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a55d94a31..b5c273c6e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -300,6 +300,7 @@
 'title.delete_time_record' => 'Ajakande kustutamine',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Kulud',
 'title.edit_expense' => 'Kulukirje muutmine',
 'title.delete_expense' => 'Kulukirje kustutamine',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e4cf8e656..87a23b8e9 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -302,6 +302,7 @@
 'title.delete_time_record' => 'حذف رکورد زمان',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'هزینه ها',
 'title.edit_expense' => 'ویرایش آیتم هزینه ها',
 'title.delete_expense' => 'حذف آیتم هزینه ها',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 67c1c8a6f..ec86e2dca 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -295,6 +295,7 @@
 'title.delete_time_record' => 'Tuntikirjausten poisto',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Kulut',
 'title.edit_expense' => 'Kulutietojen muokkaus',
 'title.delete_expense' => 'Kulutiedon poisto',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 95aaac583..aa6df41d5 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -289,6 +289,7 @@
 'title.delete_time_record' => 'Suppression de l\\\'entrée de temps',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Dépenses',
 'title.edit_expense' => 'Modification d\\\'une dépense',
 'title.delete_expense' => 'Suppression d\\\'une dépense',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 869864d67..b90a319c5 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -284,6 +284,7 @@
 'title.delete_time_record' => 'Διαγραφή χρόνου',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Δαπάνες',
 'title.edit_expense' => 'Επεξεργασία δαπάνης',
 'title.delete_expense' => 'Διαγραφή δαπάνης',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index dc52c3424..65d176306 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -310,6 +310,7 @@
 'title.delete_time_record' => 'מחיקת רשומה',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index af6746e34..04cbc1d30 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -305,6 +305,7 @@
 // 'title.edit_time_record' => 'Editing Time Record',
 // 'title.delete_time_record' => 'Deleting Time Record',
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 9f3746a3a..34f31925f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -292,6 +292,7 @@
 'title.delete_time_record' => 'Eliminazione record temporale',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Spese',
 'title.edit_expense' => 'Modifica voce di spesa',
 'title.delete_expense' => 'Eliminezione voce di spesa',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8c24fda22..b60895f12 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -310,6 +310,7 @@
 'title.delete_time_record' => '時間レコードの削除',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f53083404..429171ea6 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -310,6 +310,7 @@
 'title.delete_time_record' => '시간기록을 삭제하기',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index f53581e45..2d75613b8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -257,6 +257,8 @@
 'title.edit_time_record' => 'Wijzigen tijdrecord',
 'title.delete_time_record' => 'Verwijder tijdrecord',
 'title.time_files' => 'Tijden bestanden',
+// TODO: Translate the following:
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Bewerk kosten artikel',
 'title.delete_expense' => 'Verwijder kosten artikel',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1441fd4ae..e9efaa796 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -307,6 +307,7 @@
 'title.delete_time_record' => 'Slett tids oppføringen',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d770bb1bb..ea15b86c6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -296,6 +296,7 @@
 'title.delete_time_record' => 'Usuwanie wpisu',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Wydatki',
 'title.edit_expense' => 'Edytowanie wpisu',
 'title.delete_expense' => 'Usuwanie wpisu',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index a81399f60..d288de9a6 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -293,6 +293,7 @@
 'title.delete_time_record' => 'Apagando entrada de hora',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Gastos',
 'title.edit_expense' => 'Editando item de gasto',
 'title.delete_expense' => 'Apagando item de gasto',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 1b7f7f589..c784e3b67 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -293,6 +293,7 @@
 // 'title.edit_time_record' => 'Editing Time Record',
 // 'title.delete_time_record' => 'Deleting Time Record',
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9a49293ef..00028da62 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -310,6 +310,7 @@
 'title.delete_time_record' => 'Ștergerea inregistrarii timpului',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ed729dfc0..5a6ef864e 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -257,6 +257,7 @@
 'title.edit_time_record' => 'Редактирование записи о времени',
 'title.delete_time_record' => 'Удаление записи о времени',
 'title.time_files' => 'Файлы записи о времени',
+'title.puncher' => 'Пробиватель',
 'title.expenses' => 'Расходы',
 'title.edit_expense' => 'Редактирование предмета расхода',
 'title.delete_expense' => 'Удаление предмета расхода',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 45cfd05af..20d59bead 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -300,6 +300,7 @@
 'title.delete_time_record' => 'Vymazávanie časového záznamu',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8d42cebda..2aae8cf09 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -289,6 +289,7 @@
 // 'title.edit_time_record' => 'Editing Time Record',
 // 'title.delete_time_record' => 'Deleting Time Record',
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 649c95f7f..6c58a22e3 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -294,6 +294,7 @@
 'title.delete_time_record' => 'Obriši unos vremena',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Troškovi',
 'title.edit_expense' => 'Izmeni stavke troškova',
 'title.delete_expense' => 'Obriši stavke troškova',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index f8bc48673..4ab25f50a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -291,6 +291,7 @@
 'title.delete_time_record' => 'Ta bort tidsregistrering',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 'title.expenses' => 'Kostnader',
 'title.edit_expense' => 'Redigera kostnad',
 'title.delete_expense' => 'Ta bort kostnad',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 978f275c8..89494e807 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -319,6 +319,7 @@
 'title.delete_time_record' => 'Zaman kaydını siliyor',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f8b33a6c9..a4409851f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -300,6 +300,7 @@
 'title.delete_time_record' => '删除时间记录',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 6c45449ff..68e7ad5af 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -305,6 +305,7 @@
 'title.delete_time_record' => '刪除時間記錄',
 // TODO: Translate the following.
 // 'title.time_files' => 'Time Record Files',
+// 'title.puncher' => 'Puncher',
 // 'title.expenses' => 'Expenses',
 // 'title.edit_expense' => 'Editing Expense Item',
 // 'title.delete_expense' => 'Deleting Expense Item',
diff --git a/initialize.php b/initialize.php
index f30a384c1..a47d63852 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5558");
+define("APP_VERSION", "1.19.28.5559");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 218b49db73c58b1a97a0af54b73b0c4a8d08861d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 16:20:26 +0000
Subject: [PATCH 1574/1848] Introduced label.puncher into all translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/time.tpl       | 2 +-
 initialize.php                   | 2 +-
 puncher_conf.php                 | 2 +-
 32 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c17a98874..4591ffc36 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -193,6 +193,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 // 'label.id' => 'ID',
 // 'label.language' => 'Language',
 // 'label.decimal_mark' => 'Decimal mark',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a88f56cc5..51b6f9460 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -201,6 +201,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Jazyk',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 857307ec6..480eacc0d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -187,6 +187,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Sprog',
 'label.decimal_mark' => 'Decimal tegn',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index c57b2a29d..f9c9f2b61 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -181,6 +181,8 @@
 'label.select_none' => 'Alle abwählen',
 'label.day_view' => 'Tagesansicht',
 'label.week_view' => 'Wochenansicht',
+// TODO: translate the following:
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Sprache',
 'label.decimal_mark' => 'Dezimaltrennzeichen',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 2a63082d3..a6c07b5b1 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -194,6 +194,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'Identificación',
 // TODO: translate the following.
 // 'label.language' => 'Language',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index b5c273c6e..d62bc5efe 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -194,6 +194,8 @@
 'label.select_none' => 'Märgi kõik mittevalituks',
 'label.day_view' => 'Päeva vaade',
 'label.week_view' => 'Nädala vaade',
+// TODO: translate the following:
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Keel',
 'label.decimal_mark' => 'Koma märk',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 87a23b8e9..79939e02c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -197,6 +197,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'شناسه',
 'label.language' => 'زبان',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index ec86e2dca..1117b47d7 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -190,6 +190,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Kieli',
 'label.decimal_mark' => 'Desimaalierotin',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index aa6df41d5..1aa800b4b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -186,6 +186,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Langage',
 'label.decimal_mark' => 'Séparateur de décimal',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index b90a319c5..13459b194 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -180,6 +180,8 @@
 'label.select_none' => 'Μη επιλογή',
 'label.day_view' => 'Προβολή ημέρας',
 'label.week_view' => 'Προβολή εβδομάδας',
+// TODO: translate the following:
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Γλώσσα',
 'label.decimal_mark' => 'Δεκαδική ένδειξη',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 65d176306..e33c0711f 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -205,6 +205,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'מזהה',
 'label.language' => 'שפה',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 04cbc1d30..84a96f8da 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -200,6 +200,7 @@
 'label.select_none' => 'Senkit nem jelöl ki',
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'Azonosító',
 // TODO: translate the following.
 // 'label.language' => 'Language',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 34f31925f..f894fae61 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -184,6 +184,8 @@
 'label.select_none' => 'Deseleziona tutti',
 'label.day_view' => 'Vista giornaliera',
 'label.week_view' => 'Vista settimanale',
+// TODO: translate the following:
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Lingua',
 'label.decimal_mark' => 'Separatore decimale',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b60895f12..e289c9ea5 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -201,6 +201,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => '識別子',
 'label.language' => '言語',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 429171ea6..af2d180d1 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -200,6 +200,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => '식별자',
 'label.language' => '언어',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2d75613b8..3b6ed3375 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -166,6 +166,8 @@
 'label.select_none' => 'Selecteer niets',
 'label.day_view' => 'Dag overzicht',
 'label.week_view' => 'Week overzicht',
+// TODO: translate the following.
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Taal',
 'label.decimal_mark' => 'Decimaal teken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index e9efaa796..ea8b22d44 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -201,6 +201,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Språk',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ea15b86c6..97ee4e131 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -192,6 +192,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Język',
 'label.decimal_mark' => 'Znak dziesiętny',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d288de9a6..576a451ba 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -189,6 +189,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Idioma',
 'label.decimal_mark' => 'Ponto decimal',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index c784e3b67..0fe708517 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -190,6 +190,7 @@
 // 'label.select_none' => 'Deselect all',
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 // 'label.id' => 'ID',
 // 'label.language' => 'Language',
 // 'label.decimal_mark' => 'Decimal mark',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 00028da62..514c956e4 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -200,6 +200,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 // TODO: translate the following.
 // 'label.language' => 'Language',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5a6ef864e..23de783af 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -165,6 +165,7 @@
 'label.select_none' => 'Снять все отметки',
 'label.day_view' => 'День',
 'label.week_view' => 'Неделя',
+'label.puncher' => 'Пробиватель',
 'label.id' => 'ID',
 'label.language' => 'Язык',
 'label.decimal_mark' => 'Десятичный знак',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 20d59bead..db5f8d4a1 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -194,6 +194,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Jazyk',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2aae8cf09..f921786f1 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -187,6 +187,7 @@
 // 'label.select_none' => 'Deselect all',
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 // 'label.id' => 'ID',
 // 'label.language' => 'Language',
 // 'label.decimal_mark' => 'Decimal mark',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6c58a22e3..5a1d551ae 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -189,6 +189,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Jezik',
 'label.decimal_mark' => 'Decimala',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4ab25f50a..42e84a96f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -186,6 +186,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Språk',
 'label.decimal_mark' => 'Decimaltecken',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 89494e807..e5d4854f5 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -207,6 +207,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 // TODO: translate the following.
 // 'label.language' => 'Language',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a4409851f..d1ded3e78 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -193,6 +193,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID号',
 'label.language' => '语言',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 68e7ad5af..b948ff05a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -198,6 +198,7 @@
 // TODO: translate the following.
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
+// 'label.puncher' => 'Puncher',
 'label.id' => 'ID號',
 'label.language' => '語言',
 // TODO: translate the following.
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index ac4c851be..6d5c036da 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -6,8 +6,8 @@ License: See license.txt *}
 {if $show_navigation}
 <div class="optional-nav">
   <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>
-  {if $user->isPluginEnabled('wv')}&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}{/if}</a>
   {if $user->isPluginEnabled('pu')}&nbsp;/&nbsp;<a href="puncher.php">{$i18n.label.puncher}{/if}</a>
+  {if $user->isPluginEnabled('wv')}&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}{/if}</a>
 </div>
 {/if}
 
diff --git a/initialize.php b/initialize.php
index a47d63852..306ff538a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5559");
+define("APP_VERSION", "1.19.28.5560");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher_conf.php b/puncher_conf.php
index 6c1dd087c..51610f693 100644
--- a/puncher_conf.php
+++ b/puncher_conf.php
@@ -32,6 +32,6 @@
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('label.puncher'));
+$smarty->assign('title', $i18n->get('title.puncher'));
 $smarty->assign('content_page_name', 'puncher_conf.tpl');
 $smarty->display('index.tpl');

From 24f4ff1098262c6f0f6c6e550281483732ff7bf0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 17:17:32 +0000
Subject: [PATCH 1575/1848] Improved labels on puncher buttons.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 puncher.php                      | 4 ++--
 30 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 4591ffc36..b1fbd33ce 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -128,6 +128,7 @@
 'button.import' => 'Importar grup',
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 51b6f9460..97f37507f 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -130,6 +130,7 @@
 'button.import' => 'Importovat tým', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index f9c9f2b61..ed2d2587a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -119,6 +119,8 @@
 'button.export' => 'Gruppe exportieren',
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Stop',
 // TODO: translate the following.
 // (PR#81 suggested 'Freigeben / Genehmigen' for 'Approve' and 'Freigabe zurücknehmen' for 'Disapprove'.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a6c07b5b1..c50f388b9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -127,6 +127,7 @@
 'button.import' => 'Importar grupo',
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d62bc5efe..573d684c6 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -134,6 +134,8 @@
 'button.export' => 'Ekspordi grupp',
 'button.import' => 'Impordi grupp',
 'button.close' => 'Sulge',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Stopp',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 79939e02c..2e2718eb7 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -131,6 +131,8 @@
 'button.export' => 'ایجاد پشتیبان از تیم', // TODO: replace "team" with "group".
 'button.import' => 'وارد کردن تیم', // TODO: replace "team" with "group".
 'button.close' => 'بستن',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'توقف',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1117b47d7..534a94b8c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -125,6 +125,8 @@
 'button.export' => 'Vie tiimi', // TODO: replace "team" with "group".
 'button.import' => 'Tuo tiimi', // TODO: replace "team" with "group".
 'button.close' => 'Sulje',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Lopeta',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1aa800b4b..0b55172df 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -123,6 +123,8 @@
 'button.export' => 'Exporter l\\\'équipe', // TODO: replace "team" with "group".
 'button.import' => 'Importer une équipe', // TODO: replace "team" with "group".
 'button.close' => 'Fermer',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Arrêter',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 13459b194..f8bdb0dc5 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -119,6 +119,8 @@
 'button.export' => 'Εξαγωγη ομάδας',
 'button.import' => 'Εισαγωγή ομάδας',
 'button.close' => 'Κλείσιμο',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Τέλος',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e33c0711f..7505f0965 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -139,6 +139,8 @@
 'button.export' => 'ייצא צוות', // TODO: replace "team" with "group".
 'button.import' => 'ייבא צוות', // TODO: replace "team" with "group".
 'button.close' => 'סגור',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'עצור',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 84a96f8da..052dbe72e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -131,6 +131,7 @@
 'button.import' => 'Csoport importálása',
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index f894fae61..55faab87c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -123,6 +123,8 @@
 'button.export' => 'Esporta gruppo',
 'button.import' => 'Importa gruppo',
 'button.close' => 'Chiudi',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Stop',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index e289c9ea5..57f5592df 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -134,6 +134,7 @@
 'button.import' => 'チームのインポート', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index af2d180d1..832464fbc 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -133,6 +133,7 @@
 'button.import' => '팀 임포트', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 3b6ed3375..66c32ea5a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -109,6 +109,8 @@
 'button.export' => 'Groep exporteren',
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Stop',
 'button.approve' => 'Goedkeuren',
 'button.disapprove' => 'Afkeuren',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ea8b22d44..3929ac4bc 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -133,6 +133,7 @@
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Lukk',
 // TODO: translate the following.
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 97ee4e131..98018f677 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -127,6 +127,8 @@
 'button.export' => 'Eksportuj zespół', // TODO: replace "team" with "group".
 'button.import' => 'Importuj zespół', // TODO: replace "team" with "group".
 'button.close' => 'Zamknij',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Zatrzymaj',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 576a451ba..3fdfae2d1 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -124,6 +124,8 @@
 'button.export' => 'Exportar equipe', // TODO: replace "team" with "group".
 'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
 'button.close' => 'Fechar',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Parar',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 0fe708517..9cdaffd82 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -126,6 +126,7 @@
 // 'button.export' => 'Export group',
 // 'button.import' => 'Import group',
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 514c956e4..7e42575c3 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -133,6 +133,7 @@
 'button.import' => 'Importa echipa', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 23de783af..c74e45bc5 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -108,6 +108,7 @@
 'button.export' => 'Экспортировать группу',
 'button.import' => 'Импортировать группу',
 'button.close' => 'Закрыть',
+'button.start' => 'Начать',
 'button.stop' => 'Завершить',
 'button.approve' => 'Одобрить',
 'button.disapprove' => 'Не одобрить',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index db5f8d4a1..574a283f5 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -130,6 +130,7 @@
 'button.import' => 'Importovať tím', // TODO: replace "team" with "group".
 'button.close' => 'Zatvoriť',
 // TODO: translate the following.
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f921786f1..a2ce91ee7 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -123,6 +123,7 @@
 'button.import' => 'Uvozi tim', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5a1d551ae..b876161b5 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -124,6 +124,8 @@
 'button.export' => 'Izvezi tim', // TODO: replace "team" with "group".
 'button.import' => 'Uvezi tim', // TODO: replace "team" with "group".
 'button.close' => 'Zatvori',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Stani',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 42e84a96f..3f4cc33bc 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -123,6 +123,8 @@
 'button.export' => 'Exportera grupp',
 'button.import' => 'Importera grupp',
 'button.close' => 'Stäng',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Avsluta',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e5d4854f5..bf768a1b6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -137,6 +137,7 @@
 'button.import' => 'Ekibi içeri aktar', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index d1ded3e78..00095186b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -126,6 +126,7 @@
 'button.import' => '导入团队信息', // TODO: replace "team" with "group".
 'button.close' => '关闭',
 // TODO: translate the following.
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index b948ff05a..d4fa2a9f8 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -130,6 +130,7 @@
 'button.import' => '輸入團隊資訊', // TODO: replace "team" with "group".
 // TODO: translate the following.
 // 'button.close' => 'Close',
+// 'button.start' => 'Start',
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
diff --git a/initialize.php b/initialize.php
index 306ff538a..e37ae4685 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5560");
+define("APP_VERSION", "1.19.28.5561");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index c8d0d6997..cc910962d 100644
--- a/puncher.php
+++ b/puncher.php
@@ -185,9 +185,9 @@
 // Start and stop buttons.
 $enable_start = $uncompleted ? false : true;
 if (!$uncompleted)
-  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.start'),'enable'=>$enable_start));
+  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('button.start'),'enable'=>$enable_start));
 else
-  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('label.finish'),'enable'=>!$enable_start));
+  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('button.stop'),'enable'=>!$enable_start));
 
 // Submit.
 if ($request->isPost()) {

From 52875a907166ffb6287585ec4020e6f05dc8350b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 17:19:38 +0000
Subject: [PATCH 1576/1848] Forgot to check in 2 files.

---
 WEB-INF/resources/da.lang.php | 2 ++
 WEB-INF/resources/en.lang.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 480eacc0d..dd185700f 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -123,6 +123,8 @@
 'button.export' => 'Eksporter team', // TODO: replace "team" with "group".
 'button.import' => 'Importer team', // TODO: replace "team" with "group".
 'button.close' => 'Luk',
+// TODO: translate the following.
+// 'button.start' => 'Start',
 'button.stop' => 'Stop',
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1733fe489..80ef82777 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -117,6 +117,7 @@
 'button.export' => 'Export group',
 'button.import' => 'Import group',
 'button.close' => 'Close',
+'button.start' => 'Start',
 'button.stop' => 'Stop',
 'button.approve' => 'Approve',
 'button.disapprove' => 'Disapprove',

From 54b866604d42de96d780d5808bec17a65e4c7b2c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 18:35:50 +0000
Subject: [PATCH 1577/1848] Provided classes for some columns in report for
 custom CSS.

---
 WEB-INF/templates/report.tpl | 10 +++++-----
 initialize.php               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 7224b2983..8ae981a3b 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -37,7 +37,7 @@ License: See license.txt *}
 <table class="x-scrollable-table">
   <tr>
     <th>{$i18n.label.date}</th>
-  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<th>{$i18n.label.user}</th>{/if}
+  {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<th class="user-header">{$i18n.label.user}</th>{/if}
   {* user custom fileds *}
   {if isset($custom_fields) && $custom_fields->userFields}
     {foreach $custom_fields->userFields as $userField}
@@ -45,9 +45,9 @@ License: See license.txt *}
       {if $bean->getAttribute($checkbox_control_name)}<th>{{$userField['label']|escape}}</th>{/if}
     {/foreach}
   {/if}
-  {if $bean->getAttribute('chclient')}<th>{$i18n.label.client}</th>{/if}
-  {if $bean->getAttribute('chproject')}<th>{$i18n.label.project}</th>{/if}
-  {if $bean->getAttribute('chtask')}<th>{$i18n.label.task}</th>{/if}
+  {if $bean->getAttribute('chclient')}<th class="client-header">{$i18n.label.client}</th>{/if}
+  {if $bean->getAttribute('chproject')}<th class="project-header">{$i18n.label.project}</th>{/if}
+  {if $bean->getAttribute('chtask')}<th class="task-header">{$i18n.label.task}</th>{/if}
   {* time custom fileds *}
   {if isset($custom_fields) && $custom_fields->timeFields}
     {foreach $custom_fields->timeFields as $timeField}
@@ -59,7 +59,7 @@ License: See license.txt *}
   {if $bean->getAttribute('chfinish')}<th>{$i18n.label.finish}</th>{/if}
   {if $bean->getAttribute('chduration')}<th>{$i18n.label.duration}</th>{/if}
   {if $bean->getAttribute('chunits')}<th>{$i18n.label.work_units_short}</th>{/if}
-  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<th>{$i18n.label.note}</th>{/if}
+  {if $bean->getAttribute('chnote') && !$note_on_separate_row}<th class="note-header">{$i18n.label.note}</th>{/if}
   {if $bean->getAttribute('chcost')}<th>{$i18n.label.cost}</th>{/if}
   {if $bean->getAttribute('chapproved')}<th>{$i18n.label.approved}</th>{/if}
   {if $bean->getAttribute('chpaid')}<th>{$i18n.label.paid}</th>{/if}
diff --git a/initialize.php b/initialize.php
index e37ae4685..a2670c475 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5561");
+define("APP_VERSION", "1.19.28.5562");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a54c3ee8f8281092c952246c6d8328097910b486 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 21:03:49 +0000
Subject: [PATCH 1578/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttWeekViewHelper.class.php |  2 +-
 initialize.php                         |  2 +-
 tofile.php                             | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 421676312..9487f7805 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -533,7 +533,7 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     $fields4insert['billable'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'bl');
     $fields4insert['project'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'pr');
     $fields4insert['task'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'ts');
-    $fields4insert['note'] = $fields['note'];
+    $fields4insert['note'] = isset($fields['note']) ? $fields['note'] : null;
 
     // Try to insert a record.
     $id = ttTimeHelper::insert($fields4insert);
diff --git a/initialize.php b/initialize.php
index a2670c475..63187ab95 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5562");
+define("APP_VERSION", "1.19.28.5563");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/tofile.php b/tofile.php
index b10bdee02..530d2f7df 100644
--- a/tofile.php
+++ b/tofile.php
@@ -95,7 +95,7 @@
       print "\t<date><![CDATA[".$item['date']."]]></date>\n";
       if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print "\t<user><![CDATA[".$item['user']."]]></user>\n";
       // User custom fields.
-      if ($custom_fields && $custom_fields->userFields) {
+      if (isset($custom_fields) && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_control_name = 'show_'.$field_name;
@@ -106,7 +106,7 @@
       if ($bean->getAttribute('chproject')) print "\t<project><![CDATA[".$item['project']."]]></project>\n";
       if ($bean->getAttribute('chtask')) print "\t<task><![CDATA[".$item['task']."]]></task>\n";
       // Time custom fields.
-      if ($custom_fields && $custom_fields->timeFields) {
+      if (isset($custom_fields) && $custom_fields->timeFields) {
         foreach ($custom_fields->timeFields as $timeField) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_control_name = 'show_'.$field_name;
@@ -190,7 +190,7 @@
     print '"'.$i18n->get('label.date').'"';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.$i18n->get('label.user').'"';
     // User custom field labels.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_control_name = 'show_'.$field_name;
@@ -201,7 +201,7 @@
     if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
     if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
     // Time custom field labels.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_control_name = 'show_'.$field_name;
@@ -226,7 +226,7 @@
       print '"'.$item['date'].'"';
       if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) print ',"'.ttNeutralizeForCsv($item['user']).'"';
       // User custom fields.
-      if ($custom_fields && $custom_fields->userFields) {
+      if (isset($custom_fields) && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_control_name = 'show_'.$field_name;
@@ -237,7 +237,7 @@
       if ($bean->getAttribute('chproject')) print ',"'.ttNeutralizeForCsv($item['project']).'"';
       if ($bean->getAttribute('chtask')) print ',"'.ttNeutralizeForCsv($item['task']).'"';
       // Time custom fields.
-      if ($custom_fields && $custom_fields->timeFields) {
+      if (isset($custom_fields) && $custom_fields->timeFields) {
         foreach ($custom_fields->timeFields as $timeField) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_control_name = 'show_'.$field_name;

From 522f649ecc3e06333a1688cd47701fbce2224f4e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 21:37:21 +0000
Subject: [PATCH 1579/1848] Updated tcpdf library to address a php8 issue.

---
 initialize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 63187ab95..f705457f9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5563");
+define("APP_VERSION", "1.19.28.5564");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 7a3879355ca0948f04d5062c41ced4118234b2f1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 16 May 2021 21:54:19 +0000
Subject: [PATCH 1580/1848] Eliminated a few more php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php    |  6 +++---
 WEB-INF/lib/ttTimesheetHelper.class.php | 28 ++-----------------------
 initialize.php                          |  2 +-
 timesheet_view.php                      |  2 +-
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d95348e8b..1efdaefd7 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -2261,17 +2261,17 @@ static function makeGroupByHeader($options) {
     if ($no_grouping) return null;
 
     $group_by_header = '';
-    if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
+    if (isset($options['group_by1']) && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
       $group_by1 = $options['group_by1'];
       $group_by_header .= ' - '.ttReportHelper::makeGroupByHeaderPart($group_by1);
     }
-    if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
+    if (isset($options['group_by2']) && $options['group_by2'] != 'no_grouping') {
       // We have group_by2.
       $group_by2 = $options['group_by2'];
       $group_by_header .= ' - '.ttReportHelper::makeGroupByHeaderPart($group_by2);
     }
-    if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
+    if (isset($options['group_by3']) && $options['group_by3'] != 'no_grouping') {
       // We have group_by3.
       $group_by3 = $options['group_by3'];
       $group_by_header .= ' - '.ttReportHelper::makeGroupByHeaderPart($group_by3);
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 17119edac..7b6cfa249 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttUserHelper');
 import('ttFileHelper');
diff --git a/initialize.php b/initialize.php
index f705457f9..a892a9c17 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5564");
+define("APP_VERSION", "1.19.28.5565");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timesheet_view.php b/timesheet_view.php
index 905371768..b4eda31f7 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -35,6 +35,7 @@
 $totals = ttReportHelper::getTotals($options);
 
 // Determine which controls to show and obtain date for them.
+$showApprovers = false;
 $showSubmit = !$timesheet['submit_status'];
 if ($showSubmit) {
   $approvers = ttTimesheetHelper::getApprovers();
@@ -116,7 +117,6 @@
   }
 }
 
-$smarty->assign('not_client', $notClient);
 $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);

From ebbc5516b6e309c32df7f2d570126f65457518b6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 May 2021 13:42:44 +0000
Subject: [PATCH 1581/1848] Style and security improvements for puncher.php.

---
 WEB-INF/templates/puncher.tpl | 2 +-
 default.css                   | 5 +++++
 initialize.php                | 2 +-
 puncher.php                   | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/puncher.tpl b/WEB-INF/templates/puncher.tpl
index b26e07c1d..8bbd07065 100644
--- a/WEB-INF/templates/puncher.tpl
+++ b/WEB-INF/templates/puncher.tpl
@@ -3,7 +3,7 @@ License: See license.txt *}
 
 {include file="time_script.tpl"}
 
-<p><span id="hour">00</span><span id="separator">:</span><span id="min">00</span>
+<div class="punch-timer"><span id="hour">00</span><span id="separator">:</span><span id="min">00</span></div>
 
 <script>
 var timerID = null;
diff --git a/default.css b/default.css
index 956c35ed5..dddc5eb3f 100644
--- a/default.css
+++ b/default.css
@@ -526,6 +526,11 @@ div.sitemap-item {
   margin: .4rem;
 }
 
+div.punch-timer {
+  font-size: 2rem;
+  color: blue;
+}
+
 /* media rules for small screens */
 @media screen and (max-width: 600px) {
 
diff --git a/initialize.php b/initialize.php
index a892a9c17..ed53fed28 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5565");
+define("APP_VERSION", "1.19.28.5566");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index cc910962d..a80aa8b53 100644
--- a/puncher.php
+++ b/puncher.php
@@ -15,6 +15,10 @@
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('pu')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 // End of access checks.
 
 $showClient = $user->isPluginEnabled('cl');

From 1a994fdefef1d873bbeec673917130a1d9097cc6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 May 2021 14:45:22 +0000
Subject: [PATCH 1582/1848] Added a list of day records to puncher.php page to
 improve usability.

---
 WEB-INF/templates/puncher.tpl | 90 +++++++++++++++++++++++++++++++++++
 initialize.php                |  2 +-
 puncher.php                   |  5 ++
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/templates/puncher.tpl b/WEB-INF/templates/puncher.tpl
index 8bbd07065..8060c2ff5 100644
--- a/WEB-INF/templates/puncher.tpl
+++ b/WEB-INF/templates/puncher.tpl
@@ -108,6 +108,96 @@ startTimer();
 </table>
 {if isset($forms.timeRecordForm.btn_start.control)}<div class="button-set">{$forms.timeRecordForm.btn_start.control}</div>{/if}
 {if isset($forms.timeRecordForm.btn_stop.control)}<div class="button-set">{$forms.timeRecordForm.btn_stop.control}</div>{/if}
+{if $time_records}
+<div class="record-list">
+<table class="x-scrollable-table">
+  <tr>
+  {if $show_client}
+    <th>{$i18n.label.client}</th>
+  {/if}
+  {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
+    {foreach $custom_fields->timeFields as $timeField}
+    <th>{$timeField['label']|escape}</th>
+    {/foreach}
+  {/if}
+  {if $show_project}
+    <th>{$i18n.label.project}</th>
+  {/if}
+  {if $show_task}
+    <th>{$i18n.label.task}</th>
+  {/if}
+  {if $show_start}
+    <th>{$i18n.label.start}</th>
+    <th>{$i18n.label.finish}</th>
+  {/if}
+    <th>{$i18n.label.duration}</th>
+  {if $show_note_column}
+    <th>{$i18n.label.note}</th>
+  {/if}
+  {if $show_files}
+    <th></th>
+  {/if}
+    <th></th>
+    <th></th>
+  </tr>
+  {foreach $time_records as $record}
+  <tr{if !$record.billable} class="not-billable"{/if}>
+    {if $show_client}
+    <td class="text-cell">{$record.client|escape}</td>
+    {/if}
+    {* record custom fileds *}
+    {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
+      {foreach $custom_fields->timeFields as $timeField}
+          {assign var="control_name" value='time_field_'|cat:$timeField['id']}
+    <td class="text-cell">{$record.$control_name|escape}</td>
+      {/foreach}
+    {/if}
+    {if $show_project}
+     <td class="text-cell">{$record.project|escape}</td>
+    {/if}
+    {if $show_task}
+    <td class="text-cell">{$record.task|escape}</td>
+    {/if}
+    {if $show_start}
+    <td class="time-cell">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+    <td class="time-cell">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+    {/if}
+    <td class="time-cell">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+    {if $show_note_column}
+    <td class="text-cell">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+    {/if}
+    {if $show_files}
+      {if $record.has_files}
+    <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-files.png"></a></td>
+      {else}
+    <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
+      {/if}
+    {/if}
+    <td>
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+      &nbsp;
+    {else}
+      <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
+    {/if}
+    </td>
+    <td>
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+      &nbsp;
+    {else}
+      <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="img/icon-delete.png"></a>
+    {/if}
+    </td>
+  </tr>
+    {if $show_note_row && $record.comment}
+  <tr>
+    <td class="note-header-cell">{$i18n.label.note}:</td>
+    <td colspan="{$colspan}" class="text-cell">{$record.comment|escape}</td>
+  </tr>
+    {/if}
+  {/foreach}
+</table>
+</div>
+{/if}
 {$forms.timeRecordForm.close}
 
 <div class="day-totals">
diff --git a/initialize.php b/initialize.php
index ed53fed28..37ee1c8ad 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5566");
+define("APP_VERSION", "1.19.28.5567");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index a80aa8b53..5d6bca7c0 100644
--- a/puncher.php
+++ b/puncher.php
@@ -295,6 +295,8 @@
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($cl_date);
+$timeRecords = ttTimeHelper::getRecords($cl_date);
+
 $smarty->assign('week_total', $week_total);
 $smarty->assign('uncompleted', $uncompleted);
 $smarty->assign('show_client', $showClient);
@@ -304,6 +306,9 @@
 $smarty->assign('task_required', $taskRequired);
 $smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
+$smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_record_custom_fields', $user->isOptionEnabled('record_custom_fields'));
+$smarty->assign('show_start', true);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);

From 8e3e44fe944ef5a6b89d2bc3dcd83d0e184f1358 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 May 2021 15:17:06 +0000
Subject: [PATCH 1583/1848] More progress addressing php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php    | 32 +++++++++++++++----------
 WEB-INF/lib/ttTimesheetHelper.class.php |  2 ++
 initialize.php                          |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 1efdaefd7..f1d0af717 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -695,7 +695,7 @@ static function getSubtotals($options) {
     while ($val = $res->fetchRow()) {
       $time = ttTimeHelper::minutesToDuration($val['time'] / 60);
       $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
-      if ($options['show_cost']) {
+      if (isset($options['show_cost']) && $options['show_cost']) {
         $decimalMark = $user->getDecimalMark();
         if ('.' != $decimalMark) {
           $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
@@ -1893,9 +1893,12 @@ static function makeGroupByFieldsPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
     $group_by_fields_parts = '';
-    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by1'], $options);
-    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by2'], $options);
-    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by3'], $options);
+    if (isset($options['group_by1']))
+      $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by1'], $options);
+    if (isset($options['group_by2']))
+      $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by2'], $options);
+    if (isset($options['group_by3']))
+      $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldPart($options['group_by3'], $options);
     return $group_by_fields_parts;
   }
 
@@ -1905,9 +1908,12 @@ static function makeGroupByFieldsExpensesPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
     $group_by_fields_parts = '';
-    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by1'], $options);
-    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by2'], $options);
-    $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by3'], $options);
+    if (isset($options['group_by1']))
+      $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by1'], $options);
+    if (isset($options['group_by2']))
+      $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by2'], $options);
+    if (isset($options['group_by3']))
+      $group_by_fields_parts .= ttReportHelper::makeSingleDropdownGroupByFieldExpensesPart($options['group_by3'], $options);
     return $group_by_fields_parts;
   }
 
@@ -1916,9 +1922,12 @@ static function makeConcatPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
     $concat_part = '';
-    $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by1'], $options);
-    $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by2'], $options);
-    $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by3'], $options);
+    if (isset($options['group_by1']))
+      $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by1'], $options);
+    if (isset($options['group_by2']))
+      $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by2'], $options);
+    if (isset($options['group_by3']))
+      $concat_part .= ttReportHelper::makeSingleDropdownConcatPart($options['group_by3'], $options);
     // Remove garbage from the beginning.
     if (ttStartsWith($concat_part, ", ' - ', "))
       $concat_part = substr($concat_part, 9);
@@ -2123,8 +2132,7 @@ static function makeWorkUnitPart($options) {
     global $user;
 
     $work_unit_part = '';
-    $workUnits = $options['show_work_units'];
-    if ($workUnits) {
+    if (isset($options['show_work_units']) && $options['show_work_units']) {
       $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
       $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
       $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 7b6cfa249..be3b393dc 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -91,6 +91,7 @@ static function getActiveTimesheets()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $filePart = $fileJoin = '';
     if ($user->isPluginEnabled('at')) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
@@ -124,6 +125,7 @@ static function getInactiveTimesheets()
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $filePart = $fileJoin = '';
     if ($user->isPluginEnabled('at')) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
diff --git a/initialize.php b/initialize.php
index 37ee1c8ad..569d9dcd6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5567");
+define("APP_VERSION", "1.19.28.5568");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0a8fdc22b58a2d8305aa1a15e47ae1fc3b267c66 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 May 2021 16:38:44 +0000
Subject: [PATCH 1584/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php | 34 ++++++++++++++++------------
 initialize.php                       |  2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index f1d0af717..bacd79c06 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -669,7 +669,7 @@ static function getSubtotals($options) {
     // By now we have sql for time items.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+    if (isset($options['show_cost']) && $options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
       $concat_part = ttReportHelper::makeConcatExpensesPart($options);
       $group_by_fields_part = ttReportHelper::makeGroupByFieldsExpensesPart($options);
@@ -742,13 +742,13 @@ static function getTotals($options)
     // Prepare parts.
     $time_part = $units_part = $cost_part = '';
     $time_part = "sum(time_to_sec(l.duration)) as time";
-    if ($options['show_work_units']) {
+    if (isset($options['show_work_units']) && $options['show_work_units']) {
       $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
       $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
       $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
       $units_part = $unitTotalsOnly ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
     }
-    if ($options['show_cost']) {
+    if (isset($options['show_cost']) && $options['show_cost']) {
       if (MODE_TIME == $trackingMode)
         $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
       else
@@ -798,7 +798,7 @@ static function getTotals($options)
         }
       }
     }
-    if ($options['show_cost']) {
+    if (isset($options['show_cost']) && $options['show_cost']) {
       if (MODE_TIME == $trackingMode) {
         $left_joins .= " left join tt_users u on (l.user_id = u.id)";
       } else {
@@ -807,7 +807,7 @@ static function getTotals($options)
     }
     // Prepare sql query part for inner joins.
     $inner_joins = null;
-    if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+    if ($user->isPluginEnabled('ts') && isset($options['timesheet']) && $options['timesheet']) {
       $timesheet_option = $options['timesheet'];
       if ($timesheet_option == TIMESHEET_PENDING)
         $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
@@ -820,7 +820,7 @@ static function getTotals($options)
     $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $inner_joins $where";
 
     // If we have expenses, query becomes a bit more complex.
-    if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
+    if (isset($options['show_cost']) && $options['show_cost'] && $user->isPluginEnabled('ex')) {
       $where = ttReportHelper::getExpenseWhere($options);
       $sql_for_expenses = "select null as time";
       if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
@@ -865,7 +865,7 @@ static function getTotals($options)
     $val = $res->fetchRow();
     $total_time = ttTimeHelper::minutesToDuration($val['time'] / 60);
     $total_cost = $total_expenses = null;
-    if ($options['show_cost']) {
+    if (isset($options['show_cost']) && $options['show_cost']) {
       $total_cost = $val['cost'];
       if (!$total_cost) $total_cost = '0.00';
       if ('.' != $decimalMark)
@@ -1674,9 +1674,12 @@ static function makeGroupByPart($options) {
     if (!ttReportHelper::grouping($options)) return null;
 
     $group_by_parts = '';
-    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by1'], $options);
-    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by2'], $options);
-    $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by3'], $options);
+    if (isset($options['group_by1']))
+      $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by1'], $options);
+    if (isset($options['group_by2']))
+      $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by2'], $options);
+    if (isset($options['group_by3']))
+      $group_by_parts .= ttReportHelper::makeSingleDropdownGroupByPart($options['group_by3'], $options);
     // Remove garbage from the beginning.
     $group_by_parts = ltrim($group_by_parts, ', ');
     $group_by_part = "group by $group_by_parts";
@@ -2067,7 +2070,7 @@ static function makeJoinPart($options) {
     if (ttReportHelper::groupingBy('task', $options)) {
       $left_joins .= ' left join tt_tasks t on (l.task_id = t.id)';
     }
-    if ($options['show_cost'] && $trackingMode != MODE_TIME) {
+    if (isset($options['show_cost']) && $options['show_cost'] && $trackingMode != MODE_TIME) {
       $left_joins .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
     }
     // Left joins for time custom fields.
@@ -2113,7 +2116,7 @@ static function makeJoinPart($options) {
 
     // Prepare inner joins.
     $inner_joins = null;
-    if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+    if ($user->isPluginEnabled('ts') && isset($options['timesheet']) && $options['timesheet']) {
       $timesheet_option = $options['timesheet'];
       if ($timesheet_option == TIMESHEET_PENDING)
         $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approve_status is null)";
@@ -2149,7 +2152,7 @@ static function makeCostPart($options) {
     global $user;
 
     $cost_part = '';
-    if ($options['show_cost']) {
+    if (isset($options['show_cost']) && $options['show_cost']) {
       if (MODE_TIME == $user->getTrackingMode())
         $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost";
       else
@@ -2216,7 +2219,10 @@ static function grouping($options) {
   // ('date', 'user', 'project', etc.) by checking group_by1, group_by2,
   // and group_by3 values passed in $options.
   static function groupingBy($what, $options) {
-    $grouping = ($options['group_by1'] == $what) || ($options['group_by2'] == $what) || ($options['group_by3'] == $what);
+    $grouping_by1 = isset($options['group_by1']) && $options['group_by1'] == $what;
+    $grouping_by2 = isset($options['group_by2']) && $options['group_by2'] == $what;
+    $grouping_by3 = isset($options['group_by3']) && $options['group_by3'] == $what;
+    $grouping = $grouping_by1 || $grouping_by2 || $grouping_by3;
     return $grouping;
   }
 
diff --git a/initialize.php b/initialize.php
index 569d9dcd6..4e5614b7e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5568");
+define("APP_VERSION", "1.19.28.5569");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d3e52c885335061f8fe5851dc91645fceb8ad2df Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 May 2021 17:41:27 +0000
Subject: [PATCH 1585/1848] Addressed a few more php8 watnings.

---
 WEB-INF/lib/ttReportHelper.class.php    | 9 +++++----
 WEB-INF/lib/ttTimesheetHelper.class.php | 8 +++++++-
 initialize.php                          | 2 +-
 timesheet_add.php                       | 1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index bacd79c06..68fc85b2d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -877,13 +877,14 @@ static function getTotals($options)
     }
 
     $dateFormat = $user->getDateFormat();
-    if ($options['period'])
+    if (isset($options['period']) && $options['period'])
       $period = new Period($options['period'], new DateAndTime($dateFormat));
     else {
       $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($dateFormat, $options['period_start']),
-        new DateAndTime($dateFormat, $options['period_end']));
+      if (isset($options['period_start']) && isset($options['period_end']))
+        $period->setPeriod(
+          new DateAndTime($dateFormat, $options['period_start']),
+          new DateAndTime($dateFormat, $options['period_end']));
     }
 
     $totals['start_date'] = $period->getStartDate();
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index be3b393dc..5ca3abe66 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -64,9 +64,11 @@ static function createTimesheet($fields)
     $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
 
     // Associate tt_log items with timesheet.
+    $client_id = $project_id = null;
     if (isset($fields['client'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
     // sql parts.
+    $client_part = $project_part = '';
     if ($client_id) $client_part = " and client_id = $client_id";
     if ($project_id) $project_part = " and project_id = $project_id";
 
@@ -440,6 +442,7 @@ static function timesheetItemsExist($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $client_id = $project_id = null;
     if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
@@ -450,6 +453,7 @@ static function timesheetItemsExist($fields) {
     $end = $end_date->toString(DB_DATEFORMAT);
 
     // sql parts.
+    $client_part = $project_part = '';
     if ($client_id) $client_part = " and client_id = $client_id";
     if ($project_id) $project_part = " and project_id = $project_id";
 
@@ -478,6 +482,7 @@ static function overlaps($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    $client_id = $project_id = null;
     if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
@@ -490,6 +495,7 @@ static function overlaps($fields) {
     $quoted_end = $mdb2->quote($end);
 
     // sql parts.
+    $client_part = $project_part = '';
     if ($client_id) $client_part = " and client_id = $client_id";
     if ($project_id) $project_part = " and project_id = $project_id";
 
@@ -501,7 +507,7 @@ static function overlaps($fields) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      if ($val['id']) {
+      if (isset($val['id']) && $val['id']) {
         return true;
       }
     }
diff --git a/initialize.php b/initialize.php
index 4e5614b7e..a1be5736b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5569");
+define("APP_VERSION", "1.19.28.5570");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/timesheet_add.php b/timesheet_add.php
index 7361c4f28..b52775f2f 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -17,6 +17,7 @@
 }
 // End of access checks.
 
+$cl_name = $cl_client = $cl_project = $cl_start = $cl_finish = $cl_comment = null;
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('timesheet_name'));
   $cl_client = $request->getParameter('client');

From ac247bc43a62991f1289d5d36b0a154a2f94cbe3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 May 2021 17:58:48 +0000
Subject: [PATCH 1586/1848] Some html fixes.

---
 WEB-INF/templates/timesheets.tpl                     | 12 ++++++------
 WEB-INF/templates/week.tpl                           |  1 +
 .../templates/work/{footer.tpl => footer_old.tpl}    |  0
 WEB-INF/templates/work/index.tpl                     |  2 +-
 initialize.php                                       |  2 +-
 template_add.php                                     |  2 ++
 template_edit.php                                    |  2 ++
 timesheet_files.php                                  |  1 +
 8 files changed, 14 insertions(+), 8 deletions(-)
 rename WEB-INF/templates/work/{footer.tpl => footer_old.tpl} (100%)

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index fe6a9603f..e5f9abdb6 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -5,18 +5,18 @@ License: See license.txt *}
   function chLocation(newLocation) { document.location = newLocation; }
 </script>
 
+{$forms.timesheetsForm.open}
 <table class="centered-table">
 {if $user_dropdown}
-  {$forms.timesheetsForm.open}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
     <td class="td-with-input">{$forms.timesheetsForm.user.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  {$forms.timesheetsForm.close}
 {/if}
 </table>
+{$forms.timesheetsForm.close}
 <div class="form-control-separator"></div>
 {if $inactive_timesheets}
 <div class="section-header">{$i18n.form.timesheets.active_timesheets}</div>
@@ -27,8 +27,8 @@ License: See license.txt *}
   {if $show_client}
     <th>{$i18n.label.client}</th>
   {/if}
-    <th>{$i18n.label.submitted}</td>
-    <th>{$i18n.label.approved}</td>
+    <th>{$i18n.label.submitted}</th>
+    <th>{$i18n.label.approved}</th>
   {if $show_files}
     <th></th>
   {/if}
@@ -68,8 +68,8 @@ License: See license.txt *}
   {if $show_client}
     <th>{$i18n.label.client}</th>
   {/if}
-    <th>{$i18n.label.submitted}</td>
-    <th>{$i18n.label.approved}</td>
+    <th>{$i18n.label.submitted}</th>
+    <th>{$i18n.label.approved}</th>
   {if $show_files}
     <th></th>
   {/if}
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 42fa0b34e..41568f601 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -195,4 +195,5 @@ function fillDropdowns() {
   </tr>
   {/if}
 </table>
+</div>
 {/if}
diff --git a/WEB-INF/templates/work/footer.tpl b/WEB-INF/templates/work/footer_old.tpl
similarity index 100%
rename from WEB-INF/templates/work/footer.tpl
rename to WEB-INF/templates/work/footer_old.tpl
diff --git a/WEB-INF/templates/work/index.tpl b/WEB-INF/templates/work/index.tpl
index 3c6500821..c4f193521 100644
--- a/WEB-INF/templates/work/index.tpl
+++ b/WEB-INF/templates/work/index.tpl
@@ -2,4 +2,4 @@
 
 {if $content_page_name}{include file="$content_page_name"}{/if}
 
-{include file="work/footer.tpl"}
+{include file="work/footer_old.tpl"}
diff --git a/initialize.php b/initialize.php
index a1be5736b..666e412c0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5570");
+define("APP_VERSION", "1.19.28.5571");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/template_add.php b/template_add.php
index cb84fb33b..8eef424ef 100644
--- a/template_add.php
+++ b/template_add.php
@@ -19,9 +19,11 @@
 
 $config = new ttConfigHelper($user->getConfig());
 $bindTemplatesWithProjects = $config->getDefinedValue('bind_templates_with_projects');
+$projects = $cl_projects = array();
 if ($bindTemplatesWithProjects)
   $projects = ttGroupHelper::getActiveProjects();
 
+$cl_name = $cl_description = $cl_content = null;
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
diff --git a/template_edit.php b/template_edit.php
index 814eff591..2f3c69727 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -25,9 +25,11 @@
 
 $config = $user->getConfigHelper();
 $bindTemplatesWithProjects = $config->getDefinedValue('bind_templates_with_projects');
+$projects = $cl_projects = array();
 if ($bindTemplatesWithProjects)
   $projects = ttGroupHelper::getActiveProjects();
 
+$cl_name = $cl_description = $cl_content = $cl_status = null;
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
diff --git a/timesheet_files.php b/timesheet_files.php
index bca00f28d..bec4e29d8 100644
--- a/timesheet_files.php
+++ b/timesheet_files.php
@@ -24,6 +24,7 @@
 }
 // End of access checks.
 
+$cl_description = null;
 if ($request->isPost()) {
   $cl_description = trim($request->getParameter('description'));
 }

From 8f576b10e996d468d28febf8767d0bc95b824421 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 May 2021 22:20:28 +0000
Subject: [PATCH 1587/1848] Addressed several more php8 warnings.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 12 ++++-----
 WEB-INF/lib/ttRoleHelper.class.php      | 33 ++++---------------------
 initialize.php                          |  2 +-
 role_add.php                            |  1 +
 topdf.php                               | 21 ++++++++--------
 5 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index b4f917a4a..d1cce7240 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -399,7 +399,7 @@ static function loadReport(&$bean) {
         'chtotalsonly' => null,
         'new_fav_report' => null));
       // Time custom fields.
-      if ($custom_fields && $custom_fields->timeFields) {
+      if (isset($custom_fields) && $custom_fields->timeFields) {
         foreach ($custom_fields->timeFields as $timeField) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_field_name = 'show_'.$field_name;
@@ -408,7 +408,7 @@ static function loadReport(&$bean) {
         }
       }
       // User custom fields.
-      if ($custom_fields && $custom_fields->userFields) {
+      if (isset($custom_fields) && $custom_fields->userFields) {
         foreach ($custom_fields->userFields as $userField) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
@@ -416,7 +416,7 @@ static function loadReport(&$bean) {
           $custom_field_attrs[$checkbox_field_name] = null;
         }
       }
-      if (is_array($custom_field_attrs))
+      if (isset($custom_field_attrs))
         $attrs = array_merge($attrs, $custom_field_attrs);
       $bean->setAttributes($attrs);
     }
@@ -543,7 +543,7 @@ static function makeReportSpec($bean) {
     }
 
     // Add time custom field settings.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $field_value = str_replace(',','&#44',$bean->getAttribute($field_name)); 
@@ -555,7 +555,7 @@ static function makeReportSpec($bean) {
     }
 
     // Add user custom field settings.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $field_value = str_replace(',','&#44',$bean->getAttribute($field_name));
@@ -567,7 +567,7 @@ static function makeReportSpec($bean) {
     }
 
     $reportSpec = null;
-    if (is_array($reportSpecArray))
+    if (isset($reportSpecArray))
       $reportSpec = implode(',', $reportSpecArray);
     return $reportSpec;
   }
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index a3753d238..683f7ebaf 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // The ttRoleHelper is a class to help with custom group roles.
 class ttRoleHelper {
@@ -62,7 +38,7 @@ static function getRoleByName($role_name) {
 
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      if ($val['id'])
+      if (isset($val['id']) && $val['id'])
         return $val;
     }
     return false;
@@ -115,7 +91,7 @@ static function getRoleByRank($rank) {
 
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      if ($val['id'])
+      if (isset($val['id']) && $val['id'])
         return $val['id'];
     }
     return false;
@@ -130,6 +106,7 @@ static function update($fields) {
     $org_id = $user->org_id;
 
     $id = (int)$fields['id'];
+    $name_part = $rank_part = $descr_part = $status_part = $rights_part = '';
     if (isset($fields['name'])) $name_part = 'name = '.$mdb2->quote($fields['name']);
     if (isset($fields['rank'])) $rank_part = ', `rank` = '.(int)$fields['rank'];
     if (isset($fields['description'])) $descr_part = ', description = '.$mdb2->quote($fields['description']);
diff --git a/initialize.php b/initialize.php
index 666e412c0..2493a2154 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5571");
+define("APP_VERSION", "1.19.28.5572");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/role_add.php b/role_add.php
index b2879dd8f..b4e05f903 100644
--- a/role_add.php
+++ b/role_add.php
@@ -12,6 +12,7 @@
   exit();
 }
 
+$cl_name = $cl_description = $cl_rank = null;
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
diff --git a/topdf.php b/topdf.php
index aa840e106..85ff8d84e 100644
--- a/topdf.php
+++ b/topdf.php
@@ -46,6 +46,7 @@
 // Obtain items for report.
 $options = ttReportHelper::getReportOptions($bean);
 $grouping = ttReportHelper::grouping($options);
+$items = null;
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
 if ($totals_only || $grouping)
@@ -128,7 +129,7 @@
   $html .= '<td>'.$i18n->get('label.date').'</td>';
   if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) { $colspan++; $html .= '<td>'.$i18n->get('label.user').'</td>'; }
   // User custom field labels.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($custom_fields->userFields as $userField) {
       $field_name = 'user_field_'.$userField['id'];
       $checkbox_control_name = 'show_'.$field_name;
@@ -139,7 +140,7 @@
   if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->get('label.project').'</td>'; }
   if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->get('label.task').'</td>'; }
   // Time custom field labels.
-  if ($custom_fields && $custom_fields->timeFields) {
+  if (isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $field_name = 'time_field_'.$timeField['id'];
       $checkbox_control_name = 'show_'.$field_name;
@@ -174,7 +175,7 @@
             $html .= '</td>';
         }
         // User custom fields.
-        if ($custom_fields && $custom_fields->userFields) {
+        if (isset($custom_fields) && $custom_fields->userFields) {
           foreach ($custom_fields->userFields as $userField) {
             $field_name = 'user_field_'.$userField['id'];
             $checkbox_control_name = 'show_'.$field_name;
@@ -197,7 +198,7 @@
             $html .= '</td>';
         }
         // Time custom fields.
-        if ($custom_fields && $custom_fields->timeFields) {
+        if (isset($custom_fields) && $custom_fields->timeFields) {
           foreach ($custom_fields->timeFields as $timeField) {
             $field_name = 'time_field_'.$timeField['id'];
             $checkbox_control_name = 'show_'.$field_name;
@@ -242,7 +243,7 @@
     $html .= '<td>'.$item['date'].'</td>';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= '<td>'.htmlspecialchars($item['user']).'</td>';
     // User custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_control_name = 'show_'.$field_name;
@@ -253,7 +254,7 @@
     if ($bean->getAttribute('chproject')) $html .= '<td>'.htmlspecialchars($item['project']).'</td>';
     if ($bean->getAttribute('chtask')) $html .= '<td>'.htmlspecialchars($item['task']).'</td>';
     // Time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_control_name = 'show_'.$field_name;
@@ -314,7 +315,7 @@
       $html .= '</td>';
     }
     // User custom fields.
-    if ($custom_fields && $custom_fields->userFields) {
+    if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
         $checkbox_control_name = 'show_'.$field_name;
@@ -337,7 +338,7 @@
       $html .= '</td>';
     }
     // Time custom fields.
-    if ($custom_fields && $custom_fields->timeFields) {
+    if (isset($custom_fields) && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
         $field_name = 'time_field_'.$timeField['id'];
         $checkbox_control_name = 'show_'.$field_name;
@@ -371,7 +372,7 @@
   $html .= '<td>'.$i18n->get('label.total').'</td>';
   if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= '<td></td>';
   // User custom fields.
-  if ($custom_fields && $custom_fields->userFields) {
+  if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($custom_fields->userFields as $userField) {
       $field_name = 'user_field_'.$userField['id'];
       $checkbox_control_name = 'show_'.$field_name;
@@ -382,7 +383,7 @@
   if ($bean->getAttribute('chproject')) $html .= '<td></td>';
   if ($bean->getAttribute('chtask')) $html .= '<td></td>';
   // Time custom fields.
-  if ($custom_fields && $custom_fields->timeFields) {
+  if (isset($custom_fields) && $custom_fields->timeFields) {
     foreach ($custom_fields->timeFields as $timeField) {
       $field_name = 'time_field_'.$timeField['id'];
       $checkbox_control_name = 'show_'.$field_name;

From c90d809986888e191292af4ce5660a64f12c040a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 19 May 2021 18:58:44 +0000
Subject: [PATCH 1588/1848] Eliminated 2 more php8 warnings.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 4 ++--
 initialize.php                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index d1cce7240..be23f6a39 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -304,7 +304,7 @@ static function loadReport(&$bean) {
       if ($val['report_spec']) {
         $report_spec = $val['report_spec'];
         // Time custom field settings.
-        if ($custom_fields && $custom_fields->timeFields) {
+        if (isset($custom_fields) && $custom_fields->timeFields) {
           foreach ($custom_fields->timeFields as $timeField) {
             $field_name = 'time_field_'.$timeField['id'];
             $checkbox_field_name = 'show_'.$field_name;
@@ -315,7 +315,7 @@ static function loadReport(&$bean) {
           }
         }
         // User custom field settings.
-        if ($custom_fields && $custom_fields->userFields) {
+        if (isset($custom_fields) && $custom_fields->userFields) {
           foreach ($custom_fields->userFields as $userField) {
             $field_name = 'user_field_'.$userField['id'];
             $checkbox_field_name = 'show_'.$field_name;
diff --git a/initialize.php b/initialize.php
index 2493a2154..3d348f59a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5572");
+define("APP_VERSION", "1.19.28.5573");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 273e129c8e1a28ce5d8d0a425caf3865332d3bda Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 15:22:58 +0000
Subject: [PATCH 1589/1848] Starting to integrate newly translated pt-br
 strings from pr #111.

---
 WEB-INF/resources/ca.lang.php    |  1 -
 WEB-INF/resources/cs.lang.php    |  1 -
 WEB-INF/resources/da.lang.php    |  1 -
 WEB-INF/resources/de.lang.php    |  2 --
 WEB-INF/resources/en.lang.php    |  1 -
 WEB-INF/resources/es.lang.php    |  1 -
 WEB-INF/resources/et.lang.php    |  1 -
 WEB-INF/resources/fa.lang.php    |  1 -
 WEB-INF/resources/fi.lang.php    |  1 -
 WEB-INF/resources/fr.lang.php    |  1 -
 WEB-INF/resources/gr.lang.php    |  2 --
 WEB-INF/resources/he.lang.php    |  1 -
 WEB-INF/resources/hu.lang.php    |  2 --
 WEB-INF/resources/it.lang.php    |  2 --
 WEB-INF/resources/ja.lang.php    |  1 -
 WEB-INF/resources/ko.lang.php    |  1 -
 WEB-INF/resources/nl.lang.php    |  1 -
 WEB-INF/resources/no.lang.php    |  1 -
 WEB-INF/resources/pl.lang.php    |  1 -
 WEB-INF/resources/pt-br.lang.php | 21 +++++++--------------
 WEB-INF/resources/pt.lang.php    |  1 -
 WEB-INF/resources/ro.lang.php    |  1 -
 WEB-INF/resources/ru.lang.php    |  1 -
 WEB-INF/resources/sk.lang.php    |  1 -
 WEB-INF/resources/sl.lang.php    |  1 -
 WEB-INF/resources/sr.lang.php    |  1 -
 WEB-INF/resources/sv.lang.php    |  2 --
 WEB-INF/resources/tr.lang.php    |  1 -
 WEB-INF/resources/zh-cn.lang.php |  1 -
 WEB-INF/resources/zh-tw.lang.php |  1 -
 initialize.php                   |  2 +-
 31 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b1fbd33ce..333d78abe 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -40,7 +40,6 @@
 'menu.users' => 'Usuaris',
 'menu.groups' => 'Grups',
 // TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clients',
 'menu.options' => 'Opcions',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 97f37507f..a7a3fbdb5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -41,7 +41,6 @@
 'menu.users' => 'Uživatelů',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Export',
 'menu.clients' => 'Zákazníci',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index dd185700f..f2e0ff43e 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => 'Brugere',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Indstillinger',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ed2d2587a..7a8318646 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -37,8 +37,6 @@
 'menu.tasks' => 'Aufgaben',
 'menu.users' => 'Personen',
 'menu.groups' => 'Gruppen',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportieren',
 'menu.clients' => 'Kunden',
 'menu.options' => 'Optionen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 80ef82777..4da63222f 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -21,7 +21,6 @@
 'menu.register' => 'Register',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
-'menu.subgroups' => 'Subgroups',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
 'menu.puncher' => 'Punch',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c50f388b9..571c167c8 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -39,7 +39,6 @@
 'menu.users' => 'Personas',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opciones',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 573d684c6..15888784d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -38,7 +38,6 @@
 'menu.tasks' => 'Tööülesanded',
 'menu.users' => 'Kasutajad',
 'menu.groups' => 'Grupid',
-'menu.subgroups' => 'Alamgrupid',
 'menu.export' => 'Eksport', // TODO: is this a correct term as an opposite of "Import"?
 'menu.clients' => 'Kliendid',
 'menu.options' => 'Suvandid',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2e2718eb7..f9ae9a082 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -39,7 +39,6 @@
 'menu.users' => 'کاربران',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'پشتیبانی',
 'menu.clients' => 'مشتری ها',
 'menu.options' => 'تنظیمات',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 534a94b8c..bcfe62417 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => 'Käyttäjät',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Vie',
 'menu.clients' => 'Asiakkaat',
 'menu.options' => 'Optiot',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 0b55172df..d0170ebda 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => 'Utilisateurs',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exporter',
 'menu.clients' => 'Clients',
 'menu.options' => 'Options',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f8bdb0dc5..b8e6789c0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -36,8 +36,6 @@
 'menu.tasks' => 'Εργασίες',
 'menu.users' => 'Χρήστες',
 'menu.groups' => 'Ομάδες',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Εξαγωγή',
 'menu.clients' => 'Πελάτες',
 'menu.options' => 'Επιλογές',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7505f0965..011b5f573 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -39,7 +39,6 @@
 'menu.users' => 'משתמשים',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'ייצוא',
 'menu.clients' => 'לקוחות',
 'menu.options' => 'אפשרויות',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 052dbe72e..f8fb388d6 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -41,8 +41,6 @@
 // 'menu.users' => 'Users',
 'menu.groups' => 'Csoportok',
 // TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
-// TODO: translate the following.
 // 'menu.export' => 'Export',
 'menu.clients' => 'Ügyfelek',
 'menu.options' => 'Opciók',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 55faab87c..4e2bdfb2f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -38,8 +38,6 @@
 'menu.tasks' => 'Compiti',
 'menu.users' => 'Utenti',
 'menu.groups' => 'Gruppi',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Esportazione',
 'menu.clients' => 'Clienti',
 'menu.options' => 'Opzioni',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 57f5592df..15db98a04 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -40,7 +40,6 @@
 'menu.users' => 'ユーザー',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'クライアント',
 'menu.options' => 'オプション',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 832464fbc..8f22ae323 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -40,7 +40,6 @@
 'menu.users' => '사용자',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => '클라이언트',
 'menu.options' => '옵션',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 66c32ea5a..378216466 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -34,7 +34,6 @@
 'menu.tasks' => 'Taken',
 'menu.users' => 'Medewerkers',
 'menu.groups' => 'Groepen',
-'menu.subgroups' => 'Subgroepen',
 'menu.export' => 'Exporteren',
 'menu.clients' => 'Klanten',
 'menu.options' => 'Opties',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 3929ac4bc..b13b942f5 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -41,7 +41,6 @@
 'menu.users' => 'Brukere',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienter',
 'menu.options' => 'Opsjoner',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 98018f677..144ea434d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => 'Użytkownicy',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Eksport',
 'menu.clients' => 'Klienci',
 'menu.options' => 'Opcje',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3fdfae2d1..a67633ab7 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -5,7 +5,7 @@
 // Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
-$i18n_language = 'Portuguese (Português brasileiro)';
+$i18n_language = 'Portuguese (Português Brasileiro)';
 $i18n_months = array('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro');
 $i18n_weekdays = array('Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado');
 $i18n_weekdays_short = array('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab');
@@ -18,27 +18,20 @@
 'menu.logout' => 'Logout',
 'menu.forum' => 'Fórum',
 'menu.help' => 'Ajuda',
-// TODO: translate the following.
-// 'menu.register' => 'Register',
+'menu.register' => 'Registro',
 'menu.profile' => 'Perfil',
-// TODO: translate the following.
-// 'menu.group' => 'Group',
+'menu.group' => 'Grupo',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tempo',
-// TODO: translate the following.
-// 'menu.puncher' => 'Punch',
-// 'menu.week' => 'Week',
-'menu.expenses' => 'Gastos',
+'menu.puncher' => 'Punch',
+'menu.week' => 'Semana',
+'menu.expenses' => 'Despesas',
 'menu.reports' => 'Relatórios',
-// TODO: translate the following.
-// 'menu.timesheets' => 'Timesheets',
+'menu.timesheets' => 'Planilha de horas',
 'menu.charts' => 'Gráficos',
 'menu.projects' => 'Projetos',
 'menu.tasks' => 'Tarefas',
 'menu.users' => 'Usuários',
-// TODO: translate the following.
-// 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportar',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opções',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9cdaffd82..585db686f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -42,7 +42,6 @@
 'menu.users' => 'Usuários',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 // 'menu.clients' => 'Clients',
 'menu.options' => 'Opções',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 7e42575c3..eb99020fa 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -42,7 +42,6 @@
 'menu.users' => 'Utilizatori',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Clienti',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c74e45bc5..e5e767ff4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -33,7 +33,6 @@
 'menu.tasks' => 'Задачи',
 'menu.users' => 'Пользователи',
 'menu.groups' => 'Группы',
-'menu.subgroups' => 'Подгруппы',
 'menu.export' => 'Экспорт',
 'menu.clients' => 'Клиенты',
 'menu.options' => 'Опции',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 574a283f5..dcdcb8c81 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => 'Používatelia',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Export',
 'menu.clients' => 'Klienti',
 'menu.options' => 'Nastavenia',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index a2ce91ee7..095b12f30 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -40,7 +40,6 @@
 // 'menu.tasks' => 'Tasks',
 // 'menu.users' => 'Users',
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Stranke',
 'menu.options' => 'Možnosti',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b876161b5..73a1dce54 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => 'Korisnici',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Izvoz',
 'menu.clients' => 'Klijenti',
 'menu.options' => 'Opcije',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3f4cc33bc..764671820 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -36,8 +36,6 @@
 'menu.tasks' => 'Arbetsuppgifter',
 'menu.users' => 'Användare',
 'menu.groups' => 'Grupper',
-// TODO: translate the following.
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => 'Exportera',
 'menu.clients' => 'Kunder',
 'menu.options' => 'Alternativ',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index bf768a1b6..5e7ee26d1 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -42,7 +42,6 @@
 'menu.users' => 'Kullanıcılar',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 // 'menu.export' => 'Export',
 'menu.clients' => 'Müşteriler',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 00095186b..d10d1c7c3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => '用户',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => '导出数据',
 'menu.clients' => '客户',
 'menu.options' => '选项',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index d4fa2a9f8..f1a6a6e30 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -38,7 +38,6 @@
 'menu.users' => '用戶',
 // TODO: translate the following.
 // 'menu.groups' => 'Groups',
-// 'menu.subgroups' => 'Subgroups',
 'menu.export' => '輸出資料',
 'menu.clients' => '客戶',
 'menu.options' => '選項',
diff --git a/initialize.php b/initialize.php
index 3d348f59a..c47a19f44 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5573");
+define("APP_VERSION", "1.19.28.5574");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 5ff85207b6b74ed20d665de27263d8256bbab5e1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 16:00:41 +0000
Subject: [PATCH 1590/1848] Work in progress integrating changes from pr #111.

---
 WEB-INF/resources/pt-br.lang.php | 51 ++++++++++++++------------------
 initialize.php                   |  2 +-
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index a67633ab7..b7203dea6 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -32,6 +32,7 @@
 'menu.projects' => 'Projetos',
 'menu.tasks' => 'Tarefas',
 'menu.users' => 'Usuários',
+'menu.groups' => 'Grupos',
 'menu.export' => 'Exportar',
 'menu.clients' => 'Clientes',
 'menu.options' => 'Opções',
@@ -46,59 +47,51 @@
 'error.access_denied' => 'Acesso negado.',
 'error.sys' => 'Erro no sistema.',
 'error.db' => 'Erro no banco de dados.',
-// TODO: translate the following.
-// 'error.registered_recently' => 'Registered recently.',
-// 'error.feature_disabled' => 'Feature is disabled.',
+'error.registered_recently' => 'Registrado recentemente.',
+'error.feature_disabled' => 'Recurso desabilitado.',
 'error.field' => 'Dados incorretos "{0}".',
 'error.empty' => 'Campo "{0}" está vazio.',
 'error.not_equal' => 'Campo "{0}" é diferente do campo "{1}".',
-// TODO: translate the following.
-// 'error.interval' => 'Field "{0}" must be greater than "{1}".',
+'error.interval' => 'Campo "{0}" precisa ser maior que "{1}".',
 'error.project' => 'Selecione projeto.',
 'error.task' => 'Selecione tarefa.',
 'error.client' => 'Selecione cliente.',
 'error.report' => 'Selecione relatório.',
-// TODO: translate the following.
-// 'error.record' => 'Select record.',
+'error.record' => 'Selecione o registro.',
 'error.auth' => 'Usuário ou senha incorretos.',
 'error.user_exists' => 'Já existe usuário com este login.',
-// TODO: translate the following.
-// 'error.object_exists' => 'Object with this name already exists.',
+'error.object_exists' => 'Já existe um objeto com este nome.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
-// TODO: translate the following.
-// 'error.role_exists' => 'Role with this rank already exists.',
+// TODO: improve translation of the word "role" in error.role_exists. função here, papel elsewhere?
+'error.role_exists' => 'Já existe uma função com este rank.',
 'error.no_invoiceable_items' => 'Não há items faturáveis.',
-// TODO: translate the following.
-// 'error.no_records' => 'There are no records.',
+'error.no_records' => 'Não há registros.',
 'error.no_login' => 'Não há usuário com este login.',
-'error.no_groups' => 'Sua base de dados está vazia. Entre como admin e crie uma equipe nova.', // TODO: replace "team" with "group".
+'error.no_groups' => 'Sua base de dados está vazia. Entre como admin e crie um grupo novo.',
 'error.upload' => 'Erro no envio do arquivo.',
 'error.range_locked' => 'Período está bloqueado.',
 'error.mail_send' => 'Erro enviando o e-mail.',
-// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
-// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
+// TODO: is "Use" in error.mail_send translated correctly?
+'error.mail_send' => 'Erro ao enviar e-mail. Use MAIL_SMTP_DEBUG para diagnósticos.',
 'error.no_email' => 'Não há e-mail associado a este login.',
 'error.uncompleted_exists' => 'Entrada incompleta existente. Feche ou remova-a.',
 'error.goto_uncompleted' => 'Ir até a entrada incompleta.',
 'error.overlap' => 'O intervalo se sobrepõe com entradas já existentes.',
 'error.future_date' => 'Data é no futuro.',
-// TODO: translate the following.
-// '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.',
-// 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
+'error.xml' => 'Erro no arquivo XML, linha line %d: %s.',
+'error.cannot_import' => 'Não foi possível importar: %s.',
+'error.format' => 'Formato de arquivo inválido.',
+'error.user_count' => 'Limite na contagem de usuários.',
+'error.expired' => 'Data de expiração atingida.',
+'error.file_storage' => 'Erro relacionado ao servidor de armazenamento de arquivos.',
+'error.remote_work' => 'Erro relacionado ao servidor responsável pelo plugin work.',
 
 // Warning messages.
-// TODO: translate the following.
-// 'warn.sure' => 'Are you sure?',
-// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
+'warn.sure' => 'Tem certeza?',
+'warn.confirm_save' => 'A data mudou. Confirme salvando, não copiando este item.',
 
 // Success messages.
-// TODO: translate the following.
-// 'msg.success' => 'Operation completed successfully.',
+'msg.success' => 'Operação concluída com sucesso.',
 
 // Labels for buttons.
 'button.login' => 'Login',
diff --git a/initialize.php b/initialize.php
index c47a19f44..88b47d256 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5574");
+define("APP_VERSION", "1.19.28.5575");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 565d1b835511f1af29f945d3c944645a0bda57d3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 17:57:11 +0000
Subject: [PATCH 1591/1848] A bit more progress integrating pr #111.

---
 WEB-INF/resources/ca.lang.php    |  2 -
 WEB-INF/resources/cs.lang.php    |  2 -
 WEB-INF/resources/da.lang.php    |  2 -
 WEB-INF/resources/de.lang.php    |  2 -
 WEB-INF/resources/en.lang.php    |  2 -
 WEB-INF/resources/es.lang.php    |  2 -
 WEB-INF/resources/et.lang.php    |  2 -
 WEB-INF/resources/fa.lang.php    |  2 -
 WEB-INF/resources/fi.lang.php    |  2 -
 WEB-INF/resources/fr.lang.php    |  2 -
 WEB-INF/resources/gr.lang.php    |  2 -
 WEB-INF/resources/he.lang.php    |  2 -
 WEB-INF/resources/hu.lang.php    |  2 -
 WEB-INF/resources/it.lang.php    |  2 -
 WEB-INF/resources/ja.lang.php    |  2 -
 WEB-INF/resources/ko.lang.php    |  2 -
 WEB-INF/resources/nl.lang.php    |  2 -
 WEB-INF/resources/no.lang.php    |  2 -
 WEB-INF/resources/pl.lang.php    |  2 -
 WEB-INF/resources/pt-br.lang.php | 97 ++++++++++++++------------------
 WEB-INF/resources/pt.lang.php    |  2 -
 WEB-INF/resources/ro.lang.php    |  2 -
 WEB-INF/resources/ru.lang.php    |  2 -
 WEB-INF/resources/sk.lang.php    |  2 -
 WEB-INF/resources/sl.lang.php    |  2 -
 WEB-INF/resources/sr.lang.php    |  2 -
 WEB-INF/resources/sv.lang.php    |  2 -
 WEB-INF/resources/tr.lang.php    |  2 -
 WEB-INF/resources/zh-cn.lang.php |  2 -
 WEB-INF/resources/zh-tw.lang.php |  2 -
 initialize.php                   |  2 +-
 31 files changed, 42 insertions(+), 115 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 333d78abe..1f735771e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -260,8 +260,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a7a3fbdb5..b180b884e 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -270,8 +270,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index f2e0ff43e..9c6aea90d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -252,8 +252,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktive Brugere',
 'label.inactive_users' => 'Inaktive Brugere',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 7a8318646..d2dff2a08 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -244,8 +244,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
 // TODO: translate the following or confirm that "Details" is also correct for German (exactly as the English string).
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4da63222f..d7fb49ac4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -234,8 +234,6 @@
 'label.attachments' => 'Attachments',
 'label.files' => 'Files',
 'label.file' => 'File',
-'label.image' => 'Image',
-'label.download' => 'Download',
 'label.active_users' => 'Active Users',
 'label.inactive_users' => 'Inactive Users',
 'label.details' => 'Details',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 571c167c8..c352f5d9a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -263,8 +263,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 15888784d..c4ab61d3a 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -260,8 +260,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktiivsed kasutajad',
 'label.inactive_users' => 'Mitteaktiivsed kasutajad',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f9ae9a082..dfff12bd2 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -263,8 +263,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'کاربران فعال',
 'label.inactive_users' => 'کاربران غیرفعال',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index bcfe62417..f624a91d1 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -256,8 +256,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktiiviset käyttäjät',
 'label.inactive_users' => 'Ei-aktiiviset käyttäjät',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d0170ebda..f3e0c862a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -250,8 +250,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Utilisateurs actifs',
 'label.inactive_users' => 'Utilisateurs inactifs',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index b8e6789c0..b5ba3bf3e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -245,8 +245,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Ενεργοί χρήστες',
 'label.inactive_users' => 'Ανενεργοί χρήστες',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 011b5f573..f85fbb544 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -271,8 +271,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'משתמשים פעילים',
 'label.inactive_users' => 'משתמשים לא פעילים',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f8fb388d6..791105b34 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -265,8 +265,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 4e2bdfb2f..2654c6398 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -249,8 +249,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Utenti attivi',
 'label.inactive_users' => 'Utenti inattivi',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 15db98a04..b9d84a9ac 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -270,8 +270,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 8f22ae323..f1cff3fc4 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -270,8 +270,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 378216466..dfd469993 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -228,8 +228,6 @@
 'label.attachments' => 'Bijlagen',
 'label.files' => 'Bestanden',
 'label.file' => 'Bestand',
-'label.image' => 'Afbeelding',
-'label.download' => 'Download',
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
 'label.details' => 'Details',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b13b942f5..3511faec7 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -267,8 +267,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 144ea434d..dd4deeadd 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -257,8 +257,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktywni użytkownicy',
 'label.inactive_users' => 'Nieaktywni użytkownicy',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b7203dea6..40f7a8362 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -110,16 +110,13 @@
 'button.export' => 'Exportar equipe', // TODO: replace "team" with "group".
 'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
 'button.close' => 'Fechar',
-// TODO: translate the following.
-// 'button.start' => 'Start',
+'button.start' => 'Iniciar',
 'button.stop' => 'Parar',
-// TODO: translate the following.
-// 'button.approve' => 'Approve',
-// 'button.disapprove' => 'Disapprove',
+'button.approve' => 'Aprovar',
+'button.disapprove' => 'Desaprovar',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-// TODO: translate the following.
-// 'label.menu' => 'Menu',
+'label.menu' => 'Menu',
 'label.group_name' => 'Nome da equipe',  // TODO: replace "team" with "group".
 'label.address' => 'Endereço',
 'label.currency' => 'Moeda',
@@ -132,18 +129,16 @@
 'label.confirm_password' => 'Confirme a senha',
 'label.email' => 'E-mail',
 'label.cc' => 'Cc',
-// TODO: translate the following.
-// 'label.bcc' => 'Bcc',
+'label.bcc' => 'Bcc',
 'label.subject' => 'Assunto',
 'label.date' => 'Data',
 'label.start_date' => 'Data inicial',
 'label.end_date' => 'Data final',
 'label.user' => 'Usuário',
 'label.users' => 'Usuários',
-// TODO: translate the following.
-// 'label.group' => 'Group',
-// 'label.subgroups' => 'Subgroups',
-// 'label.roles' => 'Roles',
+'label.group' => 'Grupo',
+'label.subgroups' => 'Subgrupos',
+'label.roles' => 'Papéis',
 'label.client' => 'Cliente',
 'label.clients' => 'Clientes',
 'label.option' => 'Opção',
@@ -157,16 +152,13 @@
 'label.finish' => 'Fim',
 'label.duration' => 'Duração',
 'label.note' => 'Anotação',
-// TODO: translate the following.
-// 'label.notes' => 'Notes',
+'label.notes' => 'Anotações',
 'label.item' => 'Item',
 'label.cost' => 'Custo',
-// TODO: translate the following.
-// 'label.ip' => 'IP',
+'label.ip' => 'IP',
 'label.day_total' => 'Total diário',
 'label.week_total' => 'Total semanal',
-// TODO: translate the following.
-// 'label.month_total' => 'Month total',
+'label.month_total' => 'Total mensal',
 'label.today' => 'Hoje',
 'label.view' => 'Ver',
 'label.edit' => 'Editar',
@@ -174,10 +166,9 @@
 'label.configure' => 'Configurar',
 'label.select_all' => 'Selecionar todos',
 'label.select_none' => 'Desmarcar todos',
-// TODO: translate the following.
-// 'label.day_view' => 'Day view',
-// 'label.week_view' => 'Week view',
-// 'label.puncher' => 'Puncher',
+'label.day_view' => 'Visão diária',
+'label.week_view' => 'Visão semanal',
+'label.puncher' => 'Puncher',
 'label.id' => 'ID',
 'label.language' => 'Idioma',
 'label.decimal_mark' => 'Ponto decimal',
@@ -200,17 +191,14 @@
 'label.role_comanager' => '(coordenador)',
 'label.role_admin' => '(administrador)',
 'label.page' => 'Página',
-// TODO: translate the following.
-// 'label.condition' => 'Condition',
-// 'label.yes' => 'yes',
-// 'label.no' => 'no',
-// 'label.sort' => 'Sort',
+'label.condition' => 'Condição',
+'label.yes' => 'sim',
+'label.no' => 'não',
+'label.sort' => 'Ordenar',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campos personalizados',
-// Translate the following.
-// 'label.monthly_quotas' => 'Monthly quotas',
-// TODO: translate the following.
-// 'label.entity' => 'Entity',
+'label.monthly_quotas' => 'Cotas mensais',
+'label.entity' => 'Entidade',
 'label.type' => 'Tipo',
 'label.type_dropdown' => 'lista suspensa',
 'label.type_text' => 'texto',
@@ -218,31 +206,28 @@
 'label.fav_report' => 'Relatório favorito',
 'label.schedule' => 'Agenda',
 'label.what_is_it' => 'O que é?',
-// 'label.expense' => 'Expense',
-// 'label.quantity' => 'Quantity',
-// 'label.paid_status' => 'Paid status',
-// 'label.paid' => 'Paid',
-// 'label.mark_paid' => 'Mark paid',
-// 'label.week_note' => 'Week note',
-// 'label.week_list' => 'Week list',
-// 'label.work_units' => 'Work units',
-// 'label.work_units_short' => 'Units',
+'label.expense' => 'Despesa',
+'label.quantity' => 'Quantidade',
+'label.paid_status' => 'Status pago',
+'label.paid' => 'Pago',
+'label.mark_paid' => 'Marcar como pago',
+'label.week_note' => 'Anotação da semana',
+'label.week_list' => 'Lista da semana',
+'label.work_units' => 'Unidades de trabalho',
+'label.work_units_short' => 'Unidades',
 'label.totals_only' => 'Somente totais',
-// TODO: translate the following.
-// 'label.quota' => 'Quota',
-// 'label.timesheet' => 'Timesheet',
-// 'label.submitted' => 'Submitted',
-// 'label.approved' => 'Approved',
-// 'label.approval' => 'Report approval',
-// 'label.mark_approved' => 'Mark approved',
-// 'label.template' => 'Template',
-// 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_note' => 'Prepopulate Note field',
-// 'label.attachments' => 'Attachments',
-// 'label.files' => 'Files',
-// 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
+'label.quota' => 'Cota',
+'label.timesheet' => 'Planilha de horas',
+'label.submitted' => 'Enviado',
+'label.approved' => 'Aprovado',
+'label.approval' => 'Aprovação de relatório',
+'label.mark_approved' => 'Marcar como aprovado',
+'label.template' => 'Modelo',
+'label.bind_templates_with_projects' => 'Vincular modelos com projetos',
+'label.prepopulate_note' => 'Pré-preencher campo de anotação',
+'label.attachments' => 'Anexos',
+'label.files' => 'Arquivos',
+'label.file' => 'Arquivo',
 'label.active_users' => 'Usuários ativos',
 'label.inactive_users' => 'Usuários inativos',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 585db686f..374cf4da6 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -255,8 +255,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index eb99020fa..cdca51cc1 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -267,8 +267,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e5e767ff4..abfff9a20 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -225,8 +225,6 @@
 'label.attachments' => 'Приложения',
 'label.files' => 'Файлы',
 'label.file' => 'Файл',
-'label.image' => 'Изображение',
-'label.download' => 'Скачать',
 'label.active_users' => 'Активные пользователи',
 'label.inactive_users' => 'Неактивные пользователи',
 'label.details' => 'Детали',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index dcdcb8c81..8c9717270 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -260,8 +260,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktívny používatelia',
 'label.inactive_users' => 'Neaktívny používatelia',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 095b12f30..e45e43a52 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -250,8 +250,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 73a1dce54..cd9ff6182 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -255,8 +255,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktivni korisnik',
 'label.inactive_users' => 'Neaktivni korisnik',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 764671820..5a9b86787 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -251,8 +251,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 'label.active_users' => 'Aktiva användare',
 'label.inactive_users' => 'Inaktiva användare',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 5e7ee26d1..a1b4b0d84 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -274,8 +274,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index d10d1c7c3..fc07dc618 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -260,8 +260,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f1a6a6e30..1b20c2d11 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -265,8 +265,6 @@
 // 'label.attachments' => 'Attachments',
 // 'label.files' => 'Files',
 // 'label.file' => 'File',
-// 'label.image' => 'Image',
-// 'label.download' => 'Download',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
diff --git a/initialize.php b/initialize.php
index 88b47d256..6104df6ef 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5575");
+define("APP_VERSION", "1.19.28.5576");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0b6c6bf40b94be1b25f4675eea05354297103409 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 19:16:27 +0000
Subject: [PATCH 1592/1848] More progress on integrating strings from pr #111.

---
 WEB-INF/resources/ca.lang.php    |  1 -
 WEB-INF/resources/cs.lang.php    |  1 -
 WEB-INF/resources/da.lang.php    |  1 -
 WEB-INF/resources/de.lang.php    |  2 --
 WEB-INF/resources/en.lang.php    |  1 -
 WEB-INF/resources/es.lang.php    |  1 -
 WEB-INF/resources/et.lang.php    |  1 -
 WEB-INF/resources/fa.lang.php    |  1 -
 WEB-INF/resources/fi.lang.php    |  1 -
 WEB-INF/resources/fr.lang.php    |  1 -
 WEB-INF/resources/gr.lang.php    |  1 -
 WEB-INF/resources/he.lang.php    |  1 -
 WEB-INF/resources/hu.lang.php    |  1 -
 WEB-INF/resources/it.lang.php    |  1 -
 WEB-INF/resources/ja.lang.php    |  1 -
 WEB-INF/resources/ko.lang.php    |  1 -
 WEB-INF/resources/nl.lang.php    |  1 -
 WEB-INF/resources/no.lang.php    |  1 -
 WEB-INF/resources/pl.lang.php    |  1 -
 WEB-INF/resources/pt-br.lang.php | 31 ++++++++++++-------------------
 WEB-INF/resources/pt.lang.php    |  1 -
 WEB-INF/resources/ro.lang.php    |  1 -
 WEB-INF/resources/ru.lang.php    |  1 -
 WEB-INF/resources/sk.lang.php    |  1 -
 WEB-INF/resources/sl.lang.php    |  1 -
 WEB-INF/resources/sr.lang.php    |  1 -
 WEB-INF/resources/sv.lang.php    |  1 -
 WEB-INF/resources/tr.lang.php    |  1 -
 WEB-INF/resources/zh-cn.lang.php |  1 -
 WEB-INF/resources/zh-tw.lang.php |  1 -
 initialize.php                   |  2 +-
 31 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1f735771e..c91a3ae3a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -291,7 +291,6 @@
 'title.login' => 'Sessió iniciada',
 'title.groups' => 'Grups',
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Eliminar grup',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index b180b884e..2829fc0ff 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -301,7 +301,6 @@
 'title.login' => 'Přihlásit',
 'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Smazat tým', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9c6aea90d..bec944e15 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -280,7 +280,6 @@
 'title.login' => 'Login',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Redigér Team', // TODO: change "team" to "group".
 'title.delete_group' => 'Slet Team', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index d2dff2a08..2c270748e 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -274,8 +274,6 @@
 'title.success' => 'Erfol',
 'title.login' => 'Anmelden',
 'title.groups' => 'Gruppen',
-// TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 'title.add_group' => 'Gruppe anlegen',
 'title.edit_group' => 'Gruppe bearbeiten',
 'title.delete_group' => 'Gruppe löschen',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index d7fb49ac4..2339a9961 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -258,7 +258,6 @@
 'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Groups',
-'title.subgroups' => 'Subgroups',
 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c352f5d9a..c538fbc94 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -290,7 +290,6 @@
 'title.login' => 'Sesión iniciada',
 'title.groups' => 'Grupos',
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c4ab61d3a..08f392f65 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -290,7 +290,6 @@
 'title.success' => 'Õnnestumine',
 'title.login' => 'Sisene',
 'title.groups' => 'Grupid',
-'title.subgroups' => 'Alamgrupid',
 'title.add_group' => 'Lisa grupp',
 'title.edit_group' => 'Muuda gruppi',
 'title.delete_group' => 'Kustuta grupp',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index dfff12bd2..75220b462 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -291,7 +291,6 @@
 'title.login' => 'ورود',
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'حذف تیم', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f624a91d1..a497a690e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -284,7 +284,6 @@
 'title.login' => 'Kirjautuminen',
 'title.groups' => 'Tiimit', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Tiimin muokkaus', // TODO: change "team" to "group".
 'title.delete_group' => 'Tiimin poisto', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f3e0c862a..d1b0bc906 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -278,7 +278,6 @@
 'title.login' => 'Connexion',
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Modification d\\\'une équipe', // TODO: change "team" to "group".
 'title.delete_group' => 'Suppression d\\\'une équipe', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index b5ba3bf3e..647475c47 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -273,7 +273,6 @@
 'title.login' => 'Σύνδεση',
 'title.groups' => 'Ομάδες',
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Επεξεργασία ομάδας',
 'title.delete_group' => 'Διαγραφή ομάδας',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f85fbb544..8ad1fe77a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -299,7 +299,6 @@
 'title.login' => 'כניסה',
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'מחיקת צוות', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 791105b34..403e178b8 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -292,7 +292,6 @@
 'title.login' => 'Bejelentkezés',
 'title.groups' => 'Csoportok',
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Csoport törlése',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2654c6398..c48251969 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -281,7 +281,6 @@
 'title.login' => 'Login',
 'title.groups' => 'Gruppi',
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Modifica gruppo',
 'title.delete_group' => 'Elimina gruppo',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b9d84a9ac..df981bc5a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -297,7 +297,6 @@
 'title.login' => 'ログイン',
 'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'チームの削除',  // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f1cff3fc4..120734f78 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -297,7 +297,6 @@
 'title.login' => '로그인',
 'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '팀 삭제',  // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index dfd469993..2190504f8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -248,7 +248,6 @@
 'title.success' => 'Succes',
 'title.login' => 'Aanmelden',
 'title.groups' => 'Groepen',
-'title.subgroups' => 'Subgroepen',
 'title.add_group' => 'Groep toevoegen',
 'title.edit_group' => 'Groep bewerken',
 'title.delete_group' => 'Groep aan het verwijderen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 3511faec7..a0ebfcde0 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -294,7 +294,6 @@
 'title.login' => 'Innlogging',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Slett team', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index dd4deeadd..42ff39036 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -285,7 +285,6 @@
 'title.login' => 'Logowanie',
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Edytowanie zespołu', // TODO: change "team" to "group".
 'title.delete_group' => 'Usuwanie zespołu', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 40f7a8362..d936a13f2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -217,7 +217,7 @@
 'label.work_units_short' => 'Unidades',
 'label.totals_only' => 'Somente totais',
 'label.quota' => 'Cota',
-'label.timesheet' => 'Planilha de horas',
+'label.timesheet' => 'Planilha de horas', 
 'label.submitted' => 'Enviado',
 'label.approved' => 'Aprovado',
 'label.approval' => 'Aprovação de relatório',
@@ -230,33 +230,26 @@
 'label.file' => 'Arquivo',
 'label.active_users' => 'Usuários ativos',
 'label.inactive_users' => 'Usuários inativos',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
+'label.details' => 'Detalhes',
+'label.budget' => 'Orçamento',
+'label.work' => 'Trabalho',
+'label.offer' => 'Oferta',
+'label.contractor' => 'Contratante',
+'label.how_to_pay' => 'Como pagar',
+'label.moderator_comment' => 'Comentário do moderador',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
-// TODO: translate the following.
-// 'entity.time' => 'time',
-// 'entity.user' => 'user',
-// 'entity.project' => 'project',
+'entity.time' => 'tempo',
+'entity.user' => 'usuário',
+'entity.project' => 'projeto',
 
 // Form titles.
 'title.error' => 'Erro',
-// TODO: Translate the following.
-// 'title.success' => 'Success',
+'title.success' => 'Sucesso',
 'title.login' => 'Login',
 'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editando equipe', // TODO: change "team" to "group".
 'title.delete_group' => 'Apagando equipe', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 374cf4da6..2bd9783fa 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -282,7 +282,6 @@
 'title.login' => 'Login',
 // TODO: translate the following.
 // 'title.groups' => 'Groups',
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cdca51cc1..561543d4c 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -297,7 +297,6 @@
 'title.login' => 'Autentificare',
 'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Șterge echipa', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index abfff9a20..c5c01a17f 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -246,7 +246,6 @@
 'title.success' => 'Успех',
 'title.login' => 'Вход в систему',
 'title.groups' => 'Группы',
-'title.subgroups' => 'Подгруппы',
 'title.add_group' => 'Добавление группы',
 'title.edit_group' => 'Редактирование группы',
 'title.delete_group' => 'Удаление группы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8c9717270..68ba10552 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -288,7 +288,6 @@
 'title.login' => 'Prihlásenie',
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Vymazávanie tímu', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e45e43a52..0942fbbd6 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -277,7 +277,6 @@
 'title.login' => 'Prijava',
 'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 // 'title.delete_group' => 'Deleting Group',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index cd9ff6182..a7118c7ca 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -283,7 +283,6 @@
 'title.login' => 'Prijava',
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Izmeni tim', // TODO: change "team" to "group".
 'title.delete_group' => 'Obriši tim', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 5a9b86787..66f1b159d 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -279,7 +279,6 @@
 'title.login' => 'Logga in',
 'title.groups' => 'Grupper',
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Redigera grupp',
 'title.delete_group' => 'Ta bort grupp',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a1b4b0d84..7ae9c8e07 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -306,7 +306,6 @@
 'title.login' => 'Giriş',
 'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Ekibi sil', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index fc07dc618..f370b737e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -287,7 +287,6 @@
 'title.login' => '登录',
 'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '删除团队', // TODO: change "team" to "group".
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1b20c2d11..c7985b99a 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -292,7 +292,6 @@
 'title.login' => '登錄',
 'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.
-// 'title.subgroups' => 'Subgroups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
 'title.delete_group' => '刪除團隊', // TODO: change "team" to "group".
diff --git a/initialize.php b/initialize.php
index 6104df6ef..edfd70a71 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5576");
+define("APP_VERSION", "1.19.28.5577");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1406aa8ff086976efeea555da98d547f268845c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 20:17:02 +0000
Subject: [PATCH 1593/1848] More work on progress improving pt-br translation
 from pr #111.

---
 WEB-INF/resources/pt-br.lang.php | 127 ++++++++++++++-----------------
 initialize.php                   |   2 +-
 2 files changed, 57 insertions(+), 72 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d936a13f2..d736843a4 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -217,7 +217,7 @@
 'label.work_units_short' => 'Unidades',
 'label.totals_only' => 'Somente totais',
 'label.quota' => 'Cota',
-'label.timesheet' => 'Planilha de horas', 
+'label.timesheet' => 'Planilha de horas',
 'label.submitted' => 'Enviado',
 'label.approved' => 'Aprovado',
 'label.approval' => 'Aprovação de relatório',
@@ -248,37 +248,32 @@
 'title.error' => 'Erro',
 'title.success' => 'Sucesso',
 'title.login' => 'Login',
-'title.groups' => 'Equipes', // TODO: change "teams" to "groups".
-// TODO: translate the following.
-// 'title.add_group' => 'Adding Group',
-'title.edit_group' => 'Editando equipe', // TODO: change "team" to "group".
-'title.delete_group' => 'Apagando equipe', // TODO: change "team" to "group".
+'title.groups' => 'Grupos',
+'title.add_group' => 'Adicionando grupo',
+'title.edit_group' => 'Editando grupo',
+'title.delete_group' => 'Apagando grupo',
 'title.reset_password' => 'Resetando a senha',
 'title.change_password' => 'Alterando a senha',
 'title.time' => 'Tempo',
 'title.edit_time_record' => 'Editando entrada de hora',
 'title.delete_time_record' => 'Apagando entrada de hora',
-// TODO: Translate the following.
-// 'title.time_files' => 'Time Record Files',
-// 'title.puncher' => 'Puncher',
+'title.time_files' => 'Arquivos de registro de tempo',
+'title.puncher' => 'Puncher',
 'title.expenses' => 'Gastos',
 'title.edit_expense' => 'Editando item de gasto',
 'title.delete_expense' => 'Apagando item de gasto',
-// TODO: translate the following.
-// 'title.expense_files' => 'Expense Item Files',
+'title.expense_files' => 'Arquivos de itens de despesas',
 'title.reports' => 'Relatórios',
 'title.report' => 'Report',
 'title.send_report' => 'Enviando relatório',
-// TODO: Translate the following.
-// 'title.timesheets' => 'Timesheets',
-// 'title.timesheet' => 'Timesheet',
-// 'title.timesheet_files' => 'Timesheet Files',
+'title.timesheets' => 'Planilhas de horas',
+'title.timesheet' => 'Planilha de horas',
+'title.timesheet_files' => 'Arquivos de planilha de horas',
 'title.invoice' => 'Fatura',
 'title.send_invoice' => 'Enviando fatura',
 'title.charts' => 'Gráficos',
 'title.projects' => 'Projetos',
-// TODO: translate the following.
-// 'title.project_files' => 'Project Files',
+'title.project_files' => 'Arquivos do projeto',
 'title.add_project' => 'Adicionando projeto',
 'title.edit_project' => 'Editando projeto',
 'title.delete_project' => 'Apagando projeto',
@@ -290,8 +285,8 @@
 'title.add_user' => 'Adicionando usuário',
 'title.edit_user' => 'Editando usuário',
 'title.delete_user' => 'Apagando usuário',
+'title.roles' => 'Papéis',
 // TODO: translate the following.
-// 'title.roles' => 'Roles',
 // 'title.add_role' => 'Adding Role',
 // 'title.edit_role' => 'Editing Role',
 // 'title.delete_role' => 'Deleting Role',
@@ -307,16 +302,14 @@
 'title.add_notification' => 'Adicionando notificação',
 'title.edit_notification' => 'Editando notificação',
 'title.delete_notification' => 'Apagando notificação',
-// TODO: translate the following.
-// 'title.add_timesheet' => 'Adding Timesheet',
-// 'title.edit_timesheet' => 'Editing Timesheet',
-// 'title.delete_timesheet' => 'Deleting Timesheet',
-// 'title.monthly_quotas' => 'Monthly Quotas',
+'title.add_timesheet' => 'Adicionando planilha de horas',
+'title.edit_timesheet' => 'Editando planilha de horas',
+'title.delete_timesheet' => 'Apagando planilha de horas',
+'title.monthly_quotas' => 'Cotas mensais',
 'title.export' => 'Exportando dados de equipe', // TODO: replace "team" with "group".
 'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
 'title.options' => 'Opções',
-// TODO: translate the following.
-// 'title.display_options' => 'Display Options',
+'title.display_options' => 'Opções de exibição',
 'title.profile' => 'Perfil',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Campos personalizados',
@@ -328,41 +321,39 @@
 'title.cf_edit_dropdown_option' => 'Editando opção',
 'title.cf_delete_dropdown_option' => 'Apagando opção',
 'title.locking' => 'Bloquear',
-// TODO: translate the following.
-// 'title.week_view' => 'Week View',
-// 'title.swap_roles' => 'Swapping Roles',
-// 'title.work_units' => 'Work Units',
-// 'title.templates' => 'Templates',
-// 'title.add_template' => 'Adding Template',
-// 'title.edit_template' => 'Editing Template',
-// 'title.delete_template' => 'Deleting Template',
-// 'title.edit_file' => 'Editing File',
-// 'title.delete_file' => 'Deleting File',
-// 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
+'title.week_view' => 'Visão semanal',
+'title.swap_roles' => 'Alteração de papéis',
+'title.work_units' => 'Unidades de trabalho',
+'title.templates' => 'Modelos',
+'title.add_template' => 'Adicionando modelo',
+'title.edit_template' => 'Editando modelo',
+'title.delete_template' => 'Apagando modelo',
+'title.edit_file' => 'Editando arquivo',
+'title.delete_file' => 'Apagando arquivo',
+'title.download_file' => 'Baixando arquivo',
+'title.work' => 'Trabalho',
+'title.add_work' => 'Adicionando trabalho',
+'title.edit_work' => 'Editando trabalho',
+'title.delete_work' => 'Apagando trabalho',
+'title.active_work' => 'Trabalho ativo',
+'title.available_work' => 'Trabalho disponível',
+'title.inactive_work' => 'Trabalho inativo',
+'title.pending_work' => 'Trabalho pendente',
+'title.offer' => 'Oferta',
+'title.add_offer' => 'Adicionando oferta',
+'title.edit_offer' => 'Editando oferta',
+'title.delete_offer' => 'Apagando oferta',
+'title.active_offers' => 'Ofertas ativas',
+'title.available_offers' => 'Ofertas disponíveis',
+'title.inactive_offers' => 'Ofertas inativas',
+'title.pending_offers' => 'Ofertas pendentes',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
 'dropdown.all' => '--- todos ---',
 'dropdown.no' => '--- não ---',
-// TODO: translate the following.
-// 'dropdown.current_day' => 'today',
-// 'dropdown.previous_day' => 'yesterday',
+'dropdown.current_day' => 'hoje',
+'dropdown.previous_day' => 'ontem',
 'dropdown.selected_day' => 'dia',
 'dropdown.current_week' => 'esta semana',
 'dropdown.previous_week' => 'última semana',
@@ -371,8 +362,7 @@
 'dropdown.previous_month' => 'último mês',
 'dropdown.selected_month' => 'mês',
 'dropdown.current_year' => 'este ano',
-// TODO: translate the following.
-// 'dropdown.previous_year' => 'previous year',
+'dropdown.previous_year' => 'último ano', // TODO: check if this is correct. I used último for consistency with other dropdown options.
 'dropdown.selected_year' => 'ano',
 'dropdown.all_time' => 'todas as datas',
 'dropdown.projects' => 'projetos',
@@ -380,20 +370,18 @@
 'dropdown.clients' => 'clientes',
 'dropdown.select' => '--- selecione ---',
 'dropdown.select_invoice' => '--- selecione fatura ---',
-// TODO: translate the following.
-// 'dropdown.select_timesheet' => '--- select timesheet ---',
+'dropdown.select_timesheet' => '--- selecione planilha de horas ---',
 'dropdown.status_active' => 'ativo',
 'dropdown.status_inactive' => 'inativo',
 'dropdown.delete' => 'apagar',
 'dropdown.do_not_delete' => 'não apagar',
-// TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
-// 'dropdown.approved' => 'approved',
-// 'dropdown.not_approved' => 'not approved',
-// 'dropdown.paid' => 'paid',
-// 'dropdown.not_paid' => 'not paid',
-// 'dropdown.ascending' => 'ascending',
-// 'dropdown.descending' => 'descending',
+'dropdown.pending_approval' => 'aprovação pendente',
+'dropdown.approved' => 'aprovado',
+'dropdown.not_approved' => 'não aprovado',
+'dropdown.paid' => 'pago',
+'dropdown.not_paid' => 'não pago',
+'dropdown.ascending' => 'ascendente',
+'dropdown.descending' => 'descendente',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
@@ -407,10 +395,7 @@
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Pedido para resetar a senha enviado por e-mail.',
 'form.reset_password.email_subject' => 'Pedido de alteração de senha no Anuko Time Tracker',
-// TODO: English string has changed. "from IP" added. Re-translate the beginning.
-// 'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is an open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
-// "IP %s" probably sounds awkward.
-'form.reset_password.email_body' => "Prezado usuário,\n\nAlguém, IP %s, solicitou o reset da sua senha do Anuko Time Tracker. Entre nete link para resetar a sua senha.\n\n%s\n\nAnuko Time Tracker é um sistema de código abertois, de rastreamento do tempo. Visite https://www.anuko.com para mais informações.\n\n",
+'form.reset_password.email_body' => "Caro usuário,\n\nAlguém do IP %s solicitou a redefinição da senha do Anuko Time Tracker. Visite este link se quiser redefinir sua senha.\n\n%s\n\nAnuko Time Tracker é um sistema de rastreamento de apontamentos de código aberto. Visite https://www.anuko.com para obter mais informações.\n\n",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Entre com a nova senha e clique em Salvar.',
diff --git a/initialize.php b/initialize.php
index edfd70a71..80ad77c08 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5577");
+define("APP_VERSION", "1.19.28.5578");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c1633c81d3003d84aeea7e185d13f33b6142ab9f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 22:21:33 +0000
Subject: [PATCH 1594/1848] More work in progress on pt-br translation.

---
 WEB-INF/resources/ca.lang.php    |  4 +--
 WEB-INF/resources/cs.lang.php    |  4 +--
 WEB-INF/resources/da.lang.php    |  4 +--
 WEB-INF/resources/de.lang.php    |  4 +--
 WEB-INF/resources/en.lang.php    |  4 +--
 WEB-INF/resources/es.lang.php    |  4 +--
 WEB-INF/resources/et.lang.php    |  4 +--
 WEB-INF/resources/fa.lang.php    |  4 +--
 WEB-INF/resources/fi.lang.php    |  4 +--
 WEB-INF/resources/fr.lang.php    |  4 +--
 WEB-INF/resources/gr.lang.php    |  4 +--
 WEB-INF/resources/he.lang.php    |  4 +--
 WEB-INF/resources/hu.lang.php    |  4 +--
 WEB-INF/resources/it.lang.php    |  4 +--
 WEB-INF/resources/ja.lang.php    |  4 +--
 WEB-INF/resources/ko.lang.php    |  4 +--
 WEB-INF/resources/nl.lang.php    |  4 +--
 WEB-INF/resources/no.lang.php    |  4 +--
 WEB-INF/resources/pl.lang.php    |  4 +--
 WEB-INF/resources/pt-br.lang.php | 46 +++++++++++++++-----------------
 WEB-INF/resources/pt.lang.php    |  4 +--
 WEB-INF/resources/ro.lang.php    |  4 +--
 WEB-INF/resources/ru.lang.php    |  4 +--
 WEB-INF/resources/sk.lang.php    |  4 +--
 WEB-INF/resources/sl.lang.php    |  4 +--
 WEB-INF/resources/sr.lang.php    |  4 +--
 WEB-INF/resources/sv.lang.php    |  4 +--
 WEB-INF/resources/tr.lang.php    |  4 +--
 WEB-INF/resources/zh-cn.lang.php |  4 +--
 WEB-INF/resources/zh-tw.lang.php |  4 +--
 initialize.php                   |  2 +-
 31 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c91a3ae3a..205600d04 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -520,8 +520,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Número de factura',
 'form.invoice.person' => 'Persona',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2829fc0ff..7a685029b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -529,8 +529,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Faktura číslo',
 'form.invoice.person' => 'Osoba',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index bec944e15..3cb53a5a3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -503,8 +503,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Fakturanummer',
 'form.invoice.person' => 'Person',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 2c270748e..c0d69b6d6 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -489,8 +489,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Rechnungsnummer',
 'form.invoice.person' => 'Person',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2339a9961..1acc79084 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -472,8 +472,8 @@
 'form.templates.active_templates' => 'Active Templates',
 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Invoice number',
 'form.invoice.person' => 'Person',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index c538fbc94..ebe095e96 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -533,8 +533,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Número de factura',
 'form.invoice.person' => 'Persona',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 08f392f65..961b8e2b5 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -515,8 +515,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Arve number',
 'form.invoice.person' => 'Isik',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 75220b462..798406ccf 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -524,8 +524,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'شماره فاکتور',
 'form.invoice.person' => 'شخص',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a497a690e..813b442fe 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -509,8 +509,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Laskun numero',
 'form.invoice.person' => 'Henkilö',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d1b0bc906..e2642ad27 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -500,8 +500,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Numéro de facture',
 'form.invoice.person' => 'Personne',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 647475c47..5a6a8df81 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -495,8 +495,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Αριθμός τιμολογίου',
 'form.invoice.person' => 'Άτομο',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8ad1fe77a..958a556e6 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -528,8 +528,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'מספר חשבונית',
 'form.invoice.person' => 'משתמש',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 403e178b8..22b28039e 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -523,8 +523,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Számla azonosító száma',
 'form.invoice.person' => 'Személy',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index c48251969..ab3852bf5 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -508,8 +508,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Numero fattura',
 'form.invoice.person' => 'Persona',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index df981bc5a..85192f026 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -529,8 +529,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => '送り状の番号',
 'form.invoice.person' => '個人',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 120734f78..202578fcc 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -527,8 +527,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => '송장 번호',
 'form.invoice.person' => '개인',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2190504f8..10c905143 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -455,8 +455,8 @@
 'form.templates.active_templates' => 'Actieve sjablonen',
 'form.templates.inactive_templates' => 'Inactieve sjablonen',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Factuur nummer',
 'form.invoice.person' => 'Medewerker',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a0ebfcde0..b3cf78863 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -527,8 +527,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Fakturanummer',
 'form.invoice.person' => 'Person',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 42ff39036..b0602334f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -511,8 +511,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Numer faktury',
 'form.invoice.person' => 'Osoba',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d736843a4..52193b87d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -404,18 +404,16 @@
 'form.time.duration_format' => '(hh:mm ou 0.0h)',
 'form.time.billable' => 'Faturável',
 'form.time.uncompleted' => 'Incompleta',
-// TODO: translate the following.
-// 'form.time.remaining_quota' => 'Remaining quota',
-// 'form.time.over_quota' => 'Over quota',
-// 'form.time.remaining_balance' => 'Remaining balance',
-// 'form.time.over_balance' => 'Over balance',
+'form.time.remaining_quota' => 'Cota restante', // TODO: check if this translation is correct. I changed it from "Cota excedente", which appears to be wrong.
+'form.time.over_quota' => 'Acima da cota',
+'form.time.remaining_balance' => 'Saldo restante',
+'form.time.over_balance' => 'Saldo excedente',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Eesta entrada foi salva somente com hora de início. Não é um erro.',
 
 // Week view form. See example at https://timetracker.anuko.com/week.php.
-// TODO: translate the following.
-// 'form.week.new_entry' => 'New entry',
+'form.week.new_entry' => 'Nova entrada',
 
 // Reports form. See example at https://timetracker.anuko.com/reports.php
 'form.reports.save_as_favorite' => 'Guardar como favorito',
@@ -424,16 +422,19 @@
 'form.reports.include_not_billable' => 'não faturável',
 'form.reports.include_invoiced' => 'faturado',
 'form.reports.include_not_invoiced' => 'não faturado',
-// TODO: translate the following.
-// 'form.reports.include_assigned' => 'assigned',
-// 'form.reports.include_not_assigned' => 'not assigned',
-// 'form.reports.include_pending' => 'pending',
+'form.reports.include_assigned' => 'atribuído',
+'form.reports.include_not_assigned' => 'não atribuído',
+'form.reports.include_pending' => 'pendente',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
-// TODO: translate the following.
+// TODO: Try to improve the translation of form.reports.time_fields. This is a label for a section of custom fields that
+// are associated with a time record. I suggest trying custom fields plugin, creating a few "time" custom fields, and seeing how
+// reports.php page looks like. For example, one may create a "Ticket #" or a "Property" custom fields to be associated with time entries,
+// the form.reports.time_fields groups these fields together on reports.php.
 // 'form.reports.time_fields' => 'Time fields',
-// 'form.reports.user_fields' => 'User fields',
+// 'form.reports.time_fields' => 'Campos de apontamento',
+'form.reports.user_fields' => 'Campos de usuário',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- sem agrupar ---',
 'form.reports.group_by_date' => 'data',
@@ -445,22 +446,19 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportar',
-// TODO: translate the following.
-// 'form.report.assign_to_invoice' => 'Assign to invoice',
-// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
+'form.report.assign_to_invoice' => 'Atribuir a fatura',
+'form.report.assign_to_timesheet' => 'Atribuir a planilha de horas',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-// TODO: translate the following.
-// 'form.timesheets.active_timesheets' => 'Active Timesheets',
-// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
+'form.timesheets.active_timesheets' => 'Planilhas de horas ativas',
+'form.timesheets.inactive_timesheets' => 'Planilhas de horas inativas',
 
 // Templates form. See example at https://timetracker.anuko.com/templates.php
-// TODO: translate the following.
-// 'form.templates.active_templates' => 'Active Templates',
-// 'form.templates.inactive_templates' => 'Inactive Templates',
+'form.templates.active_templates' => 'Modelos ativos',
+'form.templates.inactive_templates' => 'Modelos inativos',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Número da fatura',
 'form.invoice.person' => 'Pessoa',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2bd9783fa..9a26f283e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -505,8 +505,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 // TODO: translate the following.
 // 'form.invoice.number' => 'Invoice number',
 // 'form.invoice.person' => 'Person',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 561543d4c..95e27a122 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -527,8 +527,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Numar factura',
 'form.invoice.person' => 'Persoana',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c5c01a17f..cb4abe577 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -452,8 +452,8 @@
 'form.templates.active_templates' => 'Активные шаблоны',
 'form.templates.inactive_templates' => 'Неактивные шаблоны',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Номер счёта',
 'form.invoice.person' => 'Работник',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 68ba10552..821c23b45 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -514,8 +514,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Číslo faktúry',
 'form.invoice.person' => 'Osoba',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 0942fbbd6..bb37b8631 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -500,8 +500,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 // TODO: translate the following.
 // 'form.invoice.number' => 'Invoice number',
 // 'form.invoice.person' => 'Person',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index a7118c7ca..e1f9a28e2 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -511,8 +511,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Broj računa',
 'form.invoice.person' => 'Osoba',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 66f1b159d..cea1ddd88 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -509,8 +509,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Fakturanummer',
 'form.invoice.person' => 'Person',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7ae9c8e07..b94ba8d90 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -539,8 +539,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => 'Fatura numarası',
 'form.invoice.person' => 'Kişi',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f370b737e..0a6e4ab25 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -516,8 +516,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => '发票号码',
 'form.invoice.person' => '人', // TODO: is this correct?
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c7985b99a..2efd7bbe1 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -519,8 +519,8 @@
 // 'form.templates.active_templates' => 'Active Templates',
 // 'form.templates.inactive_templates' => 'Inactive Templates',
 
-// Invoice form. See example at https://timetracker.anuko.com/invoice.php
-// (you can get to this form after generating a report).
+// Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
+// (you can get to this form after generating an invoice).
 'form.invoice.number' => '發票號碼',
 'form.invoice.person' => '人', // TODO: is this correct?
 
diff --git a/initialize.php b/initialize.php
index 80ad77c08..33974fb78 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5578");
+define("APP_VERSION", "1.19.28.5579");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2ac0bd2cc5b5d9b512476d884540b06b6c5f374a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 23:09:50 +0000
Subject: [PATCH 1595/1848] Finished integrating good changes from pr #111.

---
 WEB-INF/resources/pt-br.lang.php | 157 +++++++++++++++----------------
 initialize.php                   |   2 +-
 2 files changed, 75 insertions(+), 84 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 52193b87d..f9085c538 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -465,8 +465,7 @@
 // Deleting Invoice form. See example at https://timetracker.anuko.com/invoice_delete.php
 'form.invoice.invoice_to_delete' => 'Fatura a ser apagada',
 'form.invoice.invoice_entries' => 'Entradas de fatura',
-// TODO: translate the following.
-// 'form.invoice.confirm_deleting_entries' => 'Please confirm deleting invoice entries from Time Tracker.',
+'form.invoice.confirm_deleting_entries' => 'Confirme a exclusão das entradas de fatura do Time Tracker.',
 
 // Charts form. See example at https://timetracker.anuko.com/charts.php
 'form.charts.interval' => 'Intervalo',
@@ -481,8 +480,12 @@
 'form.tasks.inactive_tasks' => 'Tarefas inativas',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-// TODO: translate the following.
+// TODO: check the translation of form.users.uncompleted_entry. Is "apontamento" a correct term for a time entry?
+// The meaning of incomplete time entry in Time Tracker is that the entry only has the "start" time defined, but no finish time yet,
+// and may be ongoing. For example, user started working on something and is curently in progress doing it.
+// Check the Puncher plugin, which operates with such entries.
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
+'form.users.uncompleted_entry' => 'O usuário tem um apontamento incompleto',
 'form.users.role' => 'Papel',
 'form.users.manager' => 'Gerente',
 'form.users.comanager' => 'Coordenador',
@@ -490,17 +493,15 @@
 'form.users.default_rate' => 'Honorário padrão por hora',
 
 // Editing User form. See example at https://timetracker.anuko.com/user_edit.php
-// TODO: translate the following.
-// 'form.user_edit.swap_roles' => 'Swap roles',
+'form.user_edit.swap_roles' => 'Alternar papéis',
 
 // Roles form. See example at https://timetracker.anuko.com/roles.php
-// TODO: translate the following.
-// 'form.roles.active_roles' => 'Active Roles',
-// 'form.roles.inactive_roles' => 'Inactive Roles',
-// 'form.roles.rank' => 'Rank',
-// 'form.roles.rights' => 'Rights',
-// 'form.roles.assigned' => 'Assigned',
-// 'form.roles.not_assigned' => 'Not assigned',
+'form.roles.active_roles' => 'Papéis ativos',
+'form.roles.inactive_roles' => 'Papéis inativos',
+'form.roles.rank' => 'Rank',
+'form.roles.rights' => 'Direitos',
+'form.roles.assigned' => 'Atribuído',
+'form.roles.not_assigned' => 'Não atribuído',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
 'form.clients.active_clients' => 'Clientes ativos',
@@ -529,9 +530,8 @@
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 horas',
 'form.group_edit.24_hours' => '24 horas',
-// TODO: translate the following.
-// 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.holidays' => 'Holidays',
+'form.group_edit.display_options' => 'Opções de exibição',
+'form.group_edit.holidays' => 'Feriados',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',
 'form.group_edit.mode_projects' => 'projetos',
@@ -540,18 +540,16 @@
 'form.group_edit.type_all' => 'todos',
 'form.group_edit.type_start_finish' => 'início e fim',
 'form.group_edit.type_duration' => 'duração',
-// TODO: translate the following.
-// 'form.group_edit.punch_mode' => 'Punch mode',
-// 'form.group_edit.allow_overlap' => 'Allow overlap',
-// 'form.group_edit.future_entries' => 'Future entries',
-// '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',
+'form.group_edit.punch_mode' => 'Modo punch',
+'form.group_edit.allow_overlap' => 'Permitir sobreposição',
+'form.group_edit.future_entries' => 'Entradas futuros',
+'form.group_edit.uncompleted_indicators' => 'Indicadores incompletos',
+'form.group_edit.confirm_save' => 'Confirme o salvamento',
+'form.group_edit.allow_ip' => 'Permitir IP',
+'form.group_edit.advanced_settings' => 'Configurações avançadas',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
-// TODO: translate the following.
-// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+'form.group_delete.hint' => 'Tem certeza de que deseja excluir todo o grupo?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.to' => 'Para',
@@ -561,74 +559,67 @@
 'form.mail.invoice_sent' => 'Fatura enviada.',
 
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
-// TODO: translate the following.
-// 'form.quota.year' => 'Year',
-// 'form.quota.month' => 'Month',
-// 'form.quota.workday_hours' => 'Hours in a work day',
-// 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
+'form.quota.year' => 'Ano',
+'form.quota.month' => 'Mês',
+'form.quota.workday_hours' => 'Horas em um dia útil',
+'form.quota.hint' => 'Se os valores estiverem vazios, as cotas serão calculadas automaticamente com base nas horas de trabalho e feriados.',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
-// TODO: translate the following.
-// 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
-// 'form.swap.swap_with' => 'Swap roles with',
+'form.swap.hint' => 'Rebaixe-se a papel inferior trocando funções com outra pessoa. Isto não pode ser desfeito.',
+'form.swap.swap_with' => 'Trocar papéis com',
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
-// TODO: translate the following.
-// 'form.work_units.minutes_in_unit' => 'Minutes in unit',
-// 'form.work_units.1st_unit_threshold' => '1st unit threshold',
+'form.work_units.minutes_in_unit' => 'Minutos em unidade',
+'form.work_units.1st_unit_threshold' => 'Limiar da 1ª unidade',
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
-// TODO: translate the following.
-// 'role.user.label' => 'User',
-// 'role.user.low_case_label' => 'user',
-// 'role.user.description' => 'A regular member without management rights.',
-// 'role.client.label' => 'Client',
-// 'role.client.low_case_label' => 'client',
-// 'role.client.description' => 'A client can view its own data.',
-// 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.low_case_label' => 'supervisor',
-// 'role.supervisor.description' => 'A person with a small set of management rights.',
-// 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.low_case_label' => 'co-manager',
-// 'role.comanager.description' => 'A person with a big set of management functions.',
-// 'role.manager.label' => 'Manager',
-// 'role.manager.low_case_label' => 'manager',
-// 'role.manager.description' => 'Group manager. Can do most of things for a group.',
-// 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.low_case_label' => 'top manager',
-// 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
-// 'role.admin.label' => 'Administrator',
-// 'role.admin.low_case_label' => 'administrator',
-// 'role.admin.description' => 'Site adminsitrator.',
+'role.user.label' => 'Usuário',
+'role.user.low_case_label' => 'usuário',
+'role.user.description' => 'Um membro regular sem direitos de gestão.',
+'role.client.label' => 'Cliente',
+'role.client.low_case_label' => 'cliente',
+'role.client.description' => 'Um cliente pode visualizar seus próprios dados.',
+'role.supervisor.label' => 'Supervisor',
+'role.supervisor.low_case_label' => 'supervisor',
+'role.supervisor.description' => 'Uma pessoa com um pequeno conjunto de direitos de gerenciamento.',
+'role.comanager.label' => 'Co-gerente',
+'role.comanager.low_case_label' => 'co-gerente',
+'role.comanager.description' => 'Uma pessoa com um grande conjunto de funções de gerenciamento.',
+'role.manager.label' => 'Gerente',
+'role.manager.low_case_label' => 'gerente',
+'role.manager.description' => 'Gerente de grupo. Pode fazer a maioria das coisas para um grupo.',
+'role.top_manager.label' => 'Gerente geral',
+'role.top_manager.low_case_label' => 'gerente geral',
+'role.top_manager.description' => 'Principal gerente de grupo. Pode fazer tudo em uma árvore de grupos.',
+'role.admin.label' => 'Administrador',
+'role.admin.low_case_label' => 'administrador',
+'role.admin.description' => 'Adminsitrador do site/sistema.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
-// TODO: translate the following.
-// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
-// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
-// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
-// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
-// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
-// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+'form.timesheet_view.submit_subject' => 'Solicitação de aprovação de planilha de horas',
+'form.timesheet_view.submit_body' => "Uma nova planilha de horas requer aprovação.<p>Usuário: %s.",
+'form.timesheet_view.approve_subject' => 'Planilha de horas aprovada',
+'form.timesheet_view.approve_body' => "Sua planilha de horas %s foi aprovada.<p>%s",
+'form.timesheet_view.disapprove_subject' => 'Planilha de horas não aprovada',
+'form.timesheet_view.disapprove_body' => "Sua planilha de horas %s não foi aprovada.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
-// TODO: translate the following.
-// 'form.display_options.note_on_separate_row' => 'Note on separate row',
-// 'form.display_options.not_complete_days' => 'Not complete days',
-// 'form.display_options.custom_css' => 'Custom CSS',
+'form.display_options.note_on_separate_row' => 'Anotação em linha separada',
+'form.display_options.not_complete_days' => 'Dias não completos',
+'form.display_options.custom_css' => 'CSS customizado',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
+'work.error.work_not_available' => 'Item de trabalho não está disponível.',
+'work.error.offer_not_available' => 'Oferta não disponível',
+'work.type.one_time' => 'Uma interação',
+'work.type.ongoing' => 'Em progresso',
+'work.label.own_work' => 'Trabalho próprio',
+'work.label.own_offers' => 'Ofertas próprias',
+'work.label.offers' => 'Ofertas',
+'work.button.send_message' => 'Enviar mensagem',
+'work.button.make_offer' => 'Fazer oferta',
+'work.button.accept' => 'Aceitar',
+'work.button.decline' => 'Recusar',
+'work.title.send_message' => 'Enviando mensagem',
+'work.msg.message_sent' => 'Mensagem enviada.',
 );
diff --git a/initialize.php b/initialize.php
index 33974fb78..a89b0c287 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5579");
+define("APP_VERSION", "1.19.28.5580");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9e937b53f8265d44579fdab0de1b9074582125b0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Jun 2021 23:17:58 +0000
Subject: [PATCH 1596/1848] Improved TODO comments for pt-br translators.

---
 WEB-INF/resources/pt-br.lang.php | 16 ++++++++--------
 initialize.php                   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f9085c538..38ca0dfec 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -106,9 +106,9 @@
 'button.reset_password' => 'Resetar senha',
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
-'button.create_group' => 'Criar equipe', // TODO: replace "team" with "group".
-'button.export' => 'Exportar equipe', // TODO: replace "team" with "group".
-'button.import' => 'Importar equipe', // TODO: replace "team" with "group".
+'button.create_group' => 'Criar equipe', // TODO: replace "equipe" with "group".
+'button.export' => 'Exportar equipe', // TODO: replace "equipe" with "group".
+'button.import' => 'Importar equipe', // TODO: replace "equipe" with "group".
 'button.close' => 'Fechar',
 'button.start' => 'Iniciar',
 'button.stop' => 'Parar',
@@ -117,7 +117,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Menu',
-'label.group_name' => 'Nome da equipe',  // TODO: replace "team" with "group".
+'label.group_name' => 'Nome da equipe',  // TODO: replace "equipe" with "group".
 'label.address' => 'Endereço',
 'label.currency' => 'Moeda',
 'label.manager_name' => 'Nome do gerente',
@@ -306,8 +306,8 @@
 'title.edit_timesheet' => 'Editando planilha de horas',
 'title.delete_timesheet' => 'Apagando planilha de horas',
 'title.monthly_quotas' => 'Cotas mensais',
-'title.export' => 'Exportando dados de equipe', // TODO: replace "team" with "group".
-'title.import' => 'Importando dados de equipe', // TODO: replace "team" with "group".
+'title.export' => 'Exportando dados de equipe', // TODO: replace "equipe" with "group".
+'title.import' => 'Importando dados de equipe', // TODO: replace "equipe" with "group".
 'title.options' => 'Opções',
 'title.display_options' => 'Opções de exibição',
 'title.profile' => 'Perfil',
@@ -512,7 +512,7 @@
 'form.client.client_entries' => 'Entradas de cliente',
 
 // Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
-// TODO: replace "team" with "group" in the string below.
+// TODO: replace "equipe" with "group" in the string below.
 'form.export.hint' => 'Você pode exportar todos os dados da equipe para um arquivo xml. Isto pode ser útil se você estiver migrando os dados para um servidor próprio.',
 'form.export.compression' => 'Compressão',
 'form.export.compression_none' => 'nenhuma',
@@ -524,7 +524,7 @@
 'form.import.success' => 'Importação realizada com sucesso.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-// TODO: replace "team" with "group" in the string below (3 places).
+// TODO: replace "equipe" with "group" in the string below (3 places).
 'form.groups.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
diff --git a/initialize.php b/initialize.php
index a89b0c287..24ac12b57 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5580");
+define("APP_VERSION", "1.19.28.5581");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 387034aed0193e99e1ac6cc3e01977118064201c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Jun 2021 18:06:29 +0000
Subject: [PATCH 1597/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 12 ++++--------
 initialize.php                |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 10c905143..51d4e41ee 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -23,8 +23,7 @@
 'menu.group' => 'Groep',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Tijden',
-// TODO: translate the following:
-// 'menu.puncher' => 'Punch',
+'menu.puncher' => 'Prikklok',
 'menu.week' => 'Week',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Rapporten',
@@ -108,8 +107,7 @@
 'button.export' => 'Groep exporteren',
 'button.import' => 'Groep importeren',
 'button.close' => 'Sluiten',
-// TODO: translate the following.
-// 'button.start' => 'Start',
+'button.start' => 'Start',
 'button.stop' => 'Stop',
 'button.approve' => 'Goedkeuren',
 'button.disapprove' => 'Afkeuren',
@@ -167,8 +165,7 @@
 'label.select_none' => 'Selecteer niets',
 'label.day_view' => 'Dag overzicht',
 'label.week_view' => 'Week overzicht',
-// TODO: translate the following.
-// 'label.puncher' => 'Puncher',
+'label.puncher' => 'Prikklok',
 'label.id' => 'ID',
 'label.language' => 'Taal',
 'label.decimal_mark' => 'Decimaal teken',
@@ -257,8 +254,7 @@
 'title.edit_time_record' => 'Wijzigen tijdrecord',
 'title.delete_time_record' => 'Verwijder tijdrecord',
 'title.time_files' => 'Tijden bestanden',
-// TODO: Translate the following:
-// 'title.puncher' => 'Puncher',
+'title.puncher' => 'Prikklok',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Bewerk kosten artikel',
 'title.delete_expense' => 'Verwijder kosten artikel',
diff --git a/initialize.php b/initialize.php
index 24ac12b57..b5407ad8a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5581");
+define("APP_VERSION", "1.19.28.5582");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c446afd20b43b27d34a840010ccf114f1eeb7b53 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 24 Jun 2021 17:08:40 +0000
Subject: [PATCH 1598/1848] Cosmetic change to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 92e2728c3..d81178e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Thumbs.db
 *.DS_Store
 *~
 .idea/
+api/

From 0b57ed4799b8ab05e9add3028977fb79d7c6fb90 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Jul 2021 15:19:18 +0000
Subject: [PATCH 1599/1848] Integrating useful changes from pr#111 with yet
 some remaining todo.

---
 WEB-INF/resources/pt-br.lang.php | 95 ++++++++++++++------------------
 initialize.php                   |  2 +-
 2 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 38ca0dfec..3e2c6526f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -62,16 +62,15 @@
 'error.user_exists' => 'Já existe usuário com este login.',
 'error.object_exists' => 'Já existe um objeto com este nome.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
-// TODO: improve translation of the word "role" in error.role_exists. função here, papel elsewhere?
 'error.role_exists' => 'Já existe uma função com este rank.',
 'error.no_invoiceable_items' => 'Não há items faturáveis.',
 'error.no_records' => 'Não há registros.',
 'error.no_login' => 'Não há usuário com este login.',
 'error.no_groups' => 'Sua base de dados está vazia. Entre como admin e crie um grupo novo.',
 'error.upload' => 'Erro no envio do arquivo.',
-'error.range_locked' => 'Período está bloqueado.',
-'error.mail_send' => 'Erro enviando o e-mail.',
-// TODO: is "Use" in error.mail_send translated correctly?
+'error.range_locked' => 'Período bloqueado.',
+// TODO: is "Use" in error.mail_send translated correctly? Usar, or utilizar, perhaps? "Use" looks like an untranslated English word.
+// The meaning of this error is that mail send feature did not work, and using MAIL_SMTP_DEBUG should help admin to troubleshoot it.
 'error.mail_send' => 'Erro ao enviar e-mail. Use MAIL_SMTP_DEBUG para diagnósticos.',
 'error.no_email' => 'Não há e-mail associado a este login.',
 'error.uncompleted_exists' => 'Entrada incompleta existente. Feche ou remova-a.',
@@ -106,9 +105,9 @@
 'button.reset_password' => 'Resetar senha',
 'button.send' => 'Enviar',
 'button.send_by_email' => 'Enviar por e-mail',
-'button.create_group' => 'Criar equipe', // TODO: replace "equipe" with "group".
-'button.export' => 'Exportar equipe', // TODO: replace "equipe" with "group".
-'button.import' => 'Importar equipe', // TODO: replace "equipe" with "group".
+'button.create_group' => 'Criar grupo',
+'button.export' => 'Exportar grupo',
+'button.import' => 'Importar grupo',
 'button.close' => 'Fechar',
 'button.start' => 'Iniciar',
 'button.stop' => 'Parar',
@@ -117,7 +116,7 @@
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Menu',
-'label.group_name' => 'Nome da equipe',  // TODO: replace "equipe" with "group".
+'label.group_name' => 'Nome do grupo',
 'label.address' => 'Endereço',
 'label.currency' => 'Moeda',
 'label.manager_name' => 'Nome do gerente',
@@ -286,10 +285,9 @@
 'title.edit_user' => 'Editando usuário',
 'title.delete_user' => 'Apagando usuário',
 'title.roles' => 'Papéis',
-// TODO: translate the following.
-// 'title.add_role' => 'Adding Role',
-// 'title.edit_role' => 'Editing Role',
-// 'title.delete_role' => 'Deleting Role',
+'title.add_role' => 'Adicionando função',
+'title.edit_role' => 'Editando função',
+'title.delete_role' => 'Apagando função',
 'title.clients' => 'Clientes',
 'title.add_client' => 'Adicionando cliente',
 'title.edit_client' => 'Editando cliente',
@@ -306,8 +304,8 @@
 'title.edit_timesheet' => 'Editando planilha de horas',
 'title.delete_timesheet' => 'Apagando planilha de horas',
 'title.monthly_quotas' => 'Cotas mensais',
-'title.export' => 'Exportando dados de equipe', // TODO: replace "equipe" with "group".
-'title.import' => 'Importando dados de equipe', // TODO: replace "equipe" with "group".
+'title.export' => 'Exportando dados do grupo',
+'title.import' => 'Importando dados do grupo',
 'title.options' => 'Opções',
 'title.display_options' => 'Opções de exibição',
 'title.profile' => 'Perfil',
@@ -362,7 +360,7 @@
 'dropdown.previous_month' => 'último mês',
 'dropdown.selected_month' => 'mês',
 'dropdown.current_year' => 'este ano',
-'dropdown.previous_year' => 'último ano', // TODO: check if this is correct. I used último for consistency with other dropdown options.
+'dropdown.previous_year' => 'último ano',
 'dropdown.selected_year' => 'ano',
 'dropdown.all_time' => 'todas as datas',
 'dropdown.projects' => 'projetos',
@@ -404,7 +402,7 @@
 'form.time.duration_format' => '(hh:mm ou 0.0h)',
 'form.time.billable' => 'Faturável',
 'form.time.uncompleted' => 'Incompleta',
-'form.time.remaining_quota' => 'Cota restante', // TODO: check if this translation is correct. I changed it from "Cota excedente", which appears to be wrong.
+'form.time.remaining_quota' => 'Cota restante',
 'form.time.over_quota' => 'Acima da cota',
 'form.time.remaining_balance' => 'Saldo restante',
 'form.time.over_balance' => 'Saldo excedente',
@@ -415,7 +413,7 @@
 // Week view form. See example at https://timetracker.anuko.com/week.php.
 'form.week.new_entry' => 'Nova entrada',
 
-// Reports form. See example at https://timetracker.anuko.com/reports.php
+// Reports form. See example at https://timetracker.anuko.com/reports.php.
 'form.reports.save_as_favorite' => 'Guardar como favorito',
 'form.reports.confirm_delete' => 'Tem certeza que deseja remover este relatório dos favoritos?',
 'form.reports.include_billable' => 'faturável',
@@ -428,12 +426,7 @@
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',
-// TODO: Try to improve the translation of form.reports.time_fields. This is a label for a section of custom fields that
-// are associated with a time record. I suggest trying custom fields plugin, creating a few "time" custom fields, and seeing how
-// reports.php page looks like. For example, one may create a "Ticket #" or a "Property" custom fields to be associated with time entries,
-// the form.reports.time_fields groups these fields together on reports.php.
-// 'form.reports.time_fields' => 'Time fields',
-// 'form.reports.time_fields' => 'Campos de apontamento',
+'form.reports.time_fields' => 'Campos de tempo',
 'form.reports.user_fields' => 'Campos de usuário',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- sem agrupar ---',
@@ -449,11 +442,11 @@
 'form.report.assign_to_invoice' => 'Atribuir a fatura',
 'form.report.assign_to_timesheet' => 'Atribuir a planilha de horas',
 
-// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
+// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php.
 'form.timesheets.active_timesheets' => 'Planilhas de horas ativas',
 'form.timesheets.inactive_timesheets' => 'Planilhas de horas inativas',
 
-// Templates form. See example at https://timetracker.anuko.com/templates.php
+// Templates form. See example at https://timetracker.anuko.com/templates.php.
 'form.templates.active_templates' => 'Modelos ativos',
 'form.templates.inactive_templates' => 'Modelos inativos',
 
@@ -462,70 +455,63 @@
 'form.invoice.number' => 'Número da fatura',
 'form.invoice.person' => 'Pessoa',
 
-// Deleting Invoice form. See example at https://timetracker.anuko.com/invoice_delete.php
+// Deleting Invoice form. See example at https://timetracker.anuko.com/invoice_delete.php.
 'form.invoice.invoice_to_delete' => 'Fatura a ser apagada',
 'form.invoice.invoice_entries' => 'Entradas de fatura',
 'form.invoice.confirm_deleting_entries' => 'Confirme a exclusão das entradas de fatura do Time Tracker.',
 
-// Charts form. See example at https://timetracker.anuko.com/charts.php
+// Charts form. See example at https://timetracker.anuko.com/charts.php.
 'form.charts.interval' => 'Intervalo',
 'form.charts.chart' => 'Gráfico',
 
-// Projects form. See example at https://timetracker.anuko.com/projects.php
+// Projects form. See example at https://timetracker.anuko.com/projects.php.
 'form.projects.active_projects' => 'Projetos ativos',
 'form.projects.inactive_projects' => 'Projetos inativos',
 
-// Tasks form. See example at https://timetracker.anuko.com/tasks.php
+// Tasks form. See example at https://timetracker.anuko.com/tasks.php.
 'form.tasks.active_tasks' => 'Tarefas ativas',
 'form.tasks.inactive_tasks' => 'Tarefas inativas',
 
-// Users form. See example at https://timetracker.anuko.com/users.php
-// TODO: check the translation of form.users.uncompleted_entry. Is "apontamento" a correct term for a time entry?
-// The meaning of incomplete time entry in Time Tracker is that the entry only has the "start" time defined, but no finish time yet,
-// and may be ongoing. For example, user started working on something and is curently in progress doing it.
-// Check the Puncher plugin, which operates with such entries.
-// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-'form.users.uncompleted_entry' => 'O usuário tem um apontamento incompleto',
-'form.users.role' => 'Papel',
+// Users form. See example at https://timetracker.anuko.com/users.php.
+'form.users.uncompleted_entry' => 'O usuário tem uma entrada incompleta',
+'form.users.role' => 'Função',
 'form.users.manager' => 'Gerente',
 'form.users.comanager' => 'Coordenador',
 'form.users.rate' => 'Honorário',
 'form.users.default_rate' => 'Honorário padrão por hora',
 
-// Editing User form. See example at https://timetracker.anuko.com/user_edit.php
-'form.user_edit.swap_roles' => 'Alternar papéis',
+// Editing User form. See example at https://timetracker.anuko.com/user_edit.php.
+'form.user_edit.swap_roles' => 'Alternar funções',
 
-// Roles form. See example at https://timetracker.anuko.com/roles.php
-'form.roles.active_roles' => 'Papéis ativos',
-'form.roles.inactive_roles' => 'Papéis inativos',
+// Roles form. See example at https://timetracker.anuko.com/roles.php.
+'form.roles.active_roles' => 'Funções ativas',
+'form.roles.inactive_roles' => 'Funções inativas',
 'form.roles.rank' => 'Rank',
 'form.roles.rights' => 'Direitos',
 'form.roles.assigned' => 'Atribuído',
 'form.roles.not_assigned' => 'Não atribuído',
 
-// Clients form. See example at https://timetracker.anuko.com/clients.php
+// Clients form. See example at https://timetracker.anuko.com/clients.php.
 'form.clients.active_clients' => 'Clientes ativos',
 'form.clients.inactive_clients' => 'Clientes inativos',
 
-// Deleting Client form. See example at https://timetracker.anuko.com/client_delete.php
+// Deleting Client form. See example at https://timetracker.anuko.com/client_delete.php.
 'form.client.client_to_delete' => 'Cliente a ser apagado',
 'form.client.client_entries' => 'Entradas de cliente',
 
-// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php
-// TODO: replace "equipe" with "group" in the string below.
-'form.export.hint' => 'Você pode exportar todos os dados da equipe para um arquivo xml. Isto pode ser útil se você estiver migrando os dados para um servidor próprio.',
+// Exporting Group Data form. See example at https://timetracker.anuko.com/export.php.
+'form.export.hint' => 'Você pode exportar todos os dados do grupo para um arquivo xml. Isto pode ser útil se você estiver migrando os dados para um servidor próprio.',
 'form.export.compression' => 'Compressão',
 'form.export.compression_none' => 'nenhuma',
 'form.export.compression_bzip' => 'bzip',
 
 // Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
-'form.import.hint' => 'Importar dados de equipe de um arquivo xml.', // TODO: replace "team" with "group".
+'form.import.hint' => 'Importar dados do grupo de um arquivo xml.',
 'form.import.file' => 'Selecionar arquivo',
 'form.import.success' => 'Importação realizada com sucesso.',
 
 // Groups form. See example at https://timetracker.anuko.com/admin_groups.php (login as admin first).
-// TODO: replace "equipe" with "group" in the string below (3 places).
-'form.groups.hint' => 'Crie uma nova equipe fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
+'form.groups.hint' => 'Crie um novo grupo fazendo uma nova conta de gerente.<br>Você também pode importar os dados de um arquivo xml de outro servidor Anuko Time Tracker (não havendo colisão de usuários).',
 
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 horas',
@@ -548,7 +534,7 @@
 'form.group_edit.allow_ip' => 'Permitir IP',
 'form.group_edit.advanced_settings' => 'Configurações avançadas',
 
-// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php.
 'form.group_delete.hint' => 'Tem certeza de que deseja excluir todo o grupo?',
 
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
@@ -565,8 +551,8 @@
 'form.quota.hint' => 'Se os valores estiverem vazios, as cotas serão calculadas automaticamente com base nas horas de trabalho e feriados.',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
-'form.swap.hint' => 'Rebaixe-se a papel inferior trocando funções com outra pessoa. Isto não pode ser desfeito.',
-'form.swap.swap_with' => 'Trocar papéis com',
+'form.swap.hint' => 'Rebaixe-se a função inferior trocando funções com outra pessoa. Isto não pode ser desfeito.',
+'form.swap.swap_with' => 'Trocar papéis com', // TODO: replace papéis with funções?
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
 'form.work_units.minutes_in_unit' => 'Minutos em unidade',
@@ -608,7 +594,7 @@
 'form.display_options.not_complete_days' => 'Dias não completos',
 'form.display_options.custom_css' => 'CSS customizado',
 
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
+// Work plugin strings. See example at https://timetracker.anuko.com/work.php.
 'work.error.work_not_available' => 'Item de trabalho não está disponível.',
 'work.error.offer_not_available' => 'Oferta não disponível',
 'work.type.one_time' => 'Uma interação',
@@ -623,3 +609,4 @@
 'work.title.send_message' => 'Enviando mensagem',
 'work.msg.message_sent' => 'Mensagem enviada.',
 );
+
diff --git a/initialize.php b/initialize.php
index b5407ad8a..f0b52b40b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5582");
+define("APP_VERSION", "1.19.28.5583");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 227ab161cfe26f605406ef31959449aa0ada0f27 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Jul 2021 13:28:54 +0000
Subject: [PATCH 1600/1848] Minor improvement in pt-br file as per pr #111.

---
 WEB-INF/resources/pt-br.lang.php | 2 +-
 initialize.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3e2c6526f..bef8e5f40 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -552,7 +552,7 @@
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
 'form.swap.hint' => 'Rebaixe-se a função inferior trocando funções com outra pessoa. Isto não pode ser desfeito.',
-'form.swap.swap_with' => 'Trocar papéis com', // TODO: replace papéis with funções?
+'form.swap.swap_with' => 'Trocar função com',
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
 'form.work_units.minutes_in_unit' => 'Minutos em unidade',
diff --git a/initialize.php b/initialize.php
index f0b52b40b..dc53874d9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5583");
+define("APP_VERSION", "1.19.28.5584");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f22d240ca21743681e52edecfa050450cd596213 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Jul 2021 13:35:58 +0000
Subject: [PATCH 1601/1848] Added a comment in pt-br file.

---
 WEB-INF/resources/pt-br.lang.php | 2 +-
 initialize.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bef8e5f40..128f57f49 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -137,7 +137,7 @@
 'label.users' => 'Usuários',
 'label.group' => 'Grupo',
 'label.subgroups' => 'Subgrupos',
-'label.roles' => 'Papéis',
+'label.roles' => 'Papéis', // TODO: for consistency, use funçãos, perhaps?
 'label.client' => 'Cliente',
 'label.clients' => 'Clientes',
 'label.option' => 'Opção',
diff --git a/initialize.php b/initialize.php
index dc53874d9..c282d3f35 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5584");
+define("APP_VERSION", "1.19.28.5585");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 7e78a97138a71ff4b8070d3ec354475ddf0b8e29 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Jul 2021 13:37:19 +0000
Subject: [PATCH 1602/1848] Finished integrating changes from pr #111.

---
 WEB-INF/resources/pt-br.lang.php | 12 +++++-------
 initialize.php                   |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 128f57f49..5d3e2b6ed 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -69,9 +69,7 @@
 'error.no_groups' => 'Sua base de dados está vazia. Entre como admin e crie um grupo novo.',
 'error.upload' => 'Erro no envio do arquivo.',
 'error.range_locked' => 'Período bloqueado.',
-// TODO: is "Use" in error.mail_send translated correctly? Usar, or utilizar, perhaps? "Use" looks like an untranslated English word.
-// The meaning of this error is that mail send feature did not work, and using MAIL_SMTP_DEBUG should help admin to troubleshoot it.
-'error.mail_send' => 'Erro ao enviar e-mail. Use MAIL_SMTP_DEBUG para diagnósticos.',
+'error.mail_send' => 'Erro ao enviar e-mail. Use MAIL_SMTP_DEBUG para diagnósticos.', // "Use" means the same in pt-br as in en.
 'error.no_email' => 'Não há e-mail associado a este login.',
 'error.uncompleted_exists' => 'Entrada incompleta existente. Feche ou remova-a.',
 'error.goto_uncompleted' => 'Ir até a entrada incompleta.',
@@ -137,7 +135,7 @@
 'label.users' => 'Usuários',
 'label.group' => 'Grupo',
 'label.subgroups' => 'Subgrupos',
-'label.roles' => 'Papéis', // TODO: for consistency, use funçãos, perhaps?
+'label.roles' => 'Funções',
 'label.client' => 'Cliente',
 'label.clients' => 'Clientes',
 'label.option' => 'Opção',
@@ -284,7 +282,7 @@
 'title.add_user' => 'Adicionando usuário',
 'title.edit_user' => 'Editando usuário',
 'title.delete_user' => 'Apagando usuário',
-'title.roles' => 'Papéis',
+'title.roles' => 'Funções',
 'title.add_role' => 'Adicionando função',
 'title.edit_role' => 'Editando função',
 'title.delete_role' => 'Apagando função',
@@ -320,7 +318,7 @@
 'title.cf_delete_dropdown_option' => 'Apagando opção',
 'title.locking' => 'Bloquear',
 'title.week_view' => 'Visão semanal',
-'title.swap_roles' => 'Alteração de papéis',
+'title.swap_roles' => 'Alteração de funções',
 'title.work_units' => 'Unidades de trabalho',
 'title.templates' => 'Modelos',
 'title.add_template' => 'Adicionando modelo',
@@ -408,7 +406,7 @@
 'form.time.over_balance' => 'Saldo excedente',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
-'form.time_edit.uncompleted' => 'Eesta entrada foi salva somente com hora de início. Não é um erro.',
+'form.time_edit.uncompleted' => 'Esta entrada foi salva somente com hora de início. Não é um erro.',
 
 // Week view form. See example at https://timetracker.anuko.com/week.php.
 'form.week.new_entry' => 'Nova entrada',
diff --git a/initialize.php b/initialize.php
index c282d3f35..76b5058ef 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5585");
+define("APP_VERSION", "1.19.28.5586");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bd5871c86bd95adff6d429c3481f03ec9a244414 Mon Sep 17 00:00:00 2001
From: Thiago Alves Cavalcante <thiagoalcav@gmail.com>
Date: Thu, 8 Jul 2021 10:45:13 -0300
Subject: [PATCH 1603/1848] Add conditional if ldap is enabled on passwords
 (#112)

Adds same conditional on verifications of passwords in case of ldap (external password) is enabled. Else is not possible create groups due to erros on this verification with ldap configured.
---
 admin_group_add.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/admin_group_add.php b/admin_group_add.php
index 52850b608..9aeff1831 100644
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -69,12 +69,14 @@
     $err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
   if (ttUserHelper::getUserByLogin($cl_manager_login))
     $err->add($i18n->get('error.user_exists'));
-  if (!ttValidString($cl_password1))
-    $err->add($i18n->get('error.field'), $i18n->get('label.password'));
-  if (!ttValidString($cl_password2))
-    $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
-  if ($cl_password1 !== $cl_password2)
-    $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  if (!$auth->isPasswordExternal()) {
+    if (!ttValidString($cl_password1))
+      $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2))
+      $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
+    if ($cl_password1 !== $cl_password2)
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  }
   if (!ttValidEmail($cl_manager_email, true))
     $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttUserHelper::canAdd())

From 0a94b8f7afe1ee14b69b15789fd751d928255dd4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Jul 2021 15:23:21 +0000
Subject: [PATCH 1604/1848] Fixed ttUser::getUserDetails() function to allow
 supervisors work on behalf of users.

---
 WEB-INF/lib/ttUser.class.php | 7 ++-----
 initialize.php               | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index cf1065f06..2086a3740 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -587,11 +587,8 @@ function getSubgroups($group_id = null) {
     return $groups;
   }
 
-  // getUserDetails function is used to manage users in group and returns user details.
-  // At the moment, the function is used for user edits and deletes.
-  function getUserDetails($user_id) {
-    if (!$this->can('manage_users')) return false;
-
+  // getUserDetails function returns user details.
+   function getUserDetails($user_id) {
     $mdb2 = getConnection();
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
diff --git a/initialize.php b/initialize.php
index 76b5058ef..6b968992a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5586");
+define("APP_VERSION", "1.19.28.5587");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 36d735b4748bc786196f4b8c5f9ce72867aa1fe2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Jul 2021 15:06:30 +0000
Subject: [PATCH 1605/1848] Work started on inactive projects display option
 for reports.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 31 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 205600d04..5f37900bd 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -682,6 +682,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 7a685029b..0ff169553 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -695,6 +695,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3cb53a5a3..142655586 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -659,6 +659,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index c0d69b6d6..86834287a 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -636,6 +636,7 @@
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
 // TODO: translate the following.
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1acc79084..93d77217e 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -614,6 +614,7 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 'form.display_options.not_complete_days' => 'Not complete days',
+'form.display_options.inactive_projects' => 'Inactive projects',
 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index ebe095e96..1fb69298e 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -697,6 +697,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 961b8e2b5..28693401c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -667,6 +667,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 798406ccf..7d453ef33 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -683,6 +683,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 813b442fe..f45dec85a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -667,6 +667,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e2642ad27..168b01a5b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -655,6 +655,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 5a6a8df81..3b1ca3883 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -647,6 +647,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 958a556e6..2ed161e3e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -688,6 +688,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 22b28039e..78971e4f5 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -686,6 +686,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ab3852bf5..d1c172a5d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -661,6 +661,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 85192f026..2e1b012d3 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -690,6 +690,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 202578fcc..a5960229d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -688,6 +688,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 51d4e41ee..c261b7491 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -593,6 +593,8 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom', // Translator (Henk) comment: "kolom is the right word in Dutch."
 'form.display_options.not_complete_days' => 'Niet complete dagen',
+// TODO: translate the following.
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 'form.display_options.custom_css' => 'Aangepaste CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b3cf78863..6a6161f5d 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -689,6 +689,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b0602334f..376f324b7 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -668,6 +668,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 5d3e2b6ed..db8503038 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -590,6 +590,8 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.note_on_separate_row' => 'Anotação em linha separada',
 'form.display_options.not_complete_days' => 'Dias não completos',
+// TODO: translate the following.
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 'form.display_options.custom_css' => 'CSS customizado',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9a26f283e..4617faf4c 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -669,6 +669,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 95e27a122..d325468ce 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -690,6 +690,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index cb4abe577..5fbca6032 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -594,6 +594,7 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 'form.display_options.not_complete_days' => 'Незавершенные дни',
+'form.display_options.inactive_projects' => 'Неактивные проекты',
 'form.display_options.custom_css' => 'Пользовательская CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 821c23b45..d8add50c8 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -672,6 +672,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index bb37b8631..ac49e7d81 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -663,6 +663,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e1f9a28e2..6fcae026c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -670,6 +670,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index cea1ddd88..49df06651 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -667,6 +667,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b94ba8d90..08eec0619 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -703,6 +703,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 0a6e4ab25..4ec6da135 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -677,6 +677,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2efd7bbe1..970d79263 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -680,6 +680,7 @@
 // TODO: translate the following.
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
+// 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/initialize.php b/initialize.php
index 6b968992a..60598cb3c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5587");
+define("APP_VERSION", "1.19.28.5588");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ae7dfacad852cccff08c0a1f6fdcc8c7e7f50cf1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Jul 2021 16:42:27 +0000
Subject: [PATCH 1606/1848] Implemented report inactive projects display
 option.

---
 WEB-INF/lib/ttProjectHelper.class.php | 12 +++++++++---
 WEB-INF/templates/display_options.tpl |  8 ++++++++
 display_options.php                   |  4 ++++
 initialize.php                        |  2 +-
 reports.php                           |  4 +++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index d456c3110..ebbd055fb 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -77,17 +77,23 @@ static function getRates($user_id) {
     return $result;
   }
   
-  // getProjects - returns an array of active and inactive projects in group.
-  static function getProjects() {
+  // getProjects - returns an array of projects for group.
+  static function getProjects($includeInactiveProjects = true) {
     global $user;
     $mdb2 = getConnection();
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
+    // Construct status part.
+    $statusPart = 'status = 1';
+    if ($includeInactiveProjects) {
+      $statusPart = '(status = 0 or '.$statusPart.')';
+    }
+
     $result = array();
     $sql = "select id, name, tasks from tt_projects".
-      " where group_id = $group_id and org_id = $org_id and (status = 0 or status = 1) order by upper(name)";
+      " where group_id = $group_id and org_id = $org_id and $statusPart order by upper(name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index 8c9db8ea7..6486c0b25 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -41,6 +41,14 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_32.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
+  <tr class = "small-screen-label"><td><label for="report_inactive_projects">{$i18n.form.display_options.inactive_projects}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="report_inactive_projects">{$i18n.form.display_options.inactive_projects}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.report_inactive_projects.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_53.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_53.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td><div class="form-control-separator"></div></td></tr>
   <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_css}</td></tr>
diff --git a/display_options.php b/display_options.php
index 21b488c64..6e0ccc548 100644
--- a/display_options.php
+++ b/display_options.php
@@ -20,12 +20,14 @@
   $cl_time_not_complete_days = (bool)$request->getParameter('time_not_complete_days');
   $cl_record_custom_fields = (bool)$request->getParameter('record_custom_fields');
   $cl_report_note_on_separate_row = (bool)$request->getParameter('report_note_on_separate_row');
+  $cl_report_inactive_projects = (bool)($request->getParameter('report_inactive_projects'));
   $cl_custom_css = trim($request->getParameter('custom_css'));
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
   $cl_time_not_complete_days = $config->getDefinedValue('time_not_complete_days');
   $cl_record_custom_fields = $config->getDefinedValue('record_custom_fields');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
+  $cl_report_inactive_projects = $config->getDefinedValue('report_inactive_projects');
   $cl_custom_css = $user->getCustomCss();
 }
 
@@ -46,6 +48,7 @@
 
 // Reports.
 $form->addInput(array('type'=>'checkbox','name'=>'report_note_on_separate_row','value'=>$cl_report_note_on_separate_row));
+$form->addInput(array('type'=>'checkbox','name'=>'report_inactive_projects','value'=>$cl_report_inactive_projects));
 // TODO: add PDF break controller here.
 
 $form->addInput(array('type'=>'textarea','name'=>'custom_css','value'=>$cl_custom_css));
@@ -62,6 +65,7 @@
     $config->setDefinedValue('time_not_complete_days', $cl_time_not_complete_days);
     $config->setDefinedValue('record_custom_fields', $cl_record_custom_fields);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
+    $config->setDefinedValue('report_inactive_projects', $cl_report_inactive_projects);
     if ($user->updateGroup(array(
       'config' => $config->getConfig(),
       'custom_css' => $cl_custom_css))) {
diff --git a/initialize.php b/initialize.php
index 60598cb3c..f8f514ee0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5588");
+define("APP_VERSION", "1.19.28.5589");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index b71706220..c1df04387 100644
--- a/reports.php
+++ b/reports.php
@@ -73,7 +73,9 @@
 $project_list = array();
 if ($showProject) {
   if ($user->can('view_reports') || $user->can('view_all_reports')) {
-    $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
+    $config = new ttConfigHelper($user->getConfig());
+    $includeInactiveProjects = $config->getDefinedValue('report_inactive_projects');
+    $project_list = ttProjectHelper::getProjects($includeInactiveProjects);
   } elseif ($user->isClient()) {
     $project_list = ttProjectHelper::getProjectsForClient();
   } else {

From fb9f7b179726343b7c59aadf11c9ef1fa0b0762d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Aug 2021 18:21:40 +0000
Subject: [PATCH 1607/1848] Added a resource string.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 31 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5f37900bd..f9d9952db 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -131,6 +131,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0ff169553..453a51000 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -133,6 +133,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 142655586..a33224168 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -128,6 +128,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 86834287a..47eb84a16 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -125,6 +125,7 @@
 // The problem is they do not appear precise, deviate from the meaning of approval / disaproval of report items.)
 // 'button.approve' => 'Approve', (suggested 'Freigeben / Genehmigen' does not appear precise)
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 93d77217e..c1c00af9d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -120,6 +120,7 @@
 'button.stop' => 'Stop',
 'button.approve' => 'Approve',
 'button.disapprove' => 'Disapprove',
+'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Menu',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1fb69298e..8a8902f7d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -130,6 +130,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 28693401c..3299e8ada 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -139,6 +139,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 7d453ef33..019c4ca31 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -136,6 +136,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f45dec85a..0940dc597 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -130,6 +130,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 168b01a5b..88a96690e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -128,6 +128,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 3b1ca3883..489185a8c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -123,6 +123,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2ed161e3e..918b5f7dc 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -144,6 +144,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 78971e4f5..407c22cd4 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -133,6 +133,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d1c172a5d..165afe880 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -127,6 +127,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 2e1b012d3..dbac8f190 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -137,6 +137,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index a5960229d..896f1939f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -136,6 +136,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c261b7491..921d50af8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -111,6 +111,7 @@
 'button.stop' => 'Stop',
 'button.approve' => 'Goedkeuren',
 'button.disapprove' => 'Afkeuren',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Menu',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6a6161f5d..5cb39137d 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -136,6 +136,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 376f324b7..d77f11c3d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -132,6 +132,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index db8503038..15e3ef91f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -111,6 +111,8 @@
 'button.stop' => 'Parar',
 'button.approve' => 'Aprovar',
 'button.disapprove' => 'Desaprovar',
+// TODO: translate the following.
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Menu',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 4617faf4c..6a1598cc7 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -129,6 +129,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index d325468ce..f93f12085 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -136,6 +136,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5fbca6032..71bc709bf 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -111,6 +111,7 @@
 'button.stop' => 'Завершить',
 'button.approve' => 'Одобрить',
 'button.disapprove' => 'Не одобрить',
+'button.sync' => 'Синхронизовать',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Меню',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d8add50c8..da24d8caf 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -133,6 +133,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index ac49e7d81..40abaabea 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -126,6 +126,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6fcae026c..8e9fe4e8f 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -129,6 +129,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 49df06651..bd025f84b 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -127,6 +127,7 @@
 // TODO: translate the following.
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 08eec0619..5ac60a72d 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -140,6 +140,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4ec6da135..6c6451214 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -129,6 +129,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 970d79263..d16bf4cb7 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -133,6 +133,7 @@
 // 'button.stop' => 'Stop',
 // 'button.approve' => 'Approve',
 // 'button.disapprove' => 'Disapprove',
+// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 // TODO: translate the following.
diff --git a/initialize.php b/initialize.php
index f8f514ee0..d36445879 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5589");
+define("APP_VERSION", "1.19.28.5590");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d1a34ad77b7f38f8831fa303a215c242aaab492b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Aug 2021 13:26:18 +0000
Subject: [PATCH 1608/1848] Introduced entities_modified field in tt_groups
 table for future API support.

---
 dbinstall.php  | 10 ++++++----
 initialize.php |  2 +-
 mysql.sql      |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dbinstall.php b/dbinstall.php
index 322b05663..2dfe30d66 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1137,7 +1137,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11923"]) {
+  if ($_POST["convert11900to11929"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1170,6 +1170,8 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.22', modified = now() where param_name = 'version_db' and param_value = '1.19.19'");
     ttExecute("ALTER TABLE `tt_groups` drop `task_required`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.23', modified = now() where param_name = 'version_db' and param_value = '1.19.22'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `entities_modified` datetime default NULL AFTER `modified_by`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.29', modified = now() where param_name = 'version_db' and param_value = '1.19.23'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1220,7 +1222,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.23)</b>
+    <td width="80%"><b>Create database structure (v1.19.29)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1269,8 +1271,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.23)</td>
-    <td><input type="submit" name="convert11900to11923" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.19.29)</td>
+    <td><input type="submit" name="convert11900to11929" value="Update"></td>
   </tr>
 </table>
 
diff --git a/initialize.php b/initialize.php
index d36445879..97dfbe2ac 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.28.5590");
+define("APP_VERSION", "1.19.29.5591");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mysql.sql b/mysql.sql
index e9f4cc031..7a87b3766 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -45,6 +45,7 @@ CREATE TABLE `tt_groups` (
   `modified` datetime default NULL,                      # modification timestamp
   `modified_ip` varchar(45) default NULL,                # modifier ip
   `modified_by` int(11) default NULL,                    # modifier user_id
+  `entities_modified` datetime default NULL,             # modification timestamp of group entities (clients, projects, etc.)
   `status` tinyint(4) default 1,                         # group status
   PRIMARY KEY (`id`)
 );
@@ -656,4 +657,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.23', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.29', now()); # TODO: change when structure changes.

From 30ae56536c029705287b6a5c291624e5e4c5ed11 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Aug 2021 14:21:56 +0000
Subject: [PATCH 1609/1848] Wrote ttGroupHelper::updateEntitiesModidied
 function and started to use it for group and project changes.

---
 WEB-INF/lib/ttGroupHelper.class.php   | 13 +++++++++++++
 WEB-INF/lib/ttProjectHelper.class.php | 21 +++++++++++++++++----
 WEB-INF/lib/ttUser.class.php          |  3 +++
 initialize.php                        |  2 +-
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 0dd3dd412..0fa0355ea 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -761,4 +761,17 @@ static function deleteGroupFiles($group_id) {
     // By design, we ignore such errors.
     return true;
   }
+
+  // updateEntitiesModified updates the entities_modided field in tt_groups table
+  // with a current timestamp.
+  static function updateEntitiesModified() {
+    global $user;
+    $org_id = $user->org_id;
+    $group_id = $user->getGroup();
+    $mdb2 = getConnection();
+
+    $sql = "update tt_groups set entities_modified = now() where id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
 }
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index ebbd055fb..5e3321b92 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -216,9 +216,14 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Finally, delete the project from the projects field in tt_clients table.
-    $result = ttClientHelper::deleteProject($id);
-    return $result;
+    // Delete the project from the projects field in tt_clients table.
+    if (!ttClientHelper::deleteProject($id))
+      return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified()) return false;
+
+    return true;
   }
   
   // insert function inserts a new project into database.
@@ -269,6 +274,9 @@ static function insert($fields)
       }
     }
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified()) return false;
+
     return $last_id;
   } 
 
@@ -354,7 +362,12 @@ static function update($fields) {
       ", tasks = ".$mdb2->quote($comma_separated).", status = ".$mdb2->quote($status).
       " where id = $project_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified()) return false;
+
+    return true;
   }
 
   // getAssignedUsers - returns an array of user ids assigned to a project.
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2086a3740..c6539db66 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -707,6 +707,9 @@ function updateGroup($fields) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified()) return false;
+
     return true;
   }
 
diff --git a/initialize.php b/initialize.php
index 97dfbe2ac..5c37c7452 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5591");
+define("APP_VERSION", "1.19.29.5592");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 25c08b9eab394193cddae071ca3d6cca652ef88d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Aug 2021 15:47:54 +0000
Subject: [PATCH 1610/1848] Started to update entities_modified for client add,
 edit, and delete operations.

---
 WEB-INF/lib/ttClientHelper.class.php  | 22 ++++++++++++++++++++--
 WEB-INF/lib/ttGroupHelper.class.php   |  2 +-
 WEB-INF/lib/ttProjectHelper.class.php | 12 ++++++++----
 WEB-INF/lib/ttUser.class.php          |  6 ++++--
 initialize.php                        |  2 +-
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index 3c5f0d646..ba62d0f33 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -150,7 +150,14 @@ static function delete($id, $delete_client_entries) {
     $sql = "update tt_clients set status = null".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
+    return true;
   }
 
   // The insert function inserts a new client record into the clients table.
@@ -190,6 +197,10 @@ static function insert($fields)
           return false;
       }
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   }
 
@@ -232,7 +243,14 @@ static function update($fields)
       ", tax = $tax, projects = ".$mdb2->quote($comma_separated).", status = $status".
       " where id = $id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
+    return true;
   }
 
   // The fillBean function fills the ActionForm object with client data.
diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 0fa0355ea..aa75a571e 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -762,7 +762,7 @@ static function deleteGroupFiles($group_id) {
     return true;
   }
 
-  // updateEntitiesModified updates the entities_modided field in tt_groups table
+  // updateEntitiesModified updates the entities_modified field in tt_groups table
   // with a current timestamp.
   static function updateEntitiesModified() {
     global $user;
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 5e3321b92..dd6e35cb8 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -221,7 +221,8 @@ static function delete($id) {
       return false;
 
     // Update entities_modified, too.
-    if (!ttGroupHelper::updateEntitiesModified()) return false;
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
 
     return true;
   }
@@ -275,7 +276,8 @@ static function insert($fields)
     }
 
     // Update entities_modified, too.
-    if (!ttGroupHelper::updateEntitiesModified()) return false;
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
 
     return $last_id;
   } 
@@ -362,10 +364,12 @@ static function update($fields) {
       ", tasks = ".$mdb2->quote($comma_separated).", status = ".$mdb2->quote($status).
       " where id = $project_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
 
     // Update entities_modified, too.
-    if (!ttGroupHelper::updateEntitiesModified()) return false;
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
 
     return true;
   }
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index c6539db66..6848a72df 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -705,10 +705,12 @@ function updateGroup($fields) {
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
 
     // Update entities_modified, too.
-    if (!ttGroupHelper::updateEntitiesModified()) return false;
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
 
     return true;
   }
diff --git a/initialize.php b/initialize.php
index 5c37c7452..d2b0a737d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5592");
+define("APP_VERSION", "1.19.29.5593");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9a99a01e54029b20a1f1ed6dcc2ae9062e300576 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 13 Aug 2021 16:33:58 +0000
Subject: [PATCH 1611/1848] Start to update entities_modified for task and user
 update operations.

---
 WEB-INF/lib/ttTaskHelper.class.php | 19 +++++++++++-
 WEB-INF/lib/ttUser.class.php       |  4 ++-
 WEB-INF/lib/ttUserHelper.class.php | 47 +++++++++++++++++++-----------
 initialize.php                     |  2 +-
 4 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index 71a520025..e93d3d669 100644
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -107,7 +107,14 @@ static function delete($task_id) {
     // Mark the task as deleted.
     $sql = "update tt_tasks set status = NULL where id = $task_id";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
+    return true;
   }
   
  // insert function inserts a new task into database.
@@ -161,6 +168,11 @@ static function insert($fields)
           return false;
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   }
  
@@ -242,6 +254,11 @@ static function update($fields)
         }
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 6848a72df..320fa623d 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -760,7 +760,9 @@ function markUserDeleted($user_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
 
     return true;
   }
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 95be4fbb5..122c7889c 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -95,27 +95,31 @@ static function insert($fields, $hash = true) {
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
       ", $password, $group_id, $org_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, $quota_percent, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v)";
     $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
 
     // Now deal with project assignment.
-    if (!is_a($affected, 'PEAR_Error')) {
-      $last_id = $mdb2->lastInsertID('tt_users', 'id');
-      $projects = isset($fields['projects']) ? $fields['projects'] : array();
-      if (count($projects) > 0) {
-        // We have at least one project assigned. Insert corresponding entries in tt_user_project_binds table.
-        foreach($projects as $p) {
-          if(!isset($p['rate']))
-            $p['rate'] = 0;
-          else
-            $p['rate'] = str_replace(',', '.', $p['rate']);
-
-          $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, rate, status)".
-            " values(".$p['id'].", $last_id, $group_id, $org_id, ".$p['rate'].", 1)";
-          $affected = $mdb2->exec($sql);
-        }
+    $last_id = $mdb2->lastInsertID('tt_users', 'id');
+    $projects = isset($fields['projects']) ? $fields['projects'] : array();
+    if (count($projects) > 0) {
+      // We have at least one project assigned. Insert corresponding entries in tt_user_project_binds table.
+      foreach($projects as $p) {
+        if(!isset($p['rate']))
+          $p['rate'] = 0;
+        else
+          $p['rate'] = str_replace(',', '.', $p['rate']);
+
+        $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, rate, status)".
+          " values(".$p['id'].", $last_id, $group_id, $org_id, ".$p['rate'].", 1)";
+        $affected = $mdb2->exec($sql);
       }
-      return $last_id;
     }
-    return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
+    return $last_id;
   }
 
   // update - updates a user in database.
@@ -232,6 +236,11 @@ static function update($user_id, $fields) {
         }
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
@@ -282,6 +291,10 @@ static function delete($user_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
diff --git a/initialize.php b/initialize.php
index d2b0a737d..984dc3718 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5593");
+define("APP_VERSION", "1.19.29.5594");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 974a1cf40a424eca9594bc0d0dbf08e3b72c78f2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Aug 2021 16:52:54 +0000
Subject: [PATCH 1612/1848] Started to update entities_modified on custom field
 and predefined expenses changes.

---
 .../lib/ttPredefinedExpenseHelper.class.php   | 17 ++++++-
 initialize.php                                |  2 +-
 plugins/CustomFields.class.php                | 50 +++++++++++++++++--
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 8ec8ccfee..c6bc3f356 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -66,6 +66,10 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
@@ -88,6 +92,10 @@ static function insert($fields) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
@@ -108,6 +116,13 @@ static function update($fields) {
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
       " where id = $predefined_expense_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
+    return true;
   }
 }
diff --git a/initialize.php b/initialize.php
index 984dc3718..21f27ce82 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5594");
+define("APP_VERSION", "1.19.29.5595");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index a11e40a32..6350a6784 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -156,6 +156,11 @@ static function insertOption($field_id, $option_name) {
             if (is_a($affected, 'PEAR_Error'))
                 return false;
         }
+
+        // Update entities_modified, too.
+        if (!ttGroupHelper::updateEntitiesModified())
+          return false;
+
         return true;
     }
 
@@ -170,7 +175,14 @@ static function updateOption($id, $option_name) {
         $sql = "update tt_custom_field_options set value = " . $mdb2->quote($option_name) .
                 " where id = $id and group_id = $group_id and org_id = $org_id";
         $affected = $mdb2->exec($sql);
-        return (!is_a($affected, 'PEAR_Error'));
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+
+        // Update entities_modified, too.
+        if (!ttGroupHelper::updateEntitiesModified())
+          return false;
+
+        return true;
     }
 
     // delete Option deletes an option and all custom field log entries that used it.
@@ -196,7 +208,14 @@ static function deleteOption($id) {
         $sql = "update tt_custom_field_options set status = null" .
                 " where id = $id and group_id = $group_id and org_id = $org_id";
         $affected = $mdb2->exec($sql);
-        return (!is_a($affected, 'PEAR_Error'));
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+
+        // Update entities_modified, too.
+        if (!ttGroupHelper::updateEntitiesModified())
+          return false;
+
+        return true;
     }
 
     // getOptions returns an array of options for a custom field.
@@ -314,7 +333,14 @@ static function insertField($field_name, $entity_type, $field_type, $required) {
         $sql = "insert into tt_custom_fields (group_id, org_id, entity_type, type, label, required, status)" .
                 " values($group_id, $org_id, $entity_type, $field_type, " . $mdb2->quote($field_name) . ", $required, 1)";
         $affected = $mdb2->exec($sql);
-        return (!is_a($affected, 'PEAR_Error'));
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+
+        // Update entities_modified, too.
+        if (!ttGroupHelper::updateEntitiesModified())
+          return false;
+
+        return true;
     }
 
     // The updateField updates custom field for group.
@@ -328,7 +354,14 @@ static function updateField($id, $name, $type, $required) {
         $sql = "update tt_custom_fields set label = " . $mdb2->quote($name) . ", type = $type, required = $required" .
                 " where id = $id and group_id = $group_id and org_id = $org_id";
         $affected = $mdb2->exec($sql);
-        return (!is_a($affected, 'PEAR_Error'));
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+
+        // Update entities_modified, too.
+        if (!ttGroupHelper::updateEntitiesModified())
+          return false;
+
+        return true;
     }
 
     // The deleteField deletes a custom field, its options and log entries for group.
@@ -357,7 +390,14 @@ static function deleteField($field_id) {
         $sql = "update tt_custom_fields set status = null" .
                 " where id = $field_id and group_id = $group_id and org_id = $org_id";
         $affected = $mdb2->exec($sql);
-        return (!is_a($affected, 'PEAR_Error'));
+        if (is_a($affected, 'PEAR_Error'))
+          return false;
+
+        // Update entities_modified, too.
+        if (!ttGroupHelper::updateEntitiesModified())
+          return false;
+
+        return true;
     }
 
     // insertTimeFields - inserts time custom fields into tt_custom_field_log.

From 865dd33879409b174a4eab42beecedf426f26602 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 14 Aug 2021 17:10:06 +0000
Subject: [PATCH 1613/1848] Started to update entities_modified on template
 changes.

---
 WEB-INF/lib/ttTemplateHelper.class.php | 13 +++++++++++++
 initialize.php                         |  2 +-
 plugins/MonthlyQuota.class.php         |  8 +++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTemplateHelper.class.php b/WEB-INF/lib/ttTemplateHelper.class.php
index 6e6ad0a02..0b9fcf92a 100644
--- a/WEB-INF/lib/ttTemplateHelper.class.php
+++ b/WEB-INF/lib/ttTemplateHelper.class.php
@@ -48,6 +48,10 @@ static function delete($id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
@@ -87,6 +91,11 @@ static function insert($fields) {
           return false;
       }
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return $last_id;
   }
 
@@ -129,6 +138,10 @@ static function update($fields) {
           die($affected->getMessage());
       }
 
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 
diff --git a/initialize.php b/initialize.php
index 21f27ce82..b8f7a204f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5595");
+define("APP_VERSION", "1.19.29.5596");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 0a8ee4e9b..f742fd918 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -51,8 +51,14 @@ public function update($year, $month, $minutes) {
       $insertSql = "insert into tt_monthly_quotas (group_id, org_id, year, month, minutes)".
         " values ($this->group_id, $this->org_id, $year, $month, $minutes)";
       $affected = $this->db->exec($insertSql);
-      return (!is_a($affected, 'PEAR_Error'));
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
     }
+
+    // Update entities_modified, too.
+    if (!ttGroupHelper::updateEntitiesModified())
+      return false;
+
     return true;
   }
 

From 72d595742225a383fa8b891cd19add6296b2c208 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 1 Sep 2021 14:27:58 +0000
Subject: [PATCH 1614/1848] Cosmetic fixes to typos in comments.

---
 WEB-INF/lib/ttTimeHelper.class.php | 4 ++--
 initialize.php                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 031ccfb61..75c911e04 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -119,13 +119,13 @@ static function isValidDuration($value) {
   }
 
   // postedDurationToMinutes - converts a value representing a duration
-  // (usually enetered in a form by a user) to an integer number of minutes.
+  // (usually entered in a form by a user) to an integer number of minutes.
   //
   // Parameters:
   //   $duration - user entered duration string. Valid strings are:
   //               3 or 3h - means 3 hours. Note: h and m letters are not localized.
   //               0.25 or 0.25h or .25 or .25h - means a quarter of hour.
-  //               0,25 or 0,25h or ,25 or ,25h - same as above for users with comma ad decimal mark.
+  //               0,25 or 0,25h or ,25 or ,25h - same as above for users with comma as decimal mark.
   //               1:30 - means 1 hour 30 minutes.
   //               25m - means 25 minutes.
   //   $max - maximum number of minutes that is valid.
diff --git a/initialize.php b/initialize.php
index b8f7a204f..934f9d4b4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5596");
+define("APP_VERSION", "1.19.29.5597");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 71796c69b7128ce6d49c6772ccfa8c0c14ff4ba0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Oct 2021 17:39:30 +0000
Subject: [PATCH 1615/1848] Maintenance fixes.

---
 initialize.php                 | 2 +-
 plugins/CustomFields.class.php | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 934f9d4b4..105507363 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5597");
+define("APP_VERSION", "1.19.29.5598");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 6350a6784..26e4532b3 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -373,18 +373,27 @@ static function deleteField($field_id) {
         $org_id = $user->org_id;
 
         // Mark log entries as deleted. TODO: why are we doing this? Research impact.
+        // The impact is quite severe: an accidental delete of a custom field makes manual recovery problematic.
+        // Therefore, not doing this anymore as of Oct 7, 2021.
+        /*
         $sql = "update tt_custom_field_log set status = null" .
                 " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
             return false;
+        */
 
         // Mark field options as deleted.
+        // Same comment as above applies.
+        // An accidental delete of a custom field makes manual recovery problematic.
+        // Therefore, not doing this anymore as of Oct 7, 2021.
+        /*
         $sql = "update tt_custom_field_options set status = null" .
                 " where field_id = $field_id and group_id = $group_id and org_id = $org_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
             return false;
+        */
 
         // Mark custom field as deleted.
         $sql = "update tt_custom_fields set status = null" .

From 559906731f153c9b3a632c2839ed11669b76d593 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 12 Oct 2021 20:01:36 +0000
Subject: [PATCH 1616/1848] Added a check for passed in date to time.php.

---
 initialize.php | 2 +-
 time.php       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 105507363..e0b38f4d5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.29.5598");
+define("APP_VERSION", "1.19.30.5599");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 1bee1129c..61e771f8b 100644
--- a/time.php
+++ b/time.php
@@ -32,6 +32,12 @@
     exit();
   }
 }
+// If we are passed in a date, make sure it is in correct format.
+$date = $request->getParameter('date');
+if ($date && !ttValidDate($date)) {
+  header('Location: access_denied.php');
+  exit();
+}
 // End of access checks.
 
 // Determine user for whom we display this page.

From d3f60bd3e3ea8ff8ec31a596baec6750af601b7c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 12 Oct 2021 20:31:02 +0000
Subject: [PATCH 1617/1848] A better fix to validate a passed-in date.

---
 WEB-INF/lib/common.lib.php | 20 +++++++++++++++++---
 initialize.php             |  2 +-
 time.php                   |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index d5b43f57f..db8d58ea3 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -226,15 +226,29 @@ function ttValidDate($val)
   if (strlen($val) == 0)
     return false;
 
-  // This should accept a string in format 'YYYY-MM-DD', 'MM/DD/YYYY', 'DD-MM-YYYY', 'DD.MM.YYYY', or 'DD.MM.YYYY whatever'.
+  // This should validate a string in format 'YYYY-MM-DD', 'MM/DD/YYYY', 'DD-MM-YYYY', 'DD.MM.YYYY', or 'DD.MM.YYYY whatever'.
   if (!preg_match('/^\d\d\d\d-\d\d-\d\d$/', $val) &&
     !preg_match('/^\d\d\/\d\d\/\d\d\d\d$/', $val) &&
     !preg_match('/^\d\d\-\d\d\-\d\d\d\d$/', $val) &&
     !preg_match('/^\d\d\.\d\d\.\d\d\d\d$/', $val) &&
     !preg_match('/^\d\d\.\d\d\.\d\d\d\d .+$/', $val))
     return false;
-    
-  return true;    
+
+  return true;
+}
+
+// ttValidDbDateFormatDate is used to check user input to validate a date in DB_DATEFORMAT.
+function ttValidDbDateFormatDate($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0)
+    return false;
+
+  // This should validate a string in format 'YYYY-MM-DD'.
+  if (!preg_match('/^\d\d\d\d-\d\d-\d\d$/', $val))
+    return false;
+
+  return true;
 }
 
 // ttValidInteger is used to check user input to validate an integer.
diff --git a/initialize.php b/initialize.php
index e0b38f4d5..3d6aeab4c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.30.5599");
+define("APP_VERSION", "1.19.30.5600");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 61e771f8b..e5e509c06 100644
--- a/time.php
+++ b/time.php
@@ -34,7 +34,7 @@
 }
 // If we are passed in a date, make sure it is in correct format.
 $date = $request->getParameter('date');
-if ($date && !ttValidDate($date)) {
+if ($date && !ttValidDbDateFormatDate($date)) {
   header('Location: access_denied.php');
   exit();
 }

From 42ea5b1d1658ba5a0fa14069d8b31b9292249821 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 12 Oct 2021 21:00:47 +0000
Subject: [PATCH 1618/1848] Added validation of browser_today parameter in
 posts.

---
 expense_edit.php |  8 ++++++++
 expenses.php     |  8 ++++++++
 initialize.php   |  2 +-
 login.php        | 11 +++++++++++
 puncher.php      |  8 ++++++++
 time.php         |  8 ++++++++
 time_edit.php    |  8 ++++++++
 7 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/expense_edit.php b/expense_edit.php
index 271a588ac..258437b33 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -27,6 +27,14 @@
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
diff --git a/expenses.php b/expenses.php
index 1914a253e..1b5d99c1d 100644
--- a/expenses.php
+++ b/expenses.php
@@ -38,6 +38,14 @@
     exit();
   }
 }
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 // Determine user for which we display this page.
diff --git a/initialize.php b/initialize.php
index 3d6aeab4c..63ee048df 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.30.5600");
+define("APP_VERSION", "1.19.30.5601");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index 09c7af141..9e2436206 100644
--- a/login.php
+++ b/login.php
@@ -7,6 +7,17 @@
 import('ttOrgHelper');
 import('ttUser');
 
+// Access checks.
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+
 $cl_login = $request->getParameter('login');
 if ($cl_login == null && $request->isGet()) $cl_login = @$_COOKIE[LOGIN_COOKIE_NAME];
 $cl_password = $request->getParameter('password');
diff --git a/puncher.php b/puncher.php
index 5d6bca7c0..787c6f34b 100644
--- a/puncher.php
+++ b/puncher.php
@@ -19,6 +19,14 @@
   header('Location: feature_disabled.php');
   exit();
 }
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 $showClient = $user->isPluginEnabled('cl');
diff --git a/time.php b/time.php
index e5e509c06..9202dc1d7 100644
--- a/time.php
+++ b/time.php
@@ -38,6 +38,14 @@
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 // Determine user for whom we display this page.
diff --git a/time_edit.php b/time_edit.php
index d34ae1ca6..e82e21b88 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -24,6 +24,14 @@
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 $user_id = $user->getUser();

From 8f78ea2bac49e937eedf5477dfcb9cf61c498069 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 12 Oct 2021 21:45:35 +0000
Subject: [PATCH 1619/1848] Forgot to check in one file.

---
 week.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/week.php b/week.php
index 7687f9598..fbfbfee36 100644
--- a/week.php
+++ b/week.php
@@ -38,6 +38,14 @@
     exit();
   }
 }
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 // Determine user for whom we display this page.

From 94fda0cc0c9c20ab98d38ccc75ff040d13dc7f1b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 20 Oct 2021 20:51:47 +0000
Subject: [PATCH 1620/1848] Fixed an sql injection vulnerability in groups.php.

---
 groups.php     | 13 ++++++++++---
 initialize.php |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/groups.php b/groups.php
index a7bf2dfe6..ca01a5f7c 100644
--- a/groups.php
+++ b/groups.php
@@ -11,9 +11,16 @@
   header('Location: access_denied.php');
   exit();
 }
-if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
+if ($request->isPost()) {
+  $group_id = $request->getParameter('group');
+  if (!ttValidInteger($group_id)) {
+    header('Location: access_denied.php'); // Protection against sql injection.
+    exit();
+  }
+  if (!$user->isGroupValid($group_id)) {
+    header('Location: access_denied.php'); // Wrong group id in post.
+    exit();
+  }
 }
 // End of access checks.
 
diff --git a/initialize.php b/initialize.php
index 63ee048df..92c907f30 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.30.5601");
+define("APP_VERSION", "1.19.31.5602");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0cf32f1046418aa2e5218b0b370064820c330c6a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Oct 2021 12:29:00 +0000
Subject: [PATCH 1621/1848] Added additional protection against an sql
 injection fixed in previous commit.

---
 WEB-INF/lib/ttGroupHelper.class.php | 6 +++++-
 initialize.php                      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index aa75a571e..81b0c7f34 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -27,9 +27,13 @@ static function getGroupName($group_id) {
   static function getParentGroup($group_id) {
     global $user;
 
+    // Checking parameters for sanity is normally done in access check blocks on pages.
+    // This cast below is just in case we forgot to check $group_id to be an integer.
+    $groupId = (int) $group_id; // Protection against sql injection.
+
     $mdb2 = getConnection();
 
-    $sql = "select parent_id from tt_groups where id = $group_id and org_id = $user->org_id and status = 1";
+    $sql = "select parent_id from tt_groups where id = $groupId and org_id = $user->org_id and status = 1";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
diff --git a/initialize.php b/initialize.php
index 92c907f30..bc05d18d9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.31.5602");
+define("APP_VERSION", "1.19.31.5603");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 571a69ca25e0c94af905d54b84dc06b3d9df22d8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 21 Oct 2021 15:27:59 +0000
Subject: [PATCH 1622/1848] A couple more fixes to address CVE-2021-41139.

---
 charts.php     | 5 +++++
 expenses.php   | 6 ++++++
 initialize.php | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts.php b/charts.php
index 1bf6d34fa..88878f6b0 100644
--- a/charts.php
+++ b/charts.php
@@ -40,6 +40,11 @@
     exit();
   }
 }
+$date = $request->getParameter('date');
+if ($date && !ttValidDbDateFormatDate($date)) {
+  header('Location: access_denied.php');
+  exit();
+}
 // End of access checks.
 
 // Determine user for which we display this page.
diff --git a/expenses.php b/expenses.php
index 1b5d99c1d..578e2d1c6 100644
--- a/expenses.php
+++ b/expenses.php
@@ -38,6 +38,12 @@
     exit();
   }
 }
+// If we are passed in a date, make sure it is in correct format.
+$date = $request->getParameter('date');
+if ($date && !ttValidDbDateFormatDate($date)) {
+  header('Location: access_denied.php');
+  exit();
+}
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
diff --git a/initialize.php b/initialize.php
index bc05d18d9..6caaec770 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.31.5603");
+define("APP_VERSION", "1.19.32.5604");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 098706ef27d5fbc8dda87383d64a671b9dd5aa7c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 22 Oct 2021 19:54:28 +0000
Subject: [PATCH 1623/1848] Security fix, added checking status value for
 sanity.

---
 WEB-INF/lib/common.lib.php | 13 +++++++++++++
 client_edit.php            |  2 ++
 initialize.php             |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index db8d58ea3..5840f3684 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -219,6 +219,19 @@ function ttValidFloat($val, $emptyValid = false)
   return true;    
 }
 
+// ttValidStatus is used to check user input to validate a status value.
+function ttValidStatus($val)
+{
+  if (!ttValidInteger($val))
+    return false;
+
+  $intVal = (int) $val; // Cast to int for comparisons below to work.
+  if ($intVal != ACTIVE && $intVal != INACTIVE)
+    return false;
+
+  return true;
+}
+
 // ttValidDate is used to check user input to validate a date.
 function ttValidDate($val)
 {
diff --git a/client_edit.php b/client_edit.php
index 349834181..4489e2a75 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -33,6 +33,7 @@
   $cl_address = trim($request->getParameter('address'));
   $cl_tax = trim($request->getParameter('tax'));
   $cl_status = $request->getParameter('status');
+$cl_status = "1"  ;
   $cl_projects = $request->getParameter('projects');
 } else {
   $cl_name = $client['name'];
@@ -64,6 +65,7 @@
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.client_name'));
   if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
   if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
+  if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
diff --git a/initialize.php b/initialize.php
index 6caaec770..4497264e5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.32.5604");
+define("APP_VERSION", "1.19.33.5605");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1e89145d4f841021ebe82049b58ce4e6840091d4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 22 Oct 2021 19:56:09 +0000
Subject: [PATCH 1624/1848] Proper security fix, added checking status value
 for sanity.

---
 client_edit.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client_edit.php b/client_edit.php
index 4489e2a75..665fda15e 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -33,7 +33,6 @@
   $cl_address = trim($request->getParameter('address'));
   $cl_tax = trim($request->getParameter('tax'));
   $cl_status = $request->getParameter('status');
-$cl_status = "1"  ;
   $cl_projects = $request->getParameter('projects');
 } else {
   $cl_name = $client['name'];

From c1db27ad9c9a4a1ebe0726977789bea52184f088 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 22 Oct 2021 20:15:50 +0000
Subject: [PATCH 1625/1848] Added checking status parameter for sanity in more
 files.

---
 initialize.php     | 2 +-
 project_edit.php   | 1 +
 role_edit.php      | 1 +
 task_edit.php      | 1 +
 template_edit.php  | 1 +
 timesheet_edit.php | 1 +
 user_edit.php      | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 4497264e5..342d458a6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.33.5605");
+define("APP_VERSION", "1.19.33.5606");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/project_edit.php b/project_edit.php
index 917b2e974..7d8e113dd 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -63,6 +63,7 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
diff --git a/role_edit.php b/role_edit.php
index 5192ee62d..f2aecadee 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -58,6 +58,7 @@
     if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
     if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
     if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
+    if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
 
     if ($err->no()) {
       $existing_role = ttRoleHelper::getRoleByName($cl_name);
diff --git a/task_edit.php b/task_edit.php
index b2b61b80b..9761e31db 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -56,6 +56,7 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
diff --git a/template_edit.php b/template_edit.php
index 2f3c69727..2ff87b721 100644
--- a/template_edit.php
+++ b/template_edit.php
@@ -64,6 +64,7 @@
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_content)) $err->add($i18n->get('error.field'), $i18n->get('label.template'));
+  if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_projects, 'tt_projects')) $err->add($i18n->get('error.field'), $i18n->get('label.projects'));
   // Finished validating user input.
 
diff --git a/timesheet_edit.php b/timesheet_edit.php
index 164cc61bb..3e46733ae 100644
--- a/timesheet_edit.php
+++ b/timesheet_edit.php
@@ -51,6 +51,7 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
+  if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
 
   if ($request->getParameter('btn_save')) {
     if ($err->no()) {
diff --git a/user_edit.php b/user_edit.php
index 10aaebbb0..57133eb39 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -194,6 +194,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
+  if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
     // Validate input in user custom fields.
   if (isset($custom_fields) && $custom_fields->userFields) {

From 4546333e1869a99b28981e3049a83b6ee4d4fa1f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 24 Oct 2021 14:57:44 +0000
Subject: [PATCH 1626/1848] Fixed ttValidStatus function to accept null values.

---
 WEB-INF/lib/common.lib.php | 3 +++
 initialize.php             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 5840f3684..05a06808f 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -222,6 +222,9 @@ function ttValidFloat($val, $emptyValid = false)
 // ttValidStatus is used to check user input to validate a status value.
 function ttValidStatus($val)
 {
+  if (null == $val)
+    return true;
+
   if (!ttValidInteger($val))
     return false;
 
diff --git a/initialize.php b/initialize.php
index 342d458a6..c778bc422 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.33.5606");
+define("APP_VERSION", "1.19.33.5607");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 50c7a625e0f8e86d3ffb8ea7c5664a995718f797 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Oct 2021 14:45:37 +0000
Subject: [PATCH 1627/1848] Dutch translation improvement.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 921d50af8..91ff4c8bc 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -594,8 +594,7 @@
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom', // Translator (Henk) comment: "kolom is the right word in Dutch."
 'form.display_options.not_complete_days' => 'Niet complete dagen',
-// TODO: translate the following.
-// 'form.display_options.inactive_projects' => 'Inactive projects',
+'form.display_options.inactive_projects' => 'Niet actieve projecten',
 'form.display_options.custom_css' => 'Aangepaste CSS',
 
 // Work plugin strings. See example at https://timetracker.anuko.com/work.php
diff --git a/initialize.php b/initialize.php
index c778bc422..f02b0b0e3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.33.5607");
+define("APP_VERSION", "1.19.33.5608");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ab0e714e047eac432316aca5eee38589215745d8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 22 Nov 2021 17:19:15 +0000
Subject: [PATCH 1628/1848] Fixed CustomFileds class for adding a previously
 deleted option.

---
 initialize.php                 | 2 +-
 plugins/CustomFields.class.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index f02b0b0e3..b93c09ce2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.33.5608");
+define("APP_VERSION", "1.19.34.5609");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 26e4532b3..1a7b94e9e 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -140,8 +140,9 @@ static function insertOption($field_id, $option_name) {
 
         // Check if the option exists.
         $id = 0;
-        $sql = "select id from tt_custom_field_options" .
-                " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = " . $mdb2->quote($option_name);
+        $sql = "select id from tt_custom_field_options".
+                " where field_id = $field_id and group_id = $group_id and org_id = $org_id and value = ".$mdb2->quote($option_name).
+                " and status is not null";
         $res = $mdb2->query($sql);
         if (is_a($res, 'PEAR_Error'))
             return false;

From 79b16664911af80dc0703ea8d8192242e7f32748 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 21 Dec 2021 21:16:50 +0000
Subject: [PATCH 1629/1848] Addressed CVE-2021-41139 situation in week.php.

---
 initialize.php | 2 +-
 week.php       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index b93c09ce2..4be516486 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5609");
+define("APP_VERSION", "1.19.34.5610");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index fbfbfee36..e6f7864bb 100644
--- a/week.php
+++ b/week.php
@@ -38,6 +38,12 @@
     exit();
   }
 }
+// If we are passed in a date, make sure it is in correct format.
+$date = $request->getParameter('date');
+if ($date && !ttValidDbDateFormatDate($date)) {
+  header('Location: access_denied.php');
+  exit();
+}
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');

From 52e8604e0ac0c33497c6e0de0db459a53b6627d7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 24 Jan 2022 17:25:34 +0000
Subject: [PATCH 1630/1848] Work in progress removing remote work plugin.

---
 WEB-INF/templates/plugins.tpl | 6 ------
 initialize.php                | 2 +-
 plugins.php                   | 5 -----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/WEB-INF/templates/plugins.tpl b/WEB-INF/templates/plugins.tpl
index 5c1e4c943..e4402f62d 100644
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -210,12 +210,6 @@ function handlePluginCheckboxes() {
     <td class="td-with-input">{$forms.pluginsForm.attachments.control} <span id="attachments_doc"><a href="https://www.anuko.com/lp/tt_31.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td><label for="work">{$i18n.title.work}:</label></td></tr>
-  <tr>
-    <td class="large-screen-label"><label for="work">{$i18n.title.work}:</label></td>
-    <td class="td-with-input">{$forms.pluginsForm.work.control} <span id="work_doc"><a href="https://www.anuko.com/lp/tt_34.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
-  </tr>
-  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 <div class="button-set">{$forms.pluginsForm.btn_save.control}</div>
 {$forms.pluginsForm.close}
diff --git a/initialize.php b/initialize.php
index 4be516486..c4fccc0f4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5610");
+define("APP_VERSION", "1.19.34.5611");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins.php b/plugins.php
index 95b6d4b9b..1dfe6a073 100644
--- a/plugins.php
+++ b/plugins.php
@@ -32,7 +32,6 @@
   $cl_timesheets = (bool)$request->getParameter('timesheets');
   $cl_templates = (bool)$request->getParameter('templates');
   $cl_attachments = (bool)$request->getParameter('attachments');
-  $cl_work = (bool)$request->getParameter('work');
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
@@ -55,7 +54,6 @@
   $cl_timesheets = in_array('ts', $plugins);
   $cl_templates = in_array('tp', $plugins);
   $cl_attachments = in_array('at', $plugins);
-  $cl_work = in_array('wk', $plugins);
 }
 
 $form = new Form('pluginsForm');
@@ -79,7 +77,6 @@
 $form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
 $form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'attachments','value'=>$cl_attachments,'onchange'=>'handlePluginCheckboxes()'));
-$form->addInput(array('type'=>'checkbox','name'=>'work','value'=>$cl_work,'onchange'=>'handlePluginCheckboxes()'));
 
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
@@ -124,8 +121,6 @@
     $plugins .= ',tp';
   if ($cl_attachments)
     $plugins .= ',at';
-  if ($cl_work)
-    $plugins .= ',wk';
   $plugins = trim($plugins, ',');
 
   // Prepare a new config string.

From 6ff1577e836c0f8134734f8a382be7b11c888fe1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 24 Jan 2022 17:35:24 +0000
Subject: [PATCH 1631/1848] Fixed headers to remove remote work plugin.

---
 WEB-INF/templates/header.tpl      | 3 ---
 WEB-INF/templates/work/header.tpl | 3 ---
 initialize.php                    | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index e7df23ea6..372b18d46 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -134,9 +134,6 @@
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
       <td><a href="clients.php">{$i18n.menu.clients}</a></td>
     {/if}
-    {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
-      <td><a href="work/work.php">{$i18n.title.work}</a></td>
-    {/if}
     {if $user->can('export_data')}
       <td><a href="export.php">{$i18n.menu.export}</a></td>
     {/if}
diff --git a/WEB-INF/templates/work/header.tpl b/WEB-INF/templates/work/header.tpl
index 75a0d586f..6b767a16a 100644
--- a/WEB-INF/templates/work/header.tpl
+++ b/WEB-INF/templates/work/header.tpl
@@ -141,9 +141,6 @@
     {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
            <a class="mainMenu" href="../clients.php">{$i18n.menu.clients}</a>
     {/if}
-    {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()}
-           <a class="mainMenu" href="work.php">{$i18n.title.work}</a>
-    {/if}
     {if $user->can('export_data')}
            <a class="mainMenu" href="../export.php">{$i18n.menu.export}</a>
     {/if}
diff --git a/initialize.php b/initialize.php
index c4fccc0f4..16f3a5b1e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5611");
+define("APP_VERSION", "1.19.34.5612");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4a289fddb562e738b03c4f8f5e2be4d1b53b3f81 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 14:54:56 +0000
Subject: [PATCH 1632/1848] Removed code for Remote Work plugin.

---
 WEB-INF/lib/ttAdminWorkHelper.class.php     | 1028 ------------
 WEB-INF/lib/ttWorkHelper.class.php          | 1617 -------------------
 WEB-INF/templates/header.tpl                |    3 -
 WEB-INF/templates/site_map.tpl              |    3 -
 WEB-INF/templates/work/admin_offer_edit.tpl |   70 -
 WEB-INF/templates/work/admin_work.tpl       |  104 --
 WEB-INF/templates/work/admin_work_edit.tpl  |   67 -
 WEB-INF/templates/work/footer_old.tpl       |   29 -
 WEB-INF/templates/work/header.tpl           |  204 ---
 WEB-INF/templates/work/index.tpl            |    5 -
 WEB-INF/templates/work/offer_add.tpl        |   74 -
 WEB-INF/templates/work/offer_delete.tpl     |   20 -
 WEB-INF/templates/work/offer_edit.tpl       |   67 -
 WEB-INF/templates/work/offer_message.tpl    |   32 -
 WEB-INF/templates/work/offer_view.tpl       |   47 -
 WEB-INF/templates/work/offer_view_own.tpl   |   42 -
 WEB-INF/templates/work/work.tpl             |  140 --
 WEB-INF/templates/work/work_add.tpl         |   62 -
 WEB-INF/templates/work/work_delete.tpl      |   20 -
 WEB-INF/templates/work/work_edit.tpl        |   73 -
 WEB-INF/templates/work/work_message.tpl     |   32 -
 WEB-INF/templates/work/work_offer_view.tpl  |   57 -
 WEB-INF/templates/work/work_offers.tpl      |   41 -
 WEB-INF/templates/work/work_view.tpl        |   47 -
 WEB-INF/templates/work/work_view_own.tpl    |   38 -
 work/admin_offer_delete.php                 |   71 -
 work/admin_offer_edit.php                   |  171 --
 work/admin_work.php                         |   53 -
 work/admin_work_delete.php                  |   71 -
 work/admin_work_edit.php                    |  168 --
 work/offer_add.php                          |  120 --
 work/offer_delete.php                       |   75 -
 work/offer_edit.php                         |  135 --
 work/offer_message.php                      |   90 --
 work/offer_view.php                         |   81 -
 work/offer_view_own.php                     |   77 -
 work/work.php                               |   65 -
 work/work_add.php                           |  122 --
 work/work_delete.php                        |   75 -
 work/work_edit.php                          |  151 --
 work/work_message.php                       |   90 --
 work/work_offer_view.php                    |  123 --
 work/work_offers.php                        |   56 -
 work/work_view.php                          |   74 -
 work/work_view_own.php                      |   79 -
 45 files changed, 5869 deletions(-)
 delete mode 100644 WEB-INF/lib/ttAdminWorkHelper.class.php
 delete mode 100644 WEB-INF/lib/ttWorkHelper.class.php
 delete mode 100644 WEB-INF/templates/work/admin_offer_edit.tpl
 delete mode 100644 WEB-INF/templates/work/admin_work.tpl
 delete mode 100644 WEB-INF/templates/work/admin_work_edit.tpl
 delete mode 100644 WEB-INF/templates/work/footer_old.tpl
 delete mode 100644 WEB-INF/templates/work/header.tpl
 delete mode 100644 WEB-INF/templates/work/index.tpl
 delete mode 100644 WEB-INF/templates/work/offer_add.tpl
 delete mode 100644 WEB-INF/templates/work/offer_delete.tpl
 delete mode 100644 WEB-INF/templates/work/offer_edit.tpl
 delete mode 100644 WEB-INF/templates/work/offer_message.tpl
 delete mode 100644 WEB-INF/templates/work/offer_view.tpl
 delete mode 100644 WEB-INF/templates/work/offer_view_own.tpl
 delete mode 100644 WEB-INF/templates/work/work.tpl
 delete mode 100644 WEB-INF/templates/work/work_add.tpl
 delete mode 100644 WEB-INF/templates/work/work_delete.tpl
 delete mode 100644 WEB-INF/templates/work/work_edit.tpl
 delete mode 100644 WEB-INF/templates/work/work_message.tpl
 delete mode 100644 WEB-INF/templates/work/work_offer_view.tpl
 delete mode 100644 WEB-INF/templates/work/work_offers.tpl
 delete mode 100644 WEB-INF/templates/work/work_view.tpl
 delete mode 100644 WEB-INF/templates/work/work_view_own.tpl
 delete mode 100644 work/admin_offer_delete.php
 delete mode 100644 work/admin_offer_edit.php
 delete mode 100644 work/admin_work.php
 delete mode 100644 work/admin_work_delete.php
 delete mode 100644 work/admin_work_edit.php
 delete mode 100644 work/offer_add.php
 delete mode 100644 work/offer_delete.php
 delete mode 100644 work/offer_edit.php
 delete mode 100644 work/offer_message.php
 delete mode 100644 work/offer_view.php
 delete mode 100644 work/offer_view_own.php
 delete mode 100644 work/work.php
 delete mode 100644 work/work_add.php
 delete mode 100644 work/work_delete.php
 delete mode 100644 work/work_edit.php
 delete mode 100644 work/work_message.php
 delete mode 100644 work/work_offer_view.php
 delete mode 100644 work/work_offers.php
 delete mode 100644 work/work_view.php
 delete mode 100644 work/work_view_own.php

diff --git a/WEB-INF/lib/ttAdminWorkHelper.class.php b/WEB-INF/lib/ttAdminWorkHelper.class.php
deleted file mode 100644
index 22098b277..000000000
--- a/WEB-INF/lib/ttAdminWorkHelper.class.php
+++ /dev/null
@@ -1,1028 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-define('TT_CURL_SUCCESS', 1);
-
-// Class ttAdminWorkHelper is used to help with operations of administering Remote Work server.
-// It does everything via curl calls to a Remote Work server using its API.
-class ttAdminWorkHelper {
-  var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $work_server_uri = null;   // Location of work server.
-  var $register_uri = null;      // URI to register with remote work server.
-  var $get_work_item_uri = null; // URI to get work item details.
-  var $update_work_item_uri = null;  // URI to update work item.
-  var $delete_work_item_uri = null;  // URI to delete work item.
-  var $approve_work_item_uri = null; // URI to approve work item.
-  var $approve_work_item_on_offer_uri = null; // URI to approve work item posted on offer.
-  var $disapprove_work_item_uri = null; // URI to disapprove work item.
-  var $disapprove_work_item_on_offer_uri = null; // URI to disapprove work item posted on offer.
-  var $get_offer_uri = null;     // URI to get offer details.
-  var $update_offer_uri = null;  // URI to update offer.
-  var $delete_offer_uri = null;  // URI to delete offer.
-  var $approve_offer_uri = null;    // URI to approved offer.
-  var $disapprove_offer_uri = null; // URI to disapprove offer.
-  var $get_pending_work_items_uri = null;  // URI to get work items pending approval.
-  var $get_pending_offers_uri = null; // URI to get offers pending approval.
-  var $get_items_uri = null;     // URI to get all admin items in one API call.
-  var $site_id = null;           // Site id for remote work server.
-  var $site_key = null;          // Site key for remote work server.
-
-  // Constructor.
-  function __construct(&$errors) {
-    $this->errors = &$errors;
-
-    $this->work_server_uri = defined('WORK_SERVER_URI') ? WORK_SERVER_URI : "https://www.anuko.com/work/";
-    $this->register_uri = $this->work_server_uri.'register';
-    $this->get_work_item_uri = $this->work_server_uri.'admin_getworkitem';
-    $this->update_work_item_uri = $this->work_server_uri.'admin_updateworkitem';
-    $this->delete_work_item_uri = $this->work_server_uri.'admin_deleteworkitem';
-    $this->approve_work_item_uri = $this->work_server_uri.'admin_approveworkitem';
-    $this->approve_work_item_on_offer_uri = $this->work_server_uri.'admin_approveworkitemonoffer';
-    $this->disapprove_work_item_uri = $this->work_server_uri.'admin_disapproveworkitem';
-    $this->disapprove_work_item_on_offer_uri = $this->work_server_uri.'admin_disapproveworkitemonoffer';
-    $this->get_offer_uri = $this->work_server_uri.'admin_getoffer';
-    $this->update_offer_uri = $this->work_server_uri.'admin_updateoffer';
-    $this->delete_offer_uri = $this->work_server_uri.'admin_deleteoffer';
-    $this->approve_offer_uri = $this->work_server_uri.'admin_approveoffer';
-    $this->disapprove_offer_uri = $this->work_server_uri.'admin_disapproveoffer';
-    $this->get_pending_work_items_uri = $this->work_server_uri.'admin_getpendingworkitems';
-    $this->get_pending_offers_uri = $this->work_server_uri.'admin_getpendingoffers';
-    $this->get_items_uri = $this->work_server_uri.'admin_getitems';
-    $this->checkSiteRegistration();
-  }
-
-  // checkSiteRegistration - obtains site id and key from local database.
-  // If not found, it tries to register with remote work server.
-  function checkSiteRegistration() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    // Obtain site id.
-    $sql = "select param_value as id from tt_site_config where param_name = 'worksite_id'";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    if (!$val) {
-      // No site id found, need to register.
-      $fields = array('lang' => urlencode($user->lang),
-        'name' => urlencode('time tracker'),
-        'origin' => urlencode('time tracker source'));
-
-      // Urlify the data for the POST.
-      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-      $fields_string = rtrim($fields_string, '&');
-
-      // Open connection.
-      $ch = curl_init();
-
-      // Set the url, number of POST vars, POST data.
-      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
-      curl_setopt($ch, CURLOPT_POST, true);
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-      // Execute a post request.
-      $result = curl_exec($ch);
-
-      // Close connection.
-      curl_close($ch);
-
-      if (!$result) {
-        $this->errors->add($i18n->get('error.remote_work'));
-        return false;
-      }
-
-      $result_array = json_decode($result, true);
-
-      // Check for errors.
-      $call_status = $result_array['call_status'];
-      if (!$call_status) {
-        $this->errors->add($i18n->get('error.remote_work'));
-        return false;
-      }
-      if ($call_status['code'] != TT_CURL_SUCCESS) {
-        $this->errors->add($call_status['error']);
-        return false;
-      }
-
-      $reg_status = $result_array['reg_status']; // Registration status.
-      if ($reg_status['site_id'] && $reg_status['site_key']) {
-        $this->site_id = $reg_status['site_id'];
-        $this->site_key = $reg_status['site_key'];
-
-        // Registration successful. Store id and key locally for future use.
-        $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
-        $mdb2->exec($sql);
-        $sql = "insert into tt_site_config values('worksite_key', ".$mdb2->quote($this->site_key).", now(), null)";
-        $mdb2->exec($sql);
-      } else {
-        $this->errors->add($i18n->get('error.remote_work'));
-      }
-    } else {
-      // Site id found.
-      $this->site_id = $val['id'];
-
-      // Obtain site key.
-      $sql = "select param_value as site_key from tt_site_config where param_name = 'worksite_key'";
-      $res = $mdb2->query($sql);
-      $val = $res->fetchRow();
-      $this->site_key = $val['site_key'];
-    }
-  }
-
-  // getPendingOffers - obtains a list of offers pending approval.
-  function getPendingOffers() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id)
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_pending_offers_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $pending_offers = $result_array['pending_offers'];
-    return $pending_offers;
-  }
-
-  // getPendingWorkItems - obtains a list of work items pending approval.
-  function getPendingWorkItems() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id)
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_pending_work_items_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $pending_work = $result_array['pending_work'];
-    return $pending_work;
-  }
-
-  // getWorkItem - gets work item details from remote work server.
-  function getWorkItem($work_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($work_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $work_item = $result_array['work_item'];
-    return $work_item;
-  }
-
-  // deleteWorkItem - deletes work item from remote work server.
-  function deleteWorkItem($work_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($work_id),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // deleteOffer - deletes an offer from remote work server.
-  function deleteOffer($offer_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'offer_id' => urlencode($offer_id),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // getOffer - gets offer details from remote work server.
-  function getOffer($offer_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'offer_id' => urlencode($offer_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $offer = $result_array['offer'];
-    return $offer;
-  }
-
-  // updateWorkItem - updates a work item in remote work server.
-  function updateWorkItem($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($fields['work_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // approveWorkItem - approves work item in remote work server.
-  function approveWorkItem($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($fields['work_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->approve_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // disapproveWorkItem - disapproves work item in remote work server.
-  function disapproveWorkItem($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($fields['work_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->disapprove_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // disapproveWorkItemOnOffer - disapproves work item posted on offer in remote work server.
-  function disapproveWorkItemOnOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($fields['work_id']),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->disapprove_work_item_on_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // approveWorkItemOnOffer - approves work item posted on offer in remote work server.
-  function approveWorkItemOnOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'work_id' => urlencode($fields['work_id']),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->approve_work_item_on_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // updateOffer - updates an offer in remote work server.
-  function updateOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'offer_id' => urlencode($fields['offer_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'payment_info' => urlencode(base64_encode($fields['payment_info'])),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // approveOffer - approves offer in remote work server.
-  function approveOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'offer_id' => urlencode($fields['offer_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->approve_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-
-  // disapproveOffer - disapproves offer in remote work server.
-  function disapproveOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id),
-      'offer_id' => urlencode($fields['offer_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'moderator_comment' => urlencode(base64_encode($fields['moderator_comment'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->disapprove_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // getItems - obtains a list of all items relevant to admin in one API call to Remote Work Server.
-  function getItems() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'user_id' => urlencode($user->id)
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_items_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    unset($result_array['call_status']); // Remove call_status element.
-    return $result_array;
-  }
-}
diff --git a/WEB-INF/lib/ttWorkHelper.class.php b/WEB-INF/lib/ttWorkHelper.class.php
deleted file mode 100644
index 6ddf87513..000000000
--- a/WEB-INF/lib/ttWorkHelper.class.php
+++ /dev/null
@@ -1,1617 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-define('TT_CURL_SUCCESS', 1);
-
-// Class ttWorkHelper is used to help with operations with the Remote Work plugin.
-// It does everything via curl calls to a Remote Work server using its API.
-class ttWorkHelper {
-  var $errors = null;            // Errors go here. Set in constructor by reference.
-  var $work_server_uri = null;   // Location of work server.
-  var $register_uri = null;      // URI to register with remote work server.
-  var $put_own_work_item_uri = null;  // URI to publish own work item.
-  var $get_own_work_item_uri = null;  // URI to get own work item details.
-  var $get_own_work_item_offer_uri = null;  // URI to get own work item offer.
-  var $accept_own_work_item_offer_uri = null; // URI to accept own work item offer.
-  var $decline_own_work_item_offer_uri = null; // URI to decline own work item offer.
-  var $get_own_work_item_offers_uri = null; // URI to get offers on own work item.
-  var $get_own_work_items_uri = null; // URI to get own work items for group.
-  var $get_available_work_items_uri = null; // URI to get available work items for group.
-  var $get_available_work_item_uri = null;  // URI to get a single available work item.
-  var $delete_own_work_item_uri = null;     // URI to delete own work item.
-  // TODO: design how (and what) to delete when a group is deleted.
-  var $update_own_work_item_uri = null;  // URI to update own work item.
-  var $update_own_work_item_on_offer_uri = null;  // URI to update own work item posted on offer.
-  var $put_own_offer_uri = null;     // URI to publish own offer.
-  var $get_own_offer_uri = null;     // URI to get own offer details.
-  var $get_own_offers_uri = null;    // URI to get own offers.
-  var $get_available_offers_uri = null; // URI to get available offers.
-  var $get_available_offer_uri = null;  // URI to get a single available offer.
-  var $get_group_items_uri = null;      // URI to get all group items in one API call.
-  var $delete_own_offer_uri = null; // URI to delete own offer.
-  var $update_own_offer_uri = null; // URI to update own offer.
-  var $send_message_to_work_owner_uri = null; // URI to send message to work owner.
-  var $send_message_to_offer_owner_uri = null; // URI to send message to offer owner.
-  var $site_id = null;              // Site id for work server.
-  var $site_key = null;             // Site key for work server.
-
-  // Constructor.
-  function __construct(&$errors) {
-    $this->errors = &$errors;
-
-    $this->work_server_uri = defined('WORK_SERVER_URI') ? WORK_SERVER_URI : "https://www.anuko.com/work/";
-
-    // Note: at some point a need will arise for API versioning.
-    // When this happens, we will append an API version number to the end of URI,
-    // for example: register_0_1 instead of register.
-    // This should theoretically allow a remote work server to be able to work with
-    // a complete variety of deployed clients, including those without versions.
-    $this->register_uri = $this->work_server_uri.'register'; // register_0_0
-    $this->put_own_work_item_uri = $this->work_server_uri.'putownworkitem';
-    $this->get_own_work_item_uri = $this->work_server_uri.'getownworkitem';
-    $this->get_own_work_item_offer_uri = $this->work_server_uri.'getownworkitemoffer';
-    $this->get_own_work_item_offers_uri = $this->work_server_uri.'getownworkitemoffers';
-    $this->get_own_work_items_uri = $this->work_server_uri.'getownworkitems';
-    $this->get_available_work_items_uri = $this->work_server_uri.'getavailableworkitems';
-    $this->get_available_work_item_uri = $this->work_server_uri.'getavailableworkitem';
-    $this->delete_own_work_item_uri = $this->work_server_uri.'deleteownworkitem';
-    $this->accept_own_work_item_offer_uri = $this->work_server_uri.'acceptownworkitemoffer';
-    $this->decline_own_work_item_offer_uri = $this->work_server_uri.'declineownworkitemoffer';
-    $this->update_own_work_item_uri = $this->work_server_uri.'updateownworkitem';
-    $this->update_own_work_item_on_offer_uri = $this->work_server_uri.'updateownworkitemonoffer';
-    $this->put_own_offer_uri = $this->work_server_uri.'putownoffer';
-    $this->get_own_offer_uri = $this->work_server_uri.'getownoffer';
-    $this->get_own_offers_uri = $this->work_server_uri.'getownoffers';
-
-    $this->get_available_offers_uri = $this->work_server_uri.'getavailableoffers';
-    $this->get_available_offer_uri = $this->work_server_uri.'getavailableoffer';
-    $this->get_group_items_uri = $this->work_server_uri.'getgroupitems';
-    $this->delete_own_offer_uri = $this->work_server_uri.'deleteownoffer';
-    $this->update_own_offer_uri = $this->work_server_uri.'updateownoffer';
-    $this->send_message_to_work_owner_uri = $this->work_server_uri.'sendmessagetoworkowner';
-    $this->send_message_to_offer_owner_uri = $this->work_server_uri.'sendmessagetoofferowner';
-    $this->checkSiteRegistration();
-  }
-
-  // checkSiteRegistration - obtains site id and key from local database.
-  // If not found, it tries to register with remote work server.
-  function checkSiteRegistration() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    // Obtain site id.
-    $sql = "select param_value as id from tt_site_config where param_name = 'worksite_id'";
-    $res = $mdb2->query($sql);
-    $val = $res->fetchRow();
-    if (!$val) {
-      // No site id found, need to register.
-      $group_id = $user->getGroup();
-      $org_id = $user->org_id;
-      $fields = array('lang' => urlencode($user->lang),
-        'name' => urlencode('time tracker'),
-        'origin' => urlencode('time tracker source'),
-        'org_id' => urlencode($org_id),
-        'group_id' => urlencode($group_id),
-        'group_name' => urlencode(base64_encode($user->getGroupName())),
-        'user_id' => urlencode($user->getUser()),
-        'user_name' => urlencode(base64_encode($user->getName())),
-        'user_email' => urlencode(base64_encode($user->getEmail())),
-        'user_ip' => urlencode($_SERVER['REMOTE_ADDR']));
-
-      // Urlify the data for the POST.
-      foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-      $fields_string = rtrim($fields_string, '&');
-
-      // Open connection.
-      $ch = curl_init();
-
-      // Set the url, number of POST vars, POST data.
-      curl_setopt($ch, CURLOPT_URL, $this->register_uri);
-      curl_setopt($ch, CURLOPT_POST, true);
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-      // Execute a post request.
-      $result = curl_exec($ch);
-
-      // Close connection.
-      curl_close($ch);
-
-      if (!$result) {
-        $this->errors->add($i18n->get('error.remote_work'));
-        return false;
-      }
-
-      $result_array = json_decode($result, true);
-
-      // Check for errors.
-      $call_status = $result_array['call_status'];
-      if (!$call_status) {
-        $this->errors->add($i18n->get('error.remote_work'));
-        return false;
-      }
-      if ($call_status['code'] != TT_CURL_SUCCESS) {
-        $this->errors->add($call_status['error']);
-        return false;
-      }
-
-      $reg_status = $result_array['reg_status']; // Registration status.
-      if ($reg_status['site_id'] && $reg_status['site_key']) {
-        $this->site_id = $reg_status['site_id'];
-        $this->site_key = $reg_status['site_key'];
-
-        // Registration successful. Store id and key locally for future use.
-        $sql = "insert into tt_site_config values('worksite_id', $this->site_id, now(), null)";
-        $mdb2->exec($sql);
-        $sql = "insert into tt_site_config values('worksite_key', ".$mdb2->quote($this->site_key).", now(), null)";
-        $mdb2->exec($sql);
-      } else {
-        $this->errors->add($i18n->get('error.remote_work'));
-      }
-    } else {
-      // Site id found.
-      $this->site_id = $val['id'];
-
-      // Obtain site key.
-      $sql = "select param_value as site_key from tt_site_config where param_name = 'worksite_key'";
-      $res = $mdb2->query($sql);
-      $val = $res->fetchRow();
-      $this->site_key = $val['site_key'];
-    }
-  }
-
-  // putOwnWorkItem - publishes a work item in remote work server.
-  //
-  // Note about some fields using additional base64 encoding.
-  // There is a problem with data posted by curl calls on the server side for
-  // some languages. Data arrives corrupted.
-  //
-  // For example: consider a case for a single Russian letter ф in the subject field.
-  // UTF-8 encoding for ф: 0xD1 0x84 (2 bytes).
-  // urlencoded ф: %D1%84 - a string of 6 characters.
-  // If we use a curl call like here with only urlencoded ф, what arrives on the server in POST is "C3 91 C2 84"
-  // no idea what it is.
-  //
-  // A workaround for now is to use use an additional base64 encoding for all text fields,
-  // which are decoded back to utf-8 strings on the server side.
-  function putOwnWorkItem($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($fields['offer_id']),
-      'type' => urlencode($fields['type']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'created_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'created_by' => urlencode($user->getUser()),
-      'created_by_name' => urlencode(base64_encode($user->getName())),
-      'created_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->put_own_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // updateOwnWorkItem - updates a work item in remote work server.
-  function updateOwnWorkItem($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($fields['work_id']),
-      'type' => urlencode($fields['type']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_own_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // updateOwnWorkItemOnOffer - updates own work item posted on offer in remote work server.
-  function updateOwnWorkItemOnOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($fields['work_id']),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_own_work_item_on_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // getOwnWorkItems - obtains a list of work items this group is currently outsourcing.
-  function getOwnWorkItems() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey())
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_items_iri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $active_work = $result_array['active_work'];
-    return $active_work;
-  }
-
-  // getAvailableWorkItems - obtains a list of available work items this group can  bid on.
-  function getAvailableWorkItems() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id)
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_available_work_items_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $available_work = $result_array['available_work'];
-    return $available_work;
-  }
-
-  // getOwnWorkItem - gets work item details from remote work server.
-  function getOwnWorkItem($work_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($work_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $work_item = $result_array['work_item'];
-    return $work_item;
-  }
-
-  // getOwnWorkItemOffers - gets offers on own work item from remote work server.
-  function getOwnWorkItemOffers($work_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($work_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_item_offers_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $work_item_offers = $result_array['work_item_offers'];
-    return $work_item_offers;
-  }
-
-  // deleteOwnWorkItem - deletes work item from remote work server.
-  function deleteOwnWorkItem($work_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($work_id),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_own_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // putOwnOffer - publishes an offer in remote work server.
-  function putOwnOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($fields['work_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'payment_info' => urlencode(base64_encode($fields['payment_info'])),
-      'created_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'created_by' => urlencode($user->getUser()),
-      'created_by_name' => urlencode(base64_encode($user->getName())),
-      'created_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->put_own_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // getOwnOffers - obtains a list of offers this group made available to other groups.
-  function getOwnOffers() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey())
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_own_offers_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $active_offers = $result_array['active_offers'];
-    return $active_offers;
-  }
-
-  // getAvailableOffers - obtains a list of available offers from other organizations.
-  function getAvailableOffers() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id)
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_available_offers_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $available_offers = $result_array['available_offers'];
-    return $available_offers;
-  }
-
-  // getOwnOffer - gets offer details from remote work server.
-  function getOwnOffer($offer_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($offer_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_own_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $offer = $result_array['offer'];
-    return $offer;
-  }
-
-  // updateOwnOffer - updates an offer in remote work server.
-  function updateOwnOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($fields['offer_id']),
-      'subject' => urlencode(base64_encode($fields['subject'])),
-      'descr_short' => urlencode(base64_encode($fields['descr_short'])),
-      'descr_long' => urlencode(base64_encode($fields['descr_long'])),
-      'currency' => urlencode($fields['currency']),
-      'amount' => urlencode($fields['amount']),
-      'payment_info' => urlencode(base64_encode($fields['payment_info'])),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail()))
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->update_own_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // deleteOwnOffer - deletes an offer from remote work server.
-  function deleteOwnOffer($offer_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($offer_id),
-      'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'modified_by' => urlencode($user->getUser()),
-      'modified_by_name' => urlencode(base64_encode($user->getName())),
-      'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->delete_own_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // getOwnWorkItemOffer - gets offer details from remote work server
-  // for an offer posted on own work item.
-  function getOwnWorkItemOffer($offer_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($offer_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_own_work_item_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $offer = $result_array['offer'];
-    return $offer;
-  }
-
-  // declineOwnWorkItemOffer - declines an offer posted on own work item in remote work server.
-  function declineOwnWorkItemOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($fields['offer_id']),
-      'client_comment' => urlencode(base64_encode($fields['client_comment'])));
-      //'modified_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      //'modified_by' => urlencode($user->getUser()),
-      //'modified_by_name' => urlencode(base64_encode($user->getName())),
-      //'modified_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->decline_own_work_item_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // acceptOwnWorkItemOffer - accepts an offer posted on own work item in remote work server.
-  function acceptOwnWorkItemOffer($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($fields['offer_id']),
-      'client_comment' => urlencode(base64_encode($fields['client_comment'])),
-      'accepted_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'accepted_by' => urlencode($user->getUser()),
-      'accepted_by_name' => urlencode(base64_encode($user->getName())),
-      'accepted_by_email' => urlencode(base64_encode($user->getEmail())));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->accept_own_work_item_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // getCurrencies - obtains a list of supported currencies.
-  static function getCurrencies() {
-    $mdb2 = getConnection();
-
-    $sql = "select id, name from tt_work_currencies order by id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) return false;
-
-    while ($val = $res->fetchRow()) {
-      $result[] = array('id'=>$val['id'], 'name'=>$val['name']);
-    }
-    return $result;
-  }
-
-  // getCurrencyID - obtains an ID for currency.
-  static function getCurrencyID($currency) {
-    $mdb2 = getConnection();
-
-    $currency_id = null;
-    $sql = "select id from tt_work_currencies where name = ".$mdb2->quote($currency);
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) return null;
-
-    if($val = $res->fetchRow()) {
-      $currency_id = $val['id'];
-    }
-    return $currency_id;
-  }
-
-  // getCurrencyName - obtains currency name using its id.
-  static function getCurrencyName($currency_id) {
-    $mdb2 = getConnection();
-
-    $currency_name = null;
-    $sql = "select name from tt_work_currencies where id = $currency_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) return null;
-
-    if($val = $res->fetchRow()) {
-      $currency_name = $val['name'];
-    }
-    return $currency_name;
-  }
-
-  // getGroupItems - obtains a list of all items relevant to group in one API call to Remote Work Server.
-  function getGroupItems() {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_key' => urlencode($user->getGroupKey())
-    );
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_group_items_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    unset($result_array['call_status']); // Remove call_status element,
-    return $result_array;
-  }
-
-  // getAvailableWorkItem - gets available work item details from remote work server.
-  function getAvailableWorkItem($work_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'user_id' => urlencode($user->getUser()),
-      'user_name' => urlencode(base64_encode($user->getName())),
-      'user_email' => urlencode(base64_encode($user->getEmail())),
-      'user_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'work_id' => urlencode($work_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_available_work_item_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $work_item = $result_array['work_item'];
-    return $work_item;
-  }
-
-  // getAvailableOffer - gets available offer details from remote work server.
-  function getAvailableOffer($offer_id) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'user_id' => urlencode($user->getUser()),
-      'user_name' => urlencode(base64_encode($user->getName())),
-      'user_email' => urlencode(base64_encode($user->getEmail())),
-      'user_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'offer_id' => urlencode($offer_id));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->get_available_offer_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    $offer = $result_array['offer'];
-    return $offer;
-  }
-
-  // sendMessageToWorkOwner - sends a message to work owner via remote work server.
-  function sendMessageToWorkOwner($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'work_id' => urlencode($fields['work_id']),
-      'sender_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'sender_user_id' => urlencode($user->getUser()),
-      'sender_name' => urlencode(base64_encode($user->getName())),
-      'sender_email' => urlencode(base64_encode($user->getEmail())),
-      'message_body' => urlencode(base64_encode($fields['message_body'])));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->send_message_to_work_owner_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-
-  // sendMessageToOfferOwner - sends a message to offer owner via remote work server.
-  function sendMessageToOfferOwner($fields) {
-    global $i18n;
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $curl_fields = array('lang' => urlencode($user->lang),
-      'site_id' => urlencode($this->site_id),
-      'site_key' => urlencode($this->site_key),
-      'org_id' => urlencode($org_id),
-      'org_key' => urlencode($user->getOrgKey()),
-      'group_id' => urlencode($group_id),
-      'group_name' => urlencode(base64_encode($user->getGroupName())),
-      'group_key' => urlencode($user->getGroupKey()),
-      'offer_id' => urlencode($fields['offer_id']),
-      'sender_ip' => urlencode($_SERVER['REMOTE_ADDR']),
-      'sender_user_id' => urlencode($user->getUser()),
-      'sender_name' => urlencode(base64_encode($user->getName())),
-      'sender_email' => urlencode(base64_encode($user->getEmail())),
-      'message_body' => urlencode(base64_encode($fields['message_body'])));
-
-    // url-ify the data for the POST.
-    foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-    $fields_string = rtrim($fields_string, '&');
-
-    // Open connection.
-    $ch = curl_init();
-
-    // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $this->send_message_to_offer_owner_uri);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    // Execute a post request.
-    $result = curl_exec($ch);
-
-    // Close connection.
-    curl_close($ch);
-
-    if (!$result) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-
-    $result_array = json_decode($result, true);
-
-    // Check for errors.
-    $call_status = $result_array['call_status'];
-    if (!$call_status) {
-      $this->errors->add($i18n->get('error.remote_work'));
-      return false;
-    }
-    if ($call_status['code'] != TT_CURL_SUCCESS) {
-      $this->errors->add($call_status['error']);
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 372b18d46..a189e50e5 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -63,9 +63,6 @@
     <tr>
       <td><a href="admin_groups.php">{$i18n.menu.groups}</a></td>
       <td><a href="admin_options.php">{$i18n.menu.options}</a></td>
-    {if isTrue('WORK_SERVER_ADMINISTRATION')}
-      <td><a href="work/admin_work.php">{$i18n.label.work}</a></td>
-    {/if}
     </td>
   </table>
 </div>
diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
index 6848fc52e..54ff8818d 100644
--- a/WEB-INF/templates/site_map.tpl
+++ b/WEB-INF/templates/site_map.tpl
@@ -4,9 +4,6 @@
 <div class="sitemap-item-group">
   <div class="sitemap-item"><a href="admin_groups.php">{$i18n.menu.groups}</a></div>
   <div class="sitemap-item"><a href="admin_options.php">{$i18n.menu.options}</a></div>
-    {if isTrue('WORK_SERVER_ADMINISTRATION')}
-  <div class="sitemap-item"><a href="work/admin_work.php">{$i18n.label.work}</a></div>
-    {/if}
 </div>
   {* end of sub menu for admin *}
   {* main menu for admin *}
diff --git a/WEB-INF/templates/work/admin_offer_edit.tpl b/WEB-INF/templates/work/admin_offer_edit.tpl
deleted file mode 100644
index bd9a6542b..000000000
--- a/WEB-INF/templates/work/admin_offer_edit.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-{if $work_id}
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td><a href="admin_work_edit.php?id={$work_id}">{$work_name}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$forms.offerForm.work_description.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.offer} (*):</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.offerForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.offerForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
-          <td>{$forms.offerForm.payment_info.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.offerForm.status.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.offerForm.moderator_comment.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_approve.control} {$forms.offerForm.btn_save.control} {$forms.offerForm.btn_disapprove.control} </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/admin_work.tpl b/WEB-INF/templates/work/admin_work.tpl
deleted file mode 100644
index 13f37e911..000000000
--- a/WEB-INF/templates/work/admin_work.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $pending_work}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_work}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $pending_work as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape} ({$work_item.site_id}.{$work_item.group_id})</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-          <td><a href="admin_work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
-          <td><a href="admin_work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-
-<div class="table-divider"></div>
-
-{if $pending_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.pending_offers}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $pending_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.subject|escape}</td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape} ({$offer.site_id}.{$offer.group_id})</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="admin_offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
-          <td><a href="admin_offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-
-<div class="table-divider"></div>
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-{if $available_work}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_work as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$work_item.subject|escape}</td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape}</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-<div class="table-divider"></div>
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
-{if $available_offers}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td>{$offer.subject|escape}</td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/work/admin_work_edit.tpl b/WEB-INF/templates/work/admin_work_edit.tpl
deleted file mode 100644
index 1ae59a6fe..000000000
--- a/WEB-INF/templates/work/admin_work_edit.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work} (*):</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.workForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.workForm.status.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.workForm.moderator_comment.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/WEB-INF/templates/work/footer_old.tpl b/WEB-INF/templates/work/footer_old.tpl
deleted file mode 100644
index 611067550..000000000
--- a/WEB-INF/templates/work/footer_old.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-    </td>
-  </tr>
-  <tr>
-    <td valign="bottom" width="100%" align="center">
-      <p>&nbsp;</p>
-
-      <table cellspacing="0" cellpadding="0" height="30" border="0" width="100%">
-        <tr>
-          <td width="100%" align="center" bgcolor="#eeeeee"><a href="https://www.anuko.com/lp/tt_8.htm" target="_blank">{$i18n.footer.contribute_msg}</a></td>
-        </tr>
-      </table>
-      <br>
-      <table cellspacing="0" cellpadding="4" width="100%" border="0">
-        <tr>
-          <td align="center">Anuko Time Tracker {constant('APP_VERSION')} | 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>
-          </td>
-        </tr>
-      </table>
-      <br>
-
-    </td>
-  </tr>
-</table>
-</body>
-</html>
-
diff --git a/WEB-INF/templates/work/header.tpl b/WEB-INF/templates/work/header.tpl
deleted file mode 100644
index 6b767a16a..000000000
--- a/WEB-INF/templates/work/header.tpl
+++ /dev/null
@@ -1,204 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset={constant('CHARSET')}">
-  <link rel="icon" href="../favicon.ico" type="image/x-icon">
-  <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
-  <link href="../{constant('DEFAULT_CSS')}" rel="stylesheet" type="text/css">
-{if $i18n.language.rtl}
-  <link href="../{constant('RTL_CSS')}" rel="stylesheet" type="text/css">
-{/if}
-  <title>Time Tracker{if $title} - {$title}{/if}</title>
-  <script src="../js/strftime.js"></script>
-  <script>
-    {* Setup locale for strftime *}
-    {$js_date_locale}
-  </script>
-  <script src="../js/strptime.js"></script>
-</head>
-
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" {$onload}>
-
-{assign var="tab_width" value="700"}
-
-<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
-  <tr>
-    <td valign="top" align="center"> <!-- This is to centrally align all our content. -->
-
-      <!-- top image -->
-      <table cellspacing="0" cellpadding="0" width="100%" border="0">
-        <tr>
-{if $user->custom_logo}
-          <td align="center">
-{else}
-          <td bgcolor="#a6ccf7" background="../img/top_bg.gif" align="center">
-{/if}
-            <table cellspacing="0" cellpadding="0" width="{$tab_width}" border="0">
-              <tr>
-                <td valign="top">
-                  <table id="page_logo" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr><td height="6" colspan="2"><img width="1" height="6" src="../img/1x1.gif" border="0"></td></tr>
-                    <tr valign="top">
-{if $user->custom_logo}
-                      <td height="55" align="center"><img alt="Time Tracker" width="300" height="43" src="../{$custom_logo}" border="0"></td>
-{else}
-                      <td height="55" align="center"><a href="https://www.anuko.com/lp/tt_1.htm" target="_blank"><img alt="Anuko Time Tracker" width="300" height="43" src="../img/logo.png" border="0"></a></td>
-{/if}
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top image -->
-
-{if $authenticated}
-  {if $user->can('administer_site')}
-      <!-- top menu for admin -->
-      <table id="top_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="../logout.php">{$i18n.menu.logout}</a>
-            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top menu for admin -->
-
-      <!-- sub menu for admin -->
-      <table id="sub_menu_admin" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
-            <a class="mainMenu" href="../admin_groups.php">{$i18n.menu.groups}</a>
-            <a class="mainMenu" href="../admin_options.php">{$i18n.menu.options}</a>
-    {if isTrue('WORK_SERVER_ADMINISTRATION')}
-            <a class="mainMenu" href="admin_work.php">{$i18n.label.work}</a>
-    {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for admin -->
-  {else}
-      <!-- top menu for authorized user -->
-      <table id="top_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="../logout.php">{$i18n.menu.logout}</a>
-    {if $user->exists() && $user->can('manage_own_settings')}
-            <a class="systemMenu" href="../profile_edit.php">{$i18n.menu.profile}</a>
-    {/if}
-    {if $user->can('manage_basic_settings')}
-            <a class="systemMenu" href="../group_edit.php">{$i18n.menu.group}</a>
-    {/if}
-    {if $user->can('manage_features')}
-            <a class="systemMenu" href="../plugins.php">{$i18n.menu.plugins}</a>
-    {/if}
-            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
-          </td>
-        </tr>
-      </table>
-      <!-- end of top menu for authorized user -->
-
-      <!-- sub menu for authorized user -->
-      <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td align="center" bgcolor="#d9d9d9" nowrap height="17" background="img/subm_bg.gif">&nbsp;
-    {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
-           <a class="mainMenu" href="../time.php">{$i18n.menu.time}</a>
-      {if $user->isPluginEnabled('wv') && $user->isOptionEnabled('week_menu')}
-           <a class="mainMenu" href="../week.php">{$i18n.menu.week}</a>
-      {/if}
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))}
-           <a class="mainMenu" href="../expenses.php">{$i18n.menu.expenses}</a>
-    {/if}
-    {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))}
-           <a class="mainMenu" href="../reports.php">{$i18n.menu.reports}</a>
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))}
-           <a class="mainMenu" href="../timesheets.php">{$i18n.menu.timesheets}</a>
-    {/if}
-    {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
-           <a class="mainMenu" href="../invoices.php">{$i18n.title.invoices}</a>
-    {/if}
-    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
-        (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
-        $user->isPluginEnabled('cl'))}
-           <a class="mainMenu" href="../charts.php">{$i18n.menu.charts}</a>
-    {/if}
-    {if ($user->can('view_own_projects') || $user->can('manage_projects')) && (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode())}
-           <a class="mainMenu" href="../projects.php">{$i18n.menu.projects}</a>
-    {/if}
-    {if (constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))}
-           <a class="mainMenu" href="../tasks.php">{$i18n.menu.tasks}</a>
-    {/if}
-    {if $user->can('view_users') || $user->can('manage_users')}
-           <a class="mainMenu" href="../users.php">{$i18n.menu.users}</a>
-    {/if}
-    {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))}
-           <a class="mainMenu" href="../clients.php">{$i18n.menu.clients}</a>
-    {/if}
-    {if $user->can('export_data')}
-           <a class="mainMenu" href="../export.php">{$i18n.menu.export}</a>
-    {/if}
-          </td>
-        </tr>
-      </table>
-      <!-- end of sub menu for authorized user -->
-  {/if}
-{else}
-      <!-- top menu for non authorized user -->
-      <table id="top_menu_non_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
-        <tr>
-          <td class="systemMenu" height="17" align="center">&nbsp;
-            <a class="systemMenu" href="../login.php">{$i18n.menu.login}</a>
-  {if isTrue('MULTIORG_MODE') && constant('AUTH_MODULE') == 'db'}
-            <a class="systemMenu" href="../register.php">{$i18n.menu.register}</a>
-  {/if}
-            <a class="systemMenu" href="{constant('FORUM_LINK')}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{constant('HELP_LINK')}" target="_blank">{$i18n.menu.help}</a>
-          </td>
-        </tr>
-      </table>
-{/if}
-      <br>
-
-      <!-- page title and user details -->
-{if $title}
-      <table id="page_title" cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
-        <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
-        <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
-      </table>
-{/if}
-      <!-- end of page title and user details -->
-
-      <!-- output errors -->
-{if $err->yes()}
-      <table id="page_errors" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="error">
-  {foreach $err->getErrors() as $error}
-            {$error.message}<br> {* No need to escape as they are not coming from user and may contain a link. *}
-  {/foreach}
-          </td>
-        </tr>
-      </table>
-{/if}
-      <!-- end of output errors -->
-
-      <!-- output messages -->
-{if $msg->yes()}
-      <table id="page_messages" cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
-        <tr>
-          <td class="info_message">
-  {foreach $msg->getErrors() as $message}
-            {$message.message}<br> {* No need to escape. *}
-  {/foreach}
-          </td>
-        </tr>
-      </table>
-{/if}
-      <!-- end of output messages -->
diff --git a/WEB-INF/templates/work/index.tpl b/WEB-INF/templates/work/index.tpl
deleted file mode 100644
index c4f193521..000000000
--- a/WEB-INF/templates/work/index.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{include file="work/header.tpl"}
-
-{if $content_page_name}{include file="$content_page_name"}{/if}
-
-{include file="work/footer_old.tpl"}
diff --git a/WEB-INF/templates/work/offer_add.tpl b/WEB-INF/templates/work/offer_add.tpl
deleted file mode 100644
index 80e07d803..000000000
--- a/WEB-INF/templates/work/offer_add.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-{if $work_id}
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td><a href="work_view.php?id={$work_id}">{$work_name}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$forms.offerForm.work_description.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.offer} (*):</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.offerForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.offerForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
-          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/offer_delete.tpl b/WEB-INF/templates/work/offer_delete.tpl
deleted file mode 100644
index 7d8954cfb..000000000
--- a/WEB-INF/templates/work/offer_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.offerDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$offer_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.offerDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.offerDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerDeleteForm.close}
diff --git a/WEB-INF/templates/work/offer_edit.tpl b/WEB-INF/templates/work/offer_edit.tpl
deleted file mode 100644
index 5c1e89a33..000000000
--- a/WEB-INF/templates/work/offer_edit.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.offer} (*):</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.offerForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.offerForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.how_to_pay} (*):</td>
-          <td>{$forms.offerForm.payment_info.control}  <a href="https://www.anuko.com/lp/tt_40.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.offerForm.status.control}</td>
-        </tr>
-{if $show_moderator_comment}
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.offerForm.moderator_comment.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.offerForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/offer_message.tpl b/WEB-INF/templates/work/offer_message.tpl
deleted file mode 100644
index c97a3db91..000000000
--- a/WEB-INF/templates/work/offer_message.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.messageForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border="0" width="100%">
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0" width="100%">
-        <tr>
-          <td align="right">{$i18n.work.label.message}:</td>
-          <td>{$forms.messageForm.message_body.control}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.messageForm.btn_send.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.messageForm.close}
diff --git a/WEB-INF/templates/work/offer_view.tpl b/WEB-INF/templates/work/offer_view.tpl
deleted file mode 100644
index 3d9d7d0c5..000000000
--- a/WEB-INF/templates/work/offer_view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.contractor}:</td>
-          <td>{$forms.offerForm.contractor.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.offer}:</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
-
-<table width="720" cellspacing="4" cellpadding="4" border="0">
-<tr>
-  <td align="center">
-  <table>
-  <tr>
-    <td><input type="button" onclick="chLocation('offer_message.php?offer_id={$offer_id}');" value="{$i18n.work.button.send_message}"></td>
-    <td><input type="button" onclick="chLocation('work_add.php?offer_id={$offer_id}');" value="{$i18n.work.button.accept}"></td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
diff --git a/WEB-INF/templates/work/offer_view_own.tpl b/WEB-INF/templates/work/offer_view_own.tpl
deleted file mode 100644
index d00ae7ea1..000000000
--- a/WEB-INF/templates/work/offer_view_own.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.offerForm.open}
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.offer}:</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/work.tpl b/WEB-INF/templates/work/work.tpl
deleted file mode 100644
index 67235b64f..000000000
--- a/WEB-INF/templates/work/work.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td valign="top">
-{if $own_work_items}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_work}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
-          <td class="tableHeader">{$i18n.work.label.offers}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $own_work_items as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="work_view_own.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.status_label}</td>
-          <td class="midAligned">{if $work_item.num_offers}<a href="work_offers.php?id={$work_item.id}">{$work_item.num_offers}</a>{/if}</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-    {if $work_item.can_edit}
-          <td><a href="work_edit.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
-    {else}
-          <td></td>
-    {/if}
-    {if $work_item.can_delete}
-          <td><a href="work_delete.php?id={$work_item.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
-    {else}
-          <td></td>
-    {/if}
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-{/if}
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_work}</td></tr>
-{if $available_work_items}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.work}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_work_items as $work_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="work_view.php?id={$work_item.id}">{$work_item.subject|escape}</a></td>
-          <td>{$work_item.description|escape}</td>
-          <td>{$work_item.group_name|escape}</td>
-          <td nowrap>{$work_item.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('work_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-{if $own_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.work.label.own_offers}</td></tr>
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-          <td></td>
-          <td></td>
-        </tr>
-  {foreach $own_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href='offer_view_own.php?id={$offer.id}'>{$offer.subject|escape}</a></td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.status_label}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-          <td><a href="offer_edit.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="../img/icon-edit.png"></a></td>
-          <td><a href="offer_delete.php?id={$offer.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="../img/icon-delete.png"></a></td>
-        </tr>
-  {/foreach}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-{/if}
-
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr><td class="sectionHeaderNoBorder">{$i18n.title.available_offers}</td></tr>
-{if $available_offers}
-        <tr>
-          <td width="35%" class="tableHeader">{$i18n.label.offer}</td>
-          <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $available_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href="offer_view.php?id={$offer.id}">{$offer.subject|escape}</a></td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.group_name|escape}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-{/if}
-      </table>
-
-      <table width="100%">
-        <tr>
-          <td align="center"><br>
-            <form><input type="button" onclick="chLocation('offer_add.php');" value="{$i18n.button.add}"></form>
-          </td>
-        </tr>
-      </table>
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/work/work_add.tpl b/WEB-INF/templates/work/work_add.tpl
deleted file mode 100644
index eca0ba799..000000000
--- a/WEB-INF/templates/work/work_add.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work} (*):</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.type}:</td>
-          <td>{$forms.workForm.work_type.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.workForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.workForm.btn_add.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/WEB-INF/templates/work/work_delete.tpl b/WEB-INF/templates/work/work_delete.tpl
deleted file mode 100644
index 2831b0f15..000000000
--- a/WEB-INF/templates/work/work_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.workDeleteForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$work_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.workDeleteForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.workDeleteForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workDeleteForm.close}
diff --git a/WEB-INF/templates/work/work_edit.tpl b/WEB-INF/templates/work/work_edit.tpl
deleted file mode 100644
index 7165d5e19..000000000
--- a/WEB-INF/templates/work/work_edit.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work} (*):</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.type}:</td>
-          <td>{$forms.workForm.work_type.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-{if $show_files}
-        <tr>
-          <td align="right">{$i18n.label.file}:</td>
-          <td>{$forms.workForm.newfile.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right">{$i18n.label.currency}:</td>
-          <td>{$forms.workForm.currency.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget} (*):</td>
-          <td>{$forms.workForm.budget.control} <a href="https://www.anuko.com/lp/tt_41.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.workForm.status.control}</td>
-        </tr>
-{if $show_moderator_comment}
-        <tr>
-          <td align = "right">{$i18n.label.moderator_comment}:</td>
-          <td>{$forms.workForm.moderator_comment.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.workForm.btn_save.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/WEB-INF/templates/work/work_message.tpl b/WEB-INF/templates/work/work_message.tpl
deleted file mode 100644
index 3f237659c..000000000
--- a/WEB-INF/templates/work/work_message.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.messageForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $work_item}
-  <tr>
-    <td>
-      <table border="0" width="100%">
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0" width="100%">
-        <tr>
-          <td align="right">{$i18n.work.label.message}:</td>
-          <td>{$forms.messageForm.message_body.control}</td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" height="50">{$forms.messageForm.btn_send.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.messageForm.close}
diff --git a/WEB-INF/templates/work/work_offer_view.tpl b/WEB-INF/templates/work/work_offer_view.tpl
deleted file mode 100644
index e2afe0003..000000000
--- a/WEB-INF/templates/work/work_offer_view.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{$forms.offerForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $work_item}
-    <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.contractor}:</td>
-          <td>{$forms.offerForm.contractor.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.offer}:</td>
-          <td>{$forms.offerForm.offer_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.offerForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.offerForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.offerForm.budget.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.status}:</td>
-          <td>{$forms.offerForm.status.control}</td>
-        </tr>
-
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td></td>
-          <td align="center" height="50">{$forms.offerForm.btn_accept.control} {$forms.offerForm.btn_decline.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.comment}:</td>
-          <td>{$forms.offerForm.client_comment.control}</td>
-        </tr>
-
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.offerForm.close}
diff --git a/WEB-INF/templates/work/work_offers.tpl b/WEB-INF/templates/work/work_offers.tpl
deleted file mode 100644
index ea0d8816f..000000000
--- a/WEB-INF/templates/work/work_offers.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.work}:</b> {$work_item.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.client}:</b> {$work_item.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$work_item.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$work_item.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td valign="top">
-
-{if $work_item_offers}
-      <table cellspacing="1" cellpadding="3" border="0" width="100%">
-        <tr>
-          <td class="tableHeader">{$i18n.label.contractor}</td>
-          <td class="tableHeader">{$i18n.label.description}</td>
-          <td class="tableHeader">{$i18n.label.status}</td>
-          <td class="tableHeader">{$i18n.label.budget}</td>
-        </tr>
-  {foreach $work_item_offers as $offer}
-        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-          <td><a href='work_offer_view.php?id={$offer.id}'>{$offer.group_name|escape}</a></td>
-          <td>{$offer.description|escape}</td>
-          <td>{$offer.status_label}</td>
-          <td nowrap>{$offer.amount_with_currency}</td>
-        </tr>
-  {/foreach}
-      </table>
-{/if}
-
-    </td>
-  </tr>
-</table>
diff --git a/WEB-INF/templates/work/work_view.tpl b/WEB-INF/templates/work/work_view.tpl
deleted file mode 100644
index 468cb9ddd..000000000
--- a/WEB-INF/templates/work/work_view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.client}:</td>
-          <td>{$forms.workForm.client.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.workForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
-
-<table width="720" cellspacing="4" cellpadding="4" border="0">
-<tr>
-  <td align="center">
-  <table>
-  <tr>
-    <td><input type="button" onclick="chLocation('work_message.php?work_id={$work_id}');" value="{$i18n.work.button.send_message}"></td>
-    <td><input type="button" onclick="chLocation('offer_add.php?work_id={$work_id}');" value="{$i18n.work.button.make_offer}"></td>
-  </tr>
-  </table>
-  </td>
-</tr>
-</table>
diff --git a/WEB-INF/templates/work/work_view_own.tpl b/WEB-INF/templates/work/work_view_own.tpl
deleted file mode 100644
index 61e270b4b..000000000
--- a/WEB-INF/templates/work/work_view_own.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{$forms.workForm.open}
-<table cellspacing="4" cellpadding="7" border="0" width="720">
-{if $offer}
-  <tr>
-    <td>
-      <table border=0 width=100%>
-        <tr><td align="left"><b>{$i18n.label.offer}:</b> {$offer.subject}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.contractor}:</b> {$offer.group_name}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.description}:</b> {$offer.descr_short|escape}</td></tr>
-        <tr><td align="left"><b>{$i18n.label.budget}:</b> {$offer.amount_with_currency}</td></tr>
-      </table>
-    </td>
-  </tr>
-{/if}
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right">{$i18n.label.work}:</td>
-          <td>{$forms.workForm.work_name.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.description}:</td>
-          <td>{$forms.workForm.description.control}</td>
-        </tr>
-        <tr>
-          <td align = "right">{$i18n.label.details}:</td>
-          <td>{$forms.workForm.details.control}</td>
-        </tr>
-        <tr>
-          <td align="right">{$i18n.label.budget}:</td>
-          <td>{$forms.workForm.budget.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.workForm.close}
diff --git a/work/admin_offer_delete.php b/work/admin_offer_delete.php
deleted file mode 100644
index a1bd5fac1..000000000
--- a/work/admin_offer_delete.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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('ttAdminWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$offer = $adminWorkHelper->getOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$offer_to_delete = $offer['subject'];
-
-$form = new Form('offerDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($adminWorkHelper->deleteOffer($cl_offer_id)) {
-      header('Location: admin_work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: admin_work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('offer_to_delete', $offer_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_offer'));
-$smarty->assign('content_page_name', 'work/offer_delete.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/admin_offer_edit.php b/work/admin_offer_edit.php
deleted file mode 100644
index ab795c136..000000000
--- a/work/admin_offer_edit.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?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');
-require '../plugins/work_constants.php';
-import('form.Form');
-import('ttWorkHelper');
-import('ttAdminWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$offer = $adminWorkHelper->getOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $adminWorkHelper->getWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$existingStatus = $offer['status'];
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('offer_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $request->getParameter('budget');
-  $cl_payment_info = $request->getParameter('payment_info');
-  // $cl_status = $request->getParameter('status');
-  $cl_moderator_comment = $request->getParameter('moderator_comment');
-} else {
-  $cl_name = $offer['subject'];
-  $cl_description = $offer['descr_short'];
-  $cl_details = $offer['descr_long'];
-  $currency = $offer['currency'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-  $cl_payment_info = $offer['payment_info'];
-  $status = $offer['status'];
-  $status_label = $offer['status_label'];
-  $cl_moderator_comment = $offer['moderator_comment'];
-}
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-if ($work_id) {
-  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
-  $form->getElement('work_description')->setEnabled(false);
-}
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-if ($work_id) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-if ($work_id) $form->getElement('currency')->setEnabled(false);
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$status_label));
-$form->getElement('status')->setEnabled(false);
-
-// Prepare status choices.
-/*
-$status_options = array();
-$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
-$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
-$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
-*/
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-if ($status == STATUS_PENDING_APPROVAL) {
-  $form->addInput(array('type'=>'submit','name'=>'btn_approve','value'=>$i18n->get('button.approve')));
-  $form->addInput(array('type'=>'submit','name'=>'btn_disapprove','value'=>$i18n->get('button.disapprove')));
-}
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
-  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  $fields = array('offer_id'=>$cl_offer_id,
-    'subject'=>$cl_name,
-    'descr_short' => $cl_description,
-    'descr_long' => $cl_details,
-    'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-    'amount' => $cl_budget,
-    'payment_info' => $cl_payment_info,
-    'moderator_comment' => $cl_moderator_comment);
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_approve')) {
-      // Approve offer.
-      if ($adminWorkHelper->approveOffer($fields)) {
-        header('Location: admin_work.php');
-        exit();
-      }
-    }
-  
-    if ($request->getParameter('btn_save')) {
-      // Update offer without changing its status.
-      if ($adminWorkHelper->updateOffer($fields)) {
-        header('Location: admin_work.php');
-        exit();
-      }
-    }
-
-    if ($request->getParameter('btn_disapprove')) {
-      // Dispprove offer.
-      if ($adminWorkHelper->disapproveOffer($fields)) {
-        header('Location: admin_work.php');
-        exit();
-      }
-    }
-  }
-} // isPost
-
-if ($work_id) {
-  $smarty->assign('work_id', $work_id);
-  $smarty->assign('work_name', $work_item['subject']);
-  $smarty->assign('work_description', $work_item['descr_short']);
-}
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_offer'));
-$smarty->assign('content_page_name', 'work/admin_offer_edit.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/admin_work.php b/work/admin_work.php
deleted file mode 100644
index 86a029a4a..000000000
--- a/work/admin_work.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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('ttAdminWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$adminWorkHelper = new ttAdminWorkHelper($err);
-
-$adminItems = $adminWorkHelper->getItems();
-$pending_work = $adminItems['pending_work'];
-$pending_offers = $adminItems['pending_offers'];
-$available_work = $adminItems['available_work'];
-$available_offers = $adminItems['available_offers'];
-
-$smarty->assign('pending_work', $pending_work);
-$smarty->assign('pending_offers', $pending_offers);
-$smarty->assign('available_work', $available_work);
-$smarty->assign('available_offers', $available_offers);
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work/admin_work.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/admin_work_delete.php b/work/admin_work_delete.php
deleted file mode 100644
index 11b599430..000000000
--- a/work/admin_work_delete.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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('ttAdminWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$work_to_delete = $work_item['subject'];
-
-$form = new Form('workDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($adminWorkHelper->deleteWorkItem($cl_work_id)) {
-      header('Location: admin_work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: admin_work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('work_to_delete', $work_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_work'));
-$smarty->assign('content_page_name', 'work/work_delete.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/admin_work_edit.php b/work/admin_work_edit.php
deleted file mode 100644
index 51169325c..000000000
--- a/work/admin_work_edit.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?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');
-require '../plugins/work_constants.php';
-import('form.Form');
-import('ttWorkHelper');
-import('ttAdminWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('administer_site')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$adminWorkHelper = new ttAdminWorkHelper($err);
-$work_item = $adminWorkHelper->getWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// Do we have offer_id?
-$offer_id = $work_item['offer_id'];
-if ($offer_id) {
-  $offer = $adminWorkHelper->getOffer($offer_id);
-  if (!$offer) {
-    header('Location: ../access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-$existingStatus = $work_item['status'];
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('work_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  $cl_budget = $request->getParameter('budget');
-  $cl_status = $request->getParameter('status');
-  $cl_moderator_comment = $request->getParameter('moderator_comment');
-} else {
-  $cl_name = $work_item['subject'];
-  $cl_description = $work_item['descr_short'];
-  $cl_details = $work_item['descr_long'];
-  $currency = $work_item['currency'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $work_item['amount'];
-  $cl_status = $work_item['status'];
-  $cl_moderator_comment = $work_item['moderator_comment'];
-}
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-// Disable some controls for work on an available offer.
-if ($offer) {
-  $form->getElement('work_name')->setEnabled(false);
-  // $form->getElement('work_type')->setEnabled(false);
-  $form->getElement('currency')->setEnabled(false);
-  $form->getElement('budget')->setEnabled(false);
-}
-
-// Prepare status choices.
-$status_options = array();
-$status_options[STATUS_PENDING_APPROVAL] = $i18n->get('dropdown.pending_approval');
-$status_options[STATUS_DISAPPROVED] = $i18n->get('dropdown.not_approved');
-$status_options[STATUS_APPROVED] = $i18n->get('dropdown.approved');
-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,'data'=>$status_options));
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_moderator_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.moderator_comment'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      $fields = array('work_id'=>$cl_work_id,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget,
-        'moderator_comment' => $cl_moderator_comment);
-
-      // Do things differently, depending on status control value.
-      if ($existingStatus == $cl_status) {
-        // Status not changed. Update work information.
-        if ($adminWorkHelper->updateWorkItem($fields)) {
-          header('Location: admin_work.php');
-          exit();
-        }
-      } else if ($cl_status == STATUS_DISAPPROVED) {
-        // Status changed to "not approved". Disapprove work.
-        if ($offer_id) {
-          if ($adminWorkHelper->disapproveWorkItemOnOffer($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        } else {
-          if ($adminWorkHelper->disapproveWorkItem($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        }
-      } else if ($cl_status == STATUS_APPROVED) {
-        // Status changed to "approved". Approve work.
-        if ($offer_id) {
-          if ($adminWorkHelper->approveWorkItemOnOffer($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        } else {
-          if ($adminWorkHelper->approveWorkItem($fields)) {
-            header('Location: admin_work.php');
-            exit();
-          }
-        }
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_work'));
-$smarty->assign('content_page_name', 'work/admin_work_edit.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/offer_add.php b/work/offer_add.php
deleted file mode 100644
index bafdae216..000000000
--- a/work/offer_add.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-// Do we have work_id?
-$cl_work_id = (int)$request->getParameter('work_id');
-if ($cl_work_id) {
-  $workHelper = new ttWorkHelper($err);
-  $work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-  if (!$work_item) {
-    header('Location: ../access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-if ($work_item) $cl_name = $work_item['subject'];
-
-if ($request->isPost()) {
-  if (!$work_item)
-    $cl_name = trim($request->getParameter('offer_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $request->getParameter('budget');
-  $cl_payment_info = $request->getParameter('payment_info');
-} else {
-  if ($work_item) {
-    $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  }
-}
-
-$form = new Form('offerForm');
-if ($cl_work_id) {
-  $form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
-  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
-  $form->getElement('work_description')->setEnabled(false);
-}
-$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-if ($work_item) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-// Add a dropdown for currency.
-$currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-if ($work_item) $form->getElement('currency')->setEnabled(false); // Do not allow changing currency for offers on existing work items.
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px;vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('work_id'=>$cl_work_id,
-      'subject'=>$cl_name,
-      'descr_short' => $cl_description,
-      'descr_long' => $cl_details,
-      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-      'amount' => $cl_budget,
-      'payment_info' => $cl_payment_info);
-     if ($workHelper->putOwnOffer($fields)) {
-        header('Location: work.php');
-        exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('title.add_offer'));
-$smarty->assign('content_page_name', 'work/offer_add.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/offer_delete.php b/work/offer_delete.php
deleted file mode 100644
index fd3d2e7d1..000000000
--- a/work/offer_delete.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$offer_to_delete = $offer['subject'];
-
-$form = new Form('offerDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($workHelper->deleteOwnOffer($cl_offer_id)) {
-      header('Location: work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('offer_to_delete', $offer_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_offer'));
-$smarty->assign('content_page_name', 'work/offer_delete.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/offer_edit.php b/work/offer_edit.php
deleted file mode 100644
index bd2172210..000000000
--- a/work/offer_edit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $workHelper->getAvailableWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('offer_name'));
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  if (!$cl_currency_id && $work_item) $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $request->getParameter('budget');
-  $cl_payment_info = $request->getParameter('payment_info');
-} else {
-  $cl_name = $offer['subject'];
-  $cl_description = $offer['descr_short'];
-  $cl_details = $offer['descr_long'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-  $cl_payment_info = $offer['payment_info'];
-  $cl_status = $offer['status_label'];
-  $cl_moderator_comment = $offer['moderator_comment'];
-}
-
-$show_moderator_comment = $cl_moderator_comment != null;
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-if ($work_id) {
-  $form->addInput(array('type'=>'textarea','name'=>'work_description','style'=>'width: 400px; height: 80px;','value'=>$work_item['descr_short']));
-  $form->getElement('work_description')->setEnabled(false);
-}
-$form->addInput(array('type'=>'text','name'=>'offer_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-if ($work_id) $form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-if ($work_id) $form->getElement('currency')->setEnabled(false);
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'textarea','name'=>'payment_info','maxlength'=>'256','style'=>'width: 400px; height: 40px; vertical-align: middle','value'=>$cl_payment_info));
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
-$form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->getElement('moderator_comment')->setEnabled(false);
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.offer'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-  if (!ttValidString($cl_payment_info)) $err->add($i18n->get('error.field'), $i18n->get('label.how_to_pay'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      // Update offer information.
-      $fields = array('offer_id'=>$cl_offer_id,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget,
-        'payment_info' => $cl_payment_info);
-      if ($workHelper->updateOwnOffer($fields)) {
-        header('Location: work.php');
-        exit();
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('show_moderator_comment', $show_moderator_comment);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_offer'));
-$smarty->assign('content_page_name', 'work/offer_edit.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/offer_message.php b/work/offer_message.php
deleted file mode 100644
index ff324808e..000000000
--- a/work/offer_message.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('offer_id');
-if (!$cl_offer_id) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getAvailableOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$cl_name = $offer['subject'];
-
-if ($request->isPost()) {
-  $cl_message_body = trim($request->getParameter('message_body'));
-}
-
-$form = new Form('messageForm');
-$form->addInput(array('type'=>'hidden','name'=>'offer_id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
-$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_message_body)) $err->add($i18n->get('error.field'), $i18n->get('work.label.message'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('offer_id'=>$cl_offer_id,
-      'message_body' => $cl_message_body);
-    if ($workHelper->sendMessageToOfferOwner($fields)) {
-      $msg->add($i18n->get('work.msg.message_sent'));
-      //  header('Location: work.php'); // TODO: where to redirect?
-      // exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('work.title.send_message'));
-$smarty->assign('content_page_name', 'work/offer_message.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/offer_view.php b/work/offer_view.php
deleted file mode 100644
index 1e045bf20..000000000
--- a/work/offer_view.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getAvailableOffer($offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $workHelper->getAvailableWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$cl_contractor = $offer['group_name'];
-$cl_name = $offer['subject'];
-$cl_description = $offer['descr_short'];
-$cl_details = $offer['descr_long'];
-$cl_budget = $offer['amount_with_currency'];
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
-$form->getElement('contractor')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-
-$smarty->assign('offer_id', $offer_id);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.offer'));
-$smarty->assign('content_page_name', 'work/offer_view.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/offer_view_own.php b/work/offer_view_own.php
deleted file mode 100644
index 57b1b95b3..000000000
--- a/work/offer_view_own.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnOffer($offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Is this offer associated with a work item?
-$work_id = $offer['work_id'];
-if ($work_id) {
-  $work_item = $workHelper->getAvailableWorkItem($work_id);
-  if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-}
-
-$cl_name = $offer['subject'];
-$cl_description = $offer['descr_short'];
-$cl_details = $offer['descr_long'];
-$cl_budget = $offer['amount_with_currency'];
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.offer'));
-$smarty->assign('content_page_name', 'work/offer_view_own.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work.php b/work/work.php
deleted file mode 100644
index b043690b4..000000000
--- a/work/work.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!(ttAccessAllowed('update_work') || ttAccessAllowed('bid_on_work')  || ttAccessAllowed('manage_work'))) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-// End of access checks.
-
-$workHelper = new ttWorkHelper($err);
-$groupItems = $workHelper->getGroupItems(); // All group items.
-if($user->can('manage_work')) {
-  $own_work_items = $groupItems['own_work_items']; // Own work items this group is outsourcing.
-  $available_offers = $groupItems['available_offers']; // Available offers from other organizations.
-}
-if($user->can('bid_on_work')) {
-  $available_work_items = $groupItems['available_work_items']; // Currently available work items from other orgs.
-  $own_offers = $groupItems['own_offers']; // Own offers this group makes available to other groups.
-}
-if($user->can('update_work')) {
-  // $in_progress_work = ttWorkHelper::getInProgressWork(); // Work items in progress for other groups.
-  // $completed_work = ttWorkHelper::getCompletedWork(); // Completed work items for other groups.
-}
-// TODO: review access rights for the code above.
-
-$smarty->assign('own_work_items', $own_work_items);
-$smarty->assign('available_work_items', $available_work_items);
-$smarty->assign('own_offers', $own_offers);
-$smarty->assign('available_offers', $available_offers);
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work/work.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_add.php b/work/work_add.php
deleted file mode 100644
index df12c9155..000000000
--- a/work/work_add.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-// Do we have offer_id?
-$cl_offer_id = (int)$request->getParameter('offer_id');
-if ($cl_offer_id) {
-  $workHelper = new ttWorkHelper($err);
-  $offer = $workHelper->getAvailableOffer($cl_offer_id);
-  if (!$offer) {
-    header('Location: ../access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('work_name'));
-  $cl_work_type = $request->getParameter('work_type');
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  $cl_budget = $request->getParameter('budget');
-}
-// Override some fields for work being created on an available offer.
-if ($offer) {
-  $cl_name = $offer['subject'];
-  $cl_work_type = 0; // one-time work
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-}
-
-$form = new Form('workForm');
-if ($offer)
-  $form->addInput(array('type'=>'hidden','name'=>'offer_id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
-$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-// Add a dropdown for currency.
-$currencies = ttWorkHelper::getCurrencies();
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-// Disable some controls for work being created on an available offer.
-if ($offer) {
-  $form->getElement('work_name')->setEnabled(false);
-  $form->getElement('work_type')->setEnabled(false);
-  $form->getElement('currency')->setEnabled(false);
-  $form->getElement('budget')->setEnabled(false);
-}
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('offer_id' => $cl_offer_id,
-      'subject' => $cl_name,
-      'type' => $cl_work_type,
-      'descr_short' => $cl_description,
-      'descr_long' => $cl_details,
-      'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-      'amount' => $cl_budget);
-     if ($workHelper->putOwnWorkItem($fields)) {
-        header('Location: work.php');
-        exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.workForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('title.add_work'));
-$smarty->assign('content_page_name', 'work/work_add.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_delete.php b/work/work_delete.php
deleted file mode 100644
index 1d94603ab..000000000
--- a/work/work_delete.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$work_to_delete = $work_item['subject'];
-
-$form = new Form('workDeleteForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
-
-if ($request->isPost()) {
-  if ($request->getParameter('btn_delete')) {
-    if ($workHelper->deleteOwnWorkItem($cl_work_id)) {
-      header('Location: work.php');
-      exit();
-    }
-  } elseif ($request->getParameter('btn_cancel')) {
-    header('Location: work.php');
-    exit();
-  }
-} // isPost
-
-$smarty->assign('work_to_delete', $work_to_delete);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.workDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->get('title.delete_work'));
-$smarty->assign('content_page_name', 'work/work_delete.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_edit.php b/work/work_edit.php
deleted file mode 100644
index 7e27106b8..000000000
--- a/work/work_edit.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// Do we have offer_id?
-$offer_id = $work_item['offer_id'];
-if ($offer_id) {
-  $offer = $workHelper->getAvailableOffer($offer_id);
-  if (!$offer) {
-    header('Location: ../access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-$currencies = ttWorkHelper::getCurrencies();
-
-if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('work_name'));
-  $cl_work_type = $request->getParameter('work_type');
-  $cl_description = trim($request->getParameter('description'));
-  $cl_details = trim($request->getParameter('details'));
-  $cl_currency_id = $request->getParameter('currency');
-  $cl_budget = $request->getParameter('budget');
-} else {
-  $cl_name = $work_item['subject'];
-  $cl_work_type = $work_item['type'];
-  $cl_description = $work_item['descr_short'];
-  $cl_details = $work_item['descr_long'];
-  $cl_currency_id = ttWorkHelper::getCurrencyID($work_item['currency']);
-  $cl_budget = $work_item['amount'];
-  $cl_status = $work_item['status_label'];
-  $cl_moderator_comment = $work_item['moderator_comment'];
-}
-// Override some fields for work on an available offer.
-if ($offer) {
-  $cl_name = $offer['subject'];
-  $cl_work_type = 0; // one-time work
-  $cl_currency_id = ttWorkHelper::getCurrencyID($offer['currency']);
-  $cl_budget = $offer['amount'];
-}
-
-$show_moderator_comment = $cl_moderator_comment != null;
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'work_name','maxlength'=>'128','style'=>'width: 400px;','value'=>$cl_name));
-$WORK_TYPE_OPTIONS = array('0'=>$i18n->get('work.type.one_time'),'1'=>$i18n->get('work.type.ongoing'));
-$form->addInput(array('type'=>'combobox','name'=>'work_type','data'=>$WORK_TYPE_OPTIONS,'value'=>$cl_work_type));
-$form->addInput(array('type'=>'textarea','name'=>'description','maxlength'=>'512','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->addInput(array('type'=>'combobox','name'=>'currency','data'=>$currencies,'datakeys'=>array('id','name'),'value'=>$cl_currency_id));
-$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'budget','format'=>'.2','value'=>$cl_budget));
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
-$form->getElement('status')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'moderator_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_moderator_comment));
-$form->getElement('moderator_comment')->setEnabled(false);
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-// Disable some controls for work on an available offer.
-if ($offer) {
-  $form->getElement('work_name')->setEnabled(false);
-  $form->getElement('work_type')->setEnabled(false);
-  $form->getElement('currency')->setEnabled(false);
-  $form->getElement('budget')->setEnabled(false);
-}
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.work'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
-  if (!ttValidString($cl_details, true)) $err->add($i18n->get('error.field'), $i18n->get('label.details'));
-  if (!ttValidString($cl_budget)) $err->add($i18n->get('error.field'), $i18n->get('label.budget'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    if ($request->getParameter('btn_save')) {
-      // Update work information.
-      $fields = array('work_id'=>$cl_work_id,
-        'type'=>$cl_work_type,
-        'subject'=>$cl_name,
-        'descr_short' => $cl_description,
-        'descr_long' => $cl_details,
-        'currency' => ttWorkHelper::getCurrencyName($cl_currency_id),
-        'amount' => $cl_budget);
-      if ($offer_id > 0) {
-        if ($workHelper->updateOwnWorkItemOnOffer($fields)) {
-          header('Location: work.php');
-          exit();
-        }
-      } else {
-        if ($workHelper->updateOwnWorkItem($fields)) {
-          header('Location: work.php');
-          exit();
-        }
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('offer', $offer);
-$smarty->assign('show_moderator_comment', $show_moderator_comment);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.edit_work'));
-$smarty->assign('content_page_name', 'work/work_edit.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_message.php b/work/work_message.php
deleted file mode 100644
index 91d02b5cb..000000000
--- a/work/work_message.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('work_id');
-if (!$cl_work_id) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$cl_name = $work_item['subject'];
-
-if ($request->isPost()) {
-  $cl_message_body = trim($request->getParameter('message_body'));
-}
-
-$form = new Form('messageForm');
-$form->addInput(array('type'=>'hidden','name'=>'work_id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'textarea','name'=>'message_body','style'=>'width: 400px; height: 80px;vertical-align: middle','value'=>$cl_message_body));
-$form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->get('work.button.send_message')));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_message_body)) $err->add($i18n->get('error.field'), $i18n->get('work.label.message'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('work_id'=>$cl_work_id,
-      'message_body' => $cl_message_body);
-    if ($workHelper->sendMessageToWorkOwner($fields)) {
-      $msg->add($i18n->get('work.msg.message_sent'));
-      //  header('Location: work.php'); // TODO: where to redirect?
-      // exit();
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.offerForm.work_name.focus()"');
-$smarty->assign('title', $i18n->get('work.title.send_message'));
-$smarty->assign('content_page_name', 'work/work_message.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_offer_view.php b/work/work_offer_view.php
deleted file mode 100644
index c0dd5ee1a..000000000
--- a/work/work_offer_view.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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');
-require_once('../plugins/work_constants.php');
-import('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$cl_offer_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$offer = $workHelper->getOwnWorkItemOffer($cl_offer_id);
-if (!$offer) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-// Get an associated work item.
-$work_item = $workHelper->getOwnWorkItem($offer['work_id']);
-if (!$work_item) $err->add($i18n->get('work.error.work_not_available'));
-
-if ($request->isPost()) {
-  $cl_client_comment = $request->getParameter('client_comment');
-} else {
-  $cl_client_comment = $offer['client_comment'];
-}
-
-$cl_contractor = $offer['group_name'];
-$cl_name = $offer['subject'];
-$cl_description = $offer['descr_short'];
-$cl_details = $offer['descr_long'];
-$cl_budget = $offer['amount_with_currency'];
-$cl_status = $offer['status_label'];
-
-$form = new Form('offerForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_offer_id));
-$form->addInput(array('type'=>'text','name'=>'contractor','value'=>$cl_contractor));
-$form->getElement('contractor')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'offer_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('offer_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'status','style'=>'width: 400px;','value'=>$cl_status));
-$form->getElement('status')->setEnabled(false);
-if ($offer['status'] == STATUS_APPROVED) {
-  $form->addInput(array('type'=>'submit','name'=>'btn_accept','value'=>$i18n->get('work.button.accept')));
-  $form->addInput(array('type'=>'submit','name'=>'btn_decline','value'=>$i18n->get('work.button.decline')));
-}
-$form->addInput(array('type'=>'textarea','name'=>'client_comment','style'=>'width: 400px; height: 80px;','value'=>$cl_client_comment));
-
-if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_client_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
-
-  // Ensure user email exists (required for workflow).
-  if (!$user->getEmail()) $err->add($i18n->get('error.no_email'));
-
-  if ($err->no()) {
-    $workHelper = new ttWorkHelper($err);
-    $fields = array('offer_id'=>$cl_offer_id,
-      'client_comment'=>$cl_client_comment);
-
-    if ($request->getParameter('btn_accept')) {
-      // Accept offer.
-      if ($workHelper->acceptOwnWorkItemOffer($fields)) {
-        header('Location: work_offer_view.php?id='.$cl_offer_id);
-        exit();
-      }
-    }
-
-    if ($request->getParameter('btn_decline')) {
-      // Decline offer.
-      if ($workHelper->declineOwnWorkItemOffer($fields)) {
-        header('Location: work_offer_view.php?id='.$cl_offer_id);
-        exit();
-      }
-    }
-  }
-} // isPost
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.offer'));
-$smarty->assign('content_page_name', 'work/work_offer_view.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_offers.php b/work/work_offers.php
deleted file mode 100644
index eae9841bb..000000000
--- a/work/work_offers.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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('ttWorkHelper');
-
-// Access checks.
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-$work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$work_item_offers = $workHelper->getOwnWorkItemOffers($work_id);
-
-$smarty->assign('work_item', $work_item);
-$smarty->assign('work_item_offers', $work_item_offers);
-$smarty->assign('title', $i18n->get('work.label.offers'));
-$smarty->assign('content_page_name', 'work/work_offers.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_view.php b/work/work_view.php
deleted file mode 100644
index cb73f2eed..000000000
--- a/work/work_view.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('bid_on_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$cl_work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getAvailableWorkItem($cl_work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// End of access checks.
-
-$cl_client = $work_item['group_name'];
-$cl_name = $work_item['subject'];
-$cl_description = $work_item['descr_short'];
-$cl_details = $work_item['descr_long'];
-$cl_budget = $work_item['amount_with_currency'];
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_work_id));
-$form->addInput(array('type'=>'text','name'=>'client','value'=>$cl_client));
-$form->getElement('client')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('work_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-$smarty->assign('work_id', $cl_work_id);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work/work_view.tpl');
-$smarty->display('work/index.tpl');
diff --git a/work/work_view_own.php b/work/work_view_own.php
deleted file mode 100644
index c4b887e7e..000000000
--- a/work/work_view_own.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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('ttWorkHelper');
-import('form.Form');
-
-// Access checks.
-if (!$user->isPluginEnabled('wk')) {
-  header('Location: ../feature_disabled.php');
-  exit();
-}
-if (!ttAccessAllowed('manage_work')) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-$work_id = (int)$request->getParameter('id');
-$workHelper = new ttWorkHelper($err);
-$work_item = $workHelper->getOwnWorkItem($work_id);
-if (!$work_item) {
-  header('Location: ../access_denied.php');
-  exit();
-}
-// Do we have offer_id?
-$offer_id = $work_item['offer_id'];
-if ($offer_id) {
-  $offer = $workHelper->getAvailableOffer($offer_id);
-  if (!$offer) {
-    header('Location: ../access_denied.php');
-    exit();
-  }
-}
-// End of access checks.
-
-$cl_name = $work_item['subject'];
-$cl_description = $work_item['descr_short'];
-$cl_details = $work_item['descr_long'];
-$cl_budget = $work_item['amount_with_currency'];
-
-$form = new Form('workForm');
-$form->addInput(array('type'=>'textarea','name'=>'work_name','style'=>'width: 400px;','value'=>$cl_name));
-$form->getElement('work_name')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 400px; height: 80px;','value'=>$cl_description));
-$form->getElement('description')->setEnabled(false);
-$form->addInput(array('type'=>'textarea','name'=>'details','style'=>'width: 400px; height: 200px;','value'=>$cl_details));
-$form->getElement('details')->setEnabled(false);
-$form->addInput(array('type'=>'text','name'=>'budget','value'=>$cl_budget));
-$form->getElement('budget')->setEnabled(false);
-
-$smarty->assign('offer', $offer);
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->get('title.work'));
-$smarty->assign('content_page_name', 'work/work_view_own.tpl');
-$smarty->display('work/index.tpl');

From 0db69425bcc8bbdc20091e20d2b7437f7b53071d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 15:08:53 +0000
Subject: [PATCH 1633/1848] Some cleanup in translation files.

---
 WEB-INF/resources/ca.lang.php    | 8 --------
 WEB-INF/resources/cs.lang.php    | 8 --------
 WEB-INF/resources/da.lang.php    | 8 --------
 WEB-INF/resources/de.lang.php    | 9 ---------
 WEB-INF/resources/en.lang.php    | 8 --------
 WEB-INF/resources/es.lang.php    | 8 --------
 WEB-INF/resources/et.lang.php    | 8 --------
 WEB-INF/resources/fa.lang.php    | 8 --------
 WEB-INF/resources/fi.lang.php    | 8 --------
 WEB-INF/resources/fr.lang.php    | 8 --------
 WEB-INF/resources/gr.lang.php    | 8 --------
 WEB-INF/resources/he.lang.php    | 8 --------
 WEB-INF/resources/hu.lang.php    | 8 --------
 WEB-INF/resources/it.lang.php    | 8 --------
 WEB-INF/resources/ja.lang.php    | 8 --------
 WEB-INF/resources/ko.lang.php    | 8 --------
 WEB-INF/resources/nl.lang.php    | 5 -----
 WEB-INF/resources/no.lang.php    | 8 --------
 WEB-INF/resources/pl.lang.php    | 8 --------
 WEB-INF/resources/pt-br.lang.php | 5 -----
 WEB-INF/resources/pt.lang.php    | 8 --------
 WEB-INF/resources/ro.lang.php    | 8 --------
 WEB-INF/resources/ru.lang.php    | 5 -----
 WEB-INF/resources/sk.lang.php    | 8 --------
 WEB-INF/resources/sl.lang.php    | 8 --------
 WEB-INF/resources/sr.lang.php    | 8 --------
 WEB-INF/resources/sv.lang.php    | 8 --------
 WEB-INF/resources/tr.lang.php    | 8 --------
 WEB-INF/resources/zh-cn.lang.php | 8 --------
 WEB-INF/resources/zh-tw.lang.php | 8 --------
 initialize.php                   | 2 +-
 31 files changed, 1 insertion(+), 233 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f9d9952db..a2e130835 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -265,14 +265,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 453a51000..be62bf261 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -275,14 +275,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a33224168..48a37886c 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -258,14 +258,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 47eb84a16..916861d1b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -253,15 +253,6 @@
 // Another use is with offers with Remote Work plugin, where details hold a long, precise, and complete description of the offer.
 // 'label.details' => 'Details',
 'label.budget' => 'Budget',
-// TODO: translate the following.
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index c1c00af9d..2a78286a6 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -239,14 +239,6 @@
 'label.inactive_users' => 'Inactive Users',
 'label.details' => 'Details',
 'label.budget' => 'Budget',
-'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                    // Technically, it is either an org name or a combination of org and group names
-                                    // because both work items and offers are owned by Time Tracker groups of users.
-'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                    // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 8a8902f7d..83b5a6c0b 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -268,14 +268,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 3299e8ada..727da041d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -266,14 +266,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 019c4ca31..4ec8ef170 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -269,14 +269,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 0940dc597..d01becc4d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -262,14 +262,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 88a96690e..f690a4dc8 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -256,14 +256,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 489185a8c..3d0ac2a74 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -251,14 +251,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 918b5f7dc..bf17c6155 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -277,14 +277,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 407c22cd4..f67aadf87 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -270,14 +270,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 165afe880..ca7eec157 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -255,14 +255,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index dbac8f190..9519dd4c3 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -275,14 +275,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 896f1939f..0d190764b 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -275,14 +275,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 91ff4c8bc..fe5f4653e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -230,11 +230,6 @@
 'label.inactive_users' => 'Inactieve medewerkers',
 'label.details' => 'Details',
 'label.budget' => 'Budget',
-'label.work' => 'Werk',
-'label.offer' => 'Aanbod',
-'label.contractor' => 'Aanbieder',
-'label.how_to_pay' => 'Betaalwijze',
-'label.moderator_comment' => 'Commentaar',
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5cb39137d..73a640b99 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -272,14 +272,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d77f11c3d..ea5013148 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -263,14 +263,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 15e3ef91f..a46208163 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -231,11 +231,6 @@
 'label.inactive_users' => 'Usuários inativos',
 'label.details' => 'Detalhes',
 'label.budget' => 'Orçamento',
-'label.work' => 'Trabalho',
-'label.offer' => 'Oferta',
-'label.contractor' => 'Contratante',
-'label.how_to_pay' => 'Como pagar',
-'label.moderator_comment' => 'Comentário do moderador',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 6a1598cc7..fff0ad651 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -260,14 +260,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f93f12085..736c934e4 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -272,14 +272,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 71bc709bf..3450227db 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -230,11 +230,6 @@
 'label.inactive_users' => 'Неактивные пользователи',
 'label.details' => 'Детали',
 'label.budget' => 'Бюджет',
-'label.work' => 'Работа',
-'label.offer' => 'Предложение',
-'label.contractor' => 'Подрядчик',
-'label.how_to_pay' => 'Как оплатить',
-'label.moderator_comment' => 'Комментарий модератора',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index da24d8caf..8c386d1a8 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -266,14 +266,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 40abaabea..44be6053d 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -255,14 +255,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8e9fe4e8f..45dbb1004 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -261,14 +261,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bd025f84b..cb30b5e41 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -257,14 +257,6 @@
 // TODO: translate the following.
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 5ac60a72d..56c309432 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -279,14 +279,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 6c6451214..6f492d491 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -265,14 +265,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index d16bf4cb7..f9496eb21 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -270,14 +270,6 @@
 // 'label.inactive_users' => 'Inactive Users',
 // 'label.details' => 'Details',
 // 'label.budget' => 'Budget',
-// 'label.work' => 'Work',   // Table column header for work items, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.offer' => 'Offer', // Table column header for offers, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// 'label.contractor' => 'Contractor', // Table column header for offers (contractor is someone who offers to do work).
-                                       // Technically, it is either an org name or a combination of org and group names
-                                       // because both work items and offers are owned by Time Tracker groups of users.
-// 'label.how_to_pay' => 'How to pay', // Label for the "How to pay" field on offers, which allows contractors to specify
-                                       // how to pay them, for example: paypal email, check by mail to a specific address, etc.
-// 'label.moderator_comment' => 'Moderator comment', // Label for "Moderator comment" field that explains something.
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/initialize.php b/initialize.php
index 16f3a5b1e..db645a9d5 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5612");
+define("APP_VERSION", "1.19.34.5613");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 91294bc2d33e9415d104670928b2ecd83ce68c36 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 15:26:22 +0000
Subject: [PATCH 1634/1848] A bit more cleanup in translation files.

---
 WEB-INF/resources/ca.lang.php    | 2 --
 WEB-INF/resources/cs.lang.php    | 2 --
 WEB-INF/resources/da.lang.php    | 3 ---
 WEB-INF/resources/de.lang.php    | 6 ------
 WEB-INF/resources/en.lang.php    | 2 --
 WEB-INF/resources/es.lang.php    | 2 --
 WEB-INF/resources/et.lang.php    | 3 ---
 WEB-INF/resources/fa.lang.php    | 3 ---
 WEB-INF/resources/fi.lang.php    | 3 ---
 WEB-INF/resources/fr.lang.php    | 3 ---
 WEB-INF/resources/gr.lang.php    | 3 ---
 WEB-INF/resources/he.lang.php    | 3 ---
 WEB-INF/resources/hu.lang.php    | 2 --
 WEB-INF/resources/it.lang.php    | 3 ---
 WEB-INF/resources/ja.lang.php    | 2 --
 WEB-INF/resources/ko.lang.php    | 2 --
 WEB-INF/resources/nl.lang.php    | 2 --
 WEB-INF/resources/no.lang.php    | 2 --
 WEB-INF/resources/pl.lang.php    | 3 ---
 WEB-INF/resources/pt-br.lang.php | 2 --
 WEB-INF/resources/pt.lang.php    | 2 --
 WEB-INF/resources/ro.lang.php    | 2 --
 WEB-INF/resources/ru.lang.php    | 2 --
 WEB-INF/resources/sk.lang.php    | 3 ---
 WEB-INF/resources/sl.lang.php    | 2 --
 WEB-INF/resources/sr.lang.php    | 3 ---
 WEB-INF/resources/sv.lang.php    | 3 ---
 WEB-INF/resources/tr.lang.php    | 2 --
 WEB-INF/resources/zh-cn.lang.php | 2 --
 WEB-INF/resources/zh-tw.lang.php | 2 --
 initialize.php                   | 2 +-
 31 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a2e130835..fefaad825 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -263,8 +263,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index be62bf261..ff237c005 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -273,8 +273,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 48a37886c..9a9c532d5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -255,9 +255,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktive Brugere',
 'label.inactive_users' => 'Inaktive Brugere',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 916861d1b..3fea57b73 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -247,12 +247,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
-// TODO: translate the following or confirm that "Details" is also correct for German (exactly as the English string).
-// label.details is used to identify a field for LONG DESCRIPTION of a work item used in Remote Work plugin.
-// For example, a work item could be "Design a logo", and the Details hold EXACT anfd PRECISE specs of what a customer needs.
-// Another use is with offers with Remote Work plugin, where details hold a long, precise, and complete description of the offer.
-// 'label.details' => 'Details',
-'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2a78286a6..d82bb75b1 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -237,8 +237,6 @@
 'label.file' => 'File',
 'label.active_users' => 'Active Users',
 'label.inactive_users' => 'Inactive Users',
-'label.details' => 'Details',
-'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 83b5a6c0b..0f2b8a319 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -266,8 +266,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 727da041d..7137357e7 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -263,9 +263,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktiivsed kasutajad',
 'label.inactive_users' => 'Mitteaktiivsed kasutajad',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 4ec8ef170..085f80ca4 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -266,9 +266,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'کاربران فعال',
 'label.inactive_users' => 'کاربران غیرفعال',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d01becc4d..f3237ff0c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -259,9 +259,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktiiviset käyttäjät',
 'label.inactive_users' => 'Ei-aktiiviset käyttäjät',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f690a4dc8..5c971ea9b 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -253,9 +253,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Utilisateurs actifs',
 'label.inactive_users' => 'Utilisateurs inactifs',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 3d0ac2a74..dbbd85dbb 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -248,9 +248,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Ενεργοί χρήστες',
 'label.inactive_users' => 'Ανενεργοί χρήστες',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index bf17c6155..f3cee584a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -274,9 +274,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'משתמשים פעילים',
 'label.inactive_users' => 'משתמשים לא פעילים',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f67aadf87..08e52d402 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -268,8 +268,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index ca7eec157..d9cca113c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -252,9 +252,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Utenti attivi',
 'label.inactive_users' => 'Utenti inattivi',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9519dd4c3..7437648bc 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -273,8 +273,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 0d190764b..3454a362c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -273,8 +273,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index fe5f4653e..2c1b7b71b 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -228,8 +228,6 @@
 'label.file' => 'Bestand',
 'label.active_users' => 'Actieve medewerkers',
 'label.inactive_users' => 'Inactieve medewerkers',
-'label.details' => 'Details',
-'label.budget' => 'Budget',
 
 // Entity names.
 'entity.time' => 'tijd',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 73a640b99..20f50546d 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -270,8 +270,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ea5013148..84cd8241e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -260,9 +260,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktywni użytkownicy',
 'label.inactive_users' => 'Nieaktywni użytkownicy',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index a46208163..fbdff5ace 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -229,8 +229,6 @@
 'label.file' => 'Arquivo',
 'label.active_users' => 'Usuários ativos',
 'label.inactive_users' => 'Usuários inativos',
-'label.details' => 'Detalhes',
-'label.budget' => 'Orçamento',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fff0ad651..728c4ba62 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -258,8 +258,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 736c934e4..d89e335b3 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -270,8 +270,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3450227db..d16bd99df 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -228,8 +228,6 @@
 'label.file' => 'Файл',
 'label.active_users' => 'Активные пользователи',
 'label.inactive_users' => 'Неактивные пользователи',
-'label.details' => 'Детали',
-'label.budget' => 'Бюджет',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8c386d1a8..37303bdf7 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -263,9 +263,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktívny používatelia',
 'label.inactive_users' => 'Neaktívny používatelia',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 44be6053d..91e6dea08 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -253,8 +253,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 45dbb1004..5eddee167 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -258,9 +258,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktivni korisnik',
 'label.inactive_users' => 'Neaktivni korisnik',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index cb30b5e41..fddf70abb 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -254,9 +254,6 @@
 // 'label.file' => 'File',
 'label.active_users' => 'Aktiva användare',
 'label.inactive_users' => 'Inaktiva användare',
-// TODO: translate the following.
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 56c309432..e5c4e5c23 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -277,8 +277,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 6f492d491..157a95727 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -263,8 +263,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f9496eb21..a2c2705ec 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -268,8 +268,6 @@
 // 'label.file' => 'File',
 // 'label.active_users' => 'Active Users',
 // 'label.inactive_users' => 'Inactive Users',
-// 'label.details' => 'Details',
-// 'label.budget' => 'Budget',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
diff --git a/initialize.php b/initialize.php
index db645a9d5..ddbfe2444 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5613");
+define("APP_VERSION", "1.19.34.5614");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From efef96ec94f019afbad9af8cf8b6b0f9e4cefbcf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 15:38:24 +0000
Subject: [PATCH 1635/1848] More cleanup in translation files.

---
 WEB-INF/resources/ca.lang.php    | 16 ----------------
 WEB-INF/resources/cs.lang.php    | 16 ----------------
 WEB-INF/resources/da.lang.php    | 16 ----------------
 WEB-INF/resources/de.lang.php    | 16 ----------------
 WEB-INF/resources/en.lang.php    | 16 ----------------
 WEB-INF/resources/es.lang.php    | 16 ----------------
 WEB-INF/resources/et.lang.php    | 16 ----------------
 WEB-INF/resources/fa.lang.php    | 16 ----------------
 WEB-INF/resources/fi.lang.php    | 16 ----------------
 WEB-INF/resources/fr.lang.php    | 16 ----------------
 WEB-INF/resources/gr.lang.php    | 16 ----------------
 WEB-INF/resources/he.lang.php    | 16 ----------------
 WEB-INF/resources/hu.lang.php    | 16 ----------------
 WEB-INF/resources/it.lang.php    | 16 ----------------
 WEB-INF/resources/ja.lang.php    | 16 ----------------
 WEB-INF/resources/ko.lang.php    | 16 ----------------
 WEB-INF/resources/nl.lang.php    | 15 ---------------
 WEB-INF/resources/no.lang.php    | 16 ----------------
 WEB-INF/resources/pl.lang.php    | 16 ----------------
 WEB-INF/resources/pt-br.lang.php | 15 ---------------
 WEB-INF/resources/pt.lang.php    | 16 ----------------
 WEB-INF/resources/ro.lang.php    | 16 ----------------
 WEB-INF/resources/ru.lang.php    | 15 ---------------
 WEB-INF/resources/sk.lang.php    | 16 ----------------
 WEB-INF/resources/sl.lang.php    | 16 ----------------
 WEB-INF/resources/sr.lang.php    | 16 ----------------
 WEB-INF/resources/sv.lang.php    | 16 ----------------
 WEB-INF/resources/tr.lang.php    | 16 ----------------
 WEB-INF/resources/zh-cn.lang.php | 16 ----------------
 WEB-INF/resources/zh-tw.lang.php | 16 ----------------
 initialize.php                   |  2 +-
 31 files changed, 1 insertion(+), 478 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index fefaad825..0f05c8d73 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -675,20 +675,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index ff237c005..d42f51935 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -688,20 +688,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9a9c532d5..af755d4ae 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -651,20 +651,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 3fea57b73..46cdcb473 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -624,20 +624,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index d82bb75b1..897faa592 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -607,20 +607,4 @@
 'form.display_options.not_complete_days' => 'Not complete days',
 'form.display_options.inactive_projects' => 'Inactive projects',
 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-'work.error.work_not_available' => 'Work item is not available.',
-'work.error.offer_not_available' => 'Offer is not available.',
-'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-'work.label.own_work' => 'Own work',
-'work.label.own_offers' => 'Own offers',
-'work.label.offers' => 'Offers',
-'work.label.message' => 'Message',
-'work.button.send_message' => 'Send message',
-'work.button.make_offer' => 'Make offer',
-'work.button.accept' => 'Accept',
-'work.button.decline' => 'Decline',
-'work.title.send_message' => 'Sending Message',
-'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0f2b8a319..f9a300370 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -690,20 +690,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7137357e7..ad93af7d9 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -659,20 +659,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 085f80ca4..7bf3a9637 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -675,20 +675,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index f3237ff0c..71f401fb0 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -659,20 +659,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5c971ea9b..e56425f58 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -647,20 +647,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index dbbd85dbb..fe89a425d 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -639,20 +639,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index f3cee584a..9c4718bf2 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -680,20 +680,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 08e52d402..d20ff3524 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -679,20 +679,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d9cca113c..253c08545 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -653,20 +653,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 7437648bc..06d452108 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -683,20 +683,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 3454a362c..07603b634 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -681,20 +681,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2c1b7b71b..ac41ea720 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -589,19 +589,4 @@
 'form.display_options.not_complete_days' => 'Niet complete dagen',
 'form.display_options.inactive_projects' => 'Niet actieve projecten',
 'form.display_options.custom_css' => 'Aangepaste CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-'work.error.work_not_available' => 'Werk onderdeel is niet beschikbaar.',
-'work.error.offer_not_available' => 'Aanbod is niet beschikbaar.',
-'work.type.one_time' => 'eenmalig',
-'work.type.ongoing' => 'doorlopend',
-'work.label.own_work' => 'Eigen werk',
-'work.label.own_offers' => 'Eigen aanbod',
-'work.label.offers' => 'Aanbiedingen',
-'work.button.send_message' => 'Verstuur bericht',
-'work.button.make_offer' => 'maak aanbieding',
-'work.button.accept' => 'Accepteer',
-'work.button.decline' => 'Weiger',
-'work.title.send_message' => 'Bericht wordt verstuurd',
-'work.msg.message_sent' => 'Bericht is verstuurd.',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 20f50546d..05b4f16c3 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -682,20 +682,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 84cd8241e..114465b50 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -660,20 +660,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index fbdff5ace..9bdede0da 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -588,20 +588,5 @@
 // TODO: translate the following.
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 'form.display_options.custom_css' => 'CSS customizado',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php.
-'work.error.work_not_available' => 'Item de trabalho não está disponível.',
-'work.error.offer_not_available' => 'Oferta não disponível',
-'work.type.one_time' => 'Uma interação',
-'work.type.ongoing' => 'Em progresso',
-'work.label.own_work' => 'Trabalho próprio',
-'work.label.own_offers' => 'Ofertas próprias',
-'work.label.offers' => 'Ofertas',
-'work.button.send_message' => 'Enviar mensagem',
-'work.button.make_offer' => 'Fazer oferta',
-'work.button.accept' => 'Aceitar',
-'work.button.decline' => 'Recusar',
-'work.title.send_message' => 'Enviando mensagem',
-'work.msg.message_sent' => 'Mensagem enviada.',
 );
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 728c4ba62..25a65270a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -662,20 +662,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index d89e335b3..74f898568 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -683,20 +683,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d16bd99df..a59d7e413 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -590,19 +590,4 @@
 'form.display_options.not_complete_days' => 'Незавершенные дни',
 'form.display_options.inactive_projects' => 'Неактивные проекты',
 'form.display_options.custom_css' => 'Пользовательская CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-'work.error.work_not_available' => 'Работа отсутствует.',
-'work.error.offer_not_available' => 'Предложение отсутствует.',
-'work.type.one_time' => 'одноразовая',
-'work.type.ongoing' => 'постоянная',
-'work.label.own_work' => 'Своя работа',
-'work.label.own_offers' => 'Свои предложения',
-'work.label.offers' => 'Предложения',
-'work.button.send_message' => 'Отправить сообщение',
-'work.button.make_offer' => 'Сделать предложение',
-'work.button.accept' => 'Принять',
-'work.button.decline' => 'Отклонить',
-'work.title.send_message' => 'Отсылка сообщения',
-'work.msg.message_sent' => 'Сообщение отослано.',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 37303bdf7..d09cd1063 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -664,20 +664,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 91e6dea08..98621f355 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -656,20 +656,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5eddee167..1dc547f16 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -662,20 +662,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index fddf70abb..2fa40ce33 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -659,20 +659,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e5c4e5c23..10b582dc2 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -696,20 +696,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 157a95727..6722da048 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -670,20 +670,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a2c2705ec..24bc7b817 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -673,20 +673,4 @@
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.custom_css' => 'Custom CSS',
-
-// Work plugin strings. See example at https://timetracker.anuko.com/work.php
-// TODO: translate the following.
-// 'work.error.work_not_available' => 'Work item is not available.',
-// 'work.error.offer_not_available' => 'Offer is not available.',
-// 'work.type.one_time' => 'one time', // Work type is "one time job" for well defined work ("do exactly this").
-// 'work.type.ongoing' => 'ongoing',   // Work type is "ongoing" for complex jobs (billed by the hour, multiple contractors, etc.)
-// 'work.label.own_work' => 'Own work',
-// 'work.label.own_offers' => 'Own offers',
-// 'work.label.offers' => 'Offers',
-// 'work.button.send_message' => 'Send message',
-// 'work.button.make_offer' => 'Make offer',
-// 'work.button.accept' => 'Accept',
-// 'work.button.decline' => 'Decline',
-// 'work.title.send_message' => 'Sending Message',
-// 'work.msg.message_sent' => 'Message sent.',
 );
diff --git a/initialize.php b/initialize.php
index ddbfe2444..0ec782c6d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5614");
+define("APP_VERSION", "1.19.34.5615");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2a6379743ea1ff38a24062c39610749e9581c9dc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 16:09:52 +0000
Subject: [PATCH 1636/1848] Removed no longer used string from translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 5 -----
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 1 -
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 1 -
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 initialize.php                   | 2 +-
 31 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0f05c8d73..0202a4be0 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -97,7 +97,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d42f51935..6ace11812 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -99,7 +99,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index af755d4ae..b76c65c24 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -94,7 +94,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 46cdcb473..6a11c4054 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -90,7 +90,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 'warn.sure' => 'Sind Sie sicher?',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 897faa592..44a1c2a69 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -86,11 +86,6 @@
 // "something went wrong" when trying to do some operation with attachments.
 // For example, File Storage server could be offline, or Time Tracker config option is wrong, etc.
 'error.file_storage' => 'File storage server error.',
-// Meaning of error.remote_work: an (unspecified) error occurred when trying to communicate with
-// "Remote Work" server, the one that supports the "Work" plugin, see https://www.anuko.com/time_tracker/what_is/work_plugin.htm
-// It is a generic message telling us that "something went wrong" when trying to do some operation with Work plugin.
-// For example, Remote Work server could be offline, among other things.
-'error.remote_work' => 'Remote work server error.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f9a300370..09fe1d9e6 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -95,7 +95,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index ad93af7d9..9cbcf13b5 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -107,7 +107,6 @@
 'error.expired' => 'Kehtivusaeg on lõppenud.',
 // TODO: translate the following.
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 'warn.sure' => 'Oled kindel?',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 7bf3a9637..16fb3e5ad 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -102,7 +102,6 @@
 // 'error.expired' => 'Expiration date reached.',
 // TODO: translate the following.
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 71f401fb0..9c76d646b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -96,7 +96,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e56425f58..5a3017365 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -94,7 +94,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index fe89a425d..e2bd54181 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -89,7 +89,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 9c4718bf2..5fd42b36c 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -110,7 +110,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d20ff3524..e03a684cb 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -98,7 +98,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 253c08545..2e3fd91f5 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -93,7 +93,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 06d452108..c2b509f3e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -101,7 +101,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 07603b634..dc2172408 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -100,7 +100,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ac41ea720..247a3652c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -81,7 +81,6 @@
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
 'error.file_storage' => 'Bestand server probleem.',
-'error.remote_work' => 'Werk op afstand server probleem.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 05b4f16c3..094d6b0a2 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -101,7 +101,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 114465b50..0cb9f69f5 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -98,7 +98,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // 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 9bdede0da..ae860cf1c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -81,7 +81,6 @@
 'error.user_count' => 'Limite na contagem de usuários.',
 'error.expired' => 'Data de expiração atingida.',
 'error.file_storage' => 'Erro relacionado ao servidor de armazenamento de arquivos.',
-'error.remote_work' => 'Erro relacionado ao servidor responsável pelo plugin work.',
 
 // Warning messages.
 'warn.sure' => 'Tem certeza?',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 25a65270a..538dd52f0 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -94,7 +94,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 74f898568..cde5a27d7 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -101,7 +101,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index a59d7e413..c62142727 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -81,7 +81,6 @@
 'error.user_count' => 'Ограничение на количество пользователей.',
 'error.expired' => 'Достигнута дата экспирации.',
 'error.file_storage' => 'Ошибка сервера для хранения файлов.',
-'error.remote_work' => 'Ошибка сервера удаленной работы.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d09cd1063..d74bb3183 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -99,7 +99,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 98621f355..f615e431f 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -91,7 +91,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1dc547f16..7bb9edbe8 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -95,7 +95,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 2fa40ce33..dce2488b3 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -93,7 +93,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 10b582dc2..c154a3a41 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -104,7 +104,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // 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 6722da048..a2e6bf285 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -94,7 +94,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // 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 24bc7b817..69121475b 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -98,7 +98,6 @@
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
 // 'error.file_storage' => 'File storage server error.', // See comment in English file.
-// 'error.remote_work' => 'Remote work server error.',   // See comment in English file.
 
 // Warning messages.
 // TODO: translate the following.
diff --git a/initialize.php b/initialize.php
index 0ec782c6d..7825bbe59 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5615");
+define("APP_VERSION", "1.19.34.5616");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 46fa236d1a379935b89bd218af2190a1691d3e10 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 16:45:01 +0000
Subject: [PATCH 1637/1848] Removed no longer used titles from translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 16 ----------------
 WEB-INF/resources/cs.lang.php    | 16 ----------------
 WEB-INF/resources/da.lang.php    | 16 ----------------
 WEB-INF/resources/de.lang.php    | 16 ----------------
 WEB-INF/resources/en.lang.php    | 16 ----------------
 WEB-INF/resources/es.lang.php    | 16 ----------------
 WEB-INF/resources/et.lang.php    | 16 ----------------
 WEB-INF/resources/fa.lang.php    | 16 ----------------
 WEB-INF/resources/fi.lang.php    | 16 ----------------
 WEB-INF/resources/fr.lang.php    | 16 ----------------
 WEB-INF/resources/gr.lang.php    | 16 ----------------
 WEB-INF/resources/he.lang.php    | 16 ----------------
 WEB-INF/resources/hu.lang.php    | 16 ----------------
 WEB-INF/resources/it.lang.php    | 16 ----------------
 WEB-INF/resources/ja.lang.php    | 16 ----------------
 WEB-INF/resources/ko.lang.php    | 16 ----------------
 WEB-INF/resources/nl.lang.php    | 16 ----------------
 WEB-INF/resources/no.lang.php    | 16 ----------------
 WEB-INF/resources/pl.lang.php    | 16 ----------------
 WEB-INF/resources/pt-br.lang.php | 16 ----------------
 WEB-INF/resources/pt.lang.php    | 16 ----------------
 WEB-INF/resources/ro.lang.php    | 16 ----------------
 WEB-INF/resources/ru.lang.php    | 16 ----------------
 WEB-INF/resources/sk.lang.php    | 16 ----------------
 WEB-INF/resources/sl.lang.php    | 16 ----------------
 WEB-INF/resources/sr.lang.php    | 16 ----------------
 WEB-INF/resources/sv.lang.php    | 16 ----------------
 WEB-INF/resources/tr.lang.php    | 16 ----------------
 WEB-INF/resources/zh-cn.lang.php | 16 ----------------
 WEB-INF/resources/zh-tw.lang.php | 16 ----------------
 initialize.php                   |  2 +-
 31 files changed, 1 insertion(+), 481 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 0202a4be0..6a9290041 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -378,22 +378,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 6ace11812..15da342d5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -388,22 +388,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index b76c65c24..d357a3b3e 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -362,22 +362,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6a11c4054..259f6c55c 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -345,22 +345,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 44a1c2a69..8867e8c29 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -331,22 +331,6 @@
 'title.edit_file' => 'Editing File',
 'title.delete_file' => 'Deleting File',
 'title.download_file' => 'Downloading File',
-'title.work' => 'Work',
-'title.add_work' => 'Adding Work',
-'title.edit_work' => 'Editing Work',
-'title.delete_work' => 'Deleting Work',
-'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-'title.available_work' => 'Available Work', // Available work items from other organizations.
-'title.inactive_work' => 'Inactive Work', // Inactive work items for group.
-'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-'title.offer' => 'Offer',
-'title.add_offer' => 'Adding Offer',
-'title.edit_offer' => 'Editing Offer',
-'title.delete_offer' => 'Deleting Offer',
-'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 09fe1d9e6..25c94b896 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -377,22 +377,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 9cbcf13b5..0f0d1448c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -371,22 +371,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 16fb3e5ad..831e9228b 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -371,22 +371,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9c76d646b..bbb33f37b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -362,22 +362,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5a3017365..443ace913 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -356,22 +356,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index e2bd54181..229d94eb2 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -354,22 +354,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5fd42b36c..5431e0513 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -378,22 +378,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e03a684cb..d1a093baa 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -377,22 +377,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2e3fd91f5..1afc09eb6 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -364,22 +364,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index c2b509f3e..93ab30e43 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -384,22 +384,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dc2172408..6ca74cf65 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -385,22 +385,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 247a3652c..ae1df70d6 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -323,22 +323,6 @@
 'title.edit_file' => 'Bestand bewerken',
 'title.delete_file' => 'Bestand verwijderen',
 'title.download_file' => ' Bestand downloaden',
-'title.work' => 'Werk',
-'title.add_work' => 'Werk toevoegen',
-'title.edit_work' => 'Werk bewerken',
-'title.delete_work' => 'Werk verwijderen',
-'title.active_work' => 'Actief werk',
-'title.available_work' => 'Beschikbaar werk',
-'title.inactive_work' => 'Inactief werk',
-'title.pending_work' => 'Werk in afwachting van goedkeuring',
-'title.offer' => 'Aanbod',
-'title.add_offer' => 'Aanbieding toevoegen',
-'title.edit_offer' => 'Aanbieding bewerken',
-'title.delete_offer' => 'Aanbieding verwijderen',
-'title.active_offers' => 'Actieve aanbiedingen',
-'title.available_offers' => 'Beschikbare aanbiedingen',
-'title.inactive_offers' => 'Inactieve aanbiedingen',
-'title.pending_offers' => 'Aangeboden werk in afwachting van goedkeuring',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 094d6b0a2..5b6780779 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -381,22 +381,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 0cb9f69f5..970acaf1e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -365,22 +365,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ae860cf1c..b46a54a89 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -321,22 +321,6 @@
 'title.edit_file' => 'Editando arquivo',
 'title.delete_file' => 'Apagando arquivo',
 'title.download_file' => 'Baixando arquivo',
-'title.work' => 'Trabalho',
-'title.add_work' => 'Adicionando trabalho',
-'title.edit_work' => 'Editando trabalho',
-'title.delete_work' => 'Apagando trabalho',
-'title.active_work' => 'Trabalho ativo',
-'title.available_work' => 'Trabalho disponível',
-'title.inactive_work' => 'Trabalho inativo',
-'title.pending_work' => 'Trabalho pendente',
-'title.offer' => 'Oferta',
-'title.add_offer' => 'Adicionando oferta',
-'title.edit_offer' => 'Editando oferta',
-'title.delete_offer' => 'Apagando oferta',
-'title.active_offers' => 'Ofertas ativas',
-'title.available_offers' => 'Ofertas disponíveis',
-'title.inactive_offers' => 'Ofertas inativas',
-'title.pending_offers' => 'Ofertas pendentes',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 538dd52f0..1fb18ea17 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -365,22 +365,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cde5a27d7..f5bdba763 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -383,22 +383,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.add_offer' => 'Adding Offer',
-// 'title.offer' => 'Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c62142727..8171ba517 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -324,22 +324,6 @@
 'title.edit_file' => 'Редактирование файла',
 'title.delete_file' => 'Удаление файла',
 'title.download_file' => 'Скачивание файла',
-'title.work' => 'Работа',
-'title.add_work' => 'Добавление работы',
-'title.edit_work' => 'Редактирование работы',
-'title.delete_work' => 'Удаление работы',
-'title.active_work' => 'Активная работа',
-'title.available_work' => 'Имеющаяся работа',
-'title.inactive_work' => 'Неактивная работа',
-'title.pending_work' => 'Работа в ожидании',
-'title.offer' => 'Предложение',
-'title.add_offer' => 'Добавление предложения',
-'title.edit_offer' => 'Редактирование предложения',
-'title.delete_offer' => 'Удаление предложения',
-'title.active_offers' => 'Активные предложения',
-'title.available_offers' => 'Имеющиеся предложения',
-'title.inactive_offers' => 'Неактивные предложения',
-'title.pending_offers' => 'Предложения в ожидании',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d74bb3183..ab601e945 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -367,22 +367,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index f615e431f..b8f7e9407 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -358,22 +358,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7bb9edbe8..bc98a1d33 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -363,22 +363,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index dce2488b3..d977a9a2e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -363,22 +363,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c154a3a41..dc8bd0736 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -392,22 +392,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a2e6bf285..50cff7bcc 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -374,22 +374,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 69121475b..8bc481b9e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -378,22 +378,6 @@
 // 'title.edit_file' => 'Editing File',
 // 'title.delete_file' => 'Deleting File',
 // 'title.download_file' => 'Downloading File',
-// 'title.work' => 'Work',
-// 'title.add_work' => 'Adding Work',
-// 'title.edit_work' => 'Editing Work',
-// 'title.delete_work' => 'Deleting Work',
-// 'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
-// 'title.available_work' => 'Available Work', // Available work items from other organizations.
-// 'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
-// 'title.pending_work' => 'Pending Work', // Work items pending moderator approval.
-// 'title.offer' => 'Offer',
-// 'title.add_offer' => 'Adding Offer',
-// 'title.edit_offer' => 'Editing Offer',
-// 'title.delete_offer' => 'Deleting Offer',
-// 'title.active_offers' => 'Active Offers', // Active offers this group makes available to other groups.
-// 'title.available_offers' => 'Available Offers', // Available offers from other organizations.
-// 'title.inactive_offers' => 'Inactive Offers', // Inactive offers for group.
-// 'title.pending_offers' => 'Pending Offers', // Offers pending moderator approval.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
diff --git a/initialize.php b/initialize.php
index 7825bbe59..07344a419 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5616");
+define("APP_VERSION", "1.19.34.5617");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From cb7c7934259f96399c6fc14c25311c9430fd75a7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 17:59:14 +0000
Subject: [PATCH 1638/1848] Removed 3 unused strings from translation files.

---
 WEB-INF/resources/ca.lang.php    | 3 ---
 WEB-INF/resources/cs.lang.php    | 4 ----
 WEB-INF/resources/da.lang.php    | 3 ---
 WEB-INF/resources/de.lang.php    | 3 ---
 WEB-INF/resources/en.lang.php    | 3 ---
 WEB-INF/resources/es.lang.php    | 3 ---
 WEB-INF/resources/et.lang.php    | 3 ---
 WEB-INF/resources/fa.lang.php    | 3 ---
 WEB-INF/resources/fi.lang.php    | 3 ---
 WEB-INF/resources/fr.lang.php    | 3 ---
 WEB-INF/resources/gr.lang.php    | 3 ---
 WEB-INF/resources/he.lang.php    | 3 ---
 WEB-INF/resources/hu.lang.php    | 3 ---
 WEB-INF/resources/it.lang.php    | 3 ---
 WEB-INF/resources/ja.lang.php    | 5 -----
 WEB-INF/resources/ko.lang.php    | 5 -----
 WEB-INF/resources/nl.lang.php    | 3 ---
 WEB-INF/resources/no.lang.php    | 3 ---
 WEB-INF/resources/pl.lang.php    | 3 ---
 WEB-INF/resources/pt-br.lang.php | 3 ---
 WEB-INF/resources/pt.lang.php    | 4 ----
 WEB-INF/resources/ro.lang.php    | 3 ---
 WEB-INF/resources/ru.lang.php    | 3 ---
 WEB-INF/resources/sk.lang.php    | 3 ---
 WEB-INF/resources/sl.lang.php    | 3 ---
 WEB-INF/resources/sr.lang.php    | 3 ---
 WEB-INF/resources/sv.lang.php    | 3 ---
 WEB-INF/resources/tr.lang.php    | 3 ---
 WEB-INF/resources/zh-cn.lang.php | 3 ---
 WEB-INF/resources/zh-tw.lang.php | 3 ---
 initialize.php                   | 2 +-
 31 files changed, 1 insertion(+), 97 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6a9290041..196a4441d 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -214,9 +214,6 @@
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* camps requerits',
 'label.on_behalf' => 'a nom de',
-'label.role_manager' => '(manejador)',
-'label.role_comanager' => '(auxiliar del manejador)',
-'label.role_admin' => '(administrador)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 15da342d5..a30d83c89 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -224,10 +224,6 @@
 'label.required_fields' => '* nutno vyplnit',
 // TODO: translate the following.
 // 'label.on_behalf' => 'on behalf of',
-'label.role_manager' => '(manažer)',
-'label.role_comanager' => '(spolumanažer)',
-'label.role_admin' => '(administrator)',
-// TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d357a3b3e..369c965f4 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -207,9 +207,6 @@
 'label.ldap_hint' => 'Skriv dit <b>Windows brugernavn</b> eller <b>adgangskode</b> i felterne her under.',
 'label.required_fields' => '* - obligatorisk felt',
 'label.on_behalf' => 'på vegne af',
-'label.role_manager' => '(Manager)',
-'label.role_comanager' => '(Co-Manager)',
-'label.role_admin' => '(Administrator)',
 'label.page' => 'Side',
 'label.condition' => 'Betingelse',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 259f6c55c..87f40c849 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -201,9 +201,6 @@
 'label.ldap_hint' => 'Geben Sie unten Ihren <b>Windows Benutzernamen</b> und Ihr <b>Passwort</b> ein.',
 'label.required_fields' => '* - Pflichtfelder',
 'label.on_behalf' => 'für',
-'label.role_manager' => '(Manager)',
-'label.role_comanager' => '(Co-Manager)',
-'label.role_admin' => '(Administrator)',
 'label.page' => 'Seite',
 'label.condition' => 'Bedingung',
 'label.yes' => 'Ja',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 8867e8c29..0d82650c8 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -189,9 +189,6 @@
 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* - required fields',
 'label.on_behalf' => 'on behalf of',
-'label.role_manager' => '(manager)',
-'label.role_comanager' => '(co-manager)',
-'label.role_admin' => '(administrator)',
 'label.page' => 'Page',
 'label.condition' => 'Condition',
 'label.yes' => 'yes',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 25c94b896..68dcc8c31 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -218,9 +218,6 @@
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* - campos requeridos',
 'label.on_behalf' => 'a nombre de',
-'label.role_manager' => '(manejador)',
-'label.role_comanager' => '(auxiliar del manejador)',
-'label.role_admin' => '(administrador)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0f0d1448c..431f29563 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -216,9 +216,6 @@
 'label.required_fields' => '* nõutud väljad',
 // TODO: Translate label.on_behalf, perhaps trying as "instead of".
 // 'label.on_behalf' => 'on behalf of',
-'label.role_manager' => '(haldur)',
-'label.role_comanager' => '(kaashaldur)',
-'label.role_admin' => '(administraator)',
 'label.page' => 'Lehekülg',
 'label.condition' => 'Tingimus',
 'label.yes' => 'jah',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 831e9228b..9ae24d016 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -218,9 +218,6 @@
 'label.ldap_hint' => '<b>نام کاربری ویندوز</b>و <b>رمزعبور</b>خود را در فیلدهای زیر وارد کنید',
 'label.required_fields' => '* - فیلد های اجباری',
 'label.on_behalf' => 'از دیدگاه',
-'label.role_manager' => '(مدیر)',
-'label.role_comanager' => '(دستیار مدیر)',
-'label.role_admin' => '(مدیر ارشد)',
 // Translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index bbb33f37b..a9396eba9 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -210,9 +210,6 @@
 'label.ldap_hint' => 'Syötä <b>Windows-käyttäjätunnuksesi</b> ja <b>salasanasi</b> ao. kenttiin.',
 'label.required_fields' => '* - pakolliset kentät',
 'label.on_behalf' => 'puolesta',
-'label.role_manager' => '(esimies)',
-'label.role_comanager' => '(apu-esimies)',
-'label.role_admin' => '(ylläpitäjä)',
 'label.page' => 'Sivu',
 // TODO: translate the following.
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 443ace913..91e04d793 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -206,9 +206,6 @@
 'label.ldap_hint' => 'Entrer votre <b>Identifiant Windows</b> et <b>votre mot de passe</b> dans les champs suivants.',
 'label.required_fields' => '* - champs obligatoires',
 'label.on_behalf' => 'de la part de',
-'label.role_manager' => '(responsable)',
-'label.role_comanager' => '(coresponsable)',
-'label.role_admin' => '(administrateur)',
 'label.page' => 'Page',
 'label.condition' => 'Condition',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 229d94eb2..1fd83890f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -200,9 +200,6 @@
 'label.ldap_hint' => 'Εισάγετε το <b>όνομα σύνδεσης των Windows</b> και <b>κωδικό πρόσβασης</b> στα παρακάτω πεδία.',
 'label.required_fields' => '* - υποχρεωτικά πεδία',
 'label.on_behalf' => 'εκ μέρους του',
-'label.role_manager' => '(Διευθυντής)',
-'label.role_comanager' => '(Υποδιευθυντής)',
-'label.role_admin' => '(Διαχειριστής)',
 'label.page' => 'Σελίδα',
 'label.condition' => 'Κατάσταση',
 'label.yes' => 'ναι',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5431e0513..ef7597cd3 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -226,9 +226,6 @@
 'label.ldap_hint' => 'הכנס את <b>שם המשתמש</b> ואת <b>הסיסמה</b> של ווינדוז בשדות.',
 'label.required_fields' => '* - שדות חובה',
 'label.on_behalf' => 'מטעם',
-'label.role_manager' => '(מנהל)',
-'label.role_comanager' => '(מנהל משנה)',
-'label.role_admin' => '(מנהל המערכת)',
 // Translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d1a093baa..1c446ac53 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -221,9 +221,6 @@
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* kötelezően kitöltendő mezők',
 'label.on_behalf' => 'helyett',
-'label.role_manager' => '(vezető)',
-'label.role_comanager' => '(helyettes)',
-'label.role_admin' => '(adminisztrátor)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 1afc09eb6..e3d19aa5f 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -204,9 +204,6 @@
 'label.ldap_hint' => 'Digita il tuo <b>Login Windows</b> e la tua <b>password</b> nei campi qui sotto.',
 'label.required_fields' => '* campi obbligatori',
 'label.on_behalf' => 'a favore di',
-'label.role_manager' => '(manager)',
-'label.role_comanager' => '(co-manager)',
-'label.role_admin' => '(amministratore)',
 'label.page' => 'Pagina',
 'label.condition' => 'Condizione',
 'label.yes' => 'si',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 93ab30e43..aa2389788 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -223,11 +223,6 @@
 'label.ldap_hint' => '下記のフィールドにあなたの<b>WindowsのログインID</b>と<b>パスワード</b>を入力してください。',
 'label.required_fields' => '* 必須のフィールド',
 'label.on_behalf' => 'を代表して',
-// TODO: translate all 3 roles properly, see https://www.anuko.com/time_tracker/user_guide/user_accounts.htm
-// This may require different terms for role_manager and role_comanager.
-'label.role_manager' => '(管理者)',
-'label.role_comanager' => '(共同管理者)',
-// 'label.role_admin' => '(administrator)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6ca74cf65..cc52c1108 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -222,11 +222,6 @@
 'label.ldap_hint' => '아래의 필드들에서 <b>Windows 로그인</b> 및 <b>암호</b> 를 입력하십시오.',
 'label.required_fields' => '* 필수 필드',
 'label.on_behalf' => '을 대표하여',
-// TODO: translate all 3 roles properly, see https://www.anuko.com/time_tracker/user_guide/user_accounts.htm
-// This may require different terms for role_manager and role_comanager.
-'label.role_manager' => '(관리자)',
-'label.role_comanager' => '(공동관리자)',
-// 'label.role_admin' => '(administrator)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ae1df70d6..360ddd802 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -184,9 +184,6 @@
 'label.ldap_hint' => 'Type uw <b>Windows login</b> en <b>wachtwoord</b> in de onderstaande velden.',
 'label.required_fields' => '* - verplichte velden',
 'label.on_behalf' => 'namens',
-'label.role_manager' => '(manager)',
-'label.role_comanager' => '(co-manager)',
-'label.role_admin' => '(beheerder)',
 'label.page' => 'Pagina',
 'label.condition' => 'Voorwaarde',
 'label.yes' => 'ja',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5b6780779..8202b4e9f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -224,9 +224,6 @@
 'label.required_fields' => '* obligatoriske felt',
 'label.on_behalf' => 'på vegne av',
 // TODO: translate the following.
-// 'label.role_manager' => '(manager)',
-// 'label.role_comanager' => '(co-manager)',
-// 'label.role_admin' => '(administrator)',
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 970acaf1e..ad4ec2c3d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -212,9 +212,6 @@
 'label.ldap_hint' => 'Wpisz swoją <b> nazwę użytkownika Windows<b> i <b>hasło<b> w polach poniżej.',
 'label.required_fields' => '* - pola wymagane',
 'label.on_behalf' => 'w imieniu',
-'label.role_manager' => '(Manager)',
-'label.role_comanager' => '(Co-manager)',
-'label.role_admin' => '(Administrator)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b46a54a89..3b8ceccf3 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -185,9 +185,6 @@
 'label.ldap_hint' => 'Entre com o seu <b>login do Windows</b> e <b>senha</b> nos campos abaixo.',
 'label.required_fields' => '* - campos obrigatórios',
 'label.on_behalf' => 'em nome de',
-'label.role_manager' => '(gerente)',
-'label.role_comanager' => '(coordenador)',
-'label.role_admin' => '(administrador)',
 'label.page' => 'Página',
 'label.condition' => 'Condição',
 'label.yes' => 'sim',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 1fb18ea17..4b6db659e 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -212,10 +212,6 @@
 'label.required_fields' => '* campos obrigatórios',
 // TODO: translate the following.
 // 'label.on_behalf' => 'on behalf of',
-'label.role_manager' => '(gerente)',
-// TODO: translate the following.
-// 'label.role_comanager' => '(co-manager)',
-// 'label.role_admin' => '(administrator)',
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f5bdba763..fc8c9a8f8 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -222,9 +222,6 @@
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* date obligatorii',
 'label.on_behalf' => 'in numele',
-'label.role_manager' => '(manager)',
-'label.role_comanager' => '(co-manager)',
-'label.role_admin' => '(administrator)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 8171ba517..e052ba818 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -184,9 +184,6 @@
 'label.ldap_hint' => 'Введите свои <b>Windows логин</b> и <b>пароль</b> в поля ниже.',
 'label.required_fields' => '* - обязательные для заполнения поля',
 'label.on_behalf' => 'от имени',
-'label.role_manager' => '(менеджер)',
-'label.role_comanager' => '(ассистент менеджера)',
-'label.role_admin' => '(администратор)',
 'label.page' => 'Стр',
 'label.condition' => 'Условие',
 'label.yes' => 'да',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ab601e945..6eb804d20 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -214,9 +214,6 @@
 'label.ldap_hint' => 'Zadajte <b>prihlasovacie meno do Windowsu</b> a <b>heslo</b> do polí nižšie.',
 'label.required_fields' => '* - povinné polia',
 'label.on_behalf' => 'v zastúpení',
-'label.role_manager' => '(manažér)',
-'label.role_comanager' => '(spolu-manažér)',
-'label.role_admin' => '(administrátor)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b8f7e9407..1703ba75d 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -208,9 +208,6 @@
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 // 'label.required_fields' => '* - required fields',
 // 'label.on_behalf' => 'on behalf of',
-// 'label.role_manager' => '(manager)',
-// 'label.role_comanager' => '(co-manager)',
-// 'label.role_admin' => '(administrator)',
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
 // 'label.yes' => 'yes',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index bc98a1d33..fac94f100 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -209,9 +209,6 @@
 'label.ldap_hint' => 'Unesi tvoju <b>Windows prijavu</b> i <b>lozinku</b> u polje ispod.',
 'label.required_fields' => '* - obavezna polja',
 'label.on_behalf' => 'ispred',
-'label.role_manager' => '(menadžer)',
-'label.role_comanager' => '(saradnik)',
-'label.role_admin' => '(administrator)',
 'label.page' => 'Strana',
 // TODO: translate the following.
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d977a9a2e..64311d4ad 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -205,9 +205,6 @@
 'label.ldap_hint' => 'Fyll i ditt <b>användarnamn och lösenord för Windows</b> i fälten nedan.',
 'label.required_fields' => '* - Obligatoriska fält',
 'label.on_behalf' => 'agerar som',
-'label.role_manager' => '(Ansvarig)',
-'label.role_comanager' => '(Delansvarig)',
-'label.role_admin' => '(Administratör)',
 'label.page' => 'Sida',
 'label.condition' => 'Villkor',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index dc8bd0736..a41fda46c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -229,9 +229,6 @@
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* zorunlu bilgi',
 'label.on_behalf' => 'adına',
-'label.role_manager' => '(yönetici)',
-'label.role_comanager' => '(yardımcı yönetici)',
-'label.role_admin' => '(sistem yönetici)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 50cff7bcc..e6df6346f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -216,9 +216,6 @@
 'label.ldap_hint' => '在下面的栏目输入您的<b>Windows用户名</b>和<b>密码</b>。',
 'label.required_fields' => '* 必填栏目',
 'label.on_behalf' => '代表',
-'label.role_manager' => '(经理)',
-'label.role_comanager' => '(合作经理人)',
-'label.role_admin' => '(管理员)',
 'label.page' => '页码',
 // TODO: translate the following.
 // 'label.condition' => 'Condition',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 8bc481b9e..353ca1fdf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -221,9 +221,6 @@
 'label.ldap_hint' => '在下麵的欄目輸入您的<b>Windows用戶名</b>和<b>密碼</b>。',
 'label.required_fields' => '* 必填欄目',
 'label.on_behalf' => '代表',
-'label.role_manager' => '(經理)',
-'label.role_comanager' => '(合作經理人)',
-'label.role_admin' => '(管理員)',
 // TODO: translate the following.
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
diff --git a/initialize.php b/initialize.php
index 07344a419..d2596211c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5617");
+define("APP_VERSION", "1.19.34.5618");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 63fbf04bc85853a1c8a43edfb710009b6531bcce Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Jan 2022 18:08:42 +0000
Subject: [PATCH 1639/1848] Removed no longer used string from translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 -
 WEB-INF/resources/cs.lang.php    | 1 -
 WEB-INF/resources/da.lang.php    | 1 -
 WEB-INF/resources/de.lang.php    | 1 -
 WEB-INF/resources/en.lang.php    | 1 -
 WEB-INF/resources/es.lang.php    | 1 -
 WEB-INF/resources/et.lang.php    | 1 -
 WEB-INF/resources/fa.lang.php    | 1 -
 WEB-INF/resources/fi.lang.php    | 1 -
 WEB-INF/resources/fr.lang.php    | 1 -
 WEB-INF/resources/gr.lang.php    | 1 -
 WEB-INF/resources/he.lang.php    | 1 -
 WEB-INF/resources/hu.lang.php    | 1 -
 WEB-INF/resources/it.lang.php    | 1 -
 WEB-INF/resources/ja.lang.php    | 1 -
 WEB-INF/resources/ko.lang.php    | 1 -
 WEB-INF/resources/nl.lang.php    | 1 -
 WEB-INF/resources/no.lang.php    | 1 -
 WEB-INF/resources/pl.lang.php    | 1 -
 WEB-INF/resources/pt-br.lang.php | 1 -
 WEB-INF/resources/pt.lang.php    | 1 -
 WEB-INF/resources/ro.lang.php    | 1 -
 WEB-INF/resources/ru.lang.php    | 1 -
 WEB-INF/resources/sk.lang.php    | 1 -
 WEB-INF/resources/sl.lang.php    | 1 -
 WEB-INF/resources/sr.lang.php    | 1 -
 WEB-INF/resources/sv.lang.php    | 1 -
 WEB-INF/resources/tr.lang.php    | 1 -
 WEB-INF/resources/zh-cn.lang.php | 1 -
 WEB-INF/resources/zh-tw.lang.php | 1 -
 initialize.php                   | 2 +-
 31 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 196a4441d..6b74dced4 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -407,7 +407,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a30d83c89..836ef4f28 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -414,7 +414,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 369c965f4..bc042b6e5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -391,7 +391,6 @@
 'dropdown.delete' => 'Slet',
 'dropdown.do_not_delete' => 'Slet ikke',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 87f40c849..dae614fbc 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -372,7 +372,6 @@
 'dropdown.delete' => 'löschen',
 'dropdown.do_not_delete' => 'nicht löschen',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'bezahlt',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0d82650c8..652c3e484 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -356,7 +356,6 @@
 'dropdown.status_inactive' => 'inactive',
 'dropdown.delete' => 'delete',
 'dropdown.do_not_delete' => 'do not delete',
-'dropdown.pending_approval' => 'pending approval',
 'dropdown.approved' => 'approved',
 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 68dcc8c31..f2bb893ba 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -406,7 +406,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 431f29563..67210ee66 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -398,7 +398,6 @@
 'dropdown.delete' => 'kustuta',
 'dropdown.do_not_delete' => 'ära kustuta',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'makstud',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9ae24d016..31c1506fe 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -403,7 +403,6 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index a9396eba9..c0d712667 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -391,7 +391,6 @@
 'dropdown.delete' => 'poista',
 'dropdown.do_not_delete' => 'älä poista',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 91e04d793..61570ee8c 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -383,7 +383,6 @@
 'dropdown.delete' => 'supprimer',
 'dropdown.do_not_delete' => 'ne pas supprimer',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 1fd83890f..c795c5073 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -381,7 +381,6 @@
 'dropdown.delete' => 'διαγραφή',
 'dropdown.do_not_delete' => 'μη το διαγράψετε',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'εξοφλημένο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ef7597cd3..72a48ba5d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -408,7 +408,6 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 1c446ac53..8b1e0b348 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -408,7 +408,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e3d19aa5f..90167eb26 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -391,7 +391,6 @@
 'dropdown.delete' => 'elimina',
 'dropdown.do_not_delete' => 'non eliminare',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'pagato',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index aa2389788..d0bad574e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -408,7 +408,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index cc52c1108..3e62d9d2d 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -412,7 +412,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 360ddd802..dc86183ac 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -348,7 +348,6 @@
 'dropdown.status_inactive' => 'inactief',
 'dropdown.delete' => 'verwijderen',
 'dropdown.do_not_delete' => 'niet verwijderen',
-'dropdown.pending_approval' => 'in afwachting van goedkeuring',
 'dropdown.approved' => 'goedgekeurd',
 'dropdown.not_approved' => 'afgekeurd',
 'dropdown.paid' => 'betaald',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8202b4e9f..598950581 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -410,7 +410,6 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index ad4ec2c3d..c826441f3 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -394,7 +394,6 @@
 'dropdown.delete' => 'usuń',
 'dropdown.do_not_delete' => 'nie usuwaj',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 3b8ceccf3..ba2ed1d73 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -346,7 +346,6 @@
 'dropdown.status_inactive' => 'inativo',
 'dropdown.delete' => 'apagar',
 'dropdown.do_not_delete' => 'não apagar',
-'dropdown.pending_approval' => 'aprovação pendente',
 'dropdown.approved' => 'aprovado',
 'dropdown.not_approved' => 'não aprovado',
 'dropdown.paid' => 'pago',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 4b6db659e..cac4c68e8 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -392,7 +392,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index fc8c9a8f8..1d97b1fed 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -413,7 +413,6 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e052ba818..20d7d7e60 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -349,7 +349,6 @@
 'dropdown.status_inactive' => 'неактивный',
 'dropdown.delete' => 'удалить',
 'dropdown.do_not_delete' => 'не удалять',
-'dropdown.pending_approval' => 'в ожидании одобрения',
 'dropdown.approved' => 'одобрено',
 'dropdown.not_approved' => 'не одобрено',
 'dropdown.paid' => 'оплачено',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 6eb804d20..89f26abde 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -397,7 +397,6 @@
 // TODO: translate the following.
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 1703ba75d..56eeb2050 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -385,7 +385,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index fac94f100..c88e9d07c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -392,7 +392,6 @@
 'dropdown.delete' => 'obriši',
 'dropdown.do_not_delete' => 'nemoj obrisati',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 64311d4ad..36c0a325c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -390,7 +390,6 @@
 'dropdown.delete' => 'Ta bort',
 'dropdown.do_not_delete' => 'Ta inte bort',
 // TODO: translate the following.
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a41fda46c..2e5bed2bb 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -421,7 +421,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index e6df6346f..b1c0667b3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -402,7 +402,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 353ca1fdf..5212a3f80 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -406,7 +406,6 @@
 // 'dropdown.status_inactive' => 'inactive',
 // 'dropdown.delete' => 'delete',
 // 'dropdown.do_not_delete' => 'do not delete',
-// 'dropdown.pending_approval' => 'pending approval',
 // 'dropdown.approved' => 'approved',
 // 'dropdown.not_approved' => 'not approved',
 // 'dropdown.paid' => 'paid',
diff --git a/initialize.php b/initialize.php
index d2596211c..8b24ed417 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5618");
+define("APP_VERSION", "1.19.34.5619");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e0201c7924628b3727cb63b7e4b43d5f284f4326 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 26 Jan 2022 14:33:39 +0000
Subject: [PATCH 1640/1848] Updated database structure after removing remote
 work plugin.

---
 WEB-INF/lib/ttRoleHelper.class.php |  4 +--
 dbinstall.php                      | 13 +++++++---
 initialize.php                     |  2 +-
 mysql.sql                          | 40 ++----------------------------
 4 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 683f7ebaf..1ddc839cc 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -168,8 +168,8 @@ static function createPredefinedRoles($group_id, $lang)
 
     $rights_client = 'view_client_reports,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles,update_work';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_work,bid_on_work';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups';
 
     // Active roles.
diff --git a/dbinstall.php b/dbinstall.php
index 2dfe30d66..c966bdbaa 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1137,7 +1137,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to11929"]) {
+  if ($_POST["convert11900to12000"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1172,6 +1172,11 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.23', modified = now() where param_name = 'version_db' and param_value = '1.19.22'");
     ttExecute("ALTER TABLE `tt_groups` ADD `entities_modified` datetime default NULL AFTER `modified_by`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.29', modified = now() where param_name = 'version_db' and param_value = '1.19.23'");
+    ttExecute("DROP TABLE `tt_work_currencies`");
+    ttExecute("DROP TABLE `tt_work_categories`");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.19.29') set rights = replace(rights, 'swap_roles,update_work', 'swap_roles') where `rank` >= 12");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.19.29') set rights = replace(rights, 'view_all_reports,manage_work,bid_on_work', 'view_all_reports') where `rank` >= 68");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.20.0', modified = now() where param_name = 'version_db' and param_value = '1.19.29'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1222,7 +1227,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.19.29)</b>
+    <td width="80%"><b>Create database structure (v1.20.0)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1271,8 +1276,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.19.29)</td>
-    <td><input type="submit" name="convert11900to11929" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.20)</td>
+    <td><input type="submit" name="convert11900to12000" value="Update"></td>
   </tr>
 </table>
 
diff --git a/initialize.php b/initialize.php
index 8b24ed417..e0a6999eb 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.19.34.5619");
+define("APP_VERSION", "1.20.0.5620");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mysql.sql b/mysql.sql
index 7a87b3766..55d8e8b5c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -78,7 +78,7 @@ create unique index role_idx on tt_roles(group_id, `rank`, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,update_work,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_work,bid_on_work,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -608,42 +608,6 @@ CREATE TABLE `tt_files` (
 );
 
 
-#
-# Structure for table tt_work_currencies.
-# This table keeps currencies supported by remote work plugin.
-#
-CREATE TABLE `tt_work_currencies` (
-  `id` int(10) unsigned NOT NULL,    # currency id
-  `name` varchar(10) NOT NULL,       # currency name (USD, CAD, etc.)
-  PRIMARY KEY  (`id`)
-);
-
-# Create an index that guarantees unique work currencies.
-create unique index currency_idx on tt_work_currencies(`name`);
-
-INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD');
-
-
-#
-# Structure for table tt_work_categories.
-# This table keeps work categories supported by remote work plugin.
-#
-CREATE TABLE `tt_work_categories` (
-  `id` int(10) unsigned NOT NULL,     # Category id.
-  `parents` text default NULL,        # Comma-separated list of parent ids associated with this category.
-  `name` varchar(64) NOT NULL,        # English category name.
-  `name_localized` text default NULL, # Comma-separated list of localized category names in other languages.
-                                      # Example: es:Codificación,ru:Кодирование.
-  PRIMARY KEY  (`id`)
-);
-
-# Insert some default categories. Table content to be updated at run time, though.
-INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('1', NULL, 'Coding', 'es:Codificación,ru:Кодирование');
-INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('2', NULL, 'Other', 'es:Otra,ru:Другое');
-INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('3', '1', 'PHP', NULL);
-INSERT INTO `tt_work_categories` (`id`, `parents`, `name`, `name_localized`) VALUES ('4', '1', 'C/C++', NULL);
-
-
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
@@ -657,4 +621,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.29', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.20.0', now()); # TODO: change when structure changes.

From beb0be399e413bc1ade1d5da86f259154c9782e1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 4 Feb 2022 22:54:34 +0000
Subject: [PATCH 1641/1848] Remove no longer needed file.

---
 initialize.php             |  3 ++-
 plugins/work_constants.php | 36 ------------------------------------
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 plugins/work_constants.php

diff --git a/initialize.php b/initialize.php
index e0a6999eb..73f4e7581 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,8 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5620");
+define("APP_VERSION", "1.20.0.5621"
+        . "");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/work_constants.php b/plugins/work_constants.php
deleted file mode 100644
index 207ca5d35..000000000
--- a/plugins/work_constants.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-// Status definitions used with Work plugin.
-// Here, we share status values for both work items and offers,
-// although Work Server distinguishes between the two.
-// At this point the values are the same, so it is okay to use shared constants.
-// When need arises we may have to redo this and introduce additional constants.
-define("STATUS_PENDING_APPROVAL", 4);
-define("STATUS_DISAPPROVED", 8);
-define("STATUS_APPROVED", 12);

From 55310ed70109929f0565cb651750882384303529 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 4 Feb 2022 23:13:49 +0000
Subject: [PATCH 1642/1848] Fixed a typo problem in previous commit.

---
 initialize.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 73f4e7581..c417c1c4e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,8 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5621"
-        . "");
+define("APP_VERSION", "1.20.0.5621");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From fb8b436cabe05c119156de56c24f0b74a042a218 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 7 Feb 2022 19:28:04 +0000
Subject: [PATCH 1643/1848] Cosmetic maintenance.

---
 expenses.php   | 5 ++++-
 initialize.php | 2 +-
 time.php       | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/expenses.php b/expenses.php
index 578e2d1c6..897d64d91 100644
--- a/expenses.php
+++ b/expenses.php
@@ -189,6 +189,10 @@
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
+    // Use the "limit" plugin if we have one. Ignore include errors.
+    // The "limit" plugin is not required for normal operation of Time Tracker.
+    @include('plugins/limit/access_check.php');
+
     // Validate user input.
     if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
@@ -203,7 +207,6 @@
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.
diff --git a/initialize.php b/initialize.php
index c417c1c4e..ac607dd98 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5621");
+define("APP_VERSION", "1.20.0.5622");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 9202dc1d7..6bc95e930 100644
--- a/time.php
+++ b/time.php
@@ -342,6 +342,11 @@
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Submit button clicked.
+
+    // Use the "limit" plugin if we have one. Ignore include errors.
+    // The "limit" plugin is not required for normal operation of Time Tracker.
+    @include('plugins/limit/access_check.php');
+
     // Validate user input.
     if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
@@ -384,7 +389,6 @@
     if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
-    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.

From 58fb0f456312711d175495e8ea6f6116d131a068 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Feb 2022 16:25:10 +0000
Subject: [PATCH 1644/1848] Addressed several php8 warnings.

---
 WEB-INF/lib/ttReportHelper.class.php | 8 +++++---
 initialize.php                       | 2 +-
 login.php                            | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 68fc85b2d..ffef6e773 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -109,7 +109,7 @@ static function getWhere($options) {
     }
 
     // Prepare sql query part for user list.
-    $userlist = $options['users'] ? $options['users'] : '-1';
+    $userlist = isset($options['users']) ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and l.user_id in ($userlist)";
     else
@@ -191,7 +191,7 @@ static function getExpenseWhere($options) {
     }
 
     // Prepare sql query part for user list.
-    $userlist = $options['users'] ? $options['users'] : '-1';
+    $userlist = isset($options['users']) ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
       $user_list_part = " and ei.user_id in ($userlist)";
     else
@@ -571,7 +571,7 @@ static function getItems($options) {
     } else {
       $sort_part .= 'date';
     }
-    if (($canViewReports || $isClient) && $options['users'] && !$grouping_by_user)
+    if (($canViewReports || $isClient) && isset($options['users']) && !$grouping_by_user)
       $sort_part .= ', user, type';
     if ($options['show_start'])
       $sort_part .= ', unformatted_start';
@@ -584,6 +584,7 @@ static function getItems($options) {
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
 
+    $report_items = array();
     while ($val = $res->fetchRow()) {
       if ($convertTo12Hour) {
         if($val['start'] != '')
@@ -1526,6 +1527,7 @@ static function getReportOptions($bean) {
     $options['timesheet'] = $bean->getAttribute('timesheet');
 
     $active_users_in_bean = $bean->getAttribute('users_active');
+    $users = '';
     if ($active_users_in_bean && is_array($active_users_in_bean)) {
       $users = join(',', $active_users_in_bean);
     }
diff --git a/initialize.php b/initialize.php
index ac607dd98..6e3baf991 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5622");
+define("APP_VERSION", "1.20.0.5623");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index 9e2436206..93b1cd084 100644
--- a/login.php
+++ b/login.php
@@ -66,7 +66,7 @@
   $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
-$show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
+$show_hint = ('ad' == isset($GLOBALS['AUTH_MODULE_PARAMS']['type']) ? $GLOBALS['AUTH_MODULE_PARAMS']['type'] : null);
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_hint', $show_hint);

From 8f06d7527e7e7311b3ac289177ecc1fc77aeebd9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Feb 2022 17:15:05 +0000
Subject: [PATCH 1645/1848] Updated dbinstall.php for php8.1 breaking change.

---
 dbinstall.php  | 30 ++++++++++++++++++++----------
 initialize.php |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/dbinstall.php b/dbinstall.php
index c966bdbaa..12a1e6232 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -94,10 +94,16 @@ function ttGenerateKeys() {
   // $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
   $required_version = '5.4.0';    // Week view (week.php) requires 5.4 because of []-way of referencing arrays.
                                   // This needs further investigation as we use [] elsewhere without obvious problems.
-  if (version_compare(phpversion(), $required_version, '>=')) {
-    echo('PHP version: '.phpversion().', good enough.<br>');
+  // Print a warning about php >= 8.1 because of a breaking change
+  // with mysqli default error mode, see https://php.watch/versions/8.1/mysqli-error-mode
+  if (version_compare(phpversion(), '8.1', '>=')) {
+    echo('<font color="red">Error: This app was not tested with PHP version: '.phpversion().'</font><br>');
   } else {
-    echo('<font color="red">Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'.</font><br>');
+    if (version_compare(phpversion(), $required_version, '>=')) {
+      echo('PHP version: '.phpversion().', good enough.<br>');
+    } else {
+      echo('<font color="red">Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'.</font><br>');
+    }
   }
 
   // Depending on DSN, require either mysqli or mysql extensions.
@@ -171,13 +177,17 @@ function ttGenerateKeys() {
     echo('<font color="red">There are no tables in database. Execute step 1 - Create database structure.</font><br>');
   }
 
-  $sql = "select param_value from tt_site_config where param_name = 'version_db'";
-  $res = $conn->query($sql);
-  if (is_a($res, 'MDB2_Error')) {
-    echo('<font color="red">Error: database schema version query failed. '.$res->getMessage().'</font><br>');
-  } else {
-    $val = $res->fetchRow();
-    echo('Database version is: '.$val['param_value'].'.');
+  try {
+    $sql = "select param_value from tt_site_config where param_name = 'version_db'";
+    $res = $conn->query($sql);
+    if (is_a($res, 'MDB2_Error')) {
+      echo('<font color="red">Error: database schema version query failed. '.$res->getMessage().'</font><br>');
+    } else {
+      $val = $res->fetchRow();
+      echo('Database version is: '.$val['param_value'].'.');
+    }
+  } catch (Exception $e) {
+    echo('<font color="red">Caught exception: '.$e->getMessage().'</font><br>');
   }
 
   $conn->disconnect();
diff --git a/initialize.php b/initialize.php
index 6e3baf991..27f6705fe 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5623");
+define("APP_VERSION", "1.20.0.5624");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d04650cf53ea378f9bd8c7b81104f63c34713936 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Feb 2022 19:28:48 +0000
Subject: [PATCH 1646/1848] Starting to address numerous php8.1 issues.

---
 WEB-INF/lib/ttConfigHelper.class.php | 33 +++++-----------------------
 initialize.php                       |  2 +-
 time.php                             | 10 ++++-----
 3 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/WEB-INF/lib/ttConfigHelper.class.php b/WEB-INF/lib/ttConfigHelper.class.php
index 33e94e513..95bc1e0f1 100644
--- a/WEB-INF/lib/ttConfigHelper.class.php
+++ b/WEB-INF/lib/ttConfigHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 // Class ttConfigHelper is a helper class to handle comma-separated lists of config data.
 // For example, in tt_groups table we have a field called "config", that may store something like:
@@ -38,7 +14,8 @@ class ttConfigHelper {
 
   // Constructor.
   function __construct($config) {
-    $this->config = trim($config, ' ,');
+    if (!is_null($config))
+      $this->config = trim($config, ' ,');
     if ($this->config)
       $this->config_array = explode(',', $this->config);
   }
@@ -120,6 +97,6 @@ function setIntValue($name, $value) {
 
   // The getConfig returns the config string.
   function getConfig() {
-    return trim($this->config, ' ,');
+    return (is_null($this->config) ? null : trim($this->config, ' ,'));
   }
 }
diff --git a/initialize.php b/initialize.php
index 27f6705fe..7a7f06efe 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5624");
+define("APP_VERSION", "1.20.0.5625");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 6bc95e930..f5f84deb3 100644
--- a/time.php
+++ b/time.php
@@ -129,10 +129,10 @@
 }
 
 // Initialize variables.
-$cl_start = trim($request->getParameter('start'));
-$cl_finish = trim($request->getParameter('finish'));
-$cl_duration = trim($request->getParameter('duration'));
-$cl_note = trim($request->getParameter('note'));
+$cl_start = is_null($request->getParameter('start')) ? null : trim($request->getParameter('start'));
+$cl_finish = is_null($request->getParameter('finish')) ? null : trim($request->getParameter('finish'));
+$cl_duration = is_null($request->getParameter('duration')) ? null : trim($request->getParameter('duration'));
+$cl_note = is_null($request->getParameter('note')) ? null : trim($request->getParameter('note'));
 $cl_billable = 1;
 if ($showBillable) {
   if ($request->isPost()) {
@@ -161,7 +161,7 @@
       'label' => $timeField['label'],
       'type' => $timeField['type'],
       'required' => $timeField['required'],
-      'value' => trim($cl_control_name));
+      'value' => is_null($cl_control_name) ? null : trim($cl_control_name));
   }
 }
 

From 15c3ecc308bb027469926644af84e4cd49bb8904 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Feb 2022 15:49:30 +0000
Subject: [PATCH 1647/1848] Started making a replacement for DateAndTime class
 for php8.1 support.

---
 WEB-INF/lib/ttDate.class.php | 75 ++++++++++++++++++++++++++++++++++++
 initialize.php               |  2 +-
 time.php                     | 11 ++++++
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 WEB-INF/lib/ttDate.class.php

diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
new file mode 100644
index 000000000..519a76623
--- /dev/null
+++ b/WEB-INF/lib/ttDate.class.php
@@ -0,0 +1,75 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+import('I18n');
+
+// ttDate class is used to represent a date in Time Tracker.
+// It is a planned replacement for DateAndTime class, which is problematic with php8.1.
+class ttDate {
+
+  var $year;          // year
+  var $month;         // month
+  var $day;           // day of month
+  var $dayOfWeek;     // day of week
+  var $unixTimestamp; // unix timestamp of our date
+
+  var $isValid = false;
+
+  // Additional property, used for efficiency when we only need a date in DB_DATEFORMAT.
+  var $dateInDbDateFormat = null; // When initialized, this is our date in DB_DATEFORMAT.
+
+
+  // Constructor.
+  function __construct($dateString = null) {
+    // TODO: redo the constructor and initialize year. month, day, and dayOfWeek properly.
+    if (ttValidDbDateFormatDate($dateString)) {
+      $this->$dateInDbDateFormat = $dateString;
+      $this->isValid = true;
+    } else {
+      $today = date_create();
+      $this->dateInDbDateFormat = date_format($today, 'Y-m-d');
+      $this->isValid = true;
+    }
+
+    $this->unixTimestamp = strtotime($this->dateInDbDateFormat);
+    $this->year = date('Y', $this->unixTimestamp);
+    $this->month = date('m', $this->unixTimestamp);
+    $this->day = date('d', $this->unixTimestamp);
+    $this->dayOfWeek = date('w', $this->unixTimestamp);
+  }
+
+
+  // isValid determines if we have a properly initialized ttDate object.
+  function isValid() {
+      return $this->isValid;
+  }
+
+
+  // toString returns a date in specified format.
+  function toString($format = null) {
+    if (!$this->isValid) return null;
+
+    if ($format == null || $format == DB_DATEFORMAT)
+      return $this->dateInDbDateFormat;
+    else {
+      return $this->formatDate($format);
+    }
+  }
+
+
+  // formatDate returns a date string in specified format.
+  function formatDate($format) {
+    global $i18n;
+
+    $formattedDate = $format; // Start with unmodified format string.
+
+    // Replace all found elements with data.
+    $formattedDate = str_replace('%Y', $this->year, $formattedDate);
+    $formattedDate = str_replace('%m', $this->month, $formattedDate);
+    $formattedDate = str_replace('%d', $this->day, $formattedDate);
+    // Replace locale-dependent days of week.
+    $formattedDate = str_replace('%a', mb_substr($i18n->getWeekDayName($this->dayOfWeek), 0, 3, 'utf-8'), $formattedDate);
+    return $formattedDate;
+  }
+}
diff --git a/initialize.php b/initialize.php
index 7a7f06efe..28d4a8d1d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5625");
+define("APP_VERSION", "1.20.0.5626");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index f5f84deb3..9ee63d91c 100644
--- a/time.php
+++ b/time.php
@@ -11,6 +11,7 @@
 import('ttTimeHelper');
 import('ttFileHelper');
 import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -81,6 +82,16 @@
   $cl_date = $selected_date->toString(DB_DATEFORMAT);
 $_SESSION['date'] = $cl_date;
 
+// Refactoring in progress for php8.1.
+// TODO: remove the above block when done.
+$selected_date2 = new ttDate();
+if (!$selected_date2->isValid())
+  $selected_date2 = new ttDate();
+if(!$cl_date)
+  $cl_date = $selected_date2->toString(DB_DATEFORMAT);
+$_SESSION['date'] = $cl_date;
+// End of TODO.
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');

From 496e3ed494343bbd328af0f7a5f288d47a584778 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Feb 2022 16:09:55 +0000
Subject: [PATCH 1648/1848] Some more refactoring for php8.1.

---
 initialize.php                 | 2 +-
 plugins/MonthlyQuota.class.php | 8 ++++----
 time.php                       | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/initialize.php b/initialize.php
index 28d4a8d1d..237566d18 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5626");
+define("APP_VERSION", "1.20.0.5627");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index f742fd918..76a7c5100 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -104,13 +104,13 @@ public function getUserQuota($year, $month) {
   // from 1st of the month up to and inclusive of $selected_date.
   public function getUserQuotaFrom1st($selected_date) {
     // TODO: we may need a better algorithm here. Review.
-    $monthQuotaMinutes = $this->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-    $workdaysInMonth = $this->getNumWorkdays($selected_date->mMonth, $selected_date->mYear);
+    $monthQuotaMinutes = $this->getUserQuota($selected_date->year, $selected_date->month);
+    $workdaysInMonth = $this->getNumWorkdays($selected_date->month, $selected_date->year);
 
     // Iterate from 1st up to selected date.
     $workdaysFrom1st = 0;
-    for ($i = 1; $i <= $selected_date->mDate; $i++) {
-      $date = ttTimeHelper::dateInDatabaseFormat($selected_date->mYear, $selected_date->mMonth, $i);
+    for ($i = 1; $i <= $selected_date->day; $i++) {
+      $date = ttTimeHelper::dateInDatabaseFormat($selected_date->year, $selected_date->month, $i);
       if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) {
         $workdaysFrom1st++;
       }
diff --git a/time.php b/time.php
index 9ee63d91c..6e9dd610d 100644
--- a/time.php
+++ b/time.php
@@ -84,6 +84,7 @@
 
 // Refactoring in progress for php8.1.
 // TODO: remove the above block when done.
+// Also replace all occurrences of $selected_date2 with $selected_date.
 $selected_date2 = new ttDate();
 if (!$selected_date2->isValid())
   $selected_date2 = new ttDate();
@@ -124,8 +125,9 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
+  $month_quota_minutes = $quota->getUserQuota($selected_date2->year, $selected_date2->month);
+  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date2);
+  // TODO: refactor ttTimeHelper::getTimeForMonth to use a new ttPeriod class.
   $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $month_total_minutes = ttTimeHelper::toMinutes($month_total);
   $balance_left = $quota_minutes_from_1st - $month_total_minutes;

From 6dd18388f02edf24238aea848cd651380ccbe02a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Feb 2022 12:15:20 +0000
Subject: [PATCH 1649/1848] Some refactoring for php8.1 support.

---
 WEB-INF/lib/ttDate.class.php       | 34 ++++++++++++++++++++++--
 WEB-INF/lib/ttPeriod.class.php     | 42 ++++++++++++++++++++++++++++++
 WEB-INF/lib/ttTimeHelper.class.php | 27 +++++++++++++++++++
 initialize.php                     |  2 +-
 time.php                           |  9 +++----
 5 files changed, 106 insertions(+), 8 deletions(-)
 create mode 100644 WEB-INF/lib/ttPeriod.class.php

diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 519a76623..791a1e942 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -22,9 +22,8 @@ class ttDate {
 
   // Constructor.
   function __construct($dateString = null) {
-    // TODO: redo the constructor and initialize year. month, day, and dayOfWeek properly.
     if (ttValidDbDateFormatDate($dateString)) {
-      $this->$dateInDbDateFormat = $dateString;
+      $this->dateInDbDateFormat = $dateString;
       $this->isValid = true;
     } else {
       $today = date_create();
@@ -46,6 +45,25 @@ function isValid() {
   }
 
 
+  // Returns unix timestamp.
+  function getTimestamp() {
+    return $this->unixTimestamp;
+  }
+
+
+  // Resets the object properties from a passed in unix timestamp.
+  function setFromUnixTimestamp($unixTimestamp) {
+    $this->unixTimestamp = $unixTimestamp;
+
+    $this->year = date('Y', $this->unixTimestamp);
+    $this->month = date('m', $this->unixTimestamp);
+    $this->day = date('d', $this->unixTimestamp);
+    $this->dayOfWeek = date('w', $this->unixTimestamp);
+
+    $this->dateInDbDateFormat = $this->year.'-'.$this->month.'-'.$this->day;
+  }
+
+
   // toString returns a date in specified format.
   function toString($format = null) {
     if (!$this->isValid) return null;
@@ -72,4 +90,16 @@ function formatDate($format) {
     $formattedDate = str_replace('%a', mb_substr($i18n->getWeekDayName($this->dayOfWeek), 0, 3, 'utf-8'), $formattedDate);
     return $formattedDate;
   }
+
+
+  function before(/*ttDate*/ $obj) {
+    if ($this->getTimestamp() < $obj->getTimestamp()) return true;
+    return false;
+  }
+
+
+  function after(/*ttDate*/ $obj) {
+    if ($this->getTimestamp() > $obj->getTimestamp()) return true;
+    return false;
+  }
 }
diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
new file mode 100644
index 000000000..a541663fe
--- /dev/null
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -0,0 +1,42 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+define('INTERVAL_THIS_MONTH', 3);
+
+class ttPeriod {
+  var $startDate; // ttDate object.
+  var $endDate;   // ttDate object.
+
+
+  function __construct($period_type = INTERVAL_THIS_MONTH, $ttDateInstance) {
+
+    // global $user;
+    // $weekStartDay = $user->getWeekStart();
+
+    $t_arr = localtime($ttDateInstance->getTimestamp());
+    $t_arr[5] = $t_arr[5] + 1900;
+
+    $this->startDate = new ttDate();
+    $this->endDate = new ttDate();
+
+    switch ($period_type) {
+      case INTERVAL_THIS_MONTH:
+	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,1,$t_arr[5]));
+	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
+	break;
+      }
+    }
+
+
+  // Returns start date in specified format.
+  function getStartDate($format = null) {
+    return $this->startDate->toString($format);
+  }
+
+
+  // Returns end date in specified format.
+  function getEndDate($format = null) {
+    return $this->endDate->toString($format);
+  }
+}
\ No newline at end of file
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 75c911e04..917ceb571 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -605,6 +605,7 @@ static function getTimeForWeek($date) {
   static function getTimeForMonth($date) {
     global $user;
     import('Period');
+    import('ttPeriod');
     $mdb2 = getConnection();
 
     $user_id = $user->getUser();
@@ -612,6 +613,8 @@ static function getTimeForMonth($date) {
     $org_id = $user->org_id;
 
     $period = new Period(INTERVAL_THIS_MONTH, $date);
+    // TODO: refactoring in progress...
+    $period2 = new ttPeriod(INTERVAL_THIS_MONTH, $date);
     $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
       " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
       " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
@@ -623,6 +626,30 @@ static function getTimeForMonth($date) {
     return false;
   }
 
+  // getTimeForMonth2 - gets total time for a user for a given month.
+  // Refactoring - this is a replacement function for getTimeForMonth above.
+  // TODO: remove getTimeForMonth after refactoring week view.
+  static function getTimeForMonth2($date) {
+    global $user;
+    import('ttPeriod');
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $period = new ttPeriod(INTERVAL_THIS_MONTH, $date);
+    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date >= '".$period->getStartDate()."' and date <= '".$period->getEndDate()."' and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
+    }
+    return false;
+  }
+
   // getUncompleted - retrieves an uncompleted record for user, if one exists.
   static function getUncompleted($user_id) {
     $mdb2 = getConnection();
diff --git a/initialize.php b/initialize.php
index 237566d18..e6223498a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5627");
+define("APP_VERSION", "1.20.0.5628");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 6e9dd610d..b20308974 100644
--- a/time.php
+++ b/time.php
@@ -85,7 +85,7 @@
 // Refactoring in progress for php8.1.
 // TODO: remove the above block when done.
 // Also replace all occurrences of $selected_date2 with $selected_date.
-$selected_date2 = new ttDate();
+$selected_date2 = new ttDate($cl_date);
 if (!$selected_date2->isValid())
   $selected_date2 = new ttDate();
 if(!$cl_date)
@@ -127,8 +127,7 @@
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->getUserQuota($selected_date2->year, $selected_date2->month);
   $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date2);
-  // TODO: refactor ttTimeHelper::getTimeForMonth to use a new ttPeriod class.
-  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth2($selected_date2);
   $month_total_minutes = ttTimeHelper::toMinutes($month_total);
   $balance_left = $quota_minutes_from_1st - $month_total_minutes;
   $minutes_left = $month_quota_minutes - $month_total_minutes;
@@ -406,8 +405,8 @@
 
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
+      $browser_today = new ttDate($request->getParameter('browser_today', null));
+      if ($selected_date2->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
 

From 82ff14f082c8e03098292b9c9bdf79c22227aa21 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Feb 2022 13:07:48 +0000
Subject: [PATCH 1650/1848] More refactoring for php8.1.

---
 WEB-INF/lib/ttPeriod.class.php     | 11 +++++++++--
 WEB-INF/lib/ttTimeHelper.class.php | 27 ++++++++++++++++++++++++---
 WEB-INF/lib/ttUser.class.php       |  2 +-
 initialize.php                     |  2 +-
 time.php                           | 29 +++++++++--------------------
 5 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
index a541663fe..1d4b2c4d6 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -2,6 +2,7 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
+define('INTERVAL_THIS_WEEK', 2);
 define('INTERVAL_THIS_MONTH', 3);
 
 class ttPeriod {
@@ -11,16 +12,22 @@ class ttPeriod {
 
   function __construct($period_type = INTERVAL_THIS_MONTH, $ttDateInstance) {
 
-    // global $user;
-    // $weekStartDay = $user->getWeekStart();
+    global $user;
+    $weekStartDay = $user->getWeekStart();
 
     $t_arr = localtime($ttDateInstance->getTimestamp());
     $t_arr[5] = $t_arr[5] + 1900;
+    $startWeekBias = ($t_arr[6] < $weekStartDay) ? $weekStartDay - 7 : $weekStartDay;
 
     $this->startDate = new ttDate();
     $this->endDate = new ttDate();
 
     switch ($period_type) {
+      case INTERVAL_THIS_WEEK:
+	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
+	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
+	break;
+
       case INTERVAL_THIS_MONTH:
 	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,1,$t_arr[5]));
 	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 917ceb571..604724160 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -600,12 +600,35 @@ static function getTimeForWeek($date) {
     }
     return false;
   }
+  
+  // getTimeForWeek2 - gets total time for a user for a given week.
+  // Refactoring - this is a replacement function for getTimeForWeek above.
+  // TODO: remove getTimeForWeek after refactoring week view and puncher.
+  static function getTimeForWeek2($date) {
+    global $user;
+    import('ttPeriod');
+    $mdb2 = getConnection();
+
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $period = new ttPeriod(INTERVAL_THIS_WEEK, $date);
+    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date >= '".$period->getStartDate()."' and date <= '".$period->getEndDate()."' and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
+    }
+    return false;
+  }
 
   // getTimeForMonth - gets total time for a user for a given month.
   static function getTimeForMonth($date) {
     global $user;
     import('Period');
-    import('ttPeriod');
     $mdb2 = getConnection();
 
     $user_id = $user->getUser();
@@ -613,8 +636,6 @@ static function getTimeForMonth($date) {
     $org_id = $user->org_id;
 
     $period = new Period(INTERVAL_THIS_MONTH, $date);
-    // TODO: refactoring in progress...
-    $period2 = new ttPeriod(INTERVAL_THIS_MONTH, $date);
     $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
       " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
       " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 320fa623d..e6ed7ed71 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -436,7 +436,7 @@ function isDateLocked($date)
 
     // Calculate the last occurrence of a lock.
     $last = tdCron::getLastOccurrence($this->getLockSpec(), time());
-    $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
+    $lockdate = new ttDate(strftime('%Y-%m-%d', $last));
     if ($date->before($lockdate))
       return true;
 
diff --git a/initialize.php b/initialize.php
index e6223498a..588dbac7c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5628");
+define("APP_VERSION", "1.20.0.5629");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index b20308974..b4dcd84e7 100644
--- a/time.php
+++ b/time.php
@@ -75,24 +75,13 @@
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
+$selected_date = new ttDate($cl_date);
+if (!$selected_date->isValid())
+  $selected_date = new ttDate();
 if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+  $cl_date = $selected_date->toString();
 $_SESSION['date'] = $cl_date;
 
-// Refactoring in progress for php8.1.
-// TODO: remove the above block when done.
-// Also replace all occurrences of $selected_date2 with $selected_date.
-$selected_date2 = new ttDate($cl_date);
-if (!$selected_date2->isValid())
-  $selected_date2 = new ttDate();
-if(!$cl_date)
-  $cl_date = $selected_date2->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-// End of TODO.
-
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
@@ -125,9 +114,9 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->getUserQuota($selected_date2->year, $selected_date2->month);
-  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date2);
-  $month_total = ttTimeHelper::getTimeForMonth2($selected_date2);
+  $month_quota_minutes = $quota->getUserQuota($selected_date->year, $selected_date->month);
+  $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth2($selected_date);
   $month_total_minutes = ttTimeHelper::toMinutes($month_total);
   $balance_left = $quota_minutes_from_1st - $month_total_minutes;
   $minutes_left = $month_quota_minutes - $month_total_minutes;
@@ -406,7 +395,7 @@
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new ttDate($request->getParameter('browser_today', null));
-      if ($selected_date2->after($browser_today))
+      if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
 
@@ -491,7 +480,7 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($selected_date);
+$week_total = ttTimeHelper::getTimeForWeek2($selected_date);
 $timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 $showNavigation = ($user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu')) ||
   ($user->isPluginEnabled('pu') && !$user->isOptionEnabled('puncher_menu'));

From 98534ea6d695fb4fe5f606d9352d0e259f7733d6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Feb 2022 14:14:33 +0000
Subject: [PATCH 1651/1848] Refactoring for php8.1.

---
 WEB-INF/lib/common.lib.php     | 3 +--
 WEB-INF/lib/ttPeriod.class.php | 6 +++---
 WEB-INF/lib/ttUser.class.php   | 2 +-
 initialize.php                 | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 05a06808f..fcc36ed40 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -256,8 +256,7 @@ function ttValidDate($val)
 // ttValidDbDateFormatDate is used to check user input to validate a date in DB_DATEFORMAT.
 function ttValidDbDateFormatDate($val)
 {
-  $val = trim($val);
-  if (strlen($val) == 0)
+  if (is_null($val) || strlen($val) == 0)
     return false;
 
   // This should validate a string in format 'YYYY-MM-DD'.
diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
index 1d4b2c4d6..077aff278 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -24,9 +24,9 @@ function __construct($period_type = INTERVAL_THIS_MONTH, $ttDateInstance) {
 
     switch ($period_type) {
       case INTERVAL_THIS_WEEK:
-	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
-	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
-	break;
+        $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
+        $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
+        break;
 
       case INTERVAL_THIS_MONTH:
 	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,1,$t_arr[5]));
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e6ed7ed71..93e71116a 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -297,7 +297,7 @@ function isClient() {
   // isPluginEnabled checks whether a plugin is enabled for user.
   function isPluginEnabled($plugin)
   {
-    return in_array($plugin, explode(',', $this->getPlugins()));
+    return in_array($plugin, explode(',', $this->getPlugins() ? $this->getPlugins() : ''));
   }
 
   // isOptionEnabled checks whether a config option is enabled for user.
diff --git a/initialize.php b/initialize.php
index 588dbac7c..9514cc4a1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5629");
+define("APP_VERSION", "1.20.0.5630");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6c9cddd745b7aa9a985d596633762320a5586d8b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Feb 2022 14:54:42 +0000
Subject: [PATCH 1652/1848] Started refactoring Calendar.class.php for php8.1.

---
 WEB-INF/lib/form/Calendar.class.php | 10 ++++++----
 WEB-INF/lib/ttDate.class.php        |  7 +++++++
 initialize.php                      |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 337737f1c..02a6d0845 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -64,20 +64,22 @@ function getHtml() {
     global $user;
 
     $selectedDate = $this->value;
-    if (!$selectedDate) $selectedDate = strftime(DB_DATEFORMAT);
 
     // Determine month and year for selected date.
-    $selectedDateObject = new DateAndTime(DB_DATEFORMAT, $selectedDate);
+    $selectedDateObject = new ttDate($selectedDate);
     $selectedMonth = $selectedDateObject->getMonth();
     $selectedYear = $selectedDateObject->getYear();
 
     // Determine date for the 1st of next month for calendar navigation.
     $firstOfNextMonth2AM = mktime(2, 0, 0, $selectedMonth + 1, 1, $selectedYear); // 2 am on the 1st of next month.
-    $firstOfNextMonth = strftime(DB_DATEFORMAT, $firstOfNextMonth2AM);
+    $ttDateObject = new ttDate();
+    $ttDateObject->setFromUnixTimestamp($firstOfNextMonth2AM);
+    $firstOfNextMonth = $ttDateObject->toString();
 
     // Determine date for the 1st of previous month.
     $firstOfPreviousMonth2AM = mktime(2, 0, 0, $selectedMonth - 1, 1, $selectedYear); // 2 am on the 1st of previous month.
-    $firstOfPreviousMonth = strftime(DB_DATEFORMAT, $firstOfPreviousMonth2AM);
+    $ttDateObject->setFromUnixTimestamp($firstOfPreviousMonth2AM);
+    $firstOfPreviousMonth = $ttDateObject->toString();
 
     // Print calendar header.
     $html = "\n\n<!-- start of calendar -->\n";
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 791a1e942..f2ae46226 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -102,4 +102,11 @@ function after(/*ttDate*/ $obj) {
     if ($this->getTimestamp() > $obj->getTimestamp()) return true;
     return false;
   }
+
+
+  // Geters.
+  function getYear() { return $this->year; }
+  function getMonth() { return $this->month; }
+  function getDay() { return $this->day; }
+  function getDayOfWeek() { return $this->dayOfWeek; }
 }
diff --git a/initialize.php b/initialize.php
index 9514cc4a1..f98d2cb39 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5630");
+define("APP_VERSION", "1.20.0.5631");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 22d3a95aee4e07b29f9b8bd282faa0c595c2a7c5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Feb 2022 21:44:54 +0000
Subject: [PATCH 1653/1848] More refactoring for php8.1 support.

---
 WEB-INF/lib/common.lib.php          |  4 +++-
 WEB-INF/lib/form/Calendar.class.php |  8 ++++----
 WEB-INF/lib/ttDate.class.php        | 15 +++++++++++++++
 WEB-INF/lib/ttPeriod.class.php      |  2 +-
 WEB-INF/lib/ttTimeHelper.class.php  |  4 ++--
 initialize.php                      |  2 +-
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index fcc36ed40..cabf62621 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -128,7 +128,9 @@ function isTrue($val)
 // ttValidString is used to check user input to validate a string.
 function ttValidString($val, $emptyValid = false)
 {
-  $val = trim($val);
+  if(!is_null($val))
+    $val = trim($val);
+
   if (strlen($val) == 0 && !$emptyValid)
     return false;
     
diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 02a6d0845..af32eea1d 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -157,14 +157,14 @@ function getHtml() {
           }
 
           // Handle selected day.
-          if ($selectedDate == strftime(DB_DATEFORMAT, $cellDate0am))
+          if ($selectedDate == ttDate::dateFromUnixTimestamp($cellDate0am))
             $cell_style = ' class="calendarDaySelected"';
 
           $html .= '<td'.$cell_style.'>';
           // Handle days with existing entries.
           if ($active_dates) {
             // Entries exist.
-            if (in_array(strftime(DB_DATEFORMAT, $cellDate0am), $active_dates)) {
+            if (in_array(ttDate::dateFromUnixTimestamp($cellDate0am), $active_dates)) {
               if ($handleNotCompleteDays && $this->highlight == 'time') {
                 $day_total_minutes = ttTimeHelper::toMinutes(ttTimeHelper::getTimeForDay($date_to_check));
                 if ($day_total_minutes >= $workday_minutes)
@@ -176,7 +176,7 @@ function getHtml() {
                 $link_style = ' class="calendarLinkRecordsExist"';
             }
           }
-          $html .= "<a".$link_style." href=\"?".$this->name."=".strftime(DB_DATEFORMAT, $cellDate0am)."\" tabindex=\"-1\">".date("d",$cellDate0am)."</a>";
+          $html .= "<a".$link_style." href=\"?".$this->name."=".ttDate::dateFromUnixTimestamp($cellDate0am)."\" tabindex=\"-1\">".date("d",$cellDate0am)."</a>";
           $html .= "</td>";
         } else {
           $html .= "<td>&nbsp;</td>";
@@ -188,7 +188,7 @@ function getHtml() {
     // Finished printing calendar table.
 
     // Print Today link.
-    $html .= "  <tr><td colspan=\"7\" align=\"center\"><a class=\"today_link\" href=\"?".$this->name."=".strftime(DB_DATEFORMAT)."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
+    $html .= "  <tr><td colspan=\"7\" align=\"center\"><a class=\"today_link\" href=\"?".$this->name."=".ttDate::dateFromUnixTimestamp()."\" tabindex=\"-1\">".$i18n->get('label.today')."</a></td></tr>\n";
     $html .= "</table>\n";
 
     // Add a hidden control for selected date.
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index f2ae46226..fcf58e60c 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -109,4 +109,19 @@ function getYear() { return $this->year; }
   function getMonth() { return $this->month; }
   function getDay() { return $this->day; }
   function getDayOfWeek() { return $this->dayOfWeek; }
+
+
+  // A static function to obtain a date in DB_DATEFORMAT from a Unix timestamp.
+  static function dateFromUnixTimestamp($unixTimestamp = null) {
+    if ($unixTimestamp == null) {
+      $today = date_create();
+      return date_format($today, 'Y-m-d');
+    }
+
+    $year = date('Y', $unixTimestamp);
+    $month = date('m', $unixTimestamp);
+    $day = date('d', $unixTimestamp);
+    $dateInDbFormat = $year.'-'.$month.'-'.$day;
+    return $dateInDbFormat;
+  }
 }
diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
index 077aff278..3eb431cc4 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -10,7 +10,7 @@ class ttPeriod {
   var $endDate;   // ttDate object.
 
 
-  function __construct($period_type = INTERVAL_THIS_MONTH, $ttDateInstance) {
+  function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
 
     global $user;
     $weekStartDay = $user->getWeekStart();
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 604724160..b45c6d17f 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -613,7 +613,7 @@ static function getTimeForWeek2($date) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $period = new ttPeriod(INTERVAL_THIS_WEEK, $date);
+    $period = new ttPeriod($date, INTERVAL_THIS_WEEK);
     $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
       " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
       " and date >= '".$period->getStartDate()."' and date <= '".$period->getEndDate()."' and status = 1";
@@ -659,7 +659,7 @@ static function getTimeForMonth2($date) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $period = new ttPeriod(INTERVAL_THIS_MONTH, $date);
+    $period = new ttPeriod($date, INTERVAL_THIS_MONTH);
     $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
       " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
       " and date >= '".$period->getStartDate()."' and date <= '".$period->getEndDate()."' and status = 1";
diff --git a/initialize.php b/initialize.php
index f98d2cb39..5874ba026 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5631");
+define("APP_VERSION", "1.20.0.5632");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b33a06c5f0eb6ef32b0840f3219dfba1f8bcf426 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Feb 2022 17:29:53 +0000
Subject: [PATCH 1654/1848] Fixed Calendar.class.php with a forgotten import.

---
 WEB-INF/lib/form/Calendar.class.php | 1 +
 WEB-INF/lib/ttDate.class.php        | 2 +-
 initialize.php                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index af32eea1d..3f16ed597 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -28,6 +28,7 @@
 
 import('form.FormElement');
 import('DateAndTime');
+import('ttDate');
 import('ttTimeHelper');
 
 class Calendar extends FormElement {
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index fcf58e60c..1b5bad9c4 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -104,7 +104,7 @@ function after(/*ttDate*/ $obj) {
   }
 
 
-  // Geters.
+  // Getters.
   function getYear() { return $this->year; }
   function getMonth() { return $this->month; }
   function getDay() { return $this->day; }
diff --git a/initialize.php b/initialize.php
index 5874ba026..29789ed1a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5632");
+define("APP_VERSION", "1.20.0.5633");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From eb3210f9fdd97c1a220b874ab2bf73efdc280029 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Feb 2022 19:51:24 +0000
Subject: [PATCH 1655/1848] Added a missing import to ttUser.class.php.

---
 WEB-INF/lib/ttUser.class.php | 1 +
 initialize.php               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 93e71116a..592b5d9c8 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -9,6 +9,7 @@
 import('form.Form');
 import('form.ActionForm');
 import('ttTemplateHelper');
+import('ttDate');
 
 class ttUser {
   var $login = null;            // User login.
diff --git a/initialize.php b/initialize.php
index 29789ed1a..03294184b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5633");
+define("APP_VERSION", "1.20.0.5634");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 042398a7f8f0322eb2caa002360172b31c2d2f78 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Feb 2022 21:23:00 +0000
Subject: [PATCH 1656/1848] Fixed adjusting fav report options for changed user
 role.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 11 ++++++++++-
 initialize.php                          |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index be23f6a39..303750d63 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -473,6 +473,7 @@ static function adjustOptions($options) {
       }
     } else {
       $users_to_adjust = explode(',', $options['users']); // Users to adjust.
+      // Adjust user list for a client.
       if ($user->isClient()) {
         $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
         foreach ($users as $single_user) {
@@ -485,7 +486,15 @@ static function adjustOptions($options) {
         }
         $options['users'] = implode(',', $adjusted_user_ids);
       }
-      // TODO: add checking the existing user list for potentially changed access rights for user.
+      // Reset user list for a role that no longer has view_reports or view_all_reports rights.
+      if (!($user->can('view_reports') || $user->can('view_all_reports'))) {
+        $options['users'] = null;
+        // Also remove grouping by user if we can't do it.
+        if (isset($options['group_by1']) && $options['group_by1'] == 'user') unset($options['group_by1']);
+        if (isset($options['group_by2']) && $options['group_by2'] == 'user') unset($options['group_by2']);
+        if (isset($options['group_by3']) && $options['group_by3'] == 'user') unset($options['group_by3']);
+      }
+      // TODO: improve checking the existing user list for potentially changed access rights for user.
     }
 
     if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
diff --git a/initialize.php b/initialize.php
index 03294184b..09344a542 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5634");
+define("APP_VERSION", "1.20.0.5635");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 8e8321a78d7dd9c341f7253a18d324a74b039cfc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Feb 2022 12:54:19 +0000
Subject: [PATCH 1657/1848] Addressed a php warning.

---
 WEB-INF/lib/ttReportHelper.class.php | 5 +++--
 initialize.php                       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ffef6e773..20e6d7a46 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -693,6 +693,8 @@ static function getSubtotals($options) {
     // Execute query.
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    $subtotals = array();
     while ($val = $res->fetchRow()) {
       $time = ttTimeHelper::minutesToDuration($val['time'] / 60);
       $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
@@ -1014,8 +1016,7 @@ static function prepareReportBody($options, $comment = null)
 
     $items = ttReportHelper::getItems($options);
     $grouping = ttReportHelper::grouping($options);
-    if ($grouping)
-      $subtotals = ttReportHelper::getSubtotals($options);
+    $subtotals = $grouping ? ttReportHelper::getSubtotals($options) : array();
     $totals = ttReportHelper::getTotals($options);
 
     // Use custom fields plugin if it is enabled.
diff --git a/initialize.php b/initialize.php
index 09344a542..e06256f06 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5635");
+define("APP_VERSION", "1.20.0.5636");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4f95a311ebc6ec1092ad572a4dc2b59ad58a3a79 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Feb 2022 15:20:18 +0000
Subject: [PATCH 1658/1848] Some refactoring in Calendar class.

---
 WEB-INF/lib/form/Calendar.class.php | 8 ++------
 initialize.php                      | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 3f16ed597..072b48281 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -27,7 +27,6 @@
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
-import('DateAndTime');
 import('ttDate');
 import('ttTimeHelper');
 
@@ -73,14 +72,11 @@ function getHtml() {
 
     // Determine date for the 1st of next month for calendar navigation.
     $firstOfNextMonth2AM = mktime(2, 0, 0, $selectedMonth + 1, 1, $selectedYear); // 2 am on the 1st of next month.
-    $ttDateObject = new ttDate();
-    $ttDateObject->setFromUnixTimestamp($firstOfNextMonth2AM);
-    $firstOfNextMonth = $ttDateObject->toString();
+    $firstOfNextMonth = ttDate::dateFromUnixTimestamp($firstOfNextMonth2AM);
 
     // Determine date for the 1st of previous month.
     $firstOfPreviousMonth2AM = mktime(2, 0, 0, $selectedMonth - 1, 1, $selectedYear); // 2 am on the 1st of previous month.
-    $ttDateObject->setFromUnixTimestamp($firstOfPreviousMonth2AM);
-    $firstOfPreviousMonth = $ttDateObject->toString();
+    $firstOfPreviousMonth = ttDate::dateFromUnixTimestamp($firstOfPreviousMonth2AM);
 
     // Print calendar header.
     $html = "\n\n<!-- start of calendar -->\n";
diff --git a/initialize.php b/initialize.php
index e06256f06..aa92c01e2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5636");
+define("APP_VERSION", "1.20.0.5637");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 28c91182fc500cd9c4a77ada70a24151c6afd7b2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Feb 2022 15:46:25 +0000
Subject: [PATCH 1659/1848] Resumed refactoring for php8.1.

---
 WEB-INF/lib/common.lib.php | 10 ++++++----
 initialize.php             |  2 +-
 time.php                   |  1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index cabf62621..d8ed3c8d5 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -128,16 +128,18 @@ function isTrue($val)
 // ttValidString is used to check user input to validate a string.
 function ttValidString($val, $emptyValid = false)
 {
-  if(!is_null($val))
-    $val = trim($val);
+  if (is_null($val)) {
+    return $emptyValid ? true : false;
+  }
 
+  $val = trim($val);
   if (strlen($val) == 0 && !$emptyValid)
     return false;
-    
+
   // String must not be XSS evil (to insert JavaScript).
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
-    
+
   return true;    
 }
 
diff --git a/initialize.php b/initialize.php
index aa92c01e2..911c1f71d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5637");
+define("APP_VERSION", "1.20.0.5638");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index b4dcd84e7..25f9b4a4b 100644
--- a/time.php
+++ b/time.php
@@ -10,7 +10,6 @@
 import('ttClientHelper');
 import('ttTimeHelper');
 import('ttFileHelper');
-import('DateAndTime');
 import('ttDate');
 
 // Access checks.

From 343557ad5bb4f98c356978a652318d7aa01f2389 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Feb 2022 17:23:26 +0000
Subject: [PATCH 1660/1848] Updated smarty for php8.1 support.

---
 WEB-INF/lib/smarty/Autoloader.php             |    8 +-
 WEB-INF/lib/smarty/Smarty.class.php           |   87 +-
 WEB-INF/lib/smarty/SmartyBC.class.php         |  477 --
 .../lib/smarty/plugins/block.textformat.php   |    2 +-
 .../lib/smarty/plugins/function.counter.php   |    2 +-
 WEB-INF/lib/smarty/plugins/function.cycle.php |    2 +-
 WEB-INF/lib/smarty/plugins/function.fetch.php |    2 +-
 .../plugins/function.html_checkboxes.php      |    2 +-
 .../smarty/plugins/function.html_image.php    |    2 +-
 .../smarty/plugins/function.html_options.php  |    2 +-
 .../smarty/plugins/function.html_radios.php   |    2 +-
 .../plugins/function.html_select_date.php     |    2 +-
 .../plugins/function.html_select_time.php     |    2 +-
 .../smarty/plugins/function.html_table.php    |    2 +-
 .../lib/smarty/plugins/function.mailto.php    |   13 +-
 WEB-INF/lib/smarty/plugins/function.math.php  |   34 +-
 .../smarty/plugins/modifier.date_format.php   |    2 +-
 .../lib/smarty/plugins/modifier.escape.php    |   14 +-
 .../smarty/plugins/modifier.mb_wordwrap.php   |    2 +-
 .../smarty/plugins/modifier.regex_replace.php |    2 +-
 .../lib/smarty/plugins/modifier.replace.php   |    2 +-
 .../lib/smarty/plugins/modifier.spacify.php   |    2 +-
 .../lib/smarty/plugins/modifier.truncate.php  |    2 +-
 .../smarty/plugins/modifiercompiler.cat.php   |    2 +-
 .../modifiercompiler.count_characters.php     |    2 +-
 .../modifiercompiler.count_paragraphs.php     |    2 +-
 .../modifiercompiler.count_sentences.php      |    2 +-
 .../plugins/modifiercompiler.count_words.php  |    2 +-
 .../plugins/modifiercompiler.default.php      |    4 +-
 .../plugins/modifiercompiler.escape.php       |   10 +-
 .../plugins/modifiercompiler.indent.php       |    2 +-
 .../smarty/plugins/modifiercompiler.lower.php |    2 +-
 .../modifiercompiler.string_format.php        |    2 +-
 .../smarty/plugins/modifiercompiler.strip.php |    2 +-
 .../plugins/modifiercompiler.strip_tags.php   |    2 +-
 .../smarty/plugins/modifiercompiler.upper.php |    2 +-
 .../plugins/modifiercompiler.wordwrap.php     |    2 +-
 .../plugins/outputfilter.trimwhitespace.php   |    2 +-
 .../plugins/shared.escape_special_chars.php   |    8 +-
 .../smarty/plugins/shared.mb_str_replace.php  |    2 +-
 WEB-INF/lib/smarty/readme                     |    8 +
 .../smarty_internal_cacheresource_file.php    |    8 +-
 .../smarty_internal_compile_for.php           |    2 +-
 .../smarty_internal_compile_foreach.php       |    4 +-
 .../smarty_internal_compile_function.php      |    2 +-
 .../smarty_internal_compile_include_php.php   |  110 -
 .../smarty_internal_compile_insert.php        |    2 +-
 .../smarty_internal_compile_private_php.php   |  253 -
 .../smarty_internal_config_file_compiler.php  |    2 +-
 .../sysplugins/smarty_internal_data.php       |   24 +-
 .../smarty_internal_errorhandler.php          |  117 +-
 .../smarty_internal_method_append.php         |    2 +-
 .../smarty_internal_method_appendbyref.php    |    2 +-
 .../smarty_internal_method_clearallassign.php |    2 +-
 .../smarty_internal_method_clearallcache.php  |    2 +-
 .../smarty_internal_method_clearassign.php    |    2 +-
 .../smarty_internal_method_clearcache.php     |    2 +-
 ..._internal_method_clearcompiledtemplate.php |    2 +-
 .../smarty_internal_method_clearconfig.php    |    2 +-
 .../smarty_internal_method_configload.php     |    4 +-
 .../smarty_internal_method_createdata.php     |    2 +-
 .../smarty_internal_method_getconfigvars.php  |    2 +-
 ...ty_internal_method_getregisteredobject.php |    2 +-
 .../smarty_internal_method_gettags.php        |    2 +-
 ...smarty_internal_method_gettemplatevars.php |    2 +-
 .../smarty_internal_method_loadfilter.php     |    2 +-
 ..._internal_method_registercacheresource.php |    2 +-
 .../smarty_internal_method_registerclass.php  |    2 +-
 ...al_method_registerdefaultpluginhandler.php |    2 +-
 .../smarty_internal_method_registerfilter.php |    2 +-
 .../smarty_internal_method_registerobject.php |    2 +-
 .../smarty_internal_method_registerplugin.php |    2 +-
 ...marty_internal_method_registerresource.php |   15 +-
 .../smarty_internal_method_unloadfilter.php   |    2 +-
 ...nternal_method_unregistercacheresource.php |    2 +-
 ...marty_internal_method_unregisterfilter.php |    2 +-
 ...marty_internal_method_unregisterobject.php |    2 +-
 ...marty_internal_method_unregisterplugin.php |    2 +-
 ...rty_internal_method_unregisterresource.php |    2 +-
 .../smarty_internal_parsetree_template.php    |  138 +-
 .../smarty_internal_parsetree_text.php        |   34 +-
 .../smarty_internal_resource_registered.php   |  101 -
 .../smarty_internal_resource_stream.php       |    2 +-
 .../smarty_internal_runtime_codeframe.php     |    2 +-
 .../smarty_internal_templatebase.php          |   25 +-
 .../smarty_internal_templatecompilerbase.php  |   58 +-
 .../smarty_internal_templatelexer.php         |  614 +-
 .../smarty_internal_templateparser.php        | 5283 +++++++----------
 .../smarty_internal_testinstall.php           |    4 -
 .../lib/smarty/sysplugins/smarty_resource.php |    4 +-
 .../lib/smarty/sysplugins/smarty_security.php |   13 -
 .../sysplugins/smartycompilerexception.php    |   10 +-
 initialize.php                                |    2 +-
 93 files changed, 2945 insertions(+), 4665 deletions(-)
 delete mode 100644 WEB-INF/lib/smarty/SmartyBC.class.php
 create mode 100644 WEB-INF/lib/smarty/readme
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php
 delete mode 100644 WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php

diff --git a/WEB-INF/lib/smarty/Autoloader.php b/WEB-INF/lib/smarty/Autoloader.php
index c09361b66..1673ce2ff 100644
--- a/WEB-INF/lib/smarty/Autoloader.php
+++ b/WEB-INF/lib/smarty/Autoloader.php
@@ -39,7 +39,7 @@ class Smarty_Autoloader
      *
      * @var array
      */
-    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+    public static $rootClasses = array('smarty' => 'Smarty.class.php');
 
     /**
      * Registers Smarty_Autoloader backward compatible to older installations.
@@ -76,11 +76,7 @@ public static function register($prepend = false)
         self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
         self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
             self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
-        } else {
-            spl_autoload_register(array(__CLASS__, 'autoload'));
-        }
+        spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
     }
 
     /**
diff --git a/WEB-INF/lib/smarty/Smarty.class.php b/WEB-INF/lib/smarty/Smarty.class.php
index 375bab133..05325a230 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -20,7 +20,7 @@
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link      http://www.smarty.net/
+ * @link      https://www.smarty.net/
  * @copyright 2018 New Digital Group, Inc.
  * @copyright 2018 Uwe Tews
  * @author    Monte Ohrt <monte at ohrt dot com>
@@ -60,19 +60,6 @@
      */
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
-}
-if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    /**
-     * @deprecated in favor of Smarty::$_DATE_FORMAT
-     */
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-}
 /**
  * Load Smarty_Autoloader
  */
@@ -111,7 +98,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.39';
+    const SMARTY_VERSION = '4.1.0';
     /**
      * define variable scopes
      */
@@ -143,13 +130,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     const DEBUG_OFF        = 0;
     const DEBUG_ON         = 1;
     const DEBUG_INDIVIDUAL = 2;
-    /**
-     * modes for handling of "<?php ... ?>" tags in templates.
-     */
-    const PHP_PASSTHRU = 0; //-> print tags as plain text
-    const PHP_QUOTE    = 1; //-> escape tags as entities
-    const PHP_REMOVE   = 2; //-> escape tags as entities
-    const PHP_ALLOW    = 3; //-> escape tags as entities
+
     /**
      * filter types
      */
@@ -179,13 +160,13 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
-    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
 
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
-    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+    public static $_DATE_FORMAT = '%b %e, %Y';
 
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
@@ -369,13 +350,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $security_policy = null;
 
-    /**
-     * controls handling of PHP-blocks
-     *
-     * @var integer
-     */
-    public $php_handling = self::PHP_PASSTHRU;
-
     /**
      * controls if the php template file resource is allowed
      *
@@ -666,6 +640,12 @@ class Smarty extends Smarty_Internal_TemplateBase
         'cache_dir'    => 'CacheDir',
     );
 
+    /**
+     * PHP7 Compatibility mode
+     * @var bool
+     */
+    private $isMutingUndefinedOrNullWarnings = false;
+
     /**
      * Initialize new Smarty object
      */
@@ -688,27 +668,6 @@ public function __construct()
         }
     }
 
-    /**
-     * Enable error handler to mute expected messages
-     *
-     * @return     boolean
-     * @deprecated
-     */
-    public static function muteExpectedErrors()
-    {
-        return Smarty_Internal_ErrorHandler::muteExpectedErrors();
-    }
-
-    /**
-     * Disable error handler muting expected messages
-     *
-     * @deprecated
-     */
-    public static function unmuteExpectedErrors()
-    {
-        restore_error_handler();
-    }
-
     /**
      * Check if a template resource exists
      *
@@ -1387,11 +1346,6 @@ public function __set($name, $value)
     private function _normalizeDir($dirName, $dir)
     {
         $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
-        if (class_exists('Smarty_Internal_ErrorHandler', false)) {
-            if (!isset(Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ])) {
-                Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ] = null;
-            }
-        }
     }
 
     /**
@@ -1421,4 +1375,23 @@ private function _normalizeTemplateConfig($isConfig)
         $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
             $this->_joined_template_dir = join('#', $this->template_dir);
     }
+
+    /**
+     * Activates PHP7 compatibility mode:
+     * - converts E_WARNINGS for "undefined array key" and "trying to read property of null" errors to E_NOTICE
+     *
+     * @void
+     */
+    public function muteUndefinedOrNullWarnings() {
+        $this->isMutingUndefinedOrNullWarnings = true;
+    }
+
+    /**
+     * Indicates if PHP7 compatibility mode is set.
+     * @bool
+     */
+    public function isMutingUndefinedOrNullWarnings() {
+        return $this->isMutingUndefinedOrNullWarnings;
+    }
+
 }
diff --git a/WEB-INF/lib/smarty/SmartyBC.class.php b/WEB-INF/lib/smarty/SmartyBC.class.php
deleted file mode 100644
index 0550e46dc..000000000
--- a/WEB-INF/lib/smarty/SmartyBC.class.php
+++ /dev/null
@@ -1,477 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        SmartyBC.class.php
- * SVN:         $Id: $
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- */
-/**
- * @ignore
- */
-require_once dirname(__FILE__) . '/Smarty.class.php';
-
-/**
- * Smarty Backward Compatibility Wrapper Class
- *
- * @package Smarty
- */
-class SmartyBC extends Smarty
-{
-    /**
-     * Smarty 2 BC
-     *
-     * @var string
-     */
-    public $_version = self::SMARTY_VERSION;
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-
-    /**
-     * Initialize new SmartyBC object
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * wrapper for assign_by_ref
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to assign
-     */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-        $this->assignByRef($tpl_var, $value);
-    }
-
-    /**
-     * wrapper for append_by_ref
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
-    {
-        $this->appendByRef($tpl_var, $value, $merge);
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    public function clear_assign($tpl_var)
-    {
-        $this->clearAssign($tpl_var);
-    }
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function      the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     *
-     * @throws \SmartyException
-     */
-    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregister custom function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_function($function)
-    {
-        $this->unregisterPlugin('function', $function);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object        name of template object
-     * @param object  $object_impl   the referenced PHP object to register
-     * @param array   $allowed       list of allowed methods (empty = all)
-     * @param boolean $smarty_args   smarty argument format, else traditional
-     * @param array   $block_methods list of methods that are block format
-     *
-     * @throws   SmartyException
-     * @internal param array $block_functs list of methods that are block format
-     */
-    public function register_object(
-        $object,
-        $object_impl,
-        $allowed = array(),
-        $smarty_args = true,
-        $block_methods = array()
-    ) {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregister object
-     *
-     * @param string $object name of template object
-     */
-    public function unregister_object($object)
-    {
-        $this->unregisterObject($object);
-    }
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block      name of template block
-     * @param string $block_impl PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     *
-     * @throws \SmartyException
-     */
-    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregister block function
-     *
-     * @param string $block name of template function
-     */
-    public function unregister_block($block)
-    {
-        $this->unregisterPlugin('block', $block);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function      name of template function
-     * @param string $function_impl name of PHP function to register
-     * @param bool   $cacheable
-     *
-     * @throws \SmartyException
-     */
-    public function register_compiler_function($function, $function_impl, $cacheable = true)
-    {
-        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
-    }
-
-    /**
-     * Unregister compiler function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_compiler_function($function)
-    {
-        $this->unregisterPlugin('compiler', $function);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier      name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     *
-     * @throws \SmartyException
-     */
-    public function register_modifier($modifier, $modifier_impl)
-    {
-        $this->registerPlugin('modifier', $modifier, $modifier_impl);
-    }
-
-    /**
-     * Unregister modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    public function unregister_modifier($modifier)
-    {
-        $this->unregisterPlugin('modifier', $modifier);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type      name of resource
-     * @param array  $functions array of functions to handle resource
-     */
-    public function register_resource($type, $functions)
-    {
-        $this->registerResource($type, $functions);
-    }
-
-    /**
-     * Unregister a resource
-     *
-     * @param string $type name of resource
-     */
-    public function unregister_resource($type)
-    {
-        $this->unregisterResource($type);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_prefilter($function)
-    {
-        $this->registerFilter('pre', $function);
-    }
-
-    /**
-     * Unregister a prefilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_prefilter($function)
-    {
-        $this->unregisterFilter('pre', $function);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_postfilter($function)
-    {
-        $this->registerFilter('post', $function);
-    }
-
-    /**
-     * Unregister a postfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_postfilter($function)
-    {
-        $this->unregisterFilter('post', $function);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_outputfilter($function)
-    {
-        $this->registerFilter('output', $function);
-    }
-
-    /**
-     * Unregister an outputfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_outputfilter($function)
-    {
-        $this->unregisterFilter('output', $function);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     *
-     * @throws \SmartyException
-     */
-    public function load_filter($type, $name)
-    {
-        $this->loadFilter($type, $name);
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param string $tpl_file   name of template file
-     * @param string $cache_id   name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time   expiration time
-     *
-     * @return boolean
-     */
-    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param string $exp_time expire time
-     *
-     * @return boolean
-     */
-    public function clear_all_cache($exp_time = null)
-    {
-        return $this->clearCache(null, null, null, $exp_time);
-    }
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
-     *
-     * @return bool
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        return $this->isCached($tpl_file, $cache_id, $compile_id);
-    }
-
-    /**
-     * clear all the assigned template variables.
-     */
-    public function clear_all_assign()
-    {
-        $this->clearAllAssign();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
-     *
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param string $tpl_file
-     *
-     * @return bool
-     * @throws \SmartyException
-     */
-    public function template_exists($tpl_file)
-    {
-        return $this->templateExists($tpl_file);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function get_template_vars($name = null)
-    {
-        return $this->getTemplateVars($name);
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function get_config_vars($name = null)
-    {
-        return $this->getConfigVars($name);
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    public function config_load($file, $section = null, $scope = 'global')
-    {
-        $this->ConfigLoad($file, $section, $scope);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name
-     *
-     * @return object
-     */
-    public function get_registered_object($name)
-    {
-        return $this->getRegisteredObject($name);
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    public function clear_config($var = null)
-    {
-        $this->clearConfig($var);
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string  $error_msg
-     * @param integer $error_type
-     */
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-}
diff --git a/WEB-INF/lib/smarty/plugins/block.textformat.php b/WEB-INF/lib/smarty/plugins/block.textformat.php
index 5e494637e..fed090e4d 100644
--- a/WEB-INF/lib/smarty/plugins/block.textformat.php
+++ b/WEB-INF/lib/smarty/plugins/block.textformat.php
@@ -20,7 +20,7 @@
  * - indent_char   - string (" ")
  * - wrap_boundary - boolean (true)
  *
- * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ * @link   https://www.smarty.net/manual/en/language.function.textformat.php {textformat}
  *         (Smarty online manual)
  *
  * @param array                    $params   parameters
diff --git a/WEB-INF/lib/smarty/plugins/function.counter.php b/WEB-INF/lib/smarty/plugins/function.counter.php
index a4129e77c..54795459c 100644
--- a/WEB-INF/lib/smarty/plugins/function.counter.php
+++ b/WEB-INF/lib/smarty/plugins/function.counter.php
@@ -12,7 +12,7 @@
  * Purpose:  print out a counter value
  *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ * @link   https://www.smarty.net/manual/en/language.function.counter.php {counter}
  *         (Smarty online manual)
  *
  * @param array                    $params   parameters
diff --git a/WEB-INF/lib/smarty/plugins/function.cycle.php b/WEB-INF/lib/smarty/plugins/function.cycle.php
index 07ffcc5e2..793569991 100644
--- a/WEB-INF/lib/smarty/plugins/function.cycle.php
+++ b/WEB-INF/lib/smarty/plugins/function.cycle.php
@@ -28,7 +28,7 @@
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
  *
- * @link    http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ * @link    https://www.smarty.net/manual/en/language.function.cycle.php {cycle}
  *           (Smarty online manual)
  * @author  Monte Ohrt <monte at ohrt dot com>
  * @author  credit to Mark Priatel <mpriatel@rogers.com>
diff --git a/WEB-INF/lib/smarty/plugins/function.fetch.php b/WEB-INF/lib/smarty/plugins/function.fetch.php
index 768761b23..4a3e88196 100644
--- a/WEB-INF/lib/smarty/plugins/function.fetch.php
+++ b/WEB-INF/lib/smarty/plugins/function.fetch.php
@@ -11,7 +11,7 @@
  * Name:     fetch
  * Purpose:  fetch file, web or ftp data and display results
  *
- * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ * @link   https://www.smarty.net/manual/en/language.function.fetch.php {fetch}
  *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
diff --git a/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php b/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php
index 302358edd..a8e7a07d8 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_checkboxes.php
@@ -29,7 +29,7 @@
  * - assign     (optional) - assign the output as an array to this variable
  * - escape     (optional) - escape the content (not value), defaults to true
  *
- * @link    http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ * @link    https://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
  *             (Smarty online manual)
  * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
  * @author  credits to Monte Ohrt <monte at ohrt dot com>
diff --git a/WEB-INF/lib/smarty/plugins/function.html_image.php b/WEB-INF/lib/smarty/plugins/function.html_image.php
index ad468e4f1..71bc63864 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_image.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_image.php
@@ -21,7 +21,7 @@
  * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
  * - path_prefix - prefix for path output (optional, default empty)
  *
- * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ * @link    https://www.smarty.net/manual/en/language.function.html.image.php {html_image}
  *          (Smarty online manual)
  * @author  Monte Ohrt <monte at ohrt dot com>
  * @author  credits to Duda <duda@big.hu>
diff --git a/WEB-INF/lib/smarty/plugins/function.html_options.php b/WEB-INF/lib/smarty/plugins/function.html_options.php
index 6907e8ee1..3e4335340 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_options.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_options.php
@@ -21,7 +21,7 @@
  * - id         (optional) - string default not set
  * - class      (optional) - string default not set
  *
- * @link   http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ * @link   https://www.smarty.net/manual/en/language.function.html.options.php {html_image}
  *           (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
diff --git a/WEB-INF/lib/smarty/plugins/function.html_radios.php b/WEB-INF/lib/smarty/plugins/function.html_radios.php
index 5e834587c..2223ff7ee 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_radios.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_radios.php
@@ -29,7 +29,7 @@
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
  *
- * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ * @link    https://www.smarty.net/manual/en/language.function.html.radios.php {html_radios}
  *          (Smarty online manual)
  * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
  * @author  credits to Monte Ohrt <monte at ohrt dot com>
diff --git a/WEB-INF/lib/smarty/plugins/function.html_select_date.php b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
index 86403e3dc..763fc60f9 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_select_date.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
@@ -28,7 +28,7 @@
  *            - 2.0 complete rewrite for performance,
  *              added attributes month_names, *_id
  *
- * @link    http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ * @link    https://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
  *           (Smarty online manual)
  * @version 2.0
  * @author  Andrei Zmievski
diff --git a/WEB-INF/lib/smarty/plugins/function.html_select_time.php b/WEB-INF/lib/smarty/plugins/function.html_select_time.php
index cb047bc0a..256b56b1c 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_select_time.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_select_time.php
@@ -11,7 +11,7 @@
  * Name:     html_select_time
  * Purpose:  Prints the dropdowns for time selection
  *
- * @link   http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ * @link   https://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
  *           (Smarty online manual)
  * @author Roberto Berto <roberto@berto.net>
  * @author Monte Ohrt <monte AT ohrt DOT com>
diff --git a/WEB-INF/lib/smarty/plugins/function.html_table.php b/WEB-INF/lib/smarty/plugins/function.html_table.php
index ae61e83dc..17b0586e2 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_table.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_table.php
@@ -38,7 +38,7 @@
  * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
  * @author  credit to boots <boots dot smarty at yahoo dot com>
  * @version 1.1
- * @link    http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ * @link    https://www.smarty.net/manual/en/language.function.html.table.php {html_table}
  *           (Smarty online manual)
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/function.mailto.php b/WEB-INF/lib/smarty/plugins/function.mailto.php
index 27351df82..834d0535a 100644
--- a/WEB-INF/lib/smarty/plugins/function.mailto.php
+++ b/WEB-INF/lib/smarty/plugins/function.mailto.php
@@ -36,7 +36,7 @@
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
  *
- * @link    http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ * @link    https://www.smarty.net/manual/en/language.function.mailto.php {mailto}
  *           (Smarty online manual)
  * @version 1.2
  * @author  Monte Ohrt <monte at ohrt dot com>
@@ -94,22 +94,19 @@ function smarty_function_mailto($params)
         );
         return;
     }
-    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
     if ($encode === 'javascript') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+	    $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
         $js_encode = '';
         for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
             $js_encode .= '%' . bin2hex($string[ $x ]);
         }
-        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
+        return '<script type="text/javascript">document.write(unescape(\'' . $js_encode . '\'))</script>';
     } elseif ($encode === 'javascript_charcode') {
         $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-        for ($x = 0, $y = strlen($string); $x < $y; $x++) {
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
             $ord[] = ord($string[ $x ]);
         }
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
-                implode(',', $ord) . "))" . "}\n" . "</script>\n";
-        return $_ret;
+	    return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
     } elseif ($encode === 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[ 2 ])) {
diff --git a/WEB-INF/lib/smarty/plugins/function.math.php b/WEB-INF/lib/smarty/plugins/function.math.php
index 7348d9649..fd5b3d166 100644
--- a/WEB-INF/lib/smarty/plugins/function.math.php
+++ b/WEB-INF/lib/smarty/plugins/function.math.php
@@ -12,7 +12,7 @@
  * Name:     math
  * Purpose:  handle math computations in template
  *
- * @link   http://www.smarty.net/manual/en/language.function.math.php {math}
+ * @link   https://www.smarty.net/manual/en/language.function.math.php {math}
  *           (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
@@ -28,7 +28,12 @@ function smarty_function_math($params, $template)
             'int'   => true,
             'abs'   => true,
             'ceil'  => true,
+            'acos'   => true,
+            'acosh'   => true,
             'cos'   => true,
+            'cosh'   => true,
+            'deg2rad'   => true,
+            'rad2deg'   => true,
             'exp'   => true,
             'floor' => true,
             'log'   => true,
@@ -39,27 +44,51 @@ function smarty_function_math($params, $template)
             'pow'   => true,
             'rand'  => true,
             'round' => true,
+            'asin'   => true,
+            'asinh'   => true,
             'sin'   => true,
+            'sinh'   => true,
             'sqrt'  => true,
             'srand' => true,
-            'tan'   => true
+            'atan'   => true,
+            'atanh'   => true,
+            'tan'   => true,
+            'tanh'   => true
         );
+
     // be sure equation parameter is present
     if (empty($params[ 'equation' ])) {
         trigger_error("math: missing equation parameter", E_USER_WARNING);
         return;
     }
     $equation = $params[ 'equation' ];
+
+    // Remove whitespaces
+    $equation = preg_replace('/\s+/', '', $equation);
+
+    // Adapted from https://www.php.net/manual/en/function.eval.php#107377
+    $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
+    $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
+    $operators = '[+\/*\^%-]'; // Allowed math operators
+    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)+\)|\((?1)+\)))(?:'.$operators.'(?1))?)+$/';
+
+    if (!preg_match($regexp, $equation)) {
+        trigger_error("math: illegal characters", E_USER_WARNING);
+        return;
+    }
+
     // make sure parenthesis are balanced
     if (substr_count($equation, '(') !== substr_count($equation, ')')) {
         trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
         return;
     }
+
     // disallow backticks
     if (strpos($equation, '`') !== false) {
         trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
         return;
     }
+
     // also disallow dollar signs
     if (strpos($equation, '$') !== false) {
         trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
@@ -96,6 +125,7 @@ function smarty_function_math($params, $template)
     }
     $smarty_math_result = null;
     eval("\$smarty_math_result = " . $equation . ";");
+
     if (empty($params[ 'format' ])) {
         if (empty($params[ 'assign' ])) {
             return $smarty_math_result;
diff --git a/WEB-INF/lib/smarty/plugins/modifier.date_format.php b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
index c8e88c5c9..8e7e0b6e1 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.date_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
@@ -15,7 +15,7 @@
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string $string       input date string
diff --git a/WEB-INF/lib/smarty/plugins/modifier.escape.php b/WEB-INF/lib/smarty/plugins/modifier.escape.php
index 150901c7c..47489aa98 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.escape.php
@@ -11,7 +11,7 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   http://www.smarty.net/docs/en/language.modifier.escape
+ * @link   https://www.smarty.net/docs/en/language.modifier.escape
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string  $string        input string
@@ -23,12 +23,9 @@
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
-    static $_double_encode = null;
+    static $_double_encode = true;
     static $is_loaded_1 = false;
     static $is_loaded_2 = false;
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
@@ -184,7 +181,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     '"'  => '\\"',
                     "\r" => '\\r',
                     "\n" => '\\n',
-                    '</' => '<\/'
+                    '</' => '<\/',
+                    // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+                    '<!--' => '<\!--',
+                    '<s'   => '<\s',
+                    '<S'   => '<\S'
                 )
             );
         case 'mail':
@@ -250,6 +251,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
             }
             return $return;
         default:
+            trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
             return $string;
     }
 }
diff --git a/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php b/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
index 1cd625b64..7c7bd875f 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.mb_wordwrap.php
@@ -11,7 +11,7 @@
  * Name:     mb_wordwrap
  * Purpose:  Wrap a string to a given number of characters
  *
- * @link   http://php.net/manual/en/function.wordwrap.php for similarity
+ * @link   https://php.net/manual/en/function.wordwrap.php for similarity
  *
  * @param string  $str   the string to wrap
  * @param int     $width the width of the output
diff --git a/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php b/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
index 7eb550695..cd57cdf33 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.regex_replace.php
@@ -11,7 +11,7 @@
  * Name:     regex_replace
  * Purpose:  regular expression search/replace
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ * @link   https://www.smarty.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifier.replace.php b/WEB-INF/lib/smarty/plugins/modifier.replace.php
index a98f5a4a6..71a7c632a 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.replace.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.replace.php
@@ -11,7 +11,7 @@
  * Name:     replace
  * Purpose:  simple search/replace
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifier.spacify.php b/WEB-INF/lib/smarty/plugins/modifier.spacify.php
index 98efd4b30..251dbe71b 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.spacify.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.spacify.php
@@ -11,7 +11,7 @@
  * Name:     spacify
  * Purpose:  add spaces between characters in a string
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string $string       input string
diff --git a/WEB-INF/lib/smarty/plugins/modifier.truncate.php b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
index bb881bf6e..33e7e53aa 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.truncate.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
@@ -13,7 +13,7 @@
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string  $string      input string
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php
index 21d0e6624..2c3a8b2a4 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.cat.php
@@ -14,7 +14,7 @@
  * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
  *           (Smarty online manual)
  * @author Uwe Tews
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php
index 6c44278af..b5d97e276 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_characters.php
@@ -11,7 +11,7 @@
  * Name:     count_characters
  * Purpose:  count the number of characters in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
  *         manual)
  * @author Uwe Tews
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
index e214a56f0..332402968 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
@@ -11,7 +11,7 @@
  * Name:     count_paragraphs
  * Purpose:  count the number of paragraphs in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_paragraphs (Smarty online manual)
  * @author Uwe Tews
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php
index 027745635..30e36e5f0 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_sentences.php
@@ -11,7 +11,7 @@
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_sentences (Smarty online manual)
  * @author Uwe Tews
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php
index 6d889da5c..cf2e50222 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.count_words.php
@@ -11,7 +11,7 @@
  * Name:     count_words
  * Purpose:  count the number of words in a text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php
index ae886c4b2..dffa7a986 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.default.php
@@ -11,7 +11,7 @@
  * Name:     default
  * Purpose:  designate default value for empty variables
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
@@ -26,7 +26,7 @@ function smarty_modifiercompiler_default($params)
     }
     array_shift($params);
     foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
+        $output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
     }
     return $output;
 }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
index e0763adce..70b95cc9d 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
@@ -11,7 +11,7 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
  *
  * @param array                                $params parameters
@@ -22,7 +22,7 @@
  */
 function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    static $_double_encode = null;
+    static $_double_encode = true;
     static $is_loaded = false;
     $compiler->template->_checkPlugins(
         array(
@@ -32,9 +32,6 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
             )
         )
     );
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
     try {
         $esc_type = smarty_literal_compiler_param($params, 1, 'html');
         $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
@@ -89,9 +86,10 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
                 return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
+                // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
                 return 'strtr(' .
                        $params[ 0 ] .
-                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
         }
     } catch (SmartyException $e) {
         // pass through to regular plugin fallback
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php
index 2088ad6a8..636f0edf1 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.indent.php
@@ -11,7 +11,7 @@
  * Name:     indent
  * Purpose:  indent lines of text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php
index 0d899a002..ac9cc39d7 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.lower.php
@@ -11,7 +11,7 @@
  * Name:     lower
  * Purpose:  convert string to lowercase
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
  *
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
index 663094311..8df5632c5 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.string_format.php
@@ -11,7 +11,7 @@
  * Name:     string_format
  * Purpose:  format strings via sprintf
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php
index 04ea332c5..51944bde6 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip.php
@@ -14,7 +14,7 @@
  * Example:  {$var|strip} {$var|strip:"&nbsp;"}
  * Date:     September 25th, 2002
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
index 1bca1a28e..6ee3df9a5 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
@@ -11,7 +11,7 @@
  * Name:     strip_tags
  * Purpose:  strip html tags from text
  *
- * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
+ * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
index ea4e95b7a..e12ae6769 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
@@ -11,7 +11,7 @@
  * Name:     lower
  * Purpose:  convert string to uppercase
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php
index 8565f140e..49cb40b0f 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.wordwrap.php
@@ -11,7 +11,7 @@
  * Name:     wordwrap
  * Purpose:  wrap a string of text at a given length
  *
- * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @link   https://www.smarty.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array                                 $params parameters
diff --git a/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php b/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php
index 7e4503a1c..2f747ad5a 100644
--- a/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php
+++ b/WEB-INF/lib/smarty/plugins/outputfilter.trimwhitespace.php
@@ -41,7 +41,7 @@ function smarty_outputfilter_trimwhitespace($source)
         }
     }
     // Strip all HTML-Comments
-    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
+    // yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
     $source = preg_replace('#<!--.*?-->#ms', '', $source);
     // capture html elements not to be messed with
     $_offset = 0;
diff --git a/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php b/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php
index 6b18d3eec..a204b092c 100644
--- a/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php
+++ b/WEB-INF/lib/smarty/plugins/shared.escape_special_chars.php
@@ -20,13 +20,7 @@
 function smarty_function_escape_special_chars($string)
 {
     if (!is_array($string)) {
-        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-        } else {
-            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-            $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-        }
+        $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
     }
     return $string;
 }
diff --git a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
index 206cf9ea6..226d9035d 100644
--- a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
+++ b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
@@ -44,7 +44,7 @@ function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
                 }
             }
         } else {
-            $parts = mb_split(preg_quote($search), $subject);
+            $parts = mb_split(preg_quote($search), $subject) ?: array();
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
         }
diff --git a/WEB-INF/lib/smarty/readme b/WEB-INF/lib/smarty/readme
new file mode 100644
index 000000000..91eff4784
--- /dev/null
+++ b/WEB-INF/lib/smarty/readme
@@ -0,0 +1,8 @@
+These are files from Smarty-4.1.0 with 2 modifications in:
+
+Smarty.class.php
+sysplugins/smarty_internal_cacheresource_file.php
+
+Nik edited these files for php5.4 support, as they use php7.0 features.
+
+
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
index 61618449d..f6879bc76 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -196,12 +196,8 @@ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $e
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            clearstatcache(true, $cached->lock_id);
-        } else {
-            clearstatcache();
-        }
-        if (is_file($cached->lock_id)) {
+        clearstatcache(true, $cached->lock_id ?: '');
+        if (null !== $cached->lock_id && is_file($cached->lock_id)) {
             $t = filemtime($cached->lock_id);
             return $t && (time() - $t < $smarty->locking_timeout);
         } else {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php
index 3f113e56d..969e22c1a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_for.php
@@ -18,7 +18,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
 {
     /**
      * Compiles code for the {for} tag
-     * Smarty 3 does implement two different syntax's:
+     * Smarty supports two different syntax's:
      * - {for $var in $array}
      * For looping over arrays or iterators
      * - {for $x=0; $x<$y; $x++}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
index a68da5409..edfe358be 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
@@ -219,9 +219,9 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if (isset($itemAttr[ 'index' ])) {
             $output .= "{$itemVar}->index = -1;\n";
         }
-	    $output .= "{$itemVar}->do_else = true;\n";
+        $output .= "{$itemVar}->do_else = true;\n";
         $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
-	    $output .= "{$itemVar}->do_else = false;\n";
+        $output .= "{$itemVar}->do_else = false;\n";
         if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
             $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
index d0f2b0f4a..84e9584d9 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
@@ -157,7 +157,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
             $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
             $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
             $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
-            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
             $output .= "}\n}\n";
             $output .= "/*/ {$_funcName}_nocache */\n\n";
             $output .= "?>\n";
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
deleted file mode 100644
index 1b0fdaad3..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include PHP
- * Compiles the {include_php} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('once', 'assign');
-
-    /**
-     * Compiles code for the {include_php} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        if (!($compiler->smarty instanceof SmartyBC)) {
-            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        /**
-         *
-         *
-         * @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        $_filepath = false;
-        $_file = null;
-        eval('$_file = @' . $_attr[ 'file' ] . ';');
-        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $compiler->smarty->_realpath($_file, true);
-        } else {
-            if (isset($compiler->smarty->security_policy)) {
-                $_dir = $compiler->smarty->security_policy->trusted_dir;
-            } else {
-                $_dir = $compiler->smarty->trusted_dir;
-            }
-            if (!empty($_dir)) {
-                foreach ((array)$_dir as $_script_dir) {
-                    $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
-                    if (file_exists($_path)) {
-                        $_filepath = $_path;
-                        break;
-                    }
-                }
-            }
-        }
-        if ($_filepath === false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
-        }
-        if (isset($compiler->smarty->security_policy)) {
-            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
-        }
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr[ 'assign' ];
-        }
-        $_once = '_once';
-        if (isset($_attr[ 'once' ])) {
-            if ($_attr[ 'once' ] === 'false') {
-                $_once = '';
-            }
-        }
-        if (isset($_assign)) {
-            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
-        } else {
-            return "<?php include{$_once} ('{$_filepath}');?>\n";
-        }
-    }
-}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
index 4bdc3952e..c91ff62cb 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -89,7 +89,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                 if (isset($compiler->smarty->security_policy)) {
                     $_dir = $compiler->smarty->security_policy->trusted_dir;
                 } else {
-                    $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
+                    $_dir = null;
                 }
                 if (!empty($_dir)) {
                     foreach ((array)$_dir as $_script_dir) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php
deleted file mode 100644
index ff48c6fbc..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_php.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile PHP Expression
- * Compiles any tag which will output an expression or variable
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile PHP Expression Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('code', 'type');
-
-    /**
-     * Compiles code for generating output from any expression
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->has_code = false;
-        if ($_attr[ 'type' ] === 'xml') {
-            $compiler->tag_nocache = true;
-            $output = addcslashes($_attr[ 'code' ], "'\\");
-            $compiler->parser->current_buffer->append_subtree(
-                $compiler->parser,
-                new Smarty_Internal_ParseTree_Tag(
-                    $compiler->parser,
-                    $compiler->processNocacheCode(
-                        "<?php echo '{$output}';?>\n",
-                        true
-                    )
-                )
-            );
-            return '';
-        }
-        if ($_attr[ 'type' ] !== 'tag') {
-            if ($compiler->php_handling === Smarty::PHP_REMOVE) {
-                return '';
-            } elseif ($compiler->php_handling === Smarty::PHP_QUOTE) {
-                $output =
-                    preg_replace_callback(
-                        '#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
-                        array($this, 'quote'),
-                        $_attr[ 'code' ]
-                    );
-                $compiler->parser->current_buffer->append_subtree(
-                    $compiler->parser,
-                    new Smarty_Internal_ParseTree_Text($output)
-                );
-                return '';
-            } elseif ($compiler->php_handling === Smarty::PHP_PASSTHRU || $_attr[ 'type' ] === 'unmatched') {
-                $compiler->tag_nocache = true;
-                $output = addcslashes($_attr[ 'code' ], "'\\");
-                $compiler->parser->current_buffer->append_subtree(
-                    $compiler->parser,
-                    new Smarty_Internal_ParseTree_Tag(
-                        $compiler->parser,
-                        $compiler->processNocacheCode(
-                            "<?php echo '{$output}';?>\n",
-                            true
-                        )
-                    )
-                );
-                return '';
-            } elseif ($compiler->php_handling === Smarty::PHP_ALLOW) {
-                if (!($compiler->smarty instanceof SmartyBC)) {
-                    $compiler->trigger_template_error(
-                        '$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
-                        null,
-                        true
-                    );
-                }
-                $compiler->has_code = true;
-                return $_attr[ 'code' ];
-            } else {
-                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
-            }
-        } else {
-            $compiler->has_code = true;
-            if (!($compiler->smarty instanceof SmartyBC)) {
-                $compiler->trigger_template_error(
-                    '{php}{/php} tags not allowed. Use SmartyBC to enable them',
-                    null,
-                    true
-                );
-            }
-            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
-            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
-            if (!empty($match[ 2 ])) {
-                if ('nocache' === trim($match[ 2 ])) {
-                    $compiler->tag_nocache = true;
-                } else {
-                    $compiler->trigger_template_error("illegal value of option flag '{$match[2]}'", null, true);
-                }
-            }
-            return preg_replace(
-                array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
-                array('<?php ', '?>'),
-                $_attr[ 'code' ]
-            );
-        }
-    }
-
-    /**
-     * Lexer code for PHP tags
-     *
-     * This code has been moved from lexer here fo easier debugging and maintenance
-     *
-     * @param Smarty_Internal_Templatelexer $lex
-     *
-     * @throws \SmartyCompilerException
-     */
-    public function parsePhp(Smarty_Internal_Templatelexer $lex)
-    {
-        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
-        $close = 0;
-        $lex->taglineno = $lex->line;
-        $closeTag = '?>';
-        if (strpos($lex->value, '<?xml') === 0) {
-            $lex->is_xml = true;
-            $lex->phpType = 'xml';
-            return;
-        } elseif (strpos($lex->value, '<?') === 0) {
-            $lex->phpType = 'php';
-        } elseif (strpos($lex->value, '<%') === 0) {
-            $lex->phpType = 'asp';
-            $closeTag = '%>';
-        } elseif (strpos($lex->value, '%>') === 0) {
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '?>') === 0) {
-            if ($lex->is_xml) {
-                $lex->is_xml = false;
-                $lex->phpType = 'xml';
-                return;
-            }
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '<s') === 0) {
-            $lex->phpType = 'script';
-            $closeTag = '</script>';
-        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
-            if ($lex->isAutoLiteral()) {
-                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
-                return;
-            }
-            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
-            if ($lex->value === $closeTag) {
-                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
-            }
-            $lex->phpType = 'tag';
-        }
-        if ($lex->phpType === 'unmatched') {
-            return;
-        }
-        if (($lex->phpType === 'php' || $lex->phpType === 'asp')
-            &&
-            ($lex->compiler->php_handling === Smarty::PHP_PASSTHRU ||
-             $lex->compiler->php_handling === Smarty::PHP_QUOTE)
-        ) {
-            return;
-        }
-        $start = $lex->counter + strlen($lex->value);
-        $body = true;
-        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[ 0 ][ 1 ];
-        } else {
-            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-        }
-        while ($body) {
-            if (preg_match(
-                '~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
-                $lex->data,
-                $match,
-                PREG_OFFSET_CAPTURE,
-                $start
-            )
-            ) {
-                $value = $match[ 0 ][ 0 ];
-                $from = $pos = $match[ 0 ][ 1 ];
-                if ($pos > $close) {
-                    $body = false;
-                } else {
-                    $start = $pos + strlen($value);
-                    $phpCommentStart = $value === '/*';
-                    if ($phpCommentStart) {
-                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
-                        if ($phpCommentEnd) {
-                            $pos2 = $match[ 0 ][ 1 ];
-                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
-                        }
-                    }
-                    while ($close > $pos && $close < $start) {
-                        if (preg_match(
-                            '~' . preg_quote($closeTag, '~') . '~i',
-                            $lex->data,
-                            $match,
-                            PREG_OFFSET_CAPTURE,
-                            $from
-                        )
-                        ) {
-                            $close = $match[ 0 ][ 1 ];
-                            $from = $close + strlen($match[ 0 ][ 0 ]);
-                        } else {
-                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-                        }
-                    }
-                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
-                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
-                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
-                    }
-                }
-            } else {
-                $body = false;
-            }
-        }
-        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
-    }
-
-    /*
-     * Call back function for $php_handling = PHP_QUOTE
-     *
-     */
-    /**
-     * @param $match
-     *
-     * @return string
-     */
-    private function quote($match)
-    {
-        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
-    }
-}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
index 90c5dcefa..a9b940e5a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -158,7 +158,7 @@ public function compileTemplate(Smarty_Internal_Template $template)
         }
         // template header code
         $template_header =
-            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . date("Y-m-d H:i:s") .
             "\n";
         $template_header .= "         compiled from '{$this->template->source->filepath}' */ ?>\n";
         $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
index 98e3e57b3..1b64185b8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_data.php
@@ -121,7 +121,7 @@ public function assign($tpl_var, $value = null, $nocache = false)
      * appends values to template variables
      *
      * @api  Smarty::append()
-     * @link http://www.smarty.net/docs/en/api.append.tpl
+     * @link https://www.smarty.net/docs/en/api.append.tpl
      *
      * @param array|string $tpl_var the template variable name(s)
      * @param mixed        $value   the value to append
@@ -182,7 +182,7 @@ public function assignByRef($tpl_var, &$value, $nocache = false)
      * Returns a single or all template variables
      *
      * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
      * @param string                                                  $varName       variable name or null
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
@@ -195,26 +195,6 @@ public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = nu
         return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
     }
 
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param string               $variable      the name of the Smarty variable
-     * @param Smarty_Internal_Data $_ptr          optional pointer to data object
-     * @param boolean              $searchParents search also in parent data
-     * @param bool                 $error_enable
-     *
-     * @return     Smarty_Variable|Smarty_Undefined_Variable the object of the variable
-     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
-     */
-    public function getVariable(
-        $variable = null,
-        Smarty_Internal_Data $_ptr = null,
-        $searchParents = true,
-        $error_enable = true
-    ) {
-        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
-    }
-
     /**
      * Follow the parent chain an merge template and config variables
      *
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
index 56dca18fa..c2b653ef4 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_errorhandler.php
@@ -1,61 +1,60 @@
 <?php
 
 /**
- * Smarty error handler
+ * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
  *
  * @package    Smarty
  * @subpackage PluginsInternal
- * @author     Uwe Tews
+ * @author     Simon Wisselink
  *
- * @deprecated
-Smarty does no longer use @filemtime()
  */
 class Smarty_Internal_ErrorHandler
 {
+
     /**
-     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
+     * Allows {$foo} where foo is unset.
+     * @var bool
      */
-    public static $mutedDirectories = array();
+    public $allowUndefinedVars = true;
 
     /**
-     * error handler returned by set_error_handler() in self::muteExpectedErrors()
+     * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
+     * @var bool
      */
-    private static $previousErrorHandler = null;
+    public $allowUndefinedArrayKeys = true;
+
+    private $previousErrorHandler = null;
 
     /**
-     * Enable error handler to mute expected messages
-     *
+     * Enable error handler to intercept errors
      */
-    public static function muteExpectedErrors()
-    {
+    public function activate() {
         /*
-            error muting is done because some people implemented custom error_handlers using
-            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
+            Error muting is done because some people implemented custom error_handlers using
+            https://php.net/set_error_handler and for some reason did not understand the following paragraph:
 
-                It is important to remember that the standard PHP error handler is completely bypassed for the
-                error types specified by error_types unless the callback function returns FALSE.
-                error_reporting() settings will have no effect and your error handler will be called regardless -
-                however you are still able to read the current value of error_reporting and act appropriately.
-                Of particular note is that this value will be 0 if the statement that caused the error was
-                prepended by the @ error-control operator.
-
-            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
-                - @filemtime() is almost twice as fast as using an additional file_exists()
-                - between file_exists() and filemtime() a possible race condition is opened,
-                  which does not exist using the simple @filemtime() approach.
+            It is important to remember that the standard PHP error handler is completely bypassed for the
+            error types specified by error_types unless the callback function returns FALSE.
+            error_reporting() settings will have no effect and your error handler will be called regardless -
+            however you are still able to read the current value of error_reporting and act appropriately.
+            Of particular note is that this value will be 0 if the statement that caused the error was
+            prepended by the @ error-control operator.
         */
-        $error_handler = array('Smarty_Internal_ErrorHandler', 'mutingErrorHandler');
-        $previous = set_error_handler($error_handler);
-        // avoid dead loops
-        if ($previous !== $error_handler) {
-            self::$previousErrorHandler = $previous;
-        }
+        $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
+    }
+
+    /**
+     * Disable error handler
+     */
+    public function deactivate() {
+        restore_error_handler();
+        $this->previousErrorHandler = null;
     }
 
     /**
      * Error Handler to mute expected messages
      *
-     * @link http://php.net/set_error_handler
+     * @link https://php.net/set_error_handler
      *
      * @param integer $errno Error level
      * @param         $errstr
@@ -65,49 +64,21 @@ public static function muteExpectedErrors()
      *
      * @return bool
      */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext = array())
+    public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
     {
-        $_is_muted_directory = false;
-        // add the SMARTY_DIR to the list of muted directories
-        if (!isset(self::$mutedDirectories[ SMARTY_DIR ])) {
-            $smarty_dir = realpath(SMARTY_DIR);
-            if ($smarty_dir !== false) {
-                self::$mutedDirectories[ SMARTY_DIR ] =
-                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
-            }
+        if ($this->allowUndefinedVars && $errstr == 'Attempt to read property "value" on null') {
+            return; // suppresses this error
         }
-        // walk the muted directories and test against $errfile
-        foreach (self::$mutedDirectories as $key => &$dir) {
-            if (!$dir) {
-                // resolve directory and length for speedy comparisons
-                $file = realpath($key);
-                if ($file === false) {
-                    // this directory does not exist, remove and skip it
-                    unset(self::$mutedDirectories[ $key ]);
-                    continue;
-                }
-                $dir = array('file' => $file, 'length' => strlen($file),);
-            }
-            if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
-                $_is_muted_directory = true;
-                break;
-            }
-        }
-        // pass to next error handler if this error did not occur inside SMARTY_DIR
-        // or the error was within smarty but masked to be ignored
-        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
-            if (self::$previousErrorHandler) {
-                return call_user_func(
-                    self::$previousErrorHandler,
-                    $errno,
-                    $errstr,
-                    $errfile,
-                    $errline,
-                    $errcontext
-                );
-            } else {
-                return false;
-            }
+
+        if ($this->allowUndefinedArrayKeys && preg_match(
+            '/^(Undefined array key|Trying to access array offset on value of type null)/',
+            $errstr
+        )) {
+            return; // suppresses this error
         }
+
+        // pass all other errors through to the previous error handler or to the default PHP error handler
+        return $this->previousErrorHandler ?
+            call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline, $errcontext) : false;
     }
 }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php
index 881375efe..e207734e8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_append.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_Append
      * appends values to template variables
      *
      * @api  Smarty::append()
-     * @link http://www.smarty.net/docs/en/api.append.tpl
+     * @link https://www.smarty.net/docs/en/api.append.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param array|string                                            $tpl_var the template variable name(s)
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php
index c95904460..b5be69b54 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_appendbyref.php
@@ -15,7 +15,7 @@ class Smarty_Internal_Method_AppendByRef
      * appends values to template variables by reference
      *
      * @api  Smarty::appendByRef()
-     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
+     * @link https://www.smarty.net/docs/en/api.append.by.ref.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $tpl_var the template variable name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php
index 29ff2ffb0..6fb0c8f3d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallassign.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAllAssign
      * clear all the assigned template variables.
      *
      * @api  Smarty::clearAllAssign()
-     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.all.assign.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      *
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php
index 30d55f7d2..b74d30580 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearallcache.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAllCache
      * Empty cache folder
      *
      * @api  Smarty::clearAllCache()
-     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.all.cache.tpl
      *
      * @param \Smarty $smarty
      * @param integer $exp_time expiration time
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php
index 22bfa2d31..12b755c06 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearassign.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAssign
      * clear the given assigned template variable(s).
      *
      * @api  Smarty::clearAssign()
-     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.assign.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string|array                                            $tpl_var the template variable(s) to clear
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php
index a5dd4e26e..df766eee8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcache.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearCache
      * Empty cache for a specific template
      *
      * @api  Smarty::clearCache()
-     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.cache.tpl
      *
      * @param \Smarty $smarty
      * @param string  $template_name template name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php
index bf4929807..db0a49b00 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearCompiledTemplate
      * Delete compiled template file
      *
      * @api  Smarty::clearCompiledTemplate()
-     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.compiled.template.tpl
      *
      * @param \Smarty $smarty
      * @param string  $resource_name template name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php
index 15bf492a1..d1b730322 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_clearconfig.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearConfig
      * clear a single or all config variables
      *
      * @api  Smarty::clearConfig()
-     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+     * @link https://www.smarty.net/docs/en/api.clear.config.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string|null                                             $name variable name or null
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php
index 2e6254880..c3174d2d0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_configload.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ConfigLoad
      * load a config file, optionally load just selected sections
      *
      * @api  Smarty::configLoad()
-     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     * @link https://www.smarty.net/docs/en/api.config.load.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $config_file filename
@@ -42,7 +42,7 @@ public function configLoad(Smarty_Internal_Data $data, $config_file, $sections =
      * load a config file, optionally load just selected sections
      *
      * @api  Smarty::configLoad()
-     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     * @link https://www.smarty.net/docs/en/api.config.load.tpl
      *
      * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
      * @param string                                                  $config_file filename
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php
index f95097519..c684c0870 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_createdata.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_CreateData
      * creates a data object
      *
      * @api  Smarty::createData()
-     * @link http://www.smarty.net/docs/en/api.create.data.tpl
+     * @link https://www.smarty.net/docs/en/api.create.data.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
      * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php
index 1d11e44c1..763bdf989 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getconfigvars.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetConfigVars
      * Returns a single or all config variables
      *
      * @api  Smarty::getConfigVars()
-     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
+     * @link https://www.smarty.net/docs/en/api.get.config.vars.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $varname        variable name or null
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php
index df6ede130..0b3a071d3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetRegisteredObject
      * return a reference to a registered object
      *
      * @api  Smarty::getRegisteredObject()
-     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
+     * @link https://www.smarty.net/docs/en/api.get.registered.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name object name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php
index c07ae07ec..0d1335a8d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettags.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetTags
      * Return array of tag/attributes of all tags used by an template
      *
      * @api  Smarty::getTags()
-     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
+     * @link https://www.smarty.net/docs/en/api.get.tags.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param null|string|Smarty_Internal_Template                            $template
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php
index 9ef7d46bb..0470785b1 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetTemplateVars
      * Returns a single or all template variables
      *
      * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $varName       variable name or null
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php
index 66d80d474..af788a24e 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadfilter.php
@@ -30,7 +30,7 @@ class Smarty_Internal_Method_LoadFilter
      *
      * @api  Smarty::loadFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php
index 648365619..5608b3fd0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registercacheresource.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterCacheResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::registerCacheResource()
-     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     * @link https://www.smarty.net/docs/en/api.register.cacheresource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $name name of resource type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php
index 8d18547e2..76a69c6e5 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerclass.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterClass
      * Registers static classes to be used in templates
      *
      * @api  Smarty::registerClass()
-     * @link http://www.smarty.net/docs/en/api.register.class.tpl
+     * @link https://www.smarty.net/docs/en/api.register.class.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $class_name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
index a9fb78dc6..4cda5b056 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterDefaultPluginHandler
      * Registers a default plugin handler
      *
      * @api  Smarty::registerDefaultPluginHandler()
-     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     * @link https://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param callable                                                        $callback class/method name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php
index c0f9fff10..9719eb2b6 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerfilter.php
@@ -30,7 +30,7 @@ class Smarty_Internal_Method_RegisterFilter
      *
      * @api  Smarty::registerFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php
index 4646e4f22..8e6fe0521 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerobject.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterObject
      * Registers object to be used in templates
      *
      * @api  Smarty::registerObject()
-     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     * @link https://www.smarty.net/docs/en/api.register.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php
index ed18d84bb..74c0ae908 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerplugin.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterPlugin
      * Registers plugin to be used in templates
      *
      * @api  Smarty::registerPlugin()
-     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type       plugin type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
index 7c7d0f78a..302657ae0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_registerresource.php
@@ -22,25 +22,18 @@ class Smarty_Internal_Method_RegisterResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::registerResource()
-     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+     * @link https://www.smarty.net/docs/en/api.register.resource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $name             name of resource type
-     * @param Smarty_Resource|array                                           $resource_handler or instance of
-     *                                                                                          Smarty_Resource,
-     *                                                                                          or array of
-     *                                                                                          callbacks to
-     *                                                                                          handle
-     *                                                                                          resource
-     *                                                                                          (deprecated)
+     * @param Smarty_Resource                                           $resource_handler instance of Smarty_Resource
      *
      * @return \Smarty|\Smarty_Internal_Template
      */
-    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_Resource $resource_handler)
     {
         $smarty = $obj->_getSmartyObj();
-        $smarty->registered_resources[ $name ] =
-            $resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
+        $smarty->registered_resources[ $name ] = $resource_handler;
         return $obj;
     }
 }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php
index 55e1596be..e41e8dffc 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unloadfilter.php
@@ -16,7 +16,7 @@ class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFil
      *
      * @api  Smarty::unloadFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.unload.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php
index b99903867..377397e97 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterCacheResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::unregisterCacheResource()
-     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param                                                                 $name
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php
index 9cb494a52..ebc9337d0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -16,7 +16,7 @@ class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_Reg
      *
      * @api  Smarty::unregisterFilter()
      *
-     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php
index 1e592b339..77d619637 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterobject.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterObject
      * Registers plugin to be used in templates
      *
      * @api  Smarty::unregisterObject()
-     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name name of object
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php
index f39e31678..2431d5c23 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterPlugin
      * Registers plugin to be used in templates
      *
      * @api  Smarty::unregisterPlugin()
-     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.plugin.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type plugin type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php
index a79db4299..bbb6a861d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_unregisterresource.php
@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::unregisterResource()
-     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
+     * @link https://www.smarty.net/docs/en/api.unregister.resource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type name of resource type
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
index ab4c3ec3b..829c420fe 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_template.php
@@ -87,83 +87,83 @@ public function to_smarty_php(Smarty_Internal_Templateparser $parser)
         $code = '';
 
         foreach ($this->getChunkedSubtrees() as $chunk) {
-	        $text = '';
-	        switch ($chunk['mode']) {
-		        case 'textstripped':
-			        foreach ($chunk['subtrees'] as $subtree) {
-				        $text .= $subtree->to_smarty_php($parser);
-			        }
-			        $code .= preg_replace(
-				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
-				        "<?php echo '\$1'; ?>\n",
-				        $parser->compiler->processText($text)
-			        );
-			        break;
-		        case 'text':
-			        foreach ($chunk['subtrees'] as $subtree) {
-				        $text .= $subtree->to_smarty_php($parser);
-			        }
-			        $code .= preg_replace(
-				        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
-				        "<?php echo '\$1'; ?>\n",
-				        $text
-			        );
-			        break;
-		        case 'tag':
-			        foreach ($chunk['subtrees'] as $subtree) {
-				        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
-			        }
-			        $code .= $text;
-			        break;
-		        default:
-			        foreach ($chunk['subtrees'] as $subtree) {
-				        $text = $subtree->to_smarty_php($parser);
-			        }
-			        $code .= $text;
+            $text = '';
+            switch ($chunk['mode']) {
+                case 'textstripped':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text .= $subtree->to_smarty_php($parser);
+                    }
+                    $code .= preg_replace(
+                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                        "<?php echo '\$1'; ?>\n",
+                        $parser->compiler->processText($text)
+                    );
+                    break;
+                case 'text':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text .= $subtree->to_smarty_php($parser);
+                    }
+                    $code .= preg_replace(
+                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                        "<?php echo '\$1'; ?>\n",
+                        $text
+                    );
+                    break;
+                case 'tag':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
+                    }
+                    $code .= $text;
+                    break;
+                default:
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text = $subtree->to_smarty_php($parser);
+                    }
+                    $code .= $text;
 
-	        }
+            }
         }
         return $code;
     }
 
     private function getChunkedSubtrees() {
-    	$chunks = array();
-    	$currentMode = null;
-    	$currentChunk = array();
-	    for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+        $chunks = array();
+        $currentMode = null;
+        $currentChunk = array();
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
 
-	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
-	    		continue;
-	    	}
+            if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
+                continue;
+            }
 
-		    if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
-			    && $this->subtrees[ $key ]->isToBeStripped()) {
-		    	$newMode = 'textstripped';
-		    } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
-			    $newMode = 'text';
-		    } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
-			    $newMode = 'tag';
-		    } else {
-			    $newMode = 'other';
-		    }
+            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
+                && $this->subtrees[ $key ]->isToBeStripped()) {
+                $newMode = 'textstripped';
+            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
+                $newMode = 'text';
+            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
+                $newMode = 'tag';
+            } else {
+                $newMode = 'other';
+            }
 
-		    if ($newMode == $currentMode) {
-			    $currentChunk[] = $this->subtrees[ $key ];
-		    } else {
-		    	$chunks[] = array(
-		    		'mode' => $currentMode,
-				    'subtrees' => $currentChunk
-			    );
-		    	$currentMode = $newMode;
-			    $currentChunk = array($this->subtrees[ $key ]);
-		    }
-	    }
-	    if ($currentMode && $currentChunk) {
-		    $chunks[] = array(
-			    'mode' => $currentMode,
-			    'subtrees' => $currentChunk
-		    );
-	    }
-		return $chunks;
+            if ($newMode == $currentMode) {
+                $currentChunk[] = $this->subtrees[ $key ];
+            } else {
+                $chunks[] = array(
+                    'mode' => $currentMode,
+                    'subtrees' => $currentChunk
+                );
+                $currentMode = $newMode;
+                $currentChunk = array($this->subtrees[ $key ]);
+            }
+        }
+        if ($currentMode && $currentChunk) {
+            $chunks[] = array(
+                'mode' => $currentMode,
+                'subtrees' => $currentChunk
+            );
+        }
+        return $chunks;
     }
 }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php
index 399e84941..58116c811 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_parsetree_text.php
@@ -17,30 +17,30 @@
 class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
 {
 
-	/**
-	 * Wether this section should be stripped on output to smarty php
-	 * @var bool
-	 */
-	private $toBeStripped = false;
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @var bool
+     */
+    private $toBeStripped = false;
 
-	/**
-	 * Create template text buffer
-	 *
-	 * @param string $data text
-	 * @param bool $toBeStripped wether this section should be stripped on output to smarty php
-	 */
+    /**
+     * Create template text buffer
+     *
+     * @param string $data text
+     * @param bool $toBeStripped wether this section should be stripped on output to smarty php
+     */
     public function __construct($data, $toBeStripped = false)
     {
         $this->data = $data;
         $this->toBeStripped = $toBeStripped;
     }
 
-	/**
-	 * Wether this section should be stripped on output to smarty php
-	 * @return bool
-	 */
-	public function isToBeStripped() {
-    	return $this->toBeStripped;
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @return bool
+     */
+    public function isToBeStripped() {
+        return $this->toBeStripped;
     }
 
     /**
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php
deleted file mode 100644
index df526101f..000000000
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_registered.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Registered
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Registered
- * Implements the registered resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @deprecated
- */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $source->type . ':' . $source->name;
-        $source->uid = sha1($source->filepath . $source->smarty->_joined_template_dir);
-        $source->timestamp = $this->getTemplateTimestamp($source);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = $this->getTemplateTimestamp($source);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Get timestamp (epoch) the template source was modified
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
-     */
-    public function getTemplateTimestamp(Smarty_Template_Source $source)
-    {
-        // return timestamp
-        $time_stamp = false;
-        call_user_func_array(
-            $source->smarty->registered_resources[ $source->type ][ 0 ][ 1 ],
-            array($source->name, &$time_stamp, $source->smarty)
-        );
-        return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
-    }
-
-    /**
-     * Load template's source by invoking the registered callback into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        // return template string
-        $content = null;
-        $t = call_user_func_array(
-            $source->smarty->registered_resources[ $source->type ][ 0 ][ 0 ],
-            array($source->name, &$content, $source->smarty)
-        );
-        if (is_bool($t) && !$t) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-        return $content;
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
-}
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php
index 9956bd073..5f0203498 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_resource_stream.php
@@ -13,7 +13,7 @@
  * Smarty Internal Plugin Resource Stream
  * Implements the streams as resource for Smarty template
  *
- * @link       http://php.net/streams
+ * @link       https://php.net/streams
  * @package    Smarty
  * @subpackage TemplateResources
  */
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
index 983ca6180..b5361c9bb 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
@@ -45,7 +45,7 @@ public function create(
             $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
         }
         $output = "<?php\n";
-        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . strftime("%Y-%m-%d %H:%M:%S") .
+        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . date("Y-m-d H:i:s") .
                    "\n  from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
         $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
         $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
index 200c11bb5..2ffb896fa 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
@@ -138,7 +138,7 @@ public function display($template = null, $cache_id = null, $compile_id = null,
      * test if cache is valid
      *
      * @api  Smarty::isCached()
-     * @link http://www.smarty.net/docs/en/api.is.cached.tpl
+     * @link https://www.smarty.net/docs/en/api.is.cached.tpl
      *
      * @param null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template
      *                                                          object
@@ -199,6 +199,12 @@ private function _execute($template, $cache_id, $compile_id, $parent, $function)
         try {
             $_smarty_old_error_level =
                 isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
+
+            if ($smarty->isMutingUndefinedOrNullWarnings()) {
+                $errorHandler = new Smarty_Internal_ErrorHandler();
+                $errorHandler->activate();
+            }
+
             if ($this->_objType === 2) {
                 /* @var Smarty_Internal_Template $this */
                 $template->tplFunctions = $this->tplFunctions;
@@ -242,6 +248,11 @@ private function _execute($template, $cache_id, $compile_id, $parent, $function)
                     }
                 }
             }
+
+            if (isset($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
             if (isset($_smarty_old_error_level)) {
                 error_reporting($_smarty_old_error_level);
             }
@@ -250,6 +261,10 @@ private function _execute($template, $cache_id, $compile_id, $parent, $function)
             while (ob_get_level() > $level) {
                 ob_end_clean();
             }
+            if (isset($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
             if (isset($_smarty_old_error_level)) {
                 error_reporting($_smarty_old_error_level);
             }
@@ -261,7 +276,7 @@ private function _execute($template, $cache_id, $compile_id, $parent, $function)
      * Registers plugin to be used in templates
      *
      * @api  Smarty::registerPlugin()
-     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
      *
      * @param string   $type       plugin type
      * @param string   $name       name of template tag
@@ -281,7 +296,7 @@ public function registerPlugin($type, $name, $callback, $cacheable = true, $cach
      * load a filter of specified type and name
      *
      * @api  Smarty::loadFilter()
-     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
      *
      * @param string $type filter type
      * @param string $name filter name
@@ -298,7 +313,7 @@ public function loadFilter($type, $name)
      * Registers a filter function
      *
      * @api  Smarty::registerFilter()
-     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
      *
      * @param string      $type filter type
      * @param callable    $callback
@@ -316,7 +331,7 @@ public function registerFilter($type, $callback, $name = null)
      * Registers object to be used in templates
      *
      * @api  Smarty::registerObject()
-     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     * @link https://www.smarty.net/docs/en/api.register.object.tpl
      *
      * @param string $object_name
      * @param object $object                     the referenced PHP object to register
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
index 3cc957dec..272616148 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -203,13 +203,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
      */
     public $blockOrFunctionCode = '';
 
-    /**
-     * php_handling setting either from Smarty or security
-     *
-     * @var int
-     */
-    public $php_handling = 0;
-
     /**
      * flags for used modifier plugins
      *
@@ -438,11 +431,6 @@ public function compileTemplateSource(
                 }
                 $this->smarty->_debug->start_compile($this->template);
             }
-            if (isset($this->template->smarty->security_policy)) {
-                $this->php_handling = $this->template->smarty->security_policy->php_handling;
-            } else {
-                $this->php_handling = $this->template->smarty->php_handling;
-            }
             $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
             $nocache = isset($nocache) ? $nocache : false;
             if (empty($template->compiled->nocache_hash)) {
@@ -627,11 +615,11 @@ public function compilePHPFunctionCall($name, $parameter)
                         $this->trigger_template_error('Illegal number of parameter in "isset()"');
                     }
 
-	                $pa = array();
-	                foreach ($parameter as $p) {
-		                $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
-	                }
-	                return '(' . implode(' && ', $pa) . ')';
+                    $pa = array();
+                    foreach ($parameter as $p) {
+                        $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
+                    }
+                    return '(' . implode(' && ', $pa) . ')';
 
                 } elseif (in_array(
                     $func_name,
@@ -649,12 +637,8 @@ public function compilePHPFunctionCall($name, $parameter)
                         $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
                     }
                     if ($func_name === 'empty') {
-                        if (!$this->syntaxMatchesVariable($parameter[0]) && version_compare(PHP_VERSION, '5.5.0', '<')) {
-                            return '(' . $parameter[ 0 ] . ' === false )';
-                        } else {
-                            return $func_name . '(' .
-                                   str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
-                        }
+                        return $func_name . '(' .
+                               str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
                     } else {
                         return $func_name . '(' . $parameter[ 0 ] . ')';
                     }
@@ -667,16 +651,16 @@ public function compilePHPFunctionCall($name, $parameter)
         }
     }
 
-	/**
-	 * Determines whether the passed string represents a valid (PHP) variable.
-	 * This is important, because `isset()` only works on variables and `empty()` can only be passed
-	 * a variable prior to php5.5
-	 * @param $string
-	 * @return bool
-	 */
-	private function syntaxMatchesVariable($string) {
-    	static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
-    	return 1 === preg_match($regex_pattern, trim($string));
+    /**
+     * Determines whether the passed string represents a valid (PHP) variable.
+     * This is important, because `isset()` only works on variables and `empty()` can only be passed
+     * a variable prior to php5.5
+     * @param $string
+     * @return bool
+     */
+    private function syntaxMatchesVariable($string) {
+        static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
+        return 1 === preg_match($regex_pattern, trim($string));
     }
 
     /**
@@ -691,11 +675,11 @@ public function processText($text)
     {
 
         if (strpos($text, '<') === false) {
-        	return preg_replace($this->stripRegEx, '', $text);
+            return preg_replace($this->stripRegEx, '', $text);
         }
 
-	    $store = array();
-	    $_store = 0;
+        $store = array();
+        $_store = 0;
 
         // capture html elements not to be messed with
         $_offset = 0;
@@ -1151,7 +1135,7 @@ public function trigger_template_error($args = null, $line = null, $tagline = nu
             flush();
         }
         $e = new SmartyCompilerException($error_text);
-        $e->line = $line;
+        $e->setLine($line);
         $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
         $e->desc = $args;
         $e->template = $this->template->source->filepath;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
index 867a31d26..5ca482058 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -18,12 +18,6 @@
  */
 class Smarty_Internal_Templatelexer
 {
-    const TEXT               = 1;
-    const TAG                = 2;
-    const TAGBODY            = 3;
-    const LITERAL            = 4;
-    const DOUBLEQUOTEDSTRING = 5;
-
     /**
      * Source
      *
@@ -80,7 +74,7 @@ class Smarty_Internal_Templatelexer
      */
     public $phpType = '';
 
-    /**
+   /**
      * state number
      *
      * @var int
@@ -229,10 +223,6 @@ class Smarty_Internal_Templatelexer
      */
     private $yy_global_literal = null;
 
-    private $_yy_state         = 1;
-
-    private $_yy_stack         = array();
-
     /**
      * constructor
      *
@@ -245,14 +235,14 @@ public function __construct($source, Smarty_Internal_TemplateCompilerBase $compi
         $this->dataLength = strlen($this->data);
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
-            $this->counter += strlen($match[ 0 ]);
+            $this->counter += strlen($match[0]);
         }
         $this->line = 1;
         $this->smarty = $compiler->template->smarty;
         $this->compiler = $compiler;
         $this->compiler->initDelimiterPreg();
-        $this->smarty_token_names[ 'LDEL' ] = $this->smarty->getLeftDelimiter();
-        $this->smarty_token_names[ 'RDEL' ] = $this->smarty->getRightDelimiter();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
     }
 
     /**
@@ -265,17 +255,17 @@ public function PrintTrace()
         $this->yyTracePrompt = '<br>';
     }
 
-    /**
+   /**
      * replace placeholders with runtime preg  code
      *
      * @param string $preg
      *
      * @return string
      */
-    public function replace($preg)
-    {
+   public function replace($preg)
+   {
         return $this->compiler->replaceDelimiter($preg);
-    }
+   }
 
     /**
      * check if current value is an autoliteral left delimiter
@@ -286,7 +276,11 @@ public function isAutoLiteral()
     {
         return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
             strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
-    } // end function
+    }
+
+     
+    private $_yy_state = 1;
+    private $_yy_stack = array();
 
     public function yylex()
     {
@@ -296,62 +290,60 @@ public function yylex()
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
     public function yypopstate()
     {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
-        $this->_yy_state = array_pop($this->_yy_stack);
+       $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
+
     }
 
     public function yybegin($state)
     {
-        $this->_yy_state = $state;
+       $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
+
+     
     public function yylex1()
     {
         if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 =
-                $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[\/]phpSMARTYrdel)|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>])|\G([\S\s])/isS");
+            $this->yy_global_pattern1 = $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state TEXT');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -369,110 +361,102 @@ public function yylex1()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const TEXT = 1;
     public function yy_r1_1()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r1_2()
     {
-        $to = $this->dataLength;
-        preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/", $this->data, $match, PREG_OFFSET_CAPTURE,
-            $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
+
+       $to = $this->dataLength;
+       preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
         } else {
-            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
         }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
         return false;
-    }
-
+         }
     public function yy_r1_4()
     {
-        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
-    }
 
-    public function yy_r1_8()
-    {
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r1_10()
+         }
+    public function yy_r1_6()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
         $this->yypushstate(self::LITERAL);
-    }
-
-    public function yy_r1_12()
+         }
+    public function yy_r1_8()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
         $this->yypushstate(self::LITERAL);
-    } // end function
-
-    public function yy_r1_14()
+         }
+    public function yy_r1_10()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
-    public function yy_r1_16()
+         }
+    public function yy_r1_12()
     {
-        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
-    }
 
-    public function yy_r1_19()
-    {
-        if (!isset($this->yy_global_text)) {
-            $this->yy_global_text =
-                $this->replace('/(SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*[>]|[?][>]|[%][>]SMARTYliteral/isS');
-        }
-        $to = $this->dataLength;
-        preg_match($this->yy_global_text, $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
 
+     
     public function yylex2()
     {
         if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 =
-                $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
+            $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state TAG');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -490,79 +474,82 @@ public function yylex2()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const TAG = 2;
     public function yy_r2_1()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_4()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_6()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_8()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_10()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_12()
     {
+
         $this->yypopstate();
         $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_15()
     {
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
-        $this->taglineno = $this->line;
-    }
 
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+         }
     public function yy_r2_18()
     {
+
         $this->yypopstate();
         $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_20()
     {
-        if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] === self::TEXT) {
+
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
             $this->yypopstate();
             $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
             $this->taglineno = $this->line;
@@ -572,45 +559,46 @@ public function yy_r2_20()
             $this->yybegin(self::TAGBODY);
             $this->taglineno = $this->line;
         }
-    } // end function
-
+         }
     public function yy_r2_23()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r2_25()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDEL;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
+         }
 
+     
     public function yylex3()
     {
         if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 =
-                $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state TAGBODY');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAGBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -628,281 +616,285 @@ public function yylex3()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const TAGBODY = 3;
     public function yy_r3_1()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_RDEL;
         $this->yypopstate();
-    }
-
+         }
     public function yy_r3_2()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
+         }
     public function yy_r3_4()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypushstate(self::DOUBLEQUOTEDSTRING);
         $this->compiler->enterDoubleQuote();
-    }
-
+         }
     public function yy_r3_5()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+         }
     public function yy_r3_6()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
     public function yy_r3_7()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+         }
     public function yy_r3_8()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+         }
     public function yy_r3_9()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+         }
     public function yy_r3_10()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+         }
     public function yy_r3_11()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+         }
     public function yy_r3_12()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+         }
     public function yy_r3_13()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+         }
     public function yy_r3_15()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+         }
     public function yy_r3_17()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+         }
     public function yy_r3_20()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+         }
     public function yy_r3_23()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+         }
     public function yy_r3_24()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+         }
     public function yy_r3_28()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+         }
     public function yy_r3_29()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+         }
     public function yy_r3_30()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+         }
     public function yy_r3_31()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+         }
     public function yy_r3_32()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+         }
     public function yy_r3_33()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+         }
     public function yy_r3_34()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+         }
     public function yy_r3_35()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+         }
     public function yy_r3_37()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+         }
     public function yy_r3_39()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+         }
     public function yy_r3_41()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+         }
     public function yy_r3_42()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+         }
     public function yy_r3_43()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+         }
     public function yy_r3_44()
     {
+
         // resolve conflicts with shorttag and right_delimiter starting with '='
-        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) ===
-            $this->smarty->getRightDelimiter()) {
-            preg_match('/\s+/', $this->value, $match);
-            $this->value = $match[ 0 ];
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
             $this->token = Smarty_Internal_Templateparser::TP_SPACE;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_ATTR;
         }
-    }
-
+         }
     public function yy_r3_45()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+         }
     public function yy_r3_48()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+         }
     public function yy_r3_49()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+         }
     public function yy_r3_50()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->yypopstate();
-    }
-
+         }
     public function yy_r3_51()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+         }
     public function yy_r3_52()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+         }
     public function yy_r3_53()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+         }
     public function yy_r3_54()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+         }
     public function yy_r3_55()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+         }
     public function yy_r3_56()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+         }
     public function yy_r3_57()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+         }
     public function yy_r3_58()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+         }
     public function yy_r3_59()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    } // end function
 
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+         }
     public function yy_r3_60()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
+         }
 
+
+     
     public function yylex4()
     {
         if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 =
-                $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
+            $this->yy_global_pattern4 = $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state LITERAL');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -920,76 +912,80 @@ public function yylex4()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const LITERAL = 4;
     public function yy_r4_1()
     {
+
         $this->literal_cnt++;
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
+         }
     public function yy_r4_3()
     {
+
         if ($this->literal_cnt) {
-            $this->literal_cnt--;
+             $this->literal_cnt--;
             $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
             $this->yypopstate();
         }
-    }
-
+         }
     public function yy_r4_5()
     {
-        if (!isset($this->yy_global_literal)) {
-            $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
-        }
-        $to = $this->dataLength;
-        preg_match($this->yy_global_literal, $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    } // end function
 
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+          $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+         }
+
+     
     public function yylex5()
     {
         if (!isset($this->yy_global_pattern5)) {
-            $this->yy_global_pattern5 =
-                $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))|\G([\S\s])/isS");
+            $this->yy_global_pattern5 = $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                            $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -1007,89 +1003,93 @@ public function yylex5()
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line ' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const DOUBLEQUOTEDSTRING = 5;
     public function yy_r5_1()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_3()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_5()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_7()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
+         }
     public function yy_r5_9()
     {
+
         $this->yypushstate(self::TAG);
         return true;
-    }
-
+         }
     public function yy_r5_11()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_LDEL;
         $this->taglineno = $this->line;
         $this->yypushstate(self::TAGBODY);
-    }
-
+         }
     public function yy_r5_13()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
-    }
-
+         }
     public function yy_r5_14()
     {
+
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->value = substr($this->value, 0, -1);
+        $this->value = substr($this->value,0,-1);
         $this->yypushstate(self::TAGBODY);
         $this->taglineno = $this->line;
-    }
-
+         }
     public function yy_r5_15()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
     public function yy_r5_16()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_17()
     {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
 
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
     public function yy_r5_22()
     {
+
         $to = $this->dataLength;
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-}
+         }
 
-     
+  }
+
+     
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php
index aaeae63b7..a2dd0d6fb 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templateparser.php
@@ -7,1598 +7,25 @@ class TP_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-}
+};
+
 
 // line 11 "../smarty/lexer/smarty_internal_templateparser.y"
 
 /**
- * Smarty Template Parser Class
- *
- * This is the template parser.
- * It is generated from the smarty_internal_templateparser.y file
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the smarty_internal_templateparser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
 class Smarty_Internal_Templateparser
 {
-    // line 23 "../smarty/lexer/smarty_internal_templateparser.y"
-    const ERR1                      = 'Security error: Call to private object member not allowed';
-    const ERR2                      = 'Security error: Call to dynamic object member not allowed';
-    const ERR3                      = 'PHP in template not allowed. Use SmartyBC to enable it';
-    const TP_VERT                   = 1;
-    const TP_COLON                  = 2;
-    const TP_PHP                    = 3;
-    const TP_TEXT                   = 4;
-    const TP_STRIPON                = 5;
-    const TP_STRIPOFF               = 6;
-    const TP_LITERALSTART           = 7;
-    const TP_LITERALEND             = 8;
-    const TP_LITERAL                = 9;
-    const TP_SIMPELOUTPUT           = 10;
-    const TP_SIMPLETAG              = 11;
-    const TP_SMARTYBLOCKCHILDPARENT = 12;
-    const TP_LDEL                   = 13;
-    const TP_RDEL                   = 14;
-    const TP_DOLLARID               = 15;
-    const TP_EQUAL                  = 16;
-    const TP_ID                     = 17;
-    const TP_PTR                    = 18;
-    const TP_LDELMAKENOCACHE        = 19;
-    const TP_LDELIF                 = 20;
-    const TP_LDELFOR                = 21;
-    const TP_SEMICOLON              = 22;
-    const TP_INCDEC                 = 23;
-    const TP_TO                     = 24;
-    const TP_STEP                   = 25;
-    const TP_LDELFOREACH            = 26;
-    const TP_SPACE                  = 27;
-    const TP_AS                     = 28;
-    const TP_APTR                   = 29;
-    const TP_LDELSETFILTER          = 30;
-    const TP_CLOSETAG               = 31;
-    const TP_LDELSLASH              = 32;
-    const TP_ATTR                   = 33;
-    const TP_INTEGER                = 34;
-    const TP_COMMA                  = 35;
-    const TP_OPENP                  = 36;
-    const TP_CLOSEP                 = 37;
-    const TP_MATH                   = 38;
-    const TP_UNIMATH                = 39;
-    const TP_ISIN                   = 40;
-    const TP_QMARK                  = 41;
-    const TP_NOT                    = 42;
-    const TP_TYPECAST               = 43;
-    const TP_HEX                    = 44;
-    const TP_DOT                    = 45;
-    const TP_INSTANCEOF             = 46;
-    const TP_SINGLEQUOTESTRING      = 47;
-    const TP_DOUBLECOLON            = 48;
-    const TP_NAMESPACE              = 49;
-    const TP_AT                     = 50;
-    const TP_HATCH                  = 51;
-    const TP_OPENB                  = 52;
-    const TP_CLOSEB                 = 53;
-    const TP_DOLLAR                 = 54;
-    const TP_LOGOP                  = 55;
-    const TP_SLOGOP                 = 56;
-    const TP_TLOGOP                 = 57;
-    const TP_SINGLECOND             = 58;
-    const TP_ARRAYOPEN              = 59;
-    const TP_QUOTE                  = 60;
-    const TP_BACKTICK               = 61;
-    const YY_NO_ACTION              = 516;
-    const YY_ACCEPT_ACTION          = 515;
-    const YY_ERROR_ACTION           = 514;
-    const YY_SZ_ACTTAB              = 2071;
-    const YY_SHIFT_USE_DFLT         = -31;
-    const YY_SHIFT_MAX              = 230;
-    const YY_REDUCE_USE_DFLT        = -91;
-    const YY_REDUCE_MAX             = 178;
-    const YYNOCODE                  = 110;
-    const YYSTACKDEPTH              = 500;
-    const YYNSTATE                  = 327;
-    const YYNRULE                   = 187;
-    const YYERRORSYMBOL             = 62;
-    const YYERRSYMDT                = 'yy0';
-    const YYFALLBACK                = 0;
-
-    public static $yy_action        = array(
-        251, 234, 237, 1, 144, 127, 428, 184, 199, 212,
-        10, 54, 19, 175, 282, 215, 109, 389, 428, 428,
-        224, 321, 223, 303, 203, 389, 13, 389, 281, 43,
-        389, 428, 41, 40, 266, 225, 389, 213, 389, 194,
-        389, 52, 4, 308, 301, 383, 34, 209, 222, 3,
-        50, 153, 251, 234, 237, 1, 199, 131, 383, 198,
-        305, 212, 10, 54, 383, 16, 199, 428, 109, 385,
-        132, 18, 224, 321, 223, 222, 221, 12, 32, 428,
-        116, 43, 385, 262, 41, 40, 266, 225, 385, 233,
-        95, 194, 16, 52, 4, 131, 301, 252, 18, 265,
-        164, 3, 50, 324, 251, 234, 237, 1, 23, 130,
-        229, 198, 150, 212, 10, 54, 326, 11, 170, 284,
-        109, 42, 22, 239, 224, 321, 223, 193, 221, 261,
-        13, 52, 157, 43, 301, 286, 41, 40, 266, 225,
-        205, 233, 5, 194, 96, 52, 4, 263, 301, 301,
-        99, 349, 96, 3, 50, 199, 251, 234, 237, 1,
-        238, 130, 241, 181, 349, 212, 10, 54, 382, 240,
-        349, 36, 109, 185, 104, 256, 224, 321, 223, 132,
-        191, 382, 13, 49, 91, 43, 12, 382, 41, 40,
-        266, 225, 257, 233, 152, 194, 457, 52, 4, 457,
-        301, 301, 228, 457, 282, 3, 50, 285, 251, 234,
-        237, 1, 301, 131, 441, 198, 238, 212, 10, 54,
-        349, 441, 325, 175, 109, 30, 349, 273, 224, 321,
-        223, 20, 221, 295, 32, 211, 457, 39, 166, 49,
-        41, 40, 266, 225, 87, 233, 205, 194, 279, 52,
-        4, 24, 301, 204, 200, 280, 99, 3, 50, 199,
-        251, 234, 237, 1, 31, 130, 96, 198, 205, 212,
-        10, 54, 350, 55, 293, 207, 109, 283, 99, 96,
-        224, 321, 223, 199, 180, 350, 13, 134, 230, 43,
-        222, 350, 41, 40, 266, 225, 104, 233, 316, 194,
-        279, 52, 4, 24, 301, 165, 284, 280, 85, 3,
-        50, 25, 251, 234, 237, 1, 131, 129, 210, 198,
-        14, 212, 10, 54, 269, 270, 301, 116, 109, 295,
-        216, 211, 224, 321, 223, 171, 221, 95, 13, 28,
-        219, 43, 323, 9, 41, 40, 266, 225, 151, 233,
-        324, 194, 52, 52, 4, 301, 301, 30, 282, 302,
-        178, 3, 50, 7, 251, 234, 237, 1, 136, 130,
-        304, 179, 238, 212, 10, 54, 279, 175, 282, 24,
-        109, 238, 429, 280, 224, 321, 223, 177, 221, 270,
-        13, 255, 281, 43, 429, 49, 41, 40, 266, 225,
-        275, 233, 318, 194, 49, 52, 4, 276, 301, 163,
-        26, 199, 8, 3, 50, 119, 251, 234, 237, 1,
-        11, 93, 291, 51, 107, 212, 10, 54, 226, 428,
-        206, 201, 109, 148, 178, 322, 224, 321, 223, 441,
-        221, 428, 13, 282, 9, 43, 441, 115, 41, 40,
-        266, 225, 167, 233, 227, 194, 457, 52, 4, 457,
-        301, 96, 158, 457, 101, 3, 50, 271, 251, 234,
-        237, 1, 282, 130, 235, 186, 135, 212, 10, 54,
-        199, 37, 119, 315, 109, 165, 284, 176, 224, 321,
-        223, 104, 221, 149, 13, 281, 146, 43, 281, 300,
-        41, 40, 266, 225, 30, 233, 289, 194, 21, 52,
-        4, 272, 301, 211, 18, 301, 161, 3, 50, 110,
-        251, 234, 237, 1, 137, 128, 282, 198, 268, 212,
-        10, 54, 222, 169, 515, 92, 109, 172, 284, 31,
-        224, 321, 223, 29, 221, 238, 6, 260, 53, 43,
-        232, 139, 41, 40, 266, 225, 154, 233, 178, 194,
-        168, 52, 4, 214, 301, 145, 99, 33, 49, 3,
-        50, 245, 208, 211, 320, 282, 90, 111, 311, 183,
-        98, 70, 309, 297, 236, 178, 95, 319, 142, 258,
-        247, 267, 249, 264, 250, 195, 231, 199, 246, 324,
-        317, 253, 254, 259, 126, 137, 133, 251, 234, 237,
-        1, 326, 290, 105, 143, 156, 212, 10, 54, 88,
-        84, 83, 484, 109, 322, 282, 37, 224, 321, 223,
-        245, 208, 211, 320, 281, 90, 111, 298, 182, 98,
-        56, 245, 298, 211, 178, 95, 103, 147, 258, 197,
-        102, 75, 141, 250, 195, 231, 95, 246, 324, 258,
-        279, 242, 89, 24, 250, 195, 231, 280, 246, 324,
-        298, 298, 298, 298, 298, 298, 298, 16, 298, 192,
-        277, 298, 298, 18, 294, 44, 45, 38, 298, 298,
-        251, 234, 237, 2, 298, 296, 298, 298, 298, 212,
-        10, 54, 310, 312, 313, 314, 109, 162, 298, 298,
-        224, 321, 223, 298, 298, 298, 294, 282, 298, 42,
-        22, 239, 251, 234, 237, 2, 298, 296, 298, 298,
-        298, 212, 10, 54, 298, 159, 298, 298, 109, 298,
-        298, 17, 224, 321, 223, 282, 298, 42, 22, 239,
-        298, 298, 245, 298, 211, 278, 298, 103, 111, 298,
-        183, 98, 70, 298, 298, 298, 298, 95, 298, 298,
-        258, 298, 292, 17, 298, 250, 195, 231, 279, 246,
-        324, 24, 298, 395, 245, 280, 211, 298, 298, 103,
-        298, 298, 197, 102, 75, 16, 298, 140, 298, 95,
-        298, 18, 258, 298, 298, 298, 298, 250, 195, 231,
-        298, 246, 324, 298, 298, 298, 298, 428, 298, 395,
-        395, 395, 202, 277, 298, 245, 298, 211, 298, 428,
-        103, 298, 298, 197, 120, 69, 395, 395, 395, 395,
-        95, 298, 298, 258, 298, 298, 298, 160, 250, 195,
-        231, 86, 246, 324, 245, 16, 211, 282, 298, 103,
-        196, 18, 197, 120, 69, 298, 44, 45, 38, 95,
-        298, 298, 258, 298, 298, 298, 178, 250, 195, 231,
-        298, 246, 324, 310, 312, 313, 314, 298, 298, 190,
-        245, 298, 211, 298, 298, 103, 298, 298, 197, 102,
-        75, 298, 298, 298, 298, 95, 298, 298, 258, 298,
-        298, 298, 298, 250, 195, 231, 298, 246, 324, 298,
-        298, 298, 245, 298, 211, 298, 199, 100, 298, 288,
-        197, 120, 47, 298, 106, 298, 298, 95, 298, 353,
-        258, 155, 298, 218, 298, 250, 195, 231, 298, 246,
-        324, 282, 16, 42, 22, 239, 298, 245, 18, 211,
-        298, 428, 103, 298, 298, 197, 120, 69, 298, 298,
-        298, 298, 95, 428, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 100, 189, 298, 197, 120, 59, 245, 207, 211,
-        298, 95, 103, 298, 258, 197, 120, 81, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 80, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 67, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 57, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 58, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 82, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 97, 76, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 71, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 187, 120, 61, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 63, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 94, 79, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 59, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 77, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 188, 108, 64, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 65, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 97, 66, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 68, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 62, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 60, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 74, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 72, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 48, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 120, 46, 298, 298,
-        298, 298, 95, 298, 298, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 120, 78, 245, 298, 211,
-        298, 95, 103, 298, 258, 197, 120, 73, 298, 250,
-        195, 231, 95, 246, 324, 258, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 125, 298, 298, 298,
-        298, 298, 95, 298, 298, 298, 298, 298, 298, 244,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 114, 298, 245, 298, 211,
-        298, 95, 103, 298, 298, 197, 122, 298, 243, 250,
-        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 117, 298, 298, 298,
-        298, 298, 95, 298, 298, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 121, 298, 245, 298, 211,
-        298, 95, 103, 298, 298, 197, 124, 298, 298, 250,
-        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 298, 245, 298, 211,
-        298, 298, 103, 298, 298, 197, 118, 298, 298, 298,
-        298, 298, 95, 298, 298, 298, 298, 298, 298, 298,
-        250, 195, 231, 298, 246, 324, 245, 298, 211, 298,
-        298, 103, 298, 298, 197, 123, 298, 245, 298, 211,
-        298, 95, 103, 298, 298, 197, 113, 298, 298, 250,
-        195, 231, 95, 246, 324, 298, 298, 298, 298, 298,
-        250, 195, 231, 220, 246, 324, 298, 27, 298, 16,
-        298, 457, 298, 298, 457, 18, 298, 26, 457, 441,
-        44, 45, 38, 217, 44, 45, 38, 298, 298, 298,
-        298, 298, 298, 298, 298, 298, 298, 310, 312, 313,
-        314, 310, 312, 313, 314, 298, 441, 298, 298, 441,
-        298, 457, 220, 441, 457, 298, 298, 457, 298, 298,
-        457, 457, 441, 457, 298, 298, 220, 457, 441, 298,
-        298, 298, 298, 298, 457, 298, 298, 457, 298, 298,
-        5, 457, 441, 298, 298, 298, 298, 298, 298, 441,
-        298, 298, 441, 298, 457, 441, 441, 298, 441, 298,
-        457, 298, 441, 306, 298, 298, 298, 298, 298, 441,
-        298, 298, 441, 298, 457, 220, 441, 298, 298, 298,
-        298, 298, 298, 457, 298, 298, 457, 298, 298, 15,
-        457, 441, 35, 274, 44, 45, 38, 457, 298, 298,
-        457, 298, 298, 298, 457, 441, 298, 298, 298, 298,
-        298, 310, 312, 313, 314, 298, 298, 298, 441, 298,
-        298, 441, 298, 457, 298, 441, 287, 298, 44, 45,
-        38, 298, 441, 298, 298, 441, 298, 457, 298, 441,
-        248, 298, 298, 298, 298, 310, 312, 313, 314, 298,
-        44, 45, 38, 298, 298, 112, 298, 44, 45, 38,
-        298, 173, 298, 298, 44, 45, 38, 310, 312, 313,
-        314, 44, 45, 38, 310, 312, 313, 314, 298, 298,
-        299, 310, 312, 313, 314, 44, 45, 38, 310, 312,
-        313, 314, 174, 298, 298, 298, 138, 298, 298, 298,
-        298, 298, 310, 312, 313, 314, 44, 45, 38, 298,
-        298, 298, 44, 45, 38, 298, 44, 45, 38, 298,
-        44, 45, 38, 310, 312, 313, 314, 307, 298, 310,
-        312, 313, 314, 310, 312, 313, 314, 310, 312, 313,
-        314,
-    );
-
-    public static $yy_lookahead     = array(
-        10, 11, 12, 13, 74, 15, 36, 17, 1, 19,
-        20, 21, 29, 103, 84, 45, 26, 14, 48, 36,
-        30, 31, 32, 53, 34, 22, 36, 24, 98, 39,
-        27, 48, 42, 43, 44, 45, 33, 47, 35, 49,
-        37, 51, 52, 53, 54, 14, 16, 16, 45, 59,
-        60, 96, 10, 11, 12, 13, 1, 15, 27, 17,
-        53, 19, 20, 21, 33, 27, 1, 36, 26, 14,
-        45, 33, 30, 31, 32, 45, 34, 52, 36, 48,
-        72, 39, 27, 75, 42, 43, 44, 45, 33, 47,
-        82, 49, 27, 51, 52, 15, 54, 17, 33, 91,
-        83, 59, 60, 95, 10, 11, 12, 13, 13, 15,
-        15, 17, 17, 19, 20, 21, 97, 35, 99, 100,
-        26, 86, 87, 88, 30, 31, 32, 66, 34, 49,
-        36, 51, 96, 39, 54, 53, 42, 43, 44, 45,
-        72, 47, 16, 49, 18, 51, 52, 79, 54, 54,
-        82, 14, 18, 59, 60, 1, 10, 11, 12, 13,
-        23, 15, 15, 17, 27, 19, 20, 21, 14, 17,
-        33, 13, 26, 15, 48, 17, 30, 31, 32, 45,
-        34, 27, 36, 46, 83, 39, 52, 33, 42, 43,
-        44, 45, 34, 47, 74, 49, 10, 51, 52, 13,
-        54, 54, 50, 17, 84, 59, 60, 14, 10, 11,
-        12, 13, 54, 15, 45, 17, 23, 19, 20, 21,
-        27, 52, 100, 103, 26, 35, 33, 37, 30, 31,
-        32, 22, 34, 67, 36, 69, 50, 39, 83, 46,
-        42, 43, 44, 45, 35, 47, 72, 49, 10, 51,
-        52, 13, 54, 79, 80, 17, 82, 59, 60, 1,
-        10, 11, 12, 13, 16, 15, 18, 17, 72, 19,
-        20, 21, 14, 107, 108, 79, 26, 71, 82, 18,
-        30, 31, 32, 1, 34, 27, 36, 15, 50, 39,
-        45, 33, 42, 43, 44, 45, 48, 47, 53, 49,
-        10, 51, 52, 13, 54, 99, 100, 17, 36, 59,
-        60, 29, 10, 11, 12, 13, 15, 15, 17, 17,
-        13, 19, 20, 21, 8, 9, 54, 72, 26, 67,
-        75, 69, 30, 31, 32, 78, 34, 82, 36, 24,
-        50, 39, 17, 36, 42, 43, 44, 45, 74, 47,
-        95, 49, 51, 51, 52, 54, 54, 35, 84, 37,
-        103, 59, 60, 36, 10, 11, 12, 13, 74, 15,
-        108, 17, 23, 19, 20, 21, 10, 103, 84, 13,
-        26, 23, 36, 17, 30, 31, 32, 7, 34, 9,
-        36, 17, 98, 39, 48, 46, 42, 43, 44, 45,
-        17, 47, 53, 49, 46, 51, 52, 93, 54, 78,
-        16, 1, 36, 59, 60, 101, 10, 11, 12, 13,
-        35, 15, 37, 17, 48, 19, 20, 21, 18, 36,
-        65, 66, 26, 74, 103, 104, 30, 31, 32, 45,
-        34, 48, 36, 84, 36, 39, 52, 17, 42, 43,
-        44, 45, 15, 47, 17, 49, 10, 51, 52, 13,
-        54, 18, 74, 17, 82, 59, 60, 34, 10, 11,
-        12, 13, 84, 15, 93, 17, 15, 19, 20, 21,
-        1, 2, 101, 101, 26, 99, 100, 17, 30, 31,
-        32, 48, 34, 96, 36, 98, 96, 39, 98, 71,
-        42, 43, 44, 45, 35, 47, 37, 49, 27, 51,
-        52, 67, 54, 69, 33, 54, 74, 59, 60, 17,
-        10, 11, 12, 13, 96, 15, 84, 17, 34, 19,
-        20, 21, 45, 78, 63, 64, 26, 99, 100, 16,
-        30, 31, 32, 16, 34, 23, 36, 17, 17, 39,
-        23, 51, 42, 43, 44, 45, 72, 47, 103, 49,
-        78, 51, 52, 17, 54, 74, 82, 41, 46, 59,
-        60, 67, 68, 69, 70, 84, 72, 73, 53, 75,
-        76, 77, 53, 61, 15, 103, 82, 14, 51, 85,
-        14, 37, 17, 8, 90, 91, 92, 1, 94, 95,
-        3, 4, 5, 6, 7, 96, 82, 10, 11, 12,
-        13, 97, 84, 81, 96, 74, 19, 20, 21, 78,
-        82, 82, 1, 26, 104, 84, 2, 30, 31, 32,
-        67, 68, 69, 70, 98, 72, 73, 109, 75, 76,
-        77, 67, 109, 69, 103, 82, 72, 96, 85, 75,
-        76, 77, 96, 90, 91, 92, 82, 94, 95, 85,
-        10, 14, 96, 13, 90, 91, 92, 17, 94, 95,
-        109, 109, 109, 109, 109, 109, 109, 27, 109, 105,
-        106, 109, 109, 33, 4, 38, 39, 40, 109, 109,
-        10, 11, 12, 13, 109, 15, 109, 109, 109, 19,
-        20, 21, 55, 56, 57, 58, 26, 74, 109, 109,
-        30, 31, 32, 109, 109, 109, 4, 84, 109, 86,
-        87, 88, 10, 11, 12, 13, 109, 15, 109, 109,
-        109, 19, 20, 21, 109, 74, 109, 109, 26, 109,
-        60, 61, 30, 31, 32, 84, 109, 86, 87, 88,
-        109, 109, 67, 109, 69, 70, 109, 72, 73, 109,
-        75, 76, 77, 109, 109, 109, 109, 82, 109, 109,
-        85, 109, 60, 61, 109, 90, 91, 92, 10, 94,
-        95, 13, 109, 2, 67, 17, 69, 109, 109, 72,
-        109, 109, 75, 76, 77, 27, 109, 29, 109, 82,
-        109, 33, 85, 109, 109, 109, 109, 90, 91, 92,
-        109, 94, 95, 109, 109, 109, 109, 36, 109, 38,
-        39, 40, 105, 106, 109, 67, 109, 69, 109, 48,
-        72, 109, 109, 75, 76, 77, 55, 56, 57, 58,
-        82, 109, 109, 85, 109, 109, 109, 74, 90, 91,
-        92, 78, 94, 95, 67, 27, 69, 84, 109, 72,
-        102, 33, 75, 76, 77, 109, 38, 39, 40, 82,
-        109, 109, 85, 109, 109, 109, 103, 90, 91, 92,
-        109, 94, 95, 55, 56, 57, 58, 109, 109, 102,
-        67, 109, 69, 109, 109, 72, 109, 109, 75, 76,
-        77, 109, 109, 109, 109, 82, 109, 109, 85, 109,
-        109, 109, 109, 90, 91, 92, 109, 94, 95, 109,
-        109, 109, 67, 109, 69, 109, 1, 72, 109, 106,
-        75, 76, 77, 109, 79, 109, 109, 82, 109, 14,
-        85, 74, 109, 18, 109, 90, 91, 92, 109, 94,
-        95, 84, 27, 86, 87, 88, 109, 67, 33, 69,
-        109, 36, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 48, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 102, 109, 75, 76, 77, 67, 79, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 77, 109, 109,
-        109, 109, 82, 109, 109, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 77, 67, 109, 69,
-        109, 82, 72, 109, 85, 75, 76, 77, 109, 90,
-        91, 92, 82, 94, 95, 85, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
-        109, 109, 82, 109, 109, 109, 109, 109, 109, 89,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
-        109, 82, 72, 109, 109, 75, 76, 109, 89, 90,
-        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
-        109, 109, 82, 109, 109, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
-        109, 82, 72, 109, 109, 75, 76, 109, 109, 90,
-        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 109, 67, 109, 69,
-        109, 109, 72, 109, 109, 75, 76, 109, 109, 109,
-        109, 109, 82, 109, 109, 109, 109, 109, 109, 109,
-        90, 91, 92, 109, 94, 95, 67, 109, 69, 109,
-        109, 72, 109, 109, 75, 76, 109, 67, 109, 69,
-        109, 82, 72, 109, 109, 75, 76, 109, 109, 90,
-        91, 92, 82, 94, 95, 109, 109, 109, 109, 109,
-        90, 91, 92, 2, 94, 95, 109, 25, 109, 27,
-        109, 10, 109, 109, 13, 33, 109, 16, 17, 18,
-        38, 39, 40, 37, 38, 39, 40, 109, 109, 109,
-        109, 109, 109, 109, 109, 109, 109, 55, 56, 57,
-        58, 55, 56, 57, 58, 109, 45, 109, 109, 48,
-        109, 50, 2, 52, 10, 109, 109, 13, 109, 109,
-        10, 17, 18, 13, 109, 109, 2, 17, 18, 109,
-        109, 109, 109, 109, 10, 109, 109, 13, 109, 109,
-        16, 17, 18, 109, 109, 109, 109, 109, 109, 45,
-        109, 109, 48, 109, 50, 45, 52, 109, 48, 109,
-        50, 109, 52, 53, 109, 109, 109, 109, 109, 45,
-        109, 109, 48, 109, 50, 2, 52, 109, 109, 109,
-        109, 109, 109, 10, 109, 109, 13, 109, 109, 2,
-        17, 18, 2, 37, 38, 39, 40, 10, 109, 109,
-        13, 109, 109, 109, 17, 18, 109, 109, 109, 109,
-        109, 55, 56, 57, 58, 109, 109, 109, 45, 109,
-        109, 48, 109, 50, 109, 52, 14, 109, 38, 39,
-        40, 109, 45, 109, 109, 48, 109, 50, 109, 52,
-        14, 109, 109, 109, 109, 55, 56, 57, 58, 109,
-        38, 39, 40, 109, 109, 22, 109, 38, 39, 40,
-        109, 14, 109, 109, 38, 39, 40, 55, 56, 57,
-        58, 38, 39, 40, 55, 56, 57, 58, 109, 109,
-        61, 55, 56, 57, 58, 38, 39, 40, 55, 56,
-        57, 58, 14, 109, 109, 109, 28, 109, 109, 109,
-        109, 109, 55, 56, 57, 58, 38, 39, 40, 109,
-        109, 109, 38, 39, 40, 109, 38, 39, 40, 109,
-        38, 39, 40, 55, 56, 57, 58, 53, 109, 55,
-        56, 57, 58, 55, 56, 57, 58, 55, 56, 57,
-        58,
-    );
-
-    public static $yy_shift_ofst    = array(
-        -31, 406, 406, 458, 458, 94, 510, 94, 94, 94,
-        510, 458, -10, 94, 94, 354, 146, 94, 94, 94,
-        94, 146, 94, 94, 94, 94, 250, 94, 94, 94,
-        94, 94, 94, 302, 94, 94, 94, 198, 42, 42,
-        42, 42, 42, 42, 42, 42, 1772, 828, 828, 80,
-        712, 925, 301, 65, 272, 680, 1942, 1920, 1886, 1776,
-        647, 1949, 1977, 2008, 2004, 1963, 1998, 1956, 2012, 2012,
-        2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012, 2012,
-        2012, 2012, 2012, 768, 650, 272, 65, 272, 65, 134,
-        126, 479, 597, 1854, 154, 290, 95, 55, 258, 366,
-        248, 366, 282, 443, 437, 38, 38, 437, 7, 481,
-        410, 38, 461, 621, 596, 596, 261, 596, 596, 261,
-        596, 596, 596, 596, 596, -31, -31, 1840, 1791, 1917,
-        1903, 1834, 158, 238, 394, 446, 38, 25, 147, 169,
-        147, 25, 169, 25, 38, 38, 25, 25, 38, 25,
-        307, 38, 38, 25, 527, 38, 38, 25, 38, 38,
-        38, 38, 38, 596, 624, 261, 624, 327, 596, 596,
-        261, 596, 261, -31, -31, -31, -31, -31, -31, 781,
-        3, 31, 193, 137, -30, 186, -17, 522, 349, 469,
-        322, 30, 82, 316, 346, 376, 190, 358, 393, 152,
-        209, 380, 385, 245, 315, 523, 585, 554, 576, 575,
-        537, 573, 569, 529, 525, 546, 500, 526, 531, 325,
-        530, 487, 494, 502, 470, 433, 430, 408, 383, 327,
-        374,
-    );
-
-    public static $yy_reduce_ofst   = array(
-        471, 504, 563, 717, 574, 685, 919, 890, 787, 758,
-        855, 823, 1240, 1199, 1140, 1100, 1070, 1129, 1170, 1210,
-        1269, 1280, 1310, 1339, 1350, 1380, 1409, 1420, 1450, 1479,
-        1490, 1059, 1030, 1000, 930, 960, 989, 1520, 1549, 1700,
-        1619, 1689, 1660, 1630, 1590, 1560, 633, 661, 867, 8,
-        166, 773, 255, 541, 174, 262, 35, 35, 35, 35,
-        35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-        35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-        35, 35, 35, 294, -70, 196, 120, 68, 274, 19,
-        206, 331, 444, 428, 257, 400, 382, 257, 257, 400,
-        386, 397, 257, 386, 381, 388, 359, 314, 257, 442,
-        482, 491, 484, 257, 257, 455, 386, 257, 257, 438,
-        257, 257, 257, 257, 257, 257, 365, 509, 509, 509,
-        509, 509, 524, 536, 509, 509, 528, 514, 539, 551,
-        538, 514, 556, 514, 528, 528, 514, 514, 528, 514,
-        518, 528, 528, 514, 532, 528, 528, 514, 528, 528,
-        528, 528, 528, -90, 520, 122, 520, 566, -90, -90,
-        122, -90, 122, -45, 36, 155, 101, 61, 17,
-    );
-
-    public static $yyExpectedTokens = array(
-        array(),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 53, 54, 59,
-            60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(
-            10, 11, 12, 13, 15, 17, 19, 20, 21, 26, 30, 31, 32, 34, 36, 39, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59, 60,
-        ),
-        array(25, 27, 33, 38, 39, 40, 55, 56, 57, 58,),
-        array(27, 33, 38, 39, 40, 55, 56, 57, 58,),
-        array(27, 33, 38, 39, 40, 55, 56, 57, 58,),
-        array(15, 17, 49, 51, 54,),
-        array(4, 10, 11, 12, 13, 15, 19, 20, 21, 26, 30, 31, 32, 60, 61,),
-        array(1, 14, 18, 27, 33, 36, 48,),
-        array(15, 17, 51, 54,),
-        array(1, 27, 33,),
-        array(15, 36, 54,),
-        array(4, 10, 11, 12, 13, 15, 19, 20, 21, 26, 30, 31, 32, 60, 61,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(2, 38, 39, 40, 55, 56, 57, 58,),
-        array(37, 38, 39, 40, 55, 56, 57, 58,),
-        array(37, 38, 39, 40, 55, 56, 57, 58,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58, 61,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 53, 55, 56, 57, 58,),
-        array(22, 38, 39, 40, 55, 56, 57, 58,),
-        array(28, 38, 39, 40, 55, 56, 57, 58,),
-        array(14, 38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(38, 39, 40, 55, 56, 57, 58,),
-        array(10, 13, 17, 27, 29, 33,),
-        array(10, 13, 17, 27, 33,),
-        array(15, 36, 54,),
-        array(1, 27, 33,),
-        array(15, 36, 54,),
-        array(1, 27, 33,),
-        array(18, 45, 52,),
-        array(16, 18, 48,),
-        array(1, 2,),
-        array(3, 4, 5, 6, 7, 10, 11, 12, 13, 19, 20, 21, 26, 30, 31, 32,),
-        array(2, 10, 13, 16, 17, 18, 45, 48, 50, 52,),
-        array(1, 14, 27, 33,),
-        array(10, 13, 17, 50,),
-        array(13, 15, 17, 54,),
-        array(1, 14, 27, 33,),
-        array(1, 14, 27, 33,),
-        array(10, 13, 17,),
-        array(16, 18, 48,),
-        array(10, 13, 17,),
-        array(1, 29,),
-        array(18, 48,),
-        array(15, 17,),
-        array(27, 33,),
-        array(27, 33,),
-        array(15, 17,),
-        array(1, 53,),
-        array(27, 33,),
-        array(1, 18,),
-        array(27, 33,),
-        array(15, 54,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(18,),
-        array(1,),
-        array(1,),
-        array(18,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(1,),
-        array(),
-        array(),
-        array(2, 10, 13, 17, 18, 45, 48, 50, 52, 53,),
-        array(2, 10, 13, 16, 17, 18, 45, 48, 50, 52,),
-        array(2, 10, 13, 17, 18, 45, 48, 50, 52,),
-        array(2, 10, 13, 17, 18, 45, 48, 50, 52,),
-        array(10, 13, 17, 18, 45, 48, 50, 52,),
-        array(13, 15, 17, 34, 54,),
-        array(10, 13, 17, 50,),
-        array(16, 45, 52,),
-        array(10, 13, 17,),
-        array(27, 33,),
-        array(45, 52,),
-        array(15, 54,),
-        array(45, 52,),
-        array(15, 54,),
-        array(45, 52,),
-        array(45, 52,),
-        array(45, 52,),
-        array(27, 33,),
-        array(27, 33,),
-        array(45, 52,),
-        array(45, 52,),
-        array(27, 33,),
-        array(45, 52,),
-        array(13, 36,),
-        array(27, 33,),
-        array(27, 33,),
-        array(45, 52,),
-        array(16, 23,),
-        array(27, 33,),
-        array(27, 33,),
-        array(45, 52,),
-        array(27, 33,),
-        array(27, 33,),
-        array(27, 33,),
-        array(27, 33,),
-        array(27, 33,),
-        array(1,),
-        array(2,),
-        array(18,),
-        array(2,),
-        array(36,),
-        array(1,),
-        array(1,),
-        array(18,),
-        array(1,),
-        array(18,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(2, 36, 38, 39, 40, 48, 55, 56, 57, 58,),
-        array(14, 22, 24, 27, 33, 35, 37, 45,),
-        array(14, 16, 27, 33, 36, 48,),
-        array(14, 23, 27, 33, 46,),
-        array(14, 23, 27, 33, 46,),
-        array(36, 45, 48, 53,),
-        array(10, 13, 17, 50,),
-        array(29, 36, 48,),
-        array(23, 46, 61,),
-        array(23, 46, 53,),
-        array(35, 37,),
-        array(35, 37,),
-        array(16, 45,),
-        array(35, 53,),
-        array(8, 9,),
-        array(36, 48,),
-        array(36, 48,),
-        array(35, 37,),
-        array(23, 46,),
-        array(36, 48,),
-        array(17, 50,),
-        array(22, 35,),
-        array(7, 9,),
-        array(35, 37,),
-        array(45, 53,),
-        array(24,),
-        array(16,),
-        array(8,),
-        array(37,),
-        array(14,),
-        array(17,),
-        array(51,),
-        array(14,),
-        array(15,),
-        array(53,),
-        array(53,),
-        array(17,),
-        array(51,),
-        array(41,),
-        array(17,),
-        array(17,),
-        array(17,),
-        array(45,),
-        array(34,),
-        array(17,),
-        array(17,),
-        array(34,),
-        array(17,),
-        array(36,),
-        array(17,),
-        array(36,),
-        array(17,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-    );
-
-    public static $yy_default       = array(
-        338, 514, 514, 499, 499, 514, 514, 476, 476, 476,
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 514, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 379, 358, 379, 514,
-        514, 415, 514, 379, 514, 514, 351, 514, 514, 514,
-        514, 514, 514, 514, 514, 514, 384, 514, 399, 475,
-        351, 403, 390, 474, 500, 502, 384, 501, 363, 381,
-        404, 386, 391, 379, 379, 514, 379, 514, 379, 489,
-        431, 370, 327, 430, 393, 441, 514, 393, 393, 441,
-        431, 441, 393, 431, 514, 379, 360, 514, 393, 379,
-        373, 379, 514, 406, 402, 375, 431, 396, 398, 486,
-        393, 408, 397, 407, 406, 483, 336, 430, 430, 430,
-        430, 430, 514, 443, 457, 441, 367, 438, 514, 436,
-        514, 435, 434, 466, 368, 348, 439, 437, 361, 467,
-        441, 356, 354, 468, 514, 366, 355, 469, 362, 359,
-        352, 369, 365, 371, 478, 463, 477, 441, 374, 376,
-        490, 424, 487, 441, 441, 482, 482, 336, 482, 415,
-        411, 415, 405, 405, 415, 442, 415, 405, 405, 514,
-        514, 411, 514, 514, 425, 514, 514, 405, 415, 514,
-        514, 334, 514, 411, 387, 514, 514, 514, 514, 514,
-        514, 514, 514, 420, 514, 514, 514, 417, 514, 514,
-        514, 411, 413, 514, 514, 514, 514, 488, 514, 457,
-        514, 421, 364, 420, 340, 422, 357, 341, 409, 400,
-        480, 457, 462, 401, 485, 423, 426, 342, 447, 380,
-        416, 339, 428, 329, 330, 444, 445, 446, 394, 331,
-        395, 429, 419, 388, 332, 418, 410, 392, 412, 333,
-        335, 414, 337, 472, 417, 479, 427, 497, 347, 461,
-        460, 459, 378, 346, 464, 510, 495, 511, 498, 473,
-        377, 496, 503, 506, 513, 512, 509, 507, 504, 508,
-        345, 458, 471, 448, 505, 454, 452, 455, 456, 450,
-        491, 449, 492, 493, 494, 470, 451, 328, 453, 343,
-        344, 372, 481, 432, 433, 465, 440,
-    );
-
-    public static $yyFallback       = array();
-
-    public static $yyRuleName       = array(
-        'start ::= template',
-        'template ::= template PHP',
-        'template ::= template TEXT',
-        'template ::= template STRIPON',
-        'template ::= template STRIPOFF',
-        'template ::= template LITERALSTART literal_e2 LITERALEND',
-        'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
-        'literal_e2 ::= literal_e1',
-        'literal_e1 ::= literal_e1 LITERAL',
-        'literal_e1 ::=',
-        'template ::= template smartytag',
-        'template ::=',
-        'smartytag ::= SIMPELOUTPUT',
-        'smartytag ::= SIMPLETAG',
-        'smartytag ::= SMARTYBLOCKCHILDPARENT',
-        'smartytag ::= LDEL tagbody RDEL',
-        'smartytag ::= tag RDEL',
-        'tagbody ::= outattr',
-        'tagbody ::= DOLLARID eqoutattr',
-        'tagbody ::= varindexed eqoutattr',
-        'eqoutattr ::= EQUAL outattr',
-        'outattr ::= output attributes',
-        'output ::= variable',
-        'output ::= value',
-        'output ::= expr',
-        'tag ::= LDEL ID attributes',
-        'tag ::= LDEL ID',
-        'tag ::= LDEL ID modifierlist attributes',
-        'tag ::= LDEL ID PTR ID attributes',
-        'tag ::= LDEL ID PTR ID modifierlist attributes',
-        'tag ::= LDELMAKENOCACHE DOLLARID',
-        'tag ::= LDELIF expr',
-        'tag ::= LDELIF expr attributes',
-        'tag ::= LDELIF statement',
-        'tag ::= LDELIF statement attributes',
-        'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
-        'foraction ::= EQUAL expr',
-        'foraction ::= INCDEC',
-        'tag ::= LDELFOR statement TO expr attributes',
-        'tag ::= LDELFOR statement TO expr STEP expr attributes',
-        'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
-        'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
-        'tag ::= LDELFOREACH attributes',
-        'tag ::= LDELSETFILTER ID modparameters',
-        'tag ::= LDELSETFILTER ID modparameters modifierlist',
-        'smartytag ::= CLOSETAG',
-        'tag ::= LDELSLASH ID',
-        'tag ::= LDELSLASH ID modifierlist',
-        'tag ::= LDELSLASH ID PTR ID',
-        'tag ::= LDELSLASH ID PTR ID modifierlist',
-        'attributes ::= attributes attribute',
-        'attributes ::= attribute',
-        'attributes ::=',
-        'attribute ::= SPACE ID EQUAL ID',
-        'attribute ::= ATTR expr',
-        'attribute ::= ATTR value',
-        'attribute ::= SPACE ID',
-        'attribute ::= SPACE expr',
-        'attribute ::= SPACE value',
-        'attribute ::= SPACE INTEGER EQUAL expr',
-        'statements ::= statement',
-        'statements ::= statements COMMA statement',
-        'statement ::= DOLLARID EQUAL INTEGER',
-        'statement ::= DOLLARID EQUAL expr',
-        'statement ::= varindexed EQUAL expr',
-        'statement ::= OPENP statement CLOSEP',
-        'expr ::= value',
-        'expr ::= ternary',
-        'expr ::= DOLLARID COLON ID',
-        'expr ::= expr MATH value',
-        'expr ::= expr UNIMATH value',
-        'expr ::= expr tlop value',
-        'expr ::= expr lop expr',
-        'expr ::= expr scond',
-        'expr ::= expr ISIN array',
-        'expr ::= expr ISIN value',
-        'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
-        'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
-        'value ::= variable',
-        'value ::= UNIMATH value',
-        'value ::= NOT value',
-        'value ::= TYPECAST value',
-        'value ::= variable INCDEC',
-        'value ::= HEX',
-        'value ::= INTEGER',
-        'value ::= INTEGER DOT INTEGER',
-        'value ::= INTEGER DOT',
-        'value ::= DOT INTEGER',
-        'value ::= ID',
-        'value ::= function',
-        'value ::= OPENP expr CLOSEP',
-        'value ::= variable INSTANCEOF ns1',
-        'value ::= variable INSTANCEOF variable',
-        'value ::= SINGLEQUOTESTRING',
-        'value ::= doublequoted_with_quotes',
-        'value ::= varindexed DOUBLECOLON static_class_access',
-        'value ::= smartytag',
-        'value ::= value modifierlist',
-        'value ::= NAMESPACE',
-        'value ::= arraydef',
-        'value ::= ns1 DOUBLECOLON static_class_access',
-        'ns1 ::= ID',
-        'ns1 ::= NAMESPACE',
-        'variable ::= DOLLARID',
-        'variable ::= varindexed',
-        'variable ::= varvar AT ID',
-        'variable ::= object',
-        'variable ::= HATCH ID HATCH',
-        'variable ::= HATCH ID HATCH arrayindex',
-        'variable ::= HATCH variable HATCH',
-        'variable ::= HATCH variable HATCH arrayindex',
-        'varindexed ::= DOLLARID arrayindex',
-        'varindexed ::= varvar arrayindex',
-        'arrayindex ::= arrayindex indexdef',
-        'arrayindex ::=',
-        'indexdef ::= DOT DOLLARID',
-        'indexdef ::= DOT varvar',
-        'indexdef ::= DOT varvar AT ID',
-        'indexdef ::= DOT ID',
-        'indexdef ::= DOT INTEGER',
-        'indexdef ::= DOT LDEL expr RDEL',
-        'indexdef ::= OPENB ID CLOSEB',
-        'indexdef ::= OPENB ID DOT ID CLOSEB',
-        'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
-        'indexdef ::= OPENB INTEGER CLOSEB',
-        'indexdef ::= OPENB DOLLARID CLOSEB',
-        'indexdef ::= OPENB variable CLOSEB',
-        'indexdef ::= OPENB value CLOSEB',
-        'indexdef ::= OPENB expr CLOSEB',
-        'indexdef ::= OPENB CLOSEB',
-        'varvar ::= DOLLARID',
-        'varvar ::= DOLLAR',
-        'varvar ::= varvar varvarele',
-        'varvarele ::= ID',
-        'varvarele ::= SIMPELOUTPUT',
-        'varvarele ::= LDEL expr RDEL',
-        'object ::= varindexed objectchain',
-        'objectchain ::= objectelement',
-        'objectchain ::= objectchain objectelement',
-        'objectelement ::= PTR ID arrayindex',
-        'objectelement ::= PTR varvar arrayindex',
-        'objectelement ::= PTR LDEL expr RDEL arrayindex',
-        'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
-        'objectelement ::= PTR method',
-        'function ::= ns1 OPENP params CLOSEP',
-        'method ::= ID OPENP params CLOSEP',
-        'method ::= DOLLARID OPENP params CLOSEP',
-        'params ::= params COMMA expr',
-        'params ::= expr',
-        'params ::=',
-        'modifierlist ::= modifierlist modifier modparameters',
-        'modifierlist ::= modifier modparameters',
-        'modifier ::= VERT AT ID',
-        'modifier ::= VERT ID',
-        'modparameters ::= modparameters modparameter',
-        'modparameters ::=',
-        'modparameter ::= COLON value',
-        'modparameter ::= COLON UNIMATH value',
-        'modparameter ::= COLON array',
-        'static_class_access ::= method',
-        'static_class_access ::= method objectchain',
-        'static_class_access ::= ID',
-        'static_class_access ::= DOLLARID arrayindex',
-        'static_class_access ::= DOLLARID arrayindex objectchain',
-        'lop ::= LOGOP',
-        'lop ::= SLOGOP',
-        'tlop ::= TLOGOP',
-        'scond ::= SINGLECOND',
-        'arraydef ::= OPENB arrayelements CLOSEB',
-        'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
-        'arrayelements ::= arrayelement',
-        'arrayelements ::= arrayelements COMMA arrayelement',
-        'arrayelements ::=',
-        'arrayelement ::= value APTR expr',
-        'arrayelement ::= ID APTR expr',
-        'arrayelement ::= expr',
-        'doublequoted_with_quotes ::= QUOTE QUOTE',
-        'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
-        'doublequoted ::= doublequoted doublequotedcontent',
-        'doublequoted ::= doublequotedcontent',
-        'doublequotedcontent ::= BACKTICK variable BACKTICK',
-        'doublequotedcontent ::= BACKTICK expr BACKTICK',
-        'doublequotedcontent ::= DOLLARID',
-        'doublequotedcontent ::= LDEL variable RDEL',
-        'doublequotedcontent ::= LDEL expr RDEL',
-        'doublequotedcontent ::= smartytag',
-        'doublequotedcontent ::= TEXT',
-    );
+// line 23 "../smarty/lexer/smarty_internal_templateparser.y"
 
-    public static $yyRuleInfo       = array(
-        array(0 => 63, 1 => 1),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 4),
-        array(0 => 65, 1 => 4),
-        array(0 => 65, 1 => 1),
-        array(0 => 66, 1 => 2),
-        array(0 => 66, 1 => 0),
-        array(0 => 64, 1 => 2),
-        array(0 => 64, 1 => 0),
-        array(0 => 67, 1 => 1),
-        array(0 => 67, 1 => 1),
-        array(0 => 67, 1 => 1),
-        array(0 => 67, 1 => 3),
-        array(0 => 67, 1 => 2),
-        array(0 => 68, 1 => 1),
-        array(0 => 68, 1 => 2),
-        array(0 => 68, 1 => 2),
-        array(0 => 71, 1 => 2),
-        array(0 => 70, 1 => 2),
-        array(0 => 73, 1 => 1),
-        array(0 => 73, 1 => 1),
-        array(0 => 73, 1 => 1),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 4),
-        array(0 => 69, 1 => 5),
-        array(0 => 69, 1 => 6),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 8),
-        array(0 => 81, 1 => 2),
-        array(0 => 81, 1 => 1),
-        array(0 => 69, 1 => 5),
-        array(0 => 69, 1 => 7),
-        array(0 => 69, 1 => 6),
-        array(0 => 69, 1 => 8),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 4),
-        array(0 => 67, 1 => 1),
-        array(0 => 69, 1 => 2),
-        array(0 => 69, 1 => 3),
-        array(0 => 69, 1 => 4),
-        array(0 => 69, 1 => 5),
-        array(0 => 74, 1 => 2),
-        array(0 => 74, 1 => 1),
-        array(0 => 74, 1 => 0),
-        array(0 => 84, 1 => 4),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 2),
-        array(0 => 84, 1 => 4),
-        array(0 => 80, 1 => 1),
-        array(0 => 80, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 79, 1 => 3),
-        array(0 => 77, 1 => 1),
-        array(0 => 77, 1 => 1),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 2),
-        array(0 => 77, 1 => 3),
-        array(0 => 77, 1 => 3),
-        array(0 => 85, 1 => 7),
-        array(0 => 85, 1 => 7),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 2),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 1),
-        array(0 => 76, 1 => 3),
-        array(0 => 91, 1 => 1),
-        array(0 => 91, 1 => 1),
-        array(0 => 75, 1 => 1),
-        array(0 => 75, 1 => 1),
-        array(0 => 75, 1 => 3),
-        array(0 => 75, 1 => 1),
-        array(0 => 75, 1 => 3),
-        array(0 => 75, 1 => 4),
-        array(0 => 75, 1 => 3),
-        array(0 => 75, 1 => 4),
-        array(0 => 72, 1 => 2),
-        array(0 => 72, 1 => 2),
-        array(0 => 96, 1 => 2),
-        array(0 => 96, 1 => 0),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 4),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 2),
-        array(0 => 97, 1 => 4),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 5),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 3),
-        array(0 => 97, 1 => 2),
-        array(0 => 82, 1 => 1),
-        array(0 => 82, 1 => 1),
-        array(0 => 82, 1 => 2),
-        array(0 => 98, 1 => 1),
-        array(0 => 98, 1 => 1),
-        array(0 => 98, 1 => 3),
-        array(0 => 95, 1 => 2),
-        array(0 => 99, 1 => 1),
-        array(0 => 99, 1 => 2),
-        array(0 => 100, 1 => 3),
-        array(0 => 100, 1 => 3),
-        array(0 => 100, 1 => 5),
-        array(0 => 100, 1 => 6),
-        array(0 => 100, 1 => 2),
-        array(0 => 90, 1 => 4),
-        array(0 => 101, 1 => 4),
-        array(0 => 101, 1 => 4),
-        array(0 => 102, 1 => 3),
-        array(0 => 102, 1 => 1),
-        array(0 => 102, 1 => 0),
-        array(0 => 78, 1 => 3),
-        array(0 => 78, 1 => 2),
-        array(0 => 103, 1 => 3),
-        array(0 => 103, 1 => 2),
-        array(0 => 83, 1 => 2),
-        array(0 => 83, 1 => 0),
-        array(0 => 104, 1 => 2),
-        array(0 => 104, 1 => 3),
-        array(0 => 104, 1 => 2),
-        array(0 => 93, 1 => 1),
-        array(0 => 93, 1 => 2),
-        array(0 => 93, 1 => 1),
-        array(0 => 93, 1 => 2),
-        array(0 => 93, 1 => 3),
-        array(0 => 87, 1 => 1),
-        array(0 => 87, 1 => 1),
-        array(0 => 86, 1 => 1),
-        array(0 => 88, 1 => 1),
-        array(0 => 94, 1 => 3),
-        array(0 => 94, 1 => 3),
-        array(0 => 105, 1 => 1),
-        array(0 => 105, 1 => 3),
-        array(0 => 105, 1 => 0),
-        array(0 => 106, 1 => 3),
-        array(0 => 106, 1 => 3),
-        array(0 => 106, 1 => 1),
-        array(0 => 92, 1 => 2),
-        array(0 => 92, 1 => 3),
-        array(0 => 107, 1 => 2),
-        array(0 => 107, 1 => 1),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 1),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 3),
-        array(0 => 108, 1 => 1),
-        array(0 => 108, 1 => 1),
-    );
-
-    public static $yyReduceMap      = array(
-        0   => 0,
-        1   => 1,
-        2   => 2,
-        3   => 3,
-        4   => 4,
-        5   => 5,
-        6   => 6,
-        7   => 7,
-        22  => 7,
-        23  => 7,
-        24  => 7,
-        37  => 7,
-        57  => 7,
-        58  => 7,
-        66  => 7,
-        67  => 7,
-        78  => 7,
-        83  => 7,
-        84  => 7,
-        89  => 7,
-        93  => 7,
-        94  => 7,
-        98  => 7,
-        99  => 7,
-        101 => 7,
-        106 => 7,
-        170 => 7,
-        175 => 7,
-        8   => 8,
-        9   => 9,
-        10  => 10,
-        12  => 12,
-        13  => 13,
-        14  => 14,
-        15  => 15,
-        16  => 16,
-        17  => 17,
-        18  => 18,
-        19  => 19,
-        20  => 20,
-        21  => 21,
-        25  => 25,
-        26  => 26,
-        27  => 27,
-        28  => 28,
-        29  => 29,
-        30  => 30,
-        31  => 31,
-        32  => 32,
-        34  => 32,
-        33  => 33,
-        35  => 35,
-        36  => 36,
-        38  => 38,
-        39  => 39,
-        40  => 40,
-        41  => 41,
-        42  => 42,
-        43  => 43,
-        44  => 44,
-        45  => 45,
-        46  => 46,
-        47  => 47,
-        48  => 48,
-        49  => 49,
-        50  => 50,
-        51  => 51,
-        60  => 51,
-        148 => 51,
-        152 => 51,
-        156 => 51,
-        158 => 51,
-        52  => 52,
-        149 => 52,
-        155 => 52,
-        53  => 53,
-        54  => 54,
-        55  => 54,
-        56  => 56,
-        133 => 56,
-        59  => 59,
-        61  => 61,
-        62  => 62,
-        63  => 62,
-        64  => 64,
-        65  => 65,
-        68  => 68,
-        69  => 69,
-        70  => 69,
-        71  => 71,
-        72  => 72,
-        73  => 73,
-        74  => 74,
-        75  => 75,
-        76  => 76,
-        77  => 77,
-        79  => 79,
-        81  => 79,
-        82  => 79,
-        113 => 79,
-        80  => 80,
-        85  => 85,
-        86  => 86,
-        87  => 87,
-        88  => 88,
-        90  => 90,
-        91  => 91,
-        92  => 91,
-        95  => 95,
-        96  => 96,
-        97  => 97,
-        100 => 100,
-        102 => 102,
-        103 => 103,
-        104 => 104,
-        105 => 105,
-        107 => 107,
-        108 => 108,
-        109 => 109,
-        110 => 110,
-        111 => 111,
-        112 => 112,
-        114 => 114,
-        172 => 114,
-        115 => 115,
-        116 => 116,
-        117 => 117,
-        118 => 118,
-        119 => 119,
-        120 => 120,
-        128 => 120,
-        121 => 121,
-        122 => 122,
-        123 => 123,
-        124 => 123,
-        126 => 123,
-        127 => 123,
-        125 => 125,
-        129 => 129,
-        130 => 130,
-        131 => 131,
-        176 => 131,
-        132 => 132,
-        134 => 134,
-        135 => 135,
-        136 => 136,
-        137 => 137,
-        138 => 138,
-        139 => 139,
-        140 => 140,
-        141 => 141,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        150 => 150,
-        151 => 151,
-        153 => 153,
-        154 => 154,
-        157 => 157,
-        159 => 159,
-        160 => 160,
-        161 => 161,
-        162 => 162,
-        163 => 163,
-        164 => 164,
-        165 => 165,
-        166 => 166,
-        167 => 167,
-        168 => 168,
-        169 => 168,
-        171 => 171,
-        173 => 173,
-        174 => 174,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        180 => 180,
-        183 => 180,
-        181 => 181,
-        184 => 181,
-        182 => 182,
-        185 => 185,
-        186 => 186,
-    );
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
 
     /**
      * result status
@@ -1654,13 +81,19 @@ class Smarty_Internal_Templateparser
      */
     public $lex;
 
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
     /**
      * {strip} status
      *
      * @var bool
      */
     public $strip = false;
-
     /**
      * compiler object
      *
@@ -1710,54 +143,6 @@ class Smarty_Internal_Templateparser
      */
     public $template_postfix = array();
 
-    public $yyTraceFILE;
-
-    public $yyTracePrompt;
-
-    public $yyidx;
-
-    public $yyerrcnt;
-
-    public $yystack          = array();
-
-    public $yyTokenName      = array(
-        '$', 'VERT', 'COLON', 'PHP',
-        'TEXT', 'STRIPON', 'STRIPOFF', 'LITERALSTART',
-        'LITERALEND', 'LITERAL', 'SIMPELOUTPUT', 'SIMPLETAG',
-        'SMARTYBLOCKCHILDPARENT', 'LDEL', 'RDEL', 'DOLLARID',
-        'EQUAL', 'ID', 'PTR', 'LDELMAKENOCACHE',
-        'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC',
-        'TO', 'STEP', 'LDELFOREACH', 'SPACE',
-        'AS', 'APTR', 'LDELSETFILTER', 'CLOSETAG',
-        'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA',
-        'OPENP', 'CLOSEP', 'MATH', 'UNIMATH',
-        'ISIN', 'QMARK', 'NOT', 'TYPECAST',
-        'HEX', 'DOT', 'INSTANCEOF', 'SINGLEQUOTESTRING',
-        'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH',
-        'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP',
-        'SLOGOP', 'TLOGOP', 'SINGLECOND', 'ARRAYOPEN',
-        'QUOTE', 'BACKTICK', 'error', 'start',
-        'template', 'literal_e2', 'literal_e1', 'smartytag',
-        'tagbody', 'tag', 'outattr', 'eqoutattr',
-        'varindexed', 'output', 'attributes', 'variable',
-        'value', 'expr', 'modifierlist', 'statement',
-        'statements', 'foraction', 'varvar', 'modparameters',
-        'attribute', 'ternary', 'tlop', 'lop',
-        'scond', 'array', 'function', 'ns1',
-        'doublequoted_with_quotes', 'static_class_access', 'arraydef', 'object',
-        'arrayindex', 'indexdef', 'varvarele', 'objectchain',
-        'objectelement', 'method', 'params', 'modifier',
-        'modparameter', 'arrayelements', 'arrayelement', 'doublequoted',
-        'doublequotedcontent',
-    );
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;                    /* Index of top element in stack */
-    private $_retvalue;                 /* Shifts left before out of the error */
     /**
      * constructor
      *
@@ -1772,16 +157,9 @@ public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_
         $this->smarty = $this->template->smarty;
         $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
         $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
-    }  /* The parser's stack */
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:
-                break;   /* If no destructor action specified: do nothing */
-        }
     }
 
-    /**
+     /**
      * insert PHP code in current buffer
      *
      * @param string $code
@@ -1823,6 +201,898 @@ public function mergePrefixCode($code)
         return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
     }
 
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_TEXT                           =  3;
+    const TP_STRIPON                        =  4;
+    const TP_STRIPOFF                       =  5;
+    const TP_LITERALSTART                   =  6;
+    const TP_LITERALEND                     =  7;
+    const TP_LITERAL                        =  8;
+    const TP_SIMPELOUTPUT                   =  9;
+    const TP_SIMPLETAG                      = 10;
+    const TP_SMARTYBLOCKCHILDPARENT         = 11;
+    const TP_LDEL                           = 12;
+    const TP_RDEL                           = 13;
+    const TP_DOLLARID                       = 14;
+    const TP_EQUAL                          = 15;
+    const TP_ID                             = 16;
+    const TP_PTR                            = 17;
+    const TP_LDELMAKENOCACHE                = 18;
+    const TP_LDELIF                         = 19;
+    const TP_LDELFOR                        = 20;
+    const TP_SEMICOLON                      = 21;
+    const TP_INCDEC                         = 22;
+    const TP_TO                             = 23;
+    const TP_STEP                           = 24;
+    const TP_LDELFOREACH                    = 25;
+    const TP_SPACE                          = 26;
+    const TP_AS                             = 27;
+    const TP_APTR                           = 28;
+    const TP_LDELSETFILTER                  = 29;
+    const TP_CLOSETAG                       = 30;
+    const TP_LDELSLASH                      = 31;
+    const TP_ATTR                           = 32;
+    const TP_INTEGER                        = 33;
+    const TP_COMMA                          = 34;
+    const TP_OPENP                          = 35;
+    const TP_CLOSEP                         = 36;
+    const TP_MATH                           = 37;
+    const TP_UNIMATH                        = 38;
+    const TP_ISIN                           = 39;
+    const TP_QMARK                          = 40;
+    const TP_NOT                            = 41;
+    const TP_TYPECAST                       = 42;
+    const TP_HEX                            = 43;
+    const TP_DOT                            = 44;
+    const TP_INSTANCEOF                     = 45;
+    const TP_SINGLEQUOTESTRING              = 46;
+    const TP_DOUBLECOLON                    = 47;
+    const TP_NAMESPACE                      = 48;
+    const TP_AT                             = 49;
+    const TP_HATCH                          = 50;
+    const TP_OPENB                          = 51;
+    const TP_CLOSEB                         = 52;
+    const TP_DOLLAR                         = 53;
+    const TP_LOGOP                          = 54;
+    const TP_SLOGOP                         = 55;
+    const TP_TLOGOP                         = 56;
+    const TP_SINGLECOND                     = 57;
+    const TP_ARRAYOPEN                      = 58;
+    const TP_QUOTE                          = 59;
+    const TP_BACKTICK                       = 60;
+    const YY_NO_ACTION = 514;
+    const YY_ACCEPT_ACTION = 513;
+    const YY_ERROR_ACTION = 512;
+
+    const YY_SZ_ACTTAB = 1997;
+public static $yy_action = array(
+    249,  250,  239,    1,   27,  127,  220,  184,  160,  213,
+     11,   54,  278,   10,  173,   34,  108,  387,  282,  279,
+    223,  321,  221,    8,  194,  387,   18,  387,   85,   41,
+    387,  285,   42,   44,  264,  222,  387,  209,  387,  198,
+    387,   52,    5,  307,  288,  288,  164,  283,  224,    4,
+     50,  249,  250,  239,    1,  232,  131,  381,  189,  205,
+    213,   11,   54,   39,   35,  243,   31,  108,   94,   17,
+    381,  223,  321,  221,  439,  226,  381,   33,   49,  426,
+     41,  439,   89,   42,   44,  264,  222,    9,  235,  163,
+    198,  426,   52,    5,  131,  288,  212,  284,  102,  106,
+      4,   50,  249,  250,  239,    1,  232,  129,  426,  189,
+    347,  213,   11,   54,  175,  324,  347,  208,  108,   22,
+    426,  301,  223,  321,  221,  302,  226,  135,   18,   49,
+     52,   41,   26,  288,   42,   44,  264,  222,   16,  235,
+    294,  198,  204,   52,    5,  170,  288,   32,   90,  267,
+    268,    4,   50,  249,  250,  239,    1,   20,  129,  185,
+    179,  255,  213,   11,   54,  455,  288,  192,  455,  108,
+    175,  167,  455,  223,  321,  221,  439,  226,  256,   18,
+     55,  292,   41,  439,  132,   42,   44,  264,  222,  427,
+    235,   12,  198,  165,   52,    5,  232,  288,  288,  347,
+    153,  427,    4,   50,  249,  250,  239,    1,  232,  129,
+    286,  181,  347,  213,   11,   54,   24,   13,  347,   49,
+    108,  232,  320,  426,  223,  321,  221,  195,  201,  173,
+     18,   49,  139,   41,  296,  426,   42,   44,  264,  222,
+      7,  235,  286,  198,   49,   52,    5,  147,  288,  117,
+    150,  317,  263,    4,   50,  249,  250,  239,    1,   95,
+    130,  173,  189,  155,  213,   11,   54,   22,  244,  271,
+    192,  108,  323,  286,  101,  223,  321,  221,  294,  226,
+    204,   18,  348,  257,   41,  166,  283,   42,   44,  264,
+    222,   28,  235,  300,  198,  348,   52,    5,  247,  288,
+    117,  348,   94,  206,    4,   50,  249,  250,  239,    1,
+     95,  129,   22,  189,  277,  213,   11,   54,   91,  274,
+    224,  426,  108,  323,  216,  156,  223,  321,  221,  132,
+    180,  262,   18,  426,  100,   41,   12,  288,   42,   44,
+    264,  222,   15,  235,  216,  198,  254,   52,    5,  233,
+    288,  210,  190,  192,  100,    4,   50,  249,  250,  239,
+      1,    3,  131,   94,  189,  192,  213,   11,   54,  269,
+     10,  204,  290,  108,  325,  216,  224,  223,  321,  221,
+     23,  226,  211,   33,  315,  100,   45,  513,   92,   42,
+     44,  264,  222,  102,  235,  178,  198,  268,   52,    5,
+    275,  288,  161,  192,   37,   25,    4,   50,  249,  250,
+    239,    1,  286,  129,  172,  187,  305,  213,   11,   54,
+    164,  283,  310,  141,  108,  281,  281,  236,  223,  321,
+    221,  169,  226,  230,   18,  122,  171,   41,  225,  175,
+     42,   44,  264,  222,  144,  235,  303,  198,  134,   52,
+      5,  265,  288,  151,  286,  192,  175,    4,   50,  249,
+    250,  239,    1,  286,  128,   94,  189,  143,  213,   11,
+     54,  219,  152,  207,  193,  108,  149,  281,   31,  223,
+    321,  221,  100,  226,   21,    6,  286,  288,   41,  158,
+     16,   42,   44,  264,  222,  102,  235,  238,  198,  286,
+     52,    5,  157,  288,  281,  122,  168,  283,    4,   50,
+    249,  250,  239,    1,   30,   93,  308,   51,  215,  213,
+     11,   54,   53,  251,  140,  248,  108,  245,  304,  116,
+    223,  321,  221,  111,  226,  176,   18,  270,  266,   41,
+    224,  322,   42,   44,  264,  222,    7,  235,  259,  198,
+    147,   52,    5,  257,  288,   43,   40,   38,   83,    4,
+     50,  241,  214,  204,  319,  280,   88,  107,  138,  182,
+     97,   64,  311,  312,  313,  316,   95,  281,  298,  258,
+    142,  234,   94,  105,  272,  197,  231,  482,  237,  323,
+     37,  133,  324,  241,  214,  204,  319,  314,   88,  107,
+    296,  183,   97,   82,   84,   43,   40,   38,   95,  296,
+    296,  258,  296,  296,  296,  159,  272,  197,  231,  296,
+    237,  323,  311,  312,  313,  316,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  104,   77,  296,  296,  110,
+    296,   95,  296,  296,  258,  278,  296,  296,   34,  272,
+    197,  231,  279,  237,  323,   43,   40,   38,  296,  296,
+    296,  241,   26,  204,  196,  276,  103,  296,   16,  199,
+    104,   77,  311,  312,  313,  316,   95,  192,  296,  258,
+    146,  296,  296,  296,  272,  197,  231,  296,  237,  323,
+    286,  393,   39,   35,  243,  296,  296,  296,  296,  191,
+    276,  296,   26,  318,  252,  253,  126,  296,   16,  249,
+    250,  239,    1,  296,  296,  131,  296,  261,  213,   11,
+     54,  296,  296,  296,  426,  108,  393,  393,  393,  223,
+    321,  221,  241,  296,  204,  299,  426,  103,  107,  296,
+    183,   97,   82,  393,  393,  393,  393,   95,  296,  260,
+    258,   52,  296,  296,  288,  272,  197,  231,  296,  237,
+    323,  293,  296,  296,  296,  296,  296,  249,  250,  239,
+      2,  296,  295,  296,  296,  296,  213,   11,   54,  296,
+    296,  177,  296,  108,  136,  296,  296,  223,  321,  221,
+    296,  296,  296,  293,   43,   40,   38,  296,  296,  249,
+    250,  239,    2,  296,  295,   43,   40,   38,  213,   11,
+     54,  311,  312,  313,  316,  108,  296,  291,   14,  223,
+    321,  221,  311,  312,  313,  316,  296,  296,  241,  296,
+    204,  296,  192,  103,  296,  296,  199,  104,   77,  296,
+    296,  296,  296,   95,  383,  296,  258,  296,  296,  297,
+     14,  272,  197,  231,  296,  237,  323,  383,  296,  296,
+    241,  296,  204,  383,  296,   99,  296,  287,  199,  120,
+     48,  241,  112,  204,  296,   95,  103,  296,  258,  199,
+    120,   74,  296,  272,  197,  231,   95,  237,  323,  258,
+    455,  296,  296,  455,  272,  197,  231,  455,  237,  323,
+    241,  296,  204,  296,  296,  103,  200,  296,  199,  120,
+     74,  296,  296,  296,  296,   95,  296,  296,  258,  278,
+    296,  296,   34,  272,  197,  231,  279,  237,  323,  241,
+    455,  204,  296,  296,   99,  202,  296,  199,  120,   56,
+    241,  211,  204,  296,   95,  103,  296,  258,  199,  120,
+     74,  296,  272,  197,  231,   95,  237,  323,  258,  227,
+    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
+    296,  204,  148,  296,  103,  203,   86,  199,  120,   73,
+    296,  296,  286,  296,   95,  296,  296,  258,  278,  296,
+    296,   34,  272,  197,  231,  279,  237,  323,  241,  296,
+    204,  175,  296,  103,  296,  296,  199,  120,   75,  241,
+    296,  204,  296,   95,  103,  296,  258,  199,  120,   63,
+    296,  272,  197,  231,   95,  237,  323,  258,  229,  192,
+    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
+    204,  380,  296,  103,  296,  296,  199,  120,   58,  296,
+    296,  296,  296,   95,  380,  296,  258,  296,  296,  296,
+    380,  272,  197,  231,  296,  237,  323,  241,  296,  204,
+    296,  296,  103,  296,  296,  199,  120,   71,  241,  296,
+    204,  296,   95,  103,  296,  258,  199,  120,   79,  296,
+    272,  197,  231,   95,  237,  323,  258,  296,  296,  296,
+    154,  272,  197,  231,   87,  237,  323,  241,  296,  204,
+    286,  296,  103,  296,  296,  199,  120,   70,  296,  296,
+    296,  296,   95,  296,  296,  258,  296,  296,  296,  175,
+    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  120,   56,  241,  296,  204,
+    296,   95,  103,  296,  258,  199,  120,   46,  296,  272,
+    197,  231,   95,  237,  323,  258,  296,  296,  296,  296,
+    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  120,   78,  296,  296,  296,
+    296,   95,  296,  296,  258,  296,  296,  296,  296,  272,
+    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
+    103,  296,  296,  199,  120,   66,  241,  296,  204,  296,
+     95,  103,  296,  258,  199,  120,   59,  296,  272,  197,
+    231,   95,  237,  323,  258,  296,  296,  296,  296,  272,
+    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
+    103,  296,  296,  186,  109,   57,  296,  296,  296,  296,
+     95,  296,  296,  258,  296,  296,  296,  296,  272,  197,
+    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
+    296,  296,  188,  120,   67,  241,  296,  204,  296,   95,
+    103,  296,  258,  199,   96,   62,  296,  272,  197,  231,
+     95,  237,  323,  258,  296,  296,  296,  296,  272,  197,
+    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
+    296,  296,  199,  120,   80,  296,  296,  296,  296,   95,
+    296,  296,  258,  296,  296,  296,  296,  272,  197,  231,
+    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
+    296,  199,  120,   76,  241,  296,  204,  296,   95,  103,
+    296,  258,  199,  120,   81,  296,  272,  197,  231,   95,
+    237,  323,  258,  296,  296,  296,  296,  272,  197,  231,
+    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
+    296,  199,  120,   65,  296,  296,  296,  296,   95,  296,
+    296,  258,  296,  296,  296,  296,  272,  197,  231,  296,
+    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
+    199,   96,   68,  241,  296,  204,  296,   95,  103,  296,
+    258,  199,  120,   61,  296,  272,  197,  231,   95,  237,
+    323,  258,  296,  296,  296,  296,  272,  197,  231,  296,
+    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
+    199,   98,   69,  296,  296,  296,  296,   95,  296,  296,
+    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
+    323,  241,  296,  204,  296,  296,  103,  296,  296,  199,
+    120,   72,  241,  296,  204,  296,   95,  103,  296,  258,
+    199,  120,   47,  296,  272,  197,  231,   95,  237,  323,
+    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
+    323,  241,  192,  204,  296,  296,  103,  296,  296,  199,
+    120,   60,  296,  296,  351,  296,   95,  296,  217,  258,
+    296,  296,  296,  296,  272,  197,  231,   26,  237,  323,
+    241,  296,  204,   16,  296,  103,  426,  296,  199,  125,
+    296,  241,  296,  204,  296,   95,  103,  296,  426,  199,
+    118,  296,  242,  272,  197,  231,   95,  237,  323,  296,
+    296,  296,  296,  246,  272,  197,  231,  296,  237,  323,
+    241,  296,  204,  278,  296,  103,   34,  296,  199,  121,
+    279,  296,  296,  296,  296,   95,  296,  296,  296,  296,
+     26,  296,  162,  272,  197,  231,   16,  237,  323,  241,
+    296,  204,  296,  296,  103,  296,  296,  199,  123,  296,
+    241,  296,  204,  296,   95,  103,  296,  296,  199,  114,
+    296,  296,  272,  197,  231,   95,  237,  323,  296,  296,
+    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
+    296,  204,  296,  145,  103,  296,  296,  199,  124,  296,
+    296,  296,  296,  286,   95,   39,   35,  243,  296,  296,
+    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
+    204,  296,  296,  103,  296,  296,  199,  115,  296,  241,
+    296,  204,  296,   95,  103,  296,  296,  199,  113,  296,
+    296,  272,  197,  231,   95,  237,  323,  296,  296,  296,
+    296,  296,  272,  197,  231,  228,  237,  323,  241,  296,
+    204,  296,  455,  103,  296,  455,  199,  119,    3,  455,
+    439,  296,  296,   95,  296,  296,  296,  296,  296,  296,
+    296,  272,  197,  231,  228,  237,  323,  296,  296,  296,
+    296,  455,  296,  296,  455,  296,  296,  439,  455,  439,
+    439,  228,  455,  296,  439,  296,  296,  137,  455,  296,
+    296,  455,  296,  296,   32,  455,  439,  286,  296,   39,
+     35,  243,   29,  296,   26,  296,  439,  296,  296,  439,
+     16,  455,  296,  439,  306,   43,   40,   38,  296,  296,
+    296,  296,  296,  439,  296,  296,  439,  296,  455,  296,
+    439,   26,  311,  312,  313,  316,  296,   16,  228,  296,
+    296,  296,   43,   40,   38,  455,  296,  296,  455,  296,
+    296,  296,  455,  439,  296,  296,   19,  296,  296,  311,
+    312,  313,  316,  455,  296,  296,  455,  296,  296,  296,
+    455,  439,  296,  296,  296,   43,   40,   38,  296,  296,
+    439,  296,  296,  439,  174,  455,  296,  439,  296,  240,
+    309,  296,  311,  312,  313,  316,  296,  289,  439,  296,
+     36,  439,  296,  455,  296,  439,  296,  296,   43,   40,
+     38,  296,  296,   43,   40,   38,  296,  296,  296,  296,
+    296,   43,   40,   38,  296,  311,  312,  313,  316,  296,
+    311,  312,  313,  316,  296,   43,   40,   38,  311,  312,
+    313,  316,  273,   43,   40,   38,  296,  296,  296,  296,
+    296,  296,  311,  312,  313,  316,  296,  296,  296,  296,
+    311,  312,  313,  316,  455,  296,  296,  455,   43,   40,
+     38,  455,  439,  218,   43,   40,   38,  296,  296,  296,
+    296,  296,  296,  296,  296,  311,  312,  313,  316,  296,
+    296,  311,  312,  313,  316,  296,  296,  296,  296,  439,
+    296,  296,  439,  296,  455,  296,  439,
+    );
+    public static $yy_lookahead = array(
+      9,   10,   11,   12,   12,   14,   14,   16,   16,   18,
+     19,   20,    9,   34,  102,   12,   25,   13,   70,   16,
+     29,   30,   31,   35,   33,   21,   35,   23,   95,   38,
+     26,   52,   41,   42,   43,   44,   32,   46,   34,   48,
+     36,   50,   51,   52,   53,   53,   98,   99,   44,   58,
+     59,    9,   10,   11,   12,   22,   14,   13,   16,   15,
+     18,   19,   20,   85,   86,   87,   15,   25,   17,   21,
+     26,   29,   30,   31,   44,   33,   32,   35,   45,   35,
+     38,   51,   34,   41,   42,   43,   44,   35,   46,   77,
+     48,   47,   50,   51,   14,   53,   16,   13,   47,   47,
+     58,   59,    9,   10,   11,   12,   22,   14,   35,   16,
+     26,   18,   19,   20,  102,  103,   32,   44,   25,   34,
+     47,   36,   29,   30,   31,   52,   33,   14,   35,   45,
+     50,   38,   26,   53,   41,   42,   43,   44,   32,   46,
+     66,   48,   68,   50,   51,   77,   53,   15,   35,    7,
+      8,   58,   59,    9,   10,   11,   12,   12,   14,   14,
+     16,   16,   18,   19,   20,    9,   53,    1,   12,   25,
+    102,   82,   16,   29,   30,   31,   44,   33,   33,   35,
+    106,  107,   38,   51,   44,   41,   42,   43,   44,   35,
+     46,   51,   48,   82,   50,   51,   22,   53,   53,   13,
+     73,   47,   58,   59,    9,   10,   11,   12,   22,   14,
+     83,   16,   26,   18,   19,   20,   28,   12,   32,   45,
+     25,   22,   70,   35,   29,   30,   31,   65,   33,  102,
+     35,   45,   73,   38,   60,   47,   41,   42,   43,   44,
+     35,   46,   83,   48,   45,   50,   51,   95,   53,   71,
+     95,   52,   74,   58,   59,    9,   10,   11,   12,   81,
+     14,  102,   16,   73,   18,   19,   20,   34,   90,   36,
+      1,   25,   94,   83,   81,   29,   30,   31,   66,   33,
+     68,   35,   13,   96,   38,   98,   99,   41,   42,   43,
+     44,   15,   46,  100,   48,   26,   50,   51,   14,   53,
+     71,   32,   17,   74,   58,   59,    9,   10,   11,   12,
+     81,   14,   34,   16,   36,   18,   19,   20,   82,  107,
+     44,   35,   25,   94,   71,   95,   29,   30,   31,   44,
+     33,   78,   35,   47,   81,   38,   51,   53,   41,   42,
+     43,   44,   15,   46,   71,   48,   16,   50,   51,   22,
+     53,   78,   79,    1,   81,   58,   59,    9,   10,   11,
+     12,   15,   14,   17,   16,    1,   18,   19,   20,   66,
+     34,   68,   36,   25,   16,   71,   44,   29,   30,   31,
+     28,   33,   78,   35,   52,   81,   38,   62,   63,   41,
+     42,   43,   44,   47,   46,    6,   48,    8,   50,   51,
+     16,   53,   73,    1,    2,   40,   58,   59,    9,   10,
+     11,   12,   83,   14,   77,   16,   52,   18,   19,   20,
+     98,   99,   52,   95,   25,   97,   97,   92,   29,   30,
+     31,   77,   33,   49,   35,  100,   14,   38,   16,  102,
+     41,   42,   43,   44,   73,   46,   14,   48,   14,   50,
+     51,   36,   53,   73,   83,    1,  102,   58,   59,    9,
+     10,   11,   12,   83,   14,   17,   16,   50,   18,   19,
+     20,   17,   71,   64,   65,   25,   73,   97,   15,   29,
+     30,   31,   81,   33,   26,   35,   83,   53,   38,   73,
+     32,   41,   42,   43,   44,   47,   46,   92,   48,   83,
+     50,   51,   95,   53,   97,  100,   98,   99,   58,   59,
+      9,   10,   11,   12,   23,   14,   52,   16,   16,   18,
+     19,   20,   16,    7,   50,   16,   25,   13,   13,   16,
+     29,   30,   31,   16,   33,   16,   35,   33,   33,   38,
+     44,   16,   41,   42,   43,   44,   35,   46,   16,   48,
+     95,   50,   51,   96,   53,   37,   38,   39,   81,   58,
+     59,   66,   67,   68,   69,   83,   71,   72,   95,   74,
+     75,   76,   54,   55,   56,   57,   81,   97,   60,   84,
+     95,   13,   17,   80,   89,   90,   91,    1,   93,   94,
+      2,   81,  103,   66,   67,   68,   69,   99,   71,   72,
+    108,   74,   75,   76,   81,   37,   38,   39,   81,  108,
+    108,   84,  108,  108,  108,   95,   89,   90,   91,  108,
+     93,   94,   54,   55,   56,   57,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,  108,  108,   21,
+    108,   81,  108,  108,   84,    9,  108,  108,   12,   89,
+     90,   91,   16,   93,   94,   37,   38,   39,  108,  108,
+    108,   66,   26,   68,  104,  105,   71,  108,   32,   74,
+     75,   76,   54,   55,   56,   57,   81,    1,  108,   84,
+     73,  108,  108,  108,   89,   90,   91,  108,   93,   94,
+     83,    2,   85,   86,   87,  108,  108,  108,  108,  104,
+    105,  108,   26,    3,    4,    5,    6,  108,   32,    9,
+     10,   11,   12,  108,  108,   14,  108,   16,   18,   19,
+     20,  108,  108,  108,   35,   25,   37,   38,   39,   29,
+     30,   31,   66,  108,   68,   69,   47,   71,   72,  108,
+     74,   75,   76,   54,   55,   56,   57,   81,  108,   48,
+     84,   50,  108,  108,   53,   89,   90,   91,  108,   93,
+     94,    3,  108,  108,  108,  108,  108,    9,   10,   11,
+     12,  108,   14,  108,  108,  108,   18,   19,   20,  108,
+    108,   13,  108,   25,   27,  108,  108,   29,   30,   31,
+    108,  108,  108,    3,   37,   38,   39,  108,  108,    9,
+     10,   11,   12,  108,   14,   37,   38,   39,   18,   19,
+     20,   54,   55,   56,   57,   25,  108,   59,   60,   29,
+     30,   31,   54,   55,   56,   57,  108,  108,   66,  108,
+     68,  108,    1,   71,  108,  108,   74,   75,   76,  108,
+    108,  108,  108,   81,   13,  108,   84,  108,  108,   59,
+     60,   89,   90,   91,  108,   93,   94,   26,  108,  108,
+     66,  108,   68,   32,  108,   71,  108,  105,   74,   75,
+     76,   66,   78,   68,  108,   81,   71,  108,   84,   74,
+     75,   76,  108,   89,   90,   91,   81,   93,   94,   84,
+      9,  108,  108,   12,   89,   90,   91,   16,   93,   94,
+     66,  108,   68,  108,  108,   71,  101,  108,   74,   75,
+     76,  108,  108,  108,  108,   81,  108,  108,   84,    9,
+    108,  108,   12,   89,   90,   91,   16,   93,   94,   66,
+     49,   68,  108,  108,   71,  101,  108,   74,   75,   76,
+     66,   78,   68,  108,   81,   71,  108,   84,   74,   75,
+     76,  108,   89,   90,   91,   81,   93,   94,   84,   49,
+    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
+    108,   68,   73,  108,   71,  101,   77,   74,   75,   76,
+    108,  108,   83,  108,   81,  108,  108,   84,    9,  108,
+    108,   12,   89,   90,   91,   16,   93,   94,   66,  108,
+     68,  102,  108,   71,  108,  108,   74,   75,   76,   66,
+    108,   68,  108,   81,   71,  108,   84,   74,   75,   76,
+    108,   89,   90,   91,   81,   93,   94,   84,   49,    1,
+    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
+     68,   13,  108,   71,  108,  108,   74,   75,   76,  108,
+    108,  108,  108,   81,   26,  108,   84,  108,  108,  108,
+     32,   89,   90,   91,  108,   93,   94,   66,  108,   68,
+    108,  108,   71,  108,  108,   74,   75,   76,   66,  108,
+     68,  108,   81,   71,  108,   84,   74,   75,   76,  108,
+     89,   90,   91,   81,   93,   94,   84,  108,  108,  108,
+     73,   89,   90,   91,   77,   93,   94,   66,  108,   68,
+     83,  108,   71,  108,  108,   74,   75,   76,  108,  108,
+    108,  108,   81,  108,  108,   84,  108,  108,  108,  102,
+     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,   66,  108,   68,
+    108,   81,   71,  108,   84,   74,   75,   76,  108,   89,
+     90,   91,   81,   93,   94,   84,  108,  108,  108,  108,
+     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,  108,  108,  108,
+    108,   81,  108,  108,   84,  108,  108,  108,  108,   89,
+     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
+     71,  108,  108,   74,   75,   76,   66,  108,   68,  108,
+     81,   71,  108,   84,   74,   75,   76,  108,   89,   90,
+     91,   81,   93,   94,   84,  108,  108,  108,  108,   89,
+     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
+     71,  108,  108,   74,   75,   76,  108,  108,  108,  108,
+     81,  108,  108,   84,  108,  108,  108,  108,   89,   90,
+     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
+    108,  108,   74,   75,   76,   66,  108,   68,  108,   81,
+     71,  108,   84,   74,   75,   76,  108,   89,   90,   91,
+     81,   93,   94,   84,  108,  108,  108,  108,   89,   90,
+     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
+    108,  108,   74,   75,   76,  108,  108,  108,  108,   81,
+    108,  108,   84,  108,  108,  108,  108,   89,   90,   91,
+    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
+    108,   74,   75,   76,   66,  108,   68,  108,   81,   71,
+    108,   84,   74,   75,   76,  108,   89,   90,   91,   81,
+     93,   94,   84,  108,  108,  108,  108,   89,   90,   91,
+    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
+    108,   74,   75,   76,  108,  108,  108,  108,   81,  108,
+    108,   84,  108,  108,  108,  108,   89,   90,   91,  108,
+     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
+     74,   75,   76,   66,  108,   68,  108,   81,   71,  108,
+     84,   74,   75,   76,  108,   89,   90,   91,   81,   93,
+     94,   84,  108,  108,  108,  108,   89,   90,   91,  108,
+     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
+     74,   75,   76,  108,  108,  108,  108,   81,  108,  108,
+     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
+     94,   66,  108,   68,  108,  108,   71,  108,  108,   74,
+     75,   76,   66,  108,   68,  108,   81,   71,  108,   84,
+     74,   75,   76,  108,   89,   90,   91,   81,   93,   94,
+     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
+     94,   66,    1,   68,  108,  108,   71,  108,  108,   74,
+     75,   76,  108,  108,   13,  108,   81,  108,   17,   84,
+    108,  108,  108,  108,   89,   90,   91,   26,   93,   94,
+     66,  108,   68,   32,  108,   71,   35,  108,   74,   75,
+    108,   66,  108,   68,  108,   81,   71,  108,   47,   74,
+     75,  108,   88,   89,   90,   91,   81,   93,   94,  108,
+    108,  108,  108,   88,   89,   90,   91,  108,   93,   94,
+     66,  108,   68,    9,  108,   71,   12,  108,   74,   75,
+     16,  108,  108,  108,  108,   81,  108,  108,  108,  108,
+     26,  108,   28,   89,   90,   91,   32,   93,   94,   66,
+    108,   68,  108,  108,   71,  108,  108,   74,   75,  108,
+     66,  108,   68,  108,   81,   71,  108,  108,   74,   75,
+    108,  108,   89,   90,   91,   81,   93,   94,  108,  108,
+    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
+    108,   68,  108,   73,   71,  108,  108,   74,   75,  108,
+    108,  108,  108,   83,   81,   85,   86,   87,  108,  108,
+    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
+     68,  108,  108,   71,  108,  108,   74,   75,  108,   66,
+    108,   68,  108,   81,   71,  108,  108,   74,   75,  108,
+    108,   89,   90,   91,   81,   93,   94,  108,  108,  108,
+    108,  108,   89,   90,   91,    2,   93,   94,   66,  108,
+     68,  108,    9,   71,  108,   12,   74,   75,   15,   16,
+     17,  108,  108,   81,  108,  108,  108,  108,  108,  108,
+    108,   89,   90,   91,    2,   93,   94,  108,  108,  108,
+    108,    9,  108,  108,   12,  108,  108,   44,   16,   17,
+     47,    2,   49,  108,   51,  108,  108,   73,    9,  108,
+    108,   12,  108,  108,   15,   16,   17,   83,  108,   85,
+     86,   87,   24,  108,   26,  108,   44,  108,  108,   47,
+     32,   49,  108,   51,   52,   37,   38,   39,  108,  108,
+    108,  108,  108,   44,  108,  108,   47,  108,   49,  108,
+     51,   26,   54,   55,   56,   57,  108,   32,    2,  108,
+    108,  108,   37,   38,   39,    9,  108,  108,   12,  108,
+    108,  108,   16,   17,  108,  108,    2,  108,  108,   54,
+     55,   56,   57,    9,  108,  108,   12,  108,  108,  108,
+     16,   17,  108,  108,  108,   37,   38,   39,  108,  108,
+     44,  108,  108,   47,   13,   49,  108,   51,  108,   13,
+     52,  108,   54,   55,   56,   57,  108,   13,   44,  108,
+      2,   47,  108,   49,  108,   51,  108,  108,   37,   38,
+     39,  108,  108,   37,   38,   39,  108,  108,  108,  108,
+    108,   37,   38,   39,  108,   54,   55,   56,   57,  108,
+     54,   55,   56,   57,  108,   37,   38,   39,   54,   55,
+     56,   57,   36,   37,   38,   39,  108,  108,  108,  108,
+    108,  108,   54,   55,   56,   57,  108,  108,  108,  108,
+     54,   55,   56,   57,    9,  108,  108,   12,   37,   38,
+     39,   16,   17,   36,   37,   38,   39,  108,  108,  108,
+    108,  108,  108,  108,  108,   54,   55,   56,   57,  108,
+    108,   54,   55,   56,   57,  108,  108,  108,  108,   44,
+    108,  108,   47,  108,   49,  108,   51,
+);
+    const YY_SHIFT_USE_DFLT = -22;
+    const YY_SHIFT_MAX = 230;
+    public static $yy_shift_ofst = array(
+    -22,  501,  501,   93,  399,  399,  450,   93,   93,   93,
+    399,  450,   -9,   93,   93,   93,   93,   93,   93,  144,
+     93,  195,   93,   93,   93,  246,  195,   93,   93,   93,
+     93,   93,  297,   93,   93,   93,   93,  348,   42,   42,
+     42,   42,   42,   42,   42,   42, 1768, 1795, 1795,  701,
+    758, 1521,   80,  676,  113,  790, 1927, 1828, 1896,  568,
+    768, 1861,  757, 1866, 1874, 1888,  618,  518, 1921, 1921,
+   1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921,
+   1921, 1921, 1921, 1584,  636,  285,  676,  676,  346,  113,
+    113,  402,  700, 1723,   -8,  910,  831,  269, 1028,   51,
+      3,    3,  422,  448,  352,  106,  422,  106,  458,  364,
+    434,  454,  106,  166,  166,  166,  166,  565,  166,  166,
+    166,  586,  565,  166,  166,  -22,  -22, 1752, 1769, 1826,
+   1844, 1945,  145,  979,  156,  132,  284,  106,  140,  106,
+     30,  140,  140,   30,  106,  106,  106,  140,  106,  106,
+    140,  106,  327,  106,  106,  106,  140,  140,  106,  140,
+    205,  106,  284,  166,  565,  588,  565,  588,  565,  166,
+    166,  -12,  166,  -22,  -22,  -22,  -22,  -22,  -22,  689,
+      4,   44,   84,  186,   73,  881,  199,  188,  174,  286,
+     48,  336,  384,  389,  332,  142,  -21,   52,  154,   33,
+     85,  276,  278,  233,  515,  509,  474,  516,  502,  464,
+    491,  415,  417,  432,  514,  370,  463,  506,  365,  513,
+    -12,  517,  504,  519,  505,  511,  496,  525,  532,  330,
+    358,
+);
+    const YY_REDUCE_USE_DFLT = -89;
+    const YY_REDUCE_MAX = 178;
+    public static $yy_reduce_ofst = array(
+    325,  527,  495,  666,  595,  560,  863,  874,  834,  805,
+    762,  794, 1179, 1455, 1208, 1012, 1386, 1139, 1070, 1110,
+   1150, 1219, 1248, 1277, 1288, 1317, 1346, 1357, 1415, 1426,
+   1081, 1041, 1001,  972,  943,  932,  903, 1484, 1495, 1622,
+   1633, 1662, 1593, 1564, 1553, 1524, 1704,  607, 1590,  178,
+     74, 1027,  229,  899,  273,  212,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  380,  329,  187,  159,  127,  -52,  253,
+    304,   12,  303,  152,  193,  328,   68,   68,   68,  322,
+    328,  407,  405,  322,   68,  190,  335,  416,  403,   68,
+    401,  354,  371,   68,   68,   68,  337,  322,   68,   68,
+     68,   68,  408,   68,   68,   68,  409,  455,  455,  455,
+    455,  455,  510,  480,  455,  455,  477,  482,  457,  482,
+    473,  457,  457,  485,  482,  482,  482,  457,  482,  482,
+    457,  482,  503,  482,  482,  482,  457,  457,  482,  457,
+    520,  482,  523,  -88,  498,  489,  498,  489,  498,  -88,
+    -88,  -67,  -88,  111,  155,   89,  236,  230,  162,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 52, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(24, 26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(14, 16, 48, 50, 53, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
+         array(1, 13, 17, 26, 32, 35, 47, ),
+         array(14, 16, 50, 53, ),
+         array(1, 26, 32, ),
+         array(14, 35, 53, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
+         array(36, 37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 52, 54, 55, 56, 57, ),
+         array(36, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(27, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(2, 37, 38, 39, 54, 55, 56, 57, ),
+         array(21, 37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, 60, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(9, 12, 16, 26, 28, 32, ),
+         array(9, 12, 16, 26, 32, ),
+         array(17, 44, 51, ),
+         array(1, 26, 32, ),
+         array(1, 26, 32, ),
+         array(15, 17, 47, ),
+         array(14, 35, 53, ),
+         array(14, 35, 53, ),
+         array(1, 2, ),
+         array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 20, 25, 29, 30, 31, ),
+         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
+         array(12, 14, 16, 53, ),
+         array(9, 12, 16, 49, ),
+         array(1, 13, 26, 32, ),
+         array(1, 13, 26, 32, ),
+         array(1, 13, 26, 32, ),
+         array(15, 17, 47, ),
+         array(9, 12, 16, ),
+         array(9, 12, 16, ),
+         array(14, 16, ),
+         array(17, 47, ),
+         array(1, 28, ),
+         array(26, 32, ),
+         array(14, 16, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(1, 52, ),
+         array(14, 53, ),
+         array(1, 17, ),
+         array(26, 32, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(),
+         array(),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, 52, ),
+         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(12, 14, 16, 33, 53, ),
+         array(9, 12, 16, 49, ),
+         array(9, 12, 16, ),
+         array(15, 44, 51, ),
+         array(14, 53, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(15, 22, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(12, 35, ),
+         array(26, 32, ),
+         array(14, 53, ),
+         array(1, ),
+         array(17, ),
+         array(2, ),
+         array(17, ),
+         array(2, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(35, ),
+         array(1, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(2, 35, 37, 38, 39, 47, 54, 55, 56, 57, ),
+         array(13, 21, 23, 26, 32, 34, 36, 44, ),
+         array(13, 15, 26, 32, 35, 47, ),
+         array(13, 22, 26, 32, 45, ),
+         array(13, 22, 26, 32, 45, ),
+         array(35, 44, 47, 52, ),
+         array(9, 12, 16, 49, ),
+         array(22, 45, 52, ),
+         array(28, 35, 47, ),
+         array(22, 45, 60, ),
+         array(35, 47, ),
+         array(21, 34, ),
+         array(34, 36, ),
+         array(16, 49, ),
+         array(6, 8, ),
+         array(44, 52, ),
+         array(7, 8, ),
+         array(34, 52, ),
+         array(35, 47, ),
+         array(35, 47, ),
+         array(22, 45, ),
+         array(34, 36, ),
+         array(15, 44, ),
+         array(34, 36, ),
+         array(34, 36, ),
+         array(13, ),
+         array(16, ),
+         array(50, ),
+         array(7, ),
+         array(16, ),
+         array(52, ),
+         array(23, ),
+         array(36, ),
+         array(50, ),
+         array(14, ),
+         array(13, ),
+         array(52, ),
+         array(15, ),
+         array(16, ),
+         array(40, ),
+         array(16, ),
+         array(35, ),
+         array(16, ),
+         array(33, ),
+         array(16, ),
+         array(33, ),
+         array(35, ),
+         array(44, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+    336,  512,  512,  512,  497,  497,  512,  474,  474,  474,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  377,  377,  356,  512,
+    512,  413,  512,  377,  512,  512,  512,  512,  512,  512,
+    512,  512,  382,  512,  349,  512,  512,  512,  382,  379,
+    389,  388,  384,  402,  473,  397,  498,  500,  401,  361,
+    472,  499,  349,  377,  377,  487,  377,  377,  429,  512,
+    512,  368,  326,  428,  512,  439,  391,  391,  391,  429,
+    439,  439,  512,  429,  391,  377,  512,  377,  377,  391,
+    512,  371,  358,  395,  394,  396,  373,  429,  400,  404,
+    391,  404,  484,  406,  405,  481,  334,  428,  428,  428,
+    428,  428,  512,  441,  439,  455,  512,  363,  435,  354,
+    434,  437,  433,  432,  359,  357,  364,  436,  353,  367,
+    466,  365,  512,  352,  350,  360,  467,  465,  346,  464,
+    439,  366,  512,  369,  461,  475,  488,  476,  485,  372,
+    422,  439,  374,  480,  439,  480,  480,  439,  334,  413,
+    409,  413,  403,  403,  413,  440,  403,  413,  403,  413,
+    512,  512,  512,  332,  409,  512,  512,  512,  423,  403,
+    512,  409,  512,  512,  512,  512,  512,  512,  512,  418,
+    385,  512,  512,  512,  512,  512,  512,  512,  415,  512,
+    455,  512,  512,  512,  411,  486,  409,  512,  512,  512,
+    512,  419,  407,  362,  445,  418,  425,  424,  420,  339,
+    460,  421,  483,  398,  416,  340,  399,  455,  378,  337,
+    338,  330,  328,  329,  442,  443,  444,  438,  392,  393,
+    427,  426,  386,  417,  408,  390,  410,  331,  333,  335,
+    412,  470,  414,  415,  503,  478,  495,  471,  459,  458,
+    375,  457,  344,  462,  508,  493,  376,  496,  456,  509,
+    494,  501,  504,  511,  510,  507,  505,  502,  506,  345,
+    468,  469,  446,  355,  341,  452,  450,  454,  448,  453,
+    447,  489,  490,  491,  463,  449,  492,  451,  327,  342,
+    343,  370,  430,  431,  479,  477,
+);
+    const YYNOCODE = 109;
+    const YYSTACKDEPTH = 500;
+    const YYNSTATE = 326;
+    const YYNRULE = 186;
+    const YYERRORSYMBOL = 61;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
     public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
@@ -1840,18 +1110,250 @@ public function PrintTrace()
         $this->yyTracePrompt = '<br>';
     }
 
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'VERT',          'COLON',         'TEXT',        
+  'STRIPON',       'STRIPOFF',      'LITERALSTART',  'LITERALEND',  
+  'LITERAL',       'SIMPELOUTPUT',  'SIMPLETAG',     'SMARTYBLOCKCHILDPARENT',
+  'LDEL',          'RDEL',          'DOLLARID',      'EQUAL',       
+  'ID',            'PTR',           'LDELMAKENOCACHE',  'LDELIF',      
+  'LDELFOR',       'SEMICOLON',     'INCDEC',        'TO',          
+  'STEP',          'LDELFOREACH',   'SPACE',         'AS',          
+  'APTR',          'LDELSETFILTER',  'CLOSETAG',      'LDELSLASH',   
+  'ATTR',          'INTEGER',       'COMMA',         'OPENP',       
+  'CLOSEP',        'MATH',          'UNIMATH',       'ISIN',        
+  'QMARK',         'NOT',           'TYPECAST',      'HEX',         
+  'DOT',           'INSTANCEOF',    'SINGLEQUOTESTRING',  'DOUBLECOLON', 
+  'NAMESPACE',     'AT',            'HATCH',         'OPENB',       
+  'CLOSEB',        'DOLLAR',        'LOGOP',         'SLOGOP',      
+  'TLOGOP',        'SINGLECOND',    'ARRAYOPEN',     'QUOTE',       
+  'BACKTICK',      'error',         'start',         'template',    
+  'literal_e2',    'literal_e1',    'smartytag',     'tagbody',     
+  'tag',           'outattr',       'eqoutattr',     'varindexed',  
+  'output',        'attributes',    'variable',      'value',       
+  'expr',          'modifierlist',  'statement',     'statements',  
+  'foraction',     'varvar',        'modparameters',  'attribute',   
+  'ternary',       'tlop',          'lop',           'scond',       
+  'array',         'function',      'ns1',           'doublequoted_with_quotes',
+  'static_class_access',  'arraydef',      'object',        'arrayindex',  
+  'indexdef',      'varvarele',     'objectchain',   'objectelement',
+  'method',        'params',        'modifier',      'modparameter',
+  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
+    );
+
+    public static $yyRuleName = array(
+  'start ::= template',
+  'template ::= template TEXT',
+  'template ::= template STRIPON',
+  'template ::= template STRIPOFF',
+  'template ::= template LITERALSTART literal_e2 LITERALEND',
+  'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+  'literal_e2 ::= literal_e1',
+  'literal_e1 ::= literal_e1 LITERAL',
+  'literal_e1 ::=',
+  'template ::= template smartytag',
+  'template ::=',
+  'smartytag ::= SIMPELOUTPUT',
+  'smartytag ::= SIMPLETAG',
+  'smartytag ::= SMARTYBLOCKCHILDPARENT',
+  'smartytag ::= LDEL tagbody RDEL',
+  'smartytag ::= tag RDEL',
+  'tagbody ::= outattr',
+  'tagbody ::= DOLLARID eqoutattr',
+  'tagbody ::= varindexed eqoutattr',
+  'eqoutattr ::= EQUAL outattr',
+  'outattr ::= output attributes',
+  'output ::= variable',
+  'output ::= value',
+  'output ::= expr',
+  'tag ::= LDEL ID attributes',
+  'tag ::= LDEL ID',
+  'tag ::= LDEL ID modifierlist attributes',
+  'tag ::= LDEL ID PTR ID attributes',
+  'tag ::= LDEL ID PTR ID modifierlist attributes',
+  'tag ::= LDELMAKENOCACHE DOLLARID',
+  'tag ::= LDELIF expr',
+  'tag ::= LDELIF expr attributes',
+  'tag ::= LDELIF statement',
+  'tag ::= LDELIF statement attributes',
+  'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+  'foraction ::= EQUAL expr',
+  'foraction ::= INCDEC',
+  'tag ::= LDELFOR statement TO expr attributes',
+  'tag ::= LDELFOR statement TO expr STEP expr attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+  'tag ::= LDELFOREACH attributes',
+  'tag ::= LDELSETFILTER ID modparameters',
+  'tag ::= LDELSETFILTER ID modparameters modifierlist',
+  'smartytag ::= CLOSETAG',
+  'tag ::= LDELSLASH ID',
+  'tag ::= LDELSLASH ID modifierlist',
+  'tag ::= LDELSLASH ID PTR ID',
+  'tag ::= LDELSLASH ID PTR ID modifierlist',
+  'attributes ::= attributes attribute',
+  'attributes ::= attribute',
+  'attributes ::=',
+  'attribute ::= SPACE ID EQUAL ID',
+  'attribute ::= ATTR expr',
+  'attribute ::= ATTR value',
+  'attribute ::= SPACE ID',
+  'attribute ::= SPACE expr',
+  'attribute ::= SPACE value',
+  'attribute ::= SPACE INTEGER EQUAL expr',
+  'statements ::= statement',
+  'statements ::= statements COMMA statement',
+  'statement ::= DOLLARID EQUAL INTEGER',
+  'statement ::= DOLLARID EQUAL expr',
+  'statement ::= varindexed EQUAL expr',
+  'statement ::= OPENP statement CLOSEP',
+  'expr ::= value',
+  'expr ::= ternary',
+  'expr ::= DOLLARID COLON ID',
+  'expr ::= expr MATH value',
+  'expr ::= expr UNIMATH value',
+  'expr ::= expr tlop value',
+  'expr ::= expr lop expr',
+  'expr ::= expr scond',
+  'expr ::= expr ISIN array',
+  'expr ::= expr ISIN value',
+  'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+  'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
+  'value ::= variable',
+  'value ::= UNIMATH value',
+  'value ::= NOT value',
+  'value ::= TYPECAST value',
+  'value ::= variable INCDEC',
+  'value ::= HEX',
+  'value ::= INTEGER',
+  'value ::= INTEGER DOT INTEGER',
+  'value ::= INTEGER DOT',
+  'value ::= DOT INTEGER',
+  'value ::= ID',
+  'value ::= function',
+  'value ::= OPENP expr CLOSEP',
+  'value ::= variable INSTANCEOF ns1',
+  'value ::= variable INSTANCEOF variable',
+  'value ::= SINGLEQUOTESTRING',
+  'value ::= doublequoted_with_quotes',
+  'value ::= varindexed DOUBLECOLON static_class_access',
+  'value ::= smartytag',
+  'value ::= value modifierlist',
+  'value ::= NAMESPACE',
+  'value ::= arraydef',
+  'value ::= ns1 DOUBLECOLON static_class_access',
+  'ns1 ::= ID',
+  'ns1 ::= NAMESPACE',
+  'variable ::= DOLLARID',
+  'variable ::= varindexed',
+  'variable ::= varvar AT ID',
+  'variable ::= object',
+  'variable ::= HATCH ID HATCH',
+  'variable ::= HATCH ID HATCH arrayindex',
+  'variable ::= HATCH variable HATCH',
+  'variable ::= HATCH variable HATCH arrayindex',
+  'varindexed ::= DOLLARID arrayindex',
+  'varindexed ::= varvar arrayindex',
+  'arrayindex ::= arrayindex indexdef',
+  'arrayindex ::=',
+  'indexdef ::= DOT DOLLARID',
+  'indexdef ::= DOT varvar',
+  'indexdef ::= DOT varvar AT ID',
+  'indexdef ::= DOT ID',
+  'indexdef ::= DOT INTEGER',
+  'indexdef ::= DOT LDEL expr RDEL',
+  'indexdef ::= OPENB ID CLOSEB',
+  'indexdef ::= OPENB ID DOT ID CLOSEB',
+  'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+  'indexdef ::= OPENB INTEGER CLOSEB',
+  'indexdef ::= OPENB DOLLARID CLOSEB',
+  'indexdef ::= OPENB variable CLOSEB',
+  'indexdef ::= OPENB value CLOSEB',
+  'indexdef ::= OPENB expr CLOSEB',
+  'indexdef ::= OPENB CLOSEB',
+  'varvar ::= DOLLARID',
+  'varvar ::= DOLLAR',
+  'varvar ::= varvar varvarele',
+  'varvarele ::= ID',
+  'varvarele ::= SIMPELOUTPUT',
+  'varvarele ::= LDEL expr RDEL',
+  'object ::= varindexed objectchain',
+  'objectchain ::= objectelement',
+  'objectchain ::= objectchain objectelement',
+  'objectelement ::= PTR ID arrayindex',
+  'objectelement ::= PTR varvar arrayindex',
+  'objectelement ::= PTR LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR method',
+  'function ::= ns1 OPENP params CLOSEP',
+  'method ::= ID OPENP params CLOSEP',
+  'method ::= DOLLARID OPENP params CLOSEP',
+  'params ::= params COMMA expr',
+  'params ::= expr',
+  'params ::=',
+  'modifierlist ::= modifierlist modifier modparameters',
+  'modifierlist ::= modifier modparameters',
+  'modifier ::= VERT AT ID',
+  'modifier ::= VERT ID',
+  'modparameters ::= modparameters modparameter',
+  'modparameters ::=',
+  'modparameter ::= COLON value',
+  'modparameter ::= COLON UNIMATH value',
+  'modparameter ::= COLON array',
+  'static_class_access ::= method',
+  'static_class_access ::= method objectchain',
+  'static_class_access ::= ID',
+  'static_class_access ::= DOLLARID arrayindex',
+  'static_class_access ::= DOLLARID arrayindex objectchain',
+  'lop ::= LOGOP',
+  'lop ::= SLOGOP',
+  'tlop ::= TLOGOP',
+  'scond ::= SINGLECOND',
+  'arraydef ::= OPENB arrayelements CLOSEB',
+  'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
+  'arrayelements ::= arrayelement',
+  'arrayelements ::= arrayelements COMMA arrayelement',
+  'arrayelements ::=',
+  'arrayelement ::= value APTR expr',
+  'arrayelement ::= ID APTR expr',
+  'arrayelement ::= expr',
+  'doublequoted_with_quotes ::= QUOTE QUOTE',
+  'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+  'doublequoted ::= doublequoted doublequotedcontent',
+  'doublequoted ::= doublequotedcontent',
+  'doublequotedcontent ::= BACKTICK variable BACKTICK',
+  'doublequotedcontent ::= BACKTICK expr BACKTICK',
+  'doublequotedcontent ::= DOLLARID',
+  'doublequotedcontent ::= LDEL variable RDEL',
+  'doublequotedcontent ::= LDEL expr RDEL',
+  'doublequotedcontent ::= smartytag',
+  'doublequotedcontent ::= TEXT',
+    );
+
     public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
         }
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[ $tokenType ];
+            return $this->yyTokenName[$tokenType];
         } else {
             return 'Unknown';
         }
     }
 
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
     public function yy_pop_parser_stack()
     {
         if (empty($this->yystack)) {
@@ -1860,18 +1362,19 @@ public function yy_pop_parser_stack()
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
             fwrite($this->yyTraceFILE,
-                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
-                "\n");
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
         $this->yyidx--;
+
         return $yymajor;
     }
 
     public function __destruct()
     {
-        while ($this->yystack !== array()) {
+        while ($this->yystack !== Array()) {
             $this->yy_pop_parser_stack();
         }
         if (is_resource($this->yyTraceFILE)) {
@@ -1883,14 +1386,14 @@ public function yy_get_expected_tokens($token)
     {
         static $res3 = array();
         static $res4 = array();
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        $expected = self::$yyExpectedTokens[ $state ];
-        if (isset($res3[ $state ][ $token ])) {
-            if ($res3[ $state ][ $token ]) {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
                 return $expected;
             }
         } else {
-            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
                 return $expected;
             }
         }
@@ -1910,21 +1413,20 @@ public function yy_get_expected_tokens($token)
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[ $this->yyidx ]->stateno,
-                        self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
-                        if (isset($res4[ $nextstate ][ $token ])) {
-                            if ($res4[ $nextstate ][ $token ]) {
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
                                 $this->yyidx = $yyidx;
                                 $this->yystack = $stack;
                                 return array_unique($expected);
                             }
                         } else {
-                            if ($res4[ $nextstate ][ $token ] =
-                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
                                 $this->yyidx = $yyidx;
                                 $this->yystack = $stack;
                                 return array_unique($expected);
@@ -1936,8 +1438,8 @@ public function yy_get_expected_tokens($token)
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -1958,8 +1460,9 @@ public function yy_get_expected_tokens($token)
             }
             break;
         } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
+    $this->yyidx = $yyidx;
+    $this->yystack = $stack;
+
         return array_unique($expected);
     }
 
@@ -1970,16 +1473,16 @@ public function yy_is_expected_token($token)
         if ($token === 0) {
             return true; // 0 is not part of this
         }
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        if (isset($res[ $state ][ $token ])) {
-            if ($res[ $state ][ $token ]) {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
                 return true;
             }
         } else {
-            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
                 return true;
             }
-        }
+       }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
         do {
@@ -1996,20 +1499,18 @@ public function yy_is_expected_token($token)
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
                     $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[ $this->yyidx ]->stateno,
-                        self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset($res2[ $nextstate ][ $token ])) {
-                        if ($res2[ $nextstate ][ $token ]) {
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
                             $this->yyidx = $yyidx;
                             $this->yystack = $stack;
                             return true;
                         }
                     } else {
-                        if ($res2[ $nextstate ][ $token ] =
-                            (isset(self::$yyExpectedTokens[ $nextstate ]) &&
-                             in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
                             $this->yyidx = $yyidx;
                             $this->yystack = $stack;
                             return true;
@@ -2020,8 +1521,8 @@ public function yy_is_expected_token($token)
                         $this->yyidx++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -2048,65 +1549,69 @@ public function yy_is_expected_token($token)
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-    public function yy_find_shift_action($iLookAhead)
+   public function yy_find_shift_action($iLookAhead)
     {
-        $stateno = $this->yystack[ $this->yyidx ]->stateno;
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
             // no shift actions
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
-        $i = self::$yy_shift_ofst[ $stateno ];
+        $i = self::$yy_shift_ofst[$stateno];
         if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
         if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[ $i ] != $iLookAhead) {
+              self::$yy_lookahead[$i] != $iLookAhead) {
             if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
                 if ($this->yyTraceFILE) {
                     fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
-                                               $this->yyTokenName[ $iLookAhead ] . ' => ' .
-                                               $this->yyTokenName[ $iFallback ] . "\n");
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
                 }
+
                 return $this->yy_find_shift_action($iFallback);
             }
-            return self::$yy_default[ $stateno ];
+
+            return self::$yy_default[$stateno];
         } else {
-            return self::$yy_action[ $i ];
+            return self::$yy_action[$i];
         }
     }
 
     public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
-            return self::$yy_default[ $stateno ];
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
         }
-        $i = self::$yy_reduce_ofst[ $stateno ];
+        $i = self::$yy_reduce_ofst[$stateno];
         if ($i === self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
         if ($iLookAhead === self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[ $i ] != $iLookAhead) {
-            return self::$yy_default[ $stateno ];
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
         } else {
-            return self::$yy_action[ $i ];
+            return self::$yy_action[$i];
         }
     }
 
-    // line 234 "../smarty/lexer/smarty_internal_templateparser.y"
     public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
         $this->yyidx++;
@@ -2118,9 +1623,11 @@ public function yy_shift($yyNewState, $yyMajor, $yypMinor)
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-            // line 221 "../smarty/lexer/smarty_internal_templateparser.y"
-            $this->internalError = true;
-            $this->compiler->trigger_template_error('Stack overflow in template parser');
+// line 220 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+
             return;
         }
         $yytos = new TP_yyStackEntry;
@@ -2134,1357 +1641,1150 @@ public function yy_shift($yyNewState, $yyMajor, $yypMinor)
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
             for ($i = 1; $i <= $this->yyidx; $i++) {
                 fprintf($this->yyTraceFILE, " %s",
-                    $this->yyTokenName[ $this->yystack[ $i ]->major ]);
+                    $this->yyTokenName[$this->yystack[$i]->major]);
             }
-            fwrite($this->yyTraceFILE, "\n");
+            fwrite($this->yyTraceFILE,"\n");
         }
     }
 
-    // line 242 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r0()
-    {
-        $this->root_buffer->prepend_array($this, $this->template_prefix);
-        $this->root_buffer->append_array($this, $this->template_postfix);
-        $this->_retvalue = $this->root_buffer->to_smarty_php($this);
-    }
+    public static $yyRuleInfo = array(
+  array( 0 => 62, 1 => 1 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 4 ),
+  array( 0 => 64, 1 => 4 ),
+  array( 0 => 64, 1 => 1 ),
+  array( 0 => 65, 1 => 2 ),
+  array( 0 => 65, 1 => 0 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 0 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 3 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 67, 1 => 1 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 69, 1 => 2 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 68, 1 => 6 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 8 ),
+  array( 0 => 80, 1 => 2 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 68, 1 => 7 ),
+  array( 0 => 68, 1 => 6 ),
+  array( 0 => 68, 1 => 8 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 73, 1 => 2 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 0 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 79, 1 => 1 ),
+  array( 0 => 79, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 76, 1 => 1 ),
+  array( 0 => 76, 1 => 1 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 2 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 84, 1 => 7 ),
+  array( 0 => 84, 1 => 7 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 90, 1 => 1 ),
+  array( 0 => 90, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 4 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 4 ),
+  array( 0 => 71, 1 => 2 ),
+  array( 0 => 71, 1 => 2 ),
+  array( 0 => 95, 1 => 2 ),
+  array( 0 => 95, 1 => 0 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 4 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 4 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 5 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 81, 1 => 1 ),
+  array( 0 => 81, 1 => 1 ),
+  array( 0 => 81, 1 => 2 ),
+  array( 0 => 97, 1 => 1 ),
+  array( 0 => 97, 1 => 1 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 94, 1 => 2 ),
+  array( 0 => 98, 1 => 1 ),
+  array( 0 => 98, 1 => 2 ),
+  array( 0 => 99, 1 => 3 ),
+  array( 0 => 99, 1 => 3 ),
+  array( 0 => 99, 1 => 5 ),
+  array( 0 => 99, 1 => 6 ),
+  array( 0 => 99, 1 => 2 ),
+  array( 0 => 89, 1 => 4 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 101, 1 => 3 ),
+  array( 0 => 101, 1 => 1 ),
+  array( 0 => 101, 1 => 0 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 2 ),
+  array( 0 => 102, 1 => 3 ),
+  array( 0 => 102, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 0 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 103, 1 => 3 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 92, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 3 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 85, 1 => 1 ),
+  array( 0 => 87, 1 => 1 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 104, 1 => 1 ),
+  array( 0 => 104, 1 => 3 ),
+  array( 0 => 104, 1 => 0 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 1 ),
+  array( 0 => 91, 1 => 2 ),
+  array( 0 => 91, 1 => 3 ),
+  array( 0 => 106, 1 => 2 ),
+  array( 0 => 106, 1 => 1 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 107, 1 => 1 ),
+    );
 
-    // line 251 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r1()
-    {
-        $code =
-            $this->compiler->compileTag('private_php',
-                array(array('code' => $this->yystack[ $this->yyidx + 0 ]->minor), array('type' => $this->lex->phpType)),
-                array());
-        if ($this->compiler->has_code && !empty($code)) {
-            $tmp = '';
-            foreach ($this->compiler->prefix_code as $code) {
-                $tmp .= $code;
+    public static $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        21 => 6,
+        22 => 6,
+        23 => 6,
+        36 => 6,
+        56 => 6,
+        57 => 6,
+        65 => 6,
+        66 => 6,
+        77 => 6,
+        82 => 6,
+        83 => 6,
+        88 => 6,
+        92 => 6,
+        93 => 6,
+        97 => 6,
+        98 => 6,
+        100 => 6,
+        105 => 6,
+        169 => 6,
+        174 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 18,
+        19 => 19,
+        20 => 20,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 28,
+        29 => 29,
+        30 => 30,
+        31 => 31,
+        33 => 31,
+        32 => 32,
+        34 => 34,
+        35 => 35,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        41 => 41,
+        42 => 42,
+        43 => 43,
+        44 => 44,
+        45 => 45,
+        46 => 46,
+        47 => 47,
+        48 => 48,
+        49 => 49,
+        50 => 50,
+        59 => 50,
+        147 => 50,
+        151 => 50,
+        155 => 50,
+        157 => 50,
+        51 => 51,
+        148 => 51,
+        154 => 51,
+        52 => 52,
+        53 => 53,
+        54 => 53,
+        55 => 55,
+        132 => 55,
+        58 => 58,
+        60 => 60,
+        61 => 61,
+        62 => 61,
+        63 => 63,
+        64 => 64,
+        67 => 67,
+        68 => 68,
+        69 => 68,
+        70 => 70,
+        71 => 71,
+        72 => 72,
+        73 => 73,
+        74 => 74,
+        75 => 75,
+        76 => 76,
+        78 => 78,
+        80 => 78,
+        81 => 78,
+        112 => 78,
+        79 => 79,
+        84 => 84,
+        85 => 85,
+        86 => 86,
+        87 => 87,
+        89 => 89,
+        90 => 90,
+        91 => 90,
+        94 => 94,
+        95 => 95,
+        96 => 96,
+        99 => 99,
+        101 => 101,
+        102 => 102,
+        103 => 103,
+        104 => 104,
+        106 => 106,
+        107 => 107,
+        108 => 108,
+        109 => 109,
+        110 => 110,
+        111 => 111,
+        113 => 113,
+        171 => 113,
+        114 => 114,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        118 => 118,
+        119 => 119,
+        127 => 119,
+        120 => 120,
+        121 => 121,
+        122 => 122,
+        123 => 122,
+        125 => 122,
+        126 => 122,
+        124 => 124,
+        128 => 128,
+        129 => 129,
+        130 => 130,
+        175 => 130,
+        131 => 131,
+        133 => 133,
+        134 => 134,
+        135 => 135,
+        136 => 136,
+        137 => 137,
+        138 => 138,
+        139 => 139,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        149 => 149,
+        150 => 150,
+        152 => 152,
+        153 => 153,
+        156 => 156,
+        158 => 158,
+        159 => 159,
+        160 => 160,
+        161 => 161,
+        162 => 162,
+        163 => 163,
+        164 => 164,
+        165 => 165,
+        166 => 166,
+        167 => 167,
+        168 => 167,
+        170 => 170,
+        172 => 172,
+        173 => 173,
+        176 => 176,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        182 => 179,
+        180 => 180,
+        183 => 180,
+        181 => 181,
+        184 => 184,
+        185 => 185,
+    );
+// line 233 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r0(){
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    }
+// line 240 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r1(){
+         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
+
+         if ((string)$text == '') {
+            $this->current_buffer->append_subtree($this, null);
+         }
+
+         $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
+    }
+// line 250 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r2(){
+    $this->strip = true;
+    }
+// line 254 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r3(){
+    $this->strip = false;
+    }
+// line 259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r4(){
+       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 264 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r5(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 267 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 271 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r7(){
+        $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    }
+// line 276 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r8(){
+    $this->_retvalue = '';
+    }
+// line 280 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r9(){
+      if ($this->compiler->has_code) {
+          $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor));
+      }
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+// line 292 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r11(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+    }
+// line 302 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r12(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        $this->_retvalue = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                $this->_retvalue = $this->compiler->compileTag($tag,array());
             }
-            $this->compiler->prefix_code = array();
-            $this->current_buffer->append_subtree($this,
-                new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true)));
         }
     }
-
-    // line 255 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r2()
-    {
-    	$text = $this->yystack[ $this->yyidx + 0 ]->minor;
-
-	    if ((string)$text == '') {
-	    	$this->current_buffer->append_subtree($this, null);
-	    }
-
-	    $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
     }
-
-    // line 259 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r3()
-    {
-        $this->strip = true;
+// line 323 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r13(){
+    $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
+    if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
+        // {$smarty.block.child}
+        $this->_retvalue = $this->compiler->compileTag('child',array(),array($this->yystack[$this->yyidx + 0]->minor));
+    } else {
+        // {$smarty.block.parent}
+       $this->_retvalue = $this->compiler->compileTag('parent',array(),array($this->yystack[$this->yyidx + 0]->minor));
+     }
+    }
+// line 334 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r14(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 338 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r15(){
+     $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+     }
+// line 342 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r16(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor[1],array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]));
+    }
+// line 351 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1]));
+    }
+// line 355 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r18(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']));
+    }
+// line 359 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r19(){
+       $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 363 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r20(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 378 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r24(){
+        if (defined($this->yystack[$this->yyidx + -1]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+        }
     }
-
-    // line 264 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r4()
-    {
+// line 388 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r25(){
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + 0]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
+        }
+    }
+// line 401 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r26(){
+        if (defined($this->yystack[$this->yyidx + -2]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        }
+    }
+// line 413 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r27(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 418 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r28(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+// line 423 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r29(){
+    $this->_retvalue = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'')));
+    }
+// line 428 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r30(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); 
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 433 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r31(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 438 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r32(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 449 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r34(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
+    }
+// line 453 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r35(){
+    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 461 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r37(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 465 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r38(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 470 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r39(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
+    }
+// line 474 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r40(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
+    }
+// line 477 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r41(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 482 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r42(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
+    }
+// line 486 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r43(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 492 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r44(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
         $this->strip = false;
+        $this->_retvalue = null;
+    } else {
+       $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
+    }
+     }
+// line 501 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r45(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
+    }
+// line 505 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r46(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 510 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r47(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 514 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r48(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 522 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r49(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 528 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r50(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 533 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r51(){
+    $this->_retvalue = array();
+    }
+// line 538 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r52(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    } else {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
     }
-
-    // line 269 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r5()
-    {
-        $this->current_buffer->append_subtree($this,
-            new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + -1 ]->minor));
     }
-
-    // line 272 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r6()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -3 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor;
+// line 549 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r53(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 276 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r7()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 557 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r55(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
     }
-
-    // line 281 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r8()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 569 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r58(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 285 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r9()
-    {
-        $this->_retvalue = '';
+// line 582 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r60(){
+    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
     }
-
-    // line 297 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r10()
-    {
-        if ($this->compiler->has_code) {
-            $this->current_buffer->append_subtree($this,
-                $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor));
-        }
-        $this->compiler->has_variable_string = false;
-        $this->block_nesting_level = count($this->compiler->_tag_stack);
+// line 587 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r61(){
+    $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 307 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r12()
-    {
-        $var =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()), ' $');
-        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', array('nocache'),
-                    array('value' => $this->compiler->compileVariable('\'' . $match[ 1 ] . '\'')));
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', array(),
-                    array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
-        }
+// line 594 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r63(){
+    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 328 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r13()
-    {
-        $tag =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()));
-        if ($tag == 'strip') {
-            $this->strip = true;
-            $this->_retvalue = null;
-        } else {
-            if (defined($tag)) {
-                if ($this->security) {
-                    $this->security->isTrustedConstant($tag, $this->compiler);
-                }
-                $this->_retvalue =
-                    $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
-            } else {
-                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
-                    $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array('\'nocache\''));
-                } else {
-                    $this->_retvalue = $this->compiler->compileTag($tag, array());
-                }
-            }
-        }
+// line 598 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r64(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
     }
-
-    // line 339 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r14()
-    {
-        $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.');
-        if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') {
-            // {$smarty.block.child}
-            $this->_retvalue =
-                $this->compiler->compileTag('child', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
-        } else {
-            // {$smarty.block.parent}
-            $this->_retvalue =
-                $this->compiler->compileTag('parent', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
-        }
+// line 618 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r67(){
+    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
     }
-
-    // line 343 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r15()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+// line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r68(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 347 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r16()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+// line 633 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r70(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
     }
-
-    // line 356 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r17()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ],
-                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]));
+// line 637 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r71(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 360 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r18()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('assign', array_merge(array(
-                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
-                array('var' => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'')
-            ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]));
+// line 641 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r72(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
     }
-
-    // line 364 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r19()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('assign', array_merge(array(
-                array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
-                array('var' => $this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ])
-            ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]), array(
-                'smarty_internal_index' => $this->yystack[ $this->yyidx +
-                                                           -1 ]->minor[ 'smarty_internal_index' ]
-            ));
-    }
-
-    // line 368 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r20()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 645 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r73(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
     }
-
-    // line 383 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r21()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 393 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r25()
-    {
-        if (defined($this->yystack[ $this->yyidx + -1 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
-                    array('value' => $this->yystack[ $this->yyidx + -1 ]->minor));
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor,
-                    $this->yystack[ $this->yyidx + 0 ]->minor);
-        }
-    }
-
-    // line 406 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r26()
-    {
-        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', array(),
-                    array('value' => $this->yystack[ $this->yyidx + 0 ]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor, array());
-        }
-    }
-
-    // line 418 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r27()
-    {
-        if (defined($this->yystack[ $this->yyidx + -2 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
-                    array(
-                        'value'        => $this->yystack[ $this->yyidx + -2 ]->minor,
-                        'modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor
-                    ));
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor,
-                    $this->yystack[ $this->yyidx + 0 ]->minor,
-                    array('modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor));
-        }
-    }
-
-    // line 423 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r28()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor,
-                $this->yystack[ $this->yyidx + 0 ]->minor,
-                array('object_method' => $this->yystack[ $this->yyidx + -1 ]->minor));
-    }
-
-    // line 428 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r29()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -4 ]->minor,
-                $this->yystack[ $this->yyidx + 0 ]->minor, array(
-                    'modifierlist'  => $this->yystack[ $this->yyidx + -1 ]->minor,
-                    'object_method' => $this->yystack[ $this->yyidx + -2 ]->minor
-                ));
-    }
-
-    // line 433 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r30()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('make_nocache',
-                array(array('var' => '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'')));
-    }
-
-    // line 438 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r31()
-    {
-        $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
-        $this->_retvalue =
-            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
-                array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 443 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r32()
-    {
-        $tag = trim(substr($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler->getLdelLength()));
-        $this->_retvalue =
-            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag,
-                $this->yystack[ $this->yyidx + 0 ]->minor,
-                array('if condition' => $this->yystack[ $this->yyidx + -1 ]->minor));
-    }
-
-    // line 454 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r33()
-    {
-        $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
-        $this->_retvalue =
-            $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
-                array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 458 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r35()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('start' => $this->yystack[ $this->yyidx + -6 ]->minor),
-                array('ifexp' => $this->yystack[ $this->yyidx + -4 ]->minor),
-                array('var' => $this->yystack[ $this->yyidx + -2 ]->minor),
-                array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )), 1);
-    }
-
-    // line 466 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r36()
-    {
-        $this->_retvalue = '=' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 470 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r38()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('start' => $this->yystack[ $this->yyidx + -3 ]->minor),
-                array('to' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )), 0);
-    }
-
-    // line 475 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r39()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('start' => $this->yystack[ $this->yyidx + -5 ]->minor),
-                array('to' => $this->yystack[ $this->yyidx + -3 ]->minor),
-                array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )), 0);
-    }
-
-    // line 479 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r40()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('from' => $this->yystack[ $this->yyidx + -3 ]->minor),
-                array('item' => $this->yystack[ $this->yyidx + -1 ]->minor)
-            )));
-    }
-
-    // line 482 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r41()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
-                array('from' => $this->yystack[ $this->yyidx + -5 ]->minor),
-                array('item' => $this->yystack[ $this->yyidx + -1 ]->minor),
-                array('key' => $this->yystack[ $this->yyidx + -3 ]->minor)
-            )));
-    }
-
-    // line 487 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r42()
-    {
-        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 491 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r43()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('setfilter', array(), array(
-                'modifier_list' => array(
-                    array_merge(array($this->yystack[ $this->yyidx + -1 ]->minor),
-                        $this->yystack[ $this->yyidx + 0 ]->minor)
-                )
-            ));
-    }
-
-    // line 497 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r44()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('setfilter', array(), array(
-                'modifier_list' => array_merge(array(
-                    array_merge(array(
-                        $this->yystack[ $this->yyidx +
-                                        -2 ]->minor
-                    ), $this->yystack[ $this->yyidx + -1 ]->minor)
-                ), $this->yystack[ $this->yyidx + 0 ]->minor)
-            ));
-    }
-
-    // line 506 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r45()
-    {
-        $tag =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()), ' /');
-        if ($tag === 'strip') {
-            $this->strip = false;
-            $this->_retvalue = null;
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
-        }
-    }
-
-    // line 510 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r46()
-    {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor . 'close', array());
-    }
-
-    // line 515 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r47()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor . 'close', array(),
-                array('modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 519 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r48()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor . 'close', array(),
-                array('object_method' => $this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 527 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r49()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor . 'close', array(), array(
-                'object_method' => $this->yystack[ $this->yyidx + -1 ]->minor,
-                'modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor
-            ));
-    }
-
-    // line 533 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r50()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-        $this->_retvalue[] = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 538 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r51()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 543 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r52()
-    {
-        $this->_retvalue = array();
-    }
-
-    // line 554 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r53()
-    {
-        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
-            }
-            $this->_retvalue =
-                array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
-        } else {
-            $this->_retvalue =
-                array(
-                    $this->yystack[ $this->yyidx + -2 ]->minor => '\'' .
-                                                                  $this->yystack[ $this->yyidx + 0 ]->minor .
-                                                                  '\''
-                );
-        }
-    }
-
-    // line 562 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r54()
-    {
-        $this->_retvalue =
-            array(
-                trim($this->yystack[ $this->yyidx + -1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx +
-                                                                                                0 ]->minor
-            );
-    }
-
-    // line 574 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r56()
-    {
-        $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
-    }
-
-    // line 587 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r59()
-    {
-        $this->_retvalue =
-            array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 592 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r61()
-    {
-        $this->yystack[ $this->yyidx + -2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor;
-        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor;
-    }
-
-    // line 599 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r62()
-    {
-        $this->_retvalue =
-            array(
-                'var'   => '\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'',
-                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 603 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r64()
-    {
-        $this->_retvalue =
-            array(
-                'var'   => $this->yystack[ $this->yyidx + -2 ]->minor,
-                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 623 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r65()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 628 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r68()
-    {
-        $this->_retvalue =
-            '$_smarty_tpl->getStreamVariable(\'' .
-            substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) .
-            '://' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            '\')';
-    }
-
-    // line 638 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r69()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            trim($this->yystack[ $this->yyidx + -1 ]->minor) .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 642 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r71()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -1 ]->minor[ 'pre' ] .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + -1 ]->minor[ 'op' ] .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ')';
-    }
-
-    // line 646 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r72()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + -1 ]->minor .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 650 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r73()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 654 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r74()
-    {
-        $this->_retvalue =
-            'in_array(' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ',' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ')';
-    }
-
-    // line 662 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r75()
-    {
-        $this->_retvalue =
-            'in_array(' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ',(array)' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ')';
-    }
-
-    // line 666 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r76()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -5 ]->minor .
-            ' ? ' .
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'') .
-            ' : ' .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 676 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r77()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -5 ]->minor .
-            ' ? ' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ' : ' .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 681 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r79()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 702 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r80()
-    {
-        $this->_retvalue = '!' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 706 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r85()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 710 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r86()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.';
-    }
-
-    // line 715 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r87()
-    {
-        $this->_retvalue = '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 732 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r88()
-    {
-        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-        } else {
-            $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
-        }
-    }
-
-    // line 736 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r90()
-    {
-        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 754 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r91()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + -1 ]->minor .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 765 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r95()
-    {
-        $prefixVar = $this->compiler->getNewPrefixVariable();
-        if ($this->yystack[ $this->yyidx + -2 ]->minor[ 'var' ] === '\'smarty\'') {
-            $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
-                                              $this->compiler->compileTag('private_special_variable', array(),
-                                                  $this->yystack[ $this->yyidx +
-                                                                  -2 ]->minor[ 'smarty_internal_index' ]) .
-                                              ';?>');
-        } else {
-            $this->compiler->appendPrefixCode("<?php  {$prefixVar} = " .
-                                              $this->compiler->compileVariable($this->yystack[ $this->yyidx +
-                                                                                               -2 ]->minor[ 'var' ]) .
-                                              $this->yystack[ $this->yyidx + -2 ]->minor[ 'smarty_internal_index' ] .
-                                              ';?>');
-        }
-        $this->_retvalue =
-            $prefixVar .
-            '::' .
-            $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
-            $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
-    }
-
-    // line 772 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r96()
-    {
-        $prefixVar = $this->compiler->getNewPrefixVariable();
-        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
-        $this->_retvalue = $prefixVar;
-    }
-
-    // line 785 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r97()
-    {
-        $this->_retvalue =
-            $this->compiler->compileTag('private_modifier', array(), array(
-                'value'        => $this->yystack[ $this->yyidx + -1 ]->minor,
-                'modifierlist' => $this->yystack[ $this->yyidx + 0 ]->minor
-            ));
+// line 649 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r74(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
     }
-
-    // line 804 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r100()
-    {
-        if (!in_array(strtolower($this->yystack[ $this->yyidx + -2 ]->minor), array('self', 'parent')) &&
-            (!$this->security ||
-             $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + -2 ]->minor,
-                 $this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler))) {
-            if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ])) {
-                $this->_retvalue =
-                    $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ] .
-                    '::' .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
-            } else {
-                $this->_retvalue =
-                    $this->yystack[ $this->yyidx + -2 ]->minor .
-                    '::' .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
-            }
-        } else {
-            $this->compiler->trigger_template_error('static class \'' .
-                                                    $this->yystack[ $this->yyidx + -2 ]->minor .
-                                                    '\' is undefined or not allowed by security setting');
-        }
-    }
-
-    // line 815 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r102()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 818 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r103()
-    {
-        $this->_retvalue =
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'');
+// line 657 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r75(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '. $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'') . ' : '.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 831 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r104()
-    {
-        if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] === '\'smarty\'') {
-            $smarty_var =
-                $this->compiler->compileTag('private_special_variable', array(),
-                    $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ]);
-            $this->_retvalue = $smarty_var;
-        } else {
-            // used for array reset,next,prev,end,current
-            $this->last_variable = $this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ];
-            $this->last_index = $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
-            $this->_retvalue =
-                $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ]) .
-                $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
-        }
+// line 661 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r76(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 841 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r105()
-    {
-        $this->_retvalue =
-            '$_smarty_tpl->tpl_vars[' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            ']->' .
-            $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 671 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r78(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 845 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r107()
-    {
-        $this->_retvalue =
-            $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'');
+// line 676 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r79(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 849 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r108()
-    {
-        $this->_retvalue =
-            '(is_array($tmp = ' .
-            $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'') .
-            ') ? $tmp' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ' :null)';
+// line 697 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r84(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 853 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r109()
-    {
-        $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -1 ]->minor);
-    }
-
-    // line 857 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r110()
-    {
-        $this->_retvalue =
-            '(is_array($tmp = ' .
-            $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
-            ') ? $tmp' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ' : null)';
-    }
-
-    // line 860 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r111()
-    {
-        $this->_retvalue =
-            array(
-                'var'                   => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'',
-                'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 873 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r112()
-    {
-        $this->_retvalue =
-            array(
-                'var'                   => $this->yystack[ $this->yyidx + -1 ]->minor,
-                'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 879 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r114()
-    {
-        return;
-    }
-
-    // line 882 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r115()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'') .
-            ']';
-    }
-
-    // line 886 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r116()
-    {
-        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor) . ']';
-    }
-
-    // line 890 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r117()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
-            '->' .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            ']';
-    }
-
-    // line 894 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r118()
-    {
-        $this->_retvalue = '[\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\']';
-    }
-
-    // line 899 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r119()
-    {
-        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']';
-    }
-
-    // line 904 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r120()
-    {
-        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
-    }
-
-    // line 908 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r121()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileTag('private_special_variable', array(),
-                '[\'section\'][\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'][\'index\']') .
-            ']';
-    }
-
-    // line 911 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r122()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
-                                                                             $this->yystack[ $this->yyidx +
-                                                                                             -3 ]->minor .
-                                                                             '\'][\'' .
-                                                                             $this->yystack[ $this->yyidx +
-                                                                                             -1 ]->minor .
-                                                                             '\']') .
-            ']';
-    }
-
-    // line 917 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r123()
-    {
-        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
-    }
-
-    // line 933 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r125()
-    {
-        $this->_retvalue =
-            '[' .
-            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'') .
-            ']';
-    }
-
-    // line 943 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r129()
-    {
-        $this->_retvalue = '[]';
-    }
-
-    // line 947 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r130()
-    {
-        $this->_retvalue = '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'';
-    }
-
-    // line 952 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r131()
-    {
-        $this->_retvalue = '\'\'';
-    }
-
-    // line 960 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r132()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 966 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r134()
-    {
-        $var =
-            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
-                -$this->compiler->getRdelLength()), ' $');
-        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
-    }
-
-    // line 973 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r135()
-    {
-        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
-    }
-
-    // line 982 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r136()
-    {
-        if ($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ] === '\'smarty\'') {
-            $this->_retvalue =
-                $this->compiler->compileTag('private_special_variable', array(),
-                    $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ]) .
-                $this->yystack[ $this->yyidx + 0 ]->minor;
-        } else {
-            $this->_retvalue =
-                $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ]) .
-                $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ] .
-                $this->yystack[ $this->yyidx + 0 ]->minor;
-        }
-    }
-
-    // line 987 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r137()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 992 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r138()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 701 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r85(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
     }
-
-    // line 999 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r139()
-    {
-        if ($this->security && substr($this->yystack[ $this->yyidx + -1 ]->minor, 0, 1) === '_') {
-            $this->compiler->trigger_template_error(self::ERR1);
-        }
-        $this->_retvalue =
-            '->' . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 705 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r86(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r140()
-    {
+// line 710 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r87(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
         if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
+             $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
         }
-        $this->_retvalue =
-            '->{' .
-            $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor) .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            '}';
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
     }
-
-    // line 1013 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r141()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
-        }
-        $this->_retvalue =
-            '->{' . $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}';
     }
-
-    // line 1021 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r142()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
-        }
-        $this->_retvalue =
-            '->{\'' .
-            $this->yystack[ $this->yyidx + -4 ]->minor .
-            '\'.' .
-            $this->yystack[ $this->yyidx + -2 ]->minor .
-            $this->yystack[ $this->yyidx + 0 ]->minor .
-            '}';
+// line 727 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r89(){
+    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')';
     }
-
-    // line 1029 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r143()
-    {
-        $this->_retvalue = '->' . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 731 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r90(){
+      $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1037 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r144()
-    {
-        $this->_retvalue =
-            $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + -3 ]->minor,
-                $this->yystack[ $this->yyidx + -1 ]->minor);
+// line 749 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r94(){
+	    if ($this->security && $this->security->static_classes !== array()) {
+		    $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+	    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
+    }
+    $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+    }
+// line 760 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r95(){
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    $this->_retvalue = $prefixVar;
+    }
+// line 767 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r96(){
+    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 780 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r99(){
+    if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } else {
+            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting');
     }
-
-    // line 1044 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r145()
-    {
-        if ($this->security && substr($this->yystack[ $this->yyidx + -3 ]->minor, 0, 1) === '_') {
-            $this->compiler->trigger_template_error(self::ERR1);
-        }
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -3 ]->minor .
-            '(' .
-            implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) .
-            ')';
     }
-
-    // line 1055 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r146()
-    {
-        if ($this->security) {
-            $this->compiler->trigger_template_error(self::ERR2);
+// line 799 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r101(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
         }
-        $prefixVar = $this->compiler->getNewPrefixVariable();
-        $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
-                                          $this->compiler->compileVariable('\'' .
-                                                                           substr($this->yystack[ $this->yyidx +
-                                                                                                  -3 ]->minor, 1) .
-                                                                           '\'') .
-                                          ';?>');
-        $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) . ')';
-    }
-
-    // line 1072 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r147()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
+// line 810 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r102(){
+   $this->_retvalue = $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'');
+    }
+// line 813 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r103(){
+    if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+        $this->_retvalue = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+    }
+    }
+// line 826 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r104(){
+    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 836 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r106(){
+    $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\'');
+    }
+// line 840 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r107(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
+    }
+// line 844 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r108(){
+    $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 848 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r109(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
+    }
+// line 852 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r110(){
+    $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 855 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r111(){
+    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 868 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r113(){
+    return;
+    }
+// line 874 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r114(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'').']';
+    }
+// line 877 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r115(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
+    }
+// line 881 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r116(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
+    }
+// line 885 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r117(){
+    $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']';
+    }
+// line 889 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r118(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
+    }
+// line 894 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r119(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
     }
-
-    // line 1076 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r150()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array(
-                array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)
-            ));
+// line 899 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r120(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
+    }
+// line 903 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r121(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
+    }
+// line 906 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r122(){
+    $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
+    }
+// line 912 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r124(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'').']';
+    }
+// line 928 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r128(){
+    $this->_retvalue = '[]';
+    }
+// line 938 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r129(){
+    $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
+    }
+// line 942 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r130(){
+    $this->_retvalue = '\'\'';
+    }
+// line 947 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r131(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1084 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r151()
-    {
-        $this->_retvalue =
-            array(array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor));
+// line 955 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r133(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $this->_retvalue = $this->compiler->compileVariable('\''.$var.'\'');
     }
-
-    // line 1092 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r153()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
+// line 961 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r134(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
     }
-
-    // line 1105 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r154()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+// line 968 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r135(){
+    if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') {
+        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r157()
-    {
-        $this->_retvalue =
-            array(trim($this->yystack[ $this->yyidx + -1 ]->minor) . $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-
-    // line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r159()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method');
+// line 977 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r136(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r160()
-    {
-        $this->_retvalue =
-            array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method');
+// line 982 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r137(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r161()
-    {
-        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '');
+// line 987 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r138(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
     }
-
-    // line 1134 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r162()
-    {
-        $this->_retvalue =
-            array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
-    }
-
-    // line 1140 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r163()
-    {
-        $this->_retvalue =
-            array(
-                $this->yystack[ $this->yyidx + -2 ]->minor,
-                $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor, 'property'
-            );
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1144 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r164()
-    {
-        $this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' ';
-    }
-
-    // line 1163 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r165()
-    {
-        static $lops = array(
-            'eq'  => ' == ',
-            'ne'  => ' != ',
-            'neq' => ' != ',
-            'gt'  => ' > ',
-            'ge'  => ' >= ',
-            'gte' => ' >= ',
-            'lt'  => ' < ',
-            'le'  => ' <= ',
-            'lte' => ' <= ',
-            'mod' => ' % ',
-            'and' => ' && ',
-            'or'  => ' || ',
-            'xor' => ' xor ',
-        );
-        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
-        $this->_retvalue = $lops[ $op ];
-    }
-
-    // line 1176 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r166()
-    {
-        static $tlops = array(
-            'isdivby'     => array('op' => ' % ', 'pre' => '!('),
-            'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
-            'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
-            'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
-            'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
-            'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),
-        );
-        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
-        $this->_retvalue = $tlops[ $op ];
-    }
-
-    // line 1190 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r167()
-    {
-        static $scond = array(
-            'iseven'    => '!(1 & ',
+// line 994 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r139(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1001 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r140(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1008 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r141(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1016 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r142(){
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1024 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r143(){
+    $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1032 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r144(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1039 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r145(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'').';?>');
+    $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1050 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r146(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1067 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r149(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 1071 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r150(){
+    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1079 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r152(){
+    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1087 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r153(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r156(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1109 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r158(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+// line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r159(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+// line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r160(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+// line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r161(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r162(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1135 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r163(){
+    $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
+    }
+// line 1139 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r164(){
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+    $this->_retvalue = $lops[$op];
+    }
+// line 1158 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r165(){
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+     $this->_retvalue = $tlops[$op];
+     }
+// line 1171 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r166(){
+        static $scond = array (
+            'iseven' => '!(1 & ',
             'isnoteven' => '(1 & ',
-            'isodd'     => '(1 & ',
-            'isnotodd'  => '!(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
         );
-        $op = strtolower(str_replace(' ', '', $this->yystack[ $this->yyidx + 0 ]->minor));
-        $this->_retvalue = $scond[ $op ];
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $scond[$op];
     }
-
-    // line 1201 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r168()
-    {
-        $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+// line 1185 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r167(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
     }
-
-    // line 1209 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r171()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 1196 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r170(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1213 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r173()
-    {
-        $this->_retvalue =
-            $this->yystack[ $this->yyidx + -2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 1204 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r172(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1229 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r174()
-    {
-        $this->_retvalue =
-            '\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
+// line 1208 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r173(){ 
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
     }
-
-    // line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r177()
-    {
-        $this->compiler->leaveDoubleQuote();
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor->to_smarty_php($this);
+// line 1224 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r176(){
+    $this->compiler->leaveDoubleQuote();
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
     }
-
-    // line 1240 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r178()
-    {
-        $this->yystack[ $this->yyidx + -1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+// line 1230 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r177(){
+    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
     }
-
-    // line 1244 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r179()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+// line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r178(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
     }
-
-    // line 1248 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r180()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + -1 ]->minor);
+// line 1239 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r179(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
     }
-
-    // line 1252 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r181()
-    {
-        $this->_retvalue =
-            new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')');
+// line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r180(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
     }
-
-    // line 1264 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r182()
-    {
-        $this->_retvalue =
-            new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
-                                               substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) .
-                                               '\']->value');
+// line 1247 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r181(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
     }
-
-    // line 1268 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r185()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+// line 1259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r184(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
     }
-
-    public function yy_r186()
-    {
-        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor);
+// line 1263 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r185(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
     }
 
+    private $_retvalue;
+
     public function yy_reduce($yyruleno)
     {
         if ($this->yyTraceFILE && $yyruleno >= 0
-            && $yyruleno < count(self::$yyRuleName)) {
+              && $yyruleno < count(self::$yyRuleName)) {
             fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
                 $this->yyTracePrompt, $yyruleno,
-                self::$yyRuleName[ $yyruleno ]);
+                self::$yyRuleName[$yyruleno]);
         }
+
         $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[ $yyruleno ])) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
         for ($i = $yysize; $i; $i--) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
-        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
             if (!$this->yyTraceFILE && $yysize) {
                 $this->yyidx++;
@@ -3492,7 +2792,7 @@ public function yy_reduce($yyruleno)
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
                 $x->minor = $yy_lefthand_side;
-                $this->yystack[ $this->yyidx ] = $x;
+                $this->yystack[$this->yyidx] = $x;
             } else {
                 $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
             }
@@ -3505,37 +2805,38 @@ public function yy_parse_failed()
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
+        } while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-        // line 214 "../smarty/lexer/smarty_internal_templateparser.y"
-        $this->internalError = true;
-        $this->yymajor = $yymajor;
-        $this->compiler->trigger_template_error();
+// line 213 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
     }
 
     public function yy_accept()
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
+        } while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
-        // line 207 "../smarty/lexer/smarty_internal_templateparser.y"
-        $this->successful = !$this->internalError;
-        $this->internalError = false;
-        $this->retvalue = $this->_retvalue;
+// line 206 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
     }
 
     public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
             $this->yyerrcnt = -1;
@@ -3545,15 +2846,17 @@ public function doParse($yymajor, $yytokenvalue)
             $this->yystack = array();
             $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor == 0);
+        $yyendofinput = ($yymajor==0);
+
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sInput %s\n",
-                $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
+
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
             if ($yymajor < self::YYERRORSYMBOL &&
-                !$this->yy_is_expected_token($yymajor)) {
+                  !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -3576,22 +2879,22 @@ public function doParse($yymajor, $yytokenvalue)
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
-                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
                             fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
                         while ($this->yyidx >= 0 &&
-                               $yymx !== self::YYERRORSYMBOL &&
-                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                        ) {
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor == 0) {
+                        if ($this->yyidx < 0 || $yymajor==0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
index 504a4582c..1fac79b74 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
@@ -362,7 +362,6 @@ public static function testInstall(Smarty $smarty, &$errors = null)
                 'smarty_internal_compile_function.php'                      => true,
                 'smarty_internal_compile_if.php'                            => true,
                 'smarty_internal_compile_include.php'                       => true,
-                'smarty_internal_compile_include_php.php'                   => true,
                 'smarty_internal_compile_insert.php'                        => true,
                 'smarty_internal_compile_ldelim.php'                        => true,
                 'smarty_internal_compile_make_nocache.php'                  => true,
@@ -373,7 +372,6 @@ public static function testInstall(Smarty $smarty, &$errors = null)
                 'smarty_internal_compile_private_modifier.php'              => true,
                 'smarty_internal_compile_private_object_block_function.php' => true,
                 'smarty_internal_compile_private_object_function.php'       => true,
-                'smarty_internal_compile_private_php.php'                   => true,
                 'smarty_internal_compile_private_print_expression.php'      => true,
                 'smarty_internal_compile_private_registered_block.php'      => true,
                 'smarty_internal_compile_private_registered_function.php'   => true,
@@ -388,7 +386,6 @@ public static function testInstall(Smarty $smarty, &$errors = null)
                 'smarty_internal_config_file_compiler.php'                  => true,
                 'smarty_internal_data.php'                                  => true,
                 'smarty_internal_debug.php'                                 => true,
-                'smarty_internal_errorhandler.php'                          => true,
                 'smarty_internal_extension_handler.php'                     => true,
                 'smarty_internal_method_addautoloadfilters.php'             => true,
                 'smarty_internal_method_adddefaultmodifiers.php'            => true,
@@ -450,7 +447,6 @@ public static function testInstall(Smarty $smarty, &$errors = null)
                 'smarty_internal_resource_extends.php'                      => true,
                 'smarty_internal_resource_file.php'                         => true,
                 'smarty_internal_resource_php.php'                          => true,
-                'smarty_internal_resource_registered.php'                   => true,
                 'smarty_internal_resource_stream.php'                       => true,
                 'smarty_internal_resource_string.php'                       => true,
                 'smarty_internal_runtime_cachemodify.php'                   => true,
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
index aae7e42f7..7fe84536f 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
@@ -72,9 +72,7 @@ public static function load(Smarty $smarty, $type)
         }
         // try registered resource
         if (isset($smarty->registered_resources[ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] =
-                $smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
-                    $smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = $smarty->registered_resources[ $type ];
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_security.php b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
index 441a7e284..3c29c8132 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_security.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
@@ -21,19 +21,6 @@
  */
 class Smarty_Security
 {
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
 
     /**
      * This is the list of template directories that are considered secure.
diff --git a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
index f7ad39b93..8833aa52c 100644
--- a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
+++ b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
@@ -16,12 +16,12 @@ public function __toString()
     }
 
     /**
-     * The line number of the template error
-     *
-     * @type int|null
+     * @param int $line
      */
-    public $line = null;
-
+    public function setLine($line)
+    {
+        $this->line = $line;
+    }
     /**
      * The template source snippet relating to the error
      *
diff --git a/initialize.php b/initialize.php
index 911c1f71d..f8d3cf7db 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5638");
+define("APP_VERSION", "1.20.0.5639");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0924ef499c2b0833a20c2d180b04fa70c6484b6d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Feb 2022 20:46:15 +0000
Subject: [PATCH 1661/1848] Fixed Smarty.class.php so that it is possible to
 use it with php5.4.

---
 WEB-INF/lib/smarty/Smarty.class.php | 16 +++++++++++++++-
 WEB-INF/lib/smarty/readme           |  7 +++----
 initialize.php                      |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/smarty/Smarty.class.php b/WEB-INF/lib/smarty/Smarty.class.php
index 05325a230..85a3d9a6e 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -60,6 +60,18 @@
      */
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
+
+// Note: Nik put this back in from smarty3 for php5.4 that we still support.
+// See also comment around Smarty::$_CHARSET.
+if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
+    // UTF-8 can only be done properly when mbstring is available!
+    /**
+     * @deprecated in favor of Smarty::$_CHARSET
+     */
+    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+}
+// End of inserted fragment by Nik.
+
 /**
  * Load Smarty_Autoloader
  */
@@ -160,7 +172,9 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
-    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
+    // public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
+    // Note by Nik: the above assignment only works with php >= 5.6, rolling back to SMARTY_RESOURCE_CHAR_SET as in smarty3.
+    public static $_CHARSET =  SMARTY_RESOURCE_CHAR_SET;
 
     /**
      * The date format to be used internally
diff --git a/WEB-INF/lib/smarty/readme b/WEB-INF/lib/smarty/readme
index 91eff4784..0a894518a 100644
--- a/WEB-INF/lib/smarty/readme
+++ b/WEB-INF/lib/smarty/readme
@@ -1,8 +1,7 @@
-These are files from Smarty-4.1.0 with 2 modifications in:
+The files in this directory are from Smarty-4.1.0.
+There are 2 modified files though to support older versions of php such as 5.4.
 
 Smarty.class.php
 sysplugins/smarty_internal_cacheresource_file.php
 
-Nik edited these files for php5.4 support, as they use php7.0 features.
-
-
+Nik edited these files in a few places for php5.4 support, as they use php7.0 and php5.6 features.
diff --git a/initialize.php b/initialize.php
index f8d3cf7db..221f3f6cd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5639");
+define("APP_VERSION", "1.20.0.5640");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 992bcdd2f13da3ffa7161bbb9ed7c7d118e9297a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Feb 2022 13:12:10 +0000
Subject: [PATCH 1662/1848] Added a comment about required php version. Dutch
 file improved.

---
 WEB-INF/resources/nl.lang.php | 2 +-
 dbinstall.php                 | 4 ++++
 initialize.php                | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index dc86183ac..79baaa97d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -110,7 +110,7 @@
 'button.stop' => 'Stop',
 'button.approve' => 'Goedkeuren',
 'button.disapprove' => 'Afkeuren',
-// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
+'button.sync' => 'Sychroniseer',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.menu' => 'Menu',
diff --git a/dbinstall.php b/dbinstall.php
index 12a1e6232..a3168bbfa 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -94,6 +94,10 @@ function ttGenerateKeys() {
   // $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
   $required_version = '5.4.0';    // Week view (week.php) requires 5.4 because of []-way of referencing arrays.
                                   // This needs further investigation as we use [] elsewhere without obvious problems.
+  // Note: unmodified smarty 4.1.0 that we needed for php 8.1 support uses plp 5.6 and 7.0 features.
+  // Currently, embedded smarty in this product is adjusted to still support php 5.4.
+  // Next time we update smarty we may need to increase $required_version.
+
   // Print a warning about php >= 8.1 because of a breaking change
   // with mysqli default error mode, see https://php.watch/versions/8.1/mysqli-error-mode
   if (version_compare(phpversion(), '8.1', '>=')) {
diff --git a/initialize.php b/initialize.php
index 221f3f6cd..295d77ca0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5640");
+define("APP_VERSION", "1.20.0.5641");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0e2d6563e2d969209c502a1eae4ddd8e87b73299 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Feb 2022 14:56:48 +0000
Subject: [PATCH 1663/1848] Addressed an sql injection vulnerability in
 puncher.php.

---
 initialize.php | 2 +-
 puncher.php    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 295d77ca0..039438f08 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5641");
+define("APP_VERSION", "1.20.0.5642");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 787c6f34b..0cfd37f20 100644
--- a/puncher.php
+++ b/puncher.php
@@ -19,6 +19,13 @@
   header('Location: feature_disabled.php');
   exit();
 }
+// If we are passed in a date, make sure it is in correct format.
+// TODO: redo this temporary sql injection fix as we are not supposed to pass a date.
+$date = $request->getParameter('date');
+if ($date && !ttValidDbDateFormatDate($date)) {
+  header('Location: access_denied.php');
+  exit();
+}
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');

From 1804ff3d538651464545e1fac8fefcf10442ad7b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 22 Feb 2022 17:25:34 +0000
Subject: [PATCH 1664/1848] Improved puncher plugin.

---
 WEB-INF/lib/common.lib.php   | 13 +++++++++
 WEB-INF/lib/ttDate.class.php |  6 ++++
 initialize.php               |  2 +-
 puncher.php                  | 55 ++++++++++++++++++------------------
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index d8ed3c8d5..f5baa1a12 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -270,6 +270,19 @@ function ttValidDbDateFormatDate($val)
   return true;
 }
 
+// ttValidTime is used to check user input for time post.
+function ttValidTime($val)
+{
+  if (is_null($val) || strlen($val) == 0)
+    return false;
+
+  // This should validate a yime string in 24 hour format hh:mm.
+  if (!preg_match('/^(2[0-3]|[01]?[0-9]):([0-5]?[0-9])$/', $val))
+    return false;
+
+  return true;
+}
+
 // ttValidInteger is used to check user input to validate an integer.
 function ttValidInteger($val, $emptyValid = false)
 {
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 1b5bad9c4..176692f84 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -111,6 +111,12 @@ function getDay() { return $this->day; }
   function getDayOfWeek() { return $this->dayOfWeek; }
 
 
+  // incrementDay increments our date by a number of days.
+  function incrementDay(/*int*/ $days = 1) {
+    $this->setFromUnixTimestamp(@mktime(0, 0, 0, $this->month, $this->day + $days, $this->year));
+  }
+
+
   // A static function to obtain a date in DB_DATEFORMAT from a Unix timestamp.
   static function dateFromUnixTimestamp($unixTimestamp = null) {
     if ($unixTimestamp == null) {
diff --git a/initialize.php b/initialize.php
index 039438f08..9328d3c0f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5642");
+define("APP_VERSION", "1.20.0.5643");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 0cfd37f20..55c42e368 100644
--- a/puncher.php
+++ b/puncher.php
@@ -8,7 +8,7 @@
 import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Access check.
 if (!ttAccessAllowed('track_own_time')) {
@@ -19,13 +19,8 @@
   header('Location: feature_disabled.php');
   exit();
 }
-// If we are passed in a date, make sure it is in correct format.
-// TODO: redo this temporary sql injection fix as we are not supposed to pass a date.
-$date = $request->getParameter('date');
-if ($date && !ttValidDbDateFormatDate($date)) {
-  header('Location: access_denied.php');
-  exit();
-}
+// If we are passed in browser_today, make sure it is in correct format.
+$browser_today = null; // Reused below beyond access checks.
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
@@ -34,6 +29,16 @@
     exit();
   }
 }
+// If we are passed in browser_ttime, make sure it is in correct format.
+$browser_time = null; // Reused below beyond access checks.
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_time = $request->getParameter('browser_time');
+  if ($browser_time && !ttValidTime($browser_time)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 $showClient = $user->isPluginEnabled('cl');
@@ -44,15 +49,9 @@
 $taskRequired = false;
 if ($showTask) $taskRequired = $user->getConfigOption('task_required');
 
-// Initialize and store date in session.
-$cl_date  = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
-$_SESSION['date'] = $cl_date;
-// TODO: for timer page we may limit the day to today only.
+// Initialize $cl_date.
+$date_today = new ttDate($browser_today); // Initialize to browser today if we are passed it in, otherwise server today.
+$cl_date = $date_today->toString();
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -66,8 +65,8 @@
 $enable_controls = ($uncompleted == null);
 
 // Initialize variables.
-$cl_start = trim($request->getParameter('browser_time'));
-$cl_finish = trim($request->getParameter('browser_time'));
+$cl_start = $browser_time;
+$cl_finish = $browser_time;
 $cl_duration = $cl_note = null;
 // Disabled controls are not posted. Therefore, && $enable_controls condition in several places below.
 // This allows us to get values from session when controls are disabled and reset to null when not.
@@ -204,9 +203,9 @@
 // Start and stop buttons.
 $enable_start = $uncompleted ? false : true;
 if (!$uncompleted)
-  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('button.start'),'enable'=>$enable_start));
+  $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_today.value=get_date();browser_time.value=get_time()','value'=>$i18n->get('button.start'),'enable'=>$enable_start));
 else
-  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_time.value=get_time()','value'=>$i18n->get('button.stop'),'enable'=>!$enable_start));
+  $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_today.value=get_date();browser_time.value=get_time()','value'=>$i18n->get('button.stop'),'enable'=>!$enable_start));
 
 // Submit.
 if ($request->isPost()) {
@@ -232,15 +231,17 @@
     }
     // Finished validating user input.
 
-    // Prohibit creating entries in future.
+    // Prohibit creating entries in future. Tricky with a bogus browser_today data in post.
     if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
+      // Just check if the date we are using is after server tomorrow.
+      $server_tomorrow = new ttDate();
+      $server_tomorrow->incrementDay();
+      if ($date_today->after($server_tomorrow))
         $err->add($i18n->get('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
-    if ($user->isDateLocked($selected_date))
+    if ($user->isDateLocked($date_today))
       $err->add($i18n->get('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
@@ -309,7 +310,7 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($cl_date);
+$week_total = ttTimeHelper::getTimeForWeek2($date_today);
 $timeRecords = ttTimeHelper::getRecords($cl_date);
 
 $smarty->assign('week_total', $week_total);
@@ -329,7 +330,7 @@
 $smarty->assign('task_list', $task_list);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
-$smarty->assign('timestring', $selected_date->toString($user->date_format));
+$smarty->assign('timestring', $date_today->toString($user->getDateFormat()));
 $smarty->assign('title', $i18n->get('title.puncher'));
 $smarty->assign('content_page_name', 'puncher.tpl');
 $smarty->display('index.tpl');

From c6e71668ca55e91c8d0f039949656a0994b3be81 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 23 Feb 2022 13:55:58 +0000
Subject: [PATCH 1665/1848] Improved a check for valid date.

---
 WEB-INF/lib/common.lib.php | 5 +++--
 initialize.php             | 2 +-
 puncher.php                | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index f5baa1a12..6702919b7 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -267,7 +267,8 @@ function ttValidDbDateFormatDate($val)
   if (!preg_match('/^\d\d\d\d-\d\d-\d\d$/', $val))
     return false;
 
-  return true;
+  $date_parts = explode('-', $val);
+  return checkdate($date_parts[1], $date_parts[2], $date_parts[0]);
 }
 
 // ttValidTime is used to check user input for time post.
@@ -276,7 +277,7 @@ function ttValidTime($val)
   if (is_null($val) || strlen($val) == 0)
     return false;
 
-  // This should validate a yime string in 24 hour format hh:mm.
+  // This should validate a time string in 24 hour format hh:mm.
   if (!preg_match('/^(2[0-3]|[01]?[0-9]):([0-5]?[0-9])$/', $val))
     return false;
 
diff --git a/initialize.php b/initialize.php
index 9328d3c0f..827e9ce29 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5643");
+define("APP_VERSION", "1.20.0.5644");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 55c42e368..d23fbd1f0 100644
--- a/puncher.php
+++ b/puncher.php
@@ -29,7 +29,7 @@
     exit();
   }
 }
-// If we are passed in browser_ttime, make sure it is in correct format.
+// If we are passed in browser_time, make sure it is in correct format.
 $browser_time = null; // Reused below beyond access checks.
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.

From bb7d08fa61a40369e8eeb07e476ec0a674e2f092 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 23 Feb 2022 14:31:36 +0000
Subject: [PATCH 1666/1848] Replaced emoji with an asterisk for subgroups
 dropdown because it does not display properly in Chrome 98.

---
 WEB-INF/lib/ttUser.class.php | 5 +++--
 initialize.php               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 592b5d9c8..19e689b58 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -555,9 +555,10 @@ function getGroupsForDropdown() {
   // addGroupToDropdown is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
   function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
     $name = '';
-    // Add indentation markup to indicate subdirectory level.
+    // Add indentation markup to indicate a subdirectory level.
     for ($i = 0; $i < $subgroup_level; $i++) {
-      $name .= '🛑'; // Unicode stop sign.
+      $name .= '*';
+      // $name .= '🛑'; // Unicode stop sign. Does not display properly in Chrome 98.
     }
     if ($subgroup_level) $name .= ' '; // Add an extra space.
     $name .= ttGroupHelper::getGroupName($group_id);
diff --git a/initialize.php b/initialize.php
index 827e9ce29..62c2c0f8f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5644");
+define("APP_VERSION", "1.20.0.5645");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6aaad31630500d13b6c8459daa9f406fd5eb4330 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 23 Feb 2022 15:43:34 +0000
Subject: [PATCH 1667/1848] Addressed stored XSS vulnerability when displaying
 primary group name.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 initialize.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 19e689b58..f1eb3e094 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -834,7 +834,7 @@ function getUserPartForHeader() {
       $user_part .= ',  <span class="onBehalf">'.htmlspecialchars($this->behalf_group_name).'</span>';
     } else {
       if ($this->group_name) // Note: we did not require group names in the past.
-        $user_part .= ', '.$this->group_name;
+        $user_part .= ', '.htmlspecialchars($this->group_name);
     }
     return $user_part;
   }
diff --git a/initialize.php b/initialize.php
index 62c2c0f8f..b4ad492fa 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5645");
+define("APP_VERSION", "1.20.0.5646");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 48a36e432dbd8789b032499eb2a8ef5549b0c5f1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 2 Mar 2022 17:24:06 +0000
Subject: [PATCH 1668/1848] A fix for issue #118.

---
 WEB-INF/lib/ttClientHelper.class.php  | 45 +++++++++++++++++++++++++++
 WEB-INF/lib/ttProjectHelper.class.php |  7 ++++-
 initialize.php                        |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index ba62d0f33..5c9dff349 100644
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -358,4 +358,49 @@ static function deleteProjectFromClient($project_id, $client_id) {
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
+
+  // unassignProjectFromAllClients - removes a project reference from all clients in tt_clients table
+  // and also from tt_client_project_binds.
+  static function unassignProjectFromAllClients($project_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $project_id = (int) $project_id; // Cast for sql injection protection, just in case.
+
+    // Start with cleaning up tt_client_project_binds table.
+    $sql = "delete from tt_client_project_binds".
+       " where project_id = $project_id and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Continue with tt_clients table.
+    $sql = "select id, projects from tt_clients where projects like '%$project_id%' and group_id = $group_id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    while ($val = $res->fetchRow()) {
+
+      $client_id = (int) $val['id'];
+      $projectListed = false;
+
+      $projects = explode(',', $val['projects']);
+      if (($key = array_search($project_id, $projects)) !== false) {
+        unset($projects[$key]);
+        $projectListed = true;
+      }
+      if (!$projectListed)
+        continue;  // Project not listed, continue iterating.
+
+      // If we are here, project is listed and we need to remove it.
+      $comma_separated = implode(',', $projects);
+      $sql = "update tt_clients set projects = ".$mdb2->quote($comma_separated).
+        " where id = $client_id and group_id = $group_id and org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+    }
+    return true;
+  }
 }
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index dd6e35cb8..97a9dbc29 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -357,7 +357,12 @@ static function update($fields) {
         return false;
     }
     // End of updating tt_project_task_binds table.
-    
+
+    // If we are making the project inactive, remove references to it in tt_client_project_binds table.
+    if (constant('INACTIVE') == $status) {
+      ttClientHelper::unassignProjectFromAllClients($project_id);
+    }
+
     // Update project name, description, tasks and status in tt_projects table.
     $comma_separated = implode(",", $tasks_to_bind); // This is a comma-separated list of associated task ids.
     $sql = "update tt_projects set name = ".$mdb2->quote($name).", description = ".$mdb2->quote($description).
diff --git a/initialize.php b/initialize.php
index b4ad492fa..5d433ef69 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.0.5646");
+define("APP_VERSION", "1.20.1.5647");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bcb15ae43e46f2ae8a326374286f95a7436647de Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 2 Mar 2022 17:27:20 +0000
Subject: [PATCH 1669/1848] Cosmetic. Comment changed for clarity.

---
 WEB-INF/lib/ttProjectHelper.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 97a9dbc29..4a827189b 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -358,7 +358,7 @@ static function update($fields) {
     }
     // End of updating tt_project_task_binds table.
 
-    // If we are making the project inactive, remove references to it in tt_client_project_binds table.
+    // If we are making the project inactive, unassign it from all clients.
     if (constant('INACTIVE') == $status) {
       ttClientHelper::unassignProjectFromAllClients($project_id);
     }

From 407e6c65271d30c058377ece5a885ecfc852aaea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 3 Mar 2022 18:56:25 +0000
Subject: [PATCH 1670/1848] Improved a check for overlap. Existing code was not
 working when finish is start as in uncompleted records.

---
 WEB-INF/lib/ttTimeHelper.class.php | 2 +-
 initialize.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index b45c6d17f..70b98458f 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -718,7 +718,7 @@ static function overlaps($user_id, $date, $start, $finish, $record_id = null) {
       and start is not null and duration is not null and status = 1 and (
       (cast(".$mdb2->quote($start)." as time) >= start and cast(".$mdb2->quote($start)." as time) < addtime(start, duration))";
     if ($finish) {
-      $sql .= " or (cast(".$mdb2->quote($finish)." as time) <= addtime(start, duration) and cast(".$mdb2->quote($finish)." as time) > start)
+      $sql .= " or (cast(".$mdb2->quote($finish)." as time) < addtime(start, duration) and cast(".$mdb2->quote($finish)." as time) >= start)
       or (cast(".$mdb2->quote($start)." as time) < start and cast(".$mdb2->quote($finish)." as time) > addtime(start, duration))";
     }
     $sql .= ")";
diff --git a/initialize.php b/initialize.php
index 5d433ef69..61208f771 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.1.5647");
+define("APP_VERSION", "1.20.1.5648");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d3fcdf90b38f68f7ce1bed7f05ee74fa70fdeb7b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 4 Mar 2022 15:08:48 +0000
Subject: [PATCH 1671/1848] Rolling back a change from previous commit.

---
 WEB-INF/lib/ttTimeHelper.class.php | 2 +-
 initialize.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 70b98458f..b45c6d17f 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -718,7 +718,7 @@ static function overlaps($user_id, $date, $start, $finish, $record_id = null) {
       and start is not null and duration is not null and status = 1 and (
       (cast(".$mdb2->quote($start)." as time) >= start and cast(".$mdb2->quote($start)." as time) < addtime(start, duration))";
     if ($finish) {
-      $sql .= " or (cast(".$mdb2->quote($finish)." as time) < addtime(start, duration) and cast(".$mdb2->quote($finish)." as time) >= start)
+      $sql .= " or (cast(".$mdb2->quote($finish)." as time) <= addtime(start, duration) and cast(".$mdb2->quote($finish)." as time) > start)
       or (cast(".$mdb2->quote($start)." as time) < start and cast(".$mdb2->quote($finish)." as time) > addtime(start, duration))";
     }
     $sql .= ")";
diff --git a/initialize.php b/initialize.php
index 61208f771..27e302483 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.1.5648");
+define("APP_VERSION", "1.20.1.5649");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4bf1cc9e8a50d630db7571a2894cb6d87670ea3f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 10 Mar 2022 16:57:53 +0000
Subject: [PATCH 1672/1848] Added all users option to charts.

---
 WEB-INF/lib/ttChartHelper.class.php | 20 +++++++++---
 WEB-INF/lib/ttRoleHelper.class.php  |  2 +-
 WEB-INF/templates/header.tpl        |  2 +-
 WEB-INF/templates/site_map.tpl      |  2 +-
 charts.php                          | 48 +++++++++++++++++++++--------
 dbinstall.php                       | 10 +++---
 initialize.php                      |  2 +-
 mysql.sql                           |  4 +--
 8 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 60c9897cb..faf18263b 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -40,6 +40,11 @@ class ttChartHelper {
   // getTotals - returns total times by project or task for a given user in a specified period.
   static function getTotals($user_id, $chart_type, $selected_date, $interval_type) {
 
+    global $user;
+    $user_id = (int) $user_id; // Cast to int just in case for sql injections.
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $period = null;
     switch ($interval_type) {
       case INTERVAL_THIS_DAY:
@@ -62,25 +67,32 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
     $result = array();
     $mdb2 = getConnection();
 
+    $userIdPart = '';
+    if ($user_id > 0) {
+      // -1 here means "all users in group" both active and inactive.
+      // Therefore, we will not be using user id.
+      $userIdPart = "and l.user_id = $user_id";
+    }
+
     $q_period = '';
     if ($period != null) {
-      $q_period = " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."'";
+      $q_period = "and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."'";
     }
     if (CHART_PROJECTS == $chart_type) {
       // Data for projects.
       $sql = "select p.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_projects p on (p.id = l.project_id)
-        where l.status = 1 and l.user_id = $user_id $q_period group by l.project_id";
+        where l.status = 1 $userIdPart and l.group_id = $group_id and l.org_id = $org_id $q_period group by l.project_id";
     } elseif (CHART_TASKS == $chart_type) {
       // Data for tasks.
       $sql = "select t.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_tasks t on (t.id = l.task_id)
-        where l.status = 1 and l.user_id = $user_id $q_period group by l.task_id";
+        where l.status = 1 $userIdPart and l.group_id = $group_id and l.org_id = $org_id $q_period group by l.task_id";
     } elseif (CHART_CLIENTS == $chart_type) {
       // Data for clients.
       $sql = "select c.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
         left join tt_clients c on (c.id = l.client_id)
-        where l.status = 1 and l.user_id = $user_id $q_period group by l.client_id";
+        where l.status = 1 $userIdPart and l.group_id = $group_id and l.org_id = $org_id $q_period group by l.client_id";
     }
 
     $res = $mdb2->query($sql);
diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 1ddc839cc..fa6739a5b 100644
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -169,7 +169,7 @@ static function createPredefinedRoles($group_id, $lang)
     $rights_client = 'view_client_reports,view_client_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users';
     $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_date_lock,override_own_date_lock,swap_roles';
-    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports';
+    $rights_comanager = $rights_supervisor.',manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_charts,view_all_reports';
     $rights_manager = $rights_comanager.',manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups';
 
     // Active roles.
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index a189e50e5..af6151acb 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -114,7 +114,7 @@
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
       <td><a href="invoices.php">{$i18n.title.invoices}</a></td>
     {/if}
-    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts') || $user->can('view_all_charts'))) &&
         (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
       <td><a href="charts.php">{$i18n.menu.charts}</a></td>
diff --git a/WEB-INF/templates/site_map.tpl b/WEB-INF/templates/site_map.tpl
index 54ff8818d..8688f7677 100644
--- a/WEB-INF/templates/site_map.tpl
+++ b/WEB-INF/templates/site_map.tpl
@@ -37,7 +37,7 @@
     {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))}
   <div class="sitemap-item"><a href="invoices.php">{$i18n.title.invoices}</a></div>
     {/if}
-    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) &&
+    {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts') || $user->can('view_all_charts'))) &&
         (constant('MODE_PROJECTS') == $user->getTrackingMode() || constant('MODE_PROJECTS_AND_TASKS') == $user->getTrackingMode() ||
         $user->isPluginEnabled('cl'))}
   <div class="sitemap-item"><a href="charts.php">{$i18n.menu.charts}</a></div>
diff --git a/charts.php b/charts.php
index 88878f6b0..cfd01c5fe 100644
--- a/charts.php
+++ b/charts.php
@@ -13,8 +13,10 @@
 import('ttUserHelper');
 import('ttTeamHelper');
 
+define('ALL_USERS_OPTION_ID', -1); // An identifier for "all users" seclection in User dropdown.
+
 // Access checks.
-if (!(ttAccessAllowed('view_own_charts') || ttAccessAllowed('view_charts'))) {
+if (!(ttAccessAllowed('view_own_charts') || ttAccessAllowed('view_charts') || ttAccessAllowed('view_all_charts'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -26,7 +28,7 @@
   header('Location: access_denied.php'); // Nobody to display a chart for.
   exit();
 }
-if ($user->behalf_id && (!$user->can('view_charts') || !$user->checkBehalfId())) {
+if ($user->behalf_id && (!($user->can('view_charts') || $user->can('view_all_charts')) || !$user->checkBehalfId())) {
   header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
   exit();
 }
@@ -34,8 +36,13 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
   exit();
 }
+$userDropdownSelectionId = (int) $request->getParameter('user'); // Resused below access checks.
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid((int)$request->getParameter('user'))) {
+  if ($userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') && !ttAccessAllowed('view_all_charts')) {
+    header('Location: access_denied.php'); // All users option is only for users with view_all_charts access right.
+    exit();
+  }
+  if ($userDropdownSelectionId != constant('ALL_USERS_OPTION_ID') && !$user->isUserValid($userDropdownSelectionId)) {
     header('Location: access_denied.php'); // Wrong user id on post.
     exit();
   }
@@ -47,13 +54,16 @@
 }
 // End of access checks.
 
-// Determine user for which we display this page.
-$userChanged = (int)$request->getParameter('user_changed');
-if ($request->isPost() && $userChanged) {
-  $user_id = (int)$request->getParameter('user');
-  $user->setOnBehalfUser($user_id);
-} else {
-  $user_id = $user->getUser();
+// Determine user for whom we display this page.
+$userChanged = (int) $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged ) {
+  if ($userDropdownSelectionId != constant('ALL_USERS_OPTION_ID')) {
+    $user->setOnBehalfUser($userDropdownSelectionId);
+  }
+}
+if ($request->isGet()) {
+  $userDropdownSelectionId = $user->getUser();
+  // Note that this may change to ALL_USERS_OPTION_ID below from session.
 }
 
 $uc = new ttUserConfig();
@@ -77,6 +87,9 @@
   if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
   $_SESSION['chart_type'] = $cl_type;
   $uc->setValue(SYSC_CHART_TYPE, $cl_type);
+
+  // Remember all users selection in session.
+  $_SESSION['chart_all_users'] = $userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') ? true : false;
 } else {
   // Initialize chart interval.
   $cl_interval = @$_SESSION['chart_interval'];
@@ -89,6 +102,11 @@
   if (!$cl_type) $cl_type = $uc->getValue(SYSC_CHART_TYPE);
   $cl_type = ttChartHelper::adjustType($cl_type);
   $_SESSION['chart_type'] = $cl_type;
+
+  // Set user selection to all users, if necessary.
+  $allUsersSetInSession = @$_SESSION['chart_all_users'];
+  if ($allUsersSetInSession)
+      $userDropdownSelectionId = constant('ALL_USERS_OPTION_ID');
 }
 
 // Elements of chartForm.
@@ -96,18 +114,22 @@
 $largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 // User dropdown. Changes the user "on behalf" of whom we are working.
-if ($user->can('view_charts')) {
+if ($user->can('view_charts') || $user->can('view_all_charts')) {
   $rank = $user->getMaxRankForGroup($user->getGroup());
   if ($user->can('view_own_charts'))
     $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
     $options = array('status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
+  // Add the --- all --- option to dropdown.
+  if ($user->can('view_all_charts')) {
+      $user_list[] = array('id'=>'-1','group_id'=>$user->getGroup(), 'name'=>$i18n->get('dropdown.all'), 'rights'=>'');
+  }
   if (count($user_list) >= 1) {
     $chart_form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
       'name'=>'user',
-      'value'=>$user_id,
+      'value'=>$userDropdownSelectionId,
       'data'=>$user_list,
       'datakeys'=>array('id','name'),
     ));
@@ -159,7 +181,7 @@
 $chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 
 // Get data for our chart.
-$totals = ttChartHelper::getTotals($user_id, $cl_type, $cl_date, $cl_interval);
+$totals = ttChartHelper::getTotals($userDropdownSelectionId, $cl_type, $cl_date, $cl_interval);
 $smarty->assign('totals', $totals);
 
 // Prepare chart for drawing.
diff --git a/dbinstall.php b/dbinstall.php
index a3168bbfa..182910ada 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1151,7 +1151,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to12000"]) {
+  if ($_POST["convert11900to12100"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1191,6 +1191,8 @@ function ttGenerateKeys() {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.19.29') set rights = replace(rights, 'swap_roles,update_work', 'swap_roles') where `rank` >= 12");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.19.29') set rights = replace(rights, 'view_all_reports,manage_work,bid_on_work', 'view_all_reports') where `rank` >= 68");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.20.0', modified = now() where param_name = 'version_db' and param_value = '1.19.29'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.20.0') set rights = replace(rights, 'manage_basic_settings,view_all_reports', 'manage_basic_settings,view_all_charts,view_all_reports') where `rank` >= 68");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.0', modified = now() where param_name = 'version_db' and param_value = '1.20.0'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1241,7 +1243,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.20.0)</b>
+    <td width="80%"><b>Create database structure (v1.21.0)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1290,8 +1292,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.20)</td>
-    <td><input type="submit" name="convert11900to12000" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.21)</td>
+    <td><input type="submit" name="convert11900to12100" value="Update"></td>
   </tr>
 </table>
 
diff --git a/initialize.php b/initialize.php
index 27e302483..48af9888e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.20.1.5649");
+define("APP_VERSION", "1.21.0.5650");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mysql.sql b/mysql.sql
index 55d8e8b5c..05743ee54 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -78,7 +78,7 @@ create unique index role_idx on tt_roles(group_id, `rank`, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_charts,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -621,4 +621,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.20.0', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.0', now()); # TODO: change when structure changes.

From d6ee66fa1e218b13c093e7c7d0b34f34cb15bd06 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 12 Mar 2022 16:12:19 +0000
Subject: [PATCH 1673/1848] Updated links.

---
 .htaccess                                       |  2 +-
 CONTRIBUTING.md                                 |  4 ++--
 WEB-INF/config.php.dist                         |  4 ++--
 WEB-INF/lib/Auth.class.php                      |  2 +-
 WEB-INF/lib/DateAndTime.class.php               |  2 +-
 WEB-INF/lib/I18n.class.php                      |  2 +-
 WEB-INF/lib/Period.class.php                    |  2 +-
 WEB-INF/lib/form/ActionErrors.class.php         |  2 +-
 WEB-INF/lib/form/ActionForm.class.php           |  2 +-
 WEB-INF/lib/form/Calendar.class.php             |  2 +-
 WEB-INF/lib/form/Checkbox.class.php             |  2 +-
 WEB-INF/lib/form/CheckboxCellRenderer.class.php |  2 +-
 WEB-INF/lib/form/CheckboxGroup.class.php        |  2 +-
 WEB-INF/lib/form/DefaultCellRenderer.class.php  |  2 +-
 WEB-INF/lib/form/FloatField.class.php           |  2 +-
 WEB-INF/lib/form/Hidden.class.php               |  2 +-
 WEB-INF/lib/form/Submit.class.php               |  2 +-
 WEB-INF/lib/form/Table.class.php                |  2 +-
 WEB-INF/lib/form/TableColumn.class.php          |  2 +-
 WEB-INF/lib/form/TextArea.class.php             |  2 +-
 WEB-INF/lib/form/TextField.class.php            |  2 +-
 WEB-INF/lib/form/UploadFile.class.php           |  2 +-
 WEB-INF/lib/html/HttpRequest.class.php          |  2 +-
 WEB-INF/lib/mail/Mailer.class.php               |  2 +-
 WEB-INF/lib/ttBehalfUser.class.php              |  2 +-
 WEB-INF/lib/ttChartHelper.class.php             |  2 +-
 WEB-INF/lib/ttCronJobHelper.class.php           |  2 +-
 WEB-INF/lib/ttDebugTracer.class.php             |  2 +-
 WEB-INF/lib/ttNotificationHelper.class.php      |  2 +-
 WEB-INF/lib/ttOrgExportHelper.class.php         |  2 +-
 WEB-INF/lib/ttOrgHelper.class.php               |  2 +-
 WEB-INF/lib/ttPredefinedExpenseHelper.class.php |  2 +-
 WEB-INF/lib/ttProjectHelper.class.php           |  2 +-
 WEB-INF/lib/ttTeamHelper.class.php              |  2 +-
 initialize.php                                  |  2 +-
 plugins/CustomFields.class.php                  |  2 +-
 plugins/MonthlyQuota.class.php                  |  2 +-
 readme.txt                                      | 10 +++++-----
 38 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.htaccess b/.htaccess
index 189e6b4b8..3b6168c75 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,7 +2,7 @@ AddDefaultCharset utf-8
 
 # Restrict access to Time Tracker only from certain IPs.
 #
-# See https://www.anuko.com/time_tracker/faq/restrict_access_by_ip.htm for help.
+# See https://www.anuko.com/time-tracker/faq/restrict-access-by-ip.htm for help.
 # For this to work make sure AllowOverride is set to All in web server config file.
 # Uncomment 3 lines below and set your IP accordingly.
 #
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b7311238a..58c971801 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Resources
 
-* [docs](https://www.anuko.com/time_tracker/features.htm) - detailed documentation about this project (needs updating).
+* [docs](https://www.anuko.com/time-tracker/features.htm) - detailed documentation about this project (needs updating).
 * [forum](https://www.anuko.com/forum/viewforum.php?f=4) - general discussion.
 
 
@@ -29,4 +29,4 @@ usr: admin
 psw: secret
 ```
 
-Without docker, perform a manual install of a web server, php, database server, and Time Tracker. Full installation and setup guide can be found [here](https://www.anuko.com/time_tracker/install_guide/index.htm).
+Without docker, perform a manual install of a web server, php, database server, and Time Tracker. Full installation and setup guide can be found [here](https://www.anuko.com/time-tracker/install-guide/index.htm).
diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 9d9d90dfd..6b6a68d84 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -88,7 +88,7 @@ define('SENDER', 'Anuko Time Tracker <no-reply@timetracker.anuko.com>');
 // MAIL_MODE - mail sending mode. Can be 'mail' or 'smtp'.
 // 'mail' - sending through php mail() function.
 // 'smtp' - sending directly through SMTP server.
-// See https://www.anuko.com/time_tracker/install_guide/mail.htm
+// See https://www.anuko.com/time-tracker/install-guide/mail.htm
 //
 define('MAIL_MODE', 'smtp');
 define('MAIL_SMTP_HOST', 'localhost'); // For gmail use 'ssl://smtp.gmail.com' instead of 'localhost' and port 465.
@@ -133,7 +133,7 @@ define('REPORT_FOOTER', true);
 define('AUTH_MODULE', 'db');
 
 // LDAP authentication examples.
-// Go to https://www.anuko.com/time_tracker/install_guide/ldap_auth/index.htm for detailed configuration instructions.
+// Go to https://www.anuko.com/time-tracker/install-guide/ldap-auth/index.htm for detailed configuration instructions.
 
 // Configuration example for OpenLDAP server:
 // define('AUTH_MODULE', 'ldap');
diff --git a/WEB-INF/lib/Auth.class.php b/WEB-INF/lib/Auth.class.php
index ccf2d915d..783721090 100644
--- a/WEB-INF/lib/Auth.class.php
+++ b/WEB-INF/lib/Auth.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class Auth {
diff --git a/WEB-INF/lib/DateAndTime.class.php b/WEB-INF/lib/DateAndTime.class.php
index 1184bd853..e72245985 100644
--- a/WEB-INF/lib/DateAndTime.class.php
+++ b/WEB-INF/lib/DateAndTime.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 /**
diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index ed8380815..1760da48a 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class I18n {
diff --git a/WEB-INF/lib/Period.class.php b/WEB-INF/lib/Period.class.php
index 2d2269e52..57ea0e44c 100644
--- a/WEB-INF/lib/Period.class.php
+++ b/WEB-INF/lib/Period.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 define('INTERVAL_THIS_DAY', 1);
diff --git a/WEB-INF/lib/form/ActionErrors.class.php b/WEB-INF/lib/form/ActionErrors.class.php
index 3eaf68729..ba35ea639 100644
--- a/WEB-INF/lib/form/ActionErrors.class.php
+++ b/WEB-INF/lib/form/ActionErrors.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class ActionErrors {
diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index 8e2ad8af4..abc5e006b 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import("DateAndTime");
diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index 072b48281..7de81d876 100644
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/Checkbox.class.php b/WEB-INF/lib/form/Checkbox.class.php
index c4acbc5f5..619d39fb3 100644
--- a/WEB-INF/lib/form/Checkbox.class.php
+++ b/WEB-INF/lib/form/Checkbox.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/CheckboxCellRenderer.class.php b/WEB-INF/lib/form/CheckboxCellRenderer.class.php
index d117c12ef..cd9682703 100644
--- a/WEB-INF/lib/form/CheckboxCellRenderer.class.php
+++ b/WEB-INF/lib/form/CheckboxCellRenderer.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.DefaultCellRenderer');
diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php
index 9488b5cce..68b24853b 100644
--- a/WEB-INF/lib/form/CheckboxGroup.class.php
+++ b/WEB-INF/lib/form/CheckboxGroup.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/DefaultCellRenderer.class.php b/WEB-INF/lib/form/DefaultCellRenderer.class.php
index 1e36f79b5..55f4bbca5 100644
--- a/WEB-INF/lib/form/DefaultCellRenderer.class.php
+++ b/WEB-INF/lib/form/DefaultCellRenderer.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class DefaultCellRenderer {
diff --git a/WEB-INF/lib/form/FloatField.class.php b/WEB-INF/lib/form/FloatField.class.php
index 5b939754e..e6cbf1068 100644
--- a/WEB-INF/lib/form/FloatField.class.php
+++ b/WEB-INF/lib/form/FloatField.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.TextField');
diff --git a/WEB-INF/lib/form/Hidden.class.php b/WEB-INF/lib/form/Hidden.class.php
index 6e59bc8e1..89e90c7eb 100644
--- a/WEB-INF/lib/form/Hidden.class.php
+++ b/WEB-INF/lib/form/Hidden.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/Submit.class.php b/WEB-INF/lib/form/Submit.class.php
index 5f8da37e5..151600b32 100644
--- a/WEB-INF/lib/form/Submit.class.php
+++ b/WEB-INF/lib/form/Submit.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index d617f8b39..acdf4813a 100644
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/TableColumn.class.php b/WEB-INF/lib/form/TableColumn.class.php
index cb4bebf1b..87538eaa8 100644
--- a/WEB-INF/lib/form/TableColumn.class.php
+++ b/WEB-INF/lib/form/TableColumn.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.DefaultCellRenderer');
diff --git a/WEB-INF/lib/form/TextArea.class.php b/WEB-INF/lib/form/TextArea.class.php
index 715a6ea95..4faac1447 100644
--- a/WEB-INF/lib/form/TextArea.class.php
+++ b/WEB-INF/lib/form/TextArea.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index bb05c6738..bfc0e551f 100644
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/form/UploadFile.class.php b/WEB-INF/lib/form/UploadFile.class.php
index 50e8aad56..36d0d92a7 100644
--- a/WEB-INF/lib/form/UploadFile.class.php
+++ b/WEB-INF/lib/form/UploadFile.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('form.FormElement');
diff --git a/WEB-INF/lib/html/HttpRequest.class.php b/WEB-INF/lib/html/HttpRequest.class.php
index 2eb26f0a7..bc32debcf 100644
--- a/WEB-INF/lib/html/HttpRequest.class.php
+++ b/WEB-INF/lib/html/HttpRequest.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class ttHttpRequest {
diff --git a/WEB-INF/lib/mail/Mailer.class.php b/WEB-INF/lib/mail/Mailer.class.php
index 30f0ffb64..4c7eb0134 100644
--- a/WEB-INF/lib/mail/Mailer.class.php
+++ b/WEB-INF/lib/mail/Mailer.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class Mailer {
diff --git a/WEB-INF/lib/ttBehalfUser.class.php b/WEB-INF/lib/ttBehalfUser.class.php
index 408602a10..e85770c1b 100644
--- a/WEB-INF/lib/ttBehalfUser.class.php
+++ b/WEB-INF/lib/ttBehalfUser.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttConfigHelper');
diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index faf18263b..4e4f9c832 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('Period');
diff --git a/WEB-INF/lib/ttCronJobHelper.class.php b/WEB-INF/lib/ttCronJobHelper.class.php
index 8c44756c7..153938951 100644
--- a/WEB-INF/lib/ttCronJobHelper.class.php
+++ b/WEB-INF/lib/ttCronJobHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttRoleHelper');
diff --git a/WEB-INF/lib/ttDebugTracer.class.php b/WEB-INF/lib/ttDebugTracer.class.php
index 46469a908..33921e9dd 100644
--- a/WEB-INF/lib/ttDebugTracer.class.php
+++ b/WEB-INF/lib/ttDebugTracer.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttConfigHelper');
diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index 35c309040..8189e5a9b 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 // Class ttNotificationHelper is used to help with notification related tasks.
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index 2dd54f1b3..277eac3ab 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttTeamHelper');
diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 81169032a..656450f0e 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 // Class ttOrgHelper contains helper functions that operate with organizations.
diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index c6bc3f356..6d60d533e 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 
diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index 4a827189b..e1d5754c5 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 9bb538912..981f01b50 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
diff --git a/initialize.php b/initialize.php
index 48af9888e..d9e800df7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.0.5650");
+define("APP_VERSION", "1.21.0.5651");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 1a7b94e9e..4e2f13195 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -24,7 +24,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 class CustomFields {
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index 76a7c5100..b291d3730 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -23,7 +23,7 @@
 // |
 // +----------------------------------------------------------------------+
 // | Contributors:
-// | https://www.anuko.com/time_tracker/credits.htm
+// | https://www.anuko.com/time-tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 import('ttTimeHelper');
diff --git a/readme.txt b/readme.txt
index 421a18cdb..90cdc970d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 Anuko Time Tracker
 Copyright (c) Anuko (https://www.anuko.com)
 
-Project home page: https://www.anuko.com/time_tracker/index.htm
+Project home page: https://www.anuko.com/time-tracker/index.htm
 Forum: https://www.anuko.com/forum/viewforum.php?f=4
-Info for developers: https://www.anuko.com/time_tracker/info_for_developers.htm
+Info for developers: https://www.anuko.com/time-tracker/info-for-developers.htm
 Free hosting of Time Tracker for individuals and small groups is available at https://timetracker.anuko.com
 
 Unless otherwise noted, files in this archive are protected by the LIBERAL FREEWARE LICENSE.
@@ -12,7 +12,7 @@ Read the file license.txt for details.
 
 INSTALLATION INSTRUCTIONS
 
-Documentation is available at https://www.anuko.com/time_tracker/install_guide/index.htm
+Documentation is available at https://www.anuko.com/time-tracker/install-guide/index.htm
 
 The general installation procedure looks like this:
 
@@ -40,7 +40,7 @@ The general installation procedure looks like this:
 
 UPGRADE FROM EARLIER VERSIONS
 
-See https://www.anuko.com/time_tracker/upgrade.htm
+See https://www.anuko.com/time-tracker/install-guide/upgrade.htm
 
 
 BLANK PAGES IN TIME TRACKER
@@ -62,4 +62,4 @@ Support is available on per-incident basis - see https://www.anuko.com/support.h
 
 CHANGE LOG
 
-Change log is available at https://www.anuko.com/time_tracker/change_log/index.htm
\ No newline at end of file
+Change log is available at https://www.anuko.com/time-tracker/change-log/index.htm
\ No newline at end of file

From 84638df3b637f376deb70ed060cb4a4b6d015295 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Mar 2022 14:56:32 +0000
Subject: [PATCH 1674/1848] Starting working on password complexity.

---
 WEB-INF/resources/ca.lang.php             |  1 +
 WEB-INF/resources/cs.lang.php             |  1 +
 WEB-INF/resources/da.lang.php             |  1 +
 WEB-INF/resources/de.lang.php             |  1 +
 WEB-INF/resources/en.lang.php             |  1 +
 WEB-INF/resources/es.lang.php             |  1 +
 WEB-INF/resources/et.lang.php             |  1 +
 WEB-INF/resources/fa.lang.php             |  1 +
 WEB-INF/resources/fi.lang.php             |  1 +
 WEB-INF/resources/fr.lang.php             |  1 +
 WEB-INF/resources/gr.lang.php             |  1 +
 WEB-INF/resources/he.lang.php             |  1 +
 WEB-INF/resources/hu.lang.php             |  1 +
 WEB-INF/resources/it.lang.php             |  1 +
 WEB-INF/resources/ja.lang.php             |  1 +
 WEB-INF/resources/ko.lang.php             |  1 +
 WEB-INF/resources/nl.lang.php             |  2 ++
 WEB-INF/resources/no.lang.php             |  1 +
 WEB-INF/resources/pl.lang.php             |  1 +
 WEB-INF/resources/pt-br.lang.php          |  2 ++
 WEB-INF/resources/pt.lang.php             |  1 +
 WEB-INF/resources/ro.lang.php             |  1 +
 WEB-INF/resources/ru.lang.php             |  1 +
 WEB-INF/resources/sk.lang.php             |  1 +
 WEB-INF/resources/sl.lang.php             |  1 +
 WEB-INF/resources/sr.lang.php             |  1 +
 WEB-INF/resources/sv.lang.php             |  1 +
 WEB-INF/resources/tr.lang.php             |  1 +
 WEB-INF/resources/zh-cn.lang.php          |  1 +
 WEB-INF/resources/zh-tw.lang.php          |  1 +
 WEB-INF/templates/group_advanced_edit.tpl | 11 +++++++++++
 group_advanced_edit.php                   |  7 ++++++-
 32 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6b74dced4..a9937cea6 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -584,6 +584,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 836ef4f28..9d5331736 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -596,6 +596,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index bc042b6e5..22aba0ded 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -562,6 +562,7 @@
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index dae614fbc..9a845d1f0 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -537,6 +537,7 @@
 'form.group_edit.confirm_save' => 'Speichern bestätigen',
 'form.group_edit.allow_ip' => 'Erlaube IP',
 // TODO: translate the following.
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 652c3e484..ab7769558 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -520,6 +520,7 @@
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.password_complexity' => 'Password complexity',
 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f2bb893ba..b7942fbeb 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -598,6 +598,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 67210ee66..e14416bc1 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -571,6 +571,7 @@
 'form.group_edit.confirm_save' => 'Kinnita salvestamine',
 'form.group_edit.allow_ip' => 'Luba IP',
 // TODO: translate the following.
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 31c1506fe..8ccc29f08 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -584,6 +584,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index c0d712667..26c150880 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -568,6 +568,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 61570ee8c..892b0291f 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -558,6 +558,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c795c5073..f1dbbc3c5 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -549,6 +549,7 @@
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 72a48ba5d..4f2a49236 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -588,6 +588,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8b1e0b348..924b4acc9 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -588,6 +588,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 90167eb26..383b1ab13 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -564,6 +564,7 @@
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index d0bad574e..b3fd57f48 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -590,6 +590,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 3e62d9d2d..d182519a3 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -588,6 +588,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 79baaa97d..8c1afa7fb 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -506,6 +506,8 @@
 '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.password_complexity' => 'Password complexity',
 'form.group_edit.advanced_settings' => 'Geavanceerde instellingen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 598950581..8b5e13f0f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -591,6 +591,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c826441f3..97ac1e0da 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -570,6 +570,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ba2ed1d73..b01e94d32 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -504,6 +504,8 @@
 'form.group_edit.uncompleted_indicators' => 'Indicadores incompletos',
 'form.group_edit.confirm_save' => 'Confirme o salvamento',
 'form.group_edit.allow_ip' => 'Permitir IP',
+// TODO: translate the following.
+// 'form.group_edit.password_complexity' => 'Password complexity',
 'form.group_edit.advanced_settings' => 'Configurações avançadas',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index cac4c68e8..7c724cd29 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -570,6 +570,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1d97b1fed..33c4547dc 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -592,6 +592,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 20d7d7e60..3707ce74a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -507,6 +507,7 @@
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
 'form.group_edit.confirm_save' => 'Предупреждать при сохранении',
 'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
+'form.group_edit.password_complexity' => 'Сложность пароля',
 'form.group_edit.advanced_settings' => 'Продвинутые настройки',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 89f26abde..345666d8f 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -574,6 +574,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 56eeb2050..d5b56f4a0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -565,6 +565,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index c88e9d07c..652eaa893 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -570,6 +570,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 36c0a325c..b39366bc1 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -568,6 +568,7 @@
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2e5bed2bb..2aae8ed9c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -605,6 +605,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b1c0667b3..f423fab84 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -579,6 +579,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5212a3f80..92f5dbf52 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -582,6 +582,7 @@
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.password_complexity' => 'Password complexity',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/templates/group_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
index 1f55adf77..66fa41035 100644
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -32,6 +32,17 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_21.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
+{if constant('PASSWORD_COMPLEXITY_DEBUG')}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_edit.password_complexity}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="allow_ip">{$i18n.form.group_edit.password_complexity}:</label></td>
+    <td class="td-with-input">{$forms.groupAdvancedForm.password_complexity.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index d08017576..a950b8d22 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -22,11 +22,13 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
   $cl_allow_ip = trim($request->getParameter('allow_ip'));
+  $cl_password_compexity = trim($request->getParameter('password_complexity'));
 } else {
   $cl_group = $group['name'];
   $cl_description = $group['description'];
   $cl_bcc_email = $group['bcc_email'];
   $cl_allow_ip = $group['allow_ip'];
+  $cl_password_compexity = $group['password_complexity'];
 }
 
 $form = new Form('groupAdvancedForm');
@@ -34,6 +36,7 @@
 $form->addInput(array('type'=>'textarea','name'=>'description','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'=>'text','maxlength'=>'100','name'=>'password_complexity','value'=>$cl_password_complexity));
 
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -44,6 +47,7 @@
     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'));
+    // TODO: add validation for password complexity field.
     // Finished validating user input.
 
     if ($err->no()) {
@@ -51,7 +55,8 @@
         'name' => $cl_group,
         'description' => $cl_description,
         'bcc_email' => $cl_bcc_email,
-        'allow_ip' => $cl_allow_ip))) {
+        'allow_ip' => $cl_allow_ip,
+        'password_complexity' => $cl_password_complexity))) {
         header('Location: success.php');
         exit();
       } else

From 26c4bcf64643c64b6bd3c5e36f0b3e99ede56b38 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Mar 2022 17:27:48 +0000
Subject: [PATCH 1675/1848] Some mnore progress on password complexity.

---
 WEB-INF/lib/common.lib.php   | 10 ++++++++++
 WEB-INF/lib/ttUser.class.php |  3 ++-
 group_advanced_edit.php      |  6 +++---
 initialize.php               |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 6702919b7..365452f88 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -396,6 +396,16 @@ function ttValidHolidays($val)
   return true;
 }
 
+// ttValidPasswordComplexity is used to check user input for password complexity field.
+function ttValidPasswordComplexity($val)
+{
+  // Password complexity example may contain a-z, A-Z, 0-9, and a #.
+  if (!preg_match('/^[a-zA-Z0-9#]*$/', $val))
+    return false;
+
+  return true;
+}
+
 // ttAccessAllowed checks whether user is allowed access to a particular page.
 // It is used as an initial check on all publicly available pages
 // (except login.php, register.php, and others where we don't have to check).
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index f1eb3e094..ff9295d04 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -693,6 +693,7 @@ function updateGroup($fields) {
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type'];
     if (isset($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']);
     if (isset($fields['allow_ip'])) $allow_ip_part = ', allow_ip = '.$mdb2->quote($fields['allow_ip']);
+    if (isset($fields['password_complexity'])) $password_complexity_part = ', password_complexity = '.$mdb2->quote($fields['password_complexity']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
     if (isset($fields['custom_css'])) $custom_css_part = ', custom_css = '.$mdb2->quote($fields['custom_css']);
@@ -703,7 +704,7 @@ function updateGroup($fields) {
 
     $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
       $time_format_part.$week_start_part.$tracking_mode_part.$project_required_part.$record_type_part.
-      $bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$custom_css_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
+      $bcc_email_part.$allow_ip_part.$password_complexity_part.$plugins_part.$config_part.$custom_css_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index a950b8d22..7683d879c 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -22,13 +22,13 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
   $cl_allow_ip = trim($request->getParameter('allow_ip'));
-  $cl_password_compexity = trim($request->getParameter('password_complexity'));
+  $cl_password_complexity = trim($request->getParameter('password_complexity'));
 } else {
   $cl_group = $group['name'];
   $cl_description = $group['description'];
   $cl_bcc_email = $group['bcc_email'];
   $cl_allow_ip = $group['allow_ip'];
-  $cl_password_compexity = $group['password_complexity'];
+  $cl_password_complexity = $group['password_complexity'];
 }
 
 $form = new Form('groupAdvancedForm');
@@ -47,7 +47,7 @@
     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'));
-    // TODO: add validation for password complexity field.
+    if (!ttValidPasswordComplexity($cl_password_complexity, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.password_complexity'));
     // Finished validating user input.
 
     if ($err->no()) {
diff --git a/initialize.php b/initialize.php
index d9e800df7..8a7e9390c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.0.5651");
+define("APP_VERSION", "1.21.0.5652");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a7c55a3af569745243e29dcc3e45125a27e70fd6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Mar 2022 18:13:27 +0000
Subject: [PATCH 1676/1848] Introduced error.weak_password to translation
 files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 initialize.php                   | 2 +-
 user_add.php                     | 3 +++
 32 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a9937cea6..f1a31d7db 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -74,6 +74,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Usuari o parula de pas incorrecta.',
 // TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 9d5331736..c54d09d62 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -76,6 +76,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nesprávné jméno nebo heslo.',
 // TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 22aba0ded..84ec205c5 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -66,6 +66,8 @@
 // TODO: translate the following.
 // 'error.record' => 'Select record.',
 'error.auth' => 'Forkert brugernavn eller adgangskode.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Brugernavn eksistere allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9a845d1f0..6a79d3978 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -64,6 +64,8 @@
 'error.report' => 'Bericht auswählen.',
 'error.record' => 'Eintrag auswählen.',
 'error.auth' => 'Benutzername oder Passwort ungültig.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ab7769558..3a4b699c0 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -60,6 +60,7 @@
 'error.report' => 'Select report.',
 'error.record' => 'Select record.',
 'error.auth' => 'Incorrect login or password.',
+'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'User with this login already exists.',
 'error.object_exists' => 'Object with this name already exists.',
 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b7942fbeb..d622d857d 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -72,6 +72,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Usuario o contraseña incorrecta.',
 // TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e14416bc1..6a6d5d02c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -65,6 +65,8 @@
 'error.report' => 'Vali raport.',
 'error.record' => 'Vali kirje.',
 'error.auth' => 'Autentimine ebaõnnestus.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Selle nimega kasutaja on juba kasutusel.',
 'error.object_exists' => 'Sellise nimega objekt on juba olemas.',
 'error.invoice_exists' => 'Arve number on juba kasutusel.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 8ccc29f08..bde6ab03d 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -71,6 +71,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => 'نام کاربری یا رمز عبور اشتباه است.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'کاربری با این نام کاربری موجود است.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 26c150880..db49d601e 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -68,6 +68,8 @@
 // TODO: translate the following.
 // 'error.record' => 'Select record.',
 'error.auth' => 'Virheellinen käyttäjänimi tai salasana.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Tämä käyttäjänimi on jo olemassa.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 892b0291f..73d9ae28a 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -66,6 +66,8 @@
 // TODO: translate the following.
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nom d\\\'utilisateur ou mot de passe incorrect.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Un utilisateur avec cet identifiant existe déjà.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f1dbbc3c5..d8cf3d68f 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -63,6 +63,8 @@
 'error.report' => 'Επιλογή αναφοράς.',
 'error.record' => 'Επιλογή εγγραφής.',
 'error.auth' => 'Λανθασμένο όνομα εισόδου ή κωδικός.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Ο χρήστης με αυτήν τη σύνδεση υπάρχει ήδη.',
 'error.object_exists' => 'Το αντικείμενο με αυτό το όνομα υπάρχει ήδη.',
 'error.invoice_exists' => 'Το τιμολόγιο με αυτόν τον αριθμό υπάρχει ήδη.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 4f2a49236..0a6074693 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -81,6 +81,8 @@
 // 'error.report' => 'Select report.'
 // 'error.record' => 'Select record.',
 'error.auth' => 'שם משתמש או סיסמה שגויים',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'שם משתמש כבר קיים',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 924b4acc9..172e49fa4 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -74,6 +74,7 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 // 'error.auth' => 'Incorrect login or password.',
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 383b1ab13..8dc205860 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -65,6 +65,8 @@
 'error.report' => 'Seleziona rapporto.',
 'error.record' => 'Seleziona record.',
 'error.auth' => 'Login o password errati.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Esiste già un utente con questo username.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b3fd57f48..cc9edc0d3 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -73,6 +73,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => '不正確なログインあるいはパスワードが不正確です。',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'このログインと関連されたユーザーは既に存在します。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index d182519a3..18b6ec6c2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -73,6 +73,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => '부정확한 로그인 혹은 암호가 틀립니다.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => '본 로그인과 연계된 사용자가 이미 있습니다.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 8c1afa7fb..6e93f166c 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -59,6 +59,8 @@
 'error.report' => 'Kies rapport.',
 'error.record' => 'Kies record.',
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8b5e13f0f..1e38bd0c1 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -74,6 +74,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => 'Feil brukernavn eller passord.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Bruker med et slikt brukernavn eksisterer allerede.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 97ac1e0da..2fc57348b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -69,6 +69,8 @@
 // TODO: translate the following.
 // 'error.record' => 'Select record.',
 'error.auth' => 'Błędny login lub hasło.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Użytkownik o takiej nazwie już istnieje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b01e94d32..7f5601efe 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -59,6 +59,8 @@
 'error.report' => 'Selecione relatório.',
 'error.record' => 'Selecione o registro.',
 'error.auth' => 'Usuário ou senha incorretos.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Já existe usuário com este login.',
 'error.object_exists' => 'Já existe um objeto com este nome.',
 'error.invoice_exists' => 'Já existe fatura com este número.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 7c724cd29..2806b8437 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -72,6 +72,7 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 // 'error.auth' => 'Incorrect login or password.',
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 33c4547dc..8619ea27d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -78,6 +78,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nume de utilizator sau parola incorecta.',
 // TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3707ce74a..41c95c845 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -59,6 +59,7 @@
 'error.report' => 'Выберите отчёт.',
 'error.record' => 'Выберите запись.',
 'error.auth' => 'Неправильно введен логин или пароль.',
+'error.weak_password' => 'Слабый пароль.',
 'error.user_exists' => 'Пользователь с таким логином уже существует.',
 'error.object_exists' => 'Объект с таким именем уже есть.',
 'error.invoice_exists' => 'Счёт с таким номером уже есть.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 345666d8f..e45b06512 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -70,6 +70,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nesprávne prihlasovacie meno alebo heslo.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Používateľ s týmto prihlasovacím menom už existuje.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d5b56f4a0..4e519bcf0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -69,6 +69,7 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 // 'error.auth' => 'Incorrect login or password.',
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 652eaa893..7aa5f1008 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -66,6 +66,8 @@
 // TODO: translate the following.
 // 'error.record' => 'Select record.',
 'error.auth' => 'Pogrešno korisničko ime ili lozinka.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Korisnik pod ovim imenom već postoji.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b39366bc1..f641ef690 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -65,6 +65,8 @@
 // TODO: translate the following.
 // 'error.record' => 'Select record.',
 'error.auth' => 'Ogiltigt användarnamn eller lösenord.',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Det finns redan en användare med det här användarnamnet.',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 2aae8ed9c..9691b950f 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -81,6 +81,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Hatalı kullanıcı adı veya parola.',
 // TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
 // 'error.invoice_exists' => 'Invoice with this number already exists.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f423fab84..afe7588ab 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -68,6 +68,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => '不正确的用户名或密码。',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => '该用户登录信息已经存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 92f5dbf52..294312892 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -71,6 +71,8 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 'error.auth' => '不正確的用戶名或密碼。',
+// TODO: translate the following.
+// 'error.weak_password' => 'Weak password.',
 'error.user_exists' => '該使用者登錄資訊已經存在。',
 // TODO: translate the following.
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/initialize.php b/initialize.php
index 8a7e9390c..7d6e96ba2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.0.5652");
+define("APP_VERSION", "1.21.0.5653");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/user_add.php b/user_add.php
index 8d584afb7..f294cf71b 100644
--- a/user_add.php
+++ b/user_add.php
@@ -158,6 +158,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
     if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
       $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+    // Check password complexity.
+    // if (!ttCheckPasswordComplexity($cl_password1))
+    //   $err->add($i18n->get('error.weak_password'));
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.

From 596e07d7c3164ea98083b60bf9dec22df87bb5f6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Mar 2022 21:05:17 +0000
Subject: [PATCH 1677/1848] Added a capability and enforcement of password
 complexity for users.

---
 WEB-INF/lib/common.lib.php   | 42 ++++++++++++++++++++++++++++++++++--
 WEB-INF/lib/ttUser.class.php |  5 +++++
 initialize.php               |  2 +-
 password_change.php          |  3 +++
 profile_edit.php             |  3 +++
 user_add.php                 |  4 ++--
 user_edit.php                |  3 +++
 7 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 365452f88..122987f1a 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -397,15 +397,53 @@ function ttValidHolidays($val)
 }
 
 // ttValidPasswordComplexity is used to check user input for password complexity field.
-function ttValidPasswordComplexity($val)
+function ttValidPasswordComplexity($complexityExample)
 {
   // Password complexity example may contain a-z, A-Z, 0-9, and a #.
-  if (!preg_match('/^[a-zA-Z0-9#]*$/', $val))
+  if (!preg_match('/^[a-zA-Z0-9#]*$/', $complexityExample))
     return false;
 
   return true;
 }
 
+// ttCheckPasswordComplexity checks password complexity.
+function ttCheckPasswordComplexity($password)
+{
+  global $user;
+  $complexity = $user->getPasswordComplexity();
+  if (empty($complexity))
+    return true;
+
+  // Password complexity must be enforced.
+  if (strlen($password) < strlen($complexity))
+    return false; // Password is too short.
+
+  $numDigitsRequired = preg_match_all( "/[0-9]/", $complexity);
+  $numDigitsSupplied = preg_match_all( "/[0-9]/", $password);
+  if ($numDigitsSupplied < $numDigitsRequired)
+    return false; // Number of digits in password is less than required number in complexity example.
+
+  $numCapitalsRequired = preg_match_all( "/[A-Z]/", $complexity);
+  $numCapitalsSupplied = preg_match_all( "/[A-Z]/", $password);
+  if ($numCapitalsSupplied < $numCapitalsRequired)
+    return false; // Number of capitals A-Z in password is less than required number in complexity example.
+
+  $numLowercaseRequired = preg_match_all( "/[a-z]/", $complexity);
+  $numLowercaseSupplied = preg_match_all( "/[a-z]/", $password);
+  if ($numLowercaseSupplied < $numLowercaseRequired)
+    return false; // Number of lowercase letter a-z in password is less than required number in complexity example.
+
+  // Finally check the number of "all other" characters that are not alphanumeric. This includes utf-8 characters.
+  $numNotAlphanumericRequired = preg_match_all( "/[#]/", $complexity);
+  $passwordRemainder = preg_replace("/[a-zA-Z0-9]/", "", $password);
+  $numNotAlphanumericSupplied = mb_strlen($passwordRemainder);
+  if ($numNotAlphanumericSupplied < $numNotAlphanumericRequired)
+    return false;
+
+  return true;
+}
+
+
 // ttAccessAllowed checks whether user is allowed access to a particular page.
 // It is used as an initial check on all publicly available pages
 // (except login.php, register.php, and others where we don't have to check).
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ff9295d04..7114bc7c6 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -169,6 +169,11 @@ function getEmail() {
     return ($this->behalfUser ? $this->behalfUser->email : $this->email);
   }
 
+  // getPasswordComplexity returns password complexity for active user.
+  function getPasswordComplexity() {
+    return ($this->behalfUser ? $this->behalfUser->password_complexity : $this->password_complexity);
+  }
+
   // The getGroup returns group id on behalf of which the current user is operating.
   function getGroup() {
     return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
diff --git a/initialize.php b/initialize.php
index 7d6e96ba2..a4df18dda 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.0.5653");
+define("APP_VERSION", "1.21.1.5654");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/password_change.php b/password_change.php
index 992bdd87b..d395b6396 100644
--- a/password_change.php
+++ b/password_change.php
@@ -49,6 +49,9 @@
   if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
   if ($cl_password1 !== $cl_password2)
     $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  // Check password complexity.
+  if (!ttCheckPasswordComplexity($cl_password1))
+    $err->add($i18n->get('error.weak_password'));
 
   if ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
diff --git a/profile_edit.php b/profile_edit.php
index a9f11fc2d..3958a4018 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -67,6 +67,9 @@
     if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
       $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+    // Check password complexity.
+    if (!ttCheckPasswordComplexity($cl_password1))
+      $err->add($i18n->get('error.weak_password'));
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Finished validating user input.
diff --git a/user_add.php b/user_add.php
index f294cf71b..e75e0901d 100644
--- a/user_add.php
+++ b/user_add.php
@@ -159,8 +159,8 @@ function render(&$table, $value, $row, $column, $selected = false) {
     if ($cl_password1 !== $cl_password2)
       $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
     // Check password complexity.
-    // if (!ttCheckPasswordComplexity($cl_password1))
-    //   $err->add($i18n->get('error.weak_password'));
+    if (!ttCheckPasswordComplexity($cl_password1))
+      $err->add($i18n->get('error.weak_password'));
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.
diff --git a/user_edit.php b/user_edit.php
index 57133eb39..6bdbef693 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -190,6 +190,9 @@ function render(&$table, $value, $row, $column, $selected = false) {
     if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
       $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+    // Check password complexity.
+    if (!ttCheckPasswordComplexity($cl_password1))
+      $err->add($i18n->get('error.weak_password'));
   }
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   // Require selection of a client for a client role.

From 0261c3ffa9017327d54d0be9f315057707b43d91 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 13 Mar 2022 21:08:34 +0000
Subject: [PATCH 1678/1848] Removed a debug condition for password complextity
 feature.

---
 WEB-INF/templates/group_advanced_edit.tpl | 2 --
 initialize.php                            | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/templates/group_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
index 66fa41035..528daf465 100644
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -32,7 +32,6 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_21.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{if constant('PASSWORD_COMPLEXITY_DEBUG')}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_edit.password_complexity}:</label></td></tr>
   <tr>
@@ -42,7 +41,6 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
diff --git a/initialize.php b/initialize.php
index a4df18dda..73b693410 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5654");
+define("APP_VERSION", "1.21.1.5655");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 76667fa583dc775400db420fe77973f890b36954 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Mar 2022 13:56:25 +0000
Subject: [PATCH 1679/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 6 ++----
 initialize.php                | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 6e93f166c..5d866e617 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -59,8 +59,7 @@
 'error.report' => 'Kies rapport.',
 'error.record' => 'Kies record.',
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
-// TODO: translate the following.
-// 'error.weak_password' => 'Weak password.',
+'error.weak_password' => 'Zwak wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
 'error.invoice_exists' => 'Dit nummer is al eens toegekend aan een factuur.',
@@ -508,8 +507,7 @@
 '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.password_complexity' => 'Password complexity',
+'form.group_edit.password_complexity' => 'Wachtwoord complexiteit',
 'form.group_edit.advanced_settings' => 'Geavanceerde instellingen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/initialize.php b/initialize.php
index 73b693410..eb15642a8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5655");
+define("APP_VERSION", "1.21.1.5656");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1990edf7a7cc17f520c98f8ff929b54d509203e2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 14 Mar 2022 14:53:20 +0000
Subject: [PATCH 1680/1848] Improved password complexity specification by
 allowing an asterisk in there for better password length control.

---
 WEB-INF/lib/common.lib.php | 4 ++--
 initialize.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 122987f1a..db00923ab 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -399,8 +399,8 @@ function ttValidHolidays($val)
 // ttValidPasswordComplexity is used to check user input for password complexity field.
 function ttValidPasswordComplexity($complexityExample)
 {
-  // Password complexity example may contain a-z, A-Z, 0-9, and a #.
-  if (!preg_match('/^[a-zA-Z0-9#]*$/', $complexityExample))
+  // Password complexity example may contain a-z, A-Z, 0-9, #, and *.
+  if (!preg_match('/^[a-zA-Z0-9#*]*$/', $complexityExample))
     return false;
 
   return true;
diff --git a/initialize.php b/initialize.php
index eb15642a8..23e3c733f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5656");
+define("APP_VERSION", "1.21.1.5657");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4ce11322cefcf172b8103ae23b3c1c9684dd91ee Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Mar 2022 15:32:34 +0000
Subject: [PATCH 1681/1848] Starting work on 2fa.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 31 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f1a31d7db..e862f97f6 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -586,6 +586,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index c54d09d62..d73ef53d7 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -598,6 +598,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 84ec205c5..4c1f1b248 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -565,6 +565,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6a79d3978..cbe69a211 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -540,6 +540,7 @@
 'form.group_edit.allow_ip' => 'Erlaube IP',
 // TODO: translate the following.
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 3a4b699c0..4c2b74b42 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -522,6 +522,7 @@
 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Allow IP',
 'form.group_edit.password_complexity' => 'Password complexity',
+'form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index d622d857d..80683acc6 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -600,6 +600,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 6a6d5d02c..9c2a1c610 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -574,6 +574,7 @@
 'form.group_edit.allow_ip' => 'Luba IP',
 // TODO: translate the following.
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index bde6ab03d..1deb75471 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -587,6 +587,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index db49d601e..82c84df89 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -571,6 +571,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 73d9ae28a..b39b0aadc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -561,6 +561,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d8cf3d68f..d30201fc7 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -552,6 +552,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 0a6074693..19ce37687 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -591,6 +591,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 172e49fa4..83b82426d 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -590,6 +590,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8dc205860..acf7cc5b7 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -567,6 +567,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index cc9edc0d3..3f68a935a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -593,6 +593,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 18b6ec6c2..60b307f77 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -591,6 +591,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 5d866e617..f2b0da6fa 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -508,6 +508,8 @@
 'form.group_edit.confirm_save' => 'Bevestigen dat je wilt opslaan',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
 'form.group_edit.password_complexity' => 'Wachtwoord complexiteit',
+// TODO: translate the following.
+// form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Geavanceerde instellingen',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1e38bd0c1..281f17689 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -594,6 +594,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2fc57348b..b6610eef4 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -573,6 +573,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 7f5601efe..334db5ca7 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -508,6 +508,7 @@
 'form.group_edit.allow_ip' => 'Permitir IP',
 // TODO: translate the following.
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Configurações avançadas',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2806b8437..d3aac4e3d 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -572,6 +572,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 8619ea27d..170642ef2 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -594,6 +594,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 41c95c845..e186fbef4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -509,6 +509,7 @@
 'form.group_edit.confirm_save' => 'Предупреждать при сохранении',
 'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
 'form.group_edit.password_complexity' => 'Сложность пароля',
+'form.group_edit.2fa' => 'Двухфакторная аутентификация',
 'form.group_edit.advanced_settings' => 'Продвинутые настройки',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e45b06512..7fcc99405 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -577,6 +577,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 4e519bcf0..88aee6946 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -567,6 +567,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7aa5f1008..2aead0d8c 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -573,6 +573,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index f641ef690..87b062f50 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -571,6 +571,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9691b950f..cf2694c40 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -607,6 +607,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index afe7588ab..5686e2682 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -582,6 +582,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 294312892..62a9e9ced 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -585,6 +585,7 @@
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
 // 'form.group_edit.password_complexity' => 'Password complexity',
+// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
diff --git a/initialize.php b/initialize.php
index 23e3c733f..faf98ef38 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5657");
+define("APP_VERSION", "1.21.1.5658");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 992a7adb6f2001a5639605f8bb1e64dc68d0edd5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Mar 2022 16:06:13 +0000
Subject: [PATCH 1682/1848] Refactoring in translation files.

---
 WEB-INF/resources/ca.lang.php    | 6 ++++++
 WEB-INF/resources/cs.lang.php    | 6 ++++++
 WEB-INF/resources/da.lang.php    | 6 ++++++
 WEB-INF/resources/de.lang.php    | 6 ++++++
 WEB-INF/resources/en.lang.php    | 5 +++++
 WEB-INF/resources/es.lang.php    | 6 ++++++
 WEB-INF/resources/et.lang.php    | 6 ++++++
 WEB-INF/resources/fa.lang.php    | 6 ++++++
 WEB-INF/resources/fi.lang.php    | 6 ++++++
 WEB-INF/resources/fr.lang.php    | 6 ++++++
 WEB-INF/resources/gr.lang.php    | 6 ++++++
 WEB-INF/resources/he.lang.php    | 6 ++++++
 WEB-INF/resources/hu.lang.php    | 6 ++++++
 WEB-INF/resources/it.lang.php    | 6 ++++++
 WEB-INF/resources/ja.lang.php    | 6 ++++++
 WEB-INF/resources/ko.lang.php    | 6 ++++++
 WEB-INF/resources/nl.lang.php    | 6 ++++++
 WEB-INF/resources/no.lang.php    | 6 ++++++
 WEB-INF/resources/pl.lang.php    | 6 ++++++
 WEB-INF/resources/pt-br.lang.php | 6 ++++++
 WEB-INF/resources/pt.lang.php    | 6 ++++++
 WEB-INF/resources/ro.lang.php    | 6 ++++++
 WEB-INF/resources/ru.lang.php    | 5 +++++
 WEB-INF/resources/sk.lang.php    | 6 ++++++
 WEB-INF/resources/sl.lang.php    | 6 ++++++
 WEB-INF/resources/sr.lang.php    | 6 ++++++
 WEB-INF/resources/sv.lang.php    | 6 ++++++
 WEB-INF/resources/tr.lang.php    | 6 ++++++
 WEB-INF/resources/zh-cn.lang.php | 6 ++++++
 WEB-INF/resources/zh-tw.lang.php | 6 ++++++
 initialize.php                   | 2 +-
 31 files changed, 179 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e862f97f6..dbbeb403a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -589,6 +589,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d73ef53d7..8b5e5006c 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -601,6 +601,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4c1f1b248..6860b8e37 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -568,6 +568,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index cbe69a211..10431c2a6 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -543,6 +543,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+'form.group_advanced_edit.allow_ip' => 'Erlaube IP',
+// TODO: Translate the following.
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // 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?',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4c2b74b42..7505043ce 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -525,6 +525,11 @@
 'form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+'form.group_advanced_edit.allow_ip' => 'Allow IP',
+'form.group_advanced_edit.password_complexity' => 'Password complexity',
+'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // 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?',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 80683acc6..0e94644a9 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -603,6 +603,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 9c2a1c610..4177bfffa 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -577,6 +577,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+'form.group_advanced_edit.allow_ip' => 'Luba IP',
+// TODO: Translate the following.
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Oled kindel, et soovid kogu gruppi kustutada?',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 1deb75471..f37c789c1 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -590,6 +590,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 82c84df89..e124c61ac 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -574,6 +574,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b39b0aadc..503327a92 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -564,6 +564,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index d30201fc7..310d6bd02 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -555,6 +555,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 19ce37687..95175c930 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -594,6 +594,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 83b82426d..c4745c0a0 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -593,6 +593,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index acf7cc5b7..5676164e3 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -570,6 +570,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3f68a935a..f8f80c4f8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -596,6 +596,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 60b307f77..f578659b2 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -594,6 +594,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index f2b0da6fa..a3e415b16 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -512,6 +512,12 @@
 // form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Geavanceerde instellingen',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+'form.group_advanced_edit.allow_ip' => 'Toegestane IP adressen',
+'form.group_advanced_edit.password_complexity' => 'Wachtwoord complexiteit',
+// TODO: Translate the following.
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // 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?',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 281f17689..82fca5f14 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -597,6 +597,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b6610eef4..d4a5be37e 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -576,6 +576,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 334db5ca7..195cbc850 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -511,6 +511,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Configurações avançadas',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+'form.group_advanced_edit.allow_ip' => 'Permitir IP',
+// TODO: Translate the following.
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php.
 'form.group_delete.hint' => 'Tem certeza de que deseja excluir todo o grupo?',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d3aac4e3d..fa8c83846 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -575,6 +575,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 170642ef2..eab876d08 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -597,6 +597,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e186fbef4..30737a76a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -512,6 +512,11 @@
 'form.group_edit.2fa' => 'Двухфакторная аутентификация',
 'form.group_edit.advanced_settings' => 'Продвинутые настройки',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+'form.group_advanced_edit.allow_ip' => 'Разрешить доступ с IP',
+'form.group_advanced_edit.password_complexity' => 'Сложность пароля',
+'form.group_advanced_edit.2fa' => 'Двухфакторная аутентификация',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 7fcc99405..ae1a0376f 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -580,6 +580,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 88aee6946..d6499cb1b 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -570,6 +570,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 2aead0d8c..d05a97eeb 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -576,6 +576,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 87b062f50..80f6657bd 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -574,6 +574,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index cf2694c40..ca1dacaed 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -610,6 +610,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5686e2682..068ed52a8 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -585,6 +585,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 62a9e9ced..34e18441e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -588,6 +588,12 @@
 // 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
+// Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
+// TODO: Translate the following.
+// 'form.group_advanced_edit.allow_ip' => 'Allow IP',
+// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
+// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
 // 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
diff --git a/initialize.php b/initialize.php
index faf98ef38..3389203ce 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5658");
+define("APP_VERSION", "1.21.1.5659");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bc1c36f9fa327aa478b71ecb7beb1a34f3ba405a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Mar 2022 16:29:36 +0000
Subject: [PATCH 1683/1848] Refactoring of translation files.

---
 WEB-INF/resources/ca.lang.php             | 3 ---
 WEB-INF/resources/cs.lang.php             | 3 ---
 WEB-INF/resources/da.lang.php             | 3 ---
 WEB-INF/resources/de.lang.php             | 3 ---
 WEB-INF/resources/en.lang.php             | 2 --
 WEB-INF/resources/es.lang.php             | 3 ---
 WEB-INF/resources/et.lang.php             | 3 ---
 WEB-INF/resources/fa.lang.php             | 3 ---
 WEB-INF/resources/fi.lang.php             | 3 ---
 WEB-INF/resources/fr.lang.php             | 3 ---
 WEB-INF/resources/gr.lang.php             | 3 ---
 WEB-INF/resources/he.lang.php             | 3 ---
 WEB-INF/resources/hu.lang.php             | 3 ---
 WEB-INF/resources/it.lang.php             | 3 ---
 WEB-INF/resources/ja.lang.php             | 3 ---
 WEB-INF/resources/ko.lang.php             | 3 ---
 WEB-INF/resources/nl.lang.php             | 4 ----
 WEB-INF/resources/no.lang.php             | 3 ---
 WEB-INF/resources/pl.lang.php             | 3 ---
 WEB-INF/resources/pt-br.lang.php          | 4 ----
 WEB-INF/resources/pt.lang.php             | 3 ---
 WEB-INF/resources/ro.lang.php             | 3 ---
 WEB-INF/resources/ru.lang.php             | 3 ---
 WEB-INF/resources/sk.lang.php             | 3 ---
 WEB-INF/resources/sl.lang.php             | 3 ---
 WEB-INF/resources/sr.lang.php             | 3 ---
 WEB-INF/resources/sv.lang.php             | 3 ---
 WEB-INF/resources/tr.lang.php             | 3 ---
 WEB-INF/resources/zh-cn.lang.php          | 3 ---
 WEB-INF/resources/zh-tw.lang.php          | 3 ---
 WEB-INF/templates/group_advanced_edit.tpl | 8 ++++----
 group_advanced_edit.php                   | 4 ++--
 initialize.php                            | 2 +-
 33 files changed, 7 insertions(+), 98 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index dbbeb403a..e1f9a191e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -584,9 +584,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8b5e5006c..562253c40 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -596,9 +596,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6860b8e37..6070d5ab7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -563,9 +563,6 @@
 'form.group_edit.uncompleted_indicators' => 'Uafsluttede indikatore',
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 10431c2a6..f627e77f4 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -537,10 +537,7 @@
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
 'form.group_edit.confirm_save' => 'Speichern bestätigen',
-'form.group_edit.allow_ip' => 'Erlaube IP',
 // TODO: translate the following.
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7505043ce..1cd30f07d 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -520,9 +520,7 @@
 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 'form.group_edit.confirm_save' => 'Confirm saving',
-'form.group_edit.allow_ip' => 'Allow IP',
 'form.group_edit.password_complexity' => 'Password complexity',
-'form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 0e94644a9..9cc4aabdc 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -598,9 +598,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 4177bfffa..9dd7d02df 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -571,10 +571,7 @@
 'form.group_edit.future_entries' => 'Tuleviku kirjed',
 '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.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f37c789c1..a7560fc4e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -585,9 +585,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e124c61ac..1f483ef1c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -569,9 +569,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 503327a92..22132849e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -559,9 +559,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 310d6bd02..f2606c41c 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -550,9 +550,6 @@
 'form.group_edit.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 95175c930..52892dbcf 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -589,9 +589,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c4745c0a0..b880b22f5 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -588,9 +588,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5676164e3..40bca63ed 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -565,9 +565,6 @@
 'form.group_edit.uncompleted_indicators' => 'Indicatori incompleti',
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f8f80c4f8..518c42696 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -591,9 +591,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f578659b2..dde934023 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -589,9 +589,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index a3e415b16..bd1ad69c4 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -506,10 +506,6 @@
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 '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',
-'form.group_edit.password_complexity' => 'Wachtwoord complexiteit',
-// TODO: translate the following.
-// form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Geavanceerde instellingen',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 82fca5f14..c38c74dd4 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -592,9 +592,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d4a5be37e..865562299 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -571,9 +571,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 195cbc850..bbabafcbc 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -505,10 +505,6 @@
 'form.group_edit.future_entries' => 'Entradas futuros',
 'form.group_edit.uncompleted_indicators' => 'Indicadores incompletos',
 'form.group_edit.confirm_save' => 'Confirme o salvamento',
-'form.group_edit.allow_ip' => 'Permitir IP',
-// TODO: translate the following.
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 'form.group_edit.advanced_settings' => 'Configurações avançadas',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fa8c83846..41e06c0fc 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -570,9 +570,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index eab876d08..7f3168d41 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -592,9 +592,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 30737a76a..359666167 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -507,9 +507,6 @@
 'form.group_edit.future_entries' => 'Будущие записи',
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
 'form.group_edit.confirm_save' => 'Предупреждать при сохранении',
-'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
-'form.group_edit.password_complexity' => 'Сложность пароля',
-'form.group_edit.2fa' => 'Двухфакторная аутентификация',
 'form.group_edit.advanced_settings' => 'Продвинутые настройки',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ae1a0376f..c52d54601 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -575,9 +575,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d6499cb1b..1302ccd6f 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -565,9 +565,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d05a97eeb..ba65b4615 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -571,9 +571,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 80f6657bd..bd815b257 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -569,9 +569,6 @@
 'form.group_edit.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index ca1dacaed..a2f503308 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -605,9 +605,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 068ed52a8..7932da3bd 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -580,9 +580,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 34e18441e..78e3b25bf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -583,9 +583,6 @@
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
-// 'form.group_edit.allow_ip' => 'Allow IP',
-// 'form.group_edit.password_complexity' => 'Password complexity',
-// 'form.group_edit.2fa' => 'Two factor authentication',
 // 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
diff --git a/WEB-INF/templates/group_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
index 528daf465..4bcaedf49 100644
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -24,18 +24,18 @@ License: See license.txt *}
     </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_edit.allow_ip}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_advanced_edit.allow_ip}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="allow_ip">{$i18n.form.group_edit.allow_ip}:</label></td>
+    <td class="large-screen-label"><label for="allow_ip">{$i18n.form.group_advanced_edit.allow_ip}:</label></td>
     <td class="td-with-input">{$forms.groupAdvancedForm.allow_ip.control}
       <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_21.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_21.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_edit.password_complexity}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="allow_ip">{$i18n.form.group_advanced_edit.password_complexity}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="allow_ip">{$i18n.form.group_edit.password_complexity}:</label></td>
+    <td class="large-screen-label"><label for="allow_ip">{$i18n.form.group_advanced_edit.password_complexity}:</label></td>
     <td class="td-with-input">{$forms.groupAdvancedForm.password_complexity.control}
       <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index 7683d879c..a4cf540e3 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -46,8 +46,8 @@
     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'));
-    if (!ttValidPasswordComplexity($cl_password_complexity, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.password_complexity'));
+    if (!ttValidIP($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_advanced_edit.allow_ip'));
+    if (!ttValidPasswordComplexity($cl_password_complexity, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_advanced_edit.password_complexity'));
     // Finished validating user input.
 
     if ($err->no()) {
diff --git a/initialize.php b/initialize.php
index 3389203ce..74d3da0ad 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5659");
+define("APP_VERSION", "1.21.1.5660");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 81b2e03236fd74fe773105841b0f26fdcaa5ab59 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 15 Mar 2022 17:45:26 +0000
Subject: [PATCH 1684/1848] Implmeneted handling of 2fa setting on advanced
 group settings page.

---
 WEB-INF/templates/group_advanced_edit.tpl | 11 +++++++++++
 group_advanced_edit.php                   | 11 ++++++++++-
 initialize.php                            |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/group_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
index 4bcaedf49..d4bd55a1e 100644
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -41,6 +41,17 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
+{if constant('2FA_DEBUG')}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="confirm_save">{$i18n.form.group_advanced_edit.2fa}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="confirm_save">{$i18n.form.group_advanced_edit.2fa}:</label></td>
+    <td class="td-with-input">{$forms.groupAdvancedForm.2fa.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_54.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_54.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
index a4cf540e3..26134c789 100644
--- a/group_advanced_edit.php
+++ b/group_advanced_edit.php
@@ -16,6 +16,7 @@
 // End of access checks.
 
 $group = ttGroupHelper::getGroupAttrs($user->getGroup());
+$config = $user->getConfigHelper();
 
 if ($request->isPost()) {
   $cl_group = trim($request->getParameter('group_name'));
@@ -23,12 +24,14 @@
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
   $cl_allow_ip = trim($request->getParameter('allow_ip'));
   $cl_password_complexity = trim($request->getParameter('password_complexity'));
+  $cl_2fa = (bool) $request->getParameter('2fa');
 } else {
   $cl_group = $group['name'];
   $cl_description = $group['description'];
   $cl_bcc_email = $group['bcc_email'];
   $cl_allow_ip = $group['allow_ip'];
   $cl_password_complexity = $group['password_complexity'];
+  $cl_2fa = $config->getDefinedValue('2fa');
 }
 
 $form = new Form('groupAdvancedForm');
@@ -37,6 +40,7 @@
 $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'=>'text','maxlength'=>'100','name'=>'password_complexity','value'=>$cl_password_complexity));
+$form->addInput(array('type'=>'checkbox','name'=>'2fa','value'=>$cl_2fa));
 
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
@@ -51,12 +55,17 @@
     // Finished validating user input.
 
     if ($err->no()) {
+      // Update config.
+      $config->setDefinedValue('2fa', $cl_2fa);
+
+      // Update group.
       if ($user->updateGroup(array(
         'name' => $cl_group,
         'description' => $cl_description,
         'bcc_email' => $cl_bcc_email,
         'allow_ip' => $cl_allow_ip,
-        'password_complexity' => $cl_password_complexity))) {
+        'password_complexity' => $cl_password_complexity,
+        'config' => $config->getConfig()))) {
         header('Location: success.php');
         exit();
       } else
diff --git a/initialize.php b/initialize.php
index 74d3da0ad..1eb308b01 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5660");
+define("APP_VERSION", "1.21.1.5661");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 178417e79adcf25143ab28b2a4505f625136f3ea Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Mar 2022 14:54:46 +0000
Subject: [PATCH 1685/1848] Work in progress on 2fa.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  2 ++
 WEB-INF/resources/de.lang.php    |  2 ++
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  2 ++
 WEB-INF/resources/fa.lang.php    |  5 +++--
 WEB-INF/resources/fi.lang.php    |  2 ++
 WEB-INF/resources/fr.lang.php    |  2 ++
 WEB-INF/resources/gr.lang.php    |  2 ++
 WEB-INF/resources/he.lang.php    |  2 ++
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  2 ++
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  2 ++
 WEB-INF/resources/pl.lang.php    |  2 ++
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  2 ++
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  2 ++
 WEB-INF/resources/sv.lang.php    |  2 ++
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  2 ++
 WEB-INF/resources/zh-tw.lang.php |  1 +
 initialize.php                   |  2 +-
 login.php                        | 13 +++++++++++++
 32 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index e1f9a191e..6c577de0b 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -418,6 +418,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Ha oblidat la seva paraula de pas?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 562253c40..feee22377 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -425,6 +425,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zapomenuté heslo?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6070d5ab7..6a598edb7 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -402,6 +402,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Har du glemt din adgangskode?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et open source tidsregistrerings system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index f627e77f4..ad6727fba 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -389,6 +389,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Passwort vergessen?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein Open-Source Zeiterfassungssystem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1cd30f07d..8df7601de 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -371,6 +371,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Forgot password?',
+'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9cc4aabdc..441b42586 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -422,6 +422,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Olvido su contraseña?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 9dd7d02df..715b68bc4 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -410,6 +410,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Unustasid salasõna?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on avatud lähtekoodiga ajaarvestussüsteem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index a7560fc4e..f470be335 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -419,8 +419,9 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'بازیابی رمز عبور؟',
-// TODO: translate form.login.about.
-'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
+// 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'درخواست بازیابی رمزعبور به ایمیل فرستاده شد.',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1f483ef1c..db157940c 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -407,6 +407,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Salasana unohtunut?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
  // TODO: check translation of form.login.about - is open source "vapaan koodin"?
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on vapaan koodin tuntiseurantaohjelmisto.',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 22132849e..d68e4cb44 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -399,6 +399,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Mot de passe oublié?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> est un système de gestion du temps, open source.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index f2606c41c..7c8e39562 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -398,6 +398,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Ξεχάσατε τον κωδικό πρόσβασης;',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> είναι ένα ανοικτού κώδικα σύστημα παρακολούθησης χρόνου.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 52892dbcf..fddf8d50b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -424,6 +424,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'שכחת סיסמה?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן.',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b880b22f5..d3cbd7f93 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -419,6 +419,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Elfelejtetted a jelszót?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 40bca63ed..8d2cfaa00 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -408,6 +408,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Password dimenticata?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> è un sistema open source per registrare i tempi di lavoro.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 518c42696..3dc0b8773 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -420,6 +420,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'パスワードを忘れましたか？',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dde934023..63999c23f 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -424,6 +424,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '암호를 잊으셨습니까?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index bd1ad69c4..131d79935 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -363,6 +363,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Wachtwoord vergeten?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een open source tijdregistratiesysteem.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index c38c74dd4..d2a934ee7 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -421,6 +421,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glemt passordet?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et enkelt, brukervennlig tidsregistreringssystem basert på åpen kildekode.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 865562299..4316435a3 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -410,6 +410,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Nie pamiętasz hasła?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> jest otwartoźródłowym systemem śledzenia czasu.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index bbabafcbc..c5a670a0d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -362,6 +362,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> é um sistema de código aberto de rastreamento do tempo.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 41e06c0fc..a40d8ed83 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -403,6 +403,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 7f3168d41..97c9a854f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -424,6 +424,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parola pierduta?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 359666167..faa1c7aba 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -364,6 +364,7 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Забыли пароль?',
+'form.login.2fa_code' => '2FA код',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> - это открытая (open source) система трекинга рабочего времени.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c52d54601..356e4e0a9 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -413,6 +413,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zabudnuté heslo?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je systém na sledovanie času s otvoreným zdrojovým kódom.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 1302ccd6f..2bcba2362 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -396,6 +396,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 // TODO: translate the following.
 // 'form.login.forgot_password' => 'Forgot password?',
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ba65b4615..dff5f2623 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -408,6 +408,8 @@
 
 // Forma prijave. Pogledajte primer na https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zaboravili ste lozinku?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je jednostavan i lak za korišćenje za praćenje radnog vremena.',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index bd815b257..62a747e10 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -406,6 +406,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glömt lösenordet?',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> är en lättanvänd applikation byggd med öppen källkod som enkelt låter dig spåra och hålla koll på arbetstider.',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index a2f503308..e0a291f09 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -432,6 +432,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parolanızı unuttunuz mu?',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7932da3bd..7dc37961c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -413,6 +413,8 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘记密码？',
+// TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // TODO: re-translate form.login.about as it has changed.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> 是一种简单、易用、开放源代码的实时跟踪系统。',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 78e3b25bf..2497f7ce7 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -418,6 +418,7 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘記密碼？',
 // TODO: translate the following.
+// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/initialize.php b/initialize.php
index 1eb308b01..2f537eb6b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5661");
+define("APP_VERSION", "1.21.1.5662");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index 93b1cd084..5ea77d185 100644
--- a/login.php
+++ b/login.php
@@ -48,6 +48,19 @@
       setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
 
       $user = new ttUser(null, $auth->getUserId());
+
+      // Determine if we have to additionally use two-factor authentication.
+      $config = $user->getConfigHelper();
+      $use2FA = $config->getDefinedValue('2fa');
+      if ($use2FA) {
+
+        // TODO: send 2fa code to user.
+        $auth->doLogout();
+
+        header('Location: 2fa.php');
+        exit();
+      }
+
       // Redirect, depending on user role.
       if ($user->can('administer_site')) {
         header('Location: admin_groups.php');

From f2fbe6e5a6251cf86be04f5aa8baa8c1bee038c7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Mar 2022 15:25:33 +0000
Subject: [PATCH 1686/1848] Some refactoring in translation files related to
 2fa.

---
 2fa.php                          | 87 ++++++++++++++++++++++++++++++++
 WEB-INF/resources/ca.lang.php    |  5 +-
 WEB-INF/resources/cs.lang.php    |  5 +-
 WEB-INF/resources/da.lang.php    |  6 ++-
 WEB-INF/resources/de.lang.php    |  6 ++-
 WEB-INF/resources/en.lang.php    |  3 ++
 WEB-INF/resources/es.lang.php    |  5 +-
 WEB-INF/resources/et.lang.php    |  6 ++-
 WEB-INF/resources/fa.lang.php    |  5 +-
 WEB-INF/resources/fi.lang.php    |  8 +--
 WEB-INF/resources/fr.lang.php    |  6 ++-
 WEB-INF/resources/gr.lang.php    |  6 ++-
 WEB-INF/resources/he.lang.php    |  6 ++-
 WEB-INF/resources/hu.lang.php    |  5 +-
 WEB-INF/resources/it.lang.php    |  6 ++-
 WEB-INF/resources/ja.lang.php    |  5 +-
 WEB-INF/resources/ko.lang.php    |  5 +-
 WEB-INF/resources/nl.lang.php    |  6 ++-
 WEB-INF/resources/no.lang.php    |  6 ++-
 WEB-INF/resources/pl.lang.php    |  6 ++-
 WEB-INF/resources/pt-br.lang.php |  6 ++-
 WEB-INF/resources/pt.lang.php    |  5 +-
 WEB-INF/resources/ro.lang.php    |  5 +-
 WEB-INF/resources/ru.lang.php    |  4 +-
 WEB-INF/resources/sk.lang.php    |  6 ++-
 WEB-INF/resources/sl.lang.php    |  5 +-
 WEB-INF/resources/sr.lang.php    |  6 ++-
 WEB-INF/resources/sv.lang.php    |  6 ++-
 WEB-INF/resources/tr.lang.php    |  5 +-
 WEB-INF/resources/zh-cn.lang.php |  6 ++-
 WEB-INF/resources/zh-tw.lang.php |  5 +-
 WEB-INF/templates/2fa.tpl        | 24 +++++++++
 32 files changed, 230 insertions(+), 46 deletions(-)
 create mode 100644 2fa.php
 create mode 100644 WEB-INF/templates/2fa.tpl

diff --git a/2fa.php b/2fa.php
new file mode 100644
index 000000000..7c1728d28
--- /dev/null
+++ b/2fa.php
@@ -0,0 +1,87 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+require_once('initialize.php');
+import('form.Form');
+import('ttOrgHelper');
+import('ttUser');
+
+// Access checks.
+if ($request->isPost()) {
+  // Validate that browser_today parameter is in correct format.
+  $browser_today = $request->getParameter('browser_today');
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
+// End of access checks.
+
+$cl_2fa_code = $request->getParameter('2fa_code');
+$cl_password = $request->getParameter('password');
+
+$form = new Form('2faForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'2fa_code','value'=>$cl_2fa_code));
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
+$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.login')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_2fa_code)) $err->add($i18n->get('error.field'), $i18n->get('fprm.2fa.2fa_code'));
+
+  if ($err->no()) {
+    // Use the "limit" plugin if we have one. Ignore include errors.
+    // The "limit" plugin is not required for normal operation of Time Tracker.
+    @include('plugins/limit/access_check.php');
+
+    if ($auth->doLogin($cl_login, $cl_password)) {
+      // Set current user date (as determined by user browser) into session.
+      $current_user_date = $request->getParameter('browser_today', null);
+      if ($current_user_date)
+        $_SESSION['date'] = $current_user_date;
+
+      // Remember user login in a cookie.
+      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
+
+      $user = new ttUser(null, $auth->getUserId());
+
+      // Determine if we have to additionally use two-factor authentication.
+      $config = $user->getConfigHelper();
+      $use2FA = $config->getDefinedValue('2fa');
+      if ($use2FA) {
+
+        // TODO: send 2fa code to user.
+        $auth->doLogout();
+
+        header('Location: 2fa.php');
+        exit();
+      }
+
+      // Redirect, depending on user role.
+      if ($user->can('administer_site')) {
+        header('Location: admin_groups.php');
+      } elseif ($user->isClient()) {
+        header('Location: reports.php');
+      } else {
+        header('Location: time.php');
+      }
+      exit();
+    } else
+      $err->add($i18n->get('error.auth'));
+  }
+} // isPost
+
+if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())
+  $err->add($i18n->get('error.no_groups'));
+
+// Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
+$show_hint = ('ad' == isset($GLOBALS['AUTH_MODULE_PARAMS']['type']) ? $GLOBALS['AUTH_MODULE_PARAMS']['type'] : null);
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_hint', $show_hint);
+$smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
+$smarty->assign('about_text', $i18n->get('form.login.about'));
+$smarty->assign('title', $i18n->get('title.login'));
+$smarty->assign('content_page_name', '2fa.tpl');
+$smarty->display('index.tpl');
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6c577de0b..3bd936dd1 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -418,9 +418,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Ha oblidat la seva paraula de pas?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'S\\\'ha enviat la petició de restablir paraula de pas.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Sol·licitud de restabliment de la paraula de pas de Anuko Time Tracker',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index feee22377..a4f116022 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -425,9 +425,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zapomenuté heslo?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Zaslán požadavek k vymazání hesla.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker požadavek na vymazání hesla',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6a598edb7..d1b991f41 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -402,10 +402,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Har du glemt din adgangskode?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et open source tidsregistrerings system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Nulstilling af adgangskode er sendt på email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker - Anmodning om nulstilling af adgangskode',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ad6727fba..75c2c0a72 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -389,10 +389,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Passwort vergessen?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein Open-Source Zeiterfassungssystem.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker Anfrage zur Zurücksetzung des Passwortes',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 8df7601de..7adaceadc 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -374,6 +374,9 @@
 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Password reset request sent by email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 441b42586..a78f1e6f2 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -422,9 +422,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '¿Olvido su contraseña?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: check / improve translation of form.reset_password.message.
 // English form is: 'form.reset_password.message' => 'Password reset request sent by email.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 715b68bc4..854a52e00 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -410,10 +410,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Unustasid salasõna?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on avatud lähtekoodiga ajaarvestussüsteem.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Salasõna tühistamise teade on saadetud e-postile.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker, parooli tühistamise nõue',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f470be335..bda4a4758 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -420,9 +420,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'بازیابی رمز عبور؟',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'درخواست بازیابی رمزعبور به ایمیل فرستاده شد.',
 // TODO: check translation of form.reset_password.email_subject. This is the subject for email message for password reset. Below is the English original.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index db157940c..1d90ef233 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -407,11 +407,13 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Salasana unohtunut?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
- // TODO: check translation of form.login.about - is open source "vapaan koodin"?
+// TODO: check translation of form.login.about - is open source "vapaan koodin"?
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on vapaan koodin tuntiseurantaohjelmisto.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Salasanan nollauspyyntöviesti lähetetty.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker -salasanan nollauspyyntö',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d68e4cb44..ccb429359 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -399,10 +399,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Mot de passe oublié?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> est un système de gestion du temps, open source.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Une demande de réinitialisation du mot de passe a été envoyé par courriel.',
 'form.reset_password.email_subject' => 'Demande de réinitialisation de mot de passe Anuko Time Tracker',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 7c8e39562..4cf1f64f9 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -398,10 +398,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Ξεχάσατε τον κωδικό πρόσβασης;',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> είναι ένα ανοικτού κώδικα σύστημα παρακολούθησης χρόνου.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Το αίτημα  επαναφοράς κωδικού πρόσβασης αποστέλλεται μέσω ηλεκτρονικού ταχυδρομείου.',
 'form.reset_password.email_subject' => 'Αίτημα επαναφοράς κωδικού Anuko Time Tracker',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index fddf8d50b..4342ea846 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -424,12 +424,14 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'שכחת סיסמה?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'הבקשה לאיפוס בסיסמה נשלחה בדואר אלקטרוני.',
 'form.reset_password.email_subject' => 'בקשה לאיפוס סיסמה למערכת Anuko Time Tracker',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index d3cbd7f93..b105d2483 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -419,9 +419,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Elfelejtetted a jelszót?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: translate the following.
 // 'form.reset_password.message' => 'Password reset request sent by email.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8d2cfaa00..16727cfe7 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -408,10 +408,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Password dimenticata?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> è un sistema open source per registrare i tempi di lavoro.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Richiesta di reset password inviata via mail.',
 'form.reset_password.email_subject' => 'Richiesta reset password per Anuko Time Tracker',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3dc0b8773..46c705532 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -420,9 +420,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'パスワードを忘れましたか？',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '送信したパスワードの初期化の要求。', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Trackerのパスワードの初期化の要求',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 63999c23f..a82356937 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -424,9 +424,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '암호를 잊으셨습니까?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '송신한 암호 재설정 요청.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker 암호 재설정 요청',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 131d79935..9a7c1707d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -363,10 +363,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Wachtwoord vergeten?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een open source tijdregistratiesysteem.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Het verzoek om het wachtwoord te herstellen is verzonden per email.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker wachtwoord herstel verzoek',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d2a934ee7..b7500bbaa 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -421,12 +421,14 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glemt passordet?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et enkelt, brukervennlig tidsregistreringssystem basert på åpen kildekode.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: translate the following.
 // 'form.reset_password.message' => 'Password reset request sent by email.',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4316435a3..0e482eebe 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -410,10 +410,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Nie pamiętasz hasła?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> jest otwartoźródłowym systemem śledzenia czasu.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Instrukcje zmiany hasła zostały wysłane na adres e-mail połączony z kontem.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker - żądanie zmiany hasła',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index c5a670a0d..f0b564de9 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -362,10 +362,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> é um sistema de código aberto de rastreamento do tempo.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Pedido para resetar a senha enviado por e-mail.',
 'form.reset_password.email_subject' => 'Pedido de alteração de senha no Anuko Time Tracker',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a40d8ed83..dcb0d0357 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -403,9 +403,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Esqueceu a senha?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 // TODO: translate the following.
 // 'form.reset_password.message' => 'Password reset request sent by email.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 97c9a854f..7a5b41a3d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -424,9 +424,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parola pierduta?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Cererea de resetare a parolei a fost trimisa.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker - cerere de resetare a parolei',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index faa1c7aba..da8d8b0f9 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -364,9 +364,11 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Забыли пароль?',
-'form.login.2fa_code' => '2FA код',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> - это открытая (open source) система трекинга рабочего времени.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+'form.2fa.2fa_code' => '2FA код',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Запрос на сброс пароля отослан по e-mail.',
 'form.reset_password.email_subject' => 'Сброс пароля к Anuko Time Tracker',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 356e4e0a9..3bdc0e4bd 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -413,10 +413,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zabudnuté heslo?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je systém na sledovanie času s otvoreným zdrojovým kódom.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Žiadosť o obnovenie hesla bola odoslaná e-mailom.',
 'form.reset_password.email_subject' => 'Žiadosť o obnovenie hesla do Anuko Time Tracker',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 2bcba2362..d7406f37a 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -396,9 +396,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 // TODO: translate the following.
 // 'form.login.forgot_password' => 'Forgot password?',
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Zahteva za razveljavitev gesla je bila poslana.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker zahteva za razveljavitev gesla',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index dff5f2623..b26d4f04a 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -408,12 +408,14 @@
 
 // Forma prijave. Pogledajte primer na https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Zaboravili ste lozinku?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je jednostavan i lak za korišćenje za praćenje radnog vremena.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Izmena forme za lozinku. Pogledajte primer na https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Zahtev za izmenu lozinke je poslat mejlom.',
 'form.reset_password.email_subject' => 'Anuko Time Tracker zahtev za izmenu lozinke',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 62a747e10..1c139a0e4 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -406,12 +406,14 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Glömt lösenordet?',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
  // TODO: re-translate form.login.about as it has changed.
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> är en lättanvänd applikation byggd med öppen källkod som enkelt låter dig spåra och hålla koll på arbetstider.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Begäran om att återställa lösenordet skickades via e-post.',
 'form.reset_password.email_subject' => 'Återställning av lösenord för Anuko Time Tracker begärd',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index e0a291f09..9f57fa3e0 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -432,9 +432,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Parolanızı unuttunuz mu?',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Parola sıfırlama talebi yollandı.', // TODO: add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko Time Tracker parola sıfırlama talebi',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7dc37961c..400529f60 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -413,12 +413,14 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘记密码？',
-// TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // TODO: re-translate form.login.about as it has changed.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> 是一种简单、易用、开放源代码的实时跟踪系统。',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '密码重设请求已经发送。', // TODO: Add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko时间追踪器密码重设请求',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2497f7ce7..3ece1f0fc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -418,9 +418,12 @@
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => '忘記密碼？',
 // TODO: translate the following.
-// 'form.login.2fa_code' => '2FA code',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+// TODO: translate the following.
+// 'form.2fa.2fa_code' => '2FA code',
+
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => '密碼重設請求已經發送。', // TODO: Add "by email" to match the English string.
 'form.reset_password.email_subject' => 'Anuko時間追蹤器密碼重設請求',
diff --git a/WEB-INF/templates/2fa.tpl b/WEB-INF/templates/2fa.tpl
new file mode 100644
index 000000000..e634b624b
--- /dev/null
+++ b/WEB-INF/templates/2fa.tpl
@@ -0,0 +1,24 @@
+{* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt *}
+
+<script>
+function get_date() {
+  var date = new Date();
+  return date.strftime("%Y-%m-%d");
+}
+</script>
+
+{$forms.2faForm.open}
+<table class="centered-table">
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.form.2fa.2fa_code}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="login">{$i18n.form.2fa.2fa_code}:</label></td>
+    <td class="td-with-input">{$forms.2faForm.2fa_code.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.2faForm.btn_login.control}</td>
+  </tr>
+</table>
+{$forms.2faForm.close}
+

From 3c7cba88f69edd54f694f34f0907990977673b79 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Mar 2022 15:40:39 +0000
Subject: [PATCH 1687/1848] Added title.2fa string to translation files.

---
 2fa.php                          | 7 ++-----
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 2 ++
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 3 ++-
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 3 ++-
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 2 ++
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 4 +++-
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 initialize.php                   | 2 +-
 32 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/2fa.php b/2fa.php
index 7c1728d28..15d1a2628 100644
--- a/2fa.php
+++ b/2fa.php
@@ -28,12 +28,9 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_2fa_code)) $err->add($i18n->get('error.field'), $i18n->get('fprm.2fa.2fa_code'));
+  if (!ttValidString($cl_2fa_code)) $err->add($i18n->get('error.field'), $i18n->get('form.2fa.2fa_code'));
 
   if ($err->no()) {
-    // Use the "limit" plugin if we have one. Ignore include errors.
-    // The "limit" plugin is not required for normal operation of Time Tracker.
-    @include('plugins/limit/access_check.php');
 
     if ($auth->doLogin($cl_login, $cl_password)) {
       // Set current user date (as determined by user browser) into session.
@@ -82,6 +79,6 @@
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
 $smarty->assign('about_text', $i18n->get('form.login.about'));
-$smarty->assign('title', $i18n->get('title.login'));
+$smarty->assign('title', $i18n->get('title.2fa'));
 $smarty->assign('content_page_name', '2fa.tpl');
 $smarty->display('index.tpl');
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3bd936dd1..8be97f9b4 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -277,6 +277,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Sessió iniciada',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Grups',
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a4f116022..a9cc11823 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -286,6 +286,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Přihlásit',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Týmy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d1b991f41..74a239ca9 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -266,6 +266,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Login',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Teams', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 75c2c0a72..e55d05641 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -257,6 +257,8 @@
 'title.error' => 'Fehler',
 'title.success' => 'Erfol',
 'title.login' => 'Anmelden',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Gruppen',
 'title.add_group' => 'Gruppe anlegen',
 'title.edit_group' => 'Gruppe bearbeiten',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7adaceadc..f48c96eb7 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -241,6 +241,7 @@
 'title.error' => 'Error',
 'title.success' => 'Success',
 'title.login' => 'Login',
+'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Groups',
 'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index a78f1e6f2..b7fbecd17 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -276,6 +276,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Sesión iniciada',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Grupos',
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 854a52e00..a81b9021d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -277,6 +277,8 @@
 'title.error' => 'Viga',
 'title.success' => 'Õnnestumine',
 'title.login' => 'Sisene',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Grupid',
 'title.add_group' => 'Lisa grupp',
 'title.edit_group' => 'Muuda gruppi',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index bda4a4758..af722d6e7 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -277,6 +277,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'ورود',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'تیم ها', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 1d90ef233..86ee80d86 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -270,6 +270,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Kirjautuminen',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Tiimit', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ccb429359..9debf4673 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -264,6 +264,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Connexion',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Équipes', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4cf1f64f9..587e719a0 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -259,6 +259,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Σύνδεση',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Ομάδες',
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 4342ea846..bde356c99 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -285,6 +285,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'כניסה',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'צוותים', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b105d2483..a8fc41ef3 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -278,6 +278,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Bejelentkezés',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Csoportok',
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 16727cfe7..af53176eb 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -267,6 +267,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Login',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Gruppi',
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 46c705532..f4cfc5651 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -282,6 +282,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'ログイン',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'チーム', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index a82356937..1c677aa96 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -282,6 +282,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => '로그인',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => '팀', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9a7c1707d..dd89e3562 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -235,6 +235,8 @@
 'title.error' => 'Fout',
 'title.success' => 'Succes',
 'title.login' => 'Aanmelden',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Groepen',
 'title.add_group' => 'Groep toevoegen',
 'title.edit_group' => 'Groep bewerken',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b7500bbaa..55cd54d45 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -281,7 +281,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Innlogging',
-// TODO: translate the following.
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 // 'title.groups' => 'Groups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 0e482eebe..021e30cd6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -271,6 +271,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Logowanie',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Zespoły', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index f0b564de9..b2b71608f 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -238,6 +238,8 @@
 'title.error' => 'Erro',
 'title.success' => 'Sucesso',
 'title.login' => 'Login',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Grupos',
 'title.add_group' => 'Adicionando grupo',
 'title.edit_group' => 'Editando grupo',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index dcb0d0357..ebbc50b37 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -267,7 +267,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Login',
-// TODO: translate the following.
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 // 'title.groups' => 'Groups',
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 7a5b41a3d..670d00dcd 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -283,6 +283,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Autentificare',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Echipe', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index da8d8b0f9..9ef4dc027 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -236,6 +236,7 @@
 'title.error' => 'Ошибка',
 'title.success' => 'Успех',
 'title.login' => 'Вход в систему',
+'title.2fa' => 'Двухфакторная аутентификация',
 'title.groups' => 'Группы',
 'title.add_group' => 'Добавление группы',
 'title.edit_group' => 'Редактирование группы',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3bdc0e4bd..e75e0f2e4 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -274,6 +274,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Prihlásenie',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Tímy', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d7406f37a..150269293 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -263,6 +263,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Prijava',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Timi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index b26d4f04a..44ad24e31 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -269,6 +269,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Prijava',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Timovi', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1c139a0e4..2098b705f 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -265,6 +265,8 @@
 // TODO: Translate the following.
 // 'title.success' => 'Success',
 'title.login' => 'Logga in',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Grupper',
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9f57fa3e0..4df3f5bdc 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -292,7 +292,9 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => 'Giriş',
-'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
+    'title.groups' => 'Ekipler', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
 // 'title.edit_group' => 'Editing Group',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 400529f60..7fc1e3a15 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -274,6 +274,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => '登录',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => '团队', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 3ece1f0fc..0d3885b21 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -279,6 +279,8 @@
 // 'title.error' => 'Error',
 // 'title.success' => 'Success',
 'title.login' => '登錄',
+// TODO: translate the follolwing.
+// 'title.2fa' => 'Two Factor Authentication',
 'title.groups' => '團隊', // TODO: change "teams" to "groups".
 // TODO: translate the following.
 // 'title.add_group' => 'Adding Group',
diff --git a/initialize.php b/initialize.php
index 2f537eb6b..3fb0921fa 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5662");
+define("APP_VERSION", "1.21.1.5663");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3ce1ed036de850af767d163d322dad93907a9df6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Mar 2022 19:03:50 +0000
Subject: [PATCH 1688/1848] Smoe more work in progress on 2fa.

---
 WEB-INF/resources/ca.lang.php    |   5 ++
 WEB-INF/resources/cs.lang.php    |   5 ++
 WEB-INF/resources/da.lang.php    |   5 ++
 WEB-INF/resources/de.lang.php    |   5 ++
 WEB-INF/resources/en.lang.php    |   5 +-
 WEB-INF/resources/es.lang.php    |   5 ++
 WEB-INF/resources/et.lang.php    |   5 ++
 WEB-INF/resources/fa.lang.php    |   5 ++
 WEB-INF/resources/fi.lang.php    |   5 ++
 WEB-INF/resources/fr.lang.php    |   5 ++
 WEB-INF/resources/gr.lang.php    |   5 ++
 WEB-INF/resources/he.lang.php    |   5 ++
 WEB-INF/resources/hu.lang.php    |   5 ++
 WEB-INF/resources/it.lang.php    |   5 ++
 WEB-INF/resources/ja.lang.php    |   5 ++
 WEB-INF/resources/ko.lang.php    |   5 ++
 WEB-INF/resources/nl.lang.php    |   5 ++
 WEB-INF/resources/no.lang.php    |   5 ++
 WEB-INF/resources/pl.lang.php    |   5 ++
 WEB-INF/resources/pt-br.lang.php |   5 ++
 WEB-INF/resources/pt.lang.php    |   5 ++
 WEB-INF/resources/ro.lang.php    |   5 ++
 WEB-INF/resources/ru.lang.php    |   4 +
 WEB-INF/resources/sk.lang.php    |   5 ++
 WEB-INF/resources/sl.lang.php    |   5 ++
 WEB-INF/resources/sr.lang.php    |   5 ++
 WEB-INF/resources/sv.lang.php    |   5 ++
 WEB-INF/resources/tr.lang.php    |   5 ++
 WEB-INF/resources/zh-cn.lang.php |   5 ++
 WEB-INF/resources/zh-tw.lang.php |   5 ++
 initialize.php                   |   2 +-
 login.php                        | 121 ++++++++++++++++++++++---------
 32 files changed, 236 insertions(+), 36 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 8be97f9b4..cdf0c7eda 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -422,6 +422,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index a9cc11823..2c64a8598 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -429,6 +429,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 74a239ca9..53644ed99 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -406,6 +406,11 @@
 'form.login.forgot_password' => 'Har du glemt din adgangskode?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et open source tidsregistrerings system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e55d05641..006d7b89b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -393,6 +393,11 @@
 'form.login.forgot_password' => 'Passwort vergessen?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein Open-Source Zeiterfassungssystem.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f48c96eb7..3d5e59a86 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -372,9 +372,12 @@
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
 'form.login.forgot_password' => 'Forgot password?',
-'form.login.2fa_code' => '2FA code',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 'form.2fa.2fa_code' => '2FA code',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b7fbecd17..9ce3cb252 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -426,6 +426,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a81b9021d..884d0e327 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -414,6 +414,11 @@
 'form.login.forgot_password' => 'Unustasid salasõna?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on avatud lähtekoodiga ajaarvestussüsteem.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index af722d6e7..2eb5e5328 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -424,6 +424,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 86ee80d86..5b85ba637 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -412,6 +412,11 @@
 // TODO: check translation of form.login.about - is open source "vapaan koodin"?
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on vapaan koodin tuntiseurantaohjelmisto.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9debf4673..19c3fbaa4 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -403,6 +403,11 @@
 'form.login.forgot_password' => 'Mot de passe oublié?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> est un système de gestion du temps, open source.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 587e719a0..9c07dd523 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -402,6 +402,11 @@
 'form.login.forgot_password' => 'Ξεχάσατε τον κωδικό πρόσβασης;',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> είναι ένα ανοικτού κώδικα σύστημα παρακολούθησης χρόνου.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index bde356c99..3cb53daf0 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -430,6 +430,11 @@
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index a8fc41ef3..61438d08a 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -423,6 +423,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index af53176eb..373587f5c 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -412,6 +412,11 @@
 'form.login.forgot_password' => 'Password dimenticata?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> è un sistema open source per registrare i tempi di lavoro.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index f4cfc5651..b86ed26e1 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -424,6 +424,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1c677aa96..1a8106383 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -428,6 +428,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index dd89e3562..b2a7fd842 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -367,6 +367,11 @@
 'form.login.forgot_password' => 'Wachtwoord vergeten?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een open source tijdregistratiesysteem.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 55cd54d45..6cabab827 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -426,6 +426,11 @@
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> er et enkelt, brukervennlig tidsregistreringssystem basert på åpen kildekode.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 021e30cd6..0aac60b48 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -414,6 +414,11 @@
 'form.login.forgot_password' => 'Nie pamiętasz hasła?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> jest otwartoźródłowym systemem śledzenia czasu.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b2b71608f..d311c7a80 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -366,6 +366,11 @@
 'form.login.forgot_password' => 'Esqueceu a senha?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> é um sistema de código aberto de rastreamento do tempo.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ebbc50b37..942ce2091 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -406,6 +406,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 670d00dcd..39e507f78 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -428,6 +428,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 9ef4dc027..98b6694ad 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -367,6 +367,10 @@
 'form.login.forgot_password' => 'Забыли пароль?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> - это открытая (open source) система трекинга рабочего времени.',
 
+// Email subject and body for two-factor authentication.
+'email.2fa_code.subject' => 'Anuko Time Tracker код для двухфакторной аутентификации',
+'email.2fa_code.body' => "Уважаемый пользователь,\n\nВаш код для двухфакторной аутентификации:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 'form.2fa.2fa_code' => '2FA код',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e75e0f2e4..08bda8581 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -417,6 +417,11 @@
 'form.login.forgot_password' => 'Zabudnuté heslo?',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je systém na sledovanie času s otvoreným zdrojovým kódom.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 150269293..804b7fc8e 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -400,6 +400,11 @@
 // 'form.login.forgot_password' => 'Forgot password?',
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 44ad24e31..6f3495502 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -414,6 +414,11 @@
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> je jednostavan i lak za korišćenje za praćenje radnog vremena.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 2098b705f..4cb93fa00 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -412,6 +412,11 @@
  // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> är en lättanvänd applikation byggd med öppen källkod som enkelt låter dig spåra och hålla koll på arbetstider.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 4df3f5bdc..12bdebf38 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -436,6 +436,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 7fc1e3a15..c37b56616 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -419,6 +419,11 @@
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> 是一种简单、易用、开放源代码的实时跟踪系统。',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 0d3885b21..fd78f3e35 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -422,6 +422,11 @@
 // TODO: translate the following.
 // 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is an open source time tracking system.',
 
+// Email subject and body for two-factor authentication.
+// TODO: translate the following.
+// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
 // 'form.2fa.2fa_code' => '2FA code',
diff --git a/initialize.php b/initialize.php
index 3fb0921fa..c8b41c6d4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5663");
+define("APP_VERSION", "1.21.1.5664");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index 5ea77d185..da59757bb 100644
--- a/login.php
+++ b/login.php
@@ -4,8 +4,9 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttOrgHelper');
+//import('ttOrgHelper');
 import('ttUser');
+import('ttUserHelper');
 
 // Access checks.
 if ($request->isPost()) {
@@ -33,46 +34,98 @@
   if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
   if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
 
+  $loginSucceeded = $use2FA = false;
   if ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
     // The "limit" plugin is not required for normal operation of Time Tracker.
     @include('plugins/limit/access_check.php');
 
-    if ($auth->doLogin($cl_login, $cl_password)) {
-      // Set current user date (as determined by user browser) into session.
-      $current_user_date = $request->getParameter('browser_today', null);
-      if ($current_user_date)
-        $_SESSION['date'] = $current_user_date;
-
-      // Remember user login in a cookie.
-      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
-
-      $user = new ttUser(null, $auth->getUserId());
-
-      // Determine if we have to additionally use two-factor authentication.
-      $config = $user->getConfigHelper();
-      $use2FA = $config->getDefinedValue('2fa');
-      if ($use2FA) {
-
-        // TODO: send 2fa code to user.
-        $auth->doLogout();
-
-        header('Location: 2fa.php');
-        exit();
-      }
-
-      // Redirect, depending on user role.
-      if ($user->can('administer_site')) {
-        header('Location: admin_groups.php');
-      } elseif ($user->isClient()) {
-        header('Location: reports.php');
-      } else {
-        header('Location: time.php');
-      }
-      exit();
+    // Check user login.
+    $loginSucceeded = $auth->doLogin($cl_login, $cl_password);
+  }
+
+  // Do we have to use 2FA?
+  if ($err->no() && $loginSucceeded) {
+    $user = new ttUser(null, $auth->getUserId());
+
+    // Determine if we have to additionally use two-factor authentication.
+    $config = $user->getConfigHelper();
+    $use2FA = $config->getDefinedValue('2fa');
+  }
+
+  // If we have to use 2FA, create and email auith code to user.
+  if ($use2FA) {
+    // To keep things simple, we use the same code as for password resets.
+    $cryptographically_strong = true;
+    $random_bytes = openssl_random_pseudo_bytes(16, $cryptographically_strong);
+    if ($random_bytes === false) die ("openssl_random_pseudo_bytes function call failed...");
+    $temp_ref = bin2hex($random_bytes);
+    ttUserHelper::saveTmpRef($temp_ref, $user->id);
+
+    // For user languague in email.
+    $user_i18n = null;
+    if ($user->lang != $i18n->lang) {
+      $user_i18n = new I18n();
+      $user_i18n->load($user->lang);
     } else
-      $err->add($i18n->get('error.auth'));
+      $user_i18n = &$i18n;
+
+    // Where do we email to?
+    $receiver = null;
+    if ($user->email)
+      $receiver = $user->email;
+    else {
+      if (ttValidEmail($user->login))
+        $receiver = $user->login;
+    }
+    if (!$receiver) $err->add($user_i18n->get('error.no_email'));
+
+    // Send 2FA_code email to user.
+    if ($receiver) {
+      import('mail.Mailer');
+      $mailer = new Mailer();
+      $mailer->setCharSet(CHARSET);
+      $mailer->setSender(SENDER);
+      $mailer->setReceiver("$receiver");
+
+      $subject = $user_i18n->get('email.2fa_code.subject');
+      $body = sprintf($user_i18n->get('email.2fa_code.body'), $temp_ref);
+
+      $mailer->setMailMode(MAIL_MODE);
+      if (!$mailer->send($subject, $body))
+        $err->add($i18n->get('error.mail_send'));
+    }
+
+    $auth->doLogout();
+
+    // Redirect to 2fa.php if we have no errors.
+    if ($err->no()) {
+      header('Location: 2fa.php');
+      exit();
+    }
   }
+
+  if ($err->no() && $loginSucceeded) {
+
+    // Set current user date (as determined by user browser) into session.
+    $current_user_date = $request->getParameter('browser_today', null);
+    if ($current_user_date)
+      $_SESSION['date'] = $current_user_date;
+
+    // Remember user login in a cookie.
+    setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
+
+    // Redirect, depending on user role.
+    if ($user->can('administer_site')) {
+      header('Location: admin_groups.php');
+    } elseif ($user->isClient()) {
+      header('Location: reports.php');
+    } else {
+      header('Location: time.php');
+    }
+    exit();
+  } else
+    $err->add($i18n->get('error.auth'));
 } // isPost
 
 if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())

From 3d74117cda7abf4b2ae2634eb1a623d0a04794e0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 16 Mar 2022 22:19:44 +0000
Subject: [PATCH 1689/1848] A bit more progress on 2fa.

---
 2fa.php                          | 74 ++++++++------------------------
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  1 +
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  1 +
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  1 +
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 +
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  1 +
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/2fa.tpl        | 11 +----
 login.php                        |  9 ++--
 33 files changed, 56 insertions(+), 69 deletions(-)

diff --git a/2fa.php b/2fa.php
index 15d1a2628..005b4ea42 100644
--- a/2fa.php
+++ b/2fa.php
@@ -4,81 +4,43 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttOrgHelper');
 import('ttUser');
+import('ttUserHelper');
 
 // Access checks.
-if ($request->isPost()) {
-  // Validate that browser_today parameter is in correct format.
-  $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
-    header('Location: access_denied.php');
-    exit();
-  }
-}
+// ... anything to check?
 // End of access checks.
 
 $cl_2fa_code = $request->getParameter('2fa_code');
-$cl_password = $request->getParameter('password');
 
 $form = new Form('2faForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'2fa_code','value'=>$cl_2fa_code));
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
-$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.login')));
+$form->addInput(array('type'=>'submit','name'=>'btn_login','value'=>$i18n->get('button.login')));
 
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_2fa_code)) $err->add($i18n->get('error.field'), $i18n->get('form.2fa.2fa_code'));
 
-  if ($err->no()) {
-
-    if ($auth->doLogin($cl_login, $cl_password)) {
-      // Set current user date (as determined by user browser) into session.
-      $current_user_date = $request->getParameter('browser_today', null);
-      if ($current_user_date)
-        $_SESSION['date'] = $current_user_date;
-
-      // Remember user login in a cookie.
-      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
-
-      $user = new ttUser(null, $auth->getUserId());
+  // Get user id.
+  $user_id = ttUserHelper::getUserIdByTmpRef($cl_2fa_code);
+  if (!$user_id) $err->add($i18n->get('error.2fa_code'));
 
-      // Determine if we have to additionally use two-factor authentication.
-      $config = $user->getConfigHelper();
-      $use2FA = $config->getDefinedValue('2fa');
-      if ($use2FA) {
-
-        // TODO: send 2fa code to user.
-        $auth->doLogout();
-
-        header('Location: 2fa.php');
-        exit();
-      }
-
-      // Redirect, depending on user role.
-      if ($user->can('administer_site')) {
-        header('Location: admin_groups.php');
-      } elseif ($user->isClient()) {
-        header('Location: reports.php');
-      } else {
-        header('Location: time.php');
-      }
-      exit();
-    } else
-      $err->add($i18n->get('error.auth'));
+  if ($err->no()) {
+    $user = new ttUser(null, $user_id); // Note: reusing $user from initialize.php.
+    $auth->setAuth($user_id, $user->login);
+
+    // Redirect, depending on user role.
+    if ($user->isClient()) {
+      header('Location: reports.php');
+    } else {
+      header('Location: time.php');
+    }
+    exit();
   }
 } // isPost
 
-if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())
-  $err->add($i18n->get('error.no_groups'));
-
-// Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
-$show_hint = ('ad' == isset($GLOBALS['AUTH_MODULE_PARAMS']['type']) ? $GLOBALS['AUTH_MODULE_PARAMS']['type'] : null);
-
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('show_hint', $show_hint);
-$smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
-$smarty->assign('about_text', $i18n->get('form.login.about'));
+$smarty->assign('onload', 'onLoad="document.2faForm.2fa_code.focus()"');
 $smarty->assign('title', $i18n->get('title.2fa'));
 $smarty->assign('content_page_name', '2fa.tpl');
 $smarty->display('index.tpl');
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index cdf0c7eda..ef2d2ea6c 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -74,6 +74,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Usuari o parula de pas incorrecta.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2c64a8598..0f44c1cc5 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -76,6 +76,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nesprávné jméno nebo heslo.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 53644ed99..a159edfa2 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -67,6 +67,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Forkert brugernavn eller adgangskode.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Brugernavn eksistere allerede.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 006d7b89b..5e2c19d5b 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -65,6 +65,7 @@
 'error.record' => 'Eintrag auswählen.',
 'error.auth' => 'Benutzername oder Passwort ungültig.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 3d5e59a86..89cfcd264 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -60,6 +60,7 @@
 'error.report' => 'Select report.',
 'error.record' => 'Select record.',
 'error.auth' => 'Incorrect login or password.',
+'error.2fa_code' => 'Invalid 2FA code.',
 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'User with this login already exists.',
 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 9ce3cb252..96988bdcd 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -72,6 +72,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Usuario o contraseña incorrecta.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 884d0e327..035fb644d 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -66,6 +66,7 @@
 'error.record' => 'Vali kirje.',
 'error.auth' => 'Autentimine ebaõnnestus.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Selle nimega kasutaja on juba kasutusel.',
 'error.object_exists' => 'Sellise nimega objekt on juba olemas.',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2eb5e5328..e040921c0 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -72,6 +72,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'نام کاربری یا رمز عبور اشتباه است.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'کاربری با این نام کاربری موجود است.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 5b85ba637..3dfa94431 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -69,6 +69,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Virheellinen käyttäjänimi tai salasana.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Tämä käyttäjänimi on jo olemassa.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 19c3fbaa4..a7ef4f23e 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -67,6 +67,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nom d\\\'utilisateur ou mot de passe incorrect.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Un utilisateur avec cet identifiant existe déjà.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9c07dd523..72037b0ec 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -64,6 +64,7 @@
 'error.record' => 'Επιλογή εγγραφής.',
 'error.auth' => 'Λανθασμένο όνομα εισόδου ή κωδικός.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Ο χρήστης με αυτήν τη σύνδεση υπάρχει ήδη.',
 'error.object_exists' => 'Το αντικείμενο με αυτό το όνομα υπάρχει ήδη.',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3cb53daf0..1e03b4f75 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -82,6 +82,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'שם משתמש או סיסמה שגויים',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'שם משתמש כבר קיים',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 61438d08a..1b4cf6d24 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -74,6 +74,7 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 // 'error.auth' => 'Incorrect login or password.',
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 373587f5c..8c12f14c7 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -66,6 +66,7 @@
 'error.record' => 'Seleziona record.',
 'error.auth' => 'Login o password errati.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Esiste già un utente con questo username.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b86ed26e1..30156d526 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -74,6 +74,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => '不正確なログインあるいはパスワードが不正確です。',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'このログインと関連されたユーザーは既に存在します。',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1a8106383..49e904b04 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -74,6 +74,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => '부정확한 로그인 혹은 암호가 틀립니다.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => '본 로그인과 연계된 사용자가 이미 있습니다.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b2a7fd842..85899c8ac 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -59,6 +59,8 @@
 'error.report' => 'Kies rapport.',
 'error.record' => 'Kies record.',
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
+// TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 'error.weak_password' => 'Zwak wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6cabab827..75910ddcf 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -75,6 +75,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Feil brukernavn eller passord.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Bruker med et slikt brukernavn eksisterer allerede.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 0aac60b48..4a4f9e72a 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -70,6 +70,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Błędny login lub hasło.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Użytkownik o takiej nazwie już istnieje.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d311c7a80..ef122e23e 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -60,6 +60,7 @@
 'error.record' => 'Selecione o registro.',
 'error.auth' => 'Usuário ou senha incorretos.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Já existe usuário com este login.',
 'error.object_exists' => 'Já existe um objeto com este nome.',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 942ce2091..d6ded6515 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -72,6 +72,7 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 // 'error.auth' => 'Incorrect login or password.',
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 39e507f78..39e2f379b 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -78,6 +78,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nume de utilizator sau parola incorecta.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 98b6694ad..e4474b2f2 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -59,6 +59,7 @@
 'error.report' => 'Выберите отчёт.',
 'error.record' => 'Выберите запись.',
 'error.auth' => 'Неправильно введен логин или пароль.',
+'error.2fa_code' => 'Неверный код 2FA.',
 'error.weak_password' => 'Слабый пароль.',
 'error.user_exists' => 'Пользователь с таким логином уже существует.',
 'error.object_exists' => 'Объект с таким именем уже есть.',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 08bda8581..76337a615 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -71,6 +71,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Nesprávne prihlasovacie meno alebo heslo.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Používateľ s týmto prihlasovacím menom už existuje.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 804b7fc8e..9730c474c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -69,6 +69,7 @@
 // 'error.report' => 'Select report.',
 // 'error.record' => 'Select record.',
 // 'error.auth' => 'Incorrect login or password.',
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6f3495502..3c490d20d 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -67,6 +67,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Pogrešno korisničko ime ili lozinka.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Korisnik pod ovim imenom već postoji.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4cb93fa00..30ed6da05 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -66,6 +66,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Ogiltigt användarnamn eller lösenord.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => 'Det finns redan en användare med det här användarnamnet.',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 12bdebf38..5251ee8f6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -81,6 +81,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => 'Hatalı kullanıcı adı veya parola.',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 // 'error.user_exists' => 'User with this login already exists.',
 // 'error.object_exists' => 'Object with this name already exists.',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index c37b56616..fa7f78a37 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -69,6 +69,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => '不正确的用户名或密码。',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => '该用户登录信息已经存在。',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index fd78f3e35..71587399f 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -72,6 +72,7 @@
 // 'error.record' => 'Select record.',
 'error.auth' => '不正確的用戶名或密碼。',
 // TODO: translate the following.
+// 'error.2fa_code' => 'Invalid 2FA code.',
 // 'error.weak_password' => 'Weak password.',
 'error.user_exists' => '該使用者登錄資訊已經存在。',
 // TODO: translate the following.
diff --git a/WEB-INF/templates/2fa.tpl b/WEB-INF/templates/2fa.tpl
index e634b624b..1754f0357 100644
--- a/WEB-INF/templates/2fa.tpl
+++ b/WEB-INF/templates/2fa.tpl
@@ -1,18 +1,11 @@
 {* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt *}
 
-<script>
-function get_date() {
-  var date = new Date();
-  return date.strftime("%Y-%m-%d");
-}
-</script>
-
 {$forms.2faForm.open}
 <table class="centered-table">
-  <tr class = "small-screen-label"><td><label for="login">{$i18n.form.2fa.2fa_code}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="2fa_code">{$i18n.form.2fa.2fa_code}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="login">{$i18n.form.2fa.2fa_code}:</label></td>
+    <td class="large-screen-label"><label for="2fa_code">{$i18n.form.2fa.2fa_code}:</label></td>
     <td class="td-with-input">{$forms.2faForm.2fa_code.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
diff --git a/login.php b/login.php
index da59757bb..dbf5d0c39 100644
--- a/login.php
+++ b/login.php
@@ -35,6 +35,7 @@
   if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
 
   $loginSucceeded = $use2FA = false;
+
   if ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
     // The "limit" plugin is not required for normal operation of Time Tracker.
@@ -42,6 +43,8 @@
 
     // Check user login.
     $loginSucceeded = $auth->doLogin($cl_login, $cl_password);
+    if (!$loginSucceeded)
+      $err->add($i18n->get('error.auth'));
   }
 
   // Do we have to use 2FA?
@@ -53,7 +56,7 @@
     $use2FA = $config->getDefinedValue('2fa');
   }
 
-  // If we have to use 2FA, create and email auith code to user.
+  // If we have to use 2FA, create and email auth code to user.
   if ($use2FA) {
     // To keep things simple, we use the same code as for password resets.
     $cryptographically_strong = true;
@@ -106,7 +109,6 @@
   }
 
   if ($err->no() && $loginSucceeded) {
-
     // Set current user date (as determined by user browser) into session.
     $current_user_date = $request->getParameter('browser_today', null);
     if ($current_user_date)
@@ -124,8 +126,7 @@
       header('Location: time.php');
     }
     exit();
-  } else
-    $err->add($i18n->get('error.auth'));
+  }
 } // isPost
 
 if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())

From 274906af2c15cda962c21c8d8d7addc42482b7fd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Mar 2022 00:32:38 +0000
Subject: [PATCH 1690/1848] Added a hint for 2fa.php page to translation files.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 1 +
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 1 +
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/2fa.tpl        | 1 +
 initialize.php                   | 2 +-
 32 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ef2d2ea6c..5db492323 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -430,6 +430,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 0f44c1cc5..c689bafbc 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -437,6 +437,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index a159edfa2..e2a0da44e 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -414,6 +414,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 5e2c19d5b..10c6cba46 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -401,6 +401,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 89cfcd264..fb31f0f85 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -380,6 +380,7 @@
 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 96988bdcd..bbb923fd3 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -434,6 +434,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 035fb644d..e698f9391 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -422,6 +422,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e040921c0..7a2e8fbca 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -432,6 +432,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3dfa94431..4b6a1832d 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -420,6 +420,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a7ef4f23e..b6d170271 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -411,6 +411,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 72037b0ec..a7eec7329 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -410,6 +410,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 1e03b4f75..e4ebe5198 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -438,6 +438,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 1b4cf6d24..7c761eec5 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -431,6 +431,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8c12f14c7..a873bb477 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -420,6 +420,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 30156d526..9d5807078 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -432,6 +432,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 49e904b04..59222f086 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -436,6 +436,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 85899c8ac..6503da028 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -376,6 +376,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 75910ddcf..255495601 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -434,6 +434,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4a4f9e72a..3a91e417d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -422,6 +422,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ef122e23e..af1c6e943 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -374,6 +374,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d6ded6515..8b915d4db 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -414,6 +414,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 39e2f379b..5f267efa1 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -436,6 +436,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index e4474b2f2..c64c8e9c4 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -373,6 +373,7 @@
 'email.2fa_code.body' => "Уважаемый пользователь,\n\nВаш код для двухфакторной аутентификации:\n\n%s\n\n",
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
+'form.2fa.hint' => 'Проверьте электронную почту и введите высланный вам 2FA код здесь.',
 'form.2fa.2fa_code' => '2FA код',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 76337a615..98d429610 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -425,6 +425,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9730c474c..0f757c7d2 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -408,6 +408,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 3c490d20d..60c504ca0 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -422,6 +422,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Izmena forme za lozinku. Pogledajte primer na https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 30ed6da05..06e7f46af 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -420,6 +420,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 5251ee8f6..9d8ef4111 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -444,6 +444,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index fa7f78a37..1a91e596f 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -427,6 +427,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 71587399f..0a2f8510c 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -430,6 +430,7 @@
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
 // TODO: translate the following.
+// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
 // 'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
diff --git a/WEB-INF/templates/2fa.tpl b/WEB-INF/templates/2fa.tpl
index 1754f0357..bd7e2f01b 100644
--- a/WEB-INF/templates/2fa.tpl
+++ b/WEB-INF/templates/2fa.tpl
@@ -1,6 +1,7 @@
 {* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt *}
 
+<div class="page-hint">{$i18n.form.2fa.hint}</div>
 {$forms.2faForm.open}
 <table class="centered-table">
   <tr class = "small-screen-label"><td><label for="2fa_code">{$i18n.form.2fa.2fa_code}:</label></td></tr>
diff --git a/initialize.php b/initialize.php
index c8b41c6d4..31f4096b6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5664");
+define("APP_VERSION", "1.21.1.5665");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 09c609f8f08d9d1f9a5d5daf9d53462c495a4d08 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Mar 2022 13:39:56 +0000
Subject: [PATCH 1691/1848] Introduced override_2fa access right for top
 managers.

---
 dbinstall.php  | 12 ++++++++----
 initialize.php |  2 +-
 mysql.sql      |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dbinstall.php b/dbinstall.php
index 182910ada..f8e1b9362 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1151,7 +1151,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to12100"]) {
+  if ($_POST["convert11900to12102"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1193,6 +1193,10 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.20.0', modified = now() where param_name = 'version_db' and param_value = '1.19.29'");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.20.0') set rights = replace(rights, 'manage_basic_settings,view_all_reports', 'manage_basic_settings,view_all_charts,view_all_reports') where `rank` >= 68");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.0', modified = now() where param_name = 'version_db' and param_value = '1.20.0'");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, 'view_client_unapproved,delete_group', 'view_client_unapproved,override_2fa,delete_group') where `rank` = 512");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',manage_work', '')");
+    ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',update_work', '')");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.2', modified = now() where param_name = 'version_db' and param_value = '1.21.0'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1243,7 +1247,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.21.0)</b>
+    <td width="80%"><b>Create database structure (v1.21.2)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1292,8 +1296,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.21)</td>
-    <td><input type="submit" name="convert11900to12100" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.21.2)</td>
+    <td><input type="submit" name="convert11900to12102" value="Update"></td>
   </tr>
 </table>
 
diff --git a/initialize.php b/initialize.php
index 31f4096b6..8ed35c5cc 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.1.5665");
+define("APP_VERSION", "1.21.2.5666");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mysql.sql b/mysql.sql
index 05743ee54..0856f94a0 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -78,7 +78,7 @@ create unique index role_idx on tt_roles(group_id, `rank`, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_charts,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_charts,view_all_reports,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,override_2fa,delete_group');
 
 
 #
@@ -621,4 +621,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.0', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.2', now()); # TODO: change when structure changes.

From a201018610d9d9f82c886104a7af879a28e1325a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Mar 2022 13:56:41 +0000
Subject: [PATCH 1692/1848] Started to use override_2fa access right.

---
 initialize.php | 2 +-
 login.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 8ed35c5cc..d56c43b36 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.2.5666");
+define("APP_VERSION", "1.21.2.5667");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index dbf5d0c39..a097c8883 100644
--- a/login.php
+++ b/login.php
@@ -56,8 +56,8 @@
     $use2FA = $config->getDefinedValue('2fa');
   }
 
-  // If we have to use 2FA, create and email auth code to user.
-  if ($use2FA) {
+  // If we have to use 2FA, email auth code to user and redirect to 2fa.php.
+  if ($use2FA && !$user->can('override_2fa')) {
     // To keep things simple, we use the same code as for password resets.
     $cryptographically_strong = true;
     $random_bytes = openssl_random_pseudo_bytes(16, $cryptographically_strong);

From f2358bfc5e20cd3b741166379779505e8b149be8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 17 Mar 2022 15:26:17 +0000
Subject: [PATCH 1693/1848] Initial implementation of two factor
 authentication.

---
 2fa.php                                   | 54 +++++++++++++++--------
 WEB-INF/templates/2fa.tpl                 | 24 +++++++---
 WEB-INF/templates/group_advanced_edit.tpl |  2 -
 initialize.php                            |  2 +-
 login.php                                 |  9 ++--
 5 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/2fa.php b/2fa.php
index 005b4ea42..a7e3dbb29 100644
--- a/2fa.php
+++ b/2fa.php
@@ -11,36 +11,54 @@
 // ... anything to check?
 // End of access checks.
 
-$cl_2fa_code = $request->getParameter('2fa_code');
 
-$form = new Form('2faForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'2fa_code','value'=>$cl_2fa_code));
+$cl_login = $request->getParameter('login');
+if ($cl_login == null && $request->isGet()) $cl_login = @$_COOKIE[LOGIN_COOKIE_NAME];
+$cl_password = $request->getParameter('password');
+$cl_auth_code = $request->getParameter('auth_code');
+
+$form = new Form('twoFactorAuthForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
+$form->getElement('login')->setEnabled(false);
+$form->addInput(array('type'=>'password','maxlength'=>'50','name'=>'password','value'=>$cl_password));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'auth_code','value'=>$cl_auth_code));
 $form->addInput(array('type'=>'submit','name'=>'btn_login','value'=>$i18n->get('button.login')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_2fa_code)) $err->add($i18n->get('error.field'), $i18n->get('form.2fa.2fa_code'));
-
-  // Get user id.
-  $user_id = ttUserHelper::getUserIdByTmpRef($cl_2fa_code);
-  if (!$user_id) $err->add($i18n->get('error.2fa_code'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+  if (!ttValidString($cl_auth_code)) $err->add($i18n->get('error.field'), $i18n->get('form.2fa.2fa_code'));
 
   if ($err->no()) {
-    $user = new ttUser(null, $user_id); // Note: reusing $user from initialize.php.
-    $auth->setAuth($user_id, $user->login);
-
-    // Redirect, depending on user role.
-    if ($user->isClient()) {
-      header('Location: reports.php');
-    } else {
-      header('Location: time.php');
+    // Get user id.
+    $user_id = ttUserHelper::getUserIdByTmpRef($cl_auth_code);
+    if (!$user_id)
+      $err->add($i18n->get('error.2fa_code'));
+
+    if ($err->no()) {
+      // Additionally check user password for better protection
+      // against brute force attacks guessing 2FA codes.
+      $user = new ttUser(null, $user_id); // Note: reusing $user from initialize.php.
+      // Check user password.
+      if (!$auth->doLogin($user->login, $cl_password))
+        $err->add($i18n->get('error.auth'));
+    }
+
+    if ($err->no()) {
+      // Redirect, depending on user role.
+      if ($user->isClient()) {
+        header('Location: reports.php');
+      } else {
+        header('Location: time.php');
+      }
+      exit();
     }
-    exit();
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.2faForm.2fa_code.focus()"');
+$smarty->assign('onload', 'onLoad="document.twoFactorAuthForm.auth_code.focus()"');
 $smarty->assign('title', $i18n->get('title.2fa'));
 $smarty->assign('content_page_name', '2fa.tpl');
 $smarty->display('index.tpl');
diff --git a/WEB-INF/templates/2fa.tpl b/WEB-INF/templates/2fa.tpl
index bd7e2f01b..d425cbc11 100644
--- a/WEB-INF/templates/2fa.tpl
+++ b/WEB-INF/templates/2fa.tpl
@@ -2,17 +2,29 @@
 License: See license.txt *}
 
 <div class="page-hint">{$i18n.form.2fa.hint}</div>
-{$forms.2faForm.open}
+{$forms.twoFactorAuthForm.open}
 <table class="centered-table">
-  <tr class = "small-screen-label"><td><label for="2fa_code">{$i18n.form.2fa.2fa_code}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="login">{$i18n.label.login}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="2fa_code">{$i18n.form.2fa.2fa_code}:</label></td>
-    <td class="td-with-input">{$forms.2faForm.2fa_code.control}</td>
+    <td class="large-screen-label"><label for="login">{$i18n.label.login}:</label></td>
+    <td class="td-with-input">{$forms.twoFactorAuthForm.login.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="password">{$i18n.label.password}:</label></td></tr>
   <tr>
-    <td colspan="2">{$forms.2faForm.btn_login.control}</td>
+    <td class="large-screen-label"><label for="password">{$i18n.label.password}:</label></td>
+    <td class="td-with-input">{$forms.twoFactorAuthForm.password.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="auth_code">{$i18n.form.2fa.2fa_code}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="auth_code">{$i18n.form.2fa.2fa_code}:</label></td>
+    <td class="td-with-input">{$forms.twoFactorAuthForm.auth_code.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr>
+    <td colspan="2">{$forms.twoFactorAuthForm.btn_login.control}</td>
   </tr>
 </table>
-{$forms.2faForm.close}
+{$forms.twoFactorAuthForm.close}
 
diff --git a/WEB-INF/templates/group_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
index d4bd55a1e..82eac702c 100644
--- a/WEB-INF/templates/group_advanced_edit.tpl
+++ b/WEB-INF/templates/group_advanced_edit.tpl
@@ -41,7 +41,6 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_22.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{if constant('2FA_DEBUG')}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="confirm_save">{$i18n.form.group_advanced_edit.2fa}:</label></td></tr>
   <tr>
@@ -51,7 +50,6 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_54.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td colspan="2">{$i18n.label.required_fields}</td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
diff --git a/initialize.php b/initialize.php
index d56c43b36..f3138065a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.2.5667");
+define("APP_VERSION", "1.21.2.5668");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index a097c8883..69377fed2 100644
--- a/login.php
+++ b/login.php
@@ -43,8 +43,12 @@
 
     // Check user login.
     $loginSucceeded = $auth->doLogin($cl_login, $cl_password);
-    if (!$loginSucceeded)
+    if ($loginSucceeded) {
+      // Remember user login in a cookie.
+      setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
+    } else {
       $err->add($i18n->get('error.auth'));
+    }
   }
 
   // Do we have to use 2FA?
@@ -114,9 +118,6 @@
     if ($current_user_date)
       $_SESSION['date'] = $current_user_date;
 
-    // Remember user login in a cookie.
-    setcookie(LOGIN_COOKIE_NAME, $cl_login, time() + COOKIE_EXPIRE, '/');
-
     // Redirect, depending on user role.
     if ($user->can('administer_site')) {
       header('Location: admin_groups.php');

From e4f35b788164da94bbbdbb9f376d9e3ee970ed1a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 19 Mar 2022 14:16:55 +0000
Subject: [PATCH 1694/1848] Starting work on allowing multiple uncompleted
 entries.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  2 ++
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  2 ++
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  2 ++
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/group_edit.tpl | 11 +++++++++++
 group_edit.php                   |  6 ++++++
 initialize.php                   |  2 +-
 33 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 5db492323..8b3182047 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -593,6 +593,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index c689bafbc..fd4ba142b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -605,6 +605,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index e2a0da44e..4e41f9dd3 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -571,6 +571,7 @@
 'form.group_edit.type_duration' => 'Varighed',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uafsluttede indikatore',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 10c6cba46..989afc571 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -546,6 +546,8 @@
 'form.group_edit.type_start_finish' => 'Start und Ende',
 'form.group_edit.type_duration' => 'Dauer',
 'form.group_edit.punch_mode' => 'Stechuhr-Modus',
+// TODO: translate the following.
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 'form.group_edit.allow_overlap' => 'Erlaube Überschneidung',
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index fb31f0f85..576be5b97 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -526,6 +526,7 @@
 'form.group_edit.type_start_finish' => 'start and finish',
 'form.group_edit.type_duration' => 'duration',
 'form.group_edit.punch_mode' => 'Punch mode',
+'form.group_edit.one_uncompleted' => 'One uncompleted',
 'form.group_edit.allow_overlap' => 'Allow overlap',
 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bbb923fd3..3f815af04 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -607,6 +607,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index e698f9391..76417e948 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -580,6 +580,8 @@
 'form.group_edit.type_start_finish' => 'algus ja lõpp',
 'form.group_edit.type_duration' => 'vahemik',
 'form.group_edit.punch_mode' => 'Kellast-kellani režiim',
+// TODO: translate the following.
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 'form.group_edit.allow_overlap' => 'Luba ajaline ülekate',
 'form.group_edit.future_entries' => 'Tuleviku kirjed',
 'form.group_edit.uncompleted_indicators' => 'Lõpetamata kirjete indikaator', // TODO: Fix this. Indicators (plural), not indicator.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 7a2e8fbca..d4a52de89 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -594,6 +594,7 @@
 'form.group_edit.type_duration' => 'مدت زمان',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 4b6a1832d..d4850d85f 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -578,6 +578,7 @@
 'form.group_edit.type_duration' => 'kesto',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b6d170271..7d2bb08cc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -568,6 +568,7 @@
 'form.group_edit.type_duration' => 'Durée',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a7eec7329..222c98b05 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -558,6 +558,8 @@
 'form.group_edit.type_start_finish' => 'αρχή και τέλος',
 'form.group_edit.type_duration' => 'διάρκεια',
 'form.group_edit.punch_mode' => 'Λειτουργία διάτρησης',
+// TODO: translate the following.
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 'form.group_edit.allow_overlap' => 'Επικάλυψη επιτρεπτή',
 'form.group_edit.future_entries' => 'Μελλοντικές καταχωρήσεις',
 'form.group_edit.uncompleted_indicators' => 'Μη ολοκληρωμένες ενδείξεις',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index e4ebe5198..450fa5859 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -598,6 +598,7 @@
 'form.group_edit.type_duration' => 'משך זמן',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 7c761eec5..3b4069a31 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -597,6 +597,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index a873bb477..d1925e638 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -573,6 +573,7 @@
 'form.group_edit.type_duration' => 'durata',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Indicatori incompleti',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9d5807078..602427b16 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -600,6 +600,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 59222f086..2200b7080 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -598,6 +598,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 6503da028..497d941ef 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -516,6 +516,8 @@
 'form.group_edit.type_start_finish' => 'begin en einde',
 'form.group_edit.type_duration' => 'duur',
 'form.group_edit.punch_mode' => 'Start/stop modus',
+// TODO: translate the following.
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 'form.group_edit.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 255495601..f45cbf120 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -600,6 +600,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3a91e417d..e6bf9b24d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -580,6 +580,7 @@
 'form.group_edit.type_duration' => 'czas trwania',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index af1c6e943..36a20c20b 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -514,6 +514,8 @@
 'form.group_edit.type_start_finish' => 'início e fim',
 'form.group_edit.type_duration' => 'duração',
 'form.group_edit.punch_mode' => 'Modo punch',
+// TODO: translate the following.
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 'form.group_edit.allow_overlap' => 'Permitir sobreposição',
 'form.group_edit.future_entries' => 'Entradas futuros',
 'form.group_edit.uncompleted_indicators' => 'Indicadores incompletos',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8b915d4db..5def67598 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -578,6 +578,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 5f267efa1..05e6fe5a7 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -601,6 +601,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c64c8e9c4..2fbe0dfbe 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -513,6 +513,7 @@
 'form.group_edit.type_start_finish' => 'начало и конец',
 'form.group_edit.type_duration' => 'длительность',
 'form.group_edit.punch_mode' => 'Пробивать время',
+'form.group_edit.one_uncompleted' => 'Одна незавершённая',
 'form.group_edit.allow_overlap' => 'Возможное перекрывание',
 'form.group_edit.future_entries' => 'Будущие записи',
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 98d429610..440944c78 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -584,6 +584,7 @@
 'form.group_edit.type_duration' => 'trvanie',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 0f757c7d2..7ad63d0ec 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -574,6 +574,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 60c504ca0..1fc9691fb 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -580,6 +580,7 @@
 'form.group_edit.type_duration' => 'trajanje',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 06e7f46af..f3a943154 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -577,6 +577,7 @@
 'form.group_edit.type_duration' => 'Varaktighet',
 // TODO: translate the following.
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Indikatorer för oavslutad registrering',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 9d8ef4111..b8763bf2c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -614,6 +614,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 1a91e596f..4c797a3c5 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -589,6 +589,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 0a2f8510c..1cf542d9e 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -592,6 +592,7 @@
 // 'form.group_edit.type_start_finish' => 'start and finish',
 // 'form.group_edit.type_duration' => 'duration',
 // 'form.group_edit.punch_mode' => 'Punch mode',
+// 'form.group_edit.one_uncompleted' => 'One uncompleted',
 // 'form.group_edit.allow_overlap' => 'Allow overlap',
 // 'form.group_edit.future_entries' => 'Future entries',
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 05a134dd9..673af5e23 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -110,6 +110,17 @@ function chLocation(newLocation) { document.location = newLocation; }
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
+{if constant('ONE_UNCOMPLETED_DEBUG')}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="one_uncompleted">{$i18n.form.group_edit.one_uncompleted}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="one_uncompleted">{$i18n.form.group_edit.one_uncompleted}:</label></td>
+    <td class="td-with-input">{$forms.groupForm.one_uncompleted.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_55.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_55.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="allow_overlap">{$i18n.form.group_edit.allow_overlap}:</label></td></tr>
   <tr>
diff --git a/group_edit.php b/group_edit.php
index ab3065d52..dbfca56bb 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -66,6 +66,7 @@
   $cl_project_required = $request->getParameter('project_required');
   $cl_record_type = $request->getParameter('record_type');
   $cl_punch_mode = (bool)$request->getParameter('punch_mode');
+  $cl_one_uncompleted = (bool)$request->getParameter('one_uncompleted');
   $cl_allow_overlap = (bool)$request->getParameter('allow_overlap');
   $cl_future_entries = (bool)$request->getParameter('future_entries');
   $cl_uncompleted_indicators = (bool)$request->getParameter('uncompleted_indicators');
@@ -82,6 +83,7 @@
   $cl_project_required = $group['project_required'];
   $cl_record_type = $group['record_type'];
   $cl_punch_mode = $config->getDefinedValue('punch_mode');
+  $cl_one_uncompleted = $config->getDefinedValue('one_uncompleted');
   $cl_allow_overlap = $config->getDefinedValue('allow_overlap');
   $cl_future_entries = $config->getDefinedValue('future_entries');
   $cl_uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
@@ -166,6 +168,9 @@
 // Punch mode checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'punch_mode','value'=>$cl_punch_mode));
 
+// One uncompleted.
+$form->addInput(array('type'=>'checkbox','name'=>'one_uncompleted','value'=>$cl_one_uncompleted));
+
 // Allow overlap checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'allow_overlap','value'=>$cl_allow_overlap));
 
@@ -200,6 +205,7 @@
     if ($err->no()) {
       // Update config.
       $config->setDefinedValue('punch_mode', $cl_punch_mode);
+      $config->setDefinedValue('one_uncompleted', $cl_one_uncompleted);
       $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
       $config->setDefinedValue('future_entries', $cl_future_entries);
       $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
diff --git a/initialize.php b/initialize.php
index f3138065a..0295c2bc6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.2.5668");
+define("APP_VERSION", "1.21.2.5669");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 630f9ded901a89ccdf665405bf708961540eb6d3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Mar 2022 15:25:17 +0000
Subject: [PATCH 1695/1848] Implemented multiple uncompleted entries with
 config option.

---
 WEB-INF/lib/ttTimeHelper.class.php | 44 ++++++++++++++++++++++++++----
 WEB-INF/templates/group_edit.tpl   |  2 --
 WEB-INF/templates/puncher.tpl      |  6 ++--
 WEB-INF/templates/time.tpl         |  6 ----
 WEB-INF/templates/time_script.tpl  | 16 +++++++++++
 initialize.php                     |  2 +-
 puncher.php                        | 20 ++++++++------
 time.php                           |  4 ++-
 time_edit.php                      |  4 ++-
 9 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index b45c6d17f..fa110fa40 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -449,7 +449,6 @@ static function insert($fields)
     } else {
       $duration = ttTimeHelper::toDuration($start, $finish);
       if ($duration === false) $duration = 0;
-      if (!$duration && ttTimeHelper::getUncompleted($user_id)) return false;
 
       $sql = "insert into tt_log (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by) ".
         "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$start', '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v)";
@@ -512,9 +511,9 @@ static function update($fields)
       $duration = ttTimeHelper::toDuration($start, $finish);
       if ($duration === false)
         $duration = 0;
-      $uncompleted = ttTimeHelper::getUncompleted($user_id);
-      if (!$duration && $uncompleted && ($uncompleted['id'] != $id))
-        return false;
+      //$uncompleted = ttTimeHelper::getUncompleted($user_id);
+      //if (!$duration && $uncompleted && ($uncompleted['id'] != $id))
+//        return false;
 
       $sql = "UPDATE tt_log SET start = '$start', duration = '$duration', client_id = ".$mdb2->quote($client).", project_id = ".$mdb2->quote($project).", task_id = ".$mdb2->quote($task).", ".
         "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
@@ -673,10 +672,43 @@ static function getTimeForMonth2($date) {
 
   // getUncompleted - retrieves an uncompleted record for user, if one exists.
   static function getUncompleted($user_id) {
+
+    global $user;
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $mdb2 = getConnection();
+
+    $sql = "select id, start, date from tt_log".
+      " where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1".
+      " and group_id = $group_id and org_id = $org_id";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      if (!$res->numRows()) {
+        return false;
+      }
+      if ($val = $res->fetchRow()) {
+        return $val;
+      }
+    }
+    return false;
+  }
+
+  // getFirstUncompletedForDate - retrieves first found uncompleted record for user for a specific date, if one exists.
+  static function getFirstUncompletedForDate($user_id, $date) {
+
+    $user_id = (int) $user_id; // Protection against sql injection.
+
+    global $user;
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $mdb2 = getConnection();
 
     $sql = "select id, start, date from tt_log".
-      " where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1";
+      " where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1".
+      " and group_id = $group_id and org_id = $org_id and date = ".$mdb2->quote($date).
+      " order by start"; // Ordering by start time to get the eraliest uncompleted for date.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
@@ -740,6 +772,8 @@ static function overlaps($user_id, $date, $start, $finish, $record_id = null) {
   // getRecord - retrieves a time record identified by its id.
   static function getRecord($id) {
     global $user;
+    
+    $id = (int) $id; // Protection against sql injections.
 
     $user_id = $user->getUser();
     $group_id = $user->getGroup();
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 673af5e23..909b485e6 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -110,7 +110,6 @@ function chLocation(newLocation) { document.location = newLocation; }
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_18.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{if constant('ONE_UNCOMPLETED_DEBUG')}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="one_uncompleted">{$i18n.form.group_edit.one_uncompleted}:</label></td></tr>
   <tr>
@@ -120,7 +119,6 @@ function chLocation(newLocation) { document.location = newLocation; }
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_55.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="allow_overlap">{$i18n.form.group_edit.allow_overlap}:</label></td></tr>
   <tr>
diff --git a/WEB-INF/templates/puncher.tpl b/WEB-INF/templates/puncher.tpl
index 8060c2ff5..9190af396 100644
--- a/WEB-INF/templates/puncher.tpl
+++ b/WEB-INF/templates/puncher.tpl
@@ -48,11 +48,11 @@ function stopTimer() {
 }
 </script>
 
-{if $uncompleted}
+{if $uncompleted_today}
 <script>
 startDate = new Date();
-startDate.setHours({substr($uncompleted['start'], 0, 2)});
-startDate.setMinutes({substr($uncompleted['start'], 3, 2)});
+startDate.setHours({substr($uncompleted_today['start'], 0, 2)});
+startDate.setMinutes({substr($uncompleted_today['start'], 3, 2)});
 startDate.setSeconds(0);
 updateTimer();
 startTimer();
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 6d5c036da..42c3be433 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -182,12 +182,6 @@ License: See license.txt *}
       &nbsp;
     {else}
       <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
-      {if ($record.duration == '0:00' && $record.start <> '')}
-        <input type="hidden" name="record_id" value="{$record.id}">
-        <input type="hidden" name="browser_date" value="">
-        <input type="hidden" name="browser_time" value="">
-        <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
-      {/if}
     {/if}
     </td>
     <td>
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 67c5062cc..141df7ea3 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -256,20 +256,34 @@ function formDisable(formField) {
   var x;
 
   if (((formFieldValue != "") && (formFieldName == "start")) || ((formFieldValue != "") && (formFieldName == "finish"))) {
+    // Either start or finish field not empty.
     x = eval("document.timeRecordForm.duration");
     x.value = "";
     x.disabled = true;
     x.style.background = "#e9e9e9";
+    return;
   }
 
   if (((formFieldValue == "") && (formFieldName == "start") && (document.timeRecordForm.finish.value == "")) || ((formFieldValue == "") && (formFieldName == "finish") && (document.timeRecordForm.start.value == ""))) {
+    // Both start and finish fields are emtpy.
     x = eval("document.timeRecordForm.duration");
     x.value = "";
     x.disabled = false;
     x.style.background = "white";
+    return;
+  }
+
+  if (((formFieldValue == "") && (formFieldName == "start")) || ((formFieldValue == "") && (formFieldName == "finish"))) {
+    // Either start or finish field is empty.
+    x = eval("document.timeRecordForm.duration");
+    x.value = "";
+    x.disabled = true;
+    x.style.background = "#e9e9e9";
+    return;
   }
 
   if ((formFieldValue != "") && (formFieldName == "duration")) {
+    // Duration field is not empty.
     x = eval("document.timeRecordForm.start");
     x.value = "";
     x.disabled = true;
@@ -278,9 +292,11 @@ function formDisable(formField) {
     x.value = "";
     x.disabled = true;
     x.style.background = "#e9e9e9";
+    return;
   }
 
   if ((formFieldValue == "") && (formFieldName == "duration")) {
+    // Duration field is empty.
     x = eval("document.timeRecordForm.start");
     x.disabled = false;
     x.style.background = "white";
diff --git a/initialize.php b/initialize.php
index 0295c2bc6..702658e2b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.2.5669");
+define("APP_VERSION", "1.21.3.5670");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index d23fbd1f0..0b09fb72e 100644
--- a/puncher.php
+++ b/puncher.php
@@ -48,6 +48,7 @@
 $showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
 $taskRequired = false;
 if ($showTask) $taskRequired = $user->getConfigOption('task_required');
+$oneUncompleted = $user->getConfigOption('one_uncompleted');
 
 // Initialize $cl_date.
 $date_today = new ttDate($browser_today); // Initialize to browser today if we are passed it in, otherwise server today.
@@ -60,9 +61,12 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-// Obtain uncompleted record. Assumption is that only 1 uncompleted record is allowed.
+// Obtain first uncompleted record for today. If there are multiples, we operate with first found.
+$uncompletedToday = ttTimeHelper::getFirstUncompletedForDate($user->getUser(), $date_today->toString());
+$enable_controls = ($uncompletedToday == null);
+
+// Obtain first found uncompleted record, not necessarily for today. Used to prohibit entry in "One uncompleted" mode.
 $uncompleted = ttTimeHelper::getUncompleted($user->getUser());
-$enable_controls = ($uncompleted == null);
 
 // Initialize variables.
 $cl_start = $browser_time;
@@ -201,8 +205,8 @@
 $form->addInput(array('type'=>'hidden','name'=>'browser_time','value'=>''));  // User current time, which gets filled in on button click.
 
 // Start and stop buttons.
-$enable_start = $uncompleted ? false : true;
-if (!$uncompleted)
+$enable_start = $uncompletedToday ? false : true;
+if (!$uncompletedToday)
   $form->addInput(array('type'=>'submit','name'=>'btn_start','onclick'=>'browser_today.value=get_date();browser_time.value=get_time()','value'=>$i18n->get('button.start'),'enable'=>$enable_start));
 else
   $form->addInput(array('type'=>'submit','name'=>'btn_stop','onclick'=>'browser_today.value=get_date();browser_time.value=get_time()','value'=>$i18n->get('button.stop'),'enable'=>!$enable_start));
@@ -245,8 +249,8 @@
       $err->add($i18n->get('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
-    if ($err->no() && $uncompleted) {
-      $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
+    if ($err->no() && $uncompleted && $oneUncompleted) {
+      $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$uncompleted['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
@@ -282,7 +286,7 @@
   }
   if ($request->getParameter('btn_stop')) {
     // Stop button clicked. We need to finish an uncompleted record in progress.
-    $record = ttTimeHelper::getRecord($uncompleted['id']);
+    $record = ttTimeHelper::getRecord($uncompletedToday['id']);
 
     // Can we complete this record?
     if (ttTimeHelper::isValidInterval($record['start'], $cl_finish) // finish time is greater than start time
@@ -314,7 +318,7 @@
 $timeRecords = ttTimeHelper::getRecords($cl_date);
 
 $smarty->assign('week_total', $week_total);
-$smarty->assign('uncompleted', $uncompleted);
+$smarty->assign('uncompleted_today', $uncompletedToday);
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_billable', $showBillable);
 $smarty->assign('show_project', $showProject);
diff --git a/time.php b/time.php
index 25f9b4a4b..994aa4647 100644
--- a/time.php
+++ b/time.php
@@ -71,6 +71,7 @@
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
 $showRecordCustomFields = $user->isOptionEnabled('record_custom_fields');
+$oneUncompleted = $config->getDefinedValue('one_uncompleted');
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -403,7 +404,7 @@
       $err->add($i18n->get('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
-    if ($err->no()) {
+    if ($err->no() && $oneUncompleted) {
       if (($not_completed_rec = ttTimeHelper::getUncompleted($user_id)) && (($cl_finish == '') && ($cl_duration == '')))
         $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
     }
@@ -504,6 +505,7 @@
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);
 $smarty->assign('task_list', $task_list);
+$smarty->assign('one_uncompleted', $oneUncompleted);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns();prepopulateNote();adjustTodayLinks()"');
 $smarty->assign('timestring', $selected_date->toString($user->getDateFormat()));
diff --git a/time_edit.php b/time_edit.php
index e82e21b88..ec1545036 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -48,6 +48,7 @@
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showDuration = TYPE_DURATION == $recordType || TYPE_ALL == $recordType;
+$oneUncompleted = $config->getDefinedValue('one_uncompleted');
 
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
@@ -352,7 +353,7 @@
 
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
-      if ($uncompleted) {
+      if ($uncompleted && $oneUncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
@@ -391,6 +392,7 @@
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       }
+      $err->add($i18n->get('error.db'));
     }
   }
 

From 1e7793620b678bfca406ba7ac3452e4eb41ea098 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 20 Mar 2022 15:54:15 +0000
Subject: [PATCH 1696/1848] Cosmetic changes, mostly.

---
 WEB-INF/lib/ttTimeHelper.class.php | 7 +++----
 initialize.php                     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index fa110fa40..832086af5 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -511,9 +511,6 @@ static function update($fields)
       $duration = ttTimeHelper::toDuration($start, $finish);
       if ($duration === false)
         $duration = 0;
-      //$uncompleted = ttTimeHelper::getUncompleted($user_id);
-      //if (!$duration && $uncompleted && ($uncompleted['id'] != $id))
-//        return false;
 
       $sql = "UPDATE tt_log SET start = '$start', duration = '$duration', client_id = ".$mdb2->quote($client).", project_id = ".$mdb2->quote($project).", task_id = ".$mdb2->quote($task).", ".
         "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
@@ -673,6 +670,8 @@ static function getTimeForMonth2($date) {
   // getUncompleted - retrieves an uncompleted record for user, if one exists.
   static function getUncompleted($user_id) {
 
+    $user_id = (int) $user_id; // Protection against sql injection.
+
     global $user;
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
@@ -708,7 +707,7 @@ static function getFirstUncompletedForDate($user_id, $date) {
     $sql = "select id, start, date from tt_log".
       " where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1".
       " and group_id = $group_id and org_id = $org_id and date = ".$mdb2->quote($date).
-      " order by start"; // Ordering by start time to get the eraliest uncompleted for date.
+      " order by start"; // Ordering by start time to get the earliest uncompleted for date.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if (!$res->numRows()) {
diff --git a/initialize.php b/initialize.php
index 702658e2b..a1b35747b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.3.5670");
+define("APP_VERSION", "1.21.3.5671");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 24c0762fe7c9b7511e1c891eb4d8dbf0af5e288a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Mar 2022 12:59:59 +0000
Subject: [PATCH 1697/1848] Fixed missing ttOrgHelper class error, commented
 out prematurely.

---
 initialize.php | 2 +-
 login.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index a1b35747b..75d2d25b4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.3.5671");
+define("APP_VERSION", "1.21.3.5672");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index 69377fed2..f5dd8eec1 100644
--- a/login.php
+++ b/login.php
@@ -4,7 +4,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-//import('ttOrgHelper');
+import('ttOrgHelper');
 import('ttUser');
 import('ttUserHelper');
 

From b3a15d16daf83ffb4e2db3138868b99ca1ded109 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Mar 2022 14:18:12 +0000
Subject: [PATCH 1698/1848] Extended uncompleted indicators feature by
 providing different colors for today and past entries.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 WEB-INF/templates/users.tpl      | 8 +++++++-
 default.css                      | 3 ++-
 initialize.php                   | 2 +-
 users.php                        | 2 ++
 34 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 8b3182047..7964ede5e 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -532,6 +532,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manejador',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index fd4ba142b..5b930374b 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -540,6 +540,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Role',
 'form.users.manager' => 'Manažer',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4e41f9dd3..9c4d6c216 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -511,6 +511,8 @@
 'form.tasks.inactive_tasks' => 'Inaktive Opgaver',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Bruger har en uafsluttet tidsregistrering',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 989afc571..2cf17c453 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -492,6 +492,8 @@
 'form.tasks.inactive_tasks' => 'Inaktive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Nutzer hat einen unvollständigen Zeiteintrag',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 576be5b97..bffac8f7b 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -472,6 +472,7 @@
 'form.tasks.inactive_tasks' => 'Inactive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Role',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3f815af04..3d16d8e27 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -544,6 +544,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manejador',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 76417e948..849eff788 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -522,6 +522,8 @@
 'form.tasks.inactive_tasks' => 'Mitteaktiivsed tööülesanded',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Kasutajal on lõpetamata aja kanne',
 'form.users.role' => 'Roll',
 'form.users.manager' => 'Haldur',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index d4a52de89..bdddffa4c 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -533,6 +533,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
  // TODO: translate the following.
+ // 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
  // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'سمت',
 'form.users.manager' => 'مدیر',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d4850d85f..074ee794b 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -518,6 +518,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rooli',
 'form.users.manager' => 'Esimies',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 7d2bb08cc..548d6e0ce 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -508,6 +508,8 @@
 'form.tasks.inactive_tasks' => 'Tâches inactives',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'L\\\'utilisateur a une entrée incomplète',
 'form.users.role' => 'Rôle',
 'form.users.manager' => 'Responsable',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 222c98b05..4de8f91d2 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -502,6 +502,8 @@
 'form.tasks.inactive_tasks' => 'Ανενεργές εργασίες',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Ο χρήστης έχει μια μη ολοκληρωμένη εισαγωγή χρόνου',
 'form.users.role' => 'Ρόλος',
 'form.users.manager' => 'Διευθυντής',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 450fa5859..6abbd474e 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -537,6 +537,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'תפקיד',
 'form.users.manager' => 'מנהל',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3b4069a31..b90ffdc56 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -534,6 +534,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Szerepkör',
 'form.users.manager' => 'Vezető',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d1925e638..34ca37457 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -515,6 +515,8 @@
 'form.tasks.inactive_tasks' => 'Compiti inattivi',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Questo utente ha un record temporale incompleto',
 'form.users.role' => 'Ruolo',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 602427b16..8794e2edd 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -539,6 +539,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '役割', // TODO: is this correct?
 'form.users.manager' => '管理者',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 2200b7080..69f6fd6ce 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -537,6 +537,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '직위', // TODO: is this correct? The term "role" describes user function, as in "team manager role".
 'form.users.manager' => '관리자',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 497d941ef..2ef28c19e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -462,6 +462,8 @@
 'form.tasks.inactive_tasks' => 'Inactieve taken',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Gebruiker heeft tijd ingevoerd die niet compleet is',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index f45cbf120..9ffef3209 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -538,6 +538,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rolle',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e6bf9b24d..430416f5b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -520,6 +520,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
  // TODO: translate the following.
+ // 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
  // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rola',
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 36a20c20b..d156ccda8 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -460,6 +460,8 @@
 'form.tasks.inactive_tasks' => 'Tarefas inativas',
 
 // Users form. See example at https://timetracker.anuko.com/users.php.
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'O usuário tem uma entrada incompleta',
 'form.users.role' => 'Função',
 'form.users.manager' => 'Gerente',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 5def67598..4277ff18f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -515,6 +515,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 // 'form.users.role' => 'Role',
 'form.users.manager' => 'Gerente',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 05e6fe5a7..755e2c470 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -538,6 +538,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Functie', // TODO: is "Rol" a better term here?
 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 2fbe0dfbe..61777ff47 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -459,6 +459,7 @@
 'form.tasks.inactive_tasks' => 'Неактивные задачи',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+'form.users.uncompleted_entry_today' => 'Пользователь имеет неоконченную запись сегодня',
 'form.users.uncompleted_entry' => 'Пользователь имеет неоконченную запись',
 'form.users.role' => 'Роль',
 'form.users.manager' => 'Менеджер',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 440944c78..fb8fae3e4 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -523,6 +523,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rola',
 'form.users.manager' => 'Manažér',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7ad63d0ec..02e79b401 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -512,6 +512,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 // 'form.users.role' => 'Role',
 // 'form.users.manager' => 'Manager',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 1fc9691fb..3917fc0a1 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -520,6 +520,7 @@
 
 // Korisnička forma. Pogledajte primer na https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Funkcija',
 'form.users.manager' => 'Menadžer',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index f3a943154..c638d213b 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -517,6 +517,8 @@
 'form.tasks.inactive_tasks' => 'Inaktiva arbetsuppgifter',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
+// TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 'form.users.uncompleted_entry' => 'Användaren har en oavslutad tidsregistrering',
 'form.users.role' => 'Roll',
 'form.users.manager' => 'Ansvarig',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b8763bf2c..c55b901e5 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -550,6 +550,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4c797a3c5..2550f7589 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -528,6 +528,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '角色',
 'form.users.manager' => '经理',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1cf542d9e..08928decc 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -531,6 +531,7 @@
 
 // Users form. See example at https://timetracker.anuko.com/users.php
 // TODO: translate the following.
+// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => '角色',
 'form.users.manager' => '經理',
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index c8c2d0046..2a226238d 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -23,7 +23,13 @@ License: See license.txt *}
   <tr>
     <td class="text-cell">
       {if isset($uncompleted_indicators) && $uncompleted_indicators}
-      <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
+        {if $u.has_uncompleted_entry_today}
+      <span class="uncompleted-entry active-today" title="{$i18n.form.users.uncompleted_entry_today}"></span>
+        {elseif $u.has_uncompleted_entry}
+      <span class="uncompleted-entry active" title="{$i18n.form.users.uncompleted_entry}"></span>
+        {else}
+      <span class="uncompleted-entry"></span>
+        {/if}
       {/if}
       {$u.name|escape}
     </td>
diff --git a/default.css b/default.css
index dddc5eb3f..a9cd8991c 100644
--- a/default.css
+++ b/default.css
@@ -812,7 +812,8 @@ div.table-divider { height: 30px; }
   border-radius: 50%;
   background-color: rgba(0, 0, 0, .1);
 }
-.uncompleted-entry.active { background-color: red; }
+.uncompleted-entry.active-today { background-color: red; }
+.uncompleted-entry.active { background-color: purple; }
 
 .table_icon {
   height: 16px;
diff --git a/initialize.php b/initialize.php
index 75d2d25b4..6e02bec26 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.3.5672");
+define("APP_VERSION", "1.21.4.5673");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/users.php b/users.php
index 16a422390..f0d3f8ac2 100644
--- a/users.php
+++ b/users.php
@@ -32,6 +32,8 @@
 if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $active_user) {
+    $today = new ttDate(); // Server today.
+    $active_users[$key]['has_uncompleted_entry_today'] = (bool) ttTimeHelper::getFirstUncompletedForDate($active_user['id'], $today->toString());
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
   }
   $smarty->assign('uncompleted_indicators', true);

From f50e2e51cbba7d01666cf55f009b1830526da7df Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Mar 2022 14:23:26 +0000
Subject: [PATCH 1699/1848] Optimized a loop.

---
 initialize.php | 2 +-
 users.php      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 6e02bec26..b23b2dd40 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5673");
+define("APP_VERSION", "1.21.4.5674");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/users.php b/users.php
index f0d3f8ac2..38d4e1bc3 100644
--- a/users.php
+++ b/users.php
@@ -30,10 +30,11 @@
 
 $uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
 if ($uncompleted_indicators) {
+  $today = new ttDate(); // Server today.
+  $todayString = $today->toString();
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $active_user) {
-    $today = new ttDate(); // Server today.
-    $active_users[$key]['has_uncompleted_entry_today'] = (bool) ttTimeHelper::getFirstUncompletedForDate($active_user['id'], $today->toString());
+    $active_users[$key]['has_uncompleted_entry_today'] = (bool) ttTimeHelper::getFirstUncompletedForDate($active_user['id'], $todayString);
     $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
   }
   $smarty->assign('uncompleted_indicators', true);

From e234f9b33a9623e7d16b94c161c06551fa6d4f1c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Mar 2022 15:25:12 +0000
Subject: [PATCH 1700/1848] Improved Dutch translation.

---
 WEB-INF/resources/nl.lang.php | 23 +++++++++--------------
 initialize.php                |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2ef28c19e..9b1ad509e 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -59,8 +59,7 @@
 'error.report' => 'Kies rapport.',
 'error.record' => 'Kies record.',
 'error.auth' => 'Onjuiste inlognaam of wachtwoord.',
-// TODO: translate the following.
-// 'error.2fa_code' => 'Invalid 2FA code.',
+'error.2fa_code' => 'Niet geldige 2FA code.',
 'error.weak_password' => 'Zwak wachtwoord.',
 'error.user_exists' => 'Een gebruiker met deze inlognaam bestaat al.',
 'error.object_exists' => 'Een object met deze naam bestaat al.',
@@ -237,8 +236,7 @@
 'title.error' => 'Fout',
 'title.success' => 'Succes',
 'title.login' => 'Aanmelden',
-// TODO: translate the follolwing.
-// 'title.2fa' => 'Two Factor Authentication',
+'title.2fa' => 'Two Factor Authentication',
 'title.groups' => 'Groepen',
 'title.add_group' => 'Groep toevoegen',
 'title.edit_group' => 'Groep bewerken',
@@ -370,14 +368,13 @@
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een open source tijdregistratiesysteem.',
 
 // Email subject and body for two-factor authentication.
-// TODO: translate the following.
-// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
-// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+// TODO: is the "is" correct in email.2fa_code.body?
+'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
+'email.2fa_code.body' => "Beste gebruiker,\n\nJouw two-factor authentication code is:\n\n%s\n\n",
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
-// TODO: translate the following.
-// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
-// 'form.2fa.2fa_code' => '2FA code',
+'form.2fa.hint' => 'Je kunt je 2FA code vinden in een email die aan je is verstuurd en hier invullen.',
+'form.2fa.2fa_code' => '2FA code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Het verzoek om het wachtwoord te herstellen is verzonden per email.',
@@ -518,8 +515,7 @@
 'form.group_edit.type_start_finish' => 'begin en einde',
 'form.group_edit.type_duration' => 'duur',
 'form.group_edit.punch_mode' => 'Start/stop modus',
-// TODO: translate the following.
-// 'form.group_edit.one_uncompleted' => 'One uncompleted',
+'form.group_edit.one_uncompleted' => 'Één niet-volledige registratie toestaan',
 'form.group_edit.allow_overlap' => 'Sta overlapping van tijden toe',
 'form.group_edit.future_entries' => 'Toevoegingen toestaan in de toekomst',
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
@@ -529,8 +525,7 @@
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
 'form.group_advanced_edit.allow_ip' => 'Toegestane IP adressen',
 'form.group_advanced_edit.password_complexity' => 'Wachtwoord complexiteit',
-// TODO: Translate the following.
-// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+'form.group_advanced_edit.2fa' => 'Two Factor Authentication (2FA)',
 
 // 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?',
diff --git a/initialize.php b/initialize.php
index b23b2dd40..f6df153f8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5674");
+define("APP_VERSION", "1.21.4.5675");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 95edee55e19af4af89fd870585b2b6ae9b11ce51 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Mar 2022 17:09:46 +0000
Subject: [PATCH 1701/1848] An improvement in Dutch file.

---
 WEB-INF/resources/nl.lang.php | 4 +---
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9b1ad509e..012f9d148 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -368,7 +368,6 @@
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is een open source tijdregistratiesysteem.',
 
 // Email subject and body for two-factor authentication.
-// TODO: is the "is" correct in email.2fa_code.body?
 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
 'email.2fa_code.body' => "Beste gebruiker,\n\nJouw two-factor authentication code is:\n\n%s\n\n",
 
@@ -459,8 +458,7 @@
 'form.tasks.inactive_tasks' => 'Inactieve taken',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-// TODO: translate the following.
-// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
+'form.users.uncompleted_entry_today' => 'Gebruiker heeft vandaag een tijd ingevoerd die niet compleet is',
 'form.users.uncompleted_entry' => 'Gebruiker heeft tijd ingevoerd die niet compleet is',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manager',
diff --git a/initialize.php b/initialize.php
index f6df153f8..0965e95b6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5675");
+define("APP_VERSION", "1.21.4.5676");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c2fddedca1427a5803ad981538fab14c0fa020a1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 21 Mar 2022 21:33:12 +0000
Subject: [PATCH 1702/1848] A fix for time_edit.php for multiple uncimpleted
 entries.

---
 default.css    | 1 +
 initialize.php | 2 +-
 time_edit.php  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/default.css b/default.css
index a9cd8991c..98e40562a 100644
--- a/default.css
+++ b/default.css
@@ -811,6 +811,7 @@ div.table-divider { height: 30px; }
   border: 1px solid rgba(0, 0, 0, .1);
   border-radius: 50%;
   background-color: rgba(0, 0, 0, .1);
+  margin-right: .25em;
 }
 .uncompleted-entry.active-today { background-color: red; }
 .uncompleted-entry.active { background-color: purple; }
diff --git a/initialize.php b/initialize.php
index 0965e95b6..72698fb6a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5676");
+define("APP_VERSION", "1.21.4.5677");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index ec1545036..71eeb95c9 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -410,7 +410,7 @@
 
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
-      if ($uncompleted) {
+      if ($uncompleted && $oneUncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec) {
           // We have another not completed record.

From d0c386547ac5451c30f5de5df26639867baf3dc7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 26 Mar 2022 18:46:47 +0000
Subject: [PATCH 1703/1848] Resuming refactoring.

---
 WEB-INF/lib/ttTimeHelper.class.php | 3 ++-
 initialize.php                     | 2 +-
 week.php                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 832086af5..70f5de6b4 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -622,6 +622,7 @@ static function getTimeForWeek2($date) {
   }
 
   // getTimeForMonth - gets total time for a user for a given month.
+  /*
   static function getTimeForMonth($date) {
     global $user;
     import('Period');
@@ -641,7 +642,7 @@ static function getTimeForMonth($date) {
       return ttTimeHelper::minutesToDuration($val['sm'] / 60);
     }
     return false;
-  }
+  }*/
 
   // getTimeForMonth2 - gets total time for a user for a given month.
   // Refactoring - this is a replacement function for getTimeForMonth above.
diff --git a/initialize.php b/initialize.php
index 72698fb6a..b8b1b873d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5677");
+define("APP_VERSION", "1.21.4.5678");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index e6f7864bb..eae62be27 100644
--- a/week.php
+++ b/week.php
@@ -113,7 +113,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth2($selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);

From 08b7872c4d0d7c11c40fb01d1453043d04bc70b3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 26 Mar 2022 18:51:10 +0000
Subject: [PATCH 1704/1848] Refactored ttTimeHelper::getTimeForMonth().

---
 WEB-INF/lib/ttTimeHelper.class.php | 27 +--------------------------
 initialize.php                     |  2 +-
 time.php                           |  2 +-
 week.php                           |  2 +-
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 70f5de6b4..22ab08a8b 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -621,33 +621,8 @@ static function getTimeForWeek2($date) {
     return false;
   }
 
-  // getTimeForMonth - gets total time for a user for a given month.
-  /*
-  static function getTimeForMonth($date) {
-    global $user;
-    import('Period');
-    $mdb2 = getConnection();
-
-    $user_id = $user->getUser();
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $period = new Period(INTERVAL_THIS_MONTH, $date);
-    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
-      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
-      " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
-    }
-    return false;
-  }*/
-
   // getTimeForMonth2 - gets total time for a user for a given month.
-  // Refactoring - this is a replacement function for getTimeForMonth above.
-  // TODO: remove getTimeForMonth after refactoring week view.
-  static function getTimeForMonth2($date) {
+  static function getTimeForMonth($date) {
     global $user;
     import('ttPeriod');
     $mdb2 = getConnection();
diff --git a/initialize.php b/initialize.php
index b8b1b873d..2dc1e109f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5678");
+define("APP_VERSION", "1.21.4.5679");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 994aa4647..3622704a4 100644
--- a/time.php
+++ b/time.php
@@ -116,7 +116,7 @@
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->getUserQuota($selected_date->year, $selected_date->month);
   $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
-  $month_total = ttTimeHelper::getTimeForMonth2($selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $month_total_minutes = ttTimeHelper::toMinutes($month_total);
   $balance_left = $quota_minutes_from_1st - $month_total_minutes;
   $minutes_left = $month_quota_minutes - $month_total_minutes;
diff --git a/week.php b/week.php
index eae62be27..e6f7864bb 100644
--- a/week.php
+++ b/week.php
@@ -113,7 +113,7 @@
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
   $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth2($selected_date);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);

From b809b31d92ded05e9c443122b7ccbc8a2f760efe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 26 Mar 2022 18:58:11 +0000
Subject: [PATCH 1705/1848] Refactoring ttTimeHelper::getTimeForWeek().

---
 WEB-INF/lib/ttTimeHelper.class.php | 3 ++-
 initialize.php                     | 2 +-
 week.php                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 22ab08a8b..a8279252a 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -576,6 +576,7 @@ static function getTimeForDay($date) {
   }
 
   // getTimeForWeek - gets total time for a user for a given week.
+  /*
   static function getTimeForWeek($date) {
     global $user;
     import('Period');
@@ -595,7 +596,7 @@ static function getTimeForWeek($date) {
       return ttTimeHelper::minutesToDuration($val['sm'] / 60);
     }
     return false;
-  }
+  }*/
   
   // getTimeForWeek2 - gets total time for a user for a given week.
   // Refactoring - this is a replacement function for getTimeForWeek above.
diff --git a/initialize.php b/initialize.php
index 2dc1e109f..a22c9beb8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5679");
+define("APP_VERSION", "1.21.4.5680");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index e6f7864bb..5f60536b2 100644
--- a/week.php
+++ b/week.php
@@ -551,7 +551,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($selected_date);
+$week_total = ttTimeHelper::getTimeForWeek2($selected_date);
 
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);

From ca734fb7f8d81cd881c7c2ec25ec7fca647eb992 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 26 Mar 2022 19:02:56 +0000
Subject: [PATCH 1706/1848] Refactored ttTimeHeler::getTimeForWeek().

---
 WEB-INF/lib/ttTimeHelper.class.php | 27 +--------------------------
 initialize.php                     |  2 +-
 puncher.php                        |  2 +-
 time.php                           |  2 +-
 week.php                           |  2 +-
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index a8279252a..1a0585294 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -576,32 +576,7 @@ static function getTimeForDay($date) {
   }
 
   // getTimeForWeek - gets total time for a user for a given week.
-  /*
   static function getTimeForWeek($date) {
-    global $user;
-    import('Period');
-    $mdb2 = getConnection();
-
-    $user_id = $user->getUser();
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $period = new Period(INTERVAL_THIS_WEEK, $date);
-    $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
-      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
-      " and date >= '".$period->getStartDate(DB_DATEFORMAT)."' and date <= '".$period->getEndDate(DB_DATEFORMAT)."' and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return ttTimeHelper::minutesToDuration($val['sm'] / 60);
-    }
-    return false;
-  }*/
-  
-  // getTimeForWeek2 - gets total time for a user for a given week.
-  // Refactoring - this is a replacement function for getTimeForWeek above.
-  // TODO: remove getTimeForWeek after refactoring week view and puncher.
-  static function getTimeForWeek2($date) {
     global $user;
     import('ttPeriod');
     $mdb2 = getConnection();
@@ -622,7 +597,7 @@ static function getTimeForWeek2($date) {
     return false;
   }
 
-  // getTimeForMonth2 - gets total time for a user for a given month.
+  // getTimeForMonth - gets total time for a user for a given month.
   static function getTimeForMonth($date) {
     global $user;
     import('ttPeriod');
diff --git a/initialize.php b/initialize.php
index a22c9beb8..f93db5cea 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5680");
+define("APP_VERSION", "1.21.4.5681");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 0b09fb72e..92f500d87 100644
--- a/puncher.php
+++ b/puncher.php
@@ -314,7 +314,7 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek2($date_today);
+$week_total = ttTimeHelper::getTimeForWeek($date_today);
 $timeRecords = ttTimeHelper::getRecords($cl_date);
 
 $smarty->assign('week_total', $week_total);
diff --git a/time.php b/time.php
index 3622704a4..584d483d2 100644
--- a/time.php
+++ b/time.php
@@ -480,7 +480,7 @@
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek2($selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
 $timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 $showNavigation = ($user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu')) ||
   ($user->isPluginEnabled('pu') && !$user->isOptionEnabled('puncher_menu'));
diff --git a/week.php b/week.php
index 5f60536b2..e6f7864bb 100644
--- a/week.php
+++ b/week.php
@@ -551,7 +551,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek2($selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('selected_date', $selected_date);

From 111eb51d230988111a289aef3e0590ad65a08cf4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 26 Mar 2022 20:42:46 +0000
Subject: [PATCH 1707/1848] Incremental refactoring.

---
 WEB-INF/lib/ttTimeHelper.class.php | 3 ++-
 initialize.php                     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 1a0585294..f19e9cc97 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -566,7 +566,8 @@ static function getTimeForDay($date) {
     $org_id = $user->org_id;
 
     $sql = "select sum(time_to_sec(duration)) as sm from tt_log".
-      " where user_id = $user_id and group_id = $group_id and org_id = $org_id and date = '$date' and status = 1";
+      " where user_id = $user_id and group_id = $group_id and org_id = $org_id".
+      " and date = ".$mdb2->quote($date)." and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
diff --git a/initialize.php b/initialize.php
index f93db5cea..cd4899d8f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5681");
+define("APP_VERSION", "1.21.4.5682");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 620ff3aaffd85d265c8a63ca26907753f03819ab Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Mar 2022 15:28:28 +0000
Subject: [PATCH 1708/1848] Resuming refactoring.

---
 WEB-INF/lib/ttDate.class.php | 12 ------------
 initialize.php               |  2 +-
 time.php                     |  2 --
 week.php                     | 13 +++++++++++--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 176692f84..1c7c9459a 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -14,8 +14,6 @@ class ttDate {
   var $dayOfWeek;     // day of week
   var $unixTimestamp; // unix timestamp of our date
 
-  var $isValid = false;
-
   // Additional property, used for efficiency when we only need a date in DB_DATEFORMAT.
   var $dateInDbDateFormat = null; // When initialized, this is our date in DB_DATEFORMAT.
 
@@ -24,11 +22,9 @@ class ttDate {
   function __construct($dateString = null) {
     if (ttValidDbDateFormatDate($dateString)) {
       $this->dateInDbDateFormat = $dateString;
-      $this->isValid = true;
     } else {
       $today = date_create();
       $this->dateInDbDateFormat = date_format($today, 'Y-m-d');
-      $this->isValid = true;
     }
 
     $this->unixTimestamp = strtotime($this->dateInDbDateFormat);
@@ -39,12 +35,6 @@ function __construct($dateString = null) {
   }
 
 
-  // isValid determines if we have a properly initialized ttDate object.
-  function isValid() {
-      return $this->isValid;
-  }
-
-
   // Returns unix timestamp.
   function getTimestamp() {
     return $this->unixTimestamp;
@@ -66,8 +56,6 @@ function setFromUnixTimestamp($unixTimestamp) {
 
   // toString returns a date in specified format.
   function toString($format = null) {
-    if (!$this->isValid) return null;
-
     if ($format == null || $format == DB_DATEFORMAT)
       return $this->dateInDbDateFormat;
     else {
diff --git a/initialize.php b/initialize.php
index cd4899d8f..f140c4652 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5682");
+define("APP_VERSION", "1.21.4.5683");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 584d483d2..860ff329c 100644
--- a/time.php
+++ b/time.php
@@ -76,8 +76,6 @@
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new ttDate($cl_date);
-if (!$selected_date->isValid())
-  $selected_date = new ttDate();
 if(!$cl_date)
   $cl_date = $selected_date->toString();
 $_SESSION['date'] = $cl_date;
diff --git a/week.php b/week.php
index e6f7864bb..5aa2e0199 100644
--- a/week.php
+++ b/week.php
@@ -83,13 +83,22 @@
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
 if($selected_date->isError())
   $selected_date = new DateAndTime(DB_DATEFORMAT);
+// if(!$cl_date)
+//   $cl_date = $selected_date->toString(DB_DATEFORMAT);
+// $_SESSION['date'] = $cl_date;
+
+// TODO: This is a replacement block for the one above.
+// Remove the one above when finished refactoring this file.
+// Initialize and store date in session.
+$cl_date = $request->getParameter('date', @$_SESSION['date']);
+$selected_date2 = new ttDate($cl_date);
 if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+  $cl_date = $selected_date2->toString();
 $_SESSION['date'] = $cl_date;
 
 // Determine selected week start and end dates.
 $weekStartDay = $user->getWeekStart();
-$t_arr = localtime($selected_date->getTimestamp());
+$t_arr = localtime($selected_date2->getTimestamp());
 $t_arr[5] = $t_arr[5] + 1900;
 if ($t_arr[6] < $weekStartDay)
   $startWeekBias = $weekStartDay - 7;

From fdb55257d8d0a378e8d469d2edfc27620d305373 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Mar 2022 16:12:10 +0000
Subject: [PATCH 1709/1848] Ongoing refactoring in week.php.

---
 initialize.php |  2 +-
 time.php       |  2 +-
 week.php       | 19 ++++---------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/initialize.php b/initialize.php
index f140c4652..0c51aa297 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5683");
+define("APP_VERSION", "1.21.4.5684");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 860ff329c..4f08cfe2a 100644
--- a/time.php
+++ b/time.php
@@ -118,7 +118,7 @@
   $month_total_minutes = ttTimeHelper::toMinutes($month_total);
   $balance_left = $quota_minutes_from_1st - $month_total_minutes;
   $minutes_left = $month_quota_minutes - $month_total_minutes;
-  
+
   $smarty->assign('month_total', $month_total);
   $smarty->assign('month_quota', ttTimeHelper::toAbsDuration($month_quota_minutes));
   $smarty->assign('over_balance', $balance_left < 0);
diff --git a/week.php b/week.php
index 5aa2e0199..e27875b6a 100644
--- a/week.php
+++ b/week.php
@@ -78,17 +78,6 @@
 $showFiles = $user->isPluginEnabled('at');
 $showRecordCustomFields = $user->isOptionEnabled('record_custom_fields');
 
-// Initialize and store date in session.
-$cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
-// if(!$cl_date)
-//   $cl_date = $selected_date->toString(DB_DATEFORMAT);
-// $_SESSION['date'] = $cl_date;
-
-// TODO: This is a replacement block for the one above.
-// Remove the one above when finished refactoring this file.
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date2 = new ttDate($cl_date);
@@ -121,8 +110,8 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
-  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
+  $month_quota_minutes = $quota->getUserQuota($selected_date2->year, $selected_date2->month);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date2);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);
@@ -560,10 +549,10 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($selected_date);
+$week_total = ttTimeHelper::getTimeForWeek($selected_date2);
 
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
-$smarty->assign('selected_date', $selected_date);
+$smarty->assign('selected_date', $selected_date2);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From ac35652ddc6bd06feb67865fe094076387607f05 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Mar 2022 16:53:20 +0000
Subject: [PATCH 1710/1848] More refactoring in week.php.

---
 initialize.php |  2 +-
 week.php       | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/initialize.php b/initialize.php
index 0c51aa297..fb13d4675 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5684");
+define("APP_VERSION", "1.21.4.5685");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index e27875b6a..b36c4acaa 100644
--- a/week.php
+++ b/week.php
@@ -12,6 +12,7 @@
 import('ttWeekViewHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
+import('ttDate');
 import('DateAndTime');
 
 // Access checks.
@@ -93,10 +94,10 @@
   $startWeekBias = $weekStartDay - 7;
 else
   $startWeekBias = $weekStartDay;
-$startDate = new DateAndTime();
-$startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
-$endDate = new DateAndTime();
-$endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
+$startDate = new ttDate();
+$startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
+$endDate = new ttDate();
+$endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
 // The above is needed to set date range (timestring) in page title.
 
 // Use custom fields plugin if it is enabled.
@@ -156,15 +157,15 @@
 
 // Get the data we need to display week view.
 // Get column headers, which are day numbers in month.
-$dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
-$lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
+$dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString());
+$lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString());
 // Get already existing records.
-$records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $showFiles);
+$records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(), $endDate->toString(), $showFiles);
 // Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function.
 if ($records)
   $dataArray = ttWeekViewHelper::getDataForWeekView($records, $dayHeaders);
 else
-  $dataArray = ttWeekViewHelper::prePopulateFromPastWeeks($startDate->toString(DB_DATEFORMAT), $dayHeaders);
+  $dataArray = ttWeekViewHelper::prePopulateFromPastWeeks($startDate->toString(), $dayHeaders);
 
 // Build day totals (total durations for each day in week).
 $dayTotals = ttWeekViewHelper::getDayTotals($dataArray, $dayHeaders);
@@ -487,7 +488,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 }
               }
               $fields['day_header'] = $dayHeader;
-              $fields['start_date'] = $startDate->toString(DB_DATEFORMAT); // To be able to determine date for the entry using $dayHeader.
+              $fields['start_date'] = $startDate->toString(); // To be able to determine date for the entry using $dayHeader.
               $fields['duration'] = $postedDuration;
               $fields['browser_today'] = $request->getParameter('browser_today', null);
               if ($showWeekNotes) {

From daef78889d44ff02e57d6ebb083d2d747929e846 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Mar 2022 17:15:42 +0000
Subject: [PATCH 1711/1848] A bit more refactoring.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 22 +++++-----------------
 initialize.php                         |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 9487f7805..eebbfe166 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -366,23 +366,11 @@ static function getDayTotals($dataArray, $dayHeaders) {
   // getDayHeadersForWeek - obtains day column headers for week view, which are simply day numbers in month.
   static function getDayHeadersForWeek($start_date) {
     $dayHeaders = array();
-    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
-    $dayHeaders[] = (string) $objDate->getDate(); // It returns an int on first call.
-    if (strlen($dayHeaders[0]) == 1)              // Which is an implementation detail of DateAndTime class.
-      $dayHeaders[0] = '0'.$dayHeaders[0];        // Add a 0 for single digit day.
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate(); // After incDay it returns a string with leading 0, when necessary.
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    unset($objDate);
+    $objDate = new ttDate($start_date);
+    for ($i = 0; $i < 7; $i++) {
+      $dayHeaders[] = $objDate->getDay();
+      $objDate->incrementDay();
+    }
     return $dayHeaders;
   }
 
diff --git a/initialize.php b/initialize.php
index fb13d4675..0f5a83e9b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5685");
+define("APP_VERSION", "1.21.4.5686");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e870826a5213751dc6fd533368002e8b7668a6ec Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Mar 2022 17:33:39 +0000
Subject: [PATCH 1712/1848] A bit more refactoring.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 4 ++--
 initialize.php                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index eebbfe166..26eda5f93 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -378,10 +378,10 @@ static function getDayHeadersForWeek($start_date) {
   static function getLockedDaysForWeek($start_date) {
     global $user;
     $lockedDays = array();
-    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
+    $objDate = new ttDate($start_date);
     for ($i = 0; $i < 7; $i++) {
       $lockedDays[] = $user->isDateLocked($objDate);
-      $objDate->incDay();
+      $objDate->incrementDay();
     }
     unset($objDate);
     return $lockedDays;
diff --git a/initialize.php b/initialize.php
index 0f5a83e9b..921647cbe 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5686");
+define("APP_VERSION", "1.21.4.5687");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0b3039f475280bed1f9039c31ce286aa8e2cfa88 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 27 Mar 2022 18:41:19 +0000
Subject: [PATCH 1713/1848] Some more refactoring in week.php.

---
 WEB-INF/lib/common.lib.php             | 14 ++++++++------
 WEB-INF/lib/form/TextField.class.php   |  2 +-
 WEB-INF/lib/ttDate.class.php           |  6 ++++++
 WEB-INF/lib/ttTimeHelper.class.php     |  3 +++
 WEB-INF/lib/ttWeekViewHelper.class.php | 22 +++++++++++-----------
 initialize.php                         |  2 +-
 week.php                               | 14 +++++++-------
 7 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index db00923ab..3193cc139 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -518,20 +518,22 @@ function ttMitigateCSRF() {
   return true;
 }
 
-
 // ttStartsWith functions checks if a string starts with a given substring.
 function ttStartsWith($string, $startString)
 {
-    $len = strlen($startString);
-    return (substr($string, 0, $len) === $startString);
+  if (is_null($string))
+    return false;
+
+  $len = strlen($startString);
+  return (substr($string, 0, $len) === $startString);
 }
 
 // ttEndsWith functions checks if a string ends with a given substring.
 function ttEndsWith($string, $endString)
 {
-    $len = strlen($endString);
-    if ($len == 0) return true;
-    return (substr($string, -$len) === $endString);
+  $len = strlen($endString);
+  if ($len == 0) return true;
+  return (substr($string, -$len) === $endString);
 }
 
 // ttDateToUserFormat converts a date from database format to user format.
diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index bfc0e551f..91f8b5c2a 100644
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -56,7 +56,7 @@ function getHtml() {
       if (!empty($this->on_change)) $html .= " onchange=\"$this->on_change\"";
     }
 
-    $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
+    $html .= " value=\"".htmlspecialchars($this->getValue() ? $this->getValue() : '')."\"";
 
     if(!$this->isEnabled()) $html .= " readonly";
     $html .= ">\n";
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 1c7c9459a..0871b0582 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -105,6 +105,12 @@ function incrementDay(/*int*/ $days = 1) {
   }
 
 
+  // decrementDay decrements our date by a number of days.
+  function decrementDay(/*int*/ $days = 1) {
+    $this->setFromUnixTimestamp(@mktime(0, 0, 0, $this->month, $this->day - $days, $this->year));
+  }
+
+
   // A static function to obtain a date in DB_DATEFORMAT from a Unix timestamp.
   static function dateFromUnixTimestamp($unixTimestamp = null) {
     if ($unixTimestamp == null) {
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f19e9cc97..dd0977476 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -200,6 +200,9 @@ static function minutesToDuration($minutes, $abbreviate = false) {
 
   // toMinutes - converts a time string in format 00:00 to a number of minutes.
   static function toMinutes($value) {
+    if (is_null($value))
+      return 0;
+    
     $signMultiplier = ttStartsWith($value, '-') ? -1 : 1;
     if ($signMultiplier == -1) $value = ltrim($value, '-');
 
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 26eda5f93..7618cae42 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -242,23 +242,23 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
     global $i18n;
 
     // First, determine past week start and end dates.
-    $objDate = new DateAndTime(DB_DATEFORMAT, $startDate);
-    $objDate->decDay(7);
-    $pastWeekStartDate = $objDate->toString(DB_DATEFORMAT);
-    $objDate->incDay(6);
-    $pastWeekEndDate = $objDate->toString(DB_DATEFORMAT);
+    $objDate = new ttDate($startDate);
+    $objDate->decrementDay(7);
+    $pastWeekStartDate = $objDate->toString();
+    $objDate->incrementDay(6);
+    $pastWeekEndDate = $objDate->toString();
     unset($objDate);
 
     // Obtain past week(s) records.
     $records = ttWeekViewHelper::getRecordsForInterval($pastWeekStartDate, $pastWeekEndDate);
-    // Handle potential situation of no records by re-trying for up to 4 more previous weeks (after a long vacation, etc.).
+    // Handle a potential situation of no records by re-trying for up to 4 more previous weeks (after a long vacation, etc.).
     if (!$records) {
       for ($i = 0; $i < 4; $i++) {
-        $objDate = new DateAndTime(DB_DATEFORMAT, $pastWeekStartDate);
-        $objDate->decDay(7);
-        $pastWeekStartDate = $objDate->toString(DB_DATEFORMAT);
-        $objDate->incDay(6);
-        $pastWeekEndDate = $objDate->toString(DB_DATEFORMAT);
+        $objDate = new ttDate($pastWeekStartDate);
+        $objDate->decrementDay(7);
+        $pastWeekStartDate = $objDate->toString();
+        $objDate->incrementDay(6);
+        $pastWeekEndDate = $objDate->toString();
         unset($objDate);
 
         $records = ttWeekViewHelper::getRecordsForInterval($pastWeekStartDate, $pastWeekEndDate);
diff --git a/initialize.php b/initialize.php
index 921647cbe..23b6135ba 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5687");
+define("APP_VERSION", "1.21.4.5688");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index b36c4acaa..1e0ec1b41 100644
--- a/week.php
+++ b/week.php
@@ -81,14 +81,14 @@
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date2 = new ttDate($cl_date);
+$selected_date = new ttDate($cl_date);
 if(!$cl_date)
-  $cl_date = $selected_date2->toString();
+  $cl_date = $selected_date->toString();
 $_SESSION['date'] = $cl_date;
 
 // Determine selected week start and end dates.
 $weekStartDay = $user->getWeekStart();
-$t_arr = localtime($selected_date2->getTimestamp());
+$t_arr = localtime($selected_date->getTimestamp());
 $t_arr[5] = $t_arr[5] + 1900;
 if ($t_arr[6] < $weekStartDay)
   $startWeekBias = $weekStartDay - 7;
@@ -111,8 +111,8 @@
 if ($user->isPluginEnabled('mq')){
   require_once('plugins/MonthlyQuota.class.php');
   $quota = new MonthlyQuota();
-  $month_quota_minutes = $quota->getUserQuota($selected_date2->year, $selected_date2->month);
-  $month_total = ttTimeHelper::getTimeForMonth($selected_date2);
+  $month_quota_minutes = $quota->getUserQuota($selected_date->year, $selected_date->month);
+  $month_total = ttTimeHelper::getTimeForMonth($selected_date);
   $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
 
   $smarty->assign('month_total', $month_total);
@@ -550,10 +550,10 @@ function render(&$table, $value, $row, $column, $selected = false) {
   }
 } // isPost
 
-$week_total = ttTimeHelper::getTimeForWeek($selected_date2);
+$week_total = ttTimeHelper::getTimeForWeek($selected_date);
 
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
-$smarty->assign('selected_date', $selected_date2);
+$smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);

From d909e850b97e44e06e998430b4fc82a30f5f2509 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Mar 2022 21:25:50 +0000
Subject: [PATCH 1714/1848] Resuming refactoring work.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 23 ++++++++++-------------
 initialize.php                         |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 7618cae42..deefd8a17 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -481,18 +481,15 @@ static function parseFromWeekViewRow($row_id, $field_label, $base64decode = fals
 
   // dateFromDayHeader calculates date from start date and day header in week view.
   static function dateFromDayHeader($start_date, $day_header) {
-    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
-    $currentDayHeader = (string) $objDate->getDate(); // It returns an int on first call.
-    if (strlen($currentDayHeader) == 1)               // Which is an implementation detail of DateAndTime class.
-      $currentDayHeader = '0'.$currentDayHeader;      // Add a 0 for single digit day.
-    $i = 1;
-    while ($currentDayHeader != $day_header && $i < 7) {
-      // Iterate through remaining days to find a match.
-      $objDate->incDay();
-      $currentDayHeader = $objDate->getDate(); // After incDay it returns a string with leading 0, when necessary.
-      $i++;
+    $objDate = new ttDate($start_date);
+    $currentDayHeader = $objDate->getDay();
+    for ($i = 0; $i < 7; $i++) {
+      if ($currentDayHeader == $day_header)
+        break;
+      $objDate->incrementDay();
+      $currentDayHeader = $objDate->getDay();
     }
-    return $objDate->toString(DB_DATEFORMAT);
+    return $objDate->toString();
   }
 
   // insertDurationFromWeekView - inserts a new record in log tables from a week view post.
@@ -502,11 +499,11 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
 
     // Determine date for a new entry.
     $entry_date = ttWeekViewHelper::dateFromDayHeader($fields['start_date'], $fields['day_header']);
-    $objEntryDate = new DateAndTime(DB_DATEFORMAT, $entry_date);
+    $objEntryDate = new ttDate($entry_date);
 
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries') && $fields['browser_today']) {
-      $objBrowserToday = new DateAndTime(DB_DATEFORMAT, $fields['browser_today']);
+      $objBrowserToday = new ttDate($fields['browser_today']);
       if ($objEntryDate->after($objBrowserToday)) {
         $err->add($i18n->get('error.future_date'));
         return false;
diff --git a/initialize.php b/initialize.php
index 23b6135ba..cc9a7ae01 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5688");
+define("APP_VERSION", "1.21.4.5689");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4d1c8000c78c90443af1b5141bdee03666d82180 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 28 Mar 2022 21:38:15 +0000
Subject: [PATCH 1715/1848] Incremental refactoring.

---
 initialize.php  | 2 +-
 time_delete.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index cc9a7ae01..cb779930f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5689");
+define("APP_VERSION", "1.21.4.5690");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_delete.php b/time_delete.php
index 9c028dabb..cd0af11ab 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -6,7 +6,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttTimeHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -33,7 +33,7 @@
   if ($request->getParameter('delete_button')) { // Delete button pressed.
 
     // Determine if it's okay to delete the record.
-    $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
+    $item_date = new ttDate($time_rec['date']);
 
     // Determine if the record is uncompleted.
     $uncompleted = ($time_rec['duration'] == '0:00');

From 292571fb0576110c6cb9520b60a2626281230c9b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 29 Mar 2022 17:23:57 +0000
Subject: [PATCH 1716/1848] A bit more refactoring.

---
 WEB-INF/lib/common.lib.php   | 55 ++++++++++++++++++++++++-----
 WEB-INF/lib/ttDate.class.php | 67 ++++++++++++++++++++++++++++++++++--
 initialize.php               |  2 +-
 time_edit.php                | 23 +++++++------
 4 files changed, 124 insertions(+), 23 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 3193cc139..fc27d2945 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -242,19 +242,56 @@ function ttValidStatus($val)
 // ttValidDate is used to check user input to validate a date.
 function ttValidDate($val)
 {
-  $val = trim($val);
-  if (strlen($val) == 0)
+  if (is_null($val))
     return false;
 
-  // This should validate a string in format 'YYYY-MM-DD', 'MM/DD/YYYY', 'DD-MM-YYYY', 'DD.MM.YYYY', or 'DD.MM.YYYY whatever'.
-  if (!preg_match('/^\d\d\d\d-\d\d-\d\d$/', $val) &&
-    !preg_match('/^\d\d\/\d\d\/\d\d\d\d$/', $val) &&
-    !preg_match('/^\d\d\-\d\d\-\d\d\d\d$/', $val) &&
-    !preg_match('/^\d\d\.\d\d\.\d\d\d\d$/', $val) &&
-    !preg_match('/^\d\d\.\d\d\.\d\d\d\d .+$/', $val))
+  $val = trim($val);
+  if (strlen($val) == 0)
     return false;
 
-  return true;
+  global $user;
+  $dateFormat = $user->getDateFormat();
+
+  switch ($dateFormat) {
+    case '%Y-%m-%d':
+      if (preg_match('/^\d\d\d\d-\d\d-\d\d$/', $val)) {
+        // Validate a string in format 'YYYY-MM-DD'.
+        $date_parts = explode('-', $val);
+        return checkdate($date_parts[1], $date_parts[2], $date_parts[0]);
+      }
+      break;
+    case '%m/%d/%Y':
+      if (preg_match('/^\d\d\/\d\d\/\d\d\d\d$/', $val)) {
+        // Validate a string in format 'MM/DD/YYYY'.
+        $date_parts = explode('/', $val);
+        return checkdate($date_parts[0], $date_parts[1], $date_parts[2]);
+      }
+      break;
+    case '%d-%m-%Y':
+      if (preg_match('/^\d\d\-\d\d\-\d\d\d\d$/', $val)) {
+        // Validate a string in format 'DD-MM-YYYY'.
+        $date_parts = explode('-', $val);
+        return checkdate($date_parts[1], $date_parts[0], $date_parts[2]);
+      }
+      break;
+    case '%d.%m.%Y':
+      if (preg_match('/^\d\d\.\d\d\.\d\d\d\d$/', $val)) {
+        // Validate a string in format 'DD.MM.YYYY'.
+        $date_parts = explode('.', $val);
+        return checkdate($date_parts[1], $date_parts[0], $date_parts[2]);
+      }
+      break;
+    case '%d.%m.%Y %a':
+      if (preg_match('/^\d\d\.\d\d\.\d\d\d\d .+$/', $val)) {
+        // Validate a string in format 'DD.MM.YYYY whatever'.
+        $date_parts = explode('.', $val);
+        $date_parts[2] = substr($date_parts[2], 0, 4); // Ignore localized day of week.
+        return checkdate($date_parts[1], $date_parts[0], $date_parts[2]);
+      }
+      break; 
+    
+  }
+  return false;
 }
 
 // ttValidDbDateFormatDate is used to check user input to validate a date in DB_DATEFORMAT.
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 0871b0582..1f1dfeaaf 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -19,9 +19,70 @@ class ttDate {
 
 
   // Constructor.
-  function __construct($dateString = null) {
-    if (ttValidDbDateFormatDate($dateString)) {
-      $this->dateInDbDateFormat = $dateString;
+  function __construct($dateString = null, $dateFormat = null) {
+
+    $dateInDbDateFormat = null;
+
+    if (!is_null($dateFormat)) {
+      // Depending on passed in format, prepare $dateInDbDateFormat.
+      switch ($dateFormat) {
+        case '%Y-%m-%d':
+          if (preg_match('/^\d\d\d\d-\d\d-\d\d$/', $dateString)) {
+            $date_parts = explode('-', $dateString);
+            if (checkdate($date_parts[1], $date_parts[2], $date_parts[0])) {
+              // $dateString is valid as per specified format. Create $dateInDbDateFormat.
+              $dateInDbDateFormat = $dateString;
+            }
+          }
+          break;
+
+        case '%m/%d/%Y':
+          if (preg_match('/^\d\d\/\d\d\/\d\d\d\d$/', $dateString)) {
+            $date_parts = explode('/', $dateString);
+            if (checkdate($date_parts[0], $date_parts[1], $date_parts[2])) {
+              // $dateString is valid as per specified format. Create $dateInDbDateFormat.
+              $dateInDbDateFormat = $date_parts[2].'-'.$date_parts[0].'-'.$date_parts[1];
+            }
+          }
+          break;
+
+        case '%d-%m-%Y':
+          if (preg_match('/^\d\d\-\d\d\-\d\d\d\d$/', $dateString)) {
+            $date_parts = explode('-', $dateString);
+            if (checkdate($date_parts[1], $date_parts[0], $date_parts[2])) {
+              // $dateString is valid as per specified format. Create $dateInDbDateFormat.
+              $dateInDbDateFormat = $date_parts[2].'-'.$date_parts[1].'-'.$date_parts[0];
+            }
+          }
+          break;
+
+        case '%d.%m.%Y':
+          if (preg_match('/^\d\d\.\d\d\.\d\d\d\d$/', $dateString)) {
+            $date_parts = explode('.', $dateString);
+            if (checkdate($date_parts[1], $date_parts[0], $date_parts[2])) {
+              // $dateString is valid as per specified format. Create $dateInDbDateFormat.
+              $dateInDbDateFormat = $date_parts[2].'-'.$date_parts[1].'-'.$date_parts[0];
+            }
+          }
+          break;
+
+        case '%d.%m.%Y %a':
+          if (preg_match('/^\d\d\.\d\d\.\d\d\d\d .+$/', $dateString)) {
+            $date_parts = explode('.', $dateString);
+            $date_parts[2] = substr($date_parts[2], 0, 4); // Ignore localized day of week.
+            if (checkdate($date_parts[1], $date_parts[0], $date_parts[2])) {
+              // $dateString is valid as per specified format. Create $dateInDbDateFormat.
+              $dateInDbDateFormat = $date_parts[2].'-'.$date_parts[1].'-'.$date_parts[0];
+            }
+          }
+          break;
+      }
+    } else {
+     $dateInDbDateFormat = $dateString;
+    }
+
+    if (ttValidDbDateFormatDate($dateInDbDateFormat)) {
+      $this->dateInDbDateFormat = $dateInDbDateFormat;
     } else {
       $today = date_create();
       $this->dateInDbDateFormat = date_format($today, 'Y-m-d');
diff --git a/initialize.php b/initialize.php
index cb779930f..84470d543 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5690");
+define("APP_VERSION", "1.21.4.5691");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index 71eeb95c9..a00f66051 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -10,6 +10,7 @@
 import('ttTimeHelper');
 import('ttConfigHelper');
 import('DateAndTime');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
@@ -57,7 +58,7 @@
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-$item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
+$item_date = new ttDate($time_rec['date']);
 $confirm_save = $user->getConfigOption('confirm_save');
 
 // Initialize variables.
@@ -325,11 +326,13 @@
   // Finished validating user input.
 
   // This is a new date for the time record.
-  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
+  $new_date = null;
+  if ($err->no())
+    $new_date = new ttDate($cl_date, $user->getDateFormat());
 
   // Prohibit creating entries in future.
-  if (!$user->isOptionEnabled('future_entries')) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+  if ($err->no() && !$user->isOptionEnabled('future_entries')) {
+    $browser_today = new ttDate($request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
   }
@@ -364,7 +367,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+      if (ttTimeHelper::overlaps($user_id, $new_date->toString(), $cl_start, $cl_finish, $cl_id))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -372,7 +375,7 @@
     if ($err->no()) {
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
-        'date'=>$new_date->toString(DB_DATEFORMAT),
+        'date'=>$new_date->toString(),
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,
@@ -389,7 +392,7 @@
       }
       if ($res)
       {
-        header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
+        header('Location: time.php?date='.$new_date->toString());
         exit();
       }
       $err->add($i18n->get('error.db'));
@@ -421,7 +424,7 @@
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
-      if (ttTimeHelper::overlaps($user_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
+      if (ttTimeHelper::overlaps($user_id, $new_date->toString(), $cl_start, $cl_finish))
         $err->add($i18n->get('error.overlap'));
     }
 
@@ -429,7 +432,7 @@
     if ($err->no()) {
 
       $id = ttTimeHelper::insert(array(
-        'date'=>$new_date->toString(DB_DATEFORMAT),
+        'date'=>$new_date->toString(),
         'client'=>$cl_client,
         'project'=>$cl_project,
         'task'=>$cl_task,
@@ -446,7 +449,7 @@
         $res = $custom_fields->insertTimeFields($id, $timeCustomFields);
       }
       if ($id && $res) {
-        header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
+        header('Location: time.php?date='.$new_date->toString());
         exit();
       }
       $err->add($i18n->get('error.db'));

From ce6abbd048aea2461e91154cf00af59bed361579 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 2 Apr 2022 15:10:32 +0000
Subject: [PATCH 1717/1848] Fixed handling completion of uncompleted records
 from time.php.

---
 WEB-INF/templates/time.tpl | 16 +++++++++++++++-
 initialize.php             |  2 +-
 puncher.php                |  2 +-
 time.php                   | 24 ++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 42c3be433..b04959cfc 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -3,6 +3,14 @@ License: See license.txt *}
 
 {include file="time_script.tpl"}
 
+<script>
+// handleStop handles a click on the Stop button by setting value of a hidden control with record id.
+function handleStop(buttonElement) {
+  var recordIdControl = document.getElementById("record_id");
+  recordIdControl.value = buttonElement.parentNode.id;
+}
+</script>
+
 {if $show_navigation}
 <div class="optional-nav">
   <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>
@@ -113,6 +121,9 @@ License: See license.txt *}
 </table>
 
 {if $time_records}
+<input type="hidden" id="record_id" name="record_id">
+<input type="hidden" id="browser_today" name="browser_date">
+<input type="hidden" id="browser_time" name="browser_time">
 <div class="record-list">
 <table class="x-scrollable-table">
   <tr>
@@ -177,10 +188,13 @@ License: See license.txt *}
     <td><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="img/icon-file.png"></a></td>
       {/if}
     {/if}
-    <td>
+    <td id={$record.id}>
     {if $record.approved || $record.timesheet_id || $record.invoice_id}
       &nbsp;
     {else}
+      {if ($record.duration == '0:00' && $record.start <> '')}
+        <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time();handleStop(this);" value="{$i18n.button.stop}">
+      {/if}
       <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="img/icon-edit.png"></a>
     {/if}
     </td>
diff --git a/initialize.php b/initialize.php
index 84470d543..2f7224b8a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5691");
+define("APP_VERSION", "1.21.4.5692");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 92f500d87..2b25462d3 100644
--- a/puncher.php
+++ b/puncher.php
@@ -32,7 +32,7 @@
 // If we are passed in browser_time, make sure it is in correct format.
 $browser_time = null; // Reused below beyond access checks.
 if ($request->isPost()) {
-  // Validate that browser_today parameter is in correct format.
+  // Validate that browser_time parameter is in correct format.
   $browser_time = $request->getParameter('browser_time');
   if ($browser_time && !ttValidTime($browser_time)) {
     header('Location: access_denied.php');
diff --git a/time.php b/time.php
index 4f08cfe2a..faf064a4a 100644
--- a/time.php
+++ b/time.php
@@ -46,6 +46,30 @@
     exit();
   }
 }
+// Additional checks for hidden controls used for completion of uncompleted records.
+// browser_date, browser_time, record_id.
+if ($request->isPost() && $request->getParameter('btn_stop')) {
+  $recordId = (int) $request->getParameter('record_id');
+  $time_rec = ttTimeHelper::getRecord($recordId);
+  if (!$time_rec) {
+    // We are passed a bogus record id.
+    header('Location: access_denied.php');
+    exit();
+  }
+
+  // Validate that browser_date parameter is in correct format.
+  $browser_date = $request->getParameter('browser_date');
+  if ($browser_date && !ttValidDbDateFormatDate($browser_date)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+  // Validate that browser_time parameter is in correct format.
+  $browser_time = $request->getParameter('browser_time');
+  if ($browser_time && !ttValidTime($browser_time)) {
+    header('Location: access_denied.php');
+    exit();
+  }
+}
 // End of access checks.
 
 // Determine user for whom we display this page.

From c88dfcd6d32eea8818f266e39144732f9c263184 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Apr 2022 15:18:33 +0000
Subject: [PATCH 1718/1848] Resuming refactoring.

---
 WEB-INF/lib/common.lib.php | 2 +-
 initialize.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index fc27d2945..2d8e287d5 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -577,7 +577,7 @@ function ttEndsWith($string, $endString)
 function ttDateToUserFormat($date)
 {
   global $user;
-  $o_date = new DateAndTime(DB_DATEFORMAT, $date);
+  $o_date = new ttDate($date);
   return $o_date->toString($user->date_format);
 }
 
diff --git a/initialize.php b/initialize.php
index 2f7224b8a..e787e27b0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5692");
+define("APP_VERSION", "1.21.4.5693");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ba5e71ff40894946290f51979dc07f4ab00e21d0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Apr 2022 16:52:18 +0000
Subject: [PATCH 1719/1848] Incremental refactoring.

---
 WEB-INF/lib/form/ActionForm.class.php | 43 +++++++--------------------
 initialize.php                        |  2 +-
 time_edit.php                         |  1 -
 week.php                              |  1 -
 4 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index abc5e006b..5b88292c4 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -1,32 +1,9 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
-import("DateAndTime");
+// TODO: Refactor this entire class.
+import('ttDate');
 
 class ActionForm {
 	var $mName		= "";
@@ -106,13 +83,14 @@ function setVariablesNames($namelist) {
 
     function setAttribute($name,$value) {
     	global $user;
-    	
+
         $this->mValues[$name] = $value;
         if ($this->mForm) {
         	if (isset($this->mForm->elements[$name])) {
         		if ($this->mForm->elements[$name]->class=="DateField") {
-        			$dt = new DateAndTime($user->date_format, $value);
-					$value = $dt->toString(DB_DATEFORMAT);
+                            // TODO: It appears that we never get here. Refactor this entire class.
+                            $dt = new ttDate($user->date_format, $value);
+                            $value = $dt->toString();
         		}
         		$this->mForm->elements[$name]->setValueSafe($value);
         	}
@@ -140,8 +118,9 @@ function setAttributes($value) {
 	        if ($this->mForm) {
 	        	if (isset($this->mForm->elements[$name])) {
 	        		if ($this->mForm->elements[$name]->class=="DateField") {
-	        			$dt = new DateAndTime($user->date_format, $value);
-						$value = $dt->toString(DB_DATEFORMAT);
+                                    // TODO: It appears that we never get here. Refactor this entire class.
+                                    $dt = new ttDate($user->date_format, $value);
+                                    $value = $dt->toString();
 	        		}
 	        		$this->mForm->elements[$name]->setValueSafe($value);
 	        	}
diff --git a/initialize.php b/initialize.php
index e787e27b0..a8b14bca9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5693");
+define("APP_VERSION", "1.21.4.5694");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index a00f66051..03c721193 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -9,7 +9,6 @@
 import('ttClientHelper');
 import('ttTimeHelper');
 import('ttConfigHelper');
-import('DateAndTime');
 import('ttDate');
 
 // Access checks.
diff --git a/week.php b/week.php
index 1e0ec1b41..92eb95ee3 100644
--- a/week.php
+++ b/week.php
@@ -13,7 +13,6 @@
 import('ttClientHelper');
 import('ttTimeHelper');
 import('ttDate');
-import('DateAndTime');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {

From 43b0cadb33efc2bb97b3a62a95d6a7da5d93874b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 9 Apr 2022 18:40:23 +0000
Subject: [PATCH 1720/1848] More refactoring.

---
 expense_edit.php | 16 ++++++++--------
 initialize.php   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/expense_edit.php b/expense_edit.php
index 258437b33..e57db88d9 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -5,9 +5,9 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttGroupHelper');
-import('DateAndTime');
 import('ttTimeHelper');
 import('ttExpenseHelper');
+import('ttDate');
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
@@ -37,7 +37,7 @@
 }
 // End of access checks.
 
-$item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+$item_date = new ttDate($expense_item['date']);
 $confirm_save = $user->getConfigOption('confirm_save');
 $trackingMode = $user->getTrackingMode();
 $show_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
@@ -150,11 +150,11 @@
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
 
   // This is a new date for the expense item.
-  $new_date = new DateAndTime($user->getDateFormat(), $cl_date);
+  $new_date = new ttDate($cl_date, $user->getDateFormat());
 
   // Prohibit creating entries in future.
   if (!$user->isOptionEnabled('future_entries')) {
-    $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+    $browser_today = new ttDate($request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->get('error.future_date'));
   }
@@ -178,9 +178,9 @@
 
     // Now, an update.
     if ($err->no()) {
-      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),
+      if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(),
           'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'paid'=>$cl_paid))) {
-        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
+        header('Location: expenses.php?date='.$new_date->toString());
         exit();
       }
     }
@@ -194,9 +194,9 @@
 
     // Now, a new insert.
     if ($err->no()) {
-      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'client_id'=>$cl_client,
+      if (ttExpenseHelper::insert(array('date'=>$new_date->toString(),'client_id'=>$cl_client,
           'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) {
-        header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT));
+        header('Location: expenses.php?date='.$new_date->toString());
         exit();
       } else
         $err->add($i18n->get('error.db'));
diff --git a/initialize.php b/initialize.php
index a8b14bca9..45fa67787 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5694");
+define("APP_VERSION", "1.21.4.5695");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 49ef4b11da9b456e26d5e1592fa79a3194a49b7e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 16:04:20 +0000
Subject: [PATCH 1721/1848] Resuming refactoring.

---
 WEB-INF/lib/ttDate.class.php |  9 +++++++++
 initialize.php               |  2 +-
 reports.php                  | 33 +++++++++++++++++----------------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 1f1dfeaaf..3b798214a 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -153,6 +153,15 @@ function after(/*ttDate*/ $obj) {
   }
 
 
+  function compare(/*ttDate*/ $obj) {
+    $ts1 = $this->getTimestamp();
+    $ts2 = $obj->getTimestamp();
+    if ($ts1 < $ts2) return -1;
+    if ($ts1 == $ts2) return 0;
+    if ($ts1 > $ts2) return 1;
+  }
+
+
   // Getters.
   function getYear() { return $this->year; }
   function getMonth() { return $this->month; }
diff --git a/initialize.php b/initialize.php
index 45fa67787..201e96f4e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5695");
+define("APP_VERSION", "1.21.4.5696");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index c1df04387..858ca61cb 100644
--- a/reports.php
+++ b/reports.php
@@ -5,13 +5,13 @@
 require_once('initialize.php');
 import('form.Form');
 import('form.ActionForm');
-import('DateAndTime');
 import('ttGroupHelper');
-import('Period');
 import('ttProjectHelper');
 import('ttFavReportHelper');
 import('ttClientHelper');
 import('ttReportHelper');
+import('ttDate');
+import('ttPeriod');
 
 // Access check.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
@@ -357,9 +357,9 @@
 if ($request->isGet() && !$bean->isSaved()) {
   // No previous form data were found in session. Use the following default values.
   $form->setValueByElement('users_active', array_keys((array)$user_list_active));
-  $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
-  $form->setValueByElement('start_date', $period->getStartDate());
-  $form->setValueByElement('end_date', $period->getEndDate());
+  $period = new ttPeriod(new ttDate(), INTERVAL_THIS_MONTH);
+  $form->setValueByElement('start_date', $period->getStartDate($user->getDateFormat()));
+  $form->setValueByElement('end_date', $period->getEndDate($user->getDateFormat()));
 
   $form->setValueByElement('chclient', '1');
   $form->setValueByElement('chstart', '1');
@@ -438,17 +438,18 @@
   } else {
     // Generate button pressed. Check some values.
     if (!$bean->getAttribute('period')) {
-      $start_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
-
-      if ($start_date->isError() || !$bean->getAttribute('start_date'))
-        $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
-
-      $end_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
-      if ($end_date->isError() || !$bean->getAttribute('end_date'))
-        $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
-
-      if ($start_date->compare($end_date) > 0)
-        $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+      // Validate start date.
+      if (!ttValidDate($bean->getAttribute('start_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
+      // Validate end date.
+      if (!ttValidDate($bean->getAttribute('end_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
+      // Make sure that the end date is equal or after the start date.
+      if ($err->no()) {
+        $startDate = new ttDate($bean->getAttribute('start_date'), $user->getDateFormat());
+        $endDate = new ttDate($bean->getAttribute('end_date'), $user->getDateFormat());
+        if ($startDate->compare($endDate) > 0) {
+          $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+        }
+      }
     }
     $group_by1 = $bean->getAttribute('group_by1');
     $group_by2 = $bean->getAttribute('group_by2');

From 66ee957d754819df5f672746af4d62aad44771a7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 16:15:10 +0000
Subject: [PATCH 1722/1848] A bit more refactoring.

---
 initialize.php   | 2 +-
 invoice_view.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 201e96f4e..5703b55be 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5696");
+define("APP_VERSION", "1.21.4.5697");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoice_view.php b/invoice_view.php
index b03b719e4..b1fcf91f9 100644
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -3,7 +3,7 @@
 License: See license.txt */
 
 require_once('initialize.php');
-import('DateAndTime');
+import('ttDate');
 import('ttInvoiceHelper');
 import('ttClientHelper');
 import('form.Form');
@@ -25,7 +25,7 @@
 }
 // End of access checks.
 
-$invoice_date = new DateAndTime(DB_DATEFORMAT, $invoice['date']);
+$invoice_date = new ttDate($invoice['date']);
 $client = ttClientHelper::getClient($invoice['client_id'], true);
 if (!$client) // In case client was deleted.
   $client = ttClientHelper::getDeletedClient($invoice['client_id']);

From a44ba11b58ef6f76c7570a3092bb94c0088b2008 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 16:39:55 +0000
Subject: [PATCH 1723/1848] More refactoring.

---
 expenses.php   | 11 +++++------
 initialize.php |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/expenses.php b/expenses.php
index 897d64d91..34169b7dc 100644
--- a/expenses.php
+++ b/expenses.php
@@ -6,7 +6,7 @@
 import('form.Form');
 import('ttUserHelper');
 import('ttGroupHelper');
-import('DateAndTime');
+import('ttDate');
 import('ttTimeHelper');
 import('ttExpenseHelper');
 import('ttFileHelper');
@@ -65,13 +65,12 @@
 
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
-$selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
-if($selected_date->isError())
-  $selected_date = new DateAndTime(DB_DATEFORMAT);
+$selected_date = new ttDate($cl_date);
 if(!$cl_date)
-  $cl_date = $selected_date->toString(DB_DATEFORMAT);
+  $cl_date = $selected_date->toString();
 $_SESSION['date'] = $cl_date;
 
+
 $tracking_mode = $user->getTrackingMode();
 $show_project = MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode;
 $showFiles = $user->isPluginEnabled('at');
@@ -203,7 +202,7 @@
 
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries')) {
-      $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
+      $browser_today = new ttDate($request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
diff --git a/initialize.php b/initialize.php
index 5703b55be..e1a5ffd06 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5697");
+define("APP_VERSION", "1.21.4.5698");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 8b66de3dd6a21fc65fa26a3a6fcbf940d8d2b05f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 16:53:05 +0000
Subject: [PATCH 1724/1848] A bit more refactoring.

---
 charts.php         | 6 +++---
 expense_delete.php | 4 ++--
 initialize.php     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts.php b/charts.php
index cfd01c5fe..1ad1c88d9 100644
--- a/charts.php
+++ b/charts.php
@@ -6,7 +6,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('DateAndTime');
+import('ttDate');
 import('ttChartHelper');
 import('ttUserConfig');
 import('PieChartEx');
@@ -72,8 +72,8 @@
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 if(!$cl_date) {
-  $now = new DateAndTime(DB_DATEFORMAT);
-  $cl_date = $now->toString(DB_DATEFORMAT);
+  $now = new ttDate();
+  $cl_date = $now->toString();
 }
 $_SESSION['date'] = $cl_date;
 
diff --git a/expense_delete.php b/expense_delete.php
index 6c5cb791f..6dbf421a9 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -4,7 +4,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('DateAndTime');
+import('ttDate');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -30,7 +30,7 @@
   if ($request->getParameter('delete_button')) { // Delete button pressed.
 
     // Determine if it is okay to delete the record.
-    $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+    $item_date = new ttDate($expense_item['date']);
     if ($user->isDateLocked($item_date))
       $err->add($i18n->get('error.range_locked'));
 
diff --git a/initialize.php b/initialize.php
index e1a5ffd06..6be6126dd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5698");
+define("APP_VERSION", "1.21.4.5699");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0a61c1b2469f7c519419b35712223838a37f40b9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 17:28:27 +0000
Subject: [PATCH 1725/1848] Cleanup.

---
 WEB-INF/lib/ttTeamHelper.class.php | 30 ++----------------------------
 WEB-INF/lib/ttTimeHelper.class.php |  2 --
 initialize.php                     |  2 +-
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 981f01b50..e12c2575b 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -1,33 +1,8 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttUserHelper');
-import('DateAndTime');
 import('ttInvoiceHelper');
 
 // Class ttTeamHelper - contains helper functions that operate with groups.
@@ -247,7 +222,6 @@ static function getAllInvoices()
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
         $result[] = $val;
       }
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index dd0977476..2e9eddbb1 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -2,8 +2,6 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-import('DateAndTime');
-
 // The ttTimeHelper is a class to help with time-related values.
 class ttTimeHelper {
 
diff --git a/initialize.php b/initialize.php
index 6be6126dd..9ae6dcdb6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5699");
+define("APP_VERSION", "1.21.4.5700");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 2cf98d9ab1e736794ff0131a41cb642374198fe5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 17:45:17 +0000
Subject: [PATCH 1726/1848] A bit more cleanup and refactoring.

---
 WEB-INF/lib/ttGroupHelper.class.php | 4 +---
 initialize.php                      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 81b0c7f34..81d1af696 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -431,10 +431,9 @@ static function getActiveInvoices($sort_options = false)
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
         // Localize date.
-        $dt->parseVal($val['date']);
+        $dt = new ttDate($val['date']);
         $val['date'] = $dt->toString($user->getDateFormat());
         if ($addPaidStatus)
           $val['paid'] = ttInvoiceHelper::isPaid($val['id']);
@@ -679,7 +678,6 @@ static function getRecentInvoices($client_id) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
         $result[] = $val;
       }
diff --git a/initialize.php b/initialize.php
index 9ae6dcdb6..6b4471a20 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5700");
+define("APP_VERSION", "1.21.4.5701");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 912ffe1bfcbb21a8e87e6a162b57148321109a22 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 20:01:41 +0000
Subject: [PATCH 1727/1848] Refactoring in progress.

---
 WEB-INF/lib/ttChartHelper.class.php | 40 ++++++-----------------------
 WEB-INF/lib/ttPeriod.class.php      | 12 +++++++++
 initialize.php                      |  2 +-
 3 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 4e4f9c832..f0523036d 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -1,32 +1,8 @@
 <?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
-// +----------------------------------------------------------------------+
-
-import('Period');
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+import('ttPeriod');
 import('ttTimeHelper');
 
 // Definitions for chart types.
@@ -48,19 +24,19 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
     $period = null;
     switch ($interval_type) {
       case INTERVAL_THIS_DAY:
-        $period = new Period(INTERVAL_THIS_DAY, new DateAndTime(DB_DATEFORMAT, $selected_date));
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_DAY);
         break;
  
       case INTERVAL_THIS_WEEK:
-        $period = new Period(INTERVAL_THIS_WEEK, new DateAndTime(DB_DATEFORMAT, $selected_date));
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_WEEK);
         break;
 
       case INTERVAL_THIS_MONTH:
-        $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime(DB_DATEFORMAT, $selected_date));
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_MONTH);
         break;
 
       case INTERVAL_THIS_YEAR:
-        $period = new Period(INTERVAL_THIS_YEAR, new DateAndTime(DB_DATEFORMAT, $selected_date));
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_YEAR);
         break;
     }
 
diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
index 3eb431cc4..85022a85b 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -2,8 +2,10 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
+define('INTERVAL_THIS_DAY', 1);
 define('INTERVAL_THIS_WEEK', 2);
 define('INTERVAL_THIS_MONTH', 3);
+define('INTERVAL_THIS_YEAR', 4);
 
 class ttPeriod {
   var $startDate; // ttDate object.
@@ -23,6 +25,11 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
     $this->endDate = new ttDate();
 
     switch ($period_type) {
+      case INTERVAL_THIS_DAY:
+        $this->startDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
+        $this->endDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
+        break;
+
       case INTERVAL_THIS_WEEK:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
@@ -32,6 +39,11 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
 	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,1,$t_arr[5]));
 	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
 	break;
+
+      case INTERVAL_THIS_YEAR:
+	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,1,1,$t_arr[5]));
+	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,12,31,$t_arr[5]));
+	break;
       }
     }
 
diff --git a/initialize.php b/initialize.php
index 6b4471a20..a078f888c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5701");
+define("APP_VERSION", "1.21.4.5702");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 50e2643ca231372b72c42d4094cd195903efe31d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 10 Apr 2022 20:36:34 +0000
Subject: [PATCH 1728/1848] Refactoring in progress.

---
 WEB-INF/lib/ttPeriod.class.php       | 24 ++++++++++++++++++++++++
 WEB-INF/lib/ttReportHelper.class.php | 10 ++++++----
 initialize.php                       |  2 +-
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
index 85022a85b..1d63ad9d1 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -6,6 +6,10 @@
 define('INTERVAL_THIS_WEEK', 2);
 define('INTERVAL_THIS_MONTH', 3);
 define('INTERVAL_THIS_YEAR', 4);
+define('INTERVAL_ALL_TIME', 5);
+define('INTERVAL_LAST_WEEK', 6);
+define('INTERVAL_LAST_MONTH', 7);
+define('INTERVAL_LAST_DAY', 8);
 
 class ttPeriod {
   var $startDate; // ttDate object.
@@ -30,16 +34,31 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
         $this->endDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
         break;
 
+      case INTERVAL_LAST_DAY:
+        $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
+        $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
+        break;
+
       case INTERVAL_THIS_WEEK:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
         break;
 
+      case INTERVAL_LAST_WEEK:
+        $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-7+$startWeekBias,$t_arr[5]));
+        $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-1+$startWeekBias,$t_arr[5]));
+        break;
+
       case INTERVAL_THIS_MONTH:
 	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,1,$t_arr[5]));
 	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
 	break;
 
+      case INTERVAL_LAST_MONTH:
+        $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4],1,$t_arr[5]));
+        $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,0,$t_arr[5]));
+        break;
+
       case INTERVAL_THIS_YEAR:
 	$this->startDate->setFromUnixTimestamp(mktime(0,0,0,1,1,$t_arr[5]));
 	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,12,31,$t_arr[5]));
@@ -47,6 +66,11 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
       }
     }
 
+  // Sets period to designated start and and dates.
+  function setPeriod($start_date, $end_date) {
+    $this->startDate = $start_date;
+    $this->endDate = $end_date;
+  }
 
   // Returns start date in specified format.
   function getStartDate($format = null) {
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 20e6d7a46..bafa40221 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -4,7 +4,9 @@
 
 import('ttClientHelper');
 import('DateAndTime');
+import('ttDate');
 import('Period');
+import('ttPeriod');
 import('ttTimeHelper');
 import('ttConfigHelper');
 
@@ -119,12 +121,12 @@ static function getWhere($options) {
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
     if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+      $period = new ttPeriod(new ttDate(), $options['period']);
     else {
-      $period = new Period();
+      $period = new ttPeriod(new ttDate());
       $period->setPeriod(
-        new DateAndTime($dateFormat, $options['period_start']),
-        new DateAndTime($dateFormat, $options['period_end']));
+        new ttDate($options['period_start'], $dateFormat),
+        new ttDate($options['period_end'], $dateFormat));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
       " $user_list_part $dropdown_parts $cf_text_parts";
diff --git a/initialize.php b/initialize.php
index a078f888c..7fbdc50ff 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5702");
+define("APP_VERSION", "1.21.4.5703");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 094e353b2f55375aedd70f14f495c23f179e1f24 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 15:43:46 +0000
Subject: [PATCH 1729/1848] Resuming refactoring.

---
 WEB-INF/lib/ttReportHelper.class.php | 29 +++++++++++++---------------
 initialize.php                       |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index bafa40221..995cfa2b4 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -3,9 +3,7 @@
 License: See license.txt */
 
 import('ttClientHelper');
-import('DateAndTime');
 import('ttDate');
-import('Period');
 import('ttPeriod');
 import('ttTimeHelper');
 import('ttConfigHelper');
@@ -128,7 +126,7 @@ static function getWhere($options) {
         new ttDate($options['period_start'], $dateFormat),
         new ttDate($options['period_end'], $dateFormat));
     }
-    $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+    $where = " where l.status = 1 and l.date >= '".$period->getStartDate()."' and l.date <= '".$period->getEndDate()."'".
       " $user_list_part $dropdown_parts $cf_text_parts";
     return $where;
   }
@@ -203,14 +201,14 @@ static function getExpenseWhere($options) {
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
     if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+      $period = new ttPeriod(new ttDate(), $options['period']);
     else {
-      $period = new Period();
+      $period = new ttPeriod(new ttDate());
       $period->setPeriod(
-        new DateAndTime($dateFormat, $options['period_start']),
-        new DateAndTime($dateFormat, $options['period_end']));
+        new ttDate($options['period_start'], $dateFormat),
+        new ttDate($options['period_end'], $dateFormat));
     }
-    $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+    $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate()."' and ei.date <= '".$period->getEndDate()."'".
       " $user_list_part $dropdown_parts $cf_text_parts";
     return $where;
   }
@@ -883,17 +881,16 @@ static function getTotals($options)
 
     $dateFormat = $user->getDateFormat();
     if (isset($options['period']) && $options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+      $period = new ttPeriod(new ttDate(), $options['period']);
     else {
-      $period = new Period();
-      if (isset($options['period_start']) && isset($options['period_end']))
-        $period->setPeriod(
-          new DateAndTime($dateFormat, $options['period_start']),
-          new DateAndTime($dateFormat, $options['period_end']));
+      $period = new ttPeriod(new ttDate());
+      $period->setPeriod(
+        new ttDate($options['period_start'], $dateFormat),
+        new ttDate($options['period_end'], $dateFormat));
     }
 
-    $totals['start_date'] = $period->getStartDate();
-    $totals['end_date'] = $period->getEndDate();
+    $totals['start_date'] = $period->getStartDate($user->getDateFormat());
+    $totals['end_date'] = $period->getEndDate($user->getDateFormat());
     $totals['time'] = $total_time;
     $totals['minutes'] = $val['time'] / 60;
     $totals['units'] = isset($val['units']) ? $val['units'] : null;
diff --git a/initialize.php b/initialize.php
index 7fbdc50ff..88849a738 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5703");
+define("APP_VERSION", "1.21.4.5705");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 83b155b827c5ec9923b6aadd74ad462f7d8e3b61 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 16:31:38 +0000
Subject: [PATCH 1730/1848] Refactoring. Fully replaced older Period class
 usage with newer ttPeriod.

---
 WEB-INF/lib/Period.class.php            | 136 ------------------------
 WEB-INF/lib/ttTimesheetHelper.class.php |  14 +--
 initialize.php                          |   2 +-
 3 files changed, 9 insertions(+), 143 deletions(-)
 delete mode 100644 WEB-INF/lib/Period.class.php

diff --git a/WEB-INF/lib/Period.class.php b/WEB-INF/lib/Period.class.php
deleted file mode 100644
index 57ea0e44c..000000000
--- a/WEB-INF/lib/Period.class.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-define('INTERVAL_THIS_DAY', 1);
-define('INTERVAL_THIS_WEEK', 2);
-define('INTERVAL_THIS_MONTH', 3);
-define('INTERVAL_THIS_YEAR', 4);
-define('INTERVAL_ALL_TIME', 5);
-define('INTERVAL_LAST_WEEK', 6);
-define('INTERVAL_LAST_MONTH', 7);
-define('INTERVAL_LAST_DAY', 8);
-
-/*
-// Definitions for refactored code. TODO: uncomment when done.
-define('INTERVAL_ALL_TIME', 0);
-define('INTERVAL_CURRENT_YEAR', 10);
-define('INTERVAL_PREVIOUS_YEAR', 14);
-define('INTERVAL_SELECTED_YEAR', 18);
-define('INTERVAL_CURRENT_MONTH', 20);
-define('INTERVAL_PREVIOUS_MONTH', 24);
-define('INTERVAL_SELECTED_MONTH', 28);
-define('INTERVAL_CURRENT_WEEK', 30);
-define('INTERVAL_PREVIOUS_WEEK', 34);
-define('INTERVAL_SELECTED_WEEK', 38);
-define('INTERVAL_CURRENT_DAY', 40);
-define('INTERVAL_PREVIOUS_DAY', 44);
-define('INTERVAL_SELECTED_DAY', 48);
-*/
-
-// TODO: Refactoring is needed for this class. Probably by refactoring DateAndTime first, as Period is
-// basically a collection of 2 DateAndTime instances.
-//
-// Second problem is that "today" is (most likely?) server today, so reports may give incorrect dates
-// for browser users in different time zones. Verify and fix this.
-class Period {
-  var $startDate; // DateAndTime object.
-  var $endDate;   // DateAndTime object.
-
-  function __construct($period_type = 0, $date_point = null) {
-
-    global $user;
-
-    if (!$date_point || !($date_point instanceof DateAndTime))
-      $date_point = new DateAndTime(); // Represents current date. TODO: verify this is needed, as this is server time, not browser today.
-
-    // TODO: refactoring ongoing down from here. Make code nicer, etc.
-    $weekStartDay = $user->getWeekStart();
-
-		$this->startDate = new DateAndTime();
-		$this->startDate->setFormat($date_point->getFormat());
-		$this->endDate = new DateAndTime();
-		$this->endDate->setFormat($date_point->getFormat());
-		$t_arr = localtime($date_point->getTimestamp());
-		$t_arr[5] = $t_arr[5] + 1900;
-
-		if ($t_arr[6] < $weekStartDay) {
-		  $startWeekBias = $weekStartDay - 7;
-		} else {
-		  $startWeekBias = $weekStartDay;
-		}
-
-		switch ($period_type) {
-			case INTERVAL_THIS_DAY:
-                            $this->startDate->setTimestamp($date_point->getTimestamp());
-                            $this->endDate->setTimestamp($date_point->getTimestamp());
-                        break;
-
-                        case INTERVAL_LAST_DAY:
-                            $this->startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
-                            $this->endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
-                        break;
-
-			case INTERVAL_THIS_WEEK:
-			  $this->startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
-				$this->endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
-			break;
-			case INTERVAL_LAST_WEEK:
-				$this->startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-7+$startWeekBias,$t_arr[5]));
-				$this->endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-1+$startWeekBias,$t_arr[5]));
-			break;
-			case INTERVAL_THIS_MONTH:
-				$this->startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,1,$t_arr[5]));
-				$this->endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
-			break;
-			case INTERVAL_LAST_MONTH:
-				$this->startDate->setTimestamp(mktime(0,0,0,$t_arr[4],1,$t_arr[5]));
-				$this->endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,0,$t_arr[5]));
-			break;
-
-			case INTERVAL_THIS_YEAR:
-				$this->startDate->setTimestamp(mktime(0, 0, 0, 1, 1, $t_arr[5]));
-				$this->endDate->setTimestamp(mktime(0, 0, 0, 12, 31, $t_arr[5]));
-			break;
-		}
-	}
-
-	function setPeriod($b_date, $e_date) {
-		$this->startDate = $b_date;
-		$this->endDate = $e_date;
-	}
-
-	// return date string
-	function getStartDate($format="") {
-		return $this->startDate->toString($format);
-	}
-
-	// return date string
-	function getEndDate($format="") {
-		return $this->endDate->toString($format);
-	}
-}
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 5ca3abe66..ec2032efb 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -4,6 +4,8 @@
 
 import('ttUserHelper');
 import('ttFileHelper');
+import('ttPeriod');
+import('ttDate');
 
 // Class ttTimesheetHelper is used to help with project related tasks.
 class ttTimesheetHelper {
@@ -545,15 +547,15 @@ static function getMatchingTimesheets($options) {
     // Determine start and end dates.
     $dateFormat = $user->getDateFormat();
     if ($options['period'])
-      $period = new Period($options['period'], new DateAndTime($dateFormat));
+      $period = new ttPeriod(new ttDate(), $options['period']);
     else {
-      $period = new Period();
+      $period = new ttPeriod(new ttDate());
       $period->setPeriod(
-        new DateAndTime($dateFormat, $options['period_start']),
-        new DateAndTime($dateFormat, $options['period_end']));
+        new ttDate($options['period_start'], $dateFormat),
+        new ttDate($options['period_end'], $dateFormat));
     }
-    $start = $period->getStartDate(DB_DATEFORMAT);
-    $end = $period->getEndDate(DB_DATEFORMAT);
+    $start = $period->getStartDate();
+    $end = $period->getEndDate();
 
     $result = false;
     $sql = "select id, name from tt_timesheets".
diff --git a/initialize.php b/initialize.php
index 88849a738..242fa0ab4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5705");
+define("APP_VERSION", "1.21.4.5706");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 87386884d31673d31421cfb331f0957dc28ae971 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 16:45:51 +0000
Subject: [PATCH 1731/1848] Incremental refactoring.

---
 WEB-INF/lib/ttInvoiceHelper.class.php   | 8 ++++----
 WEB-INF/lib/ttReportHelper.class.php    | 4 ++--
 WEB-INF/lib/ttTimesheetHelper.class.php | 2 +-
 initialize.php                          | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 9a20730ae..3fa4f2ce1 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -226,11 +226,11 @@ static function invoiceableItemsExist($fields) {
 
     $client_id = (int) $fields['client_id'];
 
-    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
-    $start = $start_date->toString(DB_DATEFORMAT);
+    $start_date = new ttDate($fields['start_date'], $user->getDateFormat());
+    $start = $start_date->toString();
 
-    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
-    $end = $end_date->toString(DB_DATEFORMAT);
+    $end_date = new ttDate($fields['end_date'], $user->getDateFormat());
+    $end = $end_date->toString();
 
     $project_id = null;
     $project_part = '';
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 995cfa2b4..693fe6521 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -118,7 +118,7 @@ static function getWhere($options) {
 
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
-    if ($options['period'])
+    if (isset($options['period']) && $options['period'])
       $period = new ttPeriod(new ttDate(), $options['period']);
     else {
       $period = new ttPeriod(new ttDate());
@@ -200,7 +200,7 @@ static function getExpenseWhere($options) {
 
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
-    if ($options['period'])
+    if (isset($options['period']) && $options['period'])
       $period = new ttPeriod(new ttDate(), $options['period']);
     else {
       $period = new ttPeriod(new ttDate());
diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index ec2032efb..070d31d7b 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -546,7 +546,7 @@ static function getMatchingTimesheets($options) {
 
     // Determine start and end dates.
     $dateFormat = $user->getDateFormat();
-    if ($options['period'])
+    if (isset($options['period']) && $options['period'])
       $period = new ttPeriod(new ttDate(), $options['period']);
     else {
       $period = new ttPeriod(new ttDate());
diff --git a/initialize.php b/initialize.php
index 242fa0ab4..ee6c46922 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5706");
+define("APP_VERSION", "1.21.4.5707");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a299407343dd43cb46a90ac3063fa9bcc5b7d700 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 17:01:00 +0000
Subject: [PATCH 1732/1848] A bit more refactoring.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 17 ++++++++---------
 initialize.php                        |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 3fa4f2ce1..2ac63db44 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -3,7 +3,7 @@
 License: See license.txt */
 
 import('ttClientHelper');
-import('DateAndTime');
+import('ttDate');
 
 // Class ttInvoiceHelper is used for help with invoices.
 class ttInvoiceHelper {
@@ -159,9 +159,8 @@ static function getInvoiceItems($invoice_id) {
 
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
-      $dt = new DateAndTime(DB_DATEFORMAT);
       while ($val = $res->fetchRow()) {
-        $dt->parseVal($val['date']);
+        $dt = new ttDate($val['date']);
         $val['date'] = $dt->toString($user->getDateFormat());
         $result[] = $val;
       }
@@ -304,14 +303,14 @@ static function createInvoice($fields) {
 
     $client_id = (int) $fields['client_id'];
 
-    $invoice_date = new DateAndTime($user->date_format, $fields['date']);
-    $date = $invoice_date->toString(DB_DATEFORMAT);
+    $invoice_date = new ttDate($fields['date'], $user->getDateFormat());
+    $date = $invoice_date->toString();
 
-    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
-    $start = $start_date->toString(DB_DATEFORMAT);
+    $start_date = new ttDate($fields['start_date'], $user->getDateFormat());
+    $start = $start_date->toString();
 
-    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
-    $end = $end_date->toString(DB_DATEFORMAT);
+    $end_date = new ttDate($fields['end_date'], $user->getDateFormat());
+    $end = $end_date->toString();
 
     $project_id = null;
     $project_part = '';
diff --git a/initialize.php b/initialize.php
index ee6c46922..97e7b7701 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5707");
+define("APP_VERSION", "1.21.4.5708");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d17164a8ecd5880d4b16a5eff98bd130566bc5ce Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 17:54:04 +0000
Subject: [PATCH 1733/1848] More progress with refactoring.

---
 WEB-INF/lib/ttTimesheetHelper.class.php | 24 ++++++++++++------------
 initialize.php                          |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 070d31d7b..16d740291 100644
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -47,11 +47,11 @@ static function createTimesheet($fields)
     $name = $fields['name'];
     $comment = $fields['comment'];
 
-    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
-    $start = $start_date->toString(DB_DATEFORMAT);
+    $start_date = new ttDate($fields['start_date'], $user->getDateFormat());
+    $start = $start_date->toString();
 
-    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
-    $end = $end_date->toString(DB_DATEFORMAT);
+    $end_date = new ttDate($fields['end_date'], $user->getDateFormat());
+    $end = $end_date->toString();
 
     $created_part = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
 
@@ -448,11 +448,11 @@ static function timesheetItemsExist($fields) {
     if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
-    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
-    $start = $start_date->toString(DB_DATEFORMAT);
+    $start_date = new ttDate($fields['start_date'], $user->getDateFormat());
+    $start = $start_date->toString();
 
-    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
-    $end = $end_date->toString(DB_DATEFORMAT);
+    $end_date = new ttDate($fields['end_date'], $user->getDateFormat());
+    $end = $end_date->toString();
 
     // sql parts.
     $client_part = $project_part = '';
@@ -488,12 +488,12 @@ static function overlaps($fields) {
     if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
 
-    $start_date = new DateAndTime($user->date_format, $fields['start_date']);
-    $start = $start_date->toString(DB_DATEFORMAT);
+    $start_date = new ttDate($fields['start_date'], $user->getDateFormat());
+    $start = $start_date->toString();
     $quoted_start = $mdb2->quote($start);
 
-    $end_date = new DateAndTime($user->date_format, $fields['end_date']);
-    $end = $end_date->toString(DB_DATEFORMAT);
+    $end_date = new ttDate($fields['end_date'], $user->getDateFormat());
+    $end = $end_date->toString();
     $quoted_end = $mdb2->quote($end);
 
     // sql parts.
diff --git a/initialize.php b/initialize.php
index 97e7b7701..b567181c4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5708");
+define("APP_VERSION", "1.21.4.5709");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 24d68b74cec8556cb594366e59a75d2107ff1e3c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 19:29:44 +0000
Subject: [PATCH 1734/1848] Fixed loading fav reports.

---
 WEB-INF/lib/form/ActionForm.class.php   | 8 ++++----
 WEB-INF/lib/ttFavReportHelper.class.php | 9 +++++----
 initialize.php                          | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index 5b88292c4..253091b48 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -88,8 +88,8 @@ function setAttribute($name,$value) {
         if ($this->mForm) {
         	if (isset($this->mForm->elements[$name])) {
         		if ($this->mForm->elements[$name]->class=="DateField") {
-                            // TODO: It appears that we never get here. Refactor this entire class.
-                            $dt = new ttDate($user->date_format, $value);
+                            // We get here when loading a fav report. Refactor this entire class.
+                            $dt = new ttDate($value, $user->getDateFormat());
                             $value = $dt->toString();
         		}
         		$this->mForm->elements[$name]->setValueSafe($value);
@@ -118,8 +118,8 @@ function setAttributes($value) {
 	        if ($this->mForm) {
 	        	if (isset($this->mForm->elements[$name])) {
 	        		if ($this->mForm->elements[$name]->class=="DateField") {
-                                    // TODO: It appears that we never get here. Refactor this entire class.
-                                    $dt = new ttDate($user->date_format, $value);
+                                    // We get here when changing to --- no --- fav report. Refactor this entire class.
+                                    $dt = new ttDate($value, $user->getDateFormat());
                                     $value = $dt->toString();
 	        		}
 	        		$this->mForm->elements[$name]->setValueSafe($value);
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 303750d63..9e1827e09 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -3,6 +3,7 @@
 License: See license.txt */
 
 import('ttGroupHelper');
+import('ttDate');
 
 // Class ttFavReportHelper is used to help with favorite report related tasks.
 class ttFavReportHelper {
@@ -212,12 +213,12 @@ static function saveReport($bean) {
     }
 
     if ($bean->getAttribute('start_date')) {
-      $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
-      $from = $dt->toString(DB_DATEFORMAT);
+      $dt = new ttDate($bean->getAttribute('start_date'), $user->getDateFormat());
+      $from = $dt->toString();
     }
     if ($bean->getAttribute('end_date')) {
-      $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
-      $to = $dt->toString(DB_DATEFORMAT);
+      $dt = new ttDate($bean->getAttribute('end_date'), $user->getDateFormat());
+      $to = $dt->toString();
     }
 
     $fields = array(
diff --git a/initialize.php b/initialize.php
index b567181c4..17750f01b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.4.5709");
+define("APP_VERSION", "1.21.5.5710");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 7478a60d4496328cf020a94c6e8b5b02aece11ab Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 11 Apr 2022 20:41:55 +0000
Subject: [PATCH 1735/1848] Refactoring. Finished replacing older DateAndTime
 class with newer ttDate class.

---
 WEB-INF/lib/DateAndTime.class.php       | 348 ------------------------
 WEB-INF/lib/form/DateField.class.php    |  14 +-
 WEB-INF/lib/ttDate.class.php            |   1 -
 WEB-INF/lib/ttFavReportHelper.class.php |   4 +-
 4 files changed, 7 insertions(+), 360 deletions(-)
 delete mode 100644 WEB-INF/lib/DateAndTime.class.php

diff --git a/WEB-INF/lib/DateAndTime.class.php b/WEB-INF/lib/DateAndTime.class.php
deleted file mode 100644
index e72245985..000000000
--- a/WEB-INF/lib/DateAndTime.class.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?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
-// +----------------------------------------------------------------------+
-
-/**
- * Parse a time/date generated with strftime().
- *
- * This function is the same as the original one defined by PHP (Linux/Unix only),
- *  but now you can use it on Windows too.
- *  Limitation : Only this format can be parsed %S, %M, %H, %d, %m, %Y
- *
- * @author Lionel SAURON
- * @version 1.0
- * @public
- *
- * @param $sDate(string)    The string to parse (e.g. returned from strftime()).
- * @param $sFormat(string)  The format used in date  (e.g. the same as used in strftime()).
- * @return (array)          Returns an array with the <code>$sDate</code> parsed, or <code>false</code> on error.
- */
-
-function my_strptime($sDate, $sFormat)
-{
-    $aResult = array
-    (
-        'tm_sec'   => 0,
-        'tm_min'   => 0,
-        'tm_hour'  => 0,
-        'tm_mday'  => 1,
-        'tm_mon'   => 0,
-        'tm_year'  => 0,
-        'tm_wday'  => 0,
-        'tm_yday'  => 0,
-        'unparsed' => $sDate,
-    );
-
-    while($sFormat != "")
-    {
-        // ===== Search a %x element, Check the static string before the %x =====
-        $nIdxFound = strpos($sFormat, '%');
-        if($nIdxFound === false)
-        {
-
-            // There is no more format. Check the last static string.
-            $aResult['unparsed'] = ($sFormat == $sDate) ? "" : $sDate;
-            break;
-        }
-
-        $sFormatBefore = mb_substr($sFormat, 0, $nIdxFound);
-        $sDateBefore   = mb_substr($sDate,   0, $nIdxFound);
-
-        if($sFormatBefore != $sDateBefore) break;
-
-        // ===== Read the value of the %x found =====
-        $sFormat = mb_substr($sFormat, $nIdxFound);
-        $sDate   = mb_substr($sDate,   $nIdxFound);
-
-        $aResult['unparsed'] = $sDate;
-
-        $sFormatCurrent = mb_substr($sFormat, 0, 2);
-        $sFormatAfter   = mb_substr($sFormat, 2);
-
-        $nValue = -1;
-        $sDateAfter = "";
-        switch($sFormatCurrent)
-        {
-            case '%S': // Seconds after the minute (0-59)
-
-                sscanf($sDate, "%2d%[^\\n]", $nValue, $sDateAfter);
-
-                if(($nValue < 0) || ($nValue > 59)) return false;
-
-                $aResult['tm_sec']  = $nValue;
-                break;
-
-            // ----------
-            case '%M': // Minutes after the hour (0-59)
-                sscanf($sDate, "%2d%[^\\n]", $nValue, $sDateAfter);
-
-                if(($nValue < 0) || ($nValue > 59)) return false;
-
-                $aResult['tm_min']  = $nValue;
-                break;
-
-            // ----------
-            case '%H': // Hour since midnight (0-23)
-                sscanf($sDate, "%2d%[^\\n]", $nValue, $sDateAfter);
-
-                if(($nValue < 0) || ($nValue > 23)) return false;
-
-                $aResult['tm_hour']  = $nValue;
-                break;
-
-            // ----------
-            case '%d': // Day of the month (1-31)
-                sscanf($sDate, "%2d%[^\\n]", $nValue, $sDateAfter);
-
-                if(($nValue < 1) || ($nValue > 31)) return false;
-
-                $aResult['tm_mday']  = $nValue;
-                break;
-
-            // ----------
-            case '%m': // Months since January (0-11)
-                sscanf($sDate, "%2d%[^\\n]", $nValue, $sDateAfter);
-
-                if(($nValue < 1) || ($nValue > 12)) return false;
-
-                $aResult['tm_mon']  = ($nValue - 1);
-                break;
-
-            // ----------
-            case '%Y': // Years since 1900
-                sscanf($sDate, "%4d%[^\\n]", $nValue, $sDateAfter);
-
-                if($nValue < 1900) return false;
-
-                $aResult['tm_year']  = ($nValue - 1900);
-                break;
-
-            // ----------
-            default:
-              //sscanf($sDate, "%s%[^\\n]", $skip, $sDateAfter);
-              preg_match('/^(.+)(\s|$)/uU', $sDate, $matches);
-              if (isset($matches[1])) {
-                $sDateAfter = mb_substr($sDate, mb_strlen($matches[1]));
-              } else {
-                $sDateAfter = '';
-              }
-              //break 2; // Break Switch and while
-              break;
-        }
-
-        // ===== Next please =====
-        $sFormat = $sFormatAfter;
-        $sDate   = $sDateAfter;
-
-        $aResult['unparsed'] = $sDate;
-
-    } // END while($sFormat != "")
-
-
-    // ===== Create the other value of the result array =====
-    $nParsedDateTimestamp = mktime($aResult['tm_hour'], $aResult['tm_min'], $aResult['tm_sec'],
-                            $aResult['tm_mon'] + 1, $aResult['tm_mday'], $aResult['tm_year'] + 1900);
-
-    // Before PHP 5.1 return -1 when error
-    if(($nParsedDateTimestamp === false)
-    ||($nParsedDateTimestamp === -1)) return false;
-
-    $aResult['tm_wday'] = (int) strftime("%w", $nParsedDateTimestamp); // Days since Sunday (0-6)
-    $aResult['tm_yday'] = (strftime("%j", $nParsedDateTimestamp) - 1); // Days since January 1 (0-365)
-
-    return $aResult;
-} // END of function
-
-class DateAndTime {
-  var $mHour = 0;
-  var $mMinute = 0;
-  var $mSecond = 0;
-  var $mMonth;
-  var $mDay;   // day of week
-  var $mDate;  // day of month
-  var $mYear;
-  var $mIntrFormat = "%d.%m.%Y %H:%M:%S"; //29.02.2004 16:21:42 internal format date
-  var $mLocalFormat;
-  var $mParseResult = 0;
-  var $mAutoComplete = true;
-
-  /**
-   * Constructor
-   *
-   * @param String $format
-   * @param String $strfDateTime
-   * @return DateAndTime
-   */
-  function __construct($format="",$strfDateTime="") {
-    $this->mLocalFormat = ($format ? $format : $this->mIntrFormat);
-    $d = ($strfDateTime ? $strfDateTime : $this->do_strftime($this->mLocalFormat));
-    $this->parseVal($d);
-  }
-
-  function setFormat($format) {
-    $this->mLocalFormat = $format;
-  }
-
-  function getFormat() {
-    return $this->mLocalFormat;
-  }
-
-  //01 to 31
-  function getDate() { return $this->mDate; }
-
-  //0 (for Sunday) through 6 (for Saturday)
-  function getDay() { return $this->mDay; }
-
-  //01 through 12
-  function getMonth() { return $this->mMonth; }
-
-  //1999 or 2003
-  function getYear() { return $this->mYear; }
-
-  function setDate($value) { $this->mDate = $value; }
-  function setMonth($value) { $this->mMonth = $value; }
-  function setYear($value) { $this->mYear = $value; }
-
-  function setTimestamp($ts) {
-    $this->mDate = date("d",$ts);
-    $this->mDay = date("w",$ts);
-    $this->mMonth = date("m",$ts);
-    $this->mYear = date("Y",$ts);
-    $this->mHour = date("H",$ts);
-    $this->mMinute = date("i",$ts);
-    $this->mSecond = date("s",$ts);
-  }
-
-  /**
-   * Return UNIX timestamp
-   */
-  function getTimestamp() {
-    return @mktime($this->mHour, $this->mMinute, $this->mSecond, $this->mMonth, $this->mDate, $this->mYear);
-  }
-
-  function compare($datetime) {
-    $ts1 = $this->getTimestamp();
-    $ts2 = $datetime->getTimestamp();
-    if ($ts1<$ts2) return -1;
-    if ($ts1==$ts2) return 0;
-    if ($ts1>$ts2) return 1;
-  }
-
-  function toString($format="") {
-    if ($this->mParseResult==0) {
-      if ($format) {
-        return $this->do_strftime($format, $this->getTimestamp());
-      } else {
-        return $this->do_strftime($this->mLocalFormat, $this->getTimestamp());
-      }
-    } else {
-      if ($format) {
-        return $this->do_strftime($format);
-      } else {
-        return $this->do_strftime($this->mLocalFormat);
-      }
-    }
-  }
-
-  function parseVal($szDate, $format="") {
-    $useformat = ($format ? $format : $this->mLocalFormat);
-    $res = my_strptime($szDate, $useformat);
-    if ($res !== false) {
-      $this->mDate = $res['tm_mday'];
-      $this->mDay = $res['tm_wday'];
-      $this->mMonth = $res['tm_mon'] + 1; // tm_mon - Months since January (0-11)
-      $this->mYear = 1900 + $res['tm_year']; // tm_year - Years since 1900
-      $this->mHour = $res['tm_hour'];
-      $this->mMinute = $res['tm_min'];
-      $this->mSecond = $res['tm_sec'];
-      $this->mParseResult = 0;
-    } elseif ($this->mAutoComplete) {
-      $this->setTimestamp(time());
-      $this->mParseResult = 1;
-    }
-  }
-
-  function isError() {
-    if ($this->mParseResult != 0) return true;
-    return false;
-  }
-
-  function before(/*DateAndTime*/ $obj) {
-    if ($this->getTimestamp() < $obj->getTimestamp()) return true;
-    return false;
-  }
-
-  function after(/*DateAndTime*/ $obj) {
-    if ($this->getTimestamp() > $obj->getTimestamp()) return true;
-    return false;
-  }
-
-  function equals(/*DateAndTime*/ $obj) {
-    if ($this->getTimestamp() == $obj->getTimestamp()) return true;
-    return false;
-  }
-
-  function decDay(/*int*/$days=1) {
-    $this->setTimestamp(@mktime($this->mHour, $this->mMinute, $this->mSecond, $this->mMonth, $this->mDate - $days, $this->mYear));
-  }
-
-  function incDay(/*int*/$days=1) {
-    $this->setTimestamp(@mktime($this->mHour, $this->mMinute, $this->mSecond, $this->mMonth, $this->mDate + $days, $this->mYear));
-  }
-
-  /**
-   * @param $format string Datetime format string
-   * @return string Preprocessed string with all locale-depended format
-   *                characters replaced by localized i18n strings.
-   */
-  function preprocessFormatString($format) {
-    global $i18n;
-
-    // replace locale-dependent strings
-    $format = str_replace('%a', mb_substr($i18n->getWeekDayName($this->mDay), 0, 3, 'utf-8'), $format);
-    $format = str_replace('%A', $i18n->getWeekDayName($this->mDay), $format);
-    /* This block is commented out because we currently do not use these formatters.
-    $abbrev_month = mb_substr($i18n->monthNames[$this->mMonth], 0, 3, 'utf-8');
-    $format = str_replace('%b', $abbrev_month, $format);
-    $format = str_replace('%h', $abbrev_month, $format);
-    $format = str_replace('%z', date('O'), $format);
-    $format = str_replace('%Z', date('O'), $format); // format as 'O' for consistency with JS strftime
-    if (strpos($format, '%c') !== false) {
-      $format = str_replace('%c', $this->preprocessFormatString('%a %d %b %Y %T %Z'), $format);
-    }*/
-    return $format;
-  }
-
-  function do_strftime($format, $timestamp = null)
-  {
-    if (!is_null($timestamp)) {
-      return strftime($this->preprocessFormatString($format), $timestamp);
-    } else {
-      return strftime($this->preprocessFormatString($format));
-    }
-  }
-}
diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index 922e8bf5e..d349d5687 100644
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -3,20 +3,18 @@
 License: See license.txt */
 
 import('form.TextField');
-import('DateAndTime');
+import('ttDate');
 
 class DateField extends TextField {
   var $mWeekStartDay = 0;
   var $mDateFormat  = "d/m/Y";
   var $lToday      = "Today";
-  var $mDateObj;
 
   var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close');
 
   function __construct($name) {
     $this->class = 'DateField';
     $this->name = $name;
-    $this->mDateObj = new DateAndTime();
     $this->localize();
   }
 
@@ -24,8 +22,6 @@ function localize()  {
     global $user;
     global $i18n;
   	
-    $this->mDateObj->setFormat($user->getDateFormat());
-
     $this->mMonthNames = $i18n->monthNames;
     $this->mWeekDayShortNames = $i18n->weekdayShortNames;
     $this->lToday = $i18n->get('label.today');
@@ -39,15 +35,15 @@ function localize()  {
   // set current value taken from session or database
   function setValueSafe($value)  {
     if (isset($value) && (strlen($value) > 0)) {
-      $this->mDateObj->parseVal($value, DB_DATEFORMAT);
-      $this->value = $this->mDateObj->toString($this->mDateFormat); //?
+      $ttDate = new ttDate($value);
+      $this->value = $ttDate->toString($this->mDateFormat);
     }
   }
   // get value for storing in session or database
   function getValueSafe() {
     if (strlen($this->value)>0) {
-      $this->mDateObj->parseVal($this->value, $this->mDateFormat);  //?
-      return $this->mDateObj->toString(DB_DATEFORMAT);
+      $ttDate = new ttDate($this->value, $this->mDateFormat);
+      return $ttDate->toString();
     } else {
       return null;
     }
diff --git a/WEB-INF/lib/ttDate.class.php b/WEB-INF/lib/ttDate.class.php
index 3b798214a..25dc4874a 100644
--- a/WEB-INF/lib/ttDate.class.php
+++ b/WEB-INF/lib/ttDate.class.php
@@ -5,7 +5,6 @@
 import('I18n');
 
 // ttDate class is used to represent a date in Time Tracker.
-// It is a planned replacement for DateAndTime class, which is problematic with php8.1.
 class ttDate {
 
   var $year;          // year
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 9e1827e09..3de0c94c9 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -340,11 +340,11 @@ static function loadReport(&$bean) {
       $bean->setAttribute('users_inactive', explode(',', $val['users']));
       $bean->setAttribute('period', $val['period']);
       if ($val['period_start']) {
-        $dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);
+        $dt = new ttDate($val['period_start']);
         $bean->setAttribute('start_date', $dt->toString($user->getDateFormat()));
       }
       if ($val['period_end']) {
-        $dt = new DateAndTime(DB_DATEFORMAT, $val['period_end']);
+        $dt = new ttDate($val['period_end']);
         $bean->setAttribute('end_date', $dt->toString($user->getDateFormat()));
       }
       $bean->setAttribute('chclient', $val['show_client']);

From 886f8979d84e84a4b67207ec512d5e794f34e455 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Apr 2022 14:19:03 +0000
Subject: [PATCH 1736/1848] Fixed ttUser::getUserDetails to work on top
 managers in subgroups.

---
 WEB-INF/lib/ttUser.class.php | 2 +-
 initialize.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 7114bc7c6..e0565b3dd 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -603,7 +603,7 @@ function getUserDetails($user_id) {
 
     // Determine max rank. If we are searching in on behalf group
     // then rank restriction does not apply.
-    $max_rank = $this->behalfGroup ? MAX_RANK : $this->rank;
+    $max_rank = $this->behalfGroup ? MAX_RANK + 1 : $this->rank;
 
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.quota_percent, u.email from tt_users u".
       " left join tt_roles r on (u.role_id = r.id)".
diff --git a/initialize.php b/initialize.php
index 17750f01b..8709beede 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.5.5710");
+define("APP_VERSION", "1.21.5.5712");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b292d803a1bd81bb82cff089e7d19e2786e7319a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Apr 2022 16:02:52 +0000
Subject: [PATCH 1737/1848] Fixed browser_today population on time.php.

---
 WEB-INF/templates/time.tpl | 2 +-
 initialize.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index b04959cfc..6f6f73942 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -122,7 +122,7 @@ function handleStop(buttonElement) {
 
 {if $time_records}
 <input type="hidden" id="record_id" name="record_id">
-<input type="hidden" id="browser_today" name="browser_date">
+<input type="hidden" id="browser_date" name="browser_date">
 <input type="hidden" id="browser_time" name="browser_time">
 <div class="record-list">
 <table class="x-scrollable-table">
diff --git a/initialize.php b/initialize.php
index 8709beede..b5707136e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.5.5712");
+define("APP_VERSION", "1.21.5.5713");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e5a3f1ce50205b3fa4b6bc1ca3570ab29e75d101 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Apr 2022 18:06:47 +0000
Subject: [PATCH 1738/1848] Improved a check for browser today.

---
 WEB-INF/lib/common.lib.php | 16 ++++++++++++++++
 expense_edit.php           |  2 +-
 expenses.php               |  2 +-
 initialize.php             |  2 +-
 puncher.php                |  2 +-
 time.php                   |  4 ++--
 time_edit.php              |  2 +-
 week.php                   |  2 +-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 2d8e287d5..52d82ed36 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -308,6 +308,22 @@ function ttValidDbDateFormatDate($val)
   return checkdate($date_parts[1], $date_parts[2], $date_parts[0]);
 }
 
+// ttValidBrowserToday is used to check browser today parameter for sanity.
+function ttValidBrowserToday($val)
+{
+  if (!ttValidDbDateFormatDate($val))
+    return false;
+
+  // Check if browser today is after server tomorrow.
+  $browser_today = new ttDate($val);
+  $server_tomorrow = new ttDate();
+  $server_tomorrow->incrementDay();
+  if ($browser_today->after($server_tomorrow))
+      return false;
+
+  return true;
+}
+
 // ttValidTime is used to check user input for time post.
 function ttValidTime($val)
 {
diff --git a/expense_edit.php b/expense_edit.php
index e57db88d9..0281c2cff 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -30,7 +30,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+  if ($browser_today && !ttValidBrowserToday($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
diff --git a/expenses.php b/expenses.php
index 34169b7dc..b86c34d5a 100644
--- a/expenses.php
+++ b/expenses.php
@@ -47,7 +47,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+  if ($browser_today && !ttValidBrowserToday($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
diff --git a/initialize.php b/initialize.php
index b5707136e..f91645a76 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.5.5713");
+define("APP_VERSION", "1.21.5.5714");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 2b25462d3..b959dcfbc 100644
--- a/puncher.php
+++ b/puncher.php
@@ -24,7 +24,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+  if ($browser_today && !ttValidBrowserToday($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
diff --git a/time.php b/time.php
index faf064a4a..329203449 100644
--- a/time.php
+++ b/time.php
@@ -41,7 +41,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+  if ($browser_today && !ttValidBrowserToday($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
@@ -59,7 +59,7 @@
 
   // Validate that browser_date parameter is in correct format.
   $browser_date = $request->getParameter('browser_date');
-  if ($browser_date && !ttValidDbDateFormatDate($browser_date)) {
+  if ($browser_date && !ttValidBrowserToday($browser_date)) {
     header('Location: access_denied.php');
     exit();
   }
diff --git a/time_edit.php b/time_edit.php
index 03c721193..ad673ffe1 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -27,7 +27,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+  if ($browser_today && !ttValidBrowserToday($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
diff --git a/week.php b/week.php
index 92eb95ee3..cb3a1d9f8 100644
--- a/week.php
+++ b/week.php
@@ -47,7 +47,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
+  if ($browser_today && !ttValidBrowserToday($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }

From aa5adfb54c3823b3172280be5914534e98279587 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Apr 2022 13:24:42 +0000
Subject: [PATCH 1739/1848] Improved handling of future entries by tolerating
 out of time synced browsers.

---
 WEB-INF/lib/common.lib.php | 16 ----------------
 expense_edit.php           |  6 ++++--
 expenses.php               |  6 ++++--
 initialize.php             |  2 +-
 puncher.php                |  2 +-
 time.php                   |  8 +++++---
 time_edit.php              |  6 ++++--
 week.php                   |  2 +-
 8 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 52d82ed36..2d8e287d5 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -308,22 +308,6 @@ function ttValidDbDateFormatDate($val)
   return checkdate($date_parts[1], $date_parts[2], $date_parts[0]);
 }
 
-// ttValidBrowserToday is used to check browser today parameter for sanity.
-function ttValidBrowserToday($val)
-{
-  if (!ttValidDbDateFormatDate($val))
-    return false;
-
-  // Check if browser today is after server tomorrow.
-  $browser_today = new ttDate($val);
-  $server_tomorrow = new ttDate();
-  $server_tomorrow->incrementDay();
-  if ($browser_today->after($server_tomorrow))
-      return false;
-
-  return true;
-}
-
 // ttValidTime is used to check user input for time post.
 function ttValidTime($val)
 {
diff --git a/expense_edit.php b/expense_edit.php
index 0281c2cff..98098a19f 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -30,7 +30,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidBrowserToday($browser_today)) {
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
@@ -155,7 +155,9 @@
   // Prohibit creating entries in future.
   if (!$user->isOptionEnabled('future_entries')) {
     $browser_today = new ttDate($request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
+    $server_tomorrow = new ttDate();
+    $server_tomorrow->incrementDay();
+    if ($new_date->after($browser_today) || $new_date->after($server_tomorrow))
       $err->add($i18n->get('error.future_date'));
   }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
diff --git a/expenses.php b/expenses.php
index b86c34d5a..ba091a63e 100644
--- a/expenses.php
+++ b/expenses.php
@@ -47,7 +47,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidBrowserToday($browser_today)) {
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
@@ -203,7 +203,9 @@
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new ttDate($request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
+      $server_tomorrow = new ttDate();
+      $server_tomorrow->incrementDay();
+      if ($selected_date->after($browser_today) || $selected_date->after($server_tomorrow))
         $err->add($i18n->get('error.future_date'));
     }
     // Finished validating input data.
diff --git a/initialize.php b/initialize.php
index f91645a76..a67bd3444 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.5.5714");
+define("APP_VERSION", "1.21.5.5715");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index b959dcfbc..2b25462d3 100644
--- a/puncher.php
+++ b/puncher.php
@@ -24,7 +24,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidBrowserToday($browser_today)) {
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
diff --git a/time.php b/time.php
index 329203449..766ee5fd1 100644
--- a/time.php
+++ b/time.php
@@ -41,7 +41,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidBrowserToday($browser_today)) {
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
@@ -59,7 +59,7 @@
 
   // Validate that browser_date parameter is in correct format.
   $browser_date = $request->getParameter('browser_date');
-  if ($browser_date && !ttValidBrowserToday($browser_date)) {
+  if ($browser_date && !ttValidDbDateFormatDate($browser_date)) {
     header('Location: access_denied.php');
     exit();
   }
@@ -417,7 +417,9 @@
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries')) {
       $browser_today = new ttDate($request->getParameter('browser_today', null));
-      if ($selected_date->after($browser_today))
+      $server_tomorrow = new ttDate();
+      $server_tomorrow->incrementDay();
+      if ($selected_date->after($browser_today) || $selected_date->after($server_tomorrow))
         $err->add($i18n->get('error.future_date'));
     }
 
diff --git a/time_edit.php b/time_edit.php
index ad673ffe1..7c3491eab 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -27,7 +27,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidBrowserToday($browser_today)) {
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }
@@ -332,7 +332,9 @@
   // Prohibit creating entries in future.
   if ($err->no() && !$user->isOptionEnabled('future_entries')) {
     $browser_today = new ttDate($request->getParameter('browser_today', null));
-    if ($new_date->after($browser_today))
+    $server_tomorrow = new ttDate();
+    $server_tomorrow->incrementDay();
+    if ($new_date->after($browser_today) || $new_date->after($server_tomorrow))
       $err->add($i18n->get('error.future_date'));
   }
 
diff --git a/week.php b/week.php
index cb3a1d9f8..92eb95ee3 100644
--- a/week.php
+++ b/week.php
@@ -47,7 +47,7 @@
 if ($request->isPost()) {
   // Validate that browser_today parameter is in correct format.
   $browser_today = $request->getParameter('browser_today');
-  if ($browser_today && !ttValidBrowserToday($browser_today)) {
+  if ($browser_today && !ttValidDbDateFormatDate($browser_today)) {
     header('Location: access_denied.php');
     exit();
   }

From 855e71a0b04fdc3bc449b961c56dcaa495daec3a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 16 Apr 2022 14:31:43 +0000
Subject: [PATCH 1740/1848] Cosmetic improvement to handling of future entries.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 4 +++-
 initialize.php                         | 2 +-
 puncher.php                            | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index deefd8a17..9908d12b4 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -504,7 +504,9 @@ static function insertDurationFromWeekView($fields, $custom_fields, $err) {
     // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries') && $fields['browser_today']) {
       $objBrowserToday = new ttDate($fields['browser_today']);
-      if ($objEntryDate->after($objBrowserToday)) {
+      $server_tomorrow = new ttDate();
+      $server_tomorrow->incrementDay();
+      if ($objEntryDate->after($objBrowserToday) || $objEntryDate->after($server_tomorrow)) {
         $err->add($i18n->get('error.future_date'));
         return false;
       }
diff --git a/initialize.php b/initialize.php
index a67bd3444..3a99f5184 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.5.5715");
+define("APP_VERSION", "1.21.5.5716");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 2b25462d3..9714ac242 100644
--- a/puncher.php
+++ b/puncher.php
@@ -235,9 +235,9 @@
     }
     // Finished validating user input.
 
-    // Prohibit creating entries in future. Tricky with a bogus browser_today data in post.
+    // Prohibit creating entries in future.
     if (!$user->isOptionEnabled('future_entries')) {
-      // Just check if the date we are using is after server tomorrow.
+      // $date_today is already browser_today, just check if the date we are using is after server tomorrow.
       $server_tomorrow = new ttDate();
       $server_tomorrow->incrementDay();
       if ($date_today->after($server_tomorrow))

From 38797d661ba091cc7fbb8f92e2a9dc4ef94f8750 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Apr 2022 15:55:49 +0000
Subject: [PATCH 1741/1848] Introduced an option defining whether or not to
 show weekends on week view.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  2 ++
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  2 ++
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  1 +
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/week_view.tpl  |  9 +++++++++
 initialize.php                   |  2 +-
 week.php                         | 27 ++++++++++++++++++++++++++-
 week_view.php                    |  4 ++++
 34 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 7964ede5e..1326d15aa 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -243,6 +243,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Només totals',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 5b930374b..d65c6dab3 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -252,6 +252,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Pouze součty',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9c4d6c216..3fba73805 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -236,6 +236,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Kun Total',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 2cf17c453..fe4874640 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -228,6 +228,8 @@
 'label.mark_paid' => 'Als bezahlt setzen',
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
+// TODO: translate the following:
+// 'label.weekends' => 'Weekends',
 'label.work_units' => 'Arbeitseinheiten',
 'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index bffac8f7b..5b433b0a6 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -214,6 +214,7 @@
 'label.mark_paid' => 'Mark paid',
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
+'label.weekends' => 'Weekends',
 'label.work_units' => 'Work units',
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3d16d8e27..f57f5795e 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -246,6 +246,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo totales',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 849eff788..57b92ff3c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -244,6 +244,8 @@
 'label.mark_paid' => 'Märgi makstuks',
 'label.week_note' => 'Nädala märge',
 'label.week_list' => 'Nädala nimekiri',
+// TODO: translate the following:
+// 'label.weekends' => 'Weekends',
 'label.work_units' => 'Töö ühikud',
 'label.work_units_short' => 'Ühikud',
 'label.totals_only' => 'Ainult summad',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index bdddffa4c..62b70671d 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -248,6 +248,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 074ee794b..fa1dd9739 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -240,6 +240,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Vain yhteissummat',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 548d6e0ce..7472ddf62 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -234,6 +234,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totaux uniquement',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4de8f91d2..93fb5fba5 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -229,6 +229,7 @@
 'label.week_note' => 'Σημείωση εβδομάδας',
 'label.week_list' => 'Λίστα εβδομάδων',
 // TODO: translate the following.
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Σύνολα μόνο',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6abbd474e..388622c2a 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -255,6 +255,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'labl.totals_only' => 'סיכומים בלבד',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index b90ffdc56..635147d8c 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -249,6 +249,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 34ca37457..55ea5deb4 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -233,6 +233,7 @@
 'label.week_note' => 'Nota settimanale',
 'label.week_list' => 'Lista settimanale',
 // TODO: translate the following.
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo i totali',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8794e2edd..0cf547754 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -252,6 +252,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => '全体だけ',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 69f6fd6ce..426484617 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -252,6 +252,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => '오직 전체만',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 012f9d148..eacfd5a17 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -209,6 +209,8 @@
 'label.mark_paid' => 'Markeer als betaald',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
+// TODO: translate the following.
+// 'label.weekends' => 'Weekends',
 'label.work_units' => 'Werk eenheid',
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 9ffef3209..dd92cc788 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -252,6 +252,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 430416f5b..50ac9c62d 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -241,6 +241,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Tylko sumy',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index d156ccda8..0b250d69c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -211,6 +211,8 @@
 'label.mark_paid' => 'Marcar como pago',
 'label.week_note' => 'Anotação da semana',
 'label.week_list' => 'Lista da semana',
+// TODO: translate the following.
+// 'label.weekends' => 'Weekends',
 'label.work_units' => 'Unidades de trabalho',
 'label.work_units_short' => 'Unidades',
 'label.totals_only' => 'Somente totais',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 4277ff18f..e7b16d92a 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -238,6 +238,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 755e2c470..b160169d4 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -250,6 +250,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Numai totaluri',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 61777ff47..f24aa6f7a 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -209,6 +209,7 @@
 'label.mark_paid' => 'Отметить оплату',
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Список недели',
+'label.weekends' => 'Выходные',
 'label.work_units' => 'Единицы работы',
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index fb8fae3e4..ca4f0535a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -244,6 +244,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Iba celkové',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 02e79b401..574c32f09 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -234,6 +234,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 3917fc0a1..068678867 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -240,6 +240,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 'label.totals_only' => 'Samo zbirno',
 // TODO: translate the following.
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index c638d213b..9f5725b86 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -235,6 +235,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Visa endast summeringar',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c55b901e5..f8fa7dd2b 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -257,6 +257,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Sadece toplamlar',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 2550f7589..ca1709d3b 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -245,6 +245,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 08928decc..c59a87efe 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -250,6 +250,7 @@
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.weekends' => 'Weekends',
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
diff --git a/WEB-INF/templates/week_view.tpl b/WEB-INF/templates/week_view.tpl
index 3226e0c44..00e6cd1d4 100644
--- a/WEB-INF/templates/week_view.tpl
+++ b/WEB-INF/templates/week_view.tpl
@@ -39,6 +39,15 @@ License: See license.txt *}
     </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  <tr class = "small-screen-label"><td><label for="notes">{$i18n.label.weekends}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="notes">{$i18n.label.weekends}:</label></td>
+    <td class="td-with-input">{$forms.weekViewForm.weekends.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_56.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_56.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 <div class="button-set">{$forms.weekViewForm.btn_save.control}</div>
 {$forms.weekViewForm.close}
diff --git a/initialize.php b/initialize.php
index 3a99f5184..7b2064ad4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.5.5716");
+define("APP_VERSION", "1.21.6.5717");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 92eb95ee3..302e4dfb3 100644
--- a/week.php
+++ b/week.php
@@ -73,6 +73,7 @@
 if ($showTask) $taskRequired = $user->getConfigOption('task_required');
 $showWeekNote = $user->isOptionEnabled('week_note');
 $showWeekNotes = $user->isOptionEnabled('week_notes');
+$showWeekends = $user->isOptionEnabled('weekends');
 $recordType = $user->getRecordType();
 $showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
 $showFiles = $user->isPluginEnabled('at');
@@ -158,6 +159,22 @@
 // Get column headers, which are day numbers in month.
 $dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString());
 $lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString());
+// If we are not showing weekends, reduce the above arrays to 5 days only.
+$weekend_start_idx = $weekend_end_idx = 0;
+if (!$showWeekends) {
+  if (defined('WEEKEND_START_DAY')) {
+    $weekend_start_idx = (7 + WEEKEND_START_DAY - $weekStartDay) % 7;
+    $weekend_end_idx = (7 + WEEKEND_START_DAY + 1 - $weekStartDay) % 7;
+  } else {
+    $weekend_start_idx = 6 - $weekStartDay;
+    $weekend_end_idx = (7 - $weekStartDay) % 7;
+  }
+  unset($dayHeaders[$weekend_start_idx]);
+  unset($dayHeaders[$weekend_end_idx]);
+  unset($lockedDays[$weekend_start_idx]);
+  unset($lockedDays[$weekend_end_idx]);
+}
+
 // Get already existing records.
 $records = ttWeekViewHelper::getRecordsForInterval($startDate->toString(), $endDate->toString(), $showFiles);
 // Build data array for the table. Format is described in ttWeekViewHelper::getDataForWeekView function.
@@ -273,8 +290,16 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $table->setData($dataArray);
 // Add columns to table.
 $table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label']));
+
+
+
 for ($i = 0; $i < 7; $i++) {
-  $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+  if ($showWeekends)
+    $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+  else {
+    if ($i <> $weekend_start_idx && $i <> $weekend_end_idx)
+      $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+  }
 }
 $table->setInteractive(false);
 $form->addInputElement($table);
diff --git a/week_view.php b/week_view.php
index 1718afd4b..7db10226a 100644
--- a/week_view.php
+++ b/week_view.php
@@ -18,11 +18,13 @@
   $cl_week_note = (bool)$request->getParameter('week_note');
   $cl_week_list = (bool)$request->getParameter('week_list');
   $cl_notes = (bool)$request->getParameter('notes');
+  $cl_weekends = (bool)$request->getParameter('weekends');
 } else {
   $cl_week_menu =  $config->getDefinedValue('week_menu');
   $cl_week_note = $config->getDefinedValue('week_note');
   $cl_week_list = $config->getDefinedValue('week_list');
   $cl_notes = $config->getDefinedValue('week_notes');
+  $cl_weekends = $config->getDefinedValue('weekends');
 }
 
 $form = new Form('weekViewForm');
@@ -30,6 +32,7 @@
 $form->addInput(array('type'=>'checkbox','name'=>'week_note','value'=>$cl_week_note));
 $form->addInput(array('type'=>'checkbox','name'=>'week_list','value'=>$cl_week_list));
 $form->addInput(array('type'=>'checkbox','name'=>'notes','value'=>$cl_notes));
+$form->addInput(array('type'=>'checkbox','name'=>'weekends','value'=>$cl_weekends));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
@@ -38,6 +41,7 @@
   $config->setDefinedValue('week_note', $cl_week_note);
   $config->setDefinedValue('week_list', $cl_week_list);
   $config->setDefinedValue('week_notes', $cl_notes);
+  $config->setDefinedValue('weekends', $cl_weekends);
   if (!$user->updateGroup(array('config' => $config->getConfig()))) {
     $err->add($i18n->get('error.db'));
   }

From f3ecd48c47df8af907cb46dec59cdd62793535e6 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 19 Apr 2022 16:00:27 +0000
Subject: [PATCH 1742/1848] Fixed label in html.

---
 WEB-INF/templates/week_view.tpl | 4 ++--
 initialize.php                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/week_view.tpl b/WEB-INF/templates/week_view.tpl
index 00e6cd1d4..9cd7b90a2 100644
--- a/WEB-INF/templates/week_view.tpl
+++ b/WEB-INF/templates/week_view.tpl
@@ -39,9 +39,9 @@ License: See license.txt *}
     </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-  <tr class = "small-screen-label"><td><label for="notes">{$i18n.label.weekends}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="weekends">{$i18n.label.weekends}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="notes">{$i18n.label.weekends}:</label></td>
+    <td class="large-screen-label"><label for="weekends">{$i18n.label.weekends}:</label></td>
     <td class="td-with-input">{$forms.weekViewForm.weekends.control}
       <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_56.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_56.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
diff --git a/initialize.php b/initialize.php
index 7b2064ad4..89c734ad6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.6.5717");
+define("APP_VERSION", "1.21.6.5718");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From dcfeafbc71bb9e1329f997bfc7e7b42050174453 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 26 Apr 2022 15:52:14 +0000
Subject: [PATCH 1743/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index eacfd5a17..949a3ac83 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -209,8 +209,7 @@
 'label.mark_paid' => 'Markeer als betaald',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
-// TODO: translate the following.
-// 'label.weekends' => 'Weekends',
+'label.weekends' => 'Weekeinden',
 'label.work_units' => 'Werk eenheid',
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
diff --git a/initialize.php b/initialize.php
index 89c734ad6..53810201d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.6.5718");
+define("APP_VERSION", "1.21.6.5719");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 761d451e6382b59fd96f133b5c9dc9cca3ccb753 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 30 Jun 2022 14:00:35 +0000
Subject: [PATCH 1744/1848] Starting to work on filtering by notes in reports.

---
 WEB-INF/resources/ca.lang.php    | 2 ++
 WEB-INF/resources/cs.lang.php    | 2 ++
 WEB-INF/resources/da.lang.php    | 2 ++
 WEB-INF/resources/de.lang.php    | 2 ++
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 2 ++
 WEB-INF/resources/et.lang.php    | 2 ++
 WEB-INF/resources/fa.lang.php    | 2 ++
 WEB-INF/resources/fi.lang.php    | 2 ++
 WEB-INF/resources/fr.lang.php    | 2 ++
 WEB-INF/resources/gr.lang.php    | 2 ++
 WEB-INF/resources/he.lang.php    | 2 ++
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 2 ++
 WEB-INF/resources/ja.lang.php    | 2 ++
 WEB-INF/resources/ko.lang.php    | 2 ++
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 2 ++
 WEB-INF/resources/pl.lang.php    | 2 ++
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 2 ++
 WEB-INF/resources/ro.lang.php    | 2 ++
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 2 ++
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 2 ++
 WEB-INF/resources/sv.lang.php    | 2 ++
 WEB-INF/resources/tr.lang.php    | 2 ++
 WEB-INF/resources/zh-cn.lang.php | 2 ++
 WEB-INF/resources/zh-tw.lang.php | 2 ++
 WEB-INF/templates/reports.tpl    | 8 ++++++++
 reports.php                      | 5 +++++
 32 files changed, 69 insertions(+)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1326d15aa..f2eec1b5a 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -474,6 +474,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Seleccionar període de temps',
 'form.reports.set_period' => 'o establir dates',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Mostrar camps',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d65c6dab3..8573d71c2 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -482,6 +482,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Výberte období',
 'form.reports.set_period' => 'nebo určete dny',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Zobrazit pole',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 3fba73805..dd1abd396 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -459,6 +459,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Vælg en periode',
 'form.reports.set_period' => 'eller sæt datoer',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Vis felter',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index fe4874640..e295e7281 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -442,6 +442,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Felder anzeigen',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5b433b0a6..5df99c403 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -425,6 +425,7 @@
 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
+'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Show fields',
 'form.reports.time_fields' => 'Time fields',
 'form.reports.user_fields' => 'User fields',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index f57f5795e..7c59d3ae5 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -487,6 +487,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Seleccionar período de tiempo',
 'form.reports.set_period' => 'o establecer fechas',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Mostrar campos',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 57b92ff3c..7a53024b7 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -472,6 +472,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Näita välju',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 62b70671d..2963414ee 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -480,6 +480,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'انتخاب بازه زمانی',
 'form.reports.set_period' => 'یا تعیین تاریخ',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'نمایش فیلدها',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index fa1dd9739..112dc6b6a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -465,6 +465,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Valitse ajanjakso',
 'form.reports.set_period' => 'tai aseta päivät',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Näytä kentät',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 7472ddf62..a1268d1a7 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -456,6 +456,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Sélectionner la période de temps',
 'form.reports.set_period' => 'ou dates indiquées',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Afficher les champs',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 93fb5fba5..9f1bf5d93 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -451,6 +451,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 388622c2a..3167fd8d9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -483,6 +483,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'בחר תקופת זמן',
 'form.reports.set_period' => 'או הגדר תאריכים',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'הראה שדות',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 635147d8c..636c29d07 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -478,6 +478,7 @@
 'form.reports.select_period' => 'Jelölj meg egy időszakot',
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 // 'form.reports.show_fields' => 'Show fields',
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 55ea5deb4..d517fdede 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -464,6 +464,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
 'form.reports.set_period' => 'oppure setta le date',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Mostra i campi',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0cf547754..59500e015 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -482,6 +482,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => '時間期間の選択',
 'form.reports.set_period' => 'あるいは日付を設定',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'フィールドの表示',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 426484617..e2f16ccec 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -480,6 +480,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => '시간 기간을 선택',
 'form.reports.set_period' => '혹은 날짜를 설정',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => '필드들을 보기',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 949a3ac83..9f846bc5f 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -411,6 +411,8 @@
 'form.reports.include_pending' => 'in afwachting',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Toon velden',
 'form.reports.time_fields' => 'Tijd velden',
 'form.reports.user_fields' => 'Medewerker velden',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index dd92cc788..cba06a82f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -482,6 +482,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Velg tidsperiode',
 'form.reports.set_period' => 'eller sett dato',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Vis feltene',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 50ac9c62d..3470add1b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -467,6 +467,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Wybierz okres',
 'form.reports.set_period' => 'lub ustaw daty',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Pokaż pola',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 0b250d69c..60d505762 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -414,6 +414,8 @@
 'form.reports.include_pending' => 'pendente',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Exibir campos',
 'form.reports.time_fields' => 'Campos de tempo',
 'form.reports.user_fields' => 'Campos de usuário',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index e7b16d92a..d5a4413a2 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -459,6 +459,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Exibir campos',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index b160169d4..f450bfd4e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -482,6 +482,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Alege perioada',
 'form.reports.set_period' => 'sau introdu intervalul de date',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Arata campuri',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index f24aa6f7a..47f87d496 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -412,6 +412,7 @@
 'form.reports.include_pending' => 'в ожидании',
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
+'form.reports.note_containing' => 'Комментарий содержит',
 'form.reports.show_fields' => 'Показывать поля',
 'form.reports.time_fields' => 'Поля времени',
 'form.reports.user_fields' => 'Поля пользователя',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index ca4f0535a..1909ec9d1 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -470,6 +470,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Vyberte časový rozsah',
 'form.reports.set_period' => 'alebo nastavte dátumy',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Zobraziť polia',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 574c32f09..304da23a0 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -456,6 +456,7 @@
 // 'form.reports.include_pending' => 'pending',
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
+// 'form.reports.note_containing' => 'Note containing',
 // 'form.reports.show_fields' => 'Show fields',
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 068678867..d1fb802e8 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -467,6 +467,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Odaberi vremenski raspon',
 'form.reports.set_period' => 'ili podesi datum',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 9f5725b86..1df983ecc 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -465,6 +465,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Välj intervall',
 'form.reports.set_period' => 'eller ställ in datum',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Visa fält',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index f8fa7dd2b..c6fe800a6 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -493,6 +493,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Zaman aralığını seç',
 'form.reports.set_period' => 'ya da tarihleri belirle',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => 'Alanları göster',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index ca1709d3b..5b701c851 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -471,6 +471,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => '选择时间段',
 'form.reports.set_period' => '或设定日期',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => '显示栏目',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c59a87efe..14ef3c269 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -474,6 +474,8 @@
 // 'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => '選擇時間段',
 'form.reports.set_period' => '或設定日期',
+// TODO: translate the following.
+// 'form.reports.note_containing' => 'Note containing',
 'form.reports.show_fields' => '顯示欄目',
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index aa8e9d633..d2dfcb475 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -358,6 +358,14 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if isTrue('FILTER_BY_NOTES_DEBUG')}
+  <tr class = "small-screen-label"><td><label for="notes_containing">{$i18n.form.reports.note_containing}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="notes_containing">{$i18n.form.reports.note_containing}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.notes_containing.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
 </table>
 <div class="form-control-separator"></div>
 <table class="centered-table">
diff --git a/reports.php b/reports.php
index 858ca61cb..8cf3736b1 100644
--- a/reports.php
+++ b/reports.php
@@ -239,6 +239,11 @@
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
+// Add control for notes containing.
+if (isTrue('FILTER_BY_NOTES_DEBUG')) {
+  $form->addInput(array('type'=>'text','maxlength'=>'256','name'=>'notes_containing'));
+}
+
 // Add checkboxes for "Show fields" block.
 if ($showClient)
   $form->addInput(array('type'=>'checkbox','name'=>'chclient'));

From a18e57436cb9170c22c6de7128053113913e289e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 6 Jul 2022 19:19:56 +0000
Subject: [PATCH 1745/1848] Initial implementation of report filter by notes.

---
 WEB-INF/lib/ttFavReportHelper.class.php |  7 +++++--
 WEB-INF/lib/ttReportHelper.class.php    | 17 +++++++++++++++--
 WEB-INF/templates/reports.tpl           |  6 +++---
 dbinstall.php                           |  9 +++++----
 initialize.php                          |  2 +-
 mysql.sql                               |  3 ++-
 reports.php                             |  2 +-
 7 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 3de0c94c9..df756649e 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -98,7 +98,7 @@ static function insertReport($fields) {
 
     $sql = "insert into tt_fav_reports".
       " (name, user_id, group_id, org_id, report_spec, client_id, project_id, task_id,".
-      " billable, approved, invoice, timesheet, paid_status, users, period, period_start,".
+      " billable, approved, invoice, timesheet, paid_status, note_containing, users, period, period_start,".
       " period_end, show_client, show_invoice, show_paid, show_ip,".
       " show_project, show_timesheet, show_start, show_duration, show_cost,".
       " show_task, show_end, show_note, show_approved, show_work_units,".
@@ -110,7 +110,7 @@ static function insertReport($fields) {
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
       $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
-      $mdb2->quote($fields['paid_status']).", ".
+      $mdb2->quote($fields['paid_status']).", ".$mdb2->quote($fields['note_containing']).",".
       $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
@@ -146,6 +146,7 @@ static function updateReport($fields) {
       "invoice = ".$mdb2->quote($fields['invoice']).", ".
       "timesheet = ".$mdb2->quote($fields['timesheet']).", ".
       "paid_status = ".$mdb2->quote($fields['paid_status']).", ".
+      "note_containing = ".$mdb2->quote($fields['note_containing']).", ".
       "users = ".$mdb2->quote($fields['users']).", ".
       "period = ".$mdb2->quote($fields['period']).", ".
       "period_start = ".$mdb2->quote($fields['from']).", ".
@@ -233,6 +234,7 @@ static function saveReport($bean) {
       'paid_status'=>$bean->getAttribute('paid_status'),
       'invoice'=>$bean->getAttribute('invoice'),
       'timesheet'=>$bean->getAttribute('timesheet'),
+      'note_containing'=>$bean->getAttribute('note_containing'),
       'users'=>$users,
       'period'=>$bean->getAttribute('period'),
       'from'=>$from,
@@ -336,6 +338,7 @@ static function loadReport(&$bean) {
       $bean->setAttribute('invoice', $val['invoice']);
       $bean->setAttribute('paid_status', $val['paid_status']);
       $bean->setAttribute('timesheet', $val['timesheet']);
+      $bean->setAttribute('note_containing', $val['note_containing']);
       $bean->setAttribute('users_active', explode(',', $val['users']));
       $bean->setAttribute('users_inactive', explode(',', $val['users']));
       $bean->setAttribute('period', $val['period']);
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 693fe6521..45b6ec1b6 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -116,6 +116,12 @@ static function getWhere($options) {
       $user_list_part = " and l.user_id = ".$user->getUser();
     $user_list_part .= " and l.group_id = $group_id and l.org_id = $org_id";
 
+    // Prepare part for note_containing using LIKE operator.
+    $note_containing_part = '';
+    if (isset($options['note_containing']) && !empty($options['note_containing'])) {
+      $note_containing_part = " and l.comment like ".$mdb2->quote('%'.$options['note_containing'].'%');
+    }
+
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
     if (isset($options['period']) && $options['period'])
@@ -127,7 +133,7 @@ static function getWhere($options) {
         new ttDate($options['period_end'], $dateFormat));
     }
     $where = " where l.status = 1 and l.date >= '".$period->getStartDate()."' and l.date <= '".$period->getEndDate()."'".
-      " $user_list_part $dropdown_parts $cf_text_parts";
+      $user_list_part.$dropdown_parts.$cf_text_parts.$note_containing_part;
     return $where;
   }
 
@@ -198,6 +204,12 @@ static function getExpenseWhere($options) {
       $user_list_part = " and ei.user_id = ".$user->getUser();
     $user_list_part .= " and ei.group_id = $group_id and ei.org_id = $org_id";
 
+    // Prepare part for note_containing using LIKE operator.
+    $note_containing_part = '';
+    if (isset($options['note_containing']) && !empty($options['note_containing'])) {
+      $note_containing_part = " and ei.name like ".$mdb2->quote('%'.$options['note_containing'].'%');
+    }
+
     // Prepare sql query part for where.
     $dateFormat = $user->getDateFormat();
     if (isset($options['period']) && $options['period'])
@@ -209,7 +221,7 @@ static function getExpenseWhere($options) {
         new ttDate($options['period_end'], $dateFormat));
     }
     $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate()."' and ei.date <= '".$period->getEndDate()."'".
-      " $user_list_part $dropdown_parts $cf_text_parts";
+      $user_list_part.$dropdown_parts.$cf_text_parts.$note_containing_part;
     return $where;
   }
 
@@ -1541,6 +1553,7 @@ static function getReportOptions($bean) {
     $options['period'] = $bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
+    $options['note_containing'] = $bean->getAttribute('note_containing');
     $options['show_client'] = $bean->getAttribute('chclient');
     $options['show_invoice'] = $bean->getAttribute('chinvoice');
     $options['show_approved'] = $bean->getAttribute('chapproved');
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index d2dfcb475..3edec9d82 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -359,10 +359,10 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
 {if isTrue('FILTER_BY_NOTES_DEBUG')}
-  <tr class = "small-screen-label"><td><label for="notes_containing">{$i18n.form.reports.note_containing}:</label></td></tr>
+  <tr class = "small-screen-label"><td><label for="note_containing">{$i18n.form.reports.note_containing}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="notes_containing">{$i18n.form.reports.note_containing}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.notes_containing.control}</td>
+    <td class="large-screen-label"><label for="note_containing">{$i18n.form.reports.note_containing}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.note_containing.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
diff --git a/dbinstall.php b/dbinstall.php
index f8e1b9362..bc0db6a0d 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1151,7 +1151,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to12102"]) {
+  if ($_POST["convert11900to12107"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1197,6 +1197,7 @@ function ttGenerateKeys() {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',manage_work', '')");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',update_work', '')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.2', modified = now() where param_name = 'version_db' and param_value = '1.21.0'");
+    ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `note_containing` varchar(80) default NULL after `paid_status`");
   }
 
   if ($_POST["cleanup"]) {
@@ -1247,7 +1248,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.21.2)</b>
+    <td width="80%"><b>Create database structure (v1.21.7)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1296,8 +1297,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.21.2)</td>
-    <td><input type="submit" name="convert11900to12102" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.21.7)</td>
+    <td><input type="submit" name="convert11900to12107" value="Update"></td>
   </tr>
 </table>
 
diff --git a/initialize.php b/initialize.php
index 53810201d..7ab839782 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.6.5719");
+define("APP_VERSION", "1.21.7.5720");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mysql.sql b/mysql.sql
index 0856f94a0..4fd33fa95 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -273,6 +273,7 @@ CREATE TABLE `tt_fav_reports` (
   `invoice` tinyint(4) default NULL,                     # whether to include invoiced, not invoiced, or all records
   `timesheet` tinyint(4) default NULL,                   # include records with a specific timesheet status, or all records
   `paid_status` tinyint(4) default NULL,                 # whether to include paid, not paid, or all records
+  `note_containing` varchar(80) default NULL,            # include only records with notes containing this text
   `users` text default NULL,                             # Comma-separated list of user ids. Nothing here means "all" users.
   `period` tinyint(4) default NULL,                      # selected period type for report
   `period_start` date default NULL,                      # period start
@@ -621,4 +622,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.2', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.7', now()); # TODO: change when structure changes.
diff --git a/reports.php b/reports.php
index 8cf3736b1..0dbc79a8d 100644
--- a/reports.php
+++ b/reports.php
@@ -241,7 +241,7 @@
 
 // Add control for notes containing.
 if (isTrue('FILTER_BY_NOTES_DEBUG')) {
-  $form->addInput(array('type'=>'text','maxlength'=>'256','name'=>'notes_containing'));
+  $form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'note_containing'));
 }
 
 // Add checkboxes for "Show fields" block.

From d50ff284a5dcb55e3fd276f5499ef05a700a41a7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Jul 2022 15:56:44 +0000
Subject: [PATCH 1746/1848] Removed FILTER_BY_NOTES_DEBUG condition.

---
 WEB-INF/templates/reports.tpl | 2 --
 dbinstall.php                 | 1 +
 initialize.php                | 2 +-
 reports.php                   | 4 +---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 3edec9d82..51c98212c 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -358,14 +358,12 @@ License: See license.txt *}
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-{if isTrue('FILTER_BY_NOTES_DEBUG')}
   <tr class = "small-screen-label"><td><label for="note_containing">{$i18n.form.reports.note_containing}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="note_containing">{$i18n.form.reports.note_containing}:</label></td>
     <td class="td-with-input">{$forms.reportForm.note_containing.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{/if}
 </table>
 <div class="form-control-separator"></div>
 <table class="centered-table">
diff --git a/dbinstall.php b/dbinstall.php
index bc0db6a0d..85d3f021a 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1198,6 +1198,7 @@ function ttGenerateKeys() {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.21.0') set rights = replace(rights, ',update_work', '')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.2', modified = now() where param_name = 'version_db' and param_value = '1.21.0'");
     ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `note_containing` varchar(80) default NULL after `paid_status`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.7', modified = now() where param_name = 'version_db' and param_value = '1.21.2'");
   }
 
   if ($_POST["cleanup"]) {
diff --git a/initialize.php b/initialize.php
index 7ab839782..0eb176f01 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.7.5720");
+define("APP_VERSION", "1.21.7.5721");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 0dbc79a8d..65aba65d9 100644
--- a/reports.php
+++ b/reports.php
@@ -240,9 +240,7 @@
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
 
 // Add control for notes containing.
-if (isTrue('FILTER_BY_NOTES_DEBUG')) {
-  $form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'note_containing'));
-}
+$form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'note_containing'));
 
 // Add checkboxes for "Show fields" block.
 if ($showClient)

From 01bb80be971ad6c7d685c88c9da0150060eb4ff0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Jul 2022 16:11:18 +0000
Subject: [PATCH 1747/1848] Fixed export / import for note_containing in fav
 reports.

---
 WEB-INF/lib/ttGroupExportHelper.class.php |  1 +
 WEB-INF/lib/ttOrgExportHelper.class.php   | 28 ++---------------------
 WEB-INF/lib/ttOrgImportHelper.class.php   |  5 ++--
 initialize.php                            |  2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index a464f2e25..b7b6491e5 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -566,6 +566,7 @@ function writeData() {
         $fav_report_part .= " invoice=\"".$fav_report['invoice']."\"";
         $fav_report_part .= " timesheet=\"".$fav_report['timesheet']."\"";
         $fav_report_part .= " paid_status=\"".$fav_report['paid_status']."\"";
+        $fav_report_part .= " note_containing=\"".$fav_report['note_containing']."\"";
         $fav_report_part .= " users=\"".$user_list."\"";
         $fav_report_part .= " period=\"".$fav_report['period']."\"";
         $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
diff --git a/WEB-INF/lib/ttOrgExportHelper.class.php b/WEB-INF/lib/ttOrgExportHelper.class.php
index 277eac3ab..9380231e4 100644
--- a/WEB-INF/lib/ttOrgExportHelper.class.php
+++ b/WEB-INF/lib/ttOrgExportHelper.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttTeamHelper');
 import('ttTimeHelper');
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 744b67e4b..61ed9ec78 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -461,6 +461,7 @@ function startElement($parser, $name, $attrs) {
           'invoice' => $attrs['INVOICE'],
           'timesheet' => $attrs['TIMESHEET'],
           'paid_status' => $attrs['PAID_STATUS'],
+          'note_containing' => $attrs['NOTE_CONTAINING'],
           'users' => $user_list,
           'period' => $attrs['PERIOD'],
           'from' => $attrs['PERIOD_START'],
@@ -1049,7 +1050,7 @@ private function insertFavReport($fields) {
 
     $sql = "insert into tt_fav_reports".
       " (name, user_id, group_id, org_id, report_spec, client_id, project_id, task_id,".
-      " billable, approved, invoice, timesheet, paid_status, users, period, period_start, period_end,".
+      " billable, approved, invoice, timesheet, paid_status, note_containing, users, period, period_start, period_end,".
       " show_client, show_invoice, show_paid, show_ip,".
       " show_project, show_timesheet, show_start, show_duration, show_cost,".
       " show_task, show_end, show_note, show_approved, show_work_units,".
@@ -1060,7 +1061,7 @@ private function insertFavReport($fields) {
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
       $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
-      $mdb2->quote($fields['paid_status']).", ".
+      $mdb2->quote($fields['paid_status']).", ".$mdb2->quote($fields['note_containing']).", ".
       $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
       $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
diff --git a/initialize.php b/initialize.php
index 0eb176f01..183c62f99 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.7.5721");
+define("APP_VERSION", "1.21.7.5722");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 821535bfa70fae447bede1c617e375458dd31751 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 19 Aug 2022 13:45:10 +0000
Subject: [PATCH 1748/1848] Resolved a few compatibility issues with php8.

---
 WEB-INF/lib/ttOrgImportHelper.class.php | 6 ++++--
 initialize.php                          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 61ed9ec78..92ba6276f 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -167,6 +167,7 @@ function startElement($parser, $name, $attrs) {
         // We get here when processing <project> tags for the current group.
 
         // Prepare a list of task ids.
+        $mapped_tasks = null;
         if ($attrs['TASKS']) {
           $tasks = explode(',', $attrs['TASKS']);
           foreach ($tasks as $id)
@@ -193,6 +194,7 @@ function startElement($parser, $name, $attrs) {
         // We get here when processing <client> tags for the current group.
 
         // Prepare a list of project ids.
+        $mapped_projects = array();
         if ($attrs['PROJECTS']) {
           $projects = explode(',', $attrs['PROJECTS']);
           foreach ($projects as $id)
@@ -218,7 +220,6 @@ function startElement($parser, $name, $attrs) {
 
       if ($name == 'USER') {
         // We get here when processing <user> tags for the current group.
-
         $role_id = $attrs['ROLE_ID'] === '0' ? $this->top_role_id :  $this->currentGroupRoleMap[$attrs['ROLE_ID']]; // 0 (not null) means top manager role.
 
         $user_id = $this->insertUser(array(
@@ -899,7 +900,7 @@ private function insertProject($fields)
     $org_id = (int) $fields['org_id'];
     $name = $fields['name'];
     $description = $fields['description'];
-    $tasks = $fields['tasks'];
+    $tasks = isset($fields['tasks']) ? $fields['tasks'] : array();
     $comma_separated = implode(',', $tasks); // This is a comma-separated list of associated task ids.
     $status = $fields['status'];
 
@@ -1014,6 +1015,7 @@ private function insertClient($fields)
     $address = $fields['address'];
     $tax = $fields['tax'];
     $projects = $fields['projects'];
+    $comma_separated = null;
     if ($projects)
       $comma_separated = implode(',', $projects); // This is a comma-separated list of associated projects ids.
     $status = $fields['status'];
diff --git a/initialize.php b/initialize.php
index 183c62f99..f16a12b24 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.7.5722");
+define("APP_VERSION", "1.21.8.5723");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 8392a26f00e6303095a2ff06680f054ea4fb431f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 20 Aug 2022 14:22:15 +0000
Subject: [PATCH 1749/1848] Fixed a bug in export-import.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 1 +
 WEB-INF/lib/ttOrgImportHelper.class.php   | 8 +++++---
 initialize.php                            | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index b7b6491e5..fb0f60025 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -424,6 +424,7 @@ function writeData() {
         $custom_field_option_part = $this->indentation.'    '."<custom_field_option id=\"".$this->customFieldOptionMap[$option['id']]."\"";
         $custom_field_option_part .= " field_id=\"".$this->customFieldMap[$option['field_id']]."\"";
         $custom_field_option_part .= " value=\"".htmlspecialchars($option['value'])."\"";
+        $custom_field_option_part .= " status=\"".$option['status']."\"";
         $custom_field_option_part .= "></custom_field_option>\n";
         fwrite($this->file, $custom_field_option_part);
       }
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index 92ba6276f..aae3267c9 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -349,7 +349,8 @@ function startElement($parser, $name, $attrs) {
           'group_id' => $this->current_group_id,
           'org_id' => $this->org_id,
           'field_id' => $this->currentGroupCustomFieldMap[$attrs['FIELD_ID']],
-          'value' => $attrs['VALUE']));
+          'value' => $attrs['VALUE'],
+          'status' => $attrs['STATUS']));
         if ($custom_field_option_id) {
           // Add a mapping.
           $this->currentGroupCustomFieldOptionMap[$attrs['ID']] = $custom_field_option_id;
@@ -1153,9 +1154,10 @@ private function insertCustomFieldOption($fields) {
     $org_id = (int) $fields['org_id'];
     $field_id = (int) $fields['field_id'];
     $value = $fields['value'];
+    $status = $fields['status'];
 
-    $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value)".
-      " values ($group_id, $org_id, $field_id, ".$mdb2->quote($value).")";
+    $sql = "insert into tt_custom_field_options (group_id, org_id, field_id, value, status)".
+      " values ($group_id, $org_id, $field_id, ".$mdb2->quote($value).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
diff --git a/initialize.php b/initialize.php
index f16a12b24..073178888 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.8.5723");
+define("APP_VERSION", "1.21.9.5724");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a3ec5e331f92641bb774b6f0310303d3043023be Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 16 Sep 2022 13:02:36 +0000
Subject: [PATCH 1750/1848] Fixed a JavaScript error condition (issue #128).

---
 WEB-INF/templates/user_edit.tpl | 6 +++++-
 initialize.php                  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index 744e8c40e..e4d916a5c 100644
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -57,7 +57,11 @@ function setRate(element) {
 // handleClientRole - manages visibility and content of controls related to client role,
 // also hides and unselects projects when client role is selected.
 function handleClientRole() {
-  var selectedRoleId = document.getElementById("role").value;
+  var roleControl = document.getElementById("role");
+  if (roleControl == null) {
+    return;  // Role control not available, nothing to do...
+  }
+  var selectedRoleId = roleControl.value;
   var clientControl = document.getElementById("client");
   var clientBlock = document.getElementById("client_block");
   var nonClientBlock = document.getElementById("non_client_block");
diff --git a/initialize.php b/initialize.php
index 073178888..c5cb7fe3d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.9.5724");
+define("APP_VERSION", "1.21.9.5725");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 20ec9b24e53bc00b14241c6041dbd6c0f1fb0666 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Sep 2022 20:51:28 +0000
Subject: [PATCH 1751/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9f846bc5f..2e87007cd 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -411,8 +411,7 @@
 'form.reports.include_pending' => 'in afwachting',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
-// TODO: translate the following.
-// 'form.reports.note_containing' => 'Note containing',
+'form.reports.note_containing' => 'Notitie bevat',
 'form.reports.show_fields' => 'Toon velden',
 'form.reports.time_fields' => 'Tijd velden',
 'form.reports.user_fields' => 'Medewerker velden',
diff --git a/initialize.php b/initialize.php
index c5cb7fe3d..92a3f3134 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.9.5725");
+define("APP_VERSION", "1.21.9.5726");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 491f6c4a35c723ab7e6ddd58c0065166dcfff25d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Oct 2022 15:17:19 +0000
Subject: [PATCH 1752/1848] Starting to implement cost per hour column on
 reports.

---
 WEB-INF/resources/ca.lang.php         |  1 +
 WEB-INF/resources/cs.lang.php         |  1 +
 WEB-INF/resources/da.lang.php         |  1 +
 WEB-INF/resources/de.lang.php         |  1 +
 WEB-INF/resources/en.lang.php         |  1 +
 WEB-INF/resources/es.lang.php         |  1 +
 WEB-INF/resources/et.lang.php         |  1 +
 WEB-INF/resources/fa.lang.php         |  1 +
 WEB-INF/resources/fi.lang.php         |  1 +
 WEB-INF/resources/fr.lang.php         |  1 +
 WEB-INF/resources/gr.lang.php         |  1 +
 WEB-INF/resources/he.lang.php         |  1 +
 WEB-INF/resources/hu.lang.php         |  1 +
 WEB-INF/resources/it.lang.php         |  1 +
 WEB-INF/resources/ja.lang.php         |  1 +
 WEB-INF/resources/ko.lang.php         |  1 +
 WEB-INF/resources/nl.lang.php         |  2 ++
 WEB-INF/resources/no.lang.php         |  1 +
 WEB-INF/resources/pl.lang.php         |  1 +
 WEB-INF/resources/pt-br.lang.php      |  1 +
 WEB-INF/resources/pt.lang.php         |  1 +
 WEB-INF/resources/ro.lang.php         |  1 +
 WEB-INF/resources/ru.lang.php         |  1 +
 WEB-INF/resources/sk.lang.php         |  1 +
 WEB-INF/resources/sl.lang.php         |  1 +
 WEB-INF/resources/sr.lang.php         |  1 +
 WEB-INF/resources/sv.lang.php         |  1 +
 WEB-INF/resources/tr.lang.php         |  1 +
 WEB-INF/resources/zh-cn.lang.php      |  1 +
 WEB-INF/resources/zh-tw.lang.php      |  1 +
 WEB-INF/templates/display_options.tpl | 10 ++++++++++
 display_options.php                   |  4 ++++
 initialize.php                        |  2 +-
 33 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f2eec1b5a..ae5a1df73 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -677,5 +677,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 8573d71c2..18c04aa69 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -689,5 +689,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index dd1abd396..9e4a61c96 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -655,5 +655,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e295e7281..a2e730ddf 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -630,5 +630,6 @@
 // TODO: translate the following.
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5df99c403..f55cef6f3 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -601,5 +601,6 @@
 'form.display_options.note_on_separate_row' => 'Note on separate row',
 'form.display_options.not_complete_days' => 'Not complete days',
 'form.display_options.inactive_projects' => 'Inactive projects',
+'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 7c59d3ae5..b7ec4116c 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -692,5 +692,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 7a53024b7..0b2fd1d8c 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -665,5 +665,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 2963414ee..ec3dfe6d6 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -678,5 +678,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 112dc6b6a..28033da2a 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -662,5 +662,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a1268d1a7..20bc298f0 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -651,5 +651,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9f1bf5d93..db2aa859e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -644,5 +644,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 3167fd8d9..ef6e20f35 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -683,5 +683,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 636c29d07..5987b8850 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -680,5 +680,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d517fdede..63c2ada5d 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -657,5 +657,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 59500e015..5e7070b1b 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -684,5 +684,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index e2f16ccec..a4ea97c23 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -682,5 +682,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2e87007cd..73265f98d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -586,5 +586,7 @@
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom', // Translator (Henk) comment: "kolom is the right word in Dutch."
 'form.display_options.not_complete_days' => 'Niet complete dagen',
 'form.display_options.inactive_projects' => 'Niet actieve projecten',
+// TODO: translate the following.
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'Aangepaste CSS',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index cba06a82f..8e3c4c888 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -684,5 +684,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3470add1b..bf04ee74f 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -663,5 +663,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 60d505762..36dca948c 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -594,6 +594,7 @@
 'form.display_options.not_complete_days' => 'Dias não completos',
 // TODO: translate the following.
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'CSS customizado',
 );
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d5a4413a2..cce36ad07 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -662,5 +662,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f450bfd4e..03e7a992e 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -685,5 +685,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 47f87d496..5a037b846 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -587,5 +587,6 @@
 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду',
 'form.display_options.not_complete_days' => 'Незавершенные дни',
 'form.display_options.inactive_projects' => 'Неактивные проекты',
+'form.display_options.cost_per_hour' => 'Стоимость за час',
 'form.display_options.custom_css' => 'Пользовательская CSS',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1909ec9d1..c3ad4da53 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -667,5 +667,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 304da23a0..04e709748 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -657,5 +657,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d1fb802e8..9823f810e 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -665,5 +665,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 1df983ecc..4250318c2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -663,5 +663,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index c6fe800a6..32838159e 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -698,5 +698,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5b701c851..967a172ef 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -673,5 +673,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 14ef3c269..2fd31a762 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -676,5 +676,6 @@
 // 'form.display_options.note_on_separate_row' => 'Note on separate row',
 // 'form.display_options.not_complete_days' => 'Not complete days',
 // 'form.display_options.inactive_projects' => 'Inactive projects',
+// 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
 );
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index 6486c0b25..c09a18e9b 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -49,6 +49,16 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_53.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
+{if defined('REPORT_COST_PER_HOUR')}
+  <tr class = "small-screen-label"><td><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td>
+    <td class="td-with-input">{$forms.displayOptionsForm.report_cost_per_hour.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_57.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_57.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
+  </tr>
+{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td><div class="form-control-separator"></div></td></tr>
   <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_css}</td></tr>
diff --git a/display_options.php b/display_options.php
index 6e0ccc548..e449c3c91 100644
--- a/display_options.php
+++ b/display_options.php
@@ -21,6 +21,7 @@
   $cl_record_custom_fields = (bool)$request->getParameter('record_custom_fields');
   $cl_report_note_on_separate_row = (bool)$request->getParameter('report_note_on_separate_row');
   $cl_report_inactive_projects = (bool)($request->getParameter('report_inactive_projects'));
+  $cl_report_cost_per_hour = (bool)$request->getParameter('report_cost_per_hour');
   $cl_custom_css = trim($request->getParameter('custom_css'));
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
@@ -28,6 +29,7 @@
   $cl_record_custom_fields = $config->getDefinedValue('record_custom_fields');
   $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row');
   $cl_report_inactive_projects = $config->getDefinedValue('report_inactive_projects');
+  $cl_report_cost_per_hour = $config->getDefinedValue('report_cost_per_hour');
   $cl_custom_css = $user->getCustomCss();
 }
 
@@ -49,6 +51,7 @@
 // Reports.
 $form->addInput(array('type'=>'checkbox','name'=>'report_note_on_separate_row','value'=>$cl_report_note_on_separate_row));
 $form->addInput(array('type'=>'checkbox','name'=>'report_inactive_projects','value'=>$cl_report_inactive_projects));
+$form->addInput(array('type'=>'checkbox','name'=>'report_cost_per_hour','value'=>$cl_report_cost_per_hour));
 // TODO: add PDF break controller here.
 
 $form->addInput(array('type'=>'textarea','name'=>'custom_css','value'=>$cl_custom_css));
@@ -66,6 +69,7 @@
     $config->setDefinedValue('record_custom_fields', $cl_record_custom_fields);
     $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row);
     $config->setDefinedValue('report_inactive_projects', $cl_report_inactive_projects);
+    $config->setDefinedValue('report_cost_per_hour', $cl_report_cost_per_hour);
     if ($user->updateGroup(array(
       'config' => $config->getConfig(),
       'custom_css' => $cl_custom_css))) {
diff --git a/initialize.php b/initialize.php
index 92a3f3134..86aad8046 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.9.5726");
+define("APP_VERSION", "1.21.9.5727");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 69de200456a6ad941f2a268f2efb406512b3973e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 17 Oct 2022 18:50:39 +0000
Subject: [PATCH 1753/1848] Work in progress on including cost per hour in
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 13 ++++++--
 WEB-INF/resources/ca.lang.php        |  1 +
 WEB-INF/resources/cs.lang.php        |  1 +
 WEB-INF/resources/da.lang.php        |  1 +
 WEB-INF/resources/de.lang.php        |  2 ++
 WEB-INF/resources/en.lang.php        |  1 +
 WEB-INF/resources/es.lang.php        |  1 +
 WEB-INF/resources/et.lang.php        |  2 ++
 WEB-INF/resources/fa.lang.php        |  1 +
 WEB-INF/resources/fi.lang.php        |  1 +
 WEB-INF/resources/fr.lang.php        |  1 +
 WEB-INF/resources/gr.lang.php        |  2 ++
 WEB-INF/resources/he.lang.php        |  1 +
 WEB-INF/resources/hu.lang.php        |  1 +
 WEB-INF/resources/it.lang.php        |  2 ++
 WEB-INF/resources/ja.lang.php        |  1 +
 WEB-INF/resources/ko.lang.php        |  1 +
 WEB-INF/resources/nl.lang.php        |  2 ++
 WEB-INF/resources/no.lang.php        |  1 +
 WEB-INF/resources/pl.lang.php        |  1 +
 WEB-INF/resources/pt-br.lang.php     |  2 ++
 WEB-INF/resources/pt.lang.php        |  1 +
 WEB-INF/resources/ro.lang.php        |  1 +
 WEB-INF/resources/ru.lang.php        |  1 +
 WEB-INF/resources/sk.lang.php        |  1 +
 WEB-INF/resources/sl.lang.php        |  1 +
 WEB-INF/resources/sr.lang.php        |  1 +
 WEB-INF/resources/sv.lang.php        |  1 +
 WEB-INF/resources/tr.lang.php        |  1 +
 WEB-INF/resources/zh-cn.lang.php     |  1 +
 WEB-INF/resources/zh-tw.lang.php     |  1 +
 WEB-INF/templates/puncher.tpl        |  2 +-
 WEB-INF/templates/report.tpl         | 45 ++++++++++++++++++----------
 WEB-INF/templates/time.tpl           |  2 +-
 WEB-INF/templates/week.tpl           |  2 +-
 report.php                           |  8 ++++-
 36 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 45b6ec1b6..d15d1e9bf 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -333,12 +333,19 @@ static function getItems($options) {
     // Handle cost.
     $includeCost = $options['show_cost'];
     if ($includeCost) {
-      if (MODE_TIME == $trackingMode)
+      $includeCostPerHour = $user->getConfigOption('report_cost_per_hour');
+      if (MODE_TIME == $trackingMode) {
+        if ($includeCostPerHour)
+          array_push($fields, "cast(l.billable * coalesce(u.rate, 0) as decimal(10,2)) as cost_per_hour");   // Use default user rate.
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
-      else
+      } else {
+        if ($includeCostPerHour)
+          array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) as decimal(10,2)) as cost_per_hour"); // Use project rate for user.
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
+      }
       array_push($fields, "null as expense"); 
     }
+
     // Add the fields used to determine if we show an edit icon for record.
     array_push($fields, 'l.approved');
     array_push($fields, 'l.timesheet_id');
@@ -501,6 +508,8 @@ static function getItems($options) {
       // Use the note field to print item name.
       if ($options['show_note'])
         array_push($fields, 'ei.name as note');
+      if ($user->getConfigOption('report_cost_per_hour'))
+        array_push($fields, 'null as cost_per_hour'); // null for cost_per_hour.
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
       // Add the fields used to determine if we show an edit icon for record.
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index ae5a1df73..a06c8a692 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -494,6 +494,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportar',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 18c04aa69..e8d297edc 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -502,6 +502,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportovat',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 9e4a61c96..6e27e5370 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -477,6 +477,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Eksport',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index a2e730ddf..8d5e030c3 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -459,6 +459,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportiere',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
 // TODO: translate the following.
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f55cef6f3..2f42d2730 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -440,6 +440,7 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Export',
+'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Assign to invoice',
 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index b7ec4116c..6dbfd29a8 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -507,6 +507,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportar',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0b2fd1d8c..dc08bd01a 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -489,6 +489,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Eksport',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Lisa arvele',
 // TODO: translate the following.
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index ec3dfe6d6..f8d8f6843 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -498,6 +498,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'پشتیبانی',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 28033da2a..8d5ec21ec 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -483,6 +483,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Vie',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 20bc298f0..8e7289715 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -474,6 +474,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporter',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index db2aa859e..dc03db958 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -468,6 +468,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Εξαγωγή',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Ανάθεση στο τιμολόγιο',
 // TODO: translate the following.
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ef6e20f35..5249ee8e9 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -502,6 +502,7 @@
 // TODO: form.report.export is just "Export" now in the English file. Shorten this translation.
 'form.report.export' => 'ייצא נתונים בתבנית',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5987b8850..f19593ba7 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -496,6 +496,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportálása', // TODO: is this correct?
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 63c2ada5d..f936ef123 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -481,6 +481,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Esporta',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Assegna alla fattura',
 // TODO: translate the following.
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 5e7070b1b..02d4ad227 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -502,6 +502,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => '輸出する', // TODO: is this correct?
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index a4ea97c23..491631d04 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -500,6 +500,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => '익스포트', // TODO: is this correct?
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 73265f98d..90ee07697 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -426,6 +426,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporteer',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
 'form.report.assign_to_timesheet' => 'Wijs toe aan tijdenoverzicht',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 8e3c4c888..9fd520436 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -501,6 +501,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Eksporter',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index bf04ee74f..325948cdd 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -485,6 +485,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Eksport',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 36dca948c..279d9eb68 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -430,6 +430,8 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportar',
+// TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 'form.report.assign_to_invoice' => 'Atribuir a fatura',
 'form.report.assign_to_timesheet' => 'Atribuir a planilha de horas',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index cce36ad07..d5c248b80 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -477,6 +477,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 03e7a992e..0984a7796 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -501,6 +501,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporta',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 5a037b846..faab0e60d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -427,6 +427,7 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Экспортировать',
+'form.report.per_hour' => 'За час',
 'form.report.assign_to_invoice' => 'Включить в счёт',
 'form.report.assign_to_timesheet' => 'Включить в табель',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c3ad4da53..8ba546295 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -488,6 +488,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportovať',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 04e709748..d041eaee1 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -473,6 +473,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 9823f810e..ac51518df 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -485,6 +485,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Izvoz',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 4250318c2..3c43c91cb 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -483,6 +483,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportera som',
 // TODO: translate the following.
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 32838159e..d37a1c547 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -513,6 +513,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 967a172ef..93c85118a 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -491,6 +491,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2fd31a762..75ac102bf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -494,6 +494,7 @@
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 // TODO: translate the following.
 // 'form.report.export' => 'Export',
+// 'form.report.per_hour' => 'Per hour',
 // 'form.report.assign_to_invoice' => 'Assign to invoice',
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
diff --git a/WEB-INF/templates/puncher.tpl b/WEB-INF/templates/puncher.tpl
index 9190af396..98bd5ca24 100644
--- a/WEB-INF/templates/puncher.tpl
+++ b/WEB-INF/templates/puncher.tpl
@@ -145,7 +145,7 @@ startTimer();
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
-    {* record custom fileds *}
+    {* record custom fields *}
     {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 8ae981a3b..3bd9f448c 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -38,7 +38,7 @@ License: See license.txt *}
   <tr>
     <th>{$i18n.label.date}</th>
   {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<th class="user-header">{$i18n.label.user}</th>{/if}
-  {* user custom fileds *}
+  {* user custom fields *}
   {if isset($custom_fields) && $custom_fields->userFields}
     {foreach $custom_fields->userFields as $userField}
       {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -48,7 +48,7 @@ License: See license.txt *}
   {if $bean->getAttribute('chclient')}<th class="client-header">{$i18n.label.client}</th>{/if}
   {if $bean->getAttribute('chproject')}<th class="project-header">{$i18n.label.project}</th>{/if}
   {if $bean->getAttribute('chtask')}<th class="task-header">{$i18n.label.task}</th>{/if}
-  {* time custom fileds *}
+  {* time custom fields *}
   {if isset($custom_fields) && $custom_fields->timeFields}
     {foreach $custom_fields->timeFields as $timeField}
       {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -60,7 +60,10 @@ License: See license.txt *}
   {if $bean->getAttribute('chduration')}<th>{$i18n.label.duration}</th>{/if}
   {if $bean->getAttribute('chunits')}<th>{$i18n.label.work_units_short}</th>{/if}
   {if $bean->getAttribute('chnote') && !$note_on_separate_row}<th class="note-header">{$i18n.label.note}</th>{/if}
-  {if $bean->getAttribute('chcost')}<th>{$i18n.label.cost}</th>{/if}
+  {if $bean->getAttribute('chcost')}
+    {if $show_cost_per_hour}<th>{$i18n.form.report.per_hour}</th>{/if}
+    <th>{$i18n.label.cost}</th>
+  {/if}
   {if $bean->getAttribute('chapproved')}<th>{$i18n.label.approved}</th>{/if}
   {if $bean->getAttribute('chpaid')}<th>{$i18n.label.paid}</th>{/if}
   {if $bean->getAttribute('chip')}<th>{$i18n.label.ip}</th>{/if}
@@ -79,7 +82,7 @@ License: See license.txt *}
   <tr>
     <th class="invoice-label">{$i18n.label.subtotal}</th>
         {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['user']|escape}</td>{/if}
-        {* user custom fileds *}
+        {* user custom fields *}
         {if isset($custom_fields) && $custom_fields->userFields}
           {foreach $custom_fields->userFields as $userField}
             {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -90,7 +93,7 @@ License: See license.txt *}
         {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
         {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
 
-        {* time custom fileds *}
+        {* time custom fields *}
           {if isset($custom_fields) && $custom_fields->timeFields}
            {foreach $custom_fields->timeFields as $timeField}
             {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -102,7 +105,10 @@ License: See license.txt *}
         {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
         {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
         {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-        {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}
+          {if $show_cost_per_hour}<td></td>{/if}
+          <td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>
+        {/if}
         {if $bean->getAttribute('chapproved')}<td></td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chip')}<td></td>{/if}
@@ -120,7 +126,7 @@ License: See license.txt *}
   <tr>
     <td class="date-cell">{$item.date}</td>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell">{$item.user|escape}</td>{/if}
-    {* user custom fileds *}
+    {* user custom fields *}
     {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="control_name" value='user_field_'|cat:$userField['id']}
@@ -131,7 +137,7 @@ License: See license.txt *}
     {if $bean->getAttribute('chclient')}<td class="text-cell">{$item.client|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="text-cell">{$item.project|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="text-cell">{$item.task|escape}</td>{/if}
-    {* time custom fileds *}
+    {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="control_name" value='time_field_'|cat:$timeField['id']}
@@ -144,7 +150,10 @@ License: See license.txt *}
     {if $bean->getAttribute('chduration')}<td class="time-cell">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="number-cell">{$item.units}</td>{/if}
     {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="text-cell">{$item.note|escape}</td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}
+      {if $show_cost_per_hour}<td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost_per_hour}{/if}</td>{/if}
+      <td class="money-value-cell">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>
+    {/if}
     {if $bean->getAttribute('chapproved')}<td class="yes-no-cell">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td class="yes-no-cell">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
     {if $bean->getAttribute('chip')}<td class="text-cell">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
@@ -180,7 +189,7 @@ License: See license.txt *}
     <th class="invoice-label">{$i18n.label.subtotal}</th>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['user']|escape}</td>{/if}
 
-    {* user custom fileds *}
+    {* user custom fields *}
     {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -190,7 +199,7 @@ License: See license.txt *}
     {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
     {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
-    {* time custom fileds *}
+    {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -202,7 +211,10 @@ License: See license.txt *}
     {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
     {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}
+      {if $show_cost_per_hour}<td></td>{/if}
+      <td class="money-value-cell subtotal-cell">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>
+    {/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
@@ -218,7 +230,7 @@ License: See license.txt *}
   <tr>
     <th class="invoice-label">{$i18n.label.total}</th>
     {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
-    {* user custom fileds *}
+    {* user custom fields *}
     {if isset($custom_fields) && $custom_fields->userFields}
       {foreach $custom_fields->userFields as $userField}
         {assign var="checkbox_control_name" value='show_user_field_'|cat:$userField['id']}
@@ -228,7 +240,7 @@ License: See license.txt *}
     {if $bean->getAttribute('chclient')}<td></td>{/if}
     {if $bean->getAttribute('chproject')}<td></td>{/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
-    {* time custom fileds *}
+    {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
         {assign var="checkbox_control_name" value='show_time_field_'|cat:$timeField['id']}
@@ -240,7 +252,10 @@ License: See license.txt *}
     {if $bean->getAttribute('chduration')}<td class="time-cell subtotal-cell">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chunits')}<td class="number-cell subtotal-cell">{$totals['units']}</td>{/if}
     {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
-    {if $bean->getAttribute('chcost')}<td class="money-value-cell subtotal-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}
+      {if $show_cost_per_hour}<td></td>{/if}
+      <td class="money-value-cell subtotal-cell">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>
+    {/if}
     {if $bean->getAttribute('chapproved')}<td></td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chip')}<td></td>{/if}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 6f6f73942..b601531ba 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -160,7 +160,7 @@ function handleStop(buttonElement) {
     {if $show_client}
     <td class="text-cell">{$record.client|escape}</td>
     {/if}
-    {* record custom fileds *}
+    {* record custom fields *}
     {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 41568f601..74e94053f 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -130,7 +130,7 @@ function fillDropdowns() {
   {foreach $time_records as $record}
   <tr {if !$record.billable}class="not-billable"{/if}>
     <td class="date-cell">{$record.date}</td>
-    {* record custom fileds *}
+    {* record custom fields *}
     {if $show_record_custom_fields && isset($custom_fields) && $custom_fields->timeFields}
       {foreach $custom_fields->timeFields as $timeField}
           {assign var="control_name" value='time_field_'|cat:$timeField['id']}
diff --git a/report.php b/report.php
index bd2576f14..38e57fe23 100644
--- a/report.php
+++ b/report.php
@@ -18,6 +18,7 @@
 // End of access checks.
 
 $config = new ttConfigHelper($user->getConfig());
+$show_cost_per_hour = $config->getDefinedValue('report_cost_per_hour');
 
 if ($user->isPluginEnabled('ap')) {
   $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
@@ -298,7 +299,11 @@
 if ($bean->getAttribute('chduration')) $colspan++;
 if (!$user->getConfigOption('report_note_on_separate_row') && $bean->getAttribute('chnote')) $colspan++;
 if ($bean->getAttribute('chunits')) $colspan++;
-if ($bean->getAttribute('chcost')) $colspan++;
+if ($bean->getAttribute('chcost')) {
+  if ($show_cost_per_hour)
+    $colspan++;
+  $colspan++;
+}
 if ($bean->getAttribute('chapproved')) $colspan++;
 if ($bean->getAttribute('chpaid')) $colspan++;
 if ($bean->getAttribute('chip')) $colspan++;
@@ -316,6 +321,7 @@
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('show_cost_per_hour', $show_cost_per_hour);
 $smarty->assign('note_on_separate_row', $user->getConfigOption('report_note_on_separate_row'));
 $smarty->assign('colspan', $colspan);
 $smarty->assign('bean', $bean);

From 350f206391875be2a1b1e3847f80030aca02210f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 Oct 2022 18:02:06 +0000
Subject: [PATCH 1754/1848] Fixed report exports for cost_per_hour column.

---
 WEB-INF/lib/ttReportHelper.class.php |  4 ++++
 initialize.php                       |  2 +-
 report.php                           |  2 +-
 tofile.php                           | 20 +++++++++++++++++---
 topdf.php                            |  7 +++++++
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index d15d1e9bf..cfcc64356 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -613,6 +613,10 @@ static function getItems($options) {
         if($val['finish'] != '')
           $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
       }
+      if (isset($val['cost_per_hour'])) {
+        if ('.' != $decimalMark)
+          $val['cost_per_hour'] = str_replace('.', $decimalMark, $val['cost_per_hour']);
+      }
       if (isset($val['cost'])) {
         if ('.' != $decimalMark)
           $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
diff --git a/initialize.php b/initialize.php
index 86aad8046..ed2fe659a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.9.5727");
+define("APP_VERSION", "1.21.9.5728");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 38e57fe23..4945ac173 100644
--- a/report.php
+++ b/report.php
@@ -18,7 +18,7 @@
 // End of access checks.
 
 $config = new ttConfigHelper($user->getConfig());
-$show_cost_per_hour = $config->getDefinedValue('report_cost_per_hour');
+$show_cost_per_hour = $config->getDefinedValue('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
 
 if ($user->isPluginEnabled('ap')) {
   $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
diff --git a/tofile.php b/tofile.php
index 530d2f7df..6ea39ad82 100644
--- a/tofile.php
+++ b/tofile.php
@@ -20,6 +20,8 @@
   $custom_fields = new CustomFields();
 }
 
+$show_cost_per_hour = $user->getConfigOption('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
+
 // Report settings are stored in session bean before we get here.
 $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
 
@@ -123,6 +125,11 @@
       }
       if ($bean->getAttribute('chunits')) print "\t<units><![CDATA[".$item['units']."]]></units>\n";
       if ($bean->getAttribute('chnote')) print "\t<note><![CDATA[".$item['note']."]]></note>\n";
+      if ($bean->getAttribute('chcost') && $show_cost_per_hour) {
+        print "\t<cost_per_hour><![CDATA[";
+          print $item['cost_per_hour'];
+        print "]]></cost_per_hour>\n";
+      }
       if ($bean->getAttribute('chcost')) {
         print "\t<cost><![CDATA[";
         if ($user->can('manage_invoices') || $user->isClient())
@@ -213,7 +220,11 @@
     if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
     if ($bean->getAttribute('chunits')) print ',"'.$i18n->get('label.work_units_short').'"';
     if ($bean->getAttribute('chnote')) print ',"'.$i18n->get('label.note').'"';
-    if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
+    if ($bean->getAttribute('chcost')) {
+      if ($show_cost_per_hour)
+        print ',"'.$i18n->get('form.report.per_hour').'"';
+      print ',"'.$i18n->get('label.cost').'"';
+    }
     if ($bean->getAttribute('chapproved')) print ',"'.$i18n->get('label.approved').'"';
     if ($bean->getAttribute('chpaid')) print ',"'.$i18n->get('label.paid').'"';
     if ($bean->getAttribute('chip')) print ',"'.$i18n->get('label.ip').'"';
@@ -255,10 +266,13 @@
       if ($bean->getAttribute('chunits')) print ',"'.$item['units'].'"';
       if ($bean->getAttribute('chnote')) print ',"'.ttNeutralizeForCsv($item['note']).'"';
       if ($bean->getAttribute('chcost')) {
-        if ($user->can('manage_invoices') || $user->isClient())
+        if ($user->can('manage_invoices') || $user->isClient()) {
+          if ($show_cost_per_hour)
+            print ',"'.$item['cost_per_hour'].'"';
           print ',"'.$item['cost'].'"';
-        else
+        } else {
           print ',"'.$item['expense'].'"';
+        }
       }
       if ($bean->getAttribute('chapproved')) print ',"'.$item['approved'].'"';
       if ($bean->getAttribute('chpaid')) print ',"'.$item['paid'].'"';
diff --git a/topdf.php b/topdf.php
index 85ff8d84e..931fa8145 100644
--- a/topdf.php
+++ b/topdf.php
@@ -38,6 +38,7 @@
 $config = new ttConfigHelper($user->getConfig());
 $show_note_column = $bean->getAttribute('chnote') && !$config->getDefinedValue('report_note_on_separate_row');
 $show_note_row = $bean->getAttribute('chnote') && $config->getDefinedValue('report_note_on_separate_row');
+$show_cost_per_hour = $config->getDefinedValue('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
 
 // There are 2 variations of report: totals only, or normal. Totals only means that the report
 // is grouped by either date, user, client, project, or task and user only needs to see subtotals by group.
@@ -152,6 +153,7 @@
   if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
   if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
   if ($show_note_column) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
+  if ($bean->getAttribute('chcost') && $show_cost_per_hour) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('form.report.per_hour').'</td>'; }
   if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
   if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
   if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
@@ -266,6 +268,11 @@
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
     if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
     if ($show_note_column) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
+    if ($bean->getAttribute('chcost') && $show_cost_per_hour) {
+      $html .= "<td $styleRightAligned>";
+      $html .= $item['cost_per_hour'];
+      $html .= '</td>';
+    }
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())

From 85c1f6d14ceb9df215bae6c7478bc0ec363e2b77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 Oct 2022 18:16:56 +0000
Subject: [PATCH 1755/1848] Fixed emailed reports for cost_per_hour column.

---
 WEB-INF/lib/ttReportHelper.class.php | 9 +++++++++
 initialize.php                       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index cfcc64356..056f4d4fb 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1037,6 +1037,7 @@ static function prepareReportBody($options, $comment = null)
     $config = new ttConfigHelper($user->getConfig());
     $show_note_column = $options['show_note'] && !$config->getDefinedValue('report_note_on_separate_row');
     $show_note_row = $options['show_note'] && $config->getDefinedValue('report_note_on_separate_row');
+    $show_cost_per_hour = $options['show_cost'] && $config->getDefinedValue('report_cost_per_hour') && ($user->can('manage_invoices') || $user->isClient());
 
     $items = ttReportHelper::getItems($options);
     $grouping = ttReportHelper::grouping($options);
@@ -1085,6 +1086,7 @@ static function prepareReportBody($options, $comment = null)
     if ($options['show_end']) $colspan++;
     if ($options['show_duration']) $colspan++;
     if ($options['show_work_units']) $colspan++;
+    if ($show_cost_per_hour) $colspan++;
     if ($options['show_cost']) $colspan++;
     if ($options['show_approved']) $colspan++;
     if ($options['show_paid']) $colspan++;
@@ -1201,6 +1203,8 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
       if ($show_note_column)
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
+      if ($show_cost_per_hour)
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('form.report.per_hour').'</td>';
       if ($options['show_cost'])
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
       if ($options['show_approved'])
@@ -1263,6 +1267,7 @@ static function prepareReportBody($options, $comment = null)
               if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
               if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
               if ($show_note_column) $body .= '<td></td>';
+              if ($show_cost_per_hour) $body .= '<td></td>';
               if ($options['show_cost']) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
                 $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
@@ -1318,6 +1323,8 @@ static function prepareReportBody($options, $comment = null)
             $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
           if ($show_note_column)
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
+          if ($show_cost_per_hour)
+            $body .= '<td style="'.$cellRightAligned.'">'.$record['cost_per_hour'].'</td>';
           if ($options['show_cost'])
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
           if ($options['show_approved']) {
@@ -1382,6 +1389,7 @@ static function prepareReportBody($options, $comment = null)
         if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
         if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
         if ($show_note_column) $body .= '<td></td>';
+        if ($show_cost_per_hour) $body .= '<td></td>';
         if ($options['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
@@ -1424,6 +1432,7 @@ static function prepareReportBody($options, $comment = null)
       if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
       if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
       if ($show_note_column) $body .= '<td></td>';
+      if ($show_cost_per_hour) $body .= '<td></td>';
       if ($options['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
         $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
diff --git a/initialize.php b/initialize.php
index ed2fe659a..25386c623 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.9.5728");
+define("APP_VERSION", "1.21.9.5729");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bd30ae8c78ced5dea93d10b0153f5b677e87891c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 18 Oct 2022 19:32:54 +0000
Subject: [PATCH 1756/1848] Finished adding cost per hour column in reports.

---
 WEB-INF/templates/display_options.tpl | 2 --
 initialize.php                        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index c09a18e9b..5b487ec85 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -49,7 +49,6 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_53.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{if defined('REPORT_COST_PER_HOUR')}
   <tr class = "small-screen-label"><td><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="report_cost_per_hour">{$i18n.form.display_options.cost_per_hour}:</label></td>
@@ -58,7 +57,6 @@ License: See license.txt *}
       <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_57.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
     </td>
   </tr>
-{/if}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr><td><div class="form-control-separator"></div></td></tr>
   <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_css}</td></tr>
diff --git a/initialize.php b/initialize.php
index 25386c623..e58e54a1b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.9.5729");
+define("APP_VERSION", "1.21.10.5730");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From dc03995e430b92b0e3f814d32f586a994996dc81 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 20 Oct 2022 22:01:13 +0000
Subject: [PATCH 1757/1848] German translation improved.

---
 WEB-INF/resources/de.lang.php | 3 +--
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8d5e030c3..95d9af2ca 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -459,8 +459,7 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exportiere',
-// TODO: translate the following.
-// 'form.report.per_hour' => 'Per hour',
+'form.report.per_hour' => 'Stundensatz',
 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
 // TODO: translate the following.
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
diff --git a/initialize.php b/initialize.php
index e58e54a1b..90872e605 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.10.5730");
+define("APP_VERSION", "1.21.10.5731");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e8b8d42fc07ebce3d8a08303c21c488a3165019e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Oct 2022 14:53:20 +0000
Subject: [PATCH 1758/1848] Starting to work on project custom fields.

---
 WEB-INF/templates/cf_custom_fields.tpl |  2 ++
 cf_custom_field_add.php                | 16 ++++++++++++----
 initialize.php                         |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 70253cb3f..812943db8 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -19,6 +19,8 @@ License: See license.txt *}
     <td>{$i18n.entity.time}</td>
       {elseif CustomFields::ENTITY_USER == $field['entity_type']}
     <td>{$i18n.entity.user}</td>
+      {elseif CustomFields::ENTITY_PROJECT == $field['entity_type']}
+    <td>{$i18n.entity.project}</td>
       {else}
     <td></td>
       {/if}
diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 6cfd87256..38d672822 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -27,10 +27,18 @@
 
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
-$form->addInput(array('type'=>'combobox','name'=>'entity',
-  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
-                CustomFields::ENTITY_USER=>$i18n->get('entity.user'))
-));
+if (defined('DEBUG_PROJECT_CUSTOM_FIELDS')) {
+  $form->addInput(array('type'=>'combobox','name'=>'entity',
+    'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
+                  CustomFields::ENTITY_USER=>$i18n->get('entity.user'),
+                  CustomFields::ENTITY_PROJECT=>$i18n->get('entity.project'))
+  ));
+} else {
+  $form->addInput(array('type'=>'combobox','name'=>'entity',
+    'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
+                  CustomFields::ENTITY_USER=>$i18n->get('entity.user'))
+  ));
+}
 $form->addInput(array('type'=>'combobox','name'=>'type',
   'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
                 CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))
diff --git a/initialize.php b/initialize.php
index 90872e605..6033d935a 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.10.5731");
+define("APP_VERSION", "1.21.10.5732");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b0381c6478f062d37bdbb38714d23ee6c2151805 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Oct 2022 16:16:14 +0000
Subject: [PATCH 1759/1848] Work in progress on project custom fields.

---
 WEB-INF/resources/ca.lang.php    |  1 +
 WEB-INF/resources/cs.lang.php    |  1 +
 WEB-INF/resources/da.lang.php    |  1 +
 WEB-INF/resources/de.lang.php    |  1 +
 WEB-INF/resources/en.lang.php    |  1 +
 WEB-INF/resources/es.lang.php    |  1 +
 WEB-INF/resources/et.lang.php    |  1 +
 WEB-INF/resources/fa.lang.php    |  1 +
 WEB-INF/resources/fi.lang.php    |  1 +
 WEB-INF/resources/fr.lang.php    |  1 +
 WEB-INF/resources/gr.lang.php    |  1 +
 WEB-INF/resources/he.lang.php    |  1 +
 WEB-INF/resources/hu.lang.php    |  1 +
 WEB-INF/resources/it.lang.php    |  1 +
 WEB-INF/resources/ja.lang.php    |  1 +
 WEB-INF/resources/ko.lang.php    |  1 +
 WEB-INF/resources/nl.lang.php    |  2 ++
 WEB-INF/resources/no.lang.php    |  1 +
 WEB-INF/resources/pl.lang.php    |  1 +
 WEB-INF/resources/pt-br.lang.php |  2 ++
 WEB-INF/resources/pt.lang.php    |  1 +
 WEB-INF/resources/ro.lang.php    |  1 +
 WEB-INF/resources/ru.lang.php    |  1 +
 WEB-INF/resources/sk.lang.php    |  1 +
 WEB-INF/resources/sl.lang.php    |  1 +
 WEB-INF/resources/sr.lang.php    |  1 +
 WEB-INF/resources/sv.lang.php    |  1 +
 WEB-INF/resources/tr.lang.php    |  1 +
 WEB-INF/resources/zh-cn.lang.php |  1 +
 WEB-INF/resources/zh-tw.lang.php |  1 +
 WEB-INF/templates/reports.tpl    | 16 +++++++++++++---
 initialize.php                   |  2 +-
 plugins/CustomFields.class.php   | 29 ++---------------------------
 reports.php                      | 17 +++++++++++++++++
 34 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index a06c8a692..13d8237c2 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -480,6 +480,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Agrupar per',
 'form.reports.group_by_no' => '--- no agrupar ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e8d297edc..4a93086de 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -488,6 +488,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Seskupit podle',
 // TODO: translate the following.
 // 'form.reports.group_by_no' => '--- no grouping ---',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 6e27e5370..595590f0a 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -465,6 +465,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Gruppér ved',
 'form.reports.group_by_no' => '--- Ingen gruppereing ---',
 'form.reports.group_by_date' => 'Dato',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 95d9af2ca..209df6b72 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -448,6 +448,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Gruppieren nach',
 'form.reports.group_by_no' => '--- keine Gruppierung ---',
 'form.reports.group_by_date' => 'Datum',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 2f42d2730..83808aa40 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -429,6 +429,7 @@
 'form.reports.show_fields' => 'Show fields',
 'form.reports.time_fields' => 'Time fields',
 'form.reports.user_fields' => 'User fields',
+'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Group by',
 'form.reports.group_by_no' => '--- no grouping ---',
 'form.reports.group_by_date' => 'date',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 6dbfd29a8..507bbcaac 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -493,6 +493,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- no agrupar ---',
 'form.reports.group_by_date' => 'fecha',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index dc08bd01a..0295dc70f 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -478,6 +478,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Grupeeri',
 'form.reports.group_by_no' => '--- grupeerimata ---',
 'form.reports.group_by_date' => 'kuupäev',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f8d8f6843..078872026 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -486,6 +486,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'گروه بندی شده با',
 'form.reports.group_by_no' => '--- بدون گروه ---',
 'form.reports.group_by_date' => 'تاریخ',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 8d5ec21ec..e9e92e018 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -471,6 +471,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Ryhmittelyperuste',
 'form.reports.group_by_no' => '--- ei ryhmitystä ---',
 'form.reports.group_by_date' => 'päivä',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 8e7289715..145fcb289 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -462,6 +462,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Regroupés par',
 'form.reports.group_by_no' => '--- Aucun regroupement ---',
 'form.reports.group_by_date' => 'Date',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index dc03db958..6265976d7 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -457,6 +457,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Ομαδοποίηση με βάση',
 'form.reports.group_by_no' => '--- χωρίς ομαδοποίηση ---',
 'form.reports.group_by_date' => 'ημερομηνία',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5249ee8e9..727b0b761 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -489,6 +489,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'סדר לפי',
 'form.reports.group_by_no' => '--- ללא סדר ---',
 'form.reports.group_by_date' => 'תאריך',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f19593ba7..8b0be9524 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -482,6 +482,7 @@
 // 'form.reports.show_fields' => 'Show fields',
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Csoportosítva',
 'form.reports.group_by_no' => '--- csoportosítás nélkül ---',
 'form.reports.group_by_date' => 'dátum',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index f936ef123..d283830a1 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -470,6 +470,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Raggruppa per',
 'form.reports.group_by_no' => '--- non raggruppare ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 02d4ad227..112e454cc 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -488,6 +488,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => '次のようにグループ化',
 'form.reports.group_by_no' => '--- グループの機能がありません ---',
 'form.reports.group_by_date' => '日付',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 491631d04..6bb78d772 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -486,6 +486,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => '다음것에 의한 그룹화',
 'form.reports.group_by_no' => '--- 그룹화되지 않음 ---',
 'form.reports.group_by_date' => '날짜',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 90ee07697..38d93efdb 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -415,6 +415,8 @@
 'form.reports.show_fields' => 'Toon velden',
 'form.reports.time_fields' => 'Tijd velden',
 'form.reports.user_fields' => 'Medewerker velden',
+// TODO: translate the following.
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Groeperen op',
 'form.reports.group_by_no' => '--- niet groeperen ---',
 'form.reports.group_by_date' => 'datum',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 9fd520436..18e1ee69f 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -488,6 +488,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 'form.reports.group_by_date' => 'dato',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 325948cdd..b7dd5024c 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -473,6 +473,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Grupowanie wg',
 'form.reports.group_by_no' => '--- bez grupowania ---',
 'form.reports.group_by_date' => 'daty',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 279d9eb68..fff94fa3d 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -419,6 +419,8 @@
 'form.reports.show_fields' => 'Exibir campos',
 'form.reports.time_fields' => 'Campos de tempo',
 'form.reports.user_fields' => 'Campos de usuário',
+// TODO: translate the following.
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Agrupar por',
 'form.reports.group_by_no' => '--- sem agrupar ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index d5c248b80..075e7b41c 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -465,6 +465,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 // 'form.reports.group_by_date' => 'date',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 0984a7796..0d8fe6d1f 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -488,6 +488,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Grupat dupa',
 'form.reports.group_by_no' => '--- fara grupare ---',
 'form.reports.group_by_date' => 'data',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index faab0e60d..805be45b5 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -416,6 +416,7 @@
 'form.reports.show_fields' => 'Показывать поля',
 'form.reports.time_fields' => 'Поля времени',
 'form.reports.user_fields' => 'Поля пользователя',
+'form.reports.project_fields' => 'Поля проекта',
 'form.reports.group_by' => 'Группировать по',
 'form.reports.group_by_no' => '--- без группировки ---',
 'form.reports.group_by_date' => 'дате',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8ba546295..e57e63d74 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -476,6 +476,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 'form.reports.group_by_date' => 'dátum',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d041eaee1..8ea8c445e 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -460,6 +460,7 @@
 // 'form.reports.show_fields' => 'Show fields',
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
 // 'form.reports.group_by_date' => 'date',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ac51518df..055545b37 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -473,6 +473,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Grupiši po',
 'form.reports.group_by_no' => '--- nemoj grupisati ---',
 'form.reports.group_by_date' => 'datum',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3c43c91cb..e0d212b9e 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -471,6 +471,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Gruppera efter',
 'form.reports.group_by_no' => '--- Ingen gruppering ---',
 'form.reports.group_by_date' => 'Datum',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index d37a1c547..098871718 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -499,6 +499,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => 'Gruplandırma kıstas',
 'form.reports.group_by_no' => '--- gruplama yok ---',
 'form.reports.group_by_date' => 'tarih',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 93c85118a..87f1cc1c9 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -477,6 +477,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => '分组方式',
 'form.reports.group_by_no' => '--- 没有分组 ---',
 'form.reports.group_by_date' => '日期',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 75ac102bf..181756e77 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -480,6 +480,7 @@
 // TODO: translate the following.
 // 'form.reports.time_fields' => 'Time fields',
 // 'form.reports.user_fields' => 'User fields',
+// 'form.reports.project_fields' => 'Project fields',
 'form.reports.group_by' => '分組方式',
 'form.reports.group_by_no' => '--- 沒有分組 ---',
 'form.reports.group_by_date' => '日期',
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 51c98212c..370a6d462 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -245,9 +245,6 @@ function handleCheckboxes() {
 }
 </script>
 
-{* Copyright (c) Anuko International Ltd. https://www.anuko.com
-License: See license.txt *}
-
 {$forms.reportForm.open}
 <table class="centered-table">
   <tr><td class="text-cell">{$i18n.label.fav_report}:</td></tr>
@@ -513,6 +510,19 @@ License: See license.txt *}
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
+{if isset($custom_fields) && $custom_fields->projectFields}
+  <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.project_fields}</div></td></tr>
+  {foreach $custom_fields->projectFields as $projectField}
+    {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+    {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$projectField['label']|escape}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$projectField['label']|escape}:</label></td>
+    <td class="td-with-input">{$forms.reportForm.$control_name.control} {$forms.reportForm.$checkbox_control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
 </table>
 <div class="form-control-separator"></div>
 <table class="centered-table">
diff --git a/initialize.php b/initialize.php
index 6033d935a..e6e457301 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.10.5732");
+define("APP_VERSION", "1.21.10.5733");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 4e2f13195..0e52871e2 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -1,31 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 class CustomFields {
 
diff --git a/reports.php b/reports.php
index 65aba65d9..2fb61ccdf 100644
--- a/reports.php
+++ b/reports.php
@@ -315,6 +315,23 @@
   }
 }
 
+// If we have projects custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    $checkbox_field_name = 'show_'.$field_name;
+    if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,));
+    } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'data'=>CustomFields::getOptions($projectField['id']),
+      'empty'=>array(''=>$i18n->get('dropdown.all'))));
+    }
+    // Also add a checkbox (to print the field or not).
+    $form->addInput(array('type'=>'checkbox','name'=>$checkbox_field_name));
+  }
+}
+
 // Add group by control.
 $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
 $group_by_options['date'] = $i18n->get('form.reports.group_by_date');

From ac2e96281d8be1c80d50cc08290609b60fc9f997 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 21 Oct 2022 19:28:55 +0000
Subject: [PATCH 1760/1848] Added handling of custom fields on project_add,
 project_edit, and project_delete pages.

---
 WEB-INF/lib/ttProjectHelper.class.php | 11 ++++
 WEB-INF/templates/project_add.tpl     | 11 ++++
 WEB-INF/templates/project_edit.tpl    | 12 +++++
 project_add.php                       | 54 +++++++++++++++++--
 project_edit.php                      | 75 ++++++++++++++++++++++++---
 user_edit.php                         |  2 +-
 6 files changed, 153 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index e1d5754c5..e6459bd04 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -220,6 +220,17 @@ static function delete($id) {
     if (!ttClientHelper::deleteProject($id))
       return false;
 
+    // Mark project custom fields as deleted,
+    require_once('plugins/CustomFields.class.php');
+    $entity_type = CustomFields::ENTITY_PROJECT;
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $sql = "update tt_entity_custom_fields set status = null $modified_part".
+      " where entity_type = $entity_type and entity_id = $id".
+      " and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
     // Update entities_modified, too.
     if (!ttGroupHelper::updateEntitiesModified())
       return false;
diff --git a/WEB-INF/templates/project_add.tpl b/WEB-INF/templates/project_add.tpl
index 8cc43fcaa..7b1fd835c 100644
--- a/WEB-INF/templates/project_add.tpl
+++ b/WEB-INF/templates/project_add.tpl
@@ -15,6 +15,17 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.projectForm.description.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if isset($custom_fields) && $custom_fields->projectFields}
+  {foreach $custom_fields->projectFields as $projectField}
+    {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
 {if $show_files}
   <tr class = "small-screen-label"><td><label for="newfile">{$i18n.label.file}:</label></td></tr>
   <tr>
diff --git a/WEB-INF/templates/project_edit.tpl b/WEB-INF/templates/project_edit.tpl
index 3ecc85a84..4e3b02e79 100644
--- a/WEB-INF/templates/project_edit.tpl
+++ b/WEB-INF/templates/project_edit.tpl
@@ -15,6 +15,18 @@ License: See license.txt *}
     <td class="td-with-input">{$forms.projectForm.description.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if isset($custom_fields) && $custom_fields->projectFields}
+  {foreach $custom_fields->projectFields as $projectField}
+    {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+  <tr class = "small-screen-label"><td><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td></tr>
+  <tr>
+    <td class="large-screen-label"><label for="{$control_name}">{$projectField['label']|escape}{if $projectField['required']} (*){/if}:</label></td>
+    <td class="td-with-input">{$forms.projectForm.$control_name.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+  {/foreach}
+{/if}
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   <tr class = "small-screen-label"><td><label for="status">{$i18n.label.status}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="status">{$i18n.label.status}:</label></td>
diff --git a/project_add.php b/project_add.php
index 35b45c97a..859fdc259 100644
--- a/project_add.php
+++ b/project_add.php
@@ -19,6 +19,13 @@
 }
 // End of access checks.
 
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
 $showFiles = $user->isPluginEnabled('at');
 $users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
@@ -35,6 +42,18 @@
   $cl_description = trim($request->getParameter('description'));
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
+  // If we have project custom fields - collect input.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $control_name = 'project_field_'.$projectField['id'];
+      $projectCustomFields[$projectField['id']] = array('field_id' => $projectField['id'],
+        'control_name' => $control_name,
+        'label' => $projectField['label'],
+        'type' => $projectField['type'],
+        'required' => $projectField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
 } else {
   foreach ($users as $user_item)
     $cl_users[] = $user_item['id'];
@@ -45,6 +64,20 @@
 $form = new Form('projectForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
+// If we have custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$projectCustomFields[$projectField['id']]['value']));
+    } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'data'=>CustomFields::getOptions($projectField['id']),
+      'value'=>$projectCustomFields[$projectField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
@@ -56,26 +89,37 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Validate input in project custom fields.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($projectCustomFields as $projectField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($projectField['value'], !$projectField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($projectField['label']));
+    }
+  }
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      $id = ttProjectHelper::insert(array('name' => $cl_name,
+      $project_id = ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
         'status' => ACTIVE));
-
+      // Insert project custom fields if we have them.
+      $result = true;
+      if ($project_id && isset($custom_fields) && $custom_fields->projectFields) {
+        $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_PROJECT, $project_id, $projectCustomFields);
+      }
       // Put a new file in storage if we have it.
-      if ($id && $showFiles && $_FILES['newfile']['name']) {
+      if ($project_id && $showFiles && $_FILES['newfile']['name']) {
         $fileHelper = new ttFileHelper($err);
         $fields = array('entity_type'=>'project',
-          'entity_id' => $id,
+          'entity_id' => $project_id,
           'file_name' => $_FILES['newfile']['name']);
         $fileHelper->putFile($fields);
       }
-      if ($id) {
+      if ($project_id && $result) {
         header('Location: projects.php');
         exit();
       } else
diff --git a/project_edit.php b/project_edit.php
index 7d8e113dd..a0190ff83 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -24,6 +24,13 @@
 }
 // End of access checks.
 
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}
+
 $users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
@@ -39,9 +46,33 @@
   $cl_status = $request->getParameter('status');
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
+  // If we have project custom fields - collect input.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $control_name = 'project_field_'.$projectField['id'];
+      $projectCustomFields[$projectField['id']] = array('field_id' => $projectField['id'],
+        'control_name' => $control_name,
+        'label' => $projectField['label'],
+        'type' => $projectField['type'],
+        'required' => $projectField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }
 } else {
   $cl_name = $project['name'];
   $cl_description = $project['description'];
+  // If we have project custom fields - collect values from database.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $control_name = 'project_field_'.$projectField['id'];
+      $projectCustomFields[$projectField['id']] = array('field_id' => $projectField['id'],
+        'control_name' => $control_name,
+        'label' => $projectField['label'],
+        'type' => $projectField['type'],
+        'required' => $projectField['required'],
+        'value' => $custom_fields->getEntityFieldValue(CustomFields::ENTITY_PROJECT, $cl_project_id, $projectField['id'], $projectField['type']));
+    }
+  }
   $cl_status = $project['status'];
   $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
   $cl_tasks = explode(',', $project['tasks']);
@@ -51,6 +82,20 @@
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_project_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
+// If we have custom fields - add controls for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$projectCustomFields[$projectField['id']]['value']));
+    } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'data'=>CustomFields::getOptions($projectField['id']),
+      'value'=>$projectCustomFields[$projectField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
@@ -63,6 +108,13 @@
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  // Validate input in project custom fields.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($projectCustomFields as $projectField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($projectField['value'], !$projectField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($projectField['label']));
+    }
+  }
   if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
   if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
@@ -72,28 +124,39 @@
       $existing_project = ttProjectHelper::getProjectByName($cl_name);
       if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
         // Update project information.
-        if (ttProjectHelper::update(array(
+        $result = ttProjectHelper::update(array(
           'id' => $cl_project_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
           'users' => $cl_users,
-          'tasks' => $cl_tasks))) {
+          'tasks' => $cl_tasks));
+        // Update project custom fields if we have them.
+        if ($result && isset($custom_fields) && $custom_fields->projectFields) {
+          $result = $custom_fields->updateEntityFields(CustomFields::ENTITY_PROJECT, $cl_project_id, $projectCustomFields);
+        }
+        if ($result) {
           header('Location: projects.php');
           exit();
-        } else
+         } else
           $err->add($i18n->get('error.db'));
-      } else
+        } else
         $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array('name' => $cl_name,
+        $project_id = ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,
-          'status' => ACTIVE))) {
+          'status' => ACTIVE));
+        // Insert project custom fields if we have them.
+        $result = true;
+        if ($project_id && isset($custom_fields) && $custom_fields->projectFields) {
+          $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_PROJECT, $project_id, $projectCustomFields);
+        }
+        if ($project_id && $result) {
           header('Location: projects.php');
           exit();
         } else
diff --git a/user_edit.php b/user_edit.php
index 6bdbef693..0633e8a1f 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -199,7 +199,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
-    // Validate input in user custom fields.
+  // Validate input in user custom fields.
   if (isset($custom_fields) && $custom_fields->userFields) {
     foreach ($userCustomFields as $userField) {
       // Validation is the same for text and dropdown fields.

From 2700f1d275ac01a18beeae8f9d3cd124fc214193 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Oct 2022 13:51:57 +0000
Subject: [PATCH 1761/1848] Added a condition on including project custom
 fields on reports.

---
 WEB-INF/templates/reports.tpl | 2 +-
 initialize.php                | 2 +-
 reports.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 370a6d462..6a5ecbbe0 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -510,7 +510,7 @@ function handleCheckboxes() {
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
   {/foreach}
 {/if}
-{if isset($custom_fields) && $custom_fields->projectFields}
+{if $show_project && isset($custom_fields) && $custom_fields->projectFields}
   <tr><td colspan="2"><div class="section-header">{$i18n.form.reports.project_fields}</div></td></tr>
   {foreach $custom_fields->projectFields as $projectField}
     {assign var="control_name" value='project_field_'|cat:$projectField['id']}
diff --git a/initialize.php b/initialize.php
index e6e457301..f31382c7f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.10.5733");
+define("APP_VERSION", "1.21.10.5734");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 2fb61ccdf..6d5b441a4 100644
--- a/reports.php
+++ b/reports.php
@@ -316,7 +316,7 @@
 }
 
 // If we have projects custom fields - add controls for them.
-if (isset($custom_fields) && $custom_fields->projectFields) {
+if ($showProject && isset($custom_fields) && $custom_fields->projectFields) {
   foreach ($custom_fields->projectFields as $projectField) {
     $field_name = 'project_field_'.$projectField['id'];
     $checkbox_field_name = 'show_'.$field_name;

From 318f74cc352cbbbd049077bc61375d7e2d4d6ff1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Oct 2022 19:11:06 +0000
Subject: [PATCH 1762/1848] Made progress on including project custom fields on
 reports.

---
 WEB-INF/lib/ttProjectHelper.class.php |   2 +-
 WEB-INF/lib/ttReportHelper.class.php  | 276 +++++++++++++++++++++++++-
 WEB-INF/templates/report.tpl          |  36 ++++
 initialize.php                        |   2 +-
 reports.php                           |   7 +
 5 files changed, 318 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index e6459bd04..bd166e864 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -166,7 +166,7 @@ static function getProjectByName($name) {
   }
   
   
-  // delete - deletes things associated with a project and marks the project as deleted. 
+  // delete - deletes things associated with a project and marks the project and its custom fields as deleted.
   static function delete($id) {
     global $user;
     $mdb2 = getConnection();
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 056f4d4fb..85c4d80b4 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -108,6 +108,30 @@ static function getWhere($options) {
       }
     }
 
+    // Add project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
+          $cfoTable = 'cfo'.$projectField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
+
+    // Continue preparing part for text custom fields using LIKE operator.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_TEXT && $field_value) {
+          $ecfTableName = 'ecf'.$projectField['id'];
+          $cf_text_parts .= " and $ecfTableName.value like ".$mdb2->quote("%$field_value%");
+        }
+      }
+    }
+
     // Prepare sql query part for user list.
     $userlist = isset($options['users']) ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
@@ -196,6 +220,30 @@ static function getExpenseWhere($options) {
       }
     }
 
+    // Add project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_DROPDOWN && $field_value) {
+          $cfoTable = 'cfo'.$projectField['id'];
+          $dropdown_parts .= " and $cfoTable.id = $field_value";
+        }
+      }
+    }
+
+    // Continue prparing parts for text custom fields using LIKE operator.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        if ($projectField['type'] == CustomFields::TYPE_TEXT && $field_value) {
+          $ecfTableName = 'ecf'.$projectField['id'];
+          $cf_text_parts .= " and $ecfTableName.value like ".$mdb2->quote("%$field_value%");
+        }
+      }
+    }
+
     // Prepare sql query part for user list.
     $userlist = isset($options['users']) ? $options['users'] : '-1';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
@@ -306,6 +354,22 @@ static function getItems($options) {
         }
       }
     }
+    // Add project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_field_name = 'show_'.$field_name;
+        if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            $ecfTableName = 'ecf'.$projectField['id'];
+            array_push($fields, "$ecfTableName.value as $field_name");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTableName = 'cfo'.$projectField['id'];
+            array_push($fields, "$cfoTableName.value as $field_name");
+          }
+        }
+      }
+    }
     // Add start time.
     if ($options['show_start']) {
       array_push($fields, "l.start as unformatted_start");
@@ -372,8 +436,7 @@ static function getItems($options) {
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-    // Left joins for custom fields.
-    // 1 join is required for each text field, 2 joins for each dropdown.
+    // Left joins for user custom fields.
     if (isset($custom_fields) && $custom_fields->userFields) {
       foreach ($custom_fields->userFields as $userField) {
         $field_name = 'user_field_'.$userField['id'];
@@ -393,6 +456,26 @@ static function getItems($options) {
         }
       }
     }
+    // Left joins for project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_field_name = 'show_'.$field_name;
+        $entity_type = CustomFields::ENTITY_PROJECT;
+        if ($options[$field_name] || $options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
+          $ecfTable = 'ecf'.$projectField['id'];
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$projectField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
     if ($options['show_client'] || $grouping_by_client)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
     if (($canViewReports || $isClient) && $options['show_invoice'])
@@ -495,6 +578,22 @@ static function getItems($options) {
           }
         }
       }
+      // Add project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          if ($options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
+            if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+              $ecfTableName = 'ecf'.$projectField['id'];
+              array_push($fields, "$ecfTableName.value as $field_name");
+            } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTableName = 'cfo'.$projectField['id'];
+              array_push($fields, "$cfoTableName.value as $field_name");
+            }
+          }
+        }
+      }
       if ($options['show_start']) {
         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
@@ -557,6 +656,26 @@ static function getItems($options) {
           }
         }
       }
+      // Left joins for project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $entity_type = CustomFields::ENTITY_PROJECT;
+          if ($options[$field_name] || $options[$checkbox_field_name] || ttReportHelper::groupingBy($field_name, $options)) {
+            $ecfTable = 'ecf'.$projectField['id'];
+            if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+              // Add one join for each text field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTable = 'cfo'.$projectField['id'];
+              // Add two joins for each dropdown field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+              $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+            }
+          }
+        }
+      }
       if ($canViewReports || $isClient)
         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
       if ($options['show_client'] || $grouping_by_client)
@@ -826,6 +945,26 @@ static function getTotals($options)
         }
       }
     }
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_PROJECT;
+        if ($field_value) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$projectField['id'];
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$projectField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
     if (isset($options['show_cost']) && $options['show_cost']) {
       if (MODE_TIME == $trackingMode) {
         $left_joins .= " left join tt_users u on (l.user_id = u.id)";
@@ -876,6 +1015,26 @@ static function getTotals($options)
           }
         }
       }
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $field_value = $options[$field_name];
+          $entity_type = CustomFields::ENTITY_PROJECT;
+          if ($field_value) {
+            // We need to add left joins when input is not null.
+            $ecfTable = 'ecf'.$projectField['id'];
+            if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+              // Add one join for each text field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+              $cfoTable = 'cfo'.$projectField['id'];
+              // Add two joins for each dropdown field.
+              $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+              $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+            }
+          }
+        }
+      }
 
       $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $left_joins $where";
 
@@ -1617,7 +1776,15 @@ static function getReportOptions($bean) {
         }
       }
 
-      // TODO: add project fields here.
+      // Project fields.
+      if ($custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $control_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$control_name;
+          $options[$control_name] =  $bean->getAttribute($control_name);
+          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
+        }
+      }
     }
 
     $options['group_by1'] = $bean->getAttribute('group_by1');
@@ -1795,6 +1962,19 @@ static function makeSingleDropdownConcatCustomFieldPart($dropdown_value) {
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(ecf".$projectField['id'].".value, 'Null')");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$projectField['id'].".value, 'Null')");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -1829,6 +2009,19 @@ static function makeSingleDropdownConcatCustomFieldExpensesPart($dropdown_value)
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ' - ', coalesce(ecf".$projectField['id'].".value, 'Null')");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", ' - ', coalesce(cfo".$projectField['id'].".value, 'Null')");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -1882,6 +2075,19 @@ static function makeSingleDropdownGroupByCustomFieldPart($dropdown_value) {
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ecf".$projectField['id'].".value as $field_name");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$projectField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -1916,6 +2122,19 @@ static function makeSingleDropdownGroupByCustomFieldExpensesPart($dropdown_value
         }
       }
     }
+    // Iterate through project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            return (", ecf".$projectField['id'].".value as $field_name");
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            return (", cfo".$projectField['id'].".value as $field_name");
+          }
+        }
+      }
+    }
     // Iterate through time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
       foreach ($custom_fields->timeFields as $timeField) {
@@ -2151,6 +2370,27 @@ static function makeJoinPart($options) {
         }
       }
     }
+    // Left joins for project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_PROJECT;
+        if ($field_value || ttReportHelper::groupingBy($field_name, $options)) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$projectField['id'];
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$projectField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = l.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
 
     // Prepare inner joins.
     $inner_joins = null;
@@ -2240,6 +2480,27 @@ static function makeJoinExpensesPart($options) {
         }
       }
     }
+    // Left joins for project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = $options[$field_name];
+        $entity_type = CustomFields::ENTITY_PROJECT;
+        if ($field_value || ttReportHelper::groupingBy($field_name, $options)) {
+          // We need to add left joins when input is not null.
+          $ecfTable = 'ecf'.$projectField['id'];
+          if ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // Add one join for each text field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+          } elseif ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            $cfoTable = 'cfo'.$projectField['id'];
+            // Add two joins for each dropdown field.
+            $left_joins .= " left join tt_entity_custom_fields $ecfTable on ($ecfTable.entity_type = $entity_type and $ecfTable.entity_id = ei.project_id and $ecfTable.field_id = ".$projectField['id'].")";
+            $left_joins .= " left join tt_custom_field_options $cfoTable on ($cfoTable.field_id = $ecfTable.field_id and $cfoTable.id = $ecfTable.option_id)";
+          }
+        }
+      }
+    }
 
     return $left_joins;
   }
@@ -2299,6 +2560,15 @@ static function makeGroupByHeaderPart($dropdown_value) {
         }
       }
     }
+    // Process project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        if ($dropdown_value == $field_name) {
+          return $projectField['label'];
+        }
+      }
+    }
 
     // Return null if nothing is found.
     return null;
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 3bd9f448c..b63e505f8 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -47,6 +47,13 @@ License: See license.txt *}
   {/if}
   {if $bean->getAttribute('chclient')}<th class="client-header">{$i18n.label.client}</th>{/if}
   {if $bean->getAttribute('chproject')}<th class="project-header">{$i18n.label.project}</th>{/if}
+  {* project custom fields *}
+  {if isset($custom_fields) && $custom_fields->projectFields}
+    {foreach $custom_fields->projectFields as $projectField}
+      {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+      {if $bean->getAttribute($checkbox_control_name)}<th>{{$projectField['label']|escape}}</th>{/if}
+    {/foreach}
+  {/if}
   {if $bean->getAttribute('chtask')}<th class="task-header">{$i18n.label.task}</th>{/if}
   {* time custom fields *}
   {if isset($custom_fields) && $custom_fields->timeFields}
@@ -91,6 +98,13 @@ License: See license.txt *}
         {/if}
         {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['client']|escape}</td>{/if}
         {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['project']|escape}</td>{/if}
+        {* project custom fields *}
+        {if isset($custom_fields) && $custom_fields->projectFields}
+          {foreach $custom_fields->projectFields as $projectField}
+            {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+            {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+          {/foreach}
+        {/if}
         {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$prev_grouped_by]['task']|escape}</td>{/if}
 
         {* time custom fields *}
@@ -136,6 +150,14 @@ License: See license.txt *}
     {/if}
     {if $bean->getAttribute('chclient')}<td class="text-cell">{$item.client|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="text-cell">{$item.project|escape}</td>{/if}
+    {* project custom fields *}
+    {if isset($custom_fields) && $custom_fields->projectFields}
+      {foreach $custom_fields->projectFields as $projectField}
+        {assign var="control_name" value='project_field_'|cat:$projectField['id']}
+        {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td class="text-cell">{$item.$control_name|escape}</td>{/if}
+      {/foreach}
+    {/if}
     {if $bean->getAttribute('chtask')}<td class="text-cell">{$item.task|escape}</td>{/if}
     {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
@@ -198,6 +220,13 @@ License: See license.txt *}
     {/if}
     {if $bean->getAttribute('chclient')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['client']|escape}</td>{/if}
     {if $bean->getAttribute('chproject')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['project']|escape}</td>{/if}
+    {* project custom fields *}
+    {if isset($custom_fields) && $custom_fields->projectFields}
+      {foreach $custom_fields->projectFields as $projectField}
+        {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
     {if $bean->getAttribute('chtask')}<td class="text-cell subtotal-cell">{$subtotals[$cur_grouped_by]['task']|escape}</td>{/if}
     {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
@@ -239,6 +268,13 @@ License: See license.txt *}
     {/if}
     {if $bean->getAttribute('chclient')}<td></td>{/if}
     {if $bean->getAttribute('chproject')}<td></td>{/if}
+    {* project custom fields *}
+    {if isset($custom_fields) && $custom_fields->projectFields}
+      {foreach $custom_fields->projectFields as $projectField}
+        {assign var="checkbox_control_name" value='show_project_field_'|cat:$projectField['id']}
+        {if $bean->getAttribute($checkbox_control_name)}<td></td>{/if}
+      {/foreach}
+    {/if}
     {if $bean->getAttribute('chtask')}<td></td>{/if}
     {* time custom fields *}
     {if isset($custom_fields) && $custom_fields->timeFields}
diff --git a/initialize.php b/initialize.php
index f31382c7f..90cd73473 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.10.5734");
+define("APP_VERSION", "1.21.10.5735");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 6d5b441a4..057787e7c 100644
--- a/reports.php
+++ b/reports.php
@@ -357,6 +357,13 @@
     $group_by_options[$field_name] = $userField['label'];
   }
 }
+// If we have project custom fields - add group by options for them.
+if (isset($custom_fields) && $custom_fields->projectFields) {
+  foreach ($custom_fields->projectFields as $projectField) {
+    $field_name = 'project_field_'.$projectField['id'];
+    $group_by_options[$field_name] = $projectField['label'];
+  }
+}
 $group_by_options_size = sizeof($group_by_options);
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
 if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));

From 3837b1a97765e4533b3aa4baf13cc9c78cc6a3fe Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Oct 2022 15:29:04 +0000
Subject: [PATCH 1763/1848] Fixed pdf reports for per hour cost column, fixed
 all report exports for project custom fields.

---
 WEB-INF/lib/common.lib.php           | 14 +++++++--
 WEB-INF/lib/ttReportHelper.class.php | 11 +++++--
 initialize.php                       |  2 +-
 tofile.php                           | 24 ++++++++++++++++
 topdf.php                            | 43 ++++++++++++++++++++++++++++
 5 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 2d8e287d5..370816cba 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -555,7 +555,7 @@ function ttMitigateCSRF() {
   return true;
 }
 
-// ttStartsWith functions checks if a string starts with a given substring.
+// ttStartsWith function checks if a string starts with a given substring.
 function ttStartsWith($string, $startString)
 {
   if (is_null($string))
@@ -565,7 +565,7 @@ function ttStartsWith($string, $startString)
   return (substr($string, 0, $len) === $startString);
 }
 
-// ttEndsWith functions checks if a string ends with a given substring.
+// ttEndsWith function checks if a string ends with a given substring.
 function ttEndsWith($string, $endString)
 {
   $len = strlen($endString);
@@ -573,6 +573,16 @@ function ttEndsWith($string, $endString)
   return (substr($string, -$len) === $endString);
 }
 
+// ttContains functions checks if a string contains a given substring.
+function ttContains($string, $part)
+{
+  // Note: in php8 we can use str_contanins.
+  if (strpos($string, $part) !== false)
+    return true;
+
+  return false;
+}
+
 // ttDateToUserFormat converts a date from database format to user format.
 function ttDateToUserFormat($date)
 {
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 85c4d80b4..6cfc1464a 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -232,7 +232,7 @@ static function getExpenseWhere($options) {
       }
     }
 
-    // Continue prparing parts for text custom fields using LIKE operator.
+    // Continue preparing parts for text custom fields using LIKE operator.
     if (isset($custom_fields) && $custom_fields->projectFields) {
       foreach ($custom_fields->projectFields as $projectField) {
         $field_name = 'project_field_'.$projectField['id'];
@@ -2533,7 +2533,7 @@ static function makeGroupByHeaderPart($dropdown_value) {
 
     // First, try to get a label from a translation file, which is the most likely scenario
     // such as grouping by date, user, project, or task.
-    if (!ttStartsWith($dropdown_value, 'time_field_') && !ttStartsWith($dropdown_value, 'user_field_')) {
+    if (!ttContains($dropdown_value, '_field_')) {
       $key = 'label.'.$dropdown_value;
       $part = $i18n->get($key);
       if ($part) return $part;
@@ -2605,6 +2605,13 @@ static function makeGroupByHeader($options) {
   // makeGroupByXmlTag creates an xml tag for a totals only report using group_by1,
   // group_by2, and group_by3 values passed in $options.
   static function makeGroupByXmlTag($options) {
+    // Note: there is a problem with this function for custom fields.
+    // Returned xml tags are like "project_field_1134" and not their user entered labels.
+    // This is on purpose because we are trying to avoid potential XML parsing problems.
+    // See https://stackoverflow.com/questions/1478486/using-in-xml-element-name
+    // Perhaps review this if someone complains, but there are W3C standard (section 2.3) rules
+    // on names (including starting character).
+
     $tag = '';
     if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
       // We have group_by1.
diff --git a/initialize.php b/initialize.php
index 90cd73473..d24ca7fa9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.10.5735");
+define("APP_VERSION", "1.21.11.5736");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/tofile.php b/tofile.php
index 6ea39ad82..0134885f8 100644
--- a/tofile.php
+++ b/tofile.php
@@ -106,6 +106,14 @@
       }
       if ($bean->getAttribute('chclient')) print "\t<client><![CDATA[".$item['client']."]]></client>\n";
       if ($bean->getAttribute('chproject')) print "\t<project><![CDATA[".$item['project']."]]></project>\n";
+      // Project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print "\t<$field_name><![CDATA[".$item[$field_name]."]]></$field_name>\n";
+        }
+      }
       if ($bean->getAttribute('chtask')) print "\t<task><![CDATA[".$item['task']."]]></task>\n";
       // Time custom fields.
       if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -206,6 +214,14 @@
     }
     if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
     if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
+    // Project custom field labels.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($projectField['label']).'"';
+      }
+    }
     if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
     // Time custom field labels.
     if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -246,6 +262,14 @@
       }
       if ($bean->getAttribute('chclient')) print ',"'.ttNeutralizeForCsv($item['client']).'"';
       if ($bean->getAttribute('chproject')) print ',"'.ttNeutralizeForCsv($item['project']).'"';
+      // Project custom fields.
+      if (isset($custom_fields) && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($bean->getAttribute($checkbox_control_name)) print ',"'.ttNeutralizeForCsv($item[$field_name]).'"';
+        }
+      }
       if ($bean->getAttribute('chtask')) print ',"'.ttNeutralizeForCsv($item['task']).'"';
       // Time custom fields.
       if (isset($custom_fields) && $custom_fields->timeFields) {
diff --git a/topdf.php b/topdf.php
index 931fa8145..4e1e677db 100644
--- a/topdf.php
+++ b/topdf.php
@@ -139,6 +139,14 @@
   }
   if ($bean->getAttribute('chclient')) { $colspan++; $html .= '<td>'.$i18n->get('label.client').'</td>'; }
   if ($bean->getAttribute('chproject')) { $colspan++; $html .= '<td>'.$i18n->get('label.project').'</td>'; }
+  // Project custom field labels.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $field_name = 'project_field_'.$projectField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) { $colspan++; $html .= '<td>'.htmlspecialchars($projectField['label']).'</td>'; }
+    }
+  }
   if ($bean->getAttribute('chtask')) { $colspan++; $html .= '<td>'.$i18n->get('label.task').'</td>'; }
   // Time custom field labels.
   if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -194,6 +202,14 @@
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
             $html .= '</td>';
         }
+        // Project custom fields.
+        if (isset($custom_fields) && $custom_fields->projectFields) {
+          foreach ($custom_fields->projectFields as $projectField) {
+            $field_name = 'project_field_'.$projectField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+          }
+        }
         if ($bean->getAttribute('chtask')) {
             $html .= '<td>';
             $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
@@ -212,6 +228,7 @@
         if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
         if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
         if ($show_note_column) $html .= '<td></td>';
+        if ($bean->getAttribute('chcost') && $show_cost_per_hour) $html .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $html .= "<td $styleRightAligned>";
           if ($user->can('manage_invoices') || $user->isClient())
@@ -254,6 +271,14 @@
     }
     if ($bean->getAttribute('chclient')) $html .= '<td>'.htmlspecialchars($item['client']).'</td>';
     if ($bean->getAttribute('chproject')) $html .= '<td>'.htmlspecialchars($item['project']).'</td>';
+    // Project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td>'.htmlspecialchars($item[$field_name]).'</td>';
+      }
+    }
     if ($bean->getAttribute('chtask')) $html .= '<td>'.htmlspecialchars($item['task']).'</td>';
     // Time custom fields.
     if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -339,6 +364,14 @@
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
       $html .= '</td>';
     }
+    // Project custom fields.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+      }
+    }
     if ($bean->getAttribute('chtask')) {
       $html .= '<td>';
       $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
@@ -357,6 +390,7 @@
     if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
     if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
     if ($show_note_column) $html .= '<td></td>';
+    if ($bean->getAttribute('chcost') && $show_cost_per_hour) $html .= '<td></td>';
     if ($bean->getAttribute('chcost')) {
       $html .= "<td $styleRightAligned>";
       if ($user->can('manage_invoices') || $user->isClient())
@@ -388,6 +422,14 @@
   }
   if ($bean->getAttribute('chclient')) $html .= '<td></td>';
   if ($bean->getAttribute('chproject')) $html .= '<td></td>';
+  // Project custom fields.
+  if (isset($custom_fields) && $custom_fields->projectFields) {
+    foreach ($custom_fields->projectFields as $projectField) {
+      $field_name = 'project_field_'.$projectField['id'];
+      $checkbox_control_name = 'show_'.$field_name;
+      if ($bean->getAttribute($checkbox_control_name)) $html .= '<td></td>';
+    }
+  }
   if ($bean->getAttribute('chtask')) $html .= '<td></td>';
   // Time custom fields.
   if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -402,6 +444,7 @@
   if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
   if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
   if ($show_note_column) $html .= '<td></td>';
+  if ($bean->getAttribute('chcost') && $show_cost_per_hour) $html .= '<td></td>';
   if ($bean->getAttribute('chcost')) {
     $html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
     if ($user->can('manage_invoices') || $user->isClient())

From 0ec60fc296df0ca7447db3e2b725c8bbcac24e39 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Oct 2022 15:46:07 +0000
Subject: [PATCH 1764/1848] Fixed emailed reports to handle project custom
 fields.

---
 WEB-INF/lib/common.lib.php           |  2 +-
 WEB-INF/lib/ttReportHelper.class.php | 48 ++++++++++++++++++++++++++++
 initialize.php                       |  2 +-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 370816cba..0f38f80fa 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -573,7 +573,7 @@ function ttEndsWith($string, $endString)
   return (substr($string, -$len) === $endString);
 }
 
-// ttContains functions checks if a string contains a given substring.
+// ttContains function checks if a string contains a given substring.
 function ttContains($string, $part)
 {
   // Note: in php8 we can use str_contanins.
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 6cfc1464a..a3f894497 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1232,6 +1232,14 @@ static function prepareReportBody($options, $comment = null)
     }
     if ($options['show_client']) $colspan++;
     if ($options['show_project']) $colspan++;
+    // Project custom fields.
+    if ($custom_fields && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $checkbox_control_name = 'show_'.$field_name;
+        if ($options[$checkbox_control_name]) $colspan++;
+      }
+    }
     if ($options['show_task']) $colspan++;
     // Time custom fields.
     if ($custom_fields && $custom_fields->timeFields) {
@@ -1342,6 +1350,14 @@ static function prepareReportBody($options, $comment = null)
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
       if ($options['show_project'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
+      // Project custom fields.
+      if ($custom_fields && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($options[$checkbox_control_name]) $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($projectField['label']).'</td>';
+        }
+      }
       if ($options['show_task'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
       // Time custom fields.
@@ -1412,6 +1428,14 @@ static function prepareReportBody($options, $comment = null)
               }
               if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['client'].'</td>';
               if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['project'].'</td>';
+              // Project custom fields.
+              if ($custom_fields && $custom_fields->projectFields) {
+                foreach ($custom_fields->projectFields as $projectField) {
+                  $field_name = 'project_field_'.$projectField['id'];
+                  $checkbox_control_name = 'show_'.$field_name;
+                  if ($options[$checkbox_control_name]) $body .= '<td></td>';
+                }
+              }
               if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['task'].'</td>';
               // Time custom fields.
               if ($custom_fields && $custom_fields->timeFields) {
@@ -1462,6 +1486,14 @@ static function prepareReportBody($options, $comment = null)
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
           if ($options['show_project'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['project']).'</td>';
+          // Project custom fields.
+          if ($custom_fields && $custom_fields->projectFields) {
+            foreach ($custom_fields->projectFields as $projectField) {
+              $field_name = 'project_field_'.$projectField['id'];
+              $checkbox_control_name = 'show_'.$field_name;
+              if ($options[$checkbox_control_name]) $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record[$field_name]).'</td>';
+            }
+          }
           if ($options['show_task'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['task']).'</td>';
           // Time custom fields.
@@ -1534,6 +1566,14 @@ static function prepareReportBody($options, $comment = null)
         }
         if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['client'].'</td>';
         if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['project'].'</td>';
+        // Project custom fields.
+        if ($custom_fields && $custom_fields->projectFields) {
+          foreach ($custom_fields->projectFields as $projectField) {
+            $field_name = 'project_field_'.$projectField['id'];
+            $checkbox_control_name = 'show_'.$field_name;
+            if ($options[$checkbox_control_name]) $body .= '<td></td>';
+          }
+        }
         if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['task'].'</td>';
         // Time custom fields.
         if ($custom_fields && $custom_fields->timeFields) {
@@ -1577,6 +1617,14 @@ static function prepareReportBody($options, $comment = null)
       }
       if ($options['show_client']) $body .= '<td></td>';
       if ($options['show_project']) $body .= '<td></td>';
+      // Project custom fields.
+      if ($custom_fields && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$field_name;
+          if ($options[$checkbox_control_name]) $body .= '<td></td>';
+        }
+      }
       if ($options['show_task']) $body .= '<td></td>';
       // Time custom fields.
       if ($custom_fields && $custom_fields->timeFields) {
diff --git a/initialize.php b/initialize.php
index d24ca7fa9..d310471ee 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.11.5736");
+define("APP_VERSION", "1.21.11.5737");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 95481ddf41d2914555d8b48b6dcfd7acb7aa25f1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Oct 2022 16:15:16 +0000
Subject: [PATCH 1765/1848] Fixed fav reports to keep project custom fields
 settings.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 23 +++++++++++++++++++++++
 initialize.php                          |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index df756649e..0d8cc071f 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -328,6 +328,17 @@ static function loadReport(&$bean) {
             $bean->setAttribute($checkbox_field_name, $checkbox_value);
           }
         }
+        // Project custom field settings.
+        if (isset($custom_fields) && $custom_fields->projectFields) {
+          foreach ($custom_fields->projectFields as $projectField) {
+            $field_name = 'project_field_'.$projectField['id'];
+            $checkbox_field_name = 'show_'.$field_name;
+            $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
+            $bean->setAttribute($field_name, $field_value);
+            $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
+            $bean->setAttribute($checkbox_field_name, $checkbox_value);
+          }
+        }
       }
 
       $bean->setAttribute('client', $val['client_id']);
@@ -579,6 +590,18 @@ static function makeReportSpec($bean) {
       }
     }
 
+    // Add project custom field settings.
+    if (isset($custom_fields) && $custom_fields->projectFields) {
+      foreach ($custom_fields->projectFields as $projectField) {
+        $field_name = 'project_field_'.$projectField['id'];
+        $field_value = str_replace(',','&#44',$bean->getAttribute($field_name));
+        $checkbox_field_name = 'show_'.$field_name;
+        $checkbox_field_value = (int) $bean->getAttribute($checkbox_field_name);
+        if ($field_value) $reportSpecArray[] = $field_name.':'.$field_value;
+        if ($checkbox_field_value) $reportSpecArray[] = $checkbox_field_name.':1';
+      }
+    }
+
     $reportSpec = null;
     if (isset($reportSpecArray))
       $reportSpec = implode(',', $reportSpecArray);
diff --git a/initialize.php b/initialize.php
index d310471ee..5ff396459 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.11.5737");
+define("APP_VERSION", "1.21.11.5738");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 10713c13048462dbd2c33c7cc38492f4c7a140af Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Oct 2022 16:24:37 +0000
Subject: [PATCH 1766/1848] Fixed adjusting fav report options for cron.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 12 +++++++++++-
 initialize.php                          |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 0d8cc071f..00a1bd5bb 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -541,7 +541,17 @@ static function adjustOptions($options) {
           $options[$checkbox_field_name] = $checkbox_value;
         }
       }
-      // TODO: add project fields here.
+      // Project fields.
+      if ($custom_fields && $custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $field_name = 'project_field_'.$projectField['id'];
+          $checkbox_field_name = 'show_'.$field_name;
+          $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
+          $options[$field_name] = $field_value;
+          $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
+          $options[$checkbox_field_name] = $checkbox_value;
+        }
+      }
     }
 
     // Adjust period_start and period_end to user date format.
diff --git a/initialize.php b/initialize.php
index 5ff396459..5fd8012f6 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.11.5738");
+define("APP_VERSION", "1.21.11.5739");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 00a75a7ed04fa22de4211891580deee454f04ec2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Oct 2022 16:32:14 +0000
Subject: [PATCH 1767/1848] Initial implementation of project custom fields.

---
 cf_custom_field_add.php | 17 +++++------------
 initialize.php          |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index 38d672822..c10803758 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -27,18 +27,11 @@
 
 $form = new Form('fieldForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
-if (defined('DEBUG_PROJECT_CUSTOM_FIELDS')) {
-  $form->addInput(array('type'=>'combobox','name'=>'entity',
-    'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
-                  CustomFields::ENTITY_USER=>$i18n->get('entity.user'),
-                  CustomFields::ENTITY_PROJECT=>$i18n->get('entity.project'))
-  ));
-} else {
-  $form->addInput(array('type'=>'combobox','name'=>'entity',
-    'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
-                  CustomFields::ENTITY_USER=>$i18n->get('entity.user'))
-  ));
-}
+$form->addInput(array('type'=>'combobox','name'=>'entity',
+  'data'=>array(CustomFields::ENTITY_TIME=>$i18n->get('entity.time'),
+                CustomFields::ENTITY_USER=>$i18n->get('entity.user'),
+                CustomFields::ENTITY_PROJECT=>$i18n->get('entity.project'))
+));
 $form->addInput(array('type'=>'combobox','name'=>'type',
   'data'=>array(CustomFields::TYPE_TEXT=>$i18n->get('label.type_text'),
                 CustomFields::TYPE_DROPDOWN=>$i18n->get('label.type_dropdown'))
diff --git a/initialize.php b/initialize.php
index 5fd8012f6..552e5e2cb 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.11.5739");
+define("APP_VERSION", "1.21.12.5740");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c0ae1e6d07f2a64e4d54e47133b5bfda29ffcf87 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 25 Oct 2022 16:26:46 +0000
Subject: [PATCH 1768/1848] Added a what is it link explaining note cotaining
 option in reports.

---
 WEB-INF/templates/reports.tpl | 5 ++++-
 initialize.php                | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 6a5ecbbe0..42cdd661f 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -358,7 +358,10 @@ function handleCheckboxes() {
   <tr class = "small-screen-label"><td><label for="note_containing">{$i18n.form.reports.note_containing}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="note_containing">{$i18n.form.reports.note_containing}:</label></td>
-    <td class="td-with-input">{$forms.reportForm.note_containing.control}</td>
+    <td class="td-with-input">{$forms.reportForm.note_containing.control}
+      <span class="what-is-it-img"><a href="https://www.anuko.com/lp/tt_58.htm" target="_blank"><img src="img/icon-question-mark.png" title="{$i18n.label.what_is_it}" alt="{$i18n.label.what_is_it}"></a></span>
+      <span class="what-is-it-text"><a href="https://www.anuko.com/lp/tt_58.htm" target="_blank">{$i18n.label.what_is_it}</a></span>
+    </td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
diff --git a/initialize.php b/initialize.php
index 552e5e2cb..0e90ef89d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.12.5740");
+define("APP_VERSION", "1.21.12.5741");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3102ef6e950150eccccee5f63922bf25fae8a83c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Oct 2022 15:18:50 +0000
Subject: [PATCH 1769/1848] Version change for 1.22 release.

---
 initialize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index 0e90ef89d..7fcb17aa2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.21.12.5741");
+define("APP_VERSION", "1.22.0.5742");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c4d2026603df8fa31a31f2ea440df436d67df7a7 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 27 Oct 2022 19:55:16 +0000
Subject: [PATCH 1770/1848] Addressed some php8 warnings.

---
 WEB-INF/lib/ttUser.class.php           |   2 +-
 WEB-INF/lib/ttWeekViewHelper.class.php | 108 +++++++++++++++++++------
 initialize.php                         |   2 +-
 3 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e0565b3dd..2e7ff2793 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -682,7 +682,7 @@ function updateGroup($fields) {
 
     $name_part = $description_part = $currency_part = $lang_part = $decimal_mark_part = $date_format_part = $time_format_part =
       $week_start_part = $tracking_mode_part = $project_required_part = $record_type_part = $bcc_email_part =  $allow_ip_part =
-      $plugins_part = $config_part = $custom_css_part = $lock_spec_part = $holidays_part = $workday_minutes_part = '';
+      $password_complexity_part = $plugins_part = $config_part = $custom_css_part = $lock_spec_part = $holidays_part = $workday_minutes_part = '';
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 9908d12b4..4ee5346a9 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -167,22 +167,37 @@ static function getDataForWeekView($records, $dayHeaders) {
     global $i18n;
 
     $dataArray = array();
+    $includeWeekends = $user->isOptionEnabled('weekends');
     $includeNotes = $user->isOptionEnabled('week_notes');
 
     // Construct the first row for a brand new entry.
     $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
     // Insert empty cells with proper control ids.
-    for ($i = 0; $i < 7; $i++) {
-      $control_id = '0_'. $dayHeaders[$i];
-      $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+    if ($includeWeekends) {
+      for ($i = 0; $i < 7; $i++) {
+        $control_id = '0_'. $dayHeaders[$i];
+        $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+      }
+    } else {
+      for ($i = 1; $i < 6; $i++) {
+        $control_id = '0_'. $dayHeaders[$i];
+        $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+      }
     }
     if ($includeNotes) {
       // Construct the second row for daily comments for a brand new entry.
       $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
       // Insert empty cells with proper control ids.
-      for ($i = 0; $i < 7; $i++) {
-        $control_id = '1_'. $dayHeaders[$i];
-        $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+      if ($includeWeekends) {
+        for ($i = 0; $i < 7; $i++) {
+          $control_id = '1_'. $dayHeaders[$i];
+          $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        }
+      } else {
+        for ($i = 1; $i < 6; $i++) {
+          $control_id = '1_'. $dayHeaders[$i];
+          $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        }
       }
     }
 
@@ -205,18 +220,32 @@ static function getDataForWeekView($records, $dayHeaders) {
         $dataArray[] = array('row_id' => $row_id,'label' => ttWeekViewHelper::makeRowLabel($record));
         $pos = ttWeekViewHelper::findRow($row_id, $dataArray);
         // Insert empty cells with proper control ids.
-        for ($i = 0; $i < 7; $i++) {
-          $control_id = $pos.'_'. $dayHeaders[$i];
-          $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+        if ($includeWeekends) {
+          for ($i = 0; $i < 7; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+          }
+        } else {
+          for ($i = 1; $i < 6; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+          }
         }
         // Insert row for comments.
         if ($includeNotes) {
           $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
           $pos++;
           // Insert empty cells with proper control ids.
-          for ($i = 0; $i < 7; $i++) {
-            $control_id = $pos.'_'. $dayHeaders[$i];
-            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+          if ($includeWeekends) {
+            for ($i = 0; $i < 7; $i++) {
+              $control_id = $pos.'_'. $dayHeaders[$i];
+              $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+            }
+          } else {
+            for ($i = 1; $i < 6; $i++) {
+              $control_id = $pos.'_'. $dayHeaders[$i];
+              $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+            }
           }
           $pos--;
         }
@@ -267,21 +296,38 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
       }
     }
 
+    // We will need this for iterations below.
+    $includeWeekends = $user->isOptionEnabled('weekends');
+
     // Construct the first row for a brand new entry.
     $dataArray[] = array('row_id' => null,'label' => $i18n->get('form.week.new_entry').':'); // Insert row.
     // Insert empty cells with proper control ids.
-    for ($i = 0; $i < 7; $i++) {
-      $control_id = '0_'. $dayHeaders[$i];
-      $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+    if ($includeWeekends) {
+      for ($i = 0; $i < 7; $i++) {
+        $control_id = '0_'. $dayHeaders[$i];
+        $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+      }
+    } else {
+      for ($i = 1; $i < 6; $i++) {
+        $control_id = '0_'. $dayHeaders[$i];
+        $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+      }
     }
     $includeNotes = $user->isOptionEnabled('week_notes');
     if ($includeNotes) {
       // Construct the second row for daily comments for a brand new entry.
       $dataArray[] = array('row_id' => null,'label' => $i18n->get('label.notes').':'); // Insert row.
       // Insert empty cells with proper control ids.
-      for ($i = 0; $i < 7; $i++) {
-        $control_id = '1_'. $dayHeaders[$i];
-        $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+      if ($includeWeekends) {
+        for ($i = 0; $i < 7; $i++) {
+          $control_id = '1_'. $dayHeaders[$i];
+          $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        }
+      } else {
+        for ($i = 1; $i < 6; $i++) {
+          $control_id = '1_'. $dayHeaders[$i];
+          $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+        }
       }
     }
 
@@ -296,18 +342,32 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
         $dataArray[] = array('row_id' => $row_id,'label' => ttWeekViewHelper::makeRowLabel($record));
         $pos = ttWeekViewHelper::findRow($row_id, $dataArray);
         // Insert empty cells with proper control ids.
-        for ($i = 0; $i < 7; $i++) {
-          $control_id = $pos.'_'. $dayHeaders[$i];
-          $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+        if ($includeWeekends) {
+          for ($i = 0; $i < 7; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+          }
+        } else {
+          for ($i = 1; $i < 6; $i++) {
+            $control_id = $pos.'_'. $dayHeaders[$i];
+            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
+          }
         }
         // Insert row for comments.
         if ($includeNotes) {
           $dataArray[] = array('row_id' => $row_id.'_notes','label' => $i18n->get('label.notes').':');
           $pos++;
           // Insert empty cells with proper control ids.
-          for ($i = 0; $i < 7; $i++) {
-            $control_id = $pos.'_'. $dayHeaders[$i];
-            $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+          if ($includeWeekends) {
+            for ($i = 0; $i < 7; $i++) {
+              $control_id = $pos.'_'. $dayHeaders[$i];
+              $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+            }
+          } else {
+            for ($i = 1; $i < 6; $i++) {
+              $control_id = $pos.'_'. $dayHeaders[$i];
+              $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
+            }
           }
           $pos--;
         }
diff --git a/initialize.php b/initialize.php
index 7fcb17aa2..04f1245cf 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.0.5742");
+define("APP_VERSION", "1.22.0.5743");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c2c48e291c4b12bb2e8fb5c64fc25ea5d1ae17b5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Oct 2022 13:57:06 +0000
Subject: [PATCH 1771/1848] Fixed a bug on week view related to locking.
 Addressed a few php8 warnings.

---
 WEB-INF/templates/charts.tpl     | 2 +-
 WEB-INF/templates/expenses.tpl   | 2 +-
 WEB-INF/templates/time.tpl       | 2 +-
 WEB-INF/templates/timesheets.tpl | 2 +-
 WEB-INF/templates/week.tpl       | 2 +-
 initialize.php                   | 2 +-
 week.php                         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index ff15ea8f2..b38988e89 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -25,7 +25,7 @@ function adjustTodayLinks() {
 <div class="small-screen-calendar">{$forms.chartForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 5b1da05fc..859ae3506 100644
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -119,7 +119,7 @@ function recalculateCost() {
 <div class="small-screen-calendar">{$forms.expensesForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.expensesForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index b601531ba..fa24e8062 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -23,7 +23,7 @@ function handleStop(buttonElement) {
 <div class="small-screen-calendar">{$forms.timeRecordForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.timeRecordForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index e5f9abdb6..2bd927369 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -7,7 +7,7 @@ License: See license.txt *}
 
 {$forms.timesheetsForm.open}
 <table class="centered-table">
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 74e94053f..6032d4eb5 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -28,7 +28,7 @@ function fillDropdowns() {
 <div class="small-screen-calendar">{$forms.weekTimeForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.weekTimeForm.date.control}</div></td></tr>
-{if $user_dropdown}
+{if isset($user_dropdown)}
   <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
diff --git a/initialize.php b/initialize.php
index 04f1245cf..1ebbab823 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.0.5743");
+define("APP_VERSION", "1.22.1.5744");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 302e4dfb3..9d96abfbe 100644
--- a/week.php
+++ b/week.php
@@ -228,7 +228,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
     $field = new TextField($field_name);
     // Disable control if the date is locked.
     global $lockedDays;
-    if ($lockedDays[$column-1])
+    if ($lockedDays[$column])
       $field->setEnabled(false);
     $field->setFormName($table->getFormName());
     $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually.

From 50796b8d606dae53f1c39fa08e44be4f86e863f4 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 28 Oct 2022 15:40:46 +0000
Subject: [PATCH 1772/1848] Addressed a few more php8 warnings.

---
 WEB-INF/lib/ttUser.class.php       | 2 +-
 WEB-INF/lib/ttUserHelper.class.php | 3 ++-
 initialize.php                     | 2 +-
 topdf.php                          | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2e7ff2793..b32c27792 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -151,7 +151,7 @@ function __construct($login, $id = null) {
 
   // getUser returns user id on behalf of whom the current user is operating.
   function getUser() {
-    return ($this->behalfUser ? $this->behalfUser->id : $this->id);
+    return (isset($this->behalfUser) ? $this->behalfUser->id : $this->id);
   }
 
   // getName returns user name on behalf of whom the current user is operating.
diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 122c7889c..2aeada43c 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -68,7 +68,8 @@ static function getUserIdByTmpRef($ref) {
 
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return $val['user_id'];
+      if ($val)
+        return $val['user_id'];
     }
     return false;
   }
diff --git a/initialize.php b/initialize.php
index 1ebbab823..432cbb891 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.1.5744");
+define("APP_VERSION", "1.22.1.5745");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/topdf.php b/topdf.php
index 4e1e677db..6393d5f55 100644
--- a/topdf.php
+++ b/topdf.php
@@ -55,6 +55,7 @@
 $totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.
+$print_subtotals = $first_pass = false;
 if ($items && $grouping) {
   $print_subtotals = true;
   $first_pass = true;

From 89cae455e41364dec480637ec387e3e849e84c25 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 5 Nov 2022 14:59:31 +0000
Subject: [PATCH 1773/1848] Started work on adding a fav report selector on
 charts.

---
 WEB-INF/templates/charts.tpl | 67 ++++++++++++++++++++++++++++++------
 charts.php                   | 16 ++++++++-
 initialize.php               |  2 +-
 3 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index b38988e89..ee0c48346 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -19,26 +19,59 @@ function adjustTodayLinks() {
     }
   }
 }
+
+// handleFavReportSelection - manages visibility of controls that are not relevant
+// when a fav report is selected.
+function handleFavReportSelection() {
+  var selectedFavReportId = document.getElementById("favorite_report").value;
+
+  var userLabel = document.getElementById("user_label");
+  var userControl = document.getElementById("user_control");
+  var intervalLabel = document.getElementById("interval_label");
+  var intervalControl = document.getElementById("interval_control");
+
+  if (selectedFavReportId == -1) {
+    if (userLabel != null) {
+      userLabel.style.display = "";
+    }
+    if (userControl != null) {
+      userControl.style.display = "";
+    }
+    if (intervalLabel != null) {
+      intervalLabel.style.display = "";
+    }
+    if (intervalControl != null) {
+      intervalControl.style.display = "";
+    }
+  } else {
+    if (userLabel != null) {
+      userLabel.style.display = "none";
+    }
+    if (userControl != null) {
+      userControl.style.display = "none";
+    }
+    if (intervalLabel != null) {
+      intervalLabel.style.display = "none";
+    }
+    if (intervalControl != null) {
+      intervalControl.style.display = "none";
+    }
+  }
+}
 </script>
 
 {$forms.chartForm.open}
 <div class="small-screen-calendar">{$forms.chartForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
-{if isset($user_dropdown)}
-  <tr class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+{if defined('FAV_REPORTS_ON_CHARTS_DEBUG')}
+  <tr class = "small-screen-label"><td><label for="favorite_report">{$i18n.label.fav_report}:</label></td></tr>
   <tr>
-    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
-    <td class="td-with-input">{$forms.chartForm.user.control}</td>
+    <td class="large-screen-label"><label for="favorite_report">{$i18n.label.fav_report}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.favorite_report.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
-  <tr class = "small-screen-label"><td><label for="interval">{$i18n.form.charts.interval}:</label></td></tr>
-  <tr>
-    <td class="large-screen-label"><label for="interval">{$i18n.form.charts.interval}:</label></td>
-    <td class="td-with-input">{$forms.chartForm.interval.control}</td>
-  </tr>
-  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {if $chart_selector}
   <tr class = "small-screen-label"><td><label for="type">{$i18n.form.charts.chart}:</label></td></tr>
   <tr>
@@ -47,6 +80,20 @@ function adjustTodayLinks() {
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 {/if}
+{if isset($user_dropdown)}
+  <tr id = "user_label" class = "small-screen-label"><td><label for="user">{$i18n.label.user}:</label></td></tr>
+  <tr id = "user_control">
+    <td class="large-screen-label"><label for="user">{$i18n.label.user}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.user.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
+  <tr id ="interval_label" class = "small-screen-label"><td><label for="interval">{$i18n.form.charts.interval}:</label></td></tr>
+  <tr id = "interval_control">
+    <td class="large-screen-label"><label for="interval">{$i18n.form.charts.interval}:</label></td>
+    <td class="td-with-input">{$forms.chartForm.interval.control}</td>
+  </tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
 </table>
 
 <div class="chart">
diff --git a/charts.php b/charts.php
index 1ad1c88d9..10335594a 100644
--- a/charts.php
+++ b/charts.php
@@ -12,6 +12,7 @@
 import('PieChartEx');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttFavReportHelper');
 
 define('ALL_USERS_OPTION_ID', -1); // An identifier for "all users" seclection in User dropdown.
 
@@ -106,7 +107,7 @@
   // Set user selection to all users, if necessary.
   $allUsersSetInSession = @$_SESSION['chart_all_users'];
   if ($allUsersSetInSession)
-      $userDropdownSelectionId = constant('ALL_USERS_OPTION_ID');
+    $userDropdownSelectionId = constant('ALL_USERS_OPTION_ID');
 }
 
 // Elements of chartForm.
@@ -177,6 +178,19 @@
   $largeScreenCalendarRowSpan += 2;
 }
 
+// Fav report control.
+if (defined('FAV_REPORTS_ON_CHARTS_DEBUG')) {
+  // Get saved favorite reports for user.
+  $report_list = ttFavReportHelper::getReports();
+  $chart_form->addInput(array('type'=>'combobox',
+    'name'=>'favorite_report',
+    'onchange'=>'handleFavReportSelection();this.form.submit();',
+    'data'=>$report_list,
+    'datakeys'=>array('id','name'),
+    'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
+  $largeScreenCalendarRowSpan += 2;
+}
+
 // Calendar.
 $chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 
diff --git a/initialize.php b/initialize.php
index 432cbb891..8bc3c5f4c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.1.5745");
+define("APP_VERSION", "1.22.1.5746");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6f0f261a87ab5c4bd59866a45c087f17af044cd3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 5 Nov 2022 16:17:41 +0000
Subject: [PATCH 1774/1848] Some progress on handling fav reports in charts.

---
 charts.php     | 97 ++++++++++++++++++++++++++++----------------------
 initialize.php |  2 +-
 2 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/charts.php b/charts.php
index 10335594a..aa0b9bd51 100644
--- a/charts.php
+++ b/charts.php
@@ -79,10 +79,9 @@
 $_SESSION['date'] = $cl_date;
 
 if ($request->isPost()) {
-  $cl_interval = (int)$request->getParameter('interval');
-  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
-  $_SESSION['chart_interval'] = $cl_interval;
-  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+  $cl_fav_report = (int)$request->getParameter('favorite_report');
+  if (!$cl_fav_report) $cl_fav_report = -1;
+  $_SESSION['fav_report'] = $cl_fav_report;
 
   $cl_type = (int)$request->getParameter('type');
   if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
@@ -91,12 +90,16 @@
 
   // Remember all users selection in session.
   $_SESSION['chart_all_users'] = $userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') ? true : false;
-} else {
-  // Initialize chart interval.
-  $cl_interval = @$_SESSION['chart_interval'];
-  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+
+  $cl_interval = (int)$request->getParameter('interval');
   if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
   $_SESSION['chart_interval'] = $cl_interval;
+  $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+} else {
+  // Initialize fav report selector.
+  $cl_fav_report = @$_SESSION['fav_report'];
+  if (!$cl_fav_report) $cl_fav_report = -1;
+  $_SESSION['fav_report'] = $cl_fav_report;
 
   // Initialize chart type.
   $cl_type = @$_SESSION['chart_type'];
@@ -108,12 +111,53 @@
   $allUsersSetInSession = @$_SESSION['chart_all_users'];
   if ($allUsersSetInSession)
     $userDropdownSelectionId = constant('ALL_USERS_OPTION_ID');
+
+  // Initialize chart interval.
+  $cl_interval = @$_SESSION['chart_interval'];
+  if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+  if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+  $_SESSION['chart_interval'] = $cl_interval;
 }
 
 // Elements of chartForm.
 $chart_form = new Form('chartForm');
 $largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
+// Fav report control.
+if (defined('FAV_REPORTS_ON_CHARTS_DEBUG')) {
+  // Get saved favorite reports for user.
+  $report_list = ttFavReportHelper::getReports();
+  $chart_form->addInput(array('type'=>'combobox',
+    'name'=>'favorite_report',
+    'onchange'=>'handleFavReportSelection();this.form.submit();',
+    'data'=>$report_list,
+    'value' => $cl_fav_report,
+    'datakeys'=>array('id','name'),
+    'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
+  $largeScreenCalendarRowSpan += 2;
+}
+
+// Chart type options.
+$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
+if ($chart_selector) {
+  $types = array();
+  if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
+    $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
+  if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
+    $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
+  if ($user->isPluginEnabled('cl'))
+    $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
+
+  // Add chart type dropdown.
+  $chart_form->addInput(array('type' => 'combobox',
+    'onchange' => 'this.form.submit();',
+    'name' => 'type',
+    'value' => $cl_type,
+    'data' => $types
+  ));
+  $largeScreenCalendarRowSpan += 2;
+}
+
 // User dropdown. Changes the user "on behalf" of whom we are working.
 if ($user->can('view_charts') || $user->can('view_all_charts')) {
   $rank = $user->getMaxRankForGroup($user->getGroup());
@@ -157,44 +201,11 @@
 ));
 $largeScreenCalendarRowSpan += 2;
 
-// Chart type options.
-$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
-if ($chart_selector) {
-  $types = array();
-  if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
-    $types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
-  if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
-    $types[CHART_TASKS] = $i18n->get('dropdown.tasks');
-  if ($user->isPluginEnabled('cl'))
-    $types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
-
-  // Add chart type dropdown.
-  $chart_form->addInput(array('type' => 'combobox',
-    'onchange' => 'this.form.submit();',
-    'name' => 'type',
-    'value' => $cl_type,
-    'data' => $types
-  ));
-  $largeScreenCalendarRowSpan += 2;
-}
-
-// Fav report control.
-if (defined('FAV_REPORTS_ON_CHARTS_DEBUG')) {
-  // Get saved favorite reports for user.
-  $report_list = ttFavReportHelper::getReports();
-  $chart_form->addInput(array('type'=>'combobox',
-    'name'=>'favorite_report',
-    'onchange'=>'handleFavReportSelection();this.form.submit();',
-    'data'=>$report_list,
-    'datakeys'=>array('id','name'),
-    'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
-  $largeScreenCalendarRowSpan += 2;
-}
-
 // Calendar.
 $chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 
 // Get data for our chart.
+// TODO: adjust this call below for fav report selection.
 $totals = ttChartHelper::getTotals($userDropdownSelectionId, $cl_type, $cl_date, $cl_interval);
 $smarty->assign('totals', $totals);
 
@@ -243,7 +254,7 @@
 $smarty->assign('large_screen_calendar_row_span', $largeScreenCalendarRowSpan);
 $smarty->assign('img_file_name', $img_ref);
 $smarty->assign('chart_selector', $chart_selector);
-$smarty->assign('onload', 'onLoad="adjustTodayLinks()"');
+$smarty->assign('onload', 'onLoad="adjustTodayLinks();handleFavReportSelection();"');
 $smarty->assign('forms', array($chart_form->getName() => $chart_form->toArray()));
 $smarty->assign('title', $i18n->get('title.charts'));
 $smarty->assign('content_page_name', 'charts.tpl');
diff --git a/initialize.php b/initialize.php
index 8bc3c5f4c..c99e16dc3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.1.5746");
+define("APP_VERSION", "1.22.1.5747");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6b0489f569695247ba373b3a8c3e39f96fe7eacb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 5 Nov 2022 17:30:23 +0000
Subject: [PATCH 1775/1848] Initial implenentation of fav reports on charts.

---
 WEB-INF/lib/ttChartHelper.class.php | 100 +++++++++++++++++++++++++++-
 charts.php                          |   6 +-
 initialize.php                      |   2 +-
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index f0523036d..7ee712796 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -4,6 +4,8 @@
 
 import('ttPeriod');
 import('ttTimeHelper');
+import('ttFavReportHelper');
+import('ttReportHelper');
 
 // Definitions for chart types.
 define('CHART_PROJECTS', 1);
@@ -13,7 +15,7 @@
 // Class ttChartHelper is a helper class for charts.
 class ttChartHelper {
 
-  // getTotals - returns total times by project or task for a given user in a specified period.
+  // getTotals - returns total times by project, task, or client for a given user in a specified period.
   static function getTotals($user_id, $chart_type, $selected_date, $interval_type) {
 
     global $user;
@@ -123,6 +125,102 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
     return $result;
   }
 
+
+  // getTotals - returns total times by project, task, or client for a selected fav report.
+  static function getTotalsForFavReport($fav_report_id, $chart_type) {
+
+    global $user;
+
+    // Use custom fields plugin if it is enabled.
+    if ($user->isPluginEnabled('cf')) {
+      require_once('plugins/CustomFields.class.php');
+      $custom_fields = new CustomFields();
+    }
+
+    $result = array();
+    $mdb2 = getConnection();
+
+    // Get favorite report details.
+    $options = ttFavReportHelper::getReportOptions($fav_report_id);
+    if (!$options)
+      return $result;  // Return empty array if something went wrong.
+
+    $options = ttFavReportHelper::adjustOptions($options);
+
+    // Obtain the where clause for fav report.
+    $where = ttReportHelper::getWhere($options);
+
+    // Build sql query according to selected chart type.
+    if (CHART_PROJECTS == $chart_type) {
+      // Data for projects.
+      $sql = "select p.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
+        left join tt_projects p on (p.id = l.project_id)
+        $where group by l.project_id";
+    } elseif (CHART_TASKS == $chart_type) {
+      // Data for tasks.
+      $sql = "select t.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
+        left join tt_tasks t on (t.id = l.task_id)
+        $where group by l.task_id";
+    } elseif (CHART_CLIENTS == $chart_type) {
+      // Data for clients.
+      $sql = "select c.name as name, sum(time_to_sec(l.duration)) as time from tt_log l
+        left join tt_clients c on (c.id = l.client_id)
+        $where group by l.client_id";
+    }
+
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        if ($val['time'] > 0) // Only positive totals make sense in pie charts. Skip negatives entirely.
+          $result[] = array('name'=>$val['name'],'time'=>$val['time']); // name - entity name, time - total for entity in seconds.
+      }
+    }
+
+    // Get total time. We'll need it to calculate percentages (for labels to the right of diagram).
+    $total = 0;
+    foreach ($result as $one_val) {
+      $total += $one_val['time'];
+    }
+    // Add a string representation of time + percentage to names. Example: "Time Tracker (1:15 - 6%)".
+    foreach ($result as &$one_val) {
+      $percent = round(100*$one_val['time']/$total).'%';
+      $one_val['name'] .= ' ('.ttTimeHelper::minutesToDuration($one_val['time'] / 60).' - '.$percent.')';
+    }
+
+    // Note: the remaining code here is needed to display labels on the side of the diagram.
+    // We print labels ourselves (not using libchart.php) because quality of libchart labels is not good.
+
+    // Note: Optimize this sorting and reversing.
+    $result = mu_sort($result, 'time');
+    $result = array_reverse($result); // This is to assign correct colors to labels.
+
+    // Add color to array items. This is used in labels on the side of a chart.
+    $colors = array(
+      array(2, 78, 0),
+      array(148, 170, 36),
+      array(233, 191, 49),
+      array(240, 127, 41),
+      array(243, 63, 34),
+      array(190, 71, 47),
+      array(135, 81, 60),
+      array(128, 78, 162),
+      array(121, 75, 255),
+      array(142, 165, 250),
+      array(162, 254, 239),
+      array(137, 240, 166),
+      array(104, 221, 71),
+      array(98, 174, 35),
+      array(93, 129, 1)
+    );
+    for ($i = 0; $i < count($result); $i++) {
+      $color = $colors[$i%count($colors)];
+      $result[$i]['color_html'] = sprintf('#%02x%02x%02x', $color[0], $color[1], $color[2]);
+    }
+
+    return $result;
+  }
+
+
   // adjustType - adjust chart type to something that is available for a group.
   static function adjustType($requested_type) {
     global $user;
diff --git a/charts.php b/charts.php
index aa0b9bd51..9a67e86e9 100644
--- a/charts.php
+++ b/charts.php
@@ -205,8 +205,10 @@
 $chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
 
 // Get data for our chart.
-// TODO: adjust this call below for fav report selection.
-$totals = ttChartHelper::getTotals($userDropdownSelectionId, $cl_type, $cl_date, $cl_interval);
+if ($cl_fav_report == -1)
+  $totals = ttChartHelper::getTotals($userDropdownSelectionId, $cl_type, $cl_date, $cl_interval);
+else
+  $totals = ttChartHelper::getTotalsForFavReport($cl_fav_report, $cl_type);
 $smarty->assign('totals', $totals);
 
 // Prepare chart for drawing.
diff --git a/initialize.php b/initialize.php
index c99e16dc3..c54bf1d79 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.1.5747");
+define("APP_VERSION", "1.22.2.5748");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From e9193034b33070e621e010ff13accee708fa7b3a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Nov 2022 13:26:53 +0000
Subject: [PATCH 1776/1848] Removed debug condition for fav reports on charts
 feature.

---
 WEB-INF/templates/charts.tpl |  2 --
 charts.php                   | 21 +++++++++------------
 initialize.php               |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index ee0c48346..41a6fd1e7 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -64,14 +64,12 @@ function handleFavReportSelection() {
 <div class="small-screen-calendar">{$forms.chartForm.date.control}</div>
 <table class="centered-table">
   <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
-{if defined('FAV_REPORTS_ON_CHARTS_DEBUG')}
   <tr class = "small-screen-label"><td><label for="favorite_report">{$i18n.label.fav_report}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="favorite_report">{$i18n.label.fav_report}:</label></td>
     <td class="td-with-input">{$forms.chartForm.favorite_report.control}</td>
   </tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{/if}
 {if $chart_selector}
   <tr class = "small-screen-label"><td><label for="type">{$i18n.form.charts.chart}:</label></td></tr>
   <tr>
diff --git a/charts.php b/charts.php
index 9a67e86e9..1fd7792b3 100644
--- a/charts.php
+++ b/charts.php
@@ -124,18 +124,15 @@
 $largeScreenCalendarRowSpan = 1; // Number of rows calendar spans on large screens.
 
 // Fav report control.
-if (defined('FAV_REPORTS_ON_CHARTS_DEBUG')) {
-  // Get saved favorite reports for user.
-  $report_list = ttFavReportHelper::getReports();
-  $chart_form->addInput(array('type'=>'combobox',
-    'name'=>'favorite_report',
-    'onchange'=>'handleFavReportSelection();this.form.submit();',
-    'data'=>$report_list,
-    'value' => $cl_fav_report,
-    'datakeys'=>array('id','name'),
-    'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
-  $largeScreenCalendarRowSpan += 2;
-}
+$report_list = ttFavReportHelper::getReports();
+$chart_form->addInput(array('type'=>'combobox',
+  'name'=>'favorite_report',
+  'onchange'=>'handleFavReportSelection();this.form.submit();',
+  'data'=>$report_list,
+  'value' => $cl_fav_report,
+  'datakeys'=>array('id','name'),
+  'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
+$largeScreenCalendarRowSpan += 2;
 
 // Chart type options.
 $chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
diff --git a/initialize.php b/initialize.php
index c54bf1d79..43ef2f378 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.2.5748");
+define("APP_VERSION", "1.22.2.5749");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 876d5387cce5819f2724e7dab3407ae44ccdb1a3 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 6 Nov 2022 13:47:57 +0000
Subject: [PATCH 1777/1848] Improved charts by hiding calendar for fav reports.

---
 WEB-INF/templates/charts.tpl | 18 ++++++++++++++++--
 initialize.php               |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index 41a6fd1e7..27d335ffb 100644
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -29,6 +29,8 @@ function handleFavReportSelection() {
   var userControl = document.getElementById("user_control");
   var intervalLabel = document.getElementById("interval_label");
   var intervalControl = document.getElementById("interval_control");
+  var smallScreenCalendarDiv = document.getElementById("small_screen_calendar");
+  var largeScreenCalendarDiv = document.getElementById("large_screen_calendar");
 
   if (selectedFavReportId == -1) {
     if (userLabel != null) {
@@ -43,6 +45,12 @@ function handleFavReportSelection() {
     if (intervalControl != null) {
       intervalControl.style.display = "";
     }
+    if (smallScreenCalendarDiv != null) {
+      smallScreenCalendarDiv.style.display = "";
+    }
+    if (largeScreenCalendarDiv != null) {
+      largeScreenCalendarDiv.style.display = "";
+    }
   } else {
     if (userLabel != null) {
       userLabel.style.display = "none";
@@ -56,14 +64,20 @@ function handleFavReportSelection() {
     if (intervalControl != null) {
       intervalControl.style.display = "none";
     }
+    if (smallScreenCalendarDiv != null) {
+      smallScreenCalendarDiv.style.display = "none";
+    }
+    if (largeScreenCalendarDiv != null) {
+      largeScreenCalendarDiv.style.display = "none";
+    }
   }
 }
 </script>
 
 {$forms.chartForm.open}
-<div class="small-screen-calendar">{$forms.chartForm.date.control}</div>
+<div id = "small_screen_calendar" class="small-screen-calendar">{$forms.chartForm.date.control}</div>
 <table class="centered-table">
-  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
+  <tr><td></td><td></td><td rowspan="{$large_screen_calendar_row_span}"><div id = "large_screen_calendar" class="large-screen-calendar">{$forms.chartForm.date.control}</div></td></tr>
   <tr class = "small-screen-label"><td><label for="favorite_report">{$i18n.label.fav_report}:</label></td></tr>
   <tr>
     <td class="large-screen-label"><label for="favorite_report">{$i18n.label.fav_report}:</label></td>
diff --git a/initialize.php b/initialize.php
index 43ef2f378..60af5b19d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.2.5749");
+define("APP_VERSION", "1.22.2.5750");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 66d2e4776f8e906b233783d91632f1aa0a80a287 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 18 Nov 2022 14:19:31 +0000
Subject: [PATCH 1778/1848] Removed a redundant call in puncher.

---
 initialize.php | 2 +-
 puncher.php    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 60af5b19d..71a97bb7b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.2.5750");
+define("APP_VERSION", "1.22.2.5751");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/puncher.php b/puncher.php
index 9714ac242..26b371fcd 100644
--- a/puncher.php
+++ b/puncher.php
@@ -324,7 +324,6 @@
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('task_required', $taskRequired);
-$smarty->assign('time_records', ttTimeHelper::getRecords($cl_date));
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
 $smarty->assign('show_record_custom_fields', $user->isOptionEnabled('record_custom_fields'));

From 4692f7163525e25c5efff09de72bd3fb73690f08 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Dec 2022 22:02:58 +0000
Subject: [PATCH 1779/1848] Dutch translation improved.

---
 WEB-INF/resources/nl.lang.php | 9 +++------
 initialize.php                | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 38d93efdb..c162f858d 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -415,8 +415,7 @@
 'form.reports.show_fields' => 'Toon velden',
 'form.reports.time_fields' => 'Tijd velden',
 'form.reports.user_fields' => 'Medewerker velden',
-// TODO: translate the following.
-// 'form.reports.project_fields' => 'Project fields',
+'form.reports.project_fields' => 'Project velden',
 'form.reports.group_by' => 'Groeperen op',
 'form.reports.group_by_no' => '--- niet groeperen ---',
 'form.reports.group_by_date' => 'datum',
@@ -428,8 +427,7 @@
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Exporteer',
-// TODO: translate the following.
-// 'form.report.per_hour' => 'Per hour',
+'form.report.per_hour' => 'Per uur',
 'form.report.assign_to_invoice' => 'Voeg toe aan factuur',
 'form.report.assign_to_timesheet' => 'Wijs toe aan tijdenoverzicht',
 
@@ -590,7 +588,6 @@
 'form.display_options.note_on_separate_row' => 'Notitie in aparte kolom', // Translator (Henk) comment: "kolom is the right word in Dutch."
 'form.display_options.not_complete_days' => 'Niet complete dagen',
 'form.display_options.inactive_projects' => 'Niet actieve projecten',
-// TODO: translate the following.
-// 'form.display_options.cost_per_hour' => 'Cost per hour',
+'form.display_options.cost_per_hour' => 'Kosten per uur',
 'form.display_options.custom_css' => 'Aangepaste CSS',
 );
diff --git a/initialize.php b/initialize.php
index 71a97bb7b..6c62a5c94 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.2.5751");
+define("APP_VERSION", "1.22.2.5752");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 136681fa3019c4e80ef9e93a59d5334925486121 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 8 Dec 2022 16:36:09 +0000
Subject: [PATCH 1780/1848] Added previous month option on charts.

---
 WEB-INF/lib/ttChartHelper.class.php |  4 ++++
 WEB-INF/lib/ttPeriod.class.php      | 12 ++++++------
 charts.php                          |  1 +
 initialize.php                      |  2 +-
 reports.php                         |  6 +++---
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index 7ee712796..eaa5a4c07 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -37,6 +37,10 @@ static function getTotals($user_id, $chart_type, $selected_date, $interval_type)
         $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_MONTH);
         break;
 
+      case INTERVAL_PREVIOUS_MONTH:
+        $period = new ttPeriod(new ttDate($selected_date), INTERVAL_PREVIOUS_MONTH);
+        break;
+
       case INTERVAL_THIS_YEAR:
         $period = new ttPeriod(new ttDate($selected_date), INTERVAL_THIS_YEAR);
         break;
diff --git a/WEB-INF/lib/ttPeriod.class.php b/WEB-INF/lib/ttPeriod.class.php
index 1d63ad9d1..0dcbf71c1 100644
--- a/WEB-INF/lib/ttPeriod.class.php
+++ b/WEB-INF/lib/ttPeriod.class.php
@@ -7,9 +7,9 @@
 define('INTERVAL_THIS_MONTH', 3);
 define('INTERVAL_THIS_YEAR', 4);
 define('INTERVAL_ALL_TIME', 5);
-define('INTERVAL_LAST_WEEK', 6);
-define('INTERVAL_LAST_MONTH', 7);
-define('INTERVAL_LAST_DAY', 8);
+define('INTERVAL_PREVIOUS_WEEK', 6);
+define('INTERVAL_PREVIOUS_MONTH', 7);
+define('INTERVAL_PREVIOUS_DAY', 8);
 
 class ttPeriod {
   var $startDate; // ttDate object.
@@ -34,7 +34,7 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
         $this->endDate->setFromUnixTimestamp($ttDateInstance->getTimestamp());
         break;
 
-      case INTERVAL_LAST_DAY:
+      case INTERVAL_PREVIOUS_DAY:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-1,$t_arr[5]));
         break;
@@ -44,7 +44,7 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
         break;
 
-      case INTERVAL_LAST_WEEK:
+      case INTERVAL_PREVIOUS_WEEK:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-7+$startWeekBias,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]-1+$startWeekBias,$t_arr[5]));
         break;
@@ -54,7 +54,7 @@ function __construct($ttDateInstance, $period_type = INTERVAL_THIS_MONTH) {
 	$this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+2,0,$t_arr[5]));
 	break;
 
-      case INTERVAL_LAST_MONTH:
+      case INTERVAL_PREVIOUS_MONTH:
         $this->startDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4],1,$t_arr[5]));
         $this->endDate->setFromUnixTimestamp(mktime(0,0,0,$t_arr[4]+1,0,$t_arr[5]));
         break;
diff --git a/charts.php b/charts.php
index 1fd7792b3..a4c24f0a0 100644
--- a/charts.php
+++ b/charts.php
@@ -186,6 +186,7 @@
 $intervals[INTERVAL_THIS_DAY] = $i18n->get('dropdown.selected_day');
 $intervals[INTERVAL_THIS_WEEK] = $i18n->get('dropdown.selected_week');
 $intervals[INTERVAL_THIS_MONTH] = $i18n->get('dropdown.selected_month');
+$intervals[INTERVAL_PREVIOUS_MONTH] = $i18n->get('dropdown.previous_month');
 $intervals[INTERVAL_THIS_YEAR] = $i18n->get('dropdown.selected_year');
 $intervals[INTERVAL_ALL_TIME] = $i18n->get('dropdown.all_time');
 
diff --git a/initialize.php b/initialize.php
index 6c62a5c94..d499de945 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.2.5752");
+define("APP_VERSION", "1.22.2.5753");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 057787e7c..fd4ca156b 100644
--- a/reports.php
+++ b/reports.php
@@ -229,11 +229,11 @@
 $form->addInput(array('type'=>'combobox',
   'name'=>'period',
   'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
-    INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
+    INTERVAL_PREVIOUS_MONTH=>$i18n->get('dropdown.previous_month'),
     INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
-    INTERVAL_LAST_WEEK=>$i18n->get('dropdown.previous_week'),
+    INTERVAL_PREVIOUS_WEEK=>$i18n->get('dropdown.previous_week'),
     INTERVAL_THIS_DAY=>$i18n->get('dropdown.current_day'),
-    INTERVAL_LAST_DAY=>$i18n->get('dropdown.previous_day')),
+    INTERVAL_PREVIOUS_DAY=>$i18n->get('dropdown.previous_day')),
   'empty'=>array(''=>$i18n->get('dropdown.select'))));
 // Add controls for start and end dates.
 $form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));

From 700d2e19cd276432dd03e3817a5e03aa056ea3cc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Dec 2022 13:53:20 +0000
Subject: [PATCH 1781/1848] Started to work on custom translation feature.

---
 dbinstall.php  | 10 ++++++----
 initialize.php |  2 +-
 mysql.sql      |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dbinstall.php b/dbinstall.php
index 85d3f021a..c79cd558a 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1151,7 +1151,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to12107"]) {
+  if ($_POST["convert11900to12203"]) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1199,6 +1199,8 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.2', modified = now() where param_name = 'version_db' and param_value = '1.21.0'");
     ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `note_containing` varchar(80) default NULL after `paid_status`");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.21.7', modified = now() where param_name = 'version_db' and param_value = '1.21.2'");
+    ttExecute("ALTER TABLE `tt_groups` ADD `custom_translation` text default NULL AFTER `custom_css`");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.22.3', modified = now() where param_name = 'version_db' and param_value = '1.21.7'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1249,7 +1251,7 @@ function ttGenerateKeys() {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.21.7)</b>
+    <td width="80%"><b>Create database structure (v1.22.3)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1298,8 +1300,8 @@ function ttGenerateKeys() {
     <td><input type="submit" name="convert11797to11900" value="Update"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.19 to v1.21.7)</td>
-    <td><input type="submit" name="convert11900to12107" value="Update"></td>
+    <td>Update database structure (v1.19 to v1.22.3)</td>
+    <td><input type="submit" name="convert11900to12203" value="Update"></td>
   </tr>
 </table>
 
diff --git a/initialize.php b/initialize.php
index d499de945..7c1e90f6e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.2.5753");
+define("APP_VERSION", "1.22.3.5754");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/mysql.sql b/mysql.sql
index 4fd33fa95..d50b6c46c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -39,6 +39,7 @@ CREATE TABLE `tt_groups` (
   `custom_logo` tinyint(4) default 0,                    # whether to use a custom logo or not
   `config` text default NULL,                            # miscellaneous group configuration settings
   `custom_css` text default NULL,                        # custom css for group
+  `custom_translation` text default NULL,                # custom translation for group
   `created` datetime default NULL,                       # creation timestamp
   `created_ip` varchar(45) default NULL,                 # creator ip
   `created_by` int(11) default NULL,                     # creator user_id
@@ -622,4 +623,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.21.7', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.22.3', now()); # TODO: change when structure changes.

From 6908f224aa200ae785a9b819ca73f81bb9af6f7f Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 18 Dec 2022 15:03:08 +0000
Subject: [PATCH 1782/1848] Added localization string for custom translation.

---
 WEB-INF/resources/ca.lang.php    | 1 +
 WEB-INF/resources/cs.lang.php    | 1 +
 WEB-INF/resources/da.lang.php    | 1 +
 WEB-INF/resources/de.lang.php    | 1 +
 WEB-INF/resources/en.lang.php    | 1 +
 WEB-INF/resources/es.lang.php    | 1 +
 WEB-INF/resources/et.lang.php    | 1 +
 WEB-INF/resources/fa.lang.php    | 1 +
 WEB-INF/resources/fi.lang.php    | 1 +
 WEB-INF/resources/fr.lang.php    | 1 +
 WEB-INF/resources/gr.lang.php    | 1 +
 WEB-INF/resources/he.lang.php    | 1 +
 WEB-INF/resources/hu.lang.php    | 1 +
 WEB-INF/resources/it.lang.php    | 1 +
 WEB-INF/resources/ja.lang.php    | 1 +
 WEB-INF/resources/ko.lang.php    | 1 +
 WEB-INF/resources/nl.lang.php    | 2 ++
 WEB-INF/resources/no.lang.php    | 1 +
 WEB-INF/resources/pl.lang.php    | 1 +
 WEB-INF/resources/pt-br.lang.php | 2 ++
 WEB-INF/resources/pt.lang.php    | 1 +
 WEB-INF/resources/ro.lang.php    | 1 +
 WEB-INF/resources/ru.lang.php    | 1 +
 WEB-INF/resources/sk.lang.php    | 1 +
 WEB-INF/resources/sl.lang.php    | 1 +
 WEB-INF/resources/sr.lang.php    | 1 +
 WEB-INF/resources/sv.lang.php    | 1 +
 WEB-INF/resources/tr.lang.php    | 1 +
 WEB-INF/resources/zh-cn.lang.php | 1 +
 WEB-INF/resources/zh-tw.lang.php | 1 +
 initialize.php                   | 2 +-
 31 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 13d8237c2..3cb547511 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -681,4 +681,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 4a93086de..2c32c9641 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -693,4 +693,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 595590f0a..8c86b742d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -659,4 +659,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 209df6b72..eadc49e74 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -634,4 +634,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 83808aa40..c1defcb5f 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -605,4 +605,5 @@
 'form.display_options.inactive_projects' => 'Inactive projects',
 'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'Custom CSS',
+'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 507bbcaac..63e6fbac5 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -696,4 +696,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 0295dc70f..59f6ecf5e 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -670,4 +670,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 078872026..bfe8044d5 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -682,4 +682,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e9e92e018..d5cbe9286 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -666,4 +666,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 145fcb289..a0df933eb 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -655,4 +655,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 6265976d7..c5c0c2b7a 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -649,4 +649,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 727b0b761..1d0c24f40 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -687,4 +687,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8b0be9524..4c133d9fd 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -684,4 +684,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index d283830a1..7cf157ba7 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -662,4 +662,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 112e454cc..16a882f83 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -688,4 +688,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 6bb78d772..f0c695e03 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -686,4 +686,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index c162f858d..febb14a98 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -590,4 +590,6 @@
 'form.display_options.inactive_projects' => 'Niet actieve projecten',
 'form.display_options.cost_per_hour' => 'Kosten per uur',
 'form.display_options.custom_css' => 'Aangepaste CSS',
+// TODO: translate the following.
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 18e1ee69f..ec80e93eb 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -688,4 +688,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index b7dd5024c..e6eba0521 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -667,4 +667,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index fff94fa3d..04f860459 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -600,5 +600,7 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 'form.display_options.custom_css' => 'CSS customizado',
+// TODO: translate the following.
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 075e7b41c..fdedcf435 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -666,4 +666,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 0d8fe6d1f..55d010f86 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -689,4 +689,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 805be45b5..3e804c7da 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -591,4 +591,5 @@
 'form.display_options.inactive_projects' => 'Неактивные проекты',
 'form.display_options.cost_per_hour' => 'Стоимость за час',
 'form.display_options.custom_css' => 'Пользовательская CSS',
+'form.display_options.custom_translation' => 'Пользовательский перевод',
 );
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e57e63d74..1802f518a 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -671,4 +671,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8ea8c445e..cd6149671 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -661,4 +661,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 055545b37..18c64ec78 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -669,4 +669,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index e0d212b9e..6b2a0d2bc 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -667,4 +667,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 098871718..0473d081c 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -702,4 +702,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 87f1cc1c9..44dc443ee 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -677,4 +677,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 181756e77..e5faa1cbf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -680,4 +680,5 @@
 // 'form.display_options.inactive_projects' => 'Inactive projects',
 // 'form.display_options.cost_per_hour' => 'Cost per hour',
 // 'form.display_options.custom_css' => 'Custom CSS',
+// 'form.display_options.custom_translation' => 'Custom translation',
 );
diff --git a/initialize.php b/initialize.php
index 7c1e90f6e..54e0c36d0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.3.5754");
+define("APP_VERSION", "1.22.3.5755");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 08fbd9a080c042685df6ccc40b9fd0eba0914795 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Dec 2022 15:44:16 +0000
Subject: [PATCH 1783/1848] Work in progress on custom translation.

---
 WEB-INF/lib/common.lib.php            | 14 ++++++++++++++
 WEB-INF/lib/ttUser.class.php          | 17 ++++++++++++++---
 WEB-INF/templates/display_options.tpl |  7 +++++++
 default.css                           |  4 ++--
 display_options.php                   |  7 ++++++-
 initialize.php                        |  2 +-
 6 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 0f38f80fa..7a79e0a74 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -162,6 +162,20 @@ function ttValidCss($val)
   return true;
 }
 
+// ttValidTranslation is used to check user input for custom translation.
+function ttValidTranslation($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0)
+    return true;
+
+  // String must not contain any tags.
+  if (stristr($val, '<'))
+    return false;
+
+  return false; // Not implemented yet.
+}
+
 // ttValidTemplateText is used to check template-based user input.
 // When templates are used, required input parts must be filled by user.
 // We identify these parts by 3 "stop sign" emojis (aka "octagonal sign" U+1F6D1).
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index b32c27792..37591fa5f 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -50,6 +50,7 @@ class ttUser {
   var $config = null;           // Comma-separated list of miscellaneous config options.
   var $configHelper = null;     // An instance of ttConfigHelper class.
   var $custom_css = null;       // Custom css.
+  var $custom_translation = null; // Custom translation.
 
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
@@ -73,7 +74,8 @@ function __construct($login, $id = null) {
     $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
       " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
       " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.record_type,".
-      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.holidays, g.workday_minutes, g.custom_logo".
+      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.custom_translation,".
+      " g.holidays, g.workday_minutes, g.custom_logo".
       " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
@@ -131,6 +133,7 @@ function __construct($login, $id = null) {
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
 
       $this->custom_css = $val['custom_css'];
+      $this->custom_translation = $val['custom_translation'];
 
       // Set "on behalf" id and name (user).
       if (isset($_SESSION['behalf_id'])) {
@@ -290,6 +293,11 @@ function getCustomCss() {
     return ($this->behalfGroup ? $this->behalfGroup->custom_css : $this->custom_css);
   }
 
+  // getCustomTranslation returns custom translation for active group.
+  function getCustomTranslation() {
+    return ($this->behalfGroup ? $this->behalfGroup->custom_translation : $this->custom_translation);
+  }
+  
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
@@ -682,7 +690,8 @@ function updateGroup($fields) {
 
     $name_part = $description_part = $currency_part = $lang_part = $decimal_mark_part = $date_format_part = $time_format_part =
       $week_start_part = $tracking_mode_part = $project_required_part = $record_type_part = $bcc_email_part =  $allow_ip_part =
-      $password_complexity_part = $plugins_part = $config_part = $custom_css_part = $lock_spec_part = $holidays_part = $workday_minutes_part = '';
+      $password_complexity_part = $plugins_part = $config_part = $custom_css_part = $custom_translation_part = $lock_spec_part =
+      $holidays_part = $workday_minutes_part = '';
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
@@ -702,6 +711,7 @@ function updateGroup($fields) {
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);
     if (isset($fields['custom_css'])) $custom_css_part = ', custom_css = '.$mdb2->quote($fields['custom_css']);
+    if (isset($fields['custom_translation'])) $custom_translation_part = ', custom_translation = '.$mdb2->quote($fields['custom_translation']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['holidays'])) $holidays_part = ', holidays = '.$mdb2->quote($fields['holidays']);
     if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
@@ -709,7 +719,8 @@ function updateGroup($fields) {
 
     $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
       $time_format_part.$week_start_part.$tracking_mode_part.$project_required_part.$record_type_part.
-      $bcc_email_part.$allow_ip_part.$password_complexity_part.$plugins_part.$config_part.$custom_css_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
+      $bcc_email_part.$allow_ip_part.$password_complexity_part.$plugins_part.$config_part.$custom_css_part.
+      $custom_translation_part.$lock_spec_part.$holidays_part.$workday_minutes_part.$modified_part, ',');
 
     $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
     $affected = $mdb2->exec($sql);
diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index 5b487ec85..a6abe34f2 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -63,6 +63,13 @@ License: See license.txt *}
   <tr><td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td></tr>
   <tr><td colspan="2"><a href="https://www.anuko.com/lp/tt_50.htm" target="_blank">{$i18n.label.what_is_it}</a></td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{if defined('CUSTOM_TRANSLATION_DEBUG')}
+  <tr><td><div class="form-control-separator"></div></td></tr>
+  <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_translation}</td></tr>
+  <tr><td colspan="2">{$forms.displayOptionsForm.custom_translation.control}</td></tr>
+  <tr><td colspan="2"><a href="https://www.anuko.com/lp/tt_59.htm" target="_blank">{$i18n.label.what_is_it}</a></td></tr>
+  <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
+{/if}
 </table>
 <div class="button-set">{$forms.displayOptionsForm.btn_save.control}</div>
 {$forms.displayOptionsForm.close}
diff --git a/default.css b/default.css
index 98e40562a..38de0f53f 100644
--- a/default.css
+++ b/default.css
@@ -363,7 +363,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas for fields */
-#description, #address, #item_name, #comment, #custom_css, #content {
+#description, #address, #item_name, #comment, #custom_css, #custom_translation, #content {
   width: 220px;
   border-radius: 4px;
   border: 1px solid #c9c9c9;
@@ -371,7 +371,7 @@ input[type="text"].short-text-field {
 }
 
 /* textareas with focus */
-#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #content:focus {
+#description:focus, #address:focus, #item_name:focus, #comment:focus, #custom_css:focus, #custom_translation:focus, #content:focus {
   background-color: yellow;
   border: 1px solid black;
   outline: none;
diff --git a/display_options.php b/display_options.php
index e449c3c91..e0b7bc987 100644
--- a/display_options.php
+++ b/display_options.php
@@ -23,6 +23,7 @@
   $cl_report_inactive_projects = (bool)($request->getParameter('report_inactive_projects'));
   $cl_report_cost_per_hour = (bool)$request->getParameter('report_cost_per_hour');
   $cl_custom_css = trim($request->getParameter('custom_css'));
+  $cl_custom_translation = trim($request->getParameter('custom_translation'));
 } else {
   $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row');
   $cl_time_not_complete_days = $config->getDefinedValue('time_not_complete_days');
@@ -31,6 +32,7 @@
   $cl_report_inactive_projects = $config->getDefinedValue('report_inactive_projects');
   $cl_report_cost_per_hour = $config->getDefinedValue('report_cost_per_hour');
   $cl_custom_css = $user->getCustomCss();
+  $cl_custom_translation = $user->getCustomTranslation();
 }
 
 $form = new Form('displayOptionsForm');
@@ -55,11 +57,13 @@
 // TODO: add PDF break controller here.
 
 $form->addInput(array('type'=>'textarea','name'=>'custom_css','value'=>$cl_custom_css));
+$form->addInput(array('type'=>'textarea','name'=>'custom_translation','value'=>$cl_custom_translation));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
   // Validate user input.
   if (!ttValidCss($cl_custom_css)) $err->add($i18n->get('error.field'), $i18n->get('form.display_options.custom_css'));
+  if (!ttValidTranslation($cl_custom_translation)) $err->add($i18n->get('error.field'), $i18n->get('form.display_options.custom_translation'));
   // Finished validating user input.
 
   if ($err->no()) {
@@ -72,7 +76,8 @@
     $config->setDefinedValue('report_cost_per_hour', $cl_report_cost_per_hour);
     if ($user->updateGroup(array(
       'config' => $config->getConfig(),
-      'custom_css' => $cl_custom_css))) {
+      'custom_css' => $cl_custom_css,
+      'custom_translation' => $cl_custom_translation))) {
       header('Location: success.php');
       exit();
     } else
diff --git a/initialize.php b/initialize.php
index 54e0c36d0..bb1aa4f95 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.3.5755");
+define("APP_VERSION", "1.22.3.5756");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From bd106a61bb80f88b7c4d6b7f7e3d2e28441f3851 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 19 Dec 2022 21:26:01 +0000
Subject: [PATCH 1784/1848] More progress on custom translation feature.

---
 WEB-INF/lib/I18n.class.php | 40 +++++++++++++++++++++++++++++++++--
 WEB-INF/lib/common.lib.php | 43 +++++++++++++++++++++++++++++++++++---
 initialize.php             |  2 +-
 3 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 1760da48a..99015a93e 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -51,9 +51,16 @@ function get($key) {
     return $value;
   }
 
+  // get - keyExists determines if a key exists.
+  function keyExists($key) {
+    $value = $this->get($key);
+    return ($value != null && strlen($value) > 0);
+  }
+
   // load - loads localized strings into $keys array by first going through the default file (en.lang.php)
-  // and then through the requested language file (which is supplied as parameter).
-  // This means we end up with default English strings when keys are missing in the translation file.
+  // and then through the requested language file (which is supplied as parameter),
+  // (this means we end up with default English strings when keys are missing in the translation file),
+  // and then from a group custom translation field, if available.
   function load($langName) {
     // Load default English keys first.
     $defaultFileName = RESOURCE_DIR . '/' . $this->defaultLang . '.lang.php';
@@ -105,6 +112,35 @@ function load($langName) {
         }
       }
     }
+
+    // Now load custom translation for group.
+    global $user;
+    $customTranslation = $user->getCustomTranslation();
+    if ($customTranslation != null) {
+      $lines =  preg_split("/\r\n|\n|\r/", $customTranslation);
+      for ($i = 0; $i < count($lines); $i++) {
+        $parts = explode('=', $lines[$i]);
+        if (count($parts) != 2) continue;
+
+        $key = trim($parts[0]);
+        $value = trim($parts[1]);
+        if (!$value) continue;
+
+        $value = htmlspecialchars(trim($parts[1]));
+
+        $pos = strpos($key, ".");
+        if (!($pos === false)) {
+          $p = explode(".", $key);
+          $str = "";
+          foreach ($p as $w) {
+             $str .= "[\"".$w."\"]";
+          }
+          eval("\$this->keys".$str."='".$value."';");
+        } else {
+          $this->keys[$key] = $value;
+        }
+      }
+    }
   }
 
   // hasLang determines if a file for requested language exists.
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 7a79e0a74..85ece4480 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -169,11 +169,48 @@ function ttValidTranslation($val)
   if (strlen($val) == 0)
     return true;
 
-  // String must not contain any tags.
-  if (stristr($val, '<'))
+  // Validate lines.
+  $lines = preg_split("/\r\n|\n|\r/", $val);
+  for ($i = 0; $i < count($lines); $i++) {
+    if (!ttValidTranslationLine($lines[$i]))
+      return false;
+  }
+
+  return true;
+}
+
+// ttValidTranslationLine is used to check an individual line in custom translation.
+function ttValidTranslationLine($val)
+{
+  $val = trim($val);
+  if (strlen($val) == 0)
+    return false; // Empty line is not valid.
+
+  $parts = explode('=', $val);
+  if (count($parts) != 2) {
+    // We need exactly 2 parts.
     return false;
+  }
+
+  $key = trim($parts[0]);
+  global $i18n;
+  if (!$i18n->keyExists($key)) {
+    // Key does not exist.
+    return false;
+  }
 
-  return false; // Not implemented yet.
+  $value = trim($parts[1]);
+  if (!$value) {
+    // Do not allow empty values.
+    return false;
+  }
+
+  // Prohibit apostrophes in values for now until I figure out how to handle them properly.
+  if (ttContains($value, "'")) {
+    return false;
+  }
+
+  return true;
 }
 
 // ttValidTemplateText is used to check template-based user input.
diff --git a/initialize.php b/initialize.php
index bb1aa4f95..060c63ea2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.3.5756");
+define("APP_VERSION", "1.22.3.5757");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From cd24019d91a1582bbe50c1e65a047c97fc9f19b1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Dec 2022 15:40:01 +0000
Subject: [PATCH 1785/1848] Allowed empty custom translation strings and also
 containing single quotes.

---
 WEB-INF/lib/I18n.class.php       |  8 ++++----
 WEB-INF/lib/common.lib.php       | 11 -----------
 WEB-INF/resources/ca.lang.php    |  3 ++-
 WEB-INF/resources/cs.lang.php    |  3 ++-
 WEB-INF/resources/da.lang.php    |  3 ++-
 WEB-INF/resources/de.lang.php    |  3 ++-
 WEB-INF/resources/en.lang.php    |  3 ++-
 WEB-INF/resources/es.lang.php    |  3 ++-
 WEB-INF/resources/et.lang.php    |  3 ++-
 WEB-INF/resources/fa.lang.php    |  4 +++-
 WEB-INF/resources/fi.lang.php    |  3 ++-
 WEB-INF/resources/fr.lang.php    |  3 ++-
 WEB-INF/resources/gr.lang.php    |  3 ++-
 WEB-INF/resources/he.lang.php    |  3 ++-
 WEB-INF/resources/hu.lang.php    |  3 ++-
 WEB-INF/resources/it.lang.php    |  3 ++-
 WEB-INF/resources/ja.lang.php    |  3 ++-
 WEB-INF/resources/ko.lang.php    |  3 ++-
 WEB-INF/resources/nl.lang.php    |  3 ++-
 WEB-INF/resources/no.lang.php    |  3 ++-
 WEB-INF/resources/pl.lang.php    |  3 ++-
 WEB-INF/resources/pt-br.lang.php |  3 ++-
 WEB-INF/resources/pt.lang.php    |  3 ++-
 WEB-INF/resources/ro.lang.php    |  3 ++-
 WEB-INF/resources/ru.lang.php    |  3 ++-
 WEB-INF/resources/sk.lang.php    |  3 ++-
 WEB-INF/resources/sl.lang.php    |  3 ++-
 WEB-INF/resources/sr.lang.php    |  3 ++-
 WEB-INF/resources/sv.lang.php    |  3 ++-
 WEB-INF/resources/tr.lang.php    |  3 ++-
 WEB-INF/resources/zh-cn.lang.php |  3 ++-
 WEB-INF/resources/zh-tw.lang.php |  3 ++-
 initialize.php                   |  2 +-
 33 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index 99015a93e..bd4e9ffd3 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -54,7 +54,7 @@ function get($key) {
   // get - keyExists determines if a key exists.
   function keyExists($key) {
     $value = $this->get($key);
-    return ($value != null && strlen($value) > 0);
+    return ($value !== null);
   }
 
   // load - loads localized strings into $keys array by first going through the default file (en.lang.php)
@@ -124,9 +124,9 @@ function load($langName) {
 
         $key = trim($parts[0]);
         $value = trim($parts[1]);
-        if (!$value) continue;
-
-        $value = htmlspecialchars(trim($parts[1]));
+        // Escape single quotes and backslashes.
+        $value = addcslashes($value, "'\\");
+        $value = htmlspecialchars($value);
 
         $pos = strpos($key, ".");
         if (!($pos === false)) {
diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 85ece4480..86570a5f0 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -199,17 +199,6 @@ function ttValidTranslationLine($val)
     return false;
   }
 
-  $value = trim($parts[1]);
-  if (!$value) {
-    // Do not allow empty values.
-    return false;
-  }
-
-  // Prohibit apostrophes in values for now until I figure out how to handle them properly.
-  if (ttContains($value, "'")) {
-    return false;
-  }
-
   return true;
 }
 
diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3cb547511..327132ed8 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Catalan (Català)';
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 2c32c9641..c89457e6d 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 8c86b742d..6fe93c261 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Danish (Dansk)';
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index eadc49e74..9cb0340b9 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'German (Deutsch)';
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index c1defcb5f..5858b63d4 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'English';
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 63e6fbac5..b302de1c4 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Spanish (Español)';
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 59f6ecf5e..19a74b4cd 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index bfe8044d5..32dacdf00 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -2,8 +2,10 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
+
 $i18n_language = 'Persian (فارسی)';
 // TODO: translate the following.
 $i18n_months = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index d5cbe9286..cdfc4c5fe 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Finnish (Suomi)';
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a0df933eb..b488be0bc 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'French (Français)';
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index c5c0c2b7a..34f1890eb 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Greek (Ελληνικά)';
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 1d0c24f40..585a7ec2f 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Hebrew (עברית)';
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 4c133d9fd..e2d7500d3 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 7cf157ba7..73ca8a022 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 16a882f83..0de6e88ea 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Japanese (日本語)';
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f0c695e03..fcbe14d24 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Korean (한국어)';
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index febb14a98..16fe1ecf8 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Dutch (Nederlands)';
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index ec80e93eb..720f71f34 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Norwegian (Norsk)';
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index e6eba0521..69dddf311 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Polish (Polski)';
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 04f860459..c9a4ad998 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Portuguese (Português Brasileiro)';
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fdedcf435..abcd5793f 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Please use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 55d010f86..03db7da44 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Please use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 3e804c7da..6c924df2d 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Russian (Русский)';
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 1802f518a..0404fb8d0 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Slovak (Slovenčina)';
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index cd6149671..b3153ad79 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 18c64ec78..6902d9223 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Serbian (Srpski)';
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 6b2a0d2bc..dba0fd6f2 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Swedish (Svenska)';
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 0473d081c..f2531ee76 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 // Note to translators: Use proper capitalization rules for your language.
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 44dc443ee..d30515863 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Chinese (简体中文)';
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index e5faa1cbf..890244f66 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -2,7 +2,8 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-// Note: escape apostrophes with THREE backslashes, like here:  choisir l\\\'option.
+// Note: escape apostrophes with THREE backslashes, like here:  'choisir l\\\'option'.
+// Alternatively: use one backslash and surround by double-quotes: "choisir l\'option".
 // Other characters (such as double-quotes in http links, etc.) do not have to be escaped.
 
 $i18n_language = 'Chinese (簡體中文)';
diff --git a/initialize.php b/initialize.php
index 060c63ea2..55613a09d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.3.5757");
+define("APP_VERSION", "1.22.3.5758");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3c7b6f53a0f34d7b9fa712b9a0a7d48f21081b3e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 21 Dec 2022 13:50:06 +0000
Subject: [PATCH 1786/1848] Initial release of custom translation feature in
 display options.

---
 WEB-INF/templates/display_options.tpl | 2 --
 initialize.php                        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl
index a6abe34f2..0d0418af9 100644
--- a/WEB-INF/templates/display_options.tpl
+++ b/WEB-INF/templates/display_options.tpl
@@ -63,13 +63,11 @@ License: See license.txt *}
   <tr><td colspan="2">{$forms.displayOptionsForm.custom_css.control}</td></tr>
   <tr><td colspan="2"><a href="https://www.anuko.com/lp/tt_50.htm" target="_blank">{$i18n.label.what_is_it}</a></td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{if defined('CUSTOM_TRANSLATION_DEBUG')}
   <tr><td><div class="form-control-separator"></div></td></tr>
   <tr><td class="sectionHeaderNoBorder" colspan="2">{$i18n.form.display_options.custom_translation}</td></tr>
   <tr><td colspan="2">{$forms.displayOptionsForm.custom_translation.control}</td></tr>
   <tr><td colspan="2"><a href="https://www.anuko.com/lp/tt_59.htm" target="_blank">{$i18n.label.what_is_it}</a></td></tr>
   <tr><td><div class="small-screen-form-control-separator"></div></td></tr>
-{/if}
 </table>
 <div class="button-set">{$forms.displayOptionsForm.btn_save.control}</div>
 {$forms.displayOptionsForm.close}
diff --git a/initialize.php b/initialize.php
index 55613a09d..afb52e81d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.3.5758");
+define("APP_VERSION", "1.22.4.5759");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f7dbaf2086bb5793ef5e5ecacc74709ac1c7a947 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Dec 2022 13:01:08 +0000
Subject: [PATCH 1787/1848] Dutch transation improved.

---
 WEB-INF/resources/nl.lang.php | 3 +--
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 16fe1ecf8..2ca444c0a 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -591,6 +591,5 @@
 'form.display_options.inactive_projects' => 'Niet actieve projecten',
 'form.display_options.cost_per_hour' => 'Kosten per uur',
 'form.display_options.custom_css' => 'Aangepaste CSS',
-// TODO: translate the following.
-// 'form.display_options.custom_translation' => 'Custom translation',
+'form.display_options.custom_translation' => 'Maatwerk vertaling',
 );
diff --git a/initialize.php b/initialize.php
index afb52e81d..08bcf66e8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.4.5759");
+define("APP_VERSION", "1.22.4.5760");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a38d8502bbcea6f0d877ca4ea0ba202a0a830790 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 25 Dec 2022 16:04:57 +0000
Subject: [PATCH 1788/1848] Fixed export-import for custom_css and
 custom_translation fields.

---
 WEB-INF/lib/ttGroupExportHelper.class.php | 3 ++-
 WEB-INF/lib/ttOrgImportHelper.class.php   | 6 ++++--
 initialize.php                            | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index fb0f60025..ecd4f80ac 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -137,7 +137,8 @@ function writeData() {
     $group_part .= " workday_minutes=\"".$group['workday_minutes']."\"";
     $group_part .= " custom_logo=\"".$group['custom_logo']."\"";
     $group_part .= " config=\"".$group['config']."\"";
-    $group_part .= " custom_css=\"".$group['custom_css']."\"";
+    $group_part .= " custom_css=\"".htmlspecialchars($group['custom_css'])."\"";
+    $group_part .= " custom_translation=\"".htmlspecialchars($group['custom_translation'])."\"";
     $group_part .= ">\n";
 
     // Write group info.
diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index aae3267c9..cc0ecf1d8 100644
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -99,7 +99,8 @@ function startElement($parser, $name, $attrs) {
           'workday_minutes' => $attrs['WORKDAY_MINUTES'],
           'custom_logo' => $attrs['CUSTOM_LOGO'],
           'config' => $attrs['CONFIG'],
-          'custom_css' => $attrs['CUSTOM_CSS']));
+          'custom_css' => $attrs['CUSTOM_CSS'],
+          'custom_translation' => $attrs['CUSTOM_TRANSLATION']));
 
         // Special handling for top group.
         if (!$this->org_id && $this->current_group_id) {
@@ -685,7 +686,7 @@ private function createGroup($fields) {
     $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format, time_format,'.
       ' week_start, tracking_mode, project_required, record_type, bcc_email,'.
       ' allow_ip, password_complexity, plugins, lock_spec,'.
-      ' workday_minutes, config, custom_css, created, created_ip, created_by)';
+      ' workday_minutes, config, custom_css, custom_translation, created, created_ip, created_by)';
 
     $values = ' values (';
     $values .= $mdb2->quote($fields['parent_id']);
@@ -710,6 +711,7 @@ private function createGroup($fields) {
     $values .= ', '.(int)$fields['workday_minutes'];
     $values .= ', '.$mdb2->quote($fields['config']);
     $values .= ', '.$mdb2->quote($fields['custom_css']);
+    $values .= ', '.$mdb2->quote($fields['custom_translation']);
     $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id;
     $values .= ')';
 
diff --git a/initialize.php b/initialize.php
index 08bcf66e8..fb76ba64d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.4.5760");
+define("APP_VERSION", "1.22.4.5761");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From afa80d3b183cadcc586b6ffb3d33f0f4e156e1f8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 28 Dec 2022 16:53:14 +0000
Subject: [PATCH 1789/1848] Fixed a bug with deleting custom field dropdown
 options with 0 as name.

---
 cf_dropdown_option_delete.php | 2 +-
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index e6eeeeb75..cb8c8a31a 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -17,7 +17,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $option = CustomFields::getOptionName($cl_id);
-if (!$option) {
+if ($option == null || $option === false) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/initialize.php b/initialize.php
index fb76ba64d..5a0189f28 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.4.5761");
+define("APP_VERSION", "1.22.5.5762");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 17705ca52e9e9fbc8cf6c209afecc9c4d5969d7d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Dec 2022 16:10:51 +0000
Subject: [PATCH 1790/1848] Work in progress improving German translation.

---
 WEB-INF/resources/de.lang.php | 99 ++++++++++++++---------------------
 initialize.php                |  2 +-
 2 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9cb0340b9..8f0aae4c2 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -20,19 +20,16 @@
 'menu.logout' => 'Abmelden',
 'menu.forum' => 'Forum',
 'menu.help' => 'Hilfe',
-// TODO: translate the following.
-// 'menu.register' => 'Register',
+'menu.register' => 'Registrieren',
 'menu.profile' => 'Profil',
 'menu.group' => 'Gruppe',
 'menu.plugins' => 'Erweiterungen',
 'menu.time' => 'Zeiten',
-// TODO: translate the following.
-// 'menu.puncher' => 'Punch',
+'menu.puncher' => 'Stempeluhr',
 'menu.week' => 'Woche',
 'menu.expenses' => 'Kosten',
 'menu.reports' => 'Berichte',
-// TODO: translate the following.
-// 'menu.timesheets' => 'Timesheets',
+'menu.timesheets' => 'Arbeitszeittabellen',
 'menu.charts' => 'Diagramme',
 'menu.projects' => 'Projekte',
 'menu.tasks' => 'Aufgaben',
@@ -52,8 +49,7 @@
 'error.access_denied' => 'Zugriff verweigert.',
 'error.sys' => 'Systemfehler.',
 'error.db' => 'Datenbankfehler.',
-// TODO: translate the following.
-// 'error.registered_recently' => 'Registered recently.',
+'error.registered_recently' => 'Kürzlich registriert.',
 'error.feature_disabled' => 'Funktion ist deaktiviert.',
 'error.field' => 'Ungültige "{0}" Daten.',
 'error.empty' => 'Feld "{0}" ist leer.',
@@ -65,40 +61,34 @@
 'error.report' => 'Bericht auswählen.',
 'error.record' => 'Eintrag auswählen.',
 'error.auth' => 'Benutzername oder Passwort ungültig.',
-// TODO: translate the following.
-// 'error.2fa_code' => 'Invalid 2FA code.',
-// 'error.weak_password' => 'Weak password.',
+'error.2fa_code' => 'Ungültiger 2FA-Code.',
+'error.weak_password' => 'Schwaches Passwort.',
 'error.user_exists' => 'Benutzer mit diesem Konto ist bereits vorhanden.',
 'error.object_exists' => 'Objekt mit diesem Namen ist bereits vorhanden.',
 'error.invoice_exists' => 'Rechnung mit dieser Nummer existiert bereits.',
 'error.role_exists' => 'Rolle mit diesem Rang existiert bereits.',
 'error.no_invoiceable_items' => 'Keine Einträge zur Rechnungsstellung gefunden.',
-// TODO: translate the following.
-// 'error.no_records' => 'There are no records.',
+'error.no_records' => 'Es gibt keine Einträge.',
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
 'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Gruppe erzeugen.',
 'error.upload' => 'Fehler beim hochladen einer Datei.',
 'error.range_locked' => 'Zeitinterval ist gesperrt.',
-'error.mail_send' => 'Fehler beim versenden einer E-Mail.',
-// TODO: improve the translation above by adding MAIL_SMTP_DEBUG part.
-// 'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
+'error.mail_send' => 'Fehler beim versenden einer E-Mail. Verwenden Sie MAIL_SMTP_DEBUG für die Diagnose.',
 'error.no_email' => 'Dieser Benutzer besitzt keine e-Mail Adresse.',
 'error.uncompleted_exists' => 'Unvollständiger Eintrag bereits vorhanden. Schließen oder Löschen.',
 'error.goto_uncompleted' => 'Zum unvollständigen Eintrag gehen.',
 'error.overlap' => 'Der Zeitinterval überschneidet sich mit vorhandenen Einträgen.',
 'error.future_date' => 'Datum ist in der Zukunft.',
-// TODO: translate the following.
-// '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.',
-// 'error.expired' => 'Expiration date reached.',
-// 'error.file_storage' => 'File storage server error.', // See comment in English file.
+'error.xml' => 'Fehler in der XML-Datei in der Zeile %d: %s.',
+'error.cannot_import' => 'Kann nicht importiert werden: %s.',
+'error.format' => 'Ungültiges Dateiformat.',
+'error.user_count' => 'Begrenzung der Benutzeranzahl erreicht.',
+'error.expired' => 'Ablaufdatum erreicht.',
+'error.file_storage' => 'Dateispeicherserver-Fehler.',
 
 // Warning messages.
 'warn.sure' => 'Sind Sie sicher?',
-// TODO: translate the following.
-// 'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
+'warn.confirm_save' => 'Das Datum hat sich geändert. Bestätigen Sie das Speichern, nicht das Kopieren dieses Elements.',
 
 // Success messages.
 'msg.success' => 'Operation vollständig abgeschlossen.',
@@ -120,19 +110,14 @@
 'button.export' => 'Gruppe exportieren',
 'button.import' => 'Gruppe importieren',
 'button.close' => 'Schließen',
-// TODO: translate the following.
-// 'button.start' => 'Start',
+'button.start' => 'Start',
 'button.stop' => 'Stop',
-// TODO: translate the following.
-// (PR#81 suggested 'Freigeben / Genehmigen' for 'Approve' and 'Freigabe zurücknehmen' for 'Disapprove'.
-// The problem is they do not appear precise, deviate from the meaning of approval / disaproval of report items.)
-// 'button.approve' => 'Approve', (suggested 'Freigeben / Genehmigen' does not appear precise)
-// 'button.disapprove' => 'Disapprove',
-// 'button.sync' => 'Sync', // Used in Android app. The meaning is to synchronize offline time records with server.
+'button.approve' => 'Annehmen',
+'button.disapprove' => 'Ablehnen',
+'button.sync' => 'Sync',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
-// TODO: translate the following.
-// 'label.menu' => 'Menu',
+'label.menu' => 'Menü',
 'label.group_name' => 'Gruppenname',
 'label.address' => 'Adresse',
 'label.currency' => 'Währung',
@@ -152,9 +137,8 @@
 'label.end_date' => 'Enddatum',
 'label.user' => 'Benutzer',
 'label.users' => 'Personen',
-// TODO: translate the following.
-// 'label.group' => 'Group',
-// 'label.subgroups' => 'Subgroups',
+'label.group' => 'Gruppe',
+'label.subgroups' => 'Untergruppen',
 'label.roles' => 'Rollen',
 'label.client' => 'Kunde',
 'label.clients' => 'Kunden',
@@ -185,8 +169,7 @@
 'label.select_none' => 'Alle abwählen',
 'label.day_view' => 'Tagesansicht',
 'label.week_view' => 'Wochenansicht',
-// TODO: translate the following:
-// 'label.puncher' => 'Puncher',
+'label.puncher' => 'Stempeluhr',
 'label.id' => 'ID',
 'label.language' => 'Sprache',
 'label.decimal_mark' => 'Dezimaltrennzeichen',
@@ -213,8 +196,7 @@
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Benutzerfelder',
 'label.monthly_quotas' => 'Monatliche Quoten',
-// TODO: translate the following.
-// 'label.entity' => 'Entity',
+'label.entity' => 'Einheit',
 'label.type' => 'Typ',
 'label.type_dropdown' => 'Ausklappen',
 'label.type_text' => 'Text',
@@ -229,33 +211,30 @@
 'label.mark_paid' => 'Als bezahlt setzen',
 'label.week_note' => 'Wochennotiz',
 'label.week_list' => 'Wochenliste',
-// TODO: translate the following:
-// 'label.weekends' => 'Weekends',
+'label.weekends' => 'Wochenenden',
 'label.work_units' => 'Arbeitseinheiten',
 'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
 'label.quota' => 'Quote',
-// TODO: translate the following.
-// 'label.timesheet' => 'Timesheet',
-// 'label.submitted' => 'Submitted',
-// 'label.approved' => 'Approved',
-// 'label.approval' => 'Report approval',
-// 'label.mark_approved' => 'Mark approved',
-// 'label.template' => 'Template',
-// 'label.bind_templates_with_projects' => 'Bind templates with projects',
-// 'label.prepopulate_note' => 'Prepopulate Note field',
-// 'label.attachments' => 'Attachments',
-// 'label.files' => 'Files',
-// 'label.file' => 'File',
+'label.timesheet' => 'Arbeitszeittabelle',
+'label.submitted' => 'Eingereicht',
+'label.approved' => 'Genehmigt',
+'label.approval' => 'Genehmigung des Berichts',
+'label.mark_approved' => 'Als genehmigt markieren',
+'label.template' => 'Vorlage',
+'label.bind_templates_with_projects' => 'Vorlagen mit Projekten verbinden',
+'label.prepopulate_note' => 'Notizfeld vorab ausfüllen',
+'label.attachments' => 'Anhänge',
+'label.files' => 'Dateien',
+'label.file' => 'Datei',
 'label.active_users' => 'Aktive Nutzer',
 'label.inactive_users' => 'Inaktive Nutzer',
 
 // Entity names. We use lower case (in English) because they are used in dropdowns, too.
 // They are used to associate a custom field with an entity type.
-// TODO: translate the following.
-// 'entity.time' => 'time',
-// 'entity.user' => 'user',
-// 'entity.project' => 'project',
+'entity.time' => 'Zeit',
+'entity.user' => 'Benutzer',
+'entity.project' => 'Projekt',
 
 // Form titles.
 'title.error' => 'Fehler',
diff --git a/initialize.php b/initialize.php
index 5a0189f28..e71ea88f8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.5.5762");
+define("APP_VERSION", "1.22.5.5763");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 9acc6b2db4c3739bd89632bc1d36216099799931 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 29 Dec 2022 21:44:28 +0000
Subject: [PATCH 1791/1848] Continued to improve German translation.

---
 WEB-INF/resources/de.lang.php | 78 +++++++++++++++--------------------
 initialize.php                |  2 +-
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8f0aae4c2..d0bbf01b9 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -240,8 +240,7 @@
 'title.error' => 'Fehler',
 'title.success' => 'Erfol',
 'title.login' => 'Anmelden',
-// TODO: translate the follolwing.
-// 'title.2fa' => 'Two Factor Authentication',
+'title.2fa' => 'Zwei-Faktor-Authentifizierung',
 'title.groups' => 'Gruppen',
 'title.add_group' => 'Gruppe anlegen',
 'title.edit_group' => 'Gruppe bearbeiten',
@@ -251,9 +250,8 @@
 'title.time' => 'Zeiten',
 'title.edit_time_record' => 'Bearbeiten des Stundeneintrags',
 'title.delete_time_record' => 'Eintrag löschen',
-// TODO: Translate the following.
-// 'title.time_files' => 'Time Record Files',
-// 'title.puncher' => 'Puncher',
+'title.time_files' => 'Zeiterfassungsdateien',
+'title.puncher' => 'Stempeluhr',
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Kostenposition ändern',
 'title.delete_expense' => 'Kostenposition löschen',
@@ -262,10 +260,9 @@
 'title.reports' => 'Berichte',
 'title.report' => 'Bericht',
 'title.send_report' => 'Bericht senden',
-// TODO: Translate the following.
-// 'title.timesheets' => 'Timesheets',
-// 'title.timesheet' => 'Timesheet',
-// 'title.timesheet_files' => 'Timesheet Files',
+'title.timesheets' => 'Arbeitszeittabellen',
+'title.timesheet' => 'Arbeitszeittabelle',
+'title.timesheet_files' => 'Arbeitszeittabellendateien',
 'title.invoice' => 'Rechnung',
 'title.send_invoice' => 'Rechnung senden',
 'title.charts' => 'Diagramme',
@@ -298,10 +295,9 @@
 'title.add_notification' => 'Benachrichtigung hinzufügen',
 'title.edit_notification' => 'Benachrichtigung bearbeiten',
 'title.delete_notification' => 'Benachrichtigung löschen',
-// TODO: translate the following.
-// 'title.add_timesheet' => 'Adding Timesheet',
-// 'title.edit_timesheet' => 'Editing Timesheet',
-// 'title.delete_timesheet' => 'Deleting Timesheet',
+'title.add_timesheet' => 'Arbeitszeittabelle hinzufügen',
+'title.edit_timesheet' => 'Arbeitszeittabelle bearbeiten',
+'title.delete_timesheet' => 'Arbeitszeittabelle löschen',
 'title.monthly_quotas' => 'Monatliche Quoten',
 'title.export' => 'Daten exportieren',
 'title.import' => 'Daten importieren',
@@ -321,14 +317,13 @@
 'title.week_view' => 'Wochenansicht',
 'title.swap_roles' => 'Tausche Rollen',
 'title.work_units' => 'Arbeitseinheiten',
-// TODO: translate the following.
-// 'title.templates' => 'Templates',
-// 'title.add_template' => 'Adding Template',
-// 'title.edit_template' => 'Editing Template',
-// 'title.delete_template' => 'Deleting Template',
-// 'title.edit_file' => 'Editing File',
-// 'title.delete_file' => 'Deleting File',
-// 'title.download_file' => 'Downloading File',
+'title.templates' => 'Vorlagen',
+'title.add_template' => 'Vorlage hinzufügen',
+'title.edit_template' => 'Vorlage bearbeiten',
+'title.delete_template' => 'Vorlage löschen',
+'title.edit_file' => 'Datei bearbeiten',
+'title.delete_file' => 'Datei löschen',
+'title.download_file' => 'Datei herunterladen',
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -352,20 +347,17 @@
 'dropdown.clients' => 'Kunden',
 'dropdown.select' => '--- auswählen ---',
 'dropdown.select_invoice' => '--- Rechnung auswählen ---',
-// TODO: translate the following.
-// 'dropdown.select_timesheet' => '--- select timesheet ---',
+'dropdown.select_timesheet' => '--- Arbeitszeittabelle auswählen ---',
 'dropdown.status_active' => 'aktiv',
 'dropdown.status_inactive' => 'inaktiv',
 'dropdown.delete' => 'löschen',
 'dropdown.do_not_delete' => 'nicht löschen',
-// TODO: translate the following.
-// 'dropdown.approved' => 'approved',
-// 'dropdown.not_approved' => 'not approved',
+'dropdown.approved' => 'genehmigt',
+'dropdown.not_approved' => 'abgelehnt',
 'dropdown.paid' => 'bezahlt',
 'dropdown.not_paid' => 'nicht bezahlt',
-// TODO: translate the following.
-// 'dropdown.ascending' => 'ascending',
-// 'dropdown.descending' => 'descending',
+'dropdown.ascending' => 'aufsteigend',
+'dropdown.descending' => 'absteigend',
 
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
@@ -377,14 +369,12 @@
 'form.login.about' => 'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> ist ein Open-Source Zeiterfassungssystem.',
 
 // Email subject and body for two-factor authentication.
-// TODO: translate the following.
-// 'email.2fa_code.subject' => 'Anuko Time Tracker two-factor authentication code',
-// 'email.2fa_code.body' => "Dear User,\n\nYour two-factor authentication code is:\n\n%s\n\n",
+'email.2fa_code.subject' => 'Anuko Time Tracker Zwei-Faktor-Authentifizierungscode',
+'email.2fa_code.body' => "Sehr geehrter Benutzer,\n\nIhr Zwei-Faktor-Authentifizierungscode lautet:\n\n%s\n\n",
 
 // Two-factor authentication form. See example at https://timetracker.anuko.com/2fa.php.
-// TODO: translate the following.
-// 'form.2fa.hint' => 'Check your email for 2FA code and enter it here.',
-// 'form.2fa.2fa_code' => '2FA code',
+'form.2fa.hint' => 'Überprüfen Sie Ihre E-Mails auf den 2FA-Code und geben Sie ihn hier ein.',
+'form.2fa.2fa_code' => '2FA-Code',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Anfrage zur Zurücksetzung des Passwortes wurde per E-mail gesendet.',
@@ -416,19 +406,17 @@
 'form.reports.include_not_billable' => 'nicht in Rechnung stellen',
 'form.reports.include_invoiced' => 'berechnet',
 'form.reports.include_not_invoiced' => 'nicht berechnet',
-// TODO: translate the following.
-// 'form.reports.include_assigned' => 'assigned',
-// 'form.reports.include_not_assigned' => 'not assigned',
-// 'form.reports.include_pending' => 'pending',
+'form.reports.include_pending' => 'Ausstehend',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
-// TODO: translate the following.
-// 'form.reports.note_containing' => 'Note containing',
+// TODO: review form.reports.note_containing translation for accuracy.
+// This is basically a string filter in user notes, see https://www.anuko.com/time-tracker/what-is/note-containing.htm
+'form.reports.note_containing' => 'Enthält Notitz', // The concern is that it may be translated as "Containing a note", which is different
+                                                    // from "Note containing a substring in this field."
 'form.reports.show_fields' => 'Felder anzeigen',
-// TODO: translate the following.
-// 'form.reports.time_fields' => 'Time fields',
-// 'form.reports.user_fields' => 'User fields',
-// 'form.reports.project_fields' => 'Project fields',
+'form.reports.time_fields' => 'Zeitfelder',
+'form.reports.user_fields' => 'Benutzerfelder',
+'form.reports.project_fields' => 'Projektfelder',
 'form.reports.group_by' => 'Gruppieren nach',
 'form.reports.group_by_no' => '--- keine Gruppierung ---',
 'form.reports.group_by_date' => 'Datum',
diff --git a/initialize.php b/initialize.php
index e71ea88f8..fb4b2f494 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.5.5763");
+define("APP_VERSION", "1.22.5.5764");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From eb8a5bab0ad7cf9654c40fcf005d6021f3756044 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Dec 2022 16:08:27 +0000
Subject: [PATCH 1792/1848] Work in progress on German translation. Almost
 done.

---
 WEB-INF/resources/de.lang.php | 58 ++++++++++++++++-------------------
 initialize.php                |  2 +-
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index d0bbf01b9..0217fa236 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -430,18 +430,21 @@
 'form.report.export' => 'Exportiere',
 'form.report.per_hour' => 'Stundensatz',
 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
-// TODO: translate the following.
+// TODO: REVIEW the following.
 // 'form.report.assign_to_timesheet' => 'Assign to timesheet',
+// See how this feature works: https://www.anuko.com/time-tracker/user-guide/timesheets.htm
+// Basically, we are selecting records in a report and assign them TO (include IN) one of timesheets.
+// The concern is that it is now translated as "Assign timesheet", which is different from how
+// form.report.assign_to_invoice above is translated.
+'form.report.assign_to_timesheet' => 'Arbeitszeittabelle zuweisen',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-// TODO: translate the following.
-// 'form.timesheets.active_timesheets' => 'Active Timesheets',
-// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
+'form.timesheets.active_timesheets' => 'Aktive Arbeitszeittabellen',
+'form.timesheets.inactive_timesheets' => 'Inaktive Arbeitszeittabellen',
 
 // Templates form. See example at https://timetracker.anuko.com/templates.php
-// TODO: translate the following.
-// 'form.templates.active_templates' => 'Active Templates',
-// 'form.templates.inactive_templates' => 'Inactive Templates',
+'form.templates.active_templates' => 'Aktive Vorlagen',
+'form.templates.inactive_templates' => 'Inaktive Vorlagen',
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice_view.php
 // (you can get to this form after generating an invoice).
@@ -466,8 +469,7 @@
 'form.tasks.inactive_tasks' => 'Inaktive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-// TODO: translate the following.
-// 'form.users.uncompleted_entry_today' => 'User has an uncompleted time entry today',
+'form.users.uncompleted_entry_today' => 'Der Benutzer hat heute einen nicht abgeschlossenen Zeiteintrag',
 'form.users.uncompleted_entry' => 'Nutzer hat einen unvollständigen Zeiteintrag',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
@@ -521,21 +523,18 @@
 'form.group_edit.type_all' => 'alle',
 'form.group_edit.type_start_finish' => 'Start und Ende',
 'form.group_edit.type_duration' => 'Dauer',
-'form.group_edit.punch_mode' => 'Stechuhr-Modus',
-// TODO: translate the following.
-// 'form.group_edit.one_uncompleted' => 'One uncompleted',
+'form.group_edit.punch_mode' => 'Stempeluhr-Modus',
+'form.group_edit.one_uncompleted' => 'Eine unvollendete',
 'form.group_edit.allow_overlap' => 'Erlaube Überschneidung',
 'form.group_edit.future_entries' => 'Einträge in der Zukunft',
 'form.group_edit.uncompleted_indicators' => 'Zeige unfertige Einträge',
 'form.group_edit.confirm_save' => 'Speichern bestätigen',
-// TODO: translate the following.
-// 'form.group_edit.advanced_settings' => 'Advanced settings',
+'form.group_edit.advanced_settings' => 'Erweiterte Einstellungen',
 
 // Advanced Group Settings form. See example at https://timetracker.anuko.com/group_advanced_edit.php.
 'form.group_advanced_edit.allow_ip' => 'Erlaube IP',
-// TODO: Translate the following.
-// 'form.group_advanced_edit.password_complexity' => 'Password complexity',
-// 'form.group_advanced_edit.2fa' => 'Two factor authentication',
+'form.group_advanced_edit.password_complexity' => 'Komplexität des Passworts',
+'form.group_advanced_edit.2fa' => 'Zwei-Faktor-Authentifizierung',
 
 // 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?',
@@ -569,7 +568,6 @@
 'role.client.low_case_label' => 'Kunde',
 // TODO: translate the following.
 // 'role.client.description' => 'A client can view its own data.',
-'role.client.description' => 'Ein Kunde kann zu ihm gehörende Berichte und Rechnungen ansehen.',
 'role.supervisor.label' => 'Dienstvorgesetzter',
 'role.supervisor.low_case_label' => 'Dienstvorgesetzter',
 'role.supervisor.description' => 'Eine Person mit ein paar Administrationsrechten.',
@@ -587,20 +585,18 @@
 'role.admin.description' => 'Aadminsitrator der Seite.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
-// TODO: translate the following.
-// 'form.timesheet_view.submit_subject' => 'Timesheet approval request',
-// 'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
-// 'form.timesheet_view.approve_subject' => 'Timesheet approved',
-// 'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
-// 'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
-// 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+'form.timesheet_view.submit_subject' => 'Antrag auf Genehmigung der Arbeitszeittabelle',
+'form.timesheet_view.submit_body' => "Eine neue Arbeitszeittabelle muss genehmigt werden.<p>Benutzer: %s.",
+'form.timesheet_view.approve_subject' => 'Arbeitszeittabelle genehmigt',
+'form.timesheet_view.approve_body' => "Ihre Arbeitszeittabelle %s wurde genehmigt.<p>%s",
+'form.timesheet_view.disapprove_subject' => 'Arbeitszeittabelle nicht genehmigt',
+'form.timesheet_view.disapprove_body' => "Ihre Arbeitszeittabelle %s wurde nicht genehmigt.<p>%s",
 
 // Display Options form. See example at https://timetracker.anuko.com/display_options.php.
 'form.display_options.note_on_separate_row' => 'Beschreibung in separater Zeile',
-// TODO: translate the following.
-// 'form.display_options.not_complete_days' => 'Not complete days',
-// 'form.display_options.inactive_projects' => 'Inactive projects',
-// 'form.display_options.cost_per_hour' => 'Cost per hour',
-// 'form.display_options.custom_css' => 'Custom CSS',
-// 'form.display_options.custom_translation' => 'Custom translation',
+'form.display_options.not_complete_days' => 'Nicht vollständige Tage',
+'form.display_options.inactive_projects' => 'Inaktive Projekte',
+'form.display_options.cost_per_hour' => 'Kosten pro Stunde',
+'form.display_options.custom_css' => 'Benutzerdefiniertes CSS',
+'form.display_options.custom_translation' => 'Benutzerdefinierte Übersetzung',
 );
diff --git a/initialize.php b/initialize.php
index fb4b2f494..67bd4373c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.5.5764");
+define("APP_VERSION", "1.22.5.5765");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ae138917e7a9e4bf5efcf36bd7969303a0831d19 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Dec 2022 14:48:48 +0000
Subject: [PATCH 1793/1848] Bug fixes related to using 0 as entity name.

---
 WEB-INF/lib/form/TextField.class.php | 2 +-
 WEB-INF/lib/ttAdmin.class.php        | 7 +++++--
 admin_group_delete.php               | 2 +-
 admin_group_edit.php                 | 2 +-
 cf_dropdown_option_delete.php        | 2 +-
 cf_dropdown_option_edit.php          | 2 +-
 initialize.php                       | 2 +-
 plugins/CustomFields.class.php       | 8 +++++---
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index 91f8b5c2a..bfc0e551f 100644
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -56,7 +56,7 @@ function getHtml() {
       if (!empty($this->on_change)) $html .= " onchange=\"$this->on_change\"";
     }
 
-    $html .= " value=\"".htmlspecialchars($this->getValue() ? $this->getValue() : '')."\"";
+    $html .= " value=\"".htmlspecialchars($this->getValue())."\"";
 
     if(!$this->isEnabled()) $html .= " readonly";
     $html .= ">\n";
diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 35a26afbe..00bd0ff59 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -150,6 +150,8 @@ static function updateSelf($fields) {
 
   // getGroupName obtains group name.
   static function getGroupName($group_id) {
+    $group_id = (int) $group_id; // Just in case because it is used in sql.
+
     $result = array();
     $mdb2 = getConnection();
 
@@ -158,10 +160,11 @@ static function getGroupName($group_id) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-      return $val['name'];
+      if (isset($val['name']))
+        return $val['name'];
     }
 
-    return false;
+    return null;
   }
 
   // getOrgDetails obtains group name and its top manager details.
diff --git a/admin_group_delete.php b/admin_group_delete.php
index 0cea02b32..909b2347a 100644
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -13,7 +13,7 @@
 }
 $group_id = (int)$request->getParameter('id');
 $group_name = ttAdmin::getGroupName($group_id);
-if (!($group_id && $group_name)) {
+if (!($group_id && $group_name != null)) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/admin_group_edit.php b/admin_group_edit.php
index 81588ebec..496c7b8fb 100644
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -14,7 +14,7 @@
 }
 $group_id = (int)$request->getParameter('id');
 $group_name = ttAdmin::getGroupName($group_id);
-if (!($group_id && $group_name)) {
+if (!($group_id && $group_name != null)) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index cb8c8a31a..50c685014 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -17,7 +17,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $option = CustomFields::getOptionName($cl_id);
-if ($option == null || $option === false) {
+if ($option == null) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index eee02f63c..2477b057c 100644
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -17,7 +17,7 @@
 }
 $cl_id = (int)$request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
-if (!$cl_name) {
+if ($cl_name == null) {
   header('Location: access_denied.php');
   exit();
 }
diff --git a/initialize.php b/initialize.php
index 67bd4373c..b6d48738d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.5.5765");
+define("APP_VERSION", "1.22.6.5766");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index 0e52871e2..b4839cf1b 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -221,6 +221,8 @@ static function getOptionName($id) {
         global $user;
         $mdb2 = getConnection();
 
+        $id = (int) $id; // Just in case. Better safe than sorry as it is used in sql.
+
         $group_id = $user->getGroup();
         $org_id = $user->org_id;
 
@@ -229,10 +231,10 @@ static function getOptionName($id) {
         $res = $mdb2->query($sql);
         if (!is_a($res, 'PEAR_Error')) {
             $val = $res->fetchRow();
-            $name = $val['value'];
-            return $name;
+            if (isset($val['value']))
+              return $val['value'];
         }
-        return false;
+        return null;
     }
 
     // getFields returns an array of custom fields for group.

From aa8c6961dcce1ae929f1108033871f9574bddae5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 31 Dec 2022 15:17:40 +0000
Subject: [PATCH 1794/1848] Fixes related to using 0 in fields.

---
 WEB-INF/lib/ttAdmin.class.php | 3 ++-
 admin_options.php             | 2 +-
 initialize.php                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 00bd0ff59..4a631d5e3 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -138,7 +138,8 @@ static function updateSelf($fields) {
     // Update self.
     $user_id = $user->id;
     $login_part = 'login = '.$mdb2->quote($fields['login']);
-    if ($fields['password1'])
+    $password_part = '';
+    if (isset($fields['password1']))
       $password_part = ', password = md5('.$mdb2->quote($fields['password1']).')';
     $name_part = ', name = '.$mdb2->quote($fields['name']);
     $email_part = ', email = '.$mdb2->quote($fields['email']);
diff --git a/admin_options.php b/admin_options.php
index 84a0ed3a5..aed852320 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -48,7 +48,7 @@
   // If we change login, it must be unique.
   if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
     $err->add($i18n->get('error.user_exists'));
-  if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
+  if (!$auth->isPasswordExternal() && ($cl_password1 != null || $cl_password2 != null)) {
       if (!ttValidString($cl_password1))
         $err->add($i18n->get('error.field'), $i18n->get('label.password'));
       if (!ttValidString($cl_password2))
diff --git a/initialize.php b/initialize.php
index b6d48738d..3e332ebab 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.6.5766");
+define("APP_VERSION", "1.22.6.5767");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d019c044c0e8d21ce463f680fd45f86fcf6c8014 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 1 Jan 2023 16:21:43 +0000
Subject: [PATCH 1795/1848] Disallowed adding a duplicate custom field with the
 same name and entity type.

---
 cf_custom_field_add.php        |  2 +-
 initialize.php                 |  2 +-
 plugins/CustomFields.class.php | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index c10803758..87d46bcd5 100644
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -15,7 +15,6 @@
   header('Location: feature_disabled.php');
   exit();
 }
-$fields = CustomFields::getFields();
 // End of access checks.
 
 if ($request->isPost()) {
@@ -42,6 +41,7 @@
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_field_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (CustomFields::getFieldByName($cl_field_name, $cl_entity_type) != null) $err->add($i18n->get('error.object_exists'));
 
   if ($err->no()) {
     $res = CustomFields::insertField($cl_field_name, $cl_entity_type, $cl_field_type, $cl_required);
diff --git a/initialize.php b/initialize.php
index 3e332ebab..e43e33d3e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.6.5767");
+define("APP_VERSION", "1.22.6.5768");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/CustomFields.class.php b/plugins/CustomFields.class.php
index b4839cf1b..b561af804 100644
--- a/plugins/CustomFields.class.php
+++ b/plugins/CustomFields.class.php
@@ -278,6 +278,27 @@ static function getField($id) {
         return false;
     }
 
+    // getFieldByName returns a custom field by name and its entity type.
+    static function getFieldByName($fieldName, $entityType) {
+      global $user;
+      $mdb2 = getConnection();
+
+      $entityType = (int) $entityType; // Just in case.
+      $group_id = $user->getGroup();
+      $org_id = $user->org_id;
+
+      $sql = "select label, type, required from tt_custom_fields" .
+        " where label = ". $mdb2->quote($fieldName) . " and entity_type = $entityType".
+        " and group_id = $group_id and org_id = $org_id and status is not null";
+      $res = $mdb2->query($sql);
+      if (!is_a($res, 'PEAR_Error')) {
+        $val = $res->fetchRow();
+        if (isset($val))
+          return $val;
+      }
+      return null;
+    }
+
     // getFieldIdForOption returns field id from an associated option id.
     static function getFieldIdForOption($option_id) {
         global $user;

From e0b9d2112e4b8134839e9540acb6d133bf1dce6b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Jan 2023 17:15:59 +0000
Subject: [PATCH 1796/1848] Fixed a printing problem by eliminating a 1st page
 break for large reports.

---
 default.css    | 13 +++++++++++++
 initialize.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/default.css b/default.css
index 38de0f53f..7c88fc2d6 100644
--- a/default.css
+++ b/default.css
@@ -145,6 +145,19 @@ div.page-hint {
   border-collapse: collapse;
 }
 
+/* For printing large tables that do not fit into one page, we have to change the display
+property to "block" and also use "break-before: avoid;". This eliminates a page break between
+header and large table on print previews. I could not accomplish this with inline-block
+because break-before is apparently ignored for inline elements.
+inline-block above in itself is needed for nice horizontal centering on screen. */
+@media print
+{
+  .x-scrollable-table { display: block; break-before: avoid; break-after: auto; }
+  /* Not sure if we need this, keep commented out for now.
+  .x-scrollable-table tr    { page-break-inside:avoid; page-break-after:auto; }
+  .x-scrollable-table td   { page-break-inside:avoid; page-break-after:auto; } */
+}
+
 /* th in x-scrollable-table */
 .x-scrollable-table th {
   white-space: nowrap;
diff --git a/initialize.php b/initialize.php
index e43e33d3e..c43bafddd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.6.5768");
+define("APP_VERSION", "1.22.7.5769");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 791d64428e8242a5bc4fd8af311c36ba1379d602 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 2 Jan 2023 20:57:22 +0000
Subject: [PATCH 1797/1848] A fix for invoices to allow 0 as invoice name.

---
 WEB-INF/lib/ttInvoiceHelper.class.php | 3 +--
 initialize.php                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php
index 2ac63db44..44206fa0e 100644
--- a/WEB-INF/lib/ttInvoiceHelper.class.php
+++ b/WEB-INF/lib/ttInvoiceHelper.class.php
@@ -298,8 +298,7 @@ static function createInvoice($fields) {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $name = $fields['name'];
-    if (!$name) return false;
+    $name = isset($fields['name']) ? $fields['name'] : null;
 
     $client_id = (int) $fields['client_id'];
 
diff --git a/initialize.php b/initialize.php
index c43bafddd..9f8a7a45f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.7.5769");
+define("APP_VERSION", "1.22.7.5770");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From b3f906536d4f6e8e9eb64e6b7a8c4a7db2969b06 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 5 Jan 2023 15:48:15 +0000
Subject: [PATCH 1798/1848] Some fixes for incompatible database structure.

---
 WEB-INF/lib/ttUser.class.php | 162 +++++++++++++++++++----------------
 default.css                  |   5 +-
 initialize.php               |   2 +-
 login.php                    |  12 ++-
 4 files changed, 98 insertions(+), 83 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 37591fa5f..2e86eacb9 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -62,6 +62,9 @@ class ttUser {
   var $behalfUser = null;       // A ttBehalfUser instance with on behalf user attributes.
   var $behalfGroup = null;      // A ttGroup instance with on behalf group attributes.
 
+  var $initialized = false;     // Set to true when an object is initialized.
+
+
   // Constructor.
   function __construct($login, $id = null) {
     if (!$login && !$id) {
@@ -69,86 +72,93 @@ function __construct($login, $id = null) {
       return;
     }
 
-    $mdb2 = getConnection();
-
-    $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
-      " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
-      " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.record_type,".
-      " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.custom_translation,".
-      " g.holidays, g.workday_minutes, g.custom_logo".
-      " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
-    if ($id)
-      $sql .= "u.id = $id";
-    else
-      $sql .= "u.login = ".$mdb2->quote($login);
-    $sql .= " AND u.status = 1";
+    try {
+      $mdb2 = getConnection();
+
+      $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id,".
+        " u.quota_percent, u.email, g.org_id, g.group_key, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format,".
+        " g.time_format, g.week_start, g.tracking_mode, g.project_required, g.record_type,".
+        " g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.custom_css, g.custom_translation,".
+        " g.holidays, g.workday_minutes, g.custom_logo".
+        " FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE ";
+      if ($id)
+        $sql .= "u.id = $id";
+      else
+        $sql .= "u.login = ".$mdb2->quote($login);
+      $sql .= " AND u.status = 1";
+
+      $res = $mdb2->query($sql);
+      if (is_a($res, 'PEAR_Error')) {
+        return;
+      }
 
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) {
-      return;
-    }
+      $val = $res->fetchRow();
+      if ($val['id'] > 0) {
+        $this->login = $val['login'];
+        $this->name = $val['name'];
+        $this->id = $val['id'];
+        $this->org_id = $val['org_id'];
+        $this->group_id = $val['group_id'];
+        $this->group_key = $val['group_key'];
+        if ($this->org_id == $this->group_key) $this->org_key = $val['group_key'];
+        $this->role_id = $val['role_id'];
+        $this->role_name = $val['role_name'];
+        $this->rights = explode(',', $val['rights']);
+        $this->rank = $val['rank'];
+        $this->client_id = $val['client_id'];
+        $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
+        if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
+        $this->email = $val['email'];
+        if ($val['lang']) $this->lang = $val['lang'];
+        if ($val['decimal_mark']) $this->decimal_mark = $val['decimal_mark'];
+        $this->date_format = $val['date_format'];
+        $this->time_format = $val['time_format'];
+        $this->week_start = $val['week_start'];
+        $this->tracking_mode = $val['tracking_mode'];
+        $this->project_required = $val['project_required'];
+        $this->record_type = $val['record_type'];
+        $this->bcc_email = $val['bcc_email'];
+        $this->allow_ip = $val['allow_ip'];
+        $this->password_complexity = $val['password_complexity'];
+        $this->group_name = $val['group_name'];
+        $this->currency = $val['currency'];
+        $this->plugins = $val['plugins'];
+        $this->lock_spec = $val['lock_spec'];
+        $this->holidays = $val['holidays'];
+        $this->workday_minutes = $val['workday_minutes'];
+        $this->custom_logo = $val['custom_logo'];
+
+        // TODO: refactor this.
+        $this->config = $val['config'];
+        $this->configHelper = new ttConfigHelper($val['config']);
+
+        // Set user config options.
+        $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
+        $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
+
+        $this->custom_css = $val['custom_css'];
+        $this->custom_translation = $val['custom_translation'];
+
+        // Set "on behalf" id and name (user).
+        if (isset($_SESSION['behalf_id'])) {
+          $this->behalf_id = $_SESSION['behalf_id'];
+          $this->behalf_name = $_SESSION['behalf_name'];
+
+          $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);
+        }
+        // Set "on behalf" id and name (group).
+        if (isset($_SESSION['behalf_group_id'])) {
+          $this->behalf_group_id = $_SESSION['behalf_group_id'];
+          $this->behalf_group_name = $_SESSION['behalf_group_name'];
 
-    $val = $res->fetchRow();
-    if ($val['id'] > 0) {
-      $this->login = $val['login'];
-      $this->name = $val['name'];
-      $this->id = $val['id'];
-      $this->org_id = $val['org_id'];
-      $this->group_id = $val['group_id'];
-      $this->group_key = $val['group_key'];
-      if ($this->org_id == $this->group_key) $this->org_key = $val['group_key'];
-      $this->role_id = $val['role_id'];
-      $this->role_name = $val['role_name'];
-      $this->rights = explode(',', $val['rights']);
-      $this->rank = $val['rank'];
-      $this->client_id = $val['client_id'];
-      $this->is_client = $this->client_id && !in_array('track_own_time', $this->rights);
-      if ($val['quota_percent']) $this->quota_percent = $val['quota_percent'];
-      $this->email = $val['email'];
-      if ($val['lang']) $this->lang = $val['lang'];
-      if ($val['decimal_mark']) $this->decimal_mark = $val['decimal_mark'];
-      $this->date_format = $val['date_format'];
-      $this->time_format = $val['time_format'];
-      $this->week_start = $val['week_start'];
-      $this->tracking_mode = $val['tracking_mode'];
-      $this->project_required = $val['project_required'];
-      $this->record_type = $val['record_type'];
-      $this->bcc_email = $val['bcc_email'];
-      $this->allow_ip = $val['allow_ip'];
-      $this->password_complexity = $val['password_complexity'];
-      $this->group_name = $val['group_name'];
-      $this->currency = $val['currency'];
-      $this->plugins = $val['plugins'];
-      $this->lock_spec = $val['lock_spec'];
-      $this->holidays = $val['holidays'];
-      $this->workday_minutes = $val['workday_minutes'];
-      $this->custom_logo = $val['custom_logo'];
-
-      // TODO: refactor this.
-      $this->config = $val['config'];
-      $this->configHelper = new ttConfigHelper($val['config']);
-
-      // Set user config options.
-      $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
-      $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
-
-      $this->custom_css = $val['custom_css'];
-      $this->custom_translation = $val['custom_translation'];
-
-      // Set "on behalf" id and name (user).
-      if (isset($_SESSION['behalf_id'])) {
-        $this->behalf_id = $_SESSION['behalf_id'];
-        $this->behalf_name = $_SESSION['behalf_name'];
-
-        $this->behalfUser = new ttBehalfUser($this->behalf_id, $this->org_id);
+          $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
+        }
       }
-      // Set "on behalf" id and name (group).
-      if (isset($_SESSION['behalf_group_id'])) {
-        $this->behalf_group_id = $_SESSION['behalf_group_id'];
-        $this->behalf_group_name = $_SESSION['behalf_group_name'];
 
-        $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
-      }
+      $this->initialized = true;
+    }
+    catch (Exception $e) {
+      error_log("Exception raised in ttUser constructor: ".$e->getMessage());
     }
   }
 
diff --git a/default.css b/default.css
index 7c88fc2d6..d1a77ebd8 100644
--- a/default.css
+++ b/default.css
@@ -148,8 +148,9 @@ div.page-hint {
 /* For printing large tables that do not fit into one page, we have to change the display
 property to "block" and also use "break-before: avoid;". This eliminates a page break between
 header and large table on print previews. I could not accomplish this with inline-block
-because break-before is apparently ignored for inline elements.
-inline-block above in itself is needed for nice horizontal centering on screen. */
+because break-before is apparently ignored for inline-block elements.
+inline-block above in itself is needed for nice horizontal centering on screen.
+A side effect of this is that printed tables are not horizontally centered. */
 @media print
 {
   .x-scrollable-table { display: block; break-before: avoid; break-after: auto; }
diff --git a/initialize.php b/initialize.php
index 9f8a7a45f..e2f8a2e23 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,7 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.7.5770");
+define("APP_VERSION", "1.22.8.5771");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/login.php b/login.php
index f5dd8eec1..2d9dde044 100644
--- a/login.php
+++ b/login.php
@@ -55,13 +55,17 @@
   if ($err->no() && $loginSucceeded) {
     $user = new ttUser(null, $auth->getUserId());
 
-    // Determine if we have to additionally use two-factor authentication.
-    $config = $user->getConfigHelper();
-    $use2FA = $config->getDefinedValue('2fa');
+    if ($user->initialized) {
+      // Determine if we have to additionally use two-factor authentication.
+      $config = $user->getConfigHelper();
+      $use2FA = $config->getDefinedValue('2fa');
+    } else {
+      $err->add($i18n->get('error.db'));
+    }
   }
 
   // If we have to use 2FA, email auth code to user and redirect to 2fa.php.
-  if ($use2FA && !$user->can('override_2fa')) {
+  if ($err->no() && $use2FA && !$user->can('override_2fa')) {
     // To keep things simple, we use the same code as for password resets.
     $cryptographically_strong = true;
     $random_bytes = openssl_random_pseudo_bytes(16, $cryptographically_strong);

From 94765d3b81cbbe5feb8d0a2418e3f29d06c61740 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 6 Jan 2023 16:22:10 +0000
Subject: [PATCH 1799/1848] An attempt to better support php8.1 or greater.

---
 initialize.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/initialize.php b/initialize.php
index e2f8a2e23..0ed4d1d7d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -12,7 +12,13 @@
 // Disable displaying errors on screen.
 ini_set('display_errors', 'Off');
 
-define("APP_VERSION", "1.22.8.5771");
+// Disable mysqli fatal error behaviour when using php8.1 or greater.
+// See https://php.watch/versions/8.1/mysqli-error-mode
+if (version_compare(phpversion(), '8.1', '>=')) {
+  mysqli_report(MYSQLI_REPORT_OFF);
+}
+
+define("APP_VERSION", "1.22.9.5772");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6bce8835b9b5a5c185ba44a652b9955993ff27a2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 7 Jan 2023 18:12:18 +0000
Subject: [PATCH 1800/1848] Addressed a few more php8.0 warnings.

---
 dbinstall.php  | 44 ++++++++++++++++++++++----------------------
 initialize.php |  2 +-
 time.php       |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dbinstall.php b/dbinstall.php
index c79cd558a..2db0bebca 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -201,7 +201,7 @@ function ttGenerateKeys() {
 if ($_POST) {
   print "Processing...<br>\n";
 
-  if ($_POST["crstructure"]) {
+  if (array_key_exists('crstructure', $_POST)) {
     $sqlQuery = join("\n", file("mysql.sql"));
     $sqlQuery = str_replace("TYPE=MyISAM","",$sqlQuery);
     $queries  = explode(";",$sqlQuery);
@@ -215,7 +215,7 @@ function ttGenerateKeys() {
     }
   }
 
-  if ($_POST["convert5to7"]) {
+  if (array_key_exists('convert5to7', $_POST)) {
     ttExecute("alter table `activity_log` CHANGE al_comment al_comment text");
     ttExecute("CREATE TABLE `sysconfig` (`sysc_id` int(11) unsigned NOT NULL auto_increment,`sysc_name` varchar(32) NOT NULL default '',`sysc_value` varchar(70) default NULL, PRIMARY KEY  (`sysc_id`), UNIQUE KEY `sysc_id` (`sysc_id`), UNIQUE KEY `sysc_name` (`sysc_name`))");
     ttExecute("alter table `companies` add c_locktime int(4) default -1");
@@ -229,7 +229,7 @@ function ttGenerateKeys() {
     ttExecute("alter table users drop `u_aprojects`");
   }
 
-  if ($_POST["convert7to133"]) {
+  if (array_key_exists('convert7to133', $_POST)) {
     ttExecute("ALTER TABLE users ADD COLUMN u_lang VARCHAR(20) DEFAULT NULL");
     ttExecute("ALTER TABLE users ADD COLUMN u_email VARCHAR(100) DEFAULT NULL");
     ttExecute("ALTER TABLE `activity_log` drop `al_proof`");
@@ -244,7 +244,7 @@ function ttGenerateKeys() {
 
   // The update_projects function updates p_activities field in the projects table so that we could
   // improve performance of the application by using this field instead of activity_bind table.
-  if ($_POST["update_projects"]) {
+  if (array_key_exists('update_projects', $_POST)) {
     $mdb2 = getConnection();
     // $sql = "select p_id from projects where p_status = 1 and p_activities is NULL";
     $sql = "select p_id from projects where p_status = 1";
@@ -281,15 +281,15 @@ function ttGenerateKeys() {
     }
   }
 
-  if ($_POST["convert133to1340"]) {
+  if (array_key_exists('convert133to1340', $_POST)) {
     ttExecute("ALTER TABLE companies ADD COLUMN c_show_pie smallint(2) DEFAULT 1");
     ttExecute("ALTER TABLE companies ADD COLUMN c_pie_mode smallint(2) DEFAULT 1");
     ttExecute("ALTER TABLE companies ADD COLUMN c_lang varchar(20) default NULL");
   }
 
   // The update_companies function sets up c_show_pie, c_pie_mode, and c_lang
-  // fields in the companies table from the corresponding manager fields. 
-  if ($_POST["update_companies"]) {
+  // fields in the companies table from the corresponding manager fields.
+  if (array_key_exists('update_companies', $_POST)) {
     $mdb2 = getConnection();
     // Get all active managers.
     $sql = "select u_company_id, u_show_pie, u_pie_mode, u_lang from users
@@ -316,7 +316,7 @@ function ttGenerateKeys() {
     }
   }
 
-  if ($_POST["convert1340to1485"]) {
+  if (array_key_exists('convert1340to1485', $_POST)) {
     ttExecute("ALTER TABLE users DROP u_show_pie");
     ttExecute("ALTER TABLE users DROP u_pie_mode");
     ttExecute("ALTER TABLE users DROP u_lang");
@@ -421,7 +421,7 @@ function ttGenerateKeys() {
   }
 
   // The update_to_team_id function sets team_id field projects, activities, and clients tables.
-  if ($_POST["update_to_team_id"]) {
+  if (array_key_exists('update_to_team_id', $_POST)) {
     $mdb2 = getConnection();
 
     // Update projects.
@@ -518,7 +518,7 @@ function ttGenerateKeys() {
     print "Updated $clients_updated clients...<br>\n";
   }
 
-  if ($_POST["convert1485to1579"]) {
+  if (array_key_exists('convert1485to1579', $_POST)) {
     ttExecute("ALTER TABLE tt_fav_reports MODIFY id int(11) NOT NULL auto_increment");
     ttExecute("RENAME TABLE clients TO tt_clients");
     ttExecute("ALTER TABLE tt_clients CHANGE clnt_id id int(11) NOT NULL AUTO_INCREMENT");
@@ -625,7 +625,7 @@ function ttGenerateKeys() {
     ttExecute("create index invoice_idx on tt_log(invoice_id)");
   }
 
-  if ($_POST["convert1579to1600"]) {
+  if (array_key_exists('convert1579to1600', $_POST)) {
     ttExecute("ALTER TABLE tt_invoices ADD COLUMN date date NOT NULL");
     ttExecute("ALTER TABLE tt_teams ADD COLUMN custom_logo tinyint(4) default '0'");
     ttExecute("ALTER TABLE tt_tasks ADD COLUMN description varchar(255) default NULL");
@@ -643,7 +643,7 @@ function ttGenerateKeys() {
   }
 
   // The update_clients function updates projects field in tt_clients table.
-  if ($_POST["update_clients"]) {
+  if (array_key_exists('update_clients', $_POST)) {
     $mdb2 = getConnection();
     $sql = "select id from tt_clients where status = 1 or status = 0";
     $res = $mdb2->query($sql);
@@ -682,7 +682,7 @@ function ttGenerateKeys() {
   }
 
   // The update_custom_fields function updates option_id field in tt_custom_field_log table.
-  if ($_POST['update_custom_fields']) {
+  if (array_key_exists('update_custom_fields', $_POST)) {
     $mdb2 = getConnection();
     $sql = "update tt_custom_field_log set option_id = value where option_id is null and value is not null and field_id in (select id from tt_custom_fields where type = 2)";
     $affected = $mdb2->exec($sql);
@@ -693,7 +693,7 @@ function ttGenerateKeys() {
   }
 
   // The update_tracking_mode function sets the tracking_mode field in tt_teams table to 2 (== MODE_PROJECTS_AND_TASKS).
-  if ($_POST['update_tracking_mode']) {
+  if (array_key_exists('update_tracking_mode', $_POST)) {
     $mdb2 = getConnection();
     $sql = "update tt_teams set tracking_mode = 2 where tracking_mode = 0";
     $affected = $mdb2->exec($sql);
@@ -703,7 +703,7 @@ function ttGenerateKeys() {
     print "Updated $affected teams...<br>\n";
   }
 
-  if ($_POST["convert1600to11400"]) {
+  if (array_key_exists('convert1600to11400', $_POST)) {
     ttExecute("DROP TABLE IF EXISTS tt_invoice_headers");
     ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
     ttExecute("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");
@@ -751,7 +751,7 @@ function ttGenerateKeys() {
     ttExecute("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
   }
 
-  if ($_POST["convert11400to11744"]) {
+  if (array_key_exists('convert11400to11744', $_POST)) {
     ttExecute("ALTER TABLE `tt_teams` DROP `address`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
@@ -794,7 +794,7 @@ function ttGenerateKeys() {
   }
 
   // The update_role_id function assigns a role_id to users, who don't have it.
-  if ($_POST['update_role_id']) {
+  if (array_key_exists('update_role_id', $_POST)) {
     import('I18n');
 
     $mdb2 = getConnection();
@@ -833,7 +833,7 @@ function ttGenerateKeys() {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11797"]) {
+  if (array_key_exists('convert11744to11797', $_POST)) {
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     ttExecute("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and `rank` = 512) where role = 324");
@@ -938,7 +938,7 @@ function ttGenerateKeys() {
   }
 
   // The update_group_id function updates group_id field in tt_log and tt_expense_items tables.
-  if ($_POST["update_group_id"]) {
+  if (array_key_exists('update_group_id', $_POST)) {
     $mdb2 = getConnection();
 
     $sql = "(select distinct user_id from tt_log where group_id is null) union distinct (select distinct user_id from tt_expense_items where group_id is null)";
@@ -984,7 +984,7 @@ function ttGenerateKeys() {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11900"]) {
+  if (array_key_exists('convert11797to11900', $_POST)) {
     ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1151,7 +1151,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'");
   }
 
-  if ($_POST["convert11900to12203"]) {
+  if (array_key_exists('convert11900to12203', $_POST)) {
     ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))");
     ttExecute("create unique index currency_idx on tt_work_currencies(`name`)");
     ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')");
@@ -1203,7 +1203,7 @@ function ttGenerateKeys() {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.22.3', modified = now() where param_name = 'version_db' and param_value = '1.21.7'");
   }
 
-  if ($_POST["cleanup"]) {
+  if (array_key_exists('cleanup', $_POST)) {
     $mdb2 = getConnection();
     $inactive_orgs = ttOrgHelper::getInactiveOrgs();
 
diff --git a/initialize.php b/initialize.php
index 0ed4d1d7d..705d2db19 100644
--- a/initialize.php
+++ b/initialize.php
@@ -18,7 +18,7 @@
   mysqli_report(MYSQLI_REPORT_OFF);
 }
 
-define("APP_VERSION", "1.22.9.5772");
+define("APP_VERSION", "1.22.9.5773");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 766ee5fd1..931436fae 100644
--- a/time.php
+++ b/time.php
@@ -386,7 +386,7 @@
     if ($showTask && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
-    if (strlen($cl_duration) == 0) {
+    if ($cl_duration == null || strlen($cl_duration) == 0) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
           $err->add($i18n->get('error.field'), $i18n->get('label.start'));

From 0ade9c1b7310e67ac38ee9426f27253a703a32a0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Jan 2023 15:24:49 +0000
Subject: [PATCH 1801/1848] Improved handling of a situation when mysqli_report
 function is not available.

---
 initialize.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 705d2db19..3c8191921 100644
--- a/initialize.php
+++ b/initialize.php
@@ -15,10 +15,13 @@
 // Disable mysqli fatal error behaviour when using php8.1 or greater.
 // See https://php.watch/versions/8.1/mysqli-error-mode
 if (version_compare(phpversion(), '8.1', '>=')) {
-  mysqli_report(MYSQLI_REPORT_OFF);
+  if (function_exists('mysqli_report'))
+    mysqli_report(MYSQLI_REPORT_OFF);
+  else
+    die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.9.5773");
+define("APP_VERSION", "1.22.9.5774");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 88c0ea1884e59e7f1275cff94ca888962750a1e8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Jan 2023 20:23:12 +0000
Subject: [PATCH 1802/1848] Updated smarty for better compatibility with
 php8.1.

---
 WEB-INF/lib/smarty/Autoloader.php             |  9 +-
 WEB-INF/lib/smarty/Smarty.class.php           | 35 ++++----
 WEB-INF/lib/smarty/bootstrap.php              |  2 +-
 WEB-INF/lib/smarty/debug.tpl                  | 53 +++++++-----
 WEB-INF/lib/smarty/functions.php              | 51 +++++++++++
 .../plugins/function.html_select_date.php     | 73 ++++++++--------
 .../lib/smarty/plugins/function.mailto.php    | 28 ++++---
 WEB-INF/lib/smarty/plugins/function.math.php  |  4 +-
 .../smarty/plugins/modifier.capitalize.php    |  2 +
 WEB-INF/lib/smarty/plugins/modifier.count.php | 36 ++++++++
 .../smarty/plugins/modifier.date_format.php   |  3 +-
 .../lib/smarty/plugins/modifier.escape.php    | 84 ++-----------------
 .../lib/smarty/plugins/modifier.explode.php   | 25 ++++++
 .../smarty/plugins/modifier.number_format.php | 26 ++++++
 .../lib/smarty/plugins/modifier.truncate.php  |  6 +-
 .../plugins/modifiercompiler.escape.php       | 49 +++--------
 .../smarty/plugins/modifiercompiler.nl2br.php | 23 +++++
 .../smarty/plugins/modifiercompiler.round.php | 23 +++++
 .../plugins/modifiercompiler.str_repeat.php   | 23 +++++
 .../plugins/modifiercompiler.strip_tags.php   |  4 +-
 .../plugins/modifiercompiler.strlen.php       | 23 +++++
 .../plugins/modifiercompiler.unescape.php     | 26 ++++--
 .../smarty/plugins/modifiercompiler.upper.php |  4 +-
 .../smarty/plugins/shared.mb_str_replace.php  | 36 +++++++-
 WEB-INF/lib/smarty/readme                     |  7 --
 .../sysplugins/smarty_cacheresource.php       |  4 +-
 .../smarty_cacheresource_keyvaluestore.php    |  4 +-
 .../smarty_internal_cacheresource_file.php    |  2 +-
 .../smarty_internal_compile_block.php         |  4 +-
 .../smarty_internal_compile_function.php      |  8 +-
 .../smarty_internal_compile_include.php       |  4 +-
 .../smarty_internal_compile_insert.php        |  2 +-
 ...nternal_compile_private_foreachsection.php |  6 +-
 ...arty_internal_compile_private_modifier.php |  3 +
 ...ernal_compile_private_print_expression.php |  2 +-
 ...ernal_compile_private_special_variable.php |  6 +-
 .../smarty_internal_config_file_compiler.php  | 10 ++-
 .../sysplugins/smarty_internal_debug.php      |  4 +-
 .../smarty_internal_extension_handler.php     | 28 +++----
 .../smarty_internal_method_loadplugin.php     |  4 +-
 .../smarty_internal_method_mustcompile.php    |  2 +-
 .../smarty_internal_runtime_codeframe.php     |  9 +-
 .../smarty_internal_runtime_make_nocache.php  |  2 +-
 .../smarty_internal_runtime_writefile.php     | 15 +---
 .../sysplugins/smarty_internal_template.php   |  5 +-
 .../smarty_internal_templatebase.php          |  2 +-
 .../smarty_internal_templatecompilerbase.php  | 19 +++--
 .../smarty_internal_testinstall.php           |  2 +-
 .../lib/smarty/sysplugins/smarty_resource.php |  4 +-
 .../sysplugins/smarty_resource_custom.php     | 15 +++-
 .../lib/smarty/sysplugins/smarty_security.php | 34 +-------
 .../lib/smarty/sysplugins/smarty_variable.php |  1 +
 .../sysplugins/smartycompilerexception.php    | 28 +++++++
 dbinstall.php                                 | 21 +++--
 initialize.php                                |  2 +-
 55 files changed, 563 insertions(+), 344 deletions(-)
 create mode 100644 WEB-INF/lib/smarty/functions.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifier.count.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifier.explode.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifier.number_format.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.round.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.str_repeat.php
 create mode 100644 WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php
 delete mode 100644 WEB-INF/lib/smarty/readme

diff --git a/WEB-INF/lib/smarty/Autoloader.php b/WEB-INF/lib/smarty/Autoloader.php
index 1673ce2ff..da7e32abf 100644
--- a/WEB-INF/lib/smarty/Autoloader.php
+++ b/WEB-INF/lib/smarty/Autoloader.php
@@ -5,6 +5,11 @@
  * @package Smarty
  */
 
+
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+	include __DIR__ . '/functions.php';
+}
+
 /**
  * Smarty Autoloader
  *
@@ -73,7 +78,7 @@ public static function registerBC($prepend = false)
      */
     public static function register($prepend = false)
     {
-        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : __DIR__ . DIRECTORY_SEPARATOR;
         self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
             self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
         spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
@@ -89,7 +94,7 @@ public static function autoload($class)
         if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
             return;
         }
-        $_class = strtolower($class);
+        $_class = smarty_strtolower_ascii($class);
         if (isset(self::$rootClasses[ $_class ])) {
             $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
             if (is_file($file)) {
diff --git a/WEB-INF/lib/smarty/Smarty.class.php b/WEB-INF/lib/smarty/Smarty.class.php
index 85a3d9a6e..5d2e3a4b4 100644
--- a/WEB-INF/lib/smarty/Smarty.class.php
+++ b/WEB-INF/lib/smarty/Smarty.class.php
@@ -36,7 +36,7 @@
     /**
      *
      */
-    define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+    define('SMARTY_DIR', __DIR__ . DIRECTORY_SEPARATOR);
 }
 /**
  * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
@@ -61,23 +61,20 @@
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 
-// Note: Nik put this back in from smarty3 for php5.4 that we still support.
-// See also comment around Smarty::$_CHARSET.
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+/**
+ * Load helper functions
+ */
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+    include __DIR__ . '/functions.php';
 }
-// End of inserted fragment by Nik.
 
 /**
  * Load Smarty_Autoloader
  */
 if (!class_exists('Smarty_Autoloader')) {
-    include dirname(__FILE__) . '/bootstrap.php';
+    include __DIR__ . '/bootstrap.php';
 }
+
 /**
  * Load always needed external class files
  */
@@ -110,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.1.0';
+    const SMARTY_VERSION = '4.3.0';
     /**
      * define variable scopes
      */
@@ -172,9 +169,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
-    // public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
-    // Note by Nik: the above assignment only works with php >= 5.6, rolling back to SMARTY_RESOURCE_CHAR_SET as in smarty3.
-    public static $_CHARSET =  SMARTY_RESOURCE_CHAR_SET;
+    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
 
     /**
      * The date format to be used internally
@@ -881,7 +876,7 @@ public function getPluginsDir()
                 $this->plugins_dir = (array)$this->plugins_dir;
             }
             foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, '/\\') . DIRECTORY_SEPARATOR, true);
+                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
             }
             $this->_cache[ 'plugin_files' ] = array();
             $this->_pluginsDirNormalized = true;
@@ -1359,7 +1354,7 @@ public function __set($name, $value)
      */
     private function _normalizeDir($dirName, $dir)
     {
-        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+        $this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
     }
 
     /**
@@ -1381,7 +1376,7 @@ private function _normalizeTemplateConfig($isConfig)
         }
         foreach ($dir as $k => $v) {
             if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+                $dir[ $k ] = $v = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
                 $processed[ $k ] = true;
             }
         }
@@ -1396,7 +1391,7 @@ private function _normalizeTemplateConfig($isConfig)
      *
      * @void
      */
-    public function muteUndefinedOrNullWarnings() {
+    public function muteUndefinedOrNullWarnings(): void {
         $this->isMutingUndefinedOrNullWarnings = true;
     }
 
@@ -1404,7 +1399,7 @@ public function muteUndefinedOrNullWarnings() {
      * Indicates if PHP7 compatibility mode is set.
      * @bool
      */
-    public function isMutingUndefinedOrNullWarnings() {
+    public function isMutingUndefinedOrNullWarnings(): bool {
         return $this->isMutingUndefinedOrNullWarnings;
     }
 
diff --git a/WEB-INF/lib/smarty/bootstrap.php b/WEB-INF/lib/smarty/bootstrap.php
index 2c830468e..a226ac04e 100644
--- a/WEB-INF/lib/smarty/bootstrap.php
+++ b/WEB-INF/lib/smarty/bootstrap.php
@@ -11,6 +11,6 @@
  * Load and register Smarty Autoloader
  */
 if (!class_exists('Smarty_Autoloader')) {
-    include dirname(__FILE__) . '/Autoloader.php';
+    include __DIR__ . '/Autoloader.php';
 }
 Smarty_Autoloader::register(true);
diff --git a/WEB-INF/lib/smarty/debug.tpl b/WEB-INF/lib/smarty/debug.tpl
index edc7bef98..4f82a5820 100644
--- a/WEB-INF/lib/smarty/debug.tpl
+++ b/WEB-INF/lib/smarty/debug.tpl
@@ -1,9 +1,9 @@
 {capture name='_smarty_debug' assign=debug_output}
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <!DOCTYPE html>
+    <html lang="en">
     <head>
         <title>Smarty Debug Console</title>
-        <style type="text/css">
+        <style>
             {literal}
             body, h1, h2, h3, td, th, p {
                 font-family: sans-serif;
@@ -31,6 +31,7 @@
                 padding: 2px;
                 border-top: 1px solid black;
             }
+
             h3 {
                 text-align: left;
                 font-weight: bold;
@@ -67,11 +68,11 @@
                 color: green;
             }
 
-            .odd {
+            tr:nth-child(odd) {
                 background-color: #eeeeee;
             }
 
-            .even {
+            tr:nth-child(even) {
                 background-color: #fafafa;
             }
 
@@ -84,13 +85,16 @@
                 color: black;
                 font-weight: bold;
             }
+
             #blue h3 {
                 color: blue;
             }
+
             #normal div {
                 color: black;
                 font-weight: normal;
             }
+
             #table_assigned_vars th {
                 color: blue;
                 font-weight: bold;
@@ -99,7 +103,6 @@
             #table_config_vars th {
                 color: maroon;
             }
-
             {/literal}
         </style>
     </head>
@@ -112,11 +115,11 @@
         <h2>included templates &amp; config files (load time in seconds)</h2>
         <div>
             {foreach $template_data as $template}
-                <font color=brown>{$template.name}</font>
-                <br />&nbsp;&nbsp;<span class="exectime">
+                <span style="color: brown;">{$template.name}</span>
+                <br>&nbsp;&nbsp;<span class="exectime">
                 (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
                  </span>
-                <br />
+                <br>
             {/foreach}
         </div>
     {/if}
@@ -125,13 +128,22 @@
 
     <table id="table_assigned_vars">
         {foreach $assigned_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>${$vars@key}</font></h3>
-                    {if isset($vars['nocache'])}<b>Nocache</b><br />{/if}
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">${$vars@key}</h3>
+                    {if isset($vars['nocache'])}<strong>Nocache</strong><br>{/if}
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    <h3>Value</h3>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
+                </td>
+                <td>
+                    {if isset($vars['attributes'])}
+                        <h3>Attributes</h3>
+                        {$vars['attributes']|debug_print_var nofilter}
+                    {/if}
                 </td>
-                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
-                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
          {/foreach}
     </table>
 
@@ -139,11 +151,14 @@
 
     <table id="table_config_vars">
         {foreach $config_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>#{$vars@key}#</font></h3>
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">#{$vars@key}#</h3>
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
                 </td>
-                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
             </tr>
         {/foreach}
 
diff --git a/WEB-INF/lib/smarty/functions.php b/WEB-INF/lib/smarty/functions.php
new file mode 100644
index 000000000..bac00e521
--- /dev/null
+++ b/WEB-INF/lib/smarty/functions.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * Registers some helper/polyfill functions.
+ */
+
+const SMARTY_HELPER_FUNCTIONS_LOADED = true;
+
+/**
+ * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_ucfirst_ascii($string): string {
+    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
+}
+
+/**
+ * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtolower_ascii($string): string {
+    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
+}
+
+/**
+ * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtoupper_ascii($string): string {
+    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+}
\ No newline at end of file
diff --git a/WEB-INF/lib/smarty/plugins/function.html_select_date.php b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
index 763fc60f9..d9c571976 100644
--- a/WEB-INF/lib/smarty/plugins/function.html_select_date.php
+++ b/WEB-INF/lib/smarty/plugins/function.html_select_date.php
@@ -101,6 +101,7 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
     $field_separator = "\n";
     $option_separator = "\n";
     $time = null;
+
     // $all_empty = null;
     // $day_empty = null;
     // $month_empty = null;
@@ -113,17 +114,7 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
     foreach ($params as $_key => $_value) {
         switch ($_key) {
             case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $template->_checkPlugins(
-                        array(
-                            array(
-                                'function' => 'smarty_make_timestamp',
-                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                            )
-                        )
-                    );
-                    $time = smarty_make_timestamp($_value);
-                }
+                $$_key = $_value; // we'll handle conversion below
                 break;
             case 'month_names':
                 if (is_array($_value) && count($_value) === 12) {
@@ -178,43 +169,59 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
     }
     // Note: date() is faster than strftime()
     // Note: explode(date()) is faster than date() date() date()
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
+
+    if (isset($time) && is_array($time)) {
+        if (isset($time[$prefix . 'Year'])) {
             // $_REQUEST[$field_array] given
-            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                    isset($time[$prefix . $_elementName]) ? $time[$prefix . $_elementName] :
                         date($_elementKey);
             }
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
+        } elseif (isset($time[$field_array][$prefix . 'Year'])) {
             // $_REQUEST given
-            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+                $$_variableName = isset($time[$field_array][$prefix . $_elementName]) ?
+                    $time[$field_array][$prefix . $_elementName] : date($_elementKey);
             }
         } else {
             // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
         }
+    } elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
+        $_year = $_month = $_day = null;
+        if ($matches[1] > '') $_year = (int) $matches[1];
+        if ($matches[2] > '') $_month = (int) $matches[2];
+        if ($matches[3] > '') $_day = (int) $matches[3];
     } elseif ($time === null) {
         if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
+            $_year = $_month = $_day = null;
         } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
         }
     } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
+        $template->_checkPlugins(
+            array(
+                array(
+                    'function' => 'smarty_make_timestamp',
+                    'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                )
+            )
+        );
+        $time = smarty_make_timestamp($time);
+        [$_year, $_month, $_day] = explode('-', date('Y-m-d', $time));
     }
+
     // make syntax "+N" or "-N" work with $start_year and $end_year
     // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
     foreach (array(
@@ -309,8 +316,8 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
         for ($i = 1; $i <= 12; $i++) {
             $_val = sprintf('%02d', $i);
             $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+                ($month_format === '%m' ? $_val : @strftime($month_format, $_month_timestamps[ $i ]));
+            $_value = $month_value_format === '%m' ? $_val : @strftime($month_value_format, $_month_timestamps[ $i ]);
             $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
                              '>' . $_text . '</option>' . $option_separator;
         }
diff --git a/WEB-INF/lib/smarty/plugins/function.mailto.php b/WEB-INF/lib/smarty/plugins/function.mailto.php
index 834d0535a..671ac0694 100644
--- a/WEB-INF/lib/smarty/plugins/function.mailto.php
+++ b/WEB-INF/lib/smarty/plugins/function.mailto.php
@@ -48,8 +48,13 @@
  */
 function smarty_function_mailto($params)
 {
-    static $_allowed_encoding =
-        array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+    static $_allowed_encoding = [
+        'javascript' => true,
+        'javascript_charcode' => true,
+        'hex' => true,
+        'none' => true
+    ];
+
     $extra = '';
     if (empty($params[ 'address' ])) {
         trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
@@ -57,19 +62,19 @@ function smarty_function_mailto($params)
     } else {
         $address = $params[ 'address' ];
     }
+
     $text = $address;
+
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace = array('@', ',');
-    $mail_parms = array();
+    $mail_parms = [];
     foreach ($params as $var => $value) {
         switch ($var) {
             case 'cc':
             case 'bcc':
             case 'followupto':
                 if (!empty($value)) {
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+                    $mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], rawurlencode($value));
                 }
                 break;
             case 'subject':
@@ -83,6 +88,7 @@ function smarty_function_mailto($params)
             default:
         }
     }
+
     if ($mail_parms) {
         $address .= '?' . join('&', $mail_parms);
     }
@@ -94,19 +100,21 @@ function smarty_function_mailto($params)
         );
         return;
     }
+
+    $string = '<a href="mailto:' . htmlspecialchars($address, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) .
+        '" ' . $extra . '>' . htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) . '</a>';
+
     if ($encode === 'javascript') {
-	    $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
         $js_encode = '';
         for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
             $js_encode .= '%' . bin2hex($string[ $x ]);
         }
         return '<script type="text/javascript">document.write(unescape(\'' . $js_encode . '\'))</script>';
     } elseif ($encode === 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
         for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
             $ord[] = ord($string[ $x ]);
         }
-	    return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
+        return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
     } elseif ($encode === 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[ 2 ])) {
@@ -129,6 +137,6 @@ function smarty_function_mailto($params)
         return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
     } else {
         // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+        return $string;
     }
 }
diff --git a/WEB-INF/lib/smarty/plugins/function.math.php b/WEB-INF/lib/smarty/plugins/function.math.php
index fd5b3d166..f9cf67fe7 100644
--- a/WEB-INF/lib/smarty/plugins/function.math.php
+++ b/WEB-INF/lib/smarty/plugins/function.math.php
@@ -69,8 +69,8 @@ function smarty_function_math($params, $template)
     // Adapted from https://www.php.net/manual/en/function.eval.php#107377
     $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
     $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
-    $operators = '[+\/*\^%-]'; // Allowed math operators
-    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)+\)|\((?1)+\)))(?:'.$operators.'(?1))?)+$/';
+    $operators = '[,+\/*\^%-]'; // Allowed math operators
+    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/';
 
     if (!preg_match($regexp, $equation)) {
         trigger_error("math: illegal characters", E_USER_WARNING);
diff --git a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
index c5fc400a6..2903d61d7 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.capitalize.php
@@ -22,6 +22,8 @@
  */
 function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
 {
+    $string = (string) $string;
+
     if (Smarty::$_MBSTRING) {
         if ($lc_rest) {
             // uppercase (including hyphenated words)
diff --git a/WEB-INF/lib/smarty/plugins/modifier.count.php b/WEB-INF/lib/smarty/plugins/modifier.count.php
new file mode 100644
index 000000000..ca35fc115
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifier.count.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty count modifier plugin
+ * Type:     modifier
+ * Name:     count
+ * Purpose:  counts all elements in an array or in a Countable object
+ * Input:
+ *          - Countable|array: array or object to count
+ *          - mode: int defaults to 0 for normal count mode, if set to 1 counts recursive
+  *
+ * @param mixed $arrayOrObject  input array/object
+ * @param int $mode       count mode
+ *
+ * @return int
+ */
+function smarty_modifier_count($arrayOrObject, $mode = 0)
+{
+    /*
+     * @see https://www.php.net/count
+     * > Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface,
+     * > 1 would be returned, unless value was null, in which case 0 would be returned.
+     */
+
+    if ($arrayOrObject instanceof Countable || is_array($arrayOrObject)) {
+        return count($arrayOrObject, (int) $mode);
+    } elseif ($arrayOrObject === null) {
+        return 0;
+    }
+    return 1;
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.date_format.php b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
index 8e7e0b6e1..e3589fd07 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.date_format.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.date_format.php
@@ -78,7 +78,8 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
             }
             $format = str_replace($_win_from, $_win_to, $format);
         }
-        return strftime($format, $timestamp);
+        // @ to suppress deprecation errors when running in PHP8.1 or higher.
+        return @strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);
     }
diff --git a/WEB-INF/lib/smarty/plugins/modifier.escape.php b/WEB-INF/lib/smarty/plugins/modifier.escape.php
index 47489aa98..11e44682e 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.escape.php
@@ -23,95 +23,25 @@
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
-    static $_double_encode = true;
     static $is_loaded_1 = false;
     static $is_loaded_2 = false;
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
+
+    $string = (string)$string;
+
     switch ($esc_type) {
         case 'html':
-            if ($_double_encode) {
-                // php >=5.3.2 - go native
-                return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return htmlspecialchars($string, ENT_QUOTES, $char_set);
-                } else {
-                    // php <5.2.3 - prevent double encoding
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(
-                        array(
-                            '%%%SMARTY_START%%%',
-                            '%%%SMARTY_END%%%'
-                        ),
-                        array(
-                            '&',
-                            ';'
-                        ),
-                        $string
-                    );
-                    return $string;
-                }
-            }
+            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
         // no break
         case 'htmlall':
             if (Smarty::$_MBSTRING) {
-                // mb_convert_encoding ignores htmlspecialchars()
-                if ($_double_encode) {
-                    // php >=5.3.2 - go native
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-                } else {
-                    if ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    } else {
-                        // php <5.2.3 - prevent double encoding
-                        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                        $string =
-                            str_replace(
-                                array(
-                                    '%%%SMARTY_START%%%',
-                                    '%%%SMARTY_END%%%'
-                                ),
-                                array(
-                                    '&',
-                                    ';'
-                                ),
-                                $string
-                            );
-                        return $string;
-                    }
-                }
-                // htmlentities() won't convert everything, so use mb_convert_encoding
-                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
+                $string = mb_convert_encoding($string, 'UTF-8', $char_set);
+                return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
             }
             // no MBString fallback
-            if ($_double_encode) {
-                return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    return htmlentities($string, ENT_QUOTES, $char_set);
-                } else {
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlentities($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(
-                        array(
-                            '%%%SMARTY_START%%%',
-                            '%%%SMARTY_END%%%'
-                        ),
-                        array(
-                            '&',
-                            ';'
-                        ),
-                        $string
-                    );
-                    return $string;
-                }
-            }
+            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
         // no break
         case 'url':
             return rawurlencode($string);
diff --git a/WEB-INF/lib/smarty/plugins/modifier.explode.php b/WEB-INF/lib/smarty/plugins/modifier.explode.php
new file mode 100644
index 000000000..5186fde3d
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifier.explode.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty explode modifier plugin
+ * Type:     modifier
+ * Name:     explode
+ * Purpose:  split a string by a string
+ *
+ * @param string   $separator
+ * @param string   $string
+ * @param int|null $limit
+ *
+ * @return array
+ */
+function smarty_modifier_explode($separator, $string, ?int $limit = null)
+{
+    // provide $string default to prevent deprecation errors in PHP >=8.1
+    return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.number_format.php b/WEB-INF/lib/smarty/plugins/modifier.number_format.php
new file mode 100644
index 000000000..8c612601f
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifier.number_format.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty number_format modifier plugin
+ * Type:     modifier
+ * Name:     number_format
+ * Purpose:  Format a number with grouped thousands
+ *
+ * @param float|null  $num
+ * @param int         $decimals
+ * @param string|null $decimal_separator
+ * @param string|null $thousands_separator
+ *
+ * @return string
+ */
+function smarty_modifier_number_format(?float $num, int $decimals = 0, ?string $decimal_separator = ".", ?string $thousands_separator = ",")
+{
+    // provide $num default to prevent deprecation errors in PHP >=8.1
+    return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifier.truncate.php b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
index 33e7e53aa..80dcdb531 100644
--- a/WEB-INF/lib/smarty/plugins/modifier.truncate.php
+++ b/WEB-INF/lib/smarty/plugins/modifier.truncate.php
@@ -42,8 +42,8 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
             if (!$middle) {
                 return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
             }
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
-                   mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
+            return mb_substr($string, 0, intval($length / 2), Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -intval($length / 2), $length, Smarty::$_CHARSET);
         }
         return $string;
     }
@@ -56,7 +56,7 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
         }
-        return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
+        return substr($string, 0, intval($length / 2)) . $etc . substr($string, -intval($length / 2));
     }
     return $string;
 }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
index 70b95cc9d..602c3dbfc 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.escape.php
@@ -18,12 +18,10 @@
  * @param Smarty_Internal_TemplateCompilerBase $compiler
  *
  * @return string with compiled code
- * @throws \SmartyException
+ * @throws SmartyException
  */
 function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    static $_double_encode = true;
-    static $is_loaded = false;
     $compiler->template->_checkPlugins(
         array(
             array(
@@ -41,53 +39,30 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
         }
         switch ($esc_type) {
             case 'html':
-                if ($_double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                           var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
+                return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
             // no break
             case 'htmlall':
                 if (Smarty::$_MBSTRING) {
-                    if ($_double_encode) {
-                        // php >=5.2.3 - go native
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
-                               var_export($char_set, true) . ', ' . var_export($double_encode, true) .
-                               '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
-                    } elseif ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
-                               var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
-                    } else {
-                        // fall back to modifier.escape.php
-                    }
+                    return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
+                        var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
+                        var_export($double_encode, true) . ')';
                 }
                 // no MBString fallback
-                if ($_double_encode) {
-                    // php >=5.2.3 - go native
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                           var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
+                return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
             // no break
             case 'url':
-                return 'rawurlencode(' . $params[ 0 ] . ')';
+                return 'rawurlencode((string)' . $params[ 0 ] . ')';
             case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
+                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
             case 'quotes':
                 // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
                 // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
-                return 'strtr(' .
+                return 'strtr((string)' .
                        $params[ 0 ] .
                        ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
         }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php
new file mode 100644
index 000000000..308c00e42
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.nl2br.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_nl2br($params) {
+    return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.round.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.round.php
new file mode 100644
index 000000000..97f072f00
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.round.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty round modifier plugin
+ * Type:     modifier
+ * Name:     round
+ * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_round($params) {
+    return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.str_repeat.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.str_repeat.php
new file mode 100644
index 000000000..18eb7a762
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.str_repeat.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_str_repeat($params) {
+    return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
index 6ee3df9a5..bd866a61f 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strip_tags.php
@@ -21,8 +21,8 @@
 function smarty_modifiercompiler_strip_tags($params)
 {
     if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
+        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]} ?: '')";
     } else {
-        return 'strip_tags(' . $params[ 0 ] . ')';
+        return 'strip_tags((string) ' . $params[ 0 ] . ')';
     }
 }
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php
new file mode 100644
index 000000000..d43e8ef1c
--- /dev/null
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.strlen.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strlen($params) {
+    return 'strlen((string) ' . $params[0] . ')';
+}
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
index 05beb81f5..9e1f06d67 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.unescape.php
@@ -14,26 +14,34 @@
  * @author Rodney Rehm
  *
  * @param array $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
  *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_unescape($params)
+function smarty_modifiercompiler_unescape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 'html';
-    }
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+
+    $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+
     if (!isset($params[ 2 ])) {
         $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[ 2 ] = "'{$params[ 2 ]}'";
     }
-    switch (trim($params[ 1 ], '"\'')) {
+
+    switch ($esc_type) {
         case 'entity':
         case 'htmlall':
             if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
+                return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
             }
-            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
+            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
         case 'html':
             return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
         case 'url':
diff --git a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
index e12ae6769..31a90a055 100644
--- a/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
+++ b/WEB-INF/lib/smarty/plugins/modifiercompiler.upper.php
@@ -21,8 +21,8 @@
 function smarty_modifiercompiler_upper($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+        return 'mb_strtoupper(' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
-    return 'strtoupper(' . $params[ 0 ] . ')';
+    return 'strtoupper(' . $params[ 0 ] . ' ?? \'\')';
 }
diff --git a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
index 226d9035d..7e85f7aae 100644
--- a/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
+++ b/WEB-INF/lib/smarty/plugins/shared.mb_str_replace.php
@@ -44,9 +44,43 @@ function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
                 }
             }
         } else {
-            $parts = mb_split(preg_quote($search), $subject) ?: array();
+            $mb_reg_charset = mb_regex_encoding();
+            // Check if mbstring regex is using UTF-8
+            $reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
+            if(!$reg_is_unicode) {
+                // ...and set to UTF-8 if not
+                mb_regex_encoding("UTF-8");
+            }
+
+            // See if charset used by Smarty is matching one used by regex...
+            $current_charset = mb_regex_encoding();
+            $convert_result = (bool)strcasecmp(Smarty::$_CHARSET, $current_charset);
+            if($convert_result) {
+                // ...convert to it if not.
+                $subject = mb_convert_encoding($subject, $current_charset, Smarty::$_CHARSET);
+                $search = mb_convert_encoding($search, $current_charset, Smarty::$_CHARSET);
+                $replace = mb_convert_encoding($replace, $current_charset, Smarty::$_CHARSET);
+            }
+
+            $parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
+            // If original regex encoding was not unicode...
+            if(!$reg_is_unicode) {
+                // ...restore original regex encoding to avoid breaking the system.
+                mb_regex_encoding($mb_reg_charset);
+            }
+            if($parts === false) {
+                // This exception is thrown if call to mb_split failed.
+                // Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
+                // There may be other cases for it to fail, please file an issue if you find a reproducible one.
+                throw new SmartyException("Source string is not a valid $current_charset sequence (probably)");
+            }
+
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
+            // Convert results back to charset used by Smarty, if needed.
+            if($convert_result) {
+                $subject = mb_convert_encoding($subject, Smarty::$_CHARSET, $current_charset);
+            }
         }
         return $subject;
     }
diff --git a/WEB-INF/lib/smarty/readme b/WEB-INF/lib/smarty/readme
deleted file mode 100644
index 0a894518a..000000000
--- a/WEB-INF/lib/smarty/readme
+++ /dev/null
@@ -1,7 +0,0 @@
-The files in this directory are from Smarty-4.1.0.
-There are 2 modified files though to support older versions of php such as 5.4.
-
-Smarty.class.php
-sysplugins/smarty_internal_cacheresource_file.php
-
-Nik edited these files in a few places for php5.4 support, as they use php7.0 and php5.6 features.
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
index 91e9f3924..db68f9bfd 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource.php
@@ -205,11 +205,11 @@ public static function load(Smarty $smarty, $type = null)
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . smarty_ucfirst_ascii($type);
             return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
         // try plugins dir
-        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
+        $cache_resource_class = 'Smarty_CacheResource_' . smarty_ucfirst_ascii($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
             return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
index 59bf1d4a8..4b1c0f6d8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -244,7 +244,7 @@ protected function getTemplateUid(Smarty $smarty, $resource_name)
      */
     protected function sanitize($string)
     {
-        $string = trim($string, '|');
+        $string = trim((string)$string, '|');
         if (!$string) {
             return '';
         }
@@ -428,7 +428,7 @@ protected function listInvalidationKeys(
             $t[] = 'IVK#COMPILE' . $_compile;
         }
         $_name .= '#';
-        $cid = trim($cache_id, '|');
+        $cid = trim((string)$cache_id, '|');
         if (!$cid) {
             return $t;
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
index f6879bc76..c77ae9e17 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -196,7 +196,7 @@ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $e
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        clearstatcache(true, $cached->lock_id ?: '');
+        clearstatcache(true, $cached->lock_id ?? '');
         if (null !== $cached->lock_id && is_file($cached->lock_id)) {
             $t = filemtime($cached->lock_id);
             return $t && (time() - $t < $smarty->locking_timeout);
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
index 8ff15d8e5..cbaccd2b3 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_block.php
@@ -125,7 +125,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
         // setup buffer for template function code
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         $output = "<?php\n";
-        $output .= "/* {block {$_name}} */\n";
+        $output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
         $output .= "class {$_className} extends Smarty_Internal_Block\n";
         $output .= "{\n";
         foreach ($_block as $property => $value) {
@@ -155,7 +155,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
         }
         $output .= "}\n";
         $output .= "}\n";
-        $output .= "/* {/block {$_name}} */\n\n";
+        $output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
         $output .= "?>\n";
         $compiler->parser->current_buffer->append_subtree(
             $compiler->parser,
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
index 84e9584d9..b05a82b74 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_function.php
@@ -134,7 +134,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if ($compiler->template->compiled->has_nocache_code) {
             $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
             $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
             $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
             $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
             $output .= "ob_start();\n";
@@ -159,7 +159,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
             $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
             $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
             $output .= "}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
             $output .= "?>\n";
             $compiler->parser->current_buffer->append_subtree(
                 $compiler->parser,
@@ -179,7 +179,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         }
         $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
         $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
+        $output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
         $output .= "if (!function_exists('{$_funcName}')) {\n";
         $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
         $output .= $_paramsCode;
@@ -196,7 +196,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         );
         $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
         $output = "<?php\n}}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
         $output .= "?>\n";
         $compiler->parser->current_buffer->append_subtree(
             $compiler->parser,
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
index 716c91d49..bf62461bc 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_include.php
@@ -318,14 +318,14 @@ public function compileInlineTemplate(
             }
             // get compiled code
             $compiled_code = "<?php\n\n";
-            $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
             $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
             $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
             $compiled_code .= "<?php\n";
             $compiled_code .= "}\n?>\n";
             $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
             $compiled_code .= "<?php\n\n";
-            $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
             $compiled_code .= '?>';
             unset($tpl->compiler);
             if ($tpl->compiled->has_nocache_code) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
index c91ff62cb..29031d910 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -93,7 +93,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                 }
                 if (!empty($_dir)) {
                     foreach ((array)$_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
+                        $_script_dir = rtrim($_script_dir ?? '', '/\\') . DIRECTORY_SEPARATOR;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
                             break;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
index d3aab24bb..246350dc8 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -143,7 +143,7 @@ public function matchProperty($source)
         foreach ($this->resultOffsets as $key => $offset) {
             foreach ($match[ $offset ] as $m) {
                 if (!empty($m)) {
-                    $this->matchResults[ $key ][ strtolower($m) ] = true;
+                    $this->matchResults[ $key ][ smarty_strtolower_ascii($m) ] = true;
                 }
             }
         }
@@ -213,12 +213,12 @@ public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
      */
     public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $tag = smarty_strtolower_ascii(trim($parameter[ 0 ], '"\''));
         $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
         if (!$name) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
         }
-        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        $property = isset($parameter[ 2 ]) ? smarty_strtolower_ascii($compiler->getId($parameter[ 2 ])) : false;
         if (!$property || !in_array($property, $this->nameProperties)) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
         }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
index 72773fff8..aea082f01 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
@@ -109,6 +109,9 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                             if (!is_object($compiler->smarty->security_policy)
                                 || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
                             ) {
+                                trigger_error('Using php-function "' . $modifier . '" as a modifier is deprecated and will be ' .
+                                    'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+                                    'a custom modifier.', E_USER_DEPRECATED);
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[ $modifier ] = $type;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
index 23cae8aef..96bd37244 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -93,7 +93,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 }
                 // autoescape html
                 if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                    $output = "htmlspecialchars((string) {$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
                 }
                 // loop over registered filters
                 if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
index d53ef51ff..590cba5af 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -29,7 +29,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $variable = strtolower($compiler->getId($_index[ 0 ]));
+        $variable = smarty_strtolower_ascii($compiler->getId($_index[ 0 ]));
         if ($variable === false) {
             $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
         }
@@ -40,7 +40,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 case 'foreach':
                 case 'section':
                     if (!isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ])) {
-                        $class = 'Smarty_Internal_Compile_' . ucfirst($variable);
+                        $class = 'Smarty_Internal_Compile_' . smarty_ucfirst_ascii($variable);
                         Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
                     }
                     return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
@@ -76,7 +76,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                         $compiler->trigger_template_error("(secure mode) super globals not permitted");
                         break;
                     }
-                    $compiled_ref = '$_' . strtoupper($variable);
+                    $compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
                     break;
                 case 'template':
                     return 'basename($_smarty_tpl->source->filepath)';
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
index a9b940e5a..469b9667a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -157,10 +157,12 @@ public function compileTemplate(Smarty_Internal_Template $template)
             $this->smarty->_debug->end_compile($this->template);
         }
         // template header code
-        $template_header =
-            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . date("Y-m-d H:i:s") .
-            "\n";
-        $template_header .= "         compiled from '{$this->template->source->filepath}' */ ?>\n";
+        $template_header = sprintf(
+            "<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+            Smarty::SMARTY_VERSION,
+            date("Y-m-d H:i:s"),
+            str_replace('*/', '* /' , $this->template->source->filepath)
+        );
         $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
                 var_export($this->config_data, true) . '); ?>';
         return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
index 24b233e26..570819d26 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_debug.php
@@ -210,7 +210,7 @@ public function display_debug($obj, $full = false)
         // copy the working dirs from application
         $debObj->setCompileDir($smarty->getCompileDir());
         // init properties by hand as user may have edited the original Smarty class
-        $debObj->setPluginsDir(is_dir(dirname(__FILE__) . '/../plugins') ? dirname(__FILE__) .
+        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ .
                                                                            '/../plugins' : $smarty->getPluginsDir());
         $debObj->force_compile = false;
         $debObj->compile_check = Smarty::COMPILECHECK_ON;
@@ -221,7 +221,7 @@ public function display_debug($obj, $full = false)
         $debObj->debugging_ctrl = 'NONE';
         $debObj->error_reporting = E_ALL & ~E_NOTICE;
         $debObj->debug_tpl =
-            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . dirname(__FILE__) . '/../debug.tpl';
+            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
         $debObj->registered_plugins = array();
         $debObj->registered_resources = array();
         $debObj->registered_filters = array();
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
index b07615526..3ef040ab1 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_extension_handler.php
@@ -36,6 +36,7 @@
  * @property   Smarty_Internal_Method_RegisterPlugin     $registerPlugin
  * @property   mixed|\Smarty_Template_Cached             configLoad
  */
+#[\AllowDynamicProperties]
 class Smarty_Internal_Extension_Handler
 {
     public $objType = null;
@@ -88,20 +89,19 @@ public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
                         $objType = $data->_objType;
                         $propertyType = false;
                         if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
-                            $property = isset($this->resolvedProperties[ 'property' ][ $basename ]) ?
-                                $this->resolvedProperties[ 'property' ][ $basename ] :
-                                $property = $this->resolvedProperties[ 'property' ][ $basename ] = strtolower(
-                                    join(
-                                        '_',
-                                        preg_split(
-                                            '/([A-Z][^A-Z]*)/',
-                                            $basename,
-                                            -1,
-                                            PREG_SPLIT_NO_EMPTY |
-                                            PREG_SPLIT_DELIM_CAPTURE
-                                        )
+                            $property = $this->resolvedProperties['property'][$basename] ??
+                                $this->resolvedProperties['property'][$basename] = smarty_strtolower_ascii(
+                                join(
+                                    '_',
+                                    preg_split(
+                                        '/([A-Z][^A-Z]*)/',
+                                        $basename,
+                                        -1,
+                                        PREG_SPLIT_NO_EMPTY |
+                                        PREG_SPLIT_DELIM_CAPTURE
                                     )
-                                );
+                                )
+                            );
                             if ($property !== false) {
                                 if (property_exists($data, $property)) {
                                     $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
@@ -145,7 +145,7 @@ public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
     public function upperCase($name)
     {
         $_name = explode('_', $name);
-        $_name = array_map('ucfirst', $_name);
+        $_name = array_map('smarty_ucfirst_ascii', $_name);
         return implode('_', $_name);
     }
 
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
index 3bd659cb8..6ddcaec94 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_loadplugin.php
@@ -40,7 +40,7 @@ public function loadPlugin(Smarty $smarty, $plugin_name, $check)
             throw new SmartyException("plugin {$plugin_name} is not a valid name format");
         }
         if (!empty($match[ 2 ])) {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            $file = SMARTY_SYSPLUGINS_DIR . smarty_strtolower_ascii($plugin_name) . '.php';
             if (isset($this->plugin_files[ $file ])) {
                 if ($this->plugin_files[ $file ] !== false) {
                     return $this->plugin_files[ $file ];
@@ -60,7 +60,7 @@ public function loadPlugin(Smarty $smarty, $plugin_name, $check)
         }
         // plugin filename is expected to be: [type].[name].php
         $_plugin_filename = "{$match[1]}.{$match[4]}.php";
-        $_lower_filename = strtolower($_plugin_filename);
+        $_lower_filename = smarty_strtolower_ascii($_plugin_filename);
         if (isset($this->plugin_files)) {
             if (isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
                 if (!$smarty->use_include_path || $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] !== false) {
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
index 39318838e..381346c8f 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_method_mustcompile.php
@@ -32,7 +32,7 @@ public function mustCompile(Smarty_Internal_Template $_template)
     {
         if (!$_template->source->exists) {
             if ($_template->_isSubTpl()) {
-                $parent_resource = " in '$_template->parent->template_resource}'";
+                $parent_resource = " in '{$_template->parent->template_resource}'";
             } else {
                 $parent_resource = '';
             }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
index b5361c9bb..d0ca751e2 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_codeframe.php
@@ -44,9 +44,12 @@ public function create(
             $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
             $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
         }
-        $output = "<?php\n";
-        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . date("Y-m-d H:i:s") .
-                   "\n  from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
+        $output = sprintf(
+			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+	        date("Y-m-d H:i:s"),
+	        str_replace('*/', '* /', $_template->source->filepath)
+        );
         $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
         $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
                ($cache ? 'true' : 'false') . ')';
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
index 53069148d..7994aa048 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_make_nocache.php
@@ -22,7 +22,7 @@ public function save(Smarty_Internal_Template $tpl, $var)
     {
         if (isset($tpl->tpl_vars[ $var ])) {
             $export =
-                preg_replace('/^Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
+                preg_replace('/^\\\\?Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
             if (preg_match('/(\w+)::__set_state/', $export, $match)) {
                 throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
             }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
index 4383e6f38..492d5eb25 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_runtime_writefile.php
@@ -29,12 +29,6 @@ public function writeFile($_filepath, $_contents, Smarty $smarty)
     {
         $_error_reporting = error_reporting();
         error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
-        $_dir_perms =
-            property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777) : 0771;
-        if ($_file_perms !== null) {
-            $old_umask = umask(0);
-        }
         $_dirpath = dirname($_filepath);
         // if subdirs, create dir structure
         if ($_dirpath !== '.') {
@@ -42,7 +36,7 @@ public function writeFile($_filepath, $_contents, Smarty $smarty)
             // loop if concurrency problem occurs
             // see https://bugs.php.net/bug.php?id=35326
             while (!is_dir($_dirpath)) {
-                if (@mkdir($_dirpath, $_dir_perms, true)) {
+                if (@mkdir($_dirpath, 0777, true)) {
                     break;
                 }
                 clearstatcache();
@@ -89,11 +83,8 @@ public function writeFile($_filepath, $_contents, Smarty $smarty)
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_filepath}");
         }
-        if ($_file_perms !== null) {
-            // set file permissions
-            chmod($_filepath, $_file_perms);
-            umask($old_umask);
-        }
+        // set file permissions
+        @chmod($_filepath, 0666 & ~umask());
         error_reporting($_error_reporting);
         return true;
     }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
index bae22a7d5..72d1d52e0 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_template.php
@@ -24,6 +24,7 @@
  *
  * @method bool mustCompile()
  */
+#[\AllowDynamicProperties]
 class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
 {
     /**
@@ -292,7 +293,7 @@ public function _subTemplateRender(
         $smarty = &$this->smarty;
         $_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl);
         // recursive call ?
-        if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() !== $_templateId) {
+        if ((isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId()) !== $_templateId) {
             // already in template cache?
             if (isset(self::$tplObjCache[ $_templateId ])) {
                 // copy data from cached object
@@ -358,7 +359,7 @@ public function _subTemplateRender(
         }
         if ($tpl->caching === 9999) {
             if (!isset($tpl->compiled)) {
-                $this->loadCompiled(true);
+                $tpl->loadCompiled(true);
             }
             if ($tpl->compiled->has_nocache_code) {
                 $this->cached->hashes[ $tpl->compiled->nocache_hash ] = true;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
index 2ffb896fa..918362e91 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatebase.php
@@ -257,7 +257,7 @@ private function _execute($template, $cache_id, $compile_id, $parent, $function)
                 error_reporting($_smarty_old_error_level);
             }
             return $result;
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             while (ob_get_level() > $level) {
                 ob_end_clean();
             }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
index 272616148..d5c18d31a 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -422,9 +422,6 @@ public function compileTemplateSource(
         try {
             // save template object in compiler class
             $this->template = $template;
-            if (property_exists($this->template->smarty, 'plugin_search_order')) {
-                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
-            }
             if ($this->smarty->debugging) {
                 if (!isset($this->smarty->_debug)) {
                     $this->smarty->_debug = new Smarty_Internal_Debug();
@@ -608,7 +605,7 @@ public function compilePHPFunctionCall($name, $parameter)
             if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
                 || strcasecmp($name, 'array') === 0 || is_callable($name)
             ) {
-                $func_name = strtolower($name);
+                $func_name = smarty_strtolower_ascii($name);
 
                 if ($func_name === 'isset') {
                     if (count($parameter) === 0) {
@@ -768,7 +765,7 @@ public function getTagCompiler($tag)
         if (!isset(self::$_tag_objects[ $tag ])) {
             // lazy load internal compiler plugin
             $_tag = explode('_', $tag);
-            $_tag = array_map('ucfirst', $_tag);
+            $_tag = array_map('smarty_ucfirst_ascii', $_tag);
             $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
             if (class_exists($class_name)
                 && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
@@ -1134,8 +1131,12 @@ public function trigger_template_error($args = null, $line = null, $tagline = nu
             echo ob_get_clean();
             flush();
         }
-        $e = new SmartyCompilerException($error_text);
-        $e->setLine($line);
+        $e = new SmartyCompilerException(
+            $error_text,
+            0,
+            $this->template->source->filepath,
+            $line
+        );
         $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
         $e->desc = $args;
         $e->template = $this->template->source->filepath;
@@ -1439,6 +1440,10 @@ public function compileCheckPlugins($requiredPlugins)
      */
     abstract protected function doCompile($_content, $isTemplateSource = false);
 
+    public function cStyleComment($string) {
+        return '/*' . str_replace('*/', '* /' , $string) . '*/';
+    }
+
     /**
      * Compile Tag
      *
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
index 1fac79b74..c8ffd4cc6 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_internal_testinstall.php
@@ -144,7 +144,7 @@ public static function testInstall(Smarty $smarty, &$errors = null)
         }
         // test if all registered plugins_dir are accessible
         // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
+        $_core_plugins_dir = realpath(__DIR__ . '/../plugins');
         $_core_plugins_available = false;
         foreach ($smarty->getPluginsDir() as $plugin_dir) {
             $_plugin_dir = $plugin_dir;
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
index 7fe84536f..3c43a9f46 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource.php
@@ -76,11 +76,11 @@ public static function load(Smarty $smarty, $type)
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            $_resource_class = 'Smarty_Internal_Resource_' . smarty_ucfirst_ascii($type);
             return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
         }
         // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
+        $_resource_class = 'Smarty_Resource_' . smarty_ucfirst_ascii($type);
         if ($smarty->loadPlugin($_resource_class)) {
             if (class_exists($_resource_class, false)) {
                 return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
index 8d66be3ae..191fa7c90 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_resource_custom.php
@@ -47,7 +47,7 @@ protected function fetchTimestamp($name)
      */
     public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25);
+        $source->filepath = $source->type . ':' . $this->generateSafeName($source->name);
         $source->uid = sha1($source->type . ':' . $source->name);
         $mtime = $this->fetchTimestamp($source->name);
         if ($mtime !== null) {
@@ -88,6 +88,17 @@ public function getContent(Smarty_Template_Source $source)
      */
     public function getBasename(Smarty_Template_Source $source)
     {
-        return basename(substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25));
+        return basename($this->generateSafeName($source->name));
+    }
+
+    /**
+     * Removes special characters from $name and limits its length to 127 characters.
+     *
+     * @param $name
+     *
+     * @return string
+     */
+    private function generateSafeName($name): string {
+        return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string) $name), 0, 127);
     }
 }
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_security.php b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
index 3c29c8132..97cd0521d 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_security.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_security.php
@@ -19,6 +19,7 @@
 /**
  * This class does contain the security settings
  */
+#[\AllowDynamicProperties]
 class Smarty_Security
 {
 
@@ -105,7 +106,7 @@ class Smarty_Security
      *
      * @var array
      */
-    public $php_modifiers = array('escape', 'count', 'nl2br',);
+    public $php_modifiers = array('escape', 'count', 'sizeof', 'nl2br',);
 
     /**
      * This is an array of allowed tags.
@@ -328,7 +329,7 @@ public function isTrustedStaticClassAccess($class_name, $params, $compiler)
      *
      * @param string $modifier_name
      * @param object $compiler compiler object
-     *
+     * @deprecated
      * @return boolean                 true if modifier is trusted
      */
     public function isTrustedPhpModifier($modifier_name, $compiler)
@@ -555,35 +556,6 @@ public function isTrustedUri($uri)
         throw new SmartyException("URI '{$uri}' not allowed by security setting");
     }
 
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array)$this->trusted_dir as $directory) {
-                $directory = $this->smarty->_realpath($directory . '/', true);
-                $this->_php_resource_dir[ $directory ] = true;
-            }
-        }
-        $addPath = $this->_checkDir($filepath, $this->_php_resource_dir);
-        if ($addPath !== false) {
-            $this->_php_resource_dir = array_merge($this->_php_resource_dir, $addPath);
-        }
-        return true;
-    }
-
     /**
      * Remove old directories and its sub folders, add new directories
      *
diff --git a/WEB-INF/lib/smarty/sysplugins/smarty_variable.php b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
index 914d99bd7..6a534228b 100644
--- a/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
+++ b/WEB-INF/lib/smarty/sysplugins/smarty_variable.php
@@ -7,6 +7,7 @@
  * @package    Smarty
  * @subpackage Template
  */
+#[\AllowDynamicProperties]
 class Smarty_Variable
 {
     /**
diff --git a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
index 8833aa52c..0a0a32351 100644
--- a/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
+++ b/WEB-INF/lib/smarty/sysplugins/smartycompilerexception.php
@@ -7,6 +7,33 @@
  */
 class SmartyCompilerException extends SmartyException
 {
+    /**
+     * The constructor of the exception
+     *
+     * @param string         $message  The Exception message to throw.
+     * @param int            $code     The Exception code.
+     * @param string|null    $filename The filename where the exception is thrown.
+     * @param int|null       $line     The line number where the exception is thrown.
+     * @param Throwable|null $previous The previous exception used for the exception chaining.
+     */
+    public function __construct(
+        string $message = "",
+        int $code = 0,
+        ?string $filename = null,
+        ?int $line = null,
+        Throwable $previous = null
+    ) {
+        parent::__construct($message, $code, $previous);
+
+        // These are optional parameters, should be be overridden only when present!
+        if ($filename) {
+            $this->file = $filename;
+        }
+        if ($line) {
+            $this->line = $line;
+        }
+    }
+
     /**
      * @return string
      */
@@ -22,6 +49,7 @@ public function setLine($line)
     {
         $this->line = $line;
     }
+
     /**
      * The template source snippet relating to the error
      *
diff --git a/dbinstall.php b/dbinstall.php
index 2db0bebca..647157d5f 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -91,17 +91,16 @@ function ttGenerateKeys() {
   }
 
   // Check if PHP version is good enough.
-  // $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
-  $required_version = '5.4.0';    // Week view (week.php) requires 5.4 because of []-way of referencing arrays.
-                                  // This needs further investigation as we use [] elsewhere without obvious problems.
-  // Note: unmodified smarty 4.1.0 that we needed for php 8.1 support uses plp 5.6 and 7.0 features.
-  // Currently, embedded smarty in this product is adjusted to still support php 5.4.
-  // Next time we update smarty we may need to increase $required_version.
-
-  // Print a warning about php >= 8.1 because of a breaking change
-  // with mysqli default error mode, see https://php.watch/versions/8.1/mysqli-error-mode
-  if (version_compare(phpversion(), '8.1', '>=')) {
-    echo('<font color="red">Error: This app was not tested with PHP version: '.phpversion().'</font><br>');
+  $required_version = '7.0'; // smarty 4.3.0 that we embed uses null coalescing operator (introduced in php 7).
+
+  // Print a warning about php <= 7.4 because we are no longer testing there.
+  if (version_compare(phpversion(), '7.4', '<')) {
+    echo('<font color="red">Warning: This app is no longer tested with PHP version: '.phpversion().'.</font><br>');
+  }
+
+  // Print a warning about php >= 8.2 because of insifficient testing there.
+  if (version_compare(phpversion(), '8.2', '>=')) {
+    echo('<font color="red">Error: This app was not tested with PHP version: '.phpversion().'.</font><br>');
   } else {
     if (version_compare(phpversion(), $required_version, '>=')) {
       echo('PHP version: '.phpversion().', good enough.<br>');
diff --git a/initialize.php b/initialize.php
index 3c8191921..57fa09b74 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.9.5774");
+define("APP_VERSION", "1.22.10.5775");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 99615f6b31e92004a7fee5788be7bb6d5bcd34d5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Jan 2023 20:28:31 +0000
Subject: [PATCH 1803/1848] Cosmetic. Typo.

---
 dbinstall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbinstall.php b/dbinstall.php
index 647157d5f..c557a10b4 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -98,7 +98,7 @@ function ttGenerateKeys() {
     echo('<font color="red">Warning: This app is no longer tested with PHP version: '.phpversion().'.</font><br>');
   }
 
-  // Print a warning about php >= 8.2 because of insifficient testing there.
+  // Print a warning about php >= 8.2 because of insufficient testing there.
   if (version_compare(phpversion(), '8.2', '>=')) {
     echo('<font color="red">Error: This app was not tested with PHP version: '.phpversion().'.</font><br>');
   } else {

From fefff70c58b0bedc9f6fbe1359b92a35fcd9ec3e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 8 Jan 2023 21:20:28 +0000
Subject: [PATCH 1804/1848] German transation improved.

---
 WEB-INF/resources/de.lang.php | 19 ++++---------------
 initialize.php                |  2 +-
 plugins.php                   |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 0217fa236..40c3bde97 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -255,8 +255,7 @@
 'title.expenses' => 'Kosten',
 'title.edit_expense' => 'Kostenposition ändern',
 'title.delete_expense' => 'Kostenposition löschen',
-// TODO: translate the following.
-// 'title.expense_files' => 'Expense Item Files',
+'title.expense_files' => 'Ausgabenartikel-Dateien',
 'title.reports' => 'Berichte',
 'title.report' => 'Bericht',
 'title.send_report' => 'Bericht senden',
@@ -409,10 +408,7 @@
 'form.reports.include_pending' => 'Ausstehend',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
-// TODO: review form.reports.note_containing translation for accuracy.
-// This is basically a string filter in user notes, see https://www.anuko.com/time-tracker/what-is/note-containing.htm
-'form.reports.note_containing' => 'Enthält Notitz', // The concern is that it may be translated as "Containing a note", which is different
-                                                    // from "Note containing a substring in this field."
+'form.reports.note_containing' => 'Notitz enthält',
 'form.reports.show_fields' => 'Felder anzeigen',
 'form.reports.time_fields' => 'Zeitfelder',
 'form.reports.user_fields' => 'Benutzerfelder',
@@ -430,13 +426,7 @@
 'form.report.export' => 'Exportiere',
 'form.report.per_hour' => 'Stundensatz',
 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen',
-// TODO: REVIEW the following.
-// 'form.report.assign_to_timesheet' => 'Assign to timesheet',
-// See how this feature works: https://www.anuko.com/time-tracker/user-guide/timesheets.htm
-// Basically, we are selecting records in a report and assign them TO (include IN) one of timesheets.
-// The concern is that it is now translated as "Assign timesheet", which is different from how
-// form.report.assign_to_invoice above is translated.
-'form.report.assign_to_timesheet' => 'Arbeitszeittabelle zuweisen',
+'form.report.assign_to_timesheet' => 'Zu Arbeitszeittabelle zuweisen',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.active_timesheets' => 'Aktive Arbeitszeittabellen',
@@ -566,8 +556,7 @@
 'role.user.description' => 'Ein normaler Benutzer ohne Administrationsrechte.',
 'role.client.label' => 'Kunde',
 'role.client.low_case_label' => 'Kunde',
-// TODO: translate the following.
-// 'role.client.description' => 'A client can view its own data.',
+'role.client.description' => 'Ein Kunde kann seine eigenen Daten einsehen.',
 'role.supervisor.label' => 'Dienstvorgesetzter',
 'role.supervisor.low_case_label' => 'Dienstvorgesetzter',
 'role.supervisor.description' => 'Eine Person mit ein paar Administrationsrechten.',
diff --git a/initialize.php b/initialize.php
index 57fa09b74..1a032a752 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.10.5775");
+define("APP_VERSION", "1.22.10.5776");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins.php b/plugins.php
index 1dfe6a073..a4372694a 100644
--- a/plugins.php
+++ b/plugins.php
@@ -35,7 +35,7 @@
 } else {
   // Note: we get here in get, and also in post when group changes.
   // Which plugins do we have enabled in currently selected group?
-  $plugins = explode(',', $user->getPlugins());
+  $plugins = explode(',', $user->getPlugins() ?? '');
   $cl_charts = in_array('ch', $plugins);
   $cl_puncher = in_array('pu', $plugins);
   $cl_clients = in_array('cl', $plugins);

From ce7afd2e14a55af3d39a3e5a364bca6fb1cb9ecb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 1 Feb 2023 17:50:57 +0000
Subject: [PATCH 1805/1848] Cosmetic additions to dbinstall.php.

---
 dbinstall.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dbinstall.php b/dbinstall.php
index c557a10b4..44fede0cd 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -1213,6 +1213,13 @@ function ttGenerateKeys() {
       $res = ttOrgHelper::deleteOrg($inactive_orgs[$i]);
     }
 
+    // Delete items that were marked as deleted by users.
+    // This is currently commented out to ease up recovery of accidental deletes by users.
+    // These statements can be executed manually in MySQL console to shrink database a bit.
+    // ttExecute("delete from tt_log where status is null");
+    // ttExecute("delete from tt_custom_field_log where status is null");
+    // ttExecute("delete from tt_expense_items where status is null");
+
     ttExecute("OPTIMIZE TABLE tt_client_project_binds");
     ttExecute("OPTIMIZE TABLE tt_clients");
     ttExecute("OPTIMIZE TABLE tt_config");
@@ -1224,7 +1231,8 @@ function ttGenerateKeys() {
     ttExecute("OPTIMIZE TABLE tt_expense_items");
     ttExecute("OPTIMIZE TABLE tt_fav_reports");
     ttExecute("OPTIMIZE TABLE tt_invoices");
-    ttExecute("OPTIMIZE TABLE tt_log");
+    ttExecute("OPTIMIZE TABLE tt_log"); // This locks the production table for 4 minutes. Impossible to login, etc.
+                                        // TODO: what should we do about it?
     ttExecute("OPTIMIZE TABLE tt_monthly_quotas");
     ttExecute("OPTIMIZE TABLE tt_templates");
     ttExecute("OPTIMIZE TABLE tt_project_template_binds");

From 7f2df46c0e903abe3783ffe040e0db58479f46cc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 22 Apr 2023 15:17:26 +0000
Subject: [PATCH 1806/1848] Addressed pr#129 and pr#130.

---
 WEB-INF/lib/ttProjectHelper.class.php | 4 ++--
 WEB-INF/lib/ttUser.class.php          | 4 ++--
 initialize.php                        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php
index bd166e864..303289688 100644
--- a/WEB-INF/lib/ttProjectHelper.class.php
+++ b/WEB-INF/lib/ttProjectHelper.class.php
@@ -220,8 +220,8 @@ static function delete($id) {
     if (!ttClientHelper::deleteProject($id))
       return false;
 
-    // Mark project custom fields as deleted,
-    require_once('plugins/CustomFields.class.php');
+    // Mark project custom fields as deleted.
+    require_once(APP_DIR.'/plugins/CustomFields.class.php');
     $entity_type = CustomFields::ENTITY_PROJECT;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
     $sql = "update tt_entity_custom_fields set status = null $modified_part".
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2e86eacb9..2bf5c0298 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -771,8 +771,8 @@ function markUserDeleted($user_id) {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    // Mark user custom fields as deleted,
-    require_once('plugins/CustomFields.class.php');
+    // Mark user custom fields as deleted.
+    require_once(APP_DIR.'/plugins/CustomFields.class.php');
     $entity_type = CustomFields::ENTITY_USER;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
     $sql = "update tt_entity_custom_fields set status = null $modified_part".
diff --git a/initialize.php b/initialize.php
index 1a032a752..746e9146f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.10.5776");
+define("APP_VERSION", "1.22.10.5777");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From c299c8b0d6e3f11d99b47de525621a4f64fdf334 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 23 Apr 2023 14:53:34 +0000
Subject: [PATCH 1807/1848] A couple of fixes related to pr #129 and pr #130.

---
 WEB-INF/lib/ttChartHelper.class.php  | 2 +-
 WEB-INF/lib/ttReportHelper.class.php | 2 +-
 initialize.php                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php
index eaa5a4c07..6550f5fa2 100644
--- a/WEB-INF/lib/ttChartHelper.class.php
+++ b/WEB-INF/lib/ttChartHelper.class.php
@@ -137,7 +137,7 @@ static function getTotalsForFavReport($fav_report_id, $chart_type) {
 
     // Use custom fields plugin if it is enabled.
     if ($user->isPluginEnabled('cf')) {
-      require_once('plugins/CustomFields.class.php');
+      require_once(APP_DIR.'/plugins/CustomFields.class.php');
       $custom_fields = new CustomFields();
     }
 
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a3f894497..ef11ba80c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -8,7 +8,7 @@
 import('ttTimeHelper');
 import('ttConfigHelper');
 
-require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php');
+require_once(APP_DIR.'/plugins/CustomFields.class.php');
 
 // Definitions of types for timesheet dropdown.
 define('TIMESHEET_ALL', 0); // Include all records.
diff --git a/initialize.php b/initialize.php
index 746e9146f..bd6c4a062 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.10.5777");
+define("APP_VERSION", "1.22.10.5778");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From cd59a5694cee1b284ae66c895536438ae56d4147 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 4 May 2023 19:39:30 +0000
Subject: [PATCH 1808/1848] Added some more user input validation for reports.

---
 WEB-INF/lib/common.lib.php           |  9 +++++++++
 WEB-INF/lib/ttReportHelper.class.php | 19 ++++++++++++++++++-
 initialize.php                       |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 86570a5f0..4bc912963 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -374,6 +374,15 @@ function ttValidInteger($val, $emptyValid = false)
   return true;
 }
 
+// ttValidCheckbox is used to check user input to validate a checkbox on form.
+function ttValidCheckbox($val)
+{
+  if ($val == null)
+    return true;
+
+  return ($val == '1');
+}
+
 // ttValidCronSpec is used to check user input to validate cron specification.
 function ttValidCronSpec($val)
 {
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ef11ba80c..b183d8400 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1866,7 +1866,24 @@ static function verifyBean($bean) {
       }
     }
 
-    // TODO: add additional checks here. Perhaps do it before saving the bean for consistency.
+    // Validate checkboxes.
+    if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chproject'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chtask'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chinvoice'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chpaid'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chip'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chstart'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chfinish'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chduration'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chnote'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chcost'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chunits'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chtimesheet'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chapproved'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chfiles'))) return false;
+
+    // TODO: add additional checks here.
     return true;
   }
 
diff --git a/initialize.php b/initialize.php
index bd6c4a062..78d98ca9d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.10.5778");
+define("APP_VERSION", "1.22.11.5779");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 010a05a6e7b76d1bafb4d362ee83be548b9e8671 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 4 May 2023 19:59:26 +0000
Subject: [PATCH 1809/1848] Added one more checkbox selection validation for
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 1 +
 initialize.php                       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index b183d8400..06da55e93 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1882,6 +1882,7 @@ static function verifyBean($bean) {
     if (!ttValidCheckbox($bean->getAttribute('chtimesheet'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chapproved'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chfiles'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chtotalsonly'))) return false;
 
     // TODO: add additional checks here.
     return true;
diff --git a/initialize.php b/initialize.php
index 78d98ca9d..93345f37b 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.11.5779");
+define("APP_VERSION", "1.22.11.5780");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 8a7367d7f77ea697c090f5ca4e19669181cc7bcf Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 May 2023 14:43:41 +0000
Subject: [PATCH 1810/1848] Addressed an sql vulnerability in invoices.php for
 bogus post parameters for sorting.

---
 initialize.php | 2 +-
 invoices.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 93345f37b..f8cb044a3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.11.5780");
+define("APP_VERSION", "1.22.11.5781");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoices.php b/invoices.php
index 3f6438b96..f1eda4849 100644
--- a/invoices.php
+++ b/invoices.php
@@ -76,7 +76,7 @@
   if (!ttInvoiceHelper::validSortOrder($sort_order_2)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
   if ($sort_option_1 == $sort_option_2) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
 
-  if($request->getParameter('sorting_changed')) {
+  if($err->no() && $request->getParameter('sorting_changed')) {
     // User changed sorting. Get invoices sorted accordingly.
     $sort_options = array('sort_option_1'=>$sort_option_1,
       'sort_order_1'=>$sort_order_1,

From ec4d03d4c6fa87fc08c316e414ee3ef3c510db0c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 May 2023 16:27:05 +0000
Subject: [PATCH 1811/1848] Improving report security by casting some things to
 int.

---
 WEB-INF/lib/ttReportHelper.class.php | 38 ++++++++++++++--------------
 initialize.php                       |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 06da55e93..553d0efd3 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1783,21 +1783,21 @@ static function getReportOptions($bean) {
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
     $options['note_containing'] = $bean->getAttribute('note_containing');
-    $options['show_client'] = $bean->getAttribute('chclient');
-    $options['show_invoice'] = $bean->getAttribute('chinvoice');
-    $options['show_approved'] = $bean->getAttribute('chapproved');
-    $options['show_paid'] = $bean->getAttribute('chpaid');
-    $options['show_ip'] = $bean->getAttribute('chip');
-    $options['show_project'] = $bean->getAttribute('chproject');
-    $options['show_start'] = $bean->getAttribute('chstart');
-    $options['show_duration'] = $bean->getAttribute('chduration');
-    $options['show_cost'] = $bean->getAttribute('chcost');
-    $options['show_task'] = $bean->getAttribute('chtask');
-    $options['show_end'] = $bean->getAttribute('chfinish');
-    $options['show_note'] = $bean->getAttribute('chnote');
-    $options['show_work_units'] = $bean->getAttribute('chunits');
-    $options['show_timesheet'] = $bean->getAttribute('chtimesheet');
-    $options['show_files'] = $bean->getAttribute('chfiles');
+    $options['show_client'] = (int)$bean->getAttribute('chclient');
+    $options['show_invoice'] = (int)$bean->getAttribute('chinvoice');
+    $options['show_approved'] = (int)$bean->getAttribute('chapproved');
+    $options['show_paid'] = (int)$bean->getAttribute('chpaid');
+    $options['show_ip'] = (int)$bean->getAttribute('chip');
+    $options['show_project'] = (int)$bean->getAttribute('chproject');
+    $options['show_start'] = (int)$bean->getAttribute('chstart');
+    $options['show_duration'] = (int)$bean->getAttribute('chduration');
+    $options['show_cost'] = (int)$bean->getAttribute('chcost');
+    $options['show_task'] = (int)$bean->getAttribute('chtask');
+    $options['show_end'] = (int)$bean->getAttribute('chfinish');
+    $options['show_note'] = (int)$bean->getAttribute('chnote');
+    $options['show_work_units'] = (int)$bean->getAttribute('chunits');
+    $options['show_timesheet'] = (int)$bean->getAttribute('chtimesheet');
+    $options['show_files'] = (int)$bean->getAttribute('chfiles');
 
     // Prepare custom field options.
     if ($user->isPluginEnabled('cf')) {
@@ -1810,7 +1810,7 @@ static function getReportOptions($bean) {
           $control_name = 'time_field_'.$timeField['id'];
           $checkbox_control_name = 'show_'.$control_name;
           $options[$control_name] =  $bean->getAttribute($control_name);
-          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
+          $options[$checkbox_control_name] =  (int)$bean->getAttribute($checkbox_control_name);
         }
       }
 
@@ -1820,7 +1820,7 @@ static function getReportOptions($bean) {
           $control_name = 'user_field_'.$userField['id'];
           $checkbox_control_name = 'show_'.$control_name;
           $options[$control_name] =  $bean->getAttribute($control_name);
-          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
+          $options[$checkbox_control_name] =  (int)$bean->getAttribute($checkbox_control_name);
         }
       }
 
@@ -1830,7 +1830,7 @@ static function getReportOptions($bean) {
           $control_name = 'project_field_'.$projectField['id'];
           $checkbox_control_name = 'show_'.$control_name;
           $options[$control_name] =  $bean->getAttribute($control_name);
-          $options[$checkbox_control_name] =  $bean->getAttribute($checkbox_control_name);
+          $options[$checkbox_control_name] = (int)$bean->getAttribute($checkbox_control_name);
         }
       }
     }
@@ -1838,7 +1838,7 @@ static function getReportOptions($bean) {
     $options['group_by1'] = $bean->getAttribute('group_by1');
     $options['group_by2'] = $bean->getAttribute('group_by2');
     $options['group_by3'] = $bean->getAttribute('group_by3');
-    $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
+    $options['show_totals_only'] = (int)$bean->getAttribute('chtotalsonly');
     return $options;
   }
 
diff --git a/initialize.php b/initialize.php
index f8cb044a3..3b5b0fcf9 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.11.5781");
+define("APP_VERSION", "1.22.11.5782");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 093cfe158099704ffd4a1624be217f9935e914eb Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 5 May 2023 18:19:31 +0000
Subject: [PATCH 1812/1848] Addressed stored XSS vulnerability in week.php by
 escaping cell title.

---
 initialize.php | 2 +-
 week.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 3b5b0fcf9..ac6cd7071 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.11.5782");
+define("APP_VERSION", "1.22.12.5783");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 9d96abfbe..16a00dff6 100644
--- a/week.php
+++ b/week.php
@@ -242,7 +242,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
         $field->setValue($table->getValueAt($row,$column)['duration']); // Duration for even rows.
       } else {
         $field->setValue($table->getValueAt($row,$column)['note']);     // Comment for odd rows.
-        $field->setTitle($table->getValueAt($row,$column)['note']);     // Tooltip to help view the entire comment.
+        $field->setTitle(htmlspecialchars($table->getValueAt($row,$column)['note'])); // Tooltip to help view the entire comment.
       }
     } else {
       $field->setValue($table->getValueAt($row,$column)['duration']);

From 41a56db904ab357a3eb1f6df275e3c067ca1dc14 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 6 May 2023 18:34:34 +0000
Subject: [PATCH 1813/1848] Minor improvement in data validation for reports.

---
 WEB-INF/lib/ttReportHelper.class.php |   4 +
 initialize.php                       |   2 +-
 reports.php                          | 142 ++++++++++++++-------------
 3 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 553d0efd3..c329fcb4f 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1866,6 +1866,10 @@ static function verifyBean($bean) {
       }
     }
 
+    // Check fav report id.
+    $fav_report_id = $bean->getAttribute('favorite_report');
+    if (!($fav_report_id == -1 || ttValidInteger($fav_report_id))) return false;
+
     // Validate checkboxes.
     if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chproject'))) return false;
diff --git a/initialize.php b/initialize.php
index ac6cd7071..5de06cb20 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5783");
+define("APP_VERSION", "1.22.12.5784");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index fd4ca156b..5cfdd1d81 100644
--- a/reports.php
+++ b/reports.php
@@ -417,84 +417,90 @@
   $form->getElement('btn_delete')->setEnabled(false);
 
 if ($request->isPost()) {
-  if((!$bean->getAttribute('btn_generate') && ($request->getParameter('fav_report_changed')))) {
-    // User changed favorite report. We need to load new values into the form.
-    if ($bean->getAttribute('favorite_report')) {
-      // This loads new favorite report options into the bean (into our form).
-      ttFavReportHelper::loadReport($bean);
-
-      // If user selected no favorite report - mark all user checkboxes (most probable scenario).
-      if ($bean->getAttribute('favorite_report') == -1) {
-        $form->setValueByElement('users_active', array_keys($user_list_active));
-        $form->setValueByElement('users_inactive', false);
+  // Verify bean. Do not proceed with bogus post data.
+  if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
+
+  if($err->no()) {
+    if (!$bean->getAttribute('btn_generate') && $request->getParameter('fav_report_changed')) {
+      // User changed favorite report. We need to load new values into the form.
+      if ($bean->getAttribute('favorite_report')) {
+        // This loads new favorite report options into the bean (into our form).
+        ttFavReportHelper::loadReport($bean);
+
+        // If user selected no favorite report - mark all user checkboxes (most probable scenario).
+        if ($bean->getAttribute('favorite_report') == -1) {
+          $form->setValueByElement('users_active', array_keys($user_list_active));
+          $form->setValueByElement('users_inactive', false);
+        }
+
+        // Save form data in session for future use.
+        $bean->saveBean();
+        header('Location: reports.php');
+        exit();
       }
+    } elseif ($bean->getAttribute('btn_save')) {
+      // User clicked the Save button. We need to save form options as new favorite report.
+
+      // We check new_fav_report here, rather than in ttReportHelper::verifyBean to display a specific error, instead of 'error.sys'.
+      if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
 
-      // Save form data in session for future use.
-      $bean->saveBean();
-      header('Location: reports.php');
-      exit();
-    }
-  } elseif ($bean->getAttribute('btn_save')) {
-    // User clicked the Save button. We need to save form options as new favorite report.
-    if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
-
-    if ($err->no()) {
-      $id = ttFavReportHelper::saveReport($bean);
-      if (!$id)
-        $err->add($i18n->get('error.db'));
       if ($err->no()) {
-        $bean->setAttribute('favorite_report', $id);
+        $id = ttFavReportHelper::saveReport($bean);
+        if (!$id)
+          $err->add($i18n->get('error.db'));
+        if ($err->no()) {
+          $bean->setAttribute('favorite_report', $id);
+          $bean->saveBean();
+          header('Location: reports.php');
+          exit();
+        }
+      }
+    } elseif($bean->getAttribute('btn_delete')) {
+      // Delete button pressed. User wants to delete a favorite report.
+      if ($bean->getAttribute('favorite_report')) {
+        ttFavReportHelper::deleteReport($bean->getAttribute('favorite_report'));
+      // Load default report.
+        $bean->setAttribute('favorite_report','');
+        $bean->setAttribute('new_fav_report', $report_list[0]['name']);
+        ttFavReportHelper::loadReport($bean);
+        $form->setValueByElement('users', array_keys($user_list));
         $bean->saveBean();
         header('Location: reports.php');
         exit();
       }
-    }
-  } elseif($bean->getAttribute('btn_delete')) {
-    // Delete button pressed. User wants to delete a favorite report.
-    if ($bean->getAttribute('favorite_report')) {
-      ttFavReportHelper::deleteReport($bean->getAttribute('favorite_report'));
-      // Load default report.
-      $bean->setAttribute('favorite_report','');
-      $bean->setAttribute('new_fav_report', $report_list[0]['name']);
-      ttFavReportHelper::loadReport($bean);
-      $form->setValueByElement('users', array_keys($user_list));
-      $bean->saveBean();
-      header('Location: reports.php');
-      exit();
-    }
-  } else {
-    // Generate button pressed. Check some values.
-    if (!$bean->getAttribute('period')) {
-      // Validate start date.
-      if (!ttValidDate($bean->getAttribute('start_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
-      // Validate end date.
-      if (!ttValidDate($bean->getAttribute('end_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
-      // Make sure that the end date is equal or after the start date.
-      if ($err->no()) {
-        $startDate = new ttDate($bean->getAttribute('start_date'), $user->getDateFormat());
-        $endDate = new ttDate($bean->getAttribute('end_date'), $user->getDateFormat());
-        if ($startDate->compare($endDate) > 0) {
-          $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+    } else {
+      // Generate button pressed. Check some values.
+      if (!$bean->getAttribute('period')) {
+        // Validate start date.
+        if (!ttValidDate($bean->getAttribute('start_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
+        // Validate end date.
+        if (!ttValidDate($bean->getAttribute('end_date'))) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
+        // Make sure that the end date is equal or after the start date.
+        if ($err->no()) {
+          $startDate = new ttDate($bean->getAttribute('start_date'), $user->getDateFormat());
+          $endDate = new ttDate($bean->getAttribute('end_date'), $user->getDateFormat());
+          if ($startDate->compare($endDate) > 0) {
+            $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
+          }
         }
       }
+      $group_by1 = $bean->getAttribute('group_by1');
+      $group_by2 = $bean->getAttribute('group_by2');
+      $group_by3 = $bean->getAttribute('group_by3');
+      if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
+        $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+      if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
+        $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+      // TODO: review the above checks and possibly move some of them to verifyBean that we call when entering isPost above.
+
+      if ($err->no()) {
+        $bean->saveBean();
+        // Now we can go ahead and create a report.
+        header('Location: report.php');
+        exit();
+      }
     }
-    $group_by1 = $bean->getAttribute('group_by1');
-    $group_by2 = $bean->getAttribute('group_by2');
-    $group_by3 = $bean->getAttribute('group_by3');
-    if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
-      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
-    if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
-      $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
-    // Check remaining values.
-    if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
-
-    if ($err->no()) {
-      $bean->saveBean();
-      // Now we can go ahead and create a report.
-      header('Location: report.php');
-      exit();
-    }
-  }
+  } // if($err->no())
 } // isPost
 
 $smarty->assign('client_list', $client_list);

From 28e13a2deab266ee30354df8b95dd6e47af6f2d8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Mon, 8 May 2023 14:35:05 +0000
Subject: [PATCH 1814/1848] Incremental improvement in data validation for
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 5 ++++-
 initialize.php                       | 2 +-
 report.php                           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c329fcb4f..4a7870bdc 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1868,7 +1868,10 @@ static function verifyBean($bean) {
 
     // Check fav report id.
     $fav_report_id = $bean->getAttribute('favorite_report');
-    if (!($fav_report_id == -1 || ttValidInteger($fav_report_id))) return false;
+    if (!($fav_report_id == -1 || (ttValidInteger($fav_report_id) && ttFavReportHelper::get($fav_report_id)))) return false;
+
+    // Check client id.
+    if (!ttValidInteger($bean->getAttribute('client'), true)) return false;
 
     // Validate checkboxes.
     if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
diff --git a/initialize.php b/initialize.php
index 5de06cb20..394bdb969 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5784");
+define("APP_VERSION", "1.22.12.5785");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/report.php b/report.php
index 4945ac173..b8a549b69 100644
--- a/report.php
+++ b/report.php
@@ -59,7 +59,7 @@
 // If we are in post, load the bean from session, as the constructor does it only in get.
 if ($request->isPost()) $bean->loadBean();
 
-$client_id = $bean->getAttribute('client');
+$client_id = (int)$bean->getAttribute('client');
 $options = ttReportHelper::getReportOptions($bean);
 
 // Do we need to show checkboxes? We show them in the following 4 situations:

From ec9496c95d86e26f785ab0c7dbc9d8ed07fc8fe8 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 9 May 2023 19:37:20 +0000
Subject: [PATCH 1815/1848] Incremental improvenet in data validation for
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 13 ++++++++++---
 initialize.php                       |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4a7870bdc..30c41c8d1 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1756,9 +1756,9 @@ static function getReportOptions($bean) {
     // Construct one by one.
     $options['name'] = null; // No name required.
     $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php.
-    $options['client_id'] = $bean->getAttribute('client');
-    $options['project_id'] = $bean->getAttribute('project');
-    $options['task_id'] = $bean->getAttribute('task');
+    $options['client_id'] = (int)$bean->getAttribute('client');
+    $options['project_id'] = (int)$bean->getAttribute('project');
+    $options['task_id'] = (int)$bean->getAttribute('task');
     $options['billable'] = $bean->getAttribute('include_records');
     $options['invoice'] = $bean->getAttribute('invoice');
     $options['paid_status'] = $bean->getAttribute('paid_status');
@@ -1873,6 +1873,13 @@ static function verifyBean($bean) {
     // Check client id.
     if (!ttValidInteger($bean->getAttribute('client'), true)) return false;
 
+    // Check project id.
+    if (!ttValidInteger($bean->getAttribute('project'), true)) return false;
+
+    // Check task id.
+    if (!ttValidInteger($bean->getAttribute('task'), true)) return false;
+
+
     // Validate checkboxes.
     if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chproject'))) return false;
diff --git a/initialize.php b/initialize.php
index 394bdb969..391cb2dad 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5785");
+define("APP_VERSION", "1.22.12.5786");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 1302b99e81dbb791656778bb0d36205a1ae7bf39 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 10 May 2023 17:21:06 +0000
Subject: [PATCH 1816/1848] Work in progress on validating data for reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 26 +++++++++++++++++---------
 initialize.php                       |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 30c41c8d1..305aa473c 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -48,10 +48,10 @@ static function getWhere($options) {
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
     if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
     if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
-    if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
-    if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not null';
-    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is null';
+    if ($options['billable']==1) $dropdown_parts .= ' and l.billable = 1';
+    if ($options['billable']==2) $dropdown_parts .= ' and l.billable = 0';
+    if ($options['invoice']==1) $dropdown_parts .= ' and l.invoice_id is not null';
+    if ($options['invoice']==2) $dropdown_parts .= ' and l.invoice_id is null';
     if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is null';
     if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is not null';
     if ($options['approved']=='1') $dropdown_parts .= ' and l.approved = 1';
@@ -181,8 +181,8 @@ static function getExpenseWhere($options) {
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
     if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
-    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not null';
-    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
+    if ($options['invoice']==1) $dropdown_parts .= ' and ei.invoice_id is not null';
+    if ($options['invoice']==2) $dropdown_parts .= ' and ei.invoice_id is null';
     if (isset($options['timesheet']) && ($options['timesheet']!=TIMESHEET_ALL && $options['timesheet']!=TIMESHEET_NOT_ASSIGNED)) {
         $dropdown_parts .= ' and 0 = 1'; // Expense items do not have a timesheet_id.
     }
@@ -1755,12 +1755,13 @@ static function getReportOptions($bean) {
 
     // Construct one by one.
     $options['name'] = null; // No name required.
-    $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php.
+    // $options['user_id'] = $user->id; // We don't use user_id in regular reports. But fav reports use it to recycle $user object in cron.php.
     $options['client_id'] = (int)$bean->getAttribute('client');
     $options['project_id'] = (int)$bean->getAttribute('project');
     $options['task_id'] = (int)$bean->getAttribute('task');
-    $options['billable'] = $bean->getAttribute('include_records');
-    $options['invoice'] = $bean->getAttribute('invoice');
+    $options['billable'] = (int)$bean->getAttribute('include_records');
+    $options['invoice'] = (int)$bean->getAttribute('invoice');
+
     $options['paid_status'] = $bean->getAttribute('paid_status');
     $options['approved'] = $bean->getAttribute('approved');
     if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
@@ -1873,6 +1874,12 @@ static function verifyBean($bean) {
     // Check client id.
     if (!ttValidInteger($bean->getAttribute('client'), true)) return false;
 
+    // Check billable control.
+    if (!ttValidInteger($bean->getAttribute('include_records'), true)) return false;
+
+    // Check invoiced / not invoiced control.
+    if (!ttValidInteger($bean->getAttribute('invoice'), true)) return false;
+
     // Check project id.
     if (!ttValidInteger($bean->getAttribute('project'), true)) return false;
 
@@ -1880,6 +1887,7 @@ static function verifyBean($bean) {
     if (!ttValidInteger($bean->getAttribute('task'), true)) return false;
 
 
+
     // Validate checkboxes.
     if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chproject'))) return false;
diff --git a/initialize.php b/initialize.php
index 391cb2dad..4fe6c6ef2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5786");
+define("APP_VERSION", "1.22.12.5787");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0795d5896fc961f12cec61c63aedb779e2c98c74 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 10 May 2023 17:29:07 +0000
Subject: [PATCH 1817/1848] More work in progress on data validation for
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 4 +++-
 initialize.php                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 305aa473c..73f3f165d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1761,8 +1761,8 @@ static function getReportOptions($bean) {
     $options['task_id'] = (int)$bean->getAttribute('task');
     $options['billable'] = (int)$bean->getAttribute('include_records');
     $options['invoice'] = (int)$bean->getAttribute('invoice');
+    $options['paid_status'] = (int)$bean->getAttribute('paid_status');
 
-    $options['paid_status'] = $bean->getAttribute('paid_status');
     $options['approved'] = $bean->getAttribute('approved');
     if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
       $options['approved'] = 1; // Restrict clients to approved records only.
@@ -1886,6 +1886,8 @@ static function verifyBean($bean) {
     // Check task id.
     if (!ttValidInteger($bean->getAttribute('task'), true)) return false;
 
+    // Check paid status control.
+    if (!ttValidInteger($bean->getAttribute('paid_status'), true)) return false;
 
 
     // Validate checkboxes.
diff --git a/initialize.php b/initialize.php
index 4fe6c6ef2..439f2ee6d 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5787");
+define("APP_VERSION", "1.22.12.5788");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6f1fa8fddd5ee4b53eb0850408ccac957478fd8c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 10 May 2023 17:44:35 +0000
Subject: [PATCH 1818/1848] Some more data validation for reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 26 +++++++++++++++-----------
 initialize.php                       |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 73f3f165d..c7b147d95 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -54,10 +54,10 @@ static function getWhere($options) {
     if ($options['invoice']==2) $dropdown_parts .= ' and l.invoice_id is null';
     if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is null';
     if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is not null';
-    if ($options['approved']=='1') $dropdown_parts .= ' and l.approved = 1';
-    if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
-    if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
-    if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
+    if ($options['approved']==1) $dropdown_parts .= ' and l.approved = 1';
+    if ($options['approved']==2) $dropdown_parts .= ' and l.approved = 0';
+    if ($options['paid_status']==1) $dropdown_parts .= ' and l.paid = 1';
+    if ($options['paid_status']==2) $dropdown_parts .= ' and l.paid = 0';
 
     // Add time custom fields.
     if (isset($custom_fields) && $custom_fields->timeFields) {
@@ -186,10 +186,10 @@ static function getExpenseWhere($options) {
     if (isset($options['timesheet']) && ($options['timesheet']!=TIMESHEET_ALL && $options['timesheet']!=TIMESHEET_NOT_ASSIGNED)) {
         $dropdown_parts .= ' and 0 = 1'; // Expense items do not have a timesheet_id.
     }
-    if ($options['approved']=='1') $dropdown_parts .= ' and ei.approved = 1';
-    if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
-    if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
-    if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
+    if ($options['approved']==1) $dropdown_parts .= ' and ei.approved = 1';
+    if ($options['approved']==2) $dropdown_parts .= ' and ei.approved = 0';
+    if ($options['paid_status']==1) $dropdown_parts .= ' and ei.paid = 1';
+    if ($options['paid_status']==2) $dropdown_parts .= ' and ei.paid = 0';
 
     // Not adding conditions for time custom fields by design because expenses are not associated with them.
     // Whether or not this is proper, we'll know eventually if users complain.
@@ -1762,11 +1762,10 @@ static function getReportOptions($bean) {
     $options['billable'] = (int)$bean->getAttribute('include_records');
     $options['invoice'] = (int)$bean->getAttribute('invoice');
     $options['paid_status'] = (int)$bean->getAttribute('paid_status');
-
-    $options['approved'] = $bean->getAttribute('approved');
+    $options['approved'] = (int)$bean->getAttribute('approved');
     if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
       $options['approved'] = 1; // Restrict clients to approved records only.
-    $options['timesheet'] = $bean->getAttribute('timesheet');
+    $options['timesheet'] = (int)$bean->getAttribute('timesheet');
 
     $active_users_in_bean = $bean->getAttribute('users_active');
     $users = '';
@@ -1889,6 +1888,11 @@ static function verifyBean($bean) {
     // Check paid status control.
     if (!ttValidInteger($bean->getAttribute('paid_status'), true)) return false;
 
+    // Check approved status control.
+    if (!ttValidInteger($bean->getAttribute('approved'), true)) return false;
+
+    // Check timesheet status control.
+    if (!ttValidInteger($bean->getAttribute('timesheet'), true)) return false;
 
     // Validate checkboxes.
     if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
diff --git a/initialize.php b/initialize.php
index 439f2ee6d..3a738d7fd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5788");
+define("APP_VERSION", "1.22.12.5789");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0c3c61df8de402970fe804234ada80f3ac1af670 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 11 May 2023 16:39:59 +0000
Subject: [PATCH 1819/1848] Some more data validating for reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 15 +++++++++------
 initialize.php                       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c7b147d95..5c8fdbf65 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1779,7 +1779,7 @@ static function getReportOptions($bean) {
     }
     if ($users) $options['users'] = $users;
 
-    $options['period'] = $bean->getAttribute('period');
+    $options['period'] = (int)$bean->getAttribute('period');
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
     $options['note_containing'] = $bean->getAttribute('note_containing');
@@ -1846,6 +1846,9 @@ static function getReportOptions($bean) {
   static function verifyBean($bean) {
     global $user;
 
+    // Check period control.
+    if (!ttValidInteger($bean->getAttribute('period'), true)) return false;
+
     // Check users.
     $active_users_in_bean = (array) $bean->getAttribute('users_active');
     $inactive_users_in_bean = (array) $bean->getAttribute('users_inactive');
@@ -1898,17 +1901,17 @@ static function verifyBean($bean) {
     if (!ttValidCheckbox($bean->getAttribute('chclient'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chproject'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chtask'))) return false;
-    if (!ttValidCheckbox($bean->getAttribute('chinvoice'))) return false;
-    if (!ttValidCheckbox($bean->getAttribute('chpaid'))) return false;
-    if (!ttValidCheckbox($bean->getAttribute('chip'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chstart'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chfinish'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chduration'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chnote'))) return false;
-    if (!ttValidCheckbox($bean->getAttribute('chcost'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chunits'))) return false;
-    if (!ttValidCheckbox($bean->getAttribute('chtimesheet'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chcost'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chapproved'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chpaid'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chip'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chinvoice'))) return false;
+    if (!ttValidCheckbox($bean->getAttribute('chtimesheet'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chfiles'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chtotalsonly'))) return false;
 
diff --git a/initialize.php b/initialize.php
index 3a738d7fd..511ac11ae 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5789");
+define("APP_VERSION", "1.22.12.5790");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 0ecd0c99a2d45b0dc0670d8444edfdacaa84f66e Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 11 May 2023 17:57:35 +0000
Subject: [PATCH 1820/1848] Added data validation for custom field controls for
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 72 ++++++++++++++++++++++++++--
 initialize.php                       |  2 +-
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 5c8fdbf65..cdaa3e33b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1809,7 +1809,13 @@ static function getReportOptions($bean) {
         foreach ($custom_fields->timeFields as $timeField) {
           $control_name = 'time_field_'.$timeField['id'];
           $checkbox_control_name = 'show_'.$control_name;
-          $options[$control_name] =  $bean->getAttribute($control_name);
+          if ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            // Cast to int for a dropdown for extra security.
+            $options[$control_name] =  (int)$bean->getAttribute($control_name);
+          } elseif ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            // No need to cast to int for a text field.
+            $options[$control_name] =  $bean->getAttribute($control_name);
+          }
           $options[$checkbox_control_name] =  (int)$bean->getAttribute($checkbox_control_name);
         }
       }
@@ -1819,7 +1825,13 @@ static function getReportOptions($bean) {
         foreach ($custom_fields->userFields as $userField) {
           $control_name = 'user_field_'.$userField['id'];
           $checkbox_control_name = 'show_'.$control_name;
-          $options[$control_name] =  $bean->getAttribute($control_name);
+          if ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            // Cast to int for a dropdown for extra security.
+            $options[$control_name] =  (int)$bean->getAttribute($control_name);
+          } elseif ($userField['type'] == CustomFields::TYPE_TEXT) {
+            // No need to cast to int for a text field.
+            $options[$control_name] =  $bean->getAttribute($control_name);
+          }
           $options[$checkbox_control_name] =  (int)$bean->getAttribute($checkbox_control_name);
         }
       }
@@ -1829,7 +1841,13 @@ static function getReportOptions($bean) {
         foreach ($custom_fields->projectFields as $projectField) {
           $control_name = 'project_field_'.$projectField['id'];
           $checkbox_control_name = 'show_'.$control_name;
-          $options[$control_name] =  $bean->getAttribute($control_name);
+          if ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            // Cast to int for a dropdown for extra security.
+            $options[$control_name] =  (int)$bean->getAttribute($control_name);
+          } elseif ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // No need to cast to int for a text field.
+            $options[$control_name] =  $bean->getAttribute($control_name);
+          }
           $options[$checkbox_control_name] = (int)$bean->getAttribute($checkbox_control_name);
         }
       }
@@ -1915,6 +1933,54 @@ static function verifyBean($bean) {
     if (!ttValidCheckbox($bean->getAttribute('chfiles'))) return false;
     if (!ttValidCheckbox($bean->getAttribute('chtotalsonly'))) return false;
 
+    // Verify custom field controls.
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) $custom_fields = new CustomFields();
+
+      // Time fields.
+      if ($custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $control_name = 'time_field_'.$timeField['id'];
+          $checkbox_control_name = 'show_'.$control_name;
+          if ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            if (!ttValidInteger($bean->getAttribute($control_name), true))
+              return false;
+          }
+          if (!ttValidCheckbox($bean->getAttribute($checkbox_control_name), true))
+              return false;
+        }
+      }
+
+      // User fields.
+      if ($custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $control_name = 'user_field_'.$userField['id'];
+          $checkbox_control_name = 'show_'.$control_name;
+          if ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            if (!ttValidInteger($bean->getAttribute($control_name), true))
+              return false;
+          }
+          if (!ttValidCheckbox($bean->getAttribute($checkbox_control_name), true))
+              return false;
+        }
+      }
+
+      // Project fields.
+      if ($custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $control_name = 'project_field_'.$projectField['id'];
+          $checkbox_control_name = 'show_'.$control_name;
+          if ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            if (!ttValidInteger($bean->getAttribute($control_name), true))
+              return false;
+          }
+          if (!ttValidCheckbox($bean->getAttribute($checkbox_control_name), true))
+              return false;
+        }
+      }
+    }
+
     // TODO: add additional checks here.
     return true;
   }
diff --git a/initialize.php b/initialize.php
index 511ac11ae..86bb008d0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5790");
+define("APP_VERSION", "1.22.12.5791");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a1975fbe027e5581da852fa0e802e09bfcaafce0 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 11 May 2023 18:56:46 +0000
Subject: [PATCH 1821/1848] Finished, hopefully, data validation for reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 65 ++++++++++++++++++++++++----
 initialize.php                       |  2 +-
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index cdaa3e33b..4a04f2bbf 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1811,12 +1811,12 @@ static function getReportOptions($bean) {
           $checkbox_control_name = 'show_'.$control_name;
           if ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
             // Cast to int for a dropdown for extra security.
-            $options[$control_name] =  (int)$bean->getAttribute($control_name);
+            $options[$control_name] = (int)$bean->getAttribute($control_name);
           } elseif ($timeField['type'] == CustomFields::TYPE_TEXT) {
             // No need to cast to int for a text field.
-            $options[$control_name] =  $bean->getAttribute($control_name);
+            $options[$control_name] = $bean->getAttribute($control_name);
           }
-          $options[$checkbox_control_name] =  (int)$bean->getAttribute($checkbox_control_name);
+          $options[$checkbox_control_name] = (int)$bean->getAttribute($checkbox_control_name);
         }
       }
 
@@ -1827,12 +1827,12 @@ static function getReportOptions($bean) {
           $checkbox_control_name = 'show_'.$control_name;
           if ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
             // Cast to int for a dropdown for extra security.
-            $options[$control_name] =  (int)$bean->getAttribute($control_name);
+            $options[$control_name] = (int)$bean->getAttribute($control_name);
           } elseif ($userField['type'] == CustomFields::TYPE_TEXT) {
             // No need to cast to int for a text field.
-            $options[$control_name] =  $bean->getAttribute($control_name);
+            $options[$control_name] = $bean->getAttribute($control_name);
           }
-          $options[$checkbox_control_name] =  (int)$bean->getAttribute($checkbox_control_name);
+          $options[$checkbox_control_name] = (int)$bean->getAttribute($checkbox_control_name);
         }
       }
 
@@ -1843,10 +1843,10 @@ static function getReportOptions($bean) {
           $checkbox_control_name = 'show_'.$control_name;
           if ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
             // Cast to int for a dropdown for extra security.
-            $options[$control_name] =  (int)$bean->getAttribute($control_name);
+            $options[$control_name] = (int)$bean->getAttribute($control_name);
           } elseif ($projectField['type'] == CustomFields::TYPE_TEXT) {
             // No need to cast to int for a text field.
-            $options[$control_name] =  $bean->getAttribute($control_name);
+            $options[$control_name] = $bean->getAttribute($control_name);
           }
           $options[$checkbox_control_name] = (int)$bean->getAttribute($checkbox_control_name);
         }
@@ -1981,10 +1981,57 @@ static function verifyBean($bean) {
       }
     }
 
-    // TODO: add additional checks here.
+    if (!ttReportHelper::validGroupByOption($bean->getAttribute('group_by1'))) return false;
+    if (!ttReportHelper::validGroupByOption($bean->getAttribute('group_by2'))) return false;
+    if (!ttReportHelper::validGroupByOption($bean->getAttribute('group_by3'))) return false;
+
     return true;
   }
 
+  // validGroupByOption is a security function to verify selection options for group by controls.
+  static function validGroupByOption($groupByOption) {
+
+    global $user;
+
+    if ($groupByOption == 'no_grouping' || $groupByOption == 'date' || $groupByOption == 'user' || $groupByOption == 'client' || $groupByOption == 'project' || $groupByOption == 'task')
+      return true;
+
+    // Verify custom field group by options.
+    if ($user->isPluginEnabled('cf')) {
+      global $custom_fields;
+      if (!$custom_fields) $custom_fields = new CustomFields();
+
+      // Time fields.
+      if ($custom_fields->timeFields) {
+        foreach ($custom_fields->timeFields as $timeField) {
+          $control_name = 'time_field_'.$timeField['id'];
+          if ($groupByOption == $control_name)
+            return true;
+        }
+      }
+
+      // User fields.
+      if ($custom_fields->userFields) {
+        foreach ($custom_fields->userFields as $userField) {
+          $control_name = 'user_field_'.$userField['id'];
+          if ($groupByOption == $control_name)
+            return true;
+        }
+      }
+
+      // Project fields.
+      if ($custom_fields->projectFields) {
+        foreach ($custom_fields->projectFields as $projectField) {
+          $control_name = 'project_field_'.$projectField['id'];
+          if ($groupByOption == $control_name)
+            return true;
+        }
+      }
+    } // if ($user->isPluginEnabled('cf')) {
+
+    return false;
+  }
+
   // makeGroupByKey builds a combined group by key from group_by1, group_by2 and group_by3 values
   // (passed in $options) and a row of data ($row obtained from a db query).
   static function makeGroupByKey($options, $row) {
diff --git a/initialize.php b/initialize.php
index 86bb008d0..23c326ec2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.12.5791");
+define("APP_VERSION", "1.22.13.5792");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 66e182f6c0427e00a1dd1ec9244156e909bfbf77 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 12 May 2023 13:51:50 +0000
Subject: [PATCH 1822/1848] Securing fav reports in notifications by casting
 some values to int.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 13 +++++++++++++
 initialize.php                          |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 00a1bd5bb..51bfa7aba 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -454,6 +454,19 @@ static function getReportOptions($id) {
     unset($options['id']);
     unset($options['status']);
 
+    // Cast to int some values similar to ttReportHelper::getReportOptions
+    // where we do it for extra protection against SQL injections.
+    // This step is redundant, though, as data validation is supposed to work.
+    // However, in case we missed something, casting to int reduces our risks.
+    $options['client_id'] = isset($options['client_id']) ? (int)$options['client_id'] : 0;
+    $options['project_id'] = isset($options['project_id']) ? (int)$options['project_id'] : 0;
+    $options['task_id'] = isset($options['task_id']) ? (int)$options['task_id'] : 0;
+    $options['billable'] = isset($options['billable']) ? (int)$options['billable'] : 0;
+    $options['invoice'] = isset($options['invoice']) ? (int)$options['invoice'] : 0;
+    $options['paid_status'] = isset($options['paid_status']) ? (int)$options['paid_status'] : 0;
+    $options['approved'] = isset($options['approved']) ? (int)$options['approved'] : 0;
+    $options['timesheet'] = isset($options['timesheet']) ? (int)$options['timesheet'] : 0;
+
     // Note: special handling for NULL users field is done in cron.php
 
     // $options now is a subset of db fields from tt_fav_reports table.
diff --git a/initialize.php b/initialize.php
index 23c326ec2..f453544ee 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.13.5792");
+define("APP_VERSION", "1.22.13.5793");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 6852f65a2b4f86a0a8daed905037fb5b7d3d9c4d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 12 May 2023 16:37:45 +0000
Subject: [PATCH 1823/1848] Fixed JavaScript on reports.php to work with task
 control population better.

---
 WEB-INF/templates/reports.tpl | 9 +++++++--
 initialize.php                | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 42cdd661f..1e5f26099 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -77,7 +77,12 @@ function fillProjectDropdown(id) {
 
   // Remove existing content.
   dropdown.length = 0;
-  var project_reset = true;
+
+  // project_reset is set to true if there is no previously selected project for a passed in client id.
+  // For example, a newly selected client is not associated with prevoisly selected project.
+  // This means that previous  project selection is lost and we set to --- all ---.
+  var project_reset = selected_item ? true : false;
+
   // Add mandatory top option.
   dropdown.options[0] = new Option(empty_label, '', true);
 
@@ -133,7 +138,7 @@ function fillTaskDropdown(project_id) {
   var dropdown = document.getElementById("task");
   // Determine previously selected item.
   var selected_item = dropdown.options[dropdown.selectedIndex].value;
-
+//alert(selected_item);
   // Remove existing content.
   dropdown.length = 0;
   // Add mandatory top option.
diff --git a/initialize.php b/initialize.php
index f453544ee..4af934623 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.13.5793");
+define("APP_VERSION", "1.22.13.5794");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 604d5dd0896fa6bef433c79aacf5494b4e15b982 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 12 May 2023 16:40:50 +0000
Subject: [PATCH 1824/1848] Cosmetic. Comment.

---
 WEB-INF/templates/reports.tpl | 3 +--
 initialize.php                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 1e5f26099..6c0cde76e 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -80,7 +80,7 @@ function fillProjectDropdown(id) {
 
   // project_reset is set to true if there is no previously selected project for a passed in client id.
   // For example, a newly selected client is not associated with prevoisly selected project.
-  // This means that previous  project selection is lost and we set to --- all ---.
+  // This means that previous project selection is lost and we set to --- all ---.
   var project_reset = selected_item ? true : false;
 
   // Add mandatory top option.
@@ -138,7 +138,6 @@ function fillTaskDropdown(project_id) {
   var dropdown = document.getElementById("task");
   // Determine previously selected item.
   var selected_item = dropdown.options[dropdown.selectedIndex].value;
-//alert(selected_item);
   // Remove existing content.
   dropdown.length = 0;
   // Add mandatory top option.
diff --git a/initialize.php b/initialize.php
index 4af934623..fe8603d22 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.13.5794");
+define("APP_VERSION", "1.22.13.5795");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From d26cd7271f0a20b0a30d7d0ac55e64f165ba75dd Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 12 May 2023 18:00:06 +0000
Subject: [PATCH 1825/1848] Fixing missing timesheet name in emailed reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 2 +-
 initialize.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4a04f2bbf..55f73e13a 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1536,7 +1536,7 @@ static function prepareReportBody($options, $comment = null)
           if ($options['show_invoice'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           if ($options['show_timesheet'])
-            $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
+            $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet_name']).'</td>';
           $body .= '</tr>';
           if ($show_note_row && $record['note']) {
             $body .= '<tr style="'.$row_style.'">';
diff --git a/initialize.php b/initialize.php
index fe8603d22..54ce21f69 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.13.5795");
+define("APP_VERSION", "1.22.14.5796");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 4b429dff1ad88eaa3a2e35e0a5d9d1902a1f0bf5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 12 May 2023 18:05:58 +0000
Subject: [PATCH 1826/1848] Fixed alignment for timesheet name in emailed
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 2 +-
 initialize.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 55f73e13a..ca99e6a19 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1536,7 +1536,7 @@ static function prepareReportBody($options, $comment = null)
           if ($options['show_invoice'])
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           if ($options['show_timesheet'])
-            $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet_name']).'</td>';
+            $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['timesheet_name']).'</td>';
           $body .= '</tr>';
           if ($show_note_row && $record['note']) {
             $body .= '<tr style="'.$row_style.'">';
diff --git a/initialize.php b/initialize.php
index 54ce21f69..67f823aa1 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.14.5796");
+define("APP_VERSION", "1.22.14.5797");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From f28a652f4d7eb4df88b91c4b0f405d375e215708 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 May 2023 13:57:27 +0000
Subject: [PATCH 1827/1848] Work in progress on bringing fav report options
 data types in sync with regular reports.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 18 ++++++++++++++++++
 initialize.php                          |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 51bfa7aba..aed2bf6d0 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -466,6 +466,24 @@ static function getReportOptions($id) {
     $options['paid_status'] = isset($options['paid_status']) ? (int)$options['paid_status'] : 0;
     $options['approved'] = isset($options['approved']) ? (int)$options['approved'] : 0;
     $options['timesheet'] = isset($options['timesheet']) ? (int)$options['timesheet'] : 0;
+    $options['period'] = isset($options['period']) ? (int)$options['period'] : 0;
+
+    $options['show_client'] = isset($options['show_client']) ? (int)$options['show_client'] : 0;
+    $options['show_invoice'] = isset($options['show_invoice']) ? (int)$options['show_invoice'] : 0;
+    $options['show_approved'] = isset($options['show_approved']) ? (int)$options['show_approved'] : 0;
+    $options['show_paid'] = isset($options['show_paid']) ? (int)$options['show_paid'] : 0;
+    $options['show_ip'] = isset($options['show_ip']) ? (int)$options['show_ip'] : 0;
+    $options['show_project'] = isset($options['show_project']) ? (int)$options['show_project'] : 0;
+    $options['show_start'] = isset($options['show_start']) ? (int)$options['show_start'] : 0;
+    $options['show_duration'] = isset($options['show_duration']) ? (int)$options['show_duration'] : 0;
+    $options['show_cost'] = isset($options['show_cost']) ? (int)$options['show_cost'] : 0;
+    $options['show_task'] = isset($options['show_task']) ? (int)$options['show_task'] : 0;
+    $options['show_end'] = isset($options['show_end']) ? (int)$options['show_end'] : 0;
+    $options['show_note'] = isset($options['show_note']) ? (int)$options['show_note'] : 0;
+    $options['show_work_units'] = isset($options['show_work_units']) ? (int)$options['show_work_units'] : 0;
+    $options['show_timesheet'] = isset($options['show_timesheet']) ? (int)$options['show_timesheet'] : 0;
+    $options['show_files'] = isset($options['show_files']) ? (int)$options['show_files'] : 0;
+    $options['show_totals_only'] = isset($options['show_totals_only']) ? (int)$options['show_totals_only'] : 0;
 
     // Note: special handling for NULL users field is done in cron.php
 
diff --git a/initialize.php b/initialize.php
index 67f823aa1..6ff5d4f6c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.14.5797");
+define("APP_VERSION", "1.22.14.5798");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 14d06fa90d6688677524ac6b40d344e0917152a9 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 13 May 2023 14:52:59 +0000
Subject: [PATCH 1828/1848] Brought fav report options data types in sync with
 regular report options.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 33 ++++++++++++++++++++-----
 initialize.php                          |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index aed2bf6d0..cf6090b29 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -485,6 +485,9 @@ static function getReportOptions($id) {
     $options['show_files'] = isset($options['show_files']) ? (int)$options['show_files'] : 0;
     $options['show_totals_only'] = isset($options['show_totals_only']) ? (int)$options['show_totals_only'] : 0;
 
+    // Note: We can't cast anything to int for custom fields because global $user object is not recycled
+    // yet for user id. See cron.php. Because of this we do it in adjustOptions instead.
+
     // Note: special handling for NULL users field is done in cron.php
 
     // $options now is a subset of db fields from tt_fav_reports table.
@@ -556,9 +559,15 @@ static function adjustOptions($options) {
           $field_name = 'time_field_'.$timeField['id'];
           $checkbox_field_name = 'show_'.$field_name;
           $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
-          $options[$field_name] = $field_value;
+          if ($timeField['type'] == CustomFields::TYPE_DROPDOWN) {
+            // Cast to int for a dropdown for extra security.
+            $options[$field_name] = (int)$field_value;
+          } elseif ($timeField['type'] == CustomFields::TYPE_TEXT) {
+            // No need to cast to int for a text field.
+            $options[$field_name] = $field_value;
+          }
           $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
-          $options[$checkbox_field_name] = $checkbox_value;
+          $options[$checkbox_field_name] = (int)$checkbox_value;
         }
       }
       // User fields.
@@ -567,9 +576,15 @@ static function adjustOptions($options) {
           $field_name = 'user_field_'.$userField['id'];
           $checkbox_field_name = 'show_'.$field_name;
           $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
-          $options[$field_name] = $field_value;
+          if ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+            // Cast to int for a dropdown for extra security.
+            $options[$field_name] = (int)$field_value;
+          } elseif ($userField['type'] == CustomFields::TYPE_TEXT) {
+            // No need to cast to int for a text field.
+            $options[$field_name] = $field_value;
+          }
           $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
-          $options[$checkbox_field_name] = $checkbox_value;
+          $options[$checkbox_field_name] = (int)$checkbox_value;
         }
       }
       // Project fields.
@@ -578,9 +593,15 @@ static function adjustOptions($options) {
           $field_name = 'project_field_'.$projectField['id'];
           $checkbox_field_name = 'show_'.$field_name;
           $field_value = ttFavReportHelper::getFieldSettingFromReportSpec($field_name, $report_spec);
-          $options[$field_name] = $field_value;
+          if ($projectField['type'] == CustomFields::TYPE_DROPDOWN) {
+            // Cast to int for a dropdown for extra security.
+            $options[$field_name] = (int)$field_value;
+          } elseif ($projectField['type'] == CustomFields::TYPE_TEXT) {
+            // No need to cast to int for a text field.
+            $options[$field_name] = $field_value;
+          }
           $checkbox_value = ttFavReportHelper::getFieldSettingFromReportSpec($checkbox_field_name, $report_spec);
-          $options[$checkbox_field_name] = $checkbox_value;
+          $options[$checkbox_field_name] = (int)$checkbox_value;
         }
       }
     }
diff --git a/initialize.php b/initialize.php
index 6ff5d4f6c..e61dfcbf3 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.14.5798");
+define("APP_VERSION", "1.22.14.5799");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From ca1b213332fe57befccf37b2ccf6df1e3438e15c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 17 May 2023 16:13:12 +0000
Subject: [PATCH 1829/1848] Fixed validation routine for group by controls on
 reports.

---
 WEB-INF/lib/ttReportHelper.class.php | 2 +-
 charts.php                           | 4 ++--
 expenses.php                         | 3 ++-
 initialize.php                       | 2 +-
 invoices.php                         | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ca99e6a19..842529a66 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1993,7 +1993,7 @@ static function validGroupByOption($groupByOption) {
 
     global $user;
 
-    if ($groupByOption == 'no_grouping' || $groupByOption == 'date' || $groupByOption == 'user' || $groupByOption == 'client' || $groupByOption == 'project' || $groupByOption == 'task')
+    if ($groupByOption == 'no_grouping' || $groupByOption == 'date' || $groupByOption == 'user' || $groupByOption == 'client' || $groupByOption == 'project' || $groupByOption == 'task' || $groupByOption == null)
       return true;
 
     // Verify custom field group by options.
diff --git a/charts.php b/charts.php
index a4c24f0a0..9dbb95c70 100644
--- a/charts.php
+++ b/charts.php
@@ -37,7 +37,7 @@
   header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
   exit();
 }
-$userDropdownSelectionId = (int) $request->getParameter('user'); // Resused below access checks.
+$userDropdownSelectionId = (int)$request->getParameter('user'); // Reused below access checks.
 if ($request->isPost() && $request->getParameter('user')) {
   if ($userDropdownSelectionId == constant('ALL_USERS_OPTION_ID') && !ttAccessAllowed('view_all_charts')) {
     header('Location: access_denied.php'); // All users option is only for users with view_all_charts access right.
@@ -56,7 +56,7 @@
 // End of access checks.
 
 // Determine user for whom we display this page.
-$userChanged = (int) $request->getParameter('user_changed');
+$userChanged = (int)$request->getParameter('user_changed');
 if ($request->isPost() && $userChanged ) {
   if ($userDropdownSelectionId != constant('ALL_USERS_OPTION_ID')) {
     $user->setOnBehalfUser($userDropdownSelectionId);
diff --git a/expenses.php b/expenses.php
index ba091a63e..3cbbd8bec 100644
--- a/expenses.php
+++ b/expenses.php
@@ -33,7 +33,8 @@
   exit();
 }
 if ($request->isPost() && $request->getParameter('user')) {
-  if (!$user->isUserValid((int)$request->getParameter('user'))) {
+  $posted_user_id = $request->getParameter('user');
+  if (!ttValidInteger($posted_user_id) && !$user->isUserValid($posted_user_id)) {
     header('Location: access_denied.php'); // Wrong user id on post.
     exit();
   }
diff --git a/initialize.php b/initialize.php
index e61dfcbf3..81ebc2aaf 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.14.5799");
+define("APP_VERSION", "1.22.15.5800");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/invoices.php b/invoices.php
index f1eda4849..d34e1220e 100644
--- a/invoices.php
+++ b/invoices.php
@@ -76,7 +76,7 @@
   if (!ttInvoiceHelper::validSortOrder($sort_order_2)) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
   if ($sort_option_1 == $sort_option_2) $err->add($i18n->get('error.field'),  $i18n->get('label.sort'));
 
-  if($err->no() && $request->getParameter('sorting_changed')) {
+  if ($err->no() && $request->getParameter('sorting_changed')) {
     // User changed sorting. Get invoices sorted accordingly.
     $sort_options = array('sort_option_1'=>$sort_option_1,
       'sort_order_1'=>$sort_order_1,

From d54c1aca4c19322fd4a3f23352f6eb07c1548090 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 21 May 2023 15:56:12 +0000
Subject: [PATCH 1830/1848] Fixed sorting of tasks in Tasks dropdown on time
 entry pages.

---
 WEB-INF/lib/ttUser.class.php      |  2 +-
 WEB-INF/templates/time_script.tpl | 19 ++++++-------------
 initialize.php                    |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 2bf5c0298..fedf3dafb 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -359,7 +359,7 @@ function getAssignedProjects($options = null)
     // Do a query with inner join to get assigned projects.
     $sql = "select p.id, p.name, p.description, p.tasks, upb.rate $filePart from tt_projects p $fileJoin".
       " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
-      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $bindTemplatesWithProjects = isset($options['include_templates']) && $options['include_templates'];
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 141df7ea3..0dafae8cd 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -12,7 +12,6 @@
 // project_ids[143] = "325,370,390,400";  // Comma-separated list of project ids for client.
 // project_names[325] = "Time Tracker";   // Project name.
 // task_ids[325] = "100,101,302,303,304"; // Comma-separated list ot task ids for project.
-// task_names[100] = "Coding";            // Task name.
 // template_ids[325] = "17,21";           // Comma-separated list ot template ids for project. NOT YET IMPLEMENTED.
 
 // Prepare an array of project ids for clients.
@@ -38,11 +37,6 @@ var task_ids = new Array();
 {foreach $project_list as $project}
   task_ids[{$project.id}] = "{$project.tasks}";
 {/foreach}
-// Prepare an array of task names.
-var task_names = new Array();
-{foreach $task_list as $task}
-  task_names[{$task.id}] = "{$task.name|escape:'javascript'}";
-{/foreach}
 
 // Prepare an array of template ids for projects.
 var template_ids = new Array();
@@ -143,7 +137,6 @@ function fillProjectDropdown(id) {
 // tasks associated with a selected project (project id is passed here as id).
 function fillTaskDropdown(id) {
   var str_ids = task_ids[id];
-
   var dropdown = document.getElementById("task");
   if (dropdown == null) return; // Nothing to do.
 
@@ -155,20 +148,20 @@ function fillTaskDropdown(id) {
   // Add mandatory top option.
   dropdown.options[0] = new Option(empty_label_task, '', true);
 
-  // Populate the dropdown from the task_names array.
+  // Populate the Task dropdown.
   if (str_ids) {
     var ids = new Array();
     ids = str_ids.split(",");
     var len = ids.length;
 
+    // Iterate through $task_list because it is sorted by upper(name).
     var idx = 1;
-    for (var i = 0; i < len; i++) {
-      var t_id = ids[i];
-      if (task_names[t_id]) {
-        dropdown.options[idx] = new Option(task_names[t_id], t_id);
+    {foreach $task_list as $task}
+      if (ids.includes("{$task.id}")) {
+        dropdown.options[idx] = new Option("{$task.name|escape:'javascript'}", {$task.id});
         idx++;
       }
-    }
+    {/foreach}
 
     // If a previously selected item is still in dropdown - select it.
     if (dropdown.options.length > 0) {
diff --git a/initialize.php b/initialize.php
index 81ebc2aaf..a1fa769c8 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.15.5800");
+define("APP_VERSION", "1.22.16.5801");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 3fd640e1fe5913739ee73226368aae9efb6353c2 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Jun 2023 14:15:36 +0000
Subject: [PATCH 1831/1848] A fix for 0 duration entries in day and week views.

---
 WEB-INF/lib/ttTimeHelper.class.php |  5 ++---
 initialize.php                     |  2 +-
 time.php                           |  2 +-
 time_edit.php                      | 12 +++++-------
 week.php                           |  5 +----
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 2e9eddbb1..424c8b9c0 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -440,8 +440,7 @@ static function insert($fields)
 
     if (!$billable) $billable = 0;
     if (!$paid) $paid = 0;
-
-    if ($duration) {
+    if (!is_null($duration)) {
       $sql = "insert into tt_log (user_id, group_id, org_id, date, duration, client_id, project_id, task_id, invoice_id, comment, billable, paid, created, created_ip, created_by) ".
         "values ($user_id, $group_id, $org_id, ".$mdb2->quote($date).", '$duration', ".$mdb2->quote($client).", ".$mdb2->quote($project).", ".$mdb2->quote($task).", ".$mdb2->quote($invoice).", ".$mdb2->quote($note).", $billable, $paid $created_v)";
       $affected = $mdb2->exec($sql);
@@ -502,7 +501,7 @@ static function update($fields)
     
     if ($start) $duration = '';
 
-    if ($duration) {
+    if (!is_null($duration)) {
       $sql = "UPDATE tt_log set start = NULL, duration = '$duration', client_id = ".$mdb2->quote($client).", project_id = ".$mdb2->quote($project).", task_id = ".$mdb2->quote($task).", ".
         "comment = ".$mdb2->quote($note)."$billable_part $paid_part $modified_part, date = '$date' WHERE id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
       $affected = $mdb2->exec($sql);
diff --git a/initialize.php b/initialize.php
index a1fa769c8..344ce607c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.16.5801");
+define("APP_VERSION", "1.22.17.5802");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time.php b/time.php
index 931436fae..ee90770b8 100644
--- a/time.php
+++ b/time.php
@@ -386,7 +386,7 @@
     if ($showTask && $taskRequired) {
       if (!$cl_task) $err->add($i18n->get('error.task'));
     }
-    if ($cl_duration == null || strlen($cl_duration) == 0) {
+    if ($cl_duration == null) {
       if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
           $err->add($i18n->get('error.field'), $i18n->get('label.start'));
diff --git a/time_edit.php b/time_edit.php
index 7c3491eab..7bcfe4aae 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -63,9 +63,9 @@
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
 if ($request->isPost()) {
-  $cl_start = trim($request->getParameter('start'));
-  $cl_finish = trim($request->getParameter('finish'));
-  $cl_duration = trim($request->getParameter('duration'));
+  $cl_start = is_null($request->getParameter('start')) ? null : trim($request->getParameter('start'));
+  $cl_finish = is_null($request->getParameter('finish')) ? null : trim($request->getParameter('finish'));
+  $cl_duration = is_null($request->getParameter('duration')) ? null : trim($request->getParameter('duration'));
   $cl_date = $request->getParameter('date');
   $cl_note = trim($request->getParameter('note'));
   // If we have time custom fields - collect input.
@@ -292,10 +292,8 @@
   if ($showTask &&  $taskRequired) {
     if (!$cl_task) $err->add($i18n->get('error.task'));
   }
-  if (!$cl_duration) {
-    if ('0' == $cl_duration)
-      $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
-    elseif ($cl_start || $cl_finish) {
+  if ($cl_duration == null) {
+    if ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
         $err->add($i18n->get('error.field'), $i18n->get('label.start'));
       if ($cl_finish) {
diff --git a/week.php b/week.php
index 16a00dff6..4e1e88cbf 100644
--- a/week.php
+++ b/week.php
@@ -481,9 +481,6 @@ function render(&$table, $value, $row, $column, $selected = false) {
               continue;
             // Posted value is different.
             if ($existingDuration == null) {
-              // Skip inserting 0 duration values.
-              if (0 == ttTimeHelper::toMinutes($postedDuration))
-                continue;
               // Insert a new record.
               $fields = array();
               $fields['row_id'] = $dataArray[$rowNumber]['row_id'];
@@ -524,7 +521,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
                 }
               }
               $result = ttWeekViewHelper::insertDurationFromWeekView($fields, $custom_fields, $err);
-            } elseif ($postedDuration == null || 0 == ttTimeHelper::toMinutes($postedDuration)) {
+            } elseif ($postedDuration == null) {
               // Delete an already existing record here.
               $result = ttTimeHelper::delete($dataArray[$rowNumber][$dayHeader]['tt_log_id']);
             } else {

From c5e4c12c8675fbf5313292f16ef323a52103ab27 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Jun 2023 14:43:34 +0000
Subject: [PATCH 1832/1848] Fixed editig of records.

---
 WEB-INF/lib/ttTimeHelper.class.php | 2 +-
 initialize.php                     | 2 +-
 time_edit.php                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 424c8b9c0..6019b2f12 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -499,7 +499,7 @@ static function update($fields)
     $finish = ttTimeHelper::to24HourFormat($finish);
     if ('00:00' == $finish) $finish = '24:00';
     
-    if ($start) $duration = '';
+    if ($start) $duration = null;
 
     if (!is_null($duration)) {
       $sql = "UPDATE tt_log set start = NULL, duration = '$duration', client_id = ".$mdb2->quote($client).", project_id = ".$mdb2->quote($project).", task_id = ".$mdb2->quote($task).", ".
diff --git a/initialize.php b/initialize.php
index 344ce607c..07bb0ee84 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.17.5802");
+define("APP_VERSION", "1.22.17.5803");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index 7bcfe4aae..ca951b69b 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -354,7 +354,7 @@
         $err->add($i18n->get('error.range_locked'));
 
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-      $uncompleted = ($cl_finish == '' && $cl_duration == '');
+      $uncompleted = ($cl_finish == null && $cl_duration == null);
       if ($uncompleted && $oneUncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user_id);
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {

From 144ba915c4aa883438ba5be936123e2aeec74bc1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 15 Jun 2023 14:57:12 +0000
Subject: [PATCH 1833/1848] Cosmetic.

---
 initialize.php | 2 +-
 time_edit.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/initialize.php b/initialize.php
index 07bb0ee84..3ebf911ee 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.17.5803");
+define("APP_VERSION", "1.22.17.5804");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/time_edit.php b/time_edit.php
index ca951b69b..35037dcaf 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -117,8 +117,8 @@
 
   // Add an info message to the form if we are editing an uncompleted record.
   if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
-    $cl_finish = '';
-    $cl_duration = '';
+    $cl_finish = null;
+    $cl_duration = null;
     $msg->add($i18n->get('form.time_edit.uncompleted'));
   }
 }

From 334f96dbfd5389f3c4f7fc914c54ceccfa1de0fa Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Jun 2023 13:10:01 +0000
Subject: [PATCH 1834/1848] Fixed issue #131 - unable to set some values from
 week view.

---
 WEB-INF/lib/ttWeekViewHelper.class.php | 17 ++++++++--------
 initialize.php                         |  2 +-
 week.php                               | 27 +++++++++++++++-----------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 4ee5346a9..cd1e4a952 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -179,7 +179,7 @@ static function getDataForWeekView($records, $dayHeaders) {
         $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
       }
     } else {
-      for ($i = 1; $i < 6; $i++) {
+      for ($i = 0; $i < 5; $i++) {
         $control_id = '0_'. $dayHeaders[$i];
         $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
       }
@@ -194,7 +194,7 @@ static function getDataForWeekView($records, $dayHeaders) {
           $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
         }
       } else {
-        for ($i = 1; $i < 6; $i++) {
+        for ($i = 0; $i < 5; $i++) {
           $control_id = '1_'. $dayHeaders[$i];
           $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
         }
@@ -226,7 +226,7 @@ static function getDataForWeekView($records, $dayHeaders) {
             $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
           }
         } else {
-          for ($i = 1; $i < 6; $i++) {
+          for ($i = 0; $i < 5; $i++) {
             $control_id = $pos.'_'. $dayHeaders[$i];
             $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
           }
@@ -242,7 +242,7 @@ static function getDataForWeekView($records, $dayHeaders) {
               $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
             }
           } else {
-            for ($i = 1; $i < 6; $i++) {
+            for ($i = 0; $i < 5; $i++) {
               $control_id = $pos.'_'. $dayHeaders[$i];
               $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
             }
@@ -308,7 +308,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
         $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
       }
     } else {
-      for ($i = 1; $i < 6; $i++) {
+      for ($i = 0; $i < 5; $i++) {
         $control_id = '0_'. $dayHeaders[$i];
         $dataArray[0][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
       }
@@ -324,7 +324,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
           $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
         }
       } else {
-        for ($i = 1; $i < 6; $i++) {
+        for ($i = 0; $i < 5; $i++) {
           $control_id = '1_'. $dayHeaders[$i];
           $dataArray[1][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
         }
@@ -348,7 +348,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
             $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
           }
         } else {
-          for ($i = 1; $i < 6; $i++) {
+          for ($i = 0; $i < 5; $i++) {
             $control_id = $pos.'_'. $dayHeaders[$i];
             $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'duration' => null);
           }
@@ -364,7 +364,7 @@ static function prePopulateFromPastWeeks($startDate, $dayHeaders) {
               $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
             }
           } else {
-            for ($i = 1; $i < 6; $i++) {
+            for ($i = 0; $i < 5; $i++) {
               $control_id = $pos.'_'. $dayHeaders[$i];
               $dataArray[$pos][$dayHeaders[$i]] = array('control_id' => $control_id, 'tt_log_id' => null,'note' => null);
             }
@@ -443,7 +443,6 @@ static function getLockedDaysForWeek($start_date) {
       $lockedDays[] = $user->isDateLocked($objDate);
       $objDate->incrementDay();
     }
-    unset($objDate);
     return $lockedDays;
   }
 
diff --git a/initialize.php b/initialize.php
index 3ebf911ee..57f5a366e 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.17.5804");
+define("APP_VERSION", "1.22.18.5805");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 4e1e88cbf..0a573bf27 100644
--- a/week.php
+++ b/week.php
@@ -169,10 +169,15 @@
     $weekend_start_idx = 6 - $weekStartDay;
     $weekend_end_idx = (7 - $weekStartDay) % 7;
   }
-  unset($dayHeaders[$weekend_start_idx]);
-  unset($dayHeaders[$weekend_end_idx]);
-  unset($lockedDays[$weekend_start_idx]);
-  unset($lockedDays[$weekend_end_idx]);
+  if ($weekend_end_idx > $weekend_start_idx) {
+    array_splice($dayHeaders, $weekend_start_idx, 2);
+    array_splice($lockedDays, $weekend_start_idx, 2);
+  } else {
+    array_splice($dayHeaders, $weekend_start_idx, 1);
+    array_splice($dayHeaders, $weekend_end_idx, 1);
+    array_splice($lockedDays, $weekend_start_idx, 1);
+    array_splice($lockedDays, $weekend_end_idx, 1);
+  }
 }
 
 // Get already existing records.
@@ -291,14 +296,14 @@ function render(&$table, $value, $row, $column, $selected = false) {
 // Add columns to table.
 $table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $dayTotals['label']));
 
-
-
-for ($i = 0; $i < 7; $i++) {
-  if ($showWeekends)
+if ($showWeekends) {
+  for ($i = 0; $i < 7; $i++) {
+    $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
+  }
+}
+else {
+  for ($i = 0; $i < 5; $i++) {
     $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
-  else {
-    if ($i <> $weekend_start_idx && $i <> $weekend_end_idx)
-      $table->addColumn(new TableColumn($dayHeaders[$i], $dayHeaders[$i], new WeekViewCellRenderer(), $dayTotals[$dayHeaders[$i]]));
   }
 }
 $table->setInteractive(false);

From 43a19fcb51a21f6e3169084ac81308a6ef751e63 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 22 Jun 2023 14:40:14 +0000
Subject: [PATCH 1835/1848] Addressed issue #132 - unable to change user on
 week view.

---
 initialize.php | 2 +-
 week.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/initialize.php b/initialize.php
index 57f5a366e..e9849a97f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.18.5805");
+define("APP_VERSION", "1.22.19.5806");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/week.php b/week.php
index 0a573bf27..3c2384b91 100644
--- a/week.php
+++ b/week.php
@@ -411,7 +411,7 @@ function render(&$table, $value, $row, $column, $selected = false) {
 $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date));
 
 // A hidden control for today's date from user's browser.
-$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'get_date()')); // User current date, which gets filled in on btn_submit click.
+$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
 
 // Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));

From a49a5c28228a9502d0b639d610324884d2346e10 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Jun 2023 18:29:45 +0000
Subject: [PATCH 1836/1848] Initial implementation of multiple project select
 for projects.

---
 WEB-INF/lib/form/ActionForm.class.php         |   2 -
 WEB-INF/lib/form/Form.class.php               |  10 ++
 .../lib/form/MultipleSelectCombobox.class.php |  90 ++++++++++++++
 WEB-INF/lib/ttFavReportHelper.class.php       |  29 ++++-
 WEB-INF/lib/ttReportHelper.class.php          |  34 +++++-
 WEB-INF/templates/reports.tpl                 | 114 +++++++++++++-----
 initialize.php                                |   2 +-
 reports.php                                   |  13 +-
 8 files changed, 251 insertions(+), 43 deletions(-)
 create mode 100644 WEB-INF/lib/form/MultipleSelectCombobox.class.php

diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index 253091b48..a60800a44 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -164,14 +164,12 @@ function loadBean() {
     	$el_list = @$_SESSION[$this->mSessionCell . "session_store_elements"];
     	if (is_array($el_list)) {
     		foreach ($el_list as $ref_el) {
-    			
     			// restore form elements
     			import('form.'.$ref_el["class"]);
     			$class_name = $ref_el["class"];
     			$el = new $class_name($ref_el["name"]);
                         $el->localize();
     			$el->setValueSafe(@$_SESSION[$this->mSessionCell . "_" .$el->getName()]);
-    			
 				if ($this->mForm && !isset($this->mForm->elements[$ref_el["name"]])) {
 					$this->mForm->elements[$ref_el["name"]] = &$el;
 				}
diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 27a36e9ba..cee608fe5 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -103,6 +103,16 @@ function addInput($params) {
 			    if (isset($params["datakeys"])) $el->setDataKeys($params["datakeys"]);
 			    break;
 
+                        case "multipleselectcombobox":
+			    import('form.MultipleSelectCombobox');
+                            $multipleSelectComboboxName = $params["name"].'[]';
+			    $el = new MultipleSelectCombobox($multipleSelectComboboxName);
+			    $el->setData(@$params["data"]);
+			    $el->setDataDefault(@$params["empty"]);
+                            if (isset($params['class'])) $el->setCssClass($params['class']);
+			    if (isset($params["datakeys"])) $el->setDataKeys($params["datakeys"]);
+			    break;
+
 			case "calendar":
 			    import('form.Calendar');
 			    $el = new Calendar($params["name"]);
diff --git a/WEB-INF/lib/form/MultipleSelectCombobox.class.php b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
new file mode 100644
index 000000000..9139c6094
--- /dev/null
+++ b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
@@ -0,0 +1,90 @@
+<?php
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
+
+import('form.FormElement')
+
+//  name        CDATA          #IMPLIED  -- field name --
+//  size        NUMBER         #IMPLIED  -- rows visible --
+//  multiple    (multiple)     #IMPLIED  -- default is single selection --
+//  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+//  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+//  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+//  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+//  onchange    %Script;       #IMPLIED  -- the element value was changed --
+
+class MultipleSelectCombobox extends FormElement {
+    //var $mMultiple	= false;
+    var $mOptions	= array();
+    var $mOptionsEmpty	= array();
+    var $mCompareOn = "key"; // or "value"
+    var $mDataDeep = 1;
+    var $mDataKeys = array();
+
+  function __construct($name) {
+    $this->class = 'MultipleSelectCombobox';
+    $this->css_class = 'dropdown-field';
+    $this->name = $name;
+  }
+
+	//function setMultiple($value)	{ $this->mMultiple = $value; }
+	//function isMultiple() { return $this->mMultiple;
+
+	function setData($value)	{ $this->mOptions = $value; }
+	function getData() { return $this->mOptions; }
+
+	function setDataDefault($value)	{ $this->mOptionsEmpty = $value; }
+	function getDataDefault() { return $this->mOptionsEmpty; }
+
+	function setDataKeys($keys)	{ $this->mDataKeys = $keys; $this->mDataDeep = 2; }
+	function getDataKeys() { return $this->mDataKeys; }
+
+	function getHtml() {
+
+	    if ($this->id=="") $this->id = $this->name;
+
+		$html = "\n\t<select";
+                $html .= " class=\"$this->css_class\"";
+		$html .= " name=\"$this->name\" id=\"$this->id\"";
+
+		if ($this->size!="")
+		  $html .= " size=\"$this->size\"";
+
+                $html .= " multiple";
+
+		if ($this->on_change!="")
+		   $html .= " onchange=\"$this->on_change\"";
+
+		if ($this->style!="")
+		   $html .= " style=\"$this->style\"";
+
+                if (!$this->isEnabled())
+		   $html .= " disabled";
+
+		$html .= ">\n";
+		if (is_array($this->mOptionsEmpty) && (count($this->mOptionsEmpty) > 0))
+		foreach ($this->mOptionsEmpty as $key=>$value) {
+			$html .= "<option value=\"".$key."\"";
+			if (($this->value == $value) && ($this->value != '')) $html .= " selected";
+			$html .= ">".$value."</option>\n";
+		}
+		if (is_array($this->mOptions) && (count($this->mOptions) > 0))
+		foreach ($this->mOptions as $key=>$value) {
+
+			if ($this->mDataDeep>1) {
+				$key = $value[$this->mDataKeys[0]];
+				$value = $value[$this->mDataKeys[1]];
+			}
+			$html .= "<option value=\"".$key."\"";
+
+                        $selectedProjects = $this->value;
+                        if (in_array($key, $selectedProjects)) $html .= " selected";
+
+			$html .= ">".htmlspecialchars($value)."</option>\n";
+		}
+
+		$html .= "</select>";
+
+		return $html;
+	}
+}
diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index cf6090b29..98a5c5c38 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -97,7 +97,7 @@ static function insertReport($fields) {
     $org_id = $user->org_id;
 
     $sql = "insert into tt_fav_reports".
-      " (name, user_id, group_id, org_id, report_spec, client_id, project_id, task_id,".
+      " (name, user_id, group_id, org_id, report_spec, client_id, task_id,".
       " billable, approved, invoice, timesheet, paid_status, note_containing, users, period, period_start,".
       " period_end, show_client, show_invoice, show_paid, show_ip,".
       " show_project, show_timesheet, show_start, show_duration, show_cost,".
@@ -107,7 +107,7 @@ static function insertReport($fields) {
       $mdb2->quote($fields['name']).", $user_id, $group_id, $org_id, ".
       $mdb2->quote($fields['report_spec']).", ".
       $mdb2->quote($fields['client']).", ".
-      $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
+      $mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['approved']).", ".
       $mdb2->quote($fields['invoice']).", ".$mdb2->quote($fields['timesheet']).", ".
       $mdb2->quote($fields['paid_status']).", ".$mdb2->quote($fields['note_containing']).",".
@@ -139,7 +139,7 @@ static function updateReport($fields) {
       "name = ".$mdb2->quote($fields['name']).", ".
       "report_spec = ".$mdb2->quote($fields['report_spec']).", ".
       "client_id = ".$mdb2->quote($fields['client']).", ".
-      "project_id = ".$mdb2->quote($fields['project']).", ".
+      //"project_id = ".$mdb2->quote($fields['project']).", ".
       "task_id = ".$mdb2->quote($fields['task']).", ".
       "billable = ".$mdb2->quote($fields['billable']).", ".
       "approved = ".$mdb2->quote($fields['approved']).", ".
@@ -227,7 +227,7 @@ static function saveReport($bean) {
       'report_spec'=>ttFavReportHelper::makeReportSpec($bean),
       'client'=>$bean->getAttribute('client'),
       'option'=>$bean->getAttribute('option'),
-      'project'=>$bean->getAttribute('project'),
+      //'project'=>$bean->getAttribute('project'),
       'task'=>$bean->getAttribute('task'),
       'billable'=>$bean->getAttribute('include_records'),
       'approved'=>$bean->getAttribute('approved'),
@@ -339,10 +339,17 @@ static function loadReport(&$bean) {
             $bean->setAttribute($checkbox_field_name, $checkbox_value);
           }
         }
+
+        // Project ids.
+        $project_ids = ttFavReportHelper::getFieldSettingFromReportSpec('project_ids', $report_spec);
+        if (isset($project_ids)) {
+          $projects = explode('&', $project_ids);
+          $bean->setAttribute('project', $projects);
+        }
       }
 
       $bean->setAttribute('client', $val['client_id']);
-      $bean->setAttribute('project', $val['project_id']);
+      // $bean->setAttribute('project', $val['project_id']);
       $bean->setAttribute('task', $val['task_id']);
       $bean->setAttribute('include_records', $val['billable']);
       $bean->setAttribute('approved', $val['approved']);
@@ -459,7 +466,7 @@ static function getReportOptions($id) {
     // This step is redundant, though, as data validation is supposed to work.
     // However, in case we missed something, casting to int reduces our risks.
     $options['client_id'] = isset($options['client_id']) ? (int)$options['client_id'] : 0;
-    $options['project_id'] = isset($options['project_id']) ? (int)$options['project_id'] : 0;
+    $options['project_id'] = isset($options['project_id']) ? (int)$options['project_id'] : 0; // TODO: get rid of this eventually.
     $options['task_id'] = isset($options['task_id']) ? (int)$options['task_id'] : 0;
     $options['billable'] = isset($options['billable']) ? (int)$options['billable'] : 0;
     $options['invoice'] = isset($options['invoice']) ? (int)$options['invoice'] : 0;
@@ -664,6 +671,16 @@ static function makeReportSpec($bean) {
       }
     }
 
+    // Add projects ids. Format: project_ids:25&756&567&1023. Use the & sign to join multiple project ids.
+    $selected_projects_in_bean = $bean->getAttribute('project');
+    if (!is_array($selected_projects_in_bean)) {
+      $selectedProjects = $bean->getAttribute('project[]');
+    }
+    if (is_array($selected_projects_in_bean) && !empty($selected_projects_in_bean[0])) {
+      $selectedProjectsSpec = join('&', $selected_projects_in_bean);
+    }
+    if (isset($selectedProjectsSpec)) $reportSpecArray[] = 'project_ids:'.$selectedProjectsSpec;
+
     $reportSpec = null;
     if (isset($reportSpecArray))
       $reportSpec = implode(',', $reportSpecArray);
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 842529a66..caf86f9d5 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -46,7 +46,11 @@ static function getWhere($options) {
       $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
-    if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
+
+    if (isset($options['project_ids']))
+      $dropdown_parts .= ' and l.project_id in ('.$options['project_ids'].')';
+    // if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id']; // This was here for a single select.
+
     if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
     if ($options['billable']==1) $dropdown_parts .= ' and l.billable = 1';
     if ($options['billable']==2) $dropdown_parts .= ' and l.billable = 0';
@@ -1757,7 +1761,18 @@ static function getReportOptions($bean) {
     $options['name'] = null; // No name required.
     // $options['user_id'] = $user->id; // We don't use user_id in regular reports. But fav reports use it to recycle $user object in cron.php.
     $options['client_id'] = (int)$bean->getAttribute('client');
-    $options['project_id'] = (int)$bean->getAttribute('project');
+
+    // Handle selected projects. Just in case check both "project[]" and "project".
+    $selected_projects_in_bean = $bean->getAttribute('project[]');
+    if (is_array($selected_projects_in_bean) && !empty($selected_projects_in_bean[0])) {
+      $options['project_ids'] = join(',', $selected_projects_in_bean);
+    }
+    $selected_projects_in_bean = $bean->getAttribute('project');
+    if (is_array($selected_projects_in_bean) && !empty($selected_projects_in_bean[0])) {
+      $options['project_ids'] = join(',', $selected_projects_in_bean);
+    }
+    // $options['project_id'] = (int)$bean->getAttribute('project'); // This was here for a single project select.
+
     $options['task_id'] = (int)$bean->getAttribute('task');
     $options['billable'] = (int)$bean->getAttribute('include_records');
     $options['invoice'] = (int)$bean->getAttribute('invoice');
@@ -1900,8 +1915,19 @@ static function verifyBean($bean) {
     // Check invoiced / not invoiced control.
     if (!ttValidInteger($bean->getAttribute('invoice'), true)) return false;
 
-    // Check project id.
-    if (!ttValidInteger($bean->getAttribute('project'), true)) return false;
+    // Check selected project ids. Just in case check both project[] and project.
+    $selectedProjects = $bean->getAttribute('project');
+    if (is_array($selectedProjects)) {
+      foreach ($selectedProjects as $singleProjectId) {
+        if (!ttValidInteger($singleProjectId, true)) return false;
+      }
+    }
+    $selectedProjects = $bean->getAttribute('project[]');
+    if (is_array($selectedProjects)) {
+      foreach ($selectedProjects as $singleProjectId) {
+        if (!ttValidInteger($singleProjectId, true)) return false;
+      }
+    }
 
     // Check task id.
     if (!ttValidInteger($bean->getAttribute('task'), true)) return false;
diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 6c0cde76e..7b844703a 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -123,17 +123,47 @@ function fillProjectDropdown(id) {
 
 // The fillTaskDropdown function populates the task combo box with
 // tasks associated with a selected project_id.
-function fillTaskDropdown(project_id) {
-  var str_task_ids;
-  // Get a string of comma-separated task ids.
-  if (project_id) {
-    var property = "p" + project_id;
-    str_task_ids = obj_tasks[property];
+function fillTaskDropdown() {
+
+  // Collect selected options from the project dropdown.
+  var projectDropdown = document.getElementById("project[]");
+  var selectedProjects = [];
+  var options = projectDropdown && projectDropdown.options;
+  var optionsLength = options ? options.length : 0;
+  var opt;
+  var allSelected = options[0].selected;
+  if (!allSelected) {
+    for (var i = 1; i < optionsLength; i++) {
+      opt = options[i];
+      if (opt.selected) {
+        selectedProjects.push(opt.value);
+      }
+    }
   }
-  if (str_task_ids) {
-    var task_ids = new Array(); // Array of task ids.
-    task_ids = str_task_ids.split(",");
+
+  // Iterate through all selected projects and build up an array of all relevant task ids.
+  var task_ids_for_selected_projects = [];
+  if (selectedProjects.length > 0) {
+    for (var i = 0; i < selectedProjects.length; i++) {
+      var project_id =  selectedProjects[i];
+
+      var property = "p" + project_id;
+      str_task_ids = obj_tasks[property]; // Task ids for a single selected project.
+
+      if (str_task_ids) {
+        var task_ids = new Array(); // Array of task ids for a single selected project.
+        task_ids = str_task_ids.split(",");
+
+        for (var j = 0; j < task_ids.length; j++) {
+          var single_task_id = task_ids[j];
+          if (task_ids_for_selected_projects.indexOf(single_task_id) === -1)
+            task_ids_for_selected_projects.push(single_task_id);
+        }
+      }
+    }
   }
+  // By now task_ids_for_selected_projects contains all relevenat tasks for all selected projects.
+  var taskIdsLen = task_ids_for_selected_projects.length;
 
   var dropdown = document.getElementById("task");
   // Determine previously selected item.
@@ -143,17 +173,17 @@ function fillTaskDropdown(project_id) {
   // Add mandatory top option.
   dropdown.options[0] = new Option(empty_label, '', true);
 
-  // Populate the dropdown with associated tasks.
+  // Populate the task dropdown with associated tasks.
   len = task_names.length;
   var dropdown_idx = 0;
   for (var i = 0; i < len; i++) {
-    if (!project_id) {
-      // No project is selected. Fill in all tasks.
+    if (taskIdsLen == 0) {
+      // No project, or --- all --- projects are selected. Fill in all tasks.
       dropdown.options[dropdown_idx+1] = new Option(task_names[i][1], task_names[i][0]);
       dropdown_idx++;
-    } else if (str_task_ids) {
-      // Project is selected and has associated tasks. Fill them in.
-      if (inArray(task_names[i][0], task_ids)) {
+    } else {
+      // Some projects are selected and has associated tasks. Fill them in.
+      if (inArray(task_names[i][0], task_ids_for_selected_projects)) {
         dropdown.options[dropdown_idx+1] = new Option(task_names[i][1], task_names[i][0]);
         dropdown_idx++;
       }
@@ -194,30 +224,60 @@ var assigned_projects = new Array();
 
 // selectAssignedUsers is called when a project is changed in project dropdown.
 // It selects users on the form who are assigned to this project.
-function selectAssignedUsers(project_id) {
+function selectAssignedUsers() {
+
+  // Collect selected options from the project dropdown.
+  var projectDropdown = document.getElementById("project[]");
+  var selectedProjects = [];
+  var options = projectDropdown && projectDropdown.options;
+  var optionsLength = options ? options.length : 0;
+  var opt;
+  var allSelected = options[0].selected;
+  if (!allSelected) {
+    for (var i = 1; i < optionsLength; i++) {
+      opt = options[i];
+      if (opt.selected) {
+        selectedProjects.push(opt.value);
+      }
+    }
+  }
+
   var user_id;
   var len;
 
+  // Iterate through document elements.
   for (var i = 0; i < document.reportForm.elements.length; i++) {
-    if ((document.reportForm.elements[i].type == 'checkbox') && (document.reportForm.elements[i].name == 'users[]')) {
-      user_id = document.reportForm.elements[i].value;
-      if (project_id)
-        document.reportForm.elements[i].checked = false;
-      else
+    // Iterate through 'active_users[]' checkboxes on the form.
+    if ((document.reportForm.elements[i].type == 'checkbox') && (document.reportForm.elements[i].name == 'users_active[]')) {
+      // If we have -- all --- projects or none selected, check all active user checkboxes.
+      if (allSelected || selectedProjects.length == 0)
         document.reportForm.elements[i].checked = true;
+      else
+        document.reportForm.elements[i].checked = false;
+
+      // Obtain database user id from the checkbox value.
+      user_id = document.reportForm.elements[i].value;
 
-      if(assigned_projects[user_id] != undefined)
+      if (assigned_projects[user_id] != undefined)
         len = assigned_projects[user_id].length;
       else
         len = 0;
 
-      if (project_id != '')
-        for (var j = 0; j < len; j++) {
-          if (project_id == assigned_projects[user_id][j]) {
-            document.reportForm.elements[i].checked = true;
-            break;
+      if (!allSelected && selectedProjects.length > 0) {
+        // Iterate through selected projects.
+        for (var j = 0; j < selectedProjects.length; j++) {
+          var selectedProjectId = selectedProjects[j];
+
+          // Iterate through assigned_projects array for user.
+          for (var k = 0; k < len; k++) {
+            if (selectedProjectId == assigned_projects[user_id][k]) {
+              // A selected project is assigned to user. Tick the checkbox fpr user.
+              document.reportForm.elements[i].checked = true;
+              break;
+            }
           }
         }
+      }
     }
   }
 }
diff --git a/initialize.php b/initialize.php
index e9849a97f..9ab337f88 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.19.5806");
+define("APP_VERSION", "1.22.20.5807");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/reports.php b/reports.php
index 5cfdd1d81..aabeec08f 100644
--- a/reports.php
+++ b/reports.php
@@ -84,9 +84,16 @@
   if (count($project_list) == 0) $showProject = false;
 }
 if ($showProject) {
-  $form->addInput(array('type'=>'combobox',
-    'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
-    'name'=>'project',
+  $form->addInput(array('type'=>'multipleselectcombobox',
+    'onchange'=>'fillTaskDropdown();selectAssignedUsers();',
+    'name'=>'project', // Multiple select now, but the name without "[]" in the end because we can't use it in reports.tpl.
+                       // Example: {$forms.reportForm.project.control}, we can't use {$forms.reportForm.project[].control}.
+                       // This creates an ugly complication:
+                       // Form.class.php addInput adds "[]" to a multiple select combobox element name.
+                       // When we verify bean in a form post, the name is "project".
+                       // But if bean is loaded from session, the name is "project[]".
+                       // It is unclear how to deal with this properly.
+    //'multiple'=>true,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->get('dropdown.all'))));

From 7180723180dfa79447c31ce15c8fb364bd84aea5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Fri, 30 Jun 2023 18:34:56 +0000
Subject: [PATCH 1837/1848] Fixed a problem in last commit.

---
 WEB-INF/lib/form/MultipleSelectCombobox.class.php | 2 +-
 initialize.php                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/form/MultipleSelectCombobox.class.php b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
index 9139c6094..701d42ec2 100644
--- a/WEB-INF/lib/form/MultipleSelectCombobox.class.php
+++ b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
@@ -2,7 +2,7 @@
 /* Copyright (c) Anuko International Ltd. https://www.anuko.com
 License: See license.txt */
 
-import('form.FormElement')
+import('form.FormElement');
 
 //  name        CDATA          #IMPLIED  -- field name --
 //  size        NUMBER         #IMPLIED  -- rows visible --
diff --git a/initialize.php b/initialize.php
index 9ab337f88..14a405dfe 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.20.5807");
+define("APP_VERSION", "1.22.20.5808");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 693c92c801242d2aeac196c76640efc572e06417 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 1 Jul 2023 16:26:49 +0000
Subject: [PATCH 1838/1848] A fix for project multiple select on reports.

---
 WEB-INF/lib/form/ActionForm.class.php | 5 +++++
 initialize.php                        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php
index a60800a44..358f8af5c 100644
--- a/WEB-INF/lib/form/ActionForm.class.php
+++ b/WEB-INF/lib/form/ActionForm.class.php
@@ -69,6 +69,11 @@ function initAttributes(&$request) {
         if ($this->mForm) {
 	        $elements = $this->mForm->getElements();
 			foreach ($elements as $name=>$el) {
+// TODO: Refactor this. This is a temporary fix for project multiple select. mValues should probably contain just project, not project[].
+if ($name == 'project' && isset($this->mValues['project[]'])) {
+    $this->mForm->elements['project']->setValue($this->mValues['project[]']);
+}
+// End of TODO.
     			if ($this->mForm->elements[$name] && isset($this->mValues[$name])) {
 				    $this->mForm->elements[$name]->setValue($this->mValues[$name]);
 	    	    }
diff --git a/initialize.php b/initialize.php
index 14a405dfe..8b4c6c3d0 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.20.5808");
+define("APP_VERSION", "1.22.20.5809");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 40ca86fed5c361d0723973985aade2d279fc096c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Jul 2023 14:29:49 +0000
Subject: [PATCH 1839/1848] Fixed JavaScript on reports.php to filter projects
 relevant to a selected client.

---
 WEB-INF/templates/reports.tpl | 53 +++++++++++++++++++----------------
 initialize.php                |  2 +-
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 7b844703a..485cfc121 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -70,31 +70,39 @@ function inArray(needle, haystack) {
 // projects associated with a selected client (client id is passed here as id).
 function fillProjectDropdown(id) {
   var str_ids = project_ids[id];
-  var dropdown = document.getElementById("project");
+  var projectDropdown = document.getElementById("project[]");
 
-  // Determine previously selected item.
-  var selected_item = dropdown.options[dropdown.selectedIndex].value;
+  // Collect selected options from the project dropdown.
+  var selectedProjects = [];
+  var options = projectDropdown && projectDropdown.options;
+  var optionsLength = options ? options.length : 0;
+  var opt;
+  var allSelected = options[0].selected;
+  if (!allSelected) {
+    for (var i = 1; i < optionsLength; i++) {
+      opt = options[i];
+      if (opt.selected) {
+        selectedProjects.push(opt.value);
+      }
+    }
+  }
 
   // Remove existing content.
-  dropdown.length = 0;
-
-  // project_reset is set to true if there is no previously selected project for a passed in client id.
-  // For example, a newly selected client is not associated with prevoisly selected project.
-  // This means that previous project selection is lost and we set to --- all ---.
-  var project_reset = selected_item ? true : false;
+  projectDropdown.length = 0;
 
   // Add mandatory top option.
-  dropdown.options[0] = new Option(empty_label, '', true);
+  projectDropdown.options[0] = new Option(empty_label, '', true);
 
   // Populate project dropdown.
   if (!id) {
     // If we are here, client is not selected.
     var len = projects.length;
     for (var i = 0; i < len; i++) {
-      dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
-      if (dropdown.options[i+1].value == selected_item)  {
-        dropdown.options[i+1].selected = true;
-        project_reset = false;
+      projectDropdown.options[i+1] = new Option(projects[i][1], projects[i][0]);
+      if (selectedProjects.length > 0) {
+        if (inArray(projects[i][0], selectedProjects)) {
+            projectDropdown.options[i+1].selected = true;
+        }
       }
     }
   } else if (str_ids) {
@@ -104,20 +112,17 @@ function fillProjectDropdown(id) {
 
     for (var i = 0; i < len; i++) {
       var p_id = ids[i];
-      dropdown.options[i+1] = new Option(project_names[p_id], p_id);
-      if (dropdown.options[i+1].value == selected_item)  {
-        dropdown.options[i+1].selected = true;
-        project_reset = false;
+      projectDropdown.options[i+1] = new Option(project_names[p_id], p_id);
+      if (selectedProjects.length > 0) {
+        if (inArray(projects[i][0], selectedProjects)) {
+            projectDropdown.options[i+1].selected = true;
+        }
       }
     }
   }
 
-  // If project selection was reset - clear the tasks dropdown.
-  if (project_reset) {
-    dropdown = document.getElementById("task");
-    dropdown.length = 0;
-    dropdown.options[0] = new Option(empty_label, '', true);
-  }
+  // Refill task dropdown.
+  fillTaskDropdown();
 }
 
 
diff --git a/initialize.php b/initialize.php
index 8b4c6c3d0..977903f3c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.20.5809");
+define("APP_VERSION", "1.22.20.5810");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 007080955c2c2f64a9e33b13c9777c33ab52b8f1 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sun, 2 Jul 2023 15:24:55 +0000
Subject: [PATCH 1840/1848] Fixed emailed fav reports for selected project ids.

---
 WEB-INF/lib/ttFavReportHelper.class.php | 9 ++++++++-
 initialize.php                          | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 98a5c5c38..2b2470439 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -466,7 +466,14 @@ static function getReportOptions($id) {
     // This step is redundant, though, as data validation is supposed to work.
     // However, in case we missed something, casting to int reduces our risks.
     $options['client_id'] = isset($options['client_id']) ? (int)$options['client_id'] : 0;
-    $options['project_id'] = isset($options['project_id']) ? (int)$options['project_id'] : 0; // TODO: get rid of this eventually.
+
+    // Obtain project ids from report_spec.
+    $project_ids = ttFavReportHelper::getFieldSettingFromReportSpec('project_ids', $options['report_spec']);
+    if (isset($project_ids)) {
+       $projects = explode('&', $project_ids);
+       $options['project_ids'] = join(',', $projects);
+    }
+
     $options['task_id'] = isset($options['task_id']) ? (int)$options['task_id'] : 0;
     $options['billable'] = isset($options['billable']) ? (int)$options['billable'] : 0;
     $options['invoice'] = isset($options['invoice']) ? (int)$options['invoice'] : 0;
diff --git a/initialize.php b/initialize.php
index 977903f3c..878d1efc2 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.20.5810");
+define("APP_VERSION", "1.22.20.5811");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 11864b22e641930f2bde8bd903bcb0d54b4f2f29 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 4 Jul 2023 06:49:18 +0000
Subject: [PATCH 1841/1848] Fixed reports for expenses for multiple project
 select.

---
 WEB-INF/lib/ttReportHelper.class.php | 6 +++++-
 initialize.php                       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index caf86f9d5..fb802f95e 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -184,7 +184,11 @@ static function getExpenseWhere($options) {
       $dropdown_parts .= ' and ei.client_id = '.$options['client_id'];
     elseif ($user->isClient() && $user->client_id)
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
-    if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
+
+    if (isset($options['project_ids']))
+      $dropdown_parts .= ' and ei.project_id in ('.$options['project_ids'].')';
+    // if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id']; // This was here for a single select.
+
     if ($options['invoice']==1) $dropdown_parts .= ' and ei.invoice_id is not null';
     if ($options['invoice']==2) $dropdown_parts .= ' and ei.invoice_id is null';
     if (isset($options['timesheet']) && ($options['timesheet']!=TIMESHEET_ALL && $options['timesheet']!=TIMESHEET_NOT_ASSIGNED)) {
diff --git a/initialize.php b/initialize.php
index 878d1efc2..54b7cc3fd 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.20.5811");
+define("APP_VERSION", "1.22.21.5812");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From a7c5d3a4e7802cba95a2ef0af0c7dd6e8c19e04a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 5 Jul 2023 16:17:36 +0000
Subject: [PATCH 1842/1848] Addressed issue #135.

---
 WEB-INF/lib/form/MultipleSelectCombobox.class.php | 8 +++-----
 initialize.php                                    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/form/MultipleSelectCombobox.class.php b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
index 701d42ec2..2c2cf0501 100644
--- a/WEB-INF/lib/form/MultipleSelectCombobox.class.php
+++ b/WEB-INF/lib/form/MultipleSelectCombobox.class.php
@@ -69,19 +69,17 @@ function getHtml() {
 			$html .= ">".$value."</option>\n";
 		}
 		if (is_array($this->mOptions) && (count($this->mOptions) > 0))
-		foreach ($this->mOptions as $key=>$value) {
+                  $selectedProjects = is_array($this->value) ? $this->value : array();
+		  foreach ($this->mOptions as $key=>$value) {
 
 			if ($this->mDataDeep>1) {
 				$key = $value[$this->mDataKeys[0]];
 				$value = $value[$this->mDataKeys[1]];
 			}
 			$html .= "<option value=\"".$key."\"";
-
-                        $selectedProjects = $this->value;
                         if (in_array($key, $selectedProjects)) $html .= " selected";
-
 			$html .= ">".htmlspecialchars($value)."</option>\n";
-		}
+		  }
 
 		$html .= "</select>";
 
diff --git a/initialize.php b/initialize.php
index 54b7cc3fd..f641f447f 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.21.5812");
+define("APP_VERSION", "1.22.22.5813");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");

From 26e77cce18bd060221894ebf66f8b2eefd5a9c8a Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Jul 2023 15:49:54 +0000
Subject: [PATCH 1843/1848] Addressed issue #134.

---
 WEB-INF/lib/common.lib.php | 6 +++++-
 initialize.php             | 5 ++++-
 task_add.php               | 2 +-
 task_edit.php              | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 4bc912963..79aba106b 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -126,7 +126,7 @@ function isTrue($val)
 }
 
 // ttValidString is used to check user input to validate a string.
-function ttValidString($val, $emptyValid = false)
+function ttValidString($val, $emptyValid = false, $maxChars = 0)
 {
   if (is_null($val)) {
     return $emptyValid ? true : false;
@@ -140,6 +140,10 @@ function ttValidString($val, $emptyValid = false)
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
 
+  // Count of UTF-8 characters in string must not exceeed $maxChars.
+  if ($maxChars > 0 && mb_strlen($val, 'UTF-8') > $maxChars) // 4 byte emojis are counted as 1 each, newlines as 2.
+    return false;
+
   return true;    
 }
 
diff --git a/initialize.php b/initialize.php
index f641f447f..548ad0aab 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.22.5813");
+define("APP_VERSION", "1.22.22.5814");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
@@ -117,6 +117,9 @@
 
 define('CHARSET', 'utf-8');
 
+// Definitions of max counts of utf8mb4 characters for various varchar database fields.
+define('MAX_DESCR_CHARS', 255);
+
 date_default_timezone_set(@date_default_timezone_get());
 
 // Initialize global objects that are needed for the application.
diff --git a/task_add.php b/task_add.php
index 3d8dcc1c7..e9b1df79a 100644
--- a/task_add.php
+++ b/task_add.php
@@ -40,7 +40,7 @@
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_description, true, MAX_DESCR_CHARS)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
diff --git a/task_edit.php b/task_edit.php
index 9761e31db..1530e79d0 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -55,7 +55,7 @@
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttValidString($cl_description, true, MAX_DESCR_CHARS)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
 
   if ($err->no()) {

From 3c21de2155eec74d2a16c4ccae867df6963388fc Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 6 Jul 2023 18:46:39 +0000
Subject: [PATCH 1844/1848] Added checking for max length of task names.

---
 initialize.php | 3 ++-
 task_add.php   | 4 ++--
 task_edit.php  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/initialize.php b/initialize.php
index 548ad0aab..a39c9cba4 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.22.5814");
+define("APP_VERSION", "1.22.22.5815");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
@@ -118,6 +118,7 @@
 define('CHARSET', 'utf-8');
 
 // Definitions of max counts of utf8mb4 characters for various varchar database fields.
+define('MAX_NAME_CHARS', 80);
 define('MAX_DESCR_CHARS', 255);
 
 date_default_timezone_set(@date_default_timezone_get());
diff --git a/task_add.php b/task_add.php
index e9b1df79a..4a3353703 100644
--- a/task_add.php
+++ b/task_add.php
@@ -32,14 +32,14 @@
 }
 
 $form = new Form('taskForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_name, false, MAX_NAME_CHARS)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true, MAX_DESCR_CHARS)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
 
   if ($err->no()) {
diff --git a/task_edit.php b/task_edit.php
index 1530e79d0..1eb8c7f5b 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -44,7 +44,7 @@
 
 $form = new Form('taskForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','name'=>'name','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
@@ -54,7 +54,7 @@
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_name, false, MAX_NAME_CHARS)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true, MAX_DESCR_CHARS)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidStatus($cl_status)) $err->add($i18n->get('error.field'), $i18n->get('label.status'));
 

From d123e4534038691c66c342008d464efbe8824a5d Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 8 Jul 2023 16:48:07 +0000
Subject: [PATCH 1845/1848] An improvement to validating max character count
 length for some controls.

---
 WEB-INF/lib/ttRegistrator.class.php |  8 ++++----
 initialize.php                      |  3 ++-
 mysql.sql                           |  4 ++--
 register.php                        | 10 ++++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index ae499a9df..8afbf665b 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -41,13 +41,13 @@ function __construct($fields, &$err) {
   function validate() {
     global $i18n;
 
-    if (!ttValidString($this->group_name))
+    if (!ttValidString($this->group_name, false, MAX_NAME_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
-    if (!ttValidString($this->currency, true))
+    if (!ttValidString($this->currency, true, MAX_CURRENCY_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.currency'));
-    if (!ttValidString($this->user_name))
+    if (!ttValidString($this->user_name, false, MAX_NAME_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_name'));
-    if (!ttValidString($this->login))
+    if (!ttValidString($this->login, false, MAX_NAME_CHARS))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.manager_login'));
     if (!ttValidString($this->password1))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.password'));
diff --git a/initialize.php b/initialize.php
index a39c9cba4..f6d996fa7 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.22.5815");
+define("APP_VERSION", "1.22.22.5816");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
@@ -120,6 +120,7 @@
 // Definitions of max counts of utf8mb4 characters for various varchar database fields.
 define('MAX_NAME_CHARS', 80);
 define('MAX_DESCR_CHARS', 255);
+define('MAX_CURRENCY_CHARS', 7);
 
 date_default_timezone_set(@date_default_timezone_get());
 
diff --git a/mysql.sql b/mysql.sql
index d50b6c46c..f614d0ac8 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -87,9 +87,9 @@ INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top ma
 #
 CREATE TABLE `tt_users` (
   `id` int(11) NOT NULL auto_increment,            # user id
-  `login` varchar(50) COLLATE utf8mb4_bin NOT NULL,# user login
+  `login` varchar(80) COLLATE utf8mb4_bin NOT NULL,# user login
   `password` varchar(50) default NULL,             # password hash
-  `name` varchar(100) default NULL,                # user name
+  `name` varchar(80) default NULL,                 # user name
   `group_id` int(11) NOT NULL,                     # group id
   `org_id` int(11) default NULL,                   # organization id
   `role_id` int(11) default NULL,                  # role id
diff --git a/register.php b/register.php
index 35fbee9cc..6f54ccf5b 100644
--- a/register.php
+++ b/register.php
@@ -36,8 +36,8 @@
 }
 
 $form = new Form('groupForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group_name));
-$form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
+$form->addInput(array('type'=>'text','name'=>'group_name','value'=>$cl_group_name));
+$form->addInput(array('type'=>'text','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
 $lang_files = I18n::getLangFileList();
@@ -57,14 +57,16 @@
 $longname_lang = mu_sort($longname_lang, 'name');
 $form->addInput(array('type'=>'combobox','name'=>'lang','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
 
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_login','value'=>$cl_manager_login));
+$form->addInput(array('type'=>'text','name'=>'manager_name','value'=>$cl_manager_name));
+$form->addInput(array('type'=>'text','name'=>'manager_login','value'=>$cl_manager_login));
 $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password1','value'=>$cl_password1));
 $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_email','value'=>$cl_manager_email));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
 if ($request->isPost()) {
+  // Note: user input validation is done in ttRegistrator constructor.
+
   // Create fields array for ttRegistrator instance.
   $fields = array(
     'user_name' => $cl_manager_name,

From 2deafba72d62471a2b1e29f2d625a3dbb4702200 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 11 Nov 2023 16:42:19 +0000
Subject: [PATCH 1846/1848] Cosmetic, checking deployment script.

---
 initialize.php                 |  2 +-
 plugins/MonthlyQuota.class.php | 28 ++--------------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/initialize.php b/initialize.php
index f6d996fa7..ab66a4406 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.22.5816");
+define("APP_VERSION", "1.22.22.5817");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");
diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php
index b291d3730..f37cd7885 100644
--- a/plugins/MonthlyQuota.class.php
+++ b/plugins/MonthlyQuota.class.php
@@ -1,30 +1,6 @@
 <?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
-// +----------------------------------------------------------------------+
+/* Copyright (c) Anuko International Ltd. https://www.anuko.com
+License: See license.txt */
 
 import('ttTimeHelper');
 

From f92e6ce6d58669ea735767b55e18bcaa7a7935b8 Mon Sep 17 00:00:00 2001
From: Fabian Heinrich <127763209+ram-fabian-heinrich@users.noreply.github.com>
Date: Thu, 28 Dec 2023 00:41:06 +0100
Subject: [PATCH 1847/1848] Fixed typos (#138)

Thanks. Putting this one in. As for your other PR, the changes are problematic for me to review due to a terminal medical condition. I am so sorry.
---
 WEB-INF/resources/de.lang.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 40c3bde97..9e9ad0a3d 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -72,12 +72,12 @@
 'error.no_login' => 'Benutzer mit diesen Anmeldedaten nicht vorhanden.',
 'error.no_groups' => 'Die Datenbank ist leer. Als Administrator anmelden und ein neues Gruppe erzeugen.',
 'error.upload' => 'Fehler beim hochladen einer Datei.',
-'error.range_locked' => 'Zeitinterval ist gesperrt.',
+'error.range_locked' => 'Zeitintervall ist gesperrt.',
 'error.mail_send' => 'Fehler beim versenden einer E-Mail. Verwenden Sie MAIL_SMTP_DEBUG für die Diagnose.',
 'error.no_email' => 'Dieser Benutzer besitzt keine e-Mail Adresse.',
 'error.uncompleted_exists' => 'Unvollständiger Eintrag bereits vorhanden. Schließen oder Löschen.',
 'error.goto_uncompleted' => 'Zum unvollständigen Eintrag gehen.',
-'error.overlap' => 'Der Zeitinterval überschneidet sich mit vorhandenen Einträgen.',
+'error.overlap' => 'Der Zeitintervall überschneidet sich mit vorhandenen Einträgen.',
 'error.future_date' => 'Datum ist in der Zukunft.',
 'error.xml' => 'Fehler in der XML-Datei in der Zeile %d: %s.',
 'error.cannot_import' => 'Kann nicht importiert werden: %s.',
@@ -238,7 +238,7 @@
 
 // Form titles.
 'title.error' => 'Fehler',
-'title.success' => 'Erfol',
+'title.success' => 'Erfolg',
 'title.login' => 'Anmelden',
 'title.2fa' => 'Zwei-Faktor-Authentifizierung',
 'title.groups' => 'Gruppen',
@@ -408,7 +408,7 @@
 'form.reports.include_pending' => 'Ausstehend',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
-'form.reports.note_containing' => 'Notitz enthält',
+'form.reports.note_containing' => 'Notiz enthält',
 'form.reports.show_fields' => 'Felder anzeigen',
 'form.reports.time_fields' => 'Zeitfelder',
 'form.reports.user_fields' => 'Benutzerfelder',
@@ -540,10 +540,10 @@
 'form.quota.year' => 'Jahr',
 'form.quota.month' => 'Monat',
 'form.quota.workday_hours' => 'Arbeitsstunden pro Tag',
-'form.quota.hint' => 'Wenn leergelassen wird die Quote automatisch berechnet (Basierend auf Arbeitsstunden pro Tag und Feiertagen)',
+'form.quota.hint' => 'Wenn leer gelassen wird die Quote automatisch berechnet (Basierend auf Arbeitsstunden pro Tag und Feiertagen)',
 
 // Swap roles form. See example at https://timetracker.anuko.com/swap_roles.php.
-'form.swap.hint' => 'Stufen Sie ihre Rolle auf eine niedrigere indem Sie mit jemadem die Rollen tauschen. Dies kann nicht rückgängig gemacht werden.',  
+'form.swap.hint' => 'Stufen Sie ihre Rolle auf eine niedrigere indem Sie mit jemandem die Rollen tauschen. Dies kann nicht rückgängig gemacht werden.',  
 'form.swap.swap_with' => 'Tausche Rolle mit',
 
 // Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
@@ -571,7 +571,7 @@
 'role.top_manager.description' => 'Top Gruppen-Manager. Kann alles innerhalb eines Gruppenbaums administrieren',
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'Administrator',
-'role.admin.description' => 'Aadminsitrator der Seite.',
+'role.admin.description' => 'Administrator der Seite.',
 
 // Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
 'form.timesheet_view.submit_subject' => 'Antrag auf Genehmigung der Arbeitszeittabelle',

From b6711df7ae7c0c0034d6673365d26a0933faac5c Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 28 Dec 2023 18:07:21 +0000
Subject: [PATCH 1848/1848] Added an important announcement ro README.

---
 README.md      | 3 +++
 initialize.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf2f8601f..022c0c030 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@
 ## About
 Anuko [Time Tracker](https://www.anuko.com/time-tracker/index.htm) is an open source, web-based time tracking application written in PHP. It allows you to track the time that employees or colleagues spend working on projects and tasks. It needs a web server such as Apache, IIS, etc. to run on, and a database to keep the data in, such as MySQL.
 
+## Terminal Illness of the Owner
+December 28, 2023: Nik Okuntseff, the owner and lead software developer at Anuko, developed a terminal illness. Anuko, the company behind Time Tracker, will cease to exist at soon.
+
 ## Free Hosting
 [Anuko](https://www.anuko.com) provides [free hosting](https://www.anuko.com/time-tracker/free-hosting/index.htm) of Time Tracker to individuals and small groups up to 5 users. To start using Time Tracker immediately, create a group at https://timetracker.anuko.com
 
diff --git a/initialize.php b/initialize.php
index ab66a4406..18946798c 100644
--- a/initialize.php
+++ b/initialize.php
@@ -21,7 +21,7 @@
     die("mysqli_report function is not available."); // No point to continue as mysqli will not work.
 }
 
-define("APP_VERSION", "1.22.22.5817");
+define("APP_VERSION", "1.22.22.5818");
 define("APP_DIR", dirname(__FILE__));
 define("LIBRARY_DIR", APP_DIR."/WEB-INF/lib");
 define("TEMPLATE_DIR", APP_DIR."/WEB-INF/templates");